Changeset 1529

Timestamp:

10/27/09 11:11:49 (14 years ago)

Author:

amuller

Message:

Ticket #597 - Melhorias no módulo de gerenciamento de arquivos

Location:

sandbox/filemanager

Files:

• inc/class.uifilemanager.inc.php (modified) (5 diffs)
• inc/hook_admin.inc.php (modified) (1 diff)
• inc/load_lang.php (added)
• index.php (modified) (1 diff)
• js (added)
• js/common_functions.js (added)
• js/main.js (added)
• setup/phpgw_pt-br.lang (modified) (2 diffs)
• templates/default/config.tpl (added)

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

@@ -277 +277 @@
                         }
 
+                        echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/main.js'></script>";
+                        echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/js/common_functions.js'></script>";
+                        include('load_lang.php');
 
                         # Page to process users
@@ -597 +600 @@
                                                 if($this->prefs[$internal])
                                                 {
-                                                        $col_data='<span><a href="'.$this->encode_href('/index.php','menuaction=filemanager.uifilemanager.index','path='.$this->path.'&sortby='.$internal).'">'.$displayed.'</a></span>';
+                                                        if ($internal != 'owner')
+                                                                $col_data='<span><a href="'.$this->encode_href('/index.php','menuaction=filemanager.uifilemanager.index','path='.$this->path.'&sortby='.$internal).'">'.$displayed.'</a></span>';
+                                                        else
+                                                                $col_data='<span>'.$displayed.'</span>';
                                                         $this->t->set_var('col_data',$col_data);
                                                         $this->t->parse('columns','column',True);
@@ -1113 +1119 @@
                                                         //$toolbar3.='<td><img alt="spacer" src="'.$GLOBALS['phpgw']->common->image('filemanager','spacer').'" height="27" width="1"></td>';
 
-                                                        $toolbar3.='<td><input type=text size="15" name="newfile_or_dir" value="" /></td>';
-                                                        $toolbar3.=$this->inputImage('newdir','createdir',lang('Create Folder'));
+                                                        $toolbar3.='<td><input type="hidden" id="newfile_or_dir" name="newfile_or_dir" value="" /></td>';
+                                                        $toolbar3.='<div onclick="alert(\'asdf\')">';
+                                                        //TODO : create folder with problems
+                                                        //$toolbar3.=$this->inputImage('newdir','createdir',lang('Create Folder'));
                                                         $toolbar3.=$this->inputImage('newfile','createfile',lang('Create File'));
+                                                        $toolbar3.='</div>';
                                                 }
 
@@ -1171 +1180 @@
                                                 }
                                         }
-
+                                         $c = CreateObject('phpgwapi.config','filemanager');
+                                         $c->read_repository();
+                                         $current_config = $c->config_data;
+                                         $max_size = $current_config['filemanager_Max_attachment_size'];
+                                         if (! $max_size)
+                                                 $max_size = ini_get('upload_max_filesize');
+                                         else
+                                                 $max_size .= "M";
+
+                                         $upload_max_filesize = str_replace("M","",$max_size) * 1024 * 1024;
+
+                                        if ($_FILES['upload_file']['size'][$i] > $upload_max_filesize)
+                                        {
+                                                $this->messages[]=lang('The size of %1 has exceded the limit: %2', $this->disppath.'/'.$_FILES['upload_file']['name'][$i], $max_size);
+                                        }
+                                        else
                                         if($_FILES['upload_file']['size'][$i] > 0)
                                         {
@@ -1885 +1909 @@
                         {
                                 return '<td class="" align="center" valign="middle" height="28" width="70">
-                                <input title="'.$description.'" name="'.$name.'" type="image" alt="'.$name.'" src="'.$image.'" value="clicked" /><br><small>'.$description.'</small>
+                                <input onclick="return formfmValidate(this.name)" title="'.$description.'" name="'.$name.'" type="image" alt="'.$name.'" src="'.$image.'" value="clicked" /><br><small>'.$description.'</small>
                                 </td>';
                         }

sandbox/filemanager/inc/hook_admin.inc.php

@@ -1 +1 @@
 <?php
+if(!isset($GLOBALS['phpgw_info'])){
+        $GLOBALS['phpgw_info']['flags'] = array(
+                'currentapp' => 'filemanager',
+                'nonavbar'   => true,
+                'noheader'   => true
+        );
+}
+require_once '../header.inc.php';
 
+
+        /**************************************************************************\
+        * eGroupWare                                                               *
+        * http://www.egroupware.org                                                *
+        * Written by Joseph Engo <jengo@phpgroupware.org>                          *
+        * --------------------------------------------                             *
+        *  This program is free software; you can redistribute it and/or modify it *
+        *  under the terms of the GNU General Public License as published by the   *
+        *  Free Software Foundation; either version 2 of the License, or (at your  *
+        *  option) any later version.                                              *
+        \**************************************************************************/
+
+{
+// Only Modify the $file and $title variables.....
+        $title = $appname;
+        $file = Array(
+                'Site Configuration' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname),
+        );
+//Do not modify below this line
+        display_section($appname,$title,$file);
+}
 ?>

sandbox/filemanager/index.php

@@ -20 +20 @@
 
         include('../header.inc.php');
+/*      $preferences = $GLOBALS['phpgw']->preferences->read();
+$_SESSION['phpgw_info']['user']['preferences']['filemanager'] = $preferences['filemanager'];*/
 
         Header('Location: '.$GLOBALS['phpgw']->link('/index.php','menuaction=filemanager.uifilemanager.index'));

sandbox/filemanager/setup/phpgw_pt-br.lang

@@ -60 +60 @@
 go to your home directory       filemanager     pt-br   Ir para sua pasta Home
 go to:  filemanager     pt-br   Ir para:
-go up   filemanager     pt-br   subir
+go up   filemanager     pt-br   Subir
 home    filemanager     pt-br   Início
 location        filemanager     pt-br   Local
@@ -79 +79 @@
 preview of %1   filemanager     pt-br   Visualizar %1
 quick jump to   filemanager     pt-br   Atalho para:
-reload  filemanager     pt-br   recarregar
+reload  filemanager     pt-br   Recarregar
 rename  filemanager     pt-br   Renomear
 renamed %1 to %2        filemanager     pt-br   Renomeado %1 para %2