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

Timestamp:

Jan 13, 2013, 12:29:56 AM (12 years ago)

Author:

mistic100

Message:

full compatibility with Gthumb+, improve some code

File:

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

extensions/UserCollections/include/events.inc.php

@@ -2 +2 @@
 defined('USER_COLLEC_PATH') or die('Hacking attempt!');
 
-# this file contains all functions directly called by the triggers #
-
-/* compatibility fix with Gthumb+ */
-function user_collections_save_pagination()
-{
-  global $user, $page, $uc_nb_image_page_save;
-   
-  $uc_nb_image_page_save['user'] = $user['nb_image_page'];
-  $uc_nb_image_page_save['page'] = $page['nb_image_page'];
-}
-
-
+// +-----------------------------------------------------------------------+
+// | SECTION INIT
+// +-----------------------------------------------------------------------+
 /* define page section from url */
 function user_collections_section_init()
@@ -52 +43 @@
 
 
-/* add buttons on thumbnails list */
+// +-----------------------------------------------------------------------+
+// | CATEGORY PAGE
+// +-----------------------------------------------------------------------+
+/* toggle an image, in case of no javascript or first call (must create the collection) */
 function user_collections_index_actions()
 {
@@ -71 +65 @@
 }
 
+/* add buttons on thumbnails list */
 function user_collections_thumbnails_list($tpl_thumbnails_var, $pictures)
 {
@@ -77 +72 @@
   global $page, $template, $UserCollection;
   
-  // the prefilter is different on collection page
-  if (isset($page['section']) and ($page['section'] == 'collections' or $page['section'] == 'download')) return $tpl_thumbnails_var;
+  // the content is different on collection edition page and no button on batch downloader set edition page
+  if ( (@$page['section'] == 'collections' and @$page['sub_section']=='edit') or @$page['section'] == 'download')
+  {
+    return $tpl_thumbnails_var;
+  }
   
   // get existing collections
@@ -96 +94 @@
   }
   
-  // if the collection is created we don't use AJAX to force menu refresh
+  // if the collection doesn't exists we don't use AJAX to force menu refresh
   if ($col_id === false)
   {
@@ -102 +100 @@
   }
   
-  
-  $self_url = duplicate_index_url(array(), array('collection_toggle'));  
+  // template vars
+  $url = duplicate_index_url(array(), array('collection_toggle'));  
   
   foreach ($tpl_thumbnails_var as &$thumbnail)
@@ -114 +112 @@
   unset($thumbnail);
   
-  // thumbnails buttons
   $template->assign(array(
     'USER_COLLEC_PATH' => USER_COLLEC_PATH,
-    'collection_toggle_url' =>  add_url_params($self_url, array('collection_toggle'=>'')),
+    'collection_toggle_url' =>  add_url_params($url, array('collection_toggle'=>'')),
     ));
+  
+  // thumbnails buttons
   $template->set_prefilter('index_thumbnails', 'user_collections_thumbnails_list_prefilter');
   
@@ -127 +126 @@
 {
   // add links
-  $search = '<span class="wrap1">';
-  $replace = $search.'
+  $search = '#(<span class="wrap1">|<li class="gthumb">)#';
+  $replace = '$1
 {strip}<a class="addCollection" href="{$collection_toggle_url}{$thumbnail.id}" data-id="{$thumbnail.id}" rel="nofollow">
-{if $COL_ID or $thumbnail.COLLECTION_SELECTED}
+<span class="uc_remove" {if not $COL_ID and not $thumbnail.COLLECTION_SELECTED}style="display:none;"{/if}>
 {\'Remove from collection\'|@translate}&nbsp;<img src="{$ROOT_URL}{$USER_COLLEC_PATH}template/resources/image_delete.png" title="{\'Remove from collection\'|@translate}">
-{else}
+</span>
+<span class="uc_add" {if $COL_ID or $thumbnail.COLLECTION_SELECTED}style="display:none;"{/if}>
 {\'Add to collection\'|@translate}&nbsp;<img src="{$ROOT_URL}{$USER_COLLEC_PATH}template/resources/image_add.png" title="{\'Add to collection\'|@translate}">
-{/if}
+</span>
 </a>{/strip}';
 
   // custom CSS and AJAX request
   $content.= file_get_contents(USER_COLLEC_PATH.'template/thumbnails_css_js.tpl');
-
-  return str_replace($search, $replace, $content);
-}
-
-
+  
+  return preg_replace($search, $replace, $content);
+}
+
+
+// +-----------------------------------------------------------------------+
+// | PICTURE PAGE
+// +-----------------------------------------------------------------------+
 /* add button on picture page */
 function user_collections_picture_page()
@@ -190 +193 @@
 
 
-/* menu block */
+// +-----------------------------------------------------------------------+
+// | MENU BLOCK
+// +-----------------------------------------------------------------------+
+/* register block */
 function user_collections_add_menublock($menu_ref_arr)
 {
@@ -201 +207 @@
 }
 
+/* fill block */
 function user_collections_applymenu($menu_ref_arr)
 {
   $max = 6;
   
-  global $template, $conf, $user, $UserCollection;
+  global $template, $page, $conf, $user, $UserCollection;
   $menu = &$menu_ref_arr[0];
+  
+  // the editable counter is for the active collection, except if we are currently editing a collection
+  $col_in_edit = 0;
+  if ( @$page['section'] == 'collections' and @$page['sub_section']=='edit' and !empty($page['col_id']) )
+  {
+    $col_in_edit = $page['col_id'];
+  }
   
   if (($block = $menu->get_block('mbUserCollection')) != null)
@@ -223 +237 @@
     for ($i=0; $i<$max && $i<count($collections); $i++)
     {
+      $collections[$i]['count_handler'] = $col_in_edit!=0 ? $collections[$i]['id']==$col_in_edit : $collections[$i]['active'];
       $collections[$i]['U_EDIT'] = USER_COLLEC_PUBLIC.'edit/'.$collections[$i]['id'];
       array_push($data['collections'], $collections[$i]);