[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.soXport.inc.php, 1.31, 1.32 c
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.soXport.inc.php, 1.31, 1.32 class.solocation.inc.php, 1.26, 1.27 class.sotts.inc.php, 1.25, 1.26 class.soproject.inc.php, 1.27, 1.28 class.soworkorder.inc.php, 1.19, 1.20 class.uilookup.inc.php, 1.27, 1.28 class.solookup.inc.php, 1.24, 1.25 class.uicategory.inc.php, 1.6, 1.7 class.uiadmin_location.inc.php, 1.6, 1.7 class.uistandard_3.inc.php, 1.11, 1.12 class.uistandard_2.inc.php, 1.12, 1.13 |
|
Date: |
Thu, 07 Aug 2003 12:09:01 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv15654/inc
Modified Files:
class.soXport.inc.php class.solocation.inc.php
class.sotts.inc.php class.soproject.inc.php
class.soworkorder.inc.php class.uilookup.inc.php
class.solookup.inc.php class.uicategory.inc.php
class.uiadmin_location.inc.php class.uistandard_3.inc.php
class.uistandard_2.inc.php
Log Message:
no message
Index: class.soXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soXport.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** class.soXport.inc.php 6 Aug 2003 17:07:58 -0000 1.31
--- class.soXport.inc.php 7 Aug 2003 16:08:59 -0000 1.32
***************
*** 93,201 ****
}
! function add($fields)
{
! $pmwrkord_code=$fields['pmwrkord_code'];
! if ($pmwrkord_code)
{
! $pmwrkord_code_value="'$pmwrkord_code'";
! }
! else
! {
! $pmwrkord_code_value="Null";
! }
! $bilagsnr=$fields['bilagsnr'];
! $splitt=$fields['splitt'];
! $kildeid=$fields['kildeid'];
! $kidnr=$fields['kidnr'];
! $typeid=$fields[typeid];
! $fakturadato=$fields['fakturadato'];
! $forfallsdato=$fields['forfallsdato'];
! $regtid=$fields['regtid'];
! $artid=$fields['artid'];
! $godkjentbelop=$fields['godkjentbelop'];
! $spvend_code=$fields['spvend_code'];
! $dimb=$fields['dimb'];
! if ($dimb)
! {
! $dimb_value="'$dimb'";
! }
! else
! {
! $dimb_value="Null";
! }
! $oppsynsmannid=$fields['oppsynsmannid'];
!
! if ($oppsynsmannid)
! {
! $oppsynsmannid_value="'$oppsynsmannid'";
! }
! else
! {
! $oppsynsmannid_value="Null";
! }
! $saksbehandlerid=$fields['saksbehandlerid'];
! if ($saksbehandlerid)
! {
! $saksbehandlerid_value="'$saksbehandlerid'";
! }
! else
! {
! $saksbehandlerid_value="Null";
}
! $budsjettansvarligid=$fields['budsjettansvarligid'];
! $fakturanr=$fields['fakturanr'];
! $spbudact_code=$fields['spbudact_code'];
! if ($spbudact_code)
! {
! $spbudact_code_value="'$spbudact_code'";
! }
! else
! {
! $spbudact_code_value="Null";
! }
!
! $loc1=$fields['loc1'];
! $dima=$fields['dima'];
! if ($dima)
! {
! $dima_value="'$dima'";
! }
! else
! {
! $dima_value="Null";
! }
!
! $dimd=$fields['dimd'];
! if ($dimd)
! {
! $dimd_value="'$dimd'";
! }
! else
! {
! $dimd_value="Null";
! }
!
!
! $mvakode=$fields['mvakode'];
! $belop=$fields['belop'];
! $periode=$fields['periode'];
! $merknad=$fields['merknad'];
!
! if(abs($belop)>0)
! {
! $belop=$this->bocommon->moneyformat($belop);
!
$godkjentbelop=$this->bocommon->moneyformat($godkjentbelop);
!
! $sql= "INSERT INTO fm_ecobilag
(pmwrkord_code,bilagsnr,splitt,kildeid,kidnr,typeid,fakturadato,forfallsdato,regtid,artid,godkjentbelop,spvend_code,dimb,oppsynsmannid,saksbehandlerid,budsjettansvarligid,fakturanr,spbudact_code,loc1,dima,dimd,mvakode,belop,periode,merknad,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato)"
! . " values
($pmwrkord_code_value,'$bilagsnr','$splitt','$kildeid','$kidnr','$typeid','$fakturadato','$forfallsdato','$regtid','$artid',$godkjentbelop,'$spvend_code',$dimb_value,$oppsynsmannid_value,$saksbehandlerid_value,'$budsjettansvarligid','$fakturanr',$spbudact_code_value,'$loc1',$dima_value,$dimd_value,'$mvakode',$belop,'$periode','$merknad',NULL,NULL,NULL,NULL)";
! }
! //echo 'sql'.$sql.'<br>';
! $this->db->query($sql,__LINE__,__FILE__);
}
--- 93,211 ----
}
! function add($buffer)
{
+ $this->db->transaction_begin();
! $num=0;
! foreach ($buffer as $fields)
{
! $num++;
! $pmwrkord_code=$fields['pmwrkord_code'];
! if ($pmwrkord_code)
! {
! $pmwrkord_code_value="'$pmwrkord_code'";
! }
! else
! {
! $pmwrkord_code_value="Null";
! }
! $bilagsnr=$fields['bilagsnr'];
! $splitt=$fields['splitt'];
! $kildeid=$fields['kildeid'];
! $kidnr=$fields['kidnr'];
! $typeid=$fields[typeid];
! $fakturadato=$fields['fakturadato'];
! $forfallsdato=$fields['forfallsdato'];
! $regtid=$fields['regtid'];
! $artid=$fields['artid'];
! $godkjentbelop=$fields['godkjentbelop'];
! $spvend_code=$fields['spvend_code'];
! $dimb=$fields['dimb'];
! if ($dimb)
! {
! $dimb_value="'$dimb'";
! }
! else
! {
! $dimb_value="Null";
! }
!
! $oppsynsmannid=$fields['oppsynsmannid'];
!
! if ($oppsynsmannid)
! {
! $oppsynsmannid_value="'$oppsynsmannid'";
! }
! else
! {
! $oppsynsmannid_value="Null";
! }
!
! $saksbehandlerid=$fields['saksbehandlerid'];
! if ($saksbehandlerid)
! {
!
$saksbehandlerid_value="'$saksbehandlerid'";
! }
! else
! {
! $saksbehandlerid_value="Null";
! }
!
!
$budsjettansvarligid=$fields['budsjettansvarligid'];
! $fakturanr=$fields['fakturanr'];
! $spbudact_code=$fields['spbudact_code'];
! if ($spbudact_code)
! {
! $spbudact_code_value="'$spbudact_code'";
! }
! else
! {
! $spbudact_code_value="Null";
! }
!
! $loc1=$fields['loc1'];
! $dima=$fields['dima'];
! if ($dima)
! {
! $dima_value="'$dima'";
! }
! else
! {
! $dima_value="Null";
! }
!
! $dimd=$fields['dimd'];
! if ($dimd)
! {
! $dimd_value="'$dimd'";
! }
! else
! {
! $dimd_value="Null";
! }
!
! $mvakode=$fields['mvakode'];
! $belop=$fields['belop'];
! $periode=$fields['periode'];
! $merknad=$fields['merknad'];
!
! if(abs($belop)>0)
! {
!
$belop=$this->bocommon->moneyformat($belop);
!
$godkjentbelop=$this->bocommon->moneyformat($godkjentbelop);
!
! $sql= "INSERT INTO fm_ecobilag
(pmwrkord_code,bilagsnr,splitt,kildeid,kidnr,typeid,fakturadato,forfallsdato,regtid,artid,godkjentbelop,spvend_code,dimb,oppsynsmannid,saksbehandlerid,budsjettansvarligid,fakturanr,spbudact_code,loc1,dima,dimd,mvakode,belop,periode,merknad,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato)"
! . " values
($pmwrkord_code_value,'$bilagsnr','$splitt','$kildeid','$kidnr','$typeid','$fakturadato','$forfallsdato','$regtid','$artid',$godkjentbelop,'$spvend_code',$dimb_value,$oppsynsmannid_value,$saksbehandlerid_value,'$budsjettansvarligid','$fakturanr',$spbudact_code_value,'$loc1',$dima_value,$dimd_value,'$mvakode',$belop,'$periode','$merknad',NULL,NULL,NULL,NULL)";
! }
! $this->db->query($sql,__LINE__,__FILE__);
}
! $this->db->query("update fm_idgenerator set value =
$bilagsnr where name = 'Bilagsnummer'");
! $this->db->transaction_commit();
! return $num;
}
Index: class.solocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** class.solocation.inc.php 4 Aug 2003 10:02:40 -0000 1.26
--- class.solocation.inc.php 7 Aug 2003 16:08:59 -0000 1.27
***************
*** 14,20 ****
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
- $this->acl2 =
CreateObject($this->currentapp.'.acl2','##DEFAULT##','##DEFAULT##');
-
- // $this->grants =
$this->acl2->get_grants($this->currentapp,'.location');
$this->db = $GLOBALS['phpgw']->db;
$this->db2 = $this->db;
--- 14,17 ----
Index: class.sotts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** class.sotts.inc.php 27 Jul 2003 15:53:24 -0000 1.25
--- class.sotts.inc.php 7 Aug 2003 16:08:59 -0000 1.26
***************
*** 23,26 ****
--- 23,35 ----
$this->join = $this->socommon->join;
+
+ $this->grants =
$GLOBALS['phpgw']->session->appsession('grants_ticket',$this->currentapp);
+
+ if(!$this->grants)
+ {
+ $this->grants =
$this->acl2->get_grants($this->currentapp,'.ticket');
+
$GLOBALS['phpgw']->session->appsession('grants_ticket',$this->currentapp,$this->grants);
+ }
+
}
***************
*** 51,55 ****
function read($data)
{
- $this->grants =
$this->acl2->get_grants($this->currentapp,'.ticket');
if(is_array($data))
--- 60,63 ----
***************
*** 91,95 ****
}
reset($public_user_list);
! $filtermethod .= " OR ( fm_tts_tickets.user_id
IN(" . implode(',',$public_user_list) . ")))";
}
--- 99,103 ----
}
reset($public_user_list);
! $filtermethod = " $where (
fm_tts_tickets.user_id IN(" . implode(',',$public_user_list) . "))";
}
Index: class.soproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** class.soproject.inc.php 27 Jul 2003 15:53:24 -0000 1.27
--- class.soproject.inc.php 7 Aug 2003 16:08:59 -0000 1.28
***************
*** 22,25 ****
--- 22,33 ----
$this->join = $this->bocommon->join;
+
+ $this->grants =
$GLOBALS['phpgw']->session->appsession('grants_project',$this->currentapp);
+
+ if(!$this->grants)
+ {
+ $this->grants =
$this->acl2->get_grants($this->currentapp,'.project');
+
$GLOBALS['phpgw']->session->appsession('grants_project',$this->currentapp,$this->grants);
+ }
}
***************
*** 91,96 ****
function read($data)
{
- $this->grants =
$this->acl2->get_grants($this->currentapp,'.project');
-
if(is_array($data))
{
--- 99,102 ----
***************
*** 159,163 ****
}
-
$where= 'WHERE';
--- 165,168 ----
***************
*** 171,180 ****
}
reset($public_user_list);
! $filtermethod .= " OR
(fm_project.access='public' AND fm_project.user_id IN(" .
implode(',',$public_user_list) . ")))";
}
$where= 'AND';
-
if ($cat_id > 0)
{
--- 176,188 ----
}
reset($public_user_list);
! $filtermethod = " $where
(fm_project.access='public' AND fm_project.user_id IN(" .
implode(',',$public_user_list) . "))";
! }
! else
! {
! $filtermethod .= ')';
}
$where= 'AND';
if ($cat_id > 0)
{
***************
*** 242,246 ****
function read_single($project_id)
{
- $this->grants =
$this->acl2->get_grants($this->currentapp,'.project');
$sql = "SELECT * from fm_project where
id='$project_id'";
--- 250,253 ----
Index: class.soworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soworkorder.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.soworkorder.inc.php 27 Jul 2003 15:53:24 -0000 1.19
--- class.soworkorder.inc.php 7 Aug 2003 16:08:59 -0000 1.20
***************
*** 23,26 ****
--- 23,33 ----
$this->join = $this->socommon->join;
$this->left_join = $this->socommon->left_join;
+ $this->grants =
$GLOBALS['phpgw']->session->appsession('grants_project',$this->currentapp);
+
+ if(!$this->grants)
+ {
+ $this->grants =
$this->acl2->get_grants($this->currentapp,'.project');
+
$GLOBALS['phpgw']->session->appsession('grants_project',$this->currentapp,$this->grants);
+ }
}
***************
*** 99,103 ****
function read($data)
{
- $this->grants =
$this->acl2->get_grants($this->currentapp,'.project');
if(is_array($data))
--- 106,109 ----
***************
*** 196,200 ****
}
reset($public_user_list);
! $filtermethod .= " OR
(fm_project.access='public' AND fm_project.user_id IN(" .
implode(',',$public_user_list) . ")))";
}
--- 202,206 ----
}
reset($public_user_list);
! $filtermethod = " $where
(fm_project.access='public' AND fm_project.user_id IN(" .
implode(',',$public_user_list) . "))";
}
***************
*** 264,269 ****
function read_single($workorder_id)
{
- $this->grants =
$this->acl2->get_grants($this->currentapp,'.project');
-
$sql = "SELECT fm_workorder.*, fm_chapter.descr as
chapter ,fm_project.user_id from fm_workorder $this->join fm_project on
fm_workorder.project_id=fm_project.id $this->left_join fm_chapter on "
. " fm_workorder.chapter_id = fm_chapter.id
where fm_workorder.id='$workorder_id'";
--- 270,273 ----
Index: class.uilookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilookup.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** class.uilookup.inc.php 16 Jul 2003 10:38:31 -0000 1.27
--- class.uilookup.inc.php 7 Aug 2003 16:08:59 -0000 1.28
***************
*** 37,52 ****
$GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
- $this->cats =
CreateObject('phpgwapi.categories');
- $this->cats->app_name = 'building';
$this->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
- $this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
-
- $this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
- $this->grants[$this->account] = PHPGW_ACL_READ +
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
$this->bo =
CreateObject($this->currentapp.'.bolookup',True);
- $this->bocommon =
CreateObject($this->currentapp.'.bocommon');
- $this->soadmin_location =
CreateObject($this->currentapp.'.soadmin_location');
- $this->boequipment =
CreateObject($this->currentapp.'.boequipment');
-
$this->start =
$this->bo->start;
--- 37,42 ----
***************
*** 79,82 ****
--- 69,75 ----
{
+ $this->cats =
CreateObject('phpgwapi.categories');
+ $this->cats->app_name = 'addressbook';
+
$GLOBALS['phpgw']->xslttpl->add_file(array('lookup',
'nextmatchs',
***************
*** 97,101 ****
}
- $this->cats->app_name = 'addressbook';
$addressbook_list = $this->bo->read_addressbook();
--- 90,93 ----
***************
*** 256,263 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_select),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'lang_no_cat'
=> lang('no category'),
- 'lang_cat_statustext' =>
lang('Select the category the building belongs to. To do not use a category
select NO CATEGORY'),
- 'select_name'
=> 'cat_id',
- 'cat_list'
=> $this->cats->formatted_xslt_list(array('selected' =>
$this->cat_id,'globals' => True)),
'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_select),
'filter_list'
=> $this->nextmatchs->xslt_filter(array('filter' => $this->filter,'yours' =>
'yes')),
--- 248,251 ----
***************
*** 458,465 ****
'lang_cat_statustext' =>
lang('Select the category the building belongs to. To do not use a category
select NO CATEGORY'),
'select_name'
=> 'cat_id',
! 'cat_list'
=> $this->cats->formatted_xslt_list(array('selected' =>
$this->cat_id,'globals' => True)),
'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_select),
- // 'filter_list'
=> $this->nextmatchs->xslt_filter(array('filter' => $this->filter,'yours' =>
'yes')),
- 'lang_filter_statustext' =>
lang('Select the filter. To show all entries select SHOW ALL'),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
'lang_searchbutton_statustext' => lang('Submit
the search string'),
--- 446,451 ----
'lang_cat_statustext' =>
lang('Select the category the building belongs to. To do not use a category
select NO CATEGORY'),
'select_name'
=> 'cat_id',
! // 'cat_list'
=> $this->cats->formatted_xslt_list(array('selected' =>
$this->cat_id,'globals' => True)),
'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_select),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
'lang_searchbutton_statustext' => lang('Submit
the search string'),
***************
*** 467,471 ****
'lang_search'
=> lang('search'),
'table_header_tenant_new' =>
$table_header,
! 'values_tenant_new' =>
$content,
'table_done'
=> $table_done
);
--- 453,457 ----
'lang_search'
=> lang('search'),
'table_header_tenant_new' =>
$table_header,
! 'values_tenant_new'
=> $content,
'table_done'
=> $table_done
);
***************
*** 507,511 ****
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uilookup.ns3420',
!
'cat_id'
=>$this->cat_id)
)),
'lang_descr' => lang('ns3420
description'),
--- 493,497 ----
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uilookup.ns3420',
!
'query' =>$this->query)
)),
'lang_descr' => lang('ns3420
description'),
***************
*** 516,520 ****
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uilookup.ns3420',
!
'cat_id'
=>$this->cat_id)
)),
'lang_id' => lang('ID'),
--- 502,506 ----
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uilookup.ns3420',
!
'query' =>$this->query)
)),
'lang_id' => lang('ID'),
***************
*** 549,561 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_select),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'lang_no_cat'
=> lang('no category'),
- 'lang_cat_statustext' =>
lang('Select the category the building belongs to. To do not use a category
select NO CATEGORY'),
- 'select_name'
=> 'cat_id',
- 'cat_list'
=> $this->cats->formatted_xslt_list(array('selected' =>
$this->cat_id,'globals' => True)),
'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_select),
- 'filter_list'
=> $this->nextmatchs->xslt_filter(array('filter' => $this->filter,'yours' =>
'yes')),
- 'lang_filter_statustext' =>
lang('Select the filter. To show all entries select SHOW ALL'),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
'lang_searchbutton_statustext' => lang('Submit
the search string'),
'query'
=> $this->query,
'table_header_ns3420' =>
$table_header,
--- 535,542 ----
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_select),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_select),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
'lang_searchbutton_statustext' => lang('Submit
the search string'),
+ 'lang_search'
=> lang('search'),
'query'
=> $this->query,
'table_header_ns3420' =>
$table_header,
***************
*** 574,578 ****
function equipment()
{
!
$this->start =
$this->boequipment->start;
$this->query =
$this->boequipment->query;
--- 555,560 ----
function equipment()
{
! $this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->boequipment =
CreateObject($this->currentapp.'.boequipment');
$this->start =
$this->boequipment->start;
$this->query =
$this->boequipment->query;
Index: class.solookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solookup.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** class.solookup.inc.php 16 Jul 2003 10:38:31 -0000 1.24
--- class.solookup.inc.php 7 Aug 2003 16:08:59 -0000 1.25
***************
*** 16,20 ****
$this->db = $GLOBALS['phpgw']->db;
$this->db2 = $this->db;
- $this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
$this->socommon =
CreateObject($this->currentapp.'.socommon');
--- 16,19 ----
***************
*** 54,87 ****
}
! if ($filter == 'none')
! {
! $filtermethod = ' ( owner=' . $this->account;
! if (is_array($this->grants))
! {
! $grants = $this->grants;
! while (list($user) = each($grants))
! {
! $public_user_list[] = $user;
! }
! reset($public_user_list);
! $filtermethod .= " OR (access='public'
OR owner IN(" . implode(',',$public_user_list) . ")))";
! }
! else
! {
! $filtermethod .= ' )';
! }
! }
! elseif ($filter == 'yours')
! {
! $filtermethod = " owner='" . $this->account .
"'";
! }
! else
! {
! $filtermethod = " owner='" . $this->account .
"' AND access='private'";
! }
if ($cat_id > 0)
{
! $filtermethod .= " AND cat_id='$cat_id' ";
}
--- 53,63 ----
}
!
! $where= 'WHERE';
if ($cat_id > 0)
{
! $filtermethod .= " $where cat_id='$cat_id' ";
! $where= 'AND';
}
***************
*** 91,98 ****
$query = ereg_replace('"','',$query);
! $querymethod = " AND (id LIKE '%$query%' or
org_name LIKE '%$query%')";
}
! $sql = "SELECT id,org_name FROM phpgw_addressbook WHERE
$filtermethod $querymethod";
$this->db2->query($sql,__LINE__,__FILE__);
--- 67,74 ----
$query = ereg_replace('"','',$query);
! $querymethod = " $where (id LIKE '%$query%' or
org_name LIKE '%$query%')";
}
! $sql = "SELECT id,org_name FROM phpgw_addressbook
$filtermethod $querymethod";
$this->db2->query($sql,__LINE__,__FILE__);
Index: class.uicategory.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uicategory.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.uicategory.inc.php 30 Jun 2003 10:49:14 -0000 1.6
--- class.uicategory.inc.php 7 Aug 2003 16:08:59 -0000 1.7
***************
*** 31,37 ****
$this->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
-
- $this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
- $this->grants[$this->account] = PHPGW_ACL_READ +
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
$this->bo =
CreateObject($this->currentapp.'.bocategory',true);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
--- 31,34 ----
Index: class.uiadmin_location.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiadmin_location.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.uiadmin_location.inc.php 30 Jun 2003 10:49:14 -0000 1.6
--- class.uiadmin_location.inc.php 7 Aug 2003 16:08:59 -0000 1.7
***************
*** 35,41 ****
$this->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
-
- $this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
- $this->grants[$this->account] = PHPGW_ACL_READ +
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
$this->bo =
CreateObject($this->currentapp.'.boadmin_location',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
--- 35,38 ----
Index: class.uistandard_3.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_3.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.uistandard_3.inc.php 23 May 2003 08:40:19 -0000 1.11
--- class.uistandard_3.inc.php 7 Aug 2003 16:08:59 -0000 1.12
***************
*** 31,37 ****
$this->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
-
- $this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
- $this->grants[$this->account] = PHPGW_ACL_READ +
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
$this->bo =
CreateObject($this->currentapp.'.bostandard_3',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
--- 31,34 ----
Index: class.uistandard_2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_2.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uistandard_2.inc.php 23 May 2003 08:40:19 -0000 1.12
--- class.uistandard_2.inc.php 7 Aug 2003 16:08:59 -0000 1.13
***************
*** 31,37 ****
$this->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
-
- $this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
- $this->grants[$this->account] = PHPGW_ACL_READ +
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
$this->bo =
CreateObject($this->currentapp.'.bostandard_2',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
--- 31,34 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.soXport.inc.php, 1.31, 1.32 class.solocation.inc.php, 1.26, 1.27 class.sotts.inc.php, 1.25, 1.26 class.soproject.inc.php, 1.27, 1.28 class.soworkorder.inc.php, 1.19, 1.20 class.uilookup.inc.php, 1.27, 1.28 class.solookup.inc.php, 1.24, 1.25 class.uicategory.inc.php, 1.6, 1.7 class.uiadmin_location.inc.php, 1.6, 1.7 class.uistandard_3.inc.php, 1.11, 1.12 class.uistandard_2.inc.php, 1.12, 1.13,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/inc/import Import_fra_Service, 1.14, 1.15 Import_fra_Kemner, 1.14, 1.15 Import_fra_BKK, 1.13, 1.14
- Next by Date:
[Phpgroupware-cvs] CVS: addressbook/setup phpgw_de.lang, 1.7.2.4.2.1, 1.7.2.4.2.2 phpgw_en.lang, 1.14.2.9.2.4, 1.14.2.9.2.5
- Previous by thread:
[Phpgroupware-cvs] CVS: property/inc/import Import_fra_Service, 1.14, 1.15 Import_fra_Kemner, 1.14, 1.15 Import_fra_BKK, 1.13, 1.14
- Next by thread:
[Phpgroupware-cvs] CVS: addressbook/setup phpgw_de.lang, 1.7.2.4.2.1, 1.7.2.4.2.2 phpgw_en.lang, 1.14.2.9.2.4, 1.14.2.9.2.5
- Index(es):