Changeset 3695 for extensions/whois_online/maintain.inc.php

Timestamp:

Jul 28, 2009, 9:33:06 PM (15 years ago)

Author:

vdigital

Message:

Minor release: 2009-07-28 2.0.j

Minor changes in Config management
Additionnal flags (Ireland, Armenia, Estonia, Kazakhstan, Belarus,
Andorra, Turkey, Albania, Bosnia and Herzegovina, Azerbaijan, Iceland, European Union,
Israel, Morocco, New Caledonia and some other revised)
Search Engine trapping

File:

• extensions/whois_online/maintain.inc.php (modified) (1 diff)

extensions/whois_online/maintain.inc.php

@@ -8 +8 @@
 function plugin_activate()
 {
-        global $user;
+        global $user,$conf;
         $query = "CREATE TABLE IF NOT EXISTS ". WHOIS_ONLINE_TABLE ." (
-  `IP` varchar(39) NOT NULL default '',
-  `hidden_IP` enum('true','false') NOT NULL default 'false',
+  `IP` varchar(39) NOT NULL DEFAULT '',
+  `hidden_IP` enum('true','false') NOT NULL DEFAULT 'false',
   `session_id` varchar(40) NOT NULL,
-  `user_id` smallint(5) NOT NULL default '0',
-  `username` varchar(100) character set utf8 collate utf8_bin NOT NULL default '',
-  `lang` char(2) character set utf8 collate utf8_bin NOT NULL default 'en',
-  `country` VARCHAR( 256 ) NOT NULL default '',
-  `permanent` enum('true','false') NOT NULL default 'false',
-  `last_access` varchar(12) NOT NULL default '',
-  `last_elm_ids` varchar(75) NOT NULL default '',
-  `last_cat_ids` varchar(75) NOT NULL default '',
-  `last_tag_ids` varchar(75) NOT NULL default '',
-  `last_sch_ids` varchar(75) NOT NULL default '',
-  `first_access_date` varchar(45) NOT NULL default '',
-  `last_dates` varchar(110) character set utf8 collate utf8_bin NOT NULL default '',
-  `elm_hits` int(10) unsigned NOT NULL default '0',
-  `pag_hits` int(10) unsigned NOT NULL default '0',
-  `db_timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  `user_id` smallint(5) NOT NULL DEFAULT '0',
+  `username` varchar(100) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
+  `lang` char(2) character set utf8 collate utf8_bin NOT NULL DEFAULT 'en',
+  `country` VARCHAR( 256 ) NOT NULL DEFAULT '',
+  `user_agent` VARCHAR( 160 ) NOT NULL DEFAULT '',
+  `any_previous` VARCHAR( 256 ) NOT NULL DEFAULT '',
+  `same_previous` VARCHAR( 256 ) NOT NULL DEFAULT '',
+  `permanent` enum('true','false') NOT NULL DEFAULT 'false',
+  `last_access` varchar(12) NOT NULL DEFAULT '',
+  `last_elm_ids` varchar(75) NOT NULL DEFAULT '',
+  `last_cat_ids` varchar(75) NOT NULL DEFAULT '',
+  `last_tag_ids` varchar(75) NOT NULL DEFAULT '',
+  `last_sch_ids` varchar(75) NOT NULL DEFAULT '',
+  `first_access_date` varchar(45) NOT NULL DEFAULT '',
+  `last_dates` varchar(110) character set utf8 collate utf8_bin NOT NULL DEFAULT '',
+  `elm_hits` int(10) unsigned NOT NULL DEFAULT '0',
+  `pag_hits` int(10) unsigned NOT NULL DEFAULT '0',
+  `db_timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
   PRIMARY KEY  (`session_id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 ";
         $result = pwg_query($query);
-        if (isset($conf['Whois Online'])) {
-                $conf_whois = unserialize($conf['Whois Online']);
-                if (!isset($conf_whois['Active'])) $conf_whois['Active'] = true;
-                if (!isset($conf_whois['Delete level'])) $conf_whois['Delete level'] = 20;
-                if (!isset($conf_whois['Radar limit'])) $conf_whois['Radar limit'] = 25;
-                if (!isset($conf_whois['Webmasters'])) $conf_whois['Webmasters'] = 2;
-                if (!isset($conf_whois['Administrators'])) $conf_whois['Administrators'] = 2;
-                if (!isset($conf_whois['Obsolete limit'])) $conf_whois['Obsolete limit'] = 20;
-                if (!isset($conf_whois['Add to Plugins menu'])) $conf_whois['Add to Plugins menu'] = false;
-                if (!isset($conf_whois['Add icon to History'])) $conf_whois['Add icon to History'] = true;
-                if (!isset($conf_whois['Keep data'])) $conf_whois['Keep data'] = true;
-                if (!isset($conf_whois['Default display'])) $conf_whois['Default display'] = true;
-                if (!isset($conf_whois['Search id'])) $conf_whois['Search id'] = 0;
-                if (!isset($conf_whois['Users'])) 
-                        $conf_whois['Users'] = Array('max' => 0, 'When' => date('Y-m-d'), 'count' => 0);
-                $conf['Whois Online'] = serialize($conf_whois);
+        if (!isset($conf['Whois Online'])) {
+                $conf['Whois Online'] = serialize(Array());
+                pwg_query('REPLACE INTO ' . CONFIG_TABLE . " (param,value,comment)
+                VALUES ('Whois Online','". $conf['Whois Online'] ."','Whois Online configuration');");
         }
-        else {
-                $conf['Whois Online'] = serialize(Array(
-                        'Active' => true,
-                        'Delete level' => 20,
-                        'Radar limit' => 25,
-                        'Obsolete limit' => 20,
-                        'Webmasters' => 2,
-                        'Administrators' => 2,
-                        'Search id' => 0,
-                        'Users' => Array('max' => 0, 'When' => date('Y-m-d'), 'count' => 0),
-                        'Add to Plugins menu' => false,
-                        'Add icon to History' => true,
-                        'Keep data' => true,
-                        'Default display' => true,
-                ));
-        }
-        pwg_query('REPLACE INTO ' . CONFIG_TABLE . " (param,value,comment)
-        VALUES ('Whois Online','". $conf['Whois Online'] ."','Whois Online configuration');");
-        $conf_whois = unserialize($conf['Whois Online']);
         if (isset($conf_whois['Keep data']) and !$conf_whois['Keep data']) {
                 pwg_query('DELETE FROM ' . WHOIS_ONLINE_TABLE);