From MAILER-DAEMON Fri Apr 01 19:34:22 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DHWaj-0001Ap-It for mharc-phpgroupware-cvs@gnu.org; Fri, 01 Apr 2005 19:34:21 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DHWah-00019s-Bc for phpgroupware-cvs@gnu.org; Fri, 01 Apr 2005 19:34:19 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DHWaa-00017H-5P for phpgroupware-cvs@gnu.org; Fri, 01 Apr 2005 19:34:13 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DHWaX-00011X-TG for phpgroupware-cvs@gnu.org; Fri, 01 Apr 2005 19:34:10 -0500 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DHWXB-0002xv-Ri for phpgroupware-cvs@gnu.org; Fri, 01 Apr 2005 19:30:42 -0500 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 51B73312D6 for ; Sat, 2 Apr 2005 02:30:31 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 24730-07 for ; Sat, 2 Apr 2005 02:30:28 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 5BCC7312CF for ; Sat, 2 Apr 2005 02:30:28 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j320USJ08809; Sat, 2 Apr 2005 02:30:28 +0200 Message-Id: <200504020030.j320USJ08809@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: ceb Date: Sat, 2 Apr 2005 01:52:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] projects/templates/base form_admin.tpl, 1.1 list_admin.tpl, 1.1 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Apr 2005 00:34:19 -0000 Update of projects/templates/base Added Files: Branch: MAIN form_admin.tpl list_admin.tpl Log Message: update ==================================================== Index: form_admin.tpl
{lang_users_list}:
{lang_groups_list}:
==================================================== Index: list_admin.tpl
{left} {right}
{lang_showing}
  {search_list}
{sort_lid} {sort_firstname} {sort_lastname}
{lid} {firstname} {lastname}
{lang_group}
{lid}
From MAILER-DAEMON Fri Apr 01 19:34:24 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DHWam-0001Bg-2K for mharc-phpgroupware-cvs@gnu.org; Fri, 01 Apr 2005 19:34:24 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DHWag-00019q-VI for phpgroupware-cvs@gnu.org; Fri, 01 Apr 2005 19:34:19 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DHWaa-00017X-5U for phpgroupware-cvs@gnu.org; Fri, 01 Apr 2005 19:34:13 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DHWaY-00011X-Tn for phpgroupware-cvs@gnu.org; Fri, 01 Apr 2005 19:34:10 -0500 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DHWX6-0002xO-Gn for phpgroupware-cvs@gnu.org; Fri, 01 Apr 2005 19:30:36 -0500 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 0FC60312D6 for ; Sat, 2 Apr 2005 02:30:23 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 24998-05 for ; Sat, 2 Apr 2005 02:30:20 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 42BAB312CF for ; Sat, 2 Apr 2005 02:30:20 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j320UKP08798; Sat, 2 Apr 2005 02:30:20 +0200 Message-Id: <200504020030.j320UKP08798@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: ceb Date: Sat, 2 Apr 2005 01:52:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] projects/setup setup.inc.php, 1.57 tables_update.inc.php, 1.53 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Apr 2005 00:34:20 -0000 Update of projects/setup Modified Files: Branch: MAIN setup.inc.php lines: +2 -2 tables_update.inc.php lines: +81 -8 Log Message: update ==================================================== Index: projects/setup/setup.inc.php diff -u projects/setup/setup.inc.php:1.56 projects/setup/setup.inc.php:1.57 --- projects/setup/setup.inc.php:1.56 Mon Mar 14 17:39:39 2005 +++ projects/setup/setup.inc.php Fri Apr 1 23:52:28 2005 @@ -11,7 +11,7 @@ /* $Id$ */ $setup_info['projects']['name'] = 'projects'; - $setup_info['projects']['version'] = '0.8.7.048'; + $setup_info['projects']['version'] = '0.8.7.049'; $setup_info['projects']['app_order'] = 13; $setup_info['projects']['enable'] = 1; ==================================================== Index: projects/setup/tables_update.inc.php diff -u projects/setup/tables_update.inc.php:1.52 projects/setup/tables_update.inc.php:1.53 --- projects/setup/tables_update.inc.php:1.52 Mon Mar 14 17:39:39 2005 +++ projects/setup/tables_update.inc.php Fri Apr 1 23:52:28 2005 @@ -988,7 +988,7 @@ $test[] = '0.8.7.043'; function projects_upgrade0_8_7_043() { - $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_p_ttracker','billable',array('type' => 'char','precision' => 1,'nullable' => false)); + $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_p_ttracker','billable',array('type' => 'char','precision' => 1,'nullable' => False)); $GLOBALS['setup_info']['projects']['currentver'] = '0.8.7.044'; return $GLOBALS['setup_info']['projects']['currentver']; @@ -1007,8 +1007,8 @@ $GLOBALS['phpgw_setup']->oProc->query("update phpgw_p_hours set t_journey=FLOOR(t_journey)*60 + (t_journey-FLOOR(t_journey))*100",__LINE__,__FILE__); $GLOBALS['phpgw_setup']->oProc->query("update phpgw_p_ttracker set t_journey=FLOOR(t_journey)*60 + (t_journey-FLOOR(t_journey))*100",__LINE__,__FILE__); - $GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_p_hours','t_journey',array('type' => 'int','precision' => 4,'default' => 0,'nullable' => true)); - $GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_p_ttracker','t_journey',array('type' => 'int','precision' => 4,'default' => 0,'nullable' => true)); + $GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_p_hours','t_journey',array('type' => 'int','precision' => 4,'default' => 0,'nullable' => True)); + $GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_p_ttracker','t_journey',array('type' => 'int','precision' => 4,'default' => 0,'nullable' => True)); $GLOBALS['setup_info']['projects']['currentver'] = '0.8.7.045'; return $GLOBALS['setup_info']['projects']['currentver']; @@ -1017,7 +1017,7 @@ $test[] = '0.8.7.045'; function projects_upgrade0_8_7_045() { - $GLOBALS['phpgw_setup']->db->query("SELECT project_id, start_date, end_date, psdate, pedate FROM phpgw_p_projects"); + $GLOBALS['phpgw_setup']->db->query('SELECT project_id, start_date, end_date, psdate, pedate FROM phpgw_p_projects'); while($GLOBALS['phpgw_setup']->db->next_record()) { $pro_id = intval($GLOBALS['phpgw_setup']->db->f('project_id')); @@ -1059,11 +1059,84 @@ $test[] = '0.8.7.047'; function projects_upgrade0_8_7_047() { - $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_p_projects','time_planned_childs',array('type' => 'int','precision' => 4,'default' => 0,'nullable' => false)); - $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_p_projects','budget_childs',array('type' => 'decimal','precision' => 20,'scale' => 2,'default' => 0,'nullable' => false)); - $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_p_projects','e_budget_childs',array('type' => 'decimal','precision' => 20,'scale' => 2,'default' => 0,'nullable' => true)); + $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_p_projects','time_planned_childs',array('type' => 'int','precision' => 4,'default' => 0,'nullable' => False)); + $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_p_projects','budget_childs',array('type' => 'decimal','precision' => 20,'scale' => 2,'default' => 0,'nullable' => False)); + $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_p_projects','e_budget_childs',array('type' => 'decimal','precision' => 20,'scale' => 2,'default' => 0,'nullable' => True)); $GLOBALS['setup_info']['projects']['currentver'] = '0.8.7.048'; return $GLOBALS['setup_info']['projects']['currentver']; } + + $test[] = '0.8.7.048'; + function projects_upgrade0_8_7_048() + { + $i = 0; + $GLOBALS['phpgw_setup']->db->query("SELECT account_id FROM phpgw_p_projectmembers where type='aa' or type='ma'"); + while($GLOBALS['phpgw_setup']->db->next_record()) + { + $uadmins[$i] = $GLOBALS['phpgw_setup']->db->f('account_id'); + ++$i; + } + + $i = 0; + $GLOBALS['phpgw_setup']->db->query("SELECT account_id FROM phpgw_p_projectmembers where type='ag' or type='mg'"); + while($GLOBALS['phpgw_setup']->db->next_record()) + { + $gadmins[$i] = $GLOBALS['phpgw_setup']->db->f('account_id'); + ++$i; + } + + $i = 0; + $GLOBALS['phpgw_setup']->db->query("SELECT account_id FROM phpgw_p_projectmembers where type='sa'"); + while($GLOBALS['phpgw_setup']->db->next_record()) + { + $suser[$i] = $GLOBALS['phpgw_setup']->db->f('account_id'); + ++$i; + } + + $i = 0; + $GLOBALS['phpgw_setup']->db->query("SELECT account_id FROM phpgw_p_projectmembers where type='sg'"); + while($GLOBALS['phpgw_setup']->db->next_record()) + { + $sgroup[$i] = $GLOBALS['phpgw_setup']->db->f('account_id'); + ++$i; + } + + if(is_array($uadmins)) + { + foreach($uadmins as $null => $aa) + { + $GLOBALS['phpgw_setup']->db->query("INSERT into phpgw_acl values ('project_admin','user'," . $aa . ',1)',__LINE__,__FILE__); + } + } + + if(is_array($gadmins)) + { + foreach($gadmins as $null => $ag) + { + $GLOBALS['phpgw_setup']->db->query("INSERT into phpgw_acl values ('project_admin','group'," . $ag . ',1)',__LINE__,__FILE__); + } + } + + if(is_array($suser)) + { + foreach($suser as $null => $su) + { + $GLOBALS['phpgw_setup']->db->query("INSERT into phpgw_acl values ('project_salesman','user'," . $su . ',1)',__LINE__,__FILE__); + } + } + + if(is_array($sgroup)) + { + foreach($sgroup as $null => $sg) + { + $GLOBALS['phpgw_setup']->db->query("INSERT into phpgw_acl values ('project_salesman','group'," . $sg . ',1)',__LINE__,__FILE__); + } + } + + $GLOBALS['phpgw_setup']->db->query("DELETE from phpgw_p_projectmembers where type='aa' or type='ag' or type='ma' or type='mg' or type='sa' or type='sg'",__LINE__,__FILE__); + + $GLOBALS['setup_info']['projects']['currentver'] = '0.8.7.049'; + return $GLOBALS['setup_info']['projects']['currentver']; + } ?> From MAILER-DAEMON Fri Apr 01 19:34:24 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DHWam-0001Bk-6V for mharc-phpgroupware-cvs@gnu.org; Fri, 01 Apr 2005 19:34:24 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DHWag-00019r-Vq for phpgroupware-cvs@gnu.org; Fri, 01 Apr 2005 19:34:19 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DHWaZ-00016q-72 for phpgroupware-cvs@gnu.org; Fri, 01 Apr 2005 19:34:15 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DHWaW-00011X-Jx for phpgroupware-cvs@gnu.org; Fri, 01 Apr 2005 19:34:08 -0500 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DHWXl-00030t-VD for phpgroupware-cvs@gnu.org; Fri, 01 Apr 2005 19:31:18 -0500 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 98435312D6 for ; Sat, 2 Apr 2005 02:31:07 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 24702-08 for ; Sat, 2 Apr 2005 02:31:00 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id C3BD7312CF for ; Sat, 2 Apr 2005 02:31:00 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j320V0P08849; Sat, 2 Apr 2005 02:31:00 +0200 Message-Id: <200504020031.j320V0P08849@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: ceb Date: Sat, 2 Apr 2005 01:52:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] projects/inc hook_admin.inc.php, 1.22 class.uiprojects_base.inc.php, 1.10 class.boprojects.inc.php, 1.156 class.soconfig.inc.php, 1.19 class.soprojects.inc.php, 1.109 class.uiconfig.inc.php, 1.32 class.boconfig.inc.php, 1.22 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Apr 2005 00:34:20 -0000 Update of projects/inc Modified Files: Branch: MAIN hook_admin.inc.php lines: +4 -6 class.uiprojects_base.inc.php lines: +2 -2 class.boprojects.inc.php lines: +5 -5 class.soconfig.inc.php lines: +33 -81 class.soprojects.inc.php lines: +24 -19 class.uiconfig.inc.php lines: +28 -16 class.boconfig.inc.php lines: +5 -5 Log Message: update ==================================================== Index: projects/inc/hook_admin.inc.php diff -u projects/inc/hook_admin.inc.php:1.21 projects/inc/hook_admin.inc.php:1.22 --- projects/inc/hook_admin.inc.php:1.21 Mon Mar 14 17:39:39 2005 +++ projects/inc/hook_admin.inc.php Fri Apr 1 23:52:28 2005 @@ -15,14 +15,12 @@ $file = Array ( 'Site Configuration' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname), + 'project administrators' => $GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiconfig.list_admins'), 'Worktime statusmail' => $GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiconfig.config_worktime_statusmail'), 'Worktime warnmail' => $GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiconfig.config_worktime_warnmail'), 'Workhours booking' => $GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiconfig.config_workhours_booking'), - 'managing committee' => $GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiconfig.list_admins&action=pmanager'), - 'project administrators' => $GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiconfig.list_admins&action=pad'), - 'sales department' => $GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiconfig.list_admins&action=psale'), - 'Global Categories' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=' . $appname), - 'edit project id help msg' => $GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiconfig.config_proid_help_msg') + 'edit project id help msg' => $GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiconfig.config_proid_help_msg'), + 'Global Categories' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=' . $appname) ); //Do not modify below this line display_section($appname,$appname,$file); ==================================================== Index: projects/inc/class.uiprojects_base.inc.php diff -u projects/inc/class.uiprojects_base.inc.php:1.9 projects/inc/class.uiprojects_base.inc.php:1.10 --- projects/inc/class.uiprojects_base.inc.php:1.9 Thu Mar 31 23:00:22 2005 +++ projects/inc/class.uiprojects_base.inc.php Fri Apr 1 23:52:28 2005 @@ -296,7 +296,7 @@ } /* this will move to bookkeeping - if ($this->boprojects->isprojectadmin('pad') || $this->boprojects->isprojectadmin('pmanager')) + if ($this->boprojects->isprojectadmin()) { $icons .= $icon_sep; $icons .= $this->CreateButton(EXPORT_DIAMANT); ==================================================== Index: projects/inc/class.boprojects.inc.php diff -u projects/inc/class.boprojects.inc.php:1.155 projects/inc/class.boprojects.inc.php:1.156 --- projects/inc/class.boprojects.inc.php:1.155 Tue Mar 29 14:46:57 2005 +++ projects/inc/class.boprojects.inc.php Fri Apr 1 23:52:27 2005 @@ -240,7 +240,7 @@ { return True; } - if($this->isprojectadmin('pad') || $this->isprojectadmin('pmanager')) + if($this->isprojectadmin()) { return True; } @@ -315,7 +315,7 @@ { return True; } - else if($this->isprojectadmin('pad') || $this->isprojectadmin('pmanager') && !is_array($cat)) + else if($this->isprojectadmin() && !is_array($cat)) { return True; } @@ -335,7 +335,7 @@ { return True; } - if($this->isprojectadmin('pad') || $this->isprojectadmin('pmanager')) + if($this->isprojectadmin()) { return True; } @@ -2412,7 +2412,7 @@ return $activities_list; } - function isprojectadmin($action = 'pad') + function isprojectadmin($action = 'project_admin') { return $this->soprojects->soconfig->isprojectadmin($action); } ==================================================== Index: projects/inc/class.soconfig.inc.php diff -u projects/inc/class.soconfig.inc.php:1.18 projects/inc/class.soconfig.inc.php:1.19 --- projects/inc/class.soconfig.inc.php:1.18 Mon Mar 14 17:39:39 2005 +++ projects/inc/class.soconfig.inc.php Fri Apr 1 23:52:28 2005 @@ -7,7 +7,7 @@ * Project Manager * * Written by Bettina Gille [ceb@phpgroupware.org] * * ----------------------------------------------- * - * Copyright 2000 - 2004 Free Software Foundation, Inc * + * Copyright 2000 - 2005 Free Software Foundation, Inc * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License as * @@ -292,135 +292,87 @@ } } - function read_admins($action = 'pad',$type = '') + function read_admins($action = 'project_admin',$type = '') { - switch($type) + if($action != 'project_admin' && $action != 'project_salesman') { - case 'user': - switch($action) - { - case 'pmanager': $filter = "type='ma'"; break; - case 'psale': $filter = "type='sa'"; break; - case 'pad': $filter = "type='aa'"; break; - } - break; - case 'group': - switch($action) - { - case 'pmanager': $filter = "type='mg'"; break; - case 'psale': $filter = "type='sg'"; break; - case 'pad': $filter = "type='ag'"; break; - } - break; - case 'all': $filter = "(type != 'accounting' AND type != 'role')"; break; - default: - switch($action) - { - case 'pmanager': $filter = "type='ma' or type='mg'"; break; - case 'psale': $filter = "type='sa' or type='sg'"; break; - case 'pad': $filter = "type='aa' or type='ag'"; break; - } - break; + $action = 'project_admin'; + } + + if($type != '') + { + $typeselect = " AND acl_location='" . $type . "'"; } - $sql = 'select account_id,type from phpgw_p_projectmembers WHERE ' . $filter; - $this->db->query($sql); + $sql = "select acl_account, acl_location from phpgw_acl WHERE acl_appname='" . $action . "'"; + $this->db->query($sql . $typeselect,__LINE__,__FILE__); $this->total_records = $this->db->num_rows(); while ($this->db->next_record()) { - $admins[] = array('account_id' => $this->db->f('account_id'), - 'type' => $this->db->f('type')); + $admins[] = array('account_id' => $this->db->f('acl_account'), + 'type' => $this->db->f('acl_location')); } return $admins; } - function isprojectadmin($action = 'pad') + function isprojectadmin($action = 'project_admin') { + if($action != 'project_admin' && $action != 'project_salesman') + { + $action = 'project_admin'; + } + $admin_groups = $GLOBALS['phpgw']->accounts->membership($this->account); $admins = $this->read_admins($action); //_debug_array($admins); - for ($i=0;$iaccount) { - case 'pmanager': - $type_a = 'ma'; - $type_g = 'mg'; - break; - case 'psale': - $type_a = 'sa'; - $type_g = 'sg'; - break; - default: - $type_a = 'aa'; - $type_g = 'ag'; - break; - } - - if ($admins[$i]['type'] == $type_a && $admins[$i]['account_id'] == $this->account) - { - return true; + return True; } - elseif ($admins[$i]['type'] == $type_g) + elseif($admins[$i]['type'] == 'group') { if (is_array($admin_groups)) { - for ($j=0;$jdb->query("DELETE from phpgw_p_projectmembers WHERE type='" . $filter . "'",__LINE__,__FILE__); + $this->db->query("DELETE from phpgw_acl WHERE acl_appname='" . $action . "'",__LINE__,__FILE__); if (is_array($users)) { - switch($action) - { - case 'psale': $type = 'sa'; break; - case 'pmanager': $type = 'ma'; break; - default: $type = 'aa'; break; - } - while($activ=each($users)) { - $this->db->query('insert into phpgw_p_projectmembers (project_id, account_id,type) values (0,' . $activ[1] . ",'" - . $type . "')",__LINE__,__FILE__); + $this->db->query("INSERT into phpgw_acl values ('" . $action . "','user'," . $activ[1] . ',1)',__LINE__,__FILE__); } } if (is_array($groups)) { - switch($action) - { - case 'psale': $type = 'sg'; break; - case 'pmanager': $type = 'mg'; break; - default: $type = 'ag'; break; - } - while($activ=each($groups)) { - $this->db->query('insert into phpgw_p_projectmembers (project_id, account_id,type) values (0,' . $activ[1] . ",'" - . $type . "')",__LINE__,__FILE__); + $this->db->query("INSERT into phpgw_acl values ('" . $action . "','group'," . $activ[1] . ',1)',__LINE__,__FILE__); } } } ==================================================== Index: projects/inc/class.soprojects.inc.php diff -u projects/inc/class.soprojects.inc.php:1.108 projects/inc/class.soprojects.inc.php:1.109 --- projects/inc/class.soprojects.inc.php:1.108 Thu Mar 31 23:00:22 2005 +++ projects/inc/class.soprojects.inc.php Fri Apr 1 23:52:28 2005 @@ -7,7 +7,7 @@ * Project Manager * * Written by Bettina Gille [ceb@phpgroupware.org] * * ----------------------------------------------- * - * Copyright 2000 - 2004 Free Software Foundation, Inc. * + * Copyright 2000 - 2005 Free Software Foundation, Inc. * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License as * @@ -158,7 +158,7 @@ if ($filter == 'none' || $filter == 'noadmin') { - if ($filter == 'none' && ($this->soconfig->isprojectadmin('pad') || $this->soconfig->isprojectadmin('pmanager') || $this->soconfig->isprojectadmin('psale'))) + if ($filter == 'none' && ($this->soconfig->isprojectadmin() || $this->soconfig->isprojectadmin('project_salesman'))) { $filtermethod = " ( access != 'private' OR coordinator = " . $this->account . ' )'; } @@ -187,14 +187,6 @@ { $filtermethod = ' coordinator=' . $this->account; } - elseif ($filter == 'anonym') - { - $filtermethod = " access = 'anonym' "; - } - elseif ($filter == 'employee') - { - $filtermethod = ' employee =' . $employee; - } else { $filtermethod = ' coordinator=' . $this->account . " AND access='private'"; @@ -1039,9 +1031,17 @@ if ($account_id > 0) { $this->db->query('delete from phpgw_categories where cat_owner=' . $account_id . " AND cat_appname='projects'",__LINE__,__FILE__); + + $this->db->query('delete from phpgw_acl where acl_account=' . $account_id . " AND (acl_appname='project_members' OR acl_appname='project_admin' " + . "OR acl_appname='project_salesman')",__LINE__,__FILE__); + + $this->db->query('delete from phpgw_p_projectmembers where account_id=' . $account_id,__LINE__,__FILE__); + $this->db->query('delete from phpgw_p_hours where employee=' . $account_id,__LINE__,__FILE__); - $this->db->query('select project_id from phpgw_p_projects where coordinator=' . $account_id,__LINE__,__FILE__); + $this->db->query('delete from phpgw_p_ttracker where employee=' . $account_id,__LINE__,__FILE__); + /* needs work to avoid deleting project if subs with different coordinator */ + $this->db->query('select project_id from phpgw_p_projects where coordinator=' . $account_id,__LINE__,__FILE__); while ($this->db->next_record()) { $drop_list[] = $this->db->f('project_id'); @@ -1053,10 +1053,8 @@ // _debug_array($drop_list); // exit; - $subdelete = ' OR parent in (' . implode(',',$drop_list) . ')'; - - $this->db->query('DELETE from phpgw_p_projects where project_id in (' . implode(',',$drop_list) . ')' - . $subdelete,__LINE__,__FILE__); + $this->db->query('DELETE from phpgw_p_projects where project_id in (' . implode(',',$drop_list) . ')',__LINE__,__FILE__); + $this->db->query('DELETE from phpgw_p_mstones where project_id in (' . implode(',',$drop_list) . ')',__LINE__,__FILE__); $this->db->query('select id from phpgw_p_delivery where project_id in (' . implode(',',$drop_list) . ')',__LINE__,__FILE__); @@ -1064,7 +1062,7 @@ { $del[] = array ( - 'id' => $this->db->f('id') + 'id' => $this->db->f('id') ); } @@ -1085,7 +1083,7 @@ { $inv[] = array ( - 'id' => $this->db->f('id') + 'id' => $this->db->f('id') ); } @@ -1109,10 +1107,17 @@ $this->db->query('UPDATE phpgw_p_projects set coordinator=' . $new . ' where coordinator=' . $old,__LINE__,__FILE__); $this->db->query('UPDATE phpgw_p_hours set employee=' . $new . ' where employee=' . $old,__LINE__,__FILE__); - $this->db->query('UPDATE phpgw_p_projectmembers set account_id=' . $new . ' where (account_id=' . $old . " AND type='aa')",__LINE__,__FILE__); + $this->db->query('UPDATE phpgw_p_ttracker set employee=' . $new . ' where employee=' . $old,__LINE__,__FILE__); + + $this->db->query('UPDATE phpgw_p_projectmembers set account_id=' . $new . ' where (account_id=' . $old . " AND type='role')",__LINE__,__FILE__); + $this->db->query('UPDATE phpgw_p_invoice set owner=' . $new . ' where owner=' . $old,__LINE__,__FILE__); $this->db->query('UPDATE phpgw_p_delivery set owner=' . $new . ' where owner=' . $old,__LINE__,__FILE__); + $this->db->query('UPDATE phpgw_categories set cat_owner=' . $new . ' where cat_owner=' . $old . " AND cat_appname='projects'",__LINE__,__FILE__); + + $this->db->query('UPDATE phpgw_acl set acl_account=' . $new . ' where acl_account=' . $old . " AND (acl_appname='project_members' OR acl_appname='project_admin' " + . "OR acl_appname='project_salesman')",__LINE__,__FILE__); } ==================================================== Index: projects/inc/class.uiconfig.inc.php diff -u projects/inc/class.uiconfig.inc.php:1.31 projects/inc/class.uiconfig.inc.php:1.32 --- projects/inc/class.uiconfig.inc.php:1.31 Tue Mar 15 01:10:42 2005 +++ projects/inc/class.uiconfig.inc.php Fri Apr 1 23:52:28 2005 @@ -178,6 +178,9 @@ $GLOBALS['phpgw']->template->set_var('opt_off_desc',lang('off')); $GLOBALS['phpgw']->template->set_var('opt_weekly_desc',lang('weekly')); $GLOBALS['phpgw']->template->set_var('opt_monthly_desc',lang('monthly')); + + $GLOBALS['phpgw']->template->set_var('lang_admins',lang('project administrators')); + $GLOBALS['phpgw']->template->set_var('lang_salesmen',lang('sales department')); } function display_app_header() @@ -739,24 +742,29 @@ switch($action) { - case 'psale': $header_info = lang('salesmen list'); break; - case 'pmanager': $header_info = lang('manager list'); break; - default: $header_info = lang('administrator list'); break; + case 'project_salesman': $header_info = lang('salesmen list'); + $selected_salesman = ' SELECTED'; + break; + default: $header_info = lang('administrator list'); + $selected_admin = ' SELECTED'; + break; } $GLOBALS['phpgw_info']['flags']['app_header'] = lang('projects') . ': ' . $header_info; - $GLOBALS['phpgw']->common->phpgw_header(); - echo parse_navbar(); + $GLOBALS['phpgw']->common->phpgw_header(True); + $this->set_app_langs(); $GLOBALS['phpgw']->template->set_file(array('admin_list_t' => 'list_admin.tpl')); $GLOBALS['phpgw']->template->set_block('admin_list_t','admin_list','list'); $GLOBALS['phpgw']->template->set_block('admin_list_t','group_list','glist'); + $GLOBALS['phpgw']->template->set_block('admin_list_t','group_th','gth'); - $GLOBALS['phpgw']->template->set_var('search_action',$GLOBALS['phpgw']->link('/index.php',$link_data)); $GLOBALS['phpgw']->template->set_var('search_list',$this->nextmatchs->search(array('query' => $this->query))); $link_data['menuaction'] = 'projects.uiconfig.list_admins'; $GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data)); + $GLOBALS['phpgw']->template->set_var('selected_admin',$selected_admin); + $GLOBALS['phpgw']->template->set_var('selected_salesman',$selected_salesman); $admins = $this->boconfig->list_admins($action); @@ -781,12 +789,11 @@ $GLOBALS['phpgw']->template->set_var('lang_group',lang('group')); // -------------------------- end header declaration -------------------------------------- - for ($i=0;$inextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); - $lid = $admins[$i]['lid']; - if ($admins[$i]['type']=='u') + if ($admins[$i]['type']=='user') { $GLOBALS['phpgw']->template->set_var(array ( @@ -796,13 +803,20 @@ )); $GLOBALS['phpgw']->template->fp('list','admin_list',True); } - if ($admins[$i]['type']=='g') + if ($admins[$i]['type']=='group') { + $group_th = True; $GLOBALS['phpgw']->template->set_var('lid',$admins[$i]['lid']); $GLOBALS['phpgw']->template->fp('glist','group_list',True); } } + if($group_th) + { + $GLOBALS['phpgw']->template->fp('gth','group_th',True); + } + + //$GLOBALS['phpgw']->template->set_var('gth',''); $GLOBALS['phpgw']->template->pfp('out','admin_list_t',True); $this->save_sessiondata($action); } @@ -832,14 +846,12 @@ switch($action) { - case 'psale': $header_info = lang('edit salesmen list'); break; - case 'pmanager': $header_info = lang('edit manager list'); break; - default: lang('edit administrator list'); break; + case 'project_salesman': $header_info = lang('edit salesmen list'); break; + default: $header_info = lang('edit administrator list'); break; } $GLOBALS['phpgw_info']['flags']['app_header'] = lang('projects') . ': ' . $header_info; - $GLOBALS['phpgw']->common->phpgw_header(); - echo parse_navbar(); + $GLOBALS['phpgw']->common->phpgw_header(True); $this->set_app_langs(); ==================================================== Index: projects/inc/class.boconfig.inc.php diff -u projects/inc/class.boconfig.inc.php:1.21 projects/inc/class.boconfig.inc.php:1.22 --- projects/inc/class.boconfig.inc.php:1.21 Mon Mar 14 17:39:39 2005 +++ projects/inc/class.boconfig.inc.php Fri Apr 1 23:52:27 2005 @@ -7,7 +7,7 @@ * Project Manager * * Written by Bettina Gille [ceb@phpgroupware.org] * * ----------------------------------------------- * - * Copyright 2000 - 2004 Free Software Foundation, Inc. * + * Copyright 2000 - 2005 Free Software Foundation, Inc. * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License as * @@ -200,7 +200,7 @@ function list_admins($action) { - $admins = $this->boprojects->soconfig->read_admins($action,$type=''); + $admins = $this->boprojects->soconfig->read_admins($action); //_debug_array($admins); @@ -208,7 +208,7 @@ if(is_array($admins)) { - foreach($admins as $ad) + foreach($admins as $key => $ad) { $accounts = CreateObject('phpgwapi.accounts',$ad['account_id']); $accounts->read_repository(); @@ -218,7 +218,7 @@ 'lid' => $accounts->data['account_lid'], 'firstname' => $accounts->data['firstname'], 'lastname' => $accounts->data['lastname'], - 'type' => $accounts->get_type($ad['account_id']) + 'type' => $ad['type'] ); unset($accounts); } From MAILER-DAEMON Mon Apr 04 11:26:48 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DITTT-0002EI-MG for mharc-phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 11:26:47 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DITTQ-0002Cy-Dr for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 11:26:45 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DITHa-0006D2-7j for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 11:14:34 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DIStY-0004QJ-6f for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 10:49:40 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DIAu6-0008N5-8R for phpgroupware-cvs@gnu.org; Sun, 03 Apr 2005 15:37:02 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 2AB3D312C9 for ; Sun, 3 Apr 2005 21:35:18 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 14451-07 for ; Sun, 3 Apr 2005 21:35:13 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 10004312C2 for ; Sun, 3 Apr 2005 21:35:13 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j33JZCT10942; Sun, 3 Apr 2005 21:35:12 +0200 Message-Id: <200504031935.j33JZCT10942@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: Caeies Date: Sun, 3 Apr 2005 20:49:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/inc class.vfs_dav.inc.php, 1.6 class.http_dav_client.inc.php, 1.10 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2005 15:26:46 -0000 Update of phpgwapi/inc Modified Files: Branch: MAIN class.vfs_dav.inc.php lines: +31 -9 class.http_dav_client.inc.php lines: +58 -25 Log Message: Solve caching problems for copy, adding debuging clarity, solve other potential problems, still work in progress ==================================================== Index: phpgwapi/inc/class.vfs_dav.inc.php diff -u phpgwapi/inc/class.vfs_dav.inc.php:1.5 phpgwapi/inc/class.vfs_dav.inc.php:1.6 --- phpgwapi/inc/class.vfs_dav.inc.php:1.5 Sun Feb 20 14:13:16 2005 +++ phpgwapi/inc/class.vfs_dav.inc.php Sun Apr 3 18:49:19 2005 @@ -780,13 +780,14 @@ $token = $this->override_locks[$p->real_full_path]; $status=$this->dav_client->put($this->dav_path($p->real_full_path),$data['content'],$token); $this->debug('Put complete, status: '.$status); - if($status!=201 && $status!=204) + if(intval($status) != 201 && intval($status) != 204) { +$this->debug('The file was not created !'); return False; } else { - +$this->debug('The file was created !'); /* If 'string' doesn't exist, touch () creates both the file and the database entry If 'string' does exist, touch () sets the modification time and modified by @@ -794,7 +795,8 @@ $this->touch (array( 'string' => $p->fake_full_path, 'relatives' => array ($p->mask) - ) + ), + true ); $this->correct_attributes (array( @@ -811,7 +813,7 @@ /* * See vfs_shared */ - function touch ($data) + function touch ($data,$_inwrite=false) { $default_values = array( 'relatives' => array (RELATIVE_CURRENT) @@ -859,6 +861,11 @@ 'operation' => PHPGW_ACL_ADD )) ) return False; + if ( $_inwrite ) + { + _debug_array($data); + die('should be already created ! Please Fill a bug report !!'); + } $result = $this->write (array( 'string' => $data['string'], 'relatives' => array ($data['relatives'][0]), @@ -890,7 +897,8 @@ $data = array_merge ($this->default_values ($data, $default_values), $data); $account_id = $GLOBALS['phpgw_info']['user']['account_id']; - +$this->debug('cp : data :'); +$this->debug($data); $f = $this->path_parts (array( 'string' => $data['from'], 'relatives' => array ($data['relatives'][0]) @@ -910,6 +918,7 @@ )) ) { +$this->debug('cp : from forbidden by ACL !'); return False; } @@ -933,6 +942,7 @@ )) ) { +$this->debug('cp to forbidden by ACL'); return False; } @@ -966,14 +976,18 @@ } else { - $status=$this->dav_client->copy($this->dav_path($f->real_full_path), $t->real_full_path,True, 'Infinity', $this->override_locks[$p->real_full_path]); + $status=$this->dav_client->copy($this->dav_path($f->real_full_path), $t->real_full_path,True, 'Infinity', $this->override_locks[$t->real_full_path]); $result = $status == 204 || $status==201; if (!$result) { +$this->debug('cp : Failed : '.$status); return False; } } - +$this->debug('cp : from'); +if(DEBUG) _debug_array($f); +$this->debug('cp : to'); +if(DEBUG) _debug_array($t); //Copy should copy the app too it's a dead property . $this->set_attributes(array( 'string' => $t->fake_full_path, @@ -984,6 +998,7 @@ ) ) ); +$this->debug('cp : success '.$result); return $result; } @@ -1591,7 +1606,14 @@ } $xmlns = 'xmlns:dc="http://purl.org/dc/elements/1.1/"'; - $this->dav_client->proppatch($this->dav_path($p->real_full_path), $dav_properties, $xmlns, $this->override_locks[$p->real_full_path]); + if ( !$p->outside ) + { + $this->dav_client->proppatch($this->dav_path($p->real_full_path), $dav_properties, $xmlns, $this->override_locks[$p->real_full_path]); + } + else + { + //What are we doing in this case ??? + } return True; } ==================================================== Index: phpgwapi/inc/class.http_dav_client.inc.php diff -u phpgwapi/inc/class.http_dav_client.inc.php:1.9 phpgwapi/inc/class.http_dav_client.inc.php:1.10 --- phpgwapi/inc/class.http_dav_client.inc.php:1.9 Sun Feb 20 16:45:37 2005 +++ phpgwapi/inc/class.http_dav_client.inc.php Sun Apr 3 18:49:19 2005 @@ -423,7 +423,10 @@ $this->http_client->addHeader( 'user-agent', 'Mozilla/5.0 (compatible; PHPGroupware dav_client/1; Linux)'); $this->propfind_restore_session(); if(DEBUG_CACHEPROP) unset($this->cached_propfind); - return $this->http_client->Connect($dav_host,$dav_port,$ssl); + $ret = $this->http_client->Connect($dav_host,$dav_port,$ssl); + $this->server = $this->http_client->url['scheme'] . '://'.$this->dav_host; + $this->server .= (empty($this->dav_port)) ? '' : ':'.$this->dav_port; + return $ret; } function set_debug($debug) @@ -462,19 +465,19 @@ $request_id = $url.'//'.$scope.'//'.$sorted; //A unique id for this request (for caching) if ($this->cached_props[$request_id]) { -if (DEBUG_CACHE) echo'Cache hit : cache id:'.$request_id; +if (DEBUG_CACHE) echo'Get properties: Cache hit : cache id:'.$request_id.'
'; $props = $this->cached_props[$request_id]['data']; return $this->cached_props[$request_id]['status'] != 401; } else if (! $sorted && $this->cached_props[$url.'//'.$scope.'//1']) { -if (DEBUG_CACHE) echo ' Cache hit : cache id: '.$request_id; +if (DEBUG_CACHE) echo 'Get propetries: Cache hit : cache id: '.$request_id.'
'; $props = $this->cached_props[$url.'//'.$scope.'//1']['data']; return $this->cached_props[$request_id]['status'] != 401; } if (DEBUG_CACHE) { - echo ' Cache miss : cache id: '.$request_id; + echo ' get_properties: Cache miss : cache id: '.$request_id. '
'; /* echo " cache:
";
 	print_r($this->cached_props);
 	echo '
';*/ @@ -485,9 +488,11 @@ { $this->cached_props[$request_id]['status'] = $ret; //_debug_array('You are not supposed to see this message'); + //_debug_array('Ret : '.$ret.'
'); //The following condition should never occurs - if($ret == 404 || $ret == 401 || ($ret = $this->propfind($url.SEP,$scope)) != 207) + if($ret == 404 || $ret == 401 || ($ret = $this->propfind($url.'/',$scope)) != 207) { + //_debug_array('Returning empty array :/ for '.$url); $this->cached_props[$request_id]['status'] = $ret; $props = array(); return $ret != 401; @@ -600,8 +605,8 @@ $uri = $this->encodeurl($uri); if (DEBUG_CACHE) echo 'cache cleared'; $this->cached_props = array(); -if (DEBUG_CACHEPROP) echo 'cache propfind ('.$uri.') setted'; - $this->cached_propfind[$uri] = 200; +if (DEBUG_CACHEPROP) echo 'uncached propfind ('.$uri.')'; + unset($this->cached_propfind[$uri]); if (strlen($token)) { $this->http_client->addHeader('If', '<'.$uri.'>'.' (<'.$token.'>)'); @@ -626,14 +631,22 @@ { $srcUri = $this->encodeurl($srcUri); $destUri = $this->encodeurl($destUri); -if (DEBUG_CACHE) echo 'cache cleared'; +if (DEBUG_CACHE) echo 'cp cache cleared'; $this->cached_props = array(); +if ( DEBUG_CACHEPROP) echo 'cp propfind unseted
'; + $this->delete_uri_in_cache($destUri); + if (strlen($token)) { $this->http_client->addHeader('If', '<'.$uri.'>'.' (<'.$token.'>)'); } $result = $this->http_client->Copy( $srcUri, $destUri, $overwrite, $scope); $this->http_client->removeHeader('If'); + if ( $result == 204 ) + { +if ( DEBUG_CACHEPROP) echo 'cp propfind setted
'; + $this->cached_propfind[$destUri] = 207; + } return $result; } @@ -654,10 +667,8 @@ if (DEBUG_CACHE) echo 'cache cleared'; $this->cached_props = array(); if (DEBUG_CACHEPROP) _debug_array('cache prop cleared'); - unset($this->cached_propfind[$srcUri]); - unset($this->cached_propfind[$srcUri.'/']); - unset($this->cached_propfind[$destUri]); - unset($this->cached_propfind[$destUri.'/']); + $this->delete_uri_in_cache($srcUri); + $this->delete_uri_in_cache($destUri); if (strlen($token)) { $this->http_client->addHeader('If', '<'.$uri.'>'.' (<'.$token.'>)'); @@ -681,8 +692,7 @@ if (DEBUG_CACHE) echo 'cache cleared'; $this->cached_props = array(); if (DEBUG_CACHEPROP) _debug_array('cache prop cleared'); - unset($this->cached_propfind[$uri]); - unset($this->cached_propfind[$uri.'/']); + $this->delete_uri_in_cache($uri); if (strlen($token)) { $this->http_client->addHeader('If', '<'.$uri.'>'.' (<'.$token.'>)'); @@ -702,15 +712,19 @@ function mkcol( $uri, $token='' ) { $uri = $this->encodeurl($uri); -if (DEBUG_CACHE) echo 'cache cleared'; +if (DEBUG_CACHE) echo 'mkcol : cache cleared
'; $this->cached_props = array(); -if (DEBUG_CACHEPROP) _debug_array('cache prop set'); - $this->cached_propfind[$uri.'/'] = 200; +if (DEBUG_CACHEPROP) _debug_array('mkcol : cache prop setted
'); + $this->delete_uri_in_cache($uri); if (strlen($token)) { $this->http_client->addHeader('If', '<'.$uri.'>'.' (<'.$token.'>)'); } $ret = $this->http_client->MkCol( $uri ); + if ( $ret == 201 ) + { + $this->cached_propfind[$uri.'/'] = 207; + } $this->http_client->removeHeader('If'); return $ret; } @@ -782,12 +796,17 @@ function proppatch($uri, $attributes, $namespaces='', $token='',$is_dir = False) { $uri = $this->encodeurl($uri); -if (DEBUG_CACHE) echo 'cache cleared'; +if (DEBUG_CACHE) echo 'proppatch: cache cleared
'; + $this->cached_props = array(); + if ( isset($this->cached_propfind[$uri.'/']) ) + { + $is_dir = true; + } if (strlen($token)) { + //XXX if $uri is without an ending / and is a directory ... what to do ??? $this->http_client->addHeader('If', '<'.$uri.'>'.' (<'.$token.'>)'); } - $this->cached_props = array(); //Begin evil nastiness $davxml = ' '; if (DEBUG_DAV_XML) { - echo 'send
'.htmlentities($davxml).'
'; + echo 'proppatch: send
'.htmlentities($davxml).'
'; } $this->http_client->requestBody = $davxml; //Ok if we know that this is a dir add a / if needed if ( $is_dir && !ereg('#./$#',$uri) ) { - if( $this->http_client->sendCommand( 'PROPPATCH '.$uri.'/'.' HTTP/1.1' ) ) + if( $this->http_client->sendCommand( 'PROPPATCH '.$uri.'/ HTTP/1.1' ) ) { $this->http_client->processReply(); } @@ -832,7 +851,7 @@ { //In fact the file is a directory ! $this->http_client->requestBody = $davxml; - if ( $this->http_client->sendCommand( 'PROPPATCH '.$uri.SEP.' HTTP/1.1' ) ) + if ( $this->http_client->sendCommand( 'PROPPATCH '.$uri.'/ HTTP/1.1' ) ) { $this->http_client->processReply(); } @@ -840,7 +859,7 @@ } } if (DEBUG_DAV_XML) { - echo 'Recieve
'.htmlentities($this->http_client->getBody()).'
'; + echo 'proppatch: Recieve
'.htmlentities($this->http_client->getBody()).'
'; } $this->http_client->removeHeader('If'); return $this->http_client->reply; @@ -1106,6 +1125,20 @@ $this->cached_propfind = array(); } } - + + /** + * @function delete_uri_in_cache + * @discusion Internal function for some cache deletion + */ + function delete_uri_in_cache($uri) + { + unset($this->cached_propfind[$uri]); + unset($this->cached_propfind[$uri.'/']); + unset($this->cached_propfind[$this->server.$uri]); + unset($this->cached_propfind[$rhis->server.$uri.'/']); + $suri = substr($uri,strlen($this->server)); + unset($this->cached_propfind[$suri]); + unset($this->cached_propfind[$suri.'/']); + } } From MAILER-DAEMON Mon Apr 04 16:05:44 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DIXpD-0001zj-HW for mharc-phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:31 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DIXoo-0001oi-Nu for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:06 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DIXoj-0001jm-3G for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:01 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DIXoh-0001i0-AN for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:04:59 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DIYE9-0005OC-Th for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:31:18 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 8CF16312B5 for ; Mon, 4 Apr 2005 22:30:57 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 23184-10 for ; Mon, 4 Apr 2005 22:30:54 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 19C5F312B4 for ; Mon, 4 Apr 2005 22:30:54 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j34KUsn06781; Mon, 4 Apr 2005 22:30:54 +0200 Message-Id: <200504042030.j34KUsn06781@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: gugux Date: Mon, 4 Apr 2005 21:55:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] filemanager/setup phpgw_es.lang,1.1.2.1 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2005 20:05:13 -0000 Update of filemanager/setup Added Files: Branch: Version-0_9_16-branch phpgw_es.lang lines: +0 -0 Log Message: Added spanish translation, patch #3878, thanks to anonymous ! ==================================================== Index: phpgw_es.lang %1 already exists as a file filemanager en %1 ya existe como archivo application filemanager en Aplicación back to file manager filemanager en Volver al administrador de archivos cannot create directory because it begins or ends in a space filemanager en No se puede crear la carpeta porque empieza o termina con un espacio cannot replace %1 because it is a directory filemanager en No se puede sustituir %1 porque es una carpeta choose directory --> filemanager en Elija una carpeta --> command sucessfully run filemanager en Comando ejecutado correctamente comment filemanager en Comentario comments cannot contain "%1" filemanager en Los comentarios no pueden contener "%1" copied %1 to %2 filemanager en %1 ha sido copiado a %2 copy to filemanager en Copiar a copy to: filemanager en Copiar a: could not copy %1 to %2 filemanager en No ha sido posible copiar %1 a %2 Could not copy %1 to %2 Quota exceeded filemanager en No se puede copiar %1 a %2 - Límite de espacio excedido could not create %1 filemanager en No se ha podido crear %1 could not create directory %1 filemanager en No se ha podido crear la carpeta %1 could not delete %1 filemanager en No se ha podido borrar %1 could not move %1 to %2 filemanager en %1 no ha podido ser movido a %2 Could not move %1 to %2 Quota exceeded filemanager en No se ha podido mover %1 a %2 - Límite de espacio excedido could not rename %1 to %2 filemanager en No se ha podido renombrar %1 a %2 could not save %1 filemanager en No se ha podido grabar %1 could not upload %1 Quota exceeded filemanager en No se ha podido subir %1 - Límite de espacio excedido create file filemanager en Crear un archivo create folder filemanager en Crear una carpeta created filemanager en Creado created %1 filemanager en %1 ha sido creado created by filemanager en Creado por created directory %1 filemanager en La carpeta %1 ha sido creada date filemanager en Fecha default number of upload fields to show filemanager en Número de campos de subida que se muestran por defecto delete filemanager en Borrar deleted %1 filemanager en %1 ha sido borrado directory filemanager en Carpeta directory %1 already exists filemanager en La carpeta %1 ya existe directory %1 does not exist filemanager en La carpeta %1 no existe directory names cannot contain "%1" filemanager en Los nombres de carpeta no pueden contener "%1" display attributes filemanager en Muestra los atributos download filemanager en Descargar edit filemanager en Editar edit comments filemanager en Editar comentarios edit quota filemanager en Editar límite de espacio Enter comma separated Quota value in MB filemanager en Introduzca el valor del límite de espacio en MB separado por comas erroneous input! check quota value! filemanager en ¡Valor erroneo! Compruebe el valor del límite de espacio error running command filemanager en Ha ocurrido un error al ejecutar el comando execute filemanager en Ejecutar failed to create directory filemanager en No se ha podido crear la carpeta file filemanager en Archivo file %1 already exists. please edit it or delete it first. filemanager en El archivo %1 ya existe. Por favor, edítelo o bórrelo primero. file %1 could not be created. filemanager en El archivo %1 no ha podido ser creado. file name filemanager en Nombre de archivo file names cannot contain "%1" filemanager en Los nombres de archivo no pueden contener "%1" file names cannot contain \ or / filemanager en Los nombres de archivo no pueden contener \ o / filemanager common en Administrador de archivos filemanager preferences filemanager en Preferencias del administrador de archivos files filemanager en Archivos folder filemanager en Carpeta go to filemanager en Ir a go to %1 filemanager en Ir a %1 go to your home directory filemanager en Ir a la carpeta personal go to: filemanager en Ir a: home filemanager en Carpeta personal locked filemanager en Bloqueado menu --> filemanager en Menú --> mime type filemanager en Tipo MIME modified filemanager en Modificado modified by filemanager en Modificado por move to filemanager en Mover a move to: filemanager en Mover a: moved %1 to %2 filemanager en %1 ha sido movido a %2 no version history for this file/directory filemanager en No hay historia de versión para este fichero/carpeta operation filemanager en Operación other settings filemanager en Otras preferencias owner filemanager en Propietario preview %1 filemanager en Previsualizar %1 preview of %1 filemanager en Vista previa de %1 refresh filemanager en Refrescar rename filemanager en Cambiar nombre renamed %1 to %2 filemanager en %1 ha sido renombrado a %2 replaced %1 filemanager en %1 ha sido reemplazado save %1 filemanager en Guardar %1 save all filemanager en Guardar todo saved %1 filemanager en %1 ha sido guardado show filemanager en Mostrar show .. filemanager en Mostrar .. show .files filemanager en Mostrar .archivos show command line (experimental. dangerous) filemanager en Mostrar línea de comandos (EXPERIMENTAL. PELIGROSO) show dotfiles filemanager en Mostrar ficheros dot show help filemanager en Mostrar ayuda size filemanager en Tamaño sort by: filemanager en Ordenar por: total files filemanager en Archivos totales unknown mime-type defaults to text/plain when viewing filemanager en Los tipos MIME desconocidos se muestran por defecto como text/plain unused space filemanager en Espacio libre up filemanager en Arriba update filemanager en Actualizar updated comment for %1 filemanager en El comentario para %1 ha sido actualizado upload fields filemanager en Subir campos upload files filemanager en Subir ficheros used space filemanager en Espacio usado users filemanager en Usuarios version filemanager en Versión view documents in new window filemanager en Mostrar los documentos en una ventana nueva view documents on server (if available) filemanager en Ver los documentos en el servidor (si está disponible) who filemanager en Quien you do not have access to %1 filemanager en No tiene acceso a %1 From MAILER-DAEMON Mon Apr 04 16:05:49 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DIXp7-0001xG-SK for mharc-phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:25 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DIXop-0001p4-3F for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:07 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DIXoj-0001ku-OF for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:02 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DIXoj-0001i0-3V for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:01 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DIYDf-0005MX-FT for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:30:47 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id C9719312B5 for ; Mon, 4 Apr 2005 22:30:26 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 23968-05 for ; Mon, 4 Apr 2005 22:30:24 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 93C99312B4 for ; Mon, 4 Apr 2005 22:30:24 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j34KUO206756; Mon, 4 Apr 2005 22:30:24 +0200 Message-Id: <200504042030.j34KUO206756@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: gugux Date: Mon, 4 Apr 2005 21:45:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] addressbook/inc hook_sidebox_menu.inc.php,1.3 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2005 20:05:12 -0000 Update of addressbook/inc Modified Files: Branch: MAIN hook_sidebox_menu.inc.php lines: +7 -7 Log Message: Added lang calls to side menu, english phrases and french translations (bug #12509). ==================================================== Index: addressbook/inc/hook_sidebox_menu.inc.php diff -u addressbook/inc/hook_sidebox_menu.inc.php:1.2 addressbook/inc/hook_sidebox_menu.inc.php:1.3 --- addressbook/inc/hook_sidebox_menu.inc.php:1.2 Fri Dec 31 04:55:24 2004 +++ addressbook/inc/hook_sidebox_menu.inc.php Mon Apr 4 19:45:55 2005 @@ -2,26 +2,26 @@ $menu_title = $GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. lang('Menu'); $file = Array( - array('text' => 'New Person', + array('text' => lang('New Person'), 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.add_person')), - array('text' => 'New Org', + array('text' => lang('New Org'), 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.add_org')), array('text' => '_NewLine_'), - array('text' => 'Add VCard', + array('text' => lang('Add VCard'), 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uivcard.in')), - array('text' => 'Categorize Persons', + array('text' => lang('Categorize Persons'), 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uicategorize_contacts.index')), - array('text' => 'Import Contacts', + array('text' => lang('Import Contacts'), 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.import')), - array('text' => 'Import CSV', + array('text' => lang('Import CSV'), 'url' => $GLOBALS['phpgw']->link('/addressbook/csv_import.php')), - array('text' => 'Export Contacts', + array('text' => lang('Export Contacts'), 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.export')), array('text' => '_NewLine_') // give a newline From MAILER-DAEMON Mon Apr 04 16:05:54 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DIXpG-00021K-5B for mharc-phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:34 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DIXou-0001sD-2J for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:12 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DIXok-0001lR-8I for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:02 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DIXoj-0001i0-K2 for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:01 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DIYDS-0005Lw-Rm for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:30:35 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 96FCD312B5 for ; Mon, 4 Apr 2005 22:30:11 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 23701-07 for ; Mon, 4 Apr 2005 22:30:09 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 7DC3D312B4 for ; Mon, 4 Apr 2005 22:30:09 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j34KU9C06738; Mon, 4 Apr 2005 22:30:09 +0200 Message-Id: <200504042030.j34KU9C06738@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: gugux Date: Mon, 4 Apr 2005 21:36:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] addressbook/inc hook_sidebox_menu.inc.php, 1.1.2.4 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2005 20:05:20 -0000 Update of addressbook/inc Modified Files: Branch: Version-0_9_16-branch hook_sidebox_menu.inc.php lines: +7 -7 Log Message: Added lang calls in side menu, english phrases and french translations. ==================================================== Index: addressbook/inc/hook_sidebox_menu.inc.php diff -u addressbook/inc/hook_sidebox_menu.inc.php:1.1.2.3 addressbook/inc/hook_sidebox_menu.inc.php:1.1.2.4 --- addressbook/inc/hook_sidebox_menu.inc.php:1.1.2.3 Fri Jan 9 00:09:38 2004 +++ addressbook/inc/hook_sidebox_menu.inc.php Mon Apr 4 19:36:07 2005 @@ -2,26 +2,26 @@ $menu_title = $GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. lang('Menu'); $file = Array( - array('text' => 'New Person', + array('text' => lang('New Person'), 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.add_person')), - array('text' => 'New Org', + array('text' => lang('New Org'), 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.add_org')), array('text' => '_NewLine_'), - array('text' => 'Add VCard', + array('text' => lang('Add VCard'), 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uivcard.in')), - array('text' => 'Categorize Persons', + array('text' => lang('Categorize Persons'), 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uicategorize_contacts.index')), - array('text' => 'Import Contacts', + array('text' => lang('Import Contacts'), 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.import')), - array('text' => 'Import CSV', + array('text' => lang('Import CSV'), 'url' => $GLOBALS['phpgw']->link('/addressbook/csv_import.php')), - array('text' => 'Export Contacts', + array('text' => lang('Export Contacts'), 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.export')), array('text' => '_NewLine_') // give a newline From MAILER-DAEMON Mon Apr 04 16:05:56 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DIXp3-0001wK-PE for mharc-phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:25 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DIXoo-0001p0-Vk for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:07 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DIXoi-0001jR-2X for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:00 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DIXog-0001i0-St for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:04:58 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DIYEH-0005Ok-Fp for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:31:25 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 32115312B5 for ; Mon, 4 Apr 2005 22:31:05 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 23339-10 for ; Mon, 4 Apr 2005 22:31:03 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id EAFB6312B4 for ; Mon, 4 Apr 2005 22:31:02 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j34KV3j06797; Mon, 4 Apr 2005 22:31:03 +0200 Message-Id: <200504042031.j34KV3j06797@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: gugux Date: Mon, 4 Apr 2005 22:24:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] addressbook/inc hook_sidebox_menu.inc.php,1.4 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2005 20:05:12 -0000 Update of addressbook/inc Modified Files: Branch: MAIN hook_sidebox_menu.inc.php lines: +8 -8 Log Message: Ok, my bad, no need for lang calls, only need for phrases in lang files. ==================================================== Index: addressbook/inc/hook_sidebox_menu.inc.php diff -u addressbook/inc/hook_sidebox_menu.inc.php:1.3 addressbook/inc/hook_sidebox_menu.inc.php:1.4 --- addressbook/inc/hook_sidebox_menu.inc.php:1.3 Mon Apr 4 19:45:55 2005 +++ addressbook/inc/hook_sidebox_menu.inc.php Mon Apr 4 20:24:44 2005 @@ -2,26 +2,26 @@ $menu_title = $GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. lang('Menu'); $file = Array( - array('text' => lang('New Person'), + array('text' => 'New Person', 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.add_person')), - array('text' => lang('New Org'), + array('text' => 'New Org', 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.add_org')), array('text' => '_NewLine_'), - array('text' => lang('Add VCard'), + array('text' => 'Add VCard', 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uivcard.in')), - array('text' => lang('Categorize Persons'), - 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uicategorize_contacts.index')), - array('text' => lang('Import Contacts'), + array('text' => 'Categorize Persons', + 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uicategorize_contacts.index')), + array('text' => 'Import Contacts', 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.import')), - array('text' => lang('Import CSV'), + array('text' => 'Import CSV', 'url' => $GLOBALS['phpgw']->link('/addressbook/csv_import.php')), - array('text' => lang('Export Contacts'), + array('text' => 'Export Contacts', 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.export')), array('text' => '_NewLine_') // give a newline From MAILER-DAEMON Mon Apr 04 16:05:59 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DIXpE-00020p-L2 for mharc-phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:33 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DIXoo-0001o8-96 for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:06 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DIXoh-0001jz-Mz for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:00 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DIXoh-0001i0-Ia for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:04:59 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DIYE5-0005Nu-Nx for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:31:14 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 81B68312B5 for ; Mon, 4 Apr 2005 22:30:53 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 23701-08 for ; Mon, 4 Apr 2005 22:30:50 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 1E287312B4 for ; Mon, 4 Apr 2005 22:30:50 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j34KUoJ06774; Mon, 4 Apr 2005 22:30:50 +0200 Message-Id: <200504042030.j34KUoJ06774@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: gugux Date: Mon, 4 Apr 2005 21:53:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] filemanager/setup phpgw_es.lang,1.1 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2005 20:05:13 -0000 Update of filemanager/setup Added Files: Branch: MAIN phpgw_es.lang Log Message: branches: 1.1.2; Added spanish translation, patch #3878, thanks to anonymous ! ==================================================== Index: phpgw_es.lang %1 already exists as a file filemanager en %1 ya existe como archivo application filemanager en Aplicación back to file manager filemanager en Volver al administrador de archivos cannot create directory because it begins or ends in a space filemanager en No se puede crear la carpeta porque empieza o termina con un espacio cannot replace %1 because it is a directory filemanager en No se puede sustituir %1 porque es una carpeta choose directory --> filemanager en Elija una carpeta --> command sucessfully run filemanager en Comando ejecutado correctamente comment filemanager en Comentario comments cannot contain "%1" filemanager en Los comentarios no pueden contener "%1" copied %1 to %2 filemanager en %1 ha sido copiado a %2 copy to filemanager en Copiar a copy to: filemanager en Copiar a: could not copy %1 to %2 filemanager en No ha sido posible copiar %1 a %2 Could not copy %1 to %2 Quota exceeded filemanager en No se puede copiar %1 a %2 - Límite de espacio excedido could not create %1 filemanager en No se ha podido crear %1 could not create directory %1 filemanager en No se ha podido crear la carpeta %1 could not delete %1 filemanager en No se ha podido borrar %1 could not move %1 to %2 filemanager en %1 no ha podido ser movido a %2 Could not move %1 to %2 Quota exceeded filemanager en No se ha podido mover %1 a %2 - Límite de espacio excedido could not rename %1 to %2 filemanager en No se ha podido renombrar %1 a %2 could not save %1 filemanager en No se ha podido grabar %1 could not upload %1 Quota exceeded filemanager en No se ha podido subir %1 - Límite de espacio excedido create file filemanager en Crear un archivo create folder filemanager en Crear una carpeta created filemanager en Creado created %1 filemanager en %1 ha sido creado created by filemanager en Creado por created directory %1 filemanager en La carpeta %1 ha sido creada date filemanager en Fecha default number of upload fields to show filemanager en Número de campos de subida que se muestran por defecto delete filemanager en Borrar deleted %1 filemanager en %1 ha sido borrado directory filemanager en Carpeta directory %1 already exists filemanager en La carpeta %1 ya existe directory %1 does not exist filemanager en La carpeta %1 no existe directory names cannot contain "%1" filemanager en Los nombres de carpeta no pueden contener "%1" display attributes filemanager en Muestra los atributos download filemanager en Descargar edit filemanager en Editar edit comments filemanager en Editar comentarios edit quota filemanager en Editar límite de espacio Enter comma separated Quota value in MB filemanager en Introduzca el valor del límite de espacio en MB separado por comas erroneous input! check quota value! filemanager en ¡Valor erroneo! Compruebe el valor del límite de espacio error running command filemanager en Ha ocurrido un error al ejecutar el comando execute filemanager en Ejecutar failed to create directory filemanager en No se ha podido crear la carpeta file filemanager en Archivo file %1 already exists. please edit it or delete it first. filemanager en El archivo %1 ya existe. Por favor, edítelo o bórrelo primero. file %1 could not be created. filemanager en El archivo %1 no ha podido ser creado. file name filemanager en Nombre de archivo file names cannot contain "%1" filemanager en Los nombres de archivo no pueden contener "%1" file names cannot contain \ or / filemanager en Los nombres de archivo no pueden contener \ o / filemanager common en Administrador de archivos filemanager preferences filemanager en Preferencias del administrador de archivos files filemanager en Archivos folder filemanager en Carpeta go to filemanager en Ir a go to %1 filemanager en Ir a %1 go to your home directory filemanager en Ir a la carpeta personal go to: filemanager en Ir a: home filemanager en Carpeta personal locked filemanager en Bloqueado menu --> filemanager en Menú --> mime type filemanager en Tipo MIME modified filemanager en Modificado modified by filemanager en Modificado por move to filemanager en Mover a move to: filemanager en Mover a: moved %1 to %2 filemanager en %1 ha sido movido a %2 no version history for this file/directory filemanager en No hay historia de versión para este fichero/carpeta operation filemanager en Operación other settings filemanager en Otras preferencias owner filemanager en Propietario preview %1 filemanager en Previsualizar %1 preview of %1 filemanager en Vista previa de %1 refresh filemanager en Refrescar rename filemanager en Cambiar nombre renamed %1 to %2 filemanager en %1 ha sido renombrado a %2 replaced %1 filemanager en %1 ha sido reemplazado save %1 filemanager en Guardar %1 save all filemanager en Guardar todo saved %1 filemanager en %1 ha sido guardado show filemanager en Mostrar show .. filemanager en Mostrar .. show .files filemanager en Mostrar .archivos show command line (experimental. dangerous) filemanager en Mostrar línea de comandos (EXPERIMENTAL. PELIGROSO) show dotfiles filemanager en Mostrar ficheros dot show help filemanager en Mostrar ayuda size filemanager en Tamaño sort by: filemanager en Ordenar por: total files filemanager en Archivos totales unknown mime-type defaults to text/plain when viewing filemanager en Los tipos MIME desconocidos se muestran por defecto como text/plain unused space filemanager en Espacio libre up filemanager en Arriba update filemanager en Actualizar updated comment for %1 filemanager en El comentario para %1 ha sido actualizado upload fields filemanager en Subir campos upload files filemanager en Subir ficheros used space filemanager en Espacio usado users filemanager en Usuarios version filemanager en Versión view documents in new window filemanager en Mostrar los documentos en una ventana nueva view documents on server (if available) filemanager en Ver los documentos en el servidor (si está disponible) who filemanager en Quien you do not have access to %1 filemanager en No tiene acceso a %1 From MAILER-DAEMON Mon Apr 04 16:06:10 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DIXp1-0001vf-SB for mharc-phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:21 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DIXoo-0001ol-P9 for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:06 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DIXoj-0001ke-47 for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:01 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DIXoi-0001i0-I0 for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:00 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DIYE0-0005Nj-Hh for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:31:08 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 48CB1312B5 for ; Mon, 4 Apr 2005 22:30:48 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 23339-09 for ; Mon, 4 Apr 2005 22:30:45 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id C1802312B4 for ; Mon, 4 Apr 2005 22:30:45 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j34KUkj06767; Mon, 4 Apr 2005 22:30:46 +0200 Message-Id: <200504042030.j34KUkj06767@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: gugux Date: Mon, 4 Apr 2005 21:45:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] addressbook/setup phpgw_fr.lang, 1.12 phpgw_en.lang, 1.27 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2005 20:05:12 -0000 Update of addressbook/setup Modified Files: Branch: MAIN phpgw_fr.lang lines: +5 -0 phpgw_en.lang lines: +5 -0 Log Message: Added lang calls to side menu, english phrases and french translations (bug #12509). ==================================================== Index: addressbook/setup/phpgw_fr.lang diff -u addressbook/setup/phpgw_fr.lang:1.11 addressbook/setup/phpgw_fr.lang:1.12 --- addressbook/setup/phpgw_fr.lang:1.11 Fri Dec 31 04:55:24 2004 +++ addressbook/setup/phpgw_fr.lang Mon Apr 4 19:45:55 2005 @@ -9,6 +9,7 @@ add a single entry by passing the fields. addressbook fr Ajouter une seule entrée en passant les champs. add custom field addressbook fr Ajouter champ personnalisé add new addressbook fr Ajouter un nouveau +add vcard addressbook fr Ajouter une VCard address addressbook fr Adresse address book common fr Carnet d'adresses address book - vcard in addressbook fr Carnet d'adresses - Entrée VCard @@ -44,6 +45,7 @@ business zip code addressbook fr Code postal (bureau) car phone addressbook fr Téléphone voiture categorize addressbook fr Catégoriser +categorize persons addressbook fr Catégoriser les personnes cell phone addressbook fr Téléphone portable city common fr Ville communication data for addressbook fr Données de communication pour @@ -101,6 +103,7 @@ home zip code addressbook fr Code postal (domicile) import addressbook fr Importer import contacts addressbook fr Importer les contacts +import csv addressbook fr Importer un fichier CSV import csv-file into addressbook addressbook fr Importer le fichier CSV dans le carnet d'adresses import file addressbook fr Importer le fichier import from ldif, csv, or vcard addressbook fr Importer depuis LDIF, CSV ou VCard @@ -120,6 +123,8 @@ mobile phone addressbook fr Téléphone portable modem phone addressbook fr Téléphone modem more data addressbook fr Plus de données +new org addressbook fr Nouvelle Organisation +new person addressbook fr Nouvelle Personne no vcard addressbook fr Pas de VCard number of records to read (<=200) addressbook fr Nombre d'enregistrements à lire (<=200) org data addressbook fr Données Org. ==================================================== Index: addressbook/setup/phpgw_en.lang diff -u addressbook/setup/phpgw_en.lang:1.26 addressbook/setup/phpgw_en.lang:1.27 --- addressbook/setup/phpgw_en.lang:1.26 Fri Dec 31 04:55:24 2004 +++ addressbook/setup/phpgw_en.lang Mon Apr 4 19:45:55 2005 @@ -9,6 +9,7 @@ add a single entry by passing the fields. addressbook en Add a single entry by passing the fields. add custom field addressbook en Add Custom Field add new addressbook en Add new +add vcard addressbook en Add VCard address addressbook en Address address book common en Address Book address book - vcard in addressbook en Address book - VCard in @@ -44,6 +45,7 @@ business zip code addressbook en Business Postal Code car phone addressbook en Car Phone categorize addressbook en Categorize +categorize persons addressbook en Categorize Persons cell phone addressbook en cell phone city common en City communication data for addressbook en Communication Data for @@ -101,6 +103,7 @@ home zip code addressbook en Home ZIP Code import addressbook en Import import contacts addressbook en Import Contacts +import csv addressbook en Import CSV import csv-file into addressbook addressbook en Import CSV-File into Addressbook import file addressbook en Import File import from ldif, csv, or vcard addressbook en Import from LDIF, CSV, or VCard @@ -120,6 +123,8 @@ mobile phone addressbook en Mobile Phone modem phone addressbook en Modem Phone more data addressbook en More data +new org addressbook en New Org +new person addressbook en New Person no vcard addressbook en No VCard number of records to read (<=200) addressbook en Number of records to read (<=200) org data addressbook en Org Data From MAILER-DAEMON Mon Apr 04 16:06:11 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DIXpq-0002KQ-I7 for mharc-phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:06:10 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DIXp1-0001vd-QF for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:21 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DIXol-0001l9-7o for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:15 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DIXoj-0001i0-Fq for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:01 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DIYDY-0005MP-Sp for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:30:41 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id A92CA312B5 for ; Mon, 4 Apr 2005 22:30:20 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 23184-09 for ; Mon, 4 Apr 2005 22:30:18 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 53B25312B4 for ; Mon, 4 Apr 2005 22:30:18 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j34KUIL06749; Mon, 4 Apr 2005 22:30:18 +0200 Message-Id: <200504042030.j34KUIL06749@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: gugux Date: Mon, 4 Apr 2005 21:36:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] addressbook/setup phpgw_fr.lang, 1.4.2.9.2.11 phpgw_en.lang, 1.14.2.9.2.11 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2005 20:06:08 -0000 Update of addressbook/setup Modified Files: Branch: Version-0_9_16-branch phpgw_fr.lang lines: +5 -0 phpgw_en.lang lines: +5 -0 Log Message: Added lang calls in side menu, english phrases and french translations. ==================================================== Index: addressbook/setup/phpgw_fr.lang diff -u addressbook/setup/phpgw_fr.lang:1.4.2.9.2.10 addressbook/setup/phpgw_fr.lang:1.4.2.9.2.11 --- addressbook/setup/phpgw_fr.lang:1.4.2.9.2.10 Thu Oct 7 17:36:36 2004 +++ addressbook/setup/phpgw_fr.lang Mon Apr 4 19:36:07 2005 @@ -9,6 +9,7 @@ add a single entry by passing the fields. addressbook fr Ajouter une seule entrée en passant les champs. add custom field addressbook fr Ajouter champ personnalisé add new addressbook fr Ajouter un nouveau +add vcard addressbook fr Ajouter une VCard address addressbook fr Adresse address book common fr Carnet d'adresses address book - vcard in addressbook fr Carnet d'adresses - Entrée VCard @@ -44,6 +45,7 @@ business zip code addressbook fr Code postal (bureau) car phone addressbook fr Téléphone voiture categorize addressbook fr Catégoriser +categorize persons addressbook fr Catégoriser les personnes cell phone addressbook fr Téléphone portable city common fr Ville communication data for addressbook fr Données de communication pour @@ -101,6 +103,7 @@ home zip code addressbook fr Code postal (domicile) import addressbook fr Importer import contacts addressbook fr Importer les contacts +import csv addressbook fr Importer un fichier CSV import csv-file into addressbook addressbook fr Importer le fichier CSV dans le carnet d'adresses import file addressbook fr Importer le fichier import from ldif, csv, or vcard addressbook fr Importer depuis LDIF, CSV ou VCard @@ -120,6 +123,8 @@ mobile phone addressbook fr Téléphone portable modem phone addressbook fr Téléphone modem more data addressbook fr Plus de données +new org addressbook fr Nouvelle Organisation +new person addressbook fr Nouvelle Personne no vcard addressbook fr Pas de VCard number of records to read (<=200) addressbook fr Nombre d'enregistrements à lire (<=200) org data addressbook fr Données Org. ==================================================== Index: addressbook/setup/phpgw_en.lang diff -u addressbook/setup/phpgw_en.lang:1.14.2.9.2.10 addressbook/setup/phpgw_en.lang:1.14.2.9.2.11 --- addressbook/setup/phpgw_en.lang:1.14.2.9.2.10 Thu Oct 7 17:36:36 2004 +++ addressbook/setup/phpgw_en.lang Mon Apr 4 19:36:07 2005 @@ -9,6 +9,7 @@ add a single entry by passing the fields. addressbook en Add a single entry by passing the fields. add custom field addressbook en Add Custom Field add new addressbook en Add new +add vcard addressbook en Add VCard address addressbook en Address address book common en Address Book address book - vcard in addressbook en Address book - VCard in @@ -44,6 +45,7 @@ business zip code addressbook en Business Postal Code car phone addressbook en Car Phone categorize addressbook en Categorize +categorize persons addressbook en Categorize Persons cell phone addressbook en cell phone city common en City communication data for addressbook en Communication Data for @@ -101,6 +103,7 @@ home zip code addressbook en Home ZIP Code import addressbook en Import import contacts addressbook en Import Contacts +import csv addressbook en Import CSV import csv-file into addressbook addressbook en Import CSV-File into Addressbook import file addressbook en Import File import from ldif, csv, or vcard addressbook en Import from LDIF, CSV, or VCard @@ -120,6 +123,8 @@ mobile phone addressbook en Mobile Phone modem phone addressbook en Modem Phone more data addressbook en More data +new org addressbook en New Org +new person addressbook en New Person no vcard addressbook en No VCard number of records to read (<=200) addressbook en Number of records to read (<=200) org data addressbook en Org Data From MAILER-DAEMON Mon Apr 04 16:06:30 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DIXpF-000219-CH for mharc-phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:33 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DIXou-0001sC-1z for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:12 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DIXoi-0001ja-1g for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:05:00 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DIXoh-0001i0-5U for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:04:59 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DIYED-0005OK-An for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 16:31:21 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 0F669312B5 for ; Mon, 4 Apr 2005 22:31:01 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 23968-06 for ; Mon, 4 Apr 2005 22:30:58 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id A2727312B4 for ; Mon, 4 Apr 2005 22:30:58 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j34KUw206788; Mon, 4 Apr 2005 22:30:58 +0200 Message-Id: <200504042030.j34KUw206788@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: gugux Date: Mon, 4 Apr 2005 22:23:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] addressbook/inc hook_sidebox_menu.inc.php, 1.1.2.5 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2005 20:05:20 -0000 Update of addressbook/inc Modified Files: Branch: Version-0_9_16-branch hook_sidebox_menu.inc.php lines: +8 -8 Log Message: Ok, my bad, no need for lang calls, only need for phrases in lang files. ==================================================== Index: addressbook/inc/hook_sidebox_menu.inc.php diff -u addressbook/inc/hook_sidebox_menu.inc.php:1.1.2.4 addressbook/inc/hook_sidebox_menu.inc.php:1.1.2.5 --- addressbook/inc/hook_sidebox_menu.inc.php:1.1.2.4 Mon Apr 4 19:36:07 2005 +++ addressbook/inc/hook_sidebox_menu.inc.php Mon Apr 4 20:23:44 2005 @@ -2,26 +2,26 @@ $menu_title = $GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. lang('Menu'); $file = Array( - array('text' => lang('New Person'), + array('text' => 'New Person', 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.add_person')), - array('text' => lang('New Org'), + array('text' => 'New Org', 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.add_org')), array('text' => '_NewLine_'), - array('text' => lang('Add VCard'), + array('text' => 'Add VCard', 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uivcard.in')), - array('text' => lang('Categorize Persons'), - 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uicategorize_contacts.index')), - array('text' => lang('Import Contacts'), + array('text' => 'Categorize Persons', + 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uicategorize_contacts.index')), + array('text' => 'Import Contacts', 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.import')), - array('text' => lang('Import CSV'), + array('text' => 'Import CSV', 'url' => $GLOBALS['phpgw']->link('/addressbook/csv_import.php')), - array('text' => lang('Export Contacts'), + array('text' => 'Export Contacts', 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.export')), array('text' => '_NewLine_') // give a newline From MAILER-DAEMON Mon Apr 04 17:06:21 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DIYm4-0002TH-RC for mharc-phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 17:06:21 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DIYlx-0002QH-54 for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 17:06:13 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DIYlq-0002MM-8c for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 17:06:07 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DIYlp-0002L5-6e for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 17:06:05 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DIZ9Z-00027T-0m for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 17:30:37 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 3B1A7312D3 for ; Mon, 4 Apr 2005 23:30:16 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 26566-05 for ; Mon, 4 Apr 2005 23:30:14 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id A99CA312BC for ; Mon, 4 Apr 2005 23:30:13 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j34LUDL07126; Mon, 4 Apr 2005 23:30:13 +0200 Message-Id: <200504042130.j34LUDL07126@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: gugux Date: Mon, 4 Apr 2005 22:26:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] filemanager/inc hook_preferences.inc.php, 1.6.2.1.2.2 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2005 21:06:16 -0000 Update of filemanager/inc Modified Files: Branch: Version-0_9_16-branch hook_preferences.inc.php lines: +2 -2 Log Message: Removed unneeded lang call (bug #12556) ==================================================== Index: filemanager/inc/hook_preferences.inc.php diff -u filemanager/inc/hook_preferences.inc.php:1.6.2.1.2.1 filemanager/inc/hook_preferences.inc.php:1.6.2.1.2.2 --- filemanager/inc/hook_preferences.inc.php:1.6.2.1.2.1 Fri Apr 18 19:45:23 2003 +++ filemanager/inc/hook_preferences.inc.php Mon Apr 4 20:26:39 2005 @@ -15,7 +15,7 @@ // Only Modify the $file and $title variables..... $title = $appname; $file = Array( - lang('Preferences') => $GLOBALS['phpgw']->link('/filemanager/preferences.php') + 'Preferences' => $GLOBALS['phpgw']->link('/filemanager/preferences.php') ); //Do not modify below this line display_section($appname,$title,$file); From MAILER-DAEMON Mon Apr 04 17:06:22 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DIYm5-0002TZ-E3 for mharc-phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 17:06:21 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DIYlz-0002RH-45 for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 17:06:15 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DIYlp-0002M6-Ex for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 17:06:06 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DIYlo-0002L5-Tj for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 17:06:04 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DIZ9q-00027s-7C for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 17:30:54 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 701C3312D3 for ; Mon, 4 Apr 2005 23:30:33 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 26000-10 for ; Mon, 4 Apr 2005 23:30:30 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 92E87312BC for ; Mon, 4 Apr 2005 23:30:30 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j34LUUE07148; Mon, 4 Apr 2005 23:30:30 +0200 Message-Id: <200504042130.j34LUUE07148@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: gugux Date: Mon, 4 Apr 2005 23:17:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] addressbook/setup phpgw_fr.lang, 1.13 phpgw_en.lang, 1.28 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2005 21:06:17 -0000 Update of addressbook/setup Modified Files: Branch: MAIN phpgw_fr.lang lines: +5 -0 phpgw_en.lang lines: +5 -0 Log Message: Added more missing lang phrases. ==================================================== Index: addressbook/setup/phpgw_fr.lang diff -u addressbook/setup/phpgw_fr.lang:1.12 addressbook/setup/phpgw_fr.lang:1.13 --- addressbook/setup/phpgw_fr.lang:1.12 Mon Apr 4 19:45:55 2005 +++ addressbook/setup/phpgw_fr.lang Mon Apr 4 21:17:33 2005 @@ -108,6 +108,7 @@ import file addressbook fr Importer le fichier import from ldif, csv, or vcard addressbook fr Importer depuis LDIF, CSV ou VCard import from outlook addressbook fr Importer depuis Outlook +initials addressbook fr Initiales international addressbook fr International isdn phone addressbook fr Téléphone RNIS label addressbook fr Label @@ -145,6 +146,7 @@ phone numbers common fr Numéros de téléphone please enter a name for that field ! addressbook fr SVP entrez un nom pour ce champ ! postal common fr Postal +postal code addressbook fr Code Postal pref addressbook fr pref preferred addressbook fr Préféré prefix addressbook fr Préfixe @@ -163,6 +165,8 @@ startrecord addressbook fr Enregistrement de départ state common fr Région street common fr Rue +street first common fr Rue 1er +street second common fr Rue 2me suffix addressbook fr Suffixe test import (show importable records only in browser) addressbook fr Tester l'import (montrer seulement les enregistrements importables dans le navigateur) that field name has been used already ! addressbook fr Ce nom de champ a déjà été utilisé ! @@ -180,6 +184,7 @@ video phone addressbook fr Téléphone vidéo voice phone addressbook fr Téléphone vocal warning!! ldap is valid only if you are not using contacts for accounts storage! admin fr Attention!! LDAP est valide seulement si vous n'utilisez pas les contacts pour le stockage des comptes! +website addressbook fr Site Web work phone addressbook fr Téléphone (bureau) you must select a vcard. (*.vcf) addressbook fr Vous devez choisir une vcard. (*.vcf) you must select at least 1 column to display addressbook fr Vous devez choisir au moins 1 colonne à afficher ==================================================== Index: addressbook/setup/phpgw_en.lang diff -u addressbook/setup/phpgw_en.lang:1.27 addressbook/setup/phpgw_en.lang:1.28 --- addressbook/setup/phpgw_en.lang:1.27 Mon Apr 4 19:45:55 2005 +++ addressbook/setup/phpgw_en.lang Mon Apr 4 21:17:33 2005 @@ -108,6 +108,7 @@ import file addressbook en Import File import from ldif, csv, or vcard addressbook en Import from LDIF, CSV, or VCard import from outlook addressbook en Import from Outlook +initials addressbook en Initials international addressbook en International isdn phone addressbook en ISDN Phone label addressbook en Label @@ -145,6 +146,7 @@ phone numbers common en Phone Numbers please enter a name for that field ! addressbook en Please enter a name for that field ! postal common en Postal +postal code addressbook en Postal Code pref addressbook en pref preferred addressbook en Preferred prefix addressbook en Prefix @@ -163,6 +165,8 @@ startrecord addressbook en Startrecord state common en State street common en Street +street first common en Street +street second common en Street suffix addressbook en Suffix test import (show importable records only in browser) addressbook en Test Import (show importable records only in browser) that field name has been used already ! addressbook en That field name has been used already ! @@ -180,6 +184,7 @@ video phone addressbook en Video Phone voice phone addressbook en Voice Phone warning!! ldap is valid only if you are not using contacts for accounts storage! admin en WARNING!! LDAP is valid only if you are NOT using contacts for accounts storage! +website addressbook en Website work phone addressbook en Work Phone you must select a vcard. (*.vcf) addressbook en You must select a vcard. (*.vcf) you must select at least 1 column to display addressbook en You must select at least 1 column to display From MAILER-DAEMON Mon Apr 04 17:06:24 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DIYm7-0002UP-R3 for mharc-phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 17:06:24 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DIYlz-0002RN-Ju for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 17:06:17 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DIYlp-0002MC-FZ for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 17:06:06 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DIYlp-0002L5-0z for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 17:06:05 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DIZ9h-00027h-2f for phpgroupware-cvs@gnu.org; Mon, 04 Apr 2005 17:30:45 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 568F1312D3 for ; Mon, 4 Apr 2005 23:30:24 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 26157-08 for ; Mon, 4 Apr 2005 23:30:22 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 17261312BC for ; Mon, 4 Apr 2005 23:30:22 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j34LUM207137; Mon, 4 Apr 2005 23:30:22 +0200 Message-Id: <200504042130.j34LUM207137@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: gugux Date: Mon, 4 Apr 2005 23:16:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] addressbook/setup phpgw_fr.lang, 1.4.2.9.2.12 phpgw_en.lang, 1.14.2.9.2.12 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2005 21:06:19 -0000 Update of addressbook/setup Modified Files: Branch: Version-0_9_16-branch phpgw_fr.lang lines: +5 -0 phpgw_en.lang lines: +5 -0 Log Message: Added more missing lang phrases. ==================================================== Index: addressbook/setup/phpgw_fr.lang diff -u addressbook/setup/phpgw_fr.lang:1.4.2.9.2.11 addressbook/setup/phpgw_fr.lang:1.4.2.9.2.12 --- addressbook/setup/phpgw_fr.lang:1.4.2.9.2.11 Mon Apr 4 19:36:07 2005 +++ addressbook/setup/phpgw_fr.lang Mon Apr 4 21:16:11 2005 @@ -108,6 +108,7 @@ import file addressbook fr Importer le fichier import from ldif, csv, or vcard addressbook fr Importer depuis LDIF, CSV ou VCard import from outlook addressbook fr Importer depuis Outlook +initials addressbook fr Initiales international addressbook fr International isdn phone addressbook fr Téléphone RNIS label addressbook fr Label @@ -145,6 +146,7 @@ phone numbers common fr Numéros de téléphone please enter a name for that field ! addressbook fr SVP entrez un nom pour ce champ ! postal common fr Postal +postal code addressbook fr Code Postal pref addressbook fr pref preferred addressbook fr Préféré prefix addressbook fr Préfixe @@ -163,6 +165,8 @@ startrecord addressbook fr Enregistrement de départ state common fr Région street common fr Rue +street first common fr Rue 1er +street second common fr Rue 2me suffix addressbook fr Suffixe test import (show importable records only in browser) addressbook fr Tester l'import (montrer seulement les enregistrements importables dans le navigateur) that field name has been used already ! addressbook fr Ce nom de champ a déjà été utilisé ! @@ -180,6 +184,7 @@ video phone addressbook fr Téléphone vidéo voice phone addressbook fr Téléphone vocal warning!! ldap is valid only if you are not using contacts for accounts storage! admin fr Attention!! LDAP est valide seulement si vous n'utilisez pas les contacts pour le stockage des comptes! +website addressbook fr Site Web work phone addressbook fr Téléphone (bureau) you must select a vcard. (*.vcf) addressbook fr Vous devez choisir une vcard. (*.vcf) you must select at least 1 column to display addressbook fr Vous devez choisir au moins 1 colonne à afficher ==================================================== Index: addressbook/setup/phpgw_en.lang diff -u addressbook/setup/phpgw_en.lang:1.14.2.9.2.11 addressbook/setup/phpgw_en.lang:1.14.2.9.2.12 --- addressbook/setup/phpgw_en.lang:1.14.2.9.2.11 Mon Apr 4 19:36:07 2005 +++ addressbook/setup/phpgw_en.lang Mon Apr 4 21:16:11 2005 @@ -108,6 +108,7 @@ import file addressbook en Import File import from ldif, csv, or vcard addressbook en Import from LDIF, CSV, or VCard import from outlook addressbook en Import from Outlook +initials addressbook en Initials international addressbook en International isdn phone addressbook en ISDN Phone label addressbook en Label @@ -145,6 +146,7 @@ phone numbers common en Phone Numbers please enter a name for that field ! addressbook en Please enter a name for that field ! postal common en Postal +postal code addressbook en Postal Code pref addressbook en pref preferred addressbook en Preferred prefix addressbook en Prefix @@ -163,6 +165,8 @@ startrecord addressbook en Startrecord state common en State street common en Street +street first common en Street +street second common en Street suffix addressbook en Suffix test import (show importable records only in browser) addressbook en Test Import (show importable records only in browser) that field name has been used already ! addressbook en That field name has been used already ! @@ -180,6 +184,7 @@ video phone addressbook en Video Phone voice phone addressbook en Voice Phone warning!! ldap is valid only if you are not using contacts for accounts storage! admin en WARNING!! LDAP is valid only if you are NOT using contacts for accounts storage! +website addressbook en Website work phone addressbook en Work Phone you must select a vcard. (*.vcf) addressbook en You must select a vcard. (*.vcf) you must select at least 1 column to display addressbook en You must select at least 1 column to display From MAILER-DAEMON Tue Apr 05 06:08:00 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DIkyV-0000Ms-Jp for mharc-phpgroupware-cvs@gnu.org; Tue, 05 Apr 2005 06:07:59 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DIkyT-0000Mg-JZ for phpgroupware-cvs@gnu.org; Tue, 05 Apr 2005 06:07:57 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DIkyR-0000Ly-8g for phpgroupware-cvs@gnu.org; Tue, 05 Apr 2005 06:07:56 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DIkyQ-0000LX-5c for phpgroupware-cvs@gnu.org; Tue, 05 Apr 2005 06:07:54 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DIlPP-0002cw-2f for phpgroupware-cvs@gnu.org; Tue, 05 Apr 2005 06:35:47 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id D0F18312FC for ; Tue, 5 Apr 2005 12:35:16 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 00078-02 for ; Tue, 5 Apr 2005 12:35:13 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id C7068312EA for ; Tue, 5 Apr 2005 12:35:10 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j35AZAs21512; Tue, 5 Apr 2005 12:35:10 +0200 Message-Id: <200504051035.j35AZAs21512@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: fipsfuchs Date: Tue, 5 Apr 2005 12:03:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/doc/ldap phpgroupware.schema,1.1.2.3 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Apr 2005 10:07:58 -0000 Update of phpgwapi/doc/ldap Modified Files: Branch: Version-0_9_16-branch phpgroupware.schema lines: +2 -6 Log Message: switched to ascii mode ==================================================== Index: phpgwapi/doc/ldap/phpgroupware.schema diff -u phpgwapi/doc/ldap/phpgroupware.schema:1.1.2.2 phpgwapi/doc/ldap/phpgroupware.schema:1.1.2.3 --- phpgwapi/doc/ldap/phpgroupware.schema:1.1.2.2 Tue Jan 27 22:42:30 2004 +++ phpgwapi/doc/ldap/phpgroupware.schema Tue Apr 5 10:03:49 2005 @@ -1,4 +1,4 @@ -# $phpgroupware : phpgroupware,v 1.1 pkamps +# $phpgroupware : phpgroupware,v 1.2 pkamps # REQUIRED attributetype ( 1.3.6.1.4.1.9554.201 @@ -14,13 +14,11 @@ # from the inetOrgPerson schema. objectclass ( 1.3.6.1.4.1.9554.200 NAME 'phpgwContact' + SUP top AUXILIARY DESC 'phpGroupWare Contact Entry' MUST phpgwContactID ) - - - #REQUIRD attributetype ( 1.3.6.1.4.1.9554.301 NAME 'phpgwGroupID' @@ -40,8 +38,6 @@ ) - - #accountID attributetype ( 1.3.6.1.4.1.9554.101 NAME 'phpgwAccountID' From MAILER-DAEMON Fri Apr 08 05:23:03 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DJphf-00007V-3n for mharc-phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:23:03 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DJpeX-0008AA-Fb for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:19:50 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DJpeO-000877-Vo for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:19:42 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DJpeN-0007ry-BK for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:19:39 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DJpuv-0006W2-W7 for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:36:46 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 6D2B4312D6 for ; Fri, 8 Apr 2005 11:35:24 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 14358-06 for ; Fri, 8 Apr 2005 11:35:21 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 9C9DF312B4 for ; Fri, 8 Apr 2005 11:35:21 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j389ZLv09647; Fri, 8 Apr 2005 11:35:21 +0200 Message-Id: <200504080935.j389ZLv09647@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: fipsfuchs Date: Fri, 8 Apr 2005 10:55:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/inc class.ipc_manager.inc.php, 1.6 class.ofphpgwapi.inc.php, 1.1 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2005 09:23:00 -0000 Update of phpgwapi/inc Modified Files: Branch: MAIN class.ipc_manager.inc.php lines: +2 -2 Added Files: Branch: MAIN class.ofphpgwapi.inc.php Log Message: include_class changed to include_once ==================================================== Index: phpgwapi/inc/class.ipc_manager.inc.php diff -u phpgwapi/inc/class.ipc_manager.inc.php:1.5 phpgwapi/inc/class.ipc_manager.inc.php:1.6 --- phpgwapi/inc/class.ipc_manager.inc.php:1.5 Thu Dec 30 06:47:30 2004 +++ phpgwapi/inc/class.ipc_manager.inc.php Fri Apr 8 08:55:34 2005 @@ -12,7 +12,7 @@ /** * Abstract IPC Application class for the IPC Layer */ -include_class('ipc_'); +include_once('class.ipc_.inc.php'); /** * Manager of the IPC Layer ==================================================== Index: class.ofphpgwapi.inc.php * @copyright Copyright (C) 2003 Free Software Foundation, Inc. http://www.fsf.org/ * @license http://www.fsf.org/licenses/gpl.html GNU General Public License * @package phpgwapi * @subpackage application * @version $Id: class.ofphpgwapi.inc.php,v 1.1 2005/04/08 08:55:15 fipsfuchs Exp $ */ /** * Object factory for phpgwapi * * @package phpgwapi * @subpackage application */ class ofphpgwapi extends object_factory { /*! @function CreateObject @abstract Load a class and include the class file if not done so already. @author mdean @author milosch @author (thanks to jengo and ralf) @discussion This function is used to create an instance of a class, and if the class file has not been included it will do so. @syntax CreateObject('app.class', 'constructor_params'); @example $phpgw->acl = CreateObject('phpgwapi.acl'); @param $classname name of class @param $p1-$p16 class parameters (all optional) */ function CreateObject($class, $p1='_UNDEF_',$p2='_UNDEF_',$p3='_UNDEF_',$p4='_UNDEF_', $p5='_UNDEF_',$p6='_UNDEF_',$p7='_UNDEF_',$p8='_UNDEF_', $p9='_UNDEF_',$p10='_UNDEF_',$p11='_UNDEF_',$p12='_UNDEF_', $p13='_UNDEF_',$p14='_UNDEF_',$p15='_UNDEF_',$p16='_UNDEF_') { list($appname,$classname) = explode('.', $class, 2); switch($classname) { case 'auth': return ofphpgwapi::CreateAuthObject(); break; case 'accounts': return ofphpgwapi::CreateAccountObject(); break; default: return parent::CreateObject($class,$p1,$p2,$p3,$p4,$p5,$p6,$p7,$p8,$p9,$p10,$p11,$p12,$p13,$p14,$p15,$p16); } } function CreateAuthObject() { include_once(PHPGW_API_INC . '/auth/class.auth_.inc.php'); switch($GLOBALS['phpgw_info']['server']['auth_type']) { case 'http': include_once(PHPGW_API_INC . '/auth/class.auth_http.inc.php'); return new Auth_http(); break; case 'ldap': include_once(PHPGW_API_INC . '/auth/class.auth_ldap.inc.php'); return new Auth_ldap(); break; case 'mail': include_once(PHPGW_API_INC . '/auth/class.auth_mail.inc.php'); return new Auth_mail(); break; case 'nis': include_once(PHPGW_API_INC . '/auth/class.auth_nis.inc.php'); return new Auth_nis(); break; case 'ntlm': include_once(PHPGW_API_INC . '/auth/class.auth_ntlm.inc.php'); return new Auth_ntlm(); break; case 'sqlssl': include_once(PHPGW_API_INC . '/auth/class.auth_sqlssl.inc.php'); return new Auth_sqlssl(); break; case 'exchange': include_once(PHPGW_API_INC . '/auth/class.auth_exchange.inc.php'); return new Auth_exchange(); break; case 'ads': include_once(PHPGW_API_INC . '/auth/class.auth_ads.inc.php'); return new Auth_ads(); break; default: include_once(PHPGW_API_INC . '/auth/class.auth_sql.inc.php'); return new Auth_sql(); } } function CreateAccountObject() { include_once(PHPGW_API_INC.'/accounts/class.accounts_.inc.php'); switch($GLOBALS['phpgw_info']['server']['account_repository']) { case 'ldap': include_once(PHPGW_API_INC . '/accounts/class.accounts_ldap.inc.php'); return new Accounts_LDAP ($account_id, $account_type); break; case 'sqlldap': include_once(PHPGW_API_INC . '/accounts/class.accounts_SQLLDAP.inc.php'); return new Accounts_SQLLDAP ($account_id, $account_type); break; default: include_once(PHPGW_API_INC . '/accounts/class.accounts_sql.inc.php'); return new Accounts_sql ($account_id, $account_type); } } } ?> From MAILER-DAEMON Fri Apr 08 05:23:06 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DJphh-0000A7-W0 for mharc-phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:23:06 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DJpeX-0008A6-8I for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:19:49 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DJpeQ-00087m-Hg for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:19:44 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DJpeP-0007ry-3f for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:19:41 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DJpuk-0006V8-4R for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:36:34 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 2C6D5312D6 for ; Fri, 8 Apr 2005 11:35:11 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 14907-01 for ; Fri, 8 Apr 2005 11:35:07 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 1BA78312B4 for ; Fri, 8 Apr 2005 11:35:07 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j389Z7L09629; Fri, 8 Apr 2005 11:35:07 +0200 Message-Id: <200504080935.j389Z7L09629@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: fipsfuchs Date: Fri, 8 Apr 2005 10:54:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/inc class.object_factory.inc.php,1.1 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2005 09:23:03 -0000 Update of phpgwapi/inc Added Files: Branch: MAIN class.object_factory.inc.php Log Message: parent factory class ==================================================== Index: class.object_factory.inc.php * @copyright Copyright (C) 2003 Free Software Foundation, Inc. http://www.fsf.org/ * @license http://www.fsf.org/licenses/gpl.html GNU General Public License * @package phpgwapi * @subpackage application * @version $Id: class.object_factory.inc.php,v 1.1 2005/04/08 08:54:59 fipsfuchs Exp $ */ /** * Object factory * * @package phpgwapi * @subpackage application */ class object_factory { function object_factory() { die ('not allowed'); } /*! @function CreateObject @abstract Load a class and include the class file if not done so already. @author mdean @author milosch @author (thanks to jengo and ralf) @discussion This function is used to create an instance of a class, and if the class file has not been included it will do so. @syntax CreateObject('app.class', 'constructor_params'); @example $phpgw->acl = CreateObject('phpgwapi.acl'); @param $classname name of class @param $p1-$p16 class parameters (all optional) */ function CreateObject($class, $p1='_UNDEF_',$p2='_UNDEF_',$p3='_UNDEF_',$p4='_UNDEF_', $p5='_UNDEF_',$p6='_UNDEF_',$p7='_UNDEF_',$p8='_UNDEF_', $p9='_UNDEF_',$p10='_UNDEF_',$p11='_UNDEF_',$p12='_UNDEF_', $p13='_UNDEF_',$p14='_UNDEF_',$p15='_UNDEF_',$p16='_UNDEF_') { global $phpgw_info, $phpgw; if (is_object(@$GLOBALS['phpgw']->log) && $class != 'phpgwapi.error' && $class != 'phpgwapi.errorlog') { //$GLOBALS['phpgw']->log->write(array('text'=>'D-Debug, dbg: %1','p1'=>'This class was run: '.$class,'file'=>__FILE__,'line'=>__LINE__)); } list($appname,$classname) = explode('.', $class); $is_included = include_class($appname, $classname); if($is_included) { if ($p1 == '_UNDEF_' && $p1 != 1) { $obj = new $classname; } else { $input = array($p1,$p2,$p3,$p4,$p5,$p6,$p7,$p8,$p9,$p10,$p11,$p12,$p13,$p14,$p15,$p16); $i = 1; $code = '$obj = new ' . $classname . '('; while (list($x,$test) = each($input)) { if (($test == '_UNDEF_' && $test != 1 ) || $i == 17) { break; } else { $code .= '$p' . $i . ','; } $i++; } $code = substr($code,0,-1) . ');'; eval($code); } /* error_reporting(E_ERROR | E_WARNING | E_PARSE); */ return $obj; } } /*! @function getClassInfo @abstract Convert the class string into an array. @author Dirk Schaller @discussion This function is used to convert the first parameter of CreateObject method ('app.class') into an array (array('app'=>app, 'class'=>class)). @syntax getClassInfo('app.class'); @example $ci = CreateObject('phpgwapi.acl'); @param $class 'app.class' string @return array with key 'app' and key 'class'. */ function getClassInfo($class) { list($app,$class) = explode('.', $class, 2); return array('app' => $app, 'class' => $class); } } ?> From MAILER-DAEMON Fri Apr 08 05:23:03 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DJphf-00007v-Ju for mharc-phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:23:03 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DJpeX-0008AB-E9 for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:19:50 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DJpeP-00087E-3i for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:19:42 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DJpeO-0007ry-9D for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:19:40 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DJpuo-0006VW-JP for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:36:39 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 046E3312D6 for ; Fri, 8 Apr 2005 11:35:17 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 14083-08 for ; Fri, 8 Apr 2005 11:35:11 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id D0CB6312B4 for ; Fri, 8 Apr 2005 11:35:11 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j389ZCw09636; Fri, 8 Apr 2005 11:35:12 +0200 Message-Id: <200504080935.j389ZCw09636@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: fipsfuchs Date: Fri, 8 Apr 2005 10:55:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/inc/accounts class.accounts_.inc.php, 1.3 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2005 09:23:01 -0000 Update of phpgwapi/inc/accounts Modified Files: Branch: MAIN class.accounts_.inc.php lines: +55 -1 Log Message: configuration added to this class ==================================================== Index: phpgwapi/inc/accounts/class.accounts_.inc.php diff -u phpgwapi/inc/accounts/class.accounts_.inc.php:1.2 phpgwapi/inc/accounts/class.accounts_.inc.php:1.3 --- phpgwapi/inc/accounts/class.accounts_.inc.php:1.2 Thu Dec 30 06:47:32 2004 +++ phpgwapi/inc/accounts/class.accounts_.inc.php Fri Apr 8 08:55:56 2005 @@ -3,12 +3,66 @@ * Shared functions for other account repository managers and loader * @author Joseph Engo * @author Bettina Gille + * @author Philipp Kamps * @copyright Copyright (C) 2000-2004 Free Software Foundation, Inc. http://www.fsf.org/ * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License * @package phpgwapi * @subpackage accounts * @version $Id$ */ + if (empty($GLOBALS['phpgw_info']['server']['account_repository'])) + { + if (!empty($GLOBALS['phpgw_info']['server']['auth_type'])) + { + $GLOBALS['phpgw_info']['server']['account_repository'] = $GLOBALS['phpgw_info']['server']['auth_type']; + } + else + { + $GLOBALS['phpgw_info']['server']['account_repository'] = 'sql'; + } + } + /** + * Include child class + */ + + /** + * @internal Moved again at least temporarily since sql and ldap use it. + */ + $GLOBALS['phpgw_info']['server']['global_denied_users'] = array( + 'root' => True, 'bin' => True, 'daemon' => True, + 'adm' => True, 'lp' => True, 'sync' => True, + 'shutdown' => True, 'halt' => True, 'ldap' => True, + 'mail' => True, 'news' => True, 'uucp' => True, + 'operator' => True, 'games' => True, 'gopher' => True, + 'nobody' => True, 'xfs' => True, 'pgsql' => True, + 'mysql' => True, 'postgres' => True, 'oracle' => True, + 'ftp' => True, 'gdm' => True, 'named' => True, + 'alias' => True, 'web' => True, 'sweep' => True, + 'cvs' => True, 'qmaild' => True, 'qmaill' => True, + 'qmaillog' => True, 'qmailp' => True, 'qmailq' => True, + 'qmailr' => True, 'qmails' => True, 'rpc' => True, + 'rpcuser' => True, 'amanda' => True, 'apache' => True, + 'pvm' => True, 'squid' => True, 'ident' => True, + 'nscd' => True, 'mailnull' => True, 'cyrus' => True, + 'backup' => True + ); + + $GLOBALS['phpgw_info']['server']['global_denied_groups'] = array( + 'root' => True, 'bin' => True, 'daemon' => True, + 'sys' => True, 'adm' => True, 'tty' => True, + 'disk' => True, 'lp' => True, 'mem' => True, + 'kmem' => True, 'wheel' => True, 'mail' => True, + 'uucp' => True, 'man' => True, 'games' => True, + 'dip' => True, 'ftp' => True, 'nobody' => True, + 'floppy' => True, 'xfs' => True, 'console' => True, + 'utmp' => True, 'pppusers' => True, 'popusers' => True, + 'slipusers' => True, 'slocate' => True, 'mysql' => True, + 'dnstools' => True, 'web' => True, 'named' => True, + 'dba' => True, 'oinstall' => True, 'oracle' => True, + 'gdm' => True, 'sweep' => True, 'cvs' => True, + 'postgres' => True, 'qmail' => True, 'nofiles' => True, + 'ldap' => True, 'backup' => True + ); /** * Class for handling user and group accounts From MAILER-DAEMON Fri Apr 08 05:23:20 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DJpeb-0008B1-2P for mharc-phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:19:53 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DJpeV-00089a-Ei for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:19:48 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DJpeP-00087L-FV for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:19:42 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DJpeM-0007ry-QT for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:19:38 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DJpv8-0006Wp-Eu for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:36:58 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id D4759312D6 for ; Fri, 8 Apr 2005 11:35:36 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 14907-02 for ; Fri, 8 Apr 2005 11:35:34 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 94CDC312B4 for ; Fri, 8 Apr 2005 11:35:34 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j389ZYM09658; Fri, 8 Apr 2005 11:35:34 +0200 Message-Id: <200504080935.j389ZYM09658@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: fipsfuchs Date: Fri, 8 Apr 2005 10:56:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/inc class.auth.inc.php, 1.12 class.accounts.inc.php, 1.18 common_functions.inc.php, 1.20 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2005 09:19:51 -0000 Update of phpgwapi/inc Removed Files: Branch: MAIN class.auth.inc.php class.accounts.inc.php Modified Files: Branch: MAIN common_functions.inc.php lines: +47 -71 Log Message: logic moved to factory method ==================================================== Index: phpgwapi/inc/common_functions.inc.php diff -u phpgwapi/inc/common_functions.inc.php:1.19 phpgwapi/inc/common_functions.inc.php:1.20 --- phpgwapi/inc/common_functions.inc.php:1.19 Thu Dec 30 06:47:31 2004 +++ phpgwapi/inc/common_functions.inc.php Fri Apr 8 08:56:22 2005 @@ -461,30 +461,49 @@ /*! @function include_class - @abstract This will include the class once and guarantee that it is loaded only once. Similar to CreateObject, but does not instantiate the class. - @author skeeter - @discussion This will include the API class once and guarantee that it is loaded only once. Similar to CreateObject, but does not instantiate the class. - @syntax include_class('setup'); - @example include_class('setup'); - @param $included_class API class to load + @abstract This will include an application class once and guarantee that it is loaded only once. Similar to CreateObject, but does not instantiate the class. + @author dschaller + @discussion This will include an application class once and guarantee that it is loaded only once. Similar to CreateObject, but does not instantiate the class. + @syntax include_class('.', ''); + @example include_class('projects.ui_base'); + @param $appName name of application + @param $className name of class + @param $classPath path to the application class, default is 'inc/', use this parameter i.e. if the class is located in a subdirectory like 'inc/base_classes/' + @return boolean true if class is included, else false (false means class could not included) */ - function include_class($included_class) + function include_class($appName, $className, $classPath='inc/') { - if (!isset($GLOBALS['phpgw_info']['flags']['included_classes'][$included_class]) || - !$GLOBALS['phpgw_info']['flags']['included_classes'][$included_class]) + $fileName = PHPGW_INCLUDE_ROOT.'/'.$appName.'/'.$classPath.'class.'.$className.'.inc.php'; + $included_files = get_included_files(); + + if (!isset($included_files[$fileName])) { - $GLOBALS['phpgw_info']['flags']['included_classes'][$included_class] = True; - include_once(PHPGW_SERVER_ROOT.'/phpgwapi/inc/class.'.$included_class.'.inc.php'); + if(@file_exists($fileName)) + { + include_once($fileName); + $is_included = True; + } + else + { + $is_included = False; + } } + else + { + $is_included = True; + } + + return $is_included; } + // include object factory base class once + include_once(PHPGW_SERVER_ROOT.'/phpgwapi/inc/class.object_factory.inc.php'); /*! @function CreateObject - @abstract Load a class and include the class file if not done so already. - @author mdean - @author milosch - @author (thanks to jengo and ralf) - @discussion This function is used to create an instance of a class, and if the class file has not been included it will do so. + @abstract delegate the object creation into the module. + @author Dirk Schaller + @author Phillip Kamps + @discussion This function is used to create an instance of a class. Its delegates the creation process into the called module and its factory class. If a module has no factory class, then its use the old CreateObject method. The old CreateObject method is moved into the base object factory class. @syntax CreateObject('app.class', 'constructor_params'); @example $phpgw->acl = CreateObject('phpgwapi.acl'); @param $classname name of class @@ -496,64 +515,21 @@ $p9='_UNDEF_',$p10='_UNDEF_',$p11='_UNDEF_',$p12='_UNDEF_', $p13='_UNDEF_',$p14='_UNDEF_',$p15='_UNDEF_',$p16='_UNDEF_') { - global $phpgw_info, $phpgw; - - if (is_object(@$GLOBALS['phpgw']->log) && $class != 'phpgwapi.error' && $class != 'phpgwapi.errorlog') - { - //$GLOBALS['phpgw']->log->write(array('text'=>'D-Debug, dbg: %1','p1'=>'This class was run: '.$class,'file'=>__FILE__,'line'=>__LINE__)); - } + + list($appname,$classname) = explode('.', $class, 2); - /* error_reporting(0); */ - list($appname,$classname) = explode('.', $class); - $filename = PHPGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php'; - $included_files = get_included_files(); + // include app object factory class + $of_classname = 'of'.$appname; - if (!isset($included_files[$filename])) - { - if(@file_exists($filename)) - { - include_once($filename); - $is_included = True; - } - else - { - $is_included = False; - } - } - else + // include module object factory class + if (!include_class($appname, $of_classname)) { - $is_included = True; - } - - if($is_included) - { - if ($p1 == '_UNDEF_' && $p1 != 1) - { - $obj = new $classname; - } - else - { - $input = array($p1,$p2,$p3,$p4,$p5,$p6,$p7,$p8,$p9,$p10,$p11,$p12,$p13,$p14,$p15,$p16); - $i = 1; - $code = '$obj = new ' . $classname . '('; - while (list($x,$test) = each($input)) - { - if (($test == '_UNDEF_' && $test != 1 ) || $i == 17) - { - break; - } - else - { - $code .= '$p' . $i . ','; - } - $i++; - } - $code = substr($code,0,-1) . ');'; - eval($code); - } - /* error_reporting(E_ERROR | E_WARNING | E_PARSE); */ - return $obj; + // fail to load module object factory -> use old CreateObject in base class + $of_classname = 'object_factory'; } + + // because $of_classname::CreateObject() is not allowed, we use call_user_func + return call_user_func(array($of_classname, 'CreateObject'),$class,$p1,$p2,$p3,$p4,$p5,$p6,$p7,$p8,$p9,$p10,$p11,$p12,$p13,$p14,$p15,$p16); } /*! From MAILER-DAEMON Fri Apr 08 05:26:43 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DJplA-0001GX-1D for mharc-phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:26:40 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DJpeV-00089Z-EK for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:19:48 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DJpeM-00085x-Sv for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:19:40 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DJpeK-0007ry-LC for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:19:37 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DJpvG-0006XC-K4 for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 05:37:06 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id E9068312D6 for ; Fri, 8 Apr 2005 11:35:44 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 14083-09 for ; Fri, 8 Apr 2005 11:35:43 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id DA97D312B4 for ; Fri, 8 Apr 2005 11:35:42 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j389Zg409669; Fri, 8 Apr 2005 11:35:42 +0200 Message-Id: <200504080935.j389Zg409669@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: fipsfuchs Date: Fri, 8 Apr 2005 10:56:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/inc/accounts class.accounts_sql.inc.php, 1.3 class.accounts_ldap.inc.php, 1.3 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2005 09:26:37 -0000 Update of phpgwapi/inc/accounts Modified Files: Branch: MAIN class.accounts_sql.inc.php lines: +1 -4 class.accounts_ldap.inc.php lines: +1 -4 Log Message: include_once removed ==================================================== Index: phpgwapi/inc/accounts/class.accounts_sql.inc.php diff -u phpgwapi/inc/accounts/class.accounts_sql.inc.php:1.2 phpgwapi/inc/accounts/class.accounts_sql.inc.php:1.3 --- phpgwapi/inc/accounts/class.accounts_sql.inc.php:1.2 Thu Dec 30 06:47:32 2004 +++ phpgwapi/inc/accounts/class.accounts_sql.inc.php Fri Apr 8 08:56:08 2005 @@ -1,7 +1,4 @@ ==================================================== Index: phpgwapi/inc/accounts/class.accounts_ldap.inc.php diff -u phpgwapi/inc/accounts/class.accounts_ldap.inc.php:1.2 phpgwapi/inc/accounts/class.accounts_ldap.inc.php:1.3 --- phpgwapi/inc/accounts/class.accounts_ldap.inc.php:1.2 Thu Dec 30 06:47:32 2004 +++ phpgwapi/inc/accounts/class.accounts_ldap.inc.php Fri Apr 8 08:56:08 2005 @@ -1,7 +1,4 @@ From MAILER-DAEMON Fri Apr 08 07:17:11 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DJrU7-0000ra-K1 for mharc-phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 07:17:11 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DJrTz-0000o4-6I for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 07:17:03 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DJrTt-0000lk-5W for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 07:16:58 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DJrTs-0000g4-Jw for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 07:16:56 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DJri8-00066z-0E for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 07:31:40 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 1929A3132E for ; Fri, 8 Apr 2005 13:30:17 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 20523-07 for ; Fri, 8 Apr 2005 13:30:14 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id D18CF312D6 for ; Fri, 8 Apr 2005 13:30:14 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j38BUEN10244; Fri, 8 Apr 2005 13:30:14 +0200 Message-Id: <200504081130.j38BUEN10244@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: sigurdne Date: Fri, 8 Apr 2005 12:49:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] property/inc hook_settings.inc.php, 1.7 class.uitts.inc.php, 1.12 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2005 11:17:06 -0000 Update of property/inc Modified Files: Branch: MAIN hook_settings.inc.php lines: +9 -1 class.uitts.inc.php lines: +9 -1 Log Message: no message ==================================================== Index: property/inc/hook_settings.inc.php diff -u property/inc/hook_settings.inc.php:1.6 property/inc/hook_settings.inc.php:1.7 --- property/inc/hook_settings.inc.php:1.6 Wed Mar 2 11:54:04 2005 +++ property/inc/hook_settings.inc.php Fri Apr 8 10:49:20 2005 @@ -28,6 +28,14 @@ ); create_select_box('show new/updated tickets on main screen','mainscreen_show_new_updated',$yes_and_no,'Dont think this is working - yet'); + $tts_status = array( + '' => lang('Open'), + 'closed' => lang('Closed'), + 'all' => lang('All') + ); + + create_select_box('Default ticket status','tts_status',$tts_status,'The default status when entering the helpdesk'); + $acc = CreateObject('phpgwapi.accounts'); $group_list = $acc->get_list('groups'); while (list($key,$entry) = each($group_list)) ==================================================== Index: property/inc/class.uitts.inc.php diff -u property/inc/class.uitts.inc.php:1.11 property/inc/class.uitts.inc.php:1.12 --- property/inc/class.uitts.inc.php:1.11 Tue Mar 1 15:04:27 2005 +++ property/inc/class.uitts.inc.php Fri Apr 8 10:49:20 2005 @@ -185,6 +185,8 @@ $second_display = get_var('second_display',array('POST','GET')); $default_category = $GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['default_district']; + $default_status = $GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_status']; + if ($default_category && !$second_display && !$this->district_id) { @@ -192,6 +194,12 @@ $this->district_id = $default_category; } + if ($default_status && !$second_display) + { + $this->bo->filter = $default_status; + $this->filter = $default_status; + } + $bgcolor['1'] = '#dadada'; $bgcolor['2'] = '#dad0d0'; $bgcolor['3'] = '#dacaca'; From MAILER-DAEMON Fri Apr 08 12:17:09 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DJwAL-00053D-W9 for mharc-phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 12:17:06 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DJwAE-0004zb-H7 for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 12:16:58 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DJwA2-0004ue-Lz for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 12:16:50 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DJwA2-0004rd-9N for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 12:16:46 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DJwQ9-00049U-IO for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 12:33:25 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 4CBFA3132F for ; Fri, 8 Apr 2005 18:31:59 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 03432-05 for ; Fri, 8 Apr 2005 18:31:57 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 0B56931330 for ; Fri, 8 Apr 2005 18:31:57 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j38GVus12926; Fri, 8 Apr 2005 18:31:56 +0200 Message-Id: <200504081631.j38GVus12926@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: ceb Date: Fri, 8 Apr 2005 17:52:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] projects index.php,1.56 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2005 16:17:01 -0000 Update of projects Modified Files: Branch: MAIN index.php lines: +10 -24 Log Message: update ==================================================== Index: projects/index.php diff -u projects/index.php:1.55 projects/index.php:1.56 --- projects/index.php:1.55 Mon Mar 14 17:39:38 2005 +++ projects/index.php Fri Apr 8 15:52:57 2005 @@ -1,28 +1,14 @@ ; Fri, 8 Apr 2005 18:31:56 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 03406-05 for ; Fri, 8 Apr 2005 18:31:52 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id B227931330 for ; Fri, 8 Apr 2005 18:31:52 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j38GVqK12919; Fri, 8 Apr 2005 18:31:52 +0200 Message-Id: <200504081631.j38GVqK12919@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: ceb Date: Fri, 8 Apr 2005 17:52:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] projects/help index.php,1.3 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2005 16:17:01 -0000 Update of projects/help Modified Files: Branch: MAIN index.php lines: +11 -10 Log Message: update ==================================================== Index: projects/help/index.php diff -u projects/help/index.php:1.2 projects/help/index.php:1.3 --- projects/help/index.php:1.2 Mon Jun 11 04:32:50 2001 +++ projects/help/index.php Fri Apr 8 15:52:57 2005 @@ -1,14 +1,15 @@ 'manual'); From MAILER-DAEMON Fri Apr 08 12:17:16 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DJwAV-00056b-0m for mharc-phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 12:17:15 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DJwAK-00052J-Kh for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 12:17:05 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DJwA5-0004vA-IE for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 12:17:01 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DJwA2-0004rd-Ll for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 12:16:46 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DJwQ5-00049J-Ns for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 12:33:22 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 53ED331332 for ; Fri, 8 Apr 2005 18:31:55 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 03834-02 for ; Fri, 8 Apr 2005 18:31:48 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 4A3E73132F for ; Fri, 8 Apr 2005 18:31:48 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j38GVmL12912; Fri, 8 Apr 2005 18:31:48 +0200 Message-Id: <200504081631.j38GVmL12912@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: ceb Date: Fri, 8 Apr 2005 17:52:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] projects/inc class.uiprojecthours.inc.php, 1.84 class.uiconfig.inc.php, 1.33 class.sostatistics.inc.php, 1.13 class.uiprojects.inc.php, 1.158 class.uiprojects_base.inc.php, 1.11 hook_add_def_pref.inc.php, 1.8 class.uistatistics.inc.php, 1.61 class.soprojects.inc.php, 1.110 class.soprojecthours.inc.php, 1.40 class.boconfig.inc.php, 1.23 class.boprojecthours.inc.php, 1.37 class.boprojects.inc.php, 1.157 class.soconfig.inc.php, 1.20 class.bostatistics.inc.php, 1.27 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2005 16:17:06 -0000 Update of projects/inc Modified Files: Branch: MAIN class.uiprojecthours.inc.php lines: +10 -27 class.uiconfig.inc.php lines: +11 -28 class.sostatistics.inc.php lines: +10 -26 class.uiprojects.inc.php lines: +10 -26 class.uiprojects_base.inc.php lines: +11 -27 hook_add_def_pref.inc.php lines: +14 -10 class.uistatistics.inc.php lines: +10 -26 class.soprojects.inc.php lines: +10 -26 class.soprojecthours.inc.php lines: +10 -26 class.boconfig.inc.php lines: +10 -26 class.boprojecthours.inc.php lines: +10 -26 class.boprojects.inc.php lines: +10 -26 class.soconfig.inc.php lines: +10 -26 class.bostatistics.inc.php lines: +10 -26 Log Message: update ==================================================== Index: projects/inc/class.uiprojecthours.inc.php diff -u projects/inc/class.uiprojecthours.inc.php:1.83 projects/inc/class.uiprojecthours.inc.php:1.84 --- projects/inc/class.uiprojecthours.inc.php:1.83 Wed Mar 30 15:53:38 2005 +++ projects/inc/class.uiprojecthours.inc.php Fri Apr 8 15:52:58 2005 @@ -1,31 +1,14 @@ common->phpgw_header(); - echo parse_navbar(); + $GLOBALS['phpgw']->common->phpgw_header(True); $GLOBALS['phpgw']->template->set_file(array('prefs' => 'preferences.tpl')); $this->set_app_langs(); ==================================================== Index: projects/inc/class.sostatistics.inc.php diff -u projects/inc/class.sostatistics.inc.php:1.12 projects/inc/class.sostatistics.inc.php:1.13 --- projects/inc/class.sostatistics.inc.php:1.12 Sun Feb 29 23:16:55 2004 +++ projects/inc/class.sostatistics.inc.php Fri Apr 8 15:52:58 2005 @@ -1,30 +1,14 @@ * - * --------------------------------------------------- * - * Copyright 2005 Free Software Foundation, Inc. * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the Free Software * - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - \*******************************************************************/ - /* $Id$ */ - /* $Source$ */ + /** + * Project Manager + * + * @author Bettina Gille [ceb@phpgroupware.org] + * @author Dirk Schaller + * @copyright Copyright (C) 2004-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package projects + * @version $Id$ + * $Source$ + */ define('PROJECT_LIST','pro_list'); define('PROJECT_VIEW','pro_view'); ==================================================== Index: projects/inc/hook_add_def_pref.inc.php diff -u projects/inc/hook_add_def_pref.inc.php:1.7 projects/inc/hook_add_def_pref.inc.php:1.8 --- projects/inc/hook_add_def_pref.inc.php:1.7 Mon Apr 26 16:07:13 2004 +++ projects/inc/hook_add_def_pref.inc.php Fri Apr 8 15:52:58 2005 @@ -1,12 +1,16 @@ change('projects','columns',$columns); ?> ==================================================== Index: projects/inc/class.uistatistics.inc.php diff -u projects/inc/class.uistatistics.inc.php:1.60 projects/inc/class.uistatistics.inc.php:1.61 --- projects/inc/class.uistatistics.inc.php:1.60 Thu Mar 31 23:00:22 2005 +++ projects/inc/class.uistatistics.inc.php Fri Apr 8 15:52:58 2005 @@ -1,30 +1,14 @@ ; Sat, 9 Apr 2005 02:30:15 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 24879-05 for ; Sat, 9 Apr 2005 02:30:13 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 1CBDD312B2 for ; Sat, 9 Apr 2005 02:30:13 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j390UDx16703; Sat, 9 Apr 2005 02:30:13 +0200 Message-Id: <200504090030.j390UDx16703@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: ceb Date: Sat, 9 Apr 2005 02:19:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] filemanager/templates/base widgets.xsl, 1.12 app_data.xsl, 1.19 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Apr 2005 00:13:03 -0000 Update of filemanager/templates/base Modified Files: Branch: MAIN widgets.xsl lines: +12 -11 app_data.xsl lines: +2 -2 Log Message: update ==================================================== Index: filemanager/templates/base/widgets.xsl diff -u filemanager/templates/base/widgets.xsl:1.11 filemanager/templates/base/widgets.xsl:1.12 --- filemanager/templates/base/widgets.xsl:1.11 Sat Feb 12 00:36:23 2005 +++ filemanager/templates/base/widgets.xsl Sat Apr 9 00:19:32 2005 @@ -92,21 +92,22 @@ - +   - - - - - checked - - - - + + + + + + + checked + + +   ==================================================== Index: filemanager/templates/base/app_data.xsl diff -u filemanager/templates/base/app_data.xsl:1.18 filemanager/templates/base/app_data.xsl:1.19 --- filemanager/templates/base/app_data.xsl:1.18 Sat Feb 12 00:36:23 2005 +++ filemanager/templates/base/app_data.xsl Sat Apr 9 00:19:32 2005 @@ -265,7 +265,7 @@
- +
From MAILER-DAEMON Fri Apr 08 20:13:08 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DK3b2-00087D-DE for mharc-phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 20:13:08 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DK3ax-00084j-EG for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 20:13:03 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DK3ar-00081g-1H for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 20:12:59 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DK3aq-00080C-OB for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 20:12:56 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DK3tK-0002u9-Bk for phpgroupware-cvs@gnu.org; Fri, 08 Apr 2005 20:32:03 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 03DE8312BF for ; Sat, 9 Apr 2005 02:30:30 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 24963-05 for ; Sat, 9 Apr 2005 02:30:27 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 74772312B2 for ; Sat, 9 Apr 2005 02:30:27 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j390URu16718; Sat, 9 Apr 2005 02:30:27 +0200 Message-Id: <200504090030.j390URu16718@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: ceb Date: Sat, 9 Apr 2005 02:19:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] filemanager/inc hook_admin.inc.php, 1.6 class.uifilemanager.inc.php, 1.30 class.bofilemanager.inc.php, 1.22 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Apr 2005 00:13:05 -0000 Update of filemanager/inc Modified Files: Branch: MAIN hook_admin.inc.php lines: +2 -2 class.uifilemanager.inc.php lines: +74 -24 class.bofilemanager.inc.php lines: +62 -8 Log Message: update ==================================================== Index: filemanager/inc/hook_admin.inc.php diff -u filemanager/inc/hook_admin.inc.php:1.5 filemanager/inc/hook_admin.inc.php:1.6 --- filemanager/inc/hook_admin.inc.php:1.5 Sun Jan 23 21:33:14 2005 +++ filemanager/inc/hook_admin.inc.php Sat Apr 9 00:19:32 2005 @@ -14,7 +14,7 @@ // Only Modify the $file and $title variables..... $file = Array ( - 'edit quota' => $GLOBALS['phpgw']->link('/index.php','menuaction=filemanager.uifilemanager.admin') + 'site configuration' => $GLOBALS['phpgw']->link('/index.php','menuaction=filemanager.uifilemanager.admin') ); //Do not modify below this line display_section($appname,$appname,$file); ==================================================== Index: filemanager/inc/class.uifilemanager.inc.php diff -u filemanager/inc/class.uifilemanager.inc.php:1.29 filemanager/inc/class.uifilemanager.inc.php:1.30 --- filemanager/inc/class.uifilemanager.inc.php:1.29 Sun Feb 20 17:09:49 2005 +++ filemanager/inc/class.uifilemanager.inc.php Sat Apr 9 00:19:32 2005 @@ -522,15 +522,19 @@ //_debug_array($this->bofilemanager->settings); + $link_data = array + ( + 'menuaction' => $this->bofilemanager->appname.'.ui'.$this->bofilemanager->appname.'.index', + 'path' => $this->bofilemanager->path + ); + foreach($this->bofilemanager->file_attributes as $attribute => $translation) { if ($this->bofilemanager->settings[$attribute]) { + $link_data['sortby'] = $attribute; $file_attributes[] = array('widget'=> array('type' => 'link','caption' => lang($attribute), - 'href' => $GLOBALS['phpgw']->link('/index.php', array( - 'menuaction' => $this->bofilemanager->appname.'.ui'.$this->bofilemanager->appname.'.index', - 'path'=>$this->bofilemanager->path, - 'sortby' => $attribute))), + 'href' => $GLOBALS['phpgw']->link('/index.php',$link_data)), 'help' => array('widget' => array('type' => 'help','onClick' => $this->bofilemanager->build_help($attribute)))); } } @@ -581,9 +585,8 @@ 'src' => $GLOBALS['phpgw']->common->image($this->bofilemanager->appname,$file_icon))); if ($file['mime_type']=='Directory') { - $href = $GLOBALS['phpgw']->link('/index.php',array('menuaction' => $this->bofilemanager->appname.'.ui'. - $this->bofilemanager->appname.'.index', - 'path' => $this->bofilemanager->path . $this->bofilemanager->dispsep . $file['name'])); + $link_data['path'] = $this->bofilemanager->path . $this->bofilemanager->dispsep . $file['name']; + $href = $GLOBALS['phpgw']->link('/index.php',$link_data); } else { @@ -598,11 +601,11 @@ 'href' => $href,'onClick' => $onClick)); if($mime_parts[0] == 'text') { - $href['menuaction'] = $this->bofilemanager->appname.'.uiaction_edit.edit'; - $href['edit_file'] = urlencode($file['name']); + $link_data['menuaction'] = $this->bofilemanager->appname.'.uiaction_edit.edit'; + $link_data['edit_file'] = urlencode($file['name']); $file_output[$i]['name']['edit'] = array('widget' => array( 'type' => 'image', 'src' => $GLOBALS['phpgw']->common->image($this->bofilemanager->appname,'pencil'), - 'link' => $GLOBALS['phpgw']->link('/index.php', $href))); + 'link' => $GLOBALS['phpgw']->link('/index.php',$link_data))); } } break; @@ -1015,27 +1018,46 @@ function admin() { - $val = $_POST['set_quota']; - + $val = $_POST['set_quota']; + $values = $_POST['values']; $config = CreateObject('phpgwapi.config','filemanager'); $config->read_repository(); // Check if the Values match the following pattern 0,1,10,unlimited - if (empty($val) || ereg("^[ 0-9]+(,[ 0-9]+)*$",$val)) + + if ($_POST['save']) { - if ($_POST['save']) + if (empty($val) || ereg("^[ 0-9]+(,[ 0-9]+)*$",$val)) { $config->value('set_quota', '0,' . $val . ',unlimited'); - $config->save_repository(); + } + else + { + $error[] = lang('erroneous input! check quota value!'); + } + + if ($values['script_path']) + { + $doc_root = get_var('DOCUMENT_ROOT',Array('GLOBAL','SERVER')); + if (substr($values['script_path'],0,strlen($doc_root)) == $doc_root) + { + $error[] = lang('the directory to store additional action scripts must be outside of the webservers documentroot'); + } + else + { + $config->value('script_path',$values['script_path']); + } + } + $config->value('check_files',$values['check_files']); + $config->value('check_interval',$values['check_interval']); + $config->save_repository(); + + if(!is_array($error)) + { $GLOBALS['phpgw']->redirect_link('/admin/index.php'); } } - else - { - $error = lang('erroneous input! check quota value!'); - } - - if ($_POST['cancel']) + elseif($_POST['cancel']) { $GLOBALS['phpgw']->redirect_link('/admin/index.php'); } @@ -1085,7 +1107,7 @@ } $sstr = '0,'; - $estr .= ', ' . lang('unlimited'); + $estr .= ',' . lang('unlimited'); $data = array(); $table_head = array('table_col' => array('colspan' => '2','align' => 'left','widget' => array('type' => 'label','caption' => lang('edit quota')))); @@ -1095,11 +1117,39 @@ $var[] = array('widget' => array('type' => 'text','name' => 'set_quota','value' => $str,'caption_start' => $sstr,'caption' => $estr)); $table_rows[] = array('table_col' => $var); + $var = array(); + $var[] = array('class' => 'th','colspan' => '2','widget' => array('type' => 'label','caption' => lang('user menu action scripts'))); + $table_rows[] = array('table_col' => $var); + + $var = array(); + $var[] = array('widget' => array('type' => 'label','caption' => lang('absolute path to directory for storing additional action scripts'))); + $var[] = array('widget' => array('type' => 'text','name' => 'values[script_path]','value' => $items['script_path'])); + $table_rows[] = array('table_col' => $var); + + $var = array(); + $var[] = array('class' => 'th','colspan' => '2','widget' => array('type' => 'label','caption' => lang('periodically check for new files'))); + $table_rows[] = array('table_col' => $var); + + $var = array(); + $var[] = array('widget' => array('type' => 'label','caption' => lang('enable periodically check for new files'))); + $var[] = array('widget' => array('type' => 'checkbox','name' => 'values[check_files]','value' => 'True', 'checked' => ($items['check_files']?True:False))); + $table_rows[] = array('table_col' => $var); + + $var = array(); + $var[] = array('widget' => array('type' => 'label','caption' => lang('interval'))); + $var[] = array('widget' => array('type' => 'text','name' => 'values[check_interval]','value' => $items['check_interval'],'size' => 3,'caption' => lang('minutes'))); + $table_rows[] = array('table_col' => $var); + $table_footer = array('table_col' => $this->display_buttons()); + if(is_array($error)) + { + $errormsg = explode('
',$error); + } + $data = array ( - 'error' => $error, + 'error' => $errormsg, 'action_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=filemanager.uifilemanager.admin'), 'table' => array('width' => '50%','table_head' => $table_head ,'table_row' => $table_rows,'table_footer' => $table_footer) ); ==================================================== Index: filemanager/inc/class.bofilemanager.inc.php diff -u filemanager/inc/class.bofilemanager.inc.php:1.21 filemanager/inc/class.bofilemanager.inc.php:1.22 --- filemanager/inc/class.bofilemanager.inc.php:1.21 Sat Feb 12 01:07:35 2005 +++ filemanager/inc/class.bofilemanager.inc.php Sat Apr 9 00:19:32 2005 @@ -15,7 +15,7 @@ class bofilemanager { var $access_add = False; - var $rootdir; + var $basedir; var $fakebase; var $appname; var $settings; @@ -104,14 +104,14 @@ //_debug_array($this->fileman); - $this->rootdir = $GLOBALS['phpgw']->vfs->basedir; + $this->basedir = $GLOBALS['phpgw']->vfs->basedir; $this->fakebase = $GLOBALS['phpgw']->vfs->fakebase; $this->appname = $GLOBALS['phpgw_info']['flags']['currentapp']; $this->settings = $GLOBALS['phpgw_info']['user']['preferences'][$this->appname]; - if(stristr($this->rootdir,PHPGW_SERVER_ROOT)) + if(stristr($this->basedir,PHPGW_SERVER_ROOT)) { - $this->filesdir = substr($this->rootdir,strlen(PHPGW_SERVER_ROOT)); + $this->filesdir = substr($this->basedir,strlen(PHPGW_SERVER_ROOT)); } else { @@ -1175,9 +1175,63 @@ srand((double)microtime() * 1000000); if($this->params['update'] || rand(0,19) == 4) { - $GLOBALS['phpgw']->vfs->update_real(array( - 'string' => $this->bofilemanager->path, - 'relatives' =>Array(RELATIVE_NONE))); + $dir_files = $this->get_dirfiles(); + $sql_files = $this->get_sqlfiles(); + $this->sync_files($dir_files,$sql_files); + $GLOBALS['phpgw']->vfs->update_real(array('string' => $this->path,'relatives' => array(RELATIVE_NONE))); + } + } + + function get_dirfiles() + { + $basedir = $this->basedir . $this->path; + $dir = opendir($basedir); + + $files = array(); + $i = 0; + while ($file = readdir($dir)) + { + if ($file != '.' && $file != '..') + { + $files[$i] = $file; + ++$i; + } + } + return $files; + } + + function get_sqlfiles() + { + $ls_array = $GLOBALS['phpgw']->vfs->ls(array( + 'string' => $this->path, + 'relatives' => array (RELATIVE_NONE), + 'checksubdirs' => False, + 'nofiles' => False)); + + $files = array(); + if(is_array($ls_array)) + { + $i = 0; + foreach($ls_array as $key => $file) + { + $files[$i] = $file['name']; + ++$i; + } + } + return $files; + } + + function sync_files($dir_files,$sql_files) + { + if (is_array($sql_files)) + { + $array_difference = array_diff($sql_files,$dir_files); + sort($array_difference); + for($i=0;$ivfs->delete(array('string' => $array_difference[$i])); + } } } } From MAILER-DAEMON Sat Apr 09 18:11:56 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DKOBH-0005lt-IV for mharc-phpgroupware-cvs@gnu.org; Sat, 09 Apr 2005 18:11:55 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DKOBC-0005hF-9Z for phpgroupware-cvs@gnu.org; Sat, 09 Apr 2005 18:11:51 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DKOB6-0005bV-Bj for phpgroupware-cvs@gnu.org; Sat, 09 Apr 2005 18:11:45 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DKOB1-0005YH-RU for phpgroupware-cvs@gnu.org; Sat, 09 Apr 2005 18:11:39 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DKOUn-0003ND-19 for phpgroupware-cvs@gnu.org; Sat, 09 Apr 2005 18:32:05 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 3DBC5312B9 for ; Sun, 10 Apr 2005 00:30:11 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 19424-07 for ; Sun, 10 Apr 2005 00:30:09 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id BFC69312BA for ; Sun, 10 Apr 2005 00:30:08 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j39MU8D02227; Sun, 10 Apr 2005 00:30:08 +0200 Message-Id: <200504092230.j39MU8D02227@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: ceb Date: Sat, 9 Apr 2005 23:56:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] filemanager/templates/base widgets.xsl,1.13 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Apr 2005 22:11:52 -0000 Update of filemanager/templates/base Modified Files: Branch: MAIN widgets.xsl lines: +4 -1 Log Message: update ==================================================== Index: filemanager/templates/base/widgets.xsl diff -u filemanager/templates/base/widgets.xsl:1.12 filemanager/templates/base/widgets.xsl:1.13 --- filemanager/templates/base/widgets.xsl:1.12 Sat Apr 9 00:19:32 2005 +++ filemanager/templates/base/widgets.xsl Sat Apr 9 21:56:02 2005 @@ -211,6 +211,9 @@ + + + From MAILER-DAEMON Sat Apr 09 18:11:57 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DKOBI-0005mt-6l for mharc-phpgroupware-cvs@gnu.org; Sat, 09 Apr 2005 18:11:56 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DKOBD-0005iD-RD for phpgroupware-cvs@gnu.org; Sat, 09 Apr 2005 18:11:52 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DKOB5-0005bO-Sp for phpgroupware-cvs@gnu.org; Sat, 09 Apr 2005 18:11:49 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DKOB1-0005YH-KX for phpgroupware-cvs@gnu.org; Sat, 09 Apr 2005 18:11:39 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DKOUy-0003Nt-AF for phpgroupware-cvs@gnu.org; Sat, 09 Apr 2005 18:32:16 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 35394312C7 for ; Sun, 10 Apr 2005 00:30:28 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 17830-10 for ; Sun, 10 Apr 2005 00:30:25 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 5720E312BA for ; Sun, 10 Apr 2005 00:30:25 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j39MUPO02242; Sun, 10 Apr 2005 00:30:25 +0200 Message-Id: <200504092230.j39MUPO02242@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: ceb Date: Sat, 9 Apr 2005 23:56:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] filemanager/inc hook_admin.inc.php, 1.7 class.uifilemanager.inc.php, 1.31 class.bofilemanager.inc.php, 1.23 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Apr 2005 22:11:52 -0000 Update of filemanager/inc Modified Files: Branch: MAIN hook_admin.inc.php lines: +3 -2 class.uifilemanager.inc.php lines: +232 -52 class.bofilemanager.inc.php lines: +19 -12 Log Message: update ==================================================== Index: filemanager/inc/hook_admin.inc.php diff -u filemanager/inc/hook_admin.inc.php:1.6 filemanager/inc/hook_admin.inc.php:1.7 --- filemanager/inc/hook_admin.inc.php:1.6 Sat Apr 9 00:19:32 2005 +++ filemanager/inc/hook_admin.inc.php Sat Apr 9 21:56:02 2005 @@ -14,7 +14,8 @@ // Only Modify the $file and $title variables..... $file = Array ( - 'site configuration' => $GLOBALS['phpgw']->link('/index.php','menuaction=filemanager.uifilemanager.admin') + 'site configuration' => $GLOBALS['phpgw']->link('/index.php','menuaction=filemanager.uifilemanager.admin'), + 'edit user menu actions' => $GLOBALS['phpgw']->link('/index.php','menuaction=filemanager.uifilemanager.edit_actions') ); //Do not modify below this line display_section($appname,$appname,$file); ==================================================== Index: filemanager/inc/class.uifilemanager.inc.php diff -u filemanager/inc/class.uifilemanager.inc.php:1.30 filemanager/inc/class.uifilemanager.inc.php:1.31 --- filemanager/inc/class.uifilemanager.inc.php:1.30 Sat Apr 9 00:19:32 2005 +++ filemanager/inc/class.uifilemanager.inc.php Sat Apr 9 21:56:02 2005 @@ -24,45 +24,43 @@ 'view' => True, 'edit' => True, 'preferences' => True, - 'admin' => True + 'admin' => True, + 'edit_actions' => True ); var $bofilemanager; - var $nextmatchs; var $browser; - var $template_dir; - var $help_info; var $mime_ico = array ( - 'application/pdf' => 'pdf', - 'application/postscript' => 'postscript', - 'application/msword' => 'word', - 'application/vnd.ms-excel' => 'excel', - 'application/vnd.ms-powerpoint' => 'ppt', - 'application/x-gzip' => 'tgz', - 'application/x-bzip' => 'tgz', - 'application/zip' => 'tgz', - 'application/x-debian-package' => 'deb', - 'application/x-rpm' => 'rpm', - 'application' => 'document', - 'application/octet-stream' => 'unknown', - 'audio' => 'sound', - 'audio/mpeg' => 'sound', - 'Directory' => 'folder', - 'exe' => 'exe', - 'image' => 'image', - 'text' => 'txt', - 'text/html' => 'html', - 'text/plain' => 'txt', - 'text/xml' => 'html', - 'text/x-vcalendar' => 'vcalendar', - 'text/calendar' => 'vcalendar', - 'text/x-vcard' => 'vcard', - 'text/x-tex' => 'tex', - 'unknown' => 'unknown', - 'video' => 'video', - 'message' => 'message' -); + 'application/pdf' => 'pdf', + 'application/postscript' => 'postscript', + 'application/msword' => 'word', + 'application/vnd.ms-excel' => 'excel', + 'application/vnd.ms-powerpoint' => 'ppt', + 'application/x-gzip' => 'tgz', + 'application/x-bzip' => 'tgz', + 'application/zip' => 'tgz', + 'application/x-debian-package' => 'deb', + 'application/x-rpm' => 'rpm', + 'application' => 'document', + 'application/octet-stream' => 'unknown', + 'audio' => 'sound', + 'audio/mpeg' => 'sound', + 'Directory' => 'folder', + 'exe' => 'exe', + 'image' => 'image', + 'text' => 'txt', + 'text/html' => 'html', + 'text/plain' => 'txt', + 'text/xml' => 'html', + 'text/x-vcalendar' => 'vcalendar', + 'text/calendar' => 'vcalendar', + 'text/x-vcard' => 'vcard', + 'text/x-tex' => 'tex', + 'unknown' => 'unknown', + 'video' => 'video', + 'message' => 'message' + ); function uifilemanager() { @@ -270,6 +268,7 @@ switch($type) { case 'config': + case 'actions': $button = array ( 'type' => 'submit', @@ -285,7 +284,14 @@ 'value' => lang('cancel') //'caption' => $this->bofilemanager->build_help('cancel') ); - $var[] = array('align' => 'right','height' => '50','valign' => 'bottom','widget' => $button); + if($type == 'actions') + { + $var[] = array('align' => 'right','colspan' => '2','height' => '50','valign' => 'bottom','widget' => $button); + } + else + { + $var[] = array('align' => 'right','height' => '50','valign' => 'bottom','widget' => $button); + } break; case 'menu': $var['option'][] = array @@ -929,18 +935,16 @@ /* To add an on/off preference, just add it here. Key is internal name, value is displayed name */ - $other_checkboxes = array("viewinnewwin" => lang("View documents in new window"), - "viewonserver" => lang("View documents on server (if available)"), - "viewtextplain" => lang("Unknown MIME-type defaults to text/plain when viewing"), - "dotdot" => lang('Show ..'), - "dotfiles" => lang('Show dotfiles'), - "show_help" => lang('Show help'), - "show_command_line" => lang('Show command line (EXPERIMENTAL. DANGEROUS)')); - - /* - To add a input field preferences, add it here. Key is internal name, value key is - displayed name, value values are choices in the dropdown - */ + $other_checkboxes = array + ( + 'viewinnewwin' => lang('View documents in new window'), + 'viewonserver' => lang('View documents on server (if available)'), + 'viewtextplain' => lang('Unknown MIME-type defaults to text/plain when viewing'), + 'dotdot' => lang('Show ..'), + 'dotfiles' => lang('Show dotfiles'), + 'show_help' => lang('Show help'), + 'show_command_line' => lang('Show command line (EXPERIMENTAL. DANGEROUS)') + ); if ($_POST['save']) { @@ -972,7 +976,7 @@ //$GLOBALS['phpgw_info']['flags']['app_header'] = lang('filemanager') . ': ' . lang('preferences'); $data = array(); - $table_head = array('table_col' => array('colspan' => '2','align' => 'left','widget' => array('type' => 'label','caption' => lang('display attributes')))); + $table_head = array('table_col' => array('colspan' => '2','style' => 'font-weight: bold','widget' => array('type' => 'label','caption' => lang('display attributes')))); foreach($this->bofilemanager->file_attributes as $internal => $title) { @@ -983,7 +987,7 @@ } $var = array(); - $var[] = array('class' => 'th','width' => '90%','widget' => array('type' => 'label','caption' => lang('other settings'))); + $var[] = array('class' => 'th','width' => '90%','style' => 'font-weight: bold','widget' => array('type' => 'label','caption' => lang('other settings'))); $var[] = array('class' => 'th','widget' => array('type' => 'empty')); $table_rows[] = array('table_col' => $var); @@ -1110,7 +1114,7 @@ $estr .= ',' . lang('unlimited'); $data = array(); - $table_head = array('table_col' => array('colspan' => '2','align' => 'left','widget' => array('type' => 'label','caption' => lang('edit quota')))); + $table_head = array('table_col' => array('colspan' => '2','style' => 'font-weight: bold','widget' => array('type' => 'label','caption' => lang('edit quota')))); $var = array(); $var[] = array('widget' => array('type' => 'label','width' => '80%','caption' => lang('Enter comma separated Quota value in MB'))); @@ -1118,7 +1122,7 @@ $table_rows[] = array('table_col' => $var); $var = array(); - $var[] = array('class' => 'th','colspan' => '2','widget' => array('type' => 'label','caption' => lang('user menu action scripts'))); + $var[] = array('style' => 'font-weight: bold','colspan' => '2','widget' => array('type' => 'label','caption' => lang('user menu action scripts'))); $table_rows[] = array('table_col' => $var); $var = array(); @@ -1127,7 +1131,7 @@ $table_rows[] = array('table_col' => $var); $var = array(); - $var[] = array('class' => 'th','colspan' => '2','widget' => array('type' => 'label','caption' => lang('periodically check for new files'))); + $var[] = array('style' => 'font-weight: bold','colspan' => '2','widget' => array('type' => 'label','caption' => lang('periodically check for new files'))); $table_rows[] = array('table_col' => $var); $var = array(); @@ -1156,5 +1160,181 @@ //_debug_array($data); $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('config' => $data)); } + + function edit_actions() + { + $config = CreateObject('phpgwapi.config','filemanager'); + $config->read_repository(); + + if ($config->config_data) + { + $items = $config->config_data; + + if($items['user_scripts']) + { + $user_scripts = $items['user_scripts']; + reset($user_scripts); + //_debug_array($user_scripts); + } + } + + if($_POST['save']) + { + $values = $_POST['values']; + + //_debug_array($values); + + if(is_array($values['menu_disabled'])) + { + $config->value('menu_disabled',$values['menu_disabled']); + } + + if(strlen($values['scriptname'])>0 && strlen($values['scripttitle'])>0) + { + if(is_array($user_scripts)) + { + $count = count($user_scripts); + $user_scripts[$count] = array + ( + 'name' => $values['scriptname'], + 'title' => $values['scripttitle'] + ); + } + else + { + $user_scripts[0] = array + ( + 'name' => $values['scriptname'], + 'title' => $values['scripttitle'] + ); + } + $config->value('user_scripts',$user_scripts); + } + $config->save_repository(); + unset($items); + } + elseif($_GET['delete_script']) + { + $script_nr = intval($_GET['script']); + unset($user_scripts[$script_nr]); + reset($user_scripts); + $i = 0; + foreach($user_scripts as $key => $uscript) + { + $nscript[$i] = $uscript; + ++$i; + } + //_debug_array($nscript); + $config->value('user_scripts',$nscript); + $config->save_repository(); + unset($items); + } + + if ($_POST['cancel']) + { + $GLOBALS['phpgw']->redirect_link('/admin/index.php'); + } + + $GLOBALS['phpgw_info']['flags']['app_header'] = lang('filemanager') . ': ' . lang('admin'); + + $config->read_repository(); + if ($config->config_data) + { + $items = $config->config_data; + $disabled = $items['menu_disabled']; + $uscripts = $items['user_scripts']; + //_debug_array($disabled); + if(!is_array($disabled)) + { + $disabled = array(); + } + if(!is_array($uscripts)) + { + $uscripts = array(); + } + unset($config); + } + + $data = array(); + $table_head = array('table_col' => array('colspan' => '3','style' => 'font-weight: bold','widget' => array('type' => 'label','caption' => lang('deactivate menu actions')))); + + $actions = array + ( + 'edit' => lang('Edit'), + 'rename' => lang('Rename'), + 'delete' => lang('Delete'), + 'edit_comments' => lang('Edit comments') + ); + + foreach($actions as $action => $trans) + { + $checked = False; + if(in_array($action,$disabled)) + { + $checked = True; + } + $var = array(); + $var[] = array('colspan' => '2','width' => '90%','widget' => array('type' => 'label','caption' => $trans)); + $var[] = array('align' => 'center','widget' => array('type' => 'checkbox','name' => 'values[menu_disabled][]','value' => $action, 'checked' => $checked)); + $table_rows[] = array('table_col' => $var); + } + + $var = array(); + $var[] = array('class' => 'th','style' => 'font-weight: bold','colspan' => '3','widget' => array('type' => 'label','caption' => lang('additional menu actions'))); + $table_rows[] = array('table_col' => $var); + + $var = array(); + $var[] = array('widget' => array('type' => 'label','caption' => lang('script'))); + $var[] = array('widget' => array('type' => 'label','caption' => lang('user menu action'))); + $var[] = array('widget' => array('type' => 'empty')); + $table_rows[] = array('table_col' => $var); + + reset($uscripts); + $i = 0; + foreach($uscripts as $uscript) + { + $delete_link = array('widget' => array( 'type' => 'image', + 'src' => $GLOBALS['phpgw']->common->image('phpgwapi','delete'), + 'link' => $GLOBALS['phpgw']->link('/index.php','menuaction=filemanager.uifilemanager.edit_actions&delete_script=1&script=' . $i))); + $var = array(); + $var[] = array('widget' => array('type' => 'label','caption' => $uscript['name'])); + $var[] = array('widget' => array('type' => 'label','caption' => $uscript['title'])); + $var[] = $delete_link; + $table_rows[] = array('table_col' => $var); + ++$i; + } + + $scripts = $this->bofilemanager->get_dirfiles($items['script_path']); + $options[] = array('option' => array('value' => '','caption' => lang('select script'))); + if(is_array($scripts)) + { + foreach($scripts as $null => $script) + { + $options[] = array('option' => array('value' => $script,'caption' => $script)); + } + } + + $var = array(); + $var[] = array('widget' => array('type' => 'text','name' => 'values[scripttitle]')); + $var[] = array('widget' => array('type' => 'select','name' => 'values[scriptname]','options' => $options)); + $var[] = array('widget' => array('type' => 'empty')); + $table_rows[] = array('table_col' => $var); + + $table_footer = array('table_col' => $this->display_buttons('actions')); + + if(is_array($error)) + { + $errormsg = explode('
',$error); + } + + $data = array + ( + 'error' => $errormsg, + 'action_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=filemanager.uifilemanager.edit_actions'), + 'table' => array('width' => '50%','table_head' => $table_head ,'table_row' => $table_rows,'table_footer' => $table_footer) + ); + //_debug_array($data); + $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('config' => $data)); + } } ?> ==================================================== Index: filemanager/inc/class.bofilemanager.inc.php diff -u filemanager/inc/class.bofilemanager.inc.php:1.22 filemanager/inc/class.bofilemanager.inc.php:1.23 --- filemanager/inc/class.bofilemanager.inc.php:1.22 Sat Apr 9 00:19:32 2005 +++ filemanager/inc/class.bofilemanager.inc.php Sat Apr 9 21:56:02 2005 @@ -1182,21 +1182,28 @@ } } - function get_dirfiles() + function get_dirfiles($basedir = '') { - $basedir = $this->basedir . $this->path; - $dir = opendir($basedir); + if($basedir = '') + { + $basedir = $this->basedir . $this->path; + } $files = array(); - $i = 0; - while ($file = readdir($dir)) + if(is_dir($basedir)) { - if ($file != '.' && $file != '..') + $dir = opendir($basedir); + $i = 0; + while ($file = readdir($dir)) { - $files[$i] = $file; - ++$i; - } - } + if ($file != '.' && $file != '..') + { + $files[$i] = $file; + ++$i; + } + } + closedir($dir); + } return $files; } From MAILER-DAEMON Sat Apr 09 19:12:34 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DKP7x-0006Z0-21 for mharc-phpgroupware-cvs@gnu.org; Sat, 09 Apr 2005 19:12:33 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DKP7o-0006WB-F6 for phpgroupware-cvs@gnu.org; Sat, 09 Apr 2005 19:12:25 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DKP7i-0006Tc-DG for phpgroupware-cvs@gnu.org; Sat, 09 Apr 2005 19:12:21 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DKP7g-0006S1-US for phpgroupware-cvs@gnu.org; Sat, 09 Apr 2005 19:12:17 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DKPS9-0005C2-4R for phpgroupware-cvs@gnu.org; Sat, 09 Apr 2005 19:33:25 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 6AAB4312C7 for ; Sun, 10 Apr 2005 01:31:36 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 23282-08 for ; Sun, 10 Apr 2005 01:30:32 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 9BF9D312B9 for ; Sun, 10 Apr 2005 01:30:32 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j39NUWb02567; Sun, 10 Apr 2005 01:30:32 +0200 Message-Id: <200504092330.j39NUWb02567@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: ceb Date: Sun, 10 Apr 2005 00:36:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] projects/setup setup.inc.php, 1.58 default_records.inc.php, 1.2 tables_baseline.inc.php, 1.3 tables_current.inc.php, 1.47 tables_update.inc.php, 1.54 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Apr 2005 23:12:30 -0000 Update of projects/setup Modified Files: Branch: MAIN setup.inc.php lines: +11 -10 default_records.inc.php lines: +10 -10 tables_baseline.inc.php lines: +11 -10 tables_current.inc.php lines: +11 -14 tables_update.inc.php lines: +11 -10 Log Message: kais headers ==================================================== Index: projects/setup/setup.inc.php diff -u projects/setup/setup.inc.php:1.57 projects/setup/setup.inc.php:1.58 --- projects/setup/setup.inc.php:1.57 Fri Apr 1 23:52:28 2005 +++ projects/setup/setup.inc.php Sat Apr 9 22:36:30 2005 @@ -1,14 +1,15 @@ oProc->query("INSERT into phpgw_p_events (event_name,event_type,event_extra) values('hours limit','percent',90)",__LINE__,__FILE__); $GLOBALS['phpgw_setup']->oProc->query("INSERT into phpgw_p_events (event_name,event_type,event_extra) values('budget limit','percent',90)",__LINE__,__FILE__); ==================================================== Index: projects/setup/tables_baseline.inc.php diff -u projects/setup/tables_baseline.inc.php:1.2 projects/setup/tables_baseline.inc.php:1.3 --- projects/setup/tables_baseline.inc.php:1.2 Fri Jun 15 04:22:12 2001 +++ projects/setup/tables_baseline.inc.php Sat Apr 9 22:36:30 2005 @@ -1,14 +1,15 @@ array( ==================================================== Index: projects/setup/tables_current.inc.php diff -u projects/setup/tables_current.inc.php:1.46 projects/setup/tables_current.inc.php:1.47 --- projects/setup/tables_current.inc.php:1.46 Mon Mar 14 17:39:39 2005 +++ projects/setup/tables_current.inc.php Sat Apr 9 22:36:30 2005 @@ -1,18 +1,15 @@ array( ==================================================== Index: projects/setup/tables_update.inc.php diff -u projects/setup/tables_update.inc.php:1.53 projects/setup/tables_update.inc.php:1.54 --- projects/setup/tables_update.inc.php:1.53 Fri Apr 1 23:52:28 2005 +++ projects/setup/tables_update.inc.php Sat Apr 9 22:36:30 2005 @@ -1,14 +1,15 @@ ; Sun, 10 Apr 2005 01:31:19 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 23935-06 for ; Sun, 10 Apr 2005 01:31:05 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id B344C312C7 for ; Sun, 10 Apr 2005 01:31:05 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j39NV5U02600; Sun, 10 Apr 2005 01:31:05 +0200 Message-Id: <200504092331.j39NV5U02600@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: ceb Date: Sun, 10 Apr 2005 00:36:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] projects/inc hook_sidebox_menu.inc.php, 1.14 hook_preferences.inc.php, 1.27 hook_admin.inc.php, 1.23 hook_deleteaccount.inc.php, 1.7 hook_home.inc.php, 1.5 hook_manual.inc.php, 1.4 hook_add_def_pref.inc.php, 1.9 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Apr 2005 23:12:31 -0000 Update of projects/inc Modified Files: Branch: MAIN hook_sidebox_menu.inc.php lines: +12 -11 hook_preferences.inc.php lines: +10 -10 hook_admin.inc.php lines: +10 -10 hook_deleteaccount.inc.php lines: +10 -10 hook_home.inc.php lines: +10 -11 hook_manual.inc.php lines: +10 -11 hook_add_def_pref.inc.php lines: +3 -4 Log Message: kais headers ==================================================== Index: projects/inc/hook_sidebox_menu.inc.php diff -u projects/inc/hook_sidebox_menu.inc.php:1.13 projects/inc/hook_sidebox_menu.inc.php:1.14 --- projects/inc/hook_sidebox_menu.inc.php:1.13 Thu Mar 31 23:00:22 2005 +++ projects/inc/hook_sidebox_menu.inc.php Sat Apr 9 22:36:30 2005 @@ -1,15 +1,16 @@ * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - /* $Id$ */ + /** + * Project Manager - Sidebox-Menu for iDots Template + * + * @author Bettina Gille [ceb@phpgroupware.org] + * @author Pim Snel + * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package projects + * @version $Id$ + * $Source$ + */ + { $boprojects = CreateObject('projects.boprojects'); $appname = 'projects'; ==================================================== Index: projects/inc/hook_preferences.inc.php diff -u projects/inc/hook_preferences.inc.php:1.26 projects/inc/hook_preferences.inc.php:1.27 --- projects/inc/hook_preferences.inc.php:1.26 Sat Jun 19 22:47:32 2004 +++ projects/inc/hook_preferences.inc.php Sat Apr 9 22:36:30 2005 @@ -1,14 +1,14 @@ * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - /* $Id$ */ + /** + * Project Manager - Manual + * + * @author Bettina Gille [ceb@phpgroupware.org] + * @author Mark Peters + * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package projects + * @version $Id$ + */ // Only Modify the $file variable..... $file = Array(); ==================================================== Index: projects/inc/hook_add_def_pref.inc.php diff -u projects/inc/hook_add_def_pref.inc.php:1.8 projects/inc/hook_add_def_pref.inc.php:1.9 --- projects/inc/hook_add_def_pref.inc.php:1.8 Fri Apr 8 15:52:58 2005 +++ projects/inc/hook_add_def_pref.inc.php Sat Apr 9 22:36:30 2005 @@ -1,12 +1,11 @@ ; Mon, 11 Apr 2005 01:30:31 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 26920-02 for ; Mon, 11 Apr 2005 01:30:28 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id EECB3312DE for ; Mon, 11 Apr 2005 01:30:27 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3ANURU14811; Mon, 11 Apr 2005 01:30:27 +0200 Message-Id: <200504102330.j3ANURU14811@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: ceb Date: Mon, 11 Apr 2005 00:36:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] filemanager/inc class.uiactions.inc.php, 1.3 hook_sidebox_menu.inc.php, 1.2 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Apr 2005 23:10:40 -0000 Update of filemanager/inc Modified Files: Branch: MAIN class.uiactions.inc.php lines: +175 -3 hook_sidebox_menu.inc.php lines: +17 -17 Log Message: added functions for attaching files ==================================================== Index: filemanager/inc/class.uiactions.inc.php diff -u filemanager/inc/class.uiactions.inc.php:1.2 filemanager/inc/class.uiactions.inc.php:1.3 --- filemanager/inc/class.uiactions.inc.php:1.2 Sat Jan 22 02:22:52 2005 +++ filemanager/inc/class.uiactions.inc.php Sun Apr 10 22:36:06 2005 @@ -1,8 +1,180 @@ + * @copyright Copyright (C) 2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package filemanager + * @version $Id$ + * $Source$ + */ class uiactions - { - var $action_classes = array( + { + var $public_functions = array + ( + 'show_file' => True, + 'save_file' => True, + 'delete_file' => True, + 'get_file' => True + ); + var $file; + var $action_id; + var $app; + var $appdir; + + function uiactions() + { + $this->app = $_REQUEST['app']?$_REQUEST['app']:$GLOBALS['phpgw_info']['flags']['currentapp']; + $this->appdir = $GLOBALS['basedir'] . '/' . $this->app; + + $this->file = $_REQUEST['file']; + $this->action_id = $_REQUEST['action_id']; + + if (@!is_object($GLOBALS['phpgw']->vfs)) + { + $GLOBALS['phpgw']->vfs = CreateObject ('phpgwapi.vfs'); + } + $GLOBALS['phpgw']->vfs->override_acl = True; + } + + function show_file() + { + $ls_array = $GLOBALS['phpgw']->vfs->ls(array + ( + 'string' => $this->file, + 'relatives' => array (RELATIVE_ALL), + 'checksubdirs' => False, + 'nofiles' => True + )); + + if ($ls_array[0]['mime_type']) + { + $mime_type = $ls_array[0]['mime_type']; + } + elseif ($GLOBALS['settings']['viewtextplain']) + { + $mime_type = 'application/octet-stream;'; + } + $filename = basename($this->file); + header('Content-type: ' . $mime_type); + header('Content-Disposition: attachment; filename=' . $filename); + echo $GLOBALS['phpgw']->vfs->read(array + ( + 'string' => $this->file, + 'relatives' => array(RELATIVE_NONE) + )); + $GLOBALS['phpgw']->common->phpgw_exit(); + } + + function save_file($action_id, $source = '', $destination = '') + { + //Check if home/groupdirectory exists. If not, we create it + if (!file_exists($this->appdir)) + { + $GLOBALS['phpgw']->vfs->override_acl = 1; + $GLOBALS['phpgw']->vfs->mkdir(array + ( + 'string' => $this->appdir, + 'relatives' => array (RELATIVE_ALL) + )); + $GLOBALS['phpgw']->vfs->override_acl = 0; + } + + $attdir = $this->appdir . '/' . $action_id; + + if (!file_exists($attdir)) + { + $GLOBALS['phpgw']->vfs->override_acl = 1; + $GLOBALS['phpgw']->vfs->mkdir(array + ( + 'string' => $attdir, + 'relatives' => array (RELATIVE_ALL) + )); + $GLOBALS['phpgw']->vfs->override_acl = 0; + } + + if(!$source || !$destination) + { + $source = $_FILES['attachment']['tmp_name']; + $destination = $_FILES['attachment']['name']; + } + + $GLOBALS['phpgw']->vfs->override_acl = 1; + $GLOBALS['phpgw']->vfs->cp(array + ( + 'from' => $source, + 'to' => $attdir . '/' . $destination, + 'relatives' => array (RELATIVE_NONE|VFS_REAL, RELATIVE_ALL) + )); + $GLOBALS['phpgw']->vfs->override_acl = 0; + } + + function delete_file() + { + //$this->app = $_GET['app']; + //$this->appdir = $GLOBALS['basedir'] . '/' . $this->app; + + if(!$this->file && file_exists($this->appdir . '/' . $this->action_id)) + { + $GLOBALS['phpgw']->vfs->override_acl = 1; + $GLOBALS['phpgw']->vfs->delete(array + ( + 'string' => $this->appdir . '/' . $this->action_id, + 'relatives' => array (RELATIVE_ALL) + )); + $GLOBALS['phpgw']->vfs->override_acl = 0; + } + elseif($this->file) + { + $GLOBALS['phpgw']->vfs->override_acl = 1; + $GLOBALS['phpgw']->vfs->rm(array + ( + 'string' => $this->appdir . '/' . $this->action_id . '/' . $this->file, + 'relatives' => array (RELATIVE_ALL) + )); + $GLOBALS['phpgw']->vfs->override_acl = 0; + + Header('Location: ' . $_SERVER['HTTP_REFERER']); + //$GLOBALS['phpgw']->redirect_link($referer); + } + } + + function get_files($action_id, $delete = False) + { + $directory = '/' . $this->app . '/' . $action_id; + + $GLOBALS['phpgw']->db->query("SELECT name from phpgw_vfs where directory like '" . $directory . "' AND size > 0 AND mime_type NOT like 'journal-deleted'",__LINE__,__FILE__); + + while($GLOBALS['phpgw']->db->next_record() != '') + { + $attachment = $directory . '/' . $GLOBALS['phpgw']->db->f('name'); + + $view_link = $GLOBALS['phpgw']->link('/index.php',array('menuaction' => 'filemanager.uiactions.show_file','file' => $attachment,'app' => $this->app)); + if($delete) + { + $del_link = $GLOBALS['phpgw']->link('/index.php',array + ( + 'menuaction' => 'filemanager.uiactions.delete_file', + 'action_id' => $action_id, + 'file' => basename($attachment), + 'app' => $this->app)); + $del = ''; + } + $att_link .= '' . basename($attachment) . '  ' . $del . '
'; + } + return $att_link; + } + + function file_exists($data) + { + return $GLOBALS['phpgw']->vfs->file_exists($data); + } + + + /*var $action_classes = array( 0=>'filemanager.uiaction_edit' ); var $actions = array(); @@ -46,6 +218,6 @@ } } - } + }*/ } ?> ==================================================== Index: filemanager/inc/hook_sidebox_menu.inc.php diff -u filemanager/inc/hook_sidebox_menu.inc.php:1.1 filemanager/inc/hook_sidebox_menu.inc.php:1.2 --- filemanager/inc/hook_sidebox_menu.inc.php:1.1 Tue Feb 8 00:06:31 2005 +++ filemanager/inc/hook_sidebox_menu.inc.php Sun Apr 10 22:36:07 2005 @@ -1,17 +1,17 @@ * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - /* $Id$ */ + /** + * Filemanager - Sidebox-Menu for iDots Template + * + * @author Bettina Gille [ceb@phpgroupware.org] + * @author Pim Snel + * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package filemanager + * @version $Id$ + * $Source$ + */ - /* + /* This hookfile is for generating an app-specific side menu used in the idots template set. @@ -22,12 +22,12 @@ */ { - $appname = 'filemanager'; - $menu_title = $GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. lang('Menu'); + $appname = 'filemanager'; + $menu_title = $GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. lang('Menu'); - $file[] = array('text' => 'Preferences', - 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=filemanager.uifilemanager.preferences')); + $file[] = array('text' => 'Preferences', + 'url' => $GLOBALS['phpgw']->link('/index.php','menuaction=filemanager.uifilemanager.preferences')); - display_sidebox($appname,$menu_title,$file); + display_sidebox($appname,$menu_title,$file); } ?> From MAILER-DAEMON Sun Apr 10 19:11:04 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DKla2-0007As-SZ for mharc-phpgroupware-cvs@gnu.org; Sun, 10 Apr 2005 19:11:03 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DKlZw-00077A-4N for phpgroupware-cvs@gnu.org; Sun, 10 Apr 2005 19:10:56 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DKlZt-00073P-Ck for phpgroupware-cvs@gnu.org; Sun, 10 Apr 2005 19:10:54 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DKlZm-0006uQ-JI for phpgroupware-cvs@gnu.org; Sun, 10 Apr 2005 19:10:46 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DKlv9-00006Z-2T for phpgroupware-cvs@gnu.org; Sun, 10 Apr 2005 19:32:51 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id E48ED312E6 for ; Mon, 11 Apr 2005 01:30:44 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 22622-09 for ; Mon, 11 Apr 2005 01:30:42 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 903CB312DE for ; Mon, 11 Apr 2005 01:30:42 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3ANUgj14824; Mon, 11 Apr 2005 01:30:42 +0200 Message-Id: <200504102330.j3ANUgj14824@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: ceb Date: Mon, 11 Apr 2005 00:40:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] projects/inc class.uiprojects_base.inc.php, 1.12 class.uiprojects.inc.php, 1.159 class.attached_files.inc.php, 1.3 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Apr 2005 23:10:57 -0000 Update of projects/inc Modified Files: Branch: MAIN class.uiprojects_base.inc.php lines: +3 -2 class.uiprojects.inc.php lines: +7 -15 Removed Files: Branch: MAIN class.attached_files.inc.php Log Message: update attached files ==================================================== Index: projects/inc/class.uiprojects_base.inc.php diff -u projects/inc/class.uiprojects_base.inc.php:1.11 projects/inc/class.uiprojects_base.inc.php:1.12 --- projects/inc/class.uiprojects_base.inc.php:1.11 Fri Apr 8 15:52:58 2005 +++ projects/inc/class.uiprojects_base.inc.php Sun Apr 10 22:40:36 2005 @@ -968,6 +968,7 @@ $GLOBALS['phpgw']->template->set_var('lang_billable',lang('billable')); $GLOBALS['phpgw']->template->set_var('lang_files',lang('files')); $GLOBALS['phpgw']->template->set_var('lang_attach',lang('attach file')); + $GLOBALS['phpgw']->template->set_var('lang_plan_bottom_up',lang('plan bottom up')); $GLOBALS['phpgw']->template->set_var('lang_direct_work',lang('direct work')); $GLOBALS['phpgw']->template->set_var('lang_sum',lang('Sum')); ==================================================== Index: projects/inc/class.uiprojects.inc.php diff -u projects/inc/class.uiprojects.inc.php:1.158 projects/inc/class.uiprojects.inc.php:1.159 --- projects/inc/class.uiprojects.inc.php:1.158 Fri Apr 8 15:52:58 2005 +++ projects/inc/class.uiprojects.inc.php Sun Apr 10 22:40:36 2005 @@ -48,7 +48,7 @@ $this->boprojects = $this->ui_base->boprojects; $this->nextmatchs = CreateObject('phpgwapi.nextmatchs'); - //$this->attached_files = CreateObject('projects.attached_files'); + $this->attached_files = CreateObject('filemanager.uiactions'); $this->start = $this->boprojects->start; $this->query = $this->boprojects->query; @@ -408,8 +408,6 @@ $GLOBALS['phpgw']->template->set_var('customer_main',$main['customerout']); $GLOBALS['phpgw']->template->set_var('customer_org_name',$main['customerorgout']); $GLOBALS['phpgw']->template->set_var('url_main',$main['url']); - $GLOBALS['phpgw']->template->set_var('attachment',$this->attached_files->get_files($pro_main)); - $GLOBALS['phpgw']->template->set_var('lang_files',lang('Files')); $link = $GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.report&project_id=' . $pro_main . '&generated=1'); $GLOBALS['phpgw']->template->set_var('report','' . lang('generate activity report') . ''); $GLOBALS['phpgw']->template->parse('main','project_main',True); @@ -658,7 +656,6 @@ // ---------------- list header variable template-declarations -------------------------- $this->t->set_var('sort_number',$this->nextmatchs->show_sort_order($this->sort,'p_number',$this->order,'/index.php',lang('Project ID'),$link_data)); - $this->t->set_var('lang_milestones',lang('milestones')); $this->t->set_var('sort_title',$this->nextmatchs->show_sort_order($this->sort,'title',$this->order,'/index.php',lang('Title'),$link_data)); $this->t->set_var('sort_end_date',$this->nextmatchs->show_sort_order($this->sort,'end_date',$this->order,'/index.php',lang('Date due'),$link_data)); $this->t->set_var('sort_coordinator',$this->nextmatchs->show_sort_order($this->sort,'coordinator',$this->order,'/index.php',lang('Coordinator'),$link_data)); @@ -860,7 +857,7 @@ else { $project_id = $this->boprojects->save_project($action, $values); - //$this->attached_files->save_file($project_id); + $this->attached_files->save_file($project_id); $link_data['project_id'] = $project_id; if($_POST['save']) { @@ -1361,9 +1358,7 @@ $GLOBALS['phpgw']->template->set_var('test',$values['test']); $GLOBALS['phpgw']->template->set_var('quality',$values['quality']); - //$GLOBALS['phpgw']->template->set_var('attachment',$this->attached_files->get_files($project_id, True)); - $GLOBALS['phpgw']->template->set_var('lang_files',lang('Files')); - $GLOBALS['phpgw']->template->set_var('lang_attach',lang('Attach File')); + $GLOBALS['phpgw']->template->set_var('attachment',$this->attached_files->get_files($project_id, True)); //--------- coordinator ------------- @@ -1437,8 +1432,6 @@ $GLOBALS['phpgw']->template->set_var('customer_org_name', $customer_org_name); $GLOBALS['phpgw']->template->set_var('customer_org', $customer_org_id); - //$GLOBALS['phpgw']->template->set_var('attachment',$this->attached_files->get_files($project_id,True)); - if ($project_id && $this->boprojects->edit_perms(array('action' => $action,'coordinator' => $values['coordinator'],'main_co' => $main['coordinator'], 'parent_co' => $parent['coordinator'],'type' => 'delete'))) { @@ -1602,6 +1595,8 @@ $GLOBALS['phpgw']->template->set_var('udate',$values['udate_formatted']); $GLOBALS['phpgw']->template->set_var('cdate',$values['cdate_formatted']); + $GLOBALS['phpgw']->template->set_var('attachment',$this->attached_files->get_files($project_id)); + //--------- coordinator ------------- $GLOBALS['phpgw']->template->set_var('lang_coordinator',lang('Coordinator')); @@ -1617,7 +1612,6 @@ // --------- milestones ------------------------------ - $GLOBALS['phpgw']->template->set_var('lang_milestones',lang('milestones').':'); $mstones = $this->boprojects->get_mstones($project_id); //$link_data['menuaction'] = 'projects.uiprojects.edit_mstone'; @@ -1717,8 +1711,6 @@ 'location' => 'projects_view', 'project_id' => $project_id ));*/ - - //$GLOBALS['phpgw']->template->set_var('attachment',$this->attached_files->get_files($project_id)); $GLOBALS['phpgw']->template->set_var('ownhandle',''); $GLOBALS['phpgw']->template->set_var('acthandle',''); From MAILER-DAEMON Mon Apr 11 08:08:48 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DKxh8-0004yF-3L for mharc-phpgroupware-cvs@gnu.org; Mon, 11 Apr 2005 08:07:10 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DKxgr-0004lm-9N for phpgroupware-cvs@gnu.org; Mon, 11 Apr 2005 08:06:54 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DKxgJ-0004Nj-FO for phpgroupware-cvs@gnu.org; Mon, 11 Apr 2005 08:06:21 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DKxgA-00045n-S2 for phpgroupware-cvs@gnu.org; Mon, 11 Apr 2005 08:06:11 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DKy5e-00067z-UI for phpgroupware-cvs@gnu.org; Mon, 11 Apr 2005 08:32:31 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 35926312FF for ; Mon, 11 Apr 2005 14:30:15 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 00255-07 for ; Mon, 11 Apr 2005 14:30:13 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 21E2A312D6 for ; Mon, 11 Apr 2005 14:30:13 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3BCUDI22258; Mon, 11 Apr 2005 14:30:13 +0200 Message-Id: <200504111230.j3BCUDI22258@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: sigurdne Date: Mon, 11 Apr 2005 14:01:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] property/inc class.soinvoice.inc.php,1.10 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Apr 2005 12:07:08 -0000 Update of property/inc Modified Files: Branch: MAIN class.soinvoice.inc.php lines: +2 -1 Log Message: no message ==================================================== Index: property/inc/class.soinvoice.inc.php diff -u property/inc/class.soinvoice.inc.php:1.9 property/inc/class.soinvoice.inc.php:1.10 --- property/inc/class.soinvoice.inc.php:1.9 Fri Feb 18 07:51:34 2005 +++ property/inc/class.soinvoice.inc.php Mon Apr 11 12:01:39 2005 @@ -369,6 +369,7 @@ while ($this->db->next_record()) { $invoice[$i]['counter'] = $i; + $invoice[$i]['project_id'] = $this->db->f('project_id'); $invoice[$i]['workorder_id'] = $this->db->f('pmwrkord_code'); $invoice[$i]['status'] = $this->db->f('status'); if ($this->db->f('status')=='closed') From MAILER-DAEMON Mon Apr 11 08:09:26 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DKxj6-0005py-1D for mharc-phpgroupware-cvs@gnu.org; Mon, 11 Apr 2005 08:09:12 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DKxil-0005dh-7H for phpgroupware-cvs@gnu.org; Mon, 11 Apr 2005 08:08:51 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DKxhH-00053s-FN for phpgroupware-cvs@gnu.org; Mon, 11 Apr 2005 08:07:19 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DKxgB-00045n-QR for phpgroupware-cvs@gnu.org; Mon, 11 Apr 2005 08:06:11 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DKy5c-00067r-6J for phpgroupware-cvs@gnu.org; Mon, 11 Apr 2005 08:32:28 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 6A853312FF for ; Mon, 11 Apr 2005 14:30:12 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 00320-06 for ; Mon, 11 Apr 2005 14:30:08 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id BC426312D6 for ; Mon, 11 Apr 2005 14:30:08 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3BCU8I22251; Mon, 11 Apr 2005 14:30:08 +0200 Message-Id: <200504111230.j3BCU8I22251@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: sigurdne Date: Mon, 11 Apr 2005 13:59:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] property/inc class.sowo_hour.inc.php,1.4 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Apr 2005 12:09:10 -0000 Update of property/inc Modified Files: Branch: MAIN class.sowo_hour.inc.php lines: +16 -9 Log Message: no message ==================================================== Index: property/inc/class.sowo_hour.inc.php diff -u property/inc/class.sowo_hour.inc.php:1.3 property/inc/class.sowo_hour.inc.php:1.4 --- property/inc/class.sowo_hour.inc.php:1.3 Thu Jan 13 16:52:48 2005 +++ property/inc/class.sowo_hour.inc.php Mon Apr 11 11:59:02 2005 @@ -287,13 +287,20 @@ $this->db->transaction_begin(); + $values_insert= array( + $this->account, + $values['name'], + $values['descr'], + $workorder['chapter_id'], + time() + ); + + $values_insert = $this->bocommon->validate_db_insert($values_insert); + $this->db->query("insert into fm_template (owner,name,descr,chapter_id,entry_date) " - . " values ('" . - $this->account . "','" . - $values['name'] . "','" . - $values['descr'] . "','" . - $workorder['chapter_id'] . "','" . - time() . "')",__LINE__,__FILE__); + . " values ($values_insert)",__LINE__,__FILE__); + + unset ($values_insert); $template_id = $this->db->get_last_insert_id('fm_template','id'); @@ -304,7 +311,7 @@ for ($i=0; $iaccount, @@ -323,11 +330,11 @@ $record, $template_id ); - $values = $this->bocommon->validate_db_insert($values); + $values_insert = $this->bocommon->validate_db_insert($values_insert); $this->db->query("insert into fm_template_hours (activity_id,activity_num,owner,hours_descr,unit," . "cost,quantity,billperae,ns3420_id,dim_d,grouping_id,grouping_descr,remark,tolerance,building_part,record,template_id) " - . " values ($values)",__LINE__,__FILE__); + . " values ($values_insert)",__LINE__,__FILE__); $record++; } From MAILER-DAEMON Tue Apr 12 10:02:12 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DLLy0-00051o-8y for mharc-phpgroupware-cvs@gnu.org; Tue, 12 Apr 2005 10:02:12 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DLLxx-0004z6-4u for phpgroupware-cvs@gnu.org; Tue, 12 Apr 2005 10:02:09 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DLLxp-0004vN-W6 for phpgroupware-cvs@gnu.org; Tue, 12 Apr 2005 10:02:07 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DLLxp-0004vK-Ta for phpgroupware-cvs@gnu.org; Tue, 12 Apr 2005 10:02:01 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DLMQN-0004ge-Kz for phpgroupware-cvs@gnu.org; Tue, 12 Apr 2005 10:31:32 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 18FDA312C4 for ; Tue, 12 Apr 2005 16:30:37 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 13279-05 for ; Tue, 12 Apr 2005 16:30:35 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id F3CA4312B1 for ; Tue, 12 Apr 2005 16:30:34 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3CEUYv22674; Tue, 12 Apr 2005 16:30:34 +0200 Message-Id: <200504121430.j3CEUYv22674@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: sigurdne Date: Tue, 12 Apr 2005 16:14:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] property/inc/export Agresso,1.20 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Apr 2005 14:02:10 -0000 Update of property/inc/export Modified Files: Branch: MAIN Agresso lines: +29 -4 Log Message: no message ==================================================== Index: property/inc/export/Agresso diff -u property/inc/export/Agresso:1.19 property/inc/export/Agresso:1.20 --- property/inc/export/Agresso:1.19 Mon Feb 7 13:22:11 2005 +++ property/inc/export/Agresso Tue Apr 12 14:14:54 2005 @@ -568,7 +568,7 @@ if($pre_transfer) { - $Bilagsart = sprintf("%2s",'FE');// verdi: , type: c2, plass: 15 - 16 + $Bilagsart = sprintf("%2s",'FF');// verdi: , type: c2, plass: 15 - 16 $Forfall = '20991231';// verdi: Forfallsdato , type: date, plass: 298 - 305 } else @@ -738,12 +738,14 @@ $Antall = sprintf("%11s",'');// verdi: Blank, type: i4, plass: 130 - 140 $Belop2 = sprintf("%20s",'');// verdi: Blank, type: f8, plass: 141 - 160 $Belop3 = sprintf("%20s",'');// verdi: Blank, type: money, plass: 161 - 180 - $Belop4 = sprintf("%20s",'');// verdi: Blank, type: money, plass: 181 - 200 + + // $Belop4 (også kalt "money3" )blir brukt for identifisere overføring på tvers av filer. + $Belop4 = sprintf("%20s",$batchid);// verdi: Blank, type: money, plass: 181 - 200 - batch_id høyre justert if($oRsOverfBilag['pmwrkord_code']) { - $Tekst = sprintf("%-50s",$this->get_order_title($oRsOverfBilag['pmwrkord_code']));//sprintf("%-50s",substr($oRsOverfBilag['merknad'],0,50));// verdi: Tekst, type: text (50), plass: 201 - 250 + $Tekst = sprintf("%-50s",substr($this->get_order_title($oRsOverfBilag['pmwrkord_code']),0,50));//sprintf("%-50s",substr($oRsOverfBilag['merknad'],0,50));// verdi: Tekst, type: text (50), plass: 201 - 250 } else { @@ -848,11 +850,22 @@ { $fp = fopen($Filnavn, "wb"); fwrite($fp,$buffer); + if(fclose($fp)) { + $file_written=True; + } + + if($file_written && $this->config->config_data['invoice_export_method']!='ftp'): + { + $transfer_ok = True; + } + elseif($file_written): + { $transfer_ok = $this->transfer($buffer,$Filnavn,$batchid,$tranfser_bilag); } - + endif; + if($transfer_ok) { $this->db->transaction_commit(); @@ -866,12 +879,24 @@ } elseif($download=='on' && $pre_transfer && !$this->debug): { + $fp = fopen($Filnavn, "wb"); fwrite($fp,$buffer); + if(fclose($fp)) { + $file_written=True; + } + + if($file_written && $this->config->config_data['invoice_export_method']!='ftp'): + { + $transfer_ok = True; + } + elseif($file_written): + { $transfer_ok = $this->transfer($buffer,$Filnavn,$batchid,$tranfser_bilag); } + endif; if($transfer_ok) { From MAILER-DAEMON Tue Apr 12 10:02:12 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DLLy0-00051w-FE for mharc-phpgroupware-cvs@gnu.org; Tue, 12 Apr 2005 10:02:12 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DLLxx-0004zB-O9 for phpgroupware-cvs@gnu.org; Tue, 12 Apr 2005 10:02:09 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DLLxq-0004vj-IQ for phpgroupware-cvs@gnu.org; Tue, 12 Apr 2005 10:02:07 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DLLxq-0004vK-Et for phpgroupware-cvs@gnu.org; Tue, 12 Apr 2005 10:02:02 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DLMQ1-0004ev-7F for phpgroupware-cvs@gnu.org; Tue, 12 Apr 2005 10:31:10 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id AA1AD312C4 for ; Tue, 12 Apr 2005 16:30:13 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 13126-07 for ; Tue, 12 Apr 2005 16:30:10 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id CFFDD312B1 for ; Tue, 12 Apr 2005 16:30:10 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3CEUAK22651; Tue, 12 Apr 2005 16:30:10 +0200 Message-Id: <200504121430.j3CEUAK22651@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: sigurdne Date: Tue, 12 Apr 2005 16:12:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] property/templates/default tenant_claim.xsl,1.1 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Apr 2005 14:02:10 -0000 Update of property/templates/default Added Files: Branch: MAIN tenant_claim.xsl Log Message: no message ==================================================== Index: tenant_claim.xsl
row_off row_on window.status=' '; return true;
X
[ ]
[ ]
[ ] ( % )
[ ]
window.status=' '; return true; window.status=' '; return true;
window.status=' '; return true; [ ]
window.status=' '; return true; window.status=' '; return true; window.status=' '; return true;
X
[ ]
[ ]
[ ] ( % )
[ ]
,
&id= row_off row_on window.status=' '; return true; window.status=' '; return true; From MAILER-DAEMON Tue Apr 12 10:02:13 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DLLy0-00052B-Nq for mharc-phpgroupware-cvs@gnu.org; Tue, 12 Apr 2005 10:02:12 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DLLxy-00050Z-Gd for phpgroupware-cvs@gnu.org; Tue, 12 Apr 2005 10:02:10 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DLLxq-0004vb-8c for phpgroupware-cvs@gnu.org; Tue, 12 Apr 2005 10:02:09 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DLLxq-0004vK-5i for phpgroupware-cvs@gnu.org; Tue, 12 Apr 2005 10:02:02 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DLMQK-0004gD-OH for phpgroupware-cvs@gnu.org; Tue, 12 Apr 2005 10:31:30 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 41F2C312C4 for ; Tue, 12 Apr 2005 16:30:34 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 12973-06 for ; Tue, 12 Apr 2005 16:30:29 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 33A8B312B1 for ; Tue, 12 Apr 2005 16:30:29 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3CEUTK22667; Tue, 12 Apr 2005 16:30:29 +0200 Message-Id: <200504121430.j3CEUTK22667@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: sigurdne Date: Tue, 12 Apr 2005 16:12:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] property/inc class.sotenant_claim.inc.php, 1.1 class.botenant_claim.inc.php, 1.1 class.uitenant_claim.inc.php, 1.1 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Apr 2005 14:02:11 -0000 Update of property/inc Added Files: Branch: MAIN class.sotenant_claim.inc.php class.botenant_claim.inc.php class.uitenant_claim.inc.php Log Message: no message ==================================================== Index: class.sotenant_claim.inc.php currentapp = $GLOBALS['phpgw_info']['flags']['currentapp']; $this->db = $GLOBALS['phpgw']->db; $this->db2 = $this->db; $this->account = $GLOBALS['phpgw_info']['user']['account_id']; $this->bocommon = CreateObject($this->currentapp.'.bocommon'); $this->join = $this->bocommon->join; } function select_category_list() { $this->db->query("SELECT id,descr FROM fm_tenant_claim_category ORDER BY descr "); $i = 0; while ($this->db->next_record()) { $categories[$i]['id'] = $this->db->f('id'); $categories[$i]['name'] = stripslashes($this->db->f('descr')); $i++; } return $categories; } function read_category_name($cat_id) { $this->db->query("SELECT descr FROM fm_tenant_claim_category where id='$cat_id'"); $this->db->next_record(); return $this->db->f('descr'); } function read($data) { if(is_array($data)) { $start = (isset($data['start'])?$data['start']:0); $filter = (isset($data['filter'])?$data['filter']:'none'); $query = (isset($data['query'])?$data['query']:''); $sort = (isset($data['sort'])?$data['sort']:'DESC'); $order = (isset($data['order'])?$data['order']:''); $cat_id = (isset($data['cat_id'])?$data['cat_id']:0); $allrows = (isset($data['allrows'])?$data['allrows']:''); } if ($order) { $ordermethod = " order by $order $sort"; } else { $ordermethod = ' order by id DESC'; } $where = 'WHERE'; if ($cat_id > 0) { $filtermethod .= " $where category='$cat_id' "; $where = 'AND'; } if($query) { $query = ereg_replace("'",'',$query); $query = ereg_replace('"','',$query); $querymethod = " $where ( abid = '$query' or org_name LIKE '%$query%')"; } $sql = "SELECT fm_tenant_claim.*, descr as category FROM fm_tenant_claim $this->join fm_tenant_claim_category on fm_tenant_claim.category=fm_tenant_claim_category.id $filtermethod $querymethod"; $this->db2->query($sql,__LINE__,__FILE__); $this->total_records = $this->db2->num_rows(); if(!$allrows) { $this->db->limit_query($sql . $ordermethod,$start,__LINE__,__FILE__); } else { $this->db->query($sql . $ordermethod,__LINE__,__FILE__); } while ($this->db->next_record()) { $claims[] = array ( 'claim_id' => $this->db->f('id'), 'tenant_id' => $this->db->f('tenant_id'), 'remark' => stripslashes($this->db->f('remark')), 'entry_date' => $this->db->f('entry_date'), 'category' => $this->db->f('category') ); } return $claims; } function read_single($id) { $this->db->query("select * from fm_tenant_claim where id='$id'",__LINE__,__FILE__); if ($this->db->next_record()) { $claim['id'] = $id; $claim['project_id'] = $this->db->f('project_id'); $claim['tenant_id'] = $this->db->f('tenant_id'); $claim['remark'] = stripslashes($this->db->f('remark')); $claim['entry_date'] = $this->db->f('entry_date'); $claim['cat_id'] = (int)$this->db->f('category'); $claim['amount'] = $this->db->f('amount'); $claim['b_account_id'] = $this->db->f('b_account_id'); $claim['cat_id'] = (int)$this->db->f('category'); } $this->db->query("select * from fm_origin WHERE destination ='tenant_claim' AND destination_id='$id'",__LINE__,__FILE__); while ($this->db->next_record()) { $claim['workorder_id'][] = $this->db->f('origin_id'); } return $claim; } function add($claim) { //_debug_array($claim); $this->db->transaction_begin(); $claim['name'] = $this->db->db_addslashes($claim['name']); $values_insert= array( $claim['project_id'], $claim['tenant_id'], $claim['amount'], $claim['b_account_id'], $claim['cat_id'], $claim['remark'], $this->account, time() ); $values_insert = $this->bocommon->validate_db_insert($values_insert); $this->db->query("INSERT INTO fm_tenant_claim (project_id,tenant_id,amount,b_account_id,category,remark,user_id,entry_date) " . "VALUES ($values_insert)",__LINE__,__FILE__); $claim_id = $this->db->get_last_insert_id('fm_tenant_claim','id'); $receipt['claim_id'] = $claim_id; foreach ($claim['workorder_id'] as $workorder_id) { $this->db->query("INSERT INTO fm_origin (origin,origin_id,destination,destination_id,entry_date,user_id) " . "VALUES ('workorder'," . $workorder_id ."," . "'tenant_claim'," . $claim_id . "," . time()."," . $this->account .")",__LINE__,__FILE__); $this->db->query("UPDATE fm_workorder set claim_id = $claim_id WHERE id=$workorder_id" ,__LINE__,__FILE__); } $this->db->transaction_commit(); $receipt['message'][] = array('msg'=>lang('claim %1 has been saved',$claim_id)); return $receipt; } function edit($claim) { $this->db->transaction_begin(); $claim['name'] = $this->db->db_addslashes($claim['name']); $value_set=array( 'amount' => $claim['amount'], 'tenant_id' => $claim['tenant_id'], 'b_account_id' => $claim['b_account_id'], 'amount' => $claim['amount'], 'category' => $claim['cat_id'], 'user_id' => $this->account, 'remark' => $this->db->db_addslashes($claim['remark']) ); $value_set = $this->bocommon->validate_db_update($value_set); $this->db->query("UPDATE fm_tenant_claim set $value_set WHERE id=" . intval($claim['claim_id']),__LINE__,__FILE__); $claim_id = $claim['claim_id']; $this->db->query("DELETE FROM fm_origin WHERE destination ='tenant_claim' AND destination_id=$claim_id",__LINE__,__FILE__); $this->db->query("UPDATE fm_workorder set claim_id = NULL WHERE id=" . $claim['project_id'] ,__LINE__,__FILE__); foreach ($claim['workorder_id'] as $workorder_id) { $this->db->query("INSERT INTO fm_origin (origin,origin_id,destination,destination_id,entry_date,user_id) " . "VALUES ('workorder'," . $workorder_id ."," . "'tenant_claim'," . $claim_id . "," . time()."," . $this->account .")",__LINE__,__FILE__); $this->db->query("UPDATE fm_workorder set claim_id = $claim_id WHERE id=$workorder_id" ,__LINE__,__FILE__); } $this->db->transaction_commit(); $receipt['claim_id']= $claim['claim_id']; $receipt['message'][] = array('msg'=>lang('claim %1 has been edited',$claim['claim_id'])); return $receipt; } function delete($id) { $this->db->transaction_begin(); $this->db->query('DELETE FROM fm_tenant_claim WHERE id=' . intval($id),__LINE__,__FILE__); $this->db->query("DELETE FROM fm_origin WHERE destination ='tenant_claim' AND destination_id=$id",__LINE__,__FILE__); $this->db->transaction_commit(); } } ?> ==================================================== Index: class.botenant_claim.inc.php currentapp = $GLOBALS['phpgw_info']['flags']['currentapp']; $this->so = CreateObject($this->currentapp.'.sotenant_claim'); if ($session) { $this->read_sessiondata(); $this->use_session = True; } $start = get_var('start',array('POST','GET')); $query = get_var('query',array('POST','GET')); $sort = get_var('sort',array('POST','GET')); $order = get_var('order',array('POST','GET')); $filter = get_var('filter',array('POST','GET')); $cat_id = get_var('cat_id',array('POST','GET')); $allrows= get_var('allrows',array('POST','GET')); if ($start) { $this->start=$start; } else { $this->start=0; } if(isset($query)) { $this->query = $query; } if(!empty($filter)) { $this->filter = $filter; } if(isset($sort)) { $this->sort = $sort; } if(isset($order)) { $this->order = $order; } if(isset($cat_id) && !empty($cat_id)) { $this->cat_id = $cat_id; } else { unset($this->cat_id); } if(isset($allrows)) { $this->allrows = $allrows; } } function save_sessiondata($data) { if ($this->use_session) { $GLOBALS['phpgw']->session->appsession('session_data','tenant_claim',$data); } } function read_sessiondata() { $data = $GLOBALS['phpgw']->session->appsession('session_data','tenant_claim'); $this->start = $data['start']; $this->query = $data['query']; $this->filter = $data['filter']; $this->sort = $data['sort']; $this->order = $data['order']; $this->cat_id = $data['cat_id']; } function check_perms($has, $needed) { return (!!($has & $needed) == True); } function read_category_name($cat_id='') { return $this->so->read_category_name($cat_id); } function select_category_list($format='',$selected='') { switch($format) { case 'select': $GLOBALS['phpgw']->xslttpl->add_file(array('cat_select')); break; case 'filter': $GLOBALS['phpgw']->xslttpl->add_file(array('cat_filter')); break; } $categories= $this->so->select_category_list(); while (is_array($categories) && list(,$category) = each($categories)) { $sel_category = ''; if ($category['id']==$selected) { $sel_category = 'selected'; } $category_list[] = array ( 'cat_id' => $category['id'], 'name' => $category['name'], 'selected' => $sel_category ); } for ($i=0;$iso->read(array('start' => $this->start,'query' => $this->query,'sort' => $this->sort,'order' => $this->order, 'filter' => $this->filter,'cat_id' => $this->cat_id,'allrows'=>$this->allrows)); $this->total_records = $this->so->total_records; for ($i=0; $icommon->show_date($claim[$i]['entry_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']); } return $claim; } function read_single($claim_id) { return $this->so->read_single($claim_id); } function save($claim) { if ($claim['claim_id']) { if ($claim['claim_id'] != 0) { $claim_id = $claim['claim_id']; $receipt=$this->so->edit($claim); } } else { $receipt = $this->so->add($claim); } return $receipt; } function delete($params) { if (is_array($params)) { $this->so->delete($params[0]); } else { $this->so->delete($params); } } } ?> ==================================================== Index: class.uitenant_claim.inc.php True, 'view' => True, 'edit' => True, 'delete' => True ); function uitenant_claim() { $GLOBALS['phpgw_info']['flags']['xslt_app'] = True; $this->currentapp = $GLOBALS['phpgw_info']['flags']['currentapp']; $this->nextmatchs = CreateObject('phpgwapi.nextmatchs'); $this->account = $GLOBALS['phpgw_info']['user']['account_id']; $this->bo = CreateObject($this->currentapp.'.botenant_claim',True); $this->bocommon = CreateObject($this->currentapp.'.bocommon'); $this->menu = CreateObject($this->currentapp.'.menu'); $this->acl2 = CreateObject($this->currentapp.'.acl2'); $this->acl2_location= '.tenant_claim'; $this->acl_read = $this->acl2->check($this->acl2_location,1); $this->acl_add = $this->acl2->check($this->acl2_location,2); $this->acl_edit = $this->acl2->check($this->acl2_location,4); $this->acl_delete = $this->acl2->check($this->acl2_location,8); $this->acl_manage = $this->acl2->check($this->acl2_location,16); $this->start = $this->bo->start; $this->query = $this->bo->query; $this->sort = $this->bo->sort; $this->order = $this->bo->order; $this->filter = $this->bo->filter; $this->cat_id = $this->bo->cat_id; $this->allrows = $this->bo->allrows; } function save_sessiondata() { $data = array ( 'start' => $this->start, 'query' => $this->query, 'sort' => $this->sort, 'order' => $this->order, 'filter' => $this->filter, 'cat_id' => $this->cat_id, 'this->allrows' => $this->allrows ); $this->bo->save_sessiondata($data); } function index() { $GLOBALS['phpgw']->xslttpl->add_file(array('tenant_claim', 'menu', 'receipt', 'search_field', 'nextmatchs')); if(!$this->acl_read) { $GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location=' . $this->acl2_location); } $this->menu->sub = 'project'; $links = $this->menu->links('tenant_claim'); $receipt = $GLOBALS['phpgw']->session->appsession('session_data','tenant_claim_receipt'); $GLOBALS['phpgw']->session->appsession('session_data','tenant_claim_receipt',''); $claim_list = $this->bo->read(); while (is_array($claim_list) && list(,$claim) = each($claim_list)) { if($claim['tenant_id']) { $tenant= $this->bocommon->read_single_tenant($claim['tenant_id']); $name = $tenant['last_name'] . ', ' . $tenant['first_name']; } $content[] = array ( 'claim_id' => $claim['claim_id'], 'name' => $name, 'entry_date' => $claim['entry_date'], 'category' => $claim['category'], 'link_view' => $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitenant_claim.view&claim_id=' . $claim['claim_id']), 'link_edit' => $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitenant_claim.edit&claim_id=' . $claim['claim_id']), 'link_delete' => $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitenant_claim.delete&claim_id=' . $claim['claim_id']), 'lang_view_statustext' => lang('view the claim'), 'lang_edit_statustext' => lang('edit the claim'), 'lang_delete_statustext' => lang('delete the claim'), 'text_view' => lang('view'), 'text_edit' => lang('edit'), 'text_delete' => lang('delete') ); unset ($tenant); unset ($name); } $table_header = array ( 'lang_name' => lang('name'), 'lang_time_created' => lang('time created'), 'lang_view' => lang('view'), 'lang_edit' => lang('edit'), 'lang_delete' => lang('delete'), 'lang_claim_id' => lang('claim id'), 'sort_name' => $this->nextmatchs->show_sort_order(array ( 'sort' => $this->sort, 'var' => 'org_name', 'order' => $this->order, 'extra' => array('menuaction' => $this->currentapp.'.uitenant_claim.index', 'cat_id' => $this->cat_id, 'query' =>$this->query, 'allrows' =>$this->allrows) )), 'sort_claim_id' => $this->nextmatchs->show_sort_order(array ( 'sort' => $this->sort, 'var' => 'claim_id', 'order' => $this->order, 'extra' => array('menuaction' => $this->currentapp.'.uitenant_claim.index', 'cat_id' => $this->cat_id, 'query' =>$this->query, 'allrows' =>$this->allrows) )), 'sort_time_created' => $this->nextmatchs->show_sort_order(array ( 'sort' => $this->sort, 'var' => 'entry_date', 'order' => $this->order, 'extra' => array('menuaction' => $this->currentapp.'.uitenant_claim.index', 'cat_id' =>$this->cat_id, 'query' =>$this->query, 'allrows' =>$this->allrows) )), 'sort_category' => $this->nextmatchs->show_sort_order(array ( 'sort' => $this->sort, 'var' => 'descr', 'order' => $this->order, 'extra' => array('menuaction' => $this->currentapp.'.uitenant_claim.index', 'cat_id' =>$this->cat_id, 'query' =>$this->query, 'allrows' =>$this->allrows) )), 'lang_category' => lang('category') ); $table_add = array ( 'lang_add' => lang('add'), 'lang_add_statustext' => lang('add a claim'), 'add_action' => $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitenant_claim.edit') ); $link_data = array ( 'menuaction' => $this->currentapp.'.uitenant_claim.index', 'sort' =>$this->sort, 'order' =>$this->order, 'cat_id' =>$this->cat_id, 'filter' =>$this->filter, 'query' =>$this->query ); if(!$this->allrows) { $record_limit = $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']; } else { $record_limit = $this->bo->total_records; } $msgbox_data = $this->bocommon->msgbox_data($receipt); $data = array ( 'msgbox_data' => $GLOBALS['phpgw']->common->msgbox($msgbox_data), 'links' => $links, 'allow_allrows' => true, 'allrows' => $this->allrows, 'start_record' => $this->start, 'record_limit' => $record_limit, 'num_records' => count($claims_list), 'all_records' => $this->bo->total_records, 'link_url' => $GLOBALS['phpgw']->link('/index.php',$link_data), 'img_path' => $GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'), 'lang_no_cat' => lang('no category'), 'lang_cat_statustext' => lang('Select the category the claim belongs to. To do not use a category select NO CATEGORY'), 'select_name' => 'cat_id', 'cat_list' => $this->bo->select_category_list('filter',$this->cat_id), 'select_action' => $GLOBALS['phpgw']->link('/index.php',$link_data), 'filter_list' => $this->nextmatchs->xslt_filter(array('filter' => $this->filter)), '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, 'lang_search' => lang('search'), 'table_header' => $table_header, 'values' => $content, 'table_add' => $table_add ); $this->save_sessiondata(); $GLOBALS['phpgw_info']['flags']['app_header'] = lang('Tenant claim') . ': ' . lang('list claim'); $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data)); $GLOBALS['phpgw']->xslttpl->pp(); } function edit() { $claim_id = get_var('claim_id',array('POST','GET')); $values = get_var('values',array('POST')); $values['project_id'] = get_var('project_id',array('POST','GET')); $values['b_account_id'] = get_var('b_account_id',array('POST')); $values['b_account_name'] = get_var('b_account_name',array('POST')); $values['tenant_id'] = get_var('tenant_id',array('POST')); $values['last_name'] = get_var('last_name',array('POST')); $values['first_name'] = get_var('first_name',array('POST')); $this->boproject= CreateObject($this->currentapp.'.boproject'); $GLOBALS['phpgw']->xslttpl->add_file(array('tenant_claim')); if ($values['save'] || $values['apply']) { if(!$values['cat_id']) { $receipt['error'][]=array('msg'=>lang('Please select a category !')); } if(!$values['b_account_id']) { $receipt['error'][]=array('msg'=>lang('Please select a budget account !')); } if(!$values['workorder_id']) { $receipt['error'][]=array('msg'=>lang('Please select a workorder !')); } if(!$receipt['error']) { $values['claim_id'] = $claim_id; $receipt = $this->bo->save($values); $claim_id = $receipt['claim_id']; $this->cat_id = ($values['cat_id']?$values['cat_id']:$this->cat_id); if ($values['save']) { $GLOBALS['phpgw']->session->appsession('session_data','tenant_claim_receipt',$receipt); $GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uitenant_claim.index'); } } } if ($values['cancel']) { $GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uitenant_claim.index'); } if ($claim_id) { $values = $this->bo->read_single($claim_id); } //_debug_array($values); $project_values = $this->boproject->read_single($values['project_id']); $table_header_workorder[] = array ( 'lang_workorder_id' => lang('Workorder'), 'lang_budget' => lang('Budget'), 'lang_calculation' => lang('Calculation'), 'lang_vendor' => lang('Vendor'), 'lang_select' => lang('Select') ); $bolocation = CreateObject($this->currentapp.'.bolocation'); $location_data=$bolocation->initiate_ui_location(array( 'values' => $project_values['location_data'], 'type_id' => count(explode('-',$project_values['location_data']['location_code'])), 'no_link' => False, // disable lookup links for location type less than type_id 'tenant' => $project_values['location_data']['tenant_id'], 'lookup_type' => 'view', 'lookup_entity' => $this->bocommon->get_lookup_entity('project'), 'entity_data' => $project_values['p'] )); if($project_values['contact_phone']) { for ($i=0;$ibocommon->read_single_tenant($values['tenant_id']); $values['last_name'] = $tenant['last_name']; $values['first_name'] = $tenant['first_name']; } endif; if($values['workorder_id'] && $project_values['workorder_budget']) { foreach ($values['workorder_id'] as $workorder_id) { for ($i=0;$icat_id = ($values['cat_id']?$values['cat_id']:$this->cat_id); $b_account_data=$this->bocommon->initiate_ui_budget_account_lookup(array( 'b_account_id' => $values['b_account_id'], 'b_account_name' => $values['b_account_name'])); $link_data = array ( 'menuaction' => $this->currentapp.'.uitenant_claim.edit', 'claim_id' => $claim_id, 'project_id' => $values['project_id'] ); $msgbox_data = $this->bocommon->msgbox_data($receipt); $data = array ( 'table_header_workorder' => $table_header_workorder, 'lang_no_workorders' => lang('No workorder bugdet'), 'workorder_link' => $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.view'), 'lang_start_date' => lang('Project start date'), 'value_start_date' => $project_values['start_date'], 'lang_end_date' => lang('Project end date'), 'value_end_date' => $project_values['end_date'], 'lang_charge_tenant' => lang('Charge tenant'), 'charge_tenant' => $project_values['charge_tenant'], 'lang_power_meter' => lang('Power meter'), 'value_power_meter' => $project_values['power_meter'], 'lang_budget' => lang('Budget'), 'value_budget' => $project_values['budget'], 'lang_reserve' => lang('reserve'), 'value_reserve' => $project_values['reserve'], 'lang_reserve_statustext' => lang('Enter the reserve'), 'lang_reserve_remainder' => lang('reserve remainder'), 'value_reserve_remainder' => $reserve_remainder, 'value_reserve_remainder_percent'=> $remainder_percent, 'vendor_data' => $vendor_data, 'location_data' => $location_data, 'location_type' => 'view', 'lang_project_id' => lang('Project ID'), 'value_project_id' => $project_values['project_id'], 'lang_name' => lang('Name'), 'value_name' => $project_values['name'], 'lang_descr' => lang('Description'), 'sum_workorder_budget' => $project_values['sum_workorder_budget'], 'sum_workorder_calculation' => $project_values['sum_workorder_calculation'], 'workorder_budget' => $project_values['workorder_budget'], 'sum_workorder_actual_cost' => $project_values['sum_workorder_actual_cost'], 'lang_actual_cost' => lang('Actual cost'), 'lang_coordinator' => lang('Coordinator'), 'lang_sum' => lang('Sum'), 'select_user_name' => 'project_values[coordinator]', 'lang_no_user' => lang('Select coordinator'), 'user_list' => $this->bocommon->get_user_list('select',$project_values['coordinator'],$extra=False,$default=False,$start=-1,$sort='ASC',$order='account_lastname',$query='',$offset=-1), 'status_list' => $this->boproject->select_status_list('select',$project_values['status']), 'lang_no_status' => lang('Select status'), 'lang_status' => lang('Status'), 'currency' => $GLOBALS['phpgw_info']['user']['preferences']['common']['currency'], 'lang_contact_phone' => lang('Contact phone'), 'contact_phone' => $project_values['contact_phone'], 'b_account_data' => $b_account_data, 'lang_select_workorder_statustext' => lang('Include the workorder to this claim'), 'cat_list_project' => $this->boproject->select_category_project_list('select',$project_values['cat_id']), //------------------ 'lang_amount' => lang('amount'), 'lang_amount_statustext' => lang('The total amount to claim'), 'value_amount' => $values['amount'], 'tenant_link' => $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.tenant'), 'lang_tenant' => lang('tenant'), 'value_tenant_id' => $values['tenant_id'], 'value_last_name' => $values['last_name'], 'value_first_name' => $values['first_name'], 'lang_tenant_statustext' => lang('Select a tenant'), 'size_last_name' => strlen($values['last_name']), 'size_first_name' => strlen($values['first_name']), 'msgbox_data' => $GLOBALS['phpgw']->common->msgbox($msgbox_data), 'edit_url' => $GLOBALS['phpgw']->link('/index.php',$link_data), 'lang_claim_id' => lang('ID'), 'value_claim_id' => $claim_id, 'lang_remark' => lang('remark'), 'lang_category' => lang('category'), 'lang_save' => lang('save'), 'lang_cancel' => lang('cancel'), 'lang_apply' => lang('apply'), 'value_remark' => $values['remark'], 'value_cat' => $values['cat'], 'lang_remark_statustext' => lang('Enter a remark for this claim'), 'lang_apply_statustext' => lang('Apply the values'), 'lang_cancel_statustext' => lang('Leave the claim untouched and return back to the list'), 'lang_save_statustext' => lang('Save the claim and return back to the list'), 'lang_no_cat' => lang('no category'), 'lang_cat_statustext' => lang('Select the category the claim belongs to. To do not use a category select NO CATEGORY'), 'select_name' => 'values[cat_id]', 'cat_list' => $this->bo->select_category_list('select',$this->cat_id) ); $GLOBALS['phpgw_info']['flags']['app_header'] = lang('Tenant claim') . ': ' . ($claim_id?lang('edit claim'):lang('add claim')); $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data)); $GLOBALS['phpgw']->xslttpl->pp(); } function delete() { $claim_id = get_var('claim_id',array('POST','GET')); $delete = get_var('delete',array('POST')); $confirm = get_var('confirm',array('POST')); $link_data = array ( 'menuaction' => $this->currentapp.'.uitenant_claim.index' ); if (get_var('confirm',array('POST'))) { $this->bo->delete($claim_id); // Header('Location: ' . $GLOBALS['phpgw']->link('/index.php',$link_data)); $GLOBALS['phpgw']->redirect_link('/index.php',$link_data); } $GLOBALS['phpgw']->xslttpl->add_file(array('app_delete')); $data = array ( 'done_action' => $GLOBALS['phpgw']->link('/index.php',$link_data), 'delete_action' => $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitenant_claim.delete&claim_id=' . $claim_id), 'lang_confirm_msg' => lang('do you really want to delete this entry'), 'lang_yes' => lang('yes'), 'lang_yes_statustext' => lang('Delete the entry'), 'lang_no_statustext' => lang('Back to the list'), 'lang_no' => lang('no') ); $appname = lang('Tenant claim'); $function_msg = lang('delete claim'); $GLOBALS['phpgw_info']['flags']['app_header'] = lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg; $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data)); $GLOBALS['phpgw']->xslttpl->pp(); } function view() { $claim_id = get_var('claim_id',array('GET')); $action = get_var('action',array('GET')); $GLOBALS['phpgw_info']['flags']['app_header'] = lang('Tenant claim') . ': ' . lang('view claim'); $GLOBALS['phpgw']->xslttpl->add_file('tenant_claim'); $claim = $this->bo->read_single($claim_id); $data = array ( 'done_action' => $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitenant_claim.index'), 'lang_name' => lang('name'), 'lang_category' => lang('category'), 'lang_time_created' => lang('time created'), 'lang_done' => lang('done'), 'value_name' => $tenant_claim['name'], 'value_cat' => $this->bo->read_category_name($tenant_claim['cat_id']), 'value_date' => $GLOBALS['phpgw']->common->show_date($tenant_claim['entry_date']) ); $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data)); $GLOBALS['phpgw']->xslttpl->pp(); } } ?> From MAILER-DAEMON Wed Apr 13 03:18:56 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DLc3J-0004v3-CW for mharc-phpgroupware-cvs@gnu.org; Wed, 13 Apr 2005 03:12:45 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DLc35-0004oe-HH for phpgroupware-cvs@gnu.org; Wed, 13 Apr 2005 03:12:32 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DLc2y-0004lG-NY for phpgroupware-cvs@gnu.org; Wed, 13 Apr 2005 03:12:28 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DLc2r-0004il-GN for phpgroupware-cvs@gnu.org; Wed, 13 Apr 2005 03:12:17 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DLcLM-0005vF-U1 for phpgroupware-cvs@gnu.org; Wed, 13 Apr 2005 03:31:25 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 70315312C7 for ; Wed, 13 Apr 2005 09:30:15 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 28434-08 for ; Wed, 13 Apr 2005 09:30:13 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 2D9FC312C2 for ; Wed, 13 Apr 2005 09:30:13 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3D7UDa12821; Wed, 13 Apr 2005 09:30:13 +0200 Message-Id: <200504130730.j3D7UDa12821@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: sigurdne Date: Wed, 13 Apr 2005 08:43:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] property/inc class.sowo_hour.inc.php,1.5 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Apr 2005 07:12:37 -0000 Update of property/inc Modified Files: Branch: MAIN class.sowo_hour.inc.php lines: +7 -15 Log Message: no message ==================================================== Index: property/inc/class.sowo_hour.inc.php diff -u property/inc/class.sowo_hour.inc.php:1.4 property/inc/class.sowo_hour.inc.php:1.5 --- property/inc/class.sowo_hour.inc.php:1.4 Mon Apr 11 11:59:02 2005 +++ property/inc/class.sowo_hour.inc.php Wed Apr 13 06:43:15 2005 @@ -180,8 +180,6 @@ } //_debug_array($deviation); return $deviation; - - } @@ -269,12 +267,10 @@ function next_record($workorder_id) { - $this->db->query("SELECT max(record) as record FROM fm_wo_hours where workorder_id='$workorder_id'",__LINE__,__FILE__); $this->db->next_record(); $record = $this->db->f('record')+1; return $record; - } function add_template($values,$workorder_id) @@ -283,7 +279,6 @@ $values['name'] = $this->db->db_addslashes($values['name']); $soworkorder = CreateObject($this->currentapp.'.soworkorder'); $workorder = $soworkorder->read_single($workorder_id); -//_debug_array($workorder); $this->db->transaction_begin(); @@ -306,11 +301,10 @@ $hour = $this->read(array('workorder_id' => $workorder_id)); - $record = $this->next_record($hour[0]['workorder_id']); + $record = $this->next_record($workorder_id); for ($i=0; $inext_record($hour[0]['workorder_id']); for ($i=0; $idb->get_last_insert_id('fm_wo_hours','id'); return $receipt; - } function add_hour_from_template($hour,$workorder_id) { -//_debug_array($hour); $record = $this->next_record($workorder_id); - $this->db->query("UPDATE fm_workorder set - chapter_id ='" . $hour[0]['chapter_id'] . "' WHERE id= '$workorder_id'",__LINE__,__FILE__); - + if($hour[0]['chapter_id']) + { + $this->db->query("UPDATE fm_workorder set + chapter_id ='" . $hour[0]['chapter_id'] . "' WHERE id= '$workorder_id'",__LINE__,__FILE__); + } for ($i=0; $i; Thu, 14 Apr 2005 17:32:03 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 25645-06 for ; Thu, 14 Apr 2005 17:32:01 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 0B902312CE for ; Thu, 14 Apr 2005 17:32:01 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3EFW1E24753; Thu, 14 Apr 2005 17:32:01 +0200 Message-Id: <200504141532.j3EFW1E24753@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: sigurdne Date: Thu, 14 Apr 2005 16:49:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] property/setup tables_update.inc.php, 1.6 phpgw_no.lang, 1.5 tables_current.inc.php, 1.25 setup.inc.php, 1.13 default_records.inc.php, 1.10 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Apr 2005 15:45:47 -0000 Update of property/setup Modified Files: Branch: MAIN tables_update.inc.php lines: +54 -1 phpgw_no.lang lines: +3 -1 tables_current.inc.php lines: +34 -6 setup.inc.php lines: +5 -3 default_records.inc.php lines: +2 -1 Log Message: no message ==================================================== Index: property/setup/tables_update.inc.php diff -u property/setup/tables_update.inc.php:1.5 property/setup/tables_update.inc.php:1.6 --- property/setup/tables_update.inc.php:1.5 Tue Mar 15 08:47:19 2005 +++ property/setup/tables_update.inc.php Thu Apr 14 14:49:01 2005 @@ -115,4 +115,57 @@ return $GLOBALS['setup_info']['property']['currentver']; } + /** + * Update property version from 0.9.17.502 to 0.9.17.503 + */ + + $test[] = '0.9.17.502'; + function property_upgrade0_9_17_502() + { + $GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_acl_location','id',array('type' => 'varchar','precision' => '20','nullable' => False)); + $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr) VALUES ('.tenant_claim', 'Tenant claim')"); + + $GLOBALS['phpgw_setup']->oProc->CreateTable( + 'fm_tenant_claim_category', array( + 'fd' => array( + 'id' => array('type' => 'int','precision' => '4','nullable' => False), + 'descr' => array('type' => 'varchar','precision' => '255','nullable' => True) + ), + 'pk' => array('id'), + 'fk' => array(), + 'ix' => array(), + 'uc' => array() + ) + ); + + $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tenant_claim_category (id, descr) VALUES (1, 'Type 1')"); + $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tenant_claim_category (id, descr) VALUES (2, 'Type 2')"); + + $GLOBALS['phpgw_setup']->oProc->CreateTable( + 'fm_tenant_claim', array( + 'fd' => array( + 'id' => array('type' => 'auto','precision' => '4','nullable' => False), + 'project_id' => array('type' => 'int','precision' => '4','nullable' => False), + 'tenant_id' => array('type' => 'int','precision' => '4','nullable' => False), + 'amount' => array('type' => 'decimal','precision' => '20','scale' => '2','default' => '0','nullable' => True), + 'b_account_id' => array('type' => 'int','precision' => '4','nullable' => True), + 'category' => array('type' => 'int','precision' => '4','nullable' => False), + 'status' => array('type' => 'varchar','precision' => '8','nullable' => True), + 'remark' => array('type' => 'text','nullable' => True), + 'user_id' => array('type' => 'int','precision' => '4','nullable' => False), + 'entry_date' => array('type' => 'int','precision' => '4','nullable' => True) + ), + 'pk' => array('id'), + 'fk' => array(), + 'ix' => array(), + 'uc' => array() + ) + ); + + $GLOBALS['phpgw_setup']->oProc->AddColumn('fm_workorder','claim_issued',array('type' => 'int','precision' => 2,'nullable' => True)); + + $GLOBALS['setup_info']['property']['currentver'] = '0.9.17.503'; + return $GLOBALS['setup_info']['property']['currentver']; + } + ?> ==================================================== Index: property/setup/phpgw_no.lang diff -u property/setup/phpgw_no.lang:1.4 property/setup/phpgw_no.lang:1.5 --- property/setup/phpgw_no.lang:1.4 Mon Mar 7 09:54:58 2005 +++ property/setup/phpgw_no.lang Thu Apr 14 14:49:01 2005 @@ -869,7 +869,7 @@ Street name property no Gatenavn street number property no gate nr Street number property no GateNr -Subject property no Subjekt +Subject property no Overskrift Subject changed property no Emne er endret Submit the search string property no Send søkestrengen Sum property no Sum @@ -882,7 +882,9 @@ template %1 is added property no mal %1 er lagt til Template ID property no Mal ID Tenant property no Leieboer +Tenant claim is not issued for project in voucher %1 property no Krav mot leietaker er ikke registert for prosjekt i bilag %1 Tenant phone property no Leieboer tlf +termination date property no oppsigelse dato Text property no Tekst That Vendor ID is not valid ! property no Denne leverandør ID er ikke gyldig The address to which this order will be sendt property no Adressen ordren vil bli sendt til ==================================================== Index: property/setup/tables_current.inc.php diff -u property/setup/tables_current.inc.php:1.24 property/setup/tables_current.inc.php:1.25 --- property/setup/tables_current.inc.php:1.24 Tue Mar 15 08:47:19 2005 +++ property/setup/tables_current.inc.php Thu Apr 14 14:49:01 2005 @@ -511,8 +511,9 @@ 'key_fetch' => array('type' => 'int','precision' => '4','nullable' => True), 'key_deliver' => array('type' => 'int','precision' => '4','nullable' => True), 'integration' => array('type' => 'int','precision' => '4','nullable' => True), - 'charge_tenant' => array('type' => 'int','precision' => '2','nullable' => True) - ), + 'charge_tenant' => array('type' => 'int','precision' => '2','nullable' => True), + 'claim_issued' => array('type' => 'int','precision' => '2','nullable' => True) + ), 'pk' => array('id'), 'fk' => array(), 'ix' => array(), @@ -1203,8 +1204,7 @@ 'key_fetch' => array('type' => 'int','precision' => '4','nullable' => True), 'key_deliver' => array('type' => 'int','precision' => '4','nullable' => True), 'other_branch' => array('type' => 'varchar','precision' => '255','nullable' => True), - 'key_responsible' => array('type' => 'int','precision' => '4','nullable' => True), - 'charge_tenant' => array('type' => 'int','precision' => '2','nullable' => True) + 'key_responsible' => array('type' => 'int','precision' => '4','nullable' => True) ), 'pk' => array('id'), 'fk' => array(), @@ -1329,7 +1329,7 @@ ), 'fm_acl_location' => array( 'fd' => array( - 'id' => array('type' => 'varchar','precision' => '12','nullable' => False), + 'id' => array('type' => 'varchar','precision' => '20','nullable' => False), 'descr' => array('type' => 'varchar','precision' => '50','nullable' => False), 'allow_grant' => array('type' => 'int','precision' => '4','nullable' => True) ), @@ -1913,5 +1913,33 @@ 'fk' => array(), 'ix' => array(), 'uc' => array() + ), + 'fm_tenant_claim' => array( + 'fd' => array( + 'id' => array('type' => 'auto','precision' => '4','nullable' => False), + 'project_id' => array('type' => 'int','precision' => '4','nullable' => False), + 'tenant_id' => array('type' => 'int','precision' => '4','nullable' => False), + 'amount' => array('type' => 'decimal','precision' => '20','scale' => '2','default' => '0','nullable' => True), + 'b_account_id' => array('type' => 'int','precision' => '4','nullable' => True), + 'category' => array('type' => 'int','precision' => '4','nullable' => False), + 'status' => array('type' => 'varchar','precision' => '8','nullable' => True), + 'remark' => array('type' => 'text','nullable' => True), + 'user_id' => array('type' => 'int','precision' => '4','nullable' => False), + 'entry_date' => array('type' => 'int','precision' => '4','nullable' => True) + ), + 'pk' => array('id'), + 'fk' => array(), + 'ix' => array(), + 'uc' => array() + ), + 'fm_tenant_claim_category' => array( + 'fd' => array( + 'id' => array('type' => 'int','precision' => '4','nullable' => False), + 'descr' => array('type' => 'varchar','precision' => '255','nullable' => False) + ), + 'pk' => array('id'), + 'fk' => array(), + 'ix' => array(), + 'uc' => array() ) ); ==================================================== Index: property/setup/setup.inc.php diff -u property/setup/setup.inc.php:1.12 property/setup/setup.inc.php:1.13 --- property/setup/setup.inc.php:1.12 Tue Mar 15 08:47:19 2005 +++ property/setup/setup.inc.php Thu Apr 14 14:49:01 2005 @@ -24,7 +24,7 @@ $setup_info['property']['name'] = 'property'; $setup_info['property']['title'] = 'Property'; - $setup_info['property']['version'] = '0.9.17.502'; + $setup_info['property']['version'] = '0.9.17.503'; $setup_info['property']['app_order'] = 8; $setup_info['property']['enable'] = 1; @@ -192,7 +192,9 @@ 'fm_s_agreement_pricing', 'fm_async_method', 'fm_cron_log', - 'fm_origin' + 'fm_origin', + 'fm_tenant_claim', + 'fm_tenant_claim_category' ); /* The hooks this app includes, needed for hooks registration */ ==================================================== Index: property/setup/default_records.inc.php diff -u property/setup/default_records.inc.php:1.9 property/setup/default_records.inc.php:1.10 --- property/setup/default_records.inc.php:1.9 Sat Jan 29 18:40:26 2005 +++ property/setup/default_records.inc.php Thu Apr 14 14:49:01 2005 @@ -215,6 +215,7 @@ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr, allow_grant) VALUES ('.entity.2.2', 'Report type 2', 1)"); $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr) VALUES ('.s_agreement', 'Service agreement')"); $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr) VALUES ('.b_account', 'Budget account')"); +$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr) VALUES ('.tenant_claim', 'Tenant claim')"); # From MAILER-DAEMON Thu Apr 14 11:47:23 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DM6Ys-00045c-Vo for mharc-phpgroupware-cvs@gnu.org; Thu, 14 Apr 2005 11:47:23 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DM6WI-0003Ck-OZ for phpgroupware-cvs@gnu.org; Thu, 14 Apr 2005 11:44:43 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DM6W2-00034V-5S for phpgroupware-cvs@gnu.org; Thu, 14 Apr 2005 11:44:32 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DM6W0-0002xo-6d for phpgroupware-cvs@gnu.org; Thu, 14 Apr 2005 11:44:24 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DM6KT-0004t6-L1 for phpgroupware-cvs@gnu.org; Thu, 14 Apr 2005 11:32:30 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id F029E312D4 for ; Thu, 14 Apr 2005 17:30:58 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 24972-10 for ; Thu, 14 Apr 2005 17:30:55 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id F06BF312CE for ; Thu, 14 Apr 2005 17:30:54 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3EFUst24686; Thu, 14 Apr 2005 17:30:54 +0200 Message-Id: <200504141530.j3EFUst24686@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: sigurdne Date: Thu, 14 Apr 2005 16:48:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] property/inc class.uiinvoice.inc.php, 1.14 class.uiproject.inc.php, 1.14 class.menu.inc.php, 1.10 class.uitenant_claim.inc.php, 1.2 class.soinvoice.inc.php, 1.11 class.uiworkorder.inc.php, 1.6 class.soworkorder.inc.php, 1.5 class.soproject.inc.php, 1.18 class.botenant_claim.inc.php, 1.2 class.sotenant_claim.inc.php, 1.2 class.boproject.inc.php, 1.9 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Apr 2005 15:47:20 -0000 Update of property/inc Modified Files: Branch: MAIN class.uiinvoice.inc.php lines: +3 -1 class.uiproject.inc.php lines: +10 -4 class.menu.inc.php lines: +10 -1 class.uitenant_claim.inc.php lines: +104 -14 class.soinvoice.inc.php lines: +21 -7 class.uiworkorder.inc.php lines: +2 -2 class.soworkorder.inc.php lines: +12 -2 class.soproject.inc.php lines: +4 -3 class.botenant_claim.inc.php lines: +77 -3 class.sotenant_claim.inc.php lines: +71 -10 class.boproject.inc.php lines: +2 -1 Log Message: no message ==================================================== Index: property/inc/class.uiinvoice.inc.php diff -u property/inc/class.uiinvoice.inc.php:1.13 property/inc/class.uiinvoice.inc.php:1.14 --- property/inc/class.uiinvoice.inc.php:1.13 Thu Jan 13 16:52:48 2005 +++ property/inc/class.uiinvoice.inc.php Thu Apr 14 14:48:39 2005 @@ -415,6 +415,7 @@ $content[$i]['link_remark'] = $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.remark'); $content[$i]['lang_remark_help'] = lang('Klick this link to view the remark'); $content[$i]['link_order'] = $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.view_order'); + $content[$i]['link_claim'] = $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitenant_claim.check'); $i++; } } @@ -549,6 +550,7 @@ 'lang_vendor' => lang('Vendor'), 'voucher_id' => $voucher_id, 'lang_voucher_id' => lang('Voucher Id'), + 'lang_claim' => lang('Claim'), 'table_done' => $table_done ); ==================================================== Index: property/inc/class.uiproject.inc.php diff -u property/inc/class.uiproject.inc.php:1.13 property/inc/class.uiproject.inc.php:1.14 --- property/inc/class.uiproject.inc.php:1.13 Tue Mar 1 15:04:27 2005 +++ property/inc/class.uiproject.inc.php Thu Apr 14 14:48:39 2005 @@ -159,7 +159,8 @@ 'nextmatchs', 'search_field')); - $lookup = get_var('lookup',array('POST','GET')); + $lookup = get_var('lookup',array('POST','GET')); + $from = get_var('from',array('POST','GET')); $start_date = urldecode(get_var('start_date',array('POST','GET'))); $end_date = urldecode(get_var('end_date',array('POST','GET'))); @@ -185,7 +186,7 @@ $content[$j]['row'][]= array( 'statustext' => lang('search'), 'text' => $project_entry[$uicols['name'][$k]], - 'link' => $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.index&query=' . $project_entry['query_location'][$uicols['name'][$k]] . '&lookup=' . $lookup . '&filter=' . $this->filter) + 'link' => $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.index&query=' . $project_entry['query_location'][$uicols['name'][$k]] . '&lookup=' . $lookup . '&from=' . $from . '&filter=' . $this->filter) ); } else @@ -208,7 +209,7 @@ if($lookup && $k==($count_uicols_name-1)) { $content[$j]['row'][]= array( - 'lookup_action' => $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&project_id=' . $project_entry['project_id']) + 'lookup_action' => $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.ui' . $from . '.edit&project_id=' . $project_entry['project_id']) ); } } @@ -279,6 +280,7 @@ 'type_id' =>$type_id, 'query' =>$this->query, 'lookup' =>$lookup, + 'from' =>$from, 'district_id' => $this->district_id, 'cat_id' =>$this->cat_id, 'start_date'=>$start_date, @@ -297,6 +299,7 @@ 'type_id' =>$type_id, 'query' =>$this->query, 'lookup' =>$lookup, + 'from' =>$from, 'district_id' => $this->district_id, 'cat_id' =>$this->cat_id, 'start_date'=>$start_date, @@ -315,6 +318,7 @@ 'type_id' =>$type_id, 'query' =>$this->query, 'lookup' =>$lookup, + 'from' =>$from, 'district_id' => $this->district_id, 'cat_id' =>$this->cat_id, 'start_date'=>$start_date, @@ -376,6 +380,7 @@ 'filter' =>$this->filter, 'status_id' =>$this->status_id, 'lookup' =>$lookup, + 'from' =>$from, 'query' =>$this->query, 'start_date' =>$start_date, 'end_date' =>$end_date @@ -393,6 +398,7 @@ 'filter' =>$this->filter, 'status_id' =>$this->status_id, 'lookup' =>$lookup, + 'from' =>$from, 'query' =>$this->query, 'start_date' =>$start_date, 'end_date' =>$end_date, ==================================================== Index: property/inc/class.menu.inc.php diff -u property/inc/class.menu.inc.php:1.9 property/inc/class.menu.inc.php:1.10 --- property/inc/class.menu.inc.php:1.9 Wed Mar 16 12:11:00 2005 +++ property/inc/class.menu.inc.php Thu Apr 14 14:48:39 2005 @@ -403,6 +403,15 @@ $menu['sub_menu'][$i]['link'] = $GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uitemplate.index'); $menu['sub_menu'][$i]['name'] = lang('template'); $menu['sub_menu'][$i]['statustext'] = lang('Workorder template'); + + $i++; + if($page=='tenant_claim') + { + $menu['sub_menu'][$i]['this']=True; + } + $menu['sub_menu'][$i]['link'] = $GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uitenant_claim.index'); + $menu['sub_menu'][$i]['name'] = lang('Tenant claim'); + $menu['sub_menu'][$i]['statustext'] = lang('Tenant claim'); } if ($sub == adm_loc && $this->acl2->check('.location',16)) ==================================================== Index: property/inc/class.uitenant_claim.inc.php diff -u property/inc/class.uitenant_claim.inc.php:1.1 property/inc/class.uitenant_claim.inc.php:1.2 --- property/inc/class.uitenant_claim.inc.php:1.1 Tue Apr 12 14:12:20 2005 +++ property/inc/class.uitenant_claim.inc.php Thu Apr 14 14:48:39 2005 @@ -39,6 +39,7 @@ var $public_functions = array ( 'index' => True, + 'check' => True, 'view' => True, 'edit' => True, 'delete' => True @@ -69,6 +70,7 @@ $this->sort = $this->bo->sort; $this->order = $this->bo->order; $this->filter = $this->bo->filter; + $this->status = $this->bo->status; $this->cat_id = $this->bo->cat_id; $this->allrows = $this->bo->allrows; } @@ -82,13 +84,14 @@ 'sort' => $this->sort, 'order' => $this->order, 'filter' => $this->filter, + 'status' => $this->status, 'cat_id' => $this->cat_id, 'this->allrows' => $this->allrows ); $this->bo->save_sessiondata($data); } - function index() + function index($project_id='') { $GLOBALS['phpgw']->xslttpl->add_file(array('tenant_claim', 'menu', @@ -108,7 +111,7 @@ $receipt = $GLOBALS['phpgw']->session->appsession('session_data','tenant_claim_receipt'); $GLOBALS['phpgw']->session->appsession('session_data','tenant_claim_receipt',''); - $claim_list = $this->bo->read(); + $claim_list = $this->bo->read(array('project_id' => $project_id)); while (is_array($claim_list) && list(,$claim) = each($claim_list)) { @@ -121,6 +124,7 @@ $content[] = array ( 'claim_id' => $claim['claim_id'], + 'project_id' => $claim['project_id'], 'name' => $name, 'entry_date' => $claim['entry_date'], 'category' => $claim['category'], @@ -140,12 +144,24 @@ $table_header = array ( + 'lang_project' => lang('Project'), 'lang_name' => lang('name'), 'lang_time_created' => lang('time created'), 'lang_view' => lang('view'), 'lang_edit' => lang('edit'), 'lang_delete' => lang('delete'), 'lang_claim_id' => lang('claim id'), + 'sort_project' => $this->nextmatchs->show_sort_order(array + ( + 'sort' => $this->sort, + 'var' => 'project_id', + 'order' => $this->order, + 'extra' => array('menuaction' => $this->currentapp.'.uitenant_claim.index', + 'cat_id' => $this->cat_id, + 'query' =>$this->query, + 'status' =>$this->status, + 'allrows' =>$this->allrows) + )), 'sort_name' => $this->nextmatchs->show_sort_order(array ( 'sort' => $this->sort, @@ -154,6 +170,7 @@ 'extra' => array('menuaction' => $this->currentapp.'.uitenant_claim.index', 'cat_id' => $this->cat_id, 'query' =>$this->query, + 'status' =>$this->status, 'allrows' =>$this->allrows) )), 'sort_claim_id' => $this->nextmatchs->show_sort_order(array @@ -164,6 +181,7 @@ 'extra' => array('menuaction' => $this->currentapp.'.uitenant_claim.index', 'cat_id' => $this->cat_id, 'query' =>$this->query, + 'status' =>$this->status, 'allrows' =>$this->allrows) )), 'sort_time_created' => $this->nextmatchs->show_sort_order(array @@ -174,6 +192,7 @@ 'extra' => array('menuaction' => $this->currentapp.'.uitenant_claim.index', 'cat_id' =>$this->cat_id, 'query' =>$this->query, + 'status' =>$this->status, 'allrows' =>$this->allrows) )), 'sort_category' => $this->nextmatchs->show_sort_order(array @@ -184,16 +203,29 @@ 'extra' => array('menuaction' => $this->currentapp.'.uitenant_claim.index', 'cat_id' =>$this->cat_id, 'query' =>$this->query, + 'status' =>$this->status, 'allrows' =>$this->allrows) )), 'lang_category' => lang('category') ); + if ($project_id) + { + $lang_add = lang('add another'); + $add_action = $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitenant_claim.edit&project_id=' . $project_id); + } + else + { + $lang_add = lang('add'); + $add_action = $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.index&lookup=true&from=tenant_claim'); + + } + $table_add = array ( - 'lang_add' => lang('add'), + 'lang_add' => $lang_add, 'lang_add_statustext' => lang('add a claim'), - 'add_action' => $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitenant_claim.edit') + 'add_action' => $add_action ); $link_data = array @@ -203,6 +235,7 @@ 'order' =>$this->order, 'cat_id' =>$this->cat_id, 'filter' =>$this->filter, + 'status' =>$this->status, 'query' =>$this->query ); @@ -236,6 +269,12 @@ 'select_action' => $GLOBALS['phpgw']->link('/index.php',$link_data), 'filter_list' => $this->nextmatchs->xslt_filter(array('filter' => $this->filter)), 'lang_filter_statustext' => lang('Select the filter. To show all entries select SHOW ALL'), + + 'status_name' => 'status', + 'status_list' => $this->bo->get_status_list(array('format' => 'filter', 'selected' => $this->status,'default' => 'open')), + 'lang_no_status' => lang('Open'), + '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, @@ -252,7 +291,30 @@ } - function edit() + function check() + { + $project_id = get_var('project_id',array('POST','GET')); + + $GLOBALS['phpgw']->xslttpl->add_file(array('tenant_claim')); + + $claim = $this->bo->check_claim_project($project_id); + $total_records = $this->bo->total_records; + + if($total_records > 0) + { + $receipt['message'][] = array('msg'=>lang('%1 claim is already registered for this project',$total_records)); + $GLOBALS['phpgw']->session->appsession('session_data','tenant_claim_receipt',$receipt); + $this->index($project_id); + } + else + { + $this->edit($project_id); + } + + return; + } + + function edit($project_id='') { $claim_id = get_var('claim_id',array('POST','GET')); @@ -264,6 +326,11 @@ $values['last_name'] = get_var('last_name',array('POST')); $values['first_name'] = get_var('first_name',array('POST')); + if($project_id) + { + $values['project_id'] = $project_id; + } + $this->boproject= CreateObject($this->currentapp.'.boproject'); $GLOBALS['phpgw']->xslttpl->add_file(array('tenant_claim')); @@ -280,7 +347,7 @@ $receipt['error'][]=array('msg'=>lang('Please select a budget account !')); } - if(!$values['workorder_id']) + if(!$values['workorder']) { $receipt['error'][]=array('msg'=>lang('Please select a workorder !')); } @@ -315,13 +382,16 @@ $project_values = $this->boproject->read_single($values['project_id']); +//_debug_array($project_values); + $table_header_workorder[] = array ( - 'lang_workorder_id' => lang('Workorder'), - 'lang_budget' => lang('Budget'), - 'lang_calculation' => lang('Calculation'), - 'lang_vendor' => lang('Vendor'), - 'lang_select' => lang('Select') + 'lang_workorder_id' => lang('Workorder'), + 'lang_budget' => lang('Budget'), + 'lang_calculation' => lang('Calculation'), + 'lang_vendor' => lang('Vendor'), + 'lang_charge_tenant' => lang('Charge tenant'), + 'lang_select' => lang('Select') ); $bolocation = CreateObject($this->currentapp.'.bolocation'); @@ -362,9 +432,10 @@ } endif; - if($values['workorder_id'] && $project_values['workorder_budget']) + + if($values['workorder'] && $project_values['workorder_budget']) { - foreach ($values['workorder_id'] as $workorder_id) + foreach ($values['workorder'] as $workorder_id) { for ($i=0;$ibo->check_claim_workorder($project_values['workorder_budget'][$i]['workorder_id']); + + if($claimed) + { + $project_values['workorder_budget'][$i]['claimed'] = $claimed; + } + } + + + $this->cat_id = ($values['cat_id']?$values['cat_id']:$this->cat_id); $b_account_data=$this->bocommon->initiate_ui_budget_account_lookup(array( 'b_account_id' => $values['b_account_id'], @@ -459,6 +543,12 @@ //------------------ + 'lang_status' => lang('Status'), + 'lang_status_statustext' => lang('Select status'), + 'status_list' => $this->bo->get_status_list(array('format' => 'select', 'selected' => $values['status'],'default' => 'open')), + 'lang_no_status' => lang('No status'), + 'select_status_name' => 'values[status]', + 'lang_amount' => lang('amount'), 'lang_amount_statustext' => lang('The total amount to claim'), 'value_amount' => $values['amount'], ==================================================== Index: property/inc/class.soinvoice.inc.php diff -u property/inc/class.soinvoice.inc.php:1.10 property/inc/class.soinvoice.inc.php:1.11 --- property/inc/class.soinvoice.inc.php:1.10 Mon Apr 11 12:01:39 2005 +++ property/inc/class.soinvoice.inc.php Thu Apr 14 14:48:39 2005 @@ -356,9 +356,10 @@ $filtermethod = " WHERE ( bilagsnr= '$voucher_id')"; } - $sql = "SELECT $table.*,fm_workorder.status,fm_workorder.charge_tenant ,org_name FROM (( $table $this->left_join " - . "fm_workorder on fm_workorder.id = $table.pmwrkord_code ) $this->join " - . "fm_vendor on $table.spvend_code = fm_vendor.id ) $filtermethod "; + $sql = "SELECT $table.*,fm_workorder.status,fm_workorder.charge_tenant,org_name,fm_project.claim_issued FROM $table " + . " $this->left_join fm_workorder on fm_workorder.id = $table.pmwrkord_code " + . " $this->join fm_project on fm_project.id = fm_workorder.project_id" + . " $this->join fm_vendor on $table.spvend_code = fm_vendor.id $filtermethod "; $this->db2->query($sql,__LINE__,__FILE__); $this->total_records = $this->db2->num_rows(); @@ -369,7 +370,8 @@ while ($this->db->next_record()) { $invoice[$i]['counter'] = $i; - $invoice[$i]['project_id'] = $this->db->f('project_id'); + $invoice[$i]['claim_issued'] = $this->db->f('claim_issued'); + $invoice[$i]['project_id'] = $this->db->f('project_id'); $invoice[$i]['workorder_id'] = $this->db->f('pmwrkord_code'); $invoice[$i]['status'] = $this->db->f('status'); if ($this->db->f('status')=='closed') @@ -941,8 +943,6 @@ $local_error= true; } - - if (!($check_count['spbudact_code_count'] == $values['invoice_count'][$n])) { $receipt['error'][] = array('msg'=>lang('Budget code is missing from sub invoice in :'). " ".$values['voucher_id'][$n]); @@ -955,6 +955,12 @@ $local_error= true; } + if ($this->check_claim($voucher_id)) + { + $receipt['error'][] = array('msg'=>lang('Tenant claim is not issued for project in voucher %1',$voucher_id)); + $local_error= true; + } + $blank_date = ''; $sign_field=''; $sign_id=''; @@ -1133,5 +1139,13 @@ return $allow_transfer; } + function check_claim($voucher_id='') + { + $sql = "SELECT count(*) FROM fm_ecobilag $this->left_join fm_workorder on fm_ecobilag.pmwrkord_code = fm_workorder.id " + . " WHERE bilagsnr='$voucher_id' AND fm_workorder.charge_tenant=1 AND fm_workorder.claim_issued IS NULL"; + $this->db->query($sql,__LINE__,__FILE__); + $this->db->next_record(); + return $this->db->f(0); + } } ?> ==================================================== Index: property/inc/class.uiworkorder.inc.php diff -u property/inc/class.uiworkorder.inc.php:1.5 property/inc/class.uiworkorder.inc.php:1.6 --- property/inc/class.uiworkorder.inc.php:1.5 Thu Jan 13 16:52:48 2005 +++ property/inc/class.uiworkorder.inc.php Thu Apr 14 14:48:39 2005 @@ -906,7 +906,7 @@ ( 'done_action' => $GLOBALS['phpgw']->link('/index.php',$link_data), 'add_action' => $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit'), - 'search_action' => $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.index&lookup=true'), + 'search_action' => $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.index&lookup=true&from=workorder'), 'lang_done_statustext' => lang('Back to the workorder list'), 'lang_add_statustext' => lang('Adds a new project - then a new workorder'), ==================================================== Index: property/inc/class.soworkorder.inc.php diff -u property/inc/class.soworkorder.inc.php:1.4 property/inc/class.soworkorder.inc.php:1.5 --- property/inc/class.soworkorder.inc.php:1.4 Thu Jan 13 16:52:48 2005 +++ property/inc/class.soworkorder.inc.php Thu Apr 14 14:48:39 2005 @@ -480,6 +480,12 @@ $this->db->query("INSERT INTO fm_orders (id,type) VALUES (" . $workorder['workorder_id'] . ",'workorder')"); + + if($workorder['charge_tenant']) + { + $this->db->query("UPDATE fm_project set charge_tenant = 1 WHERE id =" . $workorder['project_id']); + } + if($this->db->transaction_commit()) { $this->increment_workorder_id(); @@ -498,7 +504,6 @@ $historylog = CreateObject($this->currentapp.'.historylog','workorder'); $workorder['descr'] = $this->db->db_addslashes($workorder['descr']); $workorder['title'] = $this->db->db_addslashes($workorder['title']); -//_debug_array($workorder); $value_set=array( 'title' => $workorder['title'], @@ -528,6 +533,11 @@ $this->db->query("UPDATE fm_workorder set $value_set WHERE id=" . $workorder['workorder_id'] ,__LINE__,__FILE__); + if($workorder['charge_tenant']) + { + $this->db->query("UPDATE fm_project set charge_tenant = 1 WHERE id =" . $workorder['project_id']); + } + if($this->db->transaction_commit()) { if ($old_status != $workorder['status']) ==================================================== Index: property/inc/class.soproject.inc.php diff -u property/inc/class.soproject.inc.php:1.17 property/inc/class.soproject.inc.php:1.18 --- property/inc/class.soproject.inc.php:1.17 Wed Mar 2 10:29:38 2005 +++ property/inc/class.soproject.inc.php Thu Apr 14 14:48:39 2005 @@ -407,7 +407,7 @@ function project_workorder_data($project_id = '') { - $this->db->query("SELECT act_mtrl_cost, act_vendor_cost, budget, id as workorder_id, vendor_id, calculation,rig_addition,addition,deviation from fm_workorder where project_id='$project_id'"); + $this->db->query("SELECT act_mtrl_cost, act_vendor_cost, budget, id as workorder_id, vendor_id, calculation,rig_addition,addition,deviation,charge_tenant from fm_workorder where project_id='$project_id'"); while ($this->db->next_record()) { $budget[] = array( @@ -417,7 +417,8 @@ 'calculation' => ($this->db->f('calculation')*(1+$this->db->f('addition')/100))+$this->db->f('rig_addition'), 'vendor_id' => $this->db->f('vendor_id'), 'act_mtrl_cost' => $this->db->f('act_mtrl_cost'), - 'act_vendor_cost' => $this->db->f('act_vendor_cost') + 'act_vendor_cost' => $this->db->f('act_vendor_cost'), + 'charge_tenant' => $this->db->f('charge_tenant') ); } return $budget; ==================================================== Index: property/inc/class.botenant_claim.inc.php diff -u property/inc/class.botenant_claim.inc.php:1.1 property/inc/class.botenant_claim.inc.php:1.2 --- property/inc/class.botenant_claim.inc.php:1.1 Tue Apr 12 14:12:20 2005 +++ property/inc/class.botenant_claim.inc.php Thu Apr 14 14:48:39 2005 @@ -52,6 +52,7 @@ $sort = get_var('sort',array('POST','GET')); $order = get_var('order',array('POST','GET')); $filter = get_var('filter',array('POST','GET')); + $status = get_var('status',array('POST','GET')); $cat_id = get_var('cat_id',array('POST','GET')); $allrows= get_var('allrows',array('POST','GET')); @@ -72,6 +73,10 @@ { $this->filter = $filter; } + if(isset($status)) + { + $this->status = $status; + } if(isset($sort)) { $this->sort = $sort; @@ -109,6 +114,7 @@ $this->start = $data['start']; $this->query = $data['query']; $this->filter = $data['filter']; + $this->status = $data['status']; $this->sort = $data['sort']; $this->order = $data['order']; $this->cat_id = $data['cat_id']; @@ -119,6 +125,59 @@ return (!!($has & $needed) == True); } + function get_status_list($data=0) + { + if(is_array($data)) + { + $format = (isset($data['format'])?$data['format']:''); + $selected = (isset($data['selected'])?$data['selected']:$data['default']); + } + else + { + return; + } + + $GLOBALS['phpgw']->xslttpl->add_file(array('status_' . $format)); + + $status[0][id]='closed'; + $status[0][name]=lang('Closed'); + if($format == "filter") + { + $status[1][id]='all'; + $status[1][name]=lang('All'); + } + else + { + $status[1][id]='open'; + $status[1][name]=lang('Open'); + } + + while (is_array($status) && list(,$entry) = each($status)) + { + $sel_status = ''; + if ($entry['id']==$selected) + { + $sel_status = 'selected'; + } + + $status_list[] = array + ( + 'id' => $entry['id'], + 'name' => $entry['name'], + 'selected' => $sel_status + ); + } + + for ($i=0;$iso->read(array('start' => $this->start,'query' => $this->query,'sort' => $this->sort,'order' => $this->order, - 'filter' => $this->filter,'cat_id' => $this->cat_id,'allrows'=>$this->allrows)); + 'filter' => $this->filter,'status' => $this->status,'cat_id' => $this->cat_id, + 'allrows'=>$this->allrows,'project_id' => $data['project_id'])); $this->total_records = $this->so->total_records; for ($i=0; $iso->check_claim_project($project_id); + $this->total_records = $this->so->total_records; + return $claim; + } + + function check_claim_workorder($workorder_id) + { + $claim = $this->so->check_claim_workorder($workorder_id); + $this->total_records = $this->so->total_records; + return $claim; + } + function read_single($claim_id) { return $this->so->read_single($claim_id); ==================================================== Index: property/inc/class.sotenant_claim.inc.php diff -u property/inc/class.sotenant_claim.inc.php:1.1 property/inc/class.sotenant_claim.inc.php:1.2 --- property/inc/class.sotenant_claim.inc.php:1.1 Tue Apr 12 14:12:20 2005 +++ property/inc/class.sotenant_claim.inc.php Thu Apr 14 14:48:39 2005 @@ -67,11 +67,14 @@ { $start = (isset($data['start'])?$data['start']:0); $filter = (isset($data['filter'])?$data['filter']:'none'); + $status = (isset($data['status'])?$data['status']:'open'); $query = (isset($data['query'])?$data['query']:''); $sort = (isset($data['sort'])?$data['sort']:'DESC'); $order = (isset($data['order'])?$data['order']:''); $cat_id = (isset($data['cat_id'])?$data['cat_id']:0); - $allrows = (isset($data['allrows'])?$data['allrows']:''); + $allrows = (isset($data['allrows'])?$data['allrows']:''); + $project_id = (isset($data['project_id'])?$data['project_id']:''); + } if ($order) @@ -89,9 +92,26 @@ { $filtermethod .= " $where category='$cat_id' "; $where = 'AND'; + } + if ($project_id > 0) + { + $filtermethod .= " $where project_id='$project_id' "; + $where = 'AND'; } + if ($status == 'closed'): + { + $filtermethod .= " $where fm_tenant_claim.status='closed'"; + $where = 'AND'; + } + elseif($status == ''): + { + $filtermethod .= " $where fm_tenant_claim.status='open'"; + $where = 'AND'; + } + endif; + if($query) { $query = ereg_replace("'",'',$query); @@ -119,6 +139,7 @@ $claims[] = array ( 'claim_id' => $this->db->f('id'), + 'project_id' => $this->db->f('project_id'), 'tenant_id' => $this->db->f('tenant_id'), 'remark' => stripslashes($this->db->f('remark')), 'entry_date' => $this->db->f('entry_date'), @@ -128,6 +149,43 @@ return $claims; } + function check_claim_project($project_id) + { + $sql = "SELECT fm_tenant_claim.*, descr as category FROM fm_tenant_claim" + . " $this->join fm_tenant_claim_category on fm_tenant_claim.category=fm_tenant_claim_category.id" + . " WHERE project_id = $project_id"; + + $this->db2->query($sql,__LINE__,__FILE__); + $this->total_records = $this->db2->num_rows(); + + $this->db->query($sql . $ordermethod,__LINE__,__FILE__); + + while ($this->db->next_record()) + { + $claims[] = array + ( + 'claim_id' => $this->db->f('id'), + 'project_id' => $this->db->f('project_id'), + 'tenant_id' => $this->db->f('tenant_id'), + 'entry_date' => $this->db->f('entry_date'), + 'category' => $this->db->f('category') + ); + } + return $claims; + } + + function check_claim_workorder($workorder_id) + { + $this->db->query("select * from fm_origin WHERE destination ='tenant_claim' AND origin_id='$workorder_id'",__LINE__,__FILE__); + + while ($this->db->next_record()) + { + $claim[] = $this->db->f('destination_id'); + } + + return @implode(",", $claim); + } + function read_single($id) { $this->db->query("select * from fm_tenant_claim where id='$id'",__LINE__,__FILE__); @@ -143,6 +201,7 @@ $claim['amount'] = $this->db->f('amount'); $claim['b_account_id'] = $this->db->f('b_account_id'); $claim['cat_id'] = (int)$this->db->f('category'); + $claim['status'] = $this->db->f('status'); } @@ -150,7 +209,7 @@ while ($this->db->next_record()) { - $claim['workorder_id'][] = $this->db->f('origin_id'); + $claim['workorder'][] = $this->db->f('origin_id'); } return $claim; @@ -171,19 +230,20 @@ $claim['cat_id'], $claim['remark'], $this->account, - time() + time(), + $claim['status'] ); $values_insert = $this->bocommon->validate_db_insert($values_insert); - $this->db->query("INSERT INTO fm_tenant_claim (project_id,tenant_id,amount,b_account_id,category,remark,user_id,entry_date) " + $this->db->query("INSERT INTO fm_tenant_claim (project_id,tenant_id,amount,b_account_id,category,remark,user_id,entry_date,status) " . "VALUES ($values_insert)",__LINE__,__FILE__); $claim_id = $this->db->get_last_insert_id('fm_tenant_claim','id'); $receipt['claim_id'] = $claim_id; - foreach ($claim['workorder_id'] as $workorder_id) + foreach ($claim['workorder'] as $workorder_id) { $this->db->query("INSERT INTO fm_origin (origin,origin_id,destination,destination_id,entry_date,user_id) " . "VALUES ('workorder'," @@ -193,7 +253,7 @@ . time()."," . $this->account .")",__LINE__,__FILE__); - $this->db->query("UPDATE fm_workorder set claim_id = $claim_id WHERE id=$workorder_id" ,__LINE__,__FILE__); + $this->db->query("UPDATE fm_workorder set claim_issued = 1 WHERE id=" . $claim['project_id'] ,__LINE__,__FILE__); } $this->db->transaction_commit(); @@ -214,6 +274,7 @@ 'b_account_id' => $claim['b_account_id'], 'amount' => $claim['amount'], 'category' => $claim['cat_id'], + 'status' => $claim['status'], 'user_id' => $this->account, 'remark' => $this->db->db_addslashes($claim['remark']) ); @@ -226,9 +287,9 @@ $this->db->query("DELETE FROM fm_origin WHERE destination ='tenant_claim' AND destination_id=$claim_id",__LINE__,__FILE__); - $this->db->query("UPDATE fm_workorder set claim_id = NULL WHERE id=" . $claim['project_id'] ,__LINE__,__FILE__); + $this->db->query("UPDATE fm_workorder set claim_issued = NULL WHERE id=" . $claim['project_id'] ,__LINE__,__FILE__); - foreach ($claim['workorder_id'] as $workorder_id) + foreach ($claim['workorder'] as $workorder_id) { $this->db->query("INSERT INTO fm_origin (origin,origin_id,destination,destination_id,entry_date,user_id) " . "VALUES ('workorder'," @@ -238,7 +299,7 @@ . time()."," . $this->account .")",__LINE__,__FILE__); - $this->db->query("UPDATE fm_workorder set claim_id = $claim_id WHERE id=$workorder_id" ,__LINE__,__FILE__); + $this->db->query("UPDATE fm_workorder set claim_issued = 1 WHERE id=" . $claim['project_id'] ,__LINE__,__FILE__); } $this->db->transaction_commit(); ==================================================== Index: property/inc/class.boproject.inc.php diff -u property/inc/class.boproject.inc.php:1.8 property/inc/class.boproject.inc.php:1.9 --- property/inc/class.boproject.inc.php:1.8 Tue Mar 1 15:04:27 2005 +++ property/inc/class.boproject.inc.php Thu Apr 14 14:48:39 2005 @@ -365,6 +365,7 @@ $project['workorder_budget'][$i]['workorder_id']=$workorder_data[$i]['workorder_id']; $project['workorder_budget'][$i]['budget']=number_format($workorder_data[$i]['budget'], 2, ',', ''); $project['workorder_budget'][$i]['calculation']=number_format($workorder_data[$i]['calculation']*$tax, 2, ',', ''); + $project['workorder_budget'][$i]['charge_tenant'] = $workorder_data[$i]['charge_tenant']; $vendor = $contacts->read_single(array('actor_id'=>(int)$workorder_data[$i]['vendor_id'])); if(is_array($vendor)) { From MAILER-DAEMON Thu Apr 14 11:47:41 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DM6WQ-0003EO-81 for mharc-phpgroupware-cvs@gnu.org; Thu, 14 Apr 2005 11:44:50 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DM6WA-00037b-6A for phpgroupware-cvs@gnu.org; Thu, 14 Apr 2005 11:44:35 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DM6W0-00033m-0q for phpgroupware-cvs@gnu.org; Thu, 14 Apr 2005 11:44:28 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DM6Vz-0002xo-Jr for phpgroupware-cvs@gnu.org; Thu, 14 Apr 2005 11:44:23 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DM6Ki-0004u1-Un for phpgroupware-cvs@gnu.org; Thu, 14 Apr 2005 11:32:45 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 11497312D4 for ; Thu, 14 Apr 2005 17:31:15 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 25889-02 for ; Thu, 14 Apr 2005 17:31:12 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 8F173312CE for ; Thu, 14 Apr 2005 17:31:12 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3EFVCa24709; Thu, 14 Apr 2005 17:31:12 +0200 Message-Id: <200504141531.j3EFVCa24709@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: sigurdne Date: Thu, 14 Apr 2005 16:49:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] property/templates/default tenant_claim.xsl, 1.2 invoice.xsl, 1.9 project.xsl, 1.8 location.xsl, 1.3 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Apr 2005 15:44:41 -0000 Update of property/templates/default Modified Files: Branch: MAIN tenant_claim.xsl lines: +43 -2 invoice.xsl lines: +7 -1 project.xsl lines: +1 -40 location.xsl lines: +2 -2 Log Message: no message ==================================================== Index: property/templates/default/tenant_claim.xsl diff -u property/templates/default/tenant_claim.xsl:1.1 property/templates/default/tenant_claim.xsl:1.2 --- property/templates/default/tenant_claim.xsl:1.1 Tue Apr 12 14:12:41 2005 +++ property/templates/default/tenant_claim.xsl Thu Apr 14 14:49:58 2005 @@ -29,6 +29,9 @@ + + + @@ -49,6 +52,7 @@ + @@ -56,6 +60,9 @@ + + + @@ -99,6 +106,9 @@ + + + @@ -335,6 +345,8 @@ + + @@ -387,6 +399,14 @@ + + + + + + + + @@ -410,6 +430,7 @@ + @@ -821,6 +842,9 @@ + + + @@ -858,8 +882,25 @@ + + x + + + + + + [ + + ] + + + + + + + - + window.status=' @@ -868,7 +909,7 @@ - + window.status=' ==================================================== Index: property/templates/default/invoice.xsl diff -u property/templates/default/invoice.xsl:1.8 property/templates/default/invoice.xsl:1.9 --- property/templates/default/invoice.xsl:1.8 Thu Jan 13 16:52:48 2005 +++ property/templates/default/invoice.xsl Thu Apr 14 14:49:58 2005 @@ -2408,6 +2408,12 @@ + + + &project_id= + + + x ==================================================== Index: property/templates/default/project.xsl diff -u property/templates/default/project.xsl:1.7 property/templates/default/project.xsl:1.8 --- property/templates/default/project.xsl:1.7 Fri Feb 25 13:19:54 2005 +++ property/templates/default/project.xsl Thu Apr 14 14:49:58 2005 @@ -285,33 +285,6 @@ - - - - - - - - - window.status=' - - '; return true; - - - - - - - window.status=' - - '; return true; - - - - - - - @@ -832,18 +805,6 @@ - - - - - - - X - - - - - ==================================================== Index: property/templates/default/location.xsl diff -u property/templates/default/location.xsl:1.2 property/templates/default/location.xsl:1.3 --- property/templates/default/location.xsl:1.2 Wed Jun 2 19:10:19 2004 +++ property/templates/default/location.xsl Thu Apr 14 14:49:58 2005 @@ -385,7 +385,7 @@ - + From MAILER-DAEMON Thu Apr 14 11:47:51 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DM6WQ-0003EY-QW for mharc-phpgroupware-cvs@gnu.org; Thu, 14 Apr 2005 11:44:51 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DM6W6-00035C-FT for phpgroupware-cvs@gnu.org; Thu, 14 Apr 2005 11:44:31 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DM6Vy-00032O-RP for phpgroupware-cvs@gnu.org; Thu, 14 Apr 2005 11:44:23 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DM6Vx-0002xo-7M for phpgroupware-cvs@gnu.org; Thu, 14 Apr 2005 11:44:21 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DM6LA-0004vc-9f for phpgroupware-cvs@gnu.org; Thu, 14 Apr 2005 11:33:12 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 47235312D4 for ; Thu, 14 Apr 2005 17:31:42 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 25692-05 for ; Thu, 14 Apr 2005 17:31:37 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id B0E16312CE for ; Thu, 14 Apr 2005 17:31:37 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3EFVbG24728; Thu, 14 Apr 2005 17:31:37 +0200 Message-Id: <200504141531.j3EFVbG24728@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: sigurdne Date: Thu, 14 Apr 2005 16:49:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] property/templates/base location.xsl, 1.2 project.xsl, 1.3 invoice.xsl, 1.2 tenant_claim.xsl, 1.1 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Apr 2005 15:44:41 -0000 Update of property/templates/base Modified Files: Branch: MAIN location.xsl lines: +1 -1 project.xsl lines: +1 -40 invoice.xsl lines: +6 -0 Added Files: Branch: MAIN tenant_claim.xsl Log Message: no message ==================================================== Index: property/templates/base/location.xsl diff -u property/templates/base/location.xsl:1.1 property/templates/base/location.xsl:1.2 --- property/templates/base/location.xsl:1.1 Mon Jan 17 10:03:18 2005 +++ property/templates/base/location.xsl Thu Apr 14 14:49:39 2005 @@ -385,7 +385,7 @@ - + ==================================================== Index: property/templates/base/project.xsl diff -u property/templates/base/project.xsl:1.2 property/templates/base/project.xsl:1.3 --- property/templates/base/project.xsl:1.2 Fri Feb 25 13:19:54 2005 +++ property/templates/base/project.xsl Thu Apr 14 14:49:39 2005 @@ -285,33 +285,6 @@ - - - - - - - - - window.status=' - - '; return true; - - - - - - - window.status=' - - '; return true; - - - - - - - @@ -832,18 +805,6 @@ - - - - - - - X - - - - - ==================================================== Index: property/templates/base/invoice.xsl diff -u property/templates/base/invoice.xsl:1.1 property/templates/base/invoice.xsl:1.2 --- property/templates/base/invoice.xsl:1.1 Mon Jan 17 10:03:18 2005 +++ property/templates/base/invoice.xsl Thu Apr 14 14:49:39 2005 @@ -2408,6 +2408,12 @@ + + + &project_id= + + + x ==================================================== Index: tenant_claim.xsl
row_off row_on
window.status=' '; return true;
X
[ ]
[ ]
[ ] ( % )
[ ]
window.status=' '; return true; window.status=' '; return true;
window.status=' '; return true; [ ]
window.status=' '; return true; window.status=' '; return true; window.status=' '; return true;
X
[ ]
[ ]
[ ] ( % )
[ ]
,
&id= row_off row_on x [ ] window.status=' '; return true; window.status=' '; return true; From MAILER-DAEMON Fri Apr 15 06:03:07 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DMNfG-0005an-T7 for mharc-phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 06:03:07 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DMNfE-0005aK-1g for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 06:03:04 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DMNfB-0005Zo-TS for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 06:03:03 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DMNc4-0004j6-9E for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 05:59:48 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DMNBJ-0006aG-5x for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 05:32:09 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 3F27B312BC for ; Fri, 15 Apr 2005 11:30:26 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 12021-05 for ; Fri, 15 Apr 2005 11:30:23 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 2364C312B3 for ; Fri, 15 Apr 2005 11:30:23 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3F9UN408670; Fri, 15 Apr 2005 11:30:23 +0200 Message-Id: <200504150930.j3F9UN408670@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: sigurdne Date: Fri, 15 Apr 2005 10:30:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] property/templates/default tenant_claim.xsl,1.3 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2005 10:03:05 -0000 Update of property/templates/default Modified Files: Branch: MAIN tenant_claim.xsl lines: +77 -96 Log Message: no message ==================================================== Index: property/templates/default/tenant_claim.xsl diff -u property/templates/default/tenant_claim.xsl:1.2 property/templates/default/tenant_claim.xsl:1.3 --- property/templates/default/tenant_claim.xsl:1.2 Thu Apr 14 14:49:58 2005 +++ property/templates/default/tenant_claim.xsl Fri Apr 15 08:30:41 2005 @@ -73,6 +73,9 @@ + + + @@ -118,6 +121,9 @@ + + + @@ -513,8 +519,17 @@ - +
+
+ + + + - - - - - - - - - + @@ -645,9 +645,6 @@ - - + +
+ + + +
@@ -524,21 +539,6 @@
- - - - - - -
@@ -559,7 +559,7 @@ @@ -599,7 +599,7 @@ - X + X
- - @@ -655,24 +652,26 @@ - + @@ -724,94 +723,75 @@ - - - - - - - - - - + - + + + + + + + + - - - - - - - - - - - + - + + + + + + + + - - + - @@ -824,6 +804,7 @@
+ - - - +
+ + + +
- - - - - , - -
- - - -
- + +
+ - - - + + + + - - - -
- + - - - - - - - + + + +
- + + - - - - - - - + + [ ]
- - - -
+
- - + +
- +
+ - + + +
+ @@ -869,7 +850,7 @@
- + From MAILER-DAEMON Fri Apr 15 06:03:31 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DMNfd-0005eX-Tq for mharc-phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 06:03:30 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DMNfa-0005e7-Sy for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 06:03:27 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DMNfX-0005dg-Cs for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 06:03:25 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DMNc6-0004j6-1p for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 05:59:50 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DMNBE-0006Zk-5u for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 05:32:04 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 29566312B3 for ; Fri, 15 Apr 2005 11:30:21 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 11946-06 for ; Fri, 15 Apr 2005 11:30:18 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id BCB22312BC for ; Fri, 15 Apr 2005 11:30:18 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3F9UI708663; Fri, 15 Apr 2005 11:30:18 +0200 Message-Id: <200504150930.j3F9UI708663@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: sigurdne Date: Fri, 15 Apr 2005 10:30:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] property/templates/base tenant_claim.xsl,1.2 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2005 10:03:27 -0000 Update of property/templates/base Modified Files: Branch: MAIN tenant_claim.xsl lines: +77 -96 Log Message: no message ==================================================== Index: property/templates/base/tenant_claim.xsl diff -u property/templates/base/tenant_claim.xsl:1.1 property/templates/base/tenant_claim.xsl:1.2 --- property/templates/base/tenant_claim.xsl:1.1 Thu Apr 14 14:49:39 2005 +++ property/templates/base/tenant_claim.xsl Fri Apr 15 08:30:41 2005 @@ -73,6 +73,9 @@ + + @@ -118,6 +121,9 @@ + + @@ -513,8 +519,17 @@ - +
+
+ + + + - - - - - - - - - + @@ -645,9 +645,6 @@ - - From MAILER-DAEMON Mon Apr 18 05:32:07 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNSbv-0008Oj-1h for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:32:07 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNSbi-0008Ku-Dl for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:31:54 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNSbg-0008KR-A7 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:31:52 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNSbf-0008It-Qq for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:31:51 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNScd-00050t-0E for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:32:51 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id B6708312B8 for ; Mon, 18 Apr 2005 11:30:15 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 19201-01 for ; Mon, 18 Apr 2005 11:30:13 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 51205312B5 for ; Mon, 18 Apr 2005 11:30:13 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I9UD702818; Mon, 18 Apr 2005 11:30:13 +0200 Message-Id: <200504180930.j3I9UD702818@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 10:38:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] mediadb/inc format.inc.php,1.6 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 09:31:56 -0000 Update of mediadb/inc Modified Files: Branch: MAIN format.inc.php lines: +2 -2 Log Message: Fixed syntax errors - wrong closing " must be ' ==================================================== Index: mediadb/inc/format.inc.php diff -u mediadb/inc/format.inc.php:1.5 mediadb/inc/format.inc.php:1.6 --- mediadb/inc/format.inc.php:1.5 Sun Jan 27 13:52:53 2002 +++ mediadb/inc/format.inc.php Mon Apr 18 08:38:02 2005 @@ -87,7 +87,7 @@ { $rchecked = 'checked'; } - if ($GLOBALS['phpgw']->db->f('format_hscores")) + if ($GLOBALS['phpgw']->db->f('format_hscores')) { $schecked = 'checked'; } From MAILER-DAEMON Mon Apr 18 05:32:11 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNSby-0008PO-TU for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:32:11 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNSbp-0008NN-V8 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:32:02 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNSbl-0008Lw-DO for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:31:58 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNSbj-0008It-SA for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:31:56 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNScy-00054P-M6 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:33:12 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 6387E312B8 for ; Mon, 18 Apr 2005 11:30:37 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 19201-02 for ; Mon, 18 Apr 2005 11:30:35 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 6A4D3312B5 for ; Mon, 18 Apr 2005 11:30:35 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I9UZs02846; Mon, 18 Apr 2005 11:30:35 +0200 Message-Id: <200504180930.j3I9UZs02846@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 10:54:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] squirrelmail/inc hook_admin.inc.php,1.6 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 09:32:05 -0000 Update of squirrelmail/inc Modified Files: Branch: MAIN hook_admin.inc.php lines: +2 -2 Log Message: Fixed syntax errors ==================================================== Index: squirrelmail/inc/hook_admin.inc.php diff -u squirrelmail/inc/hook_admin.inc.php:1.5 squirrelmail/inc/hook_admin.inc.php:1.6 --- squirrelmail/inc/hook_admin.inc.php:1.5 Wed Apr 23 01:50:05 2003 +++ squirrelmail/inc/hook_admin.inc.php Mon Apr 18 08:54:37 2005 @@ -12,7 +12,7 @@ { $file = Array ( - 'Site Configuration' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' $appname) + 'Site Configuration' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname) ); //Do not modify below this line $GLOBALS['phpgw']->common->display_mainscreen($appname,$file); From MAILER-DAEMON Mon Apr 18 05:32:37 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNScP-00007Z-1B for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:32:37 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNScB-0008V8-RN for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:32:24 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNSc9-0008U3-Ah for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:32:21 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNSc8-0008RI-VV for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:32:21 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNSd8-00056W-Qb for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:33:23 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 82E85312B8 for ; Mon, 18 Apr 2005 11:30:47 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 18772-07 for ; Mon, 18 Apr 2005 11:30:45 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 36F89312B5 for ; Mon, 18 Apr 2005 11:30:45 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I9Ujl02853; Mon, 18 Apr 2005 11:30:45 +0200 Message-Id: <200504180930.j3I9Ujl02853@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 10:56:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] syncml-server syncml.php,1.10 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 09:32:29 -0000 Update of syncml-server Modified Files: Branch: MAIN syncml.php lines: +1 -2 Log Message: fixed syntax error; missing '] ==================================================== Index: syncml-server/syncml.php diff -u syncml-server/syncml.php:1.9 syncml-server/syncml.php:1.10 --- syncml-server/syncml.php:1.9 Sat Jul 14 12:06:17 2001 +++ syncml-server/syncml.php Mon Apr 18 08:56:45 2005 @@ -93,8 +93,7 @@ /* Start processing incoming data */ if ( $debug['level'] > 0 ) { error_log ($debug['prefix'] . 'Starting processing of incoming SyncML data', - $debug['type'], $debug['destination); + $debug['type'], $debug['destination']); } $instance->process_data(); - ?> From MAILER-DAEMON Mon Apr 18 05:41:51 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNSlK-0002RU-W9 for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:41:51 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNSkI-00024t-Ap for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:40:47 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNSkA-000232-G4 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:40:40 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNSk8-0001qZ-Fp for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:40:37 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNSdd-0005BT-5p for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:33:53 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id D1252312B5 for ; Mon, 18 Apr 2005 11:31:17 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 18713-09 for ; Mon, 18 Apr 2005 11:31:15 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 802FE312B8 for ; Mon, 18 Apr 2005 11:31:15 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I9VF402873; Mon, 18 Apr 2005 11:31:15 +0200 Message-Id: <200504180931.j3I9VF402873@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 11:12:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] api/db class.db_sybase.php,1.3 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 09:41:48 -0000 Update of api/db Modified Files: Branch: MAIN class.db_sybase.php lines: +2 -2 Log Message: fixed syntax error ==================================================== Index: api/db/class.db_sybase.php diff -u api/db/class.db_sybase.php:1.2 api/db/class.db_sybase.php:1.3 --- api/db/class.db_sybase.php:1.2 Mon Apr 18 07:44:28 2005 +++ api/db/class.db_sybase.php Mon Apr 18 09:12:30 2005 @@ -46,7 +46,7 @@ } if(!$this->Link_ID) { - $this->halt('Link-ID == false, ' . ($GLOBALS['phpgw_info']['server']['db_persistent'] ? 'p' : '') . 'connect failed'); + $this->halt('Link-ID == false, ' . $GLOBALS['phpgw_info']['server']['db_persistent'] ? 'p' : '' . 'connect failed'); } if(!sybase_select_db($this->Database, $this->Link_ID)) { From MAILER-DAEMON Mon Apr 18 05:41:52 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNSlL-0002T2-Tg for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:41:52 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNSkI-00024y-B4 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:40:47 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNSkC-00023b-Bv for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:40:41 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNSkA-0001qZ-7y for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:40:38 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNSdT-0005AR-U1 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:33:44 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 72C44312D1 for ; Mon, 18 Apr 2005 11:31:08 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 19201-03 for ; Mon, 18 Apr 2005 11:31:06 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 7D14A312B8 for ; Mon, 18 Apr 2005 11:31:06 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I9V6b02866; Mon, 18 Apr 2005 11:31:06 +0200 Message-Id: <200504180931.j3I9V6b02866@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 11:03:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] timetrack deletecustomer.php, 1.8 deletedetail.php, 1.8 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 09:41:49 -0000 Update of timetrack Modified Files: Branch: MAIN deletecustomer.php lines: +2 -2 deletedetail.php lines: +2 -2 Log Message: fixed syntax errors ==================================================== Index: timetrack/deletecustomer.php diff -u timetrack/deletecustomer.php:1.7 timetrack/deletecustomer.php:1.8 --- timetrack/deletecustomer.php:1.7 Mon Mar 18 03:18:04 2002 +++ timetrack/deletecustomer.php Mon Apr 18 09:03:28 2005 @@ -78,7 +78,7 @@
+ + + +
@@ -524,21 +539,6 @@
- - - - - - -
@@ -559,7 +559,7 @@ @@ -599,7 +599,7 @@ - X + X
- - @@ -655,24 +652,26 @@ - + @@ -724,94 +723,75 @@ - - - - - - - - - - + - + + + + + + + + - - - - - - - - - - - + - + + + + + + + + - - + - @@ -824,6 +804,7 @@
+ - - - +
+ + + +
- - - - - , - -
- - - -
- + +
+ - - - + + + + - - - -
- + - - - - - - - + + + +
- + + - - - - - - - + + [ ]
- - - -
+
- - + +
- +
+ - + + +
+ @@ -869,7 +850,7 @@
- + From MAILER-DAEMON Fri Apr 15 06:06:45 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DMNim-0006Z5-4b for mharc-phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 06:06:44 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DMNih-0006XK-Fg for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 06:06:39 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DMNif-0006WN-Ik for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 06:06:38 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DMNc3-0004j6-Kz for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 05:59:48 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DMNBa-0006bC-FU for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 05:32:27 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 7F692312BC for ; Fri, 15 Apr 2005 11:30:43 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 12037-05 for ; Fri, 15 Apr 2005 11:30:40 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id A622C312B3 for ; Fri, 15 Apr 2005 11:30:40 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3F9UeL08689; Fri, 15 Apr 2005 11:30:40 +0200 Message-Id: <200504150930.j3F9UeL08689@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: sigurdne Date: Fri, 15 Apr 2005 10:30:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] property/inc class.uiworkorder.inc.php, 1.7 class.sotenant_claim.inc.php, 1.3 class.uitenant_claim.inc.php, 1.3 class.soinvoice.inc.php, 1.12 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2005 10:06:41 -0000 Update of property/inc Modified Files: Branch: MAIN class.uiworkorder.inc.php lines: +4 -2 class.sotenant_claim.inc.php lines: +3 -2 class.uitenant_claim.inc.php lines: +204 -8 class.soinvoice.inc.php lines: +2 -3 Log Message: no message ==================================================== Index: property/inc/class.uiworkorder.inc.php diff -u property/inc/class.uiworkorder.inc.php:1.6 property/inc/class.uiworkorder.inc.php:1.7 --- property/inc/class.uiworkorder.inc.php:1.6 Thu Apr 14 14:48:39 2005 +++ property/inc/class.uiworkorder.inc.php Fri Apr 15 08:30:41 2005 @@ -610,10 +610,12 @@ { $values['key_deliver']=$project['key_deliver']; } - if( $project['charge_tenant'] && !$values['workorder_id']) + +/* if( $project['charge_tenant'] && !$values['workorder_id']) { $values['charge_tenant']=$project['charge_tenant']; } +*/ if( $project['start_date'] && !$values['start_date']) { $values['start_date']=$project['start_date']; ==================================================== Index: property/inc/class.sotenant_claim.inc.php diff -u property/inc/class.sotenant_claim.inc.php:1.2 property/inc/class.sotenant_claim.inc.php:1.3 --- property/inc/class.sotenant_claim.inc.php:1.2 Thu Apr 14 14:48:39 2005 +++ property/inc/class.sotenant_claim.inc.php Fri Apr 15 08:30:41 2005 @@ -143,7 +143,8 @@ 'tenant_id' => $this->db->f('tenant_id'), 'remark' => stripslashes($this->db->f('remark')), 'entry_date' => $this->db->f('entry_date'), - 'category' => $this->db->f('category') + 'category' => $this->db->f('category'), + 'status' => $this->db->f('status') ); } return $claims; ==================================================== Index: property/inc/class.uitenant_claim.inc.php diff -u property/inc/class.uitenant_claim.inc.php:1.2 property/inc/class.uitenant_claim.inc.php:1.3 --- property/inc/class.uitenant_claim.inc.php:1.2 Thu Apr 14 14:48:39 2005 +++ property/inc/class.uitenant_claim.inc.php Fri Apr 15 08:30:41 2005 @@ -125,6 +125,7 @@ ( 'claim_id' => $claim['claim_id'], 'project_id' => $claim['project_id'], + 'status' => lang($claim['status']), 'name' => $name, 'entry_date' => $claim['entry_date'], 'category' => $claim['category'], @@ -146,6 +147,7 @@ ( 'lang_project' => lang('Project'), 'lang_name' => lang('name'), + 'lang_status' => lang('Status'), 'lang_time_created' => lang('time created'), 'lang_view' => lang('view'), 'lang_edit' => lang('edit'), @@ -258,7 +260,7 @@ 'allrows' => $this->allrows, 'start_record' => $this->start, 'record_limit' => $record_limit, - 'num_records' => count($claims_list), + 'num_records' => count($claim_list), 'all_records' => $this->bo->total_records, 'link_url' => $GLOBALS['phpgw']->link('/index.php',$link_data), 'img_path' => $GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'), @@ -304,6 +306,8 @@ { $receipt['message'][] = array('msg'=>lang('%1 claim is already registered for this project',$total_records)); $GLOBALS['phpgw']->session->appsession('session_data','tenant_claim_receipt',$receipt); + $this->bo->status = 'all'; + $this->status = 'all'; $this->index($project_id); } else @@ -316,6 +320,11 @@ function edit($project_id='') { + if(!$this->acl_add && !$this->acl_edit) + { + $GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location=' . $this->acl2_location); + } + $claim_id = get_var('claim_id',array('POST','GET')); $values = get_var('values',array('POST')); @@ -591,6 +600,13 @@ function delete() { + + if(!$this->acl_delete) + { + $GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=8&acl_location=' . $this->acl2_location); + } + + $claim_id = get_var('claim_id',array('POST','GET')); $delete = get_var('delete',array('POST')); $confirm = get_var('confirm',array('POST')); @@ -629,20 +645,194 @@ } - function view() { - $claim_id = get_var('claim_id',array('GET')); - $action = get_var('action',array('GET')); + if(!$this->acl_read) + { + $GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location=' . $this->acl2_location); + } + + $claim_id = get_var('claim_id',array('POST','GET')); + + $this->boproject= CreateObject($this->currentapp.'.boproject'); + $GLOBALS['phpgw']->xslttpl->add_file(array('tenant_claim')); + + $values = $this->bo->read_single($claim_id); + + $project_values = $this->boproject->read_single($values['project_id']); + + $table_header_workorder[] = array + ( + 'lang_workorder_id' => lang('Workorder'), + 'lang_budget' => lang('Budget'), + 'lang_calculation' => lang('Calculation'), + 'lang_vendor' => lang('Vendor'), + 'lang_charge_tenant' => lang('Charge tenant'), + 'lang_select' => lang('Select') + ); - $GLOBALS['phpgw_info']['flags']['app_header'] = lang('Tenant claim') . ': ' . lang('view claim'); + $bolocation = CreateObject($this->currentapp.'.bolocation'); - $GLOBALS['phpgw']->xslttpl->add_file('tenant_claim'); + $location_data=$bolocation->initiate_ui_location(array( + 'values' => $project_values['location_data'], + 'type_id' => count(explode('-',$project_values['location_data']['location_code'])), + 'no_link' => False, // disable lookup links for location type less than type_id + 'tenant' => $project_values['location_data']['tenant_id'], + 'lookup_type' => 'view', + 'lookup_entity' => $this->bocommon->get_lookup_entity('project'), + 'entity_data' => $project_values['p'] + )); - $claim = $this->bo->read_single($claim_id); + if($project_values['contact_phone']) + { + for ($i=0;$ibocommon->read_single_tenant($values['tenant_id']); + $values['last_name'] = $tenant['last_name']; + $values['first_name'] = $tenant['first_name']; + } + endif; + + + if($values['workorder'] && $project_values['workorder_budget']) + { + foreach ($values['workorder'] as $workorder_id) + { + for ($i=0;$ibo->check_claim_workorder($project_values['workorder_budget'][$i]['workorder_id']); + + if($claimed) + { + $project_values['workorder_budget'][$i]['claimed'] = $claimed; + } + } + + + + $b_account_data=$this->bocommon->initiate_ui_budget_account_lookup(array( + 'b_account_id' => $values['b_account_id'], + 'b_account_name' => $values['b_account_name'], + 'type' => 'view')); + + + $msgbox_data = $this->bocommon->msgbox_data($receipt); $data = array ( + 'table_header_workorder' => $table_header_workorder, + 'lang_no_workorders' => lang('No workorder bugdet'), + 'workorder_link' => $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.view'), + 'lang_start_date' => lang('Project start date'), + 'value_start_date' => $project_values['start_date'], + + 'lang_end_date' => lang('Project end date'), + 'value_end_date' => $project_values['end_date'], + + 'lang_charge_tenant' => lang('Charge tenant'), + 'charge_tenant' => $project_values['charge_tenant'], + + 'lang_power_meter' => lang('Power meter'), + 'value_power_meter' => $project_values['power_meter'], + + 'lang_budget' => lang('Budget'), + 'value_budget' => $project_values['budget'], + + 'lang_reserve' => lang('reserve'), + 'value_reserve' => $project_values['reserve'], + 'lang_reserve_statustext' => lang('Enter the reserve'), + + 'lang_reserve_remainder' => lang('reserve remainder'), + 'value_reserve_remainder' => $reserve_remainder, + 'value_reserve_remainder_percent'=> $remainder_percent, + + 'location_data' => $location_data, + 'location_type' => 'view', + + 'lang_project_id' => lang('Project ID'), + 'value_project_id' => $project_values['project_id'], + 'lang_name' => lang('Name'), + 'value_name' => $project_values['name'], + + 'lang_descr' => lang('Description'), + + 'sum_workorder_budget' => $project_values['sum_workorder_budget'], + 'sum_workorder_calculation' => $project_values['sum_workorder_calculation'], + 'workorder_budget' => $project_values['workorder_budget'], + 'sum_workorder_actual_cost' => $project_values['sum_workorder_actual_cost'], + 'lang_actual_cost' => lang('Actual cost'), + 'lang_coordinator' => lang('Coordinator'), + 'lang_sum' => lang('Sum'), + 'select_user_name' => 'project_values[coordinator]', + 'lang_no_user' => lang('Select coordinator'), + 'user_list' => $this->bocommon->get_user_list('select',$project_values['coordinator'],$extra=False,$default=False,$start=-1,$sort='ASC',$order='account_lastname',$query='',$offset=-1), + + 'status_list' => $this->boproject->select_status_list('select',$project_values['status']), + 'lang_no_status' => lang('Select status'), + 'lang_status' => lang('Status'), + + 'currency' => $GLOBALS['phpgw_info']['user']['preferences']['common']['currency'], + + 'lang_contact_phone' => lang('Contact phone'), + 'contact_phone' => $project_values['contact_phone'], + + 'b_account_data' => $b_account_data, + + 'cat_list_project' => $this->boproject->select_category_project_list('select',$project_values['cat_id']), + +//------------------ + + 'lang_status' => lang('Status'), + 'status_list' => $this->bo->get_status_list(array('format' => 'select', 'selected' => $values['status'],'default' => 'open')), + + 'lang_amount' => lang('amount'), + 'value_amount' => $values['amount'], + + 'lang_tenant' => lang('tenant'), + 'value_tenant_id' => $values['tenant_id'], + 'value_last_name' => $values['last_name'], + 'value_first_name' => $values['first_name'], + 'size_last_name' => strlen($values['last_name']), + 'size_first_name' => strlen($values['first_name']), + + 'lang_claim_id' => lang('ID'), + 'value_claim_id' => $claim_id, + 'lang_remark' => lang('remark'), + 'lang_category' => lang('category'), + 'lang_save' => lang('save'), + 'lang_cancel' => lang('cancel'), + 'lang_apply' => lang('apply'), + 'value_remark' => $values['remark'], + 'value_cat' => $values['cat'], + 'cat_list' => $this->bo->select_category_list('select',$values['cat_id']), + 'done_action' => $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitenant_claim.index'), 'lang_name' => lang('name'), 'lang_category' => lang('category'), @@ -651,10 +841,16 @@ 'value_name' => $tenant_claim['name'], 'value_cat' => $this->bo->read_category_name($tenant_claim['cat_id']), 'value_date' => $GLOBALS['phpgw']->common->show_date($tenant_claim['entry_date']) + ); + $GLOBALS['phpgw_info']['flags']['app_header'] = lang('Tenant claim') . ': ' . ($claim_id?lang('edit claim'):lang('add claim')); $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data)); $GLOBALS['phpgw']->xslttpl->pp(); } + + + + } ?> ==================================================== Index: property/inc/class.soinvoice.inc.php diff -u property/inc/class.soinvoice.inc.php:1.11 property/inc/class.soinvoice.inc.php:1.12 --- property/inc/class.soinvoice.inc.php:1.11 Thu Apr 14 14:48:39 2005 +++ property/inc/class.soinvoice.inc.php Fri Apr 15 08:30:41 2005 @@ -356,9 +356,8 @@ $filtermethod = " WHERE ( bilagsnr= '$voucher_id')"; } - $sql = "SELECT $table.*,fm_workorder.status,fm_workorder.charge_tenant,org_name,fm_project.claim_issued FROM $table " + $sql = "SELECT $table.*,fm_workorder.status,fm_workorder.charge_tenant,org_name,fm_workorder.claim_issued FROM $table " . " $this->left_join fm_workorder on fm_workorder.id = $table.pmwrkord_code " - . " $this->join fm_project on fm_project.id = fm_workorder.project_id" . " $this->join fm_vendor on $table.spvend_code = fm_vendor.id $filtermethod "; $this->db2->query($sql,__LINE__,__FILE__); From MAILER-DAEMON Fri Apr 15 07:36:54 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DMP81-0001Ko-Pp for mharc-phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 07:36:53 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DMP7w-0001Ja-DV for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 07:36:48 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DMP7t-0001IU-I7 for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 07:36:47 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DMP7s-0001HP-Db for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 07:36:44 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DMP49-0006FL-6W for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 07:32:53 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id B5BC8312BB for ; Fri, 15 Apr 2005 13:31:08 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 17988-05 for ; Fri, 15 Apr 2005 13:31:06 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 1920C312B3 for ; Fri, 15 Apr 2005 13:31:06 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3FBV6i11648; Fri, 15 Apr 2005 13:31:06 +0200 Message-Id: <200504151131.j3FBV6i11648@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Fri, 15 Apr 2005 12:55:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] skel/inc hook_add_def_pref.inc.php, 1.3 class.skel.inc.php, 1.3 hook_admin.inc.php, 1.7 hook_preferences.inc.php, 1.7 hook_manual.inc.php, 1.3 functions.inc.php, 1.2 header.inc.php, 1.3 hook_skel_about.inc.php, 1.2 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2005 11:36:49 -0000 Update of skel/inc Modified Files: Branch: MAIN hook_add_def_pref.inc.php lines: +10 -10 class.skel.inc.php lines: +35 -11 hook_admin.inc.php lines: +12 -12 hook_preferences.inc.php lines: +15 -14 hook_manual.inc.php lines: +12 -12 functions.inc.php lines: +19 -11 header.inc.php lines: +9 -10 hook_skel_about.inc.php lines: +20 -10 Log Message: Converted to phpdoc. Verified with phpdocumentor and php -l ==================================================== Index: skel/inc/hook_add_def_pref.inc.php diff -u skel/inc/hook_add_def_pref.inc.php:1.2 skel/inc/hook_add_def_pref.inc.php:1.3 --- skel/inc/hook_add_def_pref.inc.php:1.2 Fri Mar 8 04:27:05 2002 +++ skel/inc/hook_add_def_pref.inc.php Fri Apr 15 10:55:41 2005 @@ -1,14 +1,14 @@ change('notes','notes_font','Verdana,Arial,Helvetica,sans-serif'); $GLOBALS['pref']->change('notes','notes_font_size','3'); ==================================================== Index: skel/inc/class.skel.inc.php diff -u skel/inc/class.skel.inc.php:1.2 skel/inc/class.skel.inc.php:1.3 --- skel/inc/class.skel.inc.php:1.2 Fri Mar 8 04:27:05 2002 +++ skel/inc/class.skel.inc.php Fri Apr 15 10:55:41 2005 @@ -1,27 +1,51 @@ ==================================================== Index: skel/inc/hook_admin.inc.php diff -u skel/inc/hook_admin.inc.php:1.6 skel/inc/hook_admin.inc.php:1.7 --- skel/inc/hook_admin.inc.php:1.6 Sat Apr 19 23:29:34 2003 +++ skel/inc/hook_admin.inc.php Fri Apr 15 10:55:41 2005 @@ -1,21 +1,21 @@ $GLOBALS['phpgw']->link('/index.php','menuaction=skel.uiskel.admin'), + // 'Administer' => $GLOBALS['phpgw']->link('/index.php','menuaction=skel.uiskel.admin'), ); -//Do not modify below this line + // Do not modify below this line $GLOBALS['phpgw']->common->display_mainscreen($appname,$file); } ?> ==================================================== Index: skel/inc/hook_preferences.inc.php diff -u skel/inc/hook_preferences.inc.php:1.6 skel/inc/hook_preferences.inc.php:1.7 --- skel/inc/hook_preferences.inc.php:1.6 Sat Jan 12 15:46:47 2002 +++ skel/inc/hook_preferences.inc.php Fri Apr 15 10:55:41 2005 @@ -1,23 +1,24 @@ $GLOBALS['phpgw']->link('/skel/preferences.php'), -// 'Grant Access' => $GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='.$appname), -// 'Edit categories' => $GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app=' . $appname . '&cats_level=True&global_cats=True') + // 'Preferences' => $GLOBALS['phpgw']->link('/skel/preferences.php'), + // 'Grant Access' => $GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='.$appname), + // 'Edit categories' => $GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app=' . $appname . '&cats_level=True&global_cats=True') ); -//Do not modify below this line + // Do not modify below this line display_section($appname,$title,$file); } ?> ==================================================== Index: skel/inc/hook_manual.inc.php diff -u skel/inc/hook_manual.inc.php:1.2 skel/inc/hook_manual.inc.php:1.3 --- skel/inc/hook_manual.inc.php:1.2 Fri Mar 8 04:27:05 2002 +++ skel/inc/hook_manual.inc.php Fri Apr 15 10:55:41 2005 @@ -1,18 +1,18 @@ * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - /* $Id$ */ + /** + * Skeleton - manual hook + * + * This is only a skeleton to help start an phpgroupware application. + * @author Mark Peters + * @copyright Copyright (C) 2000-2002,2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package skeleton + * @subpackage hooks + * @version $Id$ + */ // Only Modify the $file variable..... $file = Array(); -//Do not modify below this line + // Do not modify below this line display_manual_section($appname,$file); ?> ==================================================== Index: skel/inc/functions.inc.php diff -u skel/inc/functions.inc.php:1.1 skel/inc/functions.inc.php:1.2 --- skel/inc/functions.inc.php:1.1 Sun May 20 07:40:32 2001 +++ skel/inc/functions.inc.php Fri Apr 15 10:55:41 2005 @@ -1,17 +1,25 @@ ==================================================== Index: skel/inc/header.inc.php diff -u skel/inc/header.inc.php:1.2 skel/inc/header.inc.php:1.3 --- skel/inc/header.inc.php:1.2 Fri Mar 8 04:27:05 2002 +++ skel/inc/header.inc.php Fri Apr 15 10:55:41 2005 @@ -1,14 +1,13 @@ set_file(array('skel_header' => 'header.tpl')); ==================================================== Index: skel/inc/hook_skel_about.inc.php diff -u skel/inc/hook_skel_about.inc.php:1.1 skel/inc/hook_skel_about.inc.php:1.2 --- skel/inc/hook_skel_about.inc.php:1.1 Sun May 20 07:40:32 2001 +++ skel/inc/hook_skel_about.inc.php Fri Apr 15 10:55:41 2005 @@ -1,15 +1,25 @@ ' . lang('Skeleton') . '

' . lang('written by:') . ' Dan Kuykendall (Seek3r)'; From MAILER-DAEMON Fri Apr 15 07:36:55 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DMP82-0001LH-T3 for mharc-phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 07:36:55 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DMP7w-0001JW-Dc for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 07:36:49 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DMP7t-0001Ic-IA for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 07:36:46 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DMP7s-0001HP-SW for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 07:36:44 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DMP3Z-0006DM-3l for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 07:32:17 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id ADC25312BB for ; Fri, 15 Apr 2005 13:30:32 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 17511-08 for ; Fri, 15 Apr 2005 13:30:29 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 743DE312B3 for ; Fri, 15 Apr 2005 13:30:29 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3FBUTG11611; Fri, 15 Apr 2005 13:30:29 +0200 Message-Id: <200504151130.j3FBUTG11611@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Fri, 15 Apr 2005 12:55:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] skel/help index.php,1.3 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2005 11:36:50 -0000 Update of skel/help Modified Files: Branch: MAIN index.php lines: +24 -15 Log Message: Converted to phpdoc. Verified with phpdocumentor and php -l ==================================================== Index: skel/help/index.php diff -u skel/help/index.php:1.2 skel/help/index.php:1.3 --- skel/help/index.php:1.2 Sat Jun 9 02:43:01 2001 +++ skel/help/index.php Fri Apr 15 10:55:41 2005 @@ -1,26 +1,35 @@ 'manual'); $phpgw_info['flags'] = $phpgw_flags; + + /** + * Include phpgroupware header + */ include('../../header.inc.php'); $appname = 'skel'; - include(PHPGW_SERVER_ROOT.'/'.$appname.'/setup/setup.inc.php'); + + /** + * Include application setup + */ + include(PHPGW_SERVER_ROOT . '/' . $appname . '/setup/setup.inc.php'); ?> -

+ +

- Version: - + Version: - common->phpgw_footer(); ?> +common->phpgw_footer(); +?> From MAILER-DAEMON Fri Apr 15 07:36:55 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DMP82-0001Kv-EK for mharc-phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 07:36:54 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DMP7w-0001JV-CY for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 07:36:49 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DMP7t-0001Ih-IA for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 07:36:46 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DMP7t-0001HP-3f for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 07:36:45 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DMP3U-0006DA-Uv for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 07:32:13 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 90EDE312BF for ; Fri, 15 Apr 2005 13:30:28 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 17988-04 for ; Fri, 15 Apr 2005 13:30:24 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 60A83312B3 for ; Fri, 15 Apr 2005 13:30:24 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3FBUOn11604; Fri, 15 Apr 2005 13:30:24 +0200 Message-Id: <200504151130.j3FBUOn11604@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Fri, 15 Apr 2005 12:55:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] skel/setup tables_update.inc.php, 1.3 setup.inc.php, 1.15 tables_current.inc.php, 1.4 tables_baseline.inc.php, 1.2 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2005 11:36:50 -0000 Update of skel/setup Modified Files: Branch: MAIN tables_update.inc.php lines: +14 -11 setup.inc.php lines: +9 -11 tables_current.inc.php lines: +9 -11 tables_baseline.inc.php lines: +9 -11 Log Message: Converted to phpdoc. Verified with phpdocumentor and php -l ==================================================== Index: skel/setup/tables_update.inc.php diff -u skel/setup/tables_update.inc.php:1.2 skel/setup/tables_update.inc.php:1.3 --- skel/setup/tables_update.inc.php:1.2 Fri Mar 8 04:27:05 2002 +++ skel/setup/tables_update.inc.php Fri Apr 15 10:55:41 2005 @@ -1,17 +1,20 @@ oProc->RenameTable('skel','phpgw_skel'); ==================================================== Index: skel/setup/setup.inc.php diff -u skel/setup/setup.inc.php:1.14 skel/setup/setup.inc.php:1.15 --- skel/setup/setup.inc.php:1.14 Wed Oct 23 20:47:32 2002 +++ skel/setup/setup.inc.php Fri Apr 15 10:55:41 2005 @@ -1,15 +1,13 @@ array( ==================================================== Index: skel/setup/tables_baseline.inc.php diff -u skel/setup/tables_baseline.inc.php:1.1 skel/setup/tables_baseline.inc.php:1.2 --- skel/setup/tables_baseline.inc.php:1.1 Wed Jul 4 04:24:22 2001 +++ skel/setup/tables_baseline.inc.php Fri Apr 15 10:55:41 2005 @@ -1,15 +1,13 @@ array( From MAILER-DAEMON Fri Apr 15 09:36:19 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DMQzX-0002ma-Dz for mharc-phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 09:36:15 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DMQzS-0002l0-Df for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 09:36:10 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DMQzO-0002ji-Mj for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 09:36:08 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DMQzK-0002fR-Cr for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 09:36:03 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DMQwm-0006Dr-Ne for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 09:33:25 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 98E91312B3 for ; Fri, 15 Apr 2005 15:31:38 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 24041-06 for ; Fri, 15 Apr 2005 15:31:35 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id A0BA8312B2 for ; Fri, 15 Apr 2005 15:31:35 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3FDVZl12302; Fri, 15 Apr 2005 15:31:35 +0200 Message-Id: <200504151331.j3FDVZl12302@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Fri, 15 Apr 2005 15:19:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgroupware/doc cvs_full_checkout.php, 1.14 inlinedocparser.php, 1.31 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2005 13:36:12 -0000 Update of phpgroupware/doc Modified Files: Branch: MAIN cvs_full_checkout.php lines: +52 -28 inlinedocparser.php lines: +63 -54 Log Message: Converted to phpdoc. Verified with phpdocumentor and php -l Also cleaned up some HTML code and unified include_once('header.inc.php') ==================================================== Index: phpgroupware/doc/cvs_full_checkout.php diff -u phpgroupware/doc/cvs_full_checkout.php:1.13 phpgroupware/doc/cvs_full_checkout.php:1.14 --- phpgroupware/doc/cvs_full_checkout.php:1.13 Thu Dec 30 10:46:22 2004 +++ phpgroupware/doc/cvs_full_checkout.php Fri Apr 15 13:19:15 2005 @@ -1,36 +1,49 @@ #!/usr/bin/php * - * Joseph Engo * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id$ */ - - /****************************************************************************\ - * Config section * - \****************************************************************************/ - // Temp paths that can be read and written to - $tmp_dir = '/tmp'; - // Directory that you want the phpgroupware directory to go in. NO trailing / - $co_dir = '/var/www/html'; - // If you do not have developer access to cvs, set to True + /** + * phpGroupWare + * + * phpgroupware base + * @author Dan Kuykendall + * @author Joseph Engo + * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package phpgroupware + * @subpackage development + * @version $Id$ + */ + + exit; //remove this line to make the script work + + // **************************************************************************** + // Config section + // **************************************************************************** + + /** + * Temp paths that can be read and written to + */ + $tmp_dir = '/tmp'; + /** + * Directory that you want the phpgroupware directory to go in. NO trailing / + */ + $co_dir = '/var/www/html'; + /** + * If you do not have developer access to cvs, set to True + */ $cvs_anonymous = True; - // If you do not have developer access to phpgwapi cvs, set to True + /** + * If you do not have developer access to phpgwapi cvs, set to True + */ $cvs_api_anonymous = True; - // Only needed if you have developers cvs access - $cvs_login = ''; + /** + * Only needed if you have developers cvs access + */ + $cvs_login = ''; - // Modules you want to checkout, do NOT add the phpgroupware module + /** + * Modules you want to checkout, do NOT add the phpgroupware module + */ $co_modules[] = 'addressbook'; $co_modules[] = 'admin'; $co_modules[] = 'backup'; @@ -90,8 +103,18 @@ $co_modules[] = 'weather'; $co_modules[] = 'xmlrpc'; - // -- End config section + // **************************************************************************** + // End config section + // **************************************************************************** + + /** + * Do cvs command + * + * This will do the cvs command + * @param string $command + * @param boolean $anonymous_login + */ function docvscommand($command, $anonymous_login = False) { global $tmp_dir, $cvs_anonymous; @@ -124,6 +147,7 @@ unlink($tmp_dir . '/createrelease.exp'); } + chdir($co_dir); if ($cvs_anonymous) { ==================================================== Index: phpgroupware/doc/inlinedocparser.php diff -u phpgroupware/doc/inlinedocparser.php:1.30 phpgroupware/doc/inlinedocparser.php:1.31 --- phpgroupware/doc/inlinedocparser.php:1.30 Thu Dec 30 10:46:22 2004 +++ phpgroupware/doc/inlinedocparser.php Fri Apr 15 13:19:15 2005 @@ -1,32 +1,41 @@ * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id$ */ - - /**************************************************************************\ - * These are the few functions needed for parsing the inline comments * - \**************************************************************************/ + /** + * phpGroupWare + * + * phpgroupware old inline doc parser (pre phpdoc) + * @author Miles Lott + * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package phpgroupware + * @subpackage documentation + * @version $Id$ + */ + + + // ************************************************************************* + // These are the few functions needed for parsing the inline comments + // ************************************************************************* + $phpgw_info['flags']['noapi'] = True; + + /** + * Include phpgroupware header + */ include ('../header.inc.php'); + if (floor(phpversion()) == 3) { + /** + * Include PHP3 support functions + */ include (PHPGW_API_INC.'/php3_support_functions.inc.php'); } - /*! - @function array_print - @abstract output an array for HTML. - @syntax array_print($array); - @example array_print($my_array); + + /** + * Function to print an array to HTML + * + * @param array $array Array to output as HTML */ function array_print($array) { @@ -44,12 +53,12 @@ } } - /*! - @function parseobject - @abstract Parses inline comments for a single function - @author seek3r - @syntax parseobject($input); - @example $return_data = parseobject($doc_data); + /** + * Parses inline comments for a single function + * + * @author seek3r + * @param string $input Input for parsing @ commands + * @return array Name/value array */ function parseobject($input) { @@ -91,12 +100,12 @@ return Array('name' => $t, 'value' => $output[$t]); } - /*! - @function parsesimpleobject - @abstract Parses inline comments for a single function, in a more limited fashion - @author seek3r - @syntax parsesimpleobject($input); - @example $return_data = parsesimpleobject($simple_doc_data); + /** + * Parses inline comments for a single function, in a more limited fashion + * + * @author seek3r + * @param string $input + * @return array Name/value pair array */ function parsesimpleobject($input) { @@ -144,10 +153,10 @@ return Array('name' => $t, 'value' => $output[$t]); } - /**************************************************************************\ - * This section handles processing most of the input params for * - * limiting and selecting what to print * - \**************************************************************************/ + // ************************************************************************** + // This section handles processing most of the input params for + // limiting and selecting what to print + // ************************************************************************** if (!isset($GLOBALS['HTTP_GET_VARS']['object_type'])) { @@ -201,17 +210,17 @@ sort($files); } - /**************************************************************************\ - * Now that I have the list of files, I loop thru all of them and get the * - * inline comments from them and load each of them into an array * - \**************************************************************************/ + //************************************************************************** + // Now that I have the list of files, I loop thru all of them and get the + // inline comments from them and load each of them into an array + //************************************************************************** while (list($p,$fn) = each($files)) { $matches = $elements = $data = $startstop = array(); $string = $t = $out = $xkey = $new = ''; $file = '../'.$app.'/inc/' . $fn; -// echo 'Looking at: ' . $file . "
\n"; +// echo 'Looking at: ' . $file . "
\n"; $f = fopen($file,'r'); while (!feof($f)) { @@ -221,10 +230,10 @@ preg_match_all("#\*\!(.*)\*/#sUi",$string,$matches,PREG_SET_ORDER); - /**************************************************************************\ - * Now that I have the list of found inline docs, I need to figure out * - * which group they belong to. * - \**************************************************************************/ + // ************************************************************************** + // Now that I have the list of found inline docs, I need to figure out + // which group they belong to. + // ************************************************************************** $idx = 0; $ssmatches = $matches; reset($ssmatches); @@ -273,7 +282,7 @@ $startstop[$idx] = 'some_lame_string_that_wont_be_used_by_a_function'; } } - $idx = $idx + 1; + ++$idx; } unset($ssmatches); unset($sskey); @@ -283,12 +292,12 @@ unset($idx); reset($startstop); - /**************************************************************************\ - * Now that I have the list groups and which records belong in which groups * - * its time to parse each function and stick it under the appropriate group * - * if there is no defined group for a function, then it gets tossed under * - * a special group named by the file it was found in * - \**************************************************************************/ + // ************************************************************************** + // Now that I have the list groups and which records belong in which groups + // its time to parse each function and stick it under the appropriate group + // if there is no defined group for a function, then it gets tossed under + // a special group named by the file it was found in + // ************************************************************************** while (list($key,$val) = each($matches)) { preg_match_all("#@(.*)$#sUi",$val[1],$data); @@ -473,6 +482,6 @@ } $GLOBALS['template']->fp('doc','border_bottom',True); $GLOBALS['template']->pfp('out', 'doc'); - echo ''; + echo ''; array_print($doc_array); ?> From MAILER-DAEMON Fri Apr 15 09:36:23 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DMQze-0002qd-HI for mharc-phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 09:36:22 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DMQzU-0002lh-BS for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 09:36:13 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DMQzO-0002jQ-2k for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 09:36:09 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DMQzM-0002fR-3W for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 09:36:04 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DMQwh-0006Cy-Sj for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 09:33:20 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 2913B312B3 for ; Fri, 15 Apr 2005 15:31:34 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 24056-05 for ; Fri, 15 Apr 2005 15:31:26 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 2BAEA312B2 for ; Fri, 15 Apr 2005 15:31:26 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3FDVQV12291; Fri, 15 Apr 2005 15:31:26 +0200 Message-Id: <200504151331.j3FDVQV12291@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Fri, 15 Apr 2005 15:19:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgroupware soap.php, 1.9 index.php, 1.122 anon_wrapper.php, 1.7 set_box.php, 1.6 about.php, 1.26 notify.php, 1.14 login.php, 1.103 logout.php, 1.29 header.inc.php.template, 1.48 version.inc.php, 1.93 help.php, 1.4 home.php, 1.30 xmlrpc.php, 1.14 redirect.php, 1.3 notify_simple.php, 1.5 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2005 13:36:19 -0000 Update of phpgroupware Modified Files: Branch: MAIN soap.php lines: +76 -70 index.php lines: +22 -15 anon_wrapper.php lines: +19 -18 set_box.php lines: +25 -13 about.php lines: +39 -20 notify.php lines: +16 -13 login.php lines: +39 -22 logout.php lines: +15 -13 header.inc.php.template lines: +128 -53 version.inc.php lines: +13 -17 help.php lines: +23 -14 home.php lines: +27 -22 xmlrpc.php lines: +71 -23 redirect.php lines: +17 -17 notify_simple.php lines: +15 -12 Log Message: Converted to phpdoc. Verified with phpdocumentor and php -l Also cleaned up some HTML code and unified include_once('header.inc.php') ==================================================== Index: phpgroupware/soap.php diff -u phpgroupware/soap.php:1.8 phpgroupware/soap.php:1.9 --- phpgroupware/soap.php:1.8 Thu Dec 30 10:46:22 2004 +++ phpgroupware/soap.php Fri Apr 15 13:19:15 2005 @@ -1,70 +1,76 @@ - * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id$ */ - - $GLOBALS['phpgw_info'] = array(); - $GLOBALS['phpgw_info']['flags'] = array( - 'disable_Template_class' => True, - 'currentapp' => 'login', - 'noheader' => True, - 'disable_Template_class' => True - ); - - include('./header.inc.php'); - - $GLOBALS['server'] = CreateObject('phpgwapi.soap_server'); - /* _debug_array($GLOBALS['server']);exit; */ - /* include(PHPGW_API_INC . '/soaplib.soapinterop.php'); */ - - $headers = getallheaders(); - - if(ereg('Basic',$headers['Authorization'])) - { - $tmp = $headers['Authorization']; - $tmp = ereg_replace(' ','',$tmp); - $tmp = ereg_replace('Basic','',$tmp); - $auth = base64_decode(trim($tmp)); - list($sessionid,$kp3) = split(':',$auth); - - if($GLOBALS['phpgw']->session->verify($sessionid,$kp3)) - { - $GLOBALS['server']->authed = True; - } - elseif($GLOBALS['phpgw']->session->verify_server($sessionid,$kp3)) - { - $GLOBALS['server']->authed = True; - } - } - - $GLOBALS['server']->add_to_map( - 'system_login', - array('soapstruct'), - array('soapstruct') - ); - $GLOBALS['server']->add_to_map( - 'system_logout', - array('soapstruct'), - array('soapstruct') - ); - - if(function_exists('system_listapps')) - { - $GLOBALS['server']->add_to_map( - 'system_listApps', - array(), - array('soapstruct') - ); - } - - $GLOBALS['server']->service($HTTP_RAW_POST_DATA); -?> + + * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package phpgroupware + * @version $Id$ + */ + + $GLOBALS['phpgw_info'] = array(); + + $GLOBALS['phpgw_info']['flags'] = array( + 'disable_Template_class' => True, + 'currentapp' => 'login', + 'noheader' => True, + 'disable_Template_class' => True + ); + + /** + * Include phpgroupware header + */ + include_once('header.inc.php'); + + /** + * @global object $GLOBALS['server'] + */ + $GLOBALS['server'] = CreateObject('phpgwapi.soap_server'); + + /* _debug_array($GLOBALS['server']);exit; */ + /* include(PHPGW_API_INC . '/soaplib.soapinterop.php'); */ + + $headers = getallheaders(); + + if(ereg('Basic',$headers['Authorization'])) + { + $tmp = $headers['Authorization']; + $tmp = ereg_replace(' ','',$tmp); + $tmp = ereg_replace('Basic','',$tmp); + $auth = base64_decode(trim($tmp)); + list($sessionid,$kp3) = split(':',$auth); + + if($GLOBALS['phpgw']->session->verify($sessionid,$kp3)) + { + $GLOBALS['server']->authed = True; + } + elseif($GLOBALS['phpgw']->session->verify_server($sessionid,$kp3)) + { + $GLOBALS['server']->authed = True; + } + } + + $GLOBALS['server']->add_to_map( + 'system_login', + array('soapstruct'), + array('soapstruct') + ); + $GLOBALS['server']->add_to_map( + 'system_logout', + array('soapstruct'), + array('soapstruct') + ); + + if(function_exists('system_listapps')) + { + $GLOBALS['server']->add_to_map( + 'system_listApps', + array(), + array('soapstruct') + ); + } + + $GLOBALS['server']->service($HTTP_RAW_POST_DATA); +?> ==================================================== Index: phpgroupware/index.php diff -u phpgroupware/index.php:1.121 phpgroupware/index.php:1.122 --- phpgroupware/index.php:1.121 Thu Dec 30 10:46:22 2004 +++ phpgroupware/index.php Fri Apr 15 13:19:15 2005 @@ -1,15 +1,13 @@ True, 'currentapp' => $app ); - include('./header.inc.php'); + + /** + * Include phpgroupware header + */ + include_once('header.inc.php'); if ($app == 'home' && ! $api_requested) { @@ -68,7 +71,11 @@ $app = 'phpgwapi'; } + /** + * @global object $GLOBALS['obj'] + */ $GLOBALS['obj'] = CreateObject(sprintf('%s.%s',$app,$class)); + $GLOBALS[$class] = $GLOBALS['obj']; if ((is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions[$method]) && ! $invalid_data) { ==================================================== Index: phpgroupware/anon_wrapper.php diff -u phpgroupware/anon_wrapper.php:1.6 phpgroupware/anon_wrapper.php:1.7 --- phpgroupware/anon_wrapper.php:1.6 Thu Dec 30 10:46:22 2004 +++ phpgroupware/anon_wrapper.php Fri Apr 15 13:19:15 2005 @@ -1,21 +1,18 @@ * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id$ */ - - // TODO: - // Limit which users can access this program (ACL check) - // Global disabler - // Detect bad logins and passwords, spit out generic message + /** + * phpGroupWare + * + * phpgroupware base + * @author Dan Kuykendall + * @author Joseph Engo + * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package phpgroupware + * @version $Id$ + * @todo Limit which users can access this program (ACL check) + * @todo Global disabler + * @todo Detect bad logins and passwords, spit out generic message + */ // If your are going to use multiable accounts, remove the following lines $login = 'anonymous'; @@ -27,7 +24,11 @@ 'currentapp' => 'login', 'noheader' => True ); - include('./header.inc.php'); + + /** + * Include phpgroupware header + */ + include_once('./header.inc.php'); // If your are going to use multiable accounts, remove the following lines // You must create the useraccount and check its permissions before use ==================================================== Index: phpgroupware/set_box.php diff -u phpgroupware/set_box.php:1.5 phpgroupware/set_box.php:1.6 --- phpgroupware/set_box.php:1.5 Thu Dec 30 10:46:22 2004 +++ phpgroupware/set_box.php Fri Apr 15 13:19:15 2005 @@ -1,23 +1,25 @@ * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id$ */ + /** + * phpGroupWare + * + * phpgroupware base + * @author Joseph Engo + * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package phpgroupware + * @version $Id$ + */ $GLOBALS['phpgw_info']['flags'] = Array( 'noheader' => True, 'nofooter' => True, 'currentapp' => 'home' ); - include('header.inc.php'); + + /** + * Include phpgroupware header + */ + include_once('header.inc.php'); // if(basename($HTTP_REFERER) != 'home.php') // { @@ -29,6 +31,16 @@ // unset($GLOBALS['phpgw_info']['user']['preferences']['portal_order']); // $GLOBALS['phpgw']->preferences->save_repository(); + + /** + * Move boxes + * + * @param integer $curr_position + * @param integer $new_order + * @param integer $offset + * @param integer $value_to_check + * @param integer $max_num + */ function move_boxes($curr_position,$new_order,$offset,$value_to_check,$max_num) { if(isset($GLOBALS['phpgw_info']['user']['preferences']['portal_order'][$new_order])) ==================================================== Index: phpgroupware/about.php diff -u phpgroupware/about.php:1.25 phpgroupware/about.php:1.26 --- phpgroupware/about.php:1.25 Thu Dec 30 10:46:22 2004 +++ phpgroupware/about.php Fri Apr 15 13:19:15 2005 @@ -1,30 +1,49 @@ + * @author Joseph Engo + * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package phpgroupware + * @version $Id$ + */ $GLOBALS['phpgw_info']['flags']['currentapp'] = 'about'; $GLOBALS['phpgw_info']['flags']['disable_Template_class'] = True; $GLOBALS['phpgw_info']['flags']['noheader'] = True; - include('header.inc.php'); + + /** + * Include phpgroupware header + */ + include_once('header.inc.php'); $app = $_GET['app']; if ($app) { if (!($included = $GLOBALS['phpgw']->hooks->single('about',$app))) { + + + /** + * About this application + * + * This function will create the string to display when the about this + * application function will be called. + * @return string Text which describes this application. + */ function about_app() { global $app; $icon = $GLOBALS['phpgw']->common->image($app,'navbar'); - include (PHPGW_INCLUDE_ROOT . "/$app/setup/setup.inc.php"); + + /** + * Include applications setup + */ + include(PHPGW_INCLUDE_ROOT . "/$app/setup/setup.inc.php"); + $info = $setup_info[$app]; $info['title'] = $GLOBALS['phpgw_info']['apps'][$app]['title']; $other_infos = array( @@ -35,7 +54,7 @@ ); $s = "\n" - . "" + . "" . ""; if ($info['description']) @@ -45,14 +64,14 @@ if ($info['note']) { $info['note'] = lang($info['note']); - $s .= "\n"; + $s .= "\n"; } } foreach ($other_infos as $key => $val) { if (isset($info[$key])) { - $s .= "\n"; } ==================================================== Index: phpgroupware/notify.php diff -u phpgroupware/notify.php:1.13 phpgroupware/notify.php:1.14 --- phpgroupware/notify.php:1.13 Thu Dec 30 10:46:22 2004 +++ phpgroupware/notify.php Fri Apr 15 13:19:15 2005 @@ -1,28 +1,31 @@ True, 'nonavbar' => True, 'disable_Template_class' => True, 'currentapp' => 'notifywindow' ); - include('header.inc.php'); + + /** + * Include phpgroupware header + */ + include_once('header.inc.php'); ?> - + Notify Window ==================================================== Index: phpgroupware/login.php diff -u phpgroupware/login.php:1.102 phpgroupware/login.php:1.103 --- phpgroupware/login.php:1.102 Sat Jan 15 09:55:35 2005 +++ phpgroupware/login.php Fri Apr 15 13:19:15 2005 @@ -1,19 +1,18 @@ * - * Joseph Engo * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id$ */ + /** + * phpGroupWare + * + * phpgroupware base + * @author Dan Kuykendall + * @author Joseph Engo + * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package phpgroupware + * @version $Id$ + */ $phpgw_info = array(); + $GLOBALS['phpgw_info']['flags'] = array( 'disable_template_class' => True, 'login' => True, @@ -22,7 +21,12 @@ ); if(file_exists('./header.inc.php')) { - include('./header.inc.php'); + + /** + * Include phpgroupware header + */ + include_once('header.inc.php'); + $GLOBALS['phpgw']->sessions = createObject('phpgwapi.sessions'); } else @@ -70,48 +74,54 @@ } */ + + /** + * Check logout error code + * + * @param integer $code Error code + * @return string Error message + */ function check_logoutcode($code) { switch($code) { case 1: return lang('You have been successfully logged out'); - break; case 2: return lang('Sorry, your login has expired'); - break; case 5: return lang('Bad login or password'); - break; case 99: return lang('Blocked, too many attempts'); - break; case 10: $GLOBALS['phpgw']->sessions->phpgw_setcookie('sessionid'); $GLOBALS['phpgw']->sessions->phpgw_setcookie('kp3'); $GLOBALS['phpgw']->sessions->phpgw_setcookie('domain'); - //fix for bug php4 expired sessions bug + // fix for bug php4 expired sessions bug if($GLOBALS['phpgw_info']['server']['sessions_type'] == 'php4') { $GLOBALS['phpgw']->sessions->phpgw_setcookie(PHPGW_PHPSESSID); } return lang('Your session could not be verified.'); - break; default: return ' '; } } + + /** + * Check languages + */ function check_langs() { - //echo "

check_langs()

\n"; + // echo "

check_langs()

\n"; if ($GLOBALS['phpgw_info']['server']['lang_ctimes'] && !is_array($GLOBALS['phpgw_info']['server']['lang_ctimes'])) { $GLOBALS['phpgw_info']['server']['lang_ctimes'] = unserialize($GLOBALS['phpgw_info']['server']['lang_ctimes']); } - //_debug_array($GLOBALS['phpgw_info']['server']['lang_ctimes']); + // _debug_array($GLOBALS['phpgw_info']['server']['lang_ctimes']); $lang = $GLOBALS['phpgw_info']['user']['preferences']['common']['lang']; $apps = $GLOBALS['phpgw_info']['user']['apps']; @@ -135,6 +145,10 @@ } } + + /** + * Update languages + */ function update_langs() { $GLOBALS['phpgw_setup'] = CreateObject('phpgwapi.setup'); @@ -151,6 +165,9 @@ $_POST['upgrademethod'] = 'dumpold'; $included = 'from_login'; + /** + * Include languages setup + */ include(PHPGW_SERVER_ROOT . '/setup/lang.php'); } ==================================================== Index: phpgroupware/logout.php diff -u phpgroupware/logout.php:1.28 phpgroupware/logout.php:1.29 --- phpgroupware/logout.php:1.28 Thu Dec 30 10:46:22 2004 +++ phpgroupware/logout.php Fri Apr 15 13:19:15 2005 @@ -1,18 +1,17 @@ * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id$ */ + /** + * phpGroupWare + * + * phpgroupware base + * @author Joseph Engo + * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package phpgroupware + * @version $Id$ + */ $GLOBALS['phpgw_info'] = array(); + $GLOBALS['phpgw_info']['flags'] = array( 'disable_template_class' => True, 'currentapp' => 'logout', @@ -21,7 +20,10 @@ 'nonavbar' => True ); - include('./header.inc.php'); + /** + * Include phpgroupware header + */ + include_once('header.inc.php'); $GLOBALS['sessionid'] = get_var('sessionid',array('GET','COOKIE')); $GLOBALS['kp3'] = get_var('kp3',array('GET','COOKIE')); ==================================================== Index: phpgroupware/header.inc.php.template diff -u phpgroupware/header.inc.php.template:1.47 phpgroupware/header.inc.php.template:1.48 --- phpgroupware/header.inc.php.template:1.47 Mon Jan 3 22:06:56 2005 +++ phpgroupware/header.inc.php.template Fri Apr 15 13:19:15 2005 @@ -1,116 +1,191 @@ * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - /* $Id$ */ - - /**************************************************************************\ - * !!!!!!! EDIT THESE LINES !!!!!!!! * - * This setting allows you to easily move the include directory and the * - * base of the phpGroupWare install. Simple edit the following 2 lines with * - * the absolute path to fit your site, and you should be up and running. * - \**************************************************************************/ + /** + * phpGroupWare + * + * phpgroupware header + * @author Dan Kuykendall + * @author Joseph Engo + * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package phpgroupware + * @version $Id$ + */ + + // ************************************************************************** + // !!!!!!! EDIT THESE LINES !!!!!!!! + // This setting allows you to easily move the include directory and the + // base of the phpGroupWare install. Simple edit the following 2 lines with + // the absolute path to fit your site, and you should be up and running. + // ************************************************************************** + + /** + * Server root directory + */ define('PHPGW_SERVER_ROOT','{SERVER_ROOT}'); + + /** + * Include root directory + */ define('PHPGW_INCLUDE_ROOT','{INCLUDE_ROOT}'); + + /** + * @global string $GLOBALS['phpgw_info']['server']['header_admin_password'] Setup administrator password + */ $GLOBALS['phpgw_info']['server']['header_admin_password'] = '{HEADER_ADMIN_PASSWORD}'; - /* phpGroupWare domain-specific db settings */{domains} - /* - ** If you want to have your domains in a select box, change to True - ** If not, users will have to login as user@domain - ** Note: This is only for virtual domain support, default domain users can login only using - ** there loginid. + // phpGroupWare domain-specific db settings + {domains} + + /** + * @global boolean $GLOBALS['phpgw_info']['server']['show_domain_selectbox'] + * If you want to have your domains in a select box, change to True + * If not, users will have to login as user@domain + * Note: This is only for virtual domain support, default domain users can login only using + * there login id. */ $GLOBALS['phpgw_info']['server']['show_domain_selectbox'] = {DOMAIN_SELECTBOX}; - /* - ** As an alternative to the domain select box, set this option to True - ** to use the domain name from the browser provided hostname ($_SERVER['HTTP_HOST']) + /** + * @global $GLOBALS['phpgw_info']['server']['domain_from_host'] + * As an alternative to the domain select box, set this option to True + * to use the domain name from the browser provided hostname ($_SERVER['HTTP_HOST']) */ $GLOBALS['phpgw_info']['server']['domain_from_host'] = {DOMAIN_FROM_HOST}; + /** + * @global boolean $GLOBALS['phpgw_info']['server']['db_persistent'] + * Use persistent database connection + */ $GLOBALS['phpgw_info']['server']['db_persistent'] = {DB_PERSISTENT}; - /* - ** phpGroupWare can handle session management using the database, but if - ** you are using PHP4 you can usually get better performance by having phpGroupWare - ** use the session support built into PHP4. PHP3 users will have to use the database. - ** Your choices are 'db' or 'php4' + /** + * @global string $GLOBALS['phpgw_info']['server']['sessions_type'] + * phpGroupWare can handle session management using the database, but if + * you are using PHP4+ you can usually get better performance by having phpGroupWare + * use the session support built into PHP4. PHP3 users will have to use the database. + * Your choices are 'db' or 'php4' */ $GLOBALS['phpgw_info']['server']['sessions_type'] = '{SESSIONS_TYPE}'; - /* Select which login template set you want, most people will use simple */ + /** + * @global string $GLOBALS['phpgw_info']['login_template_set'] + * Select which login template set you want, most people will use 'simple' + */ $GLOBALS['phpgw_info']['login_template_set'] = 'simple'; - /* This is used to control mcrypt's use */ + /** + * @global boolean $GLOBALS['phpgw_info']['server']['mcrypt_enabled'] + * This is used to control mcrypt's use + */ $GLOBALS['phpgw_info']['server']['mcrypt_enabled'] = {ENABLE_MCRYPT}; - /* Set this to 'old' for versions < 2.4, otherwise the exact mcrypt version you use. */ + + /** + * @global string $GLOBALS['phpgw_info']['server']['versions']['mcrypt'] + * Set this to 'old' for versions < 2.4, otherwise the exact mcrypt version you use. + */ $GLOBALS['phpgw_info']['server']['versions']['mcrypt'] = '{MCRYPT_VERSION}'; - /* - ** This is a random string used as the initialization vector for mcrypt - ** feel free to change it when setting up phpgroupware on a clean database, - ** but you must not change it after that point! - ** It should be around 30 bytes in length. + /** + * @global string $GLOBALS['phpgw_info']['server']['mcrypt_iv'] + * This is a random string used as the initialization vector for mcrypt + * feel free to change it when setting up phpgroupware on a clean database, + * but you must not change it after that point! + * It should be around 30 bytes in length. */ $GLOBALS['phpgw_info']['server']['mcrypt_iv'] = '{MCRYPT_IV}'; - /* If you want phpGroupWare to be cached by proxy servers, uncomment the following */ - /* This is NOT recommended, but phpGroupWare should still work fine. */ + // If you want phpGroupWare to be cached by proxy servers, uncomment the following + // This is NOT recommended, but phpGroupWare should still work fine. if(!isset($GLOBALS['phpgw_info']['flags']['nocachecontrol']) || !$GLOBALS['phpgw_info']['flags']['nocachecontrol'] == True) { header('Cache-Control: no-cache, must-revalidate'); // HTTP/1.1 header('Pragma: no-cache'); // HTTP/1.0 } - /* debugging settings */ + // debugging settings define('DEBUG_APP', False); define('DEBUG_API', False); define('DEBUG_DATATYPES', True); define('DEBUG_LEVEL', 3); - define('DEBUG_OUTPUT', 2); /* 1 = screen, 2 = DB (not supported with PHP3). For both use 3. */ + define('DEBUG_OUTPUT', 2); // 1 = screen, 2 = DB (not supported with PHP3). For both use 3. define('DEBUG_TIMER', False); + + /** + * Perf get microtime + * + * @return float Microseconds + */ function perfgetmicrotime() { list($usec, $sec) = explode(' ',microtime()); return ((float)$usec + (float)$sec); } + if (DEBUG_TIMER) { $GLOBALS['debug_timer_start'] = perfgetmicrotime(); } - /**************************************************************************\ - * Do not edit these lines * - \**************************************************************************/ + // ************************************************************************** + // Do not edit these lines + // ************************************************************************** + + /** + * phpgroupware API include root + */ define('PHPGW_API_INC',PHPGW_INCLUDE_ROOT.'/phpgwapi/inc'); - include(PHPGW_SERVER_ROOT.'/phpgwapi/setup/setup.inc.php'); + + /** + * Include API setup + */ + include(PHPGW_SERVER_ROOT . '/phpgwapi/setup/setup.inc.php'); + + /** + * @global string $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'] + * Installed API version + */ $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'] = $setup_info['phpgwapi']['version']; + + /** + * @global string $GLOBALS['phpgw_info']['server']['versions']['current_header'] + * Installed header version + */ $GLOBALS['phpgw_info']['server']['versions']['current_header'] = $setup_info['phpgwapi']['versions']['current_header']; + unset($setup_info); + + /** + * @global string $GLOBALS['phpgw_info']['server']['versions']['header'] + * Version of this header file + */ $GLOBALS['phpgw_info']['server']['versions']['header'] = '1.24'; - /* This is a fix for NT */ + + + // This is a fix for NT if(!isset($GLOBALS['phpgw_info']['flags']['noapi']) || $GLOBALS['phpgw_info']['flags']['noapi'] != True) { + /** + * Include global general functions + */ include(PHPGW_API_INC . '/functions.inc.php'); + + /** + * Include global XML functions + */ include(PHPGW_API_INC . '/xml_functions.inc.php'); + + /** + * Include global SOAP functions + */ include(PHPGW_API_INC . '/soap_functions.inc.php'); } - /* - Leave off the final php closing tag, some editors will add - a \n or space after which will mess up cookies later on - */ + // Leave off the final php closing tag, some editors will add + // a \n or space after which will mess up cookies later on + $GLOBALS['phpgw_domain']['{DB_DOMAIN}'] = array ( 'db_host' => '{DB_HOST}', 'db_name' => '{DB_NAME}', ==================================================== Index: phpgroupware/version.inc.php diff -u phpgroupware/version.inc.php:1.92 phpgroupware/version.inc.php:1.93 --- phpgroupware/version.inc.php:1.92 Thu Dec 30 10:46:22 2004 +++ phpgroupware/version.inc.php Fri Apr 15 13:19:15 2005 @@ -1,20 +1,16 @@ * - * Joseph Engo * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id$ */ - - /* - This is here only to aid in the header.inc.php update from .12 and earlier. - After this you can delete it. + /** + * phpGroupWare + * + * phpgroupware base + * @author Dan Kuykendall + * @author Joseph Engo + * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package phpgroupware + * @version $Id$ */ + + // This is here only to aid in the header.inc.php update from .12 and earlier. + // After this you can delete it. ?> ==================================================== Index: phpgroupware/help.php diff -u phpgroupware/help.php:1.3 phpgroupware/help.php:1.4 --- phpgroupware/help.php:1.3 Mon Dec 23 00:56:48 2002 +++ phpgroupware/help.php Fri Apr 15 13:19:15 2005 @@ -1,17 +1,19 @@ True, 'currentapp' => $app ); - include('header.inc.php'); + + /** + * Include phpgroupware header + */ + include_once('header.inc.php'); $GLOBALS['phpgw']->help = CreateObject('phpgwapi.help_helper'); ==================================================== Index: phpgroupware/home.php diff -u phpgroupware/home.php:1.29 phpgroupware/home.php:1.30 --- phpgroupware/home.php:1.29 Thu Dec 30 10:46:22 2004 +++ phpgroupware/home.php Fri Apr 15 13:19:15 2005 @@ -1,18 +1,20 @@ * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id$ */ - + /** + * phpGroupWare + * + * phpgroupware base + * @author Joseph Engo + * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package phpgroupware + * @version $Id$ + */ + + /** + * @global array $phpgw_info + */ $phpgw_info = array(); + if (!is_file('header.inc.php')) { echo '

True, 'enable_nextmatchs_class' => True ); - include('header.inc.php'); + + /** + * Include phpgroupware header + */ + include_once('header.inc.php'); // check if forward parameter is set if (@$_GET['phpgw_forward']) @@ -130,7 +136,7 @@ { $GLOBALS['phpgw']->network->set_addcrlf(False); $lines = $GLOBALS['phpgw']->network->gethttpsocketfile('http://www.phpgroupware.org/currentversion'); - for ($i=0; $icommon->cmp_version_long($_db_version,$_file_version)) { $_found = True; - $_app_string .= '
' . $_app_title; + $_app_string .= '
' . $_app_title; } unset($_file_version); unset($_app_title); @@ -170,9 +176,9 @@ } if($_found) { - echo '
' . lang('The following applications require upgrades') . ':' . "\n"; + echo '
' . lang('The following applications require upgrades') . ':' . "\n"; echo $_app_string . "\n"; - echo '
' . lang('Please run setup to become current') . '.' . "\n"; + echo '
' . lang('Please run setup to become current') . '.' . "\n"; unset($_app_string); } } @@ -181,7 +187,7 @@ $GLOBALS['phpgw_info']['user']['apps']['notifywindow']) { ?> - - + ' . lang('Open notify window') . '
'; } - /* This initializes the users portal_order preference if it does not exist. */ + // This initializes the users portal_order preference if it does not exist. if(!is_array($GLOBALS['phpgw_info']['user']['preferences']['portal_order']) && $GLOBALS['phpgw_info']['apps']) { $GLOBALS['phpgw']->preferences->delete('portal_order'); ==================================================== Index: phpgroupware/xmlrpc.php diff -u phpgroupware/xmlrpc.php:1.13 phpgroupware/xmlrpc.php:1.14 --- phpgroupware/xmlrpc.php:1.13 Thu Dec 30 10:46:22 2004 +++ phpgroupware/xmlrpc.php Fri Apr 15 13:19:15 2005 @@ -1,17 +1,14 @@ * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id$ */ - /* $Source$ */ + /** + * phpGroupWare + * + * phpgroupware base + * @author Joseph Engo + * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package phpgroupware + * @version $Id$ + */ // NOTE! This file is still in the experimental stages, use at your own risk! // The only current documentation for it is the code and the comments @@ -22,12 +19,17 @@ // (jengo) $GLOBALS['phpgw_info'] = array(); + $GLOBALS['phpgw_info']['flags'] = array( 'currentapp' => 'login', 'noheader' => True, 'disable_Template_class' => True ); - include('header.inc.php'); + + /** + * Include phpgroupware header + */ + include_once('header.inc.php'); // If XML-RPC isn't enabled in PHP, return an XML-RPC response stating so if (! function_exists('xmlrpc_server_create')) @@ -116,7 +118,7 @@ } else { - // Session is invailed + // Session is invalied xmlrpc_error(1001,'Session expired'); } } @@ -148,8 +150,18 @@ } } - // When PHP returns an error, return that error with a fault instead of - // HTML with will make most parsers fall apart + + /** + * XMLRPC custom error + * + * When PHP returns an error, return that error with a fault instead of + * HTML with will make most parsers fall apart + * @param integer $error_number + * @param string $error_string + * @param string $filename + * @param integer $line + * @param array $vars + */ function xmlrpc_custom_error($error_number, $error_string, $filename, $line, $vars) { if (error_reporting() & $error_number) @@ -160,9 +172,13 @@ } } - // This will create an XML-RPC error - // FIXME! This needs to be expanded to handle PHP errors themselfs - // it will make debugging easier + /** + * Create an XML-RPC error + * + * @param integer $error_number + * @param string $error_string + * @todo FIXME! This needs to be expanded to handle PHP errors themselfs it will make debugging easier + */ function xmlrpc_error($error_number, $error_string) { $values = array( @@ -176,7 +192,12 @@ exit; } - // This will dynamicly create the avaiable methods for each class + /** + * Dynamicly create the avaiable methods for each class + * + * @param string $method + * @return array Method names + */ function xmlrpc_list_methods($method) { list($app,$class,$func) = explode('.',$method); @@ -192,6 +213,12 @@ return $methods; } + /** + * Get XMLRPC methods + * + * @param string $method + * @return array + */ function xmlrpc_describe_methods($method) { list($app,$class,$func) = explode('.',$method); @@ -211,6 +238,14 @@ // and kp3 instead of using HTTP_AUTH features. // Would be a nice workaround for librarys that don't support it, as its // not in the XML-RPC spec. + + /** + * XMLRPC call wrapper + * + * @param string $method_name + * @param array $parameters + * @return unknown + */ function xmlrpc_call_wrapper($method_name, $parameters) { $a = explode('.',$method_name); @@ -244,6 +279,14 @@ } // The following are common functions used ONLY by XML-RPC + + + /** + * XMLRPC login + * + * @param string $method_name + * @param array $parameters + */ function xmlrpc_login($method_name, $parameters) { $p = $parameters[0]; @@ -275,6 +318,13 @@ } } + /** + * XMLRPC logout + * + * @param string $method + * @param array $parameters + * @return boolean Always true + */ function xmlrpc_logout($method, $parameters) { // We have already verified the session upon before this method is even created @@ -284,5 +334,3 @@ return True; } - - ==================================================== Index: phpgroupware/redirect.php diff -u phpgroupware/redirect.php:1.2 phpgroupware/redirect.php:1.3 --- phpgroupware/redirect.php:1.2 Thu Dec 30 10:46:22 2004 +++ phpgroupware/redirect.php Fri Apr 15 13:19:15 2005 @@ -1,19 +1,16 @@ * - * Poor implementation by: Lars Kneschke * - * Proper Implementation by: Dave Hall skwashd at phpgroupware.org * - * Copyright (c) 2004 Free Software Foundation Inc - http://www.fsf.org/ * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id$ */ + /** + * phpGroupWare - Session safe redirect + * + * phpgroupware base + * @internal Idea by Jason Wies + * @author Lars Kneschke + * @author Dave Hall + * @copyright Copyright (C) 2004-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package phpgroupware + * @version $Id$ + */ //Get the session variables set for non cookie based sessions if (! (@isset($_COOKIES['PHPSESSID']) || @isset($_COOKIES['sessionid']) ) ) @@ -37,7 +34,10 @@ 'nofooter' => True ); - require_once('./header.inc.php'); + /** + * Include phpgroupware header + */ + include_once('header.inc.php'); if( @isset($_GET['go']) ) { @@ -47,7 +47,7 @@


- + True, 'nonavbar' => True, 'disable_Template_class' => True, 'currentapp' => 'notifywindow' ); - include('./header.inc.php'); + + /** + * Include phpgroupware header + */ + include_once('header.inc.php'); echo ''; $GLOBALS['phpgw']->hooks->process('notifywindow_simple',array('email')); From MAILER-DAEMON Fri Apr 15 11:50:17 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DMT5F-00049d-0B for mharc-phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 11:50:17 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DMT55-00046m-Om for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 11:50:08 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DMT4W-0003y0-8B for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 11:50:04 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DMT4W-0003to-4N for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 11:49:32 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DMSnh-0006pY-Dn for phpgroupware-cvs@gnu.org; Fri, 15 Apr 2005 11:32:11 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 90105312B3 for ; Fri, 15 Apr 2005 17:30:20 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 29971-06 for ; Fri, 15 Apr 2005 17:30:15 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 91625312B2 for ; Fri, 15 Apr 2005 17:30:15 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3FFUFq12911; Fri, 15 Apr 2005 17:30:15 +0200 Message-Id: <200504151530.j3FFUFq12911@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Fri, 15 Apr 2005 16:36:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] setup/inc hook_config.inc.php, 1.2 functions.inc.php, 1.50 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2005 15:50:09 -0000 Update of setup/inc Modified Files: Branch: MAIN hook_config.inc.php lines: +33 -16 functions.inc.php lines: +60 -28 Log Message: Converted to phpdoc. Verified with phpdocumentor and php -l Fixed to XHTML ==================================================== Index: setup/inc/hook_config.inc.php diff -u setup/inc/hook_config.inc.php:1.1 setup/inc/hook_config.inc.php:1.2 --- setup/inc/hook_config.inc.php:1.1 Sat Dec 7 02:12:15 2002 +++ setup/inc/hook_config.inc.php Fri Apr 15 14:36:20 2005 @@ -1,17 +1,21 @@ * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id$ */ - + /** + * Setup - configuration hook + * + * cConfiguration hook + * @author Mark Peters + * @copyright Copyright (C) 2000-2002,2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package setup + * @version $Id$ + */ + + /** + * Get selectbox for supported encryption algorithms selectbox + * + * @param $config + * @return string HTML code for encryption algorithm selection + */ function encryptalgo($config) { if(@function_exists('mcrypt_list_algorithms')) @@ -33,7 +37,7 @@ { if($config['mcrypt_algo'] == $value) { - $selected = ' selected'; + $selected = ' selected="selected"'; } else { @@ -58,6 +62,12 @@ return $out; } + /** + * Get encryption modes selectbox + * + * @param $config + * @return string HTML select box + */ function encryptmode($config) { if(@function_exists('mcrypt_list_modes')) @@ -79,7 +89,7 @@ { if($config['mcrypt_mode'] == $value) { - $selected = ' selected'; + $selected = ' selected="selected"'; } else { @@ -104,6 +114,13 @@ return $out; } + + /** + * Get HTML selectbox with supported hash algorithms + * + * @param $config + * @return string HTML select box + */ function passwdhashes($config) { $hashes = array( @@ -119,7 +136,7 @@ { if($config['ldap_encryption_type'] == $value) { - $selected = ' selected'; + $selected = ' selected="selected"'; } else { ==================================================== Index: setup/inc/functions.inc.php diff -u setup/inc/functions.inc.php:1.49 setup/inc/functions.inc.php:1.50 --- setup/inc/functions.inc.php:1.49 Thu Dec 30 09:37:36 2004 +++ setup/inc/functions.inc.php Fri Apr 15 14:36:20 2005 @@ -1,22 +1,19 @@ * - * and Dan Kuykendall * - * and Mark Peters * - * and Miles Lott * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id$ */ + /** + * Setup - functions + * + * Setup functions + * @author Joseph Engo + * @author Dan Kuykendall + * @author Mark Peters + * @author Miles Lott + * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package setup + * @version $Id$ + */ - /* ######## Start security check ########## */ + // ######## Start security check ########## $d1 = strtolower(substr(@$GLOBALS['phpgw_info']['server']['api_inc'],0,3)); $d2 = strtolower(substr(@$GLOBALS['phpgw_info']['server']['server_root'],0,3)); $d3 = strtolower(substr(@$GLOBALS['phpgw_info']['server']['app_inc'],0,3)); @@ -30,7 +27,11 @@ if(file_exists('../header.inc.php')) { - include('../header.inc.php'); + + /** + * Include phpgroupware header + */ + include_once('../header.inc.php'); } if (!function_exists('version_compare'))//version_compare() is only available in PHP4.1+ @@ -49,14 +50,36 @@ define('PHPGW_INCLUDE_ROOT','..'); } + /** + * Include common functions + */ include(PHPGW_INCLUDE_ROOT . '/phpgwapi/inc/common_functions.inc.php'); + + /** + * Include log functions + */ include(PHPGW_INCLUDE_ROOT . '/phpgwapi/inc/log_functions.inc.php'); + /** + * Platform dependend file separator + */ define('SEP',filesystem_separator()); - /*! - @function lang - @abstract function to handle multilanguage support + /** + * Handle multilanguage support + * + * @param $key + * @param string|array $m1 + * @param string $m2 + * @param string $m3 + * @param string $m4 + * @param string $m5 + * @param string $m6 + * @param string $m7 + * @param string $m8 + * @param string $m9 + * @param string $m10 + * @return array */ function lang($key,$m1='',$m2='',$m3='',$m4='',$m5='',$m6='',$m7='',$m8='',$m9='',$m10='') { @@ -72,10 +95,10 @@ return $value; } - /*! - @function get_langs - @abstract returns array of languages we support, with enabled set - to True if the lang file exists + /** + * Get supported languages + * + * @return array Supported languages */ function get_langs() { @@ -104,11 +127,17 @@ return $languages; } + /** + * Create HTML select with available languages + * + * @param boolean $onChange Add JavaScript code for auto submit when true + * @return string HTML code for select box + */ function lang_select($onChange=False) { $ConfigLang = get_var('ConfigLang',Array('POST','COOKIE')); - $select = '' . "\n"; $languages = get_langs(); while(list($null,$data) = each($languages)) { @@ -118,7 +147,7 @@ $short = substr($data['lang'],0,2); if ($short == $ConfigLang || empty($ConfigLang) && $short == substr($_SERVER['HTTP_ACCEPT_LANGUAGE'],0,2)) { - $selected = ' selected'; + $selected = ' selected="selected"'; } $select .= '' . "\n"; } @@ -130,8 +159,11 @@ if(file_exists(PHPGW_SERVER_ROOT.'/phpgwapi/setup/setup.inc.php')) { + /** + * Include API setup + */ include(PHPGW_SERVER_ROOT.'/phpgwapi/setup/setup.inc.php'); /* To set the current core version */ - /* This will change to just use setup_info */ + // This will change to just use setup_info $GLOBALS['phpgw_info']['server']['versions']['current_header'] = $setup_info['phpgwapi']['versions']['current_header']; } else From MAILER-DAEMON Sun Apr 17 09:33:42 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DN9uA-00040G-31 for mharc-phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 09:33:42 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DN9u3-0003t6-Sl for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 09:33:36 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DN9ty-0003qj-0n for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 09:33:32 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DN9tx-0003qg-Sa for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 09:33:29 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DN9u3-0001mg-Va for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 09:33:36 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 8BBE5312CC for ; Sun, 17 Apr 2005 15:31:14 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 24453-10 for ; Sun, 17 Apr 2005 15:31:08 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id D320B312BA for ; Sun, 17 Apr 2005 15:31:07 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3HDV7618175; Sun, 17 Apr 2005 15:31:07 +0200 Message-Id: <200504171331.j3HDV7618175@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Sun, 17 Apr 2005 15:18:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] setup ldapexport.php, 1.10 index.php, 1.119 schematoy.php, 1.15 sqltoarray.php, 1.14 manageheader.php, 1.52 applist.php, 1.11 bulk.php, 1.4 setup_demo.php, 1.35 ldapimport.php, 1.14 config.php, 1.84 applications.php, 1.24 lang.php, 1.51 ldap.php, 1.57 ldapmodify.php, 1.14 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 13:33:39 -0000 Update of setup Modified Files: Branch: MAIN ldapexport.php lines: +36 -11 index.php lines: +15 -17 schematoy.php lines: +20 -11 sqltoarray.php lines: +41 -15 manageheader.php lines: +28 -25 applist.php lines: +17 -12 bulk.php lines: +12 -11 setup_demo.php lines: +53 -16 ldapimport.php lines: +52 -17 config.php lines: +52 -27 applications.php lines: +23 -15 lang.php lines: +18 -12 ldap.php lines: +12 -11 ldapmodify.php lines: +49 -25 Log Message: Added phpdocs checked with php -l and phpdocumentor. versions.inc.php is NO php file and should be renamed README.inc should also be renamed ==================================================== Index: setup/ldapexport.php diff -u setup/ldapexport.php:1.9 setup/ldapexport.php:1.10 --- setup/ldapexport.php:1.9 Thu Dec 30 11:59:24 2004 +++ setup/ldapexport.php Sun Apr 17 13:18:24 2005 @@ -1,15 +1,12 @@ 'home', 'noapi' => True ); + + /** + * Include setup functions + */ include('./inc/functions.inc.php'); // Authorize the user to use setup app and load the database @@ -31,11 +32,35 @@ //This stops timeout problems for larger conversions @set_time_limit(0); + /** + * phpGroupWare class + * @package setup + * @ignore + */ class phpgw { + /** + * Common + * @var object + */ var $common; + + /** + * Accounts + * @var object + */ var $accounts; + + /** + * Applications + * @var object + */ var $applications; + + /** + * Database + * @var object + */ var $db; } $phpgw = new phpgw; ==================================================== Index: setup/index.php diff -u setup/index.php:1.118 setup/index.php:1.119 --- setup/index.php:1.118 Thu Mar 3 19:28:13 2005 +++ setup/index.php Sun Apr 17 13:18:24 2005 @@ -1,14 +1,12 @@ True, 'nocachecontrol' => True ); + + /** + * Include setup functions + */ include('./inc/functions.inc.php'); @set_time_limit(0); @@ -75,8 +77,8 @@ $GLOBALS['phpgw_setup']->loaddb(); - /* Add cleaning of app_sessions per skeeter, but with a check for the table being there, just in case */ - /* $GLOBALS['phpgw_setup']->clear_session_cache(); */ + // Add cleaning of app_sessions per skeeter, but with a check for the table being there, just in case + // $GLOBALS['phpgw_setup']->clear_session_cache(); // Database actions $setup_info = $GLOBALS['phpgw_setup']->detection->get_versions(); @@ -247,7 +249,7 @@ $setup_info = $GLOBALS['phpgw_setup']->process->droptables($setup_info); break; case 'new': - /* process all apps and langs(last param True), excluding apps with the no_mass_update flag set. */ + // process all apps and langs(last param True), excluding apps with the no_mass_update flag set. $setup_info = $GLOBALS['phpgw_setup']->detection->upgrade_exclude($setup_info); $setup_info = $GLOBALS['phpgw_setup']->process->pass($setup_info,'new',$GLOBALS['DEBUG'],True); @@ -285,7 +287,6 @@ $setup_tpl->parse('V_db_stage_default','B_db_stage_default'); $db_filled_block = $setup_tpl->get_var('V_db_stage_default'); $setup_tpl->set_var('V_db_filled_block',$db_filled_block); - break; } // Config Section @@ -389,7 +390,6 @@ $setup_tpl->set_var('config_status_alt',lang('not completed')); $setup_tpl->set_var('config_table_data',lang('Not ready for this stage yet')); $setup_tpl->set_var('ldap_table_data',' '); - break; } // Lang Section @@ -435,7 +435,6 @@ $setup_tpl->set_var('lang_status_img',$incomplete); $setup_tpl->set_var('lang_status_alt',lang('not completed')); $setup_tpl->set_var('lang_table_data',lang('Not ready for this stage yet')); - break; } $setup_tpl->set_var('apps_step_text',lang('Step 4 - Advanced Application Management')); @@ -456,7 +455,6 @@ $setup_tpl->set_var('apps_status_img',$incomplete); $setup_tpl->set_var('apps_status_alt',lang('not completed')); $setup_tpl->set_var('apps_table_data',lang('Not ready for this stage yet')); - break; } $GLOBALS['phpgw_setup']->html->show_header( ==================================================== Index: setup/schematoy.php diff -u setup/schematoy.php:1.14 setup/schematoy.php:1.15 --- setup/schematoy.php:1.14 Thu Dec 30 11:59:24 2004 +++ setup/schematoy.php Sun Apr 17 13:18:24 2005 @@ -1,15 +1,12 @@ 'home', 'noapi' => True ); + + /** + * Include setup functions + */ include ('./inc/functions.inc.php'); // Check header and authentication @@ -56,6 +57,14 @@ $bgcolor = array('DDDDDD','EEEEEE'); + /** + * Parse dependencies + * + * @param array $depends + * @param boolean $main Return a string when true otherwise an array + * @return string|array Dependency string or array + * @ignore + */ function parsedep($depends,$main=True) { $depstring = '('; ==================================================== Index: setup/sqltoarray.php diff -u setup/sqltoarray.php:1.13 setup/sqltoarray.php:1.14 --- setup/sqltoarray.php:1.13 Thu Dec 30 11:59:24 2004 +++ setup/sqltoarray.php Sun Apr 17 13:18:24 2005 @@ -1,15 +1,12 @@ 'home', 'noapi' => True ); + + /** + * Include setup functions + */ include ('./inc/functions.inc.php'); - /* Check header and authentication */ + // Check header and authentication if (!$GLOBALS['phpgw_setup']->auth('Config')) { Header('Location: index.php'); @@ -72,6 +73,12 @@ $GLOBALS['phpgw_setup']->loaddb(); + /** + * Parse variables + * + * @param string $table + * @param string $term + */ function parse_vars($table,$term) { $GLOBALS['setup_tpl']->set_var('table', $table); @@ -132,6 +139,12 @@ } } + /** + * + * + * @param string $template + * @return string + */ function printout($template) { global $download,$appname,$table,$showall; @@ -153,6 +166,13 @@ return $string; } + + /** + * Download handler + * + * @param string $dlstring + * @param string $fn + */ function download_handler($dlstring,$fn='tables_current.inc.php') { //include( PHPGW_SERVER_ROOT . '/phpgwapi/inc/class.browser.inc.php'); @@ -201,12 +221,18 @@ if(!$setup_info[$appname]['tables']) { $f = PHPGW_SERVER_ROOT . '/' . $appname . '/setup/setup.inc.php'; - if (file_exists ($f)) { include($f); } + if (file_exists ($f)) + { + /** + * Include existing file + */ + include($f); + } } //$tables = explode(',',$setup_info[$appname]['tables']); $tables = $setup_info[$appname]['tables']; - /* $i = 1; */ + // $i = 1; while(list($key,$table) = @each($tables)) { /* @@ -217,7 +243,7 @@ */ parse_vars($table,$term); $dlstring .= printout('sqlbody'); - /* $i++; */ + // ++$i; } $dlstring .= printout('sqlfooter'); } ==================================================== Index: setup/manageheader.php diff -u setup/manageheader.php:1.51 setup/manageheader.php:1.52 --- setup/manageheader.php:1.51 Thu Mar 3 19:28:13 2005 +++ setup/manageheader.php Sun Apr 17 13:18:24 2005 @@ -1,15 +1,12 @@ 'home', 'noapi' => True ); + + /** + * Include setup functions + */ include('./inc/functions.inc.php'); $GLOBALS['phpgw_info']['server']['versions']['current_header'] = $setup_info['phpgwapi']['versions']['current_header']; @@ -30,6 +31,9 @@ { } + /** + * Check form values + */ function check_form_values() { $errors = ''; @@ -149,8 +153,8 @@ echo '
'; echo '
'; echo '
' . lang('After retrieving the file, put it into place as the header.inc.php. Then, click "continue".') . '
'; - echo ''; - echo ''; + echo ''; + echo ''; echo ''; echo ''; break; @@ -166,8 +170,8 @@ $GLOBALS['phpgw_setup']->html->show_header('Saved header.inc.php', False, 'header'); echo '
'; echo '
Created header.inc.php! '; - echo ''; - echo ''; + echo ''; + echo ''; echo ''; echo ''; break; @@ -188,7 +192,7 @@ if (!$ConfigLang) { $_POST['ConfigLang'] = 'en'; - $detected .= '
Please Select your language '.lang_select(True)."\n"; + $detected .= '
Please Select your language ' . lang_select(True) . "\n"; } $detected .= '
\"\"$info[title]
$info[note]
$info[note]
$val"; + $s .= "
$val"; $infos = $info[$key]; for ($n = 0; is_array($info[$key][$n]) && ($infos = $info[$key][$n]) || !$n; ++$n) { @@ -62,8 +81,8 @@ } if (is_array($infos)) { - $names = explode('
',$infos['name']); - $emails = split('@|
',$infos['email']); + $names = explode('
',$infos['name']); + $emails = split('@|
',$infos['email']); if (count($names) < count($emails)/2) { $names = ''; @@ -71,13 +90,13 @@ $infos = ''; while (list($user,$domain) = $emails) { - if ($infos) $infos .= '
'; + if ($infos) $infos .= '
'; $name = $names ? array_shift($names) : $user; - $infos .= "$name"; + $infos .= "$name"; array_shift($emails); array_shift($emails); } } - $s .= ($n ? '
' : '') . $infos; + $s .= ($n ? '
' : '') . $infos; } $s .= "
' . "\n"; @@ -351,7 +355,7 @@ { if($v == $GLOBALS['phpgw_domain'][$key]['db_type']) { - $selected = ' selected '; + $selected = ' selected="selected" '; $found_dbtype = true; } else @@ -424,7 +428,7 @@ 'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z' ); - for($i=0; $i<30; $i++) + for($i=0; $i < 30; ++$i) { $GLOBALS['phpgw_info']['server']['mcrypt_iv'] .= $random_char[rand(1,count($random_char))]; } @@ -462,7 +466,7 @@ { if($v == @$GLOBALS['phpgw_info']['server']['sessions_type']) { - $selected = ' selected '; + $selected = ' selected="selected" '; } else { @@ -518,15 +522,15 @@ if(is_writeable('../header.inc.php') || (!file_exists('../header.inc.php') && is_writeable('../'))) { - $errors .= '
 ' - . lang('or') . '  ' - . lang('or') . '  '.lang('the file').'.'; + $errors .= '
 ' + . lang('or') . '  ' + . lang('or') . '  ' . lang('the file') . '.'; } else { $errors .= '
' . lang('Cannot create the header.inc.php due to file permission restrictions.
Instead you can %1 the file.', - '' . lang('or') . ' ') + '' . lang('or') . ' ') . ''; } @@ -565,7 +569,6 @@ $setup_tpl->set_var('lang_continue',lang('Continue')); $setup_tpl->pfp('out','manageheader'); - break; // ending the switch default + // ending the switch default } ?> - ==================================================== Index: setup/applist.php diff -u setup/applist.php:1.10 setup/applist.php:1.11 --- setup/applist.php:1.10 Thu Dec 30 11:59:24 2004 +++ setup/applist.php Sun Apr 17 13:18:24 2005 @@ -1,15 +1,12 @@ 'home', 'noapi' => True ); + + /** + * Include setup functions + */ include('./inc/functions.inc.php'); + + /** + * Include XML functions + */ include(PHPGW_SERVER_ROOT . 'phpgwapi/inc/xml_functions.inc.php'); - /* Check header and authentication */ + // Check header and authentication if (!$GLOBALS['phpgw_setup']->auth('Config')) { Header('Location: index.php'); ==================================================== Index: setup/bulk.php diff -u setup/bulk.php:1.3 setup/bulk.php:1.4 --- setup/bulk.php:1.3 Thu Dec 30 09:37:36 2004 +++ setup/bulk.php Sun Apr 17 13:18:24 2005 @@ -1,15 +1,12 @@ 'home', 'noapi' => True ); + + /** + * Include setup functions + */ include ('./inc/functions.inc.php'); set_time_limit(0); ==================================================== Index: setup/setup_demo.php diff -u setup/setup_demo.php:1.34 setup/setup_demo.php:1.35 --- setup/setup_demo.php:1.34 Thu Dec 30 11:59:24 2004 +++ setup/setup_demo.php Sun Apr 17 13:18:24 2005 @@ -1,15 +1,12 @@ 'home', 'noapi' => True ); + + /** + * Include setup functions + */ include('./inc/functions.inc.php'); // Authorize the user to use setup app and load the database @@ -29,6 +30,16 @@ exit; } + /** + * Add account + * + * @param string $username Username to add + * @param string $first First name ow new user + * @param string $last Last name of new user + * @param string $passwd Password for new user + * @param string $type Account type; u = user + * @return string Account ID + */ function add_account($username, $first, $last, $passwd, $type='u') { if($type=='u') @@ -154,13 +165,32 @@ $GLOBALS['phpgw_info']['server']['group_max_id'] = $config['group_max_id']; unset($config); - /* Create dummy class, then accounts object */ + /** + * phpGroupWare dummy class + * @package setup + * @ignore + */ class phpgw { + /** + * Database + * @var object + */ var $db; + + /** + * Common + * @var object + */ var $common; + + /** + * Accounts + * @var object + */ var $accounts; } + $GLOBALS['phpgw'] = new phpgw; $GLOBALS['phpgw']->db = $GLOBALS['phpgw_setup']->db; $GLOBALS['phpgw']->common = CreateObject('phpgwapi.common'); @@ -172,10 +202,10 @@ exit; } - /* Begin transaction for acl, etc */ + // Begin transaction for acl, etc $GLOBALS['phpgw_setup']->db->transaction_begin(); - /* Now, clear out existing tables */ + // Now, clear out existing tables $contacts_to_delete = $GLOBALS['phpgw']->accounts->get_account_with_contact(); // $GLOBALS['phpgw_setup']->db->query('SELECT person_id from phpgw_accounts WHERE person_id is not null'); // $contacts_to_delete=array(); @@ -199,10 +229,10 @@ $defaultgroupid = intval(add_account('Default','Default','Group',$passwd,'g')); $admingroupid = intval(add_account('Admins','Admin', 'Group',$passwd,'g')); - /* Create the addressmaster record */ + // Create the addressmaster record //add_account('addressmaster','addressmaster','addressmaster','addressmaster'); - /* Group perms for the default group */ + // Group perms for the default group $GLOBALS['phpgw_setup']->db->query("INSERT INTO phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) VALUES('addressbook','run'," . $defaultgroupid . ", 1)"); $GLOBALS['phpgw_setup']->db->query("INSERT INTO phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) VALUES('filemanager','run'," . $defaultgroupid . ", 1)"); $GLOBALS['phpgw_setup']->db->query("INSERT INTO phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) VALUES('calendar','run'," . $defaultgroupid . ", 1)"); @@ -212,6 +242,11 @@ $GLOBALS['phpgw_setup']->db->query("INSERT INTO phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) VALUES('manual','run'," . $defaultgroupid . ", 1)"); $GLOBALS['phpgw_setup']->db->query("INSERT INTO phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) VALUES('preferences','run'," . $defaultgroupid . ", 1)"); + /** + * Insert default preferences + * + * @param $accountid + */ function insert_default_prefs($accountid) { $defaultprefs = unserialize('a:3:{s:6:"common";a:10:{s:9:"maxmatchs";s:2:"15";s:12:"template_set";s:8:"verdilak";s:5:"theme";s:9:"submarine";s:13:"navbar_format";s:5:"icons";s:9:"tz_offset";s:0:"";s:10:"dateformat";s:5:"Y/m/d";s:10:"timeformat";s:2:"24";s:4:"lang";s:2:"en";s:11:"default_app";s:0:"";s:8:"currency";s:1:"$";}s:11:"addressbook";a:1:{s:0:"";s:4:"True";}s:8:"calendar";a:4:{s:13:"workdaystarts";s:1:"9";s:11:"workdayends";s:2:"17";s:13:"weekdaystarts";s:6:"Monday";s:15:"defaultcalendar";s:9:"month.php";}}'); @@ -224,6 +259,8 @@ $GLOBALS['phpgw_setup']->db->query("INSERT INTO phpgw_preferences(preference_owner,preference_app,preference_value) VALUES($accountid,'$app','$prefs')",__FILE__,__LINE__); } } + + insert_default_prefs(-2); // set some default prefs /* Creation of the demo accounts is optional - the checkbox is on by default. */ ==================================================== Index: setup/ldapimport.php diff -u setup/ldapimport.php:1.13 setup/ldapimport.php:1.14 --- setup/ldapimport.php:1.13 Thu Dec 30 11:59:24 2004 +++ setup/ldapimport.php Sun Apr 17 13:18:24 2005 @@ -1,15 +1,12 @@ 'home', 'noapi' => True ); + + /** + * Include setup functions + */ include('./inc/functions.inc.php'); // Authorize the user to use setup app and load the database @@ -28,13 +29,47 @@ } // Does not return unless user is authorized + /** + * phpGroupWare class + * @package setup + * @ignore + */ class phpgw { + /** + * Common + * @var object + */ var $common; + + /** + * Accounts + * @var object + */ var $accounts; + + /** + * Applications + * @var object + */ var $applications; + + /** + * Database + * @var object + */ var $db; + + /** + * Hooks + * @var object + */ var $hooks; + + /** + * Access control list + * @var object + */ var $acl; } $GLOBALS['phpgw'] = new phpgw; @@ -96,7 +131,7 @@ $info = ldap_get_entries($ldap, $sr); $tmp = ''; - for ($i=0; $i<$info['count']; $i++) + for ($i=0; $i<$info['count']; ++$i) { if (! $GLOBALS['phpgw_info']['server']['global_denied_users'][$info[$i]['uid'][0]]) { @@ -115,7 +150,7 @@ $info = ldap_get_entries($ldap, $srg); $tmp = ''; - for ($i=0; $i<$info['count']; $i++) + for ($i=0; $i<$info['count']; ++$i) { if (! $GLOBALS['phpgw_info']['server']['global_denied_groups'][$info[$i]['cn'][0]] && ! $account_info[$i][$info[$i]['cn'][0]]) @@ -204,14 +239,14 @@ // Insert default acls for this user. // Since the group has app rights, we don't need to give users - // these rights. Instead, we make the user a member of the Default group - // below. + // these rights. Instead, we make the user a member of the Default group + // below. $GLOBALS['phpgw']->acl->acl($thisacctid); $GLOBALS['phpgw']->acl->read_repository(); // Only give them admin if we asked for them to have it. // This is typically an exception to apps for run rights - // as a group member. + // as a group member. $cnt_admins = count($_POST['admins']); for ($a = 0; $a < $cnt_admins; ++$a) { @@ -261,7 +296,7 @@ // Check if the account is already there. // If so, we won't try to create it again. $acct_exist = $groups->name2id($thisacctlid); - /* echo 'group: ' . $acct_exist; */ if ($acct_exist) { $thisacctid = $acct_exist; ==================================================== Index: setup/config.php diff -u setup/config.php:1.83 setup/config.php:1.84 --- setup/config.php:1.83 Sun Jan 9 00:32:07 2005 +++ setup/config.php Sun Apr 17 13:18:24 2005 @@ -1,15 +1,12 @@ 'home', 'noapi' => True ); + + /** + * Include setup functions + */ include('./inc/functions.inc.php'); - /* - Authorize the user to use setup app and load the database - Does not return unless user is authorized - */ + // Authorize the user to use setup app and load the database + // Does not return unless user is authorized if(!$GLOBALS['phpgw_setup']->auth('Config')) { Header('Location: index.php'); @@ -33,8 +32,12 @@ $tpl_root = $GLOBALS['phpgw_setup']->html->setup_tpl_dir('setup'); $setup_tpl = CreateObject('phpgwapi.Template',$tpl_root); - // test if $path lies within the webservers document-root - // + /** + * Test if $path lies within the webservers document-root + * + * @param string $path File/directory path + * @return boolean True when path is within webservers document-root; otherwise false + */ function in_docroot($path) { $docroots = array(PHPGW_SERVER_ROOT,$GLOBALS['HTTP_SERVER_VARS']['DOCUMENT_ROOT']); @@ -64,12 +67,12 @@ 'T_config_post_script' => 'config_post_script.tpl' )); - /* Following to ensure windows file paths are saved correctly */ + // Following to ensure windows file paths are saved correctly set_magic_quotes_runtime(0); $GLOBALS['phpgw_setup']->loaddb(); - /* Guessing default values. */ + // Guessing default values. $GLOBALS['current_config']['hostname'] = $_SERVER['HTTP_HOST']; // files-dir is not longer allowed in document root, for security reasons !!! $GLOBALS['current_config']['files_dir'] = '/outside/webserver/docroot'; @@ -94,7 +97,7 @@ exit; } - /* Check api version, use correct table */ + // Check api version, use correct table $setup_info = $GLOBALS['phpgw_setup']->detection->get_db_versions(); if($GLOBALS['phpgw_setup']->alessthanb($setup_info['phpgwapi']['currentver'], '0.9.10pre7')) @@ -128,7 +131,7 @@ print_debug('TZ_OFFSET',$newsettings['tz_offset']); $GLOBALS['phpgw_setup']->db->transaction_begin(); - /* This is only temp: */ + // This is only temp: $GLOBALS['phpgw_setup']->db->query("DELETE FROM $configtbl WHERE config_name='useframes'"); $GLOBALS['phpgw_setup']->db->query("INSERT INTO $configtbl (config_app,config_name, config_value) values ('phpgwapi','useframes','never')"); @@ -148,7 +151,7 @@ } $GLOBALS['phpgw_setup']->db->transaction_commit(); - /* Add cleaning of app_sessions per skeeter, but with a check for the table being there, just in case */ + // Add cleaning of app_sessions per skeeter, but with a check for the table being there, just in case $tablenames = $GLOBALS['phpgw_setup']->db->table_names(); while(list($key,$val) = @each($tablenames)) { @@ -198,20 +201,43 @@ if($GLOBALS['error'] == 'badldapconnection') { - /* Please check the number and dial again :) */ + // Please check the number and dial again :) $GLOBALS['phpgw_setup']->html->show_alert_msg('Error', lang('There was a problem trying to connect to your LDAP server.
' .'please check your LDAP server configuration') . '.'); } $setup_tpl->pparse('out','T_config_pre_script'); - - /* Now parse each of the templates we want to show here */ + // Now parse each of the templates we want to show here + + /** + * phpGroupWare class + * @package setup + */ class phpgw { + /** + * Common + * @var object + */ var $common; + + /** + * Accounts + * @var object + */ var $accounts; + + /** + * Applications + * @var object + */ var $applications; + + /** + * Database + * @var object + */ var $db; } $GLOBALS['phpgw'] = new phpgw; @@ -263,7 +289,7 @@ $config = ''; $newvals = explode(' ',$newval); $setting = end($newvals); - for($i=0;$i<(count($newvals) - 1); $i++) + for($i=0;$i<(count($newvals) - 1); ++$i) { $configs[] = $newvals[$i]; } @@ -298,4 +324,3 @@ $GLOBALS['phpgw_setup']->html->show_footer(); ?> - ==================================================== Index: setup/applications.php diff -u setup/applications.php:1.23 setup/applications.php:1.24 --- setup/applications.php:1.23 Thu Dec 30 09:37:36 2004 +++ setup/applications.php Sun Apr 17 13:18:24 2005 @@ -1,15 +1,12 @@ 'home', 'noapi' => True ); + + /** + * Include setup functions + */ include ('./inc/functions.inc.php'); @set_time_limit(0); @@ -65,6 +66,13 @@ $bgcolor = array('row_on', 'row_off'); + /** + * Parse dependencies + * + * @param array $depends + * @param boolean $main Return a string when true otherwise an array + * @return string|array Dependency string or array + */ function parsedep($depends,$main=True) { $depstring = '('; @@ -316,7 +324,7 @@ echo lang('because it depends upon') . ':
' . "\n"; list($depapp,$depver) = parsedep($setup_info[$resolve]['depends'],False); $depapp_count = count($depapp); - for ($i=0; $i<$depapp_count; $i++) + for ($i=0; $i<$depapp_count; ++$i) { echo '
' . $depapp[$i] . ': '; $list = ''; @@ -427,7 +435,7 @@ switch($value['status']) { case 'C': - $setup_tpl->set_var('remove',''); + $setup_tpl->set_var('remove',''); $setup_tpl->set_var('upgrade',' '); if (!$GLOBALS['phpgw_setup']->detection->check_app_tables($value['name'])) { @@ -470,7 +478,7 @@ if ($value['tables'] && $GLOBALS['phpgw_setup']->detection->check_app_tables($value['name'],True)) { // Some tables missing - $setup_tpl->set_var('remove',''); + $setup_tpl->set_var('remove',''); $setup_tpl->set_var('resolution','' . lang('Potential Problem') . ''); $status = lang('Requires reinstall or manual repair') . ' - ' . $value['status']; } @@ -481,7 +489,7 @@ $status = lang('Requires upgrade') . ' - ' . $value['status']; } $setup_tpl->set_var('bg_color','row_install'); - $setup_tpl->set_var('install',''); + $setup_tpl->set_var('install',''); $setup_tpl->set_var('upgrade',' '); $status = lang('Please install') . ' - ' . $value['status']; } ==================================================== Index: setup/lang.php diff -u setup/lang.php:1.50 setup/lang.php:1.51 --- setup/lang.php:1.50 Thu Dec 30 09:37:36 2004 +++ setup/lang.php Sun Apr 17 13:18:24 2005 @@ -1,15 +1,12 @@ 'home', 'noapi' => True ); + + /** + * Include setup functions + */ include('./inc/functions.inc.php'); + // Authorize the user to use setup app and load the database // Does not return unless user is authorized if (!$GLOBALS['phpgw_setup']->auth('Config')) @@ -30,7 +32,11 @@ } $GLOBALS['phpgw_setup']->loaddb(); + /** + * Include API Common class + */ include(PHPGW_API_INC.'/class.common.inc.php'); + $common = new common; // this is not used //$sep = $common->filesystem_separator(); @@ -215,7 +221,7 @@ $select_box_langs = @$select_box_langs .'' ."\n"; if(strtoupper($GLOBALS['phpgw_setup']->db->f('available')) != 'YES') ==================================================== Index: setup/ldap.php diff -u setup/ldap.php:1.56 setup/ldap.php:1.57 --- setup/ldap.php:1.56 Mon Jan 3 07:47:22 2005 +++ setup/ldap.php Sun Apr 17 13:18:24 2005 @@ -1,15 +1,12 @@ 'home', 'noapi' => True ); + + /** + * Include setup functions + */ include('./inc/functions.inc.php'); // Authorize the user to use setup app and load the database ==================================================== Index: setup/ldapmodify.php diff -u setup/ldapmodify.php:1.13 setup/ldapmodify.php:1.14 --- setup/ldapmodify.php:1.13 Thu Dec 30 11:59:24 2004 +++ setup/ldapmodify.php Sun Apr 17 13:18:24 2005 @@ -1,15 +1,12 @@ True ); + /** + * Include setup functions + */ include('./inc/functions.inc.php'); /* Authorize the user to use setup app and load the database */ @@ -28,13 +28,37 @@ exit; } - /* Does not return unless user is authorized */ + // Does not return unless user is authorized + /** + * phpGroupWare class + * @package setup + * @ignore + */ class phpgw { + /** + * Common + * @var object + */ var $common; + + /** + * Accounts + * @var object + */ var $accounts; + + /** + * Applications + * @var object + */ var $applications; + + /** + * Database + * @var object + */ var $db; } $GLOBALS['phpgw'] = new phpgw; @@ -67,7 +91,7 @@ $acct = $GLOBALS['phpgw']->accounts = CreateObject('phpgwapi.accounts'); - /* connect to ldap server */ + // connect to ldap server if (! $ldap = $common->ldapConnect()) { $noldapconnection = True; @@ -97,7 +121,7 @@ $info = ldap_get_entries($ldap, $srg); $tmp = ''; - for ($i=0; $i<$info['count']; $i++) + for ($i=0; $i<$info['count']; ++$i) { if (! $GLOBALS['phpgw_info']['server']['global_denied_groups'][$info[$i]['cn'][0]] && ! $account_info[$i][$info[$i]['cn'][0]]) @@ -146,7 +170,7 @@ $thismembers = $group_info[$groupid]['memberuid']; $thisdn = $group_info[$groupid]['dn']; - /* Do some checks before we try to import the data. */ + // Do some checks before we try to import the data. if (!empty($thisacctid) && !empty($thisacctlid)) { $groups->account_id = intval($thisacctid); @@ -168,14 +192,14 @@ { reset($entry[0]['objectclass']); $replace['objectclass'] = $entry[0]['objectclass']; - unset($replace['objectclass']['count']);//breaks things + unset($replace['objectclass']['count']); // breaks things $replace['objectclass'][] = 'phpgwGroup'; - //We add this here as it is mandatory + // We add this here as it is mandatory $replace['phpgwGroupID'] = $thisacctlid; $ok = ldap_mod_replace($ldap,$thisdn,$replace); - if (!$ok)//give user some feedback + if (!$ok) // give user some feedback { echo lang('failed to modify: %1', $thisdn) . '
'; } @@ -186,7 +210,7 @@ } unset($add); - /* Now make the members a member of this group in phpgw. */ + // Now make the members a member of this group in phpgw. while (list($key,$members) = each($thismembers)) { if ($key == 'count') @@ -206,7 +230,7 @@ } // Insert acls for this group based on memberuid field. // Since the group has app rights, we don't need to give users - // these rights. Instead, we maintain group membership here. + // these rights. Instead, we maintain group membership here. if($tmpid) { $acl->account_id = intval($tmpid); @@ -222,7 +246,7 @@ $acl->save_repository(); } } - /* Now give this group some rights */ + // Now give this group some rights $GLOBALS['phpgw_info']['user']['account_id'] = $thisacctid; $acl->account_id = intval($thisacctid); $acl->read_repository(); @@ -292,7 +316,7 @@ { $ok = ldap_mod_replace($ldap,$thisdn,$addmod); - if (!$ok)//give user some feedback + if (!$ok) // give user some feedback { echo lang('failed to modify: ', $thisdn) . '
'; } @@ -337,7 +361,7 @@ This is typically an exception to apps for run rights as a group member. */ - for ($a=0;$a' . $group['cn'][0] . ''; } - while(list($appname,$apptitle) = each($apps))//TODO: IMHO This needs to go - skwashd Jul-04 + while(list($appname,$apptitle) = each($apps)) // TODO: IMHO This needs to go - skwashd Jul-04 { if($appname == 'admin' || $appname == 'skel' || @@ -405,7 +429,7 @@ } else { - $app_list .= ''; + $app_list .= ''; } } From MAILER-DAEMON Sun Apr 17 10:31:56 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNAoV-0002gq-Pg for mharc-phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:31:55 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNAoM-0002bv-OD for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:31:47 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNAoD-0002ZJ-SQ for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:31:40 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNAoA-0002KB-UJ for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:31:36 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNApH-0004Fu-0h for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:32:43 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id A2022312CB for ; Sun, 17 Apr 2005 16:30:21 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 27908-09 for ; Sun, 17 Apr 2005 16:30:19 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 956B9312BA for ; Sun, 17 Apr 2005 16:30:19 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3HEUJp18500; Sun, 17 Apr 2005 16:30:19 +0200 Message-Id: <200504171430.j3HEUJp18500@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Sun, 17 Apr 2005 15:45:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] manual index.php,1.12 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 14:31:54 -0000 Update of manual Modified Files: Branch: MAIN index.php lines: +12 -11 Log Message: Added phpdocs checked with php -l and phpdocumentor. ==================================================== Index: manual/index.php diff -u manual/index.php:1.11 manual/index.php:1.12 --- manual/index.php:1.11 Mon Dec 16 00:16:54 2002 +++ manual/index.php Sun Apr 17 13:45:48 2005 @@ -1,21 +1,22 @@ True, 'currentapp' => 'manual' ); + + /** + * Include phpgroupware header + */ include('../header.inc.php'); $GLOBALS['phpgw']->common->phpgw_footer(); From MAILER-DAEMON Sun Apr 17 10:31:59 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNAoQ-0002eD-LY for mharc-phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:31:50 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNAoF-0002Zg-H4 for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:31:39 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNAo6-0002U3-4h for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:31:31 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNAo4-0002KB-I0 for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:31:28 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNAp9-0004EI-Sf for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:32:36 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 7C47D312CB for ; Sun, 17 Apr 2005 16:30:14 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 30057-01 for ; Sun, 17 Apr 2005 16:30:11 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 391CF312BA for ; Sun, 17 Apr 2005 16:30:11 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3HEUBk18486; Sun, 17 Apr 2005 16:30:11 +0200 Message-Id: <200504171430.j3HEUBk18486@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Sun, 17 Apr 2005 15:45:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] manual/setup setup.inc.php,1.7 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 14:31:41 -0000 Update of manual/setup Modified Files: Branch: MAIN setup.inc.php lines: +11 -13 Log Message: Added phpdocs checked with php -l and phpdocumentor. ==================================================== Index: manual/setup/setup.inc.php diff -u manual/setup/setup.inc.php:1.6 manual/setup/setup.inc.php:1.7 --- manual/setup/setup.inc.php:1.6 Sat Jan 4 00:12:48 2003 +++ manual/setup/setup.inc.php Sun Apr 17 13:45:47 2005 @@ -1,25 +1,23 @@ 'phpgwapi', From MAILER-DAEMON Sun Apr 17 10:32:01 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNAoR-0002fL-TO for mharc-phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:31:52 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNAoJ-0002am-Us for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:31:44 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNAo9-0002Vy-0k for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:31:35 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNAo7-0002KB-4r for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:31:31 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNApC-0004Eu-Rx for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:32:39 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 7AE63312CB for ; Sun, 17 Apr 2005 16:30:17 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 28959-04 for ; Sun, 17 Apr 2005 16:30:15 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 6665A312BA for ; Sun, 17 Apr 2005 16:30:15 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3HEUFA18493; Sun, 17 Apr 2005 16:30:15 +0200 Message-Id: <200504171430.j3HEUFA18493@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Sun, 17 Apr 2005 15:45:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] manual/inc hook_help.inc.php,1.4 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 14:31:48 -0000 Update of manual/inc Modified Files: Branch: MAIN hook_help.inc.php lines: +12 -11 Log Message: Added phpdocs checked with php -l and phpdocumentor. ==================================================== Index: manual/inc/hook_help.inc.php diff -u manual/inc/hook_help.inc.php:1.3 manual/inc/hook_help.inc.php:1.4 --- manual/inc/hook_help.inc.php:1.3 Sat Jan 4 00:12:48 2003 +++ manual/inc/hook_help.inc.php Sun Apr 17 13:45:47 2005 @@ -1,16 +1,17 @@ help->set_params(array('app_name' => 'manual', 'title' => phpGroupWare, From MAILER-DAEMON Sun Apr 17 10:33:02 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNApa-0003Ka-Db for mharc-phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:33:02 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNApY-0003Jg-BJ for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:33:00 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNApX-0003JJ-C3 for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:32:59 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNAoN-0002KB-Kq for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:31:47 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNApR-0004HI-RF for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:32:54 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 64B09312CB for ; Sun, 17 Apr 2005 16:30:32 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 29542-03 for ; Sun, 17 Apr 2005 16:30:27 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id CBC9F312BA for ; Sun, 17 Apr 2005 16:30:27 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3HEUR618511; Sun, 17 Apr 2005 16:30:27 +0200 Message-Id: <200504171430.j3HEUR618511@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Sun, 17 Apr 2005 15:45:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] manual/help/EN home.php,1.3 overview.php,1.6 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 14:33:00 -0000 Update of manual/help/EN Modified Files: Branch: MAIN home.php lines: +24 -23 overview.php lines: +57 -53 Log Message: Added phpdocs checked with php -l and phpdocumentor. ==================================================== Index: manual/help/EN/home.php diff -u manual/help/EN/home.php:1.2 manual/help/EN/home.php:1.3 --- manual/help/EN/home.php:1.2 Tue Dec 24 00:51:42 2002 +++ manual/help/EN/home.php Sun Apr 17 13:45:47 2005 @@ -1,34 +1,35 @@ "manual", "enable_utilities_class" => True); - $phpgw_info["flags"] = array("currentapp" => "manual", "enable_utilities_class" => True); + /** + * Include phpgroupware header + */ include('../../../header.inc.php'); ?> -/title_home.gif" border=0> +/title_home.gif" border="0" alt="" /> -

-When you first log onto the system, this page will be presented to you. +

When you first log onto the system, this page will be presented to you.

The navigation bar at the top will show you the system applications you have. These applications are represented in two formats -

Icons (small pictures, representing the function) -
Icons and text (same as icons, but with added text below each icon) -

-Alerts linked to the calendar or to the trouble ticket/todo list, such as birthday or +

    +
  • Icons (small pictures, representing the function)
  • +
  • Icons and text (same as icons, but with added text below each icon)
  • +
+

Alerts linked to the calendar or to the trouble ticket/todo list, such as birthday or priority tasks, will be listed on this page. -

-When you first login to this system, you may have an alert on this page, stating you need +

When you first login to this system, you may have an alert on this page, stating you need to change your password. This can be done in preferences. -

-If you would like other features that are not in your navigation bar, +

If you would like other features that are not in your navigation bar, but are discussed in these howto pages, please contact the systems admin. -common->phpgw_footer(); ?> +common->phpgw_footer(); +?> ==================================================== Index: manual/help/EN/overview.php diff -u manual/help/EN/overview.php:1.5 manual/help/EN/overview.php:1.6 --- manual/help/EN/overview.php:1.5 Wed May 1 09:47:02 2002 +++ manual/help/EN/overview.php Sun Apr 17 13:45:47 2005 @@ -1,79 +1,83 @@ 'manual', 'enable_utilities_class' => True ); + + /** + * Include phpgroupware header + */ include('../../../header.inc.php'); + $font = $phpgw_info['theme']['font']; - echo ''; + echo ''; ?> -

-The following pages are an to be used as a guideline/ready reference + +

The following pages are an to be used as a guideline/ready reference for how to navigate the pages found here, and the functionality of -each application.

-Please visit phpgroupware the +each application.

+

Please visit phpgroupware the home page of this free software project, by way of trying to say to the young people who wrote (or at least put together much of this) , Thank You. Without such keen and enthusiastic joint co-operation, many projects on the internet as we know it, would not be available, or would at the very least be similar to many other well known costly alternatives.
-For those of you who are not familar with Free Software, please visit +For those of you who are not familar with Free Software, please visit a short philosophy of the Free Software Foundation.

Now on with the overview: (NB: please be aware this is an evolving project, so some functionality may not be available to you yet, or perhaps there will be be extra things, not yet included here.)If you have any problems with these pages or understanding what is written, please mail and we will do our -best to fix or assist.

-The names are pretty self evident, however for completion :) -

  • Address Book:
    -A quick and detailed address book, to keep various levels of contact information and a search function to find people you need quickly.
  • -

  • Administration:
    -Where the administrator of the system can create users/ groups, set up levels of access for users/groups, view active sessions (see who is connected to the system), view access logs, set headline stats, set Network News, and see other intersting things about what their system is doing.
  • -

  • Bookmarks:
    -As yet still under development, may be incorporated into other features.
  • -

  • Calendar:
    -Day, week and monthly viewing, with hourly breakdown of each day, appointment +best to fix or assist.

    +

    The names are pretty self evident, however for completion :)

    +
      +
    • Address Book:
      A quick and detailed address book, to keep various levels of contact information and a search function to find people you need quickly.
    • +
    • Administration:
      Where the administrator of the system can create users/ groups, set up levels of access for users/groups, view active sessions (see who is connected to the system), view access logs, set headline stats, set Network News, and see other intersting things about what their system is doing.
    • +
    • Bookmarks:
      As yet still under development, may be incorporated into other features.
    • +
    • Calendar:
      Day, week and monthly viewing, with hourly breakdown of each day, appointment scheduling, with the ability to add specific people or groups to alert others to your availabilty or not. Also a search function, very helpful for tracking down those -forgotten birthdays or appointments ;)
    • -

    • Chat:
      -Chat rooms, to talk realtime with other users in the system.
    • -

    • Email:
      -Pop3 and IMAP functionalty for webased mail.
    • -

    • File Manager:
      -Application to help manage documents within a group, or privately. Upload,edit,copy.
    • -

    • Headlines:
      -Latest snippets of news as set by the Systems Admin, and selected by your preferences.
    • -

    • Home:
      -The first page you reach after you log in to the system
    • -

    • Human Resources:
      -View where all the people on the network fit in.. which group they belong to and what groups have what users.
    • -

    • Preferences
      -Here you can change your passwd, select differement themes, change your settings and choose which news groups you would like to monitor... fun with color :)
    • -

    • Infolog:
      -Replacement for ToDo List, Notes and Phonelog in one app. Infolog entries can be linked to and viewed from addressbook and projekt entries.
    • -

    • Inventory:
      -Build and maintain an inventory.
    • -

    • Todo list:
      -Check your own tasks or those of your group members, and a search function.
    • -

    • NNTP:
      +forgotten birthdays or appointments ;)
    • +
    • Chat:
      +Chat rooms, to talk realtime with other users in the system.
    • +
    • Email:
      +Pop3 and IMAP functionalty for webased mail.
    • +
    • File Manager:
      +Application to help manage documents within a group, or privately. Upload,edit,copy.
    • +
    • Headlines:
      +Latest snippets of news as set by the Systems Admin, and selected by your preferences.
    • +
    • Home:
      +The first page you reach after you log in to the system
    • +
    • Human Resources:
      +View where all the people on the network fit in.. which group they belong to and what groups have what users.
    • +
    • Preferences
      +Here you can change your passwd, select differement themes, change your settings and choose which news groups you would like to monitor... fun with color :)
    • +
    • Infolog:
      +Replacement for ToDo List, Notes and Phonelog in one app. Infolog entries can be linked to and viewed from addressbook and projekt entries.
    • +
    • Inventory:
      +Build and maintain an inventory.
    • +
    • Todo list:
      +Check your own tasks or those of your group members, and a search function.
    • +
    • NNTP:
      All the latest news.
    • -

    • Trouble Ticket System:
      -Tracking system, for trouble tickets and problem resolution.
    -That is about it.. for a more detailed howto, please look into each section for clear indepth +
  • Trouble Ticket System:
    +Tracking system, for trouble tickets and problem resolution.
  • +
+

That is about it.. for a more detailed howto, please look into each section for clear indepth explainations.. and remember to click on the little square boxes next to the icons for drop -downs of what is in each folder. -common->phpgw_footer(); ?> +downs of what is in each folder.

+
+common->phpgw_footer(); +?> From MAILER-DAEMON Sun Apr 17 10:37:44 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNAu7-0005vh-Pp for mharc-phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:37:43 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNAu4-0005uA-NA for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:37:41 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNAu2-0005t4-2T for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:37:38 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNAu1-0005qC-LQ for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:37:37 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNApb-0004Hu-TE for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:33:04 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 7658D312CB for ; Sun, 17 Apr 2005 16:30:42 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 28959-05 for ; Sun, 17 Apr 2005 16:30:40 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 6F207312BA for ; Sun, 17 Apr 2005 16:30:40 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3HEUee18529; Sun, 17 Apr 2005 16:30:40 +0200 Message-Id: <200504171430.j3HEUee18529@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Sun, 17 Apr 2005 16:04:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] manual/setup setup.inc.php,1.8 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 14:37:42 -0000 Update of manual/setup Modified Files: Branch: MAIN setup.inc.php lines: +2 -1 Log Message: added phpdoc subpackages for manual and setup ==================================================== Index: manual/setup/setup.inc.php diff -u manual/setup/setup.inc.php:1.7 manual/setup/setup.inc.php:1.8 --- manual/setup/setup.inc.php:1.7 Sun Apr 17 13:45:47 2005 +++ manual/setup/setup.inc.php Sun Apr 17 14:04:32 2005 @@ -5,6 +5,7 @@ * @copyright Copyright (C) 2000-2002,2005 Free Software Foundation, Inc. http://www.fsf.org/ * @license http://www.gnu.org/licenses/gpl.html GNU General Public License * @package manual + * @subpackage setup * @version $Id$ */ From MAILER-DAEMON Sun Apr 17 10:37:46 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNAuA-0005wt-9G for mharc-phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:37:46 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNAu6-0005ut-47 for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:37:42 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNAu3-0005tX-4I for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:37:40 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNAu2-0005qC-BE for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:37:38 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNApY-0004Hl-3q for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:33:00 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 8EDF8312CB for ; Sun, 17 Apr 2005 16:30:38 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 30057-02 for ; Sun, 17 Apr 2005 16:30:36 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 4B8FA312BA for ; Sun, 17 Apr 2005 16:30:36 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3HEUaL18522; Sun, 17 Apr 2005 16:30:36 +0200 Message-Id: <200504171430.j3HEUaL18522@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Sun, 17 Apr 2005 16:04:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] manual/help/EN home.php,1.4 overview.php,1.7 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 14:37:44 -0000 Update of manual/help/EN Modified Files: Branch: MAIN home.php lines: +2 -1 overview.php lines: +2 -1 Log Message: added phpdoc subpackages for manual and setup ==================================================== Index: manual/help/EN/home.php diff -u manual/help/EN/home.php:1.3 manual/help/EN/home.php:1.4 --- manual/help/EN/home.php:1.3 Sun Apr 17 13:45:47 2005 +++ manual/help/EN/home.php Sun Apr 17 14:04:32 2005 @@ -5,6 +5,7 @@ * @copyright Copyright (C) 2000-2002,2005 Free Software Foundation, Inc. http://www.fsf.org/ * @license http://www.gnu.org/licenses/gpl.html GNU General Public License * @package manual + * @subpackage manual * @version $Id$ */ ==================================================== Index: manual/help/EN/overview.php diff -u manual/help/EN/overview.php:1.6 manual/help/EN/overview.php:1.7 --- manual/help/EN/overview.php:1.6 Sun Apr 17 13:45:47 2005 +++ manual/help/EN/overview.php Sun Apr 17 14:04:32 2005 @@ -5,6 +5,7 @@ * @copyright Copyright (C) 2000-2002,2005 Free Software Foundation, Inc. http://www.fsf.org/ * @license http://www.gnu.org/licenses/gpl.html GNU General Public License * @package manual + * @subpackage manual * @version $Id$ */ From MAILER-DAEMON Sun Apr 17 10:37:46 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNAu9-0005wh-VU for mharc-phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:37:46 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNAu5-0005uV-Ss for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:37:42 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNAu1-0005sD-2c for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:37:38 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNAty-0005qC-9j for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:37:34 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNApg-0004IY-Ar for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 10:33:08 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id D6249312CB for ; Sun, 17 Apr 2005 16:30:46 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 27908-10 for ; Sun, 17 Apr 2005 16:30:44 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id C154B312BA for ; Sun, 17 Apr 2005 16:30:44 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3HEUiV18536; Sun, 17 Apr 2005 16:30:44 +0200 Message-Id: <200504171430.j3HEUiV18536@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Sun, 17 Apr 2005 16:06:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] skel/help index.php,1.4 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 14:37:44 -0000 Update of skel/help Modified Files: Branch: MAIN index.php lines: +2 -2 Log Message: changed phpdoc subpackage from help to manual ==================================================== Index: skel/help/index.php diff -u skel/help/index.php:1.3 skel/help/index.php:1.4 --- skel/help/index.php:1.3 Fri Apr 15 10:55:41 2005 +++ skel/help/index.php Sun Apr 17 14:06:00 2005 @@ -5,7 +5,7 @@ * @copyright Copyright (C) 2001,2005 Free Software Foundation, Inc. http://www.fsf.org/ * @license http://www.gnu.org/licenses/gpl.html GNU General Public License * @package skeleton - * @subpackage help + * @subpackage manual * @version $Id$ */ From MAILER-DAEMON Sun Apr 17 11:34:28 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNBn2-0005Nt-DM for mharc-phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:34:28 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNBmx-0005KX-8I for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:34:23 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNBmr-0005Hs-CX for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:34:19 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNBmr-0005Hp-8g for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:34:17 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNBmV-00076O-91 for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:33:55 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 4D052312CB for ; Sun, 17 Apr 2005 17:31:33 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 31532-10 for ; Sun, 17 Apr 2005 17:31:29 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id D5B3F312BA for ; Sun, 17 Apr 2005 17:31:29 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3HFVTL18940; Sun, 17 Apr 2005 17:31:29 +0200 Message-Id: <200504171531.j3HFVTL18940@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Sun, 17 Apr 2005 17:14:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] preferences/inc hook_settings.inc.php, 1.14 class.bocategories.inc.php, 1.15 hook_preferences.inc.php, 1.16 hook_deleteaccount.inc.php, 1.6 class.uicategories.inc.php, 1.28 class.uiaclprefs.inc.php, 1.15 hook_manual.inc.php, 1.7 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 15:34:23 -0000 Update of preferences/inc Modified Files: Branch: MAIN hook_settings.inc.php lines: +8 -11 class.bocategories.inc.php lines: +90 -12 hook_preferences.inc.php lines: +9 -13 hook_deleteaccount.inc.php lines: +9 -12 class.uicategories.inc.php lines: +88 -27 class.uiaclprefs.inc.php lines: +69 -29 hook_manual.inc.php lines: +9 -12 Log Message: Added phpdocs checked with php -l and phpdocumentor. Parses, but is still not complete. Fixed one php -l syntax bug ==================================================== Index: preferences/inc/hook_settings.inc.php diff -u preferences/inc/hook_settings.inc.php:1.13 preferences/inc/hook_settings.inc.php:1.14 --- preferences/inc/hook_settings.inc.php:1.13 Thu Dec 30 11:19:04 2004 +++ preferences/inc/hook_settings.inc.php Sun Apr 17 15:14:31 2005 @@ -1,15 +1,12 @@ common->list_templates(); while (list($var,$value) = each($templates)) ==================================================== Index: preferences/inc/class.bocategories.inc.php diff -u preferences/inc/class.bocategories.inc.php:1.14 preferences/inc/class.bocategories.inc.php:1.15 --- preferences/inc/class.bocategories.inc.php:1.14 Thu Dec 30 11:19:04 2004 +++ preferences/inc/class.bocategories.inc.php Sun Apr 17 15:14:31 2005 @@ -1,25 +1,52 @@ cats = CreateObject('phpgwapi.categories'); @@ -51,12 +78,23 @@ } } + /** + * + * + * @param $data + * @param $cats_app + */ function save_sessiondata($data, $cats_app) { $colum = $cats_app . '_cats'; $GLOBALS['phpgw']->session->appsession('session_data',$column,$data); } + /** + * + * + * @param $cats_app + */ function read_sessiondata($cats_app) { $colum = $cats_app . '_cats'; @@ -68,11 +106,23 @@ $this->order = $data['order']; } + /** + * + * + * @param $global_cats + * @return array + */ function get_list($global_cats) { return $this->cats->return_sorted_array($this->start,True,$this->query,$this->sort,$this->order,$global_cats); } + /** + * + * + * @param $values + * @return unknown + */ function save_cat($values) { if ($values['access']) @@ -94,6 +144,12 @@ } } + /** + * + * + * @param $data + * @return unknown + */ function exists($data) { $data['type'] = $data['type'] ? $data['type'] : ''; @@ -101,16 +157,38 @@ return $this->cats->exists($data['type'],$data['cat_name'],$data['cat_id']); } + /** + * + * + * @param $format + * @param $type + * @param $cat_parent + * @param $global_cats + * @return unknown + */ function formatted_list($format,$type,$cat_parent,$global_cats) { return $this->cats->formated_list($format,$type,$cat_parent,$global_cats); } + /** + * + * + * @param $cat_id + * @param $subs + * @return unknown + */ function delete($cat_id,$subs) { return $this->cats->delete($cat_id,$subs); } + /** + * + * + * @param $values + * @return string Error message + */ function check_values($values) { if (strlen($values['descr']) >= 255) ==================================================== Index: preferences/inc/hook_preferences.inc.php diff -u preferences/inc/hook_preferences.inc.php:1.15 preferences/inc/hook_preferences.inc.php:1.16 --- preferences/inc/hook_preferences.inc.php:1.15 Thu Dec 30 11:19:04 2004 +++ preferences/inc/hook_preferences.inc.php Sun Apr 17 15:14:31 2005 @@ -1,16 +1,13 @@ * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id$ */ + /** + * Preferences - preferences hook + * + * @author Joseph Engo + * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package preferences + * @version $Id$ + */ if ($GLOBALS['phpgw']->acl->check('changepassword',1)) { @@ -19,5 +16,4 @@ $file['change your settings'] = $GLOBALS['phpgw']->link('/preferences/preferences.php','appname=preferences'); display_section('preferences',$file); - ?> ==================================================== Index: preferences/inc/hook_deleteaccount.inc.php diff -u preferences/inc/hook_deleteaccount.inc.php:1.5 preferences/inc/hook_deleteaccount.inc.php:1.6 --- preferences/inc/hook_deleteaccount.inc.php:1.5 Thu Dec 30 11:19:04 2004 +++ preferences/inc/hook_deleteaccount.inc.php Sun Apr 17 15:14:31 2005 @@ -1,16 +1,13 @@ * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id$ */ + /** + * Preferences - delete account hook + * + * @author Mark Peters + * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package preferences + * @version $Id$ + */ // Delete all records for a user $table_locks = Array('phpgw_preferences'); ==================================================== Index: preferences/inc/class.uicategories.inc.php diff -u preferences/inc/class.uicategories.inc.php:1.27 preferences/inc/class.uicategories.inc.php:1.28 --- preferences/inc/class.uicategories.inc.php:1.27 Thu Dec 30 11:19:04 2004 +++ preferences/inc/class.uicategories.inc.php Sun Apr 17 15:14:31 2005 @@ -1,30 +1,67 @@ True, @@ -33,6 +70,9 @@ 'delete' => True ); + /** + * Constructor + */ function uicategories() { $cats_app = get_var('cats_app',array('GET','POST')); @@ -48,6 +88,11 @@ $this->order = $this->bo->order; } + /** + * Save session data + * + * @param $cats_app + */ function save_sessiondata($cats_app) { $data = array @@ -60,6 +105,9 @@ $this->bo->save_sessiondata($data,$cats_app); } + /** + * Set languages + */ function set_langs() { $GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']); @@ -82,15 +130,25 @@ $GLOBALS['phpgw']->template->set_var('lang_reset',lang('Clear Form')); } + /** + * Display data elements in td + * + * @param array $edata + * @param array $data + * @return string td element string + */ function cat_data($edata,$data) { - for ($j=0;$j' . "\n"; } return $td_data; } + /** + * + */ function index() { $cats_app = get_var('cats_app',array('GET','POST')); @@ -158,7 +216,7 @@ if (is_array($edata)) { - for($i=0;$itemplate->set_var('th_data','
'); $GLOBALS['phpgw']->template->fp('column','data_column',True); @@ -171,9 +229,9 @@ // -------------------------- end header declaration -------------------------------------- - for ($i=0;$inextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); + $this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template); // pass-by-reference DEPRECATED if ($cats[$i]['app_name'] == 'phpgw') { @@ -272,6 +330,9 @@ $GLOBALS['phpgw']->template->pfp('out','cat_list_t',True); } + /** + * + */ function add() { $cats_app = get_var('cats_app',array('GET','POST')); @@ -358,15 +419,15 @@ $GLOBALS['phpgw']->template->set_var('cat_description',$cat_description); $GLOBALS['phpgw']->template->set_var('access',''); + . ($cat_access == True ?' checked="checked"':'') . ' />'); if ($extra) { $edata = explode(',',$extra); - for($i=0;$itemplate->set_var('tr_color',$GLOBALS['phpgw']->nextmatchs->alternate_row_color()); - $GLOBALS['phpgw']->template->set_var('td_data',''); + $GLOBALS['phpgw']->template->set_var('td_data',''); $GLOBALS['phpgw']->template->set_var('lang_data',lang($edata[$i])); $GLOBALS['phpgw']->template->fp('row','data_row',True); } @@ -484,16 +545,16 @@ 'globals' => $global_cats, 'self' => $cat_id))); $GLOBALS['phpgw']->template->set_var('access',''); + . (($cats[0]['access'] == 'private') ? ' checked="checked"' : '') . ' />'); if ($extra) { $edata = explode(',',$extra); $data = unserialize($cats[0]['data']); - for($i=0;$itemplate->set_var('td_data',''); + $GLOBALS['phpgw']->template->set_var('td_data',''); $GLOBALS['phpgw']->template->set_var('lang_data',lang($edata[$i])); $GLOBALS['phpgw']->template->fp('row','data_row',True); } @@ -502,8 +563,8 @@ if ($cats[0]['owner'] == $this->account) { $link_data['menuaction'] = 'preferences.uicategories.delete'; - $GLOBALS['phpgw']->template->set_var('delete','
'); + $GLOBALS['phpgw']->template->set_var('delete','
'); } else { @@ -571,7 +632,7 @@ if ($exists) { $GLOBALS['phpgw']->template->set_var('lang_subs',lang('Do you also want to delete all subcategories ?')); - $GLOBALS['phpgw']->template->set_var('subs',''); + $GLOBALS['phpgw']->template->set_var('subs',''); } else { ==================================================== Index: preferences/inc/class.uiaclprefs.inc.php diff -u preferences/inc/class.uiaclprefs.inc.php:1.14 preferences/inc/class.uiaclprefs.inc.php:1.15 --- preferences/inc/class.uiaclprefs.inc.php:1.14 Thu Dec 30 11:19:04 2004 +++ preferences/inc/class.uiaclprefs.inc.php Sun Apr 17 15:14:31 2005 @@ -1,28 +1,50 @@ True); + /** + * Constructor + */ function uiaclprefs() { $GLOBALS['phpgw']->nextmatchs = CreateObject('phpgwapi.nextmatchs'); } + /** + * + */ function index() { $acl_app = get_var('acl_app',array('POST','GET')); @@ -98,7 +120,7 @@ $processed = $_POST['processed']; $to_remove = unserialize(urldecode($processed)); - for($i=0;$iacl->delete($GLOBALS['phpgw_info']['flags']['currentapp'],$to_remove[$i]); } @@ -220,18 +242,18 @@ } $common_hidden_vars = - ' '."\n" - . ' '."\n" - . ' '."\n" - . ' '."\n" - . ' '."\n" - . ' '."\n" - . ' '."\n" - . ' '."\n"; + ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n" + . ' ' . "\n"; $var = Array( 'errors' => '', - 'title' => '
', + 'title' => '
', 'action_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app=' . $acl_app), 'bg_color' => $GLOBALS['phpgw_info']['theme']['th_bg'], 'submit_lang' => lang('Save'), @@ -242,7 +264,7 @@ if(isset($query_result) && $query_result) { - $common_hidden_vars .= ''."\n"; + $common_hidden_vars .= '' . "\n"; } $this->template->set_var('common_hidden_vars',$common_hidden_vars); @@ -265,7 +287,7 @@ $this->template->parse('row','row_colspan',True); reset($groups); - for($k=$start;$knextmatchs->alternate_row_color($tr_color); $this->display_row($tr_color,'g_',$group['account_id'],$group['account_lid'],$is_group); - $s_groups++; + ++$s_groups; $processed[] = $group['account_id']; - $total++; + ++$total; if($total == $maxm) { break; @@ -300,10 +322,10 @@ $this->template->set_var('string',ucfirst(lang('Users'))); $this->template->parse('row','row_colspan',True); $tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color); - for($k=$s_users;$k<$totalentries || $k==count($users);$k++) + for($k=$s_users; ($k < $totalentries) || ($k == count($users)); ++$k) { $user = $users[$k]; - //echo '
acctid: '.$user['account_id']; + //echo '
acctid: '.$user['account_id']; if ($user['account_id']) { $go = True; @@ -326,9 +348,9 @@ // or the admin can't get special grants from a group $tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color); $this->display_row($tr_color,'u_',$user['account_id'],$GLOBALS['phpgw']->common->display_fullname($user['account_lid'],$user['account_firstname'],$user['account_lastname']),$is_group); - $s_users++; + ++$s_users; $processed[] = $user['account_id']; - $total++; + ++$total; if($total == $maxm) { break; @@ -357,6 +379,16 @@ $this->template->pfp('out','preferences'); } + /** + * + * + * @param $label + * @param $id + * @param $acl + * @param $rights + * @param $right + * @param boolean $is_group + */ function check_acl($label,$id,$acl,$rights,$right,$is_group=False) { $this->template->set_var($acl,$label.$GLOBALS['phpgw_info']['flags']['currentapp'].'['.$id.'_'.$right.']'); @@ -369,6 +401,15 @@ $this->template->set_var($acl.'_selected',$rights_set); } + /** + * + * + * @param $bg_color + * @param $label + * @param $id + * @param $name + * @param boolean $is_group + */ function display_row($bg_color,$label,$id,$name,$is_group) { $this->template->set_var('row_color',$bg_color); @@ -384,7 +425,6 @@ $is_group_set = True; } } - // ^^ This is new $this->check_acl($label,$id,'read',$rights,PHPGW_ACL_READ,($is_group_set && ($rights & PHPGW_ACL_READ) && !$is_group?$is_group_set:False)); $this->check_acl($label,$id,'add',$rights,PHPGW_ACL_ADD,($is_group_set && ($rights & PHPGW_ACL_ADD && !$is_group)?$is_group_set:False)); ==================================================== Index: preferences/inc/hook_manual.inc.php diff -u preferences/inc/hook_manual.inc.php:1.6 preferences/inc/hook_manual.inc.php:1.7 --- preferences/inc/hook_manual.inc.php:1.6 Mon May 14 00:18:12 2001 +++ preferences/inc/hook_manual.inc.php Sun Apr 17 15:14:31 2005 @@ -1,16 +1,13 @@ * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id$ */ + /** + * Preferences - manual hook + * + * @author Mark Peters + * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package preferences + * @version $Id$ + */ // Only Modify the $file variable..... $file = Array( From MAILER-DAEMON Sun Apr 17 11:34:31 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNBn5-0005Ol-Fx for mharc-phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:34:31 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNBmx-0005Ki-Lb for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:34:23 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNBms-0005IU-Gr for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:34:19 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNBms-0005Hp-Aw for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:34:18 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNBm1-00075Q-2F for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:33:25 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 237EB312CB for ; Sun, 17 Apr 2005 17:31:03 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 00295-03 for ; Sun, 17 Apr 2005 17:31:00 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 4150F312BA for ; Sun, 17 Apr 2005 17:31:00 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3HFV0F18907; Sun, 17 Apr 2005 17:31:00 +0200 Message-Id: <200504171531.j3HFV0F18907@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Sun, 17 Apr 2005 17:14:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] preferences/help/EN other.php, 1.4 preferences.php, 1.4 settings.php, 1.4 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 15:34:25 -0000 Update of preferences/help/EN Modified Files: Branch: MAIN other.php lines: +26 -22 preferences.php lines: +52 -47 settings.php lines: +46 -41 Log Message: Added phpdocs checked with php -l and phpdocumentor. Parses, but is still not complete. Fixed one php -l syntax bug ==================================================== Index: preferences/help/EN/other.php diff -u preferences/help/EN/other.php:1.3 preferences/help/EN/other.php:1.4 --- preferences/help/EN/other.php:1.3 Thu Dec 30 11:19:04 2004 +++ preferences/help/EN/other.php Sun Apr 17 15:14:31 2005 @@ -1,38 +1,42 @@ 'manual', 'enable_utilities_class' => True ); $phpgw_info['flags'] = $phpgw_flags; + + /** + * Include phpgroupware header + */ include('../../../header.inc.php'); ?> - -

-The place to make changes to your personal piece of groupware.

+ + +

The place to make changes to your personal piece of groupware.

    -
  • Change your Password:
    +
  • Change your Password:
    Used for changing your login password to the system. You will be presented with two text boxes, enter your new password, -then click on the change button.
  • -

  • Select different Theme:
    +then click on the change button.
  • +
  • Select different Theme:
    To change the look of the pages you see, within the system. Displayed is your current theme (for new users set to default). Simply click on the -theme of your choice. Your pages will change immediately.

    -

  • Change your profile:
    +theme of your choice. Your pages will change immediately.
    +
  • Change your profile:
    Here you can set a few details about yourself, for public viewing by the -rest of the users of the system. Title,Phone number, Comments, Picture upload.
  • -

  • Monitor Newsgroups:
    +rest of the users of the system. Title,Phone number, Comments, Picture upload.
  • +
  • Monitor Newsgroups:
    Easily choose which news groups you want to set for reading.
  • -common->phpgw_footer(); ?> +common->phpgw_footer(); +?> ==================================================== Index: preferences/help/EN/preferences.php diff -u preferences/help/EN/preferences.php:1.3 preferences/help/EN/preferences.php:1.4 --- preferences/help/EN/preferences.php:1.3 Thu Dec 30 11:19:04 2004 +++ preferences/help/EN/preferences.php Sun Apr 17 15:14:31 2005 @@ -1,70 +1,75 @@ 'manual' ); $phpgw_info['flags'] = $phpgw_flags; + + /** + * Include phpgroupware header + */ include('../../../header.inc.php'); ?> - -

    -The place to make changes to your personal piece of groupware.

    + + +

    The place to make changes to your personal piece of groupware.

    • Change your Password:
      Used for changing your login password to the system. You will be presented with two text boxes, enter your new password, -then click on the change button.
    • -

    • Select different Theme:
      +then click on the change button.
    • +
    • Select different Theme:
      To change the look of the pages you see, within the system. Displayed is your current theme (for new users set to default). Simply click on the -theme of your choice. Your pages will change immediately.
    • -

    • Change your Settings:
      -Max matches per page:
      -Choose how many instances of items will be displayed on your screen at one time, default is 15.

      -Show text on navigation icons:
      -Add text under the navigation icons at the top of the screen.

      -Time zone offset:
      -Set your time zone, default setting is Central Europian Standard CEST.

      -Date format:
      -Choose the order of day/month/year, default is m/d/y.

      -Time format:
      -Choose from am/pm=12hours or 24hours settings.

      -Language:
      -Set your language, options German,Spanish,Norwegen,Italian,French, default is English.

      -Show birthday reminders on main screen:
      +theme of your choice. Your pages will change immediately.

    • +
    • Change your Settings:
      +Max matches per page:
      +Choose how many instances of items will be displayed on your screen at one time, default is 15.
      +Show text on navigation icons:
      +Add text under the navigation icons at the top of the screen.
      +Time zone offset:
      +Set your time zone, default setting is Central Europian Standard CEST.
      +Date format:
      +Choose the order of day/month/year, default is m/d/y.
      +Time format:
      +Choose from am/pm=12hours or 24hours settings.
      +Language:
      +Set your language, options German,Spanish,Norwegen,Italian,French, default is English.
      +Show birthday reminders on main screen:
      Selecting this option, enables birthday reminders to be shown on the day as an alert. When you log on to the system on the day a birthday is entered, an alert -will be displayed on the home screen. Birthday settings are made in the address book.

      -Show high priority events on main screen:
      +will be displayed on the home screen. Birthday settings are made in the address book.
      +Show high priority events on main screen:
      Selecting this option, enables reminders for priority tasks assigned to you in either -todo list or ticketing system.

      -Weekday starts on:
      -Choose the day your week starts.

      -Workday starts on:
      +todo list or ticketing system.
      +Weekday starts on:
      +Choose the day your week starts.
      +Workday starts on:
      Choose the start time of your work day. This will effect the beginning time slot -in the calendar when displaying the days schedule.

      -Workday ends on:
      +in the calendar when displaying the days schedule.
      +Workday ends on:
      Choose the end time of your work day. This will effect the ending time slot -in the calendar when displaying the days schedule.

      -Select Headline News sites:
      +in the calendar when displaying the days schedule.
      +Select Headline News sites:
      Click on as many news headline news sites as you wish, these will be displayed for you when using the headlines function. The systems admin set these as default, so be sure to -let them know if you want some that are not there ;)

    • -

    • Change your profile:
      +let them know if you want some that are not there ;)

    • +
    • Change your profile:
      Here you can set a few details about yourself, for public viewing by the rest of the users -of the system. Title,Phone number, Comments, Picture upload.
    • -

    • Monitor Newsgroups:
      -Easily choose which news groups you want to set for reading.
    +of the system. Title,Phone number, Comments, Picture upload.
    +
  • Monitor Newsgroups:
    +Easily choose which news groups you want to set for reading.
  • +
-common->phpgw_footer(); ?> +common->phpgw_footer(); +?> ==================================================== Index: preferences/help/EN/settings.php diff -u preferences/help/EN/settings.php:1.3 preferences/help/EN/settings.php:1.4 --- preferences/help/EN/settings.php:1.3 Thu Dec 30 11:19:04 2004 +++ preferences/help/EN/settings.php Sun Apr 17 15:14:31 2005 @@ -1,58 +1,63 @@ 'manual', 'enable_utilities_class' => True ); $phpgw_info['flags'] = $phpgw_flags; + + /** + * Include phpgroupware header + */ include('../../../header.inc.php'); ?> - -

-The place to make changes to your personal piece of groupware.

+ + +

The place to make changes to your personal piece of groupware.

    -
  • Change your Settings:
    -Max matches per page:
    -Choose how many instances of items will be displayed on your screen at one time, default is 15.

    -Show text on navigation icons:
    -Add text under the navigation icons at the top of the screen.

    -Time zone offset:
    -Set your time zone, default setting is Central Europian Standard CEST.

    -Date format:
    -Choose the order of day/month/year, default is m/d/y.

    -Time format:
    -Choose from am/pm=12hours or 24hours settings.

    -Language:
    -Set your language, options German,Spanish,Norwegen,Italian,French, default is English.

    -Show birthday reminders on main screen:
    +

  • Change your Settings:
    +Max matches per page:
    +Choose how many instances of items will be displayed on your screen at one time, default is 15.
    +Show text on navigation icons:
    +Add text under the navigation icons at the top of the screen.
    +Time zone offset:
    +Set your time zone, default setting is Central Europian Standard CEST.
    +Date format:
    +Choose the order of day/month/year, default is m/d/y.
    +Time format:
    +Choose from am/pm=12hours or 24hours settings.
    +Language:
    +Set your language, options German,Spanish,Norwegen,Italian,French, default is English.
    +Show birthday reminders on main screen:
    Selecting this option, enables birthday reminders to be shown on the day as an alert. When you log on to the system on the day a birthday is entered, an alert -will be displayed on the home screen. Birthday settings are made in the address book.

    -Show high priority events on main screen:
    +will be displayed on the home screen. Birthday settings are made in the address book.
    +Show high priority events on main screen:
    Selecting this option, enables reminders for priority tasks assigned to you in -either todo list or ticketing system.

    -Weekday starts on:
    -Choose the day your week starts.

    -Workday starts on:
    +either todo list or ticketing system.
    +Weekday starts on:
    +Choose the day your week starts.
    +Workday starts on:
    Choose the start time of your work day. This will effect the beginning time slot -in the calendar when displaying the days schedule.

    -Workday ends on:
    +in the calendar when displaying the days schedule.
    +Workday ends on:
    Choose the end time of your work day. This will effect the ending time slot -in the calendar when displaying the days schedule.

    -Select Headline News sites:
    +in the calendar when displaying the days schedule.
    +Select Headline News sites:
    Click on as many news headline news sites as you wish, these will be displayed for you when using the headlines function.The systems admin set these as default, so be sure to -let them know if you want some that are not there ;) -

-common->phpgw_footer(); ?> +let them know if you want some that are not there ;) + +
+common->phpgw_footer(); +?> From MAILER-DAEMON Sun Apr 17 11:34:32 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNBn5-0005Ot-M7 for mharc-phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:34:31 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNBmy-0005LD-GX for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:34:24 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNBmt-0005Io-1K for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:34:22 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNBms-0005Hp-L2 for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:34:18 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNBli-00074l-SY for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:33:07 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id EB61F312CB for ; Sun, 17 Apr 2005 17:30:44 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 31778-07 for ; Sun, 17 Apr 2005 17:30:42 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 0BF32312BA for ; Sun, 17 Apr 2005 17:30:42 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3HFUfo18885; Sun, 17 Apr 2005 17:30:41 +0200 Message-Id: <200504171530.j3HFUfo18885@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Sun, 17 Apr 2005 17:14:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] preferences preferences.php, 1.38 changeprofile.php, 1.12 index.php, 1.33 changepassword.php, 1.43 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 15:34:25 -0000 Update of preferences Modified Files: Branch: MAIN preferences.php lines: +130 -29 changeprofile.php lines: +19 -19 index.php lines: +35 -13 changepassword.php lines: +12 -12 Log Message: Added phpdocs checked with php -l and phpdocumentor. Parses, but is still not complete. Fixed one php -l syntax bug ==================================================== Index: preferences/preferences.php diff -u preferences/preferences.php:1.37 preferences/preferences.php:1.38 --- preferences/preferences.php:1.37 Thu Dec 30 11:19:04 2004 +++ preferences/preferences.php Sun Apr 17 15:14:31 2005 @@ -1,15 +1,12 @@ True, @@ -18,6 +15,10 @@ 'currentapp' => $_GET['appname'], 'enable_nextmatchs_class' => True ); + + /** + * Include phpgroupware header + */ include('../header.inc.php'); if ($_POST['cancel']) @@ -46,6 +47,13 @@ /* Make things a little easier to follow */ /* Some places we will need to change this if there in common */ + + + /** + * Get application name + * + * @return string Application name + */ function check_app() { if ($_GET['appname'] == 'preferences') @@ -58,6 +66,13 @@ } } + /** + * + * + * @param $_appname + * @param $preference_name + * @return boolean + */ function is_forced_value($_appname,$preference_name) { if (isset($GLOBALS['phpgw']->preferences->forced[$_appname][$preference_name]) && $GLOBALS['type'] != 'forced') @@ -70,6 +85,16 @@ } } + /** + * Create password box + * + * @param string $label_name + * @param string $preference_name + * @param string $help + * @param $size + * @param $max_size + * @return boolean + */ function create_password_box($label_name,$preference_name,$help='',$size = '',$max_size = '') { global $user,$forced,$default; @@ -82,6 +107,18 @@ create_input_box($label_name,$preference_name.'][pw',$help,'',$size,$max_size,'password'); } + /** + * Create input box + * + * @param string $label + * @param string $name + * @param string $help + * @param string $default + * @param $size + * @param $max_size + * @param $type + * @return boolean + */ function create_input_box($label,$name,$help='',$default='',$size = '',$max_size = '',$type='', $run_lang=True) { @@ -95,15 +132,15 @@ if ($type) // used to specify password { - $options = " TYPE='$type'"; + $options = " type=\"$type\""; } if ($size) { - $options .= " SIZE='$size'"; + $options .= " size=\"$size\""; } if ($maxsize) { - $options .= " MAXSIZE='$maxsize'"; + $options .= " maxsize=\"$maxsize\""; } if (isset($prefs[$name]) || $GLOBALS['type'] != 'user') @@ -119,15 +156,22 @@ { $def_text = $GLOBALS['phpgw']->preferences->lang_notify($def_text,$notifys[$name]); } - $def_text = $def_text != '' ? ' '.lang('default').': '.$def_text.'' : ''; + $def_text = ($def_text != '') ? ' ' . lang('default') . ': ' . $def_text . '' : ''; } - $t->set_var('row_value',"$def_text"); + $t->set_var('row_value',"$def_text"); $t->set_var('row_name',lang($label)); $GLOBALS['phpgw']->nextmatchs->template_alternate_row_color($t); $t->fp('rows',process_help($help,$run_lang) ? 'help_row' : 'row',True); } + /** + * + * + * @param $help + * @param boolean $run_lang + * @return boolean + */ function process_help($help,$run_lang=True) { global $t,$show_help,$has_help; @@ -146,6 +190,14 @@ return False; } + /** + * Create checkbox + * + * @param string $label + * @param string $name + * @param string $help + * @param $default + */ function create_check_box($label,$name,$help='',$default='') { // checkboxes itself can't be use as they return nothing if uncheckt !!! @@ -166,6 +218,13 @@ ),$help,$default); } + /** + * Create option + * + * @param string $selected + * @param string $values + * @return string String with HTML option + */ function create_option_string($selected,$values) { while (is_array($values) && list($var,$value) = each($values)) @@ -173,13 +232,22 @@ $s .= '
' . lang($edata[$i]) . '
@@ -80,13 +81,13 @@ - + @@ -96,14 +97,13 @@ - + -
common->display_fullname($GLOBALS['phpgw_info']['user']['userid'],$GLOBALS['phpgw_info']['user']['firstname'],$GLOBALS['phpgw_info']['user']['lastname']); ?>Title: - +
Phone number:
Picture:
Note: Pictures will be resized to 100x120.

Note: Pictures will be resized to 100x120.
+
- common->phpgw_footer(); ==================================================== Index: preferences/index.php diff -u preferences/index.php:1.32 preferences/index.php:1.33 --- preferences/index.php:1.32 Thu Dec 30 11:19:04 2004 +++ preferences/index.php Sun Apr 17 15:14:31 2005 @@ -1,19 +1,20 @@ * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id$ */ + /** + * Preferences + * + * @author Joseph Engo + * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package preferences + * @version $Id$ + */ $phpgw_info = array(); $GLOBALS['phpgw_info']['flags']['currentapp'] = 'preferences'; + + /** + * Include phpgroupware header + */ include('../header.inc.php'); $pref_tpl = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); @@ -74,7 +75,12 @@ $pref_tpl->set_var('tabs',$GLOBALS['phpgw']->common->create_tabs($tabs,$selected)); } - // This func called by the includes to dump a row header + /** + * Dump a row header + * + * @param $appname='' + * @param $icon + */ function section_start($appname='',$icon='') { global $pref_tpl; @@ -94,6 +100,12 @@ } } + /** + * + * + * @param string $pref_link + * @param string $pref_text + */ function section_item($pref_link='',$pref_text='') { global $pref_tpl; @@ -112,6 +124,9 @@ $pref_tpl->parse('rows','link_row',True); } + /** + * + */ function section_end() { global $pref_tpl; @@ -119,6 +134,13 @@ $pref_tpl->parse('rows','spacer_row',True); } + /** + * + * + * @param $appname + * @param $file + * @param $file2 + */ function display_section($appname,$file,$file2=False) { if ($file2) ==================================================== Index: preferences/changepassword.php diff -u preferences/changepassword.php:1.42 preferences/changepassword.php:1.43 --- preferences/changepassword.php:1.42 Thu Dec 30 11:19:04 2004 +++ preferences/changepassword.php Sun Apr 17 15:14:31 2005 @@ -1,16 +1,13 @@ * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id$ */ + /** + * Preferences - change password + * + * @author Joseph Engo + * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package preferences + * @version $Id$ + */ $GLOBALS['phpgw_info']['flags'] = array( 'noheader' => True, @@ -18,6 +15,9 @@ 'currentapp' => 'preferences' ); + /** + * Include phpgroupware header + */ include('../header.inc.php'); $n_passwd = $_POST['n_passwd']; From MAILER-DAEMON Sun Apr 17 11:34:32 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNBn6-0005PA-45 for mharc-phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:34:32 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNBmy-0005Kt-GM for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:34:24 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNBmu-0005JQ-MU for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:34:21 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNBmt-0005Hp-BV for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:34:19 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNBlQ-00073n-Rp for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:32:49 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id EDEFF312CC for ; Sun, 17 Apr 2005 17:30:26 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 00295-02 for ; Sun, 17 Apr 2005 17:30:21 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 25AB7312BA for ; Sun, 17 Apr 2005 17:30:21 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3HFUKc18859; Sun, 17 Apr 2005 17:30:20 +0200 Message-Id: <200504171530.j3HFUKc18859@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Sun, 17 Apr 2005 17:14:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] preferences/help/DE settings.php, 1.3 other.php, 1.3 preferences.php, 1.3 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 15:34:25 -0000 Update of preferences/help/DE Modified Files: Branch: MAIN settings.php lines: +70 -65 other.php lines: +46 -43 preferences.php lines: +83 -82 Log Message: Added phpdocs checked with php -l and phpdocumentor. Parses, but is still not complete. Fixed one php -l syntax bug ==================================================== Index: preferences/help/DE/settings.php diff -u preferences/help/DE/settings.php:1.2 preferences/help/DE/settings.php:1.3 --- preferences/help/DE/settings.php:1.2 Thu Dec 30 11:19:04 2004 +++ preferences/help/DE/settings.php Sun Apr 17 15:14:31 2005 @@ -1,65 +1,70 @@ - 'manual', - 'enable_utilities_class' => True - ); - $phpgw_info['flags'] = $phpgw_flags; - include('../../../header.inc.php'); -?> - -

           Der Ort um Änderungen -an Ihrer persönlichen Groupware zu machen. -

            -

    -
  • Ihre Einstellungen ändern:
    - Maximale Treffer pro Seite:
    - Wählen Sie wie viele Treffer auf Ihrem Bildschirm auf einmal angezeigt - werden, standard ist 15. -

               Zeige Text bei den Navigations-Symbolen:
    - Text unter den Symbolen oben am Bildschirm anzeigen. -

               Zeitzonen Differenz:
    - Stellen Sie Ihre Zeitzone ein, Standard ist die Zentral Europäische Standard - Zeit. -

               Datumsformat:
    - Wählen Sie die Anordnung von Tag/Monat/Jahr, Standard ist Monat/Tag/Jahr. -

               Zeitformat:
    - Wählen Sie zwischen am/pm=12 Stunden oder 24 Stunden Einstellung. -

               Sprache:
    - Wählen Sie Ihre Sprache. Wählbar sind Deutsch, Spanisch, Norwegisch, - Italienisch, Französisch und die Standardeinstellung Englisch. -

               Zeige Geburtstagserrinnerungen auf dem Begrüssungsbildschirm::
    - Diese Option aktiviert die Errinnerung für Geburtstage als ein Alarm. - Wenn Sie sich an einem Tag an dem ein Geburtstag eingetragen ist in das System - einloggen, wird eine Alarm-Botschaft auf dem Startbildschirm angezeigt. Geburtstagseinstellungen - werden im Adressbuch gemacht. -

               Zeige Ereignisse mit hoher Priorität auf dem Hauptbildschirm:
    - Die Auswahl dieser Option aktiviert Erinnerungen für wichtige Ereignisse - in der TO-DO LiST oder dem Ticketing System. -

               Die Woche Startet am:
    - Wählen Sie den Tag an dem die Woche beginnt.. -

               Der Arbeitstag beginnt um:
    - Wählen Sie die Anfangszeit ihres Arbeitstages. Das hat einfluss auf den - Tagesanfang im Kalender wenn die Tagesansicht angezeigt wird. -

               Ende eines Arbeitstags:
    - Wählen Sie die Endzeit ihres Arbeitstags. Das ändert die letzte - Stunde die im Kalender in der Tagesansicht angezeigt wird. -

               Wählen Sie News Seiten:
    - Klicken Sie on so viele Schlagzeilen Seiten wie Sie wünschen, diese werden - dann für Sie angezeigt wenn sie Die Headlines Funktion benutzen. Die - Systemadministratoren bestimmen welche voreingestellt sind, sie sind also - Ihre Ansprechpartner wenn Sie welche wollen die nicht dort sind. ;)

  • -
-
-common->phpgw_footer(); ?> + 'manual', + 'enable_utilities_class' => True + ); + $phpgw_info['flags'] = $phpgw_flags; + + /** + * Include phpgroupware header + */ + include('../../../header.inc.php'); +?> + + +

           Der Ort um Änderungen +an Ihrer persönlichen Groupware zu machen.

+
    +
  • Ihre Einstellungen ändern:
    + Maximale Treffer pro Seite:
    + Wählen Sie wie viele Treffer auf Ihrem Bildschirm auf einmal angezeigt + werden, standard ist 15. +
               Zeige Text bei den Navigations-Symbolen:
    + Text unter den Symbolen oben am Bildschirm anzeigen. +
               Zeitzonen Differenz:
    + Stellen Sie Ihre Zeitzone ein, Standard ist die Zentral Europäische Standard + Zeit. +
               Datumsformat:
    + Wählen Sie die Anordnung von Tag/Monat/Jahr, Standard ist Monat/Tag/Jahr. +
               Zeitformat:
    + Wählen Sie zwischen am/pm=12 Stunden oder 24 Stunden Einstellung. +
               Sprache:
    + Wählen Sie Ihre Sprache. Wählbar sind Deutsch, Spanisch, Norwegisch, + Italienisch, Französisch und die Standardeinstellung Englisch. +
               Zeige Geburtstagserrinnerungen auf dem Begrüssungsbildschirm::
    + Diese Option aktiviert die Errinnerung für Geburtstage als ein Alarm. + Wenn Sie sich an einem Tag an dem ein Geburtstag eingetragen ist in das System + einloggen, wird eine Alarm-Botschaft auf dem Startbildschirm angezeigt. Geburtstagseinstellungen + werden im Adressbuch gemacht. +
               Zeige Ereignisse mit hoher Priorität auf dem Hauptbildschirm:
    + Die Auswahl dieser Option aktiviert Erinnerungen für wichtige Ereignisse + in der TO-DO LiST oder dem Ticketing System. +
               Die Woche Startet am:
    + Wählen Sie den Tag an dem die Woche beginnt.. +
               Der Arbeitstag beginnt um:
    + Wählen Sie die Anfangszeit ihres Arbeitstages. Das hat einfluss auf den + Tagesanfang im Kalender wenn die Tagesansicht angezeigt wird. +
               Ende eines Arbeitstags:
    + Wählen Sie die Endzeit ihres Arbeitstags. Das ändert die letzte + Stunde die im Kalender in der Tagesansicht angezeigt wird. +
               Wählen Sie News Seiten:
    + Klicken Sie on so viele Schlagzeilen Seiten wie Sie wünschen, diese werden + dann für Sie angezeigt wenn sie Die Headlines Funktion benutzen. Die + Systemadministratoren bestimmen welche voreingestellt sind, sie sind also + Ihre Ansprechpartner wenn Sie welche wollen die nicht dort sind. ;)
  • +
+
+common->phpgw_footer(); +?> ==================================================== Index: preferences/help/DE/other.php diff -u preferences/help/DE/other.php:1.2 preferences/help/DE/other.php:1.3 --- preferences/help/DE/other.php:1.2 Thu Dec 30 11:19:04 2004 +++ preferences/help/DE/other.php Sun Apr 17 15:14:31 2005 @@ -1,43 +1,46 @@ - 'manual', - 'enable_utilities_class' => True - ); - $phpgw_info['flags'] = $phpgw_flags; - include('../../../header.inc.php'); -?> - -

   -Der Ort um Äderungen an Ihrer persönlichen Groupware zu machen.

   -

    -
  • Ihr Passwort Ändern:
    - Wird benutzt um Ihr login Passwort zum system zu ändern. Sie werden zwei - Eingabefelder angezeigt bekommen, geben Sie Ihr neues passwort in diese zwei - Felder ein und klicken Sie den ändern Knopf.
  • -

       -

  • Wählen Sie ein andere Farbschema:
    - Hier ändern Sie Ihr Farbschema für das System. Es wird das aktuelle - Thema angezeigt (für neue benutzer ist das Default). Wählen Sie einfach - mit der Maus ein Thema ihrer Wahl aus. Das Aussehen wird sich nach dem Absenden - sofort verändern. -

       -

  • Ihr Profil ändern:
    - Hier können Sie einige Details über sich selber, für die anderen - Benutzer des Systems eingeben. Titel, Telefonnummer, Kommentare und ein Bild - hoch laden.
  • -

       -

  • Newsgroups Lesen:
    - Hier wählen sie einfach welche Newsgruppen sie gerne abonnieren möchten.
  • -common->phpgw_footer(); ?> + 'manual', + 'enable_utilities_class' => True + ); + $phpgw_info['flags'] = $phpgw_flags; + + /** + * Include phpgroupware header + */ + include('../../../header.inc.php'); +?> + + +

       +Der Ort um Äderungen an Ihrer persönlichen Groupware zu machen.

    +
      +
    • Ihr Passwort Ändern:
      + Wird benutzt um Ihr login Passwort zum system zu ändern. Sie werden zwei + Eingabefelder angezeigt bekommen, geben Sie Ihr neues passwort in diese zwei + Felder ein und klicken Sie den ändern Knopf.
    • +
    • Wählen Sie ein andere Farbschema:
      + Hier ändern Sie Ihr Farbschema für das System. Es wird das aktuelle + Thema angezeigt (für neue benutzer ist das Default). Wählen Sie einfach + mit der Maus ein Thema ihrer Wahl aus. Das Aussehen wird sich nach dem Absenden + sofort verändern.
    • +
    • Ihr Profil ändern:
      + Hier können Sie einige Details über sich selber, für die anderen + Benutzer des Systems eingeben. Titel, Telefonnummer, Kommentare und ein Bild + hoch laden.
    • +
    • Newsgroups Lesen:
      + Hier wählen sie einfach welche Newsgruppen sie gerne abonnieren möchten.
    • +
    +common->phpgw_footer(); +?> ==================================================== Index: preferences/help/DE/preferences.php diff -u preferences/help/DE/preferences.php:1.2 preferences/help/DE/preferences.php:1.3 --- preferences/help/DE/preferences.php:1.2 Thu Dec 30 11:19:04 2004 +++ preferences/help/DE/preferences.php Sun Apr 17 15:14:31 2005 @@ -1,82 +1,83 @@ - 'manual' - ); - $phpgw_info['flags'] = $phpgw_flags; - include('../../../header.inc.php'); -?> - -

      Der Ort um Äderungen an Ihrer persönlichen Groupware zu machen. -

       -

      -
    • Ihr Passwort Ändern:
      - Wird benutzt um Ihr login Passwort zum system zu ändern. Sie werden zwei - Eingabefelder angezeigt bekommen, geben Sie Ihr neues passwort in diese zwei - Felder ein und klicken Sie den ändern Knopf.
    • -

         -

    • Wählen Sie ein andere Farbschema:
      - Hier ändern Sie Ihr Farbschema für das System. Es wird das aktuelle - Thema angezeigt (für neue benutzer ist das Default). Wählen Sie - einfach mit der Maus ein Thema ihrer Wahl aus. Das Aussehen wird sich nach - dem Absenden sofort verändern.
    • -

         -

    • Ihre Einstellungen ändern:
      - Maximale Treffer pro Seite:
      - Wählen Sie wie viele Treffer auf Ihrem Bildschirm auf einmal angezeigt - werden, standard ist 15. -

        Zeige Text bei den Navigations-Symbolen:
      - Text unter den Symbolen oben am Bildschirm anzeigen. -

        Zeitzonen Differenz:
      - Stellen Sie Ihre Zeitzone ein, Standard ist die Zentral Europäische Standard - Zeit. -

        Datumsformat:
      - Wählen Sie die Anordnung von Tag/Monat/Jahr, Standard ist Monat/Tag/Jahr. -

        Zeitformat:
      - Wählen Sie zwischen am/pm=12 Stunden oder 24 Stunden Einstellung. -

        Sprache:
      - Wählen Sie Ihre Sprache. Wählbar sind Deutsch, Spanisch, Norwegisch, - Italienisch, Französisch und die Standardeinstellung Englisch. -

        Zeige Geburtstagserrinnerungen auf dem Begrüssungsbildschirm:
      - Diese Option aktiviert die Errinnerung für Geburtstage als ein Alarm. - Wenn Sie sich an einem Tag an dem ein Geburtstag eingetragen ist in das System - einloggen, wird eine Alarm-Botschaft auf dem Startbildschirm angezeigt. Geburtstagseinstellungen - werden im Adressbuch gemacht. -

        Zeige Ereignisse mit hoher Priorität auf dem Hauptbildschirm:
      - Die Auswahl dieser Option aktiviert Erinnerungen für wichtige Ereignisse - in der TO-DO LiST oder dem Ticketing System. -

        Die Woche Startet am:
      - Wählen Sie den Tag an dem die Woche beginnt. -

        Der Arbeitstag beginnt um:
      - Wählen Sie die Anfangszeit ihres Arbeitstages. Das hat einfluss auf den - Tagesanfang im Kalender wenn die Tagesansicht angezeigt wird. -

        Ende eines Arbeitstags:
      - Wählen Sie die Endzeit ihres Arbeitstags. Das ändert die letzte - Stunde die im Kalender in der Tagesansicht angezeigt wird. -

        Wählen Sie News Seiten:
      - Klicken Sie on so viele Schlagzeilen Seiten wie Sie wünschen, diese werden - dann für Sie angezeigt wenn sie Die Headlines Funktion benutzen. Die - Systemadministratoren bestimmen welche voreingestellt sind, sie sind also - Ihre Ansprechpartner wenn Sie welche wollen die nicht dort sind. ;)

    • -

         -

    • Ihr Profil ändern:
      - Hier können Sie einige Details über sich selber, für die anderen - Benutzer des Systems eingeben. Titel, Telefonnummer, Kommentare und ein Bild - hoch laden.
    • -

         -

    • Newsgroups Lesen:
      - Hier wählen sie einfach welche Newsgruppen Sie gerne abonieren möchten.
    • -
    -
    -common->phpgw_footer(); ?> + 'manual' + ); + $phpgw_info['flags'] = $phpgw_flags; + + /** + * Include phpgroupware header + */ + include('../../../header.inc.php'); +?> + + +

      Der Ort um Äderungen an Ihrer persönlichen Groupware zu machen. +

    +
      +
    • Ihr Passwort Ändern:
      + Wird benutzt um Ihr login Passwort zum system zu ändern. Sie werden zwei + Eingabefelder angezeigt bekommen, geben Sie Ihr neues passwort in diese zwei + Felder ein und klicken Sie den ändern Knopf.
    • +
    • Wählen Sie ein andere Farbschema:
      + Hier ändern Sie Ihr Farbschema für das System. Es wird das aktuelle + Thema angezeigt (für neue benutzer ist das Default). Wählen Sie + einfach mit der Maus ein Thema ihrer Wahl aus. Das Aussehen wird sich nach + dem Absenden sofort verändern.
    • +
    • Ihre Einstellungen ändern:
      + Maximale Treffer pro Seite:
      + Wählen Sie wie viele Treffer auf Ihrem Bildschirm auf einmal angezeigt + werden, standard ist 15. +
        Zeige Text bei den Navigations-Symbolen:
      + Text unter den Symbolen oben am Bildschirm anzeigen. +
        Zeitzonen Differenz:
      + Stellen Sie Ihre Zeitzone ein, Standard ist die Zentral Europäische Standard + Zeit. +
        Datumsformat:
      + Wählen Sie die Anordnung von Tag/Monat/Jahr, Standard ist Monat/Tag/Jahr. +
        Zeitformat:
      + Wählen Sie zwischen am/pm=12 Stunden oder 24 Stunden Einstellung. +
        Sprache:
      + Wählen Sie Ihre Sprache. Wählbar sind Deutsch, Spanisch, Norwegisch, + Italienisch, Französisch und die Standardeinstellung Englisch. +
        Zeige Geburtstagserrinnerungen auf dem Begrüssungsbildschirm:
      + Diese Option aktiviert die Errinnerung für Geburtstage als ein Alarm. + Wenn Sie sich an einem Tag an dem ein Geburtstag eingetragen ist in das System + einloggen, wird eine Alarm-Botschaft auf dem Startbildschirm angezeigt. Geburtstagseinstellungen + werden im Adressbuch gemacht. +
        Zeige Ereignisse mit hoher Priorität auf dem Hauptbildschirm:
      + Die Auswahl dieser Option aktiviert Erinnerungen für wichtige Ereignisse + in der TO-DO LiST oder dem Ticketing System. +
        Die Woche Startet am:
      + Wählen Sie den Tag an dem die Woche beginnt. +
        Der Arbeitstag beginnt um:
      + Wählen Sie die Anfangszeit ihres Arbeitstages. Das hat einfluss auf den + Tagesanfang im Kalender wenn die Tagesansicht angezeigt wird. +
        Ende eines Arbeitstags:
      + Wählen Sie die Endzeit ihres Arbeitstags. Das ändert die letzte + Stunde die im Kalender in der Tagesansicht angezeigt wird. +
        Wählen Sie News Seiten:
      + Klicken Sie on so viele Schlagzeilen Seiten wie Sie wünschen, diese werden + dann für Sie angezeigt wenn sie Die Headlines Funktion benutzen. Die + Systemadministratoren bestimmen welche voreingestellt sind, sie sind also + Ihre Ansprechpartner wenn Sie welche wollen die nicht dort sind. ;)
    • +
    • Ihr Profil ändern:
      + Hier können Sie einige Details über sich selber, für die anderen + Benutzer des Systems eingeben. Titel, Telefonnummer, Kommentare und ein Bild + hoch laden.
    • +
    • Newsgroups Lesen:
      + Hier wählen sie einfach welche Newsgruppen Sie gerne abonieren möchten.
    • +
    +
    +common->phpgw_footer(); +?> From MAILER-DAEMON Sun Apr 17 11:34:29 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNBn2-0005O7-PT for mharc-phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:34:28 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNBmx-0005Kg-Lb for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:34:23 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNBmt-0005If-1K for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:34:19 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNBms-0005Hp-Fo for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:34:18 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNBlm-00074u-AF for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:33:10 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 52465312CB for ; Sun, 17 Apr 2005 17:30:48 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 00651-01 for ; Sun, 17 Apr 2005 17:30:46 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 2B9D0312BA for ; Sun, 17 Apr 2005 17:30:46 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3HFUkL18892; Sun, 17 Apr 2005 17:30:46 +0200 Message-Id: <200504171530.j3HFUkL18892@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Sun, 17 Apr 2005 17:14:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] preferences/help index.php,1.6 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 15:34:24 -0000 Update of preferences/help Modified Files: Branch: MAIN index.php lines: +26 -16 Log Message: Added phpdocs checked with php -l and phpdocumentor. Parses, but is still not complete. Fixed one php -l syntax bug ==================================================== Index: preferences/help/index.php diff -u preferences/help/index.php:1.5 preferences/help/index.php:1.6 --- preferences/help/index.php:1.5 Thu Dec 30 11:19:04 2004 +++ preferences/help/index.php Sun Apr 17 15:14:31 2005 @@ -1,26 +1,36 @@ 'manual' ); $GLOBALS['phpgw_info']['flags'] = $phpgw_flags; + + /** + * Include phpgroupware header + */ include('../../header.inc.php'); + $appname = 'preferences'; - include(PHPGW_SERVER_ROOT.'/'.$appname.'/setup/setup.inc.php'); + + /** + * Include application setup + */ + include(PHPGW_SERVER_ROOT . '/' . $appname . '/setup/setup.inc.php'); ?> -

    + +

    -Version:

    - -common->phpgw_footer(); ?> +Version:

    + +common->phpgw_footer(); +?> From MAILER-DAEMON Sun Apr 17 12:01:35 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNCBJ-0002ae-U3 for mharc-phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:59:33 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNCAr-0002Q2-98 for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:59:05 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNCAl-0002M8-Cp for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:59:01 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNCAl-0002Lf-9w for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:58:59 -0400 Received: from [199.232.41.67] (helo=mx20.gnu.org) by monty-python.gnu.org with esmtp (TLS-1.0:RSA_ARCFOUR_SHA:16) (Exim 4.34) id 1DNC9X-0007vM-Qn for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:57:43 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by mx20.gnu.org with esmtp (Exim 4.34) id 1DNBkA-0001Bt-DR for phpgroupware-cvs@gnu.org; Sun, 17 Apr 2005 11:31:30 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id CC416312BA for ; Sun, 17 Apr 2005 17:30:27 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 31532-09 for ; Sun, 17 Apr 2005 17:30:25 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 4A9F9312CB for ; Sun, 17 Apr 2005 17:30:25 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3HFUP018866; Sun, 17 Apr 2005 17:30:25 +0200 Message-Id: <200504171530.j3HFUP018866@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Sun, 17 Apr 2005 17:14:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] preferences/setup setup.inc.php,1.19 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2005 15:59:18 -0000 Update of preferences/setup Modified Files: Branch: MAIN setup.inc.php lines: +11 -13 Log Message: Added phpdocs checked with php -l and phpdocumentor. Parses, but is still not complete. Fixed one php -l syntax bug ==================================================== Index: preferences/setup/setup.inc.php diff -u preferences/setup/setup.inc.php:1.18 preferences/setup/setup.inc.php:1.19 --- preferences/setup/setup.inc.php:1.18 Sun Jan 16 17:39:54 2005 +++ preferences/setup/setup.inc.php Sun Apr 17 15:14:31 2005 @@ -1,15 +1,13 @@ 'phpgwapi', 'versions' => array('0.9.17') From MAILER-DAEMON Mon Apr 18 04:32:07 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNRfn-0007Zk-Ch for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:32:04 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNRfW-0007Xk-8C for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:31:46 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNRfR-0007Wr-6f for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:31:43 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNRfM-0007Vw-8c for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:31:38 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNRgT-0000ku-LZ for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:32:46 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 1EF7F312B8 for ; Mon, 18 Apr 2005 10:30:11 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 15151-09 for ; Mon, 18 Apr 2005 10:30:09 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 1A766312B5 for ; Mon, 18 Apr 2005 10:30:09 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I8U9C02258; Mon, 18 Apr 2005 10:30:09 +0200 Message-Id: <200504180830.j3I8U9C02258@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 09:34:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] admin class.admin.php,1.2 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 08:31:49 -0000 Update of admin Modified Files: Branch: MAIN class.admin.php lines: +2 -2 Log Message: fixed syntax error; missing ) ==================================================== Index: admin/class.admin.php diff -u admin/class.admin.php:1.1 admin/class.admin.php:1.2 --- admin/class.admin.php:1.1 Thu Oct 23 07:27:18 2003 +++ admin/class.admin.php Mon Apr 18 07:34:47 2005 @@ -25,7 +25,7 @@ $args->set('isadmin', False, 'bool'); $args = $args->get(func_get_args(),__LINE__,__FILE__); - if(isset($args['username']) + if(isset($args['username'])) { $account_info['account_lid'] = $args['username']; $account_info['account_passwd'] = $args['passwd']; From MAILER-DAEMON Mon Apr 18 04:32:13 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNRfr-0007aB-7D for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:32:09 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNRfZ-0007YT-7z for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:31:50 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNRfT-0007XE-58 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:31:46 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNRfQ-0007Vw-IK for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:31:41 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNRgc-0000lg-Hc for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:32:55 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 0062D312D1 for ; Mon, 18 Apr 2005 10:30:20 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 15561-05 for ; Mon, 18 Apr 2005 10:30:14 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id DB397312B8 for ; Mon, 18 Apr 2005 10:30:13 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I8UEM02265; Mon, 18 Apr 2005 10:30:14 +0200 Message-Id: <200504180830.j3I8UEM02265@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 09:37:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] anthill/etc upgrade-0.2.3-0.3.0-mysql.php,1.2 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 08:31:55 -0000 Update of anthill/etc Modified Files: Branch: MAIN upgrade-0.2.3-0.3.0-mysql.php lines: +161 -161 Log Message: Fixed syntax error; missing ';' ==================================================== Index: anthill/etc/upgrade-0.2.3-0.3.0-mysql.php diff -u anthill/etc/upgrade-0.2.3-0.3.0-mysql.php:1.1 anthill/etc/upgrade-0.2.3-0.3.0-mysql.php:1.2 --- anthill/etc/upgrade-0.2.3-0.3.0-mysql.php:1.1 Sun Jul 20 01:23:01 2003 +++ anthill/etc/upgrade-0.2.3-0.3.0-mysql.php Mon Apr 18 07:37:20 2005 @@ -1,162 +1,162 @@ - phpGroupWare Anthill Upgrade Script * - * http://phpgroupware.org * - * * - * Written by Dave Hall [skwashd AT phpgroupware.org] * - * Copyright 2003 Free Software Founation * - * ------------------------------------------------------------------------ * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - * ------------------------------------------------------------------------ * - ****************************************************************************/ - // $Id$ - - //SQL upgrade script for Anthill 0.2.3 -> 0.3.0alpha - - $GLOBALS['update'] = intval($_GET['update']); - - //Fix config table - $sql[] = 'ALTER TABLE config RENAME anthill_config'; - $sql[] = 'ALTER TABLE anthill_config DROP PRIMARY KEY'; - $sql[] = 'ALTER TABLE anthill_config DROP id'; - $sql[] = "ALTER TABLE anthill_config ADD PRIMARY KEY('name')"; - $sql[] = "INSERT INTO anthill_config('def_severity', 2)"; - $sql[] = "INSERT INTO anthill_config('def_priority', 2)"; - - //Create New Sessions Table - $sql[] = 'DROP TABLE sessions'; - - // Alter User Table - $sql[] = 'ALTER TABLE users RENAME anthill_users'; - $sql[] = "ALTER TABLE anthill_users CHANGE epref email_updates INT(1) DEFAULT '1'"; - $sql[] = 'ALTER TABLE anthill_users MODIFY laston INT(11)'; - $sql[] = 'ALTER TABLE anthill_users MODIFY thison INT(11)'; - - // Alter severity Table - $sql[]= 'ALTER TABLE severity_d RENAME anthill_severity_d'; - $sql[]= 'ALTER TABLE anthill_severity_d DROP s_def'; - - // Alter priority Table - $sql[] = 'ALTER TABLE severity_d RENAME anthill_priority_d'; - $sql[] = 'ALTER TABLE anthill_priority_d DROP s_def'; - - // Rename Remaining Tables - $sql[] = 'ALTER TABLE bugs RENAME anthill_bugs'; - $sql[] = 'ALTER TABLE bugdesc RENAME anthill_bugdesc'; - $sql[] = 'ALTER TABLE products RENAME anthill_products'; - $sql[] = 'ALTER TABLE components RENAME anthill_components'; - $sql[] = 'ALTER TABLE status_d RENAME anthill_status_d'; - $sql[] = 'ALTER TABLE priority_d RENAME anthill_priority_d' - $sql[] = 'ALTER TABLE resolve_d RENAME anthill_resolve_d'; - $sql[] = 'ALTER TABLE bugactivity RENAME anthill_bugactivity'; - $sql[] = 'ALTER TABLE attachidx RENAME anthill_attachidx'; - - // get the basic changes out the way - foreach($sql as $query) - { - if($GLOBALS['update']) - { - $db->query($query); - } - else - { - echo "SQL: $query
    \n"; - } - } - // free up some memory :) - unset($sql); - - $changes[] = array('tbl' => 'anthill_bugs', - 'col' => 'modified', - 'pk' => 'bid' - ); - - $changes[] = array('tbl' => 'anthill_bugs', - 'col' => 'creation', - 'pk' => 'bid' - ); - - $changes[] = array('tbl' => 'anthill_bugdesc', - 'col' => 'date', - 'pk' => 'did' - ); - - $changes[] = array('tbl' => 'anthill_bugactivity', - 'col' => 'modified', - 'pk' => 'aid' - ); - - $changes[] = array('tbl' => 'anthill_attachidx', - 'col' => 'modified', - 'pk' => 'atid' - ); - - function convert_timestamp_cols($changes) - { - foreach($changes as $change) - { - // rename the old modified col - $sql = 'ALTER TABLE ' . $change['tbl'] . ' CHANGE ' . $change['col'] . ' ' . $change['col'] . '_ts TIMESTAMP(14)'; - if($GLOBALS['update']) - { - $db->query($query); - } - else - { - echo "SQL: $sql
    \n"; - } - - // add the new timestamp col - $sql = 'ALTER TABLE ' . $change['tbl'] . 'ADD ' . $change['col'] . ' INT(11)'; - if($GLOBALS['update']) - { - $db->query($query); - } - else - { - echo "SQL: $sql
    \n"; - } - - - // get all the old values from modified - $sql = 'SELECT ' . $change['pk'] . ', UNIX_TIMESTAMP(' . $change['col'] . '_ts) as epoch_ts FROM '. $change['tbl']; - $db->query($sql); - while($db->next_record()) - { - $new_vals[$db->f($change['pk'])] = $db->f('epoch_ts'); - } - - foreach($news_vals as $new_val) - { - $sql = 'UPDATE ' . $change['tbl'] . ' ' - . 'SET modified=' . $new_val['epoch_ts'] . ' ' - . 'WHERE bid=' . $new_val[$change['pk']]; - - if($GLOBALS['update']) - { - $db->query($query); - } - else - { - echo "SQL: $sql
    \n"; - } - } - $sql = 'ALTER TABLE ' . $change['tbl'] . ' DROP ' . $change['col'] . '_ts'; - if($GLOBALS['update']) - { - $db->query($query); - } - else - { - echo "SQL: $sql
    \n"; - } - } - } - - echo '

    please check the above output

    '; - echo '

    If all appears to be correct run it in update mode

    '; - + phpGroupWare Anthill Upgrade Script * + * http://phpgroupware.org * + * * + * Written by Dave Hall [skwashd AT phpgroupware.org] * + * Copyright 2003 Free Software Founation * + * ------------------------------------------------------------------------ * + * This program is free software; you can redistribute it and/or modify it * + * under the terms of the GNU General Public License as published by the * + * Free Software Foundation; either version 2 of the License, or (at your * + * option) any later version. * + * ------------------------------------------------------------------------ * + ****************************************************************************/ + // $Id$ + + //SQL upgrade script for Anthill 0.2.3 -> 0.3.0alpha + + $GLOBALS['update'] = intval($_GET['update']); + + //Fix config table + $sql[] = 'ALTER TABLE config RENAME anthill_config'; + $sql[] = 'ALTER TABLE anthill_config DROP PRIMARY KEY'; + $sql[] = 'ALTER TABLE anthill_config DROP id'; + $sql[] = "ALTER TABLE anthill_config ADD PRIMARY KEY('name')"; + $sql[] = "INSERT INTO anthill_config('def_severity', 2)"; + $sql[] = "INSERT INTO anthill_config('def_priority', 2)"; + + //Create New Sessions Table + $sql[] = 'DROP TABLE sessions'; + + // Alter User Table + $sql[] = 'ALTER TABLE users RENAME anthill_users'; + $sql[] = "ALTER TABLE anthill_users CHANGE epref email_updates INT(1) DEFAULT '1'"; + $sql[] = 'ALTER TABLE anthill_users MODIFY laston INT(11)'; + $sql[] = 'ALTER TABLE anthill_users MODIFY thison INT(11)'; + + // Alter severity Table + $sql[]= 'ALTER TABLE severity_d RENAME anthill_severity_d'; + $sql[]= 'ALTER TABLE anthill_severity_d DROP s_def'; + + // Alter priority Table + $sql[] = 'ALTER TABLE severity_d RENAME anthill_priority_d'; + $sql[] = 'ALTER TABLE anthill_priority_d DROP s_def'; + + // Rename Remaining Tables + $sql[] = 'ALTER TABLE bugs RENAME anthill_bugs'; + $sql[] = 'ALTER TABLE bugdesc RENAME anthill_bugdesc'; + $sql[] = 'ALTER TABLE products RENAME anthill_products'; + $sql[] = 'ALTER TABLE components RENAME anthill_components'; + $sql[] = 'ALTER TABLE status_d RENAME anthill_status_d'; + $sql[] = 'ALTER TABLE priority_d RENAME anthill_priority_d'; + $sql[] = 'ALTER TABLE resolve_d RENAME anthill_resolve_d'; + $sql[] = 'ALTER TABLE bugactivity RENAME anthill_bugactivity'; + $sql[] = 'ALTER TABLE attachidx RENAME anthill_attachidx'; + + // get the basic changes out the way + foreach($sql as $query) + { + if($GLOBALS['update']) + { + $db->query($query); + } + else + { + echo "SQL: $query
    \n"; + } + } + // free up some memory :) + unset($sql); + + $changes[] = array('tbl' => 'anthill_bugs', + 'col' => 'modified', + 'pk' => 'bid' + ); + + $changes[] = array('tbl' => 'anthill_bugs', + 'col' => 'creation', + 'pk' => 'bid' + ); + + $changes[] = array('tbl' => 'anthill_bugdesc', + 'col' => 'date', + 'pk' => 'did' + ); + + $changes[] = array('tbl' => 'anthill_bugactivity', + 'col' => 'modified', + 'pk' => 'aid' + ); + + $changes[] = array('tbl' => 'anthill_attachidx', + 'col' => 'modified', + 'pk' => 'atid' + ); + + function convert_timestamp_cols($changes) + { + foreach($changes as $change) + { + // rename the old modified col + $sql = 'ALTER TABLE ' . $change['tbl'] . ' CHANGE ' . $change['col'] . ' ' . $change['col'] . '_ts TIMESTAMP(14)'; + if($GLOBALS['update']) + { + $db->query($query); + } + else + { + echo "SQL: $sql
    \n"; + } + + // add the new timestamp col + $sql = 'ALTER TABLE ' . $change['tbl'] . 'ADD ' . $change['col'] . ' INT(11)'; + if($GLOBALS['update']) + { + $db->query($query); + } + else + { + echo "SQL: $sql
    \n"; + } + + + // get all the old values from modified + $sql = 'SELECT ' . $change['pk'] . ', UNIX_TIMESTAMP(' . $change['col'] . '_ts) as epoch_ts FROM '. $change['tbl']; + $db->query($sql); + while($db->next_record()) + { + $new_vals[$db->f($change['pk'])] = $db->f('epoch_ts'); + } + + foreach($news_vals as $new_val) + { + $sql = 'UPDATE ' . $change['tbl'] . ' ' + . 'SET modified=' . $new_val['epoch_ts'] . ' ' + . 'WHERE bid=' . $new_val[$change['pk']]; + + if($GLOBALS['update']) + { + $db->query($query); + } + else + { + echo "SQL: $sql
    \n"; + } + } + $sql = 'ALTER TABLE ' . $change['tbl'] . ' DROP ' . $change['col'] . '_ts'; + if($GLOBALS['update']) + { + $db->query($query); + } + else + { + echo "SQL: $sql
    \n"; + } + } + } + + echo '

    please check the above output

    '; + echo '

    If all appears to be correct run it in update mode

    '; + ?> \ No newline at end of file From MAILER-DAEMON Mon Apr 18 04:34:29 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNRi1-0007fh-Jk for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:34:22 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNRhl-0007f6-Ch for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:34:06 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNRgo-0007dO-J7 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:33:32 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNRgS-0007Vw-EG for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:32:46 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNRhQ-0000pr-JD for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:33:44 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 05A8E312CC for ; Mon, 18 Apr 2005 10:31:10 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 15519-09 for ; Mon, 18 Apr 2005 10:31:07 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id CD2D7312B5 for ; Mon, 18 Apr 2005 10:31:07 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I8V8w02344; Mon, 18 Apr 2005 10:31:08 +0200 Message-Id: <200504180831.j3I8V8w02344@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 10:18:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] calendar/templates/verdilak header.inc.php,1.22 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 08:34:13 -0000 Update of calendar/templates/verdilak Modified Files: Branch: MAIN header.inc.php lines: +2 -2 Log Message: changed fix to ${$ ==================================================== Index: calendar/templates/verdilak/header.inc.php diff -u calendar/templates/verdilak/header.inc.php:1.21 calendar/templates/verdilak/header.inc.php:1.22 --- calendar/templates/verdilak/header.inc.php:1.21 Mon Apr 18 07:53:10 2005 +++ calendar/templates/verdilak/header.inc.php Mon Apr 18 08:18:12 2005 @@ -98,7 +98,7 @@ $base_hidden_vars = ''."\n"; for($i=0;$i'."\n"; } From MAILER-DAEMON Mon Apr 18 04:36:36 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNRgr-0007dZ-75 for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:33:11 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNRgS-0007cA-Vz for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:32:46 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNRff-0007Z4-3x for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:32:29 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNRfZ-0007Vw-3t for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:31:50 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNRgm-0000ml-Ui for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:33:05 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 50541312B5 for ; Mon, 18 Apr 2005 10:30:30 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 16073-01 for ; Mon, 18 Apr 2005 10:30:28 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 680A6312CC for ; Mon, 18 Apr 2005 10:30:28 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I8USt02286; Mon, 18 Apr 2005 10:30:28 +0200 Message-Id: <200504180830.j3I8USt02286@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 09:44:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] api/db class.db_sybase.php,1.2 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 08:33:03 -0000 Update of api/db Modified Files: Branch: MAIN class.db_sybase.php lines: +2 -2 Log Message: Fixed syntax error: one '.' to much ==================================================== Index: api/db/class.db_sybase.php diff -u api/db/class.db_sybase.php:1.1 api/db/class.db_sybase.php:1.2 --- api/db/class.db_sybase.php:1.1 Thu Oct 23 07:25:03 2003 +++ api/db/class.db_sybase.php Mon Apr 18 07:44:28 2005 @@ -46,7 +46,7 @@ } if(!$this->Link_ID) { - $this->halt('Link-ID == false, '.($GLOBALS['phpgw_info']['server']['db_persistent']?'p':'')..'connect failed'); + $this->halt('Link-ID == false, ' . ($GLOBALS['phpgw_info']['server']['db_persistent'] ? 'p' : '') . 'connect failed'); } if(!sybase_select_db($this->Database, $this->Link_ID)) { From MAILER-DAEMON Mon Apr 18 04:44:09 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNRrO-0007yq-OP for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:44:03 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNRqX-0007vp-St for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:43:10 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNRm2-0007nw-02 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:38:34 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNRgf-0007Vw-1a for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:32:57 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNRhI-0000pA-Bz for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:33:36 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 70D29312D0 for ; Mon, 18 Apr 2005 10:31:01 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 15561-08 for ; Mon, 18 Apr 2005 10:30:59 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 61585312B8 for ; Mon, 18 Apr 2005 10:30:59 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I8Ux502328; Mon, 18 Apr 2005 10:30:59 +0200 Message-Id: <200504180830.j3I8Ux502328@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 09:58:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] ccs/inc class.boTimecards.inc.php,1.6 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 08:43:57 -0000 Update of ccs/inc Modified Files: Branch: MAIN class.boTimecards.inc.php lines: +2 -2 Log Message: Fixed syntax error; changed = to == ==================================================== Index: ccs/inc/class.boTimecards.inc.php diff -u ccs/inc/class.boTimecards.inc.php:1.5 ccs/inc/class.boTimecards.inc.php:1.6 --- ccs/inc/class.boTimecards.inc.php:1.5 Tue Jun 5 21:24:04 2001 +++ ccs/inc/class.boTimecards.inc.php Mon Apr 18 07:58:42 2005 @@ -202,7 +202,7 @@ $query = sprintf('SELECT min(id) FROM osims_timecards WHERE id > %d AND ccs=%d',$objTC->id, $obTC->ccs); $objQueryTC->db->query($query); $ojbQueryTC->db->next_record(); - if($objQueryTC->db->f('id')='' || $objQueryTC->db->f('id') < 1 ) + if(($objQueryTC->db->f('id') == '') || ($objQueryTC->db->f('id') < 1)) { // theory is we're the last timecard. We control status. // now check to see if there are any prior timecards. If so we revert to their status From MAILER-DAEMON Mon Apr 18 04:47:44 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNRuQ-0008MI-5B for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:47:10 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNRu7-0008GS-Ow for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:46:52 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNRtz-0008Ep-B8 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:46:48 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNRgh-0007Vw-EK for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:33:00 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNRh2-0000o6-Ig for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:33:21 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id F10A9312B8 for ; Mon, 18 Apr 2005 10:30:45 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 15561-07 for ; Mon, 18 Apr 2005 10:30:44 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 1D64C312B5 for ; Mon, 18 Apr 2005 10:30:44 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I8UiS02307; Mon, 18 Apr 2005 10:30:44 +0200 Message-Id: <200504180830.j3I8UiS02307@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 09:53:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] calendar/templates/idsociety header.inc.php, 1.26 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 08:46:55 -0000 Update of calendar/templates/idsociety Modified Files: Branch: MAIN header.inc.php lines: +2 -2 Log Message: fixed syntax errors; asuming $$ was wanted instead of $($... ==================================================== Index: calendar/templates/idsociety/header.inc.php diff -u calendar/templates/idsociety/header.inc.php:1.25 calendar/templates/idsociety/header.inc.php:1.26 --- calendar/templates/idsociety/header.inc.php:1.25 Sun Aug 25 12:33:57 2002 +++ calendar/templates/idsociety/header.inc.php Mon Apr 18 07:53:10 2005 @@ -98,7 +98,7 @@ $base_hidden_vars = ''."\n"; for($i=0;$i'."\n"; } From MAILER-DAEMON Mon Apr 18 04:48:16 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNRuS-0008MU-OZ for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:47:14 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNRu8-0008H2-Je for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:46:54 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNRfp-0007a2-6K for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:32:50 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNRfj-0007Vw-9b for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:32:01 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNRgw-0000ng-NY for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:33:15 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 18481312B8 for ; Mon, 18 Apr 2005 10:30:40 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 15519-07 for ; Mon, 18 Apr 2005 10:30:38 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 1F4BD312B5 for ; Mon, 18 Apr 2005 10:30:38 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I8UcO02300; Mon, 18 Apr 2005 10:30:38 +0200 Message-Id: <200504180830.j3I8UcO02300@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 09:53:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] calendar/templates/verdilak header.inc.php,1.21 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 08:46:56 -0000 Update of calendar/templates/verdilak Modified Files: Branch: MAIN header.inc.php lines: +2 -2 Log Message: fixed syntax errors; asuming $$ was wanted instead of $($... ==================================================== Index: calendar/templates/verdilak/header.inc.php diff -u calendar/templates/verdilak/header.inc.php:1.20 calendar/templates/verdilak/header.inc.php:1.21 --- calendar/templates/verdilak/header.inc.php:1.20 Sun Aug 25 12:33:57 2002 +++ calendar/templates/verdilak/header.inc.php Mon Apr 18 07:53:10 2005 @@ -98,7 +98,7 @@ $base_hidden_vars = ''."\n"; for($i=0;$i'."\n"; } From MAILER-DAEMON Mon Apr 18 04:49:09 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNRvY-0000IM-2w for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:48:20 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNRvC-0000B4-O6 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:48:00 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNRft-0007aQ-JL for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:33:00 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNRfo-0007Vw-Jx for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:32:05 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNRgr-0000nG-S2 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:33:10 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 41366312B8 for ; Mon, 18 Apr 2005 10:30:35 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 15849-03 for ; Mon, 18 Apr 2005 10:30:33 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 3D5EE312B5 for ; Mon, 18 Apr 2005 10:30:33 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I8UX702293; Mon, 18 Apr 2005 10:30:33 +0200 Message-Id: <200504180830.j3I8UX702293@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 09:48:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] calendar/inc class.calendar_icap.inc.php,1.15 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 08:48:13 -0000 Update of calendar/inc Modified Files: Branch: MAIN class.calendar_icap.inc.php lines: +2 -2 Log Message: fixed syntax error; missing ';' ==================================================== Index: calendar/inc/class.calendar_icap.inc.php diff -u calendar/inc/class.calendar_icap.inc.php:1.14 calendar/inc/class.calendar_icap.inc.php:1.15 --- calendar/inc/class.calendar_icap.inc.php:1.14 Thu May 31 04:34:00 2001 +++ calendar/inc/class.calendar_icap.inc.php Mon Apr 18 07:48:27 2005 @@ -314,7 +314,7 @@ function fetch_current_stream_event() { $this->event = mcal_fetch_current_stream_event($this->stream); - return $this->event + return $this->event; } function add_attribute($attribute,$value) From MAILER-DAEMON Mon Apr 18 04:49:24 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNRvm-0000MY-Qz for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:48:35 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNRsZ-00087U-UW for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:45:18 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNRgU-0007cG-Nt for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:33:24 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNRgM-0007Vw-Lc for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:32:40 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNRhU-0000q3-Ln for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:33:48 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 0C4DE312B8 for ; Mon, 18 Apr 2005 10:31:14 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 16073-04 for ; Mon, 18 Apr 2005 10:31:12 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 18FB9312B5 for ; Mon, 18 Apr 2005 10:31:12 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I8VCw02351; Mon, 18 Apr 2005 10:31:12 +0200 Message-Id: <200504180831.j3I8VCw02351@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 10:18:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] calendar/templates/idsociety header.inc.php, 1.27 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 08:48:24 -0000 Update of calendar/templates/idsociety Modified Files: Branch: MAIN header.inc.php lines: +2 -2 Log Message: changed fix to ${$ ==================================================== Index: calendar/templates/idsociety/header.inc.php diff -u calendar/templates/idsociety/header.inc.php:1.26 calendar/templates/idsociety/header.inc.php:1.27 --- calendar/templates/idsociety/header.inc.php:1.26 Mon Apr 18 07:53:10 2005 +++ calendar/templates/idsociety/header.inc.php Mon Apr 18 08:18:12 2005 @@ -98,7 +98,7 @@ $base_hidden_vars = ''."\n"; for($i=0;$i'."\n"; } From MAILER-DAEMON Mon Apr 18 04:49:57 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNRwR-0000cN-Ms for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:49:17 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNRw6-0000TX-J5 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:48:55 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNRgM-0007bi-QO for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:33:13 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNRgA-0007Vw-Qj for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:32:32 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNRhN-0000pd-OA for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:33:42 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 2C731312CC for ; Mon, 18 Apr 2005 10:31:07 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 15849-05 for ; Mon, 18 Apr 2005 10:31:03 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id A7801312B5 for ; Mon, 18 Apr 2005 10:31:03 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I8V3T02337; Mon, 18 Apr 2005 10:31:03 +0200 Message-Id: <200504180831.j3I8V3T02337@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 10:18:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] calendar/templates/justweb header.inc.php,1.22 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 08:49:05 -0000 Update of calendar/templates/justweb Modified Files: Branch: MAIN header.inc.php lines: +2 -2 Log Message: changed fix to ${$ ==================================================== Index: calendar/templates/justweb/header.inc.php diff -u calendar/templates/justweb/header.inc.php:1.21 calendar/templates/justweb/header.inc.php:1.22 --- calendar/templates/justweb/header.inc.php:1.21 Mon Apr 18 07:53:10 2005 +++ calendar/templates/justweb/header.inc.php Mon Apr 18 08:18:12 2005 @@ -98,7 +98,7 @@ $base_hidden_vars = ''."\n"; for($i=0;$i'."\n"; } From MAILER-DAEMON Mon Apr 18 04:50:13 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNRxK-0000qv-7D for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:50:10 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNRj4-0007id-HZ for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:35:29 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNRgA-0007bP-VS for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:33:11 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNRfz-0007Vw-6b for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:32:17 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNRh9-0000oZ-4h for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:33:27 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 8C33F312B5 for ; Mon, 18 Apr 2005 10:30:52 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 15849-04 for ; Mon, 18 Apr 2005 10:30:50 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 4C22A312B8 for ; Mon, 18 Apr 2005 10:30:50 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I8Uow02314; Mon, 18 Apr 2005 10:30:50 +0200 Message-Id: <200504180830.j3I8Uow02314@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 09:53:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] calendar/templates/justweb header.inc.php,1.21 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 08:50:03 -0000 Update of calendar/templates/justweb Modified Files: Branch: MAIN header.inc.php lines: +2 -2 Log Message: fixed syntax errors; asuming $$ was wanted instead of $($... ==================================================== Index: calendar/templates/justweb/header.inc.php diff -u calendar/templates/justweb/header.inc.php:1.20 calendar/templates/justweb/header.inc.php:1.21 --- calendar/templates/justweb/header.inc.php:1.20 Sun Aug 25 12:33:57 2002 +++ calendar/templates/justweb/header.inc.php Mon Apr 18 07:53:10 2005 @@ -98,7 +98,7 @@ $base_hidden_vars = ''."\n"; for($i=0;$i'."\n"; } From MAILER-DAEMON Mon Apr 18 04:50:48 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNRwo-0000l6-TO for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:49:40 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNRgT-0007c9-0p for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:32:46 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNRfj-0007ZN-Mi for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:32:33 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNRfb-0007Vw-WC for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:31:55 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNRgk-0000mS-U4 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:33:03 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 56968312B8 for ; Mon, 18 Apr 2005 10:30:28 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 15561-06 for ; Mon, 18 Apr 2005 10:30:23 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 3BE6B312B5 for ; Mon, 18 Apr 2005 10:30:23 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I8UNa02279; Mon, 18 Apr 2005 10:30:23 +0200 Message-Id: <200504180830.j3I8UNa02279@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 09:41:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] anthill/inc sample-config.inc.php,1.2 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 08:49:30 -0000 Update of anthill/inc Modified Files: Branch: MAIN sample-config.inc.php lines: +2 -2 Log Message: fixed syntax error: missing ' ==================================================== Index: anthill/inc/sample-config.inc.php diff -u anthill/inc/sample-config.inc.php:1.1 anthill/inc/sample-config.inc.php:1.2 --- anthill/inc/sample-config.inc.php:1.1 Sun Jul 20 01:23:08 2003 +++ anthill/inc/sample-config.inc.php Mon Apr 18 07:41:34 2005 @@ -25,7 +25,7 @@ # difftool: /path/to/diff ########################################################################### - $GLOBALS['anthill_info']['path']['root'] = '/var/www/html/anthill/; + $GLOBALS['anthill_info']['path']['root'] = '/var/www/html/anthill/'; $GLOBALS['anthill_info']['path']['incdir'] = '/inc'; $GLOBALS['anthill_info']['path']['webroot'] = 'http://server.com/anthill/'; $GLOBALS['anthill_info']['path']['tpl'] = 'default'; From MAILER-DAEMON Mon Apr 18 04:50:59 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNRwH-0000Xd-3Y for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:49:06 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNRvR-0000El-II for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:48:14 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNRv2-00005J-A8 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:47:50 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNRgY-0007Vw-BM for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:32:51 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNRhJ-0000pK-R2 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:33:39 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 3F483312B8 for ; Mon, 18 Apr 2005 10:31:03 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 15519-08 for ; Mon, 18 Apr 2005 10:30:55 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 1E33A312B5 for ; Mon, 18 Apr 2005 10:30:55 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I8Utp02321; Mon, 18 Apr 2005 10:30:55 +0200 Message-Id: <200504180830.j3I8Utp02321@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 09:56:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] cart/inc class.payment_echo.inc.php,1.2 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 08:49:00 -0000 Update of cart/inc Modified Files: Branch: MAIN class.payment_echo.inc.php lines: +1129 -1134 Log Message: Fixed syntax error; method double declared ==================================================== Index: cart/inc/class.payment_echo.inc.php diff -u cart/inc/class.payment_echo.inc.php:1.1 cart/inc/class.payment_echo.inc.php:1.2 --- cart/inc/class.payment_echo.inc.php:1.1 Wed Mar 20 12:49:41 2002 +++ cart/inc/class.payment_echo.inc.php Mon Apr 18 07:56:11 2005 @@ -1,1134 +1,1129 @@ - * - * -------------------------------------------- * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - \**************************************************************************/ - - /* $Id$ */ - - /*==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-*/ - // // - // Name: ECHOPHP v1.4.4 // - // Description: PHP Class used to interface with // - // ECHO (http://www.echo-inc.com). // - // Requirements: cURL - http://curl.haxx.se/ // - // OpenSSL - http://www.openssl.org // - // Refer to ECHO's documentation for more info // - // https://wwws.echo-inc.com // - // // - /*==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-*/ - - class payment - { - var $order_type; - var $transaction_type; - var $merchant_echo_id; - var $merchant_pin; - var $isp_echo_id; - var $isp_pin; - var $authorization; - var $billing_ip_address; - var $billing_prefix; - var $billing_name; - var $billing_address1; - var $billing_address2; - var $billing_city; - var $billing_state; - var $billing_zip; - var $billing_country; - var $billing_phone; - var $billing_fax; - var $billing_email; - var $cc_number; - var $ccexp_month; - var $ccexp_year; - var $counter; - var $debug; - var $ec_account; - var $ec_address1; - var $ec_address2; - var $ec_bank_name; - var $ec_business_acct; - var $ec_city; - var $ec_email; - var $ec_first_name; - var $ec_id_country; - var $ec_id_exp_mm; - var $ec_id_exp_dd; - var $ec_id_exp_yy; - var $ec_id_number; - var $ec_id_state; - var $ec_id_type; - var $ec_last_name; - var $ec_merchant_ref; - var $ec_nbds_code; - var $ec_other_name; - var $ec_payee; - var $ec_rt; - var $ec_serial_number; - var $ec_state; - var $ec_zip; - var $grand_total; - var $merchant_email; - var $merchant_trace_nbr; - var $original_amount; - var $original_trandate_mm; - var $original_trandate_dd; - var $original_trandate_yyyy; - var $original_reference; - var $order_number; - var $shipping_flag; - var $status; - var $shipping_prefix; - var $shipping_name; - var $shipping_address1; - var $shipping_address2; - var $shipping_city; - var $shipping_state; - var $shipping_zip; - var $shipping_comments; - var $shipping_country; - var $shipping_phone; - var $shipping_fax; - var $shipper; - var $shipper_tracking_nbr; - var $track1; - var $track2; - var $EchoResponse; - var $echotype1; - var $echotype2; - var $echotype3; - var $openecho; - var $avs_result; - var $athorization; - var $reference; - var $EchoSuccess; - - function submit() - { - if ($this->EchoServer) - { - $URL = $this->EchoServer; - } - else - { - $URL = 'https://wwws.echo-inc.com/scripts/INR300.EXE'; - } - - $this->EchoResponse = ''; - - $data = $this->getURLData(); - - $ch = curl_init(); - curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1); - curl_setopt ($ch, CURLOPT_URL, $URL); - curl_setopt ($ch, CURLOPT_POST, $data); - curl_setopt ($ch, CURLOPT_POSTFIELDS, $data); - $this->EchoResponse = curl_exec ($ch); - curl_close ($ch); - - $startpos = strpos($this->EchoResponse, '') + 11; - $endpos = strpos($this->EchoResponse, ''); - $this->echotype1 = substr($this->EchoResponse, $startpos, $endpos - $startpos); - - $startpos = strpos($this->EchoResponse, '') + 11; - $endpos = strpos($this->EchoResponse, ''); - $this->echotype2 = substr($this->EchoResponse, $startpos, $endpos - $startpos); - - $startpos = strpos($this->EchoResponse, '') + 11; - $endpos = strpos($this->EchoResponse, ''); - $this->echotype3 = substr($this->EchoResponse, $startpos, $endpos - $startpos); - - if (strpos($this->EchoResponse, '')) - { - $startpos = strpos($this->EchoResponse, '') + 10; - $endpos = strpos($this->EchoResponse, ''); - $this->openecho = substr($this->EchoResponse, $startpos, $endpos - $startpos); - } - - // Get all the metadata. - $this->GetAuthFromEcho(); - $this->GetOrderNumberFromEcho(); - $this->GetReferenceFromEcho(); - $this->status = $this->GetEchoProp($this->echotype3, 'status'); - $this->avs_result = $this->GetEchoProp($this->echotype3, 'avs_result'); - - if ($this->transaction_type == 'AD') - { - if ($this->avs_result == 'X' or $this->avs_result == 'Y') - { - $this->EchoSuccess = true; - } - else - { - $this->EchoSuccess = false; - } - } - else - { - $this->EchoSuccess = !($this->status == 'D'); - } - - if ($this->EchoResponse == '') - { - $this->EchoSuccess = False; - } - - // make sure we assign an integer to EchoSuccess - ($this->EchoSuccess == true) ? ($this->EchoSuccess = true) : ($this->EchoSuccess = false); - - return $this->EchoSuccess; - } // function submit - - function getURLData() - { - $s .= - 'order_type=' . $this->order_type . - '&transaction_type=' . $this->transaction_type . - '&merchant_echo_id=' . $this->merchant_echo_id . - '&merchant_pin=' . $this->merchant_pin . - '&isp_echo_id=' . $this->isp_echo_id . - '&isp_pin=' . $this->isp_pin . - '&authorization=' . $this->authorization . - '&billing_ip_address=' . $this->billing_ip_address . - '&billing_prefix=' . $this->billing_prefix . - '&billing_name=' . $this->billing_name . - '&billing_address1=' . $this->billing_address1 . - '&billing_address2=' . $this->billing_address2 . - '&billing_city=' . $this->billing_city . - '&billing_state=' . $this->billing_state . - '&billing_zip=' . $this->billing_zip . - '&billing_country=' . $this->billing_country . - '&billing_phone=' . $this->billing_phone . - '&billing_fax=' . $this->billing_fax . - '&billing_email=' . $this->billing_email . - '&cc_number=' . $this->cc_number . - '&ccexp_month=' . $this->ccexp_month . - '&ccexp_year=' . $this->ccexp_year . - '&counter=' . $this->counter . - '&debug=' . $this->debug . - '&transaction_type=' . $this->transaction_type; - - if (($this->transaction_type == 'DD') || - ($this->transaction_type == 'DC') || - ($this->transaction_type == 'DV')) - { - $s .= - '&ec_account=' . $this->ec_account . - '&ec_address1=' . $this->ec_address1 . - '&ec_address2=' . $this->ec_address2 . - '&ec_bank_name=' . $this->ec_bank_name . - '&ec_business_acct=' . $this->ec_business_acct . - '&ec_city=' . $this->ec_city . - '&ec_email=' . $this->ec_email . - '&ec_first_name=' . $this->ec_first_name . - '&ec_id_country=' . $this->ec_id_country . - '&ec_id_exp_mm=' . $this->ec_id_exp_mm . - '&ec_id_exp_dd=' . $this->ec_id_exp_dd . - '&ec_id_exp_yy=' . $this->ec_id_exp_yy . - '&ec_id_number=' . $this->ec_id_number . - '&ec_id_state=' . $this->ec_id_state . - '&ec_id_type=' . $this->ec_id_type . - '&ec_last_name=' . $this->ec_last_name . - '&ec_merchant_ref=' . $this->ec_merchant_ref . - '&ec_nbds_code=' . $this->ec_nbds_code . - '&ec_other_name=' . $this->ec_other_name . - '&ec_payee=' . $this->ec_payee . - '&ec_rt=' . $this->ec_rt . - '&ec_serial_number=' . $this->ec_serial_number . - '&ec_state=' . $this->ec_state . - '&ec_zip=' . $this->ec_zip; - } - - $s .= - '&grand_total=' . $this->grand_total . - '&merchant_email=' . $this->merchant_email . - '&merchant_trace_nbr=' . $this->merchant_trace_nbr . - '&original_amount=' . $this->original_amount . - '&original_trandate_mm=' . $this->original_trandate_mm . - '&original_trandate_dd=' . $this->original_trandate_dd . - '&original_trandate_yyyy=' . $this->original_trandate_yyyy . - '&original_reference=' . $this->original_reference . - '&order_number=' . $this->order_number . - '&shipping_flag=' . $this->shipping_flag . - '&shipping_prefix=' . $this->shipping_prefix . - '&shipping_name=' . $this->shipping_name . - '&shipping_address1=' . $this->shipping_address1 . - '&shipping_address2=' . $this->shipping_address2 . - '&shipping_city=' . $this->shipping_city . - '&shipping_state=' . $this->shipping_state . - '&shipping_zip=' . $this->shipping_zip . - '&shipping_comments=' . $this->shipping_comments . - '&shipping_country=' . $this->shipping_country . - '&shipping_phone=' . $this->shipping_phone . - '&shipping_fax=' . $this->shipping_fax . - '&shipper=' . $this->shipper . - '&shipper_tracking_nbr=' . $this->shipper_tracking_nbr . - '&track1=' . $this->track1 . - '&track2=' . $this->track2; - - return $s; - } /* end getURLData */ - - /********************************************** - All the get/set methods for the echo properties - ***********************************************/ - function set_order_type($value) - { - $this->order_type = $value; - } - - function get_order_type() - { - return $this->order_type; - } - - function set_transaction_type($value) - { - $this->transaction_type = $value; - } - - function get_transaction_type() - { - return $this->transaction_type; - } - - function set_merchant_echo_id($value) - { - $this->merchant_echo_id = urlencode($value); - } - - function get_merchant_echo_id() - { - return $this->merchant_echo_id; - } - - function set_merchant_pin($value) - { - $this->merchant_pin = urlencode($value); - } - - function get_merchant_pin() - { - return $this->merchant_pin; - } - - function set_isp_echo_id($value) - { - $this->isp_echo_id = urlencode($value); - } - - function get_isp_echo_id() - { - return $this->isp_echo_id; - } - - function set_isp_pin($value) - { - $this->isp_pin = urlencode($value); - } - - function get_isp_pin() - { - return $this->isp_pin; - } - - function set_authorization($value) - { - $this->authorization = $value; - } - - function get_authorization() - { - return $this->authorization; - } - - function set_billing_ip_address($value) - { - $this->billing_ip_address = $value; - } - - function get_billing_ip_address() - { - return $this->billing_ip_address; - } - - function set_billing_prefix($value) - { - $this->billing_prefix = urlencode($value); - } - - function get_billing_prefix() - { - return $this->billing_prefix; - } - - function set_billing_name($value) - { - $this->billing_name = urlencode($value); - } - - function get_billing_name() - { - return $this->billing_name; - } - - function set_billing_address1($value) - { - $this->billing_address1 = urlencode($value); - } - - function get_billing_address1() - { - return $this->billing_address1; - } - - function set_billing_address2($value) - { - $this->billing_address2 = urlencode($value); - } - - function get_billing_address2() - { - return $this->billing_address2; - } - - function set_billing_city($value) - { - $this->billing_city = urlencode($value); - } - - function get_billing_city() - { - return $this->billing_city; - } - - function set_billing_state($value) - { - $this->billing_state = urlencode($value); - } - - function get_billing_state() - { - return $this->billing_state; - } - - function set_billing_zip($value) - { - $this->billing_zip = urlencode($value); - } - - function get_billing_zip() - { - return $this->billing_zip; - } - - function set_billing_country($value) - { - $this->billing_country = urlencode($value); - } - - function get_billing_country() - { - return $this->billing_country; - } - - function set_billing_phone($value) - { - $this->billing_phone = urlencode($value); - } - - function get_billing_phone() - { - return $this->billing_phone; - } - - function set_billing_fax($value) - { - $this->billing_fax = urlencode($value); - } - - function get_billing_fax() - { - return $this->billing_fax; - } - - function set_billing_email($value) - { - $this->billing_email = urlencode($value); - } - - function get_billing_email() - { - return $this->billing_email; - } - - function set_cc_number($value) - { - $this->cc_number = urlencode($value); - } - - function get_cc_number() - { - return $this->cc_number; - } - - function set_ccexp_month($value) - { - $this->ccexp_month = $value; - } - - function get_ccexp_month() - { - return $this->ccexp_month; - } - - function set_ccexp_year($value) - { - $this->ccexp_year = $value; - } - - function get_ccexp_year() - { - return $this->ccexp_year; - } - - function set_counter($value) - { - $this->counter = $value; - } - - function get_counter() - { - return $this->counter; - } - - function set_debug($value) - { - $this->debug = $value; - } - - function get_debug() - { - return $this->debug; - } - - function set_ec_account($value) - { - $this->ec_account = urlencode($value); - } - - function get_ec_account() - { - return $this->ec_account; - } - - function set_ec_address1($value) - { - $this->ec_address1 = urlencode($value); - } - - function get_ec_address1() - { - return $this->ec_address1; - } - - function set_ec_address2($value) - { - $this->ec_address2 = urlencode($value); - } - - function get_ec_address2() - { - return $this->ec_address2; - } - - function set_ec_bank_name($value) - { - $this->ec_bank_name = urlencode($value); - } - - function get_ec_bank_name() - { - return $this->ec_bank_name; - } - - function set_ec_business_acct($value) - { - $this->ec_business_acct = urlencode($value); - } - - function get_ec_business_acct() - { - return $this->ec_business_acct; - } - - function set_ec_city($value) - { - $this->ec_city = $value; - } - - function get_ec_city() - { - return $this->ec_city; - } - - function set_ec_email($value) - { - $this->ec_email = urlencode($value); - } - - function get_ec_email() - { - return $this->ec_email; - } - - function set_ec_first_name($value) - { - $this->ec_first_name = urlencode($value); - } - - function get_ec_first_name() - { - return $this->ec_first_name; - } - - function set_ec_id_country($value) - { - $this->ec_id_country = urlencode($value); - } - - function get_ec_id_country() - { - return $this->ec_id_country; - } - - function set_ec_id_exp_mm($value) - { - $this->ec_id_exp_mm = $value; - } - - function get_ec_id_exp_mm() - { - return $this->ec_id_exp_mm; - } - - function set_ec_id_exp_dd($value) - { - $this->ec_id_exp_dd = $value; - } - - function get_ec_id_exp_dd() - { - return $this->ec_id_exp_dd; - } - - function set_ec_id_exp_yy($value) - { - $this->ec_id_exp_yy = $value; - } - - function get_ec_id_exp_yy() - { - return $this->ec_id_exp_yy; - } - - function set_ec_id_number($value) - { - $this->ec_id_number = urlencode($value); - } - - function get_ec_id_number() - { - return $this->ec_id_number; - } - - function set_ec_id_state($value) - { - $this->ec_id_state = urlencode($value); - } - - function get_ec_id_state() - { - return $this->ec_id_state; - } - - function set_ec_id_type($value) - { - $this->ec_id_type = $value; - } - - function get_ec_id_type() - { - return $this->ec_id_type; - } - - function set_ec_last_name($value) - { - $this->ec_last_name = urlencode($value); - } - - function get_ec_last_name() - { - return $this->ec_last_name; - } - - function set_ec_merchant_ref($value) - { - $this->ec_merchant_ref = $value; - } - - function get_ec_merchant_ref() - { - return $this->ec_merchant_ref; - } - - function set_ec_nbds_code($value) - { - $this->ec_nbds_code = $value; - } - - function get_ec_nbds_code() - { - return $this->ec_nbds_code; - } - - function set_ec_other_name($value) - { - $this->ec_other_name = urlencode($value); - } - - function get_ec_other_name() - { - return $this->ec_other_name; - } - - function set_ec_payee($value) - { - $this->ec_payee = urlencode($value); - } - - function get_ec_payee() - { - return $this->ec_payee; - } - - function set_ec_rt($value) - { - $this->ec_rt = urlencode($value); - } - - function get_ec_rt() - { - return $this->ec_rt; - } - - function set_ec_serial_number($value) - { - $this->ec_serial_number = urlencode($value); - } - - function get_ec_serial_number() - { - return $this->ec_serial_number; - } - - function set_ec_state($value) - { - $this->ec_state = urlencode($value); - } - - function get_ec_state() - { - return $this->ec_state; - } - - function set_ec_zip($value) - { - $this->ec_zip = urlencode($value); - } - - function get_ec_zip() - { - return $this->ec_zip; - } - - function set_grand_total($value) - { - $this->grand_total = sprintf('%01.2f', $value); - } - - function get_grand_total() - { - return $this->grand_total; - } - - function set_merchant_email($value) - { - $this->merchant_email = urlencode($value); - } - - function get_merchant_email() - { - return $this->merchant_email; - } - - function set_merchant_trace_nbr($value) - { - $this->merchant_trace_nbr = $value; - } - - function get_merchant_trace_nbr() - { - return $this->merchant_trace_nbr; - } - - function set_original_amount($value) - { - $this->original_amount = sprintf('%01.2f', $value); - } - - function get_original_amount() - { - return $this->original_amount; - } - - function set_original_trandate_mm($value) - { - $this->original_trandate_mm = $value; - } - - function get_original_trandate_mm() - { - return $this->original_trandate_mm; - } - - function set_original_trandate_dd($value) - { - $this->original_trandate_dd = $value; - } - - function get_original_trandate_dd() - { - return $this->original_trandate_dd; - } - - function set_original_trandate_yyyy($value) - { - $this->original_trandate_yyyy = $value; - } - - function get_original_trandate_yyyy() - { - return $this->original_trandate_yyyy; - } - - function set_original_reference($value) - { - $this->original_reference = $value; - } - - function get_original_reference() - { - return $this->original_reference; - } - - function set_order_number($value) - { - $this->order_number = $value; - } - - function get_order_number() - { - return $this->order_number; - } - - function set_shipping_flag($value) - { - $this->shipping_flag = $value; - } - - function get_shipping_flag() - { - return $this->shipping_flag; - } - - function set_shipping_prefix($value) - { - $this->shipping_prefix = urlencode($value); - } - - function get_shipping_prefix() - { - return $this->shipping_prefix; - } - - function set_shipping_name($value) - { - $this->shipping_name = urlencode($value); - } - - function get_shipping_name() - { - return $this->shipping_name; - } - - function set_shipping_address1($value) - { - $this->shipping_address1 = urlencode($value); - } - - function get_shipping_address1() - { - return $this->shipping_address1; - } - - function set_shipping_address2($value) - { - $this->shipping_address2 = urlencode($value); - } - - function get_shipping_address2() - { - return $this->shipping_address2; - } - - function set_shipping_city($value) - { - $this->shipping_city = urlencode($value); - } - - function get_shipping_city() - { - return $this->shipping_city; - } - - function set_shipping_state($value) - { - $this->shipping_state = urlencode($value); - } - - function get_shipping_state() - { - return $this->shipping_state; - } - - function set_shipping_zip($value) - { - $this->shipping_zip = urlencode($value); - } - - function get_shipping_zip() - { - return $this->shipping_zip; - } - - function set_shipping_comments($value) - { - $this->shipping_comments = urlencode($value); - } - - function get_shipping_comments() - { - return $this->shipping_comments; - } - - function set_shipping_country($value) - { - $this->shipping_country = urlencode($value); - } - - function get_shipping_country() - { - return $this->shipping_country; - } - - function set_shipping_phone($value) - { - $this->shipping_phone = urlencode($value); - } - - function get_shipping_phone() - { - return $this->shipping_phone; - } - - function set_shipping_fax($value) - { - $this->shipping_fax = urlencode($value); - } - - function get_shipping_fax() - { - return $this->shipping_fax; - } - - function set_shipper($value) - { - $this->shipper = urlencode($value); - } - - function get_shipper() - { - return $this->shipper; - } - - function set_shipper_tracking_nbr($value) - { - $this->shipper_tracking_nbr = $value; - } - - function get_shipper_tracking_nbr() - { - return $this->shipper_tracking_nbr; - } - - function set_track1($value) - { - $this->track1 = urlencode($value); - } - - function get_track1() - { - return $this->track1; - } - - function set_track2($value) - { - $this->track2 = urlencode($value); - } - - function get_track2() - { - return $this->track2; - } - - /************************************************ - Helper functions - ************************************************/ - function get_version() - { - return 'ECHOPHP 1.4.4 10/23/2001'; - } - - function getRandomCounter() - { - mt_srand ((double) microtime() * 1000000); - return mt_rand(); - } - - function get_EchoResponse() - { - return $this->EchoResponse; - } - - function get_echotype1() - { - return $this->echotype1; - } - - function get_echotype2() - { - return $this->echotype2; - } - - function get_echotype3() - { - return $this->echotype3; - } - - function get_openecho() - { - return $this->openecho; - } - - function set_EchoServer($value) - { - $this->EchoServer = $value; - } - - function get_authorization() - { - return $this->authorization; - } - - function get_avs_result() - { - return $this->avs_result; - } - - function get_reference() - { - return $this->reference; - } - - function get_order_number() - { - return $this->order_number; - } - - function get_EchoSuccess() - { - return $this->EchoSuccess; - } - - function get_status() - { - return $this->status; - } - - function GetEchoProp($Haystack, $Prop) - { - // prepend garbage in case the property - // starts at position 0 - $Haystack = 'garbage' . $Haystack; - - if ($StartPos = strpos($Haystack, "<$Prop>")) - { - $StartPos = strpos($Haystack, "<$Prop>") + strlen("<$Prop>"); - $EndPos = strpos($Haystack, "echotype3, '')) - { - $startpos = strpos($this->echotype3, '') + 11; - $endpos = strpos($this->echotype3, ''); - $this->authorization = substr($this->echotype3, $startpos, $endpos - $startpos); - } - } - - function GetOrderNumberFromEcho() - { - if ($startpos = strpos($this->echotype3, '')) - { - $startpos = strpos($this->echotype3, '') + 14; - $endpos = strpos($this->echotype3, ''); - $this->order_number = substr($this->echotype3, $startpos, $endpos - $startpos); - } - } - - function GetReferenceFromEcho() - { - if ($startpos = strpos($this->echotype3, '')) - { - $startpos = strpos($this->echotype3, '') + 16; - $endpos = strpos($this->echotype3, ''); - $this->reference = substr($this->echotype3, $startpos, $endpos - $startpos); - } - } - } // end of class -?> + * + * -------------------------------------------- * + * This program is free software; you can redistribute it and/or modify it * + * under the terms of the GNU General Public License as published by the * + * Free Software Foundation; either version 2 of the License, or (at your * + * option) any later version. * + \**************************************************************************/ + + /* $Id$ */ + + /*==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-*/ + // // + // Name: ECHOPHP v1.4.4 // + // Description: PHP Class used to interface with // + // ECHO (http://www.echo-inc.com). // + // Requirements: cURL - http://curl.haxx.se/ // + // OpenSSL - http://www.openssl.org // + // Refer to ECHO's documentation for more info // + // https://wwws.echo-inc.com // + // // + /*==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-==-*/ + + class payment + { + var $order_type; + var $transaction_type; + var $merchant_echo_id; + var $merchant_pin; + var $isp_echo_id; + var $isp_pin; + var $authorization; + var $billing_ip_address; + var $billing_prefix; + var $billing_name; + var $billing_address1; + var $billing_address2; + var $billing_city; + var $billing_state; + var $billing_zip; + var $billing_country; + var $billing_phone; + var $billing_fax; + var $billing_email; + var $cc_number; + var $ccexp_month; + var $ccexp_year; + var $counter; + var $debug; + var $ec_account; + var $ec_address1; + var $ec_address2; + var $ec_bank_name; + var $ec_business_acct; + var $ec_city; + var $ec_email; + var $ec_first_name; + var $ec_id_country; + var $ec_id_exp_mm; + var $ec_id_exp_dd; + var $ec_id_exp_yy; + var $ec_id_number; + var $ec_id_state; + var $ec_id_type; + var $ec_last_name; + var $ec_merchant_ref; + var $ec_nbds_code; + var $ec_other_name; + var $ec_payee; + var $ec_rt; + var $ec_serial_number; + var $ec_state; + var $ec_zip; + var $grand_total; + var $merchant_email; + var $merchant_trace_nbr; + var $original_amount; + var $original_trandate_mm; + var $original_trandate_dd; + var $original_trandate_yyyy; + var $original_reference; + var $order_number; + var $shipping_flag; + var $status; + var $shipping_prefix; + var $shipping_name; + var $shipping_address1; + var $shipping_address2; + var $shipping_city; + var $shipping_state; + var $shipping_zip; + var $shipping_comments; + var $shipping_country; + var $shipping_phone; + var $shipping_fax; + var $shipper; + var $shipper_tracking_nbr; + var $track1; + var $track2; + var $EchoResponse; + var $echotype1; + var $echotype2; + var $echotype3; + var $openecho; + var $avs_result; + var $athorization; + var $reference; + var $EchoSuccess; + + function submit() + { + if ($this->EchoServer) + { + $URL = $this->EchoServer; + } + else + { + $URL = 'https://wwws.echo-inc.com/scripts/INR300.EXE'; + } + + $this->EchoResponse = ''; + + $data = $this->getURLData(); + + $ch = curl_init(); + curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1); + curl_setopt ($ch, CURLOPT_URL, $URL); + curl_setopt ($ch, CURLOPT_POST, $data); + curl_setopt ($ch, CURLOPT_POSTFIELDS, $data); + $this->EchoResponse = curl_exec ($ch); + curl_close ($ch); + + $startpos = strpos($this->EchoResponse, '') + 11; + $endpos = strpos($this->EchoResponse, ''); + $this->echotype1 = substr($this->EchoResponse, $startpos, $endpos - $startpos); + + $startpos = strpos($this->EchoResponse, '') + 11; + $endpos = strpos($this->EchoResponse, ''); + $this->echotype2 = substr($this->EchoResponse, $startpos, $endpos - $startpos); + + $startpos = strpos($this->EchoResponse, '') + 11; + $endpos = strpos($this->EchoResponse, ''); + $this->echotype3 = substr($this->EchoResponse, $startpos, $endpos - $startpos); + + if (strpos($this->EchoResponse, '')) + { + $startpos = strpos($this->EchoResponse, '') + 10; + $endpos = strpos($this->EchoResponse, ''); + $this->openecho = substr($this->EchoResponse, $startpos, $endpos - $startpos); + } + + // Get all the metadata. + $this->GetAuthFromEcho(); + $this->GetOrderNumberFromEcho(); + $this->GetReferenceFromEcho(); + $this->status = $this->GetEchoProp($this->echotype3, 'status'); + $this->avs_result = $this->GetEchoProp($this->echotype3, 'avs_result'); + + if ($this->transaction_type == 'AD') + { + if ($this->avs_result == 'X' or $this->avs_result == 'Y') + { + $this->EchoSuccess = true; + } + else + { + $this->EchoSuccess = false; + } + } + else + { + $this->EchoSuccess = !($this->status == 'D'); + } + + if ($this->EchoResponse == '') + { + $this->EchoSuccess = False; + } + + // make sure we assign an integer to EchoSuccess + ($this->EchoSuccess == true) ? ($this->EchoSuccess = true) : ($this->EchoSuccess = false); + + return $this->EchoSuccess; + } // function submit + + function getURLData() + { + $s .= + 'order_type=' . $this->order_type . + '&transaction_type=' . $this->transaction_type . + '&merchant_echo_id=' . $this->merchant_echo_id . + '&merchant_pin=' . $this->merchant_pin . + '&isp_echo_id=' . $this->isp_echo_id . + '&isp_pin=' . $this->isp_pin . + '&authorization=' . $this->authorization . + '&billing_ip_address=' . $this->billing_ip_address . + '&billing_prefix=' . $this->billing_prefix . + '&billing_name=' . $this->billing_name . + '&billing_address1=' . $this->billing_address1 . + '&billing_address2=' . $this->billing_address2 . + '&billing_city=' . $this->billing_city . + '&billing_state=' . $this->billing_state . + '&billing_zip=' . $this->billing_zip . + '&billing_country=' . $this->billing_country . + '&billing_phone=' . $this->billing_phone . + '&billing_fax=' . $this->billing_fax . + '&billing_email=' . $this->billing_email . + '&cc_number=' . $this->cc_number . + '&ccexp_month=' . $this->ccexp_month . + '&ccexp_year=' . $this->ccexp_year . + '&counter=' . $this->counter . + '&debug=' . $this->debug . + '&transaction_type=' . $this->transaction_type; + + if (($this->transaction_type == 'DD') || + ($this->transaction_type == 'DC') || + ($this->transaction_type == 'DV')) + { + $s .= + '&ec_account=' . $this->ec_account . + '&ec_address1=' . $this->ec_address1 . + '&ec_address2=' . $this->ec_address2 . + '&ec_bank_name=' . $this->ec_bank_name . + '&ec_business_acct=' . $this->ec_business_acct . + '&ec_city=' . $this->ec_city . + '&ec_email=' . $this->ec_email . + '&ec_first_name=' . $this->ec_first_name . + '&ec_id_country=' . $this->ec_id_country . + '&ec_id_exp_mm=' . $this->ec_id_exp_mm . + '&ec_id_exp_dd=' . $this->ec_id_exp_dd . + '&ec_id_exp_yy=' . $this->ec_id_exp_yy . + '&ec_id_number=' . $this->ec_id_number . + '&ec_id_state=' . $this->ec_id_state . + '&ec_id_type=' . $this->ec_id_type . + '&ec_last_name=' . $this->ec_last_name . + '&ec_merchant_ref=' . $this->ec_merchant_ref . + '&ec_nbds_code=' . $this->ec_nbds_code . + '&ec_other_name=' . $this->ec_other_name . + '&ec_payee=' . $this->ec_payee . + '&ec_rt=' . $this->ec_rt . + '&ec_serial_number=' . $this->ec_serial_number . + '&ec_state=' . $this->ec_state . + '&ec_zip=' . $this->ec_zip; + } + + $s .= + '&grand_total=' . $this->grand_total . + '&merchant_email=' . $this->merchant_email . + '&merchant_trace_nbr=' . $this->merchant_trace_nbr . + '&original_amount=' . $this->original_amount . + '&original_trandate_mm=' . $this->original_trandate_mm . + '&original_trandate_dd=' . $this->original_trandate_dd . + '&original_trandate_yyyy=' . $this->original_trandate_yyyy . + '&original_reference=' . $this->original_reference . + '&order_number=' . $this->order_number . + '&shipping_flag=' . $this->shipping_flag . + '&shipping_prefix=' . $this->shipping_prefix . + '&shipping_name=' . $this->shipping_name . + '&shipping_address1=' . $this->shipping_address1 . + '&shipping_address2=' . $this->shipping_address2 . + '&shipping_city=' . $this->shipping_city . + '&shipping_state=' . $this->shipping_state . + '&shipping_zip=' . $this->shipping_zip . + '&shipping_comments=' . $this->shipping_comments . + '&shipping_country=' . $this->shipping_country . + '&shipping_phone=' . $this->shipping_phone . + '&shipping_fax=' . $this->shipping_fax . + '&shipper=' . $this->shipper . + '&shipper_tracking_nbr=' . $this->shipper_tracking_nbr . + '&track1=' . $this->track1 . + '&track2=' . $this->track2; + + return $s; + } /* end getURLData */ + + /********************************************** + All the get/set methods for the echo properties + ***********************************************/ + function set_order_type($value) + { + $this->order_type = $value; + } + + function get_order_type() + { + return $this->order_type; + } + + function set_transaction_type($value) + { + $this->transaction_type = $value; + } + + function get_transaction_type() + { + return $this->transaction_type; + } + + function set_merchant_echo_id($value) + { + $this->merchant_echo_id = urlencode($value); + } + + function get_merchant_echo_id() + { + return $this->merchant_echo_id; + } + + function set_merchant_pin($value) + { + $this->merchant_pin = urlencode($value); + } + + function get_merchant_pin() + { + return $this->merchant_pin; + } + + function set_isp_echo_id($value) + { + $this->isp_echo_id = urlencode($value); + } + + function get_isp_echo_id() + { + return $this->isp_echo_id; + } + + function set_isp_pin($value) + { + $this->isp_pin = urlencode($value); + } + + function get_isp_pin() + { + return $this->isp_pin; + } + + function set_authorization($value) + { + $this->authorization = $value; + } + + function get_authorization() + { + return $this->authorization; + } + + function set_billing_ip_address($value) + { + $this->billing_ip_address = $value; + } + + function get_billing_ip_address() + { + return $this->billing_ip_address; + } + + function set_billing_prefix($value) + { + $this->billing_prefix = urlencode($value); + } + + function get_billing_prefix() + { + return $this->billing_prefix; + } + + function set_billing_name($value) + { + $this->billing_name = urlencode($value); + } + + function get_billing_name() + { + return $this->billing_name; + } + + function set_billing_address1($value) + { + $this->billing_address1 = urlencode($value); + } + + function get_billing_address1() + { + return $this->billing_address1; + } + + function set_billing_address2($value) + { + $this->billing_address2 = urlencode($value); + } + + function get_billing_address2() + { + return $this->billing_address2; + } + + function set_billing_city($value) + { + $this->billing_city = urlencode($value); + } + + function get_billing_city() + { + return $this->billing_city; + } + + function set_billing_state($value) + { + $this->billing_state = urlencode($value); + } + + function get_billing_state() + { + return $this->billing_state; + } + + function set_billing_zip($value) + { + $this->billing_zip = urlencode($value); + } + + function get_billing_zip() + { + return $this->billing_zip; + } + + function set_billing_country($value) + { + $this->billing_country = urlencode($value); + } + + function get_billing_country() + { + return $this->billing_country; + } + + function set_billing_phone($value) + { + $this->billing_phone = urlencode($value); + } + + function get_billing_phone() + { + return $this->billing_phone; + } + + function set_billing_fax($value) + { + $this->billing_fax = urlencode($value); + } + + function get_billing_fax() + { + return $this->billing_fax; + } + + function set_billing_email($value) + { + $this->billing_email = urlencode($value); + } + + function get_billing_email() + { + return $this->billing_email; + } + + function set_cc_number($value) + { + $this->cc_number = urlencode($value); + } + + function get_cc_number() + { + return $this->cc_number; + } + + function set_ccexp_month($value) + { + $this->ccexp_month = $value; + } + + function get_ccexp_month() + { + return $this->ccexp_month; + } + + function set_ccexp_year($value) + { + $this->ccexp_year = $value; + } + + function get_ccexp_year() + { + return $this->ccexp_year; + } + + function set_counter($value) + { + $this->counter = $value; + } + + function get_counter() + { + return $this->counter; + } + + function set_debug($value) + { + $this->debug = $value; + } + + function get_debug() + { + return $this->debug; + } + + function set_ec_account($value) + { + $this->ec_account = urlencode($value); + } + + function get_ec_account() + { + return $this->ec_account; + } + + function set_ec_address1($value) + { + $this->ec_address1 = urlencode($value); + } + + function get_ec_address1() + { + return $this->ec_address1; + } + + function set_ec_address2($value) + { + $this->ec_address2 = urlencode($value); + } + + function get_ec_address2() + { + return $this->ec_address2; + } + + function set_ec_bank_name($value) + { + $this->ec_bank_name = urlencode($value); + } + + function get_ec_bank_name() + { + return $this->ec_bank_name; + } + + function set_ec_business_acct($value) + { + $this->ec_business_acct = urlencode($value); + } + + function get_ec_business_acct() + { + return $this->ec_business_acct; + } + + function set_ec_city($value) + { + $this->ec_city = $value; + } + + function get_ec_city() + { + return $this->ec_city; + } + + function set_ec_email($value) + { + $this->ec_email = urlencode($value); + } + + function get_ec_email() + { + return $this->ec_email; + } + + function set_ec_first_name($value) + { + $this->ec_first_name = urlencode($value); + } + + function get_ec_first_name() + { + return $this->ec_first_name; + } + + function set_ec_id_country($value) + { + $this->ec_id_country = urlencode($value); + } + + function get_ec_id_country() + { + return $this->ec_id_country; + } + + function set_ec_id_exp_mm($value) + { + $this->ec_id_exp_mm = $value; + } + + function get_ec_id_exp_mm() + { + return $this->ec_id_exp_mm; + } + + function set_ec_id_exp_dd($value) + { + $this->ec_id_exp_dd = $value; + } + + function get_ec_id_exp_dd() + { + return $this->ec_id_exp_dd; + } + + function set_ec_id_exp_yy($value) + { + $this->ec_id_exp_yy = $value; + } + + function get_ec_id_exp_yy() + { + return $this->ec_id_exp_yy; + } + + function set_ec_id_number($value) + { + $this->ec_id_number = urlencode($value); + } + + function get_ec_id_number() + { + return $this->ec_id_number; + } + + function set_ec_id_state($value) + { + $this->ec_id_state = urlencode($value); + } + + function get_ec_id_state() + { + return $this->ec_id_state; + } + + function set_ec_id_type($value) + { + $this->ec_id_type = $value; + } + + function get_ec_id_type() + { + return $this->ec_id_type; + } + + function set_ec_last_name($value) + { + $this->ec_last_name = urlencode($value); + } + + function get_ec_last_name() + { + return $this->ec_last_name; + } + + function set_ec_merchant_ref($value) + { + $this->ec_merchant_ref = $value; + } + + function get_ec_merchant_ref() + { + return $this->ec_merchant_ref; + } + + function set_ec_nbds_code($value) + { + $this->ec_nbds_code = $value; + } + + function get_ec_nbds_code() + { + return $this->ec_nbds_code; + } + + function set_ec_other_name($value) + { + $this->ec_other_name = urlencode($value); + } + + function get_ec_other_name() + { + return $this->ec_other_name; + } + + function set_ec_payee($value) + { + $this->ec_payee = urlencode($value); + } + + function get_ec_payee() + { + return $this->ec_payee; + } + + function set_ec_rt($value) + { + $this->ec_rt = urlencode($value); + } + + function get_ec_rt() + { + return $this->ec_rt; + } + + function set_ec_serial_number($value) + { + $this->ec_serial_number = urlencode($value); + } + + function get_ec_serial_number() + { + return $this->ec_serial_number; + } + + function set_ec_state($value) + { + $this->ec_state = urlencode($value); + } + + function get_ec_state() + { + return $this->ec_state; + } + + function set_ec_zip($value) + { + $this->ec_zip = urlencode($value); + } + + function get_ec_zip() + { + return $this->ec_zip; + } + + function set_grand_total($value) + { + $this->grand_total = sprintf('%01.2f', $value); + } + + function get_grand_total() + { + return $this->grand_total; + } + + function set_merchant_email($value) + { + $this->merchant_email = urlencode($value); + } + + function get_merchant_email() + { + return $this->merchant_email; + } + + function set_merchant_trace_nbr($value) + { + $this->merchant_trace_nbr = $value; + } + + function get_merchant_trace_nbr() + { + return $this->merchant_trace_nbr; + } + + function set_original_amount($value) + { + $this->original_amount = sprintf('%01.2f', $value); + } + + function get_original_amount() + { + return $this->original_amount; + } + + function set_original_trandate_mm($value) + { + $this->original_trandate_mm = $value; + } + + function get_original_trandate_mm() + { + return $this->original_trandate_mm; + } + + function set_original_trandate_dd($value) + { + $this->original_trandate_dd = $value; + } + + function get_original_trandate_dd() + { + return $this->original_trandate_dd; + } + + function set_original_trandate_yyyy($value) + { + $this->original_trandate_yyyy = $value; + } + + function get_original_trandate_yyyy() + { + return $this->original_trandate_yyyy; + } + + function set_original_reference($value) + { + $this->original_reference = $value; + } + + function get_original_reference() + { + return $this->original_reference; + } + + function set_order_number($value) + { + $this->order_number = $value; + } + + function get_order_number() + { + return $this->order_number; + } + + function set_shipping_flag($value) + { + $this->shipping_flag = $value; + } + + function get_shipping_flag() + { + return $this->shipping_flag; + } + + function set_shipping_prefix($value) + { + $this->shipping_prefix = urlencode($value); + } + + function get_shipping_prefix() + { + return $this->shipping_prefix; + } + + function set_shipping_name($value) + { + $this->shipping_name = urlencode($value); + } + + function get_shipping_name() + { + return $this->shipping_name; + } + + function set_shipping_address1($value) + { + $this->shipping_address1 = urlencode($value); + } + + function get_shipping_address1() + { + return $this->shipping_address1; + } + + function set_shipping_address2($value) + { + $this->shipping_address2 = urlencode($value); + } + + function get_shipping_address2() + { + return $this->shipping_address2; + } + + function set_shipping_city($value) + { + $this->shipping_city = urlencode($value); + } + + function get_shipping_city() + { + return $this->shipping_city; + } + + function set_shipping_state($value) + { + $this->shipping_state = urlencode($value); + } + + function get_shipping_state() + { + return $this->shipping_state; + } + + function set_shipping_zip($value) + { + $this->shipping_zip = urlencode($value); + } + + function get_shipping_zip() + { + return $this->shipping_zip; + } + + function set_shipping_comments($value) + { + $this->shipping_comments = urlencode($value); + } + + function get_shipping_comments() + { + return $this->shipping_comments; + } + + function set_shipping_country($value) + { + $this->shipping_country = urlencode($value); + } + + function get_shipping_country() + { + return $this->shipping_country; + } + + function set_shipping_phone($value) + { + $this->shipping_phone = urlencode($value); + } + + function get_shipping_phone() + { + return $this->shipping_phone; + } + + function set_shipping_fax($value) + { + $this->shipping_fax = urlencode($value); + } + + function get_shipping_fax() + { + return $this->shipping_fax; + } + + function set_shipper($value) + { + $this->shipper = urlencode($value); + } + + function get_shipper() + { + return $this->shipper; + } + + function set_shipper_tracking_nbr($value) + { + $this->shipper_tracking_nbr = $value; + } + + function get_shipper_tracking_nbr() + { + return $this->shipper_tracking_nbr; + } + + function set_track1($value) + { + $this->track1 = urlencode($value); + } + + function get_track1() + { + return $this->track1; + } + + function set_track2($value) + { + $this->track2 = urlencode($value); + } + + function get_track2() + { + return $this->track2; + } + + /************************************************ + Helper functions + ************************************************/ + function get_version() + { + return 'ECHOPHP 1.4.4 10/23/2001'; + } + + function getRandomCounter() + { + mt_srand ((double) microtime() * 1000000); + return mt_rand(); + } + + function get_EchoResponse() + { + return $this->EchoResponse; + } + + function get_echotype1() + { + return $this->echotype1; + } + + function get_echotype2() + { + return $this->echotype2; + } + + function get_echotype3() + { + return $this->echotype3; + } + + function get_openecho() + { + return $this->openecho; + } + + function set_EchoServer($value) + { + $this->EchoServer = $value; + } + + function get_avs_result() + { + return $this->avs_result; + } + + function get_reference() + { + return $this->reference; + } + + function get_order_number() + { + return $this->order_number; + } + + function get_EchoSuccess() + { + return $this->EchoSuccess; + } + + function get_status() + { + return $this->status; + } + + function GetEchoProp($Haystack, $Prop) + { + // prepend garbage in case the property + // starts at position 0 + $Haystack = 'garbage' . $Haystack; + + if ($StartPos = strpos($Haystack, "<$Prop>")) + { + $StartPos = strpos($Haystack, "<$Prop>") + strlen("<$Prop>"); + $EndPos = strpos($Haystack, "echotype3, '')) + { + $startpos = strpos($this->echotype3, '') + 11; + $endpos = strpos($this->echotype3, ''); + $this->authorization = substr($this->echotype3, $startpos, $endpos - $startpos); + } + } + + function GetOrderNumberFromEcho() + { + if ($startpos = strpos($this->echotype3, '')) + { + $startpos = strpos($this->echotype3, '') + 14; + $endpos = strpos($this->echotype3, ''); + $this->order_number = substr($this->echotype3, $startpos, $endpos - $startpos); + } + } + + function GetReferenceFromEcho() + { + if ($startpos = strpos($this->echotype3, '')) + { + $startpos = strpos($this->echotype3, '') + 16; + $endpos = strpos($this->echotype3, ''); + $this->reference = substr($this->echotype3, $startpos, $endpos - $startpos); + } + } + } // end of class +?> From MAILER-DAEMON Mon Apr 18 04:51:42 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNRxN-0000so-JZ for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:50:15 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNRwg-0000jm-MI for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:49:31 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNRwL-0000aB-GU for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:49:11 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNRhc-0007Vw-4Q for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:33:58 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNRik-0000v6-3g for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:35:06 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 5828E312CC for ; Mon, 18 Apr 2005 10:32:31 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 16073-05 for ; Mon, 18 Apr 2005 10:32:27 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id DF6F9312B5 for ; Mon, 18 Apr 2005 10:32:27 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I8WSJ02416; Mon, 18 Apr 2005 10:32:28 +0200 Message-Id: <200504180832.j3I8WSJ02416@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 10:21:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] cdb/inc class.cdb_address.inc.php, 1.4 class.cdb_contact_address.inc.php, 1.4 class.cdb_contact_personal.inc.php, 1.7 class.cdb_contact_phone.inc.php, 1.5 class.cdb_phone.inc.php, 1.7 class.cdb_organization_location.inc.php, 1.5 class.cdb_organization.inc.php, 1.4 class.cdb_organization_client.inc.php, 1.3 class.cdb_contact.inc.php, 1.8 class.cdb_template.inc.php, 1.3 class.bo_filter.inc.php, 1.3 class.cdb_contact_internet.inc.php, 1.3 class.cdb_entity_meta.inc.php, 1.4 class.cdb_entity.inc.php, 1.7 class.cdb_contact_client.inc.php, 1.3 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 08:50:05 -0000 Update of cdb/inc Modified Files: Branch: MAIN class.cdb_address.inc.php lines: +3 -2 class.cdb_contact_address.inc.php lines: +2 -2 class.cdb_contact_personal.inc.php lines: +1 -2 class.cdb_contact_phone.inc.php lines: +2 -2 class.cdb_phone.inc.php lines: +3 -1 class.cdb_organization_location.inc.php lines: +3 -1 class.cdb_organization.inc.php lines: +3 -3 class.cdb_organization_client.inc.php lines: +3 -1 class.cdb_contact.inc.php lines: +3 -3 class.cdb_template.inc.php lines: +2 -2 class.bo_filter.inc.php lines: +2 -2 class.cdb_contact_internet.inc.php lines: +4 -2 class.cdb_entity_meta.inc.php lines: +2 -2 class.cdb_entity.inc.php lines: +3 -3 class.cdb_contact_client.inc.php lines: +3 -1 Log Message: Fixed various syntax errors ==================================================== Index: cdb/inc/class.cdb_address.inc.php diff -u cdb/inc/class.cdb_address.inc.php:1.3 cdb/inc/class.cdb_address.inc.php:1.4 --- cdb/inc/class.cdb_address.inc.php:1.3 Wed Feb 20 22:12:58 2002 +++ cdb/inc/class.cdb_address.inc.php Mon Apr 18 08:21:56 2005 @@ -104,6 +104,7 @@ { reset($this->_dirty); do + { $key = key($this->_dirty); switch($key) { @@ -113,7 +114,7 @@ $sql.=$key.'="'; $sql .= $this->_get($key) . '", '; } - + } while (next($this->_dirty)); if ($sql) ==================================================== Index: cdb/inc/class.cdb_contact_address.inc.php diff -u cdb/inc/class.cdb_contact_address.inc.php:1.3 cdb/inc/class.cdb_contact_address.inc.php:1.4 --- cdb/inc/class.cdb_contact_address.inc.php:1.3 Wed Feb 20 22:12:58 2002 +++ cdb/inc/class.cdb_contact_address.inc.php Mon Apr 18 08:21:56 2005 @@ -30,7 +30,7 @@ function save() { - reset $this->_address_list; + reset($this->_address_list); $retval = FALSE; while (list($key,$value) = $this->_address_list) { ==================================================== Index: cdb/inc/class.cdb_contact_personal.inc.php diff -u cdb/inc/class.cdb_contact_personal.inc.php:1.6 cdb/inc/class.cdb_contact_personal.inc.php:1.7 --- cdb/inc/class.cdb_contact_personal.inc.php:1.6 Wed Feb 20 22:12:58 2002 +++ cdb/inc/class.cdb_contact_personal.inc.php Mon Apr 18 08:21:56 2005 @@ -72,7 +72,6 @@ case 'male': case 'female': return $this->_let('gender', $new_gender); - break; case default: return FALSE; } ==================================================== Index: cdb/inc/class.cdb_contact_phone.inc.php diff -u cdb/inc/class.cdb_contact_phone.inc.php:1.4 cdb/inc/class.cdb_contact_phone.inc.php:1.5 --- cdb/inc/class.cdb_contact_phone.inc.php:1.4 Wed Feb 20 22:12:58 2002 +++ cdb/inc/class.cdb_contact_phone.inc.php Mon Apr 18 08:21:56 2005 @@ -30,7 +30,7 @@ function save() { - reset $this->_phone_list; + reset($this->_phone_list); $retval = FALSE; while (list($key,$value) = $this->_phone_list) { ==================================================== Index: cdb/inc/class.cdb_phone.inc.php diff -u cdb/inc/class.cdb_phone.inc.php:1.6 cdb/inc/class.cdb_phone.inc.php:1.7 --- cdb/inc/class.cdb_phone.inc.php:1.6 Wed Feb 20 22:12:57 2002 +++ cdb/inc/class.cdb_phone.inc.php Mon Apr 18 08:21:56 2005 @@ -36,8 +36,10 @@ { reset($this->_dirty); do + { $key = key($this->_dirty); $sql.=$key.'="'; + } while (next($this->_dirty)); $sql .= $this->_get($key) . '", '; if ($sql) ==================================================== Index: cdb/inc/class.cdb_organization_location.inc.php diff -u cdb/inc/class.cdb_organization_location.inc.php:1.4 cdb/inc/class.cdb_organization_location.inc.php:1.5 --- cdb/inc/class.cdb_organization_location.inc.php:1.4 Wed Feb 20 22:12:57 2002 +++ cdb/inc/class.cdb_organization_location.inc.php Mon Apr 18 08:21:56 2005 @@ -115,6 +115,7 @@ { reset($this->_dirty); do + { $key = key($this->_dirty); switch($key) { @@ -124,6 +125,7 @@ $sql.=$key.'="'; $sql .= $this->_get($key) . '", '; } + } while (next($this->_dirty)); if ($sql) ==================================================== Index: cdb/inc/class.cdb_organization.inc.php diff -u cdb/inc/class.cdb_organization.inc.php:1.3 cdb/inc/class.cdb_organization.inc.php:1.4 --- cdb/inc/class.cdb_organization.inc.php:1.3 Fri Mar 1 21:13:20 2002 +++ cdb/inc/class.cdb_organization.inc.php Mon Apr 18 08:21:56 2005 @@ -72,8 +72,8 @@ function create($name) { global $cdb_ver; - unset $this->_meta; - unset $this->_client; + unset($this->_meta); + unset($this->_client); $this->_id = 0; $this->_let('organization_id',0); ==================================================== Index: cdb/inc/class.cdb_organization_client.inc.php diff -u cdb/inc/class.cdb_organization_client.inc.php:1.2 cdb/inc/class.cdb_organization_client.inc.php:1.3 --- cdb/inc/class.cdb_organization_client.inc.php:1.2 Wed Feb 20 22:12:58 2002 +++ cdb/inc/class.cdb_organization_client.inc.php Mon Apr 18 08:21:56 2005 @@ -82,6 +82,7 @@ { reset($this->_dirty); do + { $key = key($this->_dirty); switch($key) { @@ -91,6 +92,7 @@ $sql.=$key.'="'; $sql .= $this->_get($key) . '", '; } + } while (next($this->_dirty)); if ($sql) ==================================================== Index: cdb/inc/class.cdb_contact.inc.php diff -u cdb/inc/class.cdb_contact.inc.php:1.7 cdb/inc/class.cdb_contact.inc.php:1.8 --- cdb/inc/class.cdb_contact.inc.php:1.7 Wed Feb 20 22:12:58 2002 +++ cdb/inc/class.cdb_contact.inc.php Mon Apr 18 08:21:56 2005 @@ -93,8 +93,8 @@ function create($name) { global $cdb_ver; - unset $this->_meta; - unset $this->_client; + unset($this->_meta); + unset($this->_client); $this->_id = 0; $this->_let('contact_id',0); ==================================================== Index: cdb/inc/class.cdb_template.inc.php diff -u cdb/inc/class.cdb_template.inc.php:1.2 cdb/inc/class.cdb_template.inc.php:1.3 --- cdb/inc/class.cdb_template.inc.php:1.2 Wed Feb 13 22:35:02 2002 +++ cdb/inc/class.cdb_template.inc.php Mon Apr 18 08:21:56 2005 @@ -33,7 +33,7 @@ { function cdb_xxx() { - var $_privatevarshere; + // var $_privatevarshere; // This is an syntax error and seems also to be useless $this->_db = $GLOBALS['phpgw']->db; /* add vars that have get/let interface to this array. */ ==================================================== Index: cdb/inc/class.bo_filter.inc.php diff -u cdb/inc/class.bo_filter.inc.php:1.2 cdb/inc/class.bo_filter.inc.php:1.3 --- cdb/inc/class.bo_filter.inc.php:1.2 Thu Mar 21 21:01:52 2002 +++ cdb/inc/class.bo_filter.inc.php Mon Apr 18 08:21:56 2005 @@ -295,7 +295,7 @@ $select = 'phpgw_cdb_entity_id.entity_id AS entity_id'; $from = 'phpgw_cdb_entity_id'; $this->_joins = array(); - reset $this->_fields; + reset($this->_fields); while (list($key,$value) = $this->_fields) { $result = FALSE; ==================================================== Index: cdb/inc/class.cdb_contact_internet.inc.php diff -u cdb/inc/class.cdb_contact_internet.inc.php:1.2 cdb/inc/class.cdb_contact_internet.inc.php:1.3 --- cdb/inc/class.cdb_contact_internet.inc.php:1.2 Wed Feb 20 22:12:58 2002 +++ cdb/inc/class.cdb_contact_internet.inc.php Mon Apr 18 08:21:56 2005 @@ -1,4 +1,4 @@ -_dirty); do + { $key = key($this->_dirty); $sql.=$key.'="'; $sql .= $this->_get($key) . '", '; + } while (next($this->_dirty)); if ($sql) { ==================================================== Index: cdb/inc/class.cdb_entity_meta.inc.php diff -u cdb/inc/class.cdb_entity_meta.inc.php:1.3 cdb/inc/class.cdb_entity_meta.inc.php:1.4 --- cdb/inc/class.cdb_entity_meta.inc.php:1.3 Wed Feb 20 22:12:58 2002 +++ cdb/inc/class.cdb_entity_meta.inc.php Mon Apr 18 08:21:56 2005 @@ -28,7 +28,7 @@ class cdb_entity_meta extends cdb_generic { - var _modified; + var $_modified; function cdb_entity_meta() { ==================================================== Index: cdb/inc/class.cdb_entity.inc.php diff -u cdb/inc/class.cdb_entity.inc.php:1.6 cdb/inc/class.cdb_entity.inc.php:1.7 --- cdb/inc/class.cdb_entity.inc.php:1.6 Wed Feb 20 22:12:58 2002 +++ cdb/inc/class.cdb_entity.inc.php Mon Apr 18 08:21:56 2005 @@ -66,8 +66,8 @@ function load($entity_id) { // Unload everything first - unset $this->_org; - unset $this->_contact; + unset($this->_org); + unset($this->_contact); $this->_loaded = FALSE; $this->_id = 0; ==================================================== Index: cdb/inc/class.cdb_contact_client.inc.php diff -u cdb/inc/class.cdb_contact_client.inc.php:1.2 cdb/inc/class.cdb_contact_client.inc.php:1.3 --- cdb/inc/class.cdb_contact_client.inc.php:1.2 Wed Feb 20 22:12:58 2002 +++ cdb/inc/class.cdb_contact_client.inc.php Mon Apr 18 08:21:56 2005 @@ -91,6 +91,7 @@ { reset($this->_dirty); do + { $key = key($this->_dirty); switch($key) { @@ -100,6 +101,7 @@ $sql.=$key.'="'; $sql .= $this->_get($key) . '", '; } + } while (next($this->_dirty)); if ($sql) { From MAILER-DAEMON Mon Apr 18 05:01:50 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNS8b-0007Gk-V0 for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:01:50 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNS8Z-0007Fk-0s for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:01:47 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNS2r-0005sE-K3 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:55:54 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNS2j-0005Ve-DC for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:55:45 -0400 Received: from [199.232.41.67] (helo=mx20.gnu.org) by monty-python.gnu.org with esmtp (TLS-1.0:RSA_ARCFOUR_SHA:16) (Exim 4.34) id 1DNS2k-0002J1-S8 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:55:46 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by mx20.gnu.org with esmtp (Exim 4.34) id 1DNRfA-0005IT-EC for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 04:31:24 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 9A0A1312B8 for ; Mon, 18 Apr 2005 10:30:20 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 15151-10 for ; Mon, 18 Apr 2005 10:30:18 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 1F7DA312D0 for ; Mon, 18 Apr 2005 10:30:18 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I8UIw02272; Mon, 18 Apr 2005 10:30:18 +0200 Message-Id: <200504180830.j3I8UIw02272@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 09:40:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] anthill/inc hook_admin.inc.php,1.2 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 09:01:47 -0000 Update of anthill/inc Modified Files: Branch: MAIN hook_admin.inc.php lines: +2 -2 Log Message: Fixed syntax error: missing ) ==================================================== Index: anthill/inc/hook_admin.inc.php diff -u anthill/inc/hook_admin.inc.php:1.1 anthill/inc/hook_admin.inc.php:1.2 --- anthill/inc/hook_admin.inc.php:1.1 Sun Jul 20 01:23:07 2003 +++ anthill/inc/hook_admin.inc.php Mon Apr 18 07:40:28 2005 @@ -23,7 +23,7 @@ 'Configure Products' => $GLOBALS['phpgw']->link('/index.php',array( 'menuaction' => 'anthill.uiadmin.products', 'appname' => $appname - )), + ))) ); //Do not modify below this line From MAILER-DAEMON Mon Apr 18 05:31:57 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNSbj-0008LN-NZ for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:31:56 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNSbe-0008Je-0j for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:31:50 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNSbb-0008JC-VD for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:31:48 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNSbb-0008It-EW for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:31:47 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNScn-00052r-J6 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:33:02 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 59B33312B8 for ; Mon, 18 Apr 2005 11:30:26 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 18964-04 for ; Mon, 18 Apr 2005 11:30:22 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 96966312B5 for ; Mon, 18 Apr 2005 11:30:22 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I9UMQ02832; Mon, 18 Apr 2005 11:30:22 +0200 Message-Id: <200504180930.j3I9UMQ02832@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 10:42:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] polls admin.php,1.18 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 09:31:52 -0000 Update of polls Modified Files: Branch: MAIN admin.php lines: +102 -102 Log Message: Fixed syntax error; one ( too much ==================================================== Index: polls/admin.php diff -u polls/admin.php:1.17 polls/admin.php:1.18 --- polls/admin.php:1.17 Fri Nov 15 09:39:40 2002 +++ polls/admin.php Mon Apr 18 08:42:42 2005 @@ -1,102 +1,102 @@ - True, - 'currentapp' => 'polls', - 'enable_nextmatchs_class' => True, - 'admin_header' => True - ); - include('../header.inc.php'); - - $show = get_var('show',Array('GET')); - $order = get_var('order',Array('GET')); - $sort = get_var('sort',Array('GET')); - - if(!$show) - { - $GLOBALS['phpgw']->common->phpgw_exit(True); - } - - if($order) - { - $ordermethod = " order by $order $sort"; - } - - if($show == 'questions') - { - $GLOBALS['phpgw']->template->set_file(array('admin' => 'admin_list_questions.tpl')); - } - else - { - $GLOBALS['phpgw']->template->set_file(array('admin' => 'admin_list_answers.tpl')); - } - $GLOBALS['phpgw']->template->set_block('admin','form','form'); - $GLOBALS['phpgw']->template->set_block('admin','row','row'); - - $GLOBALS['phpgw']->template->set_unknowns('remove'); - - $GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']); - $GLOBALS['phpgw']->template->set_var('sort_title',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'poll_title',$order,'admin.php',lang('Title'),'&show=' . $show)); - if($show == 'answers') - { - $GLOBALS['phpgw']->template->set_var('sort_answer',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'option_text',$order,'admin.php',lang('Answer'),'&show=' . $show)); - } - - $GLOBALS['phpgw']->template->set_var('lang_edit',lang('edit')); - $GLOBALS['phpgw']->template->set_var('lang_delete',lang('delete')); - if($show == 'questions') - { - $GLOBALS['phpgw']->template->set_var('lang_view',lang('view')); - } - - if($show == 'questions') - { - $GLOBALS['phpgw']->db->query("select * from phpgw_polls_desc $ordermethod",__LINE__,__FILE__); - } - else - { - $GLOBALS['phpgw']->db->query("select phpgw_polls_data.*, phpgw_polls_desc.poll_title from phpgw_polls_data," - . "phpgw_polls_desc where phpgw_polls_desc.poll_id = phpgw_polls_data.poll_id $ordermethod",__LINE__,__FILE__); - } - $GLOBALS['phpgw']->template->set_var('rows',''); - while ($GLOBALS['phpgw']->db->next_record()) - { - $tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color); - $GLOBALS['phpgw']->template->set_var('tr_color',$tr_color); - - if($show == 'questions') - { - $GLOBALS['phpgw']->template->set_var('row_title',stripslashes($GLOBALS['phpgw']->db->f('poll_title'))); - $GLOBALS['phpgw']->template->set_var('row_edit','' . lang('Edit') . ''); - $GLOBALS['phpgw']->template->set_var('row_delete','' . lang('Delete') . ''); - $GLOBALS['phpgw']->template->set_var('row_view','' . lang('View') . ''); - } - else - { - $GLOBALS['phpgw']->template->set_var('row_answer',stripslashes(($GLOBALS['phpgw']->db->f('option_text'))); - $GLOBALS['phpgw']->template->set_var('row_title',stripslashes($GLOBALS['phpgw']->db->f('poll_title'))); - $GLOBALS['phpgw']->template->set_var('row_edit','' . lang('Edit') . ''); - $GLOBALS['phpgw']->template->set_var('row_delete','' . lang('Delete') . ''); - } - $GLOBALS['phpgw']->template->parse('rows','row',True); - } - - $GLOBALS['phpgw']->template->set_var('add_action',$GLOBALS['phpgw']->link('/polls/admin_add' . substr($show,0,(strlen($show)-1)) . '.php')); - $GLOBALS['phpgw']->template->set_var('lang_add',lang('add')); - - $GLOBALS['phpgw']->template->pparse('out','form'); - - $GLOBALS['phpgw']->common->phpgw_footer(); -?> + True, + 'currentapp' => 'polls', + 'enable_nextmatchs_class' => True, + 'admin_header' => True + ); + include('../header.inc.php'); + + $show = get_var('show',Array('GET')); + $order = get_var('order',Array('GET')); + $sort = get_var('sort',Array('GET')); + + if(!$show) + { + $GLOBALS['phpgw']->common->phpgw_exit(True); + } + + if($order) + { + $ordermethod = " order by $order $sort"; + } + + if($show == 'questions') + { + $GLOBALS['phpgw']->template->set_file(array('admin' => 'admin_list_questions.tpl')); + } + else + { + $GLOBALS['phpgw']->template->set_file(array('admin' => 'admin_list_answers.tpl')); + } + $GLOBALS['phpgw']->template->set_block('admin','form','form'); + $GLOBALS['phpgw']->template->set_block('admin','row','row'); + + $GLOBALS['phpgw']->template->set_unknowns('remove'); + + $GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']); + $GLOBALS['phpgw']->template->set_var('sort_title',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'poll_title',$order,'admin.php',lang('Title'),'&show=' . $show)); + if($show == 'answers') + { + $GLOBALS['phpgw']->template->set_var('sort_answer',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'option_text',$order,'admin.php',lang('Answer'),'&show=' . $show)); + } + + $GLOBALS['phpgw']->template->set_var('lang_edit',lang('edit')); + $GLOBALS['phpgw']->template->set_var('lang_delete',lang('delete')); + if($show == 'questions') + { + $GLOBALS['phpgw']->template->set_var('lang_view',lang('view')); + } + + if($show == 'questions') + { + $GLOBALS['phpgw']->db->query("select * from phpgw_polls_desc $ordermethod",__LINE__,__FILE__); + } + else + { + $GLOBALS['phpgw']->db->query("select phpgw_polls_data.*, phpgw_polls_desc.poll_title from phpgw_polls_data," + . "phpgw_polls_desc where phpgw_polls_desc.poll_id = phpgw_polls_data.poll_id $ordermethod",__LINE__,__FILE__); + } + $GLOBALS['phpgw']->template->set_var('rows',''); + while ($GLOBALS['phpgw']->db->next_record()) + { + $tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color); + $GLOBALS['phpgw']->template->set_var('tr_color',$tr_color); + + if($show == 'questions') + { + $GLOBALS['phpgw']->template->set_var('row_title',stripslashes($GLOBALS['phpgw']->db->f('poll_title'))); + $GLOBALS['phpgw']->template->set_var('row_edit','' . lang('Edit') . ''); + $GLOBALS['phpgw']->template->set_var('row_delete','' . lang('Delete') . ''); + $GLOBALS['phpgw']->template->set_var('row_view','' . lang('View') . ''); + } + else + { + $GLOBALS['phpgw']->template->set_var('row_answer',stripslashes($GLOBALS['phpgw']->db->f('option_text'))); + $GLOBALS['phpgw']->template->set_var('row_title',stripslashes($GLOBALS['phpgw']->db->f('poll_title'))); + $GLOBALS['phpgw']->template->set_var('row_edit','' . lang('Edit') . ''); + $GLOBALS['phpgw']->template->set_var('row_delete','' . lang('Delete') . ''); + } + $GLOBALS['phpgw']->template->parse('rows','row',True); + } + + $GLOBALS['phpgw']->template->set_var('add_action',$GLOBALS['phpgw']->link('/polls/admin_add' . substr($show,0,(strlen($show)-1)) . '.php')); + $GLOBALS['phpgw']->template->set_var('lang_add',lang('add')); + + $GLOBALS['phpgw']->template->pparse('out','form'); + + $GLOBALS['phpgw']->common->phpgw_footer(); +?> From MAILER-DAEMON Mon Apr 18 05:32:00 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNSbl-0008M2-Nk for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:31:58 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNSbf-0008Ju-3e for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:31:51 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNSbb-0008J1-G7 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:31:49 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNSbb-0008It-1T for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:31:47 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNScY-000505-Ug for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:32:47 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id A666F312D0 for ; Mon, 18 Apr 2005 11:30:11 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 18964-03 for ; Mon, 18 Apr 2005 11:30:09 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 03993312B8 for ; Mon, 18 Apr 2005 11:30:09 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I9U9802811; Mon, 18 Apr 2005 11:30:09 +0200 Message-Id: <200504180930.j3I9U9802811@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 10:26:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] email/inc/phpmailer/language phpmailer.lang-tr.php, 1.2 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 09:31:52 -0000 Update of email/inc/phpmailer/language Modified Files: Branch: MAIN phpmailer.lang-tr.php lines: +2 -1 Log Message: Fixed syntax error ==================================================== Index: email/inc/phpmailer/language/phpmailer.lang-tr.php diff -u email/inc/phpmailer/language/phpmailer.lang-tr.php:1.1 email/inc/phpmailer/language/phpmailer.lang-tr.php:1.2 --- email/inc/phpmailer/language/phpmailer.lang-tr.php:1.1 Sun Mar 13 23:22:44 2005 +++ email/inc/phpmailer/language/phpmailer.lang-tr.php Mon Apr 18 08:26:04 2005 @@ -2,7 +2,8 @@ /** * PHPMailer dil dosyasý. * Türkçe Versiyonu - */ÝZYAZILIM - Elçin Özel - Can Yýlmaz - Mehmet Benlioðlu + * ÝZYAZILIM - Elçin Özel - Can Yýlmaz - Mehmet Benlioðlu + */ $PHPMAILER_LANG = array(); From MAILER-DAEMON Mon Apr 18 05:32:05 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNSbp-0008NR-V6 for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:32:02 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNSbh-0008Kl-4n for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:31:53 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNSbf-0008Jw-4V for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:31:51 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNSbe-0008It-8d for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:31:50 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNScs-00053e-Lf for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:33:06 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 4D100312B8 for ; Mon, 18 Apr 2005 11:30:31 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 18713-07 for ; Mon, 18 Apr 2005 11:30:29 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 190E4312B5 for ; Mon, 18 Apr 2005 11:30:29 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I9UTR02839; Mon, 18 Apr 2005 11:30:29 +0200 Message-Id: <200504180930.j3I9UTR02839@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 10:54:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] squirrelmail/functions abook_database.php,1.4 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 09:31:55 -0000 Update of squirrelmail/functions Modified Files: Branch: MAIN abook_database.php lines: +2 -2 Log Message: Fixed syntax errors ==================================================== Index: squirrelmail/functions/abook_database.php diff -u squirrelmail/functions/abook_database.php:1.3 squirrelmail/functions/abook_database.php:1.4 --- squirrelmail/functions/abook_database.php:1.3 Wed Jun 18 22:25:37 2003 +++ squirrelmail/functions/abook_database.php Mon Apr 18 08:54:37 2005 @@ -174,7 +174,7 @@ if(!$this->open()) return false; - $query = sprintf(;SELECT * FROM %s WHERE owner=\'%s\';, + $query = sprintf('SELECT * FROM %s WHERE owner=\'%s\'', $this->table, $this->owner); $res = $this->dbh->query($query); From MAILER-DAEMON Mon Apr 18 05:32:06 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNSbt-0008Ns-93 for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:32:05 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNSbg-0008Kk-VV for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:31:53 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNSbe-0008Ji-98 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:31:51 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNSbd-0008It-9x for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:31:49 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNScg-00051r-R3 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 05:32:55 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 96C56312B8 for ; Mon, 18 Apr 2005 11:30:19 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 18772-06 for ; Mon, 18 Apr 2005 11:30:17 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 963DC312B5 for ; Mon, 18 Apr 2005 11:30:17 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3I9UHT02825; Mon, 18 Apr 2005 11:30:17 +0200 Message-Id: <200504180930.j3I9UHT02825@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 10:38:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] mediadb/inc/temp movies.inc.php,1.6 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 09:31:55 -0000 Update of mediadb/inc/temp Modified Files: Branch: MAIN movies.inc.php lines: +2 -2 Log Message: Fixed syntax errors - wrong closing " must be ' ==================================================== Index: mediadb/inc/temp/movies.inc.php diff -u mediadb/inc/temp/movies.inc.php:1.5 mediadb/inc/temp/movies.inc.php:1.6 --- mediadb/inc/temp/movies.inc.php:1.5 Sun Jan 27 13:52:53 2002 +++ mediadb/inc/temp/movies.inc.php Mon Apr 18 08:38:02 2005 @@ -35,11 +35,11 @@
- ' . lang("edit");?> - ' . lang("Y");?>
- common->phpgw_footer(); } ==================================================== Index: timetrack/deletedetail.php diff -u timetrack/deletedetail.php:1.7 timetrack/deletedetail.php:1.8 --- timetrack/deletedetail.php:1.7 Mon Mar 18 03:18:04 2002 +++ timetrack/deletedetail.php Mon Apr 18 09:03:28 2005 @@ -47,7 +47,7 @@
- common->phpgw_footer(); } From MAILER-DAEMON Mon Apr 18 06:32:09 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNTXz-0002U2-3w for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:32:07 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNTXv-0002Sv-UE for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:32:04 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNTXt-0002S9-KN for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:32:02 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNTXQ-0001zL-DE for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:31:32 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNTYe-0001RM-BG for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:32:48 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 7B451312B8 for ; Mon, 18 Apr 2005 12:30:12 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 21656-06 for ; Mon, 18 Apr 2005 12:30:10 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 562B6312B5 for ; Mon, 18 Apr 2005 12:30:10 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3IAUAa04205; Mon, 18 Apr 2005 12:30:10 +0200 Message-Id: <200504181030.j3IAUAa04205@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 11:37:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] calendar/templates/justweb header.inc.php,1.23 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 10:32:05 -0000 Update of calendar/templates/justweb Modified Files: Branch: MAIN header.inc.php lines: +2 -2 Log Message: Fixed another $($ bug ==================================================== Index: calendar/templates/justweb/header.inc.php diff -u calendar/templates/justweb/header.inc.php:1.22 calendar/templates/justweb/header.inc.php:1.23 --- calendar/templates/justweb/header.inc.php:1.22 Mon Apr 18 08:18:12 2005 +++ calendar/templates/justweb/header.inc.php Mon Apr 18 09:37:27 2005 @@ -100,7 +100,7 @@ { if(${$var_list[$i]}) { - $base_hidden_vars .= ' '."\n"; + $base_hidden_vars .= ' ' . "\n"; } } $hidden_vars = ''; From MAILER-DAEMON Mon Apr 18 06:33:34 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNTZN-000319-I1 for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:33:33 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNTZI-0002yu-Rs for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:33:29 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNTYN-0002cm-J7 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:32:34 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNTXZ-0001zL-Sg for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:31:42 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNTYo-0001SF-EF for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:32:58 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 96B34312D0 for ; Mon, 18 Apr 2005 12:30:22 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 22333-01 for ; Mon, 18 Apr 2005 12:30:20 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 402E7312B8 for ; Mon, 18 Apr 2005 12:30:20 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3IAUKt04219; Mon, 18 Apr 2005 12:30:20 +0200 Message-Id: <200504181030.j3IAUKt04219@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 11:37:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] calendar/templates/idsociety header.inc.php, 1.28 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 10:33:30 -0000 Update of calendar/templates/idsociety Modified Files: Branch: MAIN header.inc.php lines: +2 -2 Log Message: Fixed another $($ bug ==================================================== Index: calendar/templates/idsociety/header.inc.php diff -u calendar/templates/idsociety/header.inc.php:1.27 calendar/templates/idsociety/header.inc.php:1.28 --- calendar/templates/idsociety/header.inc.php:1.27 Mon Apr 18 08:18:12 2005 +++ calendar/templates/idsociety/header.inc.php Mon Apr 18 09:37:29 2005 @@ -100,7 +100,7 @@ { if(${$var_list[$i]}) { - $base_hidden_vars .= ' '."\n"; + $base_hidden_vars .= ' ' . "\n"; } } $hidden_vars = ''; From MAILER-DAEMON Mon Apr 18 06:33:54 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNTZh-00039U-Bh for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:33:53 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNTZd-00037b-Sw for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:33:50 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNTZZ-00035p-Fc for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:33:46 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNTXk-0001zL-Cp for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:31:52 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNTYz-0001Tv-HS for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:33:09 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id AD4BF312D0 for ; Mon, 18 Apr 2005 12:30:33 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 21656-07 for ; Mon, 18 Apr 2005 12:30:31 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id CFC96312B8 for ; Mon, 18 Apr 2005 12:30:31 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3IAUVi04233; Mon, 18 Apr 2005 12:30:31 +0200 Message-Id: <200504181030.j3IAUVi04233@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 11:44:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] ccs/inc class.boTimecards.inc.php,1.7 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 10:33:51 -0000 Update of ccs/inc Modified Files: Branch: MAIN class.boTimecards.inc.php lines: +4 -4 Log Message: More bug fixes ==================================================== Index: ccs/inc/class.boTimecards.inc.php diff -u ccs/inc/class.boTimecards.inc.php:1.6 ccs/inc/class.boTimecards.inc.php:1.7 --- ccs/inc/class.boTimecards.inc.php:1.6 Mon Apr 18 07:58:42 2005 +++ ccs/inc/class.boTimecards.inc.php Mon Apr 18 09:44:55 2005 @@ -207,15 +207,15 @@ // theory is we're the last timecard. We control status. // now check to see if there are any prior timecards. If so we revert to their status - $query = sprintf('SELECT max(id) FROM osims_timecards WHERE id < %d AND ccs=%d, $ojbTC->id, $objTC->ccs); + $query = sprintf('SELECT max(id) FROM osims_timecards WHERE id < %d AND ccs=%d', $ojbTC->id, $objTC->ccs); $objQueryTC->db->query($query); $ojbQueryTC->db->next_record(); if ($ojbQueryTC->db->f('id') == false && $ojbQueryTC->db->f('id') > 0) { // ok so prior timecard exists - $objQueryTC->Load($objQueryTC->db->f('id'); - if $ojbQueryTC->status != $ojbCCS->status) + $objQueryTC->Load($objQueryTC->db->f('id')); + if ($ojbQueryTC->status != $ojbCCS->status) { $ojbCCS->statuson = date($dcl_info['DCL_TIMESTAMP_FORMAT']); if ($objQueryTC->status == 2 && $ojbCCS->status != 2) From MAILER-DAEMON Mon Apr 18 06:34:22 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNTaA-0003Mz-D7 for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:34:22 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNTa7-0003JI-P5 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:34:19 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNTa3-0003H8-Go for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:34:17 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNTXT-0001zL-Uw for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:31:36 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNTYi-0001Rr-Nz for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:32:52 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id DD5B4312B8 for ; Mon, 18 Apr 2005 12:30:16 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 21683-06 for ; Mon, 18 Apr 2005 12:30:15 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id D44C0312B5 for ; Mon, 18 Apr 2005 12:30:14 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3IAUEC04212; Mon, 18 Apr 2005 12:30:14 +0200 Message-Id: <200504181030.j3IAUEC04212@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 11:37:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] calendar/templates/verdilak header.inc.php,1.23 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 10:34:21 -0000 Update of calendar/templates/verdilak Modified Files: Branch: MAIN header.inc.php lines: +2 -2 Log Message: Fixed another $($ bug ==================================================== Index: calendar/templates/verdilak/header.inc.php diff -u calendar/templates/verdilak/header.inc.php:1.22 calendar/templates/verdilak/header.inc.php:1.23 --- calendar/templates/verdilak/header.inc.php:1.22 Mon Apr 18 08:18:12 2005 +++ calendar/templates/verdilak/header.inc.php Mon Apr 18 09:37:29 2005 @@ -100,7 +100,7 @@ { if(${$var_list[$i]}) { - $base_hidden_vars .= ' '."\n"; + $base_hidden_vars .= ' ' . "\n"; } } $hidden_vars = ''; From MAILER-DAEMON Mon Apr 18 06:34:47 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNTaZ-0003Xp-0P for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:34:47 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNTaX-0003Vc-87 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:34:45 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNTaS-0003TY-0E for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:34:41 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNTXf-0001zL-6J for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:31:47 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNTYu-0001T4-6O for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:33:04 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 2DA59312D0 for ; Mon, 18 Apr 2005 12:30:28 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 21919-05 for ; Mon, 18 Apr 2005 12:30:26 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 1A32C312B8 for ; Mon, 18 Apr 2005 12:30:26 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3IAUQ004226; Mon, 18 Apr 2005 12:30:26 +0200 Message-Id: <200504181030.j3IAUQ004226@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 11:40:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] cart/inc class.payment_echo.inc.php,1.3 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 10:34:46 -0000 Update of cart/inc Modified Files: Branch: MAIN class.payment_echo.inc.php lines: +1 -6 Log Message: Removed another medthod that was available twice ==================================================== Index: cart/inc/class.payment_echo.inc.php diff -u cart/inc/class.payment_echo.inc.php:1.2 cart/inc/class.payment_echo.inc.php:1.3 --- cart/inc/class.payment_echo.inc.php:1.2 Mon Apr 18 07:56:11 2005 +++ cart/inc/class.payment_echo.inc.php Mon Apr 18 09:40:05 2005 @@ -1063,11 +1063,6 @@ return $this->reference; } - function get_order_number() - { - return $this->order_number; - } - function get_EchoSuccess() { return $this->EchoSuccess; From MAILER-DAEMON Mon Apr 18 06:37:54 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNTdY-0005St-Lo for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:37:53 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNTdP-0005Rq-DS for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:37:44 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNTdK-0005QZ-EC for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:37:39 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNTdI-0005Ni-Cy for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:37:36 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNTdV-0001up-4c for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 06:37:49 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id DB348312B8 for ; Mon, 18 Apr 2005 12:35:12 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 22333-07 for ; Mon, 18 Apr 2005 12:35:10 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id B9592312B5 for ; Mon, 18 Apr 2005 12:35:10 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3IAZAD04266; Mon, 18 Apr 2005 12:35:10 +0200 Message-Id: <200504181035.j3IAZAD04266@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: fipsfuchs Date: Mon, 18 Apr 2005 12:07:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/doc/ldap phpgroupware.schema,1.5 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 10:37:45 -0000 Update of phpgwapi/doc/ldap Modified Files: Branch: MAIN phpgroupware.schema lines: +2 -6 Log Message: changes in .16 branch merged to HEAD ==================================================== Index: phpgwapi/doc/ldap/phpgroupware.schema diff -u phpgwapi/doc/ldap/phpgroupware.schema:1.4 phpgwapi/doc/ldap/phpgroupware.schema:1.5 --- phpgwapi/doc/ldap/phpgroupware.schema:1.4 Thu Dec 30 06:47:29 2004 +++ phpgwapi/doc/ldap/phpgroupware.schema Mon Apr 18 10:07:10 2005 @@ -1,4 +1,4 @@ -# $phpgroupware : phpgroupware,v 1.1 pkamps +# $phpgroupware : phpgroupware,v 1.2 pkamps # REQUIRED attributetype ( 1.3.6.1.4.1.9554.201 @@ -14,13 +14,11 @@ # from the inetOrgPerson schema. objectclass ( 1.3.6.1.4.1.9554.200 NAME 'phpgwContact' + SUP top AUXILIARY DESC 'phpGroupWare Contact Entry' MUST phpgwContactID ) - - - #REQUIRD attributetype ( 1.3.6.1.4.1.9554.301 NAME 'phpgwGroupID' @@ -40,8 +38,6 @@ ) - - #accountID attributetype ( 1.3.6.1.4.1.9554.101 NAME 'phpgwAccountID' From MAILER-DAEMON Mon Apr 18 07:43:03 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNUed-00027h-02 for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 07:43:03 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNUdc-0001vb-DD for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 07:42:00 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNUdU-0001u5-TL for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 07:41:54 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNUdU-0001mm-Gy for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 07:41:52 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNUWU-0006Y1-Ez for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 07:34:39 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 554A8312D2 for ; Mon, 18 Apr 2005 13:32:01 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 25413-04 for ; Mon, 18 Apr 2005 13:31:58 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 89874312D1 for ; Mon, 18 Apr 2005 13:31:58 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3IBVvA04596; Mon, 18 Apr 2005 13:31:57 +0200 Message-Id: <200504181131.j3IBVvA04596@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 13:21:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] cdb/inc class.cdb_organization.inc.php, 1.5 class.cdb_address.inc.php, 1.5 class.cdb_entity.inc.php, 1.8 class.cdb_contact_personal.inc.php, 1.8 class.cdb_organization_location.inc.php, 1.6 class.bo_filter.inc.php, 1.4 class.cdb_contact_internet.inc.php, 1.4 class.cdb_entity_meta.inc.php, 1.5 class.cdb_contact_client.inc.php, 1.4 class.cdb_contact.inc.php, 1.9 class.cdb_phone.inc.php, 1.8 class.cdb_organization_client.inc.php, 1.4 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 11:43:01 -0000 Update of cdb/inc Modified Files: Branch: MAIN class.cdb_organization.inc.php lines: +12 -9 class.cdb_address.inc.php lines: +4 -2 class.cdb_entity.inc.php lines: +5 -5 class.cdb_contact_personal.inc.php lines: +6 -2 class.cdb_organization_location.inc.php lines: +4 -2 class.bo_filter.inc.php lines: +2 -2 class.cdb_contact_internet.inc.php lines: +3 -1 class.cdb_entity_meta.inc.php lines: +6 -2 class.cdb_contact_client.inc.php lines: +5 -3 class.cdb_contact.inc.php lines: +13 -10 class.cdb_phone.inc.php lines: +3 -1 class.cdb_organization_client.inc.php lines: +4 -2 Log Message: Fixed more syntax errors ==================================================== Index: cdb/inc/class.cdb_organization.inc.php diff -u cdb/inc/class.cdb_organization.inc.php:1.4 cdb/inc/class.cdb_organization.inc.php:1.5 --- cdb/inc/class.cdb_organization.inc.php:1.4 Mon Apr 18 08:21:56 2005 +++ cdb/inc/class.cdb_organization.inc.php Mon Apr 18 11:21:27 2005 @@ -192,6 +192,7 @@ reset($this->_dirty); do + { $key = key($this->_dirty); switch($key) { @@ -210,7 +211,7 @@ $sql.=$key.'="'; $sql .= $this->_get($key) . '", '; } - + } while (next($this->_dirty)); if ($sql) { @@ -263,6 +264,7 @@ reset($this->_); do + { $key = key($this->_); switch($key) { @@ -270,12 +272,13 @@ // the note is in a diff table // just ignore it for now and we'll load it in a min break; - case 'organization_id' + case 'organization_id': $this->_let('organization_id',$organization_id); break; default: $this->_let($key,$this->_db->f($key)); } + } while(next($this->_)); // Now take care of the note @@ -322,7 +325,7 @@ function get_location_data( $location ) { /* TODO */ - return contact.location.class; + // return contact.location.class; // This is a syntax error } function get_name() @@ -411,7 +414,7 @@ function get_locations() { - _location_list = array(); + $_location_list = array(); $sql = 'SELECT location_id, location FROM ' . 'cdb_org_locations WHERE organization_id="' . @@ -419,15 +422,15 @@ $this->_db->query($sql,__LINE__,__FILE__); - _location_list[this->_db->f('location_id')] = this->_db->f('location'); + $_location_list[$this->_db->f('location_id')] = $this->_db->f('location'); - for ( int i = ; i < this->_db->num_rows(); i++ ) + for ( $i = 0; $i < $this->_db->num_rows(); ++$i ) { $this->_db->next_record(); - _location_list[$this->_db->f('location_id')] = $this->_db->f('location'); + $_location_list[$this->_db->f('location_id')] = $this->_db->f('location'); } - return _location_list; + return $_location_list; } } ==================================================== Index: cdb/inc/class.cdb_address.inc.php diff -u cdb/inc/class.cdb_address.inc.php:1.4 cdb/inc/class.cdb_address.inc.php:1.5 --- cdb/inc/class.cdb_address.inc.php:1.4 Mon Apr 18 08:21:56 2005 +++ cdb/inc/class.cdb_address.inc.php Mon Apr 18 11:21:27 2005 @@ -139,8 +139,10 @@ reset($this->_); do + { $key = key($this->_); $this->_let($key,$this->_db->f($key)); + } while(next($this->_)); $this->_id = (int)$this->_db->f('entity_id'); @@ -152,7 +154,7 @@ } function create($entity_id, $type_id, $street, $city, - $country, $postal_code, ) + $country, $postal_code ) { $this->_loaded = TRUE; $this->_dirty = array(); ==================================================== Index: cdb/inc/class.cdb_entity.inc.php diff -u cdb/inc/class.cdb_entity.inc.php:1.7 cdb/inc/class.cdb_entity.inc.php:1.8 --- cdb/inc/class.cdb_entity.inc.php:1.7 Mon Apr 18 08:21:56 2005 +++ cdb/inc/class.cdb_entity.inc.php Mon Apr 18 11:21:27 2005 @@ -128,8 +128,8 @@ */ function create($entity_type) { - unset $this->_org; - unset $this->_contact; + unset($this->_org); + unset($this->_contact); $this->_loaded = FALSE; $this->_id = 0; @@ -254,7 +254,7 @@ @function get_org_data @abstract Returns the loaded org class, if one exists */ - function get_org_data + function get_org_data() { if ($this->loaded() && $this->get_type()=='organization') { @@ -263,7 +263,7 @@ else { return FALSE; - { + } } /*! ==================================================== Index: cdb/inc/class.cdb_contact_personal.inc.php diff -u cdb/inc/class.cdb_contact_personal.inc.php:1.7 cdb/inc/class.cdb_contact_personal.inc.php:1.8 --- cdb/inc/class.cdb_contact_personal.inc.php:1.7 Mon Apr 18 08:21:56 2005 +++ cdb/inc/class.cdb_contact_personal.inc.php Mon Apr 18 11:21:27 2005 @@ -72,7 +72,7 @@ case 'male': case 'female': return $this->_let('gender', $new_gender); - case default: + default: return FALSE; } } @@ -136,9 +136,11 @@ { reset($this->_dirty); do + { $key = key($this->_dirty); $sql.=$key.'="'; $sql .= $this->_get($key) . '", '; + } while (next($this->_dirty)); if ($sql) { @@ -173,8 +175,10 @@ reset($this->_); do + { $key = key($this->_); $this->_let($key,$this->_db->f($key)); + } while(next($this->_)); $this->_dirty = array(); ==================================================== Index: cdb/inc/class.cdb_organization_location.inc.php diff -u cdb/inc/class.cdb_organization_location.inc.php:1.5 cdb/inc/class.cdb_organization_location.inc.php:1.6 --- cdb/inc/class.cdb_organization_location.inc.php:1.5 Mon Apr 18 08:21:56 2005 +++ cdb/inc/class.cdb_organization_location.inc.php Mon Apr 18 11:21:27 2005 @@ -157,8 +157,10 @@ reset($this->_); do + { $key = key($this->_); $this->_let($key,$this->_db->f($key)); + } while(next($this->_)); $this->_dirty = array(); @@ -180,7 +182,7 @@ 'VALUES ("0", "", "", "", "", "", "", "")'; $this->_db->query($sql,__LINE__,__FILE__); return $this->_db->get_last_insert_id('phpgw_cdb_org_location', - 'location_id')); + 'location_id'); } ==================================================== Index: cdb/inc/class.bo_filter.inc.php diff -u cdb/inc/class.bo_filter.inc.php:1.3 cdb/inc/class.bo_filter.inc.php:1.4 --- cdb/inc/class.bo_filter.inc.php:1.3 Mon Apr 18 08:21:56 2005 +++ cdb/inc/class.bo_filter.inc.php Mon Apr 18 11:21:27 2005 @@ -451,7 +451,7 @@ 'location_id' ); } - if (! $this->_joined('org') + if (! $this->_joined('org')) { $retval['from'] .= $this->left_join_ex( 'phpgw_cdb_org_location', ==================================================== Index: cdb/inc/class.cdb_contact_internet.inc.php diff -u cdb/inc/class.cdb_contact_internet.inc.php:1.3 cdb/inc/class.cdb_contact_internet.inc.php:1.4 --- cdb/inc/class.cdb_contact_internet.inc.php:1.3 Mon Apr 18 08:21:56 2005 +++ cdb/inc/class.cdb_contact_internet.inc.php Mon Apr 18 11:21:27 2005 @@ -221,8 +221,10 @@ reset($this->_); do + { $key = key($this->_); $this->_let($key,$this->_db->f($key)); + } while(next($this->_)); $this->_loaded = TRUE; ==================================================== Index: cdb/inc/class.cdb_entity_meta.inc.php diff -u cdb/inc/class.cdb_entity_meta.inc.php:1.4 cdb/inc/class.cdb_entity_meta.inc.php:1.5 --- cdb/inc/class.cdb_entity_meta.inc.php:1.4 Mon Apr 18 08:21:56 2005 +++ cdb/inc/class.cdb_entity_meta.inc.php Mon Apr 18 11:21:27 2005 @@ -93,6 +93,7 @@ $sqlp = "UPDATE phpgw_cdb_entity_meta SET "; reset($this->_dirty); do + { $key = key($this->_dirty); switch($key) { @@ -100,6 +101,7 @@ $sql.=$key.'="'; } $sql .= $this->_get($key) . '", '; + } while (next($this->_dirty)); if ($sql || $this->_modified) { @@ -145,6 +147,7 @@ reset($this->_); do + { $key = key($this->_); switch($key) { @@ -154,6 +157,7 @@ default: $this->_let($key,$this->_db->f($key)); } + } while(next($this->_)); $this->_loaded = TRUE; } @@ -253,7 +257,7 @@ /* keywords should either be an array or a comma separated list */ if(is_array($keywords)) { - return $this->_let('keywords', implode(',',$keywords); + return $this->_let('keywords', implode(',',$keywords)); } else if (is_string($keywords)) { ==================================================== Index: cdb/inc/class.cdb_contact_client.inc.php diff -u cdb/inc/class.cdb_contact_client.inc.php:1.3 cdb/inc/class.cdb_contact_client.inc.php:1.4 --- cdb/inc/class.cdb_contact_client.inc.php:1.3 Mon Apr 18 08:21:56 2005 +++ cdb/inc/class.cdb_contact_client.inc.php Mon Apr 18 11:21:27 2005 @@ -141,8 +141,10 @@ reset($this->_); do - $key = key($this->_); - $this->_let($key,$this->_db->f($key)); + { + $key = key($this->_); + $this->_let($key,$this->_db->f($key)); + } while(next($this->_)); $this->_id = $contact_id; ==================================================== Index: cdb/inc/class.cdb_contact.inc.php diff -u cdb/inc/class.cdb_contact.inc.php:1.8 cdb/inc/class.cdb_contact.inc.php:1.9 --- cdb/inc/class.cdb_contact.inc.php:1.8 Mon Apr 18 08:21:56 2005 +++ cdb/inc/class.cdb_contact.inc.php Mon Apr 18 11:21:27 2005 @@ -228,6 +228,7 @@ reset($this->_dirty); do + { $key = key($this->_dirty); switch($key) { @@ -244,6 +245,7 @@ $sql.=$key.'="'; } $sql .= $this->_get($key) . '", '; + } while (next($this->_dirty)); if ($sql) { @@ -296,6 +298,7 @@ reset($this->_); do + { $key = key($this->_); switch($key) { @@ -303,12 +306,13 @@ // the note is in a diff table // just ignore it for now and we'll load it in a min break; - case 'contact_id' + case 'contact_id': $this->_let('contact_id',$contact_id); break; default: $this->_let($key,$this->_db->f($key)); } + } while(next($this->_)); // Now take care of the note @@ -355,29 +359,29 @@ function get_personal_data() { /* TODO */ - return contact.personal.class; + // return contact.personal.class; // Syntax error } function get_internet_data() { /* TODO */ - return contact.internet.class; + // return contact.internet.class; // Syntax error } function get_phone_data() { /* TODO */ - return contact.phone.class; + // return contact.phone.class; // Syntax error } function get_address_data() { /* TODO */ - return contact.address.class; + // return contact.address.class; // Syntax error } function get_main_organization() { /* TODO */ - return organization.class; + // return organization.class; // Syntax error } - function let_main_organization(organization.class) + function let_main_organization(/* organization.class */) // Syntax error { /* TODO */ return; @@ -549,7 +553,6 @@ $mySuccess = $this->_let('mailing_address_selector',$inID); } return $mySuccess; - } } function get_web() { @@ -614,7 +617,7 @@ function let_phonex_selector($inID, $inNewVal) { $mySuccess = False; - if(is_int($inID) &) + if(is_int($inID) /*&*/) // Syntax error { $phonex_selector_varname = 'phone'.$inID.'_selector'; $mySuccess = $this->_let($phonex_selector_varname,$inNewVal); ==================================================== Index: cdb/inc/class.cdb_phone.inc.php diff -u cdb/inc/class.cdb_phone.inc.php:1.7 cdb/inc/class.cdb_phone.inc.php:1.8 --- cdb/inc/class.cdb_phone.inc.php:1.7 Mon Apr 18 08:21:56 2005 +++ cdb/inc/class.cdb_phone.inc.php Mon Apr 18 11:21:27 2005 @@ -64,8 +64,10 @@ reset($this->_); do + { $key = key($this->_); $this->_let($key,$this->_db->f($key)); + } while(next($this->_)); $this->_id = (int)$this->_db->f('entity_id'); ==================================================== Index: cdb/inc/class.cdb_organization_client.inc.php diff -u cdb/inc/class.cdb_organization_client.inc.php:1.3 cdb/inc/class.cdb_organization_client.inc.php:1.4 --- cdb/inc/class.cdb_organization_client.inc.php:1.3 Mon Apr 18 08:21:56 2005 +++ cdb/inc/class.cdb_organization_client.inc.php Mon Apr 18 11:21:27 2005 @@ -124,8 +124,10 @@ reset($this->_); do + { $key = key($this->_); $this->_let($key,$this->_db->f($key)); + } while(next($this->_)); $this->_dirty = array(); @@ -144,7 +146,7 @@ 'VALUES ("", "", "", "")'; $this->_db->query($sql,__LINE__,__FILE__); return $this->_db->get_last_insert_id('phpgw_cdb_org_client', - 'organization_id')); + 'organization_id'); } From MAILER-DAEMON Mon Apr 18 08:32:16 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNVQF-0003qa-EQ for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 08:32:15 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNVQ9-0003nj-KI for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 08:32:09 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNVQ4-0003kc-CF for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 08:32:05 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNVQ4-0003kT-79 for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 08:32:04 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNVQu-00030M-UD for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 08:32:57 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 84B7D312D0 for ; Mon, 18 Apr 2005 14:30:19 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 28286-05 for ; Mon, 18 Apr 2005 14:30:17 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 50993312BC for ; Mon, 18 Apr 2005 14:30:17 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3ICUHP04900; Mon, 18 Apr 2005 14:30:17 +0200 Message-Id: <200504181230.j3ICUHP04900@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 14:14:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] api/api/db class.db_sybase.php,1.2 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 12:32:12 -0000 Update of api/api/db Modified Files: Branch: MAIN class.db_sybase.php lines: +2 -2 Log Message: syntax error fixed ==================================================== Index: api/api/db/class.db_sybase.php diff -u api/api/db/class.db_sybase.php:1.1 api/api/db/class.db_sybase.php:1.2 --- api/api/db/class.db_sybase.php:1.1 Thu Oct 23 07:20:25 2003 +++ api/api/db/class.db_sybase.php Mon Apr 18 12:14:43 2005 @@ -46,7 +46,7 @@ } if(!$this->Link_ID) { - $this->halt('Link-ID == false, '.($GLOBALS['phpgw_info']['server']['db_persistent']?'p':'')..'connect failed'); + $this->halt('Link-ID == false, '.($GLOBALS['phpgw_info']['server']['db_persistent']?'p':'').'connect failed'); } if(!sybase_select_db($this->Database, $this->Link_ID)) { From MAILER-DAEMON Mon Apr 18 08:32:20 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNVQI-0003sQ-Sb for mharc-phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 08:32:19 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNVQ9-0003nl-KL for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 08:32:09 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNVQ5-0003lC-3R for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 08:32:05 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNVQ4-0003kT-Lo for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 08:32:04 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNVQr-0002zx-EH for phpgroupware-cvs@gnu.org; Mon, 18 Apr 2005 08:32:53 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 237F1312D1 for ; Mon, 18 Apr 2005 14:30:16 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 27953-08 for ; Mon, 18 Apr 2005 14:30:12 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id D3B7B312BC for ; Mon, 18 Apr 2005 14:30:12 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3ICUCC04893; Mon, 18 Apr 2005 14:30:12 +0200 Message-Id: <200504181230.j3ICUCC04893@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Mon, 18 Apr 2005 13:38:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] mediadb/inc/temp movies.inc.php,1.7 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2005 12:32:13 -0000 Update of mediadb/inc/temp Modified Files: Branch: MAIN movies.inc.php lines: +14 -14 Log Message: fixed more syntax errors ==================================================== Index: mediadb/inc/temp/movies.inc.php diff -u mediadb/inc/temp/movies.inc.php:1.6 mediadb/inc/temp/movies.inc.php:1.7 --- mediadb/inc/temp/movies.inc.php:1.6 Mon Apr 18 08:38:02 2005 +++ mediadb/inc/temp/movies.inc.php Mon Apr 18 11:38:29 2005 @@ -95,40 +95,40 @@ Independence Day - + - + Will Smith
Tommy Lee Jones - + dvd - + 1996 - + Science Fiction - + R - - + + - + tooldev - + + href="http://us.imdb.com/Tsearch"> IMDB - + ' . lang('edit');?> + .'">' . lang('edit'); ?> - + From MAILER-DAEMON Tue Apr 19 04:43:25 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DNoKH-0003Nl-85 for mharc-phpgroupware-cvs@gnu.org; Tue, 19 Apr 2005 04:43:22 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DNoK5-0003N7-7X for phpgroupware-cvs@gnu.org; Tue, 19 Apr 2005 04:43:09 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DNoJx-0003MQ-9y for phpgroupware-cvs@gnu.org; Tue, 19 Apr 2005 04:43:05 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DNoCv-0002YJ-5U for phpgroupware-cvs@gnu.org; Tue, 19 Apr 2005 04:35:49 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DNoB4-00065C-4s for phpgroupware-cvs@gnu.org; Tue, 19 Apr 2005 04:33:50 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 3DECD312B3 for ; Tue, 19 Apr 2005 10:30:45 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 21314-05 for ; Tue, 19 Apr 2005 10:30:42 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id A001E312CA for ; Tue, 19 Apr 2005 10:30:41 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3J8UfD30819; Tue, 19 Apr 2005 10:30:41 +0200 Message-Id: <200504190830.j3J8UfD30819@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: sigurdne Date: Tue, 19 Apr 2005 10:15:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] property/inc class.sotts.inc.php, 1.6 class.solocation.inc.php, 1.5 class.soproject.inc.php, 1.19 class.soworkorder.inc.php, 1.6 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Apr 2005 08:43:13 -0000 Update of property/inc Modified Files: Branch: MAIN class.sotts.inc.php lines: +2 -1 class.solocation.inc.php lines: +2 -1 class.soproject.inc.php lines: +2 -1 class.soworkorder.inc.php lines: +2 -1 Log Message: no message ==================================================== Index: property/inc/class.sotts.inc.php diff -u property/inc/class.sotts.inc.php:1.5 property/inc/class.sotts.inc.php:1.6 --- property/inc/class.sotts.inc.php:1.5 Tue Mar 1 15:04:27 2005 +++ property/inc/class.sotts.inc.php Tue Apr 19 08:15:29 2005 @@ -160,6 +160,7 @@ if($query) { + $query = str_replace(",",'.',$query); if(stristr($query, '.')) { $query=explode(".",$query); ==================================================== Index: property/inc/class.solocation.inc.php diff -u property/inc/class.solocation.inc.php:1.4 property/inc/class.solocation.inc.php:1.5 --- property/inc/class.solocation.inc.php:1.4 Thu Jan 13 16:52:48 2005 +++ property/inc/class.solocation.inc.php Tue Apr 19 08:15:29 2005 @@ -456,6 +456,7 @@ if($query) { + $query = str_replace(",",'.',$query); if(stristr($query, '.')) { $query=explode(".",$query); ==================================================== Index: property/inc/class.soproject.inc.php diff -u property/inc/class.soproject.inc.php:1.18 property/inc/class.soproject.inc.php:1.19 --- property/inc/class.soproject.inc.php:1.18 Thu Apr 14 14:48:39 2005 +++ property/inc/class.soproject.inc.php Tue Apr 19 08:15:29 2005 @@ -257,6 +257,7 @@ if($query) { + $query = str_replace(",",'.',$query); if(stristr($query, '.')) { $query=explode(".",$query); ==================================================== Index: property/inc/class.soworkorder.inc.php diff -u property/inc/class.soworkorder.inc.php:1.5 property/inc/class.soworkorder.inc.php:1.6 --- property/inc/class.soworkorder.inc.php:1.5 Thu Apr 14 14:48:39 2005 +++ property/inc/class.soworkorder.inc.php Tue Apr 19 08:15:29 2005 @@ -304,6 +304,7 @@ if($query) { + $query = str_replace(",",'.',$query); if(stristr($query, '.')) { $query=explode(".",$query); From MAILER-DAEMON Wed Apr 20 05:35:41 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DOBcS-00052S-3e for mharc-phpgroupware-cvs@gnu.org; Wed, 20 Apr 2005 05:35:40 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DOBcO-00051p-TU for phpgroupware-cvs@gnu.org; Wed, 20 Apr 2005 05:35:37 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DOBcL-00051N-HH for phpgroupware-cvs@gnu.org; Wed, 20 Apr 2005 05:35:34 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DOBcK-0004nU-Gn for phpgroupware-cvs@gnu.org; Wed, 20 Apr 2005 05:35:32 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DOBZP-0004qy-LC for phpgroupware-cvs@gnu.org; Wed, 20 Apr 2005 05:32:32 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 631EC312C6 for ; Wed, 20 Apr 2005 11:30:12 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 30088-04 for ; Wed, 20 Apr 2005 11:30:09 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 07AC0312B7 for ; Wed, 20 Apr 2005 11:30:09 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3K9U9x15698; Wed, 20 Apr 2005 11:30:09 +0200 Message-Id: <200504200930.j3K9U9x15698@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: sigurdne Date: Wed, 20 Apr 2005 11:21:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] property/inc/export Agresso,1.21 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Apr 2005 09:35:37 -0000 Update of property/inc/export Modified Files: Branch: MAIN Agresso lines: +33 -4 Log Message: no message ==================================================== Index: property/inc/export/Agresso diff -u property/inc/export/Agresso:1.20 property/inc/export/Agresso:1.21 --- property/inc/export/Agresso:1.20 Tue Apr 12 14:14:54 2005 +++ property/inc/export/Agresso Wed Apr 20 09:21:03 2005 @@ -563,16 +563,35 @@ $Valuteringsdato= date(Ymd,strtotime($oRsBilag[$k]['fakturadato']));// verdi: Dato, type: date, plass: 251 - 258 $Bilagsdato = date(Ymd,strtotime($oRsBilag[$k]['fakturadato'])) ;// verdi: Dato, type: date, plass: 259 - 266 $Bilagsnr = sprintf("%-9s",substr($oRsBilag[$k]['bilagsnr'],-8));// verdi: Bilagsnummer, type: i4, plass: 267 - 275 - $Periode = sprintf("%06s",date(Y,strtotime($oRsBilag[$k]['fakturadato'])) . sprintf("%02d",$periode));// verdi: Periode, type: i4, plass: 276 - 281 + // $Periode = sprintf("%06s",date(Y,strtotime($oRsBilag[$k]['fakturadato'])) . sprintf("%02d",$periode));// verdi: Periode, type: i4, plass: 276 - 281 $ESL = sprintf("%1s",'');// verdi: Blank, type: i+C481, plass: 282 - 282 if($pre_transfer) { + if(abs(date(m,time()) - $periode) >1) + { + $temp_period = date(m,time()) -1; + + if($temp_period == 0) + { + $temp_period =1; + } + + $temp_year = date(Y,time()); + } + else + { + $temp_period = $periode; + $temp_year = date(Y,strtotime($oRsBilag[$k]['fakturadato'])); + } + + $Periode = sprintf("%06s",$temp_year . sprintf("%02d",$temp_period));// verdi: Periode, type: i4, plass: 276 - 281 $Bilagsart = sprintf("%2s",'FF');// verdi: , type: c2, plass: 15 - 16 $Forfall = '20991231';// verdi: Forfallsdato , type: date, plass: 298 - 305 } else { + $Periode = sprintf("%06s",date(Y,strtotime($oRsBilag[$k]['fakturadato'])) . sprintf("%02d",$periode));// verdi: Periode, type: i4, plass: 276 - 281 $Bilagsart = sprintf("%2s",'FD');// verdi: , type: c2, plass: 15 - 16 $Forfall = date(Ymd,strtotime($oRsBilag[$k]['forfallsdato']));// verdi: Forfallsdato , type: date, plass: 298 - 305 } @@ -722,7 +741,17 @@ $Konto = sprintf("%-8s",$oRsOverfBilag['spbudact_code']);// verdi: Art, type: c8, plass: 21 - 28 $Dim_1 = sprintf("%-8s",'');// verdi: Ansvarssted, type: c8, plass: 29 - 36 $Dim_2 = sprintf("%-8s",$oRsOverfBilag['kostra_id']);// verdi: Tjeneste, type: c8, plass: 37 - 44 - $Dim_3 = sprintf("%-8s",substr($oRsOverfBilag['dima'],0,6));// verdi: Objekt, type: c8, plass: 45 - 52 + + if($pre_transfer) + { + $Dim_3 = sprintf("%-8s",substr($oRsOverfBilag['dima'],0,4));// verdi: Objekt, type: c8, plass: 45 - 52 + } + else + { + $Dim_3 = sprintf("%-8s",substr($oRsOverfBilag['dima'],0,6));// verdi: Objekt-bygg, type: c8, plass: 45 - 52 + } + + $Dim_4 = sprintf("%-8s",'');// verdi: Ressurs, type: c8, plass: 53 - 60 $Dim_5 = sprintf("%-12s",$oRsOverfBilag['project_id']);// verdi: Prosjekt, type: c12, plass: 61 - 72 $Dim_6 = sprintf("%-4s",$oRsOverfBilag['dimd']);// verdi: Blank, type: c4, plass: 73 - 76 @@ -869,7 +898,7 @@ if($transfer_ok) { $this->db->transaction_commit(); - $message = 'Godkjent: periode: '.$periode_aar.' antall bilag/underbilag overført:'.$antall . ' , fil: ' . $Filnavn; + $message = 'Godkjent: periode: '.$Periode.' antall bilag/underbilag overført:'.$antall . ' , fil: ' . $Filnavn; } else { @@ -901,7 +930,7 @@ if($transfer_ok) { $this->db->transaction_commit(); - $message = 'Ankomstregistrering: periode: '.$periode_aar.' antall bilag/underbilag overført:'.$antall . ' , fil: ' . $Filnavn; + $message = 'Ankomstregistrering: periode: '.$Periode.' antall bilag/underbilag overført:'.$antall . ' , fil: ' . $Filnavn; } else { From MAILER-DAEMON Wed Apr 20 10:31:19 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DOGEZ-0008At-J3 for mharc-phpgroupware-cvs@gnu.org; Wed, 20 Apr 2005 10:31:19 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DOGEX-00089v-Gp for phpgroupware-cvs@gnu.org; Wed, 20 Apr 2005 10:31:17 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DOGEV-000893-LO for phpgroupware-cvs@gnu.org; Wed, 20 Apr 2005 10:31:17 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DOGES-0007j3-Pk for phpgroupware-cvs@gnu.org; Wed, 20 Apr 2005 10:31:13 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DOGFm-0007Mq-KS for phpgroupware-cvs@gnu.org; Wed, 20 Apr 2005 10:32:34 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id DD500312BD for ; Wed, 20 Apr 2005 16:30:11 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 13272-01 for ; Wed, 20 Apr 2005 16:30:09 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 22F1D312C8 for ; Wed, 20 Apr 2005 16:30:09 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3KEU9Q17446; Wed, 20 Apr 2005 16:30:09 +0200 Message-Id: <200504201430.j3KEU9Q17446@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: Caeies Date: Wed, 20 Apr 2005 16:18:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] developer_tools/inc class.uilangfile.inc.php, 1.10.2.1.2.10 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Apr 2005 14:31:18 -0000 Update of developer_tools/inc Modified Files: Branch: Version-0_9_16-branch class.uilangfile.inc.php lines: +6 -6 Log Message: better fix for #9047 (include adding of missing phrases) ==================================================== Index: developer_tools/inc/class.uilangfile.inc.php diff -u developer_tools/inc/class.uilangfile.inc.php:1.10.2.1.2.9 developer_tools/inc/class.uilangfile.inc.php:1.10.2.1.2.10 --- developer_tools/inc/class.uilangfile.inc.php:1.10.2.1.2.9 Tue Jul 27 08:00:10 2004 +++ developer_tools/inc/class.uilangfile.inc.php Wed Apr 20 14:18:47 2005 @@ -392,8 +392,7 @@ { if($_mess) { - // You need to strip the message ! in case of magic quote ? Caeies. btw English people should never add this kind of problem ... :) - $_mess = stripslashes(strtolower(trim($this->recode_id($_mess)))); + $_mess = $this->recode_id($_mess); $this->bo->source_langarray[$_mess]['app_name'] = $_app; $this->bo->target_langarray[$_mess]['app_name'] = $_app; } @@ -403,7 +402,7 @@ if($_mess && $_cont) { // You need to strip the message ! in case of magic quote ? Caeies. btw English people should never add this kind of problem ... :) - $_mess = stripslashes(strtolower(trim($this->recode_id($_mess)))); + $_mess = $this->recode_id($_mess); //Known issue: if a message containing a ] is used as index of array, when the array is posted the index gets truncated; $this->bo->target_langarray[$_mess]['message_id'] = $_mess; //POST method adds slashes @@ -420,7 +419,7 @@ if($_checked == 'on') { // You need to strip the message ! in case of magic quote ? Caeies. btw English people should never add this kind of problem ... :) - $_mess = stripslashes(strtolower(trim($this->recode_id($_mess)))); + $_mess = $this->recode_id($_mess); unset($this->bo->source_langarray[$_mess]); unset($this->bo->target_langarray[$_mess]); } @@ -507,7 +506,8 @@ function recode_id($id) { - return str_replace(array('%5B','%5D'),array('[',']'),$id); // & + " are recode by php + // You need to strip the message ! in case of magic quote ? Caeies. btw English people should never add this kind of problem ... :) + return strtolower(trim(stripslashes(str_replace(array('%5B','%5D'),array('[',']'),$id)))); // & + " are recode by php } function save($which,$userlang) From MAILER-DAEMON Fri Apr 22 08:41:11 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DOxT5-000543-0I for mharc-phpgroupware-cvs@gnu.org; Fri, 22 Apr 2005 08:41:11 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DOxT3-00053B-UD for phpgroupware-cvs@gnu.org; Fri, 22 Apr 2005 08:41:10 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DOxT2-00052Q-JZ for phpgroupware-cvs@gnu.org; Fri, 22 Apr 2005 08:41:09 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DOxT2-0004Zz-GN for phpgroupware-cvs@gnu.org; Fri, 22 Apr 2005 08:41:08 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DOxLT-0001Ta-Qe for phpgroupware-cvs@gnu.org; Fri, 22 Apr 2005 08:33:20 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 4DC58312D2 for ; Fri, 22 Apr 2005 14:30:28 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 03724-08 for ; Fri, 22 Apr 2005 14:30:26 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 4F263312D0 for ; Fri, 22 Apr 2005 14:30:26 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3MCUQJ21311; Fri, 22 Apr 2005 14:30:26 +0200 Message-Id: <200504221230.j3MCUQJ21311@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: sigurdne Date: Fri, 22 Apr 2005 14:16:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] property/inc hook_admin.inc.php, 1.12 class.socategory.inc.php, 1.5 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Apr 2005 12:41:10 -0000 Update of property/inc Modified Files: Branch: MAIN hook_admin.inc.php lines: +2 -1 class.socategory.inc.php lines: +3 -0 Log Message: no message ==================================================== Index: property/inc/hook_admin.inc.php diff -u property/inc/hook_admin.inc.php:1.11 property/inc/hook_admin.inc.php:1.12 --- property/inc/hook_admin.inc.php:1.11 Sat Jan 29 13:23:25 2005 +++ property/inc/hook_admin.inc.php Fri Apr 22 12:16:51 2005 @@ -33,6 +33,7 @@ // 'Request Categories'=> $GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=request'), 'Workorder Categories' => $GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=wo'), 'Ticket Categories'=> $GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=ticket'), + 'Tenant Claim Categories'=> $GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=tenant_claim'), 'Tenant Categories'=> $GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=tenant'), 'Tenant Attributes'=> $GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiactor.list_attribute&role=tenant'), 'Tenant'=> $GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiactor.index&role=tenant'), ==================================================== Index: property/inc/class.socategory.inc.php diff -u property/inc/class.socategory.inc.php:1.4 property/inc/class.socategory.inc.php:1.5 --- property/inc/class.socategory.inc.php:1.4 Thu Jan 13 16:52:48 2005 +++ property/inc/class.socategory.inc.php Fri Apr 22 12:16:51 2005 @@ -161,6 +161,9 @@ case 's_agreement': $table='fm_s_agreement_category'; break; + case 'tenant_claim': + $table='fm_tenant_claim_category'; + break; } return $table; From MAILER-DAEMON Sat Apr 23 18:36:32 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DPTEm-0002CE-Cu for mharc-phpgroupware-cvs@gnu.org; Sat, 23 Apr 2005 18:36:32 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DPTEk-0002Bb-8E for phpgroupware-cvs@gnu.org; Sat, 23 Apr 2005 18:36:30 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DPTEi-0002B7-Vl for phpgroupware-cvs@gnu.org; Sat, 23 Apr 2005 18:36:29 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DPTEi-0001Ct-GT for phpgroupware-cvs@gnu.org; Sat, 23 Apr 2005 18:36:28 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DPTGi-0001XR-89 for phpgroupware-cvs@gnu.org; Sat, 23 Apr 2005 18:38:32 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id F257F312BD for ; Sun, 24 Apr 2005 00:35:11 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 27463-08 for ; Sun, 24 Apr 2005 00:35:09 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 0F9F1312B4 for ; Sun, 24 Apr 2005 00:35:09 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3NMZ8s10277; Sun, 24 Apr 2005 00:35:08 +0200 Message-Id: <200504232235.j3NMZ8s10277@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: ceb Date: Sat, 23 Apr 2005 23:44:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/inc class.Template.inc.php,1.36 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2005 22:36:30 -0000 Update of phpgwapi/inc Modified Files: Branch: MAIN class.Template.inc.php lines: +5 -3 Log Message: applied patch ==================================================== Index: phpgwapi/inc/class.Template.inc.php diff -u phpgwapi/inc/class.Template.inc.php:1.35 phpgwapi/inc/class.Template.inc.php:1.36 --- phpgwapi/inc/class.Template.inc.php:1.35 Tue Jan 11 13:39:47 2005 +++ phpgwapi/inc/class.Template.inc.php Sat Apr 23 21:44:58 2005 @@ -4,7 +4,7 @@ * @author Kristian Koehntopp * @author Dan Kuykendall * @copyright Copyright (C) 1999,2000 NetUSE GmbH Kristian Koehntopp - * @copyright Portions Copyright (C) 2001-2004 Free Software Foundation, Inc. http://www.fsf.org/ + * @copyright Portions Copyright (C) 2001-2005 Free Software Foundation, Inc. http://www.fsf.org/ * @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General Public License * @package phpgwapi * @subpackage gui @@ -386,7 +386,9 @@ } else { - $new_root = str_replace($GLOBALS['phpgw_info']['server']['template_set'],'base',$root); + //$new_root = str_replace($GLOBALS['phpgw_info']['server']['template_set'],'base',$root); + $new_root = ereg_replace($GLOBALS['phpgw_info']['server']['template_set'].'$','base',$root); + $new_filename = $this->filename(str_replace($root.'/','',$new_filename),$new_root,2); } } From MAILER-DAEMON Sat Apr 23 18:42:04 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DPTK8-0003RP-Cd for mharc-phpgroupware-cvs@gnu.org; Sat, 23 Apr 2005 18:42:04 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DPTK6-0003Qf-CJ for phpgroupware-cvs@gnu.org; Sat, 23 Apr 2005 18:42:02 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DPTK5-0003QJ-P2 for phpgroupware-cvs@gnu.org; Sat, 23 Apr 2005 18:42:01 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DPTK5-0003Jb-IB for phpgroupware-cvs@gnu.org; Sat, 23 Apr 2005 18:42:01 -0400 Received: from [199.232.41.67] (helo=mx20.gnu.org) by monty-python.gnu.org with esmtp (TLS-1.0:RSA_ARCFOUR_SHA:16) (Exim 4.34) id 1DPTM0-0001k2-JV for phpgroupware-cvs@gnu.org; Sat, 23 Apr 2005 18:44:00 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by mx20.gnu.org with esmtp (Exim 4.34) id 1DPTDw-0004Zs-Fj for phpgroupware-cvs@gnu.org; Sat, 23 Apr 2005 18:35:40 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 02797312C8 for ; Sun, 24 Apr 2005 00:35:25 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 27680-06 for ; Sun, 24 Apr 2005 00:35:22 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id EB2CD312B4 for ; Sun, 24 Apr 2005 00:35:21 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3NMZLS10291; Sun, 24 Apr 2005 00:35:21 +0200 Message-Id: <200504232235.j3NMZLS10291@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: ceb Date: Sat, 23 Apr 2005 23:47:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/inc class.xslttemplates.inc.php,1.19 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2005 22:42:02 -0000 Update of phpgwapi/inc Modified Files: Branch: MAIN class.xslttemplates.inc.php lines: +15 -7 Log Message: applied patch for save_mode=on. check for save_mode and xml_/xslt_extension loaded should move to setup ==================================================== Index: phpgwapi/inc/class.xslttemplates.inc.php diff -u phpgwapi/inc/class.xslttemplates.inc.php:1.18 phpgwapi/inc/class.xslttemplates.inc.php:1.19 --- phpgwapi/inc/class.xslttemplates.inc.php:1.18 Thu Jan 20 01:25:01 2005 +++ phpgwapi/inc/class.xslttemplates.inc.php Sat Apr 23 21:47:31 2005 @@ -4,25 +4,33 @@ * @author Dan Kuykendall * @author Bettina Gille [ceb@phpgroupware.org] * @author Ralf Becker - * @copyright Copyright (C) 2002-2005 Free Software Foundation, Inc http://www.fsf.org/ + * @copyright Copyright (C) 2002-2005 Free Software Foundation, Inc. http://www.fsf.org/ * @license http://www.gnu.org/licenses/lpl.html GNU General Public License * @package phpgwapi * @subpackage gui * @version $Id$ */ - if (!extension_loaded('xslt')) + if(!extension_loaded('xslt')) { - if (PHP_OS == 'Windows' || PHP_OS == 'OS/2') + /* phpgroupware anyway would not work properly with save_mode=on */ + if(ini_get('safe_mode')) { - dl('php_xslt.dll'); + echo 'PHP CONFIGURATION - SAVE_MODE = ON. Unable to load the xslt-extension. Please contact the system administrator.'; + exit(); } else { - dl('xslt.so'); + if(PHP_OS == 'Windows' || PHP_OS == 'OS/2') + { + dl('php_xslt.dll'); + } + else + { + dl('xslt.so'); + } } } - require_once('class.xmltool.inc.php'); class xslttemplates From MAILER-DAEMON Sat Apr 23 18:42:15 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DPTKJ-0003U9-8e for mharc-phpgroupware-cvs@gnu.org; Sat, 23 Apr 2005 18:42:15 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DPTKG-0003U3-Pv for phpgroupware-cvs@gnu.org; Sat, 23 Apr 2005 18:42:13 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DPTKG-0003Tr-6f for phpgroupware-cvs@gnu.org; Sat, 23 Apr 2005 18:42:12 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DPTKG-0003Jb-3R for phpgroupware-cvs@gnu.org; Sat, 23 Apr 2005 18:42:12 -0400 Received: from [199.232.41.67] (helo=mx20.gnu.org) by monty-python.gnu.org with esmtp (TLS-1.0:RSA_ARCFOUR_SHA:16) (Exim 4.34) id 1DPTMA-0001k2-T8 for phpgroupware-cvs@gnu.org; Sat, 23 Apr 2005 18:44:11 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by mx20.gnu.org with esmtp (Exim 4.34) id 1DPTDp-0004Zd-PN for phpgroupware-cvs@gnu.org; Sat, 23 Apr 2005 18:35:34 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 95B84312C8 for ; Sun, 24 Apr 2005 00:35:17 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 28122-02 for ; Sun, 24 Apr 2005 00:35:15 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 2E446312B4 for ; Sun, 24 Apr 2005 00:35:15 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3NMZEH10284; Sun, 24 Apr 2005 00:35:14 +0200 Message-Id: <200504232235.j3NMZEH10284@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: ceb Date: Sat, 23 Apr 2005 23:45:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/inc class.acl.inc.php,1.70 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2005 22:42:13 -0000 Update of phpgwapi/inc Modified Files: Branch: MAIN class.acl.inc.php lines: +47 -34 Log Message: applied patch partially ==================================================== Index: phpgwapi/inc/class.acl.inc.php diff -u phpgwapi/inc/class.acl.inc.php:1.69 phpgwapi/inc/class.acl.inc.php:1.70 --- phpgwapi/inc/class.acl.inc.php:1.69 Thu Dec 30 06:47:30 2004 +++ phpgwapi/inc/class.acl.inc.php Sat Apr 23 21:45:17 2005 @@ -2,7 +2,7 @@ /** * Access Control List - Security scheme based on ACL design * @author Dan Kuykendall - * @copyright Copyright (C) 2000-2004 Free Software Foundation, Inc. http://www.fsf.org/ + * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. http://www.fsf.org/ * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License * @package phpgwapi * @subpackage accounts @@ -54,7 +54,7 @@ */ function acl($account_id = '') { - $this->db = $GLOBALS['phpgw']->db; + $this->db = $GLOBALS['phpgw']->db; if (!($this->account_id = intval($account_id))) { @@ -126,9 +126,9 @@ $this->acl(); } - $sql = 'select * from phpgw_acl where (acl_account in ('.$this->account_id.', 0'; + $sql = 'select * from phpgw_acl where (acl_account in (' . $this->account_id . ', 0'; - $groups = $this->get_location_list_for_id('phpgw_group', 1, $this->account_id); + $groups = $this->get_location_list_for_id('phpgw_group',1,$this->account_id); while($groups && (list($key,$value) = each($groups))) { $sql .= ','.$value; @@ -142,11 +142,12 @@ //reset ($this->data); //while(list($idx,$value) = each($this->data)){ $this->db->next_record(); - $this->data[] = array( - 'appname' => $this->db->f('acl_appname'), - 'location' => $this->db->f('acl_location'), - 'account' => $this->db->f('acl_account'), - 'rights' => $this->db->f('acl_rights') + $this->data[] = array + ( + 'appname' => $this->db->f('acl_appname'), + 'location' => $this->db->f('acl_location'), + 'account' => $this->db->f('acl_account'), + 'rights' => $this->db->f('acl_rights') ); } reset ($this->data); @@ -244,10 +245,8 @@ return $this->data; } - // These are the non-standard $account_id specific functions - /** * Get rights from the repository not specific to this object * @@ -260,9 +259,9 @@ // For XML-RPC, change this once its working correctly for passing parameters (jengo) if (is_array($location)) { - $a = $location; - $location = $a['location']; - $appname = $a['appname']; + $a = $location; + $location = $a['location']; + $appname = $a['appname']; } if (count($this->data) == 0) @@ -300,6 +299,7 @@ } return $rights; } + /** * Check required rights (not specific to this object) * @@ -319,9 +319,10 @@ * * @param string $location Application location * @param string|boolean $appname Application name, defaults to false which means $phpgw_info['flags']['currentapp'] + * @param $checkgroups optional defaults to False * @return integer Access rights in bitmask form */ - function get_specific_rights($location, $appname = False) + function get_specific_rights($location, $appname = False, $checkgroups = False) { if ($appname == False) { @@ -335,14 +336,28 @@ return True; } $rights = 0; + + $account_list[0] = $this->account_id; + + if($checkgroups) + { + $user_groups = $GLOBALS['phpgw']->accounts->membership($this->account_id); + $user_groups = is_array($user_groups)?$user_groups:array(); + //_debug_array($user_groups); + + foreach($user_groups as $null => $ad_account) + { + $account_list[$i]=$ad_account['account_id']; + ++$i; + } + } reset ($this->data); while(list($idx,$value) = each($this->data)) { - if ($this->data[$idx]['appname'] == $appname && - ($this->data[$idx]['location'] == $location || - $this->data[$idx]['location'] == 'everywhere') && - $this->data[$idx]['account'] == $this->account_id) + if ($this->data[$idx]['appname'] == $appname && ($this->data[$idx]['location'] == $location || $this->data[$idx]['location'] == 'everywhere') && + //$this->data[$idx]['account'] == $this->account_id) + in_array($this->data[$idx]['account'],$account_list)) { if ($this->data[$idx]['rights'] == 0) { @@ -353,7 +368,7 @@ } return $rights; } - + /** * Check specific rights * @@ -502,7 +517,7 @@ $this->db->query($sql ,__LINE__,__FILE__); return $this->db->num_rows(); } - + /** * Get application list for an account id * @@ -553,7 +568,7 @@ * * @param string $app Application name * @param integer $required Required access rights in bitmap form - * @param integer $account_id Account id defaults to $phpgw_info['user']['account_id']; + * @param integer $account_id Account id * @return array|boolean Array with location list or false */ function get_location_list_for_id($app, $required, $accountid = '') @@ -569,22 +584,21 @@ $account_id = get_account_id($accountid,$this->account_id); $cache_accountid[$accountid] = $account_id; } - $sql = 'SELECT acl_location, acl_rights '; - $sql .= "FROM phpgw_acl where acl_appname = '" . $this->db->db_addslashes($app) . "' "; - $sql .= 'AND acl_account =' . intval($account_id); - + $sql = "SELECT acl_location, acl_rights FROM phpgw_acl where acl_appname='" . $this->db->db_addslashes($app) + . "' AND acl_account=" . intval($account_id); + $this->db->query($sql ,__LINE__,__FILE__); $rights = 0; - if ($this->db->num_rows() == 0 ) + if($this->db->num_rows() == 0) { return False; } - while ($this->db->next_record()) + while($this->db->next_record()) { - if ($this->db->f('acl_rights')) + if($this->db->f('acl_rights')) { $rights |= $this->db->f('acl_rights'); - if (!!($rights & $required) == True) + if(!!($rights & $required) == True) { $locations[] = $this->db->f('acl_location'); } @@ -592,7 +606,7 @@ } return $locations; } - + /** * Get ids for location * @@ -607,8 +621,7 @@ { $app = $GLOBALS['phpgw_info']['flags']['currentapp']; } - $sql = "select acl_account, acl_rights from phpgw_acl where acl_appname = '$app' and "; - $sql .= "acl_location = '".$location."'"; + $sql = "SELECT acl_account, acl_rights from phpgw_acl where acl_appname='" . $app . "' and acl_location ='" . $location . "'"; $this->db->query($sql ,__LINE__,__FILE__); $rights = 0; if ($this->db->num_rows() == 0 ) From MAILER-DAEMON Sun Apr 24 19:48:39 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DPqq7-0004Rz-Bg for mharc-phpgroupware-cvs@gnu.org; Sun, 24 Apr 2005 19:48:39 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DPqq5-0004Qk-5i for phpgroupware-cvs@gnu.org; Sun, 24 Apr 2005 19:48:37 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DPqq3-0004Px-81 for phpgroupware-cvs@gnu.org; Sun, 24 Apr 2005 19:48:36 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DPqq2-0003u9-Vm for phpgroupware-cvs@gnu.org; Sun, 24 Apr 2005 19:48:35 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DPqgn-0003hk-Qo for phpgroupware-cvs@gnu.org; Sun, 24 Apr 2005 19:39:02 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 109A2312E7 for ; Mon, 25 Apr 2005 01:35:23 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 12045-03 for ; Mon, 25 Apr 2005 01:35:18 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id BFA64312B8 for ; Mon, 25 Apr 2005 01:35:18 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3ONZIX00581; Mon, 25 Apr 2005 01:35:18 +0200 Message-Id: <200504242335.j3ONZIX00581@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: ceb Date: Mon, 25 Apr 2005 00:44:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/doc coding_standard.txt, 1.9 etiquette.txt, 1.9 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 23:48:37 -0000 Update of phpgwapi/doc Modified Files: Branch: MAIN coding_standard.txt lines: +15 -17 etiquette.txt lines: +19 -19 Log Message: removed globals ==================================================== Index: phpgwapi/doc/coding_standard.txt diff -u phpgwapi/doc/coding_standard.txt:1.8 phpgwapi/doc/coding_standard.txt:1.9 --- phpgwapi/doc/coding_standard.txt:1.8 Thu Dec 30 06:47:26 2004 +++ phpgwapi/doc/coding_standard.txt Sun Apr 24 22:44:21 2005 @@ -1,28 +1,28 @@ -1) Format your code so that we can read it, please! +1) Format your code so that we can read it, please! -2) Use tabs for formatting, NOT SPACES. Tabs create smaller files and editors allow +2) Use tabs for formatting, NOT SPACES. Tabs create smaller files and editors allow developers to view a tab as however many spaces as they prefer. Spaces do not allow this. There is one exception (see #11 below). -3) Use ' instead of " for strings. This is a performance issue, and prevents +3) Use ' instead of " for strings. This is a performance issue, and prevents a lot of inconsistent coding styles. -4) Comments go on the line ABOVE the code, NOT to the right of the code! +4) Comments go on the line ABOVE the code, NOT to the right of the code! -5) For each section of code put a section divider with basic explanation of the following +5) For each section of code put a section divider with basic explanation of the following code/functions. It should look like this: /****************************************************************************\ * These functions are used to pick my nose * \****************************************************************************/ -6) Do not document every bit of code in comments. PHP is an interpreted language and it will be +6) Do not document every bit of code in comments. PHP is an interpreted language and it will be nasty on performance. -7) Use switch statements where many elseif's are going to be used. Switch is faster and I like it +7) Use switch statements where many elseif's are going to be used. Switch is faster and I (who?) like it better! -8) 'If' statements need to use the following format: +8) 'If' statements need to use the following format: if ($var == 'example') { @@ -40,7 +40,7 @@ All other styles are not to be used. This is it. Use it or I will personally come and nag you to death. -9) ALL 'if' statements MUST have matching { } (brackets). Do NOT create 'if' statements like this: +9) ALL 'if' statements MUST have matching { } (brackets). Do NOT create 'if' statements like this: if ($a == b) dosomething(); @@ -51,14 +51,12 @@ They make the code more difficult to read and follow. -10) class/function format: +10) class/function format: class testing { function print_to_screen() { - global phpgw, phpgw_info; - if ($var == 'example') { echo 'This is only an example'; @@ -70,7 +68,7 @@ } } -11) Associative arrays must be written in the following manner: +11) Associative arrays must be written in the following manner: $array = array ( @@ -80,9 +78,9 @@ Note that tabs are preferred around the '=>'. -12) Use the long format for ; Tue, 26 Apr 2005 02:35:13 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 05943-06 for ; Tue, 26 Apr 2005 02:35:11 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id E1BB4312B1 for ; Tue, 26 Apr 2005 02:35:11 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3Q0ZBE24565; Tue, 26 Apr 2005 02:35:11 +0200 Message-Id: <200504260035.j3Q0ZBE24565@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: skwashd Date: Tue, 26 Apr 2005 01:52:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/inc common_functions.inc.php,1.16.2.13 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 00:37:14 -0000 Update of phpgwapi/inc Modified Files: Branch: Version-0_9_16-branch common_functions.inc.php lines: +2 -2 Log Message: something the zend optimiser won't find - fixes bug #12804 ==================================================== Index: phpgwapi/inc/common_functions.inc.php diff -u phpgwapi/inc/common_functions.inc.php:1.16.2.12 phpgwapi/inc/common_functions.inc.php:1.16.2.13 --- phpgwapi/inc/common_functions.inc.php:1.16.2.12 Sat Nov 6 15:34:26 2004 +++ phpgwapi/inc/common_functions.inc.php Mon Apr 25 23:52:51 2005 @@ -714,7 +714,7 @@ function _debug_array($array,$print=True) { $four = False; - if(@floor(phpversion()) == 4) + if(@floor(phpversion()) >= 4) { $four = True; } From MAILER-DAEMON Mon Apr 25 20:38:26 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DQE5q-0008IC-4i for mharc-phpgroupware-cvs@gnu.org; Mon, 25 Apr 2005 20:38:26 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DQE5p-0008Hq-6l for phpgroupware-cvs@gnu.org; Mon, 25 Apr 2005 20:38:25 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DQE5o-0008HP-Cs for phpgroupware-cvs@gnu.org; Mon, 25 Apr 2005 20:38:24 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DQE5o-0007U4-Al for phpgroupware-cvs@gnu.org; Mon, 25 Apr 2005 20:38:24 -0400 Received: from [199.232.41.67] (helo=mx20.gnu.org) by monty-python.gnu.org with esmtp (TLS-1.0:RSA_ARCFOUR_SHA:16) (Exim 4.34) id 1DQE1h-0006fr-9S for phpgroupware-cvs@gnu.org; Mon, 25 Apr 2005 20:34:09 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by mx20.gnu.org with esmtp (Exim 4.34) id 1DQDyM-0005Zs-VT for phpgroupware-cvs@gnu.org; Mon, 25 Apr 2005 20:30:43 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 35F33312C3 for ; Tue, 26 Apr 2005 02:30:19 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 05993-04 for ; Tue, 26 Apr 2005 02:30:17 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 36E0A312BF for ; Tue, 26 Apr 2005 02:30:17 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3Q0UHE24519; Tue, 26 Apr 2005 02:30:17 +0200 Message-Id: <200504260030.j3Q0UHE24519@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: skwashd Date: Tue, 26 Apr 2005 02:09:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgroupware/doc inlinedocparser.php,1.32 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 00:38:25 -0000 Update of phpgroupware/doc Modified Files: Branch: MAIN inlinedocparser.php lines: +2 -2 Log Message: php5 fix ==================================================== Index: phpgroupware/doc/inlinedocparser.php diff -u phpgroupware/doc/inlinedocparser.php:1.31 phpgroupware/doc/inlinedocparser.php:1.32 --- phpgroupware/doc/inlinedocparser.php:1.31 Fri Apr 15 13:19:15 2005 +++ phpgroupware/doc/inlinedocparser.php Tue Apr 26 00:09:34 2005 @@ -39,7 +39,7 @@ */ function array_print($array) { - if(floor(phpversion()) == 4) + if(floor(phpversion()) >= 4) { ob_start(); echo '
'; print_r($array); echo '
'; From MAILER-DAEMON Mon Apr 25 20:38:36 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DQE60-0008LG-Bc for mharc-phpgroupware-cvs@gnu.org; Mon, 25 Apr 2005 20:38:36 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DQE5z-0008LB-41 for phpgroupware-cvs@gnu.org; Mon, 25 Apr 2005 20:38:35 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DQE5y-0008Kz-HJ for phpgroupware-cvs@gnu.org; Mon, 25 Apr 2005 20:38:34 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DQE5y-0007U4-FT for phpgroupware-cvs@gnu.org; Mon, 25 Apr 2005 20:38:34 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DQE1d-0006o5-V5 for phpgroupware-cvs@gnu.org; Mon, 25 Apr 2005 20:34:06 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 250B4312B1 for ; Tue, 26 Apr 2005 02:30:14 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 05762-05 for ; Tue, 26 Apr 2005 02:30:10 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 1C1B6312BF for ; Tue, 26 Apr 2005 02:30:10 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3Q0UAT24512; Tue, 26 Apr 2005 02:30:10 +0200 Message-Id: <200504260030.j3Q0UAT24512@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: skwashd Date: Tue, 26 Apr 2005 02:05:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgroupware/doc inlinedocparser.php,1.26.4.2 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 00:38:35 -0000 Update of phpgroupware/doc Modified Files: Branch: Version-0_9_16-branch inlinedocparser.php lines: +3 -3 Log Message: php5 fix ==================================================== Index: phpgroupware/doc/inlinedocparser.php diff -u phpgroupware/doc/inlinedocparser.php:1.26.4.1 phpgroupware/doc/inlinedocparser.php:1.26.4.2 --- phpgroupware/doc/inlinedocparser.php:1.26.4.1 Sat Nov 6 16:13:48 2004 +++ phpgroupware/doc/inlinedocparser.php Tue Apr 26 00:05:49 2005 @@ -17,7 +17,7 @@ \**************************************************************************/ $phpgw_info['flags']['noapi'] = True; include ('../header.inc.php'); - if (floor(phpversion()) == 3) + if (floor(phpversion()) == 4) { include (PHPGW_API_INC.'/php3_support_functions.inc.php'); } @@ -30,7 +30,7 @@ */ function array_print($array) { - if(floor(phpversion()) == 4) + if(floor(phpversion()) >= 4) { ob_start(); echo '
'; print_r($array); echo '
'; From MAILER-DAEMON Tue Apr 26 03:40:15 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DQKg0-0005q0-OX for mharc-phpgroupware-cvs@gnu.org; Tue, 26 Apr 2005 03:40:13 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DQKft-0005mA-K1 for phpgroupware-cvs@gnu.org; Tue, 26 Apr 2005 03:40:06 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DQKfn-0005kA-8J for phpgroupware-cvs@gnu.org; Tue, 26 Apr 2005 03:40:04 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DQKfl-00058y-G3 for phpgroupware-cvs@gnu.org; Tue, 26 Apr 2005 03:39:58 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DQKez-0003GZ-10 for phpgroupware-cvs@gnu.org; Tue, 26 Apr 2005 03:39:09 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 00507312D5 for ; Tue, 26 Apr 2005 09:35:13 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 11366-07 for ; Tue, 26 Apr 2005 09:35:08 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 89016312D4 for ; Tue, 26 Apr 2005 09:35:08 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3Q7Z8K05778; Tue, 26 Apr 2005 09:35:08 +0200 Message-Id: <200504260735.j3Q7Z8K05778@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Tue, 26 Apr 2005 08:45:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/inc/accounts class.accounts_SQLLDAP.inc.php, 1.3 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 07:40:08 -0000 Update of phpgwapi/inc/accounts Modified Files: Branch: MAIN class.accounts_SQLLDAP.inc.php lines: +6 -4 Log Message: phpdoc fix ==================================================== Index: phpgwapi/inc/accounts/class.accounts_SQLLDAP.inc.php diff -u phpgwapi/inc/accounts/class.accounts_SQLLDAP.inc.php:1.2 phpgwapi/inc/accounts/class.accounts_SQLLDAP.inc.php:1.3 --- phpgwapi/inc/accounts/class.accounts_SQLLDAP.inc.php:1.2 Thu Dec 30 06:47:32 2004 +++ phpgwapi/inc/accounts/class.accounts_SQLLDAP.inc.php Tue Apr 26 06:45:23 2005 @@ -1,7 +1,4 @@ ; Tue, 26 Apr 2005 10:35:34 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 12594-03 for ; Tue, 26 Apr 2005 10:35:32 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 96AE1312D4 for ; Tue, 26 Apr 2005 10:35:32 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3Q8ZXv06094; Tue, 26 Apr 2005 10:35:33 +0200 Message-Id: <200504260835.j3Q8ZXv06094@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Tue, 26 Apr 2005 09:50:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/inc/auth class.auth_ads.inc.php,1.2 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 08:44:25 -0000 Update of phpgwapi/inc/auth Modified Files: Branch: MAIN class.auth_ads.inc.php lines: +4 -1 Log Message: phpdoc fixes ==================================================== Index: phpgwapi/inc/auth/class.auth_ads.inc.php diff -u phpgwapi/inc/auth/class.auth_ads.inc.php:1.1 phpgwapi/inc/auth/class.auth_ads.inc.php:1.2 --- phpgwapi/inc/auth/class.auth_ads.inc.php:1.1 Tue Mar 22 14:53:43 2005 +++ phpgwapi/inc/auth/class.auth_ads.inc.php Tue Apr 26 07:50:36 2005 @@ -9,6 +9,9 @@ * @version $Id$ */ + /** + * Include M$ Exchange authentification + */ include_once(PHPGW_API_INC . '/auth/class.auth_exchange.inc.php'); /** From MAILER-DAEMON Tue Apr 26 04:44:34 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DQLgH-0005I3-4b for mharc-phpgroupware-cvs@gnu.org; Tue, 26 Apr 2005 04:44:33 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DQLgD-0005HM-DB for phpgroupware-cvs@gnu.org; Tue, 26 Apr 2005 04:44:29 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DQLgC-0005H0-KS for phpgroupware-cvs@gnu.org; Tue, 26 Apr 2005 04:44:28 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DQLgB-000570-K0 for phpgroupware-cvs@gnu.org; Tue, 26 Apr 2005 04:44:27 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DQLbP-0007F2-Dm for phpgroupware-cvs@gnu.org; Tue, 26 Apr 2005 04:39:31 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 5B08A312D9 for ; Tue, 26 Apr 2005 10:35:28 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 12576-04 for ; Tue, 26 Apr 2005 10:35:26 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id E36AE312D4 for ; Tue, 26 Apr 2005 10:35:25 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3Q8ZQc06087; Tue, 26 Apr 2005 10:35:26 +0200 Message-Id: <200504260835.j3Q8ZQc06087@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Tue, 26 Apr 2005 09:50:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/inc class.http_dav_client.inc.php,1.11 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 08:44:30 -0000 Update of phpgwapi/inc Modified Files: Branch: MAIN class.http_dav_client.inc.php lines: +10 -1 Log Message: phpdoc fixes ==================================================== Index: phpgwapi/inc/class.http_dav_client.inc.php diff -u phpgwapi/inc/class.http_dav_client.inc.php:1.10 phpgwapi/inc/class.http_dav_client.inc.php:1.11 --- phpgwapi/inc/class.http_dav_client.inc.php:1.10 Sun Apr 3 18:49:19 2005 +++ phpgwapi/inc/class.http_dav_client.inc.php Tue Apr 26 07:50:36 2005 @@ -28,6 +28,15 @@ * This cache avoid to do 2 request when there is a 301 or a 404 */ define ('DEBUG_CACHEPROP', 0); + + + /** + * DAV parser + * + * @package phpgwapi + * @subpackage network + * @access private + */ class dav_parser { function davtree($branch) From MAILER-DAEMON Tue Apr 26 06:50:20 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DQNdx-0005E3-M2 for mharc-phpgroupware-cvs@gnu.org; Tue, 26 Apr 2005 06:50:19 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DQNdq-0005Da-UL for phpgroupware-cvs@gnu.org; Tue, 26 Apr 2005 06:50:11 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DQNdo-0005DE-HS for phpgroupware-cvs@gnu.org; Tue, 26 Apr 2005 06:50:09 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DQNdn-0004Rl-8v for phpgroupware-cvs@gnu.org; Tue, 26 Apr 2005 06:50:07 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DQNTv-0007jC-Qr for phpgroupware-cvs@gnu.org; Tue, 26 Apr 2005 06:39:56 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 8995C312D5 for ; Tue, 26 Apr 2005 12:35:57 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 14578-02 for ; Tue, 26 Apr 2005 12:35:50 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id E7FA4312C2 for ; Tue, 26 Apr 2005 12:35:47 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3QAZln07035; Tue, 26 Apr 2005 12:35:47 +0200 Message-Id: <200504261035.j3QAZln07035@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Tue, 26 Apr 2005 11:43:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/inc class.nextmatchs_xslt.inc.php, 1.2 class.http_dav_client.inc.php, 1.12 class.gdbutton.inc.php, 1.5 class.xmltool.inc.php, 1.11 class.gdgraph.inc.php, 1.20 class.gdimage.inc.php, 1.11 class.xslttemplates.inc.php, 1.20 class.nextmatchs.inc.php, 1.73 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 10:50:12 -0000 Update of phpgwapi/inc Modified Files: Branch: MAIN class.nextmatchs_xslt.inc.php lines: +6 -4 class.http_dav_client.inc.php lines: +171 -202 class.gdbutton.inc.php lines: +21 -32 class.xmltool.inc.php lines: +42 -25 class.gdgraph.inc.php lines: +18 -32 class.gdimage.inc.php lines: +18 -31 class.xslttemplates.inc.php lines: +24 -6 class.nextmatchs.inc.php lines: +6 -1 Log Message: phpdoc fixes ==================================================== Index: phpgwapi/inc/class.nextmatchs_xslt.inc.php diff -u phpgwapi/inc/class.nextmatchs_xslt.inc.php:1.1 phpgwapi/inc/class.nextmatchs_xslt.inc.php:1.2 --- phpgwapi/inc/class.nextmatchs_xslt.inc.php:1.1 Tue Jan 18 01:51:20 2005 +++ phpgwapi/inc/class.nextmatchs_xslt.inc.php Tue Apr 26 09:43:08 2005 @@ -9,9 +9,11 @@ * @version $Id$ */ - /*! - @class nextmatchs_xslt - @abstract + /** + * XSLT nextmatch + * + * @package phpgwapi + * @subpackage gui */ class nextmatchs_xslt { ==================================================== Index: phpgwapi/inc/class.http_dav_client.inc.php diff -u phpgwapi/inc/class.http_dav_client.inc.php:1.11 phpgwapi/inc/class.http_dav_client.inc.php:1.12 --- phpgwapi/inc/class.http_dav_client.inc.php:1.11 Tue Apr 26 07:50:36 2005 +++ phpgwapi/inc/class.http_dav_client.inc.php Tue Apr 26 09:43:08 2005 @@ -208,9 +208,9 @@ $this->tree = array(); } - //So, we fake the DAV: uri into a more acceptable one + // So, we fake the DAV: uri into a more acceptable one $xml_string = preg_replace('/"DAV:"/','"http://webdav.org/dav/"',$this->xml); - //Build it + // Build it $domobj = domxml_open_mem($xml_string); // $time1 = getmicrotime(); $this->tree = dav_parser::davtree($domobj); @@ -221,6 +221,7 @@ } + /** * DAV client * @@ -243,8 +244,8 @@ $this->set_debug(0); } - //TODO: Get rid of this - //A quick, temporary debug output function + // TODO: Get rid of this + // A quick, temporary debug output function function debug($info) { if (DEBUG_DAV_CLIENT) @@ -262,11 +263,11 @@ } } - /*! - @function glue_url - @abstract glues a parsed url (ie parsed using PHP's parse_url) back - together - @param $url The parsed url (its an array) + /** + * Glues a parsed url (ie parsed using PHP's parse_url) back together + * + * @param array $url The parsed url + * @return boolean|string URI string or false */ function glue_url ($url) { @@ -304,13 +305,12 @@ return $uri; } - /*! - @function encodeurl - @abstract encodes a url from its "display name" to something the dav server will accept - @param uri The unencoded uri - @discussion - Deals with "url"s which may contain spaces and other unsavoury characters, - by using appropriate %20s + /** + * Encodes a url from its "display name" to something the dav server will accept + * + * @param string $uri The unencoded URI + * @return string Encoded URI + * @internal Deals with "url"s which may contain spaces and other unsavoury characters, by using appropriate %20s */ function encodeurl($uri) { @@ -342,13 +342,12 @@ } - /*! - @function decodeurl - @abstract decodes a url to its "display name" - @param uri The encoded uri - @discussion - Deals with "url"s which may contain spaces and other unsavoury characters, - by using appropriate %20s + /** + * Decodes a url to its "display name" + * + * @param string $uri Encoded URI + * @return string Decoded URI + * @internal Deals with "url"s which may contain spaces and other unsavoury characters, by using appropriate %20s */ function decodeurl($uri) { @@ -380,15 +379,11 @@ } - /*! - @function set_attributes - @abstract Sets the "attribute map" - @param attributes Attributes to extract "as-is" from the DAV properties - @param dav_map A mapping of dav_property_name => attribute_name for attributes - with different names in DAV and the desired name space. - @discussion - This is mainly for use by VFS, where the VFS attributes (eg size) differ - from the corresponding DAV ones ("getcontentlength") + /** + * Sets the "attribute map" + * @param array $attributes Attributes to extract "as-is" from the DAV properties + * @param array $dav_map A mapping of dav_property_name => attribute_name for attributes with different names in DAV and the desired name space. + * @internal This is mainly for use by VFS, where the VFS attributes (eg size) differ from the corresponding DAV ones ("getcontentlength") */ function set_attributes($attributes, $dav_map) { @@ -396,27 +391,24 @@ $this->attributes = $attributes; } - /*! - @function set_credentials - @abstract Sets authentication credentials for HTTP AUTH - @param username The username to connect with - @param password The password to connect with - @discussion - The only supported authentication type is "basic" + /** + * Sets authentication credentials for HTTP AUTH + * + * @param string $username The username to connect with + * @param string $password The password to connect with + * @internal The only supported authentication type is "basic" */ function set_credentials( $username, $password ) { $this->http_client->setCredentials($username, $password ); } - /*! - @function connect - @abstract connects to the server - @param dav_host The host to connect to - @param dav_port The port to connect to - @discussion - If the server requires authentication you will need to set credentials - with set_credentials first + /** + * Connects to the server + * + * @param string $dav_host The host to connect to + * @param integer $dav_port The port to connect to + * @internal If the server requires authentication you will need to set credentials with set_credentials first */ function connect($dav_host,$dav_port,$ssl=False) { @@ -443,13 +435,10 @@ $this->http_client->setDebug($debug); } - /*! - @function disconnect - @abstract disconnect from the server - @discussion - When doing HTTP 1.1 we frequently close/reopen the connection - anyway, so this function needs to be called after any other DAV calls - (since if they find the connection closed, they just reopen it) + /** + * Disconnect from the server + * + * @internal When doing HTTP 1.1 we frequently close/reopen the connection anyway, so this function needs to be called after any other DAV calls (since if they find the connection closed, they just reopen it) */ function disconnect() { @@ -457,18 +446,16 @@ $this->http_client->Disconnect(); } - /*! - @function get_properties - @abstract a high-level method of getting DAV properties - @param url The URL to get properties for - @param scope the 'depth' to recuse subdirectories (default 1) - @param sorted whether we should sort the rsulting array (default True) - @result array of file->property arra - @discussion - This function performs all the necessary XML parsing etc to convert DAV properties (ie XML nodes) - into associative arrays of properties - including doing mappings - from DAV property names to any desired property name format (eg the VFS one) - This is controlled by the attribute arrays set in the set_attributes function. + /** + * A high-level method of getting DAV properties + * + * @param array $props + * @param string $url The URL to get properties for + * @param integer $scope the 'depth' to recuse subdirectories (default 1) + * @param boolean $is_dir + * @param boolean $sorted Whether we should sort the rsulting array (default True) + * @return array of file->property arra + * @internal This function performs all the necessary XML parsing etc to convert DAV properties (ie XML nodes) into associative arrays of properties - including doing mappings from DAV property names to any desired property name format (eg the VFS one) This is controlled by the attribute arrays set in the set_attributes function. */ function get_properties(&$props, $url, $scope=1, $is_dir =False, $sorted=true){ $request_id = $url.'//'.$scope.'//'.$sorted; //A unique id for this request (for caching) @@ -578,36 +565,35 @@ return $this->http_client->Get($uri); } - /*! - @function get_body - @abstract return the response body - @result string body content - @discussion - invoke it after a Get() call for instance, to retrieve the response + /** + * Get body content + * + * @return string + * @internal Invoke it after a Get() call for instance, to retrieve the response */ function get_body() { return $this->http_client->getBody(); } - /*! - @function get_headers - @abstract return the response headers - @result array headers received from server in the form headername => value - @discussion - to be called after a Get() or Head() call + /** + * Return the response headers + * + * @return array Headers received from server in the form headername => value + * @internal To be called after a Get() or Head() call */ function get_headers() { return $this->http_client->getHeaders(); } - /*! - @function put - @abstract PUT is the method to sending a file on the server. - @param uri the location of the file on the server. dont forget the heading "/" - @param data the content of the file. binary content accepted - @result string response status code 201 (Created) if ok + /** + * Put is the method to sending a file on the server. + * + * @param string $uri The location of the file on the server. dont forget the heading "/" + * @param string $data The content of the file. Binary content accepted + * @param string $token + * @return string Response status code 201 (Created) if ok */ function put($uri, $data, $token='') { @@ -626,15 +612,16 @@ return $result; } - /*! - @function copy - @abstract Copy a file -allready on the server- into a new location - @param srcUri the current file location on the server. dont forget the heading "/" - @param destUri the destination location on the server. this is *not* a full URL - @param overwrite boolean - true to overwrite an existing destination - overwrite by default - @result Returns the HTTP status code - @discussion - returns response status code 204 (Unchanged) if ok + /** + * Copy a file -allready on the server- into a new location + * + * @param string $srcUri the current file location on the server. dont forget the heading "/" + * @param string $destUri the destination location on the server. this is *not* a full URL + * @param boolean $overwrite boolean - true to overwrite an existing destination - overwrite by default + * @param integer $scope + * @param string $token + * @return Returns the HTTP status code + * @internal Returns response status code 204 (Unchanged) if ok */ function copy( $srcUri, $destUri, $overwrite=true, $scope=0, $token='') { @@ -659,15 +646,15 @@ return $result; } - /*! - @function move - @abstract Moves a WEBDAV resource on the server - @param srcUri the current file location on the server. dont forget the heading "/" - @param destUri the destination location on the server. this is *not* a full URL - @param overwrite boolean - true to overwrite an existing destination (default is yes) - @result Returns the HTTP status code - @discussion - returns response status code 204 (Unchanged) if ok + /** + * Moves a WEBDAV resource on the server + * + * @param string $srcUri The current file location on the server. Dont forget the heading "/" + * @param string $destUri The destination location on the server. This is *not* a full URL + * @param boolean $overwrite True to overwrite an existing destination (default is yes) + * @param integer $scope + * @param string $token + * @return string HTTP status code - Response status code 204 (Unchanged) if ok */ function move( $srcUri, $destUri, $overwrite=true, $scope=0, $token='' ) { @@ -687,13 +674,13 @@ return $result; } - /*! - @function delete - @abstract Deletes a WEBDAV resource - @param uri The URI we are deleting - @result Returns the HTTP status code - @discussion - returns response status code 204 (Unchanged) if ok + /** + * Deletes a WEBDAV resource + * + * @param string $uri The URI we are deleting + * @param integer $scope + * @param string $token + * @return string HTTP status code - response status code 204 (Unchanged) if ok */ function delete( $uri, $scope=0, $token='') { @@ -712,11 +699,12 @@ return $result; } - /*! - @function mkcol - @abstract Creates a WEBDAV collection (AKA a directory) - @param uri The URI to create - @result Returns the HTTP status code + /** + * Creates a WEBDAV collection (AKA a directory) + * + * @param string $uri The URI to create + * @param string $token + * @return HTTP status code */ function mkcol( $uri, $token='' ) { @@ -738,14 +726,14 @@ return $ret; } - /*! - @function propfind - @abstract Queries WEBDAV properties - @param uri uri of resource whose properties we are changing - @param scope Specifies how "deep" to search (0=just this file/dir 1=subfiles/dirs etc) - @result Returns the HTTP status code - @discussion - to get the result XML call get_body() + /** + * Queries WEBDAV properties + * + * @param string $uri URI of resource whose properties we are changing + * @param integer $scope Specifies how "deep" to search (0=just this file/dir 1=subfiles/dirs etc) + * @param boolean $is_dir + * @return Returns the HTTP status code + * @internal To get the result XML call get_body() */ function propfind( $uri, $scope=0, $id_dir = False ) { @@ -790,17 +778,16 @@ } } - /*! - @function proppatch - @abstract Sets DAV properties - @param uri uri of resource whose properties we are changing - @param attributes An array of attributes and values. - @param namespaces Extra namespace definitions that apply to the properties - @result Returns the HTTP status code - @discussion - To make DAV properties useful it helps to use a well established XML dialect - such as the "Dublin Core" - + /** + * Sets DAV properties + * + * @param string $uri URI of resource whose properties we are changing + * @param array $attributes Attribute,value pairs + * @param string $namespaces Extra namespace definitions that apply to the properties + * @param string $token + * @param boolean $is_dir + * @return string HTTP status code + * @internal To make DAV properties useful it helps to use a well established XML dialect such as the "Dublin Core" */ function proppatch($uri, $attributes, $namespaces='', $token='',$is_dir = False) { @@ -816,7 +803,7 @@ //XXX if $uri is without an ending / and is a directory ... what to do ??? $this->http_client->addHeader('If', '<'.$uri.'>'.' (<'.$token.'>)'); } - //Begin evil nastiness + // Begin evil nastiness $davxml = ' http_client->reply; } - /*! - @function unlock - @abstract unlocks a locked resource on the DAV server - @param uri uri of the resource we are unlocking - @param a 'token' for the lock (to get the token, do a propfind) - @result true if successfull - @discussion - Not all DAV servers support locking (its in the RFC, but many common - DAV servers only implement "DAV class 1" (no locking) - */ - + /** + * Unlocks a locked resource on the DAV server + * + * @param string $uri URI of the resource we are unlocking + * @param string $token A 'token' for the lock (to get the token, do a propfind) + * @return boolean True if successful + * @internal Not all DAV servers support locking (its in the RFC, but many common. DAV servers only implement "DAV class 1" (no locking) + */ function unlock($uri, $token) { if ( empty($token) ) @@ -934,16 +918,15 @@ } } - /*! - @function lock - @abstract locks a resource on the DAV server - @param uri uri of the resource we are locking - @param owner the 'owner' information for the lock (purely informative) - @param depth the depth to which we lock collections - @result true if successfull - @discussion - Not all DAV servers support locking (its in the RFC, but many common - DAV servers only implement "DAV class 1" (no locking) + /** + * Locks a resource on the DAV server + * + * @param string $uri URI of the resource we are locking + * @param string $owner The 'owner' information for the lock (purely informative) + * @param integer $depth The depth to which we lock collections + * @param string $timeout + * @return true If successfull + * @internal Not all DAV servers support locking (its in the RFC, but many common DAV servers only implement "DAV class 1" (no locking) */ function lock($uri, $owner, $depth=0, $timeout='Infinite') { @@ -1002,15 +985,12 @@ } } - /*! - @function options - @abstract determines the optional HTTP features supported by a server - @param uri uri of the resource we are seeking options for (or * for the whole server) - @result Returns an array of option values - @discussion - Interesting options include "ACCESS" (whether you can read a file) and - DAV (DAV features) - + /** + * Ddetermines the optional HTTP features supported by a server + * + * @param string $uri URI of the resource we are seeking options for (or * for the whole server) + * @return array|boolean Option values or false + * @internal Interesting options include "ACCESS" (whether you can read a file) and DAV (DAV features) */ function options($uri) { @@ -1027,16 +1007,12 @@ } } - /*! - @function dav_features - @abstract determines the features of a DAV server - @param uri uri of resource whose properties we are changing - @result Returns an array of option values - @discussion - Likely return codes include NULL (this isnt a dav server!), 1 - (This is a dav server, supporting all standard DAV features except locking) - 2, (additionally supports locking (should also return 1)) and - 'version-control' (this server supports versioning extensions for this resource) + /** + * Determines the features of a DAV server + * + * @param string $uri URI of resource whose properties we are changing + * @return array Option values or NULL + * @internal Likely return codes include NULL (this isnt a dav server!), 1 (This is a dav server, supporting all standard DAV features except locking) 2, (additionally supports locking (should also return 1)) and 'version-control' (this server supports versioning extensions for this resource) */ function dav_features($uri) { @@ -1053,26 +1029,20 @@ } return $features; } -/************************************************************** - RFC 3253 DeltaV versioning extensions - ************************************************************** - These are 100% untested, and almost certainly dont work yet... - eventually they will be made to work with subversion... - */ +/* RFC 3253 DeltaV versioning extensions + These are 100% untested, and almost certainly dont work yet... + eventually they will be made to work with subversion... +*/ - /*! - @function report - @abstract Report is a kind of extended PROPFIND - it queries properties accros versions etc - @param uri uri of resource whose properties we are changing - @param report the type of report desired eg DAV:version-tree, DAV:expand-property etc (see http://greenbytes.de/tech/webdav/rfc3253.html#METHOD_REPORT) - @param namespace any extra XML namespaces needed for the specified properties - @result Returns an array of option values - @discussion - From the relevent RFC: - "A REPORT request is an extensible mechanism for obtaining information about - a resource. Unlike a resource property, which has a single value, the value - of a report can depend on additional information specified in the REPORT - request body and in the REPORT request headers." + /** + * Report is a kind of extended PROPFIND - it queries properties accros versions etc. + * + * @param string $uri URI of resource whose properties we are changing + * @param string $report The type of report desired eg DAV:version-tree, DAV:expand-property etc (see http://greenbytes.de/tech/webdav/rfc3253.html#METHOD_REPORT) + * @param array $properties + * @param string $namespaces Any extra XML namespaces needed for the specified properties + * @return array Option values + * @internal From the relevent RFC: "A REPORT request is an extensible mechanism for obtaining information about a resource. Unlike a resource property, which has a single value, the value of a report can depend on additional information specified in the REPORT request body and in the REPORT request headers." */ function report($uri, $report, $properties, $namespaces='') { @@ -1105,20 +1075,18 @@ return $this->http_client->reply; } - /* - * @function locks_save_session - * @discussion : save the override_locks array in session file + /** + * Save the override_locks array in session file */ function propfind_save_session() { - //Save the overrided locks in the session + // Save the overrided locks in the session $app = 'phpgwapi' ; //$GLOBALS['phpgw_info']['flags']['currentapp']; $this->session = $GLOBALS['phpgw']->session->appsession ('dav_props',$app, base64_encode(serialize($this->cached_propfind))); } /* - * @function locks_restore_session - * @discussion: restore the override_locks array from session, use only in vfs_shared + * Restore the override_locks array from session, use only in vfs_shared */ function propfind_restore_session() { @@ -1136,8 +1104,9 @@ } /** - * @function delete_uri_in_cache - * @discusion Internal function for some cache deletion + * Some cache deletion + * + * @private */ function delete_uri_in_cache($uri) { ==================================================== Index: phpgwapi/inc/class.gdbutton.inc.php diff -u phpgwapi/inc/class.gdbutton.inc.php:1.4 phpgwapi/inc/class.gdbutton.inc.php:1.5 --- phpgwapi/inc/class.gdbutton.inc.php:1.4 Thu Jan 13 11:36:43 2005 +++ phpgwapi/inc/class.gdbutton.inc.php Tue Apr 26 09:43:08 2005 @@ -1,34 +1,22 @@ * - * and Bettina Gille [ceb@phpgroupware.org] * - * and Ralf Becker * - * Copyright (C) 2002 Dan Kuykendall, Bettina Gille, Ralf Becker * - * ----------------------------------------------------------------- * - * This library is part of the phpGroupWare API * - * ----------------------------------------------------------------- * - * This library is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the Free Software * - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - \*******************************************************************/ - /* $Id$ */ - + /** + * XML tools + * @author Bettina Gille [ceb@phpgroupware.org] + * @author Dan Kuykendall + * @author Ralf Becker + * @copyright Copyright (C) 2002-2005 Free Software Foundation, Inc. http://www.fsf.org/ + * @license http://www.gnu.org/licenses/gpl.html GNU General Public License + * @package phpgwapi + * @subpackage xml + * @version $Id$ + * @internal This class based on boGraph.php3 - Double Choco Latte - Source Configuration Management System Copyright (C) 1999 Michael L. Dean & Tim R. Norman + */ + + + /** + * Convert variable to XML + * + * @param string $name + * @param string $data + * @return string XML string + */ function var2xml($name, $data) { $doc = new xmltool('root','',''); return $doc->import_var($name,$data,True,True); } + + /** + * XML tools + * + * @package phpgwapi + * @subpackage xml + */ class xmltool { /* for root nodes */ @@ -594,6 +597,13 @@ } } + + /** + * XML node + * + * @package phpgwapi + * @subpackage xml + */ class xmlnode extends xmltool { function xmlnode($name) @@ -602,6 +612,13 @@ } } + + /** + * XML doc + * + * @package phpgwapi + * @subpackage xml + */ class xmldoc extends xmltool { function xmldoc($version = '1.0') ==================================================== Index: phpgwapi/inc/class.gdgraph.inc.php diff -u phpgwapi/inc/class.gdgraph.inc.php:1.19 phpgwapi/inc/class.gdgraph.inc.php:1.20 --- phpgwapi/inc/class.gdgraph.inc.php:1.19 Thu Jan 13 11:36:43 2005 +++ phpgwapi/inc/class.gdgraph.inc.php Tue Apr 26 09:43:08 2005 @@ -1,36 +1,22 @@ ; Tue, 26 Apr 2005 13:36:11 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 15534-02 for ; Tue, 26 Apr 2005 13:36:08 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 446D1312D5 for ; Tue, 26 Apr 2005 13:36:08 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3QBa7A07403; Tue, 26 Apr 2005 13:36:07 +0200 Message-Id: <200504261136.j3QBa7A07403@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: powerstat Date: Tue, 26 Apr 2005 12:55:00 +0200 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/inc class.translation_sql.inc.php, 1.20 class.sql_oracle.inc.php, 1.3 class.sql_entity.inc.php, 1.3 class.sql_pgsql.inc.php, 1.3 class.Template_experimental.inc.php, 1.5 class.sessions_php4.inc.php, 1.23 class.service_notes.inc.php, 1.6 class.service_schedule.inc.php, 1.5 class.sql_mssql.inc.php, 1.3 class.sql_sapdb.inc.php, 1.3 class.vfs_sql.inc.php, 1.32 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 11:39:31 -0000 Update of phpgwapi/inc Modified Files: Branch: MAIN class.translation_sql.inc.php lines: +3 -2 class.sql_oracle.inc.php lines: +2 -1 class.sql_entity.inc.php lines: +5 -1 class.sql_pgsql.inc.php lines: +2 -1 class.Template_experimental.inc.php lines: +2 -1 class.sessions_php4.inc.php lines: +2 -1 class.service_notes.inc.php lines: +2 -1 class.service_schedule.inc.php lines: +2 -1 class.sql_mssql.inc.php lines: +2 -1 class.sql_sapdb.inc.php lines: +2 -1 class.vfs_sql.inc.php lines: +2 -1 Log Message: phpdoc fixes ==================================================== Index: phpgwapi/inc/class.translation_sql.inc.php diff -u phpgwapi/inc/class.translation_sql.inc.php:1.19 phpgwapi/inc/class.translation_sql.inc.php:1.20 --- phpgwapi/inc/class.translation_sql.inc.php:1.19 Thu Dec 30 06:47:31 2004 +++ phpgwapi/inc/class.translation_sql.inc.php Tue Apr 26 10:55:25 2005 @@ -12,7 +12,8 @@ /** * define the maximal length of a message_id, all message_ids have to be unique - * in this length, our column is varchar 255, but addslashes might add some length + * in this length, our column is varchar 255, but addslashes might add some length. + * @ignore */ define('MAX_MESSAGE_ID_LENGTH',230); ==================================================== Index: phpgwapi/inc/class.sql_oracle.inc.php diff -u phpgwapi/inc/class.sql_oracle.inc.php:1.2 phpgwapi/inc/class.sql_oracle.inc.php:1.3 --- phpgwapi/inc/class.sql_oracle.inc.php:1.2 Thu Dec 30 06:47:31 2004 +++ phpgwapi/inc/class.sql_oracle.inc.php Tue Apr 26 10:55:25 2005 @@ -14,6 +14,7 @@ * * @package phpgwapi * @subpackage database + * @ignore */ class sql extends sql_ { ==================================================== Index: phpgwapi/inc/class.sql_entity.inc.php diff -u phpgwapi/inc/class.sql_entity.inc.php:1.2 phpgwapi/inc/class.sql_entity.inc.php:1.3 --- phpgwapi/inc/class.sql_entity.inc.php:1.2 Thu Dec 30 06:47:31 2004 +++ phpgwapi/inc/class.sql_entity.inc.php Tue Apr 26 10:55:25 2005 @@ -23,18 +23,22 @@ define (PHPGW_SQL_DEFAULT_METHOD, -1); /** * SQL lazy key + * @ignore */ define (PHPGW_SQL_LAZY_KEY, 1); /** * SQL required key + * @ignore */ define (PHPGW_SQL_REQUIRED_KEY, 2); /** * SQL all match + * @ignore */ define (PHPGW_SQL_ALL_MATCH, 1); /** * SQL exclusive match + * @ignore */ define (PHPGW_SQL_EXCLUSIVE_MATCH, 2); /** ==================================================== Index: phpgwapi/inc/class.sql_pgsql.inc.php diff -u phpgwapi/inc/class.sql_pgsql.inc.php:1.2 phpgwapi/inc/class.sql_pgsql.inc.php:1.3 --- phpgwapi/inc/class.sql_pgsql.inc.php:1.2 Thu Dec 30 06:47:31 2004 +++ phpgwapi/inc/class.sql_pgsql.inc.php Tue Apr 26 10:55:25 2005 @@ -18,6 +18,7 @@ * * @package phpgwapi * @subpackage database + * @ignore */ class sql extends sql_ { ==================================================== Index: phpgwapi/inc/class.Template_experimental.inc.php diff -u phpgwapi/inc/class.Template_experimental.inc.php:1.4 phpgwapi/inc/class.Template_experimental.inc.php:1.5 --- phpgwapi/inc/class.Template_experimental.inc.php:1.4 Thu Dec 30 06:47:30 2004 +++ phpgwapi/inc/class.Template_experimental.inc.php Tue Apr 26 10:55:25 2005 @@ -15,6 +15,7 @@ * * @package phpgwapi * @subpackage gui + * @ignore */ class Template { ==================================================== Index: phpgwapi/inc/class.sessions_php4.inc.php diff -u phpgwapi/inc/class.sessions_php4.inc.php:1.22 phpgwapi/inc/class.sessions_php4.inc.php:1.23 --- phpgwapi/inc/class.sessions_php4.inc.php:1.22 Thu Dec 30 06:47:31 2004 +++ phpgwapi/inc/class.sessions_php4.inc.php Tue Apr 26 10:55:25 2005 @@ -16,6 +16,7 @@ * * @package phpgwapi * @subpackage accounts + * @ignore */ class sessions extends sessions_ { ==================================================== Index: phpgwapi/inc/class.service_notes.inc.php diff -u phpgwapi/inc/class.service_notes.inc.php:1.5 phpgwapi/inc/class.service_notes.inc.php:1.6 --- phpgwapi/inc/class.service_notes.inc.php:1.5 Thu Dec 30 06:47:31 2004 +++ phpgwapi/inc/class.service_notes.inc.php Tue Apr 26 10:55:25 2005 @@ -15,6 +15,7 @@ * * @package phpgwapi * @subpackage application + * @ignore */ class service_contacts extends service { ==================================================== Index: phpgwapi/inc/class.service_schedule.inc.php diff -u phpgwapi/inc/class.service_schedule.inc.php:1.4 phpgwapi/inc/class.service_schedule.inc.php:1.5 --- phpgwapi/inc/class.service_schedule.inc.php:1.4 Thu Dec 30 06:47:31 2004 +++ phpgwapi/inc/class.service_schedule.inc.php Tue Apr 26 10:55:25 2005 @@ -15,6 +15,7 @@ * * @package phpgwapi * @subpackage application + * @ignore */ class service_contacts extends service { ==================================================== Index: phpgwapi/inc/class.sql_mssql.inc.php diff -u phpgwapi/inc/class.sql_mssql.inc.php:1.2 phpgwapi/inc/class.sql_mssql.inc.php:1.3 --- phpgwapi/inc/class.sql_mssql.inc.php:1.2 Thu Dec 30 06:47:31 2004 +++ phpgwapi/inc/class.sql_mssql.inc.php Tue Apr 26 10:55:25 2005 @@ -18,6 +18,7 @@ * * @package phpgwapi * @subpackage database + * @ignore */ class sql extends sql_ { ==================================================== Index: phpgwapi/inc/class.sql_sapdb.inc.php diff -u phpgwapi/inc/class.sql_sapdb.inc.php:1.2 phpgwapi/inc/class.sql_sapdb.inc.php:1.3 --- phpgwapi/inc/class.sql_sapdb.inc.php:1.2 Thu Dec 30 06:47:31 2004 +++ phpgwapi/inc/class.sql_sapdb.inc.php Tue Apr 26 10:55:25 2005 @@ -14,6 +14,7 @@ * * @package phpgwapi * @subpackage database + * @ignore */ class sql extends sql_ { ==================================================== Index: phpgwapi/inc/class.vfs_sql.inc.php diff -u phpgwapi/inc/class.vfs_sql.inc.php:1.31 phpgwapi/inc/class.vfs_sql.inc.php:1.32 --- phpgwapi/inc/class.vfs_sql.inc.php:1.31 Wed Jan 26 01:15:23 2005 +++ phpgwapi/inc/class.vfs_sql.inc.php Tue Apr 26 10:55:25 2005 @@ -33,6 +33,7 @@ * * @package phpgwapi * @subpackage vfs + * @ignore */ class vfs extends vfs_shared { From MAILER-DAEMON Wed Apr 27 02:37:38 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DQgAz-00075u-UT for mharc-phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:37:38 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DQgAx-00075Y-3J for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:37:35 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DQgAt-00075L-0e for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:37:34 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DQgAs-00074u-Lx for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:37:30 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DQgDH-0006fU-Jm for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:39:59 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id CA437312CD for ; Wed, 27 Apr 2005 08:35:51 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 11364-10 for ; Wed, 27 Apr 2005 08:35:49 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 830F6312BE for ; Wed, 27 Apr 2005 08:35:49 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3R6Znw01584; Wed, 27 Apr 2005 08:35:49 +0200 Message-Id: <200504270635.j3R6Znw01584@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: uid65887 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/doc ipc_layer.txt,1.1 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Wed, 27 Apr 2005 06:37:35 -0000 X-Original-Date: Tue, 23 Dec 2003 17:00:00 +0100 X-List-Received-Date: Wed, 27 Apr 2005 06:37:35 -0000 Update of phpgwapi/doc Added Files: Branch: MAIN ipc_layer.txt Log Message: added doc for ipc_layer ==================================================== Index: ipc_layer.txt IPC Layer Documentation ####################### $Id: ipc_layer.txt,v 1.1 2003/12/23 16:00:33 uid65887 Exp $ Classes and methods ^^^^^^^^^^^^^^^^^^^ Layer 1 (applications): ----------------------- class ipc_"appName" (implemented for each application) + addData(data, type) : id + getData(id, type) : data + removeData(id) : boolean + replaceData(id, data, type) : boolean + existsData(id) : boolean (methods above are the implementation of the abstract methods) + ... (other ipc methods, everything you like) Layer 2 (API): -------------- class ipc_manager + getIPC(appName) : object + execIPC(ipcAppMethod, ipcAppMethodParams) : mixed + destroyIPC(appName) : boolean - _checkIPCApp($appName) : boolean - _createIPCAppClassName($appName) : string class ipc_ + addData(data, type) : id + getData(id, type) : data + removeData(id) : boolean + replaceData(id, data, type) : boolean + existData(id) : boolean (methods above call die(), they must be implemented in the ipc_"appName" class) Layer 1 | Layer 2 | Layer 1 | | | ipc_ | | . | | /_\ | | | | | | | app_1 -|-> ipc_manager --> ipc_app_2 -|-> app_2 | | (physicaly the ipc_app_2 class belongs to the app_2 and is located in the inc-directory of app_2) The ipc_manager handles the application call (check if the called app2 is available and if acl rights are okay) and create the ipc_app_2 object. This object contains the ipc methods for add/get/... data from app_2. The type parameter of the ipc methods specifies the mime type of the passed data or result data. That's because only the application knows her database structures and data records. So the application transforms the data result to the applied mime type format. For example we want export an calendar entry as vCal. For do this the addressbook app has to provide an ipc getData method which "implements" the database queries (use the storage object) and the db result transformation to a vCal. On the other hand there is also the need for import transformations. It's possible to transfer any type of data over the ipc layer. The only need is to implement the data convertion betwenn the application data structures and the supported mime type. Each application implements her own ipc_ class. This class is derived from the abstract ipc_ class of the api. An applicaion ipc class should contain a set of methods for import and export data in useful mime type formats. I thinks it is clear that the applications can use the api if there is a solution for converting the data to another mime type. Each application developer can decide which import/export mime types his application supports. The most relevant mime type for all applications should be: application/x-phpgw- text/csv text/xml text/plain text/html The application/x-phpgw- mime type is a representation (as an array) of the internal application data structure. Some special mime types: addressbook: vCard calendar: vCal, iCal email: text/mail IPC Layer - How to ^^^^^^^^^^^^^^^^^^ Now take a look at a pseudo implemation for discussion (no error handling, not optimised): in app_1: --------- $ipc_manager = CreateObject('phpgwapi.ipc_manager'); $ipc_app_2 = $ipc_manager->getIPC('app_2'); $result = $ipc_app_2->getData(123, 'application/x-phpgw-'); in app_2: --------- class ipc_app_2 extends ipc_ function getData($id, $type) { // 1: read record from database $so = CreateObject('.so_'); $result = $so->get...($id); // 2: convert data to passed mime type switch ($type) { case 'application/phpgw-': // transfer result to application data structure ... return $converted_result; break; case 'text/xml': // convert result to xml ... return $converted_result; break; case 'text/csv': // convert result to csv ... return $converted_result; break; case '...': // convert result to ... ... return $converted_result; break; default: return false; break; } } The interprocess communication layer provides the oppertunaty to access an application. But the layer doesn't know anything about the data which will be "send" over this layer. Only the application knows her internal data representation and can provide the data in certain mime types. The called application delivers the data in the applied mime type. From MAILER-DAEMON Wed Apr 27 02:37:46 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DQgB8-000770-BP for mharc-phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:37:46 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DQgB7-00076u-8n for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:37:45 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DQgB3-00076Q-Fo for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:37:44 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DQgB3-00074u-37 for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:37:41 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DQgDX-0006g1-Im for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:40:16 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id C7776312DC for ; Wed, 27 Apr 2005 08:36:02 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 11596-01 for ; Wed, 27 Apr 2005 08:35:58 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id F2FAC312BE for ; Wed, 27 Apr 2005 08:35:57 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3R6ZvX01595; Wed, 27 Apr 2005 08:35:57 +0200 Message-Id: <200504270635.j3R6ZvX01595@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: uid65887 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/inc class.ipc_manager.inc.php,1.1 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Wed, 27 Apr 2005 06:37:45 -0000 X-Original-Date: Tue, 23 Dec 2003 17:04:00 +0100 X-List-Received-Date: Wed, 27 Apr 2005 06:37:45 -0000 Update of phpgwapi/inc Added Files: Branch: MAIN class.ipc_manager.inc.php Log Message: added classes for ipc_layer ==================================================== Index: class.ipc_manager.inc.php * @copyright Copyright (C) 2003 Free Software Foundation http://www.fsf.org/ * @license http://www.fsf.org/licenses/gpl.html GNU General Public License * @package phpgwapi * @subpackage ipc * @version $Id: class.ipc_manager.inc.php,v 1.1 2003/12/23 16:04:58 uid65887 Exp $ */ // incluse ipc_ class include_class('ipc_'); /** * Manager of the IPC Layer */ class ipc_manager { /** * @var array $_ipcObjectList contains the created ipc application objects * @access private */ var $_ipcObjectList; var $xmlrpc_methods; /** * constructor * * @access public */ function ipc_manager() { $this->_ipcObjectList = array(); $this->xmlrpc_methods = array(); $this->xmlrpc_methods[] = array( 'name' => 'execIPC', 'description' => 'Execute an ipc application methode' ); } /** * Get the ipc application object * * @access public * @param string $appName name of the application * @return object ipc object of application */ function &getIPC($appName) { // check if app is available amd the acl run app right if ($this->_checkIPCApp($appName) == false) return false; // create ipc class name $className = $this->_createIPCAppClassName($appName); // check if ipc app object exists if (isset($this->_ipcObjectList[$className]) && is_object($this->_ipcObjectList[$className])) { // return the existing ipc app object return $this->_ipcObjectList[$className]; } else { $obj =& CreateObject($className); if (is_object($obj) == true) { // save and return the created ipc app object $this->_ipcObjectList[$className] =& $obj; return $this->_ipcObjectList[$className]; } else { return false; } } } /** * Destroy the ipc application object. * * @access public * @param string $appName name of application * @return boolean true when object was destroyed, otherwise false */ function destroyIPC($appName) { // create ipc class name $className = $this->_createIPCAppClassName($appName); // check if ipc app object exists if (isset($this->_ipcObjectList[$className]) == true) { // destroy the ipc app object unset($this->_ipcObjectList[$className]); return true; } else { return false; } } /** * Executes a ipc method. * * @access public * @param string $ipcAppMethod name of the application and mathod to execute as '.' * @param array $ipcAppMethodParams array with parameters for passing to the called method * @return mixed result of execution */ function execIPC($ipcAppMethod, $ipcAppMethodParams=null) { list($ipcApp, $ipcMethod) = explode('.', $ipcAppMethod); $ipc =& $this->getIPC($ipcApp); if (is_object($ipc) == false) return false; if (method_exists($ipc, $ipcMethod) == false) return false; $ipcParams = ''; for($i=0; $i0) $ipcParams .= ', '; $ipcParams .= $ipcAppMethodParams[$i]; } $ipc_cmd = '\$ret = \$ipc->'.$ipcMethod.'('.$ipcParams.');'; eval($ipc_cmd); return $ret; } /** * Check if application is available and the acl run application right for the current user. * * @access private * @param string $appName name of application * @return boolean true if application is available and user has acl run right, otherwise false */ function _checkIPCApp($appName) { // 1: check if app is available if (isset($GLOBALS['phpgw']->applications->data[$appName]) == false) { return false; } // 2: check the acl run app right if ($GLOBALS['phpgw']->acl->check('run', 1, $appName) == false) { return false; } return true; } /** * Create the name of the ipc application class for the passed application name. * * @access private * @param string $appName name of application * @return string name of tne ipc application class */ function _createIPCAppClassName($appName) { return $appName.'.ipc_'.$appName; } } ?> From MAILER-DAEMON Wed Apr 27 02:37:55 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DQgBH-00078q-Dh for mharc-phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:37:55 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DQgBD-00078Q-Am for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:37:51 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DQgB9-00077E-9J for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:37:50 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DQgB8-00074u-Hd for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:37:46 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DQgDk-0006ga-C4 for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:40:28 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 8B425312CD for ; Wed, 27 Apr 2005 08:36:15 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 11604-01 for ; Wed, 27 Apr 2005 08:36:12 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id C2559312BE for ; Wed, 27 Apr 2005 08:36:12 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3R6aCR01622; Wed, 27 Apr 2005 08:36:12 +0200 Message-Id: <200504270636.j3R6aCR01622@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: uid65887 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/inc class.categories.inc.php, 1.74.2.20.2.14 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Wed, 27 Apr 2005 06:37:52 -0000 X-Original-Date: Wed, 24 Dec 2003 00:52:00 +0100 X-List-Received-Date: Wed, 27 Apr 2005 06:37:52 -0000 Update of phpgwapi/inc Modified Files: Branch: Version-0_9_16-branch class.categories.inc.php lines: +6 -5 Log Message: bugfix from forums.phpgw.org - cat_main not saved ==================================================== Index: phpgwapi/inc/class.categories.inc.php diff -u phpgwapi/inc/class.categories.inc.php:1.74.2.20.2.13 phpgwapi/inc/class.categories.inc.php:1.74.2.20.2.14 --- phpgwapi/inc/class.categories.inc.php:1.74.2.20.2.13 Tue Nov 18 15:45:19 2003 +++ phpgwapi/inc/class.categories.inc.php Tue Dec 23 23:52:40 2003 @@ -4,11 +4,11 @@ * This file written by Joseph Engo * * and Bettina Gille [ceb@phpgroupware.org] * * Category manager * - * Copyright (C) 2000, 2001 Joseph Engo, Bettina Gille * - * Copyright (C) 2002, 2003 Bettina Gille * + * Copyright 2000 - 2003 Free Software Foundation, Inc * * ------------------------------------------------------------------------ * * This library is part of the phpGroupWare API * * http://www.phpgroupware.org * + * This program is part of the GNU project, see http://www.gnu.org/ * * ------------------------------------------------------------------------ * * This library is free software; you can redistribute it and/or modify it * * under the terms of the GNU Lesser General Public License as published by * @@ -558,7 +558,8 @@ if ($values['parent'] > 0) { - $values['level'] = $this->id2name($values['parent'],'level')+1; + $values['level'] = $this->id2name($values['parent'],'level')+1; + $values['main'] = $this->id2name($values['parent'],'main'); } $values['descr'] = $this->db->db_addslashes($values['descr']); From MAILER-DAEMON Wed Apr 27 02:38:16 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DQgBb-0007BI-GB for mharc-phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:38:15 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DQgBY-0007Av-Cu for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:38:12 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DQgBU-0007AU-H4 for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:38:11 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DQgBU-00074u-5M for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:38:08 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DQgDw-0006hN-Qy for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:40:41 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 06D79312CD for ; Wed, 27 Apr 2005 08:36:28 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 11596-02 for ; Wed, 27 Apr 2005 08:36:26 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 22A23312BE for ; Wed, 27 Apr 2005 08:36:26 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3R6aQa01641; Wed, 27 Apr 2005 08:36:26 +0200 Message-Id: <200504270636.j3R6aQa01641@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: uid65887 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] projects/templates/default config.tpl, 1.6 preferences.tpl, 1.27 archive.tpl, 1.10 header.tpl, 1.22 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Wed, 27 Apr 2005 06:38:13 -0000 X-Original-Date: Tue, 23 Dec 2003 17:34:00 +0100 X-List-Received-Date: Wed, 27 Apr 2005 06:38:13 -0000 Update of projects/templates/default Modified Files: Branch: MAIN config.tpl lines: +8 -7 preferences.tpl lines: +1 -1 archive.tpl lines: +1 -1 header.tpl lines: +1 -1 Log Message: update ==================================================== Index: projects/templates/default/config.tpl diff -u projects/templates/default/config.tpl:1.5 projects/templates/default/config.tpl:1.6 --- projects/templates/default/config.tpl:1.5 Wed Dec 3 15:03:22 2003 +++ projects/templates/default/config.tpl Tue Dec 23 16:34:00 2003 @@ -10,14 +10,15 @@ {lang_invoicing} {lang_settings} - - {lang_Invoicing_of_work_time}: - + + {lang_Invoicing_of_work_time}: + + - + ==================================================== ==================================================== ==================================================== From MAILER-DAEMON Wed Apr 27 02:38:36 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DQgBv-0007DS-K2 for mharc-phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:38:35 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DQgBs-0007DF-4O for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:38:32 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DQgBq-0007Cy-Vm for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:38:31 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DQgBq-00074u-EO for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:38:30 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DQgEI-0006iJ-D1 for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:41:02 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 8FDB3312DC for ; Wed, 27 Apr 2005 08:36:44 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 11539-07 for ; Wed, 27 Apr 2005 08:36:41 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 53DAE312CD for ; Wed, 27 Apr 2005 08:36:41 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3R6afU01664; Wed, 27 Apr 2005 08:36:41 +0200 Message-Id: <200504270636.j3R6afU01664@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: uid65887 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/templates/probusiness/css styles.css, 1.1.2.3 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Wed, 27 Apr 2005 06:38:32 -0000 X-Original-Date: Wed, 24 Dec 2003 02:01:00 +0100 X-List-Received-Date: Wed, 27 Apr 2005 06:38:32 -0000 Update of phpgwapi/templates/probusiness/css Modified Files: Branch: Version-0_9_16-branch styles.css lines: +5 -5 Log Message: sync with probusiness cvs ==================================================== Index: phpgwapi/templates/probusiness/css/styles.css diff -u phpgwapi/templates/probusiness/css/styles.css:1.1.2.2 phpgwapi/templates/probusiness/css/styles.css:1.1.2.3 --- phpgwapi/templates/probusiness/css/styles.css:1.1.2.2 Wed Dec 3 13:38:16 2003 +++ phpgwapi/templates/probusiness/css/styles.css Wed Dec 24 01:01:01 2003 @@ -51,11 +51,11 @@ /* * set global font */ -font { font-size: 14px; color: #212020; margin: 3px; font-family: Arial, Helvetica, san-serif; } +font { font-size: 14px; color: #212020; margin: 3px; font-family: Arial, Helvetica, sans-serif; } font#title { color: #000099 } -font#header { font-weight: bolder; font-size: 14; color: #212020; font-family: Arial, Helvetica, san-serif; } -font#calendar { font-size: 10px; font-family: Arial, Helvetica, san-serif; } -font#cal_day { font-size:12px; font-family: Arial, Helvetica, san-serif } +font#header { font-weight: bolder; font-size: 14; color: #212020; font-family: Arial, Helvetica, sans-serif; } +font#calendar { font-size: 10px; font-family: Arial, Helvetica, sans-serif; } +font#cal_day { font-size:12px; font-family: Arial, Helvetica, sans-serif } /* @@ -476,7 +476,7 @@ * javascript tabs */ -TABLE.tabletab { border: 0px solid #FFFFFF; border-collapse: collapse; margin: 0px; font-size: 14px; font-family: Arial, Helvetica, san-serif;} +TABLE.tabletab { border: 0px solid #FFFFFF; border-collapse: collapse; margin: 0px; font-size: 14px; font-family: Arial, Helvetica, sans-serif;} TABLE.tabletab TH { height: 19px; padding: 0px } TABLE.tabletab TH.activetab TABLE { border-collapse: collapse; margin: 0px; } TABLE.tabletab TH.activetab TABLE TD { background-image: url(../images/tabs-bg1.png); background-repeat: repeat-x; padding: 0px; } From MAILER-DAEMON Wed Apr 27 02:39:08 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DQgCR-0007J3-J1 for mharc-phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:39:07 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DQgCP-0007Ij-2L for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:39:05 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DQgCN-0007IJ-Cu for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:39:04 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DQgCN-00074u-0g for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:39:03 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DQgCl-0006cq-Ur for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:39:28 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 34435312BE for ; Wed, 27 Apr 2005 08:35:10 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 11539-04 for ; Wed, 27 Apr 2005 08:35:04 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id C95E3312CD for ; Wed, 27 Apr 2005 08:35:04 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3R6Z4j01561; Wed, 27 Apr 2005 08:35:04 +0200 Message-Id: <200504270635.j3R6Z4j01561@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: uid65887 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] projects/inc class.uiprojects.inc.php, 1.83 class.uistatistics.inc.php, 1.26 class.uiprojecthours.inc.php, 1.36 class.soprojects.inc.php, 1.55 class.boprojecthours.inc.php, 1.12 class.boprojects.inc.php, 1.67 hook_admin.inc.php, 1.17 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Wed, 27 Apr 2005 06:39:05 -0000 X-Original-Date: Tue, 23 Dec 2003 17:34:00 +0100 X-List-Received-Date: Wed, 27 Apr 2005 06:39:05 -0000 Update of projects/inc Modified Files: Branch: MAIN class.uiprojects.inc.php lines: +19 -22 class.uistatistics.inc.php lines: +2 -2 class.uiprojecthours.inc.php lines: +2 -2 class.soprojects.inc.php lines: +69 -40 class.boprojecthours.inc.php lines: +9 -9 class.boprojects.inc.php lines: +20 -21 hook_admin.inc.php lines: +1 -1 Log Message: update ==================================================== Index: projects/inc/class.uiprojects.inc.php diff -u projects/inc/class.uiprojects.inc.php:1.82 projects/inc/class.uiprojects.inc.php:1.83 --- projects/inc/class.uiprojects.inc.php:1.82 Wed Dec 3 15:03:21 2003 +++ projects/inc/class.uiprojects.inc.php Tue Dec 23 16:34:00 2003 @@ -222,6 +222,11 @@ $this->cat_id = $_GET['cat_id']; } + if (!$action) + { + $action = 'mains'; + } + $GLOBALS['phpgw_info']['flags']['app_header'] = lang('projects') . ': ' . ($pro_main?lang('list jobs'):lang('list projects')) . ($this->boprojects->isprojectadmin()?' - ' . lang('administrator'):''); @@ -230,11 +235,6 @@ $GLOBALS['phpgw']->template->set_file(array('projects_list_t' => 'list.tpl')); $GLOBALS['phpgw']->template->set_block('projects_list_t','projects_list','list'); - if (!$action) - { - $action = 'mains'; - } - $link_data = array ( 'menuaction' => 'projects.uiprojects.list_projects', @@ -242,11 +242,6 @@ 'action' => $action ); - if (! $this->status) - { - $this->status = 'active'; - } - $pro = $this->boprojects->list_projects(array('type' => $action,'parent' => $pro_main)); // --------------------- nextmatch variable template-declarations ------------------------ @@ -271,7 +266,7 @@ { $action_list= '
' . "\n" . ''; + . $this->boprojects->select_project_list(array('status' => $this->status, 'selected' => $pro_main)) . ''; $GLOBALS['phpgw']->template->set_var('lang_action',lang('Work hours')); } @@ -884,7 +879,7 @@ $GLOBALS['phpgw']->template->set_var('pro_main',''); $GLOBALS['phpgw']->template->set_var('parent_select',''); $GLOBALS['phpgw']->template->set_var('lang_number',lang('Project ID')); - $GLOBALS['phpgw']->template->set_var('lang_choose',($project_id?'':lang('generate project id ?'))); + $GLOBALS['phpgw']->template->set_var('lang_choose',($project_id?'':lang('generate project id'))); $GLOBALS['phpgw']->template->set_var('investment_nr',''); @@ -903,7 +898,7 @@ { if ($pro_main && ($action == 'subs' || $action == 'asubs')) { - $GLOBALS['phpgw']->template->set_var('lang_choose',($project_id?'':lang('generate job id ?'))); + $GLOBALS['phpgw']->template->set_var('lang_choose',($project_id?'':lang('generate job id'))); $main = $this->boprojects->read_single_project($pro_main); $GLOBALS['phpgw']->template->set_var('parent_select',' {categories} ==================================================== Index: phpgwapi/templates/probusiness/navbar.tpl diff -u phpgwapi/templates/probusiness/navbar.tpl:1.1.2.2 phpgwapi/templates/probusiness/navbar.tpl:1.1.2.3 --- phpgwapi/templates/probusiness/navbar.tpl:1.1.2.2 Wed Dec 3 13:38:16 2003 +++ phpgwapi/templates/probusiness/navbar.tpl Wed Dec 24 01:01:01 2003 @@ -9,7 +9,10 @@ -

{current_app_header}

- {messages}
+
+

{current_app_header}

+ {messages}
+ {sideboxcontent} +
From MAILER-DAEMON Wed Apr 27 02:39:44 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DQgD1-0007NV-KY for mharc-phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:39:43 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DQgCv-0007MZ-2m for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:39:37 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DQgCs-0007MM-Pr for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:39:36 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DQgCs-00074u-9q for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:39:34 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DQgFG-0006lY-Q8 for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:42:04 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id DBB3D312BE for ; Wed, 27 Apr 2005 08:37:49 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 11604-05 for ; Wed, 27 Apr 2005 08:37:42 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 754DF312DC for ; Wed, 27 Apr 2005 08:37:42 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3R6bg401716; Wed, 27 Apr 2005 08:37:42 +0200 Message-Id: <200504270637.j3R6bg401716@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: skwashd X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/doc index.html,1.2.10.1 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Wed, 27 Apr 2005 06:39:37 -0000 X-Original-Date: Thu, 8 Jan 2004 22:39:00 +0100 X-List-Received-Date: Wed, 27 Apr 2005 06:39:37 -0000 Update of phpgwapi/doc Modified Files: Branch: index.html lines: +1030 -1342 Log Message: partial doc update - WIP ==================================================== Index: phpgwapi/doc/index.html diff -u phpgwapi/doc/index.html:1.2 phpgwapi/doc/index.html:1.2.10.1 --- phpgwapi/doc/index.html:1.2 Wed Jan 10 09:59:20 2001 +++ phpgwapi/doc/index.html Thu Jan 8 21:39:59 2004 @@ -1,1342 +1,1030 @@ - - - - - - - - - phpGroupWare Application Development - -

phpGroupWare Application Development

- -

- - phpGroupWare Application Development - -

phpGroupWare Application Development

- -

- -

Dan Kuykendall <dan@kuykendall.org>

- -

- -

v0.9 29 September 2000

- -

- -

This document explains phpGroupWare's infrastructure and API, -along with what is required to integrate applications into it. -
- -

Contents

-1  Introduction
-    1.1  Overview of application writing
-    1.2  What does the phpGroupWare API provide?
-2  Guidelines
-    2.1  Requirements
-    2.2  Writing/porting your application
-3  Installing your application
-    3.1  Overview
-    3.2  Automatic features
-    3.3  Adding files, directories and icons.
-    3.4  Making phpGroupWare aware of your application
-    3.5  Hooking into Administration page
-    3.6  Hooking into Preferences page
-4  Infrastructure
-    4.1  Overview
-    4.2  Directory tree
-    4.3  Translations
-5  The API
-    5.1  Introduction
-    5.2  Basic functions
-    5.3  Application Functions
-    5.4  File functions
-    5.5  Email/NNTP Functions
-6  Configuration Variables
-    6.1  Introduction
-    6.2  User information
-    6.3  Group information
-    6.4  Server information
-    6.5  Database information
-    6.6  Mail information
-    6.7  NNTP information
-    6.8  Application information
-7  Using Language Support
-    7.1  Overview
-    7.2  How to use lang support
-    7.3  Common return codes
-8  Using Templates
-    8.1  Overview
-    8.2  How to use templates
-9  About this document
-    9.1  New versions
-    9.2  Comments
-    9.3  History
-    9.4  Copyrights and Trademarks
-    9.5  Acknowledgments and Thanks
- - -

-

-1  Introduction

- -

-phpGroupWare is a web based groupware application framework (API), -for writing applications. Integrated applications such as email, calendar, -todo list, address book, and file manager are included. - -

-

-1.1  Overview of application writing

- -

-We have attempted to make writing application for phpGroupWare as -painless as possible. We hope any pain and suffering is cause by making -your application work, but not dealing with phpGroupWare itself. - -

-

-1.2  What does the phpGroupWare API provide?

- -

-The phpGroupWare API handles session management, user/group management, -has support for multiple databases, using the PHPLIB database abstraction -method, we support templates using the PHPLIB Templates class, a file -system interface, and even a network i/o interface. - -

-On top of these standard functions, phpGroupWare provides several -functions to give you the information you need about the users environment, -and to properly plug into phpGroupWare. - -

-

-2  Guidelines

- -

-

-2.1  Requirements

- -

-These guidelines must be followed for any application that wants considered -for inclusion into phpGroupWare deluxe: - -

- -

    -

  • It must run on PHP3 and PHP4.
  • -

    -

  • SQL statements must be compatible with both MySQL and PostgreSQL.
  • -

    -

  • It must use our default header.inc.php include.
  • -

    -

  • It must use our $phpgw_link($url) for all links (this is for session -support).
  • -

    -

  • It must use ``post'' for forms.
  • -

    -

  • It must respect phpGW group rights and phpGW user permissions.
  • -

    -

  • It must use our directory structure, template support and lang (multi-language) -support.
  • -

    -

  • Where possible it should run on both Unix and NT platforms.
  • -

    -

  • For applications that do not meet these requirements, they can be -available to users via the phpGroupWare Apps project, or whatever -means the developers decide. If you need help converting your application -to templates and our lang support, we will try to connect you with -someone to help.
  • -
- -

-

-2.2  Writing/porting your application

- -

- -

Include files

- -

-Each PHP page you write will need to include the header.inc.php along -with a few variables.
- This is done by putting this at the top of each PHP page. -

-
-  <?php
-  $phpgw_info["flags"]["currentapp"] = "appname";
-  include("../header.inc.php");
-  ?>
-
-
-
Of course change application name to fit.
- This include will provide the following things: - -

- -

    -

  • The phpgwAPI - The phpGroupWare API will be loaded.
  • -

    -

  • The phpGW navbar will be loaded (by default, but can be disabled until -a later point.
  • -

    -

  • appname/inc/functions.inc.php - This file is loaded just after the -phpgwAPI and before any HTML code is generated. This file should include -all your application specific functions.. You are welcome to include -any additional files you need from within this file.
  • -

    -

  • appname/inc/header.inc.php - This file is loaded just after the system -header/navbar, and allows developers to use it for whatever they need -to load.
  • -

    -

  • appname/inc/footer.inc.php - This file is loaded just before the system -footer, allowing developers to close connections and whatever else -they need.
  • -

    -

  • The phpGW footer will be loaded, which closes several connections.
  • -
- -

-

-3  Installing your application

- -

-

-3.1  Overview

- -

-It is fairly simple to add and delete applications to/from phpGroupWare. - -

-

-3.2  Automatic features

- -

-To make things easy for developers we go ahead and load the following -files. - -

- -

    -

  • appname/inc/functions.inc.php - This file should include all your -application specific functions.
  • -

    -

  • appname/inc/header.inc.php - This file is loaded by $phpgw->common->header -just after the system header/navbar, and allows developers to use -it for whatever they need to load.
  • -

    -

  • appname/inc/footer.inc.php - This file is loaded by $phpgw->common->footer -just before the system footer, allowing developers to close connections -and whatever else they need.
  • -
- -

-

-3.3  Adding files, directories and icons.

- -

-You will need to create the following directories for your code
- (replace 'appname' with your application name)
- -

- `--appname - -

-   |--inc - -

-   |   |--functions.inc.php - -

-   |   |--header.inc.php - -

-   |   |--hook_preferences.inc.php - -

-   |   |--hook_admin.inc.php - -

-   |   `--footer.inc.php - -

-   `--templates - -

-   |   `--default - -

- -

-
- -

-

-3.4  Making phpGroupWare aware of your application

- -

-To make the application aware of your application, add your application -details to the applications table. This can be done via the GUI administration -screen, or via a SQL script. -

-
-  insert into applications (app_name, app_title, app_enabled) values ('appname', 'The App name', 1);
-
-
-
- -

-

-3.5  Hooking into Administration page

- -

-When a user goes to the Administration page, it starts appname/inc/hook_admin.inc.php -for each application that is enabled, in alphabetical order of application -title. If the file exists, it is include()d in the hopes it will display -a selection of links to configure that application. - -

-Simple Example: -

-
-<?php
-  $img = "/" . $appname . "/images/navbar.gif";
-  section_start("My Application",$img);
-  echo "<a HREF=\"" . $phpgw->link("myAdminPage.php") . "\">";
-  echo lang("Change myApp settings") . "</a>";
-  section_end();
-?>
-
-
-
Look at headlines/inc/hook_admin.inc.php and admin/inc/hook_admin.inc.php -for more examples. - -

-Things to note: - -

- -

    -

  • Links are relative to the admin/index.php file, not your application's -base directory. (so use $appname in your link() calls)
  • -

    -

  • The file is brought in with include() so be careful to not pollute -the name-space too much
  • -
-The standard $phpgw and $phpgw_info variables are in-scope, as -is $appname which corresponds to the application name in the path. - -

-There are 2 functions to coordinate the display of each application's -links, section_start() and section_end() - -

- -

section_start

- -

-section_start($title,$icon_url) starts the section for your application. -$title is passed through lang() for you. $icon_url should be page-relative -to admin/index.php or an absolute URL. - -

- -

section_end

- -

-section_end() closes the section that was started with section_start(). - -

-

-3.6  Hooking into Preferences page

- -

-The mechanism to hook into the preferences page is identical to the -one used to hook into the administration page, however it looks for -appname/inc/hook_preferences.inc.php instead of appname/inc/hook_admin.inc.php. -The same functions and variables are defined. - -

-

-4  Infrastructure

- -

-

-4.1  Overview

- -

-phpGroupWare attempts to provide developers with a sound directory -structure to work from.
- The directory layout may seem complex at first, but after some use, -you will see that it is designed to accommodate a large number of -applications and functions. - -

-

-4.2  Directory tree

- -

-.--appname - -

-|   |--inc - -

-|   |   |--functions.inc.php - -

-|   |   |--header.inc.php - -

-|   |   |--hook_preferences.ini.php - -

-|   |   |--hook_home.inc.php - -

-|   |   `--footer.inc.php - -

-|   |--manual - -

-|   |--setup - -

-|   |   |--baseline.inc.php - -

-|   |   |--droptables.inc.php - -

-|   |   |--newtables.inc.php - -

-|   |   |--upgradetables.inc.php - -

-|   |   |--config.inc.php - -

-|   |   `--register.inc.php - -

-|   `--templates - -

-|   |   `--default - -

-|   |      `--images - -

-|   |        `--navbar.gif - -

-|   |--preferences.php - -

-|--docs (installation docs) - -

-|--files - -

-|   |--groups - -

-|   `--users - -

-`--phpgwapi - -

-   |--cron (phpgroupware's optional daemons) - -

-   |--doc (developers docs) - -

-   |--inc - -

-   |   |--phpgw.inc.php - -

-   |   |--phpgw_info.inc.php - -

-   |   |--phpgw_common.inc.php - -

-   |   `--etc.. - -

-   |--manual - -

-   |--setup - -

-   |   |--baseline.inc.php - -

-   |   |--droptables.inc.php - -

-   |   |--newtables.inc.php - -

-   |   |--upgradetables.inc.php - -

-   |   |--config.inc.php - -

-   |   `--register.inc.php - -

-   |--templates - -

-   |   |--default - -

-   |   |   `--images - -

-   |   |   |--home.gif - -

-   |   |   `--preferences.gif - -

-   |   `--verilak - -

-   |      `--images - -

-           |--home.gif - -

-           `--preferences.gif - -

-   `--themes - -

-      `--default.theme - -

- -

-
- -

-

-4.3  Translations

- -

-The translations are now being done thru the database, and will be -configurable to use other mechanisms. - -

-We are completing a program called Transy, which will provide developers/translators -a nice GUI for building and updating translations. - -

-In the mean time you will need to create a SQL script yourself and -name it lang.sql. You can copy the one in doc/lang.sql and use it -as a template. - -

-

-5  The API

- -

-

-5.1  Introduction

- -

-phpGroupWare attempts to provide developers with a useful API to handle -common tasks. - -

-To do this we have created a multi-dimensional class $phpgw->. - -

-This allows for terrific code organization, and help developers easily -identify the file that the function is in. All the files that are -part of this class are in the inc/core directory and are named to -match the sub-class. - -

-Example: $phpgw->send->msg() is in the inc/phpgwapi/phpgw_send.inc.php -file. - -

-

-5.2  Basic functions

- -

- -

$phpgw->link

- -

-$phpgw->link($url)
- Add support for session management. ALL links must use this, that -includes href's form actions and header location's. - -

-If you are just doing a form action back to the same page, you can -use it without any parameters. - -

-This function is right at the core of the class because it is used -so often, we wanted to save developers a few keystrokes. Example: - -

-
-<form name=copy method=post action="<?php echo $phpgw->link();?>">
-/* If session management is done via passing url parameters */
-/* The the result would be */
-/* <form name=copy method=post action="somepage.php?sessionid=87687693276?kp3=kjh98u80"> */
-
-
-
- -

-

-5.3  Application Functions

- -

- -

$phpgw->common->phpgw_header

- -

-$phpgw->phpgw_header()
- Print out the start of the HTML page, including the navigation bar -and includes appname/inc/header.php - -

- -

$phpgw->common->phpgw_footer

- -

-$phpgw->phpgw_footer()
- Prints the system footer, and includes appname/inc/footer.php - -

- -

$phpgw->common->appsession

- -

-$phpgw->common->appsession($data)
- Store important information session information that your application -needs.
- $phpgw->appsession will return the value of your session data is -you leave the parameter empty [i.e. $phpgw->appsession(``'')], -otherwise it will store whatever data you send to it.
- You can also store a comma delimited string and use explode() to -turn it back into an array when you receive the value back. - -

-Example: -

-
-  $phpgw->common->appsession("/path/to/something");
-  echo "Dir: " . $phpgw->common->appsession();
-
-
-
- -

-

-5.4  File functions

- -

- -

$phpgw->vfs->read_file

- -

-$phpgw->vfs->read_file($file)
- Returns the data from $file.
- You must send the complete path to the file.
- Example: -

-
-$data = $phpgw->vfs->read_file("/some/dir/to/file.txt");
-
-
-
- -

- -

$phpgw->vfs->write_file

- -

-$phpgw->vfs->write_file($file, $contents)
- Write data to $file.
- You must send the complete path to the file.
- Example: -

-
-$data = $phpgw->vfs->write_file("/some/dir/to/file.txt");
-
-
-
- -

- -

$phpgw->vfs->read_userfile

- -

-$phpgw->vfs->read_userfile($file)
- Returns the data from $file, which resides in the users private -dir.
- Example: -

-
-$data = $phpgw->vfs->read_userfile("file.txt");
-
-
-
- -

- -

$phpgw->vfs->write_userfile

- -

-$phpgw->write_userfile($file, $contents)
- Writes data to $file, which resides in the users private dir.
- Example: -

-
-$data = $phpgw->vfs->write_userfile("file.txt");
-
-
-
- -

- -

$phpgw->vfs->list_userfiles

- -

-$phpgw->vfs->list_userfiles()
- Returns an array which has the list of files in the users private -dir.
- Example: -

-
-$filelist = array();
-$filelist = $phpgw->vfs->list_userfiles();
-
-
-
- -

-

-5.5  Email/NNTP Functions

- -

- -

$phpgw->send->msg

- -

-$phpgw->msg->send($service, $to, $subject, $body, $msgtype, -$cc, $bcc)
- Send a message via email or NNTP and returns any error codes.
- Example: -

-
-$to = "someuser@domain.com";
-$subject = "Hello buddy";
-$body = "Give me a call\n Been wondering what your up to.";
-$errors = $phpgw->msg->send("email", $to, $subject, $body);
-
-
-
- -

-

-6  Configuration Variables

- -

-

-6.1  Introduction

- -

-phpGroupWare attempt to provide developers with as much information -about the user, group, server, and application configuration as possible. - -

-To do this we provide a multi-dimensional array called '$phpgw_info[]', -which includes all the information about your environment. - -

-Due to the multi-dimensional array approach. getting these values -is easy. - -

-Here are some examples: -

-
-  <?php
-  // To do a hello username
-  echo "Hello " . $phpgw_info["user"]["fullname"];
-  //If username first name is John and last name is Doe, prints: 'Hello John Doe'
-  ?>
-  <?php
-  // To find out the location of the imap server
-  echo "IMAP Server is named: " . $phpgw_info["server"]["imap_server"];
-  //If imap is running on localhost, prints: 'IMAP Server is named: localhost'
-  ?>
-
-
-
-
- -

-

-6.2  User information

- -

-$phpgw_info[``user''][``userid''] -= The user ID. -

-$phpgw_info[``user''][``sessionid''] -= The session ID -

-$phpgw_info[``user''][``theme''] -= Selected theme -

-$phpgw_info[``user''][``private_dir''] -= Users private dir. Use phpGroupWare core functions for access to -the files. -

-$phpgw_info[``user''][``firstname''] -= Users first name -

-$phpgw_info[``user''][``lastname''] -= Users last name -

-$phpgw_info[``user''][``fullname''] -= Users Full Name -

-$phpgw_info[``user''][``groups''] -= Groups the user is a member of -

-$phpgw_info[``user''][``app_perms''] -= If the user has access to the current application -

-$phpgw_info[``user''][``lastlogin''] -= Last time the user logged in. -

-$phpgw_info[``user''][``lastloginfrom''] -= Where they logged in from the last time. -

-$phpgw_info[``user''][``lastpasswd_change''] -= Last time they changed their password. -

-$phpgw_info[``user''][``passwd''] -= Hashed password. -

-$phpgw_info[``user''][``status''] -= If the user is enabled. -

-$phpgw_info[``user''][``logintime''] -= Time they logged into their current session. -

-$phpgw_info[``user''][``session_dla''] -= Last time they did anything in their current session -

-$phpgw_info[``user''][``session_ip''] -= Current IP address -

-

-6.3  Group information

- -

-$phpgw_info[``group''][``group_names''] -= List of groups. -

-

-6.4  Server information

- -

-$phpgw_info[``server''][``server_root''] -= Main installation directory -

-$phpgw_info[``server''][``include_root''] -= Location of the 'inc' directory. -

-$phpgw_info[``server''][``temp_dir''] -= Directory that can be used for temporarily storing files -

-$phpgw_info[``server''][``files_dir''] -= Directory er and group files are stored -

-$phpgw_info[``server''][``common_include_dir''] -= Location of the core/shared include files. -

-$phpgw_info[``server''][``template_dir''] -= Active template files directory. This is defaulted by the server, -and changeable by the user. -

-$phpgw_info[``server''][``dir_separator''] -= Allows compatibility with WindowsNT directory format, -

-$phpgw_info[``server''][``encrpytkey''] -= Key used for encryption functions -

-$phpgw_info[``server''][``site_title''] -= Site Title will show in the title bar of each webpage. -

-$phpgw_info[``server''][``webserver_url''] -= URL to phpGroupWare installation. -

-$phpgw_info[``server''][``hostname''] -= Name of the server phpGroupWare is installed upon. -

-$phpgw_info[``server''][``charset''] -= default charset, default:iso-8859-1 -

-$phpgw_info[``server''][``version''] -= phpGroupWare version. -

-

-6.5  Database information

- -

-It is unlikely you will need these, because $phpgw_info_db will -already be loaded as a database for you to use. - -

-$phpgw_info[``server''][``db_host''] -= Address of the database server. Usually this is set to localhost. -

-$phpgw_info[``server''][``db_name''] -= Database name. -

-$phpgw_info[``server''][``db_user''] -= User name. -

-$phpgw_info[``server''][``db_pass''] -= Password -

-$phpgw_info[``server''][``db_type''] -= Type of database. Currently MySQL and PostgreSQL are supported. -

-

-6.6  Mail information

- -

-It is unlikely you will need these, because most email needs are services -thru core phpGroupWare functions. - -

-$phpgw_info[``server''][``mail_server''] -= Address of the IMAP server. Usually this is set to localhost. -

-$phpgw_info[``server''][``mail_server_type''] -= IMAP or POP3 -

-$phpgw_info[``server''][``imap_server_type''] -= Cyrus or Uwash -

-$phpgw_info[``server''][``imap_port''] -= This is usually 143, and should only be changed if there is a good -reason. -

-$phpgw_info[``server''][``mail_suffix] -= This is the domain name, used to add to email address -

-$phpgw_info[``server''][``mail_login_type''] -= This adds support for VMailMgr. Generally this should be set to -'standard'. -

-$phpgw_info[``server''][``smtp_server''] -= Address of the SMTP server. Usually this is set to localhost. -

-$phpgw_info[``server''][``smtp_port''] -= This is usually 25, and should only be changed if there is a good -reason -

-

-6.7  NNTP information

- -

-$phpgw_info[``server''][``nntp_server''] -= Address of the NNTP server. -

-$phpgw_info[``server''][``nntp_port''] -= This is usually XX, and should only be changed if there is a good -reason. -

-$phpgw_info[``server''][``nntp_sender''] -= Unknown -

-$phpgw_info[``server''][``nntp_organization''] -= Unknown -

-$phpgw_info[``server''][``nntp_admin''] -= Unknown -

-

-6.8  Application information

- -

-Each application has the following information available. - -

-$phpgw_info[``apps''][``appname''][``title''] -= The title of the application. -

-$phpgw_info[``apps''][``appname''][``enabled''] -= If the application is enabled. True or False. -

-$phpgw_info[``server''][``app_include_dir''] -= Location of the current application include files. -

-$phpgw_info[``server''][``app_template_dir''] -= Location of the current application tpl files. -

-$phpgw_info[``server''][``app_lang_dir''] -= Location of the current lang directory. -

-$phpgw_info[``server''][``app_auth''] -= If the server and current user have access to current application -

-$phpgw_info[``server''][``app_current''] -= name of the current application. -

-

-7  Using Language Support

- -

-

-7.1  Overview

- -

-phpGroupWare is built using a multi-language support scheme. This -means the pages can be translated to other languages very easily. -Translations of text strings are stored in the phpGroupWare database, -and can be modified by the phpGroupWare administrator. - -

-

-7.2  How to use lang support

- -

-The lang() function is your application's interface to phpGroupWare's -internationalization support. - -

-While developing your application, just wrap all your text output -with calls to lang(), as in the following code: -

-
-  $x = 42;
-  echo lang("The counter is %1",$x)."<br>";
-
-
-
This will attempt to translate ``The counter is %1'', -and return a translated version based on the current application and -language in use. Note how the position that $x will end up is controlled -by the format string, not by building up the string in your -code. This allows your application to be translated to languages where -the actual number is not placed at the end of the string. - -

-When a translation is not found, the original text will be returned -with a * after the string. This makes it easy to develop your application, -then go back and add missing translations (identified by the *) -later. - -

-Without a specific translation in the lang table, the above code will -print: -

-
-The counter is 42*<br>
-
-
-
If the current user speaks Italian, they string returned -may instead be: -
-
-il contatore è 42<br>
-
-
-
- -

- -

The lang function

- -

- -

-
-lang($key, $m1="", $m2="", $m3="", $m4="", $m5="",
-          $m6="", $m7="", $m8="", $m9="", $m10="")
-
-
-
- -

- -

-
[$key ]  - -

-is the string to translate and may contain replacement directives -of the form %n.

- -
[$m1 ]  - -

-is the first replacement value or may be an array of replacement values -(in which case $m2 and above are ignored).

- -
[$m2 - $m10 ]  - -

-the 2nd through 10th replacement values if $m1 is not an array.

-
-The database is searched for rows with a lang.message_id that matches -$key. If a translation is not found, the original $key is used. -The translation engine then replaces all tokens of the form %N with -the Nth parameter (either $m1[N] or $mN). - -

- -

Adding translation data

- -

-An application called Transy is being developed to make this -easier, until then you can create the translation data manually. - -

- -

The lang table

- -

-The translation class uses the lang table for all translations. We -are concerned with 4 of the columns to create a translation: - -

- -

-
[message_id ]  - -

-The key to identify the message (the $key passed to the lang() function). -This is written in English.

- -
[app_name ]  - -

-The application the translation applies to, or common if it is common -across multiple applications.

- -
[lang ]  - -

-The code for the language the translation is in.

- -
[content ]  - -

-The translated string.

-
- -

- -

lang.sql

- -

-Currently all applications, and the core phpGroupWare source tree -have a lang.sql file. This is the place to add translation data. Just -add lines of the form: -

-
-REPLACE INTO lang (message_id, app_name, lang, content)
-VALUES( 'account has been deleted','common','en','Account has been deleted');
-
-
-
translating the content to reflect the message_id string -in the lang language. If the string is specific to your application, -put your application name in for app_name otherwise use the name -common. The message_id should be in lower case for a small increase -in speed. - -

-

-7.3  Common return codes

- -

-If you browse through the phpGroupWare sources, you may notice a pattern -to the return codes used in the higher-level functions. The codes -used are partially documented in the doc/developers/CODES file. - -

-Codes are used as a simple way to communicate common error and progress -conditions back to the user. They are mapped to a text string through -the check_code() function, which passes the strings through lang() -before returning. - -

-For example, calling -

-
-echo check_code(13);
-
-
-
Would print -
-
-Your message has been sent
-
-
-
translated into the current language. - -

-

-8  Using Templates

- -

-

-8.1  Overview

- -

-phpGroupWare is built using a templates based design. This means the -display pages, stored in tpl files, can be translated to other languages, -made to look completely different. - -

-

-8.2  How to use templates

- -

-Some instructions on using templates: - -

-For Further info read the PHPLIBs documentation for their template -class. http://phplib.netuse.de - -

-

-9  About this document

- -

-

-9.1  New versions

- -

-The newest version of this document can be found on our website http://www.phpgroupware.org -as lyx source, HTML, and text. - -

-

-9.2  Comments

- -

-Comments on this HOWTO should be directed to the phpGroupWare developers -mailing list phpgroupware-developers@lists.sourceforge.net - -

-To subscribe, go to http://sourceforge.net/mail/?group_id=7305 - -

-

-9.3  History

- -

-This document was written by Dan Kuykendall. - -

-2000-09-25 documentation on lang(), codes, administration and preferences -extension added by Steve Brown. - -

-2001-01-08 fixed directory structure, minor layout changes, imported -to lyx source - Darryl VanDorp - -

-

-9.4  Copyrights and Trademarks

- -

-Copyright (c) Dan Kuykendall. Permission is granted to copy, distribute -and/or modify this document under the terms of the GNU Free Documentation -License, Version 1.1 or any later version published by the Free Software -Foundation. - -

-A copy of the license is available at http://www.gnu.org/copyleft/gpl.html - -

-

-9.5  Acknowledgments and Thanks

- -

-Thanks to Joesph Engo for starting phpGroupWare (at the time called -webdistro). Thanks to all the developers and users who contribute -to making phpGroupWare such a success. - -


File translated from -TEX -by -TTH, -version 2.86.
On 9 Jan 2001, 21:41.
- + + + + phpGroupWare Application Development + + + +

phpGroupWare Application Development

+

phpGroupWare Documentation Team - phpgroupware-docteam at gnu.org

+

v0.9.16 1 December 2003

+
This document explains phpGroupWare's infrastructure and API, +along with what is required to integrate applications into it. +
+ +

Contents

+
    +
  1. Introduction
  2. +
      +
    1. Overview of application writing
    2. +
    3. What does the phpGroupWare API provide?
    4. +
    +
  3. Guidelines
  4. +
      +
    1. Requirements
    2. +
    3. Writing/porting your application
    4. +
    +
  5. Installing your application
  6. +
      +
    1. Overview
    2. +
    3. Automatic features
    4. +
    5. Adding files, directories and icons.
    6. +
    7. Making phpGroupWare aware of your application
    8. +
    9. Hooking into Administration page
    10. +
    11. Hooking into Preferences page
    12. +
    +
  7. Infrastructure
  8. +
      +
    1. Overview
    2. +
    3. Directory tree
    4. +
    5. Translations
    6. +
    +
  9. The API
  10. +
      +
    1. Introduction
    2. +
    3. Basic functions
    4. +
    5. Application Functions
    6. +
    7. File functions
    8. +
    9. Email/NNTP Functions
    10. +
    +
  11. Configuration Variables
  12. +
      +
    1. Introduction
    2. +
    3. User information
    4. +
    5. Group information
    6. +
    7. Server information
    8. +
    9. Database information
    10. +
    11. Mail information
    12. +
    13. NNTP information
    14. +
    15. Application information
    16. +
    +
  13. Using Language Support
  14. +
      +
    1. Overview
    2. +
    3. How to use lang support
    4. +
    5. Common return codes
    6. +
    +
  15. Using Templates
  16. +
      +
    1. Overview
    2. +
    3. How to use PHPLIB templates
    4. +
    5. How to use XSLT templates
    6. +
    +
  17. About this document
  18. +
      +
    1. New versions
    2. +
    3. Comments
    4. +
    5. History
    6. +
    7. Copyrights and Trademarks
    8. +
    9. Acknowledgments and Thanks
    10. +
    +
+ +

+

1  Introduction

+ +

+phpGroupWare is a web based groupware application framework (API), +for writing applications. Integrated applications such as email, calendar, +todo list, address book, and file manager are included. + +

+

+1.1  Overview of application writing

+ +

+We have attempted to make writing application for phpGroupWare as +painless as possible. We hope any pain and suffering is cause by making +your application work, but not dealing with phpGroupWare itself. + +

+

+1.2  What does the phpGroupWare API provide?

+ +

+The phpGroupWare API handles session management, user/group management, +has support for multiple databases, using the PHPLIB database abstraction +method, we support templates using the PHPLIB Templates class, a file +system interface, and even a network i/o interface. + +

+On top of these standard functions, phpGroupWare provides several +functions to give you the information you need about the users environment, +and to properly plug into phpGroupWare. + +

+

+2  Guidelines

+ +

+

+2.1  Requirements

+ +

+These guidelines must be followed for any application that wants considered +for inclusion into phpGroupWare deluxe: + +

+ +

    +

  • It must run on PHP4.1.0
  • +

    +

  • SQL statements must be compatible with both MySQL, PostgreSQL, M$ SQL Server and SAP-DB
  • +

    +

  • It must use our default header.inc.php include.
  • +

    +

  • It must use our $GLOBALS['phpgw']->link($url) for all links (this is for session +support).
  • +

    +

  • It must use "POST" for form submit methods.
  • +

    +

  • It must respect phpGW group rights and phpGW user permissions.
  • +

    +

  • It must use our directory structure, template support and lang (multi-language) +support.
  • +

    +

  • Where possible it should run on both Unix and NT platforms.
  • +

    +

  • For applications that do not meet these requirements, they can be +available to users via the phpGroupWare "3rd Party Apps" listing on our +website. If you need help converting your application to templates and +our lang support, we will try to connect you with someone to help.
  • +
+ +

+

2.2  Writing/porting your application

+ +

+ +

Include files

+ +

+Each PHP page you write will need to include the header.inc.php along +with a few variables.
+This is done by putting this at the top of each PHP page. +

+
+<?php
+$GLOBALS['phpgw_info']['flags']['currentapp'] = 'appname';
+include('../header.inc.php');
+?>
+
+
+
Of course change application name to fit.
+This include will provide the following things: + +

+ +

    +

  • The phpgwAPI - The phpGroupWare API will be loaded.
  • +

    +

  • The phpGW navbar will be loaded (by default, but can be disabled until +a later point.
  • + +
  • appname/inc/functions.inc.php - This file is loaded just after the +phpgwAPI and before any HTML code is generated. This file should include +all your application specific functions.. You are welcome to include +any additional files you need from within this file.
    +Note: Depricated and not used for OOP (/index.php?menuaction=app.obj.method) calls.
  • + +
  • appname/inc/header.inc.php - This file is loaded just after the system +header/navbar, and allows developers to use it for whatever they need +to load.
    +Note: Depricated and not used for OOP (/index.php?menuaction=app.obj.method) calls.
  • + +
  • appname/inc/footer.inc.php - This file is loaded just before the system +footer, allowing developers to close connections and whatever else +they need.
    +Note: Depricated and not used for OOP (/index.php?menuaction=app.obj.method) calls.
  • + + +
  • The phpGW footer will be loaded, which closes several connections.
  • +
+ +

+

3  Installing your application

+ +

+

3.1  Overview

+ +

+It is fairly simple to add and delete applications to/from phpGroupWare. + +

+

3.2  Automatic features

+ +

+To make things easy for developers we go ahead and load the following +files. +

+ +
    +
  • appname/inc/functions.inc.php - This file should include all your +application specific functions.
    +Note: Depricated and not used for OOP (/index.php?menuaction=app.obj.method) calls.
  • + +
  • appname/inc/header.inc.php - This file is loaded by $phpgw->common->header +just after the system header/navbar, and allows developers to use +it for whatever they need to load.
    +Note: Depricated and not used for OOP (/index.php?menuaction=app.obj.method) calls.
  • + + +
  • appname/inc/footer.inc.php - This file is loaded by $phpgw->common->footer +just before the system footer, allowing developers to close connections +and whatever else they need.
    +Note: Depricated and not used for OOP (/index.php?menuaction=app.obj.method) calls.
  • +
+ +

+

3.3  Adding files, directories and icons.

+ +

+You will need to create the following directories for your code
+(replace 'appname' with your application name)
+ +

+--appname
+
+  +--inc
+
+  |   |--functions.inc.php
+
+  |   |--header.inc.php
+
+  |   |--hook_preferences.inc.php
+
+  |   |--hook_admin.inc.php
+
+  |   +--footer.inc.php
+
+  +--js
+
+  |   |--base
+
+  |   +--js_package_name
+
+  +--setup
+
+  |   |--default_records.inc.php
+
+  |   |--setup.inc.php
+
+  |   +--tables_current.inc.php
+
+  +--templates
+
+      +--default
+
+ +

3.4  Making phpGroupWare aware of your application

+ +

+To make the application aware of your application, add your application +details to the applications table. This can be done via the GUI administration +screen, or via a SQL script. The script below should only be used during initial +development. You should use the phpGroupWare setup system for install and updating +the final version of your application. +

+INSERT INTO phpgw_applications (app_name, app_title, app_enabled)
+	VALUES('appname', 'The App name', 1);
+
+ +

+

3.5  Hooking into Administration page

+ +

+When a user goes to the Administration page, it starts appname/inc/hook_admin.inc.php +for each application that is enabled, in alphabetical order of application +title. If the file exists, it is include()d in the hopes it will display +a selection of links to configure that application. + +

+Simple Example: +

+<?php
+// Old linear script style
+$file['Site Configuration'] = $GLOBALS['phpgw']->link('myapp/myAdminPage.php');
+// OR - OOP Style
+$file['Site Configuration'] = $GLOBALS['phpgw']->link('/index.php',
+					array(menuaction => 'myapp.uiobj.admin_method');
+display_section('myapp',$file);
+?&#gt;
+
+Look at headlines/inc/hook_admin.inc.php and admin/inc/hook_admin.inc.php for more +examples. + +Things to note: +
    +
  • Links are relative to the admin/index.php file, not your application's +base directory. (so use "appname" in your link() calls)
  • + +
  • The file is brought in with include() so be careful to not pollute +the name-space too much
  • +
+The standard $GLOBALS['phpgw'] and $GLOBALS['phpgw_info'] variables are in-scope, as +is $appname which corresponds to the application name in the path. + +

+

3.6  Hooking into Preferences page

+ +

+The mechanism to hook into the preferences page is identical to the +one used to hook into the administration page, however it looks for +appname/inc/hook_preferences.inc.php instead of appname/inc/hook_admin.inc.php. +The same functions and variables are defined. + +

+

4  Infrastructure

+ +

+

4.1  Overview

+ +

+phpGroupWare attempts to provide developers with a sound directory +structure to work from.
+The directory layout may seem complex at first, but after some use, +you will see that it is designed to accommodate a large number of +applications and functions. + +

+

4.2  Directory tree

+ +
+--phpgroupware
+  |
+  +--admin
+  |
+  +--docs (installation docs)
+  |
+  +--files (Note: must be out of webserver document root!)
+  |   |
+  |   +--groups
+  |   |
+  |   +--homes
+  |   |
+  |   +--users
+  |
+  +--phpgwapi
+  |   |
+  |   +--cron (phpgroupware's optional daemons)
+  |   |
+  |   +--doc (developers docs)
+  |   |
+  |   +--inc
+  |   |   |
+  |   |   +--class.phpgw.inc.php
+  |   |   |
+  |   |   +--phpgw_info.inc.php
+  |   |   |
+  |   |   +--class.common.inc.php
+  |   |   |
+  |   |   +--etc..
+  |   |
+  |   +--js (javascript)
+  |   |   |
+  |   |   +--base
+  |   |   |
+  |   |   +--js_package_name
+  |   |
+  |   +--manual
+  |   |
+  |   +--setup
+  |   |   |
+  |   |   +--baseline.inc.php
+  |   |   |
+  |   |   +--default_records.inc.php
+  |   |   |
+  |   |   +--tables_current.inc.php
+  |   |   |
+  |   |   +--tables_update.inc.php
+  |   |
+  |   +--templates
+  |   |   |
+  |   |   +--default
+  |   |   |   |
+  |   |   |   +--images
+  |   |   |
+  |   |   +--verilak
+  |   |       |
+  |   |       +--images
+  |   |
+  |   +--themes
+  |       |
+  |       +--default.theme
+  |
+  +--preferences
+  |
+  +--setup
+
+

4.3  Translations

+ +

+The translations are now being done thru the database, and may be +configurable to use other mechanisms in future releases. + +

+You can use the developer_tools translations application for creating +the "lang files", which will be installed through the setup application. +Alternatively you can edit the files manually. The file naming convention for +the lang files is phpgw_<langcode>.lang. The files are stored +in the app/setup directory. The format of the files is as follows: +

+english phrase in lower case	appname	**	Translated phrase in desired case.
+
+Notes: +
    +
  • replace ** with the desired language code, as used in the filename
  • +
  • tabs are used to deliniate "columns"
  • +
+ +

5  The API

+ +

+

5.1  Introduction

+ +

+phpGroupWare attempts to provide developers with a useful API to handle +common tasks. + +

+To do this we have created a multi-dimensional class $GLOBALS['phpgw']->. + +

+This allows for terrific code organization, and help developers easily +identify the file that the function is in. All the files that are +part of this class are in the inc/core directory and are named to +match the sub-class. + +

+Example: $phpgw->send->msg() is in the inc/phpgwapi/class.send.inc.php +file. + +

+

5.2  Basic functions

+ +

+ +

$GLOBALS['phpgw']->link

+ +

+$GLOBALS['phpgw']->link($url, $args)
+Add support for session management. ALL links must use this, that +includes href's form actions and header location's. + +

+If you are just doing a form action back to the same page, you can +use it without any parameters. + +

+This function is right at the core of the class because it is used +so often, we wanted to save developers a few keystrokes. Example: + +

+<form name=copy method=post action="<?php echo $GLOBALS['phpgw']->link();?>">
+/* If session management is done via passing url parameters */
+/* The the result would be */
+/* <form name=copy method=post action="somepage.php?sessionid=87687693276?kp3=kjh98u80"> */
+
+ +

+

5.3  Application Functions

+ +

+ +

$GLOBALS['phpgw']->common->phpgw_header

+ +

+$GLOBALS['phpgw']->phpgw_header()
+Print out the start of the HTML page, including the navigation bar +and includes appname/inc/header.php, if using deprecated linear scripts style. + +

+ +

$GLOBALS['phpgw']->common->phpgw_footer

+ +

+$GLOBALS['phpgw']->phpgw_footer()
+Prints the system footer, and includes appname/inc/footer.php + +

+ +

$GLOBALS['phpgw']->common->appsession

+ +

+$GLOBALS['phpgw']->common->appsession($data)
+Store important information session information that your application +needs.
+$GLOBALS['phpgw']->appsession will return the value of your session data is +you leave the parameter empty [i.e. $GLOBALS['phpgw']->appsession()], +otherwise it will store whatever data you send to it.
+You can also store a comma delimited string and use explode() to +turn it back into an array when you receive the value back. + +

+Example: +

+$GLOBALS['phpgw']->common->appsession("/path/to/something");
+echo "Dir: " . $GLOBALS['phpgw']->common->appsession();
+
+ +

+

5.4  File functions

+ +

See Virtual File System (VFS) Developers Guide +for more info.

+ +

5.5  Email/NNTP Functions

+ +

+ +

$phpgw->send->msg

+ +

+$phpgw->msg->send($service, $to, $subject, $body, $msgtype, +$cc, $bcc)
+Send a message via email or NNTP and returns any error codes.
+Example: +

+
+$to = 'someuser@domain.com';
+$subject = 'Hello buddy';
+$body = "Give me a call\n Been wondering what your up to.";
+$errors = $GLOBALS['phpgw']->msg->send('email', $to, $subject, $body);
+
+
+
+ +

+

6  Configuration Variables

+ +

+

6.1  Introduction

+ +

+phpGroupWare attempts to provide developers with as much information +about the user, group, server, and application configuration as possible. + +

+To do this we provide a multi-dimensional array called "$GLOBALS['phpgw_info']", +which includes all the information about your environment. + +

+Due to the multi-dimensional array approach. getting these values +is easy. + +

+Here are some examples: +

+
+<?php
+// To do a hello username
+echo "Hello " . $GLOBALS['phpgw_info']['user']['fullname'];
+//If username first name is John and last name is Doe, prints: 'Hello John Doe'
+?>
+<?php
+// To find out the location of the imap server
+echo 'IMAP Server is named: ' . $GLOBALS['phpgw_info']['server']['imap_server'];
+//If imap is running on localhost, prints: 'IMAP Server is named: localhost'
+?>
+
+
+
+
+ +

+

6.2  User information

+ +$GLOBALS['phpgw_info']['user']['userid'] = The user ID.
+$GLOBALS['phpgw_info']['user']['sessionid'] = The session ID
+$GLOBALS['phpgw_info']['user']['theme'] = Selected theme
+$GLOBALS['phpgw_info']['user']['private_dir'] = Users private dir. +Use phpGroupWare core functions for access to the files.
+$GLOBALS['phpgw_info']['user']['firstname'] = Users first name
+$GLOBALS['phpgw_info']['user']['lastname'] = Users last name
+$GLOBALS['phpgw_info']['user']['fullname'] = Users Full Name
+$GLOBALS['phpgw_info']['user']['groups'] = Groups the user is a member of
+$GLOBALS['phpgw_info']['user']['app_perms'] = If the user has access to the current application
+$GLOBALS['phpgw_info']['user']['lastlogin'] = Last time the user logged in.
+$GLOBALS['phpgw_info']['user']['lastloginfrom'] = Where they logged in from the last time.
+$GLOBALS['phpgw_info']['user']['lastpasswd_change'] = Last time they changed their password.
+$GLOBALS['phpgw_info']['user']['passwd'] = Hashed password.
+$GLOBALS['phpgw_info']['user']['status'] = If the user is enabled.
+$GLOBALS['phpgw_info']['user']['logintime'] = Time they logged into their current session.
+$GLOBALS['phpgw_info']['user']['session_dla'] = Last time they did anything in their current session
+$GLOBALS['phpgw_info']['user']['session_ip'] = Current IP address
+
+ +

6.3  Group information

+$GLOBALS['phpgw_info']['group']['group_names'] = List of groups. + +

6.4  Server information

+ +$phpgw_info[``server''][``server_root''] = Main installation directory +$phpgw_info[``server''][``include_root''] = Location of the 'inc' directory. +$phpgw_info[``server''][``temp_dir''] = Directory that can be used for temporarily storing files +$phpgw_info[``server''][``files_dir''] = Directory er and group files are stored +$phpgw_info[``server''][``common_include_dir''] = Location of the core/shared include files. +$phpgw_info[``server''][``template_dir''] = Active template files directory. This is defaulted by the server, +and changeable by the user. +$phpgw_info[``server''][``dir_separator''] = Allows compatibility with WindowsNT directory format +$phpgw_info[``server''][``encrpytkey''] = Key used for encryption functions +$phpgw_info[``server''][``site_title''] = Site Title will show in the title bar of each webpage. +$phpgw_info[``server''][``webserver_url''] = URL to phpGroupWare installation. +$phpgw_info[``server''][``hostname''] = Name of the server phpGroupWare is installed upon. +$phpgw_info[``server''][``charset''] = default charset, default:iso-8859-1 +$phpgw_info[``server''][``version''] = phpGroupWare version. + +

6.5  Database information

+ +

+It is unlikely you will need these, because $GLOBALS['phpgw']->db will +already be loaded as a database for you to use. +

+ + +$phpgw_info[``server''][``db_host''] = Address of the database server. Usually this is set to localhost. +$phpgw_info[``server''][``db_name''] = Database name. +$phpgw_info[``server''][``db_user''] = User name. +$phpgw_info[``server''][``db_pass''] = Password +$phpgw_info[``server''][``db_type''] = Type of database. Currently MySQL and PostgreSQL are supported. + + +

6.6  Mail information

+ +

+It is unlikely you will need these, because most email needs are services +thru core phpGroupWare functions. + +

+$phpgw_info[``server''][``mail_server''] += Address of the IMAP server. Usually this is set to localhost. +

+$phpgw_info[``server''][``mail_server_type''] += IMAP or POP3 +

+$phpgw_info[``server''][``imap_server_type''] += Cyrus or Uwash +

+$phpgw_info[``server''][``imap_port''] += This is usually 143, and should only be changed if there is a good +reason. +

+$phpgw_info[``server''][``mail_suffix] += This is the domain name, used to add to email address +

+$phpgw_info[``server''][``mail_login_type''] += This adds support for VMailMgr. Generally this should be set to +'standard'. +

+$phpgw_info[``server''][``smtp_server''] += Address of the SMTP server. Usually this is set to localhost. +

+$phpgw_info[``server''][``smtp_port''] += This is usually 25, and should only be changed if there is a good +reason +

+

+6.7  NNTP information

+ +

+$phpgw_info[``server''][``nntp_server''] += Address of the NNTP server. +

+$phpgw_info[``server''][``nntp_port''] += This is usually XX, and should only be changed if there is a good +reason. +

+$phpgw_info[``server''][``nntp_sender''] += Unknown +

+$phpgw_info[``server''][``nntp_organization''] += Unknown +

+$phpgw_info[``server''][``nntp_admin''] += Unknown +

+

+6.8  Application information

+ +

+Each application has the following information available. + +

+$phpgw_info[``apps''][``appname''][``title''] += The title of the application. +

+$phpgw_info[``apps''][``appname''][``enabled''] += If the application is enabled. True or False. +

+$phpgw_info[``server''][``app_include_dir''] += Location of the current application include files. +

+$phpgw_info[``server''][``app_template_dir''] += Location of the current application tpl files. +

+$phpgw_info[``server''][``app_lang_dir''] += Location of the current lang directory. +

+$phpgw_info[``server''][``app_auth''] += If the server and current user have access to current application +

+$phpgw_info[``server''][``app_current''] += name of the current application. +

+

+7  Using Language Support

+ +

+

+7.1  Overview

+ +

+phpGroupWare is built using a multi-language support scheme. This +means the pages can be translated to other languages very easily. +Translations of text strings are stored in the phpGroupWare database, +and can be modified by the phpGroupWare administrator. + +

+

+7.2  How to use lang support

+ +

+The lang() function is your application's interface to phpGroupWare's +internationalization support. + +

+While developing your application, just wrap all your text output +with calls to lang(), as in the following code: + +

+$x = 42;
+echo lang("The counter is %1",$x)."<br>";
+
+ +This will attempt to translate ``The counter is %1'', +and return a translated version based on the current application and +language in use. Note how the position that $x will end up is controlled +by the format string, not by building up the string in your +code. This allows your application to be translated to languages where +the actual number is not placed at the end of the string. + +

+When a translation is not found, the original text will be returned +with a * after the string. This makes it easy to develop your application, +then go back and add missing translations (identified by the *) +later. + +

+Without a specific translation in the lang table, the above code will +print: +

+The counter is 42*<br>
+
+ +If the current user speaks Italian, they string returned +may instead be: + +
+il contatore è 42<br&#gt;
+
+ +

+ +

The lang function

+ +
+
+lang($key, $m1="", $m2="", $m3="", $m4="", $m5="",
+	$m6="", $m7="", $m8="", $m9="", $m10="")
+
+
+ +

+ +

+
[$key ]  + +

+is the string to translate and may contain replacement directives +of the form %n.

+ +
[$m1 ]  + +

+is the first replacement value or may be an array of replacement values +(in which case $m2 and above are ignored).

+ +
[$m2 - $m10 ]  + +

+the 2nd through 10th replacement values if $m1 is not an array.

+
+The database is searched for rows with a lang.message_id that matches +$key. If a translation is not found, the original $key is used. +The translation engine then replaces all tokens of the form %N with +the Nth parameter (either $m1[N] or $mN). + +

+ +

Adding translation data

+ +

+An application called Transy is being developed to make this +easier, until then you can create the translation data manually. + +

+ +

The lang table

+ +

+The translation class uses the lang table for all translations. We +are concerned with 4 of the columns to create a translation: + +

+ +

+
[message_id ]  + +

+The key to identify the message (the $key passed to the lang() function). +This is written in English.

+ +
[app_name ]  + +

+The application the translation applies to, or common if it is common +across multiple applications.

+ +
[lang ]  + +

+The code for the language the translation is in.

+ +
[content ]  + +

+The translated string.

+
+ +

+ +

lang.sql

+ +

+Currently all applications, and the core phpGroupWare source tree +have a lang.sql file. This is the place to add translation data. Just +add lines of the form: +

+
+REPLACE INTO lang (message_id, app_name, lang, content)
+VALUES( 'account has been deleted','common','en','Account has been deleted');
+
+
+
translating the content to reflect the message_id string +in the lang language. If the string is specific to your application, +put your application name in for app_name otherwise use the name +common. The message_id should be in lower case for a small increase +in speed. + +

+

+7.3  Common return codes

+ +

+If you browse through the phpGroupWare sources, you may notice a pattern +to the return codes used in the higher-level functions. The codes +used are partially documented in the doc/developers/CODES file. + +

+Codes are used as a simple way to communicate common error and progress +conditions back to the user. They are mapped to a text string through +the check_code() function, which passes the strings through lang() +before returning. + +

+For example, calling +

+
+echo check_code(13);
+
+
+
Would print +
+
+Your message has been sent
+
+
+
translated into the current language. + +

8  Using Templates

+ +

8.1  Overview

+ +

+phpGroupWare is built using a templates based design. This means the +display pages, stored in tpl files, can be translated to other languages, +made to look completely different.

+ +

phpGroupWare is changing template engines for the 0.9.18 release. All +versions of phpGroupWare upto 0.9.16 use the PHPLIB template engine. As of +the 0.9.18 release phpGroupWare will use a "home grown" XSLT based template +engine.

+ +

8.2  How to use PHPLIB templates

+ +

+For Further info read the PHPLIBs documentation for their template +class. http://phplib.sanisoft.com +

+ +

8.3  How to use XSLT templates

+ +

+Whoops, there is no documentation available on this - hassle the docteam to +produce something. +

+ + +

+

+9  About this document

+ +

+

+9.1  New versions

+ +

+The newest version of this document can be found on our website http://docs.phpgroupware.org +as HTML and plain text. + +

+

+9.2  Comments

+ +

+Comments on this HOWTO should be directed to the phpGroupWare developers +mailing list phpgroupware-docteam at gnu.org + +

FIXME +To subscribe, go to http://sourceforge.net/mail/?group_id=7305 + +

+

+9.3  History

+ +

+This document was written by Dan Kuykendall. + +

+2000-09-25 documentation on lang(), codes, administration and preferences +extension added by Steve Brown. + +

+2001-01-08 fixed directory structure, minor layout changes, imported +to lyx source - Darryl VanDorp + +

+

+9.4  Copyrights and Trademarks

+ +

+Copyright © Free Software Foundarion. Permission is granted to copy, +distribute and/or modify this document under the terms of the GNU Free +Documentation License, Version 1.1 or any later version published by the +Free Software Foundation. + +

+A copy of the license is available at http://www.gnu.org/copyleft/gpl.html + +

+

+9.5  Acknowledgments and Thanks

+ +

+Thanks to Joesph Engo for starting phpGroupWare (at the time called +webdistro). Thanks to all the developers and users who contribute +to making phpGroupWare such a success. + +


+

$Id$

+ From MAILER-DAEMON Wed Apr 27 02:39:56 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DQgDE-0007Oo-I4 for mharc-phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:39:56 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DQgDC-0007Oj-Vv for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:39:55 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DQgDA-0007OQ-Dl for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:39:53 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DQgDA-00074u-3z for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:39:52 -0400 Received: from [199.232.41.67] (helo=mx20.gnu.org) by monty-python.gnu.org with esmtp (TLS-1.0:RSA_ARCFOUR_SHA:16) (Exim 4.34) id 1DQgBX-0006BJ-5I for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:38:11 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by mx20.gnu.org with esmtp (Exim 4.34) id 1DQg7s-0002nx-4W for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:34:24 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 36670312DC for ; Wed, 27 Apr 2005 08:33:57 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 11364-09 for ; Wed, 27 Apr 2005 08:33:54 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id D3A8B312BE for ; Wed, 27 Apr 2005 08:33:54 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3R6Xs801468; Wed, 27 Apr 2005 08:33:54 +0200 Message-Id: <200504270633.j3R6Xs801468@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: uid65887 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] bookkeeping/setup phpgw_en.lang, 1.5 tables_update.inc.php, 1.2 phpgw_de.lang, 1.2 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Wed, 27 Apr 2005 06:39:55 -0000 X-Original-Date: Tue, 23 Dec 2003 17:34:00 +0100 X-List-Received-Date: Wed, 27 Apr 2005 06:39:55 -0000 Update of bookkeeping/setup Modified Files: Branch: MAIN phpgw_en.lang lines: +39 -71 tables_update.inc.php lines: +1 -1 phpgw_de.lang lines: +37 -19 Log Message: update ==================================================== Index: bookkeeping/setup/phpgw_en.lang diff -u bookkeeping/setup/phpgw_en.lang:1.4 bookkeeping/setup/phpgw_en.lang:1.5 --- bookkeeping/setup/phpgw_en.lang:1.4 Sun May 25 20:34:18 2003 +++ bookkeeping/setup/phpgw_en.lang Tue Dec 23 16:34:45 2003 @@ -1,71 +1,39 @@ -$lang_selected bookkeeping en $lang_selected -1 day bookkeeping en 1 day -7 days bookkeeping en 7 days -account_already_exist bookkeeping en Account already exists -add_bookkeeping_account bookkeeping en Add bookkeeping account -add_bookkeeping_admin bookkeeping en Add bookkeeping admin -add_bookkeeping_schema bookkeeping en Add bookkeeping schema -add_expense bookkeeping en Add expense -add_expense_category bookkeeping en Add expense category -add_group bookkeeping en Add group -add_income bookkeeping en Add income -add_income_category bookkeeping en Add income category -admin_delete_admin bookkeeping en Admin delete admin -amount bookkeeping en Amount -automatically selected your only bookkeeping account. bookkeeping en Automatically selected your only bookkeeping account. -bookingschema bookkeeping en Bookingschema -bookkeeping common en Bookkeeping -bookkeeping admins admin en Bookkeeping admins -bookkeeping_account bookkeeping en Bookkeeping account -change_bookkeeping_account bookkeeping en Change bookkeeping account -choose_a_bookkeeping_account bookkeeping en Choose a bookkeeping account -day bookkeeping en Day -delete_bookkeeping_account bookkeeping en Delete bookkeeping account -delete_bookkeeping_schema bookkeeping en Delete bookkeeping schema -delete_expense bookkeeping en Delete expense -delete_expense_category bookkeeping en Delete expense category -delete_group bookkeeping en Delete group -delete_income bookkeeping en Delete income -delete_income_category bookkeeping en Delete income category -edit_bookkeeping_account bookkeeping en Edit bookkeeping account -edit_bookkeeping_schema bookkeeping en Edit bookkeeping schema -edit_expense bookkeeping en Edit expense -edit_expense_category bookkeeping en Edit expense category -edit_group bookkeeping en Edit group -edit_income bookkeeping en Edit income -edit_income_category bookkeeping en Edit income category -entries bookkeeping en Entries -execute bookkeeping en Execute -expense bookkeeping en Expense -expenses bookkeeping en Expenses -from bookkeeping en From -go_back bookkeeping en Go back -income bookkeeping en Income -logging bookkeeping en Logging -loginid bookkeeping en LoginID -module bookkeeping en Module -month bookkeeping en Month -non_selected bookkeeping en Non selected -no_access bookkeeping en No access -no_access_enzo bookkeeping en No access enzo -no_access_for_this_bookkeeping_account bookkeeping en No access for this bookkeeping account -no_access_this_bookkeeping_account bookkeeping en No access this bookkeeping account -no_access_to_a_bookkeeping_account bookkeeping en No access to a bookkeeping account -no_bookkeeping_account_was_created bookkeeping en No bookkeeping account was created -no_valid_bookkeeping_account bookkeeping en No valid bookkeeping account -no_valid_bookkeeping_account_selected bookkeeping en No valid bookkeeping account selected -proceed bookkeeping en Proceed -remove_this_bookkeeping_admin bookkeeping en Remove this bookkeeping admin -remove_this_category bookkeeping en Remove this category -remove_this_entry bookkeeping en Remove this entry -reports bookkeeping en Reports -resolution bookkeeping en Resolution -show bookkeeping en Show -statistics bookkeeping en Statistics -switch to bookkeeping en Switch to -till bookkeeping en Till -view_bookkeeping_account bookkeeping en View bookkeeping account -view_bookkeeping_schema bookkeeping en View bookkeeping schema -view_expense bookkeeping en View expense -view_group bookkeeping en View group -view_income bookkeeping en View income +all delivery notes bookkeeping en All delivery notes +all invoices bookkeeping en All invoices +billing bookkeeping en Billing +billed bookkeeping en Billed +billed only bookkeeping en Billed only +bookkeeping common en Bookkeeping +create delivery bookkeeping en Create delivery +create invoice bookkeeping en Create invoice +deliveries bookkeeping en Deliveries +delivery bookkeeping en Delivery +delivery %1 has been created bookkeeping en Delivery %1 has been created. +delivery %1 has been updated bookkeeping en Delivery %1 has been updated. +delivery date bookkeeping en Delivery date +delivery id bookkeeping en Delivery ID +delivery list bookkeeping en Delivery list +delivery note bookkeeping en Delivery note +generate delivery id bookkeeping en Generate Delivery ID ? +generate invoice id bookkeeping en Generate Invoice ID ? +Hours bookkeeping en Hours +invoice bookkeeping en Invoice +invoice %1 has been created bookkeeping en Invoice %1 has been created. +invoice %1 has been updated bookkeeping en Invoice %1 has been updated. +invoice date bookkeeping en Invoice date +invoice id bookkeeping en Invoice ID +invoice list bookkeeping en Invoice list +net bookkeeping en net +print delivery bookkeeping en Print delivery +print invoice bookkeeping en Print invoice +select own address bookkeeping en Select own address +enter tax for work time bookkeeping en Enter tax for work time +sum hours bookkeeping en Sum hours +sum net bookkeeping en Sum net +sum workunits bookkeeping en Sum workunits +tax bookkeeping en tax +update delivery bookkeeping en Update delivery +update invoice bookkeeping en Update invoice +you have entered an invalid date bookkeeping en You have entered an invalid date. +You have no customer selected bookkeeping en You have no customer selected. +you have to create a delivery or invoice first bookkeeping en You have to CREATE a delivery or invoice first ! ==================================================== ==================================================== Index: bookkeeping/setup/phpgw_de.lang diff -u bookkeeping/setup/phpgw_de.lang:1.1 bookkeeping/setup/phpgw_de.lang:1.2 --- bookkeeping/setup/phpgw_de.lang:1.1 Tue Jun 12 22:51:31 2001 +++ bookkeeping/setup/phpgw_de.lang Tue Dec 23 16:34:45 2003 @@ -1,19 +1,37 @@ -bookkeeping common de Buchhaltung -bookkeeping admins admin de Buchhaltung Admins -add_expense bookkeeping de Ausgabe hinzufügen -add_income bookkeeping de Einnahme hinzufügen -amount bookkeeping de Betrag -edit_expense bookkeeping de Ausgabe überarbeiten -edit_income bookkeeping de Einnahme überarbeiten -entries bookkeeping de Einträge -expense bookkeeping de Ausgabe -expenses bookkeeping de Ausgaben -income bookkeeping de Einnahme -logging bookkeeping de Erfassung -loginid bookkeeping de LoginID -proceed bookkeeping de Fortsetzen. -reports bookkeeping de Bericht -statistics bookkeeping de Statistiken -switch to bookkeeping de Wechseln zu -view_expense bookkeeping de Ausgabe anzeigen -view_income bookkeeping de Einnahme anzeigen +all delivery notes bookkeeping de Alle Lieferscheine +all invoices bookkeeping de Alle Rechnungen +billed bookkeeping de Bezahlt +billed only bookkeeping de nur bezahlte +billing bookkeeping de Abrechnung +bookkeeping common de Rechnungswesen +create delivery bookkeeping de Lieferung erstellen +create invoice bookkeeping de Rechnung erstellen +deliveries bookkeeping de Lieferungen +delivery bookkeeping de Lieferung +delivery %1 has been created bookkeeping de Lieferung %1 wurde erstellt. +delivery %1 has been updated bookkeeping de Lieferung %1 wurde überarbeitet. +delivery date bookkeeping de Lieferungs Datum +delivery id bookkeeping de Lieferungs ID +delivery list bookkeeping de Lieferungs Liste +delivery note bookkeeping de Lieferschein +generate delivery id bookkeeping de Lieferungs ID generieren ? +generate invoice id bookkeeping de Rechnungs ID generieren ? +invoice bookkeeping de Rechnung +invoice %1 has been created bookkeeping de Rechnung %1 wurde erstellt. +invoice %1 has been updated bookkeeping de Rechnung %1 wurde überarbeitet. +invoice date bookkeeping de Rechnungs Datum +invoice id bookkeeping de Rechnungs ID +invoice list bookkeeping de Rechnungs Liste +net bookkeeping de netto +print delivery bookkeeping de Lieferung drucken +print invoice bookkeeping de Rechnung drucken +select own address bookkeeping de Eigene Adresse auswählen +select tax for work time bookkeeping de Mehrwertsteuer für Arbeitszeit +sum hours bookkeeping de Summe Stunden +sum net bookkeeping de Summe netto +sum workunits bookkeeping de Summe Arbeitseinheiten +tax bookkeeping de Mwst. +update delivery bookkeeping de Lieferung überarbeiten +update invoice bookkeeping de Rechnung überarbeiten +you have no customer selected projects de Sie haben keinen Kunden ausgewählt. +you have to create a delivery or invoice first bookkeeping de Sie müssen zuerst eine Rechnung/Lieferung ERSTELLEN ! From MAILER-DAEMON Wed Apr 27 02:40:05 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DQgDM-0007Q3-Ex for mharc-phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:40:04 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DQgDI-0007PX-96 for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:40:00 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DQgDF-0007P5-Uh for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:39:59 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DQgDF-00074u-Hz for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:39:57 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DQgFj-0006na-IT for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:42:32 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 65F9F312BE for ; Wed, 27 Apr 2005 08:38:23 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 11609-05 for ; Wed, 27 Apr 2005 08:37:52 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id C8260312DC for ; Wed, 27 Apr 2005 08:37:52 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3R6bqa01729; Wed, 27 Apr 2005 08:37:52 +0200 Message-Id: <200504270637.j3R6bqa01729@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: uid65887 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] todo/inc class.uitodo.inc.php, 1.23 class.sotodo.inc.php, 1.16 class.botodo.inc.php, 1.17 class.ui.inc.php, 1.21 class.bo.inc.php, 1.12 class.so.inc.php, 1.12 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Wed, 27 Apr 2005 06:40:01 -0000 X-Original-Date: Wed, 24 Dec 2003 01:39:00 +0100 X-List-Received-Date: Wed, 27 Apr 2005 06:40:01 -0000 Update of todo/inc Added Files: Branch: MAIN class.uitodo.inc.php lines: +310 -170 class.sotodo.inc.php lines: +201 -185 class.botodo.inc.php lines: +181 -128 Removed Files: Branch: MAIN class.ui.inc.php class.bo.inc.php class.so.inc.php Log Message: return id when adding a todo plus classname update ==================================================== Index: class.uitodo.inc.php * * Bettina Gille [ceb@phpgroupware.org] * * ----------------------------------------------- * * Copyright 2000 - 2003 Free Software Foundation, Inc * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the * * Free Software Foundation; either version 2 of the License, or (at your * * option) any later version. * \*************************************************************************/ /* $Id: class.uitodo.inc.php,v 1.23 2003/12/24 00:39:04 uid65887 Exp $ */ class uitodo { var $grants; var $historylog; var $t; var $public_functions = array ( 'show_list' => True, 'view' => True, 'add' => True, 'edit' => True, 'delete' => True, 'matrix' => True ); function uitodo() { $this->botodo = CreateObject('todo.botodo',True); $this->nextmatchs = CreateObject('phpgwapi.nextmatchs'); $this->historylog = CreateObject('phpgwapi.historylog','todo'); $this->historylog->types = array ( 'A' => lang('Entry added'), 'C' => lang('Category changed'), 'S' => lang('Start date changed'), 'E' => lang('End date changed'), 'U' => lang('Urgency changed'), 's' => lang('Status changed'), 'T' => lang('Title changed'), 'D' => lang('Description changed'), 'a' => lang('Access changed'), 'P' => lang('Parent changed') ); $this->historylog->alternate_handlers = array ( 'S' => '$GLOBALS[\'phpgw\']->common->show_date', 'E' => '$GLOBALS[\'phpgw\']->common->show_date', 'C' => '$GLOBALS[\'phpgw\']->categories->id2name' ); $this->cats = CreateObject('phpgwapi.categories'); $GLOBALS['phpgw']->categories = $this->cats; $this->sbox = CreateObject('phpgwapi.sbox'); $this->matrix = CreateObject('phpgwapi.matrixview'); $this->account = $GLOBALS['phpgw_info']['user']['account_id']; $this->t = CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('todo')); $this->grants = $GLOBALS['phpgw']->acl->get_grants('todo'); $this->start = $this->botodo->start; $this->query = $this->botodo->query; $this->filter = $this->botodo->filter; $this->order = $this->botodo->order; $this->sort = $this->botodo->sort; $this->cat_id = $this->botodo->cat_id; } function save_sessiondata() { $data = array ( 'start' => $this->start, 'query' => $this->query, 'filter' => $this->filter, 'order' => $this->order, 'sort' => $this->sort, 'cat_id' => $this->cat_id ); $this->botodo->save_sessiondata($data); } function set_app_langs() { $this->t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']); $this->t->set_var('row_on',$GLOBALS['phpgw_info']['theme']['row_on']); $this->t->set_var('row_off',$GLOBALS['phpgw_info']['theme']['row_off']); $this->t->set_var('lang_category',lang('Category')); $this->t->set_var('lang_select',lang('Select')); $this->t->set_var('lang_descr',lang('Description')); $this->t->set_var('lang_title',lang('Title')); $this->t->set_var('lang_none',lang('None')); $this->t->set_var('lang_nobody',lang('Nobody')); $this->t->set_var('lang_urgency',lang('Urgency')); $this->t->set_var('lang_completed',lang('Completed')); $this->t->set_var('lang_start_date',lang('Start Date')); $this->t->set_var('lang_end_date',lang('End Date')); $this->t->set_var('lang_date_due',lang('date due')); $this->t->set_var('lang_access',lang('Private')); $this->t->set_var('lang_parent',lang('Parent project')); $this->t->set_var('lang_submit',lang('Submit')); $this->t->set_var('lang_save',lang('Save')); $this->t->set_var('lang_done',lang('Done')); $this->t->set_var('lang_assigned',lang('Assigned to')); $this->t->set_var('lang_owner',lang('Created by')); } function show_list() { $GLOBALS['phpgw']->common->phpgw_header(); echo $this->show_list_body(True); } function show_list_body($show_page_header=True) { $this->t->set_file( Array( 'todo_list_t' => 'list.tpl' ) ); $this->t->set_block('todo_list_t','page_header','page_header'); $this->t->set_block('todo_list_t','table_header','table_header'); $this->t->set_block('todo_list_t','todo_list','todo_list'); $this->t->set_block('todo_list_t','table_footer','table_footer'); $this->t->set_block('todo_list_t','page_footer','page_footer'); $body = ''; $this->set_app_langs(); $this->t->set_var(lang_action,lang('todo list')); $this->t->set_var('lang_all',lang('All')); if (!$this->start) { $this->start = 0; } $todo_list = $this->botodo->_list($this->start, True, $this->query,$this->filter,$this->order,$this->sort,$this->cat_id,'all'); // --------------------- nextmatch variable template-declarations ------------------------ if($show_page_header) { $left = $this->nextmatchs->left('/index.php',$this->start,$this->botodo->total_records,'&menuaction=todo.ui.show_list'); $right = $this->nextmatchs->right('/index.php',$this->start,$this->botodo->total_records,'&menuaction=todo.ui.show_list'); $this->t->set_var('left',$left); $this->t->set_var('right',$right); $this->t->set_var('total_matchs',$this->nextmatchs->show_hits($this->botodo->total_records,$this->start)); // ------------------------- end nextmatch template -------------------------------------- $this->t->set_var('cat_action',$GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.show_list')); $this->t->set_var('categories',$this->cats->formatted_list('select','all',$this->cat_id,'True')); $this->t->set_var('filter_action',$GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.show_list')); $this->t->set_var('filter_list',$this->nextmatchs->filter(1,array('yours' => 1,'filter' => $this->filter))); $this->t->set_var('search_action',$GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.show_list')); $this->t->set_var('search_list',$this->nextmatchs->search(array('search_obj' => 1,'query' => $this->query))); $body .= $this->t->fp('out','page_header'); } // ---------------- list header variable template-declarations -------------------------- $this->t->set_var('sort_status',$this->nextmatchs->show_sort_order($this->sort,'todo_status',$this->order,'/todo/index.php',lang('Status'))); $this->t->set_var('sort_urgency',$this->nextmatchs->show_sort_order($this->sort,'todo_pri',$this->order,'/todo/index.php',lang('Urgency'))); $this->t->set_var('sort_title',$this->nextmatchs->show_sort_order($this->sort,'todo_title',$this->order,'/todo/index.php',lang('title'))); $this->t->set_var('sort_sdate',$this->nextmatchs->show_sort_order($this->sort,'todo_startdate',$this->order,'/todo/index.php',lang('start date'))); $this->t->set_var('sort_edate',$this->nextmatchs->show_sort_order($this->sort,'todo_enddate',$this->order,'/todo/index.php',lang('end date'))); $this->t->set_var('sort_owner',$this->nextmatchs->show_sort_order($this->sort,'todo_owner',$this->order,'/todo/index.php',lang('created by'))); $this->t->set_var('sort_assigned',$this->nextmatchs->show_sort_order($this->sort,'todo_assigned',$this->order,'/todo/index.php',lang('assigned to'))); $this->t->set_var('h_lang_sub',lang('Add Sub')); $this->t->set_var('h_lang_view',lang('View')); $this->t->set_var('h_lang_edit',lang('Edit')); $body .= $this->t->fp('out','table_header'); // -------------- end header declaration --------------------------------------- for ($i=0;$inextmatchs->template_alternate_row_color($this->t); $level = $todo_list[$i]['level']; $title = $GLOBALS['phpgw']->strip_html($todo_list[$i]['title']); if (!$title) { $words = split(' ',$GLOBALS['phpgw']->strip_html($todo_list[$i]['descr'])); $title = "$words[0] $words[1] $words[2] $words[3] ..."; } if ($level == 0) { $title = '' . $title . ''; } else { $space = '  '; $spaceset = str_repeat($space,$level); $title = $spaceset . $title; } switch ($todo_list[$i]['pri']) { case 1: $pri = lang('Low'); break; case 2: $pri = '' . lang('normal') . ''; break; case 3: $pri = '' . lang('high') . ''; break; } if ($todo_list[$i]['edate_epoch'] == 0) { $datedueout = ' '; } else { $datedue = $todo_list[$i]['edate_epoch']; $datedue = $datedue - $this->botodo->datetime->tz_offset; $month = $GLOBALS['phpgw']->common->show_date(time(),'n'); $day = $GLOBALS['phpgw']->common->show_date(time(),'d'); $year = $GLOBALS['phpgw']->common->show_date(time(),'Y'); $currentdate = mktime(2,0,0,$month,$day,$year); if (($currentdate >= $datedue) && ($todo_list[$i]['status'] < 100)) { $datedueout = ''; } else { $datedueout = ''; } $datedueout .= $todo_list[$i]['edate']; if ($currentdate >= $datedue) { $datedueout .= ''; } } $assigned = $this->botodo->list_assigned($todo_list[$i]['assigned']); $assigned .= $this->botodo->list_assigned($todo_list[$i]['assigned_group']); // --------------- template declaration for list records ------------------------------------- $this->t->set_var(array ( 'status' => $todo_list[$i]['status'], 'pri' => $pri, 'title' => $title, 'datecreated' => $todo_list[$i]['sdate'], 'datedue' => $datedueout, 'owner' => $todo_list[$i]['owner'], 'assigned' => $assigned )); $this->t->set_var('view','' . lang('View') . ''); if ($this->botodo->check_perms($this->grants[$todo_list[$i]['owner_id']],PHPGW_ACL_EDIT)) { $this->t->set_var('edit','' . lang('Edit') . ''); } else { $this->t->set_var('edit',' '); } if ($this->botodo->check_perms($this->grants[$todo_list[$i]['owner_id']],PHPGW_ACL_DELETE)) { $this->t->set_var('delete','' . lang('Delete') . ''); } else { $this->t->set_var('delete',' '); } if ($this->botodo->check_perms($this->grants[$todo_list[$i]['owner_id']],PHPGW_ACL_ADD)) { $this->t->set_var('subadd', '' . lang('Add Sub') . ''); } else { $this->t->set_var('subadd',' '); } $body .= $this->t->fp('out','todo_list'); } $body .= $this->t->fp('out','table_footer'); // ------------------------- end record declaration ------------------------ // --------------- template declaration for Add Form -------------------------- if($show_page_header) { if ($this->cat_id && $this->cat_id != 0) { $cat = $this->cats->return_single($this->cat_id); } if ($cat[0]['app_name'] == 'phpgw' || $cat[0]['owner'] == '-1' || !$this->cat_id) { $this->t->set_var('add',''); } else { if ($this->botodo->check_perms($this->grants[$cat[0]['owner']],PHPGW_ACL_ADD) || $cat[0]['owner'] == $GLOBALS['phpgw_info']['user']['account_id']) { $this->t->set_var('add','
'); } else { $this->t->set_var('add',''); } } // ----------------------- end Add form declaration ---------------------------- // ------------ get actual date and year for matrixview arguments -------------- $year = date('Y'); $month = date('m'); $this->t->set_var('matrixview',$GLOBALS['phpgw']->common->check_owner($GLOBALS['phpgw_info']['user']['account_id'],'/index.php', lang('View matrix of actual month'),'menuaction=todo.uitodo.matrix&month=' . $month . '&year=' . $year)); $body .= $this->t->fp('out','page_footer'); } $this->save_sessiondata(); return $body; } function formatted_user($selected = '',$type) { if (!$selected) { $selected = $this->account; } if (! is_array($selected)) { $selected = explode(',',$selected); } $employees = $this->botodo->employee_list($type); while (list($null,$account) = each($employees)) { $user_list .= ''; } return $todo_select; } function add() { global $cat_id, $new_cat, $values, $submit, $new_parent, $parent, $assigned, $assigned_group; if ($new_parent) { $parent = $new_parent; } if ($new_cat) { $cat_id = $new_cat; } if ($submit) { $values['cat'] = $cat_id; $values['parent'] = $parent; if (is_array($assigned)) { $values['assigned'] = implode(',',$assigned); if (count($assigned) > 1) { $values['assigned'] = ',' . $values['assigned'] . ','; } } if (is_array($assigned_group)) { $values['assigned_group'] = implode(',',$assigned_group); if (count($assigned_group) > 1) { $values['assigned_group'] = ',' . $values['assigned_group'] . ','; } } $error = $this->botodo->check_values($values); if (is_array($error)) { $this->t->set_var('error',$GLOBALS['phpgw']->common->error_list($error)); } else { $this->botodo->save($values); Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=todo.uitodo.show_list&cat_id=' . $cat_id)); $GLOBALS['phpgw_info']['flags']['nodisplay'] = True; exit; } } $GLOBALS['phpgw']->common->phpgw_header(); $this->t->set_file('todo_add','form.tpl'); $this->t->set_block('todo_add','add','addhandle'); $this->t->set_block('todo_add','edit','edithandle'); $this->set_app_langs(); $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=todo.uitodo.add')); if ($parent) { $this->t->set_var('lang_todo_action',lang('Add sub project')); } else { $this->t->set_var('lang_todo_action',lang('Add main project')); } $this->t->set_var('cat_list',$this->cats->formatted_list('select','all',$cat_id,'True')); $this->t->set_var('todo_list',$this->formatted_todo($parent)); $this->t->set_var('descr',$values['descr']); $this->t->set_var('pri_list',$this->sbox->getPriority('values[pri]')); $this->t->set_var('stat_list',$this->sbox->getPercentage('values[status]',0)); $this->t->set_var('user_list',$this->formatted_user($assigned,'accounts')); $this->t->set_var('group_list',$this->formatted_user($assigned_group,'groups')); if (!$values['smonth']) { $values['smonth'] = date('m',time()); } if (!$values['sday']) { $values['sday'] = date('d',time()); } if (!$values['syear']) { $values['syear'] = date('Y',time()); } $this->t->set_var('start_select_date',$GLOBALS['phpgw']->common->dateformatorder($this->sbox->getYears('values[syear]',$values['syear']), $this->sbox->getMonthText('values[smonth]',$values['smonth']),$this->sbox->getDays('values[sday]',$values['sday']))); $this->t->set_var('end_select_date',$GLOBALS['phpgw']->common->dateformatorder($this->sbox->getYears('values[eyear]',$values['eyear']), $this->sbox->getMonthText('values[emonth]',$values['emonth']),$this->sbox->getDays('values[eday]',$values['eday']))); $this->t->set_var('selfortoday',''); $this->t->set_var('daysfromstartdate',''); $this->t->set_var('access_list', ''); $this->t->set_var('lang_selfortoday',lang('or: select for today:')); $this->t->set_var('lang_daysfromstartdate',lang('or: days from startdate:')); $this->t->set_var('lang_submit',lang('Submit')); $this->t->set_var('lang_reset',lang('Clear form')); $this->t->set_var('edithandle',''); $this->t->set_var('addhandle',''); $this->t->pfp('out','todo_add'); $this->t->pfp('addhandle','add'); } function view() { $GLOBALS['phpgw']->common->phpgw_header(); $values = $this->botodo->read($GLOBALS['todo_id']); $this->t->set_file('_view','view.tpl'); $this->set_app_langs(); $this->t->set_var('lang_todo_action',lang('View todo item')); $this->t->set_var('value_title',$GLOBALS['phpgw']->strip_html($values['title'])); $this->t->set_var('value_descr',$GLOBALS['phpgw']->strip_html($values['descr'])); $this->t->set_var('value_category',$this->cats->id2name($values['cat'])); $sdate = $values['sdate'] - $this->botodo->datetime->tz_offset; $this->t->set_var('value_start_date',$GLOBALS['phpgw']->common->show_date($sdate,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'])); if ($values['edate'] && $values['edate'] != 0) { $edate = $values['edate'] - $this->botodo->datetime->tz_offset; $this->t->set_var('value_end_date',$GLOBALS['phpgw']->common->show_date($edate,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'])); } $parent_values = $this->botodo->read($values['parent']); $this->t->set_var('value_parent',$GLOBALS['phpgw']->strip_html($parent_values['title'])); $this->t->set_var('value_completed',$values['status']); $assigned = $this->botodo->list_assigned($this->botodo->format_assigned($values['assigned'])); $assigned .= $this->botodo->list_assigned($this->botodo->format_assigned($values['assigned_group'])); $this->t->set_var('assigned',$assigned); $cached_data = $this->botodo->cached_accounts($values['owner']); $this->t->set_var('owner',$GLOBALS['phpgw']->common->display_fullname($cached_data[$values['owner']]['lid'], $cached_data[$values['owner']]['firstname'],$cached_data[$values['owner']]['lastname'])); switch ($values['pri']) { case 1: $pri = lang('Low'); break; case 2: $pri = lang('normal'); break; case 3: $pri = '' . lang('high') . ''; break; } $this->t->set_var('value_urgency',$pri); $this->t->set_var('lang_access',lang('Access')); $this->t->set_var('access',lang($values['access'])); $this->t->set_var('history',$this->historylog->return_html(array(),'','',$GLOBALS['todo_id'])); $this->t->set_var('done_action',$GLOBALS['phpgw']->link('/index.php','menuaction=todo.uitodo.show_list')); $this->t->pfp('out','_view'); } function edit() { global $cat_id, $new_cat, $values, $submit, $new_parent, $parent, $todo_id, $assigned, $assigned_group; if ($new_parent) { $parent = $new_parent; } if ($new_cat) { $cat_id = $new_cat; } if ($submit) { $values['cat'] = $cat_id; $values['parent'] = $parent; $values['id'] = $todo_id; if (is_array($assigned)) { $values['assigned'] = implode(',',$assigned); if (count($assigned) > 1) { $values['assigned'] = ',' . $values['assigned'] . ','; } } if (is_array($assigned_group)) { $values['assigned_group'] = implode(',',$assigned_group); if (count($assigned_group) > 1) { $values['assigned_group'] = ',' . $values['assigned_group'] . ','; } } $error = $this->botodo->check_values($values); if (is_array($error)) { $this->t->set_var('error',$GLOBALS['phpgw']->common->error_list($error)); } else { $this->botodo->save($values,'edit'); Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=todo.uitodo.show_list&cat_id=' . $cat_id)); $GLOBALS['phpgw_info']['flags']['nodisplay'] = True; exit; } } $GLOBALS['phpgw']->common->phpgw_header(); $this->t->set_file(array('todo_edit' => 'form.tpl')); $this->t->set_block('todo_edit','add','addhandle'); $this->t->set_block('todo_edit','edit','edithandle'); $this->set_app_langs(); $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=todo.uitodo.edit&todo_id=' . $todo_id)); $values = $this->botodo->read($todo_id); if ($values['parent'] != 0) { $this->t->set_var('lang_todo_action',lang('Edit sub project')); } else { $this->t->set_var('lang_todo_action',lang('Edit main project')); } $this->t->set_var('cat_list',$this->cats->formatted_list('select','all',$values['cat'],'True')); $this->t->set_var('todo_list',$this->formatted_todo($values['parent'])); $this->t->set_var('descr',$GLOBALS['phpgw']->strip_html($values['descr'])); $this->t->set_var('title',$GLOBALS['phpgw']->strip_html($values['title'])); $this->t->set_var('pri_list',$this->sbox->getPriority('values[pri]',$values['pri'])); $this->t->set_var('stat_list',$this->sbox->getPercentage('values[status]',$values['status'])); $this->t->set_var('user_list',$this->formatted_user($this->botodo->format_assigned($values['assigned']),'accounts')); $this->t->set_var('group_list',$this->formatted_user($this->botodo->format_assigned($values['assigned_group']),'groups')); if ($values['sdate'] == 0) { $values['sday'] = 0; $values['smonth'] = 0; $values['syear'] = 0; } else { $values['sday'] = date('d',$values['sdate']); $values['smonth'] = date('m',$values['sdate']); $values['syear'] = date('Y',$values['sdate']); } $this->t->set_var('start_select_date',$GLOBALS['phpgw']->common->dateformatorder($this->sbox->getYears('values[syear]',$values['syear']), $this->sbox->getMonthText('values[smonth]',$values['smonth']),$this->sbox->getDays('values[sday]',$values['sday']))); if ($values['edate'] == 0) { $values['eday'] = 0; $values['emonth'] = 0; $values['eyear'] = 0; } else { $values['eday'] = date('d',$values['edate']); $values['emonth'] = date('m',$values['edate']); $values['eyear'] = date('Y',$values['edate']); } $this->t->set_var('end_select_date',$GLOBALS['phpgw']->common->dateformatorder($this->sbox->getYears('values[eyear]',$values['eyear']), $this->sbox->getMonthText('values[emonth]',$values['emonth']),$this->sbox->getDays('values[eday]',$values['eday']))); $this->t->set_var('selfortoday',' '); $this->t->set_var('lang_selfortoday',' '); $this->t->set_var('lang_daysfromstartdate',' '); $this->t->set_var('daysfromstartdate',' '); $this->t->set_var('access_list', ''); if ($this->botodo->check_perms($this->grants[$values['owner']],PHPGW_ACL_DELETE) || $values['owner'] == $GLOBALS['phpgw_info']['user']['account_id']) { $this->t->set_var('delete','
'); } else { $this->t->set_var('delete',' '); } $this->t->set_var('lang_submit',lang('Submit')); $this->t->set_var('edithandle',''); $this->t->set_var('addhandle',''); $this->t->pfp('out','todo_edit'); $this->t->pfp('edithandle','edit'); } function delete() { global $confirm, $todo_id, $subs; if ($confirm) { if ($subs) { $this->botodo->delete($todo_id,True); } else { $this->botodo->delete($todo_id); } Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=todo.uitodo.show_list')); } $GLOBALS['phpgw']->common->phpgw_header(); $this->t->set_file(array('todo_delete' => 'delete.tpl')); $this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=todo.uitodo.delete&todo_id=' . $todo_id)); $exists = $this->botodo->exists($todo_id); if ($exists) { $this->t->set_var('lang_subs',lang('Do you also want to delete all sub projects ?')); $this->t->set_var('subs',''); } else { $this->t->set_var('lang_subs',''); $this->t->set_var('subs', ''); } $this->t->set_var('nolink',$GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.show_list')); $this->t->set_var('deleteheader',lang('Are you sure you want to delete this entry')); $this->t->set_var('lang_no',lang('No')); $this->t->set_var('lang_yes',lang('Yes')); $this->t->pfp('out','todo_delete'); } function matrix() { global $month, $year, $o; $GLOBALS['phpgw']->common->phpgw_header(); $colors = array ( '#CC0033', '#006600', '#00CCFF', '#FF6600', '#0000FF' ); $this->matrix->matrixview($month,$year); $entries = $this->botodo->_list($start,False,$query,$filter,$order,$sort,$cat_id,'mains'); for ($i=0;$i 0 && $entries[$i]['edate_epoch'] > 0) { $startd = date('Y',$entries[$i]['sdate_epoch']) . date('m',$entries[$i]['sdate_epoch']) . date('d',$entries[$i]['sdate_epoch']); $endd = date('Y',$entries[$i]['edate_epoch']) . date('m',$entries[$i]['edate_epoch']) . date('d',$entries[$i]['edate_epoch']); $this->matrix->setPeriod($GLOBALS['phpgw']->strip_html($entries[$i]['title']),$startd,$endd,$colors[$ind]); $subentries = $this->botodo->_list($start,False,$query,$filter,$order,$sort,$cat_id,'subs',$entries[$i]['id']); for ($j=0;$j 0 && $subentries[$j]['edate_epoch'] > 0) { $startd = date('Y',$subentries[$j]['sdate_epoch']) . date('m',$subentries[$j]['sdate_epoch']) . date('d',$subentries[$j]['sdate_epoch']); $endd = date('Y',$subentries[$j]['edate_epoch']) . date('m',$subentries[$j]['edate_epoch']) . date('d',$subentries[$j]['edate_epoch']); $this->matrix->setPeriod($GLOBALS['phpgw']->strip_html($subentries[$j]['title']),$startd,$endd,$colors[$ind]); } } } } $this->matrix->out($GLOBALS['phpgw']->link('/index.php','menuaction=todo.uitodo.matrix')); } } ?> ==================================================== Index: class.sotodo.inc.php * * Bettina Gille [ceb@phpgroupware.org] * * ----------------------------------------------- * * Copyright 2000 - 2003 Free Software Foundation, Inc * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the * * Free Software Foundation; either version 2 of the License, or (at your * * option) any later version. * \*************************************************************************/ /* $Id: class.sotodo.inc.php,v 1.16 2003/12/24 00:39:04 uid65887 Exp $ */ class sotodo { var $db; var $grants; var $historylog; function sotodo() { $this->db = $GLOBALS['phpgw']->db; $this->db2 = $this->db; $this->grants = $GLOBALS['phpgw']->acl->get_grants('todo'); $this->user_groups = $GLOBALS['phpgw']->accounts->membership($this->account); $this->account = $GLOBALS['phpgw_info']['user']['account_id']; $this->historylog = CreateObject('phpgwapi.historylog','todo'); // This is so our transactions follow across classes $this->historylog->db = $this->db; } function type($tree) { switch ($tree) { case 'mains': $s = ' and todo_id_parent=0'; break; case 'subs': $s = ' and todo_id_parent != 0'; break; default: return False; } return $s; } function read_todos($start = 0, $limit = True, $query = '', $filter = '', $order = '', $sort = '', $cat_id = '', $tree = '', $parent = '') { $type = $this->type($tree); if($order) { $ordermethod = 'order by ' . $order . ' ' . $sort; } else { $ordermethod = 'order by todo_id_main, todo_id_parent, todo_level, todo_datecreated asc'; } $filter = strtolower($filter); if(!$filter) { $filter = 'none'; } $filtermethod = '(( todo_owner=' . $this->account . " OR todo_assigned like '%," . $this->account . ",%' OR todo_assigned='" . $this->account . "'"; if(is_array($this->user_groups)) { $groups = $this->user_groups; while (list($null,$group) = each($groups)) { $filtermethod .= " OR assigned_group like '%," . $group['account_id'] . ",%' OR assigned_group='" . $group['account_id'] . "'"; } } $filtermethod .= ')'; if($filter == 'none') { if(is_array($this->grants)) { $grants = $this->grants; while(list($user) = each($grants)) { $public_user_list[] = $user; } reset($public_user_list); $filtermethod .= " OR (todo_access='public' AND todo_owner IN(" . implode(',',$public_user_list) . '))'; } } $filtermethod .= ')'; if($filter == 'private') { $filtermethod .= " AND todo_access='private'"; } if($cat_id) { $filtermethod .= ' AND todo_cat=' . $cat_id; } if($query) { $query = ereg_replace("'",'',$query); $query = ereg_replace('"','',$query); $querymethod = " AND (todo_des LIKE '%$query%' OR todo_title LIKE '%$query%')"; } if($parent) { $parentmethod = ' AND todo_id_parent=' . $parent; } $sql = "SELECT * FROM phpgw_todo WHERE $filtermethod $querymethod $type $parentmethod"; if($limit) { $this->db->limit_query($sql . $ordermethod,$start,__LINE__,__FILE__); } else { $this->db->query($sql . $ordermethod,__LINE__,__FILE__); } $this->total_records = $this->db->num_rows(); while($this->db->next_record()) { $todos[] = array ( 'id' => (int)$this->db->f('todo_id'), 'main' => (int)$this->db->f('todo_id_main'), 'parent' => (int)$this->db->f('todo_id_parent'), 'level' => (int)$this->db->f('todo_level'), 'owner' => $this->db->f('todo_owner'), 'owner_id' => $this->db->f('todo_owner'), 'access' => $this->db->f('todo_access'), 'cat' => (int)$this->db->f('todo_cat'), 'title' => $this->db->f('todo_title'), 'descr' => $this->db->f('todo_des'), 'pri' => (int)$this->db->f('todo_pri'), 'status' => (int)$this->db->f('todo_status'), 'sdate' => $this->db->f('todo_startdate'), 'edate' => $this->db->f('todo_enddate'), 'grants' => (int)$this->grants[$this->db->f('todo_owner')], 'sdate_epoch' => (int)$this->db->f('todo_startdate'), 'edate_epoch' => (int)$this->db->f('todo_enddate'), 'assigned' => $this->db->f('todo_assigned'), 'assigned_group' => $this->db->f('assigned_group') ); } return $todos; } function read_single_todo($todo_id) { $this->db->query('select * from phpgw_todo where todo_id=' . intval($todo_id),__LINE__,__FILE__); if ($this->db->next_record()) { $todo['id'] = $this->db->f('todo_id'); $todo['main'] = $this->db->f('todo_id_main'); $todo['parent'] = $this->db->f('todo_id_parent'); $todo['level'] = $this->db->f('todo_level'); $todo['owner'] = $this->db->f('todo_owner'); $todo['access'] = $this->db->f('todo_access'); $todo['cat'] = $this->db->f('todo_cat'); $todo['title'] = $this->db->f('todo_title'); $todo['descr'] = $this->db->f('todo_des'); $todo['pri'] = $this->db->f('todo_pri'); $todo['status'] = $this->db->f('todo_status'); $todo['sdate'] = $this->db->f('todo_startdate'); $todo['edate'] = $this->db->f('todo_enddate'); $todo['assigned'] = $this->db->f('todo_assigned'); $todo['assigned_group'] = $this->db->f('assigned_group'); } return $todo; } function add_todo($values) { if (floor(phpversion()) == 4) { ob_start(); print_r($values); $contents = ob_get_contents(); ob_end_clean(); } $GLOBALS['phpgw']->log->message(array ( 'text' => 'debug, so add_todo values: %1', 'p1' => $contents, 'line' => __LINE__, 'file' => __FILE__ )); $GLOBALS['phpgw']->log->commit(); $values['parent'] = intval($values['parent']); if ($values['parent'] > 0) { $values['main'] = $this->return_value($values['parent']); $values['level'] = $this->return_value($values['parent'],'level')+1; } $values['title'] = $this->db->db_addslashes($values['title']); $values['descr'] = $this->db->db_addslashes($values['descr']); $this->db->transaction_begin(); $this->db->query('insert into phpgw_todo (todo_id_main,todo_id_parent,todo_level,todo_owner,todo_access,todo_cat,' . 'todo_des,todo_title,todo_pri,todo_status,todo_datecreated,todo_startdate,todo_enddate,todo_assigned,assigned_group) values (' . intval($values['main']) . ',' . $values['parent'] . ',' . intval($values['level']) . ',' . $this->account . ",'" . $values['access'] . "'," . intval($values['cat']) . ",'" . $values['descr'] . "','" . $values['title'] . "'," . intval($values['pri']) . ",'" . $values['status'] . "'," . time() . ',' . intval($values['sdate']) . ',' . intval($values['edate']) . ",'" . $values['assigned'] . "','" . $values['assigned_group'] . "')",__LINE__,__FILE__); $todo_id = $this->db->get_last_insert_id('phpgw_todo','todo_id'); if (!$values['parent'] || $values['parent'] == 0) { $this->db->query('update phpgw_todo set todo_id_main=' . $todo_id . ' where todo_id=' . $todo_id,__LINE__,__FILE__); } $this->historylog->add('A',$todo_id,''); $this->db->transaction_commit(); return $todo_id } function find_subs($list_parents='', $list='') { if ($list_parents == '') { return $list; } $query = "SELECT todo_id FROM phpgw_todo WHERE todo_id_parent IN ($list_parents)"; if ($list <> '') { $query .= " AND todo_id NOT IN ($list)"; } $this->db->query($query,__LINE__,__FILE__); $subs = array(); while ($this->db->next_record()) { $subs[] = $this->db->f('todo_id'); } if (count($subs)) { $list_subs = implode(',', $subs); if ($list <> '') { $list .= ','; } $list = $this->find_subs($list_subs, $list . $list_subs); } return $list; } function delete_todo($todo_id, $sub = False) { $this->db->transaction_begin(); $sub_todos = $this->find_subs($todo_id); if ($sub_todos) { if($sub) { $subdelete = " OR todo_id in ($sub_todos)"; } else { $parent = $this->return_value($todo_id,'parent'); } } $this->db->query('DELETE from phpgw_todo where todo_id=' . intval($todo_id) . $subdelete . " AND ((todo_access='public' " . 'AND todo_owner != ' . $this->owner . ') OR (todo_owner=' . $this->owner . '))',__LINE__,__FILE__); if (!$sub && $sub_todos) { $this->db->query('UPDATE phpgw_todo set todo_id_parent=' . $parent . ' where todo_id_parent=' . $todo_id,__LINE__,__FILE__); $this->db->query("UPDATE phpgw_todo set todo_level=todo_level-1 where todo_id in ($sub_todos)",__LINE__,__FILE__); } $this->historylog->delete($todo_id); $this->db->transaction_commit(); } function edit_todo($values) { $values['parent'] = intval($values['parent']); $values['id'] = intval($values['id']); if($values['parent'] > 0) { $values['main'] = $this->return_value($values['parent']); $values['level'] = $this->return_value($values['parent'],'level')+1; } else { $values['main'] = $values['id']; $values['level'] = 0; } $old_values = $this->read_single_todo($values['id']); $this->db->transaction_begin(); if($old_values['descr'] != $values['descr']) { $this->historylog->add('D',$values['id'],$values['descr']); } if(($old_values['parent'] || $values['parent']) && ($old_values['parent'] != $values['parent'])) { $this->historylog->add('P',$values['id'],$values['parent']); } if($old_values['pri'] != $values['pri']) { $this->historylog->add('U',$values['id'],$values['pri']); } if($old_values['status'] != $values['status']) { $this->historylog->add('s',$values['id'],$values['status']); } if($old_values['access'] != $values['access']) { $this->historylog->add('a',$values['id'],$values['access']); } if(($old_values['sdate'] || $values['sdate']) && ($old_values['sdate'] != $values['sdate'])) { $this->historylog->add('S',$values['id'],$values['sdate']); } if(($old_values['edate'] || $values['edate']) && ($old_values['edate'] != $values['edate'])) { $this->historylog->add('E',$values['id'],$values['edate']); } if($old_values['title'] != $values['title']) { $this->historylog->add('T',$values['id'],$values['title']); } if($old_values['cat'] != $values['cat']) { $this->historylog->add('C',$values['id'],$values['cat']); } $values['title'] = $this->db->db_addslashes($values['title']); $values['descr'] = $this->db->db_addslashes($values['descr']); $this->db->query("update phpgw_todo set todo_des='". $values['descr'] . "', todo_id_parent=" . $values['parent'] . ', todo_pri=' . intval($values['pri']) . ", todo_status='" . $values['status'] . "', todo_id_main=" . intval($values['main']) . ", todo_access='" . $values['access'] . "', todo_level=" . intval($values['level']) . ', todo_startdate=' . intval($values['sdate']) . ', todo_enddate=' . intval($values['edate']) . "', todo_title='" . $values['title'] . "', todo_cat=" . intval($values['cat']) . ", todo_assigned='" . $values['assigned'] . "', assigned_group='" . $values['assigned_group'] . "' where todo_id=" . $values['id'],__LINE__,__FILE__); $this->db->transaction_commit(); } function return_value($todo_id,$action = 'main') { switch($action) { case 'main': $item = ' todo_id_main '; break; case 'level': $item = ' todo_level '; break; } $this->db->query("select $item from phpgw_todo where todo_id=" . intval($todo_id),__LINE__,__FILE__); if($this->db->next_record()) { return $this->db->f(0); } } function exists($todo_id) { $this->db->query('select count(*) from phpgw_todo where todo_id_parent=' . intval($todo_id),__LINE__,__FILE__); $this->db->next_record(); if($this->db->f(0)) { return True; } else { return False; } } } ?> ==================================================== Index: class.botodo.inc.php * * Bettina Gille [ceb@phpgroupware.org] * * ----------------------------------------------- * * Copyright 2000 - 2003 Free Software Foundation, Inc * * * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the * * Free Software Foundation; either version 2 of the License, or (at your * * option) any later version. * \*************************************************************************/ /* $Id: class.botodo.inc.php,v 1.17 2003/12/24 00:39:04 uid65887 Exp $ */ class botodo { var $start; var $query; var $filter; var $order; var $sort; var $cat_id; var $public_functions = array ( 'cached_accounts' => True, '_list' => True, 'check_perms' => True, 'check_values' => True, 'select_todo_list' => True, 'save' => True, '_read' => True, 'delete' => True, 'exists' => True, 'list_methods' => True ); function botodo($session=False) { $this->sotodo = CreateObject('todo.sotodo'); $this->datetime = CreateObject('phpgwapi.datetime'); if ($session) { $this->read_sessiondata(); $this->use_session = True; } $_start = $GLOBALS['HTTP_POST_VARS']['start'] ? $GLOBALS['HTTP_POST_VARS']['start'] : $GLOBALS['HTTP_GET_VARS']['start']; $_query = $GLOBALS['HTTP_POST_VARS']['query'] ? $GLOBALS['HTTP_POST_VARS']['query'] : $GLOBALS['HTTP_GET_VARS']['query']; $_sort = $GLOBALS['HTTP_POST_VARS']['sort'] ? $GLOBALS['HTTP_POST_VARS']['sort'] : $GLOBALS['HTTP_GET_VARS']['sort']; $_order = $GLOBALS['HTTP_POST_VARS']['order'] ? $GLOBALS['HTTP_POST_VARS']['order'] : $GLOBALS['HTTP_GET_VARS']['order']; $_filter = $GLOBALS['HTTP_POST_VARS']['filter'] ? $GLOBALS['HTTP_POST_VARS']['filter'] : $GLOBALS['HTTP_GET_VARS']['filter']; $_cat_id = $GLOBALS['HTTP_POST_VARS']['cat_id'] ? $GLOBALS['HTTP_POST_VARS']['cat_id'] : $GLOBALS['HTTP_GET_VARS']['cat_id']; if(!empty($_start) || ($_start == '0') || ($_start == 0)) { if($this->debug) { echo '
overriding $start: "' . $this->start . '" now "' . $_start . '"'; } $this->start = $_start; } if((empty($_query) && !empty($this->query)) || !empty($_query)) { $this->query = $_query; } if(isset($_cat_id) && !empty($_cat_id)) { $this->cat_id = $_cat_id; } if((isset($GLOBALS['HTTP_POST_VARS']['cat_id']) || isset($GLOBALS['HTTP_GET_VARS']['cat_id'])) && ($_cat_id == '0' || $_cat_id == 0 || $_cat_id == '')) { $this->cat_id = 0; } if(isset($_sort) && !empty($_sort)) { if($this->debug) { echo '
overriding $sort: "' . $this->sort . '" now "' . $_sort . '"'; } $this->sort = $_sort; } if(isset($_order) && !empty($_order)) { if($this->debug) { echo '
overriding $order: "' . $this->order . '" now "' . $_order . '"'; } $this->order = $_order; } if(isset($_filter) && !empty($_filter)) { if($this->debug) { echo '
overriding $filter: "' . $this->filter . '" now "' . $_filter . '"'; } $this->filter = $_filter; } } function list_methods($_type) { if (is_array($_type)) { $_type = $_type['type']; } switch($_type) { case 'xmlrpc': $xml_functions = array( 'list_methods' => array( 'function' => 'list_methods', 'signature' => array(array(xmlrpcStruct,xmlrpcString)), 'docstring' => lang('Read this list of methods.') ), 'list' => array( 'function' => '_list', 'signature' => array(array(xmlrpcStruct,xmlrpcStruct)), 'docstring' => lang('Returns an array of todo items') ), 'save' => array( 'function' => 'save', 'signature' => array(array(xmlrpcBoolean,xmlrpcStruct)), 'docstring' => lang('Adds or edits a todo item') ), 'delete' => array( 'function' => 'delete', 'signature' => array(array(xmlrpcBoolean,xmlrpcInt)), 'docstring' => lang('Deletes a todo item') ), 'total_records' => array( 'function' => 'total_records', 'signature' => array(array(xmlrpcInt)), 'docstring' => lang('Returns a the total number of records in the database, must call list_todos first') ) ); return $xml_functions; break; case 'soap': return $this->soap_functions; break; default: return array(); break; } } function get_grants() { return $this->sotodo->grants; } function save_sessiondata($data) { if ($this->use_session) { $GLOBALS['phpgw']->session->appsession('session_data','todo',$data); } } function read_sessiondata() { $data = $GLOBALS['phpgw']->session->appsession('session_data','todo'); $this->start = $data['start']; $this->query = $data['query']; $this->filter = $data['filter']; $this->order = $data['order']; $this->sort = $data['sort']; $this->cat_id = $data['cat_id']; } function check_perms($has, $needed) { return (!!($has & $needed) == True); } function cached_accounts($account_id) { return $GLOBALS['phpgw']->accounts->get_account_data($account_id); } function employee_list($type) { $employees = $GLOBALS['phpgw']->accounts->get_list($type); return $employees; } function format_assigned($a = '') { if (substr($a,0,1) == ',' && (substr($a,strlen($a-1),1)) == ',') { $a = substr($a,1,strlen($a)-2); } $a = explode(',',$a); return $a; } function list_assigned($assi = '') { if (is_array($assi)) { while (list($null,$a) = each($assi)) { $adata = $this->cached_accounts($a); if ($adata[$a]['type'] == 'u') { $aout .= $GLOBALS['phpgw']->common->display_fullname($adata[$a]['lid'], $adata[$a]['firstname'],$adata[$a]['lastname']) . '
'; } elseif($adata[$a]['type'] == 'g') { $aout .= $adata[$a]['firstname'] . ' ' . lang('Group') . '
'; } } } return $aout; } function _list($start = 0, $limit = '', $query = '', $filter = '', $order = '', $sort = '', $cat_id = 0, $tree = '', $parent = '') { if (is_array($start)) { $params = $start; $start = $params['start']; $limit = $params['limit']; $query = $params['query']; $filter = $params['filter']; $order = $params['order']; $sort = $params['sort']; $cat_id = $params['cat_id']; $tree = $params['tree']; $parent = $params['parent']; } $todos = $this->sotodo->read_todos($start, $limit, $query, $filter, $order, $sort, $cat_id, $tree, $parent); $this->total_records = $this->sotodo->total_records; while (is_array($todos) && list(,$v) = each($todos)) { $sdate = $v['sdate'] - $this->datetime->tz_offset; $v['sdate'] = $GLOBALS['phpgw']->common->show_date($sdate,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']); if ($v['edate'] && $v['edate'] != 0) { $edate = $v['edate'] - $this->datetime->tz_offset; $v['edate'] = $GLOBALS['phpgw']->common->show_date($edate,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']); } if ($v['assigned']) { $v['assigned'] = $this->format_assigned($v['assigned']); } if ($v['assigned_group']) { $v['assigned_group'] = $this->format_assigned($v['assigned_group']); } $adata = $this->cached_accounts($v['owner']); $v['owner'] = $GLOBALS['phpgw']->common->display_fullname($adata[$v['owner']]['lid'], $adata[$v['owner']]['firstname'],$adata[$v['owner']]['lastname']); $r[] = array ( 'id' => (int)$v['id'], 'main' => (int)$v['main'], 'parent' => (int)$v['parent'], 'level' => (int)$v['level'], 'owner' => $v['owner'], 'owner_id' => (int)$v['owner_id'], 'access' => $v['access'], 'cat' => (int)$v['cat'], 'title' => $v['title'], 'descr' => $v['descr'], 'pri' => (int)$v['pri'], 'status' => (int)$v['status'], 'sdate' => $v['sdate'], 'edate' => $v['edate'], 'grants' => (int)$v['grants'], 'sdate_epoch' => (int)$v['sdate_epoch'], 'edate_epoch' => (int)$v['edate_epoch'], 'assigned' => $v['assigned'], 'assigned_group' => $v['assigned_group'] ); } return $r; } function read($todo_id) { $todo = $this->sotodo->read_single_todo($todo_id); return $todo; } function check_values($values) { if (!$values['title']) { $error[] = lang('Please enter a title'); } if (strlen($values['descr']) >= 8000) { $error[] = lang('Description can not exceed 8000 characters in length'); } if ($values['daysfromstart'] && ! ereg('^[0-9]+$',$values[daysfromstart])) { $error[] = lang('You can only enter numbers for days from now'); } if ($values['smonth'] || $values['sday'] || $values['syear']) { if(! $this->datetime->date_valid($values['syear'],$values['smonth'],$values['sday'])) { $error[] = lang('You have entered an starting invalid date'); } } if ($values['emonth'] || $values['eday'] || $values['eyear']) { if(! $this->datetime->date_valid($values['eyear'],$values['emonth'],$values['eday'])) { $error[] = lang('You have entered an ending invalid date'); } } if ($values['edate'] < $values['sdate'] && $values['edate'] && $values['sdate']) { $error[] = lang('Ending date can not be before start date'); } if (($values['smonth'] || $values['sday'] || $values['syear']) && ($values['emonth'] || $values['eday'] || $values['eyear'])) { if($this->datetime->date_compare($values['eyear'],$values['emonth'],$values['eday'],$values['syear'],$values['smonth'],$values['sday']) == -1) { $error[] = lang('Ending date can not be before start date'); } } if (is_array($error)) { return $error; } } function save($values) { if ($values['access']) { $values['access'] = 'private'; } else { $values['access'] = 'public'; } if ($values['seltoday']) { $values['sdate'] = time(); } else { if ($values['smonth'] || $values['sday'] || $values['syear']) { $values['sdate'] = mktime(0,0,0,$values['smonth'], $values['sday'], $values['syear']); } } if (!$values['sdate']) { $values['sdate'] = time(); } if ($values['emonth'] || $values['eday'] || $values['eyear']) { $values['edate'] = mktime(2,0,0,$values['emonth'],$values['eday'],$values['eyear']); } else if ($values['daysfromstart'] > 0) { $values['edate'] = mktime(0,0,0,date('m',$values['sdate']), date('d',$values['sdate'])+$values['daysfromstart'], date('Y',$values['sdate'])); } if ($values['id'] && intval($values['id']) > 0) { $this->sotodo->edit_todo($values); $todo_id = $values['id']; } else { $todo_id = $this->sotodo->add_todo($values); } return $todo_id; } function exists($todo_id) { $exists = $this->sotodo->exists($todo_id); if ($exists) { return True; } else { return False; } } function delete($todo_id, $subs = False) { if (is_array($todo_id)) { $todo_id = $todo_id[0]; } if ($subs) { $this->sotodo->delete_todo($todo_id,True); } else { $this->sotodo->delete_todo($todo_id); } return True; } } ?> From MAILER-DAEMON Wed Apr 27 02:40:13 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DQgDU-0007RN-EP for mharc-phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:40:12 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DQgDS-0007RE-0I for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:40:10 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DQgDR-0007Qw-9G for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:40:09 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DQgDP-00074u-Sy for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:40:08 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DQgBU-0006Yx-Na for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:38:08 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id F3E34312CD for ; Wed, 27 Apr 2005 08:34:00 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 11360-10 for ; Wed, 27 Apr 2005 08:33:59 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 130F3312BE for ; Wed, 27 Apr 2005 08:33:59 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3R6XxU01475; Wed, 27 Apr 2005 08:33:59 +0200 Message-Id: <200504270633.j3R6XxU01475@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: uid65887 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] bookkeeping index.php,1.18 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Wed, 27 Apr 2005 06:40:10 -0000 X-Original-Date: Tue, 23 Dec 2003 17:34:00 +0100 X-List-Received-Date: Wed, 27 Apr 2005 06:40:10 -0000 Update of bookkeeping Modified Files: Branch: MAIN index.php lines: +1 -1 Log Message: update ==================================================== From MAILER-DAEMON Wed Apr 27 02:40:48 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DQgE3-0007cM-K5 for mharc-phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:40:48 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DQgDz-0007Zp-IF for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:40:44 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DQgDy-0007Yp-9R for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:40:42 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DQgDx-00074u-71 for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:40:41 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DQgBO-0006Xk-AN for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:38:02 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id AD0C3312CD for ; Wed, 27 Apr 2005 08:33:44 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 11539-03 for ; Wed, 27 Apr 2005 08:33:42 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id B06AE312BE for ; Wed, 27 Apr 2005 08:33:42 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3R6Xgg01452; Wed, 27 Apr 2005 08:33:42 +0200 Message-Id: <200504270633.j3R6Xgg01452@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: uid65887 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] bookkeeping/templates/default bill_list.tpl, 1.3 header.tpl, 1.3 preferences.tpl, 1.2 config.tpl, 1.3 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Wed, 27 Apr 2005 06:40:45 -0000 X-Original-Date: Tue, 23 Dec 2003 17:34:00 +0100 X-List-Received-Date: Wed, 27 Apr 2005 06:40:45 -0000 Update of bookkeeping/templates/default Modified Files: Branch: MAIN bill_list.tpl lines: +1 -1 header.tpl lines: +1 -1 preferences.tpl lines: +1 -47 config.tpl lines: +7 -6 Log Message: update ==================================================== ==================================================== ==================================================== Index: bookkeeping/templates/default/preferences.tpl diff -u bookkeeping/templates/default/preferences.tpl:1.1 bookkeeping/templates/default/preferences.tpl:1.2 --- bookkeeping/templates/default/preferences.tpl:1.1 Mon Dec 1 16:31:35 2003 +++ bookkeeping/templates/default/preferences.tpl Tue Dec 23 16:34:45 2003 @@ -18,56 +18,10 @@ - -   - {lang_select_tax}:  % - - {lang_bill}: - {bill} - - -   - - - {lang_layout} - - - {lang_select_font}: - - - - {lang_select_mysize}: - - - - {lang_select_allsize}: - - - -   - - - - - - {lang_notifications} - - - {lang_notify_mstone}: - - - - {lang_notify_pro}: - - - - {lang_notify_assign}: - - ==================================================== Index: bookkeeping/templates/default/config.tpl diff -u bookkeeping/templates/default/config.tpl:1.2 bookkeeping/templates/default/config.tpl:1.3 --- bookkeeping/templates/default/config.tpl:1.2 Wed Dec 3 15:04:14 2003 +++ bookkeeping/templates/default/config.tpl Tue Dec 23 16:34:45 2003 @@ -11,13 +11,14 @@ {lang_invoicing} {lang_settings} - {lang_Invoicing_of_work_time}: - + {lang_enable_acl_for_invoicing_part}: + + - + From MAILER-DAEMON Wed Apr 27 02:41:06 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DQgEL-0007eW-Hn for mharc-phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:41:05 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DQgEI-0007eI-80 for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:41:02 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DQgEF-0007dy-9D for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:41:00 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DQgEE-00074u-4m for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:40:58 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DQgGj-0006qG-0o for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:43:33 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id 2145E312EF for ; Wed, 27 Apr 2005 08:39:20 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 11609-09 for ; Wed, 27 Apr 2005 08:39:16 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id F0E26312CD for ; Wed, 27 Apr 2005 08:39:15 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3R6dFI01787; Wed, 27 Apr 2005 08:39:15 +0200 Message-Id: <200504270639.j3R6dFI01787@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: skwashd X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/templates/idots navbar.inc.php, 1.1.2.12 navbar.tpl, 1.1.2.4 head.inc.php, 1.1.2.11 css.tpl, 1.1.2.3 footer.tpl, 1.1.2.2 head.tpl, 1.1.2.3 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Wed, 27 Apr 2005 06:41:03 -0000 X-Original-Date: Thu, 8 Jan 2004 22:55:00 +0100 X-List-Received-Date: Wed, 27 Apr 2005 06:41:03 -0000 Update of phpgwapi/templates/idots Modified Files: Branch: Version-0_9_16-branch navbar.inc.php lines: +27 -19 navbar.tpl lines: +50 -71 head.inc.php lines: +2 -9 css.tpl lines: +0 -3 footer.tpl lines: +12 -10 head.tpl lines: +1 -1 Log Message: html4+css2 compliance ... better than the EGO crud ==================================================== Index: phpgwapi/templates/idots/navbar.inc.php diff -u phpgwapi/templates/idots/navbar.inc.php:1.1.2.11 phpgwapi/templates/idots/navbar.inc.php:1.1.2.12 --- phpgwapi/templates/idots/navbar.inc.php:1.1.2.11 Tue Dec 2 14:41:42 2003 +++ phpgwapi/templates/idots/navbar.inc.php Thu Jan 8 21:55:24 2004 @@ -32,7 +32,7 @@ $var['table_bg_color'] = $GLOBALS['phpgw_info']['theme']['navbar_bg']; $applications = ''; - // == 'icons_and_text') + $items++; foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data) { if ($app != 'home' && $app != 'preferences' && $app != 'about' && $app != 'logout') @@ -42,32 +42,39 @@ $icon = '' . $title .
 					''; - $app_icons .= ''; + $app_icons .= '>' . $icon . "\r\n"; - $app_titles .= ''; + $app_titles .= '>' . $title . "\r\n"; unset($icon); unset($title); + $items++; } } $var['app_icons'] = $app_icons; + $var['td_span'] = ($items / 2); if($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format']!='icons') { $var['app_titles'] = $app_titles; } + else + { + $var['app_titles'] = ' '; + } + if (isset($GLOBALS['phpgw_info']['flags']['app_header'])) { $var['current_app_title'] = $GLOBALS['phpgw_info']['flags']['app_header']; @@ -110,16 +117,16 @@ $menu_title = lang('General Menu'); - $file['Home'] = $GLOBALS['phpgw_info']['navbar']['home']['url']; + $file[] = array('text' => 'Home', + 'url' => $GLOBALS['phpgw_info']['navbar']['home']['url']); if ($GLOBALS['phpgw_info']['user']['apps']['preferences']) { - $file['Preferences'] = $GLOBALS['phpgw_info']['navbar']['preferences']['url'] - . '#' . $GLOBALS['phpgw_info']['flags']['currentapp']; + $file[] = array ('text' => 'Preferences', + 'url' => $GLOBALS['phpgw_info']['navbar']['preferences']['url'] + . '#' . $GLOBALS['phpgw_info']['flags']['currentapp']); } - $file += array( - 'About %1'=>$GLOBALS['phpgw_info']['navbar']['about']['url'], - 'Logout'=>$GLOBALS['phpgw_info']['navbar']['logout']['url'] - ); + $file[] = array ('text' => 'About %1', 'url' => $GLOBALS['phpgw_info']['navbar']['about']['url']); + $file[] = array ('text' => 'Logout', 'url' => $GLOBALS['phpgw_info']['navbar']['logout']['url']); display_sidebox('',$menu_title,$file); @@ -145,30 +152,31 @@ if(!$appname || ($appname==$GLOBALS['phpgw_info']['flags']['currentapp'] && $file)) { - $var['lang_title']=$menu_title;//$appname.' '.lang('Menu'); + $var['lang_title']=$menu_title; $GLOBALS['idots_tpl']->set_var($var); $GLOBALS['idots_tpl']->pfp('out','extra_blocks_header'); - while(list($text,$url) = each($file)) + foreach($file as $null => $item) { - sidebox_menu_item($url,$text); + sidebox_menu_item($item['url'], $item['text'], $item['image']); } $GLOBALS['idots_tpl']->pparse('out','extra_blocks_footer'); } } - function sidebox_menu_item($item_link='',$item_text='') + function sidebox_menu_item($item_link='', $item_text='', $item_image='') { - if($item_text=='_NewLine_') + if($item_text == '_NewLine_') { $GLOBALS['idots_tpl']->pparse('out','extra_block_spacer'); } else { - $var['icon_or_star']='*'; + $var['icon_or_star']= ($item_image ? $item_image : '*'); $var['lang_item']=lang($item_text); $var['item_link']=$item_link; + $GLOBALS['idots_tpl']->set_var($var); $GLOBALS['idots_tpl']->pparse('out','extra_block_row'); } ==================================================== Index: phpgwapi/templates/idots/navbar.tpl diff -u phpgwapi/templates/idots/navbar.tpl:1.1.2.3 phpgwapi/templates/idots/navbar.tpl:1.1.2.4 --- phpgwapi/templates/idots/navbar.tpl:1.1.2.3 Sat May 3 13:34:39 2003 +++ phpgwapi/templates/idots/navbar.tpl Thu Jan 8 21:55:24 2004 @@ -1,87 +1,66 @@ - - - + + +
- - - - - - - - - - -
- - - - - {app_icons} - - - - - - {app_titles} - - -
{user_info}{current_users}
- - - - + +
- - + + + -
- +
+
+
 
+ + + + ==================================================== Index: phpgwapi/templates/idots/head.tpl diff -u phpgwapi/templates/idots/head.tpl:1.1.2.2 phpgwapi/templates/idots/head.tpl:1.1.2.3 --- phpgwapi/templates/idots/head.tpl:1.1.2.2 Fri May 30 02:34:26 2003 +++ phpgwapi/templates/idots/head.tpl Thu Jan 8 21:55:24 2004 @@ -14,5 +14,5 @@ {website_title} {java_script} - + From MAILER-DAEMON Wed Apr 27 02:41:27 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DQgEg-0007hu-TD for mharc-phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:41:27 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DQgEe-0007he-NI for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:41:24 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DQgEd-0007h7-9u for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:41:23 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DQgEc-00074u-V6 for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:41:23 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DQgHC-0006rh-UR for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:44:03 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id EBD11312CD for ; Wed, 27 Apr 2005 08:39:49 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 11679-04 for ; Wed, 27 Apr 2005 08:39:47 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id 76975312BE for ; Wed, 27 Apr 2005 08:39:47 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3R6dlc01804; Wed, 27 Apr 2005 08:39:47 +0200 Message-Id: <200504270639.j3R6dlc01804@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: skwashd X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] phpgwapi/templates/idots/css idots.css,1.1.2.3 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Wed, 27 Apr 2005 06:41:25 -0000 X-Original-Date: Thu, 8 Jan 2004 22:55:00 +0100 X-List-Received-Date: Wed, 27 Apr 2005 06:41:25 -0000 Update of phpgwapi/templates/idots/css Modified Files: Branch: Version-0_9_16-branch idots.css lines: +276 -96 Log Message: html4+css2 compliance ... better than the EGO crud ==================================================== Index: phpgwapi/templates/idots/css/idots.css diff -u phpgwapi/templates/idots/css/idots.css:1.1.2.2 phpgwapi/templates/idots/css/idots.css:1.1.2.3 --- phpgwapi/templates/idots/css/idots.css:1.1.2.2 Fri Apr 18 18:45:28 2003 +++ phpgwapi/templates/idots/css/idots.css Thu Jan 8 21:55:24 2004 @@ -1,160 +1,340 @@ -A:link +/* phpGroupWare Idots Template Style Sheet + (c) Copyright 2003 Free Software Foundation Inc + Originally written by Pim Snel + Currently Maintained by Dave Hall + + $Id$ +*/ + +/* Classes */ +.articlecontent { - COLOR: #006699; - TEXT-DECORATION: none + background-color: #EFEFEF; + color: #006699; + font-size: 12px; + font-family: "Verdana", "Arial", "Helvetica", "sans-serif"; + line-height: 20px; + text-align: center; + padding: 10px; } -A:visited +.articletitle { - COLOR: #006699; - TEXT-DECORATION: none + font-weight: bold; + font-size: 12px; + background-image: url(../images/greypanel.gif); + color: #000000; + text-align: center; + text-indent: 5pt; + background-repeat: repeat-x; + font-family: "Verdana", "Arial", "Helvetica", "sans-serif"; + height: 23px; } -A:hover +.box { - COLOR: #ff9933; TEXT-DECORATION: underline + background-color: #ffffff; + border: 1px solid #98aab1; + border-collapse: collapse; + height: 90%; + margin: 0px; + padding: 0px; + vertical-align: top; + width: 100%; } -A:active +/* not needed afaik - skwashd +.content { - COLOR: #006699; - TEXT-DECORATION: underline -} + color: #000000; + font-family: "Verdana", "Arial", "Helvetica", "sans-serif"; + font-size: 12px; +}*/ -INPUT +.copyright { - FONT-SIZE: 12px; - font-COLOR: #006699; - FONT-FAMILY: "Arial", "Helvetica", "sans-serif" + color: #000000; + font-size: 9px; + text-align: center; } -SELECT +.logo { - FONT-SIZE: 12px; - COLOR: #006699; - FONT-FAMILY: "Arial", "Helvetica", "sans-serif" + background: url("../images/panel.png"); + background-repeat: repeat-x; + margin: 0px; + padding: 0px; + text-align: center; + vertical-align: top; } -BODY +.mainnote { - FONT-SIZE: 12px; - FONT-FAMILY: "Verdana", "Arial", "Helvetica", "sans-serif" + background-color: #FFFFFF; /* */ + color: #006699; + font-family: "Arial", "Helvetica", "sans-serif"; + font-size: 12px; + height: 20px; + vertical-align: top; +} + +.navpanel +{ + background: url("../images/panel.png"); + background-repeat: repeat-x; + background-color: #FFFFFF; + border-collapse:collapse; + height: 60px; + margin: 0px; + padding: 0px; + text-align: center; + vertical-align: top; +} + +.popup +{ + background-color: #FFFFFF; + border-bottom: 2px solid #000000; + border-left: 1px solid #000000; + border-right: 2px solid #999999; + border-top: 1px solid #999999; + border-collapse: collapse; + padding: 0px; + width: 300px; } -FORM +.popuptitle { - FONT-SIZE: 12px; - FONT-FAMILY: "Verdana", "Arial", "Helvetica", "sans-serif" + background-image: url(../images/boxbg.gif); + background-repeat: repeat-x; + color: #000000; + font-family: "Verdana", "Arial", "Helvetica", "sans-serif"; + font-weight: bold; + font-size: 12px; } -TABLE -{ - FONT-SIZE: 12px; - FONT-FAMILY: "Verdana", "Arial", "Helvetica", "sans-serif" +.sidecontent +{ + border:0px; + border-collapse: collapse; + padding:0px; + vertical-align: top; + width: 160px; } .sideboxcontent { - PADDING-RIGHT: 5px; - PADDING-LEFT: 5px; - FONT-SIZE: 12px; - PADDING-BOTTOM: 5px; - WIDTH: 160px; - COLOR: #000000; - LINE-HEIGHT: 20px; - PADDING-TOP: 5px; - FONT-FAMILY: "Verdana", "Arial", "Helvetica", "sans-serif" + background-color: #EFEFEF; + font-family: "Verdana", "Arial", "Helvetica", "sans-serif"; + font-size: 9pt; + /*line-height: 18px;*/ + /*padding: 2px;*/ + width: 160px; } -.mainnote +.sideboxtitle { - FONT-SIZE: 12px; - COLOR: #006699; - FONT-FAMILY: "Arial", "Helvetica", "sans-serif" + background-image: url(../images/boxbg.gif); + background-position: center 50%; + color: #000000; + font-family: "Verdana", "Arial", "Helvetica", "sans-serif"; + font-size: 12px; + font-weight: bold; + height: 26px; + text-align: center; } -.articlecontent +spacer { - PADDING-RIGHT: 10px; - PADDING-LEFT: 10px; - FONT-SIZE: 12px; - PADDING-BOTTOM: 10px; - COLOR: #000000; - LINE-HEIGHT: 20px; - PADDING-TOP: 10px; - FONT-FAMILY: "Verdana", "Arial", "Helvetica", "sans-serif" + border: 0px; + width: 15px; } -.sideboxtext +/* Not used afaik, also a tag name - skwashd +.title { - FONT-SIZE: 12px; - LINE-HEIGHT: 18px; - FONT-FAMILY: "Verdana", "Arial", "Helvetica", "sans-serif" + color: #000000; + font-size: 12px; + font-weight: 12px; + padding: 5px; } +*/ +/* not used afaik - skwashd .toppannel { - BACKGROUND-IMAGE: url(../images/panel.png); - BACKGROUND-REPEAT: repeat-x + background-image: url(../images/panel.png); + background-repeat: repeat-x } +*/ -.copyright +@media screen { - font-size: 9px; - color: #000000; + .sidebox + { + border: 1px solid #98aab1; + border-collapse: collapse; + padding: 0px; + width: 160px; + } } -.title +/* Save some space when printing */ +@media print { - PADDING-LEFT: 5px; - FONT-WEIGHT: bold; - FONT-SIZE: 12px; - COLOR: #000000; - FONT-FAMILY: "Verdana", "Arial", "Helvetica", "sans-serif" + .sidebox + { + display: none; + } + #nav + { + display: none; + } } -.box +/* Tags */ +a, a:visited, a:link { - BORDER-RIGHT: #98aab1 1px solid; - BORDER-TOP: #98aab1 1px solid; - BORDER-LEFT: #98aab1 1px solid; - BORDER-BOTTOM: #98aab1 1px solid + color: #006699; + text-decoration: none; } -.content +a:active, a:hover { - FONT-SIZE: 12px; - COLOR: #000000; - FONT-FAMILY: "Verdana", "Arial", "Helvetica", "sans-serif" + color: #FF9933; + text-decoration: underline; } -.sideboxtitle +body +{ + background-color: #e5e5e5; + font-family: "Verdana", "Arial", "Helvetica", "sans-serif"; + font-size: 10pt; +} + +form +{ + font-family: "Verdana", "Arial", "Helvetica", "sans-serif"; + font-size: 10pt; +} + +img +{ + border: 0px; +} + +/* this should work but doesn't - i will come back to it +td.navpanel > a > img +{ + -moz-opacity: 0.8; mozilla/gecko + filter: alpha(opacity=8); IE 5.5+? + opacity: 0.8; CSS3 +} + +td.navpanel > a > img:hover +{ + -moz-opacity: 1.0; + filter: alpha(opacity=10); + opacity: 1.0; +} +*/ + +input, select, textarea +{ + color: #006699; + background-color: #EFEFEF; + font-family: "Arial", "Helvetica", "sans-serif"; + font-size: 9pt; +} + +input, textarea +{ + -moz-border-radius: 5px; + border: 1px solid #006699; + border-radius: 5px; +} + +input:focus, select:hover, textarea:focus +{ + background-color: #F3F3F3; + color: #1177AA; +} + +.row_on input, .row_on textarea +{ + background-color: #E8F0F0; +} + +.row_off input, .row_off textarea +{ + background-color: #DDDDDD; +} + +span.star +{ + color: #FF9933; + font-weight: bold; +} + +table { - BACKGROUND-POSITION: center 50%; - FONT-WEIGHT: bold; FONT-SIZE: 12px; - BACKGROUND-IMAGE: url(../images/boxbg.gif); - COLOR: #000000; FONT-FAMILY: "Verdana", "Arial", "Helvetica", "sans-serif" } -.sidebox +/* Used by tabs */ +th.activetab { - BORDER-RIGHT: #98aab1 1px solid; - BORDER-TOP: #98aab1 1px solid; - BORDER-LEFT: #98aab1 1px solid; - WIDTH: 160px; - BORDER-BOTTOM: #98aab1 1px solid + -moz-border-radius-topleft: 10px; + -moz-border-radius-topright: 10px; + background-color: #FFFFFF; + border-color: #000000; + border-radius-topleft: 10px; + border-radius-topright: 10px; + border-style: solid; + border-width: 1px 1px 0px 1px; + height: 20px; + padding: 0px 5px 0px 5px; + white-space: nowrap; +} + +th.inactivetab +{ + -moz-border-radius-topleft: 10px; + -moz-border-radius-topright: 10px; + background-color:#CCCCCC; + border: 1px solid #000000; + border-radius-topleft: 10px; + border-radius-topright: 10px; + color:#006699; + height: 20px; + padding: 0px 5px 0px 5px; + white-space: nowrap; +} + +th.tablast +{ + border-width: 0px 0px 1px 0px; + border-style: solid; + border-color: #000000; + width: 100%; } -.articletitle +/* nextmatch values */ +.row_off { - FONT-WEIGHT: bold; - FONT-SIZE: 12px; - BACKGROUND-IMAGE: url(../images/greypanel.gif); - COLOR: #000000; - TEXT-INDENT: 5pt; - BACKGROUND-REPEAT: repeat-x; - FONT-FAMILY: "Verdana", "Arial", "Helvetica", "sans-serif"; - HEIGHT: 20px + background-color: #E8F0F0; + color: #000000; +} + +.row_on +{ + background-color: #DDDDDD; + color: #000000; +} + +.th +{ + background-color: #D3DCE3; + color: #000000; } From MAILER-DAEMON Wed Apr 27 02:41:51 2005 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DQgF4-0007pj-Rn for mharc-phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:41:51 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DQgF2-0007pO-Ff for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:41:48 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DQgEy-0007oF-C2 for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:41:46 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DQgEx-00074u-PP for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:41:43 -0400 Received: from [212.59.36.38] (helo=relaycl.probusiness.de) by monty-python.gnu.org with esmtp (Exim 4.34) id 1DQgAt-0006WG-C1 for phpgroupware-cvs@gnu.org; Wed, 27 Apr 2005 02:37:32 -0400 Received: from localhost (localhost [127.0.0.1]) by relaycl.probusiness.de (Postfix) with ESMTP id A75D1312CD for ; Wed, 27 Apr 2005 08:33:13 +0200 (CEST) Received: from relaycl.probusiness.de ([127.0.0.1]) by localhost (relaycl.probusiness.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 11539-02 for ; Wed, 27 Apr 2005 08:33:07 +0200 (CEST) Received: from pbcvs.probusiness.de (pbcvs.hannover [192.168.102.30]) by relaycl.probusiness.de (Postfix) with ESMTP id D8840312BE for ; Wed, 27 Apr 2005 08:33:07 +0200 (CEST) Received: (from pserver@localhost) by pbcvs.probusiness.de (8.11.6/8.11.6) id j3R6X7M01433; Wed, 27 Apr 2005 08:33:07 +0200 Message-Id: <200504270633.j3R6X7M01433@pbcvs.probusiness.de> To: phpgroupware-cvs@gnu.org From: uid65887 X-Mailer: cvslog.php 1.0 using PHP/4.3.3 X-Virus-Scanned: by amavisd-new at probusiness.de Subject: [Phpgroupware-cvs] bookkeeping/inc class.uibilling.inc.php, 1.3 class.uibookkeeping.inc.php, 1.3 class.sodeliveries.inc.php, 1.2 class.bodeliveries.inc.php, 1.2 class.uideliveries.inc.php, 1.3 class.bobookkeeping.inc.php, 1.3 class.sobilling.inc.php, 1.2 class.bobilling.inc.php, 1.2 X-BeenThere: phpgroupware-cvs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: phpgroupware-cvs@gnu.org List-Id: phpgroupware-cvs.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Wed, 27 Apr 2005 06:41:49 -0000 X-Original-Date: Tue, 23 Dec 2003 17:34:00 +0100 X-List-Received-Date: Wed, 27 Apr 2005 06:41:49 -0000 Update of bookkeeping/inc Modified Files: Branch: MAIN class.uibilling.inc.php lines: +67 -55 class.uibookkeeping.inc.php lines: +2 -2 class.sodeliveries.inc.php lines: +43 -18 class.bodeliveries.inc.php lines: +32 -43 class.uideliveries.inc.php lines: +65 -62 class.bobookkeeping.inc.php lines: +42 -941 class.sobilling.inc.php lines: +49 -18 class.bobilling.inc.php lines: +19 -22 Log Message: update ==================================================== Index: bookkeeping/inc/class.uibilling.inc.php diff -u bookkeeping/inc/class.uibilling.inc.php:1.2 bookkeeping/inc/class.uibilling.inc.php:1.3 --- bookkeeping/inc/class.uibilling.inc.php:1.2 Wed Dec 3 13:20:47 2003 +++ bookkeeping/inc/class.uibilling.inc.php Tue Dec 23 16:34:45 2003 @@ -49,9 +49,9 @@ { $action = get_var('action',array('POST','GET')); - $this->boprojects = CreateObject('projects.boprojects',True, $action); $this->bobilling = CreateObject('bookkeeping.bobilling'); - $this->bodeliveries = CreateObject('bookkeeping.bodeliveries'); + $this->boprojects = $this->bobilling->boprojects; + $this->bobookkeeping = CreateObject('bookkeeping.bobookkeeping',True,$action); $this->nextmatchs = CreateObject('phpgwapi.nextmatchs'); $this->sbox = CreateObject('phpgwapi.sbox'); $this->cats = CreateObject('phpgwapi.categories'); @@ -59,12 +59,12 @@ $this->grants = $GLOBALS['phpgw']->acl->get_grants('projects'); $this->grants[$this->account] = PHPGW_ACL_READ + PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE; - $this->start = $this->boprojects->start; - $this->query = $this->boprojects->query; - $this->filter = $this->boprojects->filter; - $this->order = $this->boprojects->order; - $this->sort = $this->boprojects->sort; - $this->cat_id = $this->boprojects->cat_id; + $this->start = $this->bobookkeeping->start; + $this->query = $this->bobookkeeping->query; + $this->filter = $this->bobookkeeping->filter; + $this->order = $this->bobookkeeping->order; + $this->sort = $this->bobookkeeping->sort; + $this->cat_id = $this->bobookkeeping->cat_id; } function save_sessiondata($action) @@ -78,7 +78,7 @@ 'sort' => $this->sort, 'cat_id' => $this->cat_id ); - $this->boprojects->save_sessiondata($data, $action); + $this->bobookkeeping->save_sessiondata($data, $action); } function set_app_langs() @@ -153,12 +153,36 @@ return $newtax; } + function status_format($status = '', $showarchive = True) + { + if (!$status) + { + $status = $this->status = 'active'; + } + + switch ($status) + { + case 'active': $stat_sel[0]=' selected'; break; + case 'nonactive': $stat_sel[1]=' selected'; break; + case 'archive': $stat_sel[2]=' selected'; break; + } + + $status_list = '' . "\n" + . '' . "\n"; + + if ($showarchive) + { + $status_list .= '' . "\n"; + } + return $status_list; + } + function list_projects() { $action = get_var('action',array('POST','GET')); - $pro_parent = get_var('pro_parent',array('POST','GET')); + $pro_main = get_var('pro_main',array('POST','GET')); - $GLOBALS['phpgw_info']['flags']['app_header'] = lang('projects') . ': ' . ($pro_parent?lang('list jobs'):lang('list projects')); + $GLOBALS['phpgw_info']['flags']['app_header'] = lang('bookkeeping') . ' - ' . lang('projects') . ': ' . ($pro_parent?lang('list jobs'):lang('list projects')); $this->display_app_header(); $GLOBALS['phpgw']->template->set_file(array('projects_list_t' => 'bill_list.tpl')); @@ -172,26 +196,16 @@ $link_data = array ( 'menuaction' => 'bookkeeping.uibilling.list_projects', - 'pro_parent' => $pro_parent, + 'pro_main' => $pro_main, 'action' => $action ); - if (!$this->start) - { - $this->start = 0; - } - if (!$action) { $action = 'mains'; } - if (!$pro_parent) - { - $pro_parent = 0; - } - - $pro = $this->boprojects->list_projects($this->start,True,$this->query,$this->filter,$this->sort,$this->order,'active',$this->cat_id,$action,$pro_parent); + $pro = $this->boprojects->list_projects(array('type' => $action,'parent' => $pro_main)); // --------------------- nextmatch variable template-declarations ------------------------ @@ -213,22 +227,19 @@ else { $action_list= '
' . "\n" - . ''; + . ''; } - $GLOBALS['filter'] = $this->filter; - $GLOBALS['query'] = $this->query; - $GLOBALS['phpgw']->template->set_var('action_list',$action_list); - $GLOBALS['phpgw']->template->set_var('filter_action',$GLOBALS['phpgw']->link('/index.php',$link_data)); + $GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data)); $GLOBALS['phpgw']->template->set_var('filter_list',$this->nextmatchs->new_filter($this->filter)); - $GLOBALS['phpgw']->template->set_var('search_action',$GLOBALS['phpgw']->link('/index.php',$link_data)); $GLOBALS['phpgw']->template->set_var('search_list',$this->nextmatchs->search(array('query' => $this->query))); + $GLOBALS['phpgw']->template->set_var('status_list',$this->status_format($this->status)); // ---------------- list header variable template-declarations -------------------------- - $GLOBALS['phpgw']->template->set_var(sort_number,$this->nextmatchs->show_sort_order($this->sort,'num',$this->order,'/index.php',lang('Project ID'),$link_data)); + $GLOBALS['phpgw']->template->set_var('sort_number',$this->nextmatchs->show_sort_order($this->sort,'num',$this->order,'/index.php',lang('Project ID'),$link_data)); if ($action == 'mains') { @@ -298,14 +309,13 @@ $GLOBALS['phpgw']->template->set_var('part',$GLOBALS['phpgw']->link('/index.php',$link_data)); $GLOBALS['phpgw']->template->set_var('lang_part',lang('Invoice')); - $link_data['menuaction'] = 'bookkeeping.uibilling.list_invoices'; - $link_data['action'] = 'bill'; + $link_data['menuaction'] = 'bookkeeping.uibilling.list_invoices'; $GLOBALS['phpgw']->template->set_var('partlist',$GLOBALS['phpgw']->link('/index.php',$link_data)); $GLOBALS['phpgw']->template->set_var('lang_partlist',lang('Invoice list')); if ($action == 'mains') { - $action_entry = '' . lang('Jobs') . '' . "\n"; $GLOBALS['phpgw']->template->set_var('action_entry',$action_entry); @@ -321,8 +331,10 @@ // ------------------------- end record declaration ------------------------ $GLOBALS['phpgw']->template->set_var('lang_all_partlist',lang('All invoices')); - $GLOBALS['phpgw']->template->set_var('all_partlist',$GLOBALS['phpgw']->link('/index.php','menuaction=bookkeeping.uibilling.list_invoices&action=bill' - . '&project_id=')); + + $link_data['project_id'] = ''; + $link_data['menuaction'] = 'bookkeeping.uibilling.list_invoices'; + $GLOBALS['phpgw']->template->set_var('all_partlist',$GLOBALS['phpgw']->link('/index.php',$link_data)); $GLOBALS['phpgw']->template->set_var('lang_all_part2list',''); $GLOBALS['phpgw']->template->set_var('all_part2list',''); @@ -334,7 +346,9 @@ { $action = get_var('action',array('POST','GET')); $project_id = get_var('project_id',array('POST','GET')); + $pro_main = get_var('pro_main',array('POST','GET')); + $GLOBALS['phpgw_info']['flags']['app_header'] = lang('bookkeeping') . ' - ' . lang('projects') . ': ' . lang('list invoices'); $this->display_app_header(); $GLOBALS['phpgw']->template->set_file(array('projects_list_t' => 'bill_listinvoice.tpl')); @@ -343,17 +357,18 @@ $link_data = array ( 'menuaction' => 'projects.uibilling.list_invoices', - 'action' => $action + 'action' => $action, + 'pro_main' => $pro_main ); - $nopref = $this->boprojects->check_prefs(); + $nopref = $this->bobookkeeping->check_prefs(); if (is_array($nopref)) { $GLOBALS['phpgw']->template->set_var('pref_message',$GLOBALS['phpgw']->common->error_list($nopref)); } else { - $prefs = $this->boprojects->get_prefs(); + $prefs = $this->bobookkeeping->get_prefs(); } if (!$this->start) @@ -361,8 +376,6 @@ $this->start = 0; } - $GLOBALS['phpgw_info']['flags']['app_header'] = lang('projects') . ': ' . lang('list invoices'); - $GLOBALS['phpgw']->template->set_var('search_action',$GLOBALS['phpgw']->link('/index.php',$link_data)); $GLOBALS['phpgw']->template->set_var('search_list',$this->nextmatchs->search(array('query' => $this->query))); @@ -470,19 +483,20 @@ Header('Location: ' . $referer); } + $GLOBALS['phpgw_info']['flags']['app_header'] = lang('bookkeeping') . ' - ' . lang('projects') . ': ' . lang('create invoice'); $this->display_app_header(); $GLOBALS['phpgw']->template->set_file(array('hours_list_t' => 'bill_listhours.tpl')); $GLOBALS['phpgw']->template->set_block('hours_list_t','hours_list','list'); - $nopref = $this->boprojects->check_prefs(); + $nopref = $this->bobookkeeping->check_prefs(); if (is_array($nopref)) { $GLOBALS['phpgw']->template->set_var('pref_message',$GLOBALS['phpgw']->common->error_list($nopref)); } else { - $prefs = $this->boprojects->get_prefs(); + $prefs = $this->bobookkeeping->get_prefs(); } if ($Invoice) @@ -521,8 +535,6 @@ 'invoice_id' => $invoice_id ); - $GLOBALS['phpgw_info']['flags']['app_header'] = lang('projects') . ': ' . lang('create invoice'); - $GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data)); $GLOBALS['phpgw']->template->set_var('currency',$prefs['currency']); @@ -537,7 +549,7 @@ if (!$pro['customer']) { - $GLOBALS['phpgw']->template->set_var('customer',lang('You have no customer selected !')); + $GLOBALS['phpgw']->template->set_var('customer',lang('You have no customer selected')); } else { @@ -550,11 +562,11 @@ if (!$invoice_id) { - $GLOBALS['phpgw']->template->set_var('lang_choose',lang('Generate Invoice ID ?')); + $GLOBALS['phpgw']->template->set_var('lang_choose',lang('Generate Invoice ID')); $GLOBALS['phpgw']->template->set_var('choose',''); $GLOBALS['phpgw']->template->set_var('print_invoice',$GLOBALS['phpgw']->link('/index.php','menuaction=bookkeeping.uibilling.fail')); $GLOBALS['phpgw']->template->set_var('invoice_num',$values['invoice_num']); - $hours = $this->bobilling->read_hours($project_id, $action); + $hours = $this->bobilling->read_hours($project_id, $action, $this->bobookkeeping->status); } else { @@ -564,7 +576,7 @@ . '&invoice_id=' . $invoice_id)); $bill = $this->bobilling->read_single_invoice($invoice_id); $GLOBALS['phpgw']->template->set_var('invoice_num',$bill['invoice_num']); - $hours = $this->bobilling->read_invoice_hours($project_id, $invoice_id, $action); + $hours = $this->bobilling->read_invoice_hours($project_id, $invoice_id, $action, $this->bobookkeeping->status); } if ($bill['date']) @@ -764,7 +776,7 @@ function fail() { - echo '

' . lang('You have to CREATE a delivery or invoice first !'); + echo '

' . lang('You have to CREATE a delivery or invoice first'); echo '
'; $GLOBALS['phpgw']->common->phpgw_exit(); } @@ -787,8 +799,8 @@ { $prefs = $this->boprojects->get_prefs(); $GLOBALS['phpgw']->template->set_var('currency',$prefs['currency']); - $GLOBALS['phpgw']->template->set_var('myaddress',$this->bodeliveries->get_address_data('line',$prefs['abid'],$prefs['ifont'],$prefs['mysize'])); - $GLOBALS['phpgw']->template->set_var('fulladdress',$this->bodeliveries->get_address_data('full',$prefs['abid'],$prefs['ifont'],$prefs['mysize'])); + $GLOBALS['phpgw']->template->set_var('myaddress',$this->bobookkeeping->get_address_data('line',$prefs['abid'],$prefs['ifont'],$prefs['mysize'])); + $GLOBALS['phpgw']->template->set_var('fulladdress',$this->bobookkeeping->get_address_data('full',$prefs['abid'],$prefs['ifont'],$prefs['mysize'])); } $GLOBALS['phpgw']->template->set_var('site_title',$GLOBALS['phpgw_info']['site_title']); @@ -803,7 +815,7 @@ if ($prefs) { - $GLOBALS['phpgw']->template->set_var('customer',$this->bodeliveries->get_address_data('address',$bill['customer'],$prefs['ifont'],$prefs['allsize'])); + $GLOBALS['phpgw']->template->set_var('customer',$this->bobookkeeping->get_address_data('address',$bill['customer'],$prefs['ifont'],$prefs['allsize'])); } $bill['date'] = $bill['date'] + (60*60) * $GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset']; ==================================================== ==================================================== Index: bookkeeping/inc/class.sodeliveries.inc.php diff -u bookkeeping/inc/class.sodeliveries.inc.php:1.1 bookkeeping/inc/class.sodeliveries.inc.php:1.2 --- bookkeeping/inc/class.sodeliveries.inc.php:1.1 Mon Dec 1 16:31:33 2003 +++ bookkeeping/inc/class.sodeliveries.inc.php Tue Dec 23 16:34:45 2003 @@ -1,10 +1,10 @@ db = $GLOBALS['phpgw']->db; $this->db2 = $this->db; $this->account = $GLOBALS['phpgw_info']['user']['account_id']; + $this->soprojects = CreateObject('projects.soprojects'); } function return_join() @@ -89,21 +90,44 @@ } } - function read_hours($project_id, $action) + function parent_search($values) { - $project_id = intval($project_id); + $project_id = intval($values['project_id']); + $action = isset($values['action'])?$values['action']:'mains'; + $table = isset($values['table'])?$values['table']:'hours'; + $status = isset($values['status'])?$values['status']:'active'; - $ordermethod = ' order by end_date asc'; + switch($action) + { + case 'mains': $type = 'mainandsubs'; break; + case 'subs': $type = 'subs'; break; + } + $pro_array = $this->soprojects->read_projects(array('type' => $type,'limit' => False,'main' => $project_id,'parent' => $project_id,'column' => 'id', 'status' => $status)); - if ($action == 'mains') + if(is_array($pro_array)) { - $parent_hours = ' OR phpgw_p_hours.pro_parent=' . $project_id; + switch($table) + { + case 'del': $parent_search = ' OR phpgw_p_delivery.project_id in(' . implode(',',$pro_array) . ')'; break; + default: $parent_search = ' OR phpgw_p_hours.project_id in(' . implode(',',$pro_array) . ')'; break; + } + return $parent_search; } + return False; + } + + function read_hours($project_id, $action, $status) + { + $project_id = intval($project_id); + + $ordermethod = ' order by end_date asc'; + + $parent_search = $this->parent_search(array('project_id' => $project_id,'action' => $action,'status' => $status)); $this->db->query('SELECT phpgw_p_hours.id as id,phpgw_p_hours.hours_descr,phpgw_p_activities.descr,phpgw_p_hours.status,' . 'phpgw_p_hours.start_date,phpgw_p_hours.minutes,phpgw_p_hours.minperae FROM phpgw_p_hours' . $this->return_join() . "phpgw_p_activities ON phpgw_p_hours.activity_id=phpgw_p_activities.id WHERE (phpgw_p_hours.dstatus='o' " - . "AND phpgw_p_hours.status != 'open') AND (phpgw_p_hours.project_id=" . $project_id . $parent_hours + . "AND phpgw_p_hours.status != 'open') AND (phpgw_p_hours.project_id=" . $project_id . $parent_search . ')' . $ordermethod,__LINE__,__FILE__); while ($this->db->next_record()) @@ -123,17 +147,14 @@ return $hours; } - function read_delivery_hours($project_id, $delivery_id, $action) + function read_delivery_hours($project_id, $delivery_id, $action, $status) { $project_id = intval($project_id); $delivery_id = intval($delivery_id); $ordermethod = ' order by end_date asc'; - if ($action == 'mains' || $action == 'amains') - { - $parent_search = ' OR phpgw_p_hours.pro_parent=' . $project_id; - } + $parent_search = $this->parent_search(array('project_id' => $project_id,'action' => $action, 'status' => $status)); $this->db->query('SELECT phpgw_p_hours.id as id,phpgw_p_hours.hours_descr,phpgw_p_activities.descr,phpgw_p_hours.status,' . 'phpgw_p_hours.start_date,phpgw_p_hours.minutes,phpgw_p_hours.minperae FROM phpgw_p_hours' . $this->return_join() @@ -168,6 +189,8 @@ $owner = ($values['owner'] == 'yes'?True:False); $limit = (isset($values['limit'])?$values['limit']:True); $start = intval($values['start']); + $status = isset($values['status'])?$values['status']:'active'; + $action = isset($values['action'])?$values['action']:'mains'; if ($order) { @@ -188,11 +211,13 @@ $acl_select = ' AND phpgw_p_delivery.owner=' . $this->account; } - if ($project_id) + if ($project_id > 0) { + $parent_search = $this->parent_search(array('project_id' => $project_id,'action' => $action, 'status' => $status,'table' => 'del')); + $sql = 'SELECT phpgw_p_delivery.id as id,d_number,title,d_date,phpgw_p_delivery.project_id,phpgw_p_delivery.customer ' - . 'FROM phpgw_p_delivery,phpgw_p_projects WHERE phpgw_p_delivery.project_id=' . $project_id - . ' AND phpgw_p_delivery.project_id=phpgw_p_projects.id'; + . 'FROM phpgw_p_delivery,phpgw_p_projects WHERE (phpgw_p_delivery.project_id=' . $project_id . $parent_search + . ') AND phpgw_p_delivery.project_id=phpgw_p_projects.id'; } else { ==================================================== Index: bookkeeping/inc/class.bodeliveries.inc.php diff -u bookkeeping/inc/class.bodeliveries.inc.php:1.1 bookkeeping/inc/class.bodeliveries.inc.php:1.2 --- bookkeeping/inc/class.bodeliveries.inc.php:1.1 Mon Dec 1 16:31:33 2003 +++ bookkeeping/inc/class.bodeliveries.inc.php Tue Dec 23 16:34:45 2003 @@ -1,10 +1,10 @@ True, 'update_delivery' => True, 'read_deliveries' => True, - 'get_address_data' => True, 'read_delivery_pos' => True ); function bodeliveries() { - $this->sodeliveries = CreateObject('projects.sodeliveries'); - $this->soprojects = CreateObject('projects.soprojects'); - $this->contacts = CreateObject('phpgwapi.contacts'); - $this->boprojects = CreateObject('projects.boprojects'); + $action = get_var('action',array('POST','GET')); + + $this->sodeliveries = CreateObject('bookkeeping.sodeliveries'); + $this->soprojects = $this->sodeliveries->soprojects; + $this->boprojects = CreateObject('projects.boprojects'); + $this->bobookkeeping = CreateObject('bookkeeping.bobookkeeping',True,$action); } - function read_hours($project_id, $action) + function read_hours($project_id, $action, $status) { - $hours = $this->sodeliveries->read_hours($project_id, $action); + $hours = $this->sodeliveries->read_hours($project_id, $action, $status); return $hours; } - function read_delivery_hours($project_id, $delivery_id, $action) + function read_delivery_hours($project_id, $delivery_id, $action, $status) { - $hours = $this->sodeliveries->read_delivery_hours($project_id, $delivery_id, $action); + $hours = $this->sodeliveries->read_delivery_hours($project_id, $delivery_id, $action, $status); return $hours; } @@ -67,16 +68,21 @@ return $hours; } - function get_site_config() + function read_deliveries($values) { - return $this->boprojects->get_site_config(); - } + if(substr($values['action'],-5) == 'mains') + { + $action = 'mains'; + } + elseif(substr($values['action'],-4) == 'subs') + { + $action = 'subs'; + } - function read_deliveries($start, $query, $sort, $order, $limit, $project_id) - { - $co = $this->get_site_config(); - $del = $this->sodeliveries->read_deliveries(array('start' => $start,'query' => $query,'sort' => $sort,'order' => $order,'limit' => $limit, - 'project_id' => $project_id,'owner' => $co['invoice_acl'])); + $co = $this->bobookkeeping->get_site_config(); + $del = $this->sodeliveries->read_deliveries(array('start' => $values['start'],'query' => $values['query'],'sort' => $values['sort'], + 'order' => $values['order'],'project_id' => $values['project_id'],'owner' => $co['invoice_acl'], + 'status' => $values['status'],'action' => $action)); $this->total_records = $this->sodeliveries->total_records; return $del; } @@ -87,54 +93,37 @@ return $del; } - function get_address_data($format, $abid, $afont, $asize) - { - if ($format == 'address') - { - $address = $this->contacts->formatted_address($abid,True,$afont,$asize); - } - elseif ($format == 'line') - { - $address = $this->contacts->formatted_address_line($abid,True,$afont,$asize); - } - else - { - $address = $this->contacts->formatted_address_full($abid,True,$afont,$asize); - } - return $address; - } - function check_values($values,$select) { if (!$values['choose']) { if (!$values['delivery_num']) { - $error[] = lang('Please enter an ID !'); + $error[] = lang('Please enter an ID'); } else { $num = $this->sodeliveries->exists($values); if ($num) { - $error[] = lang('That ID has been used already !'); + $error[] = lang('That ID has been used already'); } } } if (! is_array($select)) { - $error[] = lang('The delivery note contains no items !'); + $error[] = lang('The delivery note contains no items'); } if (! $values['customer']) { - $error[] = lang('You have no customer selected !'); + $error[] = lang('You have no customer selected'); } if (! checkdate($values['month'],$values['day'],$values['year'])) { - $error[] = lang('You have entered an invalid date !'); + $error[] = lang('You have entered an invalid date'); } if (is_array($error)) ==================================================== Index: bookkeeping/inc/class.uideliveries.inc.php diff -u bookkeeping/inc/class.uideliveries.inc.php:1.2 bookkeeping/inc/class.uideliveries.inc.php:1.3 --- bookkeeping/inc/class.uideliveries.inc.php:1.2 Wed Dec 3 13:20:47 2003 +++ bookkeeping/inc/class.uideliveries.inc.php Tue Dec 23 16:34:45 2003 @@ -49,9 +49,9 @@ { $action = get_var('action',array('POST','GET')); - $this->boprojects = CreateObject('projects.boprojects',True, $action); $this->bodeliveries = CreateObject('bookkeeping.bodeliveries'); - $this->bobookkeeping = CreateObject('bookkeeping.bobookkeeping'); + $this->boprojects = $this->bodeliveries->boprojects; + $this->bobookkeeping = CreateObject('bookkeeping.bobookkeeping',True,$action); $this->nextmatchs = CreateObject('phpgwapi.nextmatchs'); $this->sbox = CreateObject('phpgwapi.sbox'); $this->cats = CreateObject('phpgwapi.categories'); @@ -59,13 +59,13 @@ $this->grants = $GLOBALS['phpgw']->acl->get_grants('projects'); $this->grants[$this->account] = PHPGW_ACL_READ + PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE; - $this->start = $this->boprojects->start; - $this->query = $this->boprojects->query; - $this->filter = $this->boprojects->filter; - $this->order = $this->boprojects->order; - $this->sort = $this->boprojects->sort; - $this->cat_id = $this->boprojects->cat_id; - $this->status = $this->boprojects->status; + $this->start = $this->bobookkeeping->start; + $this->query = $this->bobookkeeping->query; + $this->filter = $this->bobookkeeping->filter; + $this->order = $this->bobookkeeping->order; + $this->sort = $this->bobookkeeping->sort; + $this->cat_id = $this->bobookkeeping->cat_id; + $this->status = $this->bobookkeeping->status; } function save_sessiondata($action) @@ -80,7 +80,7 @@ 'cat_id' => $this->cat_id, 'status' => $this->status ); - $this->boprojects->save_sessiondata($data, $action); + $this->bobookkeeping->save_sessiondata($data, $action); } function set_app_langs() @@ -168,9 +168,9 @@ function list_projects() { $action = get_var('action',array('POST','GET')); - $pro_parent = get_var('pro_parent',array('POST','GET')); + $pro_main = get_var('pro_main',array('POST','GET')); - $GLOBALS['phpgw_info']['flags']['app_header'] = lang('projects') . ': ' . ($pro_parent?lang('list jobs'):lang('list projects')); + $GLOBALS['phpgw_info']['flags']['app_header'] = lang('bookkeeping') . ' - ' . lang('projects') . ': ' . ($pro_main?lang('list jobs'):lang('list projects')); $this->display_app_header(); $GLOBALS['phpgw']->template->set_file(array('projects_list_t' => 'bill_list.tpl')); @@ -184,7 +184,7 @@ $link_data = array ( 'menuaction' => 'bookkeeping.uideliveries.list_projects', - 'pro_parent' => $pro_parent, + 'pro_main' => $pro_main, 'action' => $action, 'cat_id' => $this->cat_id ); @@ -194,12 +194,7 @@ $this->start = 0; } - if (!$pro_parent) - { - $pro_parent = 0; - } - - $pro = $this->boprojects->list_projects(array('type' => $action,'parent' => $pro_parent)); + $pro = $this->boprojects->list_projects(array('type' => $action,'parent' => $pro_main)); // --------------------- nextmatch variable template-declarations ------------------------ @@ -216,18 +211,15 @@ { $action_list = ''; - $GLOBALS['phpgw']->template->set_var(lang_header,lang('Project list')); + $GLOBALS['phpgw']->template->set_var('lang_header',lang('Project list')); } else { - $action_list = ''; + $action_list = ''; $GLOBALS['phpgw']->template->set_var('lang_header',lang('Job list')); } - $GLOBALS['filter'] = $this->filter; - $GLOBALS['query'] = $this->query; - $GLOBALS['phpgw']->template->set_var('action_list',$action_list); $GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data)); $GLOBALS['phpgw']->template->set_var('filter_list',$this->nextmatchs->new_filter($this->filter)); @@ -236,17 +228,17 @@ // ---------------- list header variable template-declarations -------------------------- - $GLOBALS['phpgw']->template->set_var(sort_number,$this->nextmatchs->show_sort_order($this->sort,'num',$this->order,'/index.php',lang('Project ID'),$link_data)); + $GLOBALS['phpgw']->template->set_var('sort_number',$this->nextmatchs->show_sort_order($this->sort,'num',$this->order,'/index.php',lang('Project ID'),$link_data)); if ($action == 'mains') { - $GLOBALS['phpgw']->template->set_var(sort_action,$this->nextmatchs->show_sort_order($this->sort,'customer',$this->order,'/index.php',lang('Customer'),$link_data)); + $GLOBALS['phpgw']->template->set_var('sort_action',$this->nextmatchs->show_sort_order($this->sort,'customer',$this->order,'/index.php',lang('Customer'),$link_data)); $lang_action = '' . lang('Jobs') . '' . "\n"; $GLOBALS['phpgw']->template->set_var('lang_action',$lang_action); } else { - $GLOBALS['phpgw']->template->set_var(sort_action,$this->nextmatchs->show_sort_order($this->sort,'start_date',$this->order,'/index.php',lang('Start date'),$link_data)); + $GLOBALS['phpgw']->template->set_var('sort_action',$this->nextmatchs->show_sort_order($this->sort,'start_date',$this->order,'/index.php',lang('Start date'),$link_data)); $GLOBALS['phpgw']->template->set_var('lang_action',''); } @@ -301,20 +293,20 @@ )); $link_data['project_id'] = $pro[$i]['project_id']; - $link_data['menuaction'] = 'projects.uideliveries.delivery'; + $link_data['menuaction'] = 'bookkeeping.uideliveries.delivery'; $GLOBALS['phpgw']->template->set_var('part',$GLOBALS['phpgw']->link('/index.php',$link_data)); $GLOBALS['phpgw']->template->set_var('lang_part',lang('Delivery')); - $link_data['menuaction'] = 'projects.uideliveries.list_deliveries'; - $link_data['action'] = 'del'; + $link_data['menuaction'] = 'bookkeeping.uideliveries.list_deliveries'; + $GLOBALS['phpgw']->template->set_var('partlist',$GLOBALS['phpgw']->link('/index.php',$link_data)); $GLOBALS['phpgw']->template->set_var('lang_partlist',lang('Delivery list')); - + if ($action == 'mains') { $action_entry = '' . lang('Jobs') + . '&pro_main=' . $pro[$i]['project_id'] . '&action=subs') . '">' . lang('Jobs') . '' . "\n"; $GLOBALS['phpgw']->template->set_var('action_entry',$action_entry); } @@ -328,10 +320,13 @@ // ------------------------- end record declaration ------------------------ - $GLOBALS['phpgw']->template->set_var('lang_all_partlist',lang('All delivery notes')); - $GLOBALS['phpgw']->template->set_var('all_partlist',$GLOBALS['phpgw']->link('/index.php','menuaction=bookkeeping.uideliveries.list_deliveries&action=del' - . '&project_id=')); - + if($action == 'mains') + { + $link_data['project_id'] = ''; + $link_data['menuaction'] = 'bookkeeping.uideliveries.list_deliveries'; + $GLOBALS['phpgw']->template->set_var('all_partlist',$GLOBALS['phpgw']->link('/index.php',$link_data)); + $GLOBALS['phpgw']->template->set_var('lang_all_partlist',lang('All delivery notes')); + } $GLOBALS['phpgw']->template->set_var('lang_all_part2list',''); $GLOBALS['phpgw']->template->set_var('all_part2list',''); @@ -361,14 +356,14 @@ Header('Location: ' . $referer); } - $nopref = $this->boprojects->check_prefs(); + $nopref = $this->bobookkeeping->check_prefs(); if (is_array($nopref)) { $GLOBALS['phpgw']->template->set_var('pref_message',$GLOBALS['phpgw']->common->error_list($nopref)); } else { - $prefs = $this->boprojects->get_prefs(); + $prefs = $this->bobookkeeping->get_prefs(); } if ($Delivery) @@ -409,6 +404,8 @@ 'delivery_id' => $delivery_id ); + $GLOBALS['phpgw_info']['flags']['app_header'] = lang('bookkeeping') . ' - ' . lang('projects') . ': ' . lang('create delivery'); + $this->display_app_header(); $GLOBALS['phpgw']->template->set_file(array('hours_list_t' => 'del_listhours.tpl')); @@ -429,7 +426,7 @@ if (!$pro['customer']) { - $GLOBALS['phpgw']->template->set_var('customer',lang('You have no customer selected !')); + $GLOBALS['phpgw']->template->set_var('customer',lang('You have no customer selected')); } else { @@ -441,11 +438,11 @@ if(!$delivery_id) { - $GLOBALS['phpgw']->template->set_var('lang_choose',lang('Generate Delivery ID ?')); + $GLOBALS['phpgw']->template->set_var('lang_choose',lang('Generate Delivery ID')); $GLOBALS['phpgw']->template->set_var('choose',''); $GLOBALS['phpgw']->template->set_var('print_delivery',$GLOBALS['phpgw']->link('/index.php','menuaction=bookkeeping.uideliveries.fail')); $GLOBALS['phpgw']->template->set_var('delivery_num',$values['delivery_num']); - $hours = $this->bodeliveries->read_hours($project_id, $action); + $hours = $this->bodeliveries->read_hours($project_id, $action, $this->boprojects->status); } else { @@ -455,7 +452,7 @@ . '&delivery_id=' . $delivery_id)); $del = $this->bodeliveries->read_single_delivery($delivery_id); $GLOBALS['phpgw']->template->set_var('delivery_num',$del['delivery_num']); - $hours = $this->bodeliveries->read_delivery_hours($project_id, $delivery_id, $action); + $hours = $this->bodeliveries->read_delivery_hours($project_id, $delivery_id, $action, $this->boprojects->status); } if ($del['date']) @@ -624,7 +621,7 @@ } } - $GLOBALS['phpgw']->template->set_var(sum_aes,$sumaes); + $GLOBALS['phpgw']->template->set_var('sum_aes',$sumaes); if (! $delivery_id) { @@ -647,35 +644,41 @@ { $action = get_var('action',array('POST','GET')); $project_id = get_var('project_id',array('POST','GET')); + $pro_main = get_var('pro_main',array('POST','GET')); + $GLOBALS['phpgw_info']['flags']['app_header'] = lang('bookkeeping') . ' - ' . lang('projects') . ': ' . lang('list deliveries'); $this->display_app_header(); $GLOBALS['phpgw']->template->set_file(array('projects_list_t' => 'bill_listinvoice.tpl')); $GLOBALS['phpgw']->template->set_block('projects_list_t','projects_list','list'); + if(substr($action,-5) == 'mains') + { + $action = 'del_mains'; + } + elseif(substr($action,-4) == 'subs') + { + $action = 'del_subs'; + } + $link_data = array ( 'menuaction' => 'bookkeeping.uideliveries.list_deliveries', 'action' => $action, - 'project_id' => $project_id + 'project_id' => $project_id, + 'pro_main' => $pro_main ); - $GLOBALS['phpgw_info']['flags']['app_header'] = lang('projects') . ': ' . lang('list deliveries'); - $GLOBALS['phpgw']->template->set_var('search_action',$GLOBALS['phpgw']->link('/index.php',$link_data)); - $GLOBALS['phpgw']->template->set_var('search_list',$this->nextmatchs->search(array('query' => $this->query))); - - if (! $this->start) - { - $this->start = 0; - } + $GLOBALS['phpgw']->template->set_var('search_list',$this->nextmatchs->search(array('query' => $query))); if (!$project_id) { $project_id = ''; } - $del = $this->bodeliveries->read_deliveries($this->start, $this->query, $this->sort, $this->order, True, $project_id); + $del = $this->bodeliveries->read_deliveries(array('start' => $this->start, 'query' => $this->query,'sort' => $this->sort, + 'order' => $this->order,'project_id' => $project_id,'status' => $this->status)); // -------------------- nextmatch variable template-declarations ----------------------------- @@ -745,7 +748,7 @@ } } $GLOBALS['phpgw']->template->pfp('out','projects_list_t',True); - $this->save_sessiondata('del'); + $this->save_sessiondata($action); } function show_delivery() @@ -757,16 +760,16 @@ $GLOBALS['phpgw']->template->set_file(array('del_list_t' => 'del_deliveryform.tpl')); $GLOBALS['phpgw']->template->set_block('del_list_t','del_list','list'); - $error = $this->boprojects->check_prefs(); + $error = $this->bobookkeeping->check_prefs(); if (is_array($error)) { $GLOBALS['phpgw']->template->set_var('message',$GLOBALS['phpgw']->common->error_list($error)); } else { - $prefs = $this->boprojects->read_prefs(); - $GLOBALS['phpgw']->template->set_var('myaddress',$this->bodeliveries->get_address_data('line',$prefs['abid'],$prefs['ifont'],$prefs['mysize'])); - $GLOBALS['phpgw']->template->set_var('fulladdress',$this->bodeliveries->get_address_data('full',$prefs['abid'],$prefs['ifont'],$prefs['mysize'])); + $prefs = $this->bobookkeeping->read_prefs(); + $GLOBALS['phpgw']->template->set_var('myaddress',$this->bobookkeeping->get_address_data('line',$prefs['abid'],$prefs['ifont'],$prefs['mysize'])); + $GLOBALS['phpgw']->template->set_var('fulladdress',$this->bobookkeeping->get_address_data('full',$prefs['abid'],$prefs['ifont'],$prefs['mysize'])); } $GLOBALS['phpgw']->template->set_var('site_title',$GLOBALS['phpgw_info']['site_title']); @@ -781,7 +784,7 @@ if ($prefs) { - $GLOBALS['phpgw']->template->set_var('customer',$this->bodeliveries->get_address_data('address',$del['customer'],$prefs['ifont'],$prefs['allsize'])); + $GLOBALS['phpgw']->template->set_var('customer',$this->bobookkeeping->get_address_data('address',$del['customer'],$prefs['ifont'],$prefs['allsize'])); } $del['date'] = $del['date'] + (60*60) * $GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset']; ==================================================== Index: bookkeeping/inc/class.bobookkeeping.inc.php diff -u bookkeeping/inc/class.bobookkeeping.inc.php:1.2 bookkeeping/inc/class.bobookkeeping.inc.php:1.3 --- bookkeeping/inc/class.bobookkeeping.inc.php:1.2 Wed Dec 3 13:20:46 2003 +++ bookkeeping/inc/class.bobookkeeping.inc.php Tue Dec 23 16:34:45 2003 @@ -1,10 +1,10 @@ True, - 'list_projects' => True, - 'check_perms' => True, - 'check_values' => True, - 'select_project_list' => True, - 'check_act_values' => True, - 'save_project' => True, - 'read_single_project' => True, - 'delete_pa' => True, - 'exists' => True, - 'isprojectadmin' => True, - 'select_activity_list' => True, - 'employee_list' => True, - 'check_prefs' => True, - 'get_prefs' => True, - 'list_activities' => True, - 'read_single_activity' => True, - 'save_activity' => True, - 'read_abook' => True, - 'read_single_contact' => True, - 'read_prefs' => True, - 'save_prefs' => True, - 'return_value' => True, - 'select_activities_list' => True, - 'select_pro_activities' => True, - 'select_hours_activities' => True, - 'change_owner' => True, - 'activities_list' => True + 'save_sessiondata' => True, + 'get_address_data' => True, + 'read_prefs' => True, + 'save_prefs' => True, + 'check_prefs' => True, + 'get_site_config' => True ); function bobookkeeping($session=False, $action = '') { $this->debug = False; + $this->contacts = CreateObject('phpgwapi.contacts'); if ($session) { @@ -138,17 +117,10 @@ { switch ($action) { - case 'mains' : $column = 'projects_mains'; break; - case 'subs' : $column = 'projects_subs'; break; - case 'act' : $column = 'projects_act'; break; - case 'pad' : $column = 'projects_pad'; break; - case 'pbo' : $column = 'projects_pbo'; break; - case 'amains' : $column = 'projects_amains'; break; - case 'asubs' : $column = 'projects_asubs'; break; - case 'ustat' : $column = 'projects_ustat'; break; - case 'pstat' : $column = 'projects_pstat'; break; - case 'bill' : $column = 'projects_bill'; break; - case 'del' : $column = 'projects_del'; break; + case 'mains': $column = 'bookkeeping_mains'; break; + case 'subs' : $column = 'bookkeeping_subs'; break; + case 'del_mains': $column = 'bookkeeping_de_mains'; break; + case 'del_subs': $column = 'bookkeeping_de_subs'; break; } return $column; } @@ -176,70 +148,21 @@ $this->status = $data['status']; } - function check_perms($has, $needed) + function get_address_data($format, $abid, $afont, $asize) { - return (!!($has & $needed) == True); - } - - function cached_accounts($account_id) - { - $this->accounts = CreateObject('phpgwapi.accounts',$account_id); - - $this->accounts->read_repository(); - - $cached_data[$this->accounts->data['account_id']]['account_id'] = $this->accounts->data['account_id']; - $cached_data[$this->accounts->data['account_id']]['account_lid'] = $this->accounts->data['account_lid']; - $cached_data[$this->accounts->data['account_id']]['firstname'] = $this->accounts->data['firstname']; - $cached_data[$this->accounts->data['account_id']]['lastname'] = $this->accounts->data['lastname']; - - return $cached_data; - } - - function return_date() - { - $date = array - ( - 'month' => $GLOBALS['phpgw']->common->show_date(time(),'n'), - 'day' => $GLOBALS['phpgw']->common->show_date(time(),'d'), - 'year' => $GLOBALS['phpgw']->common->show_date(time(),'Y') - ); - - $date['daydate'] = mktime(2,0,0,$date['month'],$date['day'],$date['year']); - $date['monthdate'] = mktime(2,0,0,$date['month']+2,0,$date['year']); - $date['monthformatted'] = $GLOBALS['phpgw']->common->show_date($date['monthdate'],'n/Y'); - return $date; - } - - function read_abook($start, $query, $qfilter, $sort, $order) - { - $account_id = $GLOBALS['phpgw_info']['user']['account_id']; - - $cols = array('n_given' => 'n_given', - 'n_family' => 'n_family', - 'org_name' => 'org_name'); - - $entries = $this->contacts->read($start,$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'], $cols, $query, $qfilter, $sort, $order, $account_id); - $this->total_records = $this->contacts->total_records; - return $entries; - } - - function read_single_contact($abid) - { - $cols = array('n_given' => 'n_given', - 'n_family' => 'n_family', - 'org_name' => 'org_name'); - - return $this->contacts->read_single_entry($abid,$cols); - } - - function return_value($action,$item) - { - return $this->so->return_value($action,$item); - } - - function list_pcosts($project_id) - { - return $this->so->list_pcosts($project_id); + if ($format == 'address') + { + $address = $this->contacts->formatted_address($abid,True,$afont,$asize); + } + elseif ($format == 'line') + { + $address = $this->contacts->formatted_address_line($abid,True,$afont,$asize); + } + else + { + $address = $this->contacts->formatted_address_full($abid,True,$afont,$asize); + } + return $address; } function read_prefs() @@ -248,17 +171,10 @@ $prefs = array(); - if ($GLOBALS['phpgw_info']['user']['preferences']['projects']) + if ($GLOBALS['phpgw_info']['user']['preferences']['bookkeeping']) { - $prefs['tax'] = $GLOBALS['phpgw_info']['user']['preferences']['projects']['tax']; - $prefs['abid'] = $GLOBALS['phpgw_info']['user']['preferences']['projects']['abid']; - $prefs['bill'] = $GLOBALS['phpgw_info']['user']['preferences']['projects']['bill']; - $prefs['ifont'] = $GLOBALS['phpgw_info']['user']['preferences']['projects']['ifont']; - $prefs['mysize'] = $GLOBALS['phpgw_info']['user']['preferences']['projects']['mysize']; - $prefs['allsize'] = $GLOBALS['phpgw_info']['user']['preferences']['projects']['allsize']; - $prefs['notify_mstone'] = $GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_mstone']; - $prefs['notify_pro'] = $GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_pro']; - $prefs['notify_assign'] = $GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_assign']; + $prefs['tax'] = $GLOBALS['phpgw_info']['user']['preferences']['bookkeeping']['tax']; + $prefs['abid'] = $GLOBALS['phpgw_info']['user']['preferences']['bookkeeping']['abid']; } return $prefs; } @@ -269,29 +185,20 @@ if (is_array($prefs)) { - $GLOBALS['phpgw']->preferences->change('projects','tax',$prefs['tax']); - $GLOBALS['phpgw']->preferences->change('projects','abid',$prefs['abid']); - $GLOBALS['phpgw']->preferences->change('projects','bill',$prefs['bill']); - $GLOBALS['phpgw']->preferences->change('projects','ifont',$prefs['ifont']); - $GLOBALS['phpgw']->preferences->change('projects','mysize',$prefs['mysize']); - $GLOBALS['phpgw']->preferences->change('projects','allsize',$prefs['allsize']); - $GLOBALS['phpgw']->preferences->change('projects','notify_mstone',(isset($prefs['notify_mstone'])?'yes':'')); - $GLOBALS['phpgw']->preferences->change('projects','notify_pro',(isset($prefs['notify_pro'])?'yes':'')); - $GLOBALS['phpgw']->preferences->change('projects','notify_assign',(isset($prefs['notify_assign'])?'yes':'')); + $GLOBALS['phpgw']->preferences->change('bookkeeping','tax',$prefs['tax']); + $GLOBALS['phpgw']->preferences->change('bookkeeping','abid',$prefs['abid']); $GLOBALS['phpgw']->preferences->save_repository(True); - // _debug_array($prefs); - // exit; } - if ($prefs['oldbill'] == 'h' && $prefs['bill'] == 'wu') + /*if ($prefs['oldbill'] == 'h' && $prefs['bill'] == 'wu') { return True; } else { return False; - } + }*/ } function check_prefs() @@ -303,13 +210,9 @@ $error[] = lang('please specify country and currency in the global preferences section'); } - if ($this->isprojectadmin('pad') || $this->isprojectadmin('pbo')) + if (!isset($prefs['abid']) || !isset($prefs['tax'])) { - if (! isset($prefs['abid']) || (! isset($prefs['tax'])) || (! isset($prefs['bill'])) || (! isset($prefs['ifont'])) || (! isset($prefs['mysize'])) || (! isset($prefs['allsize']))) - { - $error[] = lang('if you are an administrator, please set the preferences for this application'); - $error[] = lang('if you are not an administrator, please inform the administrator to set the preferences for this application'); - } + $error[] = lang('please set your preferences for this application'); } return $error; } @@ -323,819 +226,17 @@ $prefs['currency'] = $GLOBALS['phpgw_info']['user']['preferences']['common']['currency']; $prefs['country'] = $GLOBALS['phpgw_info']['user']['preferences']['common']['country']; - if ($GLOBALS['phpgw_info']['user']['preferences']['projects']) + if ($GLOBALS['phpgw_info']['user']['preferences']['bookkeeping']) { - if ($this->isprojectadmin('pad') || $this->isprojectadmin('pbo')) - { - $prefs['abid'] = $GLOBALS['phpgw_info']['user']['preferences']['projects']['abid']; - $prefs['tax'] = $GLOBALS['phpgw_info']['user']['preferences']['projects']['tax']; - $prefs['bill'] = $GLOBALS['phpgw_info']['user']['preferences']['projects']['bill']; - $prefs['ifont'] = $GLOBALS['phpgw_info']['user']['preferences']['projects']['ifont']; - $prefs['mysize'] = $GLOBALS['phpgw_info']['user']['preferences']['projects']['mysize']; - $prefs['allsize'] = $GLOBALS['phpgw_info']['user']['preferences']['projects']['allsize']; - } - $prefs['notify_mstone'] = $GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_mstone']; - $prefs['notify_pro'] = $GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_pro']; - $prefs['notify_assign'] = $GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_assign']; + $prefs['abid'] = $GLOBALS['phpgw_info']['user']['preferences']['projects']['abid']; + $prefs['tax'] = $GLOBALS['phpgw_info']['user']['preferences']['projects']['tax']; } return $prefs; } - function employee_list() - { - $employees = $GLOBALS['phpgw']->accounts->get_list('accounts'); - return $employees; - } - - function get_acl_for_project($project_id) - { - return $GLOBALS['phpgw']->acl->get_ids_for_location($project_id, 7); - } - - function selected_employees($project_id) - { - $emps = $this->get_acl_for_project($project_id); - - if (is_array($emps)) - { - for($i=0;$iaccounts = CreateObject('phpgwapi.accounts',$emps[$i]); - $this->accounts->read_repository(); - - $empl[] = array - ( - 'account_id' => $this->accounts->data['account_id'], - 'account_lid' => $this->accounts->data['account_lid'], - 'account_firstname' => $this->accounts->data['firstname'], - 'account_lastname' => $this->accounts->data['lastname'] - ); - } - } - return $empl; - } - - function read_admins($action, $type) - { - $admins = $this->so->return_admins($action, $type); - $this->total_records = $this->so->total_records; - return $admins; - } - - function list_admins($action, $type, $start, $query, $sort, $order) - { - $admins = $this->read_admins($action, 'all'); - $allaccounts = $GLOBALS['phpgw']->accounts->get_list($type, $start, $sort, $order, $query); - - $j = 0; - while (is_array($allaccounts) && list($null,$account) = each($allaccounts)) - { - for ($i=0;$iread_admins($action, $type); - - if ($type == 'aa') - { - $alladmins = $GLOBALS['phpgw']->accounts->get_list('accounts'); - } - else - { - $alladmins = $GLOBALS['phpgw']->accounts->get_list('groups'); - } - - while (list($null,$ad_account) = each($alladmins)) - { - $selected_admins .= '