Changeset 3120

Timestamp:

Feb 4, 2009, 3:30:48 AM (15 years ago)

Author:

rvelices

Message:

optimizations (php only)

• removed unnecessary call to array_unique in get_image_ids_for_tags
• put back in smarty exec time counting (debug mode) for each included template
• prefix some smarty modifiers with @ in some templates
• do not call format_date (still very slow due to mktime and date even after prev commit) from category_default.inc.php - if used in templates format_date can be used as a smarty modifier

Location:

trunk

Files:

• include/category_default.inc.php (modified) (1 diff)
• include/functions_tag.inc.php (modified) (1 diff)
• include/smarty/libs/Smarty.class.php (modified) (6 diffs)
• template/yoga/header.tpl (modified) (2 diffs)
• template/yoga/mainpage_categories.tpl (modified) (2 diffs)
• template/yoga/picture_content.tpl (modified) (1 diff)

trunk/include/category_default.inc.php

@@ -107 +107 @@
   $tpl_var =
     array(
-      'ID'            => $row['id'],
-      'TN_SRC'         => $thumbnail_url,
-      'TN_ALT'     => $row['file'],
-      'TN_TITLE'   => get_thumbnail_title($row),
-      'ICON_TS'      => get_icon($row['date_available']),
-      'URL'    => $url,
+      'ID'        => $row['id'],
+      'TN_SRC'    => $thumbnail_url,
+      'TN_ALT'    => $row['file'],
+      'TN_TITLE'  => get_thumbnail_title($row),
+      'ICON_TS'   => get_icon($row['date_available']),
+      'URL'       => $url,
 
    /* Fields for template-extension usage */
       'FILE_PATH' => $row['path'],
-      'FILE_POSTED' => format_date($row['date_available'], 'mysql_datetime'),
-      'FILE_CREATED' => (empty($row['date_creation'])) ? 
-        '-': format_date($row['date_creation'], 'mysql_date'),
-      'FILE_DESC' => (empty($row['comment'])) ? '-' : $row['comment'],
-      'FILE_AUTHOR' => (empty($row['author'])) ? '-' : $row['author'],
+      'FILE_POSTED' => $row['date_available'],
+      'FILE_CREATED' => $row['date_creation'],
+      'FILE_DESC' => $row['comment'],
+      'FILE_AUTHOR' => $row['author'],
       'FILE_HIT' => $row['hit'],
-      'FILE_SIZE' => (empty($row['filesize'])) ? '-' : $row['filesize'],
-      'FILE_WIDTH' => (empty($row['width'])) ? '-' : $row['width'],
-      'FILE_HEIGHT' => (empty($row['height'])) ? '-' : $row['height'],
-      'FILE_METADATE' => (empty($row['date_metadata_update'])) ? 
-        '-': format_date($row['date_metadata_update'], 'mysql_date'),
-      'FILE_RATE' => (empty($row['rate'])) ? '-' : $row['rate'], 
-      'FILE_HAS_HD' => ($row['has_high'] and $user['enabled_high']=='true') ? 
+      'FILE_SIZE' => $row['filesize'],
+      'FILE_WIDTH' => $row['width'],
+      'FILE_HEIGHT' => $row['height'],
+      'FILE_METADATE' => $row['date_metadata_update'],
+      'FILE_HAS_HD' => ($row['has_high'] and $user['enabled_high']=='true') ?
                 true:false, /* lack of include/functions_picture.inc.php */
     );

trunk/include/functions_tag.inc.php

@@ -190 +190 @@
         $items = array_intersect($items, $images);
       }
-
-      return array_unique($items);
+      return $items;
       break;
     }

trunk/include/smarty/libs/Smarty.class.php

@@ -21 +21 @@
  * For questions, help, comments, discussion, etc., please join the
  * Smarty mailing list. Send a blank e-mail to
- * smarty-discussion-subscribe@googlegroups.com 
+ * smarty-discussion-subscribe@googlegroups.com
  *
  * @link http://www.smarty.net/
@@ -1058 +1058 @@
             // var non-existant, return valid reference
             $_tmp = null;
-            return $_tmp;   
+            return $_tmp;
         }
     }
@@ -1117 +1117 @@
     {
         static $_cache_info = array();
-        
+
         $_smarty_old_error_level = $this->debugging ? error_reporting() : error_reporting(isset($this->error_reporting)
                ? $this->error_reporting : error_reporting() & ~E_NOTICE);
@@ -1304 +1304 @@
             return;
         } else {
+            if ($this->debugging) {
+                // capture time for debugging info
+                $_params = array();
+                require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
+                $this->_smarty_debug_info[$_included_tpls_idx]['exec_time'] = (smarty_core_get_microtime($_params, $this) - $_debug_start_time);
+            }
             error_reporting($_smarty_old_error_level);
             if (isset($_smarty_results)) { return $_smarty_results; }
@@ -1933 +1939 @@
         return eval($code);
     }
-    
+
     /**
      * Extracts the filter name from the given callback
-     * 
+     *
      * @param callback $function
      * @return string
@@ -1951 +1957 @@
                 }
         }
-    
+
     /**#@-*/
 

trunk/template/yoga/header.tpl

@@ -7 +7 @@
 {if isset($meta_ref) } 
 {if isset($INFO_AUTHOR)}
-<meta name="author" content="{$INFO_AUTHOR|replace:'"':' '}">
+<meta name="author" content="{$INFO_AUTHOR|@replace:'"':' '}">
 {/if}
 {if isset($related_tags)}
@@ -13 +13 @@
 {/if}
 {if isset($COMMENT_IMG)}
-<meta name="description" content="{$COMMENT_IMG|strip_tags:false|replace:'"':' '}{if isset($INFO_FILE)} - {$INFO_FILE}{/if}">
+<meta name="description" content="{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}{if isset($INFO_FILE)} - {$INFO_FILE}{/if}">
 {else}
 <meta name="description" content="{$PAGE_TITLE}{if isset($INFO_FILE)} - {$INFO_FILE}{/if}">

trunk/template/yoga/mainpage_categories.tpl

@@ -7 +7 @@
                         <div class="illustration">
                         <a href="{$cat.URL}">
-                                <img src="{$cat.TN_SRC}" alt="{$cat.TN_ALT}" title="{$cat.NAME|replace:'"':' '} - {'hint_category'|@translate}">
+                                <img src="{$cat.TN_SRC}" alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '} - {'hint_category'|@translate}">
                         </a>
                         </div>
@@ -15 +15 @@
                                         {$cat.ICON_TS}
                                 </h3>
-        <div class="text">
-                                {if isset($cat.INFO_DATES) }
-                                <p class="dates">{$cat.INFO_DATES}</p>
-                                {/if}
-                                <p class="Nb_images">{$cat.CAPTION_NB_IMAGES}</p>
-                                {if not empty($cat.DESCRIPTION)}
-                                <p>{$cat.DESCRIPTION}</p>
-                                {/if}
-        </div>
+                <div class="text">
+                                {if isset($cat.INFO_DATES) }
+                                <p class="dates">{$cat.INFO_DATES}</p>
+                                {/if}
+                                <p class="Nb_images">{$cat.CAPTION_NB_IMAGES}</p>
+                                {if not empty($cat.DESCRIPTION)}
+                                <p>{$cat.DESCRIPTION}</p>
+                                {/if}
+                </div>
                         </div>
                 </div>

trunk/template/yoga/picture_content.tpl

@@ -5 +5 @@
   <img src="{$SRC_IMG}" style="width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;" alt="{$ALT_IMG}" 
         {if isset($COMMENT_IMG)}
-                title="{$COMMENT_IMG|strip_tags:false|replace:'"':' '}" {else} title="{$current.TITLE|replace:'"':' '} - {$ALT_IMG}"
+                title="{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}" {else} title="{$current.TITLE|@replace:'"':' '} - {$ALT_IMG}"
         {/if}>
 {if isset($high) }