Преглед изворни кода

Remove Sanitize Plugins functionality since that's not relevant anymore to 1.3

Thijs Kinkhorst пре 23 година
родитељ
комит
2708584fd9
2 измењених фајлова са 3 додато и 34 уклоњено
  1. 3 8
      UPGRADE
  2. 0 26
      config/conf.pl

+ 3 - 8
UPGRADE

@@ -111,15 +111,10 @@ Run config/conf.pl to see the new configuration options available with the
 new version, as well as to verify that all of your old options are set
 new version, as well as to verify that all of your old options are set
 properly.
 properly.
 
 
-When you have migrated plugins from your old install to your new
-install, or even use any plugins at all, you *must* run conf.pl and do
-the following:
+Always save your options, also if you haven't changed anything.
+This will ensure that any problems with conf.pl that might have been solved
+are effective to your installation.
 
 
-A.  Select "8" (Plugins)
-B.  Select "A" (Sanitize all plugins for use with Squirrelmail 1.2)
-
-This will make sure the plugins work more efficiently (and will
-release you from any "cannot redeclare" error messages).
 
 
 6.  DONE!
 6.  DONE!
 =========
 =========

+ 0 - 26
config/conf.pl

@@ -525,8 +525,6 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
         }
         }
         closedir DIR;
         closedir DIR;
 
 
-        print "\n";
-        print "A   Sanitize all plugins for use with Squirrelmail 1.2\n";
         print "\n";
         print "\n";
         print "R   Return to Main Menu\n";
         print "R   Return to Main Menu\n";
     } elsif ( $menu == 9 ) {
     } elsif ( $menu == 9 ) {
@@ -659,7 +657,6 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
             if ( $command == 1 ) { $motd = command71(); }
             if ( $command == 1 ) { $motd = command71(); }
         } elsif ( $menu == 8 ) {
         } elsif ( $menu == 8 ) {
             if ( $command =~ /^[0-9]+/ ) { @plugins = command81(); }
             if ( $command =~ /^[0-9]+/ ) { @plugins = command81(); }
-            elsif ( $command eq "a" ) { command8s(); }
         } elsif ( $menu == 9 ) {
         } elsif ( $menu == 9 ) {
             if    ( $command == 1 ) { $addrbook_dsn     = command91(); }
             if    ( $command == 1 ) { $addrbook_dsn     = command91(); }
             elsif ( $command == 2 ) { $addrbook_table   = command92(); }
             elsif ( $command == 2 ) { $addrbook_table   = command92(); }
@@ -1094,17 +1091,6 @@ sub command81 {
             while ( $ct <= $#unused_plugins ) {
             while ( $ct <= $#unused_plugins ) {
                 if ( $ct == $num ) {
                 if ( $ct == $num ) {
                     @newplugins = ( @newplugins, $unused_plugins[$ct] );
                     @newplugins = ( @newplugins, $unused_plugins[$ct] );
-
-                    # sanitize the plugin
-                    $dir = $unused_plugins[$ct];
-                    if (-d "../plugins/$dir") {
-                        `./ri_once.pl ../plugins/$dir`;
-                    } else {
-                        print "Could not locate ../plugins/$dir\n" ;
-                        print "The plugin $dir could *not* be sanitized!\n" ;
-                        print "If you want to try to do this manually, please run\n" ;
-                         print "config/ri_once.pl with the full path to the $dir plugin.\n" ;
-                    }
                 }
                 }
                 $ct++;
                 $ct++;
             }
             }
@@ -1114,18 +1100,6 @@ sub command81 {
     return @plugins;
     return @plugins;
 }
 }
 
 
-sub command8s {
-    print "This command will sanitize all plugins for use with\n";
-    print "Squirrelmail 1.2. That is, it will rewrite some php-\n";
-    print "constructs that are *incompatible* with the 1.2 design\n";
-    print "into ones that are *compatible*\n";
-    print "Do you wish to issue this command [y/N]? ";
-    $ctu = <STDIN>;
-    if ( $ctu =~ /^y\n/i ) {
-        `./ri_once.pl ../plugins`;
-    }
-}
-
 ################# FOLDERS ###################
 ################# FOLDERS ###################
 
 
 # default_folder_prefix
 # default_folder_prefix