Changeset 9383 for extensions/PWG_Stuffs/include/class.inc.php

Timestamp:

Feb 26, 2011, 4:28:24 PM (13 years ago)

Author:

patdenice

Message:

Add display option. Optimizations.

File:

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

extensions/PWG_Stuffs/include/class.inc.php

@@ -9 +9 @@
   var $blocks = array();
   var $pos = 'begin';
+  var $template_var = array();
 
   function stuffs()
   {
+    global $page, $template;
+
+    if ($page['stuffs_section'] == 'on_picture')
+    {
+      $this->template_var['begin'] = 'PLUGIN_PICTURE_BEFORE';
+      $this->template_var['end'] = 'PLUGIN_PICTURE_AFTER';
+      $template->set_prefilter('header', array('stuffs', 'prefilter_picture_css'));
+      pwgs_picture_special_sections();
+    }
+    else
+    {
+      $this->template_var['begin'] = 'PLUGIN_INDEX_CONTENT_BEFORE';
+      $this->template_var['end'] = 'PLUGIN_INDEX_CONTENT_AFTER';
+      $template->set_prefilter( 'header', array('stuffs', 'prefilter_index_css') );
+    }
+
     $this->get_user_groups();
     $this->get_modules();
@@ -35 +52 @@
     global $page, $user;
 
+    if (!isset($page['stuffs_section'])) return;
+
     $query = '
-SELECT id, name, path, parent, datas, groups, show_title, id_line, width
+SELECT DISTINCT id, name, path, parent, datas, groups, show_title, id_line, width
 FROM ' . STUFFS_TABLE . '
-WHERE users LIKE "%' . $user['status'] . '%"
-';
-
-    $script = script_basename();
-    if ($script == 'index')
-    {
-      $query .= !$page['is_homepage'] ?
-        'AND on_cats = "true"' :
-        'AND on_home = "true"' ;
-    }
-    elseif ($script == 'picture')
-    {
-      $query .= 'AND on_picture = "true"';
-    }
-    else return;
-
-    $query .= '
-ORDER BY pos ASC;';
+LEFT JOIN ' . USER_GROUP_TABLE . '
+  ON user_id = '.$user['id'].'
+WHERE (users IS NULL OR users LIKE "%' . $user['status'] . '%")
+  AND (groups IS NULL OR groups REGEXP CONCAT("(^|,)",group_id,"(,|$)"))
+  AND level <= '.$user['level'].'
+  AND '.$page['stuffs_section'].' = "true"
+ORDER BY pos ASC
+;';
 
     $result = pwg_query($query);
@@ -86 +95 @@
       {
         continue;
-      }
-      if (!empty($module['groups']))
-      {
-        $authorized_groups = explode(',', $module['groups']);
-        if (array_intersect($this->user_groups, $authorized_groups) == array()) continue;
       }