Changeset 31952

Timestamp:

Nov 27, 2018, 4:55:02 PM (6 years ago)

Author:

plg

Message:

cleaner configuration manager on install/update

Location:

extensions/AntiAspi

Files:

• admin.php (modified) (1 diff)
• initadmin.php (modified) (1 diff)
• maintain.class.php (modified) (3 diffs)

extensions/AntiAspi/admin.php

@@ -74 +74 @@
         break;
         case 'ipconfig':
+        antiaspi_check_old_conf();
   global $conf, $template;
   $admin_base_url = ANTIASPI_ADMIN . '-ipconfig';

extensions/AntiAspi/initadmin.php

@@ -12 +12 @@
 } 
  
+function antiaspi_check_old_conf()
+{
+  global $page;
+
+  $conf = array();
+
+  $local_conf_filpath = PHPWG_ROOT_PATH. 'local/config/config.inc.php';
+  if (file_exists($local_conf_filpath))
+  {
+    @include($local_conf_filpath);
+  }
+
+  if (isset($conf['antiaspi']))
+  {
+    $page['errors'][] = 'we have found some antiaspi settings in your local configuration, please remove it, no longer in use.';
+  }
+}

extensions/AntiAspi/maintain.class.php

@@ -4 +4 @@
 class AntiAspi_maintain extends PluginMaintain
 {
+  private $default_conf = array(
+    'diff' => '20 pages in 00:00:10',
+    'same' => '15 pages in 00:00:30',
+    'banned during' => '23:59:59',
+    'only guest' => true,
+    'only picture' => false,
+    'allowed ip' => array('123.123.123.123','122.122.122.122'),
+    );
+
   function install($plugin_version, &$errors=array())
   {
-    global $prefixeTable;
+    global $prefixeTable, $conf;
+
+    // add config parameter
+    if (empty($conf['antiaspi']))
+    {
+      conf_update_param('antiaspi', $this->default_conf, true);
+    }
+    else
+    {
+      $old_conf = safe_unserialize($conf['antiaspi']);
+
+      foreach (array_keys($this->default_conf) as $conf_key)
+      {
+        if (!isset($old_conf[$conf_key]))
+        {
+          $old_conf[$conf_key] = $this->default_conf[$conf_key];
+        }
+      }
+
+      conf_update_param('antiaspi', $old_conf, true);
+    }
 
     // table antiaspi_ip_ban to store list of banned IP addresses
@@ -43 +72 @@
   function update($old_version, $new_version, &$errors=array())
   {
-        global $conf;  
-          
-        if (!isset($conf['antiaspi']))
-      {
-                $conf['antiaspi'] = array(
-                  'diff' => '20 pages in 00:00:10' ,
-                  'same' => '15 pages in 00:00:30' ,
-                  'banned during' => '23:59:59' ,
-                  'only guest' => true ,
-                  'only picture' => false ,
-                  'allowed ip' => array('123.123.123.123','122.122.122.122'),
-                );
-                conf_update_param('antiaspi', $conf['antiaspi']);
-      }  
-          
     $this->install($new_version, $errors);
   }
@@ -67 +81 @@
     pwg_query('DROP TABLE '.$prefixeTable.'antiaspi_ip_ban;');
     pwg_query('DROP TABLE '.$prefixeTable.'antiaspi_log;');
+
+    // delete configuration
+    pwg_query('DELETE FROM `'. CONFIG_TABLE .'` WHERE param IN ("antiaspi");');
   }
 }