OpenPKG Specs: squirrelmail/squirrelmail.patch.plugins@a2c6460cfb16 (annotated)

squirrelmail/squirrelmail.patch.plugins@a2c6460cfb16 (annotated)

squirrelmail/squirrelmail.patch.plugins

Mon, 28 Jan 2013 17:37:18 +0100

author: Michael Schloh von Bennewitz <michael@schloh.com>
date: Mon, 28 Jan 2013 17:37:18 +0100
changeset 758: a2c6460cfb16
parent 159: 5524672ebbe7
permissions: -rw-r--r--

Correct socket error reporting improvement with IPv6 portable code,
after helpful recommendation by Saúl Ibarra Corretgé on OSips devlist.

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

OpenPKG Specs / annotate

squirrelmail/squirrelmail.patch.plugins@a2c6460cfb16 (annotated)

squirrelmail/squirrelmail.patch.plugins