[Phpgroupware-cvs] ged/inc class.ged_ui.inc.php

[Pascal Vilarem]

CVSROOT:        /sources/phpgroupware
Module name:    ged
Changes by:     Pascal Vilarem <maat>   07/11/19 11:12:14

Modified files:
        inc            : class.ged_ui.inc.php 

Log message:
        tiny fixes : force int type for project root and use can_delete check

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ged/inc/class.ged_ui.inc.php?cvsroot=phpgroupware&r1=1.53&r2=1.54

Patches:
Index: class.ged_ui.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/inc/class.ged_ui.inc.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- class.ged_ui.inc.php        9 Nov 2007 15:15:17 -0000       1.53
+++ class.ged_ui.inc.php        19 Nov 2007 11:12:14 -0000      1.54
@@ -987,7 +987,7 @@
                                
                                $flow_object=array(
                                        'app' => 'ged',
-                                       'project_root' => 
$focused_element['project_root'], 
+                                       'project_root' => 
(int)$focused_element['project_root'], 
                                        'doc_type' => 
$focused_element['doc_type'], 
                                        'element_id' => (int)$focused_id, 
                                        'version_id' => 
(int)$focused_version['version_id']
@@ -1070,7 +1070,7 @@
                                }
                                
                                // TODO : droit specifique de delete ?
-                               if ( $this->ged_dm->admin && $focused_id !=0 )
+                               if ( $this->ged_dm->can_delete($focused_id) )
                                {
                                        $link_data=null;
                                        
$link_data['menuaction']='ged.ged_ui.delete_folder';
@@ -1790,7 +1790,7 @@
                
                $flow_object=array(
                        'app' => 'ged',
-                       'project_root' => $element['project_root'], 
+                       'project_root' => (int)$element['project_root'], 
                        'doc_type' => $element['doc_type'], 
                        'element_id' => (int)$element_id, 
                        'version_id' => (int)$version_id