Changeset 23551 for extensions/UserCollections/include/events.inc.php

Timestamp:

Jun 26, 2013, 12:09:21 AM (11 years ago)

Author:

mistic100

Message:

many corrections & optimizations + remove useless code + clean

File:

• extensions/UserCollections/include/events.inc.php (modified) (10 diffs)

extensions/UserCollections/include/events.inc.php

@@ -47 +47 @@
 function user_collections_page()
 {
-  global $page;
+  global $page, $template;
 
   if (isset($page['section']) and $page['section'] == 'collections')
   {
     include(USER_COLLEC_PATH . '/include/collections.inc.php');
+  }
+  
+  if (!is_a_guest() && count($page['items']))
+  {
+    $template->set_filename('uc_tumbnails_cssjs', realpath(USER_COLLEC_PATH . 'template/thumbnails_css_js.tpl'));
+    $template->parse('uc_tumbnails_cssjs');
   }
 }
@@ -98 +104 @@
   // get all collections
   $query = '
-SELECT id, name, nb_images, active
+SELECT id, name, nb_images
   FROM '.COLLECTIONS_TABLE.'
   WHERE user_id = '.$user['id'].'
@@ -104 +110 @@
 ;';
   $collections = hash_from_query($query, 'id');
+  
+  foreach ($collections as &$col)
+  {
+    $col["name"] = trigger_event("render_category_name", $col["name"]);
+  }
+  unset($col);
   
   $template->assign(array(
@@ -112 +124 @@
   // thumbnails buttons
   $template->set_prefilter('index_thumbnails', 'user_collections_thumbnails_list_button');
-  $template->set_prefilter('index', 'user_collections_thumbnails_list_cssjs');
   
   return $tpl_thumbnails_var;
@@ -133 +144 @@
 }
 
-// add css & js and menu
-function user_collections_thumbnails_list_cssjs($content, &$smarty)
-{
-  $content.= file_get_contents(USER_COLLEC_PATH.'template/thumbnails_css_js.tpl');
-  return $content;
-}
-
 
 // +-----------------------------------------------------------------------+
@@ -167 +171 @@
   // get all collections
   $query = '
-SELECT id, name, nb_images, active
+SELECT id, name, nb_images
   FROM '.COLLECTIONS_TABLE.'
   WHERE user_id = '.$user['id'].'
@@ -173 +177 @@
 ;';
   $collections = hash_from_query($query, 'id');
+  
+  foreach ($collections as &$col)
+  {
+    $col["name"] = trigger_event("render_category_name", $col["name"]);
+  }
+  unset($col);
   
   $template->assign(array(
@@ -214 +224 @@
   {
     $query = '
-SELECT *
+SELECT id, name, nb_images
   FROM '.COLLECTIONS_TABLE.'
   WHERE user_id = '.$user['id'].'
-  ORDER BY
-    active DESC,
-    date_creation DESC
+  ORDER BY date_creation DESC
 ;';
     $collections = array_values(hash_from_query($query, 'id'));
@@ -226 +234 @@
     for ($i=0; $i<$max && $i<count($collections); $i++)
     {
-      $collections[$i]['U_EDIT'] = USER_COLLEC_PUBLIC.'edit/'.$collections[$i]['id'];
+      $collections[$i]['name'] = trigger_event('render_category_name', $collections[$i]['name']);
+      $collections[$i]['u_edit'] = USER_COLLEC_PUBLIC.'edit/'.$collections[$i]['id'];
       $data['collections'][] = $collections[$i];
     }
@@ -239 +248 @@
     $data['U_CREATE'] = add_url_params(USER_COLLEC_PUBLIC, array('action'=>'new','col_id'=>'0','redirect'=>'true'));
     
-    $template->set_template_dir(USER_COLLEC_PATH . 'template/');
     $block->set_title('<a href="'.USER_COLLEC_PUBLIC.'">'.l10n('Collections').'</a>');
-    $block->template = 'menublock_user_collec.tpl';
+    $block->template = realpath(USER_COLLEC_PATH . 'template/menublock.tpl');
     $block->data = $data;
   }