Changeset 13074

Timestamp:

Feb 9, 2012, 10:11:34 PM (12 years ago)

Author:

rvelices

Message:

• remove square/thumb from choices on picture
• fix content margin on password register
• purge derivative cache by type of derivative
• session saved infos/messages are not given to the page on html redirections
• shorter/faster code in functions_xxx

Location:

trunk

Files:

• admin/maintenance.php (modified) (3 diffs)
• admin/themes/default/template/maintenance.tpl (modified) (1 diff)
• include/functions_category.inc.php (modified) (1 diff)
• include/functions_user.inc.php (modified) (18 diffs)
• include/page_header.php (modified) (3 diffs)
• include/ws_functions.inc.php (modified) (3 diffs)
• picture.php (modified) (2 diffs)
• themes/default/template/index.tpl (modified) (1 diff)
• themes/default/template/password.tpl (modified) (1 diff)
• themes/default/template/picture.tpl (modified) (2 diffs)
• themes/default/template/register.tpl (modified) (1 diff)

trunk/admin/maintenance.php

@@ -143 +143 @@
   case 'derivatives':
   {
-    clear_derivative_cache();
+    clear_derivative_cache($_GET['type']);
     break;
   }
@@ -159 +159 @@
 
 $url_format = get_root_url().'admin.php?page=maintenance&action=%s&pwg_token='.get_pwg_token();
+
+$purge_urls[l10n('all')] = sprintf($url_format, 'derivatives').'&type=all';
+foreach(ImageStdParams::get_defined_type_map() as $params)
+{
+  $purge_urls[ l10n($params->type) ] = sprintf($url_format, 'derivatives').'&type='.$params->type;
+}
 
 $template->assign(
@@ -174 +180 @@
     'U_MAINT_COMPILED_TEMPLATES' => sprintf($url_format, 'compiled-templates'),
     'U_MAINT_DERIVATIVES' => sprintf($url_format, 'derivatives'),
+    'purge_derivatives' => $purge_urls,
     'U_HELP' => get_root_url().'admin/popuphelp.php?page=maintenance',
     )
   );
+
 
 if ($conf['gallery_locked'])

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

@@ -35 +35 @@
         <li><a href="{$U_MAINT_SEARCH}"onclick="return confirm('{'Purge search history'|@translate|@escape:'javascript'}');">{'Purge search history'|@translate}</a></li>
         <li><a href="{$U_MAINT_COMPILED_TEMPLATES}">{'Purge compiled templates'|@translate}</a></li>
-        <li><a href="{$U_MAINT_DERIVATIVES}">{'Purge derivative image cache'|@translate}</a></li>
+        <li>{'Purge derivative image cache'|@translate}: 
+        {foreach from=$purge_derivatives key=name item=url name=loop}{if !$smarty.foreach.loop.first}, {/if}<a href="{$url}">{$name}</a>{/foreach}
+        </li>
 </ul>

trunk/include/functions_category.inc.php

@@ -486 +486 @@
 }
 
-/**
- * create a tree from a flat list of categories, no recursivity for high speed
- */
-function categories_flatlist_to_tree($categories)
-{
-  $tree = array();
-  $key_of_cat = array();
-
-  foreach ($categories as $key => &$node)
-  {
-    $key_of_cat[$node['id']] = $key;
-
-    if (!isset($node['id_uppercat']))
-    {
-      $tree[$key] = &$node;
-    }
-    else
-    {
-      if (!isset($categories[ $key_of_cat[ $node['id_uppercat'] ] ]['sub_categories']))
-      {
-        $categories[ $key_of_cat[ $node['id_uppercat'] ] ]['sub_categories'] = array();
-      }
-
-      $categories[ $key_of_cat[ $node['id_uppercat'] ] ]['sub_categories'][$key] = &$node;
-    }
-  }
-
-  return $tree;
-}
+
 ?>

trunk/include/functions_user.inc.php

@@ -74 +74 @@
 {
   global $conf;
-  
+
   if (defined("PHPWG_INSTALLED"))
   {
@@ -106 +106 @@
 
   $SCU_users = array();
-  
+
   $q = pwg_query("
     SELECT ".$conf['user_fields']['username']." AS username
@@ -115 +115 @@
    // $SCU_users is now an associative table where the key is the account as
    // registered in the DB, and the value is this same account, in lower case
-   
+
   $users_found = array_keys($SCU_users, $username_lo);
   // $users_found is now a table of which the values are all the accounts
@@ -131 +131 @@
   if ($login == '')
   {
-    array_push($errors, l10n('Please, enter a login'));
+    $errors[] = l10n('Please, enter a login');
   }
   if (preg_match('/^.* $/', $login))
   {
-    array_push($errors, l10n('login mustn\'t end with a space character'));
+    $errors[] = l10n('login mustn\'t end with a space character');
   }
   if (preg_match('/^ .*$/', $login))
   {
-    array_push($errors, l10n('login mustn\'t start with a space character'));
+    $errors[] = l10n('login mustn\'t start with a space character');
   }
   if (get_userid($login))
   {
-    array_push($errors, l10n('this login is already used'));
+    $errors[] = l10n('this login is already used');
   }
   if ($login != strip_tags($login))
   {
-    array_push($errors, l10n('html tags are not allowed in login'));
+    $errors[] = l10n('html tags are not allowed in login');
   }
   $mail_error = validate_mail_address(null, $mail_address);
   if ('' != $mail_error)
   {
-    array_push($errors, $mail_error);
+    $errors[] = $mail_error;
   }
 
@@ -160 +160 @@
     if ($login_error != '')
     {
-      array_push($errors, $login_error);
+      $errors[] = $login_error;
     }
   }
@@ -206 +206 @@
       while ($row = pwg_db_fetch_assoc($result))
       {
-        array_push
-        (
-          $inserts,
-          array
-          (
+          $inserts[] = array(
             'user_id' => $next_id,
             'group_id' => $row['id']
-          )
-        );
+          );
       }
     }
@@ -401 +396 @@
       if ( empty($forbidden_ids) )
       {
-        array_push( $forbidden_ids, 0 );
+        $forbidden_ids[] = 0;
       }
       $userdata['image_access_type'] = 'NOT IN'; //TODO maybe later
@@ -424 +419 @@
           if ($cat['count_images']==0)
           {
-            array_push($forbidden_ids, $cat['cat_id']);
+            $forbidden_ids[] = $cat['cat_id'];
             unset( $user_cache_cats[$cat['cat_id']] );
           }
@@ -519 +514 @@
   ).'
 ;';
-  $result = pwg_query($query);
-  $authorizeds = array();
-  while ($row = pwg_db_fetch_assoc($result))
-  {
-    array_push($authorizeds, $row['image_id']);
-  }
+  $authorizeds = array_from_query($query, 'image_id');
 
   $query = '
@@ -531 +521 @@
   WHERE user_id = '.$user['id'].'
 ;';
-  $result = pwg_query($query);
-  $favorites = array();
-  while ($row = pwg_db_fetch_assoc($result))
-  {
-    array_push($favorites, $row['image_id']);
-  }
+  $favorites = array_from_query($query, 'image_id');
 
   $to_deletes = array_diff($favorites, $authorizeds);
-
   if (count($to_deletes) > 0)
   {
@@ -565 +549 @@
 function calculate_permissions($user_id, $user_status)
 {
-  $private_array = array();
-  $authorized_array = array();
-
   $query = '
 SELECT id
@@ -573 +554 @@
   WHERE status = \'private\'
 ;';
-  $result = pwg_query($query);
-  while ($row = pwg_db_fetch_assoc($result))
-  {
-    array_push($private_array, $row['id']);
-  }
+  $private_array = array_from_query($query, 'id');
 
   // retrieve category ids directly authorized to the user
@@ -618 +595 @@
     while ($row = pwg_db_fetch_assoc($result))
     {
-      array_push($forbidden_array, $row['id']);
+      $forbidden_array[] = $row['id'];
     }
     $forbidden_array = array_unique($forbidden_array);
@@ -627 +604 @@
    // where clauses such as "WHERE category_id NOT IN(0)" will always be
    // true.
-    array_push($forbidden_array, 0);
+    $forbidden_array[] = 0;
   }
 
@@ -810 +787 @@
 
   $email = pwg_db_real_escape_string($email);
-  
+
   $query = '
 SELECT
@@ -932 +909 @@
     return $theme;
   }
-  
+
   // let's find the first available theme
   $active_themes = get_pwg_themes();
@@ -1159 +1136 @@
   // we force the session table to be clean
   pwg_session_gc();
-  
+
   global $conf;
   // retrieving the encrypted password of the login submitted
@@ -1352 +1329 @@
 {
   global $user, $conf;
-  
+
   if (is_a_guest())
   {
     return false;
   }
-  
+
   if (!in_array($action, array('delete','edit', 'validate')))
   {

trunk/include/page_header.php

@@ -67 +67 @@
 
 // No referencing is required
-if ( !$conf['meta_ref'] ) 
+if ( !$conf['meta_ref'] )
 {
   $page['meta_robots']['noindex'] = 1;
@@ -82 +82 @@
 }
 if ( !isset($page['meta_robots']['noindex']) )
-{ 
-  $template->assign('meta_ref',1); 
+{
+  $template->assign('meta_ref',1);
 }
 
@@ -98 +98 @@
       ));
 }
+else
+{// messages only if no redirection
+  foreach (array('errors','infos') as $mode)
+  {
+    if (isset($_SESSION['page_'.$mode]))
+    {
+      $page[$mode] = array_merge($page[$mode], $_SESSION['page_'.$mode]);
+      unset($_SESSION['page_'.$mode]);
+    }
 
-
-// messages
-foreach (array('errors','infos') as $mode)
-{
-  if (isset($_SESSION['page_'.$mode]))
-  {
-    $page[$mode] = array_merge($page[$mode], $_SESSION['page_'.$mode]);
-    unset($_SESSION['page_'.$mode]);
-  }
-  
-  if (count($page[$mode]) != 0)
-  {
-    $template->assign($mode, $page[$mode]);
+    if (count($page[$mode]) != 0)
+    {
+      $template->assign($mode, $page[$mode]);
+    }
   }
 }
-
 trigger_action('loc_end_page_header');
 

trunk/include/ws_functions.inc.php

@@ -521 +521 @@
 }
 
+
+/**
+ * create a tree from a flat list of categories, no recursivity for high speed
+ */
+function categories_flatlist_to_tree($categories)
+{
+  $tree = array();
+  $key_of_cat = array();
+
+  foreach ($categories as $key => &$node)
+  {
+    $key_of_cat[$node['id']] = $key;
+
+    if (!isset($node['id_uppercat']))
+    {
+      $tree[$key] = &$node;
+    }
+    else
+    {
+      if (!isset($categories[ $key_of_cat[ $node['id_uppercat'] ] ]['sub_categories']))
+      {
+        $categories[ $key_of_cat[ $node['id_uppercat'] ] ]['sub_categories'] = array();
+      }
+
+      $categories[ $key_of_cat[ $node['id_uppercat'] ] ]['sub_categories'][$key] = &$node;
+    }
+  }
+
+  return $tree;
+}
 
 /**
@@ -1670 +1700 @@
   {
     $do_update = false;
-    
+
     $infos = pwg_image_infos($file_path);
-    
+
     foreach (array('width', 'height', 'filesize') as $image_info)
     {
@@ -1745 +1775 @@
   // else we use "file".
   remove_chunks($params['original_sum'], 'thumb');
-  
+
   if (isset($params['high_sum']))
   {

trunk/picture.php

@@ -171 +171 @@
   foreach($element_info['derivatives'] as $type => $derivative)
   {
+    if ($type==IMG_SQUARE || $type==IMG_THUMB)
+      continue;
     $url = $derivative->get_url();
     if (isset($added[$url]))
@@ -806 +808 @@
 if (!empty($picture['current']['author']))
 {
-  $infos['INFO_AUTHOR'] =
-// FIXME because of search engine partial rewrite, giving the author
-// name threw GET is not supported anymore. This feature should come
-// back later, with a better design
-//     '<a href="'.
-//       PHPWG_ROOT_PATH.'category.php?cat=search'.
-//       '&amp;search=author:'.$picture['current']['author']
-//       .'">'.$picture['current']['author'].'</a>';
-    $picture['current']['author'];
+  $infos['INFO_AUTHOR'] = $picture['current']['author'];
 }
 

trunk/themes/default/template/index.tpl

@@ -132 +132 @@
 </div>{* <!-- titrePage --> *}
 
+{if isset($errors) or not empty($infos)}
 {include file='infos_errors.tpl'}
-
+{/if}
 {if !empty($PLUGIN_INDEX_CONTENT_BEGIN)}{$PLUGIN_INDEX_CONTENT_BEGIN}{/if}
 

trunk/themes/default/template/password.tpl

@@ -1 +1 @@
 {if isset($MENUBAR)}{$MENUBAR}{/if}
-<div id="content" class="content">
+<div id="content" class="content{if isset($MENUBAR)} contentWithMenu{/if}">
   <div class="titrePage">
     <ul class="categoryActions">

trunk/themes/default/template/picture.tpl

@@ -2 +2 @@
 {include file='include/autosize.inc.tpl'}
 *}
-
 {if isset($MENUBAR)}
 {$MENUBAR}
 <div id="content" class="contentWithMenu">
 {/if}
-
+{if isset($errors) or not empty($infos)}
 {include file='infos_errors.tpl'}
-
+{/if}
 {if !empty($PLUGIN_PICTURE_BEFORE)}{$PLUGIN_PICTURE_BEFORE}{/if}
 
@@ -275 +274 @@
 
 {if isset($COMMENT_COUNT)}
-<a name="comments"></a>
 <div id="comments">
         {if $COMMENT_COUNT > 0}

trunk/themes/default/template/register.tpl

@@ -2 +2 @@
 <div id="registerPage">
 
-<div id="content" class="content">
+<div id="content" class="content{if isset($MENUBAR)} contentWithMenu{/if}">
 
 <div class="titrePage">