Changeset 7541 for extensions

Timestamp:

Nov 1, 2010, 3:30:48 PM (14 years ago)

Author:

patdenice

Message:

Correction of last commit.

File:

• extensions/PWG_Stuffs/include/class.inc.php (modified) (5 diffs)

extensions/PWG_Stuffs/include/class.inc.php

@@ -36 +36 @@
 
     $query = '
-SELECT id, name, type, datas, groups, show_title, id_line, width
+SELECT id, name, type, datas, users, groups, show_title, id_line, width
 FROM ' . STUFFS_TABLE . '
-WHERE users LIKE "%' . $user['status'] . '%"
+WHERE id = 0 OR (
+  users LIKE "%' . $user['status'] . '%"
 ';
 
@@ -54 +55 @@
     else return;
 
-    if (!$page['is_homepage'])
-    {
-      $query .= ' OR id = 0';
-    }
-
-    $query .= '
+    $query .= ')
 ORDER BY pos ASC;';
 
@@ -75 +71 @@
     foreach ($this->modules as $module)
     {
-      if ($module['type'] == 'MainBlock')
-      {
-                $this->pos = 'end';
-                continue;
-        }
         if (!empty($module['groups']))
       {
@@ -86 +77 @@
         }
 
+      if ($module['type'] == 'MainBlock')
+      {
+        global $user;
+        if (strpos($module['users'], $user['status']) === false)
+        {
+          add_event_handler('loc_end_index', 'hide_main_block');
+        }
+        $this->pos = 'end';
+                continue;
+        }
+
         $datas = (!empty($module['datas']) ? unserialize($module['datas']) : false);
       $block = array();
@@ -102 +104 @@
       $block['TEMPLATE'] = 'stuffs_'.strtolower($module['type']).'.tpl';
         $this->set_tpl_block($block, $module);
-    }
-    if ($this->pos == 'begin')
-    {
-      add_event_handler('loc_end_index', 'hide_main_block');
     }
   }