Fix: try to fix bookmark import size limit

diff --git a/data/templates/default/importNetscape.tpl.php b/data/templates/default/importNetscape.tpl.php
index 627a5af10d96ba337c703312f22f8b36e2e7ece2..7ed4bb1f2ed1dd0d2b36d08193f23ecd9696e28b 100644 (file)
--- a/data/templates/default/importNetscape.tpl.php
+++ b/data/templates/default/importNetscape.tpl.php
@@ -8,7 +8,7 @@ $this->includeTemplate($GLOBALS['top_include']);
     <tr valign="top">
         <th align="left"><?php echo T_('File'); ?></th>
         <td>
-            <input type="hidden" name="MAX_FILE_SIZE" value="1024000" />
+            <input type="hidden" name="MAX_FILE_SIZE" value="104857600" />
             <input type="file" name="userfile" size="50" />
         </td>
     </tr>
@@ -47,4 +47,4 @@ $this->includeTemplate($GLOBALS['top_include']);
 
 <?php
 $this->includeTemplate($GLOBALS['bottom_include']);
-?>
\ No newline at end of file
+?>

diff --git a/puppet/config/node/links.example.org.yaml b/puppet/config/node/links.example.org.yaml
index 449feff5903a251fe4ee6dc50a096c6a4195ca4e..9041cbf8f355b6f43ec2f741a18ff8b191147293 100644 (file)
--- a/puppet/config/node/links.example.org.yaml
+++ b/puppet/config/node/links.example.org.yaml
@@ -10,6 +10,20 @@ nodo::role: 'web'
 classes:
   - 'php'
 
+#
+# PHP
+#
+php::config:
+  #post_max_size:
+  #  series: '7'
+  #  value: '100M'
+  #upload_max_filesize:
+  #  series: '7'
+  #  value:  '100M'
+  memory_limit:
+    series:  '7'
+    value:   '128M'
+
 #
 # MySQL
 #

diff --git a/www/importNetscape.php b/www/importNetscape.php
index 9a5240703292f9a8523a1c8ff75e17a58a88748f..909305d13a652cf1cf896db778111b059c2dfd9a 100644 (file)
--- a/www/importNetscape.php
+++ b/www/importNetscape.php
@@ -33,6 +33,10 @@ isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_
 $countImportedBookmarks = 0;
 $tplVars['msg'] = '';
 
+if ($userservice->isLoggedOn() && sizeof($_FILES)) {
+print_r($_FILES['userfile']);
+}
+
 if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['size'] > 0) {
        $userinfo = $userservice->getCurrentObjectUser();