tutos-commits Mailing List for TUTOS (Page 9)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1142
          http://sourceforge.net/p/tutos/code/1142
Author:   gokohnert
Date:     2013-08-19 05:51:11 +0000 (Mon, 19 Aug 2013)
Log Message:
-----------
use also max post to evaluate maximum file transfer

Modified Paths:
--------------
    trunk/.htaccess
    trunk/php/file/file_new.php
    trunk/php/webelements.p3

Modified: trunk/.htaccess
===================================================================

--- trunk/.htaccess	2013-08-19 05:49:41 UTC (rev 1141)
+++ trunk/.htaccess	2013-08-19 05:51:11 UTC (rev 1142)
@@ -56,13 +56,14 @@
 
 # If Options are allowed you can enable the php_value
 <IfModule mod_php5.c>
-#php_value mbstring.func_overload "1"
-#php_value upload_max_filesize "20M"
-#php_value memory_limit "256M"
-#php_value ignore_repeated_errors  "1"
-#php_value magic_quotes_gpc  "0"
-#php_value arg_separator.output "&"
-#php_value max_input_vars "2048"
+# php_value mbstring.func_overload "1"
+# php_value upload_max_filesize "20M"
+# php_value post_max_size "20M"
+# php_value memory_limit "256M"
+# php_value ignore_repeated_errors  "1"
+# php_value magic_quotes_gpc  "0"
+# php_value arg_separator.output "&"
+# php_value max_input_vars "2048"
 # php_value eaccelerator.enable "0"
 # php_value apc.enabled "0"
 </IfModule>

Modified: trunk/php/file/file_new.php
===================================================================
--- trunk/php/file/file_new.php	2013-08-19 05:49:41 UTC (rev 1141)
+++ trunk/php/file/file_new.php	2013-08-19 05:51:11 UTC (rev 1142)
@@ -47,23 +47,21 @@
         $r .= $this->Headline();
         $r .= $this->acl_line(true);
 
-        $r .= "<tr>\n";
+        $r .= $this->EditRowStart();
         $r .= $this->showfieldc($lang['FileNameDoc'],0,"name");
         $r .= ' <td><input id="name" maxlength="'.$table['file']['name'][size]."\" name=\"name\" value=\"". $this->obj->name ."\" /></td>\n";
         $r .= $this->showfieldc($lang['FileVersion'],0,"version");
         $r .= ' <td><input id="version" size="10" maxlength="'.$table['file']['version'][size].'" name="version" value="'. $this->obj->version ."\" /></td>\n";
-        $r .= "</tr>\n";
+        $r .= $this->EditRowEnd();
 
-        $r .= "<tr>\n";
+        $r .= $this->EditRowStart();
         $r .= $this->showfieldc($lang['FileAuthor'],0,"a");
-        $r .= " <td colspan=\"3\">\n";
-        $r .= select_from_array_or_input($this->obj,"a",$this->obj->author,0,array(useaddressbook,useteams,usecompany,usedepartment));
-        $r .= " </td>\n";
-        $r .= "</tr>\n";
+        $r .= $this->showdata(select_from_array_or_input($this->obj,"a",$this->obj->author,0,array(useaddressbook,useteams,usecompany,usedepartment)),$this->width-1);
+        $r .= $this->EditRowEnd();
 
         $cnt = 0;
         foreach ($this->obj->links as $i => $f) {
-            $r .= "<tr>\n";
+            $r .= $this->EditRowStart();
             if ($cnt == 0) {
                 $r .= $this->showfield($lang['FileReference'],0,"link_id_".$cnt);
             } else {
@@ -83,10 +81,10 @@
             }
             $r .= " </td>\n";
 
-            $r .= "</tr>\n";
+            $r .= $this->EditRowEnd();
         }
         // Allow new References
-        $r .= "<tr>\n";
+        $r .= $this->EditRowStart();
         if ($cnt == 0) {
             $r .= $this->showfield($lang['FileReference'],0,"link_id_".$cnt);
         } else {
@@ -123,44 +121,42 @@
             $r .= "  <input name=\"refname\" size=\"30\" value=\"". myentities($this->refname)."\" />\n";
             $r .= " </td>\n";
         }
-        $r .= "</tr>\n";
+        $r .= $this->EditRowEnd();
 
-        $r .= "<tr>\n";
+        $r .= $this->EditRowStart();
         $r .= $this->showfield($lang['FileName'],0,"file");
         $r .= ' <td colspan="3"><input id="file1" size="40" name="file1" type="file" value="'. $this->obj->filename ."\" />\n";
         if ( $this->obj->id != -1 ) {
             $r .= '<br /><span class="small">'. $this->obj->filename .'</span>';
         }
-        $r .= '<br /><span class="small">(max. allowed size = '. ini_get('upload_max_filesize') .' Bytes)</span>';
+        $r .= '<br /><span class="small">(max. allowed size = '. min(ini_get_number('upload_max_filesize'),ini_get_number('post_max_size'))/(1024*1024) .' Megabytes)</span>';
         $r .= " </td>\n";
-        $r .= "</tr>\n";
+        $r .= $this->EditRowEnd();
 
         if ($tutos['file_local_allow'] == 1 && is_dir($tutos['file_local_searchpath']) ) {
-            $r .= "<tr>\n";
+            $r .= $this->EditRowStart();
             $r .= $this->showfield($lang['FileName'],0,"file2");
-            $r .= ' <td colspan="4"><i>'. sprintf($lang['FileLocalInfo'],$tutos['file_local_searchpath'])."</i></td>\n";
-            $r .= "</tr>\n";
-            $r .= "<tr>\n";
-            $r .= " <td></td>\n";
-            $r .= " <td id=\"file\" colspan=\"3\">\n";
+            $r .= $this->showdata('<i>'. sprintf($lang['FileLocalInfo'],$tutos['file_local_searchpath']).'</i>',$this->width-1);
+            $r .= $this->EditRowEnd();
 
-            $r .= tutos_file::get_local_selection();
-            $r .= " </td>\n";
-            $r .= "</tr>\n";
+            $r .= $this->EditRowStart();
+            $r .= $this->showfield('');
+            $r .= $this->showdata(tutos_file::get_local_selection(),$this->width-1);
+            $r .= $this->EditRowEnd();
         }
 
         if ( ($this->obj->id != -1) && ($this->obj->vsys != 0) ) {
-            $r .= "<tr>\n";
+            $r .= $this->EditRowStart();
             $r .= $this->showfield($lang['FileVersioning'],0,"save");
             $r .= " <td id=\"save\" colspan=\"3\">\n";
             $r .= ' <span class="small"><i>'. $lang['FileVersioningI'] ."</i></span><br />\n";
             $r .= '  <input type="radio" name="save" value="0" />&nbsp;'. sprintf($lang['FileOverwrite'],$this->obj->getFullname()) ."<br />\n";
             $r .= '  <input type="radio" name="save" value="1" checked="checked" />&nbsp;'. sprintf($lang['FileSave'],$this->obj->name,$this->obj->version) ."\n";
             $r .= " </td>\n";
-            $r .= "</tr>\n";
+            $r .= $this->EditRowEnd();
         }
         if ( $this->obj->id == -1 ) {
-            $r .= "<tr>\n";
+            $r .= $this->EditRowStart();
             $r .= $this->showfield($lang['FileVersionType'],0,"vsys");
             $r .= " <td id=\"vsys\" colspan=\"3\">&nbsp;\n";
             $r .= ' <span class="small"><i>'. $lang['FileVersionTypeI'] ."</i></span><br />\n";
@@ -170,16 +166,16 @@
                 $r .= "  <input type=\"radio\" name=\"vsys\" value=\"2\"". ( $this->obj->vsys == 2 ? ' checked="checked"':'') ." />&nbsp;RCS \n";
             }
             $r .= " </td>\n";
-            $r .= "</tr>\n";
+            $r .= $this->EditRowEnd();
         }
 
-        $r .= "<tr>\n";
+        $r .= $this->EditRowStart();
         $r .= $this->showfield($lang['FileLocking'],0,"locked");
         $r .= " <td id=\"locked\" colspan=\"3\">&nbsp;\n";
         $r .= "  <input type=\"radio\" name=\"locked\" value=\"0\" ". ( $this->obj->locked == 0 ? ' checked="checked"':'') ." />&nbsp;". $lang['FileUnlocked'] ."\n";
         $r .= "  <input type=\"radio\" name=\"locked\" value=\"". $this->user->id ."\"". ( $this->obj->locked == $this->user->id ? ' checked="checked"':'') ." />&nbsp;". sprintf ($lang['FileLocked'], $this->user->getLink()) ."\n" ;
         $r .= " </td>\n";
-        $r .= "</tr>\n";
+        $r .= $this->EditRowEnd();
 
         // Edit additional custom fields
         $r .= edit_custom_fields($this,$this->obj->gettype(),$this->obj,$this->width);
@@ -213,21 +209,19 @@
         $r .= $this->Headline($lang['FileConnect']);
 
 
-        $r .= "<tr>\n";
+        $r .= $this->EditRowStart();
         $r .= $this->showfield($lang['FileReference'],0,"link_id_".$cnt);
         foreach($this->obj->links as $a) {
             break;
         }
         $r .= $this->showdata($lang[$a->getType()].': '.$a->getLink(),5);
         $this->addHidden("link_id",$a->id);
-        $r .= "</tr>\n";
+        $r .= $this->EditRowEnd();
 
-        $r .= "<tr>\n";
+        $r .= $this->EditRowStart();
         $r .= $this->showfield($lang['FileNameDoc'],1,'file3');
-        $r .= " <td colspan=\"5\">\n";
-        $r .= select_from_array_or_input($this->obj,'file3',$this->target,1,array(usedocmanagement));
-        $r .= " </td>\n";
-        $r .= "</tr>\n";
+        $r .= $this->showdata(select_from_array_or_input($this->obj,'file3',$this->target,1,array(usedocmanagement)),$this->width-1);
+        $r .= $this->EditRowEnd();
 
         if ( isset($this->obj->id) && ($this->obj->id != -1) ) {
             $r .= $this->submit_reset_row(0,1,1,1,1,0);
@@ -346,4 +340,4 @@
 <!--
 SVN Info  $Id$
 $Author$
--->
+-->
\ No newline at end of file

Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3	2013-08-19 05:49:41 UTC (rev 1141)
+++ trunk/php/webelements.p3	2013-08-19 05:51:11 UTC (rev 1142)
@@ -31,6 +31,20 @@
 define('EMPTY','#');
 
 /**
+ * get a ini value that is possibly noted as M or K
+ */
+function ini_get_number($key) {
+    $x = ini_get($key);
+    $regs = array();
+    if (preg_match('/^([0-9].*)M$/',$x,$regs)) {
+        $x = $regs[1] * 1024 * 1024;
+    } else if (preg_match('/^([0-9].*)K$/',$x,$regs)) {
+        $x = $regs[1] * 1024;
+    }
+    return $x;
+}
+
+/**
  * format a given byte count in a human readable form
  */
 function format_size($s) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2001	Jan	Feb	Mar	Apr	May	Jun	Jul (13)	Aug (214)	Sep (144)	Oct (22)	Nov (22)	Dec (93)
2002	Jan (25)	Feb (31)	Mar (92)	Apr (70)	May (103)	Jun (130)	Jul (265)	Aug (325)	Sep (233)	Oct (244)	Nov (261)	Dec (157)
2003	Jan (101)	Feb (135)	Mar (148)	Apr (164)	May (53)	Jun (116)	Jul (149)	Aug (126)	Sep (45)	Oct (109)	Nov (36)	Dec (61)
2004	Jan (131)	Feb (236)	Mar (278)	Apr (259)	May (92)	Jun (110)	Jul (150)	Aug (64)	Sep (141)	Oct (141)	Nov (146)	Dec (65)
2005	Jan (70)	Feb (77)	Mar (129)	Apr (153)	May (161)	Jun (63)	Jul (42)	Aug (16)	Sep (30)	Oct (3)	Nov (8)	Dec (40)
2006	Jan (114)	Feb (16)	Mar (12)	Apr (15)	May (4)	Jun (9)	Jul (69)	Aug (27)	Sep (12)	Oct (80)	Nov (62)	Dec (41)
2007	Jan (34)	Feb (2)	Mar (38)	Apr (82)	May (61)	Jun (37)	Jul (16)	Aug (64)	Sep (7)	Oct (52)	Nov (18)	Dec (28)
2008	Jan (168)	Feb (26)	Mar (27)	Apr (19)	May (10)	Jun (58)	Jul (58)	Aug (91)	Sep (14)	Oct (23)	Nov (56)	Dec (38)
2009	Jan (58)	Feb (90)	Mar (204)	Apr (90)	May (27)	Jun (177)	Jul (116)	Aug (53)	Sep (42)	Oct (120)	Nov (51)	Dec (58)
2010	Jan (117)	Feb (231)	Mar (163)	Apr (90)	May (40)	Jun (139)	Jul (49)	Aug (118)	Sep (25)	Oct (80)	Nov (102)	Dec (99)
2011	Jan (176)	Feb (42)	Mar (60)	Apr (52)	May (30)	Jun (29)	Jul (27)	Aug (16)	Sep (51)	Oct (70)	Nov (63)	Dec (58)
2012	Jan (28)	Feb (26)	Mar (7)	Apr (12)	May (41)	Jun (61)	Jul (59)	Aug (38)	Sep (30)	Oct (28)	Nov (14)	Dec (31)
2013	Jan (24)	Feb (54)	Mar (45)	Apr (22)	May (35)	Jun (8)	Jul (18)	Aug (38)	Sep (11)	Oct (8)	Nov (19)	Dec (20)
2014	Jan (20)	Feb (22)	Mar (4)	Apr (6)	May (13)	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec (6)
2015	Jan	Feb (1)	Mar (4)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec (1)
2016	Jan (4)	Feb	Mar	Apr (1)	May	Jun	Jul (2)	Aug (4)	Sep (1)	Oct (1)	Nov (1)	Dec
2017	Jan	Feb	Mar	Apr	May	Jun (3)	Jul (8)	Aug (13)	Sep (12)	Oct	Nov	Dec
2018	Jan	Feb	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec
2020	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (2)
2021	Jan	Feb (1)	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

tutos-commits Mailing List for TUTOS (Page 9)

Projects / CRM / PLM / Calendar / Tasks / SCRUM / Test / Inventory

tutos-commits — SVN commits