Changeset 3145

Timestamp:

Feb 14, 2009, 3:24:10 AM (15 years ago)

Author:

rvelices

Message:

Last (I hope) paranoic optims ...

• move get_uysername and get_groupname from public to admin/functions.inc.php
• optim in index.php
• tags.tpl does not need smarty modifier included
• move func get_comment_post_key from functions_comment to functions (avoid extra inclusion every time on picture page)

Location:

trunk

Files:

• admin/include/functions.php (modified) (4 diffs)
• include/functions.inc.php (modified) (3 diffs)
• include/functions_comment.inc.php (modified) (2 diffs)
• include/functions_user.inc.php (modified) (2 diffs)
• include/picture_comment.inc.php (modified) (2 diffs)
• include/ws_functions.inc.php (modified) (7 diffs)
• tags.php (modified) (1 diff)
• template/yoga/index.tpl (modified) (2 diffs)
• template/yoga/tags.tpl (modified) (1 diff)

trunk/admin/include/functions.php

@@ -144 +144 @@
   {
     include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
-    
+
     // we can currently delete physically only photo with no
     // storage_category_id (added via pLoader)
@@ -1865 +1865 @@
       $extents = array_merge($extents, get_extents($path));
     }
-    elseif ( !is_link($path) and file_exists($path) 
+    elseif ( !is_link($path) and file_exists($path)
             and get_extension($path) == 'tpl' )
     {
@@ -2010 +2010 @@
   $path = isset($src['path']) ? $src['path'] : '/';
   $path .= isset($src['query']) ? '?'.$src['query'] : '';
-  
+
   if (($s = @fsockopen($host,80,$errno,$errstr,5)) === false)
   {
@@ -2067 +2067 @@
 }
 
+
+/**
+ * returns the groupname corresponding to the given group identifier if
+ * exists
+ *
+ * @param int group_id
+ * @return mixed
+ */
+function get_groupname($group_id)
+{
+  $query = '
+SELECT name
+  FROM '.GROUPS_TABLE.'
+  WHERE id = '.intval($group_id).'
+;';
+  $result = pwg_query($query);
+  if (mysql_num_rows($result) > 0)
+  {
+    list($groupname) = mysql_fetch_row($result);
+  }
+  else
+  {
+    return false;
+  }
+
+  return $groupname;
+}
+
+/**
+ * returns the username corresponding to the given user identifier if exists
+ *
+ * @param int user_id
+ * @return mixed
+ */
+function get_username($user_id)
+{
+  global $conf;
+
+  $query = '
+SELECT '.$conf['user_fields']['username'].'
+  FROM '.USERS_TABLE.'
+  WHERE '.$conf['user_fields']['id'].' = '.intval($user_id).'
+;';
+  $result = pwg_query($query);
+  if (mysql_num_rows($result) > 0)
+  {
+    list($username) = mysql_fetch_row($result);
+  }
+  else
+  {
+    return false;
+  }
+
+  return $username;
+}
 ?>

trunk/include/functions.inc.php

@@ -494 +494 @@
   closedir($dir);
   @asort($languages);
-  @reset($languages);
 
   return $languages;
@@ -1373 +1372 @@
       $source_file = $f;
       break;
-    }
-
-    if ($target_charset=='utf-8')
-    { // we accept conversion from ISO-8859-1 to UTF-8
-      $f = $dir.'.iso-8859-1/'.$filename;
-      if (file_exists($f))
-      {
-        $source_charset = 'iso-8859-1';
-        $source_file = $f;
-        break;
-      }
     }
   }
@@ -1484 +1472 @@
   }
 }
+
+/**
+ * returns a "secret key" that is to be sent back when a user enters a comment
+ *
+ * @param int image_id
+ */
+function get_comment_post_key($image_id)
+{
+  global $conf;
+
+  $time = time();
+
+  return sprintf(
+    '%s:%s',
+    $time,
+    hash_hmac(
+      'md5',
+      $time.':'.$image_id,
+      $conf['secret_key']
+      )
+    );
+}
 ?>

trunk/include/functions_comment.inc.php

@@ -22 +22 @@
 // +-----------------------------------------------------------------------+
 
-/**
- * returns a "secret key" that is to be sent back when a user enters a comment
- */
-function get_comment_post_key($image_id)
-{
-  global $conf;
-
-  $time = time();
-
-  return sprintf(
-    '%s:%s',
-    $time,
-    hash_hmac(
-      'md5',
-      $time.':'.$image_id,
-      $conf['secret_key']
-      )
-    );
-}
-
 //returns string action to perform on a new comment: validate, moderate, reject
 function user_comment_check($action, $comment)
@@ -190 +170 @@
       (
         ($comment_action=='validate' and $conf['email_admin_on_comment'])
-        or 
+        or
         ($comment_action!='validate' and $conf['email_admin_on_comment_validation'])
       )

trunk/include/functions_user.inc.php

@@ -674 +674 @@
 
 /**
- * returns the username corresponding to the given user identifier if exists
- *
- * @param int user_id
- * @return mixed
- */
-function get_username($user_id)
-{
-  global $conf;
-
-  $query = '
-SELECT '.$conf['user_fields']['username'].'
-  FROM '.USERS_TABLE.'
-  WHERE '.$conf['user_fields']['id'].' = '.intval($user_id).'
-;';
-  $result = pwg_query($query);
-  if (mysql_num_rows($result) > 0)
-  {
-    list($username) = mysql_fetch_row($result);
-  }
-  else
-  {
-    return false;
-  }
-
-  return $username;
-}
-
-/**
  * returns user identifier thanks to his name, false if not found
  *
@@ -933 +905 @@
   }
 }
-
-/**
- * returns the groupname corresponding to the given group identifier if
- * exists
- *
- * @param int group_id
- * @return mixed
- */
-function get_groupname($group_id)
-{
-  $query = '
-SELECT name
-  FROM '.GROUPS_TABLE.'
-  WHERE id = '.intval($group_id).'
-;';
-  $result = pwg_query($query);
-  if (mysql_num_rows($result) > 0)
-  {
-    list($groupname) = mysql_fetch_row($result);
-  }
-  else
-  {
-    return false;
-  }
-
-  return $groupname;
-}
-
 
 /**

trunk/include/picture_comment.inc.php

@@ -89 +89 @@
 if ($page['show_comments'])
 {
-  // number of comment for this picture
-  $query = 'SELECT COUNT(*) AS nb_comments';
-  $query.= ' FROM '.COMMENTS_TABLE.' WHERE image_id = '.$page['image_id'];
-  $query.= " AND validated = 'true'";
-  $query.= ';';
+  // number of comments for this picture
+  $query = '
+SELECT COUNT(*) AS nb_comments
+  FROM '.COMMENTS_TABLE.'
+  WHERE image_id='.$page['image_id']." AND validated = 'true'";
   $row = mysql_fetch_array( pwg_query( $query ) );
 
@@ -161 +161 @@
       or (is_a_guest() and $conf['comments_forall']))
   {
-    include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php');
     $key = get_comment_post_key($page['image_id']);
     $content = '';

trunk/include/ws_functions.inc.php

@@ -523 +523 @@
   }
 
-  include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php');
-
   $comm = array(
     'author' => trim( stripslashes($params['author']) ),
@@ -703 +701 @@
       )
   {
-    include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php');
     $comment_post_data['author'] = $user['username'];
     $comment_post_data['key'] = get_comment_post_key($params['image_id']);
@@ -1042 +1039 @@
       // last chance to make the directory writable
       @chmod($high_dir, 0777);
-      
+
       if (!is_writable($high_dir))
       {
@@ -1048 +1045 @@
       }
     }
-    
+
     secure_directory($high_dir);
-    
+
     // high resolution path, same name as web size file
     $high_path = sprintf(
@@ -1483 +1480 @@
   // thumbnail_content
   // thumbnail_sum
-  
+
   $params['image_id'] = (int)$params['image_id'];
   if ($params['image_id'] <= 0)
@@ -1537 +1534 @@
       );
   }
-  
+
   if (isset($params['categories']))
   {
@@ -1618 +1615 @@
           $current_rank_of[$cat_id] = 0;
         }
-        
+
         if ('auto' == $rank_on_category[$cat_id])
         {

trunk/tags.php

@@ -150 +150 @@
   if (count($letter['tags']) > 0)
   {
-    $letter['CHANGE_COLUMN'] = false;
+    unset($letter['CHANGE_COLUMN']);
     $letter['TITLE'] = $current_letter;
     $template->append(

trunk/template/yoga/index.tpl

@@ -15 +15 @@
       </li>
       {/if}
-      
+
       {if isset($favorite) }
       <li><a href="{$favorite.U_FAVORITE}" title="{'del_all_favorites_hint'|@translate}"><img src="{$favorite.FAVORITE_IMG}" class="button" alt="favorite" title="{'del_all_favorites_hint'|@translate}"></a></li>
@@ -29 +29 @@
 
       {if isset($U_SEARCH_RULES) }
-      <li><a href="{$U_SEARCH_RULES}" style="border:none;" onclick="popuphelp(this.href); return false;" title="{'Search rules'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/search_rules.png" class="button" alt="(?)"></a></li>
+      <li><a href="{$U_SEARCH_RULES}" onclick="popuphelp(this.href); return false;" title="{'Search rules'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/search_rules.png" class="button" alt="(?)" /></a></li>
       {/if}
 

trunk/template/yoga/tags.tpl

@@ -42 +42 @@
     </table>
   </fieldset>
-      {if $letter.CHANGE_COLUMN|@default:false}
+      {if isset($letter.CHANGE_COLUMN) }
       </td>
       <td valign="top">