Changeset 1590 for sandbox/filemanager/inc/class.uifilemanager.inc.php

Timestamp:

11/05/09 14:17:02 (14 years ago)

Author:

amuller

Message:

Ticket #597 - Implentação, melhorias do modulo gerenciador de arquivos

File:

• sandbox/filemanager/inc/class.uifilemanager.inc.php (modified) (9 diffs)

sandbox/filemanager/inc/class.uifilemanager.inc.php

@@ -297 +297 @@
                         # Some hacks to set and display directory paths correctly
                         ###
-/*
-                        if($this->goto || $this->goto_x)
-                        {
-                                $this->path = $this->cdtodir;
-                        }
- */
-                        if(!$this->bo->vfs->acl_check(array(
+                        if(!($this->edit_x || $this->edit_save_x || $this->edit_save_done_x) && !$this->bo->vfs->acl_check(array(
                                 'string' => $this->path,
                                 'relatives' => array(RELATIVE_NONE),
@@ -765 +759 @@
                                                                         $link=$this->encode_href('/index.php','menuaction=filemanager.uifilemanager.export','file='.$files['name'].'&path='.$this->path);
                                                                         $image=$GLOBALS['phpgw']->common->image('filemanager','button_export');
-                                                                        $col_data.='<a href="'.$link.'"><img alt="'.lang("export").'" src="'.$image.'"></a>';
+                                                                        $col_data.='<a href="'.$link.'"><img alt="'.lang("export").'" title="'.lang("export").'" src="'.$image.'"></a>';
                                                                 }
                                                         }
@@ -1347 +1341 @@
                                         $this->messages[]=$GLOBALS['phpgw']->common->error_list(array(lang("File names cannot contain \\ or /")));
                                 }
-                                elseif(!$this->bo->vfs->mv(array(
+                                elseif($this->verifyLock($from,RELATIVE_ALL) && $this->bo->vfs->mv(array(
                                         'from'  => $from,
                                         'to'    => $to
                                 )))
                                 {
+                                        $this->messages[]=lang('Renamed %1 to %2', $this->disppath.'/'.$from, $this->disppath.'/'.$to);
+                                }
+                                else
+                                {
                                         $this->messages[]= $GLOBALS['phpgw']->common->error_list(array(lang('Could not rename %1 to %2', $this->disppath.'/'.$from, $this->disppath.'/'.$to)));
-                                }
-                                else
-                                {
-                                        $this->messages[]=lang('Renamed %1 to %2', $this->disppath.'/'.$from, $this->disppath.'/'.$to);
                                 }
                         }
@@ -1420 +1414 @@
                                         {
                                                 $copied++;
-                                                $this->messages[] .= lang('Copied %1 to %2', $this->disppath.'/'.$file, $this->todir.'/'.$file);
+                                                $this->messages[] = lang('Copied %1 to %2', $this->disppath.'/'.$file, $this->todir.'/'.$file);
                                         }
                                         else
                                         {
-                                                $this->messages[] .= lang('Could not copy %1 to %2', $this->disppath.'/'.$file, $this->todir.'/'.$file);
+                                                $this->messages[] = lang('Could not copy %1 to %2', $this->disppath.'/'.$file, $this->todir.'/'.$file);
                                         }
                                 }
@@ -1491 +1485 @@
                         }
                 }
-
+                function verifyLock($file,$relative){
+                        $ls_array = $this->bo->vfs->ls(array(
+                                'string'        => $file,
+                                'relatives'     => array($relative),
+                                'checksubdirs'  => False,
+                                'nofiles'       => True
+                        ));
+                        $timestamp = $this->dateString2timeStamp($ls_array[0]['modified']);
+                        if (time() - $timestamp < 60 && $ls_array[0]['modifiedby_id'] != $GLOBALS['phpgw_info']['user']['account_id']) // recently than last minute: someone is editing
+                        {
+                                $this->messages[]=$GLOBALS['phpgw']->common->error_list(array(lang('This file is being edited right now by:').$GLOBALS['phpgw']->accounts->id2name($ls_array[0]['modifiedby_id'])));
+                                return False;
+
+                        }
+                        else
+                                return True;
+                }
                 function delete()
                 {
@@ -1498 +1508 @@
                                 foreach($this->fileman as $filename)
                                 {
-                                        if($this->bo->vfs->delete(array('string' => $filename)))
+                                        if($this->verifyLock($filename,RELATIVE_ALL) && $this->bo->vfs->delete(array('string' => $filename)))
                                         {
                                                 $this->messages[]= lang('Deleted %1', $this->disppath.'/'.$filename).'<br/>';
@@ -1639 +1649 @@
                         if($this->file)
                         {
+                                if (! $this->verifyLock($this->path.'/'.$this->file,RELATIVE_NONE)){
+                                        echo $this->messages['0'];
+                                        $GLOBALS['phpgw']->redirect('/index.php');
+
+                                        //$GLOBALS['phpgw']->common->phpgw_exit();
+                                }
                                 $ls_array = $this->bo->vfs->ls(array(
                                         'string'        => $this->path.'/'.$this->file,
@@ -1645 +1661 @@
                                         'nofiles'       => True
                                 ));
-                                $timestamp = $this->dateString2timeStamp($ls_array[0]['modified']);
-                                if (time() - $timestamp < 60 && $ls_array[0]['modifiedby_id'] != $GLOBALS['phpgw_info']['user']['account_id']) // recently than last minute: someone is editing
-                                {
-                                        echo lang('This file is being edited right now by:').$GLOBALS['phpgw']->accounts->id2name($ls_array[0]['modifiedby_id']);
-                                        return False;
-                                        
-                                }
+
                                 $this->bo->vfs->touch(array(
                                         'string'=> $this->path.'/'.$this->file,
@@ -1712 +1722 @@
                                 //die( $content);
                                 if($this->bo->vfs->write(array(
-                                        'string'        => $this->edit_file,
-                                        'relatives'     => array(RELATIVE_ALL),
+                                        'string'        => $this->path.'/'.$this->edit_file,
+                                        'relatives'     => array(RELATIVE_NONE),
                                         'content'       => $content
                                 )))