Changeset 17657 for extensions/UserCollections

Timestamp:

Aug 29, 2012, 5:23:25 PM (12 years ago)

Author:

mistic100

Message:

consolidate upgrade process, remote filter_var function (PHP 5.2)

Location:

extensions/UserCollections

Files:

• include/collections.inc.php (modified) (1 diff)
• include/events.inc.php (modified) (1 diff)
• include/install.inc.php (added)
• main.inc.php (modified) (2 diffs)
• maintain.inc.php (modified) (2 diffs)

extensions/UserCollections/include/collections.inc.php

@@ -17 +17 @@
     
     // actions
-    if ( isset($_GET['action']) and filter_var($_GET['col_id'], FILTER_VALIDATE_INT) !== false )
+    if ( isset($_GET['action']) and preg_match('#^([0-9]+)$#', $_GET['col_id']) )
     {
       switch ($_GET['action'])

extensions/UserCollections/include/events.inc.php

@@ -3 +3 @@
 
 # this file contains all functions directly called by the triggers #
-
-/* unserialize conf and load language */
-function user_collections_init()
-{
-  load_language('plugin.lang', USER_COLLEC_PATH);
-}
 
 

extensions/UserCollections/main.inc.php

@@ -13 +13 @@
 global $conf, $prefixeTable;
 
-define('USER_COLLEC_PATH',       PHPWG_PLUGINS_PATH . basename(dirname(__FILE__)) . '/');
+define('USER_COLLEC_PATH',       PHPWG_PLUGINS_PATH . 'UserCollections/');
 define('COLLECTIONS_TABLE',      $prefixeTable.'collections');
 define('COLLECTION_IMAGES_TABLE',$prefixeTable.'collection_images');
-define('USER_COLLEC_ADMIN',      get_root_url() . 'admin.php?page=plugin-' . basename(dirname(__FILE__)));
+define('USER_COLLEC_ADMIN',      get_root_url() . 'admin.php?page=plugin-UserCollections');
 define('USER_COLLEC_PUBLIC',     get_absolute_root_url() . make_index_url(array('section' => 'collections')) . '/');
+define('USER_COLLEC_VERSION',    '1.0.3');
+
 
 add_event_handler('init', 'user_collections_init');
@@ -36 +38 @@
 require(USER_COLLEC_PATH . 'include/events.inc.php');
 
+
+/**
+ * update plugin & load language
+ */
+function user_collections_init()
+{
+  global $pwg_loaded_plugins;
+  
+  if (
+    $pwg_loaded_plugins['UserCollections']['version'] == 'auto' or
+    version_compare($pwg_loaded_plugins['UserCollections']['version'], USER_COLLEC_VERSION, '<')
+  )
+  {
+    include_once(USER_COLLEC_PATH . 'include/install.inc.php');
+    user_collections_install();
+    
+    if ($pwg_loaded_plugins['UserCollections']['version'] != 'auto')
+    {
+      $query = '
+UPDATE '. PLUGINS_TABLE .'
+SET version = "'. USER_COLLEC_VERSION .'"
+WHERE id = "UserCollections"';
+      pwg_query($query);
+      
+      $pwg_loaded_plugins['UserCollections']['version'] = USER_COLLEC_VERSION;
+      
+      if (defined('IN_ADMIN'))
+      {
+        $_SESSION['page_infos'][] = 'UserCollections updated to version '. USER_COLLEC_VERSION;
+      }
+    }
+  }
+  
+  load_language('plugin.lang', USER_COLLEC_PATH);
+}
+
 ?>

extensions/UserCollections/maintain.inc.php

@@ -2 +2 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
+include_once(PHPWG_PLUGINS_PATH . 'UserCollections/include/install.inc.php');
+
 function plugin_install() 
 {
-  global $conf, $prefixeTable;
+  user_collections_install();
   
-  $query = '
-CREATE TABLE IF NOT EXISTS `'.$prefixeTable.'collections` (
-  `id` mediumint(8) NOT NULL AUTO_INCREMENT,
-  `user_id` smallint(5) DEFAULT NULL,
-  `name` varchar(255) NOT NULL,
-  `date_creation` datetime NOT NULL,
-  `nb_images` mediumint(8) NOT NULL DEFAULT 0,
-  `active` tinyint(1) DEFAULT 0,
-  `public` tinyint(1) DEFAULT 0,
-  `public_id` varchar(10) NULL,
-  PRIMARY KEY (`id`)
-) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1
-;';
-  pwg_query($query);
-  
-  $query = '
-CREATE TABLE IF NOT EXISTS `'.$prefixeTable.'collection_images` (
-  `col_id` mediumint(8) NOT NULL,
-  `image_id` mediumint(8) NOT NULL,
-  UNIQUE KEY `UNIQUE` (`col_id`,`image_id`)
-) DEFAULT CHARSET=utf8
-;';
-  pwg_query($query);
+  define('user_collections_installed', true);
 }
 
 function plugin_activate()
 {
-  global $prefixeTable;
-  
-  // new collumn in beta2
-  $query = 'SHOW COLUMNS FROM `'.$prefixeTable.'collections`;';
-  $columns = array_from_query($query, 'Field');
-  if (!in_array('public_id', $columns))
+  if (!defined('user_collections_intalled'))
   {
-    pwg_query('ALTER TABLE `'.$prefixeTable.'collections` ADD `public_id` varchar(10) NULL;');
+    user_collections_install();
   }
 }
@@ -48 +23 @@
   global $prefixeTable;
   
-  pwg_query('DELETE FROM `'. CONFIG_TABLE .'` WHERE param = "user_collections" LIMIT 1;');
   pwg_query('DROP TABLE IF EXISTS `'.$prefixeTable.'collections`;');
   pwg_query('DROP TABLE IF EXISTS `'.$prefixeTable.'collection_images`;');