Changeset 16597 for extensions/UserCollections/include

Timestamp:

Jul 10, 2012, 5:37:33 PM (12 years ago)

Author:

mistic100

Message:

-menu always displayed if user has unactive collections
-better user status checks
-localizations

Location:

extensions/UserCollections/include

Files:

• collections.inc.php (modified) (10 diffs)
• events.inc.php (modified) (8 diffs)

extensions/UserCollections/include/collections.inc.php

@@ -8 +8 @@
 switch ($page['sub_section'])
 {
+  /* list */
   case 'list':
   {
+    if (is_a_guest()) access_denied();
+    
     $template->set_filename('index', dirname(__FILE__) . '/../template/list.tpl');
     
@@ -125 +128 @@
     {
       $col['date_creation'] = format_date($col['date_creation'], true);
-      $col['U_VIEW'] = USER_COLLEC_PUBLIC.'view/'.$col['id'];
       $col['U_EDIT'] = USER_COLLEC_PUBLIC.'edit/'.$col['id'];
       $col['U_ACTIVE'] = USER_COLLEC_PUBLIC.'&action=set_active&col_id='.$col['id'];
@@ -133 +135 @@
       {
         $col['name'] = 'temp #'.$col['id'];
+        $col['U_VIEW'] = $col['U_EDIT'];
         $col['U_SAVE'] = USER_COLLEC_PUBLIC.'&action=save&col_id='.$col['id'];
         $template->append('temp_col', $col);
@@ -138 +141 @@
       else
       {
+        $col['U_VIEW'] = USER_COLLEC_PUBLIC.'view/'.$col['id'];
         $template->append('collections', $col);
       }
@@ -145 +149 @@
     break;
   }
-    
+  
+  /* edit */
   case 'edit':
   {
@@ -165 +170 @@
     try {
       $UserCollection = new UserCollection($page['col_id']);
+      
+      if (!is_admin() and $UserCollection->getParam('user_id') != $user['id'])
+      {
+        access_denied();
+      }
       
       // save properties
@@ -199 +209 @@
       
       include(PHPWG_ROOT_PATH . 'include/category_default.inc.php');
+      
+      $template->concat('TITLE', $conf['level_separator'].$UserCollection->getParam('name'));
     }
     catch (Exception $e)
@@ -208 +220 @@
   }
   
+  /* view */
   case 'view':
   {
@@ -234 +247 @@
       
       $template->assign('collection', $UserCollection->getCollectionInfo());
-      
-      include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
-      $template->assign('OWNER', get_username($UserCollection->getParam('user_id')));
       
       $page['start'] = isset($_GET['start']) ? $_GET['start'] : 0;
@@ -254 +264 @@
       
       include(PHPWG_ROOT_PATH . 'include/category_default.inc.php');
+      
+      include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+      $template->concat('TITLE', 
+        $conf['level_separator'].$UserCollection->getParam('name').
+        ' ('.sprintf(l10n('by %s'), get_username($UserCollection->getParam('user_id'))).')'
+        );
     }
     catch (Exception $e)
     {
-      array_push($page['errors'], $e->getMessage());
+      access_denied();
     }
     
     break;
   }
-    
-  // case 'send':
-  // {
-    
-    // break;
-  // }
 }
 

extensions/UserCollections/include/events.inc.php

@@ -7 +7 @@
 function user_collections_init()
 {
-  global $conf;
-  
-  // $conf['user_collections'] = unserialize($conf['user_collections']);
   load_language('plugin.lang', USER_COLLEC_PATH);
 }
@@ -24 +21 @@
     $page['title'] = '<a href="'.USER_COLLEC_PUBLIC.'">'.l10n('Collections').'</a>';
     
-    switch (@$tokens[1])
-    {
-      case 'edit':
-        $page['sub_section'] = 'edit';
-        $page['title'].= $conf['level_separator'].' '.l10n('Edit');
-        break;
-      case 'view':
-        $page['sub_section'] = 'view';
-        $page['title'].= $conf['level_separator'].' '.l10n('View');
-        break;
-      // case 'send':
-        // $page['sub_section'] = 'send';
-        // $page['title'].= $conf['level_separator'].' '.l10n('Send');
-        // break;
-      default:
-        $page['sub_section'] = 'list';
+    if (in_array(@$tokens[1], array('edit','view','list')))
+    {
+       $page['sub_section'] = $tokens[1];
+    }
+    else
+    {
+      $page['sub_section'] = 'list';
     }
     
@@ -64 +52 @@
 function user_collections_index_actions()
 {
+  if (is_a_guest()) return;
+  
   global $page, $UserCollection;
      
@@ -80 +70 @@
 function user_collections_thumbnails_list($tpl_thumbnails_var, $pictures)
 {
+  if (is_a_guest()) return $tpl_thumbnails_var;
+  
   global $page, $template, $UserCollection;
   
@@ -99 +91 @@
     $collection = array();
   }
-  
   
   
@@ -142 +133 @@
 function user_collections_picture_page()
 {
+  if (is_a_guest()) return;
+  
   global $template, $picture, $UserCollection;
   
@@ -186 +179 @@
 function user_collections_add_menublock($menu_ref_arr)
 {
+  if (is_a_guest()) return;
+  
+  global $user;
+  
   $menu = &$menu_ref_arr[0];
   if ($menu->get_id() != 'menubar') return;
   
-  if (get_current_collection_id(false) === false) return;
-  
-  $menu->register_block(new RegisteredBlock('mbUserCollection', l10n('Download Basket'), 'UserCollection'));
+  $query = '
+SELECT id
+  FROM '.COLLECTIONS_TABLE.'
+  WHERE user_id = '.$user['id'].'
+  LIMIT 1
+;';
+  $result = pwg_query($query);
+  
+  if (!pwg_db_num_rows($result)) return;
+  
+  $menu->register_block(new RegisteredBlock('mbUserCollection', l10n('Collections'), 'UserCollection'));
 }
 
@@ -201 +206 @@
   if (($block = $menu->get_block('mbUserCollection')) != null)
   {
-    if (empty($UserCollection))
-    {
-      $UserCollection = new UserCollection(get_current_collection_id());
-    }
-    
-    $data = array(
-      'U_LIST' => USER_COLLEC_PUBLIC,
-      'current' => array(
-        'NAME' => $UserCollection->getParam('name'),
-        'NB_IMAGES' => $UserCollection->getParam('nb_images'),
-        ),
-      'links' => array(),
-      );
-      
-    if ($data['current']['NB_IMAGES'] > 0)
-    {
-      $data['links'] = array(
-        array(
-          'URL' => USER_COLLEC_PUBLIC.'view/'.$UserCollection->getParam('col_id'),
-          'NAME' => l10n('View'),
+    if (($col_id = get_current_collection_id(false)) !== false)
+    {
+      if (empty($UserCollection))
+      {
+        $UserCollection = new UserCollection($col_id);
+      }
+    
+      $data = array(
+        'current' => array(
+          'NAME' => $UserCollection->getParam('name'),
+          'NB_IMAGES' => $UserCollection->getParam('nb_images'),
           ),
-        array(
-          'URL' => USER_COLLEC_PUBLIC.'&amp;action=clear&amp;col_id='.$UserCollection->getParam('col_id'),
-          'NAME' => l10n('Clear'),
-          ),
+        'links' => array(),
         );
-    }
+        
+      if ($data['current']['NB_IMAGES'] > 0)
+      {
+        $data['links'] = array(
+          array(
+            'URL' => USER_COLLEC_PUBLIC.'edit/'.$UserCollection->getParam('col_id'),
+            'NAME' => l10n('Display collection'),
+            ),
+          array(
+            'URL' => USER_COLLEC_PUBLIC.'&amp;action=clear&amp;col_id='.$UserCollection->getParam('col_id'),
+            'NAME' => l10n('Clear collection'),
+            ),
+          );
+      }
+    }
+    
+    $data['U_LIST'] = USER_COLLEC_PUBLIC;
       
     $template->set_template_dir(USER_COLLEC_PATH . 'template/');