[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] filemanager/inc/class.attached_files.inc.php pr...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] filemanager/inc/class.attached_files.inc.php pr... |
|
Date: |
Fri, 24 Nov 2006 20:59:44 +0000 |
CVSROOT: /sources/phpgroupware
Module name: projects
Changes by: Sigurd Nes <sigurdne> 06/11/24 20:59:44
Modified files:
filemanager/inc: class.attached_files.inc.php
inc : class.boprojects.inc.php
class.soprojects.inc.php
class.uiprojects.inc.php
class.uiprojects_base.inc.php
hook_preferences.inc.php
Log message:
notices
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/filemanager/inc/class.attached_files.inc.php?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/projects/inc/class.boprojects.inc.php?cvsroot=phpgroupware&r1=1.157&r2=1.158
http://cvs.savannah.gnu.org/viewcvs/projects/inc/class.soprojects.inc.php?cvsroot=phpgroupware&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/projects/inc/class.uiprojects.inc.php?cvsroot=phpgroupware&r1=1.160&r2=1.161
http://cvs.savannah.gnu.org/viewcvs/projects/inc/class.uiprojects_base.inc.php?cvsroot=phpgroupware&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/projects/inc/hook_preferences.inc.php?cvsroot=phpgroupware&r1=1.28&r2=1.29
Patches:
Index: filemanager/inc/class.attached_files.inc.php
===================================================================
RCS file: /sources/phpgroupware/filemanager/inc/class.attached_files.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- filemanager/inc/class.attached_files.inc.php 13 Apr 2006 22:43:37
-0000 1.1
+++ filemanager/inc/class.attached_files.inc.php 24 Nov 2006 20:59:43
-0000 1.2
@@ -7,7 +7,7 @@
* @copyright Copyright (C) 2005-2006 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package filemanager
- * @version $Id: class.attached_files.inc.php,v 1.1 2006/04/13 22:43:37
ceb Exp $
+ * @version $Id: class.attached_files.inc.php,v 1.2 2006/11/24 20:59:43
sigurdne Exp $
* @internal $Source:
/sources/phpgroupware/filemanager/inc/class.attached_files.inc.php,v $
*/
@@ -34,13 +34,13 @@
function attached_files()
{
- $this->app =
$_REQUEST['app']?$_REQUEST['app']:$GLOBALS['phpgw_info']['flags']['currentapp'];
- $this->appdir = $GLOBALS['basedir'] . '/' .
$this->app;
+ $this->app =
(isset($_REQUEST['app'])?$_REQUEST['app']:$GLOBALS['phpgw_info']['flags']['currentapp']);
+ $this->appdir =
$GLOBALS['phpgw_info']['server']['files_dir'] . '/' . $this->app;
$this->form_name = 'attachment';
- $this->file = $_REQUEST['file'];
- $this->action_id = $_REQUEST['action_id'];
+ $this->file =
(isset($_REQUEST['file'])?$_REQUEST['file']:'');
+ $this->action_id =
(isset($_REQUEST['action_id'])?$_REQUEST['action_id']:'');
if (@!is_object($GLOBALS['phpgw']->vfs))
{
Index: projects/inc/class.boprojects.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -b -r1.157 -r1.158
--- projects/inc/class.boprojects.inc.php 8 Apr 2005 15:52:57 -0000
1.157
+++ projects/inc/class.boprojects.inc.php 24 Nov 2006 20:59:43 -0000
1.158
@@ -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.157 2005/04/08 15:52:57
ceb Exp $
+ * @version $Id: class.boprojects.inc.php,v 1.158 2006/11/24 20:59:43
sigurdne Exp $
* $Source:
/sources/phpgroupware/projects/inc/class.boprojects.inc.php,v $
*/
@@ -196,8 +196,8 @@
$this->sort = $data['sort'];
$this->cat_id = $data['cat_id'];
$this->status = $data['status'];
- $this->state = $data['state'];
- $this->project_id = $data['project_id'];
+ $this->state =
(isset($data['state'])?$data['state']:'');
+ $this->project_id =
(isset($data['project_id'])?$data['project_id']:'');
}
function check_perms($has, $needed)
@@ -215,7 +215,7 @@
default: $acl = PHPGW_ACL_EDIT;
}
- if($pro['project_id'] && !$pro['coordinator'])
+ if(isset($pro['project_id']) && $pro['project_id'] &&
!$pro['coordinator'])
{
$pro['coordinator'] =
$this->soprojects->return_value('co',$pro['project_id']);
}
@@ -2900,7 +2900,7 @@
}
$workdays = $book_type;
-
$holidays->add_number_of_workdays(1,$next_m,$next_y,$workdays,$country,$federal_state,$religion,&$new_d,&$new_m,&$new_y);
+
$holidays->add_number_of_workdays(1,$next_m,$next_y,$workdays,$country,$federal_state,$religion,$new_d,$new_m,$new_y);
$ts_book = mktime(0,0,0,$new_m,$new_d,$new_y)-1;
// calc book month
Index: projects/inc/class.soprojects.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- projects/inc/class.soprojects.inc.php 8 Apr 2005 15:52:58 -0000
1.110
+++ projects/inc/class.soprojects.inc.php 24 Nov 2006 20:59:43 -0000
1.111
@@ -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.110 2005/04/08 15:52:58
ceb Exp $
+ * @version $Id: class.soprojects.inc.php,v 1.111 2006/11/24 20:59:43
sigurdne Exp $
* $Source:
/sources/phpgroupware/projects/inc/class.soprojects.inc.php,v $
*/
@@ -1281,6 +1281,7 @@
$this->db->query("SELECT acl_location from phpgw_acl
where acl_appname = 'project_members' and acl_rights=7 and acl_account="
.
$this->account,__LINE__,__FILE__);
+ $projects = false;
while($this->db->next_record())
{
$projects[] = $this->db->f(0);
Index: projects/inc/class.uiprojects.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -b -r1.160 -r1.161
--- projects/inc/class.uiprojects.inc.php 13 Apr 2006 22:41:58 -0000
1.160
+++ projects/inc/class.uiprojects.inc.php 24 Nov 2006 20:59:44 -0000
1.161
@@ -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.160 2006/04/13 22:41:58
ceb Exp $
+ * @version $Id: class.uiprojects.inc.php,v 1.161 2006/11/24 20:59:44
sigurdne Exp $
* $Source:
/sources/phpgroupware/projects/inc/class.uiprojects.inc.php,v $
*/
@@ -220,7 +220,7 @@
{
foreach($pro as $p)
{
-
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
+
$this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template);
// --------------- template declaration for list records
-------------------------------------
@@ -495,7 +495,7 @@
{
foreach($pro as $p)
{
-
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
+
$this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template);
// --------------- template declaration for list records
-------------------------------------
@@ -664,7 +664,7 @@
for ($i=0;$i<count($pro);$i++)
{
-
$this->nextmatchs->template_alternate_row_color(&$this->t);
+
$this->nextmatchs->template_alternate_row_color($this->t);
if ($action == 'mains')
{
@@ -1086,7 +1086,7 @@
{
for($i=0;$i<count($mstones);++$i)
{
-
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
+
$this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template);
$link_data['s_id'] =
$mstones[$i]['s_id'];
@@ -1907,7 +1907,7 @@
$upmost_level = $pro[$i]['level'];
}
-
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
+
$this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template);
// --------------- template declaration for list records
-------------------------------------
@@ -2087,7 +2087,7 @@
{
foreach($roles as $role)
{
-
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
+
$this->nextmatchs->template_alternate_row_color($GLOBALS['phpgw']->template);
$GLOBALS['phpgw']->template->set_var('emp_name',$role['emp_name']);
Index: projects/inc/class.uiprojects_base.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/class.uiprojects_base.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- projects/inc/class.uiprojects_base.inc.php 10 Apr 2005 22:40:36 -0000
1.12
+++ projects/inc/class.uiprojects_base.inc.php 24 Nov 2006 20:59:44 -0000
1.13
@@ -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.12 2005/04/10
22:40:36 ceb Exp $
+ * @version $Id: class.uiprojects_base.inc.php,v 1.13 2006/11/24
20:59:44 sigurdne Exp $
* $Source:
/sources/phpgroupware/projects/inc/class.uiprojects_base.inc.php,v $
*/
@@ -214,7 +214,7 @@
$GLOBALS['phpgw']->js->validate_file('core','popup');
$GLOBALS['phpgw']->js->validate_file('core','projects','projects');
- if(!is_object($GLOBALS['phpgw']->css))
+ if(!isset($GLOBALS['phpgw']->css) ||
!is_object($GLOBALS['phpgw']->css))
{
$GLOBALS['phpgw']->css =
CreateObject('phpgwapi.css');
}
@@ -553,11 +553,11 @@
$linkText = '';
}
- if($buttonInActive)
+ if(isset($buttonInActive) && $buttonInActive)
{
$buttonClass = 'menu_button_inactive';
}
- elseif($buttonActive)
+ elseif(isset($buttonActive) && $buttonActive)
{
$buttonClass = 'menu_button_active';
}
@@ -566,7 +566,7 @@
$buttonClass = 'menu_button';
}
- if($buttonInActive)
+ if(isset($buttonInActive) && $buttonInActive)
{
$link = '<div class="'.$buttonClass.'"><a
class="'.$buttonClass.'" title="'.$linkToolTip.'"><img
src="'.$GLOBALS['phpgw']->common->image('projects', $guiId).'"
class="'.$buttonClass.'" alt="'.$linkToolTip.'">'.$linkText.'</a></div>';
}
Index: projects/inc/hook_preferences.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/hook_preferences.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- projects/inc/hook_preferences.inc.php 24 Nov 2006 19:50:49 -0000
1.28
+++ projects/inc/hook_preferences.inc.php 24 Nov 2006 20:59:44 -0000
1.29
@@ -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: hook_preferences.inc.php,v 1.28 2006/11/24 19:50:49
sigurdne Exp $
+ * @version $Id: hook_preferences.inc.php,v 1.29 2006/11/24 20:59:44
sigurdne Exp $
* $Source:
/sources/phpgroupware/projects/inc/hook_preferences.inc.php,v $
*/
@@ -14,9 +14,9 @@
$title = $appname;
$file = Array
(
- 'Preferences' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'projects.uiconfig.preferences')),
- 'Grant Access' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'preferences.uiaclprefs.index','acl_app'=>$appname)),
- 'Edit categories' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'preferences.uicategories.index','cats_app'=>'projects','cats_level'=>'True','global_cats'=>'True'))
+ // 'Preferences' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'projects.uiconfig.preferences')),
+ 'Grant Access' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'preferences.uiadmin_acl.aclprefs', 'acl_app'=> $appname)),
+ 'Edit categories' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'admin.uicategories.index','cats_app'=>'projects','cats_level'=>'True','global_cats'=>'True'))
);
$pro_soconfig = CreateObject('projects.soconfig');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] filemanager/inc/class.attached_files.inc.php pr...,
Sigurd Nes <=