Changeset 2515 for trunk/include

Timestamp:

Sep 10, 2008, 3:16:13 AM (16 years ago)

Author:

rvelices

Message:

• fix undefined template vars U_LOST_PASSWORD (menubar), F_ACTION (extend_for_templates) and F_C13Y_ACTION (check_integrity)
• normalized some template variable names between category thumbnails and thumbnails (take advantage of full template change with smarty and do it now)

Location:

trunk/include

Files:

• category_cats.inc.php (modified) (3 diffs)
• category_default.inc.php (modified) (2 diffs)
• menubar.inc.php (modified) (1 diff)

trunk/include/category_cats.inc.php

@@ -33 +33 @@
   $query = '
 SELECT
-  id, name, permalink, representative_picture_id, comment, nb_images, uppercats,
-  date_last, max_date_last, count_images, count_categories, global_rank
-  FROM '.CATEGORIES_TABLE.' INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
+  c.*, nb_images, date_last, max_date_last, count_images, count_categories
+  FROM '.CATEGORIES_TABLE.' c INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
   ON id = cat_id and user_id = '.$user['id'].'
   WHERE date_last >= SUBDATE(
@@ -55 +54 @@
   $query = '
 SELECT
-  id, name, permalink, representative_picture_id, comment, nb_images, uppercats,
-  date_last, max_date_last, count_images, count_categories
-  FROM '.CATEGORIES_TABLE.' INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
+  c.*, nb_images, date_last, max_date_last, count_images, count_categories
+  FROM '.CATEGORIES_TABLE.' c INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
   ON id = cat_id and user_id = '.$user['id'].'
   WHERE id_uppercat '.
@@ -246 +244 @@
           'ID'    => $category['id'],
           'TN_SRC'   => $thumbnail_src_of[$category['representative_picture_id']],
-          'ALT'   => strip_tags($category['name']),
-          'ICON'  => $icon_ts,
+          'TN_ALT'   => strip_tags($category['name']),
+          'ICON_TS'  => $icon_ts,
 
           'URL'   => make_index_url(

trunk/include/category_default.inc.php

@@ -108 +108 @@
     array(
       'ID'            => $row['id'],
-      'IMAGE'         => $thumbnail_url,
-      'IMAGE_ALT'     => $row['file'],
-      'IMAGE_TITLE'   => get_thumbnail_title($row),
-      'IMAGE_TS'      => get_icon($row['date_available']),
-      'U_IMG_LINK'    => $url,
+      'TN_SRC'         => $thumbnail_url,
+      'TN_ALT'     => $row['file'],
+      'TN_TITLE'   => get_thumbnail_title($row),
+      'ICON_TS'      => get_icon($row['date_available']),
+      'URL'    => $url,
     );
 
@@ -148 +148 @@
     }
 
-    $tpl_var['ELEMENT_NAME'] = $name;
+    $tpl_var['NAME'] = $name;
   }
 

trunk/include/menubar.inc.php

@@ -267 +267 @@
         array(
           'U_LOGIN' => get_root_url().'identification.php',
+          'U_LOST_PASSWORD' => get_root_url().'password.php',
           'AUTHORIZE_REMEMBERING' => $conf['authorize_remembering']
         )