[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.botts.inc.php class.uilocati...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.botts.inc.php class.uilocati... |
|
Date: |
Tue, 07 Mar 2006 13:58:16 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Branch:
Changes by: Sigurd Nes <address@hidden> 06/03/07 13:58:15
Modified files:
inc : class.botts.inc.php class.uilocation.inc.php
class.solocation.inc.php
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.botts.inc.php.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.uilocation.inc.php.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.solocation.inc.php.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
Patches:
Index: property/inc/class.botts.inc.php
diff -u property/inc/class.botts.inc.php:1.19
property/inc/class.botts.inc.php:1.20
--- property/inc/class.botts.inc.php:1.19 Fri Mar 3 17:48:03 2006
+++ property/inc/class.botts.inc.php Tue Mar 7 13:58:15 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage helpdesk
- * @version $Id: class.botts.inc.php,v 1.19 2006/03/03 17:48:03 sigurdne
Exp $
+ * @version $Id: class.botts.inc.php,v 1.20 2006/03/07 13:58:15 sigurdne
Exp $
*/
/**
@@ -91,7 +91,7 @@
$this->start=0;
}
- if(array_key_exists('query',$_POST))
+ if(array_key_exists('query',$_POST) ||
array_key_exists('query',$_GET))
{
$this->query = $query;
}
Index: property/inc/class.solocation.inc.php
diff -u property/inc/class.solocation.inc.php:1.26
property/inc/class.solocation.inc.php:1.27
--- property/inc/class.solocation.inc.php:1.26 Mon Mar 6 14:15:14 2006
+++ property/inc/class.solocation.inc.php Tue Mar 7 13:58:15 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage location
- * @version $Id: class.solocation.inc.php,v 1.26 2006/03/06 14:15:14
sigurdne Exp $
+ * @version $Id: class.solocation.inc.php,v 1.27 2006/03/07 13:58:15
sigurdne Exp $
*/
/**
@@ -58,6 +58,32 @@
}
}
+ $sql = "SELECT count(*) as hits FROM fm_tts_tickets
WHERE location_code $this->like '$location_code%'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ $this->db2->next_record();
+ if($this->db2->f('hits'))
+ {
+ $entity[] = array
+ (
+ 'entity_link' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.index&query='
. $location_code),
+ 'name' => lang('Helpdesk') . '
[' . $this->db2->f('hits') . ']',
+ 'descr' => lang('Helpdesk')
+ );
+ }
+
+ $sql = "SELECT count(*) as hits FROM fm_document WHERE
location_code $this->like '$location_code%'";
+ $this->db2->query($sql,__LINE__,__FILE__);
+ $this->db2->next_record();
+ if($this->db2->f('hits'))
+ {
+ $entity[] = array
+ (
+ 'entity_link' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.index&query='
. $location_code),
+ 'name' =>
lang('Documentation') . ' [' . $this->db2->f('hits') . ']',
+ 'descr' => lang('Documentation')
+ );
+ }
+
return $entity;
}
Index: property/inc/class.uilocation.inc.php
diff -u property/inc/class.uilocation.inc.php:1.21
property/inc/class.uilocation.inc.php:1.22
--- property/inc/class.uilocation.inc.php:1.21 Fri Mar 3 09:13:42 2006
+++ property/inc/class.uilocation.inc.php Tue Mar 7 13:58:15 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage location
- * @version $Id: class.uilocation.inc.php,v 1.21 2006/03/03 09:13:42
sigurdne Exp $
+ * @version $Id: class.uilocation.inc.php,v 1.22 2006/03/07 13:58:15
sigurdne Exp $
*/
/**
@@ -881,12 +881,24 @@
{
foreach($entities as $entity_entry)
{
- $entities_link[] = array
- (
- 'entity_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.index&entity_id='
. $entity_entry['entity_id'] . '&cat_id=' . $entity_entry['cat_id'] .
'&query=' . $location_code),
-
'lang_entity_statustext' => $entity_entry['descr'],
- 'text_entity'
=> $entity_entry['name'],
- );
+ if($entity_entry['entity_link'])
+ {
+ $entities_link[] = array
+ (
+ 'entity_link'
=> $entity_entry['entity_link'],
+
'lang_entity_statustext' => $entity_entry['descr'],
+ 'text_entity'
=> $entity_entry['name'],
+ );
+ }
+ else
+ {
+ $entities_link[] = array
+ (
+ 'entity_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.index&entity_id='
. $entity_entry['entity_id'] . '&cat_id=' . $entity_entry['cat_id'] .
'&query=' . $location_code),
+
'lang_entity_statustext' => $entity_entry['descr'],
+ 'text_entity'
=> $entity_entry['name'],
+ );
+ }
}
}
}
@@ -1272,14 +1284,25 @@
if (isset($entities) AND is_array($entities))
{
foreach($entities as $entity_entry)
-
{
- $entities_link[] = array
- (
- 'entity_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.index&entity_id='
. $entity_entry['entity_id'] . '&cat_id=' . $entity_entry['cat_id'] .
'&query=' . $location_code),
- 'lang_entity_statustext'
=> $entity_entry['descr'],
- 'text_entity'
=> $entity_entry['name'],
- );
+ if($entity_entry['entity_link'])
+ {
+ $entities_link[] = array
+ (
+ 'entity_link'
=> $entity_entry['entity_link'],
+
'lang_entity_statustext' => $entity_entry['descr'],
+ 'text_entity'
=> $entity_entry['name'],
+ );
+ }
+ else
+ {
+ $entities_link[] = array
+ (
+ 'entity_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.index&entity_id='
. $entity_entry['entity_id'] . '&cat_id=' . $entity_entry['cat_id'] .
'&query=' . $location_code),
+
'lang_entity_statustext' => $entity_entry['descr'],
+ 'text_entity'
=> $entity_entry['name'],
+ );
+ }
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.botts.inc.php class.uilocati...,
Sigurd Nes <=