Changeset 17302 for trunk/admin/configuration.php

Timestamp:

Aug 1, 2012, 9:03:17 PM (12 years ago)

Author:

rvelices

Message:

merge-r17295 from branch 2.4 feature 2708: in admin, display allowed custom derivatives and ability to delete them

File:

• trunk/admin/configuration.php (modified) (18 diffs)

trunk/admin/configuration.php

@@ -107 +107 @@
     'privacy_level',
   );
-  
+
 // image order management
 $sort_fields = array(
@@ -127 +127 @@
   'rank ASC'            => l10n('Manual sort order'),
   );
-  
+
 $comments_order = array(
   'ASC' => l10n('Show oldest comments first'),
@@ -142 +142 @@
   {
     case 'main' :
-    {      
+    {
       if ( !isset($conf['order_by_custom']) and !isset($conf['order_by_inside_category_custom']) )
       {
@@ -159 +159 @@
             // limit to the number of available parameters
             $order_by = $order_by_inside_category = array_slice($_POST['order_by'], 0, ceil(count($sort_fields)/2));
-            
+
             // there is no rank outside categories
             if ( ($i = array_search('rank ASC', $order_by)) !== false)
@@ -165 +165 @@
               unset($order_by[$i]);
             }
-            
+
             // must define a default order_by if user want to order by rank only
             if ( count($order_by) == 0 )
@@ -171 +171 @@
               $order_by = array('id ASC');
             }
-            
+
             $_POST['order_by'] = 'ORDER BY '.implode(', ', $order_by);
             $_POST['order_by_inside_category'] = 'ORDER BY '.implode(', ', $order_by_inside_category);
@@ -181 +181 @@
         }
       }
-      
+
       foreach( $main_checkboxes as $checkbox)
       {
@@ -190 +190 @@
     case 'watermark' :
     {
-      include(PHPWG_ROOT_PATH.'admin/include/configuration_watermark_process.inc.php');        
+      include(PHPWG_ROOT_PATH.'admin/include/configuration_watermark_process.inc.php');
       break;
     }
     case 'sizes' :
     {
-      include(PHPWG_ROOT_PATH.'admin/include/configuration_sizes_process.inc.php');        
+      include(PHPWG_ROOT_PATH.'admin/include/configuration_sizes_process.inc.php');
       break;
     }
@@ -303 +303 @@
 {
   case 'main' :
-  {   
-    
+  {
+
     function order_by_is_local()
     {
@@ -312 +312 @@
         @include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR. 'config/config.inc.php');
       }
-      
+
       return isset($conf['order_by']) or isset($conf['order_by_inside_category']);
     }
-    
+
     if (order_by_is_local())
     {
       array_push($page['warnings'], l10n('You have specified <i>$conf[\'order_by\']</i> in your local configuration file, this parameter in deprecated, please remove it or rename it into <i>$conf[\'order_by_custom\']</i> !'));
     }
-    
+
     if ( isset($conf['order_by_custom']) or isset($conf['order_by_inside_category_custom']) )
     {
@@ -333 +333 @@
       $order_by = explode(', ', $order_by);
     }
-  
+
     $template->assign(
       'main',
@@ -441 +441 @@
           )
         );
-      
+
       foreach ($sizes_checkboxes as $checkbox)
       {
@@ -452 +452 @@
           );
       }
-      
+
       // derivatives = multiple size
       $enabled = ImageStdParams::get_defined_type_map();
@@ -465 +465 @@
       {
         $tpl_var = array();
-        
+
         $tpl_var['must_square'] = ($type==IMG_SQUARE ? true : false);
         $tpl_var['must_enable'] = ($type==IMG_SQUARE || $type==IMG_THUMB)? true : false;
-        
+
         if ($params = @$enabled[$type])
         {
@@ -478 +478 @@
           $params=@$disabled[$type];
         }
-        
+
         if ($params)
         {
@@ -496 +496 @@
       $template->assign('derivatives', $tpl_vars);
       $template->assign('resize_quality', ImageStdParams::$quality);
+
+      $tpl_vars = array();
+      $now = time();
+      foreach(ImageStdParams::$custom as $custom=>$time)
+      {
+        $tpl_vars[$custom] = ($now-$time<=24*3600) ? l10n('today') : time_since($time, 'day');
+      }
+      $template->assign('custom_derivatives', $tpl_vars);
     }
 
@@ -547 +555 @@
         $position = 'bottomright';
       }
-      
+
       if ($wm->xrepeat != 0)
       {
         $position = 'custom';
       }
-    
+
       $template->assign(
         'watermark',
@@ -567 +575 @@
         );
     }
-    
+
     break;
   }