Changeset 9410

Timestamp:

Feb 28, 2011, 10:50:28 AM (13 years ago)

Author:

patdenice

Message:

Some optimizations.

Location:

extensions/PWG_Stuffs

Files:

• admin/add_module.inc.php (modified) (2 diffs)
• admin/admin.php (modified) (2 diffs)
• admin/manage.inc.php (modified) (3 diffs)
• admin/upgrade.inc.php (modified) (1 diff)
• class.inc.php (copied) (copied from extensions/PWG_Stuffs/include/class.inc.php) (5 diffs)
• functions.inc.php (copied) (copied from extensions/PWG_Stuffs/include/functions.inc.php)
• main.inc.php (modified) (2 diffs)
• maintain.inc.php (modified) (1 diff)
• modules/BestRated/config.inc.php (modified) (1 diff)
• modules/MostVisited/config.inc.php (modified) (1 diff)
• modules/Random/config.inc.php (modified) (1 diff)
• modules/Recent/config.inc.php (modified) (1 diff)

extensions/PWG_Stuffs/admin/add_module.inc.php

@@ -72 +72 @@
 
         $query = '
-INSERT INTO ' . STUFFS_TABLE . ' ( id, pos, name, descr, path, parent, datas, users, groups, show_title, on_home, on_root, on_cats, on_picture, id_line, width )
+INSERT INTO ' . STUFFS_TABLE . ' ( id, pos, name, descr, path, datas, users, groups, show_title, on_home, on_root, on_cats, on_picture, id_line, width )
 VALUES (' . $next_element_id . ' ,
   ' . $pos . ',
@@ -78 +78 @@
   ' . $desc . ',
   "' . $module_path . '",
-  ' . (isset($modules[$module_path]['parent']) ? '"'.$modules[$module_path]['parent'].'"' : 'NULL') .',
   ' . $sav_datas . ',
   ' . $users . ',

extensions/PWG_Stuffs/admin/admin.php

@@ -7 +7 @@
 load_language('plugin.lang', STUFFS_PATH);
 include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php');
-include_once(STUFFS_PATH . 'include/functions.inc.php');
+include_once(STUFFS_PATH . 'functions.inc.php');
 $my_base_url = get_admin_plugin_menu_link(__FILE__);
 
@@ -42 +42 @@
 {
   $module['path'] = PHPWG_ROOT_PATH.trim($module['path'], './').'/';
-
-  if (preg_match('#^'.preg_quote(PHPWG_PLUGINS_PATH).'([^/]*?)/#', $module['path'], $match) and $match[1] != 'PWG_Stuffs')
-  {
-   $module['parent'] = $match[1];
-  }
   $modules[$module['path']] = $module;
 }

extensions/PWG_Stuffs/admin/manage.inc.php

@@ -37 +37 @@
 
 // Display
-$q = 'SELECT id, name, descr, path, parent, id_line, width, datas
+$q = 'SELECT id, name, descr, path, id_line, width, datas
 FROM ' . STUFFS_TABLE . '
 ORDER BY pos ASC;';
@@ -60 +60 @@
   $module['name'] = !empty($module['path']) ? $module['name'] : l10n('stuffs_main_block');
 
+  $missing = false;
+  if (!empty($module['path']))
+  {
+    preg_match('#^'.preg_quote(PHPWG_PLUGINS_PATH).'([^/]*?)/#', $module['path'], $match);
+    $missing = !isset($pwg_loaded_plugins[$match[1]]);
+  }
+
   $template->append('modules', array(
     'ID' => $module['id'],
@@ -73 +80 @@
     'U_EDIT' => PHPWG_ROOT_PATH . 'admin.php?page=plugin&section=' . STUFFS_DIR . '%2Fadmin%2Fadmin.php&tab=edit_module&edit='.$module['id'],
     'U_DELETE' => !is_adviser() ? PHPWG_ROOT_PATH . 'admin.php?page=plugin&section=' . STUFFS_DIR . '%2Fadmin%2Fadmin.php&del=' . $module['id'] : '',
-    'MISSING' => (isset($module['parent']) and !isset($pwg_loaded_plugins[$module['parent']])),
+    'MISSING' => $missing,
     )
   );

extensions/PWG_Stuffs/admin/upgrade.inc.php

@@ -92 +92 @@
   $query = 'ALTER TABLE ' . $prefixeTable . 'stuffs
 CHANGE `type` `path` VARCHAR( 255 ) NULL DEFAULT NULL,
-ADD `parent` VARCHAR( 255 ) NULL DEFAULT NULL AFTER `path`,
 ADD `level` TINYINT( 3 ) NOT NULL default "0" AFTER `groups`,
 ADD `on_root` enum(\'true\',\'false\') NOT NULL AFTER `on_home`

extensions/PWG_Stuffs/class.inc.php

@@ -9 +9 @@
   var $blocks = array();
   var $pos = 'begin';
-  var $template_var = array();
+  var $prefixe = 'PLUGIN_INDEX_CONTENT_';
 
   function stuffs()
@@ -17 +17 @@
     if ($page['stuffs_section'] == 'on_picture')
     {
-      $this->template_var['begin'] = 'PLUGIN_PICTURE_BEFORE';
-      $this->template_var['end'] = 'PLUGIN_PICTURE_AFTER';
+      $this->prefixe = 'PLUGIN_PICTURE_';
       $template->set_prefilter('header', array('stuffs', 'prefilter_picture_css'));
       pwgs_picture_special_sections();
@@ -24 +23 @@
     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') );
     }
@@ -55 +52 @@
 
     $query = '
-SELECT DISTINCT id, name, path, parent, datas, groups, show_title, id_line, width
+SELECT DISTINCT id, name, path, datas, groups, show_title, id_line, width
 FROM ' . STUFFS_TABLE . '
 LEFT JOIN ' . USER_GROUP_TABLE . '
@@ -92 +89 @@
         continue;
       }
-      if (isset($module['parent']) and !isset($pwg_loaded_plugins[$module['parent']]))
+
+      preg_match('#^'.preg_quote(PHPWG_PLUGINS_PATH).'([^/]*?)/#', $module['path'], $match);
+      if (!isset($pwg_loaded_plugins[$match[1]]))
       {
         continue;

extensions/PWG_Stuffs/main.inc.php

@@ -37 +37 @@
   global $template;
 
-  include(STUFFS_PATH . 'include/class.inc.php');
-  include(STUFFS_PATH . 'include/functions.inc.php');
+  include(STUFFS_PATH . 'class.inc.php');
+  include(STUFFS_PATH . 'functions.inc.php');
 
   $template->set_template_dir(STUFFS_PATH.'theme/template/');
@@ -48 +48 @@
   {
     $template->assign('blocks', $stuffs->blocks['begin']);
-    $template->concat($stuffs->template_var['begin'],  $template->parse('stuffs', true));
+    $template->concat($stuffs->prefixe.'BEFORE',  $template->parse('stuffs', true));
   }
   if (!empty($stuffs->blocks['end']))
   {
     $template->assign('blocks', $stuffs->blocks['end']);
-    $template->concat($stuffs->template_var['end'],  $template->parse('stuffs', true));
+    $template->concat($stuffs->prefixe.'AFTER',  $template->parse('stuffs', true));
   }
 }

extensions/PWG_Stuffs/maintain.inc.php

@@ -17 +17 @@
 `descr` varchar(255) default NULL,
 `path` varchar(255) default NULL,
-`parent` varchar(255) default NULL,
 `datas` longtext default NULL,
 `users` varchar(255) default NULL,

extensions/PWG_Stuffs/modules/BestRated/config.inc.php

@@ -30 +30 @@
   'cat_display' => $datas['cat_display'],
   'category_selected' => $datas['cat_selection'],
-  'on_picture_option' => false,
-));
+  )
+);
+
+$display_options = & $template->get_template_vars('display_options');
+$display_options['on_picture'] = false;
 
 $template->set_filenames(array('module_options' => dirname(__FILE__) . '/config.tpl'));

extensions/PWG_Stuffs/modules/MostVisited/config.inc.php

@@ -30 +30 @@
   'cat_display' => $datas['cat_display'],
   'category_selected' => $datas['cat_selection'],
-  'on_picture_option' => false,
-));
+  )
+);
+
+$display_options = & $template->get_template_vars('display_options');
+$display_options['on_picture'] = false;
 
 $template->set_filenames(array('module_options' => dirname(__FILE__) . '/config.tpl'));

extensions/PWG_Stuffs/modules/Random/config.inc.php

@@ -30 +30 @@
   'cat_display' => $datas['cat_display'],
   'category_selected' => $datas['cat_selection'],
-  'on_picture_option' => false,
-));
+  )
+);
+
+$display_options = & $template->get_template_vars('display_options');
+$display_options['on_picture'] = false;
 
 $template->set_filenames(array('module_options' => dirname(__FILE__) . '/config.tpl'));

extensions/PWG_Stuffs/modules/Recent/config.inc.php

@@ -30 +30 @@
   'cat_display' => $datas['cat_display'],
   'category_selected' => $datas['cat_selection'],
-  'on_picture_option' => false,
-));
+  )
+);
+
+$display_options = & $template->get_template_vars('display_options');
+$display_options['on_picture'] = false;
 
 $template->set_filenames(array('module_options' => dirname(__FILE__) . '/config.tpl'));