Changeset 9449 for extensions/PWG_Stuffs/admin

Timestamp:

Mar 1, 2011, 1:00:44 PM (13 years ago)

Author:

patdenice

Message:

Optimizations.

Location:

extensions/PWG_Stuffs/admin

Files:

• manage.inc.php (modified) (3 diffs)
• template/manage.tpl (modified) (2 diffs)
• template/new.tpl (modified) (1 diff)
• upgrade.inc.php (modified) (7 diffs)

extensions/PWG_Stuffs/admin/manage.inc.php

@@ -30 +30 @@
     pwg_query('
 UPDATE ' . STUFFS_TABLE . '
-SET datas = "'.addslashes(serialize(array('hide' => isset($_POST['hidemb'])))).'"
+SET datas = "'.addslashes(serialize(!isset($_POST['hidemb']))).'"
 WHERE id=0;');
 
@@ -60 +60 @@
   $module['name'] = !empty($module['path']) ? $module['name'] : l10n('stuffs_main_block');
 
-  $missing = false;
+  $missing_message = '';
+  if ($module['path'] == PHPWG_PLUGINS_PATH.'piclens/stuffs_module/' and !file_exists(PICLENS_PATH.'stuffs_module/main.inc.php'))
+  {
+    $missing_message = l10n('stuffs_piclens_need_upgrade');
+  }
   if (!empty($module['path']))
   {
     preg_match('#^'.preg_quote(PHPWG_PLUGINS_PATH).'([^/]*?)/#', $module['path'], $match);
-    $missing = !isset($pwg_loaded_plugins[$match[1]]);
+    if (!isset($pwg_loaded_plugins[$match[1]]))
+    {
+      $missing_message = l10n('stuffs_parent_plugin_is_missing');
+    }
   }
 
@@ -80 +87 @@
     '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' => $missing,
+    'MISSING' => $missing_message,
     )
   );
 
-  if (empty($module['path']) and !empty($module['datas']))
+  if (empty($module['path']))
   {
-    $datas = unserialize($module['datas']);
-    $template->assign('HIDEMB', $datas['hide']); 
+    $show = unserialize($module['datas']);
+    $template->assign('HIDEMB', !$show); 
   }
 }

extensions/PWG_Stuffs/admin/template/manage.tpl

@@ -63 +63 @@
           <input type="text" size="2" maxlength="2" value="{$module.WIDTH}" name="width[{$module.ID}]" > %
         </li>
-        {if !$module.MISSING}
+        {if empty($module.MISSING)}
         <li><a href="{$module.U_EDIT}" title="{'stuffs_edit'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_edit.png" class="button" alt="{'stuffs_edit'|@translate}"/></a></li>
         {/if}
@@ -78 +78 @@
       </p>
 
-      {if $module.MISSING}
-        <p style="margin-left: 30px;">{'stuffs_parent_plugin_is_missing'|@translate}</p> 
+      {if !empty($module.MISSING)}
+        <p style="margin-left: 30px;">{$module.MISSING}</p> 
       {elseif !empty($module.DESC)}
         <p style="margin-left: 30px;"><i>{$module.DESC}</i></p>

extensions/PWG_Stuffs/admin/template/new.tpl

@@ -3 +3 @@
 </div>
 
-<form method="post" action="" class="general">
+<form method="post" action="" class="properties">
 
-<fieldset>
-        <legend>{'stuffs_add_mod'|@translate}</legend>
-
-        <table>
-        {foreach from=$add_module item=module}
-        <tr>
-                <td><input type="radio" value="{$module.MODULE_PATH}" name="module"/>
-                        <b>{$module.NAME}</b> : {$module.DESC}</td>
-        </tr>
-        {/foreach}
-        </table>
-<br>
-<div style="text-align:center;">
-<input class="submit" name="addModule" type="submit" value="{'stuffs_add_mod'|@translate}" {$TAG_INPUT_ENABLED} />
-</div>
-
+<fieldset id="indexDisplayConf" style="padding-top:25px;">
+  <legend>{'stuffs_add_mod'|@translate}</legend>
+  <ul>
+    {foreach from=$add_module item=module}
+    <li>
+      <label>
+        <span class="property">{$module.NAME} <span style="font-weight:normal;">: {$module.DESC}</span></span>
+        <input type="radio" value="{$module.MODULE_PATH}" name="module"/>
+      </label>
+    </li>
+    {/foreach}
+  </ul>
 </fieldset>
-
+<p><input class="submit" name="addModule" type="submit" value="{'stuffs_add_mod'|@translate}"/></p>
 </form>

extensions/PWG_Stuffs/admin/upgrade.inc.php

@@ -5 +5 @@
 global $prefixeTable, $conf;
 
-$query = 'SHOW FULL COLUMNS FROM ' . $prefixeTable . 'stuffs;';
+$query = 'SHOW FULL COLUMNS FROM '.STUFFS_TABLE.';';
 $result = array_from_query($query, 'Field');
 if ($result[5] == 'params')
 {
-  $query = 'ALTER TABLE ' . $prefixeTable . 'stuffs
+  $query = 'ALTER TABLE '.STUFFS_TABLE.'
 MODIFY COLUMN name TEXT CHARACTER SET utf8 NOT NULL,
 MODIFY COLUMN descr VARCHAR(255) CHARACTER SET utf8 default NULL,
@@ -30 +30 @@
   pwg_query($query);
   
-  $query = 'SELECT id, name, type, params, datas FROM ' . $prefixeTable . 'stuffs;';
+  $query = 'SELECT id, name, type, params, datas FROM '.STUFFS_TABLE.';';
   $result = pwg_query($query);
   
@@ -76 +76 @@
   }
 
-  $query = 'ALTER TABLE ' . $prefixeTable . 'stuffs DROP params;';
+  $query = 'ALTER TABLE '.STUFFS_TABLE.' DROP params;';
   pwg_query($query);
 
@@ -86 +86 @@
 }
 
-$query = 'SHOW FULL COLUMNS FROM ' . $prefixeTable . 'stuffs;';
+$query = 'SHOW FULL COLUMNS FROM '.STUFFS_TABLE.';';
 $result = array_from_query($query, 'Field');
 if ($result[4] != 'path')
 {
-  $query = 'ALTER TABLE ' . $prefixeTable . 'stuffs
+  $path = $plugin['id'];
+  $conf['Stuffs'] = array();
+
+  $query = 'ALTER TABLE '.STUFFS_TABLE.'
 CHANGE `type` `path` VARCHAR( 255 ) NULL DEFAULT NULL,
 ADD `level` TINYINT( 3 ) NOT NULL default "0" AFTER `groups`,
@@ -97 +100 @@
   pwg_query($query);
 
-  $query = 'UPDATE ' . $prefixeTable . 'stuffs
+  $query = 'UPDATE '.STUFFS_TABLE.'
 SET on_root = "false"
-WHERE on_cats = "false"
+WHERE on_cats <> "true"
 ;';
   pwg_query($query);
 
-  $query = 'UPDATE ' . $prefixeTable . 'stuffs
-SET path = CONCAT("'.PHPWG_ROOT_PATH.'", "plugins/PWG_Stuffs/", path, "/")
-WHERE path <> "MainBlock"
+  $query = 'SELECT * FROM '.STUFFS_TABLE.';';
+  $result = pwg_query($query);
+
+  while ($row = pwg_db_fetch_assoc($result))
+  {
+    if ($row['path'] == 'Personal')
+    {
+      $data = unserialize($row['datas']);
+      $row['datas'] = serialize($data[0]);
+    }
+    if ($row['path'] == 'piclenswall')
+    {
+      $row['path'] = PHPWG_PLUGINS_PATH.'piclens/stuffs_module/';
+      $conf['Stuffs']['piclens_upgrade'] = true;
+    }
+    elseif ($row['path'] != 'MainBlock')
+    {
+      $row['path'] = PHPWG_PLUGINS_PATH.$path.'/modules/'.$row['path'].'/';
+    }
+    else
+    {
+      // Main Block
+      $row['path'] = null;
+      if (!empty($row['datas']))
+      {
+        $data = unserialize($row['datas']);
+        $row['datas'] = serialize(!$data['hide']);
+      }
+      else
+      {
+        $row['datas'] = serialize(true);
+      }
+    }
+
+    $query = 'UPDATE '.STUFFS_TABLE.'
+SET path = '.(is_null($row['path']) ? 'NULL' : '"'.$row['path'].'"').',
+    datas = "'.addslashes($row['datas']).'"
+WHERE id = '.$row['id'].'
 ;';
-  pwg_query($query);
+    pwg_query($query);
+  }
 
-  $query = 'UPDATE ' . $prefixeTable . 'stuffs
-SET path = NULL
-WHERE path = "MainBlock"
-;';
-  pwg_query($query);
-
-  $conf['Stuffs'] = array('level_perm' => false);
+  $conf['Stuffs']['level_perm'] = false;
 
   $query = 'SELECT id
-FROM '.$prefixeTable.'stuffs
+FROM '.STUFFS_TABLE.'
 WHERE users <> "guest,generic,normal,admin,webmaster"
 ;';
@@ -125 +158 @@
 
   $query = 'SELECT id
-FROM '.$prefixeTable.'stuffs
+FROM '.STUFFS_TABLE.'
 WHERE groups IS NOT NULL
 ;';
@@ -132 +165 @@
 
   $query = 'INSERT INTO ' . CONFIG_TABLE . ' (param,value,comment)
-VALUES ("PWG_Stuffs" , "'.pwg_db_real_escape_string(serialize($conf['Stuffs'])).'" , "PWG Stuffs configuration");';
-  pwg_query($query);  
+VALUES ("PWG_Stuffs" , "'.pwg_db_real_escape_string(serialize($conf['Stuffs'])).'" , "PWG Stuffs plugin configuration");';
+  pwg_query($query);
+}
+
+// Display Piclens upgrade message
+if (isset($conf['Stuffs']['piclens_upgrade']) and isset($menu))
+{
+  if (file_exists(PHPWG_PLUGINS_PATH.'piclens/stuffs_module/main.inc.php'))
+  {
+    unset($conf['Stuffs']['piclens_upgrade']);
+  }
+  else
+  {
+    if (get_db_plugins('active','piclens'))
+    {
+      global $page;
+      load_language('plugin.lang', STUFFS_PATH);
+      array_push($page['errors'], l10n('stuffs_piclens_need_upgrade'));
+    }
+  }
+  conf_update_param('PWG_Stuffs', pwg_db_real_escape_string(serialize($conf['Stuffs'])));
 }