michael@157: Index: etc/squirrelmail/config.php
michael@157: diff -Nau etc/squirrelmail/config.php.orig etc/squirrelmail/config.php
michael@157: --- etc/squirrelmail/config.php.orig	2005-03-16 13:02:25 +0100
michael@157: +++ etc/squirrelmail/config.php	2005-03-16 12:31:51 +0100
michael@164: @@ -90,6 +90,23 @@
michael@164:  $plugins[15] = 'squirrelspell';
michael@164:  $plugins[16] = 'translate';
michael@157:  
michael@164: +$plugins[17] = 'addgraphics';
michael@164: +$plugins[18] = 'avelsieve';
michael@164: +$plugins[19] = 'captcha';
michael@164: +$plugins[20] = 'change_ldappass';
michael@164: +$plugins[21] = 'check_quota';
michael@164: +$plugins[22] = 'chg_sasl_passwd';
michael@164: +$plugins[23] = 'folder_sizes';
michael@164: +$plugins[24] = 'gpg';
michael@164: +$plugins[25] = 'login_notes';
michael@164: +$plugins[26] = 'password_forget';
michael@164: +$plugins[27] = 'pupdate';
michael@164: +$plugins[28] = 'show_user_and_ip';
michael@164: +$plugins[29] = 'smallcal';
michael@159: +$plugins[30] = 'smime';
michael@164: +$plugins[31] = 'username';
michael@164: +$plugins[32] = 'vkeyboard';
michael@157: +
michael@157:  /* NOP, for patch line placeholder (avoids fuzz) */
michael@157:  $theme_css = '';
michael@164:  $theme_default = 4;
michael@157: Index: share/squirrelmail/plugins/gpg/setup.php
michael@157: diff -Nau share/squirrelmail/plugins/gpg/setup.php.orig share/squirrelmail/plugins/gpg/setup.php
michael@157: --- share/squirrelmail/plugins/gpg/setup.php.orig	2005-03-18 12:01:39.398171000 +0100
michael@157: +++ share/squirrelmail/plugins/gpg/setup.php	2005-03-18 12:03:35.986216000 +0100
michael@159: @@ -23,7 +23,9 @@
michael@159:  
michael@159:  //define SM_PATH
michael@159:  if (!defined ('SM_PATH')){
michael@157: -    if (file_exists('./gpg_functions.php')){
michael@157: +    if (file_exists('../../../plugins/gpg/gpg_functions.php')){
michael@159: +        define ('SM_PATH' , '../../../');
michael@157: +    } elseif (file_exists('../../plugins/gpg/gpg_functions.php')){
michael@159:          define ('SM_PATH' , '../../');
michael@157:      } elseif (file_exists('../plugins/gpg/gpg_functions.php')) {
michael@159:          define ('SM_PATH', '../');
michael@157: Index: share/squirrelmail/plugins/chg_sasl_passwd/options.php
michael@157: diff -Nau share/squirrelmail/plugins/chg_sasl_passwd/options.php.orig share/squirrelmail/plugins/chg_sasl_passwd/options.php
michael@157: --- share/squirrelmail/plugins/chg_sasl_passwd/options.php.orig	2005-03-17 21:00:03.157951000 +0100
michael@157: +++ share/squirrelmail/plugins/chg_sasl_passwd/options.php	2005-03-18 14:16:40.480988000 +0100
michael@157: @@ -70,8 +70,8 @@
michael@157:               ' "" + dir_path + "/../../src/signout.php?chg_sasl_passwd";' . "', 0);\n" .
michael@157:               "//-->\n</script>\n";
michael@157:  
michael@157: -        echo "<H2>" . _("Your password has successfully been changed.") . "</H2>\n";
michael@157: -        echo '<div align=center>' . _("Please") . '<a href="' . SM_PATH .
michael@157: +        echo "<H2><div align=center>" . _("Your password has successfully been changed.") . "</div></H2>\n";
michael@157: +        echo '<div align=center>' . _("Please, ") . '<a href="' . SM_PATH .
michael@157:               'src/signout.php?chg_sasl_passwd" TARGET=_top>' .
michael@157:               _("logout and log back in using your new password.") . "</div>\n";
michael@157:      }
michael@157: Index: share/squirrelmail/plugins/chg_sasl_passwd/setup.php
michael@157: diff -Nau share/squirrelmail/plugins/chg_sasl_passwd/setup.php.orig share/squirrelmail/plugins/chg_sasl_passwd/setup.php
michael@157: --- share/squirrelmail/plugins/chg_sasl_passwd/setup.php.orig	2005-03-03 00:38:44.000000000 +0100
michael@157: +++ share/squirrelmail/plugins/chg_sasl_passwd/setup.php	2005-03-18 14:29:52.513613000 +0100
michael@157: @@ -32,8 +32,12 @@
michael@157:  
michael@157:      if (isset($_SERVER['QUERY_STRING']) &&
michael@157:          stristr($_SERVER['QUERY_STRING'], 'chg_sasl_passwd') )
michael@157: -        echo "<br><b>" . _("Your password has been changed. This requires that you logout and then log back in with the new password.") .
michael@157: -             "<br><p><br>\n" . _("Logging out automagically") . ".<br><br>\n";
michael@157: +        echo "<center>" .
michael@157: +             "<br /><b>" . _("Your password has been changed.") .
michael@157: +             "</b><br />" . _("This requires that you logout and then") .
michael@157: +             "<br />" . _("log back in with the new password.") .
michael@157: +             "<br /><br />" . _("Logging out automatically...") .
michael@157: +             "</center><br /><br /><br />\n";
michael@157:  
michael@157:      /* Switch back to the SquirrelMail domain */
michael@157:      textdomain('squirrelmail');
michael@157: Index: share/squirrelmail/plugins/check_quota/config.sample.php
michael@157: diff -uaN share/squirrelmail/plugins/check_quota/config.sample.php.orig share/squirrelmail/plugins/check_quota/config.sample.php     
michael@157: --- share/squirrelmail/plugins/check_quota/config.sample.php.orig       2008-01-03 06:39:34.000000000 +0100
michael@157: +++ share/squirrelmail/plugins/check_quota/config.sample.php    2008-01-03 06:39:48.000000000 +0100
michael@157: @@ -25,7 +25,7 @@
michael@157:   * 0: UNIX / 1: IMAP / 2: cPanel
michael@157:  */
michael@157:  
michael@157: -$settings['quota_type'] = 0;
michael@157: +$settings['quota_type'] = 1;
michael@157:  
michael@157:  
michael@157:  /*
michael@159: Index: share/squirrelmail/plugins/captcha/functions.php
michael@159: diff -uaN share/squirrelmail/plugins/captcha/functions.php.orig share/squirrelmail/plugins/captcha/functions.php     
michael@159: --- share/squirrelmail/plugins/captcha/functions.php.orig       2009-02-02 16:13:12.000000000 +0100
michael@159: +++ share/squirrelmail/plugins/captcha/functions.php    2009-04-17 22:30:41.804849878 +0200
michael@159: @@ -122,13 +122,15 @@
michael@159:  
michael@159:        if (!empty($show_captcha_countries) || !empty($do_not_show_captcha_countries))
michael@159:        {
michael@159: -         include_once(SM_PATH . 'plugins/user_info/functions.php');
michael@159: +         if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
michael@159: +         {
michael@159:           $user_info = get_user_info();
michael@159:           if (empty($user_info['country_code']))
michael@159:           {
michael@159:              do_err('CAPTCHA plugin used with $show_captcha_countries or $do_not_show_captcha_countries requires the User Information plugin with a IP-to-country module', FALSE);
michael@159:              return TRUE;
michael@159:           }
michael@159: +         }
michael@159:        }
michael@159:     }
michael@159:  
michael@159: @@ -183,7 +185,8 @@
michael@159:     if (!empty($hide_captcha_ips) || !empty($show_captcha_ips)
michael@159:      && file_exists(SM_PATH . 'plugins/user_info/functions.php'))
michael@159:     {
michael@159: -      include_once(SM_PATH . 'plugins/user_info/functions.php');
michael@159: +      if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
michael@159: +      {
michael@159:        $user_info = get_user_info();
michael@159:        if (!empty($user_info['ip_address']))
michael@159:        {
michael@159: @@ -194,6 +197,7 @@
michael@159:            && !captcha_match_ip_address($user_info['ip_address'], $show_captcha_ips))
michael@159:              return;
michael@159:        }
michael@159: +      }
michael@159:     }
michael@159:  
michael@159:  
michael@159: @@ -203,7 +207,8 @@
michael@159:     if (!empty($show_captcha_countries) || !empty($do_not_show_captcha_countries)
michael@159:      && file_exists(SM_PATH . 'plugins/user_info/functions.php'))
michael@159:     {
michael@159: -      include_once(SM_PATH . 'plugins/user_info/functions.php');
michael@159: +      if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
michael@159: +      {
michael@159:        $user_info = get_user_info();
michael@159:        if (!empty($user_info['country_code']))
michael@159:        {
michael@159: @@ -214,6 +219,7 @@
michael@159:            && !in_array($user_info['country_code'], $show_captcha_countries))
michael@159:              return;
michael@159:        }
michael@159: +      }
michael@159:     }
michael@159:  
michael@159:  
michael@159: @@ -257,7 +263,8 @@
michael@159:     if (!empty($hide_captcha_ips) || !empty($show_captcha_ips)
michael@159:      && file_exists(SM_PATH . 'plugins/user_info/functions.php'))
michael@159:     {
michael@159: -      include_once(SM_PATH . 'plugins/user_info/functions.php');
michael@159: +      if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
michael@159: +      {
michael@159:        $user_info = get_user_info();
michael@159:        if (!empty($user_info['ip_address']))
michael@159:        {
michael@159: @@ -268,6 +275,7 @@
michael@159:            && !captcha_match_ip_address($user_info['ip_address'], $show_captcha_ips))
michael@159:              return;
michael@159:        }
michael@159: +      }
michael@159:     }
michael@159:  
michael@159:  
michael@159: @@ -277,7 +285,8 @@
michael@159:     if (!empty($show_captcha_countries) || !empty($do_not_show_captcha_countries)
michael@159:      && file_exists(SM_PATH . 'plugins/user_info/functions.php'))
michael@159:     {
michael@159: -      include_once(SM_PATH . 'plugins/user_info/functions.php');
michael@159: +      if (include_once(SM_PATH . 'plugins/user_info/functions.php'))
michael@159: +      {
michael@159:        $user_info = get_user_info();
michael@159:        if (!empty($user_info['country_code']))
michael@159:        {
michael@159: @@ -288,6 +297,7 @@
michael@159:            && !in_array($user_info['country_code'], $show_captcha_countries))
michael@159:              return;
michael@159:        }
michael@159: +      }
michael@159:     }
michael@159:  
michael@159: