Attachment #226969 for bug #257635

View | Details | Raw Unified | Return to bug 257635
Collapse All | Expand All

Lines 2-8 Link Here

(-)security/mailzu.new/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= mailzu	3	PORTNAME= mailzu
4	DISTVERSION= 0.8rc3	4	DISTVERSION= 0.8rc3
5	PORTREVISION= 6	5	PORTREVISION= 7
6	CATEGORIES= security	6	CATEGORIES= security
7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/MailZu%200.8RC3	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/MailZu%200.8RC3
8	PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}	8	PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}




 );
 
 // Language files directory	
@@ -113,10 +114,10 @@ function get_browser_lang() {
 	global $languages;
 		
 	if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-		$http_accepted = split(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']);
+		$http_accepted = explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']);
 		for ($i = 0; $i < count($http_accepted); $i++) {
 			foreach ($languages as $lang => $vals) {
-				if (eregi($vals[0], $http_accepted[$i]))
+				if (preg_match($vals[0], $http_accepted[$i]))
 					return $lang;
 			}
 		}	




--- help.php.orig	2007-06-14 19:00:15 UTC
+++ help.php
@@ -1,73 +1,73 @@
-<?php
-/**
-* This is the pop-up help file for the system
-* This function simply prints out an HTML help file for
-* users to reference
-* @author Nick Korbel <lqqkout13@users.sourceforge.net>
-* @version 07-10-04
-* @package phpScheduleIt
-*
-* Copyright (C) 2003 - 2005 phpScheduleIt
-* License: GPL, see LICENSE
-*/
-
-include_once('config/config.php');
-
-global $languages;
-global $lang;
-global $charset;
-
-echo "<?xml version=\"1.0\" encoding=\"$charset\"?" . ">\n";
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?=$languages[$lang][2]?>" lang="<?=$languages[$lang][2]?>">
-<head>
-<title>MailZu <?=translate('Help')?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=<?=$charset?>" />
-<style type="text/css">
-<!--
-li {
-	font-size: 12px;
-	margin-top: 0px;
-	margin-right: 0px;
-	margin-bottom: 0px;
-	margin-left: 0px;
-}
-body {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	margin-top: 5px;
-	margin-right: 5px;
-	margin-bottom: 5px;
-	margin-left: 5px;
-	background-color: #F0F0F0;
-}
-p {
-	font-size: 12px;
-	margin-left: 25px;
-	margin-top: 3px;
-}
-h5 {
-	margin-left: 10px;
-}
-a {
-	color: #104E8B;
-}
-a:hover {
-	color: #474747;
-}
--->
-</style>
-</head>
-<body>
-<?
-$help_file = 'lang/' . $languages[$lang][2] . '.help.php';
-if (file_exists($help_file)) {
-	include_once($help_file);
-}
-else {
-	include_once('lang/en.help.php');
-}
-?>
-</body>
+<?php
+/**
+* This is the pop-up help file for the system
+* This function simply prints out an HTML help file for
+* users to reference
+* @author Nick Korbel <lqqkout13@users.sourceforge.net>
+* @version 07-10-04
+* @package phpScheduleIt
+*
+* Copyright (C) 2003 - 2005 phpScheduleIt
+* License: GPL, see LICENSE
+*/
+
+include_once('config/config.php');
+
+global $languages;
+global $lang;
+global $charset;
+
+echo "<?xml version=\"1.0\" encoding=\"$charset\"?" . ">\n";
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $languages[$lang][2]?>" lang="<?php echo $languages[$lang][2]?>">
+<head>
+<title>MailZu <?php echo translate('Help')?></title>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset?>" />
+<style type="text/css">
+<!--
+li {
+	font-size: 12px;
+	margin-top: 0px;
+	margin-right: 0px;
+	margin-bottom: 0px;
+	margin-left: 0px;
+}
+body {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	margin-top: 5px;
+	margin-right: 5px;
+	margin-bottom: 5px;
+	margin-left: 5px;
+	background-color: #F0F0F0;
+}
+p {
+	font-size: 12px;
+	margin-left: 25px;
+	margin-top: 3px;
+}
+h5 {
+	margin-left: 10px;
+}
+a {
+	color: #104E8B;
+}
+a:hover {
+	color: #474747;
+}
+-->
+</style>
+</head>
+<body>
+<?php
+$help_file = 'lang/' . $languages[$lang][2] . '.help.php';
+if (file_exists($help_file)) {
+	include_once($help_file);
+}
+else {
+	include_once('lang/en.help.php');
+}
+?>
+</body>
 </html>




 		header("Refresh: $time; URL=$location");
 		if ($die) exit;
 	}
@@ -352,11 +352,11 @@ class CmnFns {
 	* Prints out the HTML to choose a language
 	* @param none
 	*/

 		global $conf;
 		?>
 		<select name="language" class="textbox" onchange="changeLanguage(this);">
-		<?
+		<?php
 			$languages = get_language_list();
 			foreach ($languages as $lang => $settings) {
 				echo '<option value="' . $lang . '"'
@@ -365,7 +365,7 @@ class CmnFns {
 			}
 		?>
 		</select>
-		<?
+		<?php
 	}
 	
 	/**
@@ -375,7 +375,7 @@ class CmnFns {
 	* @param string $str string to search for links to create
 	* @return string with 'URL-like' text changed into clickable links

 		global $conf;
 
 		$fields_array = array("f" => translate('From'), 
@@ -514,11 +514,11 @@ class CmnFns {
 
 		?>	
 		<table border=0 width="100%">
-		<form action="<? echo $submit_page ?>" method="get" name="quarantine">
+		<form action="<?php echo $submit_page ?>" method="get" name="quarantine">
 
-			<tr><td colspan=2 align="center"><? echo translate('Search for messages whose:'); ?>&nbsp;</td></tr>
+			<tr><td colspan=2 align="center"><?php echo translate('Search for messages whose:'); ?>&nbsp;</td></tr>
 			<tr><td align="right">&nbsp;
-		<?
+		<?php
 			$i = 1;
 			$array_size = count($fields_array);
 			foreach ($fields_array as $k => $name) {
@@ -543,34 +543,34 @@ class CmnFns {
 				$i ++;
 			}
 		?>
-			<? echo translate('Content Type'); ?>:
+			<?php echo translate('Content Type'); ?>:
 			<select name="ctype" class="button">
-					<option value="A" <? echo ($content_type == 'A' ?  ' selected="true"':''); ?>>
-					<? echo translate('All'); ?></option>
-					<option value="S" <? echo ($content_type == 'S' ?  ' selected="true"':''); ?>>
-					<? echo translate('Spam'); ?></option>
-					<option value="B" <? echo ($content_type == 'B' ?  ' selected="true"':''); ?>>
-					<? echo translate('Banned'); ?></option>
-			<? if (Auth::isMailAdmin() || $conf['app']['allowViruses']) { ?>
-					<option value="V" <? echo ($content_type == 'V' ?  ' selected="true"':''); ?>>
-					<? echo translate('Virus'); ?></option>
-			<? } 
+					<option value="A" <?php echo ($content_type == 'A' ?  ' selected="true"':''); ?>>
+					<?php echo translate('All'); ?></option>
+					<option value="S" <?php echo ($content_type == 'S' ?  ' selected="true"':''); ?>>
+					<?php echo translate('Spam'); ?></option>
+					<option value="B" <?php echo ($content_type == 'B' ?  ' selected="true"':''); ?>>
+					<?php echo translate('Banned'); ?></option>
+			<?php if (Auth::isMailAdmin() || $conf['app']['allowViruses']) { ?>
+					<option value="V" <?php echo ($content_type == 'V' ?  ' selected="true"':''); ?>>
+					<?php echo translate('Virus'); ?></option>
+			<?php } 
 				 if (Auth::isMailAdmin() || $conf['app']['allowBadHeaders']) { ?>
-					<option value="H" <? echo ($content_type == 'H' ?  ' selected="true"':''); ?>>
-					<? echo translate('Bad Header'); ?></option>				
-			<? }
+					<option value="H" <?php echo ($content_type == 'H' ?  ' selected="true"':''); ?>>
+					<?php echo translate('Bad Header'); ?></option>				
+			<?php }
 			echo "</select>";
 			$i ++;
 			echo ($i % 2) ? "&nbsp;</td></tr>\n\t\t\t<tr><td colspan='2' align='center'>&nbsp\n" : "&nbsp;</td><td align='left'>&nbsp";
 			?>
-			<input type="submit" class="button" name="search_action" value="<? echo translate('Search'); ?>" />
-			<? if (CmnFns::didSearch()) 
+			<input type="submit" class="button" name="search_action" value="<?php echo translate('Search'); ?>" />
+			<?php if (CmnFns::didSearch()) 
 				echo "<input type=\"submit\" class=\"button\" name=\"search_action\" value=\"" . translate('Clear search results') . "\" />";
 			?>
 			&nbsp;</td></tr>
 		</form>
 		</table>
-		<?
+		<?php
 
 	}
 
@@ -579,7 +579,7 @@ class CmnFns {
         * @param none
         * @return value boolean




--- lib/Template.class.php.orig	2007-06-14 19:00:15 UTC
+++ lib/Template.class.php
@@ -57,21 +57,21 @@ class Template {
 	?>
 	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 		"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-	<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?=$languages[$lang][2]?>" lang="<?=$languages[$lang][2]?>">
+	<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo$languages[$lang][2]?>" lang="<?php echo$languages[$lang][2]?>">
 	<head>
 	<title>
-	<?=$this->title?>
+	<?php echo $this->title?>
 	</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=<?=$charset?>" />
+	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset?>" />
 	<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon" />
-	<script language="JavaScript" type="text/javascript" src="<?=$path?>functions.js"></script>
-	<!--<link href="<?=$path?>css.css" rel="stylesheet" type="text/css" />-->
+	<script language="JavaScript" type="text/javascript" src="<?php echo $path?>functions.js"></script>
+	<!--<link href="<?php echo $path?>css.css" rel="stylesheet" type="text/css" />-->
 	<style type="text/css">
-	@import url(<?=$path?>css.css);
+	@import url(<?php echo $path?>css.css);
 	</style>
 	</head>
 	<body>
-	<?
+	<?php
 	}
 	
 	
@@ -96,31 +96,31 @@ class Template {
 	  <tr>
 		<td class="mainBkgrdClr">
 		  <h4 class="welcomeBack">
-		    <?= 
+		    <?php echo 
 		      translate('Welcome Back', array($_SESSION['sessionName'], 1));
 		      // Notify if the person logged in is admin
 		      echo (Auth::isMailAdmin() ? ' (' . translate('Administrator') . ')' : '');
 		    ?>
 		  </h4>
 		  <!--<p>
-			<? $this->link->doLink($this->dir_path . 'index.php?logout=true', translate('Log Out')) ?>
+			<?php $this->link->doLink($this->dir_path . 'index.php?logout=true', translate('Log Out')) ?>
 			|
-			<? $this->link->doLink($this->dir_path . 'summary.php', translate('My Control Panel')) ?>
+			<?php $this->link->doLink($this->dir_path . 'summary.php', translate('My Control Panel')) ?>
 		  </p>-->
 		</td>
 		<td class="mainBkgrdClr" valign="top">
 		  <div align="right">
 		    <p>
-			<?= translate_date('header', mktime());?>
+			<?php echo translate_date('header', time());?>
 			</p>
 			<!--<p>
-			  <? $this->link->doLink('javascript: help();', translate('Help')) ?>
+			  <?php $this->link->doLink('javascript: help();', translate('Help')) ?>
 			</p>-->
 		  </div>
 		</td>
 	  </tr>
 	</table>
-	<?
+	<?php
 	}
 	
 	
@@ -134,7 +134,7 @@ class Template {
 	<table width="100%" border="0" cellspacing="0" cellpadding="10" style="border: solid #CCCCCC 1px;">
 	  <tr>
 		<td bgcolor="#FAFAFA">
-		  <?
+		  <?php
 	}
 	
 	
@@ -147,7 +147,7 @@ class Template {
 		</td>
 	  </tr>
 	</table>
-	<?
+	<?php
 	}
 	
 	
@@ -160,10 +160,10 @@ class Template {
 	function printHTMLFooter() {
 		global $conf;
 	?>
-	<p align="center"><a href="http://www.mailzu.net"><?=$conf['app']['title']?> v<?=$conf['app']['version']?></a></p>
+	<p align="center"><a href="http://www.mailzu.net"><?php echo $conf['app']['title']?> v<?php echo $conf['app']['version']?></a></p>
 	</body>
 	</html>
-	<?
+	<?php
 	}
 	
 	/**




--- templates/auth.template.php.orig	2007-06-14 19:00:15 UTC
+++ templates/auth.template.php
@@ -27,19 +27,19 @@ function printLoginForm($msg = '', $resume = '') {
 	if (!empty($msg)) 
 		CmnFns::do_error_box($msg, '', false);
 ?>
-<form name="login" method="post" action="<?=$_SERVER['PHP_SELF']?>">
+<form name="login" method="post" action="<?php echo $_SERVER['PHP_SELF']?>">
 <table width="350px" border="0" cellspacing="0" cellpadding="1" align="center">
 <tr>
   <td bgcolor="#CCCCCC">
 	<table width="100%" border="0" cellspacing="0" cellpadding="3">
 	  <tr bgcolor="#EDEDED">
 		<td colspan="2" style="border-bottom: solid 1px #CCCCCC;">
-		  <h5 align="center"><?=translate('Please Log In')?></h5>
+		  <h5 align="center"><?php echo translate('Please Log In')?></h5>
 		</td>
 	  </tr>
 	  <tr bgcolor="#FFFFFF">
 		<td width="150">
-		  <p><b><?=translate('Login')?></b></p>
+		  <p><b><?php echo translate('Login')?></b></p>
 		</td>
 		<td>
 		  <input type="text" name="email" class="textbox" />
@@ -47,7 +47,7 @@ function printLoginForm($msg = '', $resume = '') {
 	  </tr>
 	  <tr bgcolor="#FFFFFF">
 		<td>
-		  <p><b><?=translate('Password')?></b></p>
+		  <p><b><?php echo translate('Password')?></b></p>
 		</td>
 		<td>
 		  <input type="password" name="password" class="textbox" />
@@ -56,26 +56,26 @@ function printLoginForm($msg = '', $resume = '') {
 	  <?php if ($conf['auth']['serverType'] === 'exchange') { ?>
 	  <tr bgcolor="#FFFFFF">
 		<td>
-		  <p><b><?=translate('Domain')?></b></p>
+		  <p><b><?php echo translate('Domain')?></b></p>
 		</td>
 		<td>
-		  <input type="text" name="domain" class="textbox" value="<?=$conf['auth']['exch_domain']?>"/>
+		  <input type="text" name="domain" class="textbox" value="<?php echo $conf['auth']['exch_domain']?>"/>
 		</td>
 	  </tr>
 	  <?php }
 	  if ($conf['app']['selectLanguage']) { ?>
 	  <tr bgcolor="#FFFFFF">
 		<td>
-		  <p><b><?=translate('Language')?></b></p>
+		  <p><b><?php echo translate('Language')?></b></p>
 		</td>
 		<td>
-		<?CmnFns::print_language_pulldown()?>
+		<?php CmnFns::print_language_pulldown()?>
 		</td>
 	  </tr>
 	  <?php } ?>
 	  <tr bgcolor="#FFFFFF">
 		<td>
-		  <p><b><?=translate('Keep me logged in')?></b></p>
+		  <p><b><?php echo translate('Keep me logged in')?></b></p>
 		</td>
 		<td>
 		  <input type="checkbox" name="setCookie" value="true" />
@@ -84,8 +84,8 @@ function printLoginForm($msg = '', $resume = '') {
 	  <tr bgcolor="#FAFAFA">
 		<td colspan="2" style="border-top: solid 1px #CCCCCC;">
 		   <p align="center">
-			<input type="submit" name="login" value="<?=translate('Log In')?>" class="button" />
-			<input type="hidden" name="resume" value="<?=$resume?>" />
+			<input type="submit" name="login" value="<?php echo translate('Log In')?>" class="button" />
+			<input type="hidden" name="resume" value="<?php echo $resume?>" />
 		  </p>
 		</td>
 	  </tr>
@@ -94,9 +94,9 @@ function printLoginForm($msg = '', $resume = '') {
 </tr>
 </table>
 <p align="center">
-<? $link->doLink('javascript: help();', translate('Help'), '', '', translate('Get online help')) ?>
+<?php $link->doLink('javascript: help();', translate('Help'), '', '', translate('Get online help')) ?>
 </p>
 </form>
-<?
+<?php
 }
 ?>




--- templates/common.template.php.orig	2007-06-14 19:00:15 UTC
+++ templates/common.template.php
@@ -47,10 +47,10 @@ function showQuickLinks() {
       <table width="100%" border="0" cellspacing="0" cellpadding="0">
         <tr>
           <td class="tableTitle" style="background-color:#0F93DF;">
-		    <?=translate('My Quick Links')?>
+		    <?php echo translate('My Quick Links')?>
 		  </td>
           <td class="tableTitle" style="background-color:#0F93DF;"><div align="right">
-              <? $link->doLink("javascript: help('quick_links');", '?', '', 'color: #FFFFFF', translate('Help') . ' - ' . translate('My Quick Links')) ?>
+              <?php $link->doLink("javascript: help('quick_links');", '?', '', 'color: #FFFFFF', translate('Help') . ' - ' . translate('My Quick Links')) ?>
             </div>
           </td>
         </tr>
@@ -58,12 +58,12 @@ function showQuickLinks() {
       <table width="100%" border="0" cellspacing="0" cellpadding="0">
         <tr style="padding: 5px;" class="cellColor">
           <td colspan="2">
-		<? echo "Quarantine Summary" == $_SESSION['sessionNav'] ? 
+		<?php echo "Quarantine Summary" == $_SESSION['sessionNav'] ? 
 			' <p class="selectedLink"><b>&raquo;</b>':
 			" <p><b>&#8250;</b>\t";
               	$link->doLink('summary.php', translate('Quarantine Summary')) ?>
             	</p>
-		<? echo "My Quarantine" == $_SESSION['sessionNav'] ? 
+		<?php echo "My Quarantine" == $_SESSION['sessionNav'] ? 
 			' <p class="selectedLink"><b>&raquo;</b>':
 			" <p><b>&#8250;</b>\t";
               	$link->doLink('messagesIndex.php?ctype=A', translate('My Quarantine'));
@@ -78,7 +78,7 @@ function showQuickLinks() {
 		?>
             	</p>
 		<br>
-		<? if (Auth::isMailAdmin()) {
+		<?php if (Auth::isMailAdmin()) {
 		     if ($conf['app']['siteSummary']) {
   		       echo "Site Quarantine Summary" == $_SESSION['sessionNav'] ? 
 		  	  ' <p class="selectedLink"><b>&raquo;</b>':
@@ -108,11 +108,11 @@ function showQuickLinks() {
 		}
 		?>
             	<p><b>&#8250;</b>
-              	<? $link->doLink('javascript: help();', translate('Help')) ?>
+              	<?php $link->doLink('javascript: help();', translate('Help')) ?>
             	</p>
 		<br>
             	<p><b>&#8250;</b>
-              	<? $link->doLink('index.php?logout=true', translate('Log Out')) ?>
+              	<?php $link->doLink('index.php?logout=true', translate('Log Out')) ?>
             	</p>
           </td>
         </tr>
@@ -120,7 +120,7 @@ function showQuickLinks() {
     </td>
   </tr>
 </table>
-<?
+<?php
 }
 
 /**
@@ -164,14 +164,14 @@ function startQuickLinksCol() {
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <td style="vertical-align:top; width:16%; border:solid 2px #0F93DF; background-color:#FFFFFF;">
-<? 
+<?php
 }
 
 function startDataDisplayCol() {
 ?>
 </td>
 <td style="padding-left:5px; vertical-align:top;">
-<?
+<?php
 }
 
 function endDataDisplayCol() {
@@ -179,7 +179,7 @@ function endDataDisplayCol() {
 </td>
 </tr>
 </table>
-<?
+<?php
 }
 
 /**
@@ -191,7 +191,7 @@ function printActionButtons( $printDeleteAll = true ) 
 ?>
 <table width="100%" border="0" cellspacing="1" cellpadding="0">
 <tr>
-<? 
+<?php
 	echo "<td align=\"left\"><input type=\"submit\" class=\"button\" name=\"action\" value=\"";
 	if ($_SESSION['sessionNav'] == "My Pending Requests") {
 		echo ( Auth::isMailAdmin() ? translate('Release') : translate('Cancel Request') );
@@ -201,14 +201,14 @@ function printActionButtons( $printDeleteAll = true ) 
 	}
 	echo "\"></td>";
 ?>
-	<td align="right"><input type="submit" class="button" name="action" value="<? echo translate('Delete'); ?>">
-<? 	if ( $printDeleteAll )
+	<td align="right"><input type="submit" class="button" name="action" value="<?php echo translate('Delete'); ?>">
+<?php 	if ( $printDeleteAll )
 		echo "<input type=\"submit\" class=\"button\" name=\"action\" value=\"".translate('Delete All')."\">";
 ?>
 	</td>
 </tr>
 </table>
-<?
+<?php
 }
 
 /**
@@ -223,17 +223,17 @@ function printReportButtons( $query_string, $error_arr
 <form name="error_report_form" action="sendErrorReport.php" method="POST">
 <table width="100%" border="0" cellspacing="1" cellpadding="0">
 <tr>
-	<input type="hidden" name="query_string" value="<? echo $query_string; ?> ">
-	<input type="hidden" name="serialized_error_array" value="<? echo $serialized_error_array; ?>">
-	<input type="hidden" name="process_action" value="<? echo $process_action ;?>">
+	<input type="hidden" name="query_string" value="<?php echo $query_string; ?> ">
+	<input type="hidden" name="serialized_error_array" value="<?php echo $serialized_error_array; ?>">
+	<input type="hidden" name="process_action" value="<?php echo $process_action ;?>">
 	<td><center>
-		<input type="submit" class="button" name="action" value="<? echo translate('Send report and go back'); ?>">&nbsp;
-		<input type="submit" class="button" name="action" value="<? echo translate('Go back'); ?>">
+		<input type="submit" class="button" name="action" value="<?php echo translate('Send report and go back'); ?>">&nbsp;
+		<input type="submit" class="button" name="action" value="<?php echo translate('Go back'); ?>">
 	</center></td>
 </tr>
 </table>
 </form>
-<?
+<?php
 }
 
 /**
@@ -243,10 +243,10 @@ function printReportButtons( $query_string, $error_arr
 function printMessage($message) {
 	$id = urlencode($message);
 ?>
-	<div align="center" id="<? echo $id; ?>" style="display:block;">
-		<H4><? echo $message; ?></H4>
+	<div align="center" id="<?php echo $id; ?>" style="display:block;">
+		<H4><?php echo $message; ?></H4>
 	</div>
-<? 
+<?php 
 	ob_flush();
 	flush();
 }




--- templates/sendmail.template.php.orig	2007-06-14 19:00:15 UTC
+++ templates/sendmail.template.php
@@ -19,7 +19,7 @@ function printsendmail(){
 		<table width="100%" border="0" cellspacing="1" cellpadding="0">
                                 <tr>
                                 <td class="tableTitle">
-				<? 
+				<?php 
 				$adminEmail = $conf['app']['adminEmail'];
 				$emailList = '';
 				if ( is_array($adminEmail) ) {
@@ -35,7 +35,7 @@ function printsendmail(){
 				</td>
 				<td class="tableTitle">
                                 <div align="right">
-                                        <? $link->doLink('javascript: help(\'msg_index\');', '?', '', 'color: #FFFFFF;',
+                                        <?php $link->doLink('javascript: help(\'msg_index\');', '?', '', 'color: #FFFFFF;',
                                                 translate('Help') . ' - ' . translate('Email Administrator')) ?>
                                 </div>
                                 </td>
@@ -45,11 +45,11 @@ function printsendmail(){
 		<table class="stdFont" width="100%" height="100%" border="0" cellspacing="1" cellpadding="0">
 
 			<tr class="cellColor" align="left">
-			<form name="sendmail_to_admin_form" action="<? echo $_SERVER['PHP_SELF']; ?>" method="POST">
+			<form name="sendmail_to_admin_form" action="<?php echo $_SERVER['PHP_SELF']; ?>" method="POST">
 			<td><br />
-			&nbsp;&nbsp;<? echo translate('Subject') . ": " ;?><br />
+			&nbsp;&nbsp;<?php echo translate('Subject') . ": " ;?><br />
 			&nbsp;&nbsp;<input name="subject" type="text" size="60"><br /><br />
-			&nbsp;&nbsp;<? echo translate('Message') . ": " ;?><br />
+			&nbsp;&nbsp;<?php echo translate('Message') . ": " ;?><br />
 			&nbsp;&nbsp;<textarea name="body" cols="60" rows="15"></textarea><br/>
 			&nbsp;&nbsp;<input type="submit" class="button" name="action" value="send"><br /><br />
 			</form>
@@ -60,7 +60,7 @@ function printsendmail(){
 		</tr>
 	</table>
 
-<?
+<?php
 }
 
 




--- templates/summary.template.php.orig	2007-06-14 19:00:15 UTC
+++ templates/summary.template.php
@@ -33,12 +33,12 @@ function showSummary($count_array) {
       		<table width="100%" border="0" cellspacing="1" cellpadding="0">
         		<tr>
 			<td colspan="5" class="tableTitle">
-			<? echo translate($_SESSION['sessionNav']); ?> 
+			<?php echo translate($_SESSION['sessionNav']); ?> 
 			</td>
 
         		<td class="tableTitle">
             		<div align="right">
-              			<? $link->doLink('javascript: help(\'msg_summary\');', '?', '', 'color: #FFFFFF;',
+              			<?php $link->doLink('javascript: help(\'msg_summary\');', '?', '', 'color: #FFFFFF;',
 					translate('Help') . ' - ' . translate($_SESSION['sessionNav'])) ?>
             		</div>
         		</td>
@@ -52,29 +52,29 @@ function showSummary($count_array) {
 				<!-- Print table's headers -->
         <tr class="rowHeaders">
 					<td width="15%">
-						<? echo translate('Date'); ?>
+						<?php echo translate('Date'); ?>
 					</td>
 					<td width="14%">
-						<? echo translate('Spam'); ?>
+						<?php echo translate('Spam'); ?>
 					</td>
        		<td width="14%">
-						<? echo translate('Banned'); ?>
+						<?php echo translate('Banned'); ?>
 					</td>
        		<td width="14%">
- 						<? echo translate('Viruses'); ?>
+ 						<?php echo translate('Viruses'); ?>
 					</td>
        		<td width="14%">
- 						<? echo translate('Bad Headers'); ?>
+ 						<?php echo translate('Bad Headers'); ?>
 					</td>
        		<td width="14%">
- 						<? echo translate('Pending Requests'); ?>
+ 						<?php echo translate('Pending Requests'); ?>
 					</td>
        		<td width="15%">
- 						<? echo translate('Total'); ?>
+ 						<?php echo translate('Total'); ?>
 					</td>
    			</tr>
 			
-			<?  $i = 0;
+			<?php  $i = 0;
 					foreach ($count_array as $key => $val) { 
 						echo '<tr class="' . 'cellColor' . ($i++%2) . ' align="center">';
 						echo ($key == 'Total' ? '<td class="rowTotals">' : '<td class="rowNumValues">') . "$key</td> \n";
@@ -89,7 +89,7 @@ function showSummary($count_array) {
 		</td>
 		</tr>
 	</table>
-<? 
+<?php 
 }
 
 ?>




--- templates/viewmail.template.php.orig	2007-06-14 19:00:15 UTC
+++ templates/viewmail.template.php
@@ -25,7 +25,7 @@ function startMessage() {
       <table width="100%" border="0" cellspacing="0" cellpadding="0">
         <tr>
           <td class="tableTitle" style="background-color:#0F93DF;">
-            <? echo translate('Message'); ?>
+            <?php echo translate('Message'); ?>
           </td>
           <td class="tableTitle" style="background-color:#0F93DF;">
             <div align="right"
@@ -34,7 +34,7 @@ function startMessage() {
           </td>
         </tr>
       </table>
-<?
+<?php
 }
 
 function endMessage() {
@@ -42,7 +42,7 @@ function endMessage() {
     </td>
   </tr>
 </table>
-<?
+<?php
 }
 
 /**
@@ -116,17 +116,17 @@ function MsgDisplayOptions($mail_id, $recip_email) {
 <table class="stdFont" width="100%">
   <tr>
     <td align="left">
-      <a href="javascript: history.back();">&#8249;&#8249; <? echo translate('BackMessageIndex'); ?> </a>
+      <a href="javascript: history.back();">&#8249;&#8249; <?php echo translate('BackMessageIndex'); ?> </a>
     </td>
     <td align="right">
-      <a href="javascript: ViewOriginal('<? echo $enc_mail_id ?>','<? echo $enc_recip_email ?>');"> <? echo translate('ViewOriginal'); ?></a>
+      <a href="javascript: ViewOriginal('<?php echo $enc_mail_id ?>','<?php echo $enc_recip_email ?>');"> <?php echo translate('ViewOriginal'); ?></a>
       |
       <a href="javascript: void(1);" onclick="showHideFullHeaders('headers');">
-   	      <? echo translate('ToggleHeaders'); ?></a>
+   	      <?php echo translate('ToggleHeaders'); ?></a>
      </td>
   </tr>
 </table>
-<?
+<?php
 }
 
 /**
@@ -138,14 +138,14 @@ function MsgOriginalOptions() {
   <table width="100%">
    <tr>
     <td class="stdFont" align="right">
-      <a href="javascript: window.print();"> <? echo translate('Print'); ?></a>
+      <a href="javascript: window.print();"> <?php echo translate('Print'); ?></a>
        |
-      <a href="javascript: window.close();"> <? echo translate('CloseWindow'); ?> </a>
+      <a href="javascript: window.close();"> <?php echo translate('CloseWindow'); ?> </a>
     </td>
    </tr>
     <tr>
      <td class="stdFont" bgcolor="#FAFAFA">
-<?
+<?php
 }
 
 





Then, edit %%WWWDIR%%/config/config.php

Also, please note that MailZu needs PHP's short_open_tag
boolean to be "on" (this is detault in typical installations
of PHP). To be certain, you can set "short_open_tag = on" in
%%LOCALBASE%%/etc/php.ini.

Finally, make MailZu available through your web site.  An
example for httpd.conf:


    Deny from all
    Allow from 127.0.0.1 .example.org
</Directory>

An example for nginx.conf:

location /mailzu/ {
    alias %%WWWDIR%%/;
    index index.php;
    allow 127.0.0.0/8;
    deny all;

    location ~ \.php$ {
        fastcgi_pass   unix:/var/run/php-fpm.socket;
        fastcgi_param HTTPS on;
        fastcgi_index  index.php;
        fastcgi_param  SCRIPT_FILENAME $request_filename;
        include        fastcgi_params;
    }
}

EOM
}
]

Return to bug 257635

Lines 168-174 Link Here

(-)security/mailzu.new/files/patch-lib_CmnFns.class.php (-1 / +82 lines)
168	header("Refresh: $time; URL=$location");	168	header("Refresh: $time; URL=$location");
169	if ($die) exit;	169	if ($die) exit;
170	}	170	}
171	@@ -352,7 +352,7 @@ class CmnFns {	171	@@ -352,11 +352,11 @@ class CmnFns {
172	* Prints out the HTML to choose a language	172	* Prints out the HTML to choose a language
173	* @param none	173	* @param none
174	*/	174	*/
Lines 177-182 Link Here
177	global $conf;	177	global $conf;
178	?>	178	?>
179	<select name="language" class="textbox" onchange="changeLanguage(this);">	179	<select name="language" class="textbox" onchange="changeLanguage(this);">
		180	- <?
		181	+ <?php
		182	$languages = get_language_list();
		183	foreach ($languages as $lang => $settings) {
		184	echo '<option value="' . $lang . '"'
		185	@@ -365,7 +365,7 @@ class CmnFns {
		186	}
		187	?>
		188	</select>
		189	- <?
		190	+ <?php
		191	}
		192
		193	/**
180	@@ -375,7 +375,7 @@ class CmnFns {	194	@@ -375,7 +375,7 @@ class CmnFns {
181	* @param string $str string to search for links to create	195	* @param string $str string to search for links to create
182	* @return string with 'URL-like' text changed into clickable links	196	* @return string with 'URL-like' text changed into clickable links
Lines 231-236 Link Here
231	global $conf;	245	global $conf;
232		246
233	$fields_array = array("f" => translate('From'),	247	$fields_array = array("f" => translate('From'),
		248	@@ -514,11 +514,11 @@ class CmnFns {
		249
		250	?>
		251	<table border=0 width="100%">
		252	- <form action="<? echo $submit_page ?>" method="get" name="quarantine">
		253	+ <form action="<?php echo $submit_page ?>" method="get" name="quarantine">
		254
		255	- <tr><td colspan=2 align="center"><? echo translate('Search for messages whose:'); ?> </td></tr>
		256	+ <tr><td colspan=2 align="center"><?php echo translate('Search for messages whose:'); ?> </td></tr>
		257	<tr><td align="right">
		258	- <?
		259	+ <?php
		260	$i = 1;
		261	$array_size = count($fields_array);
		262	foreach ($fields_array as $k => $name) {
		263	@@ -543,34 +543,34 @@ class CmnFns {
		264	$i ++;
		265	}
		266	?>
		267	- <? echo translate('Content Type'); ?>:
		268	+ <?php echo translate('Content Type'); ?>:
		269	<select name="ctype" class="button">
		270	- <option value="A" <? echo ($content_type == 'A' ? ' selected="true"':''); ?>>
		271	- <? echo translate('All'); ?></option>
		272	- <option value="S" <? echo ($content_type == 'S' ? ' selected="true"':''); ?>>
		273	- <? echo translate('Spam'); ?></option>
		274	- <option value="B" <? echo ($content_type == 'B' ? ' selected="true"':''); ?>>
		275	- <? echo translate('Banned'); ?></option>
		276	- <? if (Auth::isMailAdmin() \|\| $conf['app']['allowViruses']) { ?>
		277	- <option value="V" <? echo ($content_type == 'V' ? ' selected="true"':''); ?>>
		278	- <? echo translate('Virus'); ?></option>
		279	- <? }
		280	+ <option value="A" <?php echo ($content_type == 'A' ? ' selected="true"':''); ?>>
		281	+ <?php echo translate('All'); ?></option>
		282	+ <option value="S" <?php echo ($content_type == 'S' ? ' selected="true"':''); ?>>
		283	+ <?php echo translate('Spam'); ?></option>
		284	+ <option value="B" <?php echo ($content_type == 'B' ? ' selected="true"':''); ?>>
		285	+ <?php echo translate('Banned'); ?></option>
		286	+ <?php if (Auth::isMailAdmin() \|\| $conf['app']['allowViruses']) { ?>
		287	+ <option value="V" <?php echo ($content_type == 'V' ? ' selected="true"':''); ?>>
		288	+ <?php echo translate('Virus'); ?></option>
		289	+ <?php }
		290	if (Auth::isMailAdmin() \|\| $conf['app']['allowBadHeaders']) { ?>
		291	- <option value="H" <? echo ($content_type == 'H' ? ' selected="true"':''); ?>>
		292	- <? echo translate('Bad Header'); ?></option>
		293	- <? }
		294	+ <option value="H" <?php echo ($content_type == 'H' ? ' selected="true"':''); ?>>
		295	+ <?php echo translate('Bad Header'); ?></option>
		296	+ <?php }
		297	echo "</select>";
		298	$i ++;
		299	echo ($i % 2) ? " </td></tr>\n\t\t\t<tr><td colspan='2' align='center'>&nbsp\n" : " </td><td align='left'>&nbsp";
		300	?>
		301	- <input type="submit" class="button" name="search_action" value="<? echo translate('Search'); ?>" />
		302	- <? if (CmnFns::didSearch())
		303	+ <input type="submit" class="button" name="search_action" value="<?php echo translate('Search'); ?>" />
		304	+ <?php if (CmnFns::didSearch())
		305	echo "<input type=\"submit\" class=\"button\" name=\"search_action\" value=\"" . translate('Clear search results') . "\" />";
		306	?>
		307	</td></tr>
		308	</form>
		309	</table>
		310	- <?
		311	+ <?php
312
313	}
314
234	@@ -579,7 +579,7 @@ class CmnFns {	315	@@ -579,7 +579,7 @@ class CmnFns {
235	* @param none	316	* @param none
236	* @return value boolean	317	* @return value boolean

Lines 10-21 Link Here

(-)security/mailzu.new/files/patch-config_langs.php (-3 / +7 lines)
10	);	10	);
11		11
12	// Language files directory	12	// Language files directory
13	@@ -113,7 +114,7 @@ function get_browser_lang() {	13	@@ -113,10 +114,10 @@ function get_browser_lang() {
14	global $languages;	14	global $languages;
15		15
16	if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {	16	if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
17	- $http_accepted = split(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']);	17	- $http_accepted = split(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']);
18	+ $http_accepted = str_split(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']);	18	+ $http_accepted = explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']);
19	for ($i = 0; $i < count($http_accepted); $i++) {	19	for ($i = 0; $i < count($http_accepted); $i++) {
20	foreach ($languages as $lang => $vals) {	20	foreach ($languages as $lang => $vals) {
21	if (eregi($vals[0], $http_accepted[$i]))	21	- if (eregi($vals[0], $http_accepted[$i]))
		22	+ if (preg_match($vals[0], $http_accepted[$i]))
		23	return $lang;
		24	}
		25	}

Line 0 Link Here

(-)security/mailzu.new/files/patch-help.php (+148 lines)
		1	--- help.php.orig 2007-06-14 19:00:15 UTC
		2	+++ help.php
		3	@@ -1,73 +1,73 @@
		4	-<?php
		5	-/**
		6	-* This is the pop-up help file for the system
		7	-* This function simply prints out an HTML help file for
		8	-* users to reference
		9	-* @author Nick Korbel <lqqkout13@users.sourceforge.net>
		10	-* @version 07-10-04
		11	-* @package phpScheduleIt
		12	-*
		13	-* Copyright (C) 2003 - 2005 phpScheduleIt
		14	-* License: GPL, see LICENSE
		15	-*/
		16	-
		17	-include_once('config/config.php');
		18	-
		19	-global $languages;
		20	-global $lang;
		21	-global $charset;
		22	-
		23	-echo "<?xml version=\"1.0\" encoding=\"$charset\"?" . ">\n";
		24	-?>
		25	-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
		26	- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
		27	-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?=$languages[$lang][2]?>" lang="<?=$languages[$lang][2]?>">
		28	-<head>
		29	-<title>MailZu <?=translate('Help')?></title>
		30	-<meta http-equiv="Content-Type" content="text/html; charset=<?=$charset?>" />
		31	-<style type="text/css">
		32	-<!--
		33	-li {
		34	- font-size: 12px;
		35	- margin-top: 0px;
		36	- margin-right: 0px;
		37	- margin-bottom: 0px;
		38	- margin-left: 0px;
		39	-}
		40	-body {
		41	- font-family: Verdana, Arial, Helvetica, sans-serif;
		42	- margin-top: 5px;
		43	- margin-right: 5px;
		44	- margin-bottom: 5px;
		45	- margin-left: 5px;
		46	- background-color: #F0F0F0;
		47	-}
		48	-p {
		49	- font-size: 12px;
		50	- margin-left: 25px;
		51	- margin-top: 3px;
		52	-}
		53	-h5 {
		54	- margin-left: 10px;
		55	-}
		56	-a {
		57	- color: #104E8B;
		58	-}
		59	-a:hover {
		60	- color: #474747;
		61	-}
		62	--->
		63	-</style>
		64	-</head>
65	-<body>
66	-<?
67	-$help_file = 'lang/' . $languages[$lang][2] . '.help.php';
68	-if (file_exists($help_file)) {
69	- include_once($help_file);
70	-}
71	-else {
72	- include_once('lang/en.help.php');
73	-}
74	-?>
75	-</body>
76	+<?php
77	+/**
78	+* This is the pop-up help file for the system
79	+* This function simply prints out an HTML help file for
80	+* users to reference
81	+* @author Nick Korbel <lqqkout13@users.sourceforge.net>
82	+* @version 07-10-04
83	+* @package phpScheduleIt
84	+*
85	+* Copyright (C) 2003 - 2005 phpScheduleIt
86	+* License: GPL, see LICENSE
87	+*/
88	+
89	+include_once('config/config.php');
90	+
91	+global $languages;
92	+global $lang;
93	+global $charset;
94	+
95	+echo "<?xml version=\"1.0\" encoding=\"$charset\"?" . ">\n";
96	+?>
97	+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
98	+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
99	+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $languages[$lang][2]?>" lang="<?php echo $languages[$lang][2]?>">
100	+<head>
101	+<title>MailZu <?php echo translate('Help')?></title>
102	+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset?>" />
103	+<style type="text/css">
104	+<!--
105	+li {
106	+ font-size: 12px;
107	+ margin-top: 0px;
108	+ margin-right: 0px;
109	+ margin-bottom: 0px;
110	+ margin-left: 0px;
111	+}
112	+body {
113	+ font-family: Verdana, Arial, Helvetica, sans-serif;
114	+ margin-top: 5px;
115	+ margin-right: 5px;
116	+ margin-bottom: 5px;
117	+ margin-left: 5px;
118	+ background-color: #F0F0F0;
119	+}
120	+p {
121	+ font-size: 12px;
122	+ margin-left: 25px;
123	+ margin-top: 3px;
124	+}
125	+h5 {
126	+ margin-left: 10px;
127	+}
128	+a {
129	+ color: #104E8B;
130	+}
131	+a:hover {
132	+ color: #474747;
133	+}
134	+-->
135	+</style>
136	+</head>
137	+<body>
138	+<?php
139	+$help_file = 'lang/' . $languages[$lang][2] . '.help.php';
140	+if (file_exists($help_file)) {
141	+ include_once($help_file);
142	+}
143	+else {
144	+ include_once('lang/en.help.php');
145	+}
146	+?>
147	+</body>
148	</html>

Lines 1-11 Link Here

(-)security/mailzu.new/files/patch-lib_Template.class.php (-3 / +92 lines)
1	--- lib/Template.class.php.orig 2007-06-14 19:00:15 UTC	1	--- lib/Template.class.php.orig 2007-06-14 19:00:15 UTC
2	+++ lib/Template.class.php	2	+++ lib/Template.class.php
3	@@ -111,7 +111,7 @@ class Template {	3	@@ -57,21 +57,21 @@ class Template {
		4	?>
		5	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
		6	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
		7	- <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?=$languages[$lang][2]?>" lang="<?=$languages[$lang][2]?>">
		8	+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo$languages[$lang][2]?>" lang="<?php echo$languages[$lang][2]?>">
		9	<head>
		10	<title>
		11	- <?=$this->title?>
		12	+ <?php echo $this->title?>
		13	</title>
		14	- <meta http-equiv="Content-Type" content="text/html; charset=<?=$charset?>" />
		15	+ <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset?>" />
		16	<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon" />
		17	- <script language="JavaScript" type="text/javascript" src="<?=$path?>functions.js"></script>
		18	- <!--<link href="<?=$path?>css.css" rel="stylesheet" type="text/css" />-->
		19	+ <script language="JavaScript" type="text/javascript" src="<?php echo $path?>functions.js"></script>
		20	+ <!--<link href="<?php echo $path?>css.css" rel="stylesheet" type="text/css" />-->
		21	<style type="text/css">
		22	- @import url(<?=$path?>css.css);
		23	+ @import url(<?php echo $path?>css.css);
		24	</style>
		25	</head>
		26	<body>
		27	- <?
		28	+ <?php
		29	}
		30
		31
		32	@@ -96,31 +96,31 @@ class Template {
		33	<tr>
		34	<td class="mainBkgrdClr">
		35	<h4 class="welcomeBack">
		36	- <?=
		37	+ <?php echo
		38	translate('Welcome Back', array($_SESSION['sessionName'], 1));
		39	// Notify if the person logged in is admin
		40	echo (Auth::isMailAdmin() ? ' (' . translate('Administrator') . ')' : '');
		41	?>
		42	</h4>
		43	<!--<p>
		44	- <? $this->link->doLink($this->dir_path . 'index.php?logout=true', translate('Log Out')) ?>
		45	+ <?php $this->link->doLink($this->dir_path . 'index.php?logout=true', translate('Log Out')) ?>
		46	\|
		47	- <? $this->link->doLink($this->dir_path . 'summary.php', translate('My Control Panel')) ?>
		48	+ <?php $this->link->doLink($this->dir_path . 'summary.php', translate('My Control Panel')) ?>
		49	</p>-->
		50	</td>
4	<td class="mainBkgrdClr" valign="top">	51	<td class="mainBkgrdClr" valign="top">
5	<div align="right">	52	<div align="right">
6	<p>	53	<p>
7	- <?= translate_date('header', mktime());?>	54	- <?= translate_date('header', mktime());?>
8	+ <?= translate_date('header', time());?>	55	+ <?php echo translate_date('header', time());?>
9	</p>	56	</p>
10	<!--<p>	57	<!--<p>
11	<? $this->link->doLink('javascript: help();', translate('Help')) ?>	58	- <? $this->link->doLink('javascript: help();', translate('Help')) ?>
		59	+ <?php $this->link->doLink('javascript: help();', translate('Help')) ?>
		60	</p>-->
		61	</div>
		62	</td>
		63	</tr>
		64	</table>
		65	- <?
		66	+ <?php
		67	}
		68
		69
		70	@@ -134,7 +134,7 @@ class Template {
		71	<table width="100%" border="0" cellspacing="0" cellpadding="10" style="border: solid #CCCCCC 1px;">
		72	<tr>
		73	<td bgcolor="#FAFAFA">
		74	- <?
		75	+ <?php
		76	}
		77
		78
		79	@@ -147,7 +147,7 @@ class Template {
		80	</td>
		81	</tr>
		82	</table>
		83	- <?
		84	+ <?php
		85	}
		86
		87
		88	@@ -160,10 +160,10 @@ class Template {
		89	function printHTMLFooter() {
		90	global $conf;
		91	?>
		92	- <p align="center"><a href="http://www.mailzu.net"><?=$conf['app']['title']?> v<?=$conf['app']['version']?></a></p>
		93	+ <p align="center"><a href="http://www.mailzu.net"><?php echo $conf['app']['title']?> v<?php echo $conf['app']['version']?></a></p>
		94	</body>
		95	</html>
		96	- <?
		97	+ <?php
		98	}
		99
		100	/**

Line 0 Link Here

(-)security/mailzu.new/files/patch-templates_auth.template.php (+89 lines)
		1	--- templates/auth.template.php.orig 2007-06-14 19:00:15 UTC
		2	+++ templates/auth.template.php
		3	@@ -27,19 +27,19 @@ function printLoginForm($msg = '', $resume = '') {
		4	if (!empty($msg))
		5	CmnFns::do_error_box($msg, '', false);
		6	?>
		7	-<form name="login" method="post" action="<?=$_SERVER['PHP_SELF']?>">
		8	+<form name="login" method="post" action="<?php echo $_SERVER['PHP_SELF']?>">
		9	<table width="350px" border="0" cellspacing="0" cellpadding="1" align="center">
		10	<tr>
		11	<td bgcolor="#CCCCCC">
		12	<table width="100%" border="0" cellspacing="0" cellpadding="3">
		13	<tr bgcolor="#EDEDED">
		14	<td colspan="2" style="border-bottom: solid 1px #CCCCCC;">
		15	- <h5 align="center"><?=translate('Please Log In')?></h5>
		16	+ <h5 align="center"><?php echo translate('Please Log In')?></h5>
		17	</td>
		18	</tr>
		19	<tr bgcolor="#FFFFFF">
		20	<td width="150">
		21	- <p><b><?=translate('Login')?></b></p>
		22	+ <p><b><?php echo translate('Login')?></b></p>
		23	</td>
		24	<td>
		25	<input type="text" name="email" class="textbox" />
		26	@@ -47,7 +47,7 @@ function printLoginForm($msg = '', $resume = '') {
		27	</tr>
		28	<tr bgcolor="#FFFFFF">
		29	<td>
		30	- <p><b><?=translate('Password')?></b></p>
		31	+ <p><b><?php echo translate('Password')?></b></p>
		32	</td>
		33	<td>
		34	<input type="password" name="password" class="textbox" />
		35	@@ -56,26 +56,26 @@ function printLoginForm($msg = '', $resume = '') {
		36	<?php if ($conf['auth']['serverType'] === 'exchange') { ?>
		37	<tr bgcolor="#FFFFFF">
		38	<td>
		39	- <p><b><?=translate('Domain')?></b></p>
		40	+ <p><b><?php echo translate('Domain')?></b></p>
		41	</td>
		42	<td>
		43	- <input type="text" name="domain" class="textbox" value="<?=$conf['auth']['exch_domain']?>"/>
		44	+ <input type="text" name="domain" class="textbox" value="<?php echo $conf['auth']['exch_domain']?>"/>
		45	</td>
		46	</tr>
		47	<?php }
		48	if ($conf['app']['selectLanguage']) { ?>
		49	<tr bgcolor="#FFFFFF">
		50	<td>
		51	- <p><b><?=translate('Language')?></b></p>
		52	+ <p><b><?php echo translate('Language')?></b></p>
		53	</td>
		54	<td>
		55	- <?CmnFns::print_language_pulldown()?>
		56	+ <?php CmnFns::print_language_pulldown()?>
		57	</td>
		58	</tr>
		59	<?php } ?>
		60	<tr bgcolor="#FFFFFF">
		61	<td>
		62	- <p><b><?=translate('Keep me logged in')?></b></p>
		63	+ <p><b><?php echo translate('Keep me logged in')?></b></p>
		64	</td>
65	<td>
66	<input type="checkbox" name="setCookie" value="true" />
67	@@ -84,8 +84,8 @@ function printLoginForm($msg = '', $resume = '') {
68	<tr bgcolor="#FAFAFA">
69	<td colspan="2" style="border-top: solid 1px #CCCCCC;">
70	<p align="center">
71	- <input type="submit" name="login" value="<?=translate('Log In')?>" class="button" />
72	- <input type="hidden" name="resume" value="<?=$resume?>" />
73	+ <input type="submit" name="login" value="<?php echo translate('Log In')?>" class="button" />
74	+ <input type="hidden" name="resume" value="<?php echo $resume?>" />
75	</p>
76	</td>
77	</tr>
78	@@ -94,9 +94,9 @@ function printLoginForm($msg = '', $resume = '') {
79	</tr>
80	</table>
81	<p align="center">
82	-<? $link->doLink('javascript: help();', translate('Help'), '', '', translate('Get online help')) ?>
83	+<?php $link->doLink('javascript: help();', translate('Help'), '', '', translate('Get online help')) ?>
84	</p>
85	</form>
86	-<?
87	+<?php
88	}
89	?>

Line 0 Link Here

(-)security/mailzu.new/files/patch-templates_common.template.php (+153 lines)
		1	--- templates/common.template.php.orig 2007-06-14 19:00:15 UTC
		2	+++ templates/common.template.php
		3	@@ -47,10 +47,10 @@ function showQuickLinks() {
		4	<table width="100%" border="0" cellspacing="0" cellpadding="0">
		5	<tr>
		6	<td class="tableTitle" style="background-color:#0F93DF;">
		7	- <?=translate('My Quick Links')?>
		8	+ <?php echo translate('My Quick Links')?>
		9	</td>
		10	<td class="tableTitle" style="background-color:#0F93DF;"><div align="right">
		11	- <? $link->doLink("javascript: help('quick_links');", '?', '', 'color: #FFFFFF', translate('Help') . ' - ' . translate('My Quick Links')) ?>
		12	+ <?php $link->doLink("javascript: help('quick_links');", '?', '', 'color: #FFFFFF', translate('Help') . ' - ' . translate('My Quick Links')) ?>
		13	</div>
		14	</td>
		15	</tr>
		16	@@ -58,12 +58,12 @@ function showQuickLinks() {
		17	<table width="100%" border="0" cellspacing="0" cellpadding="0">
		18	<tr style="padding: 5px;" class="cellColor">
		19	<td colspan="2">
		20	- <? echo "Quarantine Summary" == $_SESSION['sessionNav'] ?
		21	+ <?php echo "Quarantine Summary" == $_SESSION['sessionNav'] ?
		22	' <p class="selectedLink"><b>»</b>':
		23	" <p><b>›</b>\t";
		24	$link->doLink('summary.php', translate('Quarantine Summary')) ?>
		25	</p>
		26	- <? echo "My Quarantine" == $_SESSION['sessionNav'] ?
		27	+ <?php echo "My Quarantine" == $_SESSION['sessionNav'] ?
		28	' <p class="selectedLink"><b>»</b>':
		29	" <p><b>›</b>\t";
		30	$link->doLink('messagesIndex.php?ctype=A', translate('My Quarantine'));
		31	@@ -78,7 +78,7 @@ function showQuickLinks() {
		32	?>
		33	</p>
		34	<br>
		35	- <? if (Auth::isMailAdmin()) {
		36	+ <?php if (Auth::isMailAdmin()) {
		37	if ($conf['app']['siteSummary']) {
		38	echo "Site Quarantine Summary" == $_SESSION['sessionNav'] ?
		39	' <p class="selectedLink"><b>»</b>':
		40	@@ -108,11 +108,11 @@ function showQuickLinks() {
		41	}
		42	?>
		43	<p><b>›</b>
		44	- <? $link->doLink('javascript: help();', translate('Help')) ?>
		45	+ <?php $link->doLink('javascript: help();', translate('Help')) ?>
		46	</p>
		47	<br>
		48	<p><b>›</b>
		49	- <? $link->doLink('index.php?logout=true', translate('Log Out')) ?>
		50	+ <?php $link->doLink('index.php?logout=true', translate('Log Out')) ?>
		51	</p>
		52	</td>
		53	</tr>
		54	@@ -120,7 +120,7 @@ function showQuickLinks() {
		55	</td>
		56	</tr>
		57	</table>
		58	-<?
		59	+<?php
		60	}
		61
		62	/**
		63	@@ -164,14 +164,14 @@ function startQuickLinksCol() {
		64	<table width="100%" border="0" cellpadding="0" cellspacing="0">
65	<tr>
66	<td style="vertical-align:top; width:16%; border:solid 2px #0F93DF; background-color:#FFFFFF;">
67	-<?
68	+<?php
69	}
70
71	function startDataDisplayCol() {
72	?>
73	</td>
74	<td style="padding-left:5px; vertical-align:top;">
75	-<?
76	+<?php
77	}
78
79	function endDataDisplayCol() {
80	@@ -179,7 +179,7 @@ function endDataDisplayCol() {
81	</td>
82	</tr>
83	</table>
84	-<?
85	+<?php
86	}
87
88	/**
89	@@ -191,7 +191,7 @@ function printActionButtons( $printDeleteAll = true )
90	?>
91	<table width="100%" border="0" cellspacing="1" cellpadding="0">
92	<tr>
93	-<?
94	+<?php
95	echo "<td align=\"left\"><input type=\"submit\" class=\"button\" name=\"action\" value=\"";
96	if ($_SESSION['sessionNav'] == "My Pending Requests") {
97	echo ( Auth::isMailAdmin() ? translate('Release') : translate('Cancel Request') );
98	@@ -201,14 +201,14 @@ function printActionButtons( $printDeleteAll = true )
99	}
100	echo "\"></td>";
101	?>
102	- <td align="right"><input type="submit" class="button" name="action" value="<? echo translate('Delete'); ?>">
103	-<? if ( $printDeleteAll )
104	+ <td align="right"><input type="submit" class="button" name="action" value="<?php echo translate('Delete'); ?>">
105	+<?php if ( $printDeleteAll )
106	echo "<input type=\"submit\" class=\"button\" name=\"action\" value=\"".translate('Delete All')."\">";
107	?>
108	</td>
109	</tr>
110	</table>
111	-<?
112	+<?php
113	}
114
115	/**
116	@@ -223,17 +223,17 @@ function printReportButtons( $query_string, $error_arr
117	<form name="error_report_form" action="sendErrorReport.php" method="POST">
118	<table width="100%" border="0" cellspacing="1" cellpadding="0">
119	<tr>
120	- <input type="hidden" name="query_string" value="<? echo $query_string; ?> ">
121	- <input type="hidden" name="serialized_error_array" value="<? echo $serialized_error_array; ?>">
122	- <input type="hidden" name="process_action" value="<? echo $process_action ;?>">
123	+ <input type="hidden" name="query_string" value="<?php echo $query_string; ?> ">
124	+ <input type="hidden" name="serialized_error_array" value="<?php echo $serialized_error_array; ?>">
125	+ <input type="hidden" name="process_action" value="<?php echo $process_action ;?>">
126	<td><center>
127	- <input type="submit" class="button" name="action" value="<? echo translate('Send report and go back'); ?>">
128	- <input type="submit" class="button" name="action" value="<? echo translate('Go back'); ?>">
129	+ <input type="submit" class="button" name="action" value="<?php echo translate('Send report and go back'); ?>">
130	+ <input type="submit" class="button" name="action" value="<?php echo translate('Go back'); ?>">
131	</center></td>
132	</tr>
133	</table>
134	</form>
135	-<?
136	+<?php
137	}
138
139	/**
140	@@ -243,10 +243,10 @@ function printReportButtons( $query_string, $error_arr
141	function printMessage($message) {
142	$id = urlencode($message);
143	?>
144	- <div align="center" id="<? echo $id; ?>" style="display:block;">
145	- <H4><? echo $message; ?></H4>
146	+ <div align="center" id="<?php echo $id; ?>" style="display:block;">
147	+ <H4><?php echo $message; ?></H4>
148	</div>
149	-<?
150	+<?php
151	ob_flush();
152	flush();
153	}

Line 0 Link Here

(-)security/mailzu.new/files/patch-templates_sendmail.template.php (+44 lines)
	1	--- templates/sendmail.template.php.orig 2007-06-14 19:00:15 UTC
	2	+++ templates/sendmail.template.php
	3	@@ -19,7 +19,7 @@ function printsendmail(){
	4	<table width="100%" border="0" cellspacing="1" cellpadding="0">
	5	<tr>
	6	<td class="tableTitle">
	7	- <?
	8	+ <?php
	9	$adminEmail = $conf['app']['adminEmail'];
	10	$emailList = '';
	11	if ( is_array($adminEmail) ) {
	12	@@ -35,7 +35,7 @@ function printsendmail(){
	13	</td>
	14	<td class="tableTitle">
	15	<div align="right">
	16	- <? $link->doLink('javascript: help(\'msg_index\');', '?', '', 'color: #FFFFFF;',
	17	+ <?php $link->doLink('javascript: help(\'msg_index\');', '?', '', 'color: #FFFFFF;',
	18	translate('Help') . ' - ' . translate('Email Administrator')) ?>
	19	</div>
	20	</td>
	21	@@ -45,11 +45,11 @@ function printsendmail(){
	22	<table class="stdFont" width="100%" height="100%" border="0" cellspacing="1" cellpadding="0">
	23
	24	<tr class="cellColor" align="left">
	25	- <form name="sendmail_to_admin_form" action="<? echo $_SERVER['PHP_SELF']; ?>" method="POST">
	26	+ <form name="sendmail_to_admin_form" action="<?php echo $_SERVER['PHP_SELF']; ?>" method="POST">
	27	<td><br />
	28	-   <? echo translate('Subject') . ": " ;?><br />
	29	+   <?php echo translate('Subject') . ": " ;?><br />
	30	<input name="subject" type="text" size="60"><br /><br />
	31	-   <? echo translate('Message') . ": " ;?><br />
	32	+   <?php echo translate('Message') . ": " ;?><br />
	33	<textarea name="body" cols="60" rows="15"></textarea><br/>
	34	<input type="submit" class="button" name="action" value="send"><br /><br />
	35	</form>
	36	@@ -60,7 +60,7 @@ function printsendmail(){
	37	</tr>
	38	</table>
	39
	40	-<?
	41	+<?php
	42	}
	43
	44

Line 0 Link Here

(-)security/mailzu.new/files/patch-templates_summary.template.php (+64 lines)
	1	--- templates/summary.template.php.orig 2007-06-14 19:00:15 UTC
	2	+++ templates/summary.template.php
	3	@@ -33,12 +33,12 @@ function showSummary($count_array) {
	4	<table width="100%" border="0" cellspacing="1" cellpadding="0">
	5	<tr>
	6	<td colspan="5" class="tableTitle">
	7	- <? echo translate($_SESSION['sessionNav']); ?>
	8	+ <?php echo translate($_SESSION['sessionNav']); ?>
	9	</td>
	10
	11	<td class="tableTitle">
	12	<div align="right">
	13	- <? $link->doLink('javascript: help(\'msg_summary\');', '?', '', 'color: #FFFFFF;',
	14	+ <?php $link->doLink('javascript: help(\'msg_summary\');', '?', '', 'color: #FFFFFF;',
	15	translate('Help') . ' - ' . translate($_SESSION['sessionNav'])) ?>
	16	</div>
	17	</td>
	18	@@ -52,29 +52,29 @@ function showSummary($count_array) {
	19	<!-- Print table's headers -->
	20	<tr class="rowHeaders">
	21	<td width="15%">
	22	- <? echo translate('Date'); ?>
	23	+ <?php echo translate('Date'); ?>
	24	</td>
	25	<td width="14%">
	26	- <? echo translate('Spam'); ?>
	27	+ <?php echo translate('Spam'); ?>
	28	</td>
	29	<td width="14%">
	30	- <? echo translate('Banned'); ?>
	31	+ <?php echo translate('Banned'); ?>
	32	</td>
	33	<td width="14%">
	34	- <? echo translate('Viruses'); ?>
	35	+ <?php echo translate('Viruses'); ?>
	36	</td>
	37	<td width="14%">
	38	- <? echo translate('Bad Headers'); ?>
	39	+ <?php echo translate('Bad Headers'); ?>
	40	</td>
	41	<td width="14%">
	42	- <? echo translate('Pending Requests'); ?>
	43	+ <?php echo translate('Pending Requests'); ?>
	44	</td>
	45	<td width="15%">
	46	- <? echo translate('Total'); ?>
	47	+ <?php echo translate('Total'); ?>
	48	</td>
	49	</tr>
	50
	51	- <? $i = 0;
	52	+ <?php $i = 0;
	53	foreach ($count_array as $key => $val) {
	54	echo '<tr class="' . 'cellColor' . ($i++%2) . ' align="center">';
	55	echo ($key == 'Total' ? '<td class="rowTotals">' : '<td class="rowNumValues">') . "$key</td> \n";
	56	@@ -89,7 +89,7 @@ function showSummary($count_array) {
	57	</td>
	58	</tr>
	59	</table>
	60	-<?
	61	+<?php
	62	}
	63
	64	?>

Line 0 Link Here

(-)security/mailzu.new/files/patch-templates_viewmail.template.php (+69 lines)
		1	--- templates/viewmail.template.php.orig 2007-06-14 19:00:15 UTC
		2	+++ templates/viewmail.template.php
		3	@@ -25,7 +25,7 @@ function startMessage() {
		4	<table width="100%" border="0" cellspacing="0" cellpadding="0">
		5	<tr>
		6	<td class="tableTitle" style="background-color:#0F93DF;">
		7	- <? echo translate('Message'); ?>
		8	+ <?php echo translate('Message'); ?>
		9	</td>
		10	<td class="tableTitle" style="background-color:#0F93DF;">
		11	<div align="right"
		12	@@ -34,7 +34,7 @@ function startMessage() {
		13	</td>
		14	</tr>
		15	</table>
		16	-<?
		17	+<?php
		18	}
		19
		20	function endMessage() {
		21	@@ -42,7 +42,7 @@ function endMessage() {
		22	</td>
		23	</tr>
		24	</table>
		25	-<?
		26	+<?php
		27	}
		28
		29	/**
		30	@@ -116,17 +116,17 @@ function MsgDisplayOptions($mail_id, $recip_email) {
		31	<table class="stdFont" width="100%">
		32	<tr>
		33	<td align="left">
		34	- <a href="javascript: history.back();">‹‹ <? echo translate('BackMessageIndex'); ?> </a>
		35	+ <a href="javascript: history.back();">‹‹ <?php echo translate('BackMessageIndex'); ?> </a>
		36	</td>
		37	<td align="right">
		38	- <a href="javascript: ViewOriginal('<? echo $enc_mail_id ?>','<? echo $enc_recip_email ?>');"> <? echo translate('ViewOriginal'); ?></a>
		39	+ <a href="javascript: ViewOriginal('<?php echo $enc_mail_id ?>','<?php echo $enc_recip_email ?>');"> <?php echo translate('ViewOriginal'); ?></a>
		40	\|
		41	<a href="javascript: void(1);" onclick="showHideFullHeaders('headers');">
		42	- <? echo translate('ToggleHeaders'); ?></a>
		43	+ <?php echo translate('ToggleHeaders'); ?></a>
		44	</td>
		45	</tr>
		46	</table>
		47	-<?
		48	+<?php
		49	}
		50
		51	/**
		52	@@ -138,14 +138,14 @@ function MsgOriginalOptions() {
		53	<table width="100%">
		54	<tr>
		55	<td class="stdFont" align="right">
		56	- <a href="javascript: window.print();"> <? echo translate('Print'); ?></a>
		57	+ <a href="javascript: window.print();"> <?php echo translate('Print'); ?></a>
		58	\|
		59	- <a href="javascript: window.close();"> <? echo translate('CloseWindow'); ?> </a>
		60	+ <a href="javascript: window.close();"> <?php echo translate('CloseWindow'); ?> </a>
		61	</td>
		62	</tr>
		63	<tr>
		64	<td class="stdFont" bgcolor="#FAFAFA">
65	-<?
66	+<?php
67	}
68
69

Lines 9-19 Link Here

(-)security/mailzu.new/files/pkg-message.in (-5 / +18 lines)
9		9
10	Then, edit %%WWWDIR%%/config/config.php	10	Then, edit %%WWWDIR%%/config/config.php
11		11
12	Also, please note that MailZu needs PHP's short_open_tag
13	boolean to be "on" (this is detault in typical installations
14	of PHP). To be certain, you can set "short_open_tag = on" in
15	%%LOCALBASE%%/etc/php.ini.
16
17	Finally, make MailZu available through your web site. An	12	Finally, make MailZu available through your web site. An
18	example for httpd.conf:	13	example for httpd.conf:
19		14
Lines 26-31 Link Here
26	Deny from all	21	Deny from all
27	Allow from 127.0.0.1 .example.org	22	Allow from 127.0.0.1 .example.org
28	</Directory>	23	</Directory>
		24
		25	An example for nginx.conf:
		26
		27	location /mailzu/ {
		28	alias %%WWWDIR%%/;
		29	index index.php;
		30	allow 127.0.0.0/8;
		31	deny all;
		32
		33	location ~ \.php$ {
		34	fastcgi_pass unix:/var/run/php-fpm.socket;
		35	fastcgi_param HTTPS on;
		36	fastcgi_index index.php;
		37	fastcgi_param SCRIPT_FILENAME $request_filename;
		38	include fastcgi_params;
		39	}
		40	}
		41
29	EOM	42	EOM
30	}	43	}
31	]	44	]