[Phpgroupware-cvs] projects/inc class.soconfig.inc.php class.sopro...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    projects
Changes by:     Sigurd Nes <sigurdne>   07/09/05 11:45:30

Modified files:
        inc            : class.soconfig.inc.php class.soprojects.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/projects/inc/class.soconfig.inc.php?cvsroot=phpgroupware&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/projects/inc/class.soprojects.inc.php?cvsroot=phpgroupware&r1=1.119&r2=1.120

Patches:
Index: class.soconfig.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/class.soconfig.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- class.soconfig.inc.php      5 Dec 2006 19:40:45 -0000       1.29
+++ class.soconfig.inc.php      5 Sep 2007 11:45:29 -0000       1.30
@@ -6,7 +6,7 @@
        * @copyright Copyright (C) 2000-2006 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.29 2006/12/05 19:40:45 
sigurdne Exp $
+       * @version $Id: class.soconfig.inc.php,v 1.30 2007/09/05 11:45:29 
sigurdne Exp $
        * $Source: /sources/phpgroupware/projects/inc/class.soconfig.inc.php,v $
        */
 
@@ -552,8 +552,8 @@
                {
                        $start          = intval($values['start']);
                        $limit          = 
(isset($values['limit'])?$values['limit']:false);
-                       $sort           = 
(isset($values['sort'])?$values['sort']:'ASC');
-                       $order          = 
(isset($values['order'])?$values['order']:'sdate');
+                       $sort           = (isset($values['sort']) && 
$values['sort'] ? $values['sort']:'ASC');
+                       $order          = (isset($values['order']) && 
$values['order'] ? $values['order']:'sdate');
                        $query          = 
$this->db->db_addslashes($values['query']);
                        $account_id     = intval($values['account_id']);
                        $id                     = intval($values['id']);

Index: class.soprojects.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- class.soprojects.inc.php    5 Dec 2006 19:40:45 -0000       1.119
+++ class.soprojects.inc.php    5 Sep 2007 11:45:29 -0000       1.120
@@ -6,7 +6,7 @@
        * @copyright Copyright (C) 2000-2006 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.119 2006/12/05 19:40:45 
sigurdne Exp $
+       * @version $Id: class.soprojects.inc.php,v 1.120 2007/09/05 11:45:29 
sigurdne Exp $
        * $Source: 
/sources/phpgroupware/projects/inc/class.soprojects.inc.php,v $
        */
 
@@ -1521,12 +1521,12 @@
 
                function plan_bottom_up_set_job_setting($main_project_id, 
$plan_bottom_up)
                {
-                       $this->db->query('UPDATE phpgw_p_projects SET 
plan_bottom_up="' . $plan_bottom_up . '" WHERE main=' . $main_project_id, 
__LINE__,__FILE__);
+                       $this->db->query("UPDATE phpgw_p_projects SET 
plan_bottom_up='" . $plan_bottom_up . "' WHERE main=" . $main_project_id, 
__LINE__,__FILE__);
                }
                
                function direct_work_set_job_setting($main_project_id, 
$direct_work)
                {
-                       $this->db->query('UPDATE phpgw_p_projects SET 
direct_work="' . $direct_work . '" WHERE main=' . $main_project_id, 
__LINE__,__FILE__);
+                       $this->db->query("UPDATE phpgw_p_projects SET 
direct_work='" . $direct_work . "' WHERE main=" . $main_project_id, 
__LINE__,__FILE__);
                }
 
                function get_projects_tree($mainProject = null, $fields = 
array('project_id', 'parent', 'title', 'p_number', 'direct_work', 'end_date', 
'customer_org', 'status'), $employee=-1)