[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] projects/inc class.boprojects.inc.php class.soc...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] projects/inc class.boprojects.inc.php class.soc... |
|
Date: |
Sat, 25 Nov 2006 10:28:07 +0000 |
CVSROOT: /sources/phpgroupware
Module name: projects
Changes by: Sigurd Nes <sigurdne> 06/11/25 10:28:07
Modified files:
inc : class.boprojects.inc.php class.soconfig.inc.php
class.soprojects.inc.php
class.uiprojects.inc.php
class.uiprojects_base.inc.php
Log message:
notices
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/projects/inc/class.boprojects.inc.php?cvsroot=phpgroupware&r1=1.158&r2=1.159
http://cvs.savannah.gnu.org/viewcvs/projects/inc/class.soconfig.inc.php?cvsroot=phpgroupware&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/projects/inc/class.soprojects.inc.php?cvsroot=phpgroupware&r1=1.111&r2=1.112
http://cvs.savannah.gnu.org/viewcvs/projects/inc/class.uiprojects.inc.php?cvsroot=phpgroupware&r1=1.161&r2=1.162
http://cvs.savannah.gnu.org/viewcvs/projects/inc/class.uiprojects_base.inc.php?cvsroot=phpgroupware&r1=1.13&r2=1.14
Patches:
Index: class.boprojects.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -b -r1.158 -r1.159
--- class.boprojects.inc.php 24 Nov 2006 20:59:43 -0000 1.158
+++ class.boprojects.inc.php 25 Nov 2006 10:28:07 -0000 1.159
@@ -6,7 +6,7 @@
* @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: class.boprojects.inc.php,v 1.158 2006/11/24 20:59:43
sigurdne Exp $
+ * @version $Id: class.boprojects.inc.php,v 1.159 2006/11/25 10:28:07
sigurdne Exp $
* $Source:
/sources/phpgroupware/projects/inc/class.boprojects.inc.php,v $
*/
@@ -220,7 +220,7 @@
$pro['coordinator'] =
$this->soprojects->return_value('co',$pro['project_id']);
}
-
if($this->check_perms($this->grants[$pro['coordinator']],$acl) ||
$pro['coordinator'] == $this->account)
+ if((isset($this->grants[$pro['coordinator']]) &&
$this->check_perms($this->grants[$pro['coordinator']],$acl)) ||
$pro['coordinator'] == $this->account)
{
return True;
}
@@ -1044,7 +1044,8 @@
function list_projects($params)
{
- if($params['function'] == 'gantt')
+ $projects = false;
+ if(isset($params['function']) && $params['function'] ==
'gantt')
{
$pro_list =
$this->soprojects->read_gantt_projects(array('project_id' =>
$params['project_id'],'parent_array' => $params['parent_array']));
}
@@ -1066,8 +1067,8 @@
'cat_id' => ($params['action'] == 'mains'?$this->cat_id:0),
'action' => $params['action'],
'parent' => $params['parent'],
-
'main' => $params['main'],
-
'project_id' => $params['project_id']
+
'main' => (isset($params['main'])?$params['main']:''),
+
'project_id' => (isset($params['project_id'])?$params['project_id']:'')
));
}
@@ -2432,7 +2433,7 @@
}
$prefs['currency'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['currency'];
- $prefs['mainscreen_showevents'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['mainscreen_showevents'];
+ $prefs['mainscreen_showevents'] =
(isset($GLOBALS['phpgw_info']['user']['preferences']['projects']['mainscreen_showevents'])?$GLOBALS['phpgw_info']['user']['preferences']['projects']['mainscreen_showevents']:'');
return $prefs;
}
Index: class.soconfig.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/class.soconfig.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- class.soconfig.inc.php 24 Nov 2006 19:50:49 -0000 1.21
+++ class.soconfig.inc.php 25 Nov 2006 10:28:07 -0000 1.22
@@ -6,7 +6,7 @@
* @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: class.soconfig.inc.php,v 1.21 2006/11/24 19:50:49
sigurdne Exp $
+ * @version $Id: class.soconfig.inc.php,v 1.22 2006/11/25 10:28:07
sigurdne Exp $
* $Source: /sources/phpgroupware/projects/inc/class.soconfig.inc.php,v $
*/
@@ -27,7 +27,7 @@
function get_site_config($params = 0)
{
$default = $params['default']?$params['default']:True;
- $helpmsg = $params['helpmsg']?$params['helpmsg']:False;
+ $helpmsg =
(isset($params['helpmsg'])?$params['helpmsg']:False);
$this->config =
CreateObject('phpgwapi.config','projects');
$this->config->read_repository();
Index: class.soprojects.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- class.soprojects.inc.php 24 Nov 2006 20:59:43 -0000 1.111
+++ class.soprojects.inc.php 25 Nov 2006 10:28:07 -0000 1.112
@@ -6,7 +6,7 @@
* @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: class.soprojects.inc.php,v 1.111 2006/11/24 20:59:43
sigurdne Exp $
+ * @version $Id: class.soprojects.inc.php,v 1.112 2006/11/25 10:28:07
sigurdne Exp $
* $Source:
/sources/phpgroupware/projects/inc/class.soprojects.inc.php,v $
*/
@@ -43,6 +43,7 @@
function db2projects($column = False)
{
+ $projects = array();
$i = 0;
while ($this->db->next_record())
{
@@ -112,22 +113,22 @@
function read_projects($values)
{
- $start = intval($values['start']);
+ $start =
(isset($values['start'])?intval($values['start']):0);
$limit =
(isset($values['limit'])?$values['limit']:true);
$filter =
(isset($values['filter'])?$values['filter']:'none');
- $sort = $values['sort']?$values['sort']:'ASC';
- $order =
$values['order']?$values['order']:'p_number,title,start_date';
+ $sort = (isset($values['sort']) &&
$values['sort']?$values['sort']:'ASC');
+ $order =
(isset($values['order'])?$values['order']:'p_number,title,start_date');
$status =
isset($values['status'])?$values['status']:'active';
$action =
(isset($values['action'])?$values['action']:'mains');
- $cat_id = intval($values['cat_id']);
- $main = intval($values['main']);
- $parent = intval($values['parent']);
- $project_id = intval($values['project_id']);
+ $cat_id =
(isset($values['cat_id'])?intval($values['cat_id']):0);
+ $main =
(isset($values['main'])?intval($values['main']):0);
+ $parent =
(isset($values['parent'])?intval($values['parent']):0);
+ $project_id =
(isset($values['project_id'])?intval($values['project_id']):0);
$column =
(isset($values['column'])?$values['column']:False);
- $employee = $values['employee'];
+ $employee =
(isset($values['employee'])?$values['employee']:'');
- $query = $this->db->db_addslashes($values['query']);
+ $query =
(isset($values['query'])?$this->db->db_addslashes($values['query']):'');
if ($status)
{
@@ -190,6 +191,7 @@
case 'mainsubsorted': $parent_select = ' AND
project_id=' . $project_id; break;
}
+ $querymethod='';
if ($query)
{
$querymethod = " AND (title like '%$query%' OR
p_number like '%$query%' OR descr like '%$query%') ";
@@ -343,10 +345,10 @@
$pro = $this->read_projects(array
(
'limit' =>
false,
- 'status' =>
$values['status'],
+ 'status' =>
(isset($values['status'])?$values['status']:''),
'action' =>
(isset($values['action'])?$values['action']:'mains'),
- 'main' =>
$values['main'],
- 'filter' =>
$values['filter'],
+ 'main' =>
(isset($values['main'])?$values['main']:''),
+ 'filter' =>
(isset($values['filter'])?$values['filter']:''),
'column' =>
'project_id,p_number,level,title'
));
@@ -355,7 +357,7 @@
usort($pro, array("soprojects", "cmp_pro"));
}
- if($values['self'])
+ if(isset($values['self']) && $values['self'])
{
for ($i=0;$i<count($pro);$i++)
{
Index: class.uiprojects.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -b -r1.161 -r1.162
--- class.uiprojects.inc.php 24 Nov 2006 20:59:44 -0000 1.161
+++ class.uiprojects.inc.php 25 Nov 2006 10:28:07 -0000 1.162
@@ -6,7 +6,7 @@
* @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: class.uiprojects.inc.php,v 1.161 2006/11/24 20:59:44
sigurdne Exp $
+ * @version $Id: class.uiprojects.inc.php,v 1.162 2006/11/25 10:28:07
sigurdne Exp $
* $Source:
/sources/phpgroupware/projects/inc/class.uiprojects.inc.php,v $
*/
@@ -207,7 +207,7 @@
}
else
{
- $sort_column =
$this->nextmatchs->show_sort_order($this->sort,($db?$db:$col),$this->order,'/index.php',$cname?$cname:lang($col),$link_data);
+ $sort_column =
$this->nextmatchs->show_sort_order($this->sort,(isset($db)?$db:$col),$this->order,'/index.php',$cname?$cname:lang($col),$link_data);
}
$GLOBALS['phpgw']->template->set_var('col_align',$col_align?$col_align:'left');
$GLOBALS['phpgw']->template->set_var('sort_column',$sort_column);
@@ -301,10 +301,10 @@
// --------------- Button interactions --------------------------
$valid_interactions =
$this->boprojects->get_interactions(array('pro_main' => $pro_main,
-
'project_id' => $p['project_id'],
+
'project_id' => (isset($p['project_id'])?$p['project_id']:''),
'status' => $this->status,
'action' => $action,
-
'coordinator' => $main['coordinator']
+
'coordinator' => (isset($main['coordinator'])?$main['coordinator']:'')
));
if(in_array('book_hours', $valid_interactions))
{
Index: class.uiprojects_base.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/class.uiprojects_base.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- class.uiprojects_base.inc.php 24 Nov 2006 20:59:44 -0000 1.13
+++ class.uiprojects_base.inc.php 25 Nov 2006 10:28:07 -0000 1.14
@@ -7,7 +7,7 @@
* @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: class.uiprojects_base.inc.php,v 1.13 2006/11/24
20:59:44 sigurdne Exp $
+ * @version $Id: class.uiprojects_base.inc.php,v 1.14 2006/11/25
10:28:07 sigurdne Exp $
* $Source:
/sources/phpgroupware/projects/inc/class.uiprojects_base.inc.php,v $
*/
@@ -850,9 +850,9 @@
function set_app_langs()
{
-
$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
-
$GLOBALS['phpgw']->template->set_var('row_on',$GLOBALS['phpgw_info']['theme']['row_on']);
-
$GLOBALS['phpgw']->template->set_var('row_off',$GLOBALS['phpgw_info']['theme']['row_off']);
+
$GLOBALS['phpgw']->template->set_var('th_bg',(isset($GLOBALS['phpgw_info']['theme']['th_bg'])?$GLOBALS['phpgw_info']['theme']['th_bg']:''));
+
$GLOBALS['phpgw']->template->set_var('row_on',(isset($GLOBALS['phpgw_info']['theme']['row_on'])?$GLOBALS['phpgw_info']['theme']['row_on']:''));
+
$GLOBALS['phpgw']->template->set_var('row_off',(isset($GLOBALS['phpgw_info']['theme']['row_off'])?$GLOBALS['phpgw_info']['theme']['row_off']:''));
$GLOBALS['phpgw']->template->set_var('lang_category',lang('Category'));
$GLOBALS['phpgw']->template->set_var('lang_select',lang('Select'));
@@ -1128,11 +1128,11 @@
}
$status_list = '<option value="active"' . $stat_sel[0]
. '>' . lang('Active') . '</option>' . "\n"
- . '<option value="nonactive"' .
$stat_sel[1] . '>' . lang('Nonactive') . '</option>' . "\n";
+ . '<option value="nonactive"' .
(isset($stat_sel[1])? $stat_sel[1]:'') . '>' . lang('Nonactive') . '</option>'
. "\n";
if ($showarchive)
{
- $status_list .= '<option value="archive"' .
$stat_sel[2] . '>' . lang('Archive') . '</option>' . "\n";
+ $status_list .= '<option value="archive"' .
(isset($stat_sel[2])?$stat_sel[2]:'') . '>' . lang('Archive') . '</option>' .
"\n";
}
return $status_list;
}
- [Phpgroupware-cvs] projects/inc class.boprojects.inc.php class.soc...,
Sigurd Nes <=