Sophie

Sophie

distrib > Mandriva > 2007.0 > i586 > by-pkgid > e54b55c779885f2da2061fb224edbd31 > files > 29

squirrelmail-1.4.8-3mdv2007.0.src.rpm

--- addrule_html.php.orig	2004-01-21 10:54:52.000000000 +0100
+++ addrule_html.php	2004-01-21 10:55:13.000000000 +0100
@@ -499,7 +499,7 @@
 		if(isset($_SESSION['rules'][$edit]['redirectemail']))
 			print $_SESSION['rules'][$edit]['redirectemail'];
 	} else {
-		print _("someone@example.org");
+		print _("someone@__HOSTNAME__");
 	}
 	print '" /></blockquote><br />';
 	
--- setup.php~	2004-01-21 13:04:28.000000000 +0100
+++ setup.php	2004-01-21 13:04:28.000000000 +0100
@@ -39,7 +39,7 @@
       textdomain ('avelsieve');
 
       $optpage_blocks[] = array(
-         'name' => _("Message Filters"),
+         'name' => _("Message Filters (sieve)"),
          'url'  => '../plugins/avelsieve/table.php',
 	 'desc' => _("Server-Side mail filtering enables you to add criteria in order to automatically forward, delete or place a given message into a folder."),
          'js'   => false
--- config_sample.php.old	2004-01-26 16:00:41.000000000 +0100
+++ config_sample.php	2004-01-29 12:58:21.000000000 +0100
@@ -46,7 +46,7 @@
 
 $imapproxymode = false;
 $imapproxyserv = array(
-	'localhost' => 'imap.example.org'
+	'localhost' => '__HOSTNAME__'
 );
 
 /* *** Option Reenabled since 0.9.9 ***
@@ -108,8 +108,9 @@
 $headers = array(
  'From', 'To', 'Cc', 'Bcc', 'Subject', 'Reply-To', 'Sender', 'List-Id',
  'MailingList', 'X-ML-Name', 'X-List', 'X-Mailer', 'X-MailingList',
- 'X-Mailing-List', 'X-Spam-Flag', 'X-Spam-Status', 'X-Priority', 'Importance',
- 'X-MSMail-Priority', 'Precedence');
+ 'X-Mailing-List', 'X-Spam-Flag', 'X-Spam-Status', 'X-Spam-Level', 'X-Spam-Score', 'X-Priority', 'Importance',
+ 'X-MSMail-Priority', 'Precedence', 'X-Envelope-To',
+ 'X-Original-To', 'X-AMaViS-Alert', 'X-Quarantine-id', 'X-BeenThere', 'List-Owner', 'List-Post');
 
 /* Available :method's for the :notify extension (if applicable) */
 $notifymethods = array(
--- addrule_html.php.old	2004-02-19 16:22:25.000000000 +0100
+++ addrule_html.php	2004-02-19 16:23:31.000000000 +0100
@@ -335,7 +334,7 @@
 			print_matchtype_listbox("", $n);
 		}
 	
-		print '<input type="text" name="headermatch['.$n.']" size="24" maxlength="40" value="';
+		print '<input type="text" name="headermatch['.$n.']" size="30" maxlength="80" value="';
 		if(isset($headermatch[$n])) {
 			print htmlspecialchars($headermatch[$n]);
 		}
@@ -512,7 +511,7 @@
 	print _("Redirect to the following email address:");
 	print '</label>';
 
-	print '<br /><blockquote><input type="text" name="redirectemail" size="26" maxlength="58" value="';
+	print '<br /><blockquote><input type="text" name="redirectemail" size="40" maxlength="80" value="';
 	if(isset($edit)) {
 		if(isset($_SESSION['rules'][$edit]['redirectemail']))
 			print $_SESSION['rules'][$edit]['redirectemail'];
@@ -567,9 +566,9 @@
 			if ($createnewfolder) {
 	
 				print '<br /><input type="radio" name="newfolder" value="5b" onclick="checkOther(\'5\');" /> ';
-				print _("a new folder, named");
-				print '<input type="text" size="25" name="folder_name" onclick="checkOther(\'5\');" /> ';
-				print _("created as a subfolder of");
+				print _("a new folder, named&nbsp;");
+				print '<input type="text" size="20" name="folder_name" onclick="checkOther(\'5\');" /> ';
+				print _("created as a subfolder of&nbsp;");
 				print printmailboxlist("subfolder", false, true);
 			}
 		
@@ -625,7 +624,7 @@
 			print $emailaddresses;
 		}
 	
-		print '" size="80" maxsize="200"><br />';
+		print '" size="60" maxsize="200"><br />';
 		
 		print _("Days: Reply message will be resent after");
 		print ' <input type="text" name="vac_days" value="';
--- table_html.php.old	2004-01-26 16:00:41.000000000 +0100
+++ table_html.php	2004-02-19 15:59:21.000000000 +0100
@@ -42,7 +42,7 @@
 	global $color;
 	
 	print '<br>
-	<table bgcolor="'.$color[0].'" width="95%" align="center" cellpadding="2" cellspacing="0" border="0">
+	<table bgcolor="'.$color[0].'" width="99%" align="center" cellpadding="2" cellspacing="0" border="0">
 	<tr><td align="center">
 	    <strong>'.
 	    _("Server-Side Mail Filtering");
@@ -70,7 +70,7 @@
 
 function print_all_sections_start() {
 
-	echo "<TABLE WIDTH=\"70%\" COLS=1 ALIGN=CENTER cellpadding=4 cellspacing=0 border=0>\n";
+	echo "<TABLE WIDTH=\"96%\" COLS=1 ALIGN=CENTER cellpadding=4 cellspacing=0 border=0>\n";
 
 }
 
--- addrule_html.php.avel	2004-06-07 08:55:55.000000000 +0200
+++ addrule_html.php	2004-06-07 08:57:29.000000000 +0200
@@ -111,11 +111,11 @@
 	if (count($boxes)) {
 	    $mailboxlist = '<select name="'.$selectname.'" onclick="checkOther(\'5\');" >';
 	
-	    if($sub) {
-		if ($default_sub_of_inbox == false ) {
-			$mailboxlist = $mailboxlist."\n".'<option selected value="">[ '._("None")." ] </option>\n";	
-		}
-	    }
+//	    if($sub) {
+//		if ($default_sub_of_inbox == false ) {
+//			$mailboxlist = $mailboxlist."\n".'<option selected value="">[ '._("None")." ] </option>\n";	
+//		}
+//	    }
 
 	    for ($i = 0; $i < count($boxes); $i++) {
 	            $box = $boxes[$i]['unformatted-dm'];
--- config_sample.php~	2004-07-28 13:58:40.572197843 +0200
+++ config_sample.php	2004-07-28 13:58:40.572197843 +0200
@@ -114,7 +114,7 @@
 
 /* Available :method's for the :notify extension (if applicable) */
 $notifymethods = array(
-'mailto', 'sms'
+'mailto'
 );
 /* use the value "false" if you want to provide a simple input box so that
  * users can edit the method themselves : */
--- constants.php.orig	2004-05-17 16:34:54.000000000 +0200
+++ constants.php	2004-07-28 14:03:37.520549761 +0200
@@ -95,7 +95,7 @@
 	'terse' => _("terse")
 	);
 
-$implemented_capabilities = array("fileinto", "reject", "vacation", "imapflags", "relational", "regex", "notify");
+$implemented_capabilities = array("fileinto", "reject", "envelope", "vacation", "imapflags", "notify", "subaddress", "relational", "regex");
 
 $cap_dependencies['relational'] = array("comparator-i;ascii-numeric");