Merged in from STABLE trunk...

KTS-3588 "Remove Admin Version Notifier plugin" Updated. Upgrades now remove it too. Committed By: Kevin Fourie Reviewed By: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.3-Release-Branch@9067 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from STABLE trunk...
KTS-3588 "Remove Admin Version Notifier plugin" Updated. Upgrades now remove it too. Committed By: Kevin Fourie Reviewed By: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.3-Release-Branch@9067 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent 40bc0ad2
Showing 3 changed files with 21 additions and 3 deletions
lib/upgrades/UpgradeFunctions.inc.php
sql/mysql/install/data.sql
sql/mysql/upgrade/3.5.3/del_adminversion_plugin.sql
@@ -61,7 +61,7 @@ class UpgradeFunctions {
             '3.1.6.3' => array('cleanupGroupMembership'),
             '3.5.0' => array('cleanupOldKTAdminVersionNotifier', 'updateConfigFile35', 'registerIndexingTasks'),
             '3.5.2' => array('setStorageEngine','dropForeignKeys','dropPrimaryKeys','dropIndexes','createPrimaryKeys','createForeignKeys','createIndexes', 'removeSlashesFromObjects'),
-            '3.5.3' => array('moveConfigSettingsToDB')
+            '3.5.3' => array('moveConfigSettingsToDB','removeAdminVersionNotifier')
             );
     var $descriptions = array(
@@ -93,6 +93,7 @@ class UpgradeFunctions {
             'createIndexes'=>'Recreate db integrity:Create indexes on the database',
             'removeSlashesFromObjects'=>'Remove slashes from documents and folders',
             'moveConfigSettingsToDB' => 'Move the configuration settings from the config.ini file into the new database table.'
+            'removeAdminVersionNotifier' => 'Remove the old Admin Version Notifier Plugin.'
             );
     var $phases = array(
             "setPermissionFolder" => 1,
@@ -1258,6 +1259,15 @@ class UpgradeFunctions {
 		$oScheduler->registerTask();
     }
      // }}}
+    
+    // {{{  removeAdminVersionNotifier
+    function removeAdminVersionNotifier() {
+        global $default;
+        $oldPath = KT_DIR . "/plugins/ktstandard/AdminVersionPlugin";
+
+        if(file_exists($oldPath)) return rmdir($oldPath);
+    }
+    // }}}
 }
 ?>
@@ -1705,7 +1705,9 @@ INSERT INTO `upgrades` VALUES
 (190,'sql*3.5.3*0*3.5.3/doc_checked_out_user_id.sql','Checkedout user ID update.','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'),
 (191,'sql*3.5.3*0*3.5.3/indexer_updates.sql','Indexer updates.','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'),
 (192,'sql*3.5.3*0*3.5.3/db_optimizations.sql','Database optimizations.','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'),
-(193,'upgrade*3.5.3*99*upgrade3.5.3','Upgrade from version 3.5.2 to 3.5.3','2008-03-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3');
+(193,'sql*3.5.3*0*3.5.3/del_adminversion_plugin.sql','Remove the old Admin Version Notifier.','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'),
+(194,'func*3.5.3*0*removeAdminVersionNotifier','Remove the old Admin Version Notifier files','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'),
+(195,'upgrade*3.5.3*99*upgrade3.5.3','Upgrade from version 3.5.2 to 3.5.3','2008-03-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3');
 /*!40000 ALTER TABLE `upgrades` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -2636,7 +2638,7 @@ UNLOCK TABLES;
 LOCK TABLES `zseq_upgrades` WRITE;
 /*!40000 ALTER TABLE `zseq_upgrades` DISABLE KEYS */;
 INSERT INTO `zseq_upgrades` VALUES
-(193);
+(195);
 /*!40000 ALTER TABLE `zseq_upgrades` ENABLE KEYS */;
 UNLOCK TABLES;
+-- Remove from plugins table
+DELETE FROM plugins WHERE namespace = 'ktstandard.adminversion.plugin';
+
+-- Remove from scheduler tasks table
+DELETE FROM scheduler_tasks WHERE script_url = 'plugins/ktstandard/AdminVersionPlugin/bin/UpdateNewVersion.php';
+