Changeset 6629 for trunk/admin

Timestamp:

Jun 29, 2010, 10:18:10 PM (14 years ago)

Author:

plg

Message:

merge r6628 from branch 2.1 to trunk

improvement: ability to hide setup warnings for upload. Warnings will
automatically come back at next user session.

Location:

trunk/admin

Files:

• photos_add_direct.php (modified) (2 diffs)
• themes/default/template/photos_add_direct.tpl (modified) (1 diff)

trunk/admin/photos_add_direct.php

@@ -488 +488 @@
 
 // +-----------------------------------------------------------------------+
-// |                             setup errors                              |
-// +-----------------------------------------------------------------------+
-
+// |                         setup errors/warnings                         |
+// +-----------------------------------------------------------------------+
+
+// Errors
 $setup_errors = array();
-$setup_warnings = array();
 
 $error_message = ready_for_upload_message();
@@ -505 +505 @@
 }
 
-if ($conf['use_exif'] and !function_exists('read_exif_data'))
-{
-  array_push(
-    $setup_warnings,
-    l10n('Exif extension not available, admin should disable exif use')
-    );
-}
-
-if (get_ini_size('upload_max_filesize') > get_ini_size('post_max_size'))
-{
-  array_push(
-    $setup_warnings,
-    sprintf(
-      l10n('In your php.ini file, the upload_max_filesize (%sB) is bigger than post_max_size (%sB), you should change this setting'),
-      get_ini_size('upload_max_filesize', false),
-      get_ini_size('post_max_size', false)
+$template->assign(
+  array(
+    'setup_errors'=> $setup_errors,
+    )
+  );
+
+// Warnings
+if (isset($_GET['hide_warnings']))
+{
+  $_SESSION['upload_hide_warnings'] = true;
+}
+
+if (!isset($_SESSION['upload_hide_warnings']))
+{
+  $setup_warnings = array();
+  
+  if ($conf['use_exif'] and !function_exists('read_exif_data'))
+  {
+    array_push(
+      $setup_warnings,
+      l10n('Exif extension not available, admin should disable exif use')
+      );
+  }
+
+  if (get_ini_size('upload_max_filesize') > get_ini_size('post_max_size'))
+  {
+    array_push(
+      $setup_warnings,
+      sprintf(
+        l10n('In your php.ini file, the upload_max_filesize (%sB) is bigger than post_max_size (%sB), you should change this setting'),
+        get_ini_size('upload_max_filesize', false),
+        get_ini_size('post_max_size', false)
+        )
+      );
+  }
+
+  $template->assign(
+    array(
+      'setup_warnings' => $setup_warnings,
+      'hide_warnings_link' => PHOTOS_ADD_BASE_URL.'&upload_mode='.$upload_mode.'&hide_warnings=1'
       )
     );
 }
 
-$template->assign(
-    array(
-      'setup_errors'=> $setup_errors,
-      'setup_warnings' => $setup_warnings,
-    )
-  );
-
 // +-----------------------------------------------------------------------+
 // |                           sending html code                           |

trunk/admin/themes/default/template/photos_add_direct.tpl

@@ -251 +251 @@
     {/foreach}
   </ul>
+  <div class="hideButton" style="text-align:center"><a href="{$hide_warnings_link}">{'Hide'|@translate}</a></div>
 </div>
   {/if}