Changeset 16688 for extensions/UserCollections/include/collections.inc.php

Timestamp:

Jul 13, 2012, 12:09:19 PM (12 years ago)

Author:

mistic100

Message:

-rework the main menu
-bug when a collection is create through AJAX
-add "Remove from collection" on colorbox
-minor interfaces changes

File:

• extensions/UserCollections/include/collections.inc.php (modified) (4 diffs)

extensions/UserCollections/include/collections.inc.php

@@ -24 +24 @@
         case 'new':
         {
-          new UserCollection('new', array(), empty($_GET['name']) ? 'temp' : $_GET['name'], 1);
-          redirect(USER_COLLEC_PUBLIC);
-          break;
-        }
-        
-        // clear
-        case 'clear':
-        {
-          $query = '
-DELETE ci
-  FROM '.COLLECTION_IMAGES_TABLE.' AS ci
-    INNER JOIN '.COLLECTIONS_TABLE.' AS c 
-    ON ci.col_id = c.id
-  WHERE
-    c.user_id = '.$user['id'].'
-    AND c.id = '.$_GET['col_id'].'
-;';
-          pwg_query($query);
+          $UserCollection = new UserCollection('new', array(), empty($_GET['name']) ? 'temp' : $_GET['name'], 1);
           
-          if (!empty($_SERVER['HTTP_REFERER']))
+          if (isset($_GET['redirect']))
           {
-            redirect($_SERVER['HTTP_REFERER']);
+            $redirect = USER_COLLEC_PUBLIC.'edit/'.$UserCollection->getParam('id');
           }
+          else
+          {
+            $redirect = USER_COLLEC_PUBLIC;
+          }
+          redirect($redirect);
           break;
         }
@@ -194 +182 @@
       }
       
+      // clear
+      if ( isset($_GET['action']) and $_GET['action'] == 'clear' )
+      {
+        $UserCollection->clearImages();
+      }
+      
       // remove an element
       if ( isset($_GET['collection_toggle']) and preg_match('#^[0-9]+$#', $_GET['collection_toggle']) )
       {
         $UserCollection->removeImages(array($_GET['collection_toggle']));
+        unset($_GET['collection_toggle']);
       }
       
@@ -205 +200 @@
       
       // collection content
-      $template->assign('collection', $UserCollection->getCollectionInfo());
+      $col = $UserCollection->getCollectionInfo();
+      $col['U_CLEAR'] = $self_url.'&action=clear';
+      $col['U_DELETE'] = USER_COLLEC_PUBLIC.'&action=delete&col_id='.$page['col_id'];
+      $template->assign('collection', $col);
+      
       $page['items'] = $UserCollection->getImages();
       
@@ -252 +251 @@
       $UserCollection = new UserCollection($page['col_id']);
       
-      // backlink for owner
-      if ($UserCollection->getParam('user_id') == $user['id'])
-      {
-        $template->assign('U_LIST', USER_COLLEC_PUBLIC);
-      }
-      
       // special template
       add_event_handler('loc_end_index_thumbnails', 'user_collections_thumbnails_in_collection', EVENT_HANDLER_PRIORITY_NEUTRAL+10, 2); // +10 to overload GThumb+
       
       // collection content
-      $template->assign('collection', $UserCollection->getCollectionInfo());
       $page['items'] = $UserCollection->getImages();