View | Details | Raw Unified | Return to bug 230712 | Differences between
and this patch

Collapse All | Expand All

(-)security/mailzu.new/files/patch-config_init.php (+11 lines)
Line 0 Link Here
1
--- config/init.php.orig	2007-06-14 19:00:15 UTC
2
+++ config/init.php
3
@@ -35,7 +35,7 @@
4
 session_start();
5
 
6
 // Turn off magic quotes (do not edit!)
7
-set_magic_quotes_runtime(0);
8
+// set_magic_quotes_runtime(0);
9
 
10
 $conf['app']['version'] = '0.8RC3';
11
 
(-)security/mailzu.new/files/patch-config_langs.php (+21 lines)
Line 0 Link Here
1
--- config/langs.php.orig	2007-06-14 19:00:15 UTC
2
+++ config/langs.php
3
@@ -47,7 +47,8 @@ $languages = array (
4
 	'cs'	=> array('cs([-_][[:alpha:]]{2})?|czech', 'cs.lang.php', 'cs', 'Česky'),
5
 	'fr'	=> array('fr([-_][[:alpha:]]{2})?|french', 'fr.lang.php', 'fr', 'Français'),
6
 	'it'	=> array('it([-_][[:alpha:]]{2})?|italian', 'it.lang.php', 'it', 'Italiano'),
7
-        'pt_BR' => array('pt([-_]br)?|portuguese', 'pt_BR.lang.php', 'pt', 'Portuguese Brazilian')
8
+        'pt_BR' => array('pt([-_]br)?|portuguese', 'pt_BR.lang.php', 'pt', 'Portuguese Brazilian'),
9
+	'pl'   => array('cs([-_][[:alpha:]]{2})?|polish', 'pl.lang.php', 'pl', 'Polski')
10
 );
11
 
12
 // Language files directory	
13
@@ -113,7 +114,7 @@ function get_browser_lang() {
14
 	global $languages;
15
 		
16
 	if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
17
-		$http_accepted = split(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']);
18
+		$http_accepted = str_split(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']);
19
 		for ($i = 0; $i < count($http_accepted); $i++) {
20
 			foreach ($languages as $lang => $vals) {
21
 				if (eregi($vals[0], $http_accepted[$i]))
(-)security/mailzu.new/files/patch-lib_Auth.class.php (+129 lines)
Line 0 Link Here
1
--- lib/Auth.class.php.orig	2007-06-14 19:00:15 UTC
2
+++ lib/Auth.class.php
3
@@ -43,42 +43,42 @@ class Auth {
4
 	*  and start the session
5
 	* @param none
6
 	*/
7
-	//function Auth() {
8
+	//public static function Auth() {
9
 	//	$this->db = new AuthDB();
10
 	//}
11
 
12
 	/**
13
 	* Check if user is a super administrator
14
-	* This function checks to see if the currently
15
+	* This public static function checks to see if the currently
16
 	*  logged in user is the administrator, granting
17
 	*  them special permissions
18
 	* @param none
19
 	* @return boolean whether the user is a s_admin
20
 	*/
21
-	function isAdmin() {
22
+	public static function isAdmin() {
23
 		return isset($_SESSION['sessionAdmin']);
24
 	}
25
 
26
 	/**
27
         * Check if user is a mail administrator
28
-        * This function checks to see if the currently
29
+        * This public static function checks to see if the currently
30
         *  logged in user is the administrator, granting
31
         *  them special permissions
32
         * @param none
33
         * @return boolean whether the user is a m_admin
34
         */
35
-        function isMailAdmin() {
36
+        public static function isMailAdmin() {
37
                 return (isset($_SESSION['sessionMailAdmin']) || isset($_SESSION['sessionAdmin']));
38
         }
39
 
40
 	/**
41
 	* Check user login
42
-	* This function checks to see if the user has
43
+	* This public static function checks to see if the user has
44
 	* a valid session set (if they are logged in)
45
 	* @param none
46
 	* @return boolean whether the user is logged in
47
 	*/
48
-	function is_logged_in() {
49
+	public static function is_logged_in() {
50
 		return isset($_SESSION['sessionID']);
51
 	}
52
 	
53
@@ -87,7 +87,7 @@ class Auth {
54
 	* @param none
55
 	* @return the userid, or null if the user is not logged in
56
 	*/
57
-	function getCurrentID() {
58
+	public static function getCurrentID() {
59
 		return $_SESSION['sessionID'];//isset($_SESSION['sessionID']) ? $_SESSION['sessionID'] : null;
60
 	}
61
 
62
@@ -281,7 +281,7 @@ class Auth {
63
 		}
64
 	}
65
 
66
-	function isAllowedToLogin( $username ) {
67
+	public static function isAllowedToLogin( $username ) {
68
 
69
 		global $conf;
70
 
71
@@ -333,7 +333,7 @@ class Auth {
72
 	* @param none
73
 	* @return whether the user is attempting to log in
74
 	*/
75
-	function isAttempting() {
76
+	public static function isAttempting() {
77
 		return $this->is_attempt;
78
 	}
79
 
80
@@ -341,7 +341,7 @@ class Auth {
81
 	* Kills app
82
 	* @param none
83
 	*/
84
-	function kill() {
85
+	public static function kill() {
86
 		die;
87
 	}
88
 
89
@@ -349,7 +349,7 @@ class Auth {
90
 	* Destroy any lingering sessions
91
 	* @param none
92
 	*/
93
-	function clean() {
94
+	public static function clean() {
95
 		// Destroy all session variables
96
 		unset($_SESSION['sessionID']);
97
 		unset($_SESSION['sessionName']);
98
@@ -359,11 +359,11 @@ class Auth {
99
 	}
100
 
101
 	/**
102
-	* Wrapper function to call template 'printLoginForm' function
103
+	* Wrapper public static function to call template 'printLoginForm' function
104
 	* @param string $msg error messages to display for user
105
 	* @param string $resume page to resume after a login
106
 	*/
107
-	function printLoginForm($msg = '', $resume = '') {
108
+	public static function printLoginForm($msg = '', $resume = '') {
109
 		printLoginForm($msg, $resume);
110
 	}
111
 
112
@@ -371,7 +371,7 @@ class Auth {
113
 	* Prints a message telling the user to log in
114
 	* @param boolean $kill whether to end the program or not
115
 	*/
116
-	function print_login_msg($kill = true) {
117
+	public static function print_login_msg($kill = true) {
118
 		CmnFns::redirect(CmnFns::getScriptURL() . '/index.php?auth=no&resume=' . urlencode($_SERVER['PHP_SELF']) . '?' . urlencode($_SERVER['QUERY_STRING']));
119
 	}
120
 	
121
@@ -379,7 +379,7 @@ class Auth {
122
 	* Prints out the latest success box
123
 	* @param none
124
 	*/
125
-	function print_success_box() {
126
+	public static function print_success_box() {
127
 		CmnFns::do_message_box($this->success);
128
 	}
129
 }
(-)security/mailzu.new/files/patch-lib_CmnFns.class.php (+296 lines)
Line 0 Link Here
1
--- lib/CmnFns.class.php.orig	2007-06-14 19:00:15 UTC
2
+++ lib/CmnFns.class.php
3
@@ -53,7 +53,7 @@ class CmnFns {
4
 	* @param double $time time to convert in minutes
5
 	* @return string time in 12 hour time
6
 	*/
7
-	function formatTime($time) {
8
+	public static function formatTime($time) {
9
 		global $conf;
10
 		
11
 		// Set up time array with $timeArray[0]=hour, $timeArray[1]=minute
12
@@ -82,7 +82,7 @@ class CmnFns {
13
 	* @param string $date string (yyyy-mm-dd)
14
 	* @return int timestamp
15
 	*/
16
-	function formatDateISO($date) {
17
+	public static function formatDateISO($date) {
18
 
19
 		$time = strtotime($date);
20
 		return $time;
21
@@ -94,7 +94,7 @@ class CmnFns {
22
 	* @param string $format format to put datestamp into
23
 	* @return string date as $format or as default format
24
 	*/
25
-	function formatDate($date, $format = '') {
26
+	public static function formatDate($date, $format = '') {
27
 		global $dates;
28
 		
29
 		if (empty($format)) $format = $dates['general_date'];
30
@@ -108,7 +108,7 @@ class CmnFns {
31
 	* @param string $format format to put datestamp into
32
 	* @return string date/time as $format or as default format
33
 	*/
34
-	function formatDateTime($ts, $format = '') {
35
+	public static function formatDateTime($ts, $format = '') {
36
 		global $conf;
37
 		global $dates;
38
 		
39
@@ -123,7 +123,7 @@ class CmnFns {
40
 	* @param int $minutes minutes to convert
41
 	* @return string version of hours and minutes
42
 	*/
43
-	function minutes_to_hours($minutes) {
44
+	public static function minutes_to_hours($minutes) {
45
 		if ($minutes == 0)
46
 			return '0 ' . translate('hours');
47
 			
48
@@ -137,7 +137,7 @@ class CmnFns {
49
 	* @param none
50
 	* @return url url of curent script directory
51
 	*/
52
-	function getScriptURL() {
53
+	public static function getScriptURL() {
54
 		global $conf;
55
 		$uri = $conf['app']['weburi'];
56
 		return (strrpos($uri, '/') === false) ? $uri : substr($uri, 0, strlen($uri));
57
@@ -150,7 +150,7 @@ class CmnFns {
58
 	* @param string $style inline CSS style definition to apply to box
59
 	* @param boolean $die whether to kill the app or not
60
 	*/
61
-	function do_error_box($msg, $style='', $die = true) {
62
+	public static function do_error_box($msg, $style='', $die = true) {
63
 		global $conf;
64
 		
65
 		echo '<table border="0" cellspacing="0" cellpadding="0" align="center" class="alert" style="' . $style . '"><tr><td>' . $msg . '</td></tr></table>';
66
@@ -171,7 +171,7 @@ class CmnFns {
67
 	* @param string $msg message to print out
68
 	* @param string $style inline CSS style definition to apply to box
69
 	*/
70
-	function do_message_box($msg, $style='') {
71
+	public static function do_message_box($msg, $style='') {
72
 		echo '<table border="0" cellspacing="0" cellpadding="0" align="center" class="message" style="' . $style . '"><tr><td>' . $msg . '</td></tr></table>';
73
 	}
74
 	
75
@@ -181,7 +181,7 @@ class CmnFns {
76
 	* @param none
77
 	* @return Link object
78
 	*/
79
-	function getNewLink() {
80
+	public static function getNewLink() {
81
 		return new Link();
82
 	}
83
 	
84
@@ -191,7 +191,7 @@ class CmnFns {
85
 	* @param none
86
 	* @return Pager object
87
 	*/
88
-	function getNewPager() {
89
+	public static function getNewPager() {
90
 		return new Pager();
91
 	}
92
 	
93
@@ -200,7 +200,7 @@ class CmnFns {
94
 	* @param none
95
 	* @return array of cleaned up POST values
96
 	*/
97
-	function cleanPostVals() {
98
+	public static function cleanPostVals() {
99
 		$return = array();
100
 		
101
 		foreach ($_POST as $key => $val)
102
@@ -214,7 +214,7 @@ class CmnFns {
103
 	* @param none
104
 	* @return array of cleaned up data
105
 	*/
106
-	function cleanVals($data) {
107
+	public static function cleanVals($data) {
108
 		$return = array();
109
 		
110
 		foreach ($data as $key => $val)
111
@@ -228,7 +228,7 @@ class CmnFns {
112
 	* @param string $vert value of vertical order
113
 	* @return string vertical order
114
 	*/
115
-	function get_vert_order($get_name = 'vert') {
116
+	public static function get_vert_order($get_name = 'vert') {
117
 		// If no vertical value is specified, use DESC
118
 		$vert = isset($_GET[$get_name]) ? $_GET[$get_name] : 'DESC';
119
 	    
120
@@ -251,7 +251,7 @@ class CmnFns {
121
 	* @param array $orders all valid order names
122
 	* @return string order of recorset
123
 	*/
124
-	function get_value_order($orders = array(), $get_name = 'order') {
125
+	public static function get_value_order($orders = array(), $get_name = 'order') {
126
 		if (empty($orders))		// Return null if the order array is empty
127
 			return NULL;
128
 			
129
@@ -269,12 +269,12 @@ class CmnFns {
130
 	
131
 	
132
 	/**
133
-	* Opposite of php's nl2br function.
134
+	* Opposite of php's nl2br public static function.
135
 	* Subs in a newline for all brs
136
 	* @param string $subject line to make subs on
137
 	* @return reformatted line
138
 	*/
139
-	function br2nl($subject) {
140
+	public static function br2nl($subject) {
141
 		return str_replace('<br />', "\n", $subject);
142
 	}
143
 	
144
@@ -284,7 +284,7 @@ class CmnFns {
145
 	* @param string $userid memeber id of user performing the action
146
 	* @param string $ip ip address of user performing the action
147
 	*/
148
-	function write_log($string, $userid = NULL, $ip = NULL) {
149
+	public static function write_log($string, $userid = NULL, $ip = NULL) {
150
 		global $conf;
151
 		$delim = "\t";
152
 		$file = $conf['app']['logfile'];
153
@@ -319,7 +319,7 @@ class CmnFns {
154
 	* @param int $day_of_week day of the week
155
 	* @param int $type how to return the day name (0 = full, 1 = one letter, 2 = two letter, 3 = three letter)
156
 	*/
157
-	function get_day_name($day_of_week, $type = 0) {
158
+	public static function get_day_name($day_of_week, $type = 0) {
159
 		global $days_full;
160
 		global $days_abbr;
161
 		global $days_letter;
162
@@ -343,7 +343,7 @@ class CmnFns {
163
 	* @param string $location new http location
164
 	* @param int $time time in seconds to wait before redirect
165
 	*/ 
166
-	function redirect($location, $time = 0, $die = true) {
167
+	public static function redirect($location, $time = 0, $die = true) {
168
 		header("Refresh: $time; URL=$location");
169
 		if ($die) exit;
170
 	}
171
@@ -352,7 +352,7 @@ class CmnFns {
172
 	* Prints out the HTML to choose a language
173
 	* @param none
174
 	*/
175
-	function print_language_pulldown() {
176
+	public static function print_language_pulldown() {
177
 		global $conf;
178
 		?>
179
 		<select name="language" class="textbox" onchange="changeLanguage(this);">
180
@@ -375,7 +375,7 @@ class CmnFns {
181
 	* @param string $str string to search for links to create
182
 	* @return string with 'URL-like' text changed into clickable links
183
 	*/
184
-	function html_activate_links($str) {
185
+	public static function html_activate_links($str) {
186
 		$str = eregi_replace('(((f|ht){1}tp://)[-a-zA-Z0-9@:%_+.~#?&//=]+)', '<a href="\1" target="_blank">\1</a>', $str);
187
 		$str = eregi_replace('([[:space:]()[{}])(www.[-a-zA-Z0-9@:%_+.~#?&//=]+)', '\1<a href="http://\2" target="_blank">\2</a>', $str);
188
 		$str = eregi_replace('([_.0-9a-z-]+@([0-9a-z][0-9a-z-]+.)+[a-z]{2,3})','<a href="mailto:\1">\1</a>', $str);
189
@@ -388,7 +388,7 @@ class CmnFns {
190
 	* @param integer $page value of current page number
191
 	* @return integer current page number
192
 	*/
193
-	function get_current_page_number($get_name = 'page') {
194
+	public static function get_current_page_number($get_name = 'page') {
195
 		// If no page number is specified, use 0
196
 		$page = ( isset($_GET[$get_name]) && is_numeric($_GET[$get_name]) )  ? $_GET[$get_name] : 0;
197
 		return $page;
198
@@ -399,7 +399,7 @@ class CmnFns {
199
         * @param none
200
         * @return string mail_id
201
         */
202
-        function get_mail_id($get_name = 'mail_id') {
203
+        public static function get_mail_id($get_name = 'mail_id') {
204
                 // If there isnt one set, return NULL
205
                 $mail_id = (isset($_GET[$get_name])) ? $_GET[$get_name] : NULL;
206
                 return $mail_id;
207
@@ -413,7 +413,7 @@ class CmnFns {
208
 	* @param array $exclude_vars to be excluded from the resulting string
209
 	* @param boolean $url_encode_ampersands
210
 	*/
211
-	function array_to_query_string( $array, $exclude_vars=array(), $url_encode_ampersands=true )
212
+	public static function array_to_query_string( $array, $exclude_vars=array(), $url_encode_ampersands=true )
213
 	{
214
 		if( ! is_array( $array ) )
215
 			return '';
216
@@ -441,7 +441,7 @@ class CmnFns {
217
 	* @param integer $sizeLimit maximum number of messages per page
218
 	* @param integer $count total number of messages
219
 	*/
220
-	function genMultiPagesLinks( $page, $sizeLimit, $count) {
221
+	public static function genMultiPagesLinks( $page, $sizeLimit, $count) {
222
 		global $link;
223
 
224
 		$total_pages = $count / $sizeLimit;
225
@@ -501,7 +501,7 @@ class CmnFns {
226
 	* Generate HTML for search engine
227
 	* @param $content_type: 'B' (attachment) or 'S' (spam)
228
 	*/
229
-	function searchEngine($content_type, $submit_page, $full_search = false) {
230
+	public static function searchEngine($content_type, $submit_page, $full_search = false) {
231
 		global $conf;
232
 
233
 		$fields_array = array("f" => translate('From'), 
234
@@ -579,7 +579,7 @@ class CmnFns {
235
         * @param none
236
         * @return value boolean
237
         */
238
-        function didSearch() {
239
+        public static function didSearch() {
240
 		$return = false;
241
 		$strings = array('f_string','s_string','t_string','m_string');
242
 		foreach ($strings as $string) {
243
@@ -593,7 +593,7 @@ class CmnFns {
244
         * @param array of variables to exclude
245
 	* @return query string
246
 	*/
247
-	function querystring_exclude_vars( $excl_array = array() ) {
248
+	public static function querystring_exclude_vars( $excl_array = array() ) {
249
 		return CmnFns::array_to_query_string( $_GET, $excl_array );
250
 	}	
251
 
252
@@ -602,7 +602,7 @@ class CmnFns {
253
         * @param none
254
         * @return value
255
         */
256
-        function get_ctype($get_name = 'ctype') {
257
+        public static function get_ctype($get_name = 'ctype') {
258
                 // If there isnt one set, return NULL
259
                 $result = NULL;
260
 		if ( isset($_GET[$get_name]) )
261
@@ -617,7 +617,7 @@ class CmnFns {
262
         * @param none
263
         * @return value
264
         */
265
-        function get_action($get_name = 'action') {
266
+        public static function get_action($get_name = 'action') {
267
                 // If there isnt one set, return NULL
268
                 $result = (isset($_POST[$get_name])) ? $_POST[$get_name] : NULL;
269
                 return $result;
270
@@ -628,7 +628,7 @@ class CmnFns {
271
         * @param none
272
         * @return value
273
         */
274
-        function get_query_string($get_name = 'query_string') {
275
+        public static function get_query_string($get_name = 'query_string') {
276
                 // If there isnt one set, return NULL
277
                 $result = (isset($_POST[$get_name])) ? $_POST[$get_name] : NULL;
278
                 return $result;
279
@@ -656,7 +656,7 @@ class CmnFns {
280
 	*	INORDER, SESSION, FORM, POST, GET, SERVER
281
  	* @return value of var
282
  	*/
283
-        function getGlobalVar($name, $search = INORDER) {
284
+        public static function getGlobalVar($name, $search = INORDER) {
285
 
286
 		switch ($search) {
287
 			
288
@@ -699,7 +699,7 @@ class CmnFns {
289
 	* Redirect using javascript
290
 	* @param $location string
291
 	*/
292
-	function redirect_js($location) {
293
+	public static function redirect_js($location) {
294
 		        echo "<SCRIPT LANGUAGE=\"JavaScript\">";
295
                        	echo "parent.location.href = '" . $location . "';";
296
         		echo "</SCRIPT>";
(-)security/mailzu.new/files/patch-lib_Quarantine.lib.php (+20 lines)
Line 0 Link Here
1
--- lib/Quarantine.lib.php.orig	2007-06-14 19:00:15 UTC
2
+++ lib/Quarantine.lib.php
3
@@ -65,7 +65,7 @@ function releaseMessages($emailaddresses
4
 	foreach ($mail_id_array as $mail_id_recip) {
5
 
6
 		// Get mail_id and recipient email address
7
-		$temp = preg_split('/_/', $mail_id_recip, 2);
8
+		$temp = preg_split('/__/', $mail_id_recip, 2);
9
 		$mail_id = $temp[0];
10
 		$recip_email = $temp[1];
11
 
12
@@ -258,7 +258,7 @@ function updateMessages($flag, $content_
13
 		foreach ($mail_id_array as $mail_id_recip) {
14
 		
15
 			// Get mail_id and recipient email address
16
-			$temp = preg_split('/_/', $mail_id_recip, 2);
17
+			$temp = preg_split('/__/', $mail_id_recip, 2);
18
 			$mail_id = $temp[0];
19
 			$recip_email = $temp[1];
20
 
(-)security/mailzu.new/files/patch-lib_Template.class.php (+11 lines)
Line 0 Link Here
1
--- lib/Template.class.php.orig	2007-06-14 19:00:15 UTC
2
+++ lib/Template.class.php
3
@@ -111,7 +111,7 @@ class Template {
4
 		<td class="mainBkgrdClr" valign="top">
5
 		  <div align="right">
6
 		    <p>
7
-			<?= translate_date('header', mktime());?>
8
+			<?= translate_date('header', time());?>
9
 			</p>
10
 			<!--<p>
11
 			  <? $this->link->doLink('javascript: help();', translate('Help')) ?>
(-)security/mailzu.new/files/patch-lib-DBEngine.class.php (-80 / +89 lines)
Lines 1-134 Link Here
1
--- lib/DBEngine.class.php.orig	2010-11-24 11:32:33.000000000 +0100
1
--- lib/DBEngine.class.php.orig	2007-06-14 19:00:15 UTC
2
+++ lib/DBEngine.class.php	2010-11-24 11:32:41.000000000 +0100
2
+++ lib/DBEngine.class.php
3
@@ -132,7 +132,7 @@
3
@@ -133,35 +133,35 @@ class DBEngine {
4
 			MAX(stattable.badheaders) AS badheaders,
5
 			MAX(stattable.pending) AS pending
4
 			MAX(stattable.pending) AS pending
6
 			FROM (
5
 			FROM (
7
-				SELECT CAST(time_iso AS DATE) AS date,
6
 				SELECT CAST(time_iso AS DATE) AS date,
8
+				SELECT CAST(FROM_UNIXTIME(time_num) AS DATE) AS date,
7
-					COUNT(content) AS spam,
9
 					COUNT(content) AS spam,
8
+					COUNT(msgs.content) AS spam,
10
 					0 AS banned,
9
 					0 AS banned,
11
 					0 AS viruses,
10
 					0 AS viruses,
12
@@ -141,9 +141,9 @@
11
 					0 AS badheaders,
12
 					0 AS pending
13
 					FROM msgs INNER JOIN msgrcpt ON msgs.mail_id=msgrcpt.mail_id
13
 					FROM msgs INNER JOIN msgrcpt ON msgs.mail_id=msgrcpt.mail_id
14
 					WHERE content='S' AND NOT (msgs.quar_type = '')
14
-					WHERE content='S' AND NOT (msgs.quar_type = '')
15
+					WHERE msgs.content='S' AND NOT (msgs.quar_type = '')
15
 					AND msgrcpt.rs IN ('','v')
16
 					AND msgrcpt.rs IN ('','v')
16
-					GROUP BY CAST(time_iso AS DATE)
17
 					GROUP BY CAST(time_iso AS DATE)
17
+					GROUP BY CAST(FROM_UNIXTIME(time_num) AS DATE)
18
 				UNION
18
 				UNION
19
-				SELECT CAST(time_iso AS DATE) AS date,
19
 				SELECT CAST(time_iso AS DATE) AS date,
20
+				SELECT CAST(FROM_UNIXTIME(time_num) AS DATE) AS date,
21
 					0 AS spam,
20
 					0 AS spam,
22
 					COUNT(content) AS banned,
21
-					COUNT(content) AS banned,
22
+					COUNT(msgs.content) AS banned,
23
 					0 AS viruses,
23
 					0 AS viruses,
24
@@ -152,9 +152,9 @@
24
 					0 AS badheaders,
25
 					0 AS pending 
25
 					FROM msgs INNER JOIN msgrcpt ON msgs.mail_id=msgrcpt.mail_id
26
 					FROM msgs INNER JOIN msgrcpt ON msgs.mail_id=msgrcpt.mail_id
26
 					WHERE content='B' AND NOT (msgs.quar_type = '')
27
-					WHERE content='B' AND NOT (msgs.quar_type = '')
28
+					WHERE msgs.content='B' AND NOT (msgs.quar_type = '')
27
 					AND msgrcpt.rs IN ('','v')
29
 					AND msgrcpt.rs IN ('','v')
28
-					GROUP BY CAST(time_iso AS DATE)
30
 					GROUP BY CAST(time_iso AS DATE)
29
+					GROUP BY CAST(FROM_UNIXTIME(time_num) AS DATE)
30
 				UNION
31
 				UNION
31
-				SELECT CAST(time_iso AS DATE) AS date,
32
 				SELECT CAST(time_iso AS DATE) AS date,
32
+				SELECT CAST(FROM_UNIXTIME(time_num) AS DATE) AS date,
33
 					0 AS spam,
33
 					0 AS spam,
34
 					0 AS banned,
34
 					0 AS banned,
35
 					COUNT(content) AS viruses,
35
-					COUNT(content) AS viruses,
36
@@ -163,9 +163,9 @@
36
+					COUNT(msgs.content) AS viruses,
37
 					0 AS badheaders,
38
 					0 AS pending
37
 					FROM msgs INNER JOIN msgrcpt ON msgs.mail_id=msgrcpt.mail_id
39
 					FROM msgs INNER JOIN msgrcpt ON msgs.mail_id=msgrcpt.mail_id
38
 					WHERE content='V' AND NOT (msgs.quar_type = '')
40
-					WHERE content='V' AND NOT (msgs.quar_type = '')
41
+					WHERE msgs.content='V' AND NOT (msgs.quar_type = '')
39
 					AND msgrcpt.rs IN ('','v')
42
 					AND msgrcpt.rs IN ('','v')
40
-					GROUP BY CAST(time_iso AS DATE)
43
 					GROUP BY CAST(time_iso AS DATE)
41
+					GROUP BY CAST(FROM_UNIXTIME(time_num) AS DATE)
42
 				UNION
44
 				UNION
43
-				SELECT CAST(time_iso AS DATE) AS date,
45
@@ -169,10 +169,10 @@ class DBEngine {
44
+				SELECT CAST(FROM_UNIXTIME(time_num) AS DATE) AS date,
45
 					0 AS spam,
46
 					0 AS spam,
46
 					0 AS banned,
47
 					0 AS banned,
47
 					0 AS viruses,
48
 					0 AS viruses,
48
@@ -174,9 +174,9 @@
49
-					COUNT(content) AS badheaders,
50
+					COUNT(msgs.content) AS badheaders,
51
 					0 AS pending
49
 					FROM msgs INNER JOIN msgrcpt ON msgs.mail_id=msgrcpt.mail_id
52
 					FROM msgs INNER JOIN msgrcpt ON msgs.mail_id=msgrcpt.mail_id
50
 					WHERE content='H' AND NOT (msgs.quar_type = '')
53
-					WHERE content='H' AND NOT (msgs.quar_type = '')
54
+					WHERE msgs.content='H' AND NOT (msgs.quar_type = '')
51
 					AND msgrcpt.rs IN ('','v')
55
 					AND msgrcpt.rs IN ('','v')
52
-					GROUP BY CAST(time_iso AS DATE)
56
 					GROUP BY CAST(time_iso AS DATE)
53
+					GROUP BY CAST(FROM_UNIXTIME(time_num) AS DATE)
54
 				UNION
57
 				UNION
55
-				SELECT CAST(time_iso AS DATE) AS date,
58
@@ -181,7 +181,7 @@ class DBEngine {
56
+				SELECT CAST(FROM_UNIXTIME(time_num) AS DATE) AS date,
57
 					0 AS spam,
58
 					0 AS banned,
59
 					0 AS banned,
59
 					0 AS viruses,
60
 					0 AS viruses,
60
@@ -184,7 +184,7 @@
61
 					0 AS badheaders,
61
 					COUNT(content) AS pending
62
-					COUNT(content) AS pending
63
+					COUNT(msgs.content) AS pending
62
 					FROM msgs JOIN msgrcpt ON msgs.mail_id=msgrcpt.mail_id
64
 					FROM msgs JOIN msgrcpt ON msgs.mail_id=msgrcpt.mail_id
63
 					WHERE msgrcpt.rs='p' AND NOT (msgs.quar_type = '')
65
 					WHERE msgrcpt.rs='p' AND NOT (msgs.quar_type = '')
64
-					GROUP BY CAST(time_iso AS DATE)
66
 					GROUP BY CAST(time_iso AS DATE)
65
+					GROUP BY CAST(FROM_UNIXTIME(time_num) AS DATE)
67
@@ -240,7 +240,7 @@ class DBEngine {
66
 			) AS stattable
68
 		$recipEmailClause =  $this->convertEmailaddresses2SQL($emailaddresses);
67
 			GROUP BY date
69
 
68
 			ORDER BY date";
70
 		# mysql seems to run faster with a left join
69
@@ -253,7 +253,7 @@
71
-		if ($conf['db']['dbtype'] == 'mysql') {
70
 			MAX(stattable.badheaders) AS badheaders,
72
+		if ($conf['db']['dbType'] == 'mysql') {
73
 			$join_type = ' LEFT JOIN';
74
 		} else {
75
 			$join_type = ' INNER JOIN';
76
@@ -254,38 +254,38 @@ class DBEngine {
71
 			MAX(stattable.pending) AS pending
77
 			MAX(stattable.pending) AS pending
72
 			FROM (
78
 			FROM (
73
-				SELECT CAST(time_iso AS DATE) AS date,
79
 				SELECT CAST(time_iso AS DATE) AS date,
74
+				SELECT CAST(FROM_UNIXTIME(time_num) AS DATE) AS date,
80
-					COUNT(content) AS spam,
75
 					COUNT(content) AS spam,
81
+					COUNT(msgs.content) AS spam,
76
 					0 AS banned,
82
 					0 AS banned,
77
 					0 AS viruses,
83
 					0 AS viruses,
78
@@ -263,9 +263,9 @@
84
 					0 AS badheaders,
85
 					0 AS pending
86
 					FROM msgs INNER JOIN msgrcpt ON msgs.mail_id=msgrcpt.mail_id
79
 					$join_type maddr AS recip ON msgrcpt.rid=recip.id
87
 					$join_type maddr AS recip ON msgrcpt.rid=recip.id
80
 					WHERE content='S' AND NOT (msgs.quar_type = '') AND msgrcpt.rs IN ('','v')
88
-					WHERE content='S' AND NOT (msgs.quar_type = '') AND msgrcpt.rs IN ('','v')
89
+					WHERE msgs.content='S' AND NOT (msgs.quar_type = '') AND msgrcpt.rs IN ('','v')
81
 					AND $recipEmailClause
90
 					AND $recipEmailClause
82
-					GROUP BY CAST(time_iso AS DATE)
91
 					GROUP BY CAST(time_iso AS DATE)
83
+					GROUP BY CAST(FROM_UNIXTIME(time_num) AS DATE)
84
 				UNION
92
 				UNION
85
-				SELECT CAST(time_iso AS DATE) AS date,
93
 				SELECT CAST(time_iso AS DATE) AS date,
86
+				SELECT CAST(FROM_UNIXTIME(time_num) AS DATE) AS date,
87
 					0 AS spam,
94
 					0 AS spam,
88
 					COUNT(content) AS banned,
95
-					COUNT(content) AS banned,
96
+					COUNT(msgs.content) AS banned,
89
 					0 AS viruses,
97
 					0 AS viruses,
90
@@ -275,9 +275,9 @@
98
 					0 AS badheaders,
99
 					0 AS pending 
100
 					FROM msgs INNER JOIN msgrcpt ON msgs.mail_id=msgrcpt.mail_id
91
 					$join_type maddr AS recip ON msgrcpt.rid=recip.id
101
 					$join_type maddr AS recip ON msgrcpt.rid=recip.id
92
 					WHERE content='B' AND NOT (msgs.quar_type = '') AND msgrcpt.rs IN ('','v')
102
-					WHERE content='B' AND NOT (msgs.quar_type = '') AND msgrcpt.rs IN ('','v')
103
+					WHERE msgs.content='B' AND NOT (msgs.quar_type = '') AND msgrcpt.rs IN ('','v')
93
 					AND $recipEmailClause
104
 					AND $recipEmailClause
94
-					GROUP BY CAST(time_iso AS DATE)
105
 					GROUP BY CAST(time_iso AS DATE)
95
+					GROUP BY CAST(FROM_UNIXTIME(time_num) AS DATE)
96
 				UNION
106
 				UNION
97
-				SELECT CAST(time_iso AS DATE) AS date,
107
 				SELECT CAST(time_iso AS DATE) AS date,
98
+				SELECT CAST(FROM_UNIXTIME(time_num) AS DATE) AS date,
99
 					0 AS spam,
108
 					0 AS spam,
100
 					0 AS banned,
109
 					0 AS banned,
101
 					COUNT(content) AS viruses,
110
-					COUNT(content) AS viruses,
102
@@ -287,9 +287,9 @@
111
+					COUNT(msgs.content) AS viruses,
112
 					0 AS badheaders,
113
 					0 AS pending
114
 					FROM msgs INNER JOIN msgrcpt ON msgs.mail_id=msgrcpt.mail_id
103
 					$join_type maddr AS recip ON msgrcpt.rid=recip.id
115
 					$join_type maddr AS recip ON msgrcpt.rid=recip.id
104
 					WHERE content='V' AND NOT (msgs.quar_type = '') AND msgrcpt.rs IN ('','v')
116
-					WHERE content='V' AND NOT (msgs.quar_type = '') AND msgrcpt.rs IN ('','v')
117
+					WHERE msgs.content='V' AND NOT (msgs.quar_type = '') AND msgrcpt.rs IN ('','v')
105
 					AND $recipEmailClause
118
 					AND $recipEmailClause
106
-					GROUP BY CAST(time_iso AS DATE)
119
 					GROUP BY CAST(time_iso AS DATE)
107
+					GROUP BY CAST(FROM_UNIXTIME(time_num) AS DATE)
108
 				UNION
120
 				UNION
109
-				SELECT CAST(time_iso AS DATE) AS date,
121
@@ -293,11 +293,11 @@ class DBEngine {
110
+				SELECT CAST(FROM_UNIXTIME(time_num) AS DATE) AS date,
111
 					0 AS spam,
122
 					0 AS spam,
112
 					0 AS banned,
123
 					0 AS banned,
113
 					0 AS viruses,
124
 					0 AS viruses,
114
@@ -299,9 +299,9 @@
125
-					COUNT(content) AS badheaders,
126
+					COUNT(msgs.content) AS badheaders,
127
 					0 AS pending
128
 					FROM msgs INNER JOIN msgrcpt ON msgs.mail_id=msgrcpt.mail_id
115
 					$join_type maddr AS recip ON msgrcpt.rid=recip.id
129
 					$join_type maddr AS recip ON msgrcpt.rid=recip.id
116
 					WHERE content='H' AND NOT (msgs.quar_type = '') AND msgrcpt.rs IN ('','v')
130
-					WHERE content='H' AND NOT (msgs.quar_type = '') AND msgrcpt.rs IN ('','v')
131
+					WHERE msgs.content='H' AND NOT (msgs.quar_type = '') AND msgrcpt.rs IN ('','v')
117
 					AND $recipEmailClause
132
 					AND $recipEmailClause
118
-					GROUP BY CAST(time_iso AS DATE)
133
 					GROUP BY CAST(time_iso AS DATE)
119
+					GROUP BY CAST(FROM_UNIXTIME(time_num) AS DATE)
120
 				UNION
134
 				UNION
121
-				SELECT CAST(time_iso AS DATE) AS date,
135
@@ -306,7 +306,7 @@ class DBEngine {
122
+				SELECT CAST(FROM_UNIXTIME(time_num) AS DATE) AS date,
123
 					0 AS spam,
124
 					0 AS banned,
136
 					0 AS banned,
125
 					0 AS viruses,
137
 					0 AS viruses,
126
@@ -311,7 +311,7 @@
138
 					0 AS badheaders,
139
-					COUNT(content) AS pending
140
+					COUNT(msgs.content) AS pending
141
 					FROM msgs INNER JOIN msgrcpt ON msgs.mail_id=msgrcpt.mail_id
127
 					$join_type maddr AS recip ON msgrcpt.rid=recip.id
142
 					$join_type maddr AS recip ON msgrcpt.rid=recip.id
128
 					WHERE msgrcpt.rs='p' AND NOT (msgs.quar_type = '')
143
 					WHERE msgrcpt.rs='p' AND NOT (msgs.quar_type = '')
129
 					AND $recipEmailClause
130
-					GROUP BY CAST(time_iso AS DATE)
131
+					GROUP BY CAST(FROM_UNIXTIME(time_num) AS DATE)
132
 			) AS stattable
133
 			GROUP BY date
134
 			ORDER BY date";
(-)security/mailzu.new/files/patch-messagesAdmin.php (+10 lines)
Line 0 Link Here
1
--- messagesAdmin.php.orig	2007-06-14 19:00:15 UTC
2
+++ messagesAdmin.php
3
@@ -55,6 +55,7 @@ if (! Auth::isMailAdmin()) {
4
   CmnFns::do_error_box(translate('Access Denied'));
5
 
6
 } else {
7
+  $content_type = (CmnFns::get_ctype() ? CmnFns::get_ctype() : 'A');
8
   // Draw search engine
9
   printSearchEngine($content_type, $_SERVER['PHP_SELF'], 1);
10
   echo '<br>';
(-)security/mailzu.new/files/patch-read__mail.php (+11 lines)
Line 0 Link Here
1
--- read_mail.php.orig	2007-06-14 19:00:15 UTC
2
+++ read_mail.php
3
@@ -59,7 +59,7 @@ if ( ! $m->msg_found) {
4
 } else {
5
 
6
   echo '<form name="messages_process_form" action="messagesProcessing.php" method="POST">';
7
-  echo '  <input type="hidden" name="mail_id_array[]" value="' . $mail_id . '_' . $recip_email . '">';
8
+  echo '  <input type="hidden" name="mail_id_array[]" value="' . $mail_id . '__' . $recip_email . '">';
9
   echo '  <input type="hidden" name="query_string" value="' . $query_string . '">';
10
   printActionButtons(false);
11
   echo '</form>';
(-)security/mailzu.new/files/patch-templates_quarantine.template.php (+11 lines)
Line 0 Link Here
1
--- templates/quarantine.template.php.orig	2007-06-14 19:00:15 UTC
2
+++ templates/quarantine.template.php
3
@@ -143,7 +143,7 @@ function showMessagesTable($content_type
4
         				echo "<tr class=\"$class\" align=\"center\">";
5
 
6
 					echo '  <td><input type="checkbox" onclick="ColorRow(this,\'lightyellow\')" 
7
-						name="mail_id_array[]" value="' . $rs['mail_id'] . '_' . $rs['email'] . '"></td>';
8
+						name="mail_id_array[]" value="' . $rs['mail_id'] . '__' . $rs['email'] . '"></td>';
9
 					if ( (count($_SESSION['sessionMail']) > 1) || (Auth::isMailAdmin() && 
10
 					   ("Site Quarantine" == $_SESSION['sessionNav'] || "Site Pending Requests" == $_SESSION['sessionNav']))) {
11
 						echo '  <td>' . $to . '</td>';
(-)security/mailzu.new/files/pl.help.php (+144 lines)
Line 0 Link Here
1
<?php
2
/**
3
* English (en) help translation file.
4
* This also serves as the base translation file from which to derive
5
*  all other translations.
6
*  
7
* @author Brian Wong <bwsource@users.sourceforge.net>
8
* @translator Your Name <your@email.com>
9
* @version 01-08-05
10
* @package Languages
11
*
12
* Copyright (C) 2003 - 2007 MailZu
13
* License: GPL, see LICENSE
14
*
15
* $Id$
16
*/
17
///////////////////////////////////////////////////////////
18
// INSTRUCTIONS
19
///////////////////////////////////////////////////////////
20
// This file contains all the help file for MailZu.  Please save the translated
21
//  file as '2 letter language code'.help.php.  For example, en.help.php.
22
// 
23
// To make MailZu help available in another language, simply translate this
24
//  file into your language.  If there is no direct translation, please provide the
25
//  closest translation.
26
//
27
// This will be included in the body of the help file.
28
//
29
// Please keep the HTML formatting unless you need to change it.  Also, please try
30
//  to keep the HTML XHTML 1.0 Transitional complaint.
31
///////////////////////////////////////////////////////////
32
?>
33
<div align="center"> 
34
  <h3><a name="top" id="top"></a>Wprowadzenie do MailZu</h3>
35
  <p><a href="http://mailzu.net" target="_blank">http://mailzu.net</a></p>
36
  <table width="100%" border="0" cellspacing="0" cellpadding="5" style="border: solid #CCCCCC 1px">
37
    <tr> 
38
      <td bgcolor="#FAFAFA"> 
39
        <ul>
40
          <li><b><a href="#getting_started">Rozpoczęcie pracy</a></b></li>
41
          <ul>
42
            <li><a href="#logging_in">Logowanie</a></li>
43
            <li><a href="#language">Wybór mojego języka</a></li>
44
            <li><a href="#getting_support">Uzyskanie wsparcia</a></li>
45
          </ul>
46
          <li><a href="#using_mailzu"><b>Używanie MailZu</b></a></li>
47
          <ul>
48
            <li><a href="#quick_links">Moje szybkie odnośniki</a></li>
49
            <li><a href="#msg_summary">Podsumowanie wiadomości</a></li>
50
            <li><a href="#msg_index">Indeksy wiadomości</a></li>
51
            <li><a href="#search">Szukanie wiadomości</a></li>
52
            <li><a href="#msg_view">Podgląd wiadomości</a></li>
53
          </ul>
54
        </ul>
55
		<hr width="95%" size="1" noshade="noshade" />
56
        <h4><a name="getting_started" id="getting_started"></a>Rozpoczęcie pracy</h4>
57
        <p> At the top of each page you will see a welcome message and today's date.
58
          If a previous user is displayed in the welcome message, click &quot;Log 
59
          Out&quot; to clear out any cookies they were using and <a href="#logging_in">log 
60
          in</a> as yourself. 
61
          Clicking the &quot;Help&quot; link brings a pop-up help window. Clicking
62
          the &quot;Email Administrator&quot; link will open a new mail addressed to the system's
63
          administrator.</p>
64
          <p align="right"><a href="#top">Top</a></p>
65
        <h5><a name="logging_in" id="logging_in"></a>Logging In</h5>
66
        <p>To log in, users must provide their login id and password. The login id
67
	  may be your fully-qualified email address ('user@example.com') or simply
68
	  your username ('user'). The administrator shall inform you of the correct
69
	  form to use. Selecting the &quot;Keep Me Logged In&quot; option will use 
70
          cookies to identify you each time you return to the quarantine, bypassing 
71
          the need to log in each time. <i>You should only use this option if 
72
          you are the only person using MailZu on your computer.</i> After 
73
          logging in, you will be redirected to the <a href="#message_summary">
74
          Message Summary</a>.</p>
75
        <p align="right"><a href="#top">Top</a></p>
76
        <h5><a name="language" id="language"></a>Selecting My Language</h5>
77
        <p>On the login page, there will be a pull down menu with all of the
78
          available language translations that your administrator has included.
79
          Please select the language that you prefer and all MailZu text
80
          will be translated. This will not translate any text related to actual
81
	  email messages; it will only translate the application text. You will 
82
	  need to log out to select a different language.</p>
83
        <p align="right"><a href="#top">Top</a></p>        
84
        <h5><a name="getting_support" id="getting_support"></a>Getting
85
          Help</h5>
86
        <p>If you you need assistance with viewing your quarantined messages or any
87
	  issue whatsoever, feel free to use the &quot;Email
88
          Administrator&quot; link located in <a href="#quick_links">My Quick Links</a>.</p>
89
        <p align="right"><a href="#top">Top</a></p>        <p align="right">&nbsp;</p>
90
        <hr width="95%" size="1" noshade="noshade" />
91
        <h4><a name="using_mailzu" id="using_mailzu"></a>Using MailZu</h4>
92
        <p>MailZu allows the user to view quarantined messages based on the type of messages. 
93
	   The most prevalent types of messages which will be quarantined are those that are 
94
	   considered spam, or contain a banned attachment.
95
        <p align="right"><a href="#top">Top</a></p>
96
        <h5><a name="quick_links" id="quick_links"></a>My Quick Links</h5>
97
        <p>The Quick Links table will provide you with common application links.
98
	  The first, &quot;Quarantine Summary&quot; will give an overview of your message 
99
	  quarantines.</p>
100
	<p> &quot;My Quarantine&quot; will take you to
101
          an index of your unsolicited bulk email and banned attachments.</p>
102
        <p>&quot;Email Administrator&quot; is a quick way to contact your support
103
	  staff if you require assistance.</p>
104
        <p>&quot;Help&quot; gives you this document.</p>
105
        <p>The final link, &quot;Log Out&quot; will log you out of your current
106
          session and return you to the log in screen.</p>
107
        <p align="right"><a href="#top">Top</a></p>
108
        <h5><a name="msg_summary" id="msg_summary"></a>Message Summary</h5>
109
	<p> The message summary is the default page after login. It gives you a quick count of
110
	  how many messages you have in your quarantine and their type.
111
        <p align="right"><a href="#top">Top</a></p>
112
        <h5><a name="msg_index" id="msg_index"></a>Message Indexes</h5>
113
        <p> Message indices show all the email for selected quarantined. 
114
	  For each email quarantined, the index will show the From, Subject, and Date. Depending
115
	  on the quarantine currently in view, the index may show more information.</p>
116
        <p>To sort your index by a specific field, click on the field title. Clicking the field
117
	   title again will reverse the sort.</p> 
118
	<p>Several buttons are available for handling the messages shown in the index. The 
119
	  'Release/Request' action removes the message from the index and delivers the email as 
120
   	  if it had never been quarantined. The 'Delete' action only removes the message from the 
121
	  index. These buttons perform the action on the messages selected through the checkboxes. 
122
	  The 'Delete All' button ignores the state of the checkboxes and removes all messages in
123
	  the quarantine selected.</p>
124
	<p>When viewing your pending requests you can withdraw the request by clicking 
125
	   'Cancel Request'. The message will no longer be queued for administrator review.
126
	</p>
127
        <p align="right"><a href="#top">Top</a></p>
128
        <h5><a name="search" id="search"></a>Message Search</h5>
129
        <p>Using the search function is a quick way to find a message you believe has been
130
	   quarantined. You can search for a message by specifying either who its from, or
131
	   what the subject is, or both. The search is not case sensitive.</p>
132
        <p align="right"><a href="#top">Top</a></p> 
133
	<h5><a name="msg_view" id="msg_view"></a>Message View</h5>
134
        <p>The Message View allows you to see the contents of the message to help
135
	   determine if the message is legitimate. This view offers other options such
136
	   as to display the original plain text email and see additional message headers.
137
	</p>
138
        <p align="right"><a href="#top">Top</a></p>        <p align="right">&nbsp;</p>
139
140
        <hr width="95%" size="1" noshade="noshade" />
141
      </td>
142
    </tr>
143
  </table>
144
</div>
(-)security/mailzu.new/files/pl.lang.php (+324 lines)
Line 0 Link Here
1
<?php
2
/**
3
* Polish (pl) translation file.
4
* Based on phpScheduleIt translation file.
5
* This also serves as the base translation file from which to derive
6
*  all other translations.
7
*
8
* @author Samuel Tran <stran2005@users.sourceforge.net>
9
* @author Brian Wong <bwsource@users.sourceforge.net>
10
* @author Nicolas Peyrussie <peyrouz@users.sourceforge.net>
11
* @version 04-03-07
12
* @package Languages
13
*
14
* Copyright (C) 2005 - 2007 MailZu
15
* License: GPL, see LICENSE
16
*
17
* $Id$
18
*/
19
///////////////////////////////////////////////////////////
20
// INSTRUCTIONS
21
///////////////////////////////////////////////////////////
22
// This file contains all of the strings that are used throughout phpScheduleit.
23
// Please save the translated file as '2 letter language code'.lang.php.  For example, en.lang.php.
24
// 
25
// To make phpScheduleIt available in another language, simply translate each
26
//  of the following strings into the appropriate one for the language.  If there
27
//  is no direct translation, please provide the closest translation.  Please be sure
28
//  to make the proper additions the /config/langs.php file (instructions are in the file).
29
//  Also, please add a help translation for your language using en.help.php as a base.
30
//
31
// You will probably keep all sprintf (%s) tags in their current place.  These tags
32
//  are there as a substitution placeholder.  Please check the output after translating
33
//  to be sure that the sentences make sense.
34
//
35
// + Please use single quotes ' around all $strings.  If you need to use the ' character, please enter it as \'
36
// + Please use double quotes " around all $email.  If you need to use the " character, please enter it as \"
37
//
38
// + For all $dates please use the PHP strftime() syntax
39
//    http://us2.php.net/manual/en/function.strftime.php
40
//
41
// + Non-intuitive parts of this file will be explained with comments.  If you
42
//    have any questions, please email lqqkout13@users.sourceforge.net
43
//    or post questions in the Developers forum on SourceForge
44
//    http://sourceforge.net/forum/forum.php?forum_id=331297
45
///////////////////////////////////////////////////////////
46
47
////////////////////////////////
48
/* Do not modify this section */
49
////////////////////////////////
50
global $strings;			  //
51
global $email;				  //
52
global $dates;				  //
53
global $charset;			  //
54
global $letters;			  //
55
global $days_full;			  //
56
global $days_abbr;			  //
57
global $days_two;			  //
58
global $days_letter;		  //
59
global $months_full;		  //
60
global $months_abbr;		  //
61
global $days_letter;		  //
62
/******************************/
63
64
// Charset for this language
65
// 'iso-8859-1' will work for most languages
66
$charset = 'utf-8';
67
68
/***
69
  DAY NAMES
70
  All of these arrays MUST start with Sunday as the first element 
71
   and go through the seven day week, ending on Saturday
72
***/
73
// The full day name
74
$days_full = array('Niedziela', 'Poniedziałek', 'Wtorek', 'Środa', 'Czwartek', 'Piątek', 'Sobota');
75
// The three letter abbreviation
76
$days_abbr = array('Nie', 'Pon', 'Wto', 'Śro', 'Czw', 'Pią', 'Sob');
77
// The two letter abbreviation
78
$days_two  = array('Nd', 'Pn', 'Wt', 'Śr', 'Cz', 'Pi', 'So');
79
// The one letter abbreviation
80
$days_letter = array('N', 'P', 'W', 'Ś', 'C', 'T', 'S');
81
82
/***
83
  MONTH NAMES
84
  All of these arrays MUST start with January as the first element
85
   and go through the twelve months of the year, ending on December
86
***/
87
// The full month name
88
$months_full = array('Styczeń', 'Luty', 'Marzec', 'Kwiecień', 'Maj', 'Czerwiec', 'Lipiec', 'Sierpień', 'Wrzesień', 'Październik', 'Listopad', 'Grudzień');
89
// The three letter month name
90
$months_abbr = array('Sty', 'Lut', 'Mar', 'Kwi', 'Maj', 'Cze', 'Lip', 'Sie', 'Wrz', 'Paź', 'Lis', 'Gru');
91
92
// All letters of the alphabet starting with A and ending with Z
93
$letters = array ('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z');
94
95
/***
96
  DATE FORMATTING
97
  All of the date formatting must use the PHP strftime() syntax
98
  You can include any text/HTML formatting in the translation
99
***/
100
// General date formatting used for all date display unless otherwise noted
101
$dates['general_date'] = '%d/%m/%Y';
102
// General datetime formatting used for all datetime display unless otherwise noted
103
// The hour:minute:second will always follow this format
104
$dates['general_datetime'] = '%d/%m/%Y @';
105
$dates['header'] = '%A, %B %d, %Y';
106
107
/***
108
  STRING TRANSLATIONS
109
  All of these strings should be translated from the English value (right side of the equals sign) to the new language.
110
  - Please keep the keys (between the [] brackets) as they are.  The keys will not always be the same as the value.
111
  - Please keep the sprintf formatting (%s) placeholders where they are unless you are sure it needs to be moved.
112
  - Please keep the HTML and punctuation as-is unless you know that you want to change it.
113
***/
114
$strings['hours'] = 'godziny';
115
$strings['minutes'] = 'minuty';
116
// The common abbreviation to hint that a user should enter the month as 2 digits
117
$strings['mm'] = 'mm';
118
// The common abbreviation to hint that a user should enter the day as 2 digits
119
$strings['dd'] = 'dd';
120
// The common abbreviation to hint that a user should enter the year as 4 digits
121
$strings['yyyy'] = 'yyyy';
122
$strings['am'] = 'am';
123
$strings['pm'] = 'pm';
124
125
$strings['Administrator'] = 'Administrator';
126
$strings['Welcome Back'] = '%s, witaj ponownie';
127
$strings['Log Out'] = 'Wyloguj';
128
$strings['Help'] = 'Pomoc';
129
130
$strings['Admin Email'] = 'Email administratora';
131
132
$strings['Default'] = 'Domyślny';
133
$strings['Reset'] = 'Reset';
134
$strings['Edit'] = 'Edytuj';
135
$strings['Delete'] = 'Skasuj';
136
$strings['Cancel'] = 'Anuluj';
137
$strings['View'] = 'Podgląd';
138
$strings['Modify'] = 'Modyfikacja';
139
$strings['Save'] = 'Zachowaj';
140
$strings['Back'] = 'Powrót';
141
$strings['BackMessageIndex'] = 'Powrót do Wiadomości';
142
$strings['ToggleHeaders'] = 'Przełącz nagłówki';
143
$strings['ViewOriginal'] = 'Obejrzyj w oryginale';
144
$strings['Next'] = 'Następna';
145
$strings['Close Window'] = 'Zamknij okno';
146
$strings['Search'] = 'Szukaj';
147
$strings['Clear'] = 'Wyczyść';
148
149
$strings['Days to Show'] = 'Dni do pokazania';
150
$strings['Reservation Offset'] = 'Reservation Offset';
151
$strings['Hidden'] = 'Ukryte';
152
$strings['Show Summary'] = 'Pokaż podsumowanie';
153
$strings['Add Schedule'] = 'Dodaj Schedule';
154
$strings['Edit Schedule'] = 'Edytuj Schedule';
155
$strings['No'] = 'Nie';
156
$strings['Yes'] = 'Tak';
157
$strings['Name'] = 'Nazwa';
158
$strings['First Name'] = 'Imię';
159
$strings['Last Name'] = 'Nazwisko';
160
$strings['Resource Name'] = 'Nazwa Żródła';
161
$strings['Email'] = 'Email';
162
$strings['Institution'] = 'Instytucja';
163
$strings['Phone'] = 'Telefon';
164
$strings['Password'] = 'Hasło';
165
$strings['Permissions'] = 'Uprawnienia';
166
$strings['View information about'] = 'Zobacz informację o %s %s';
167
$strings['Send email to'] = 'Wyślij email do %s %s';
168
$strings['Reset password for'] = 'Reset hasła dla %s %s';
169
$strings['Edit permissions for'] = 'Edycja uprawnień dla %s %s';
170
$strings['Position'] = 'Pozycja';
171
$strings['Password (6 char min)'] = 'Hasło (minimum %s znaków)';	// @since 1.1.0
172
$strings['Re-Enter Password'] = 'Wprowadź hasło ponownie';
173
174
$strings['Date'] = 'Data';
175
$strings['Email Users'] = 'Wyślij email do użytkowników';
176
$strings['Subject'] = 'Temat';
177
$strings['Message'] = 'Wiadomość';
178
$strings['Send Email'] = 'Wyślij Email';
179
$strings['problem sending email'] = 'Niestety wystąpił błąd podczas wysyłania emaila. Proszę spróbować ponownie później.';
180
$strings['The email sent successfully.'] = 'Wysłanie emaila zakończone sukcesem.';
181
$strings['Email address'] = 'Adres email';
182
$strings['Please Log In'] = 'Proszę się zalogować';
183
$strings['Keep me logged in'] = 'Pamiętaj moje dane logowania <br/>(wymagane ciasteczka)';
184
$strings['Password'] = 'Hasło';
185
$strings['Log In'] = 'Zaloguj';
186
$strings['Get online help'] = 'Dostęp do pomocy';
187
$strings['Language'] = 'Język';
188
$strings['(Default)'] = '(Domyślnie)';
189
190
$strings['Email Administrator'] = 'Wyślij email do administrator';
191
192
$strings['N/A'] = 'Niedostępne';
193
$strings['Summary'] = 'Podsumowanie';
194
195
$strings['View stats for schedule'] = 'Zobacz statystyki dla wykazu:';
196
$strings['At A Glance'] = 'W skrócie';
197
$strings['Total Users'] = 'Wszystkich użytkowników:';
198
$strings['Total Resources'] = 'Wszystkich zasobów:';
199
$strings['Total Reservations'] = 'Wszystkich Rezerwacji:';
200
$strings['Max Reservation'] = 'Maksimum Rezerwacji:';
201
$strings['Min Reservation'] = 'Minimum Rezerwacji:';
202
$strings['Avg Reservation'] = 'Średnio Rezerwacji:';
203
$strings['Most Active Resource'] = 'Najbardziej aktywne źródła:';
204
$strings['Most Active User'] = 'Najbardziej aktywni użytkownicy:';
205
$strings['System Stats'] = 'Statystyki systemowe';
206
$strings['phpScheduleIt version'] = 'Wersja phpScheduleIt:';
207
$strings['Database backend'] = 'Baza danych:';
208
$strings['Database name'] = 'Nazwa bazy danych:';
209
$strings['PHP version'] = 'Wersja PHP:';
210
$strings['Server OS'] = 'System operacyjny serwera:';
211
$strings['Server name'] = 'Nazwa serwera:';
212
$strings['phpScheduleIt root directory'] = 'Katalog główny (root) phpScheduleIt:';
213
$strings['Using permissions'] = 'Using permissions:';
214
$strings['Using logging'] = 'Using logging:';
215
$strings['Log file'] = 'Plik logu:';
216
$strings['Admin email address'] = 'Adres email administracyjny:';
217
$strings['Tech email address'] = 'Adres email techniczny:';
218
$strings['CC email addresses'] = 'Adresy email do Cc (do wiadomości):';
219
$strings['Reservation start time'] = 'Czas rozpoczęcia rezerwacji:';
220
$strings['Reservation end time'] = 'Czas zakończenia rezerwacji:';
221
$strings['Days shown at a time'] = 'Pokazana liczba dni:';
222
$strings['Reservations'] = 'Rezerwacje';
223
$strings['Return to top'] = 'Powrót na początek';
224
$strings['for'] = 'dla';
225
226
$strings['Per page'] = 'na stronę:';
227
$strings['Page'] = 'Strona:';
228
229
$strings['You are not logged in!'] = 'Nie jesteś zalogowany!';
230
231
$strings['Setup'] = 'Setup';
232
$strings['Invalid User Name/Password.'] = 'Niepoprawny login/hasło.';
233
234
$strings['Valid username is required'] = 'Wymagana poprawna nazwa użytkownika';
235
236
$strings['Close'] = 'Zamknij';
237
238
$strings['Admin'] = 'Admin';
239
240
$strings['My Quick Links'] = 'Moje szybkie odnośniki';
241
242
$strings['Go to first page'] = 'Idź na pierwszą stronę';
243
$strings['Go to last page'] = 'Idź na ostatnią stronę';
244
$strings['Sort by descending order'] = 'Uporządkuj malejąco';
245
$strings['Sort by ascending order'] = 'Uporządkuj rosnąco';
246
$strings['Spam Quarantine'] = 'Kwarantanna spamów';
247
$strings['Message View'] = 'Podgląd wiadomości';
248
$strings['Attachment Quarantine'] = 'Kwarantanna załączników';
249
$strings['No such content type'] = 'Nierozpoznana zawartość (content type)';
250
$strings['No message was selected'] = 'Nie wybrano wiadomości...';
251
$strings['Unknown action type'] = 'Nieznany rodzaj akcji...';
252
$strings['A problem occured when trying to release the following messages'] = 'Wystąpił błąd w trakcie uwalniania wiadomości';
253
$strings['A problem occured when trying to delete the following messages'] = 'Wystąpił błąd w trakcie kasowania wiadomości';
254
$strings['Please release the following messages'] = 'Proszę uwolnić następujące wiadomości';
255
$strings['To'] = 'Do';
256
$strings['From'] = 'Od';
257
$strings['Subject'] = 'Temat';
258
$strings['Date'] = 'Data';
259
$strings['Score'] = 'Punkty';
260
$strings['Mail ID'] = 'ID wiadomości';
261
$strings['Status'] = 'Status';
262
$strings['Print'] = 'Drukuj';
263
$strings['CloseWindow'] = 'Zamknij';
264
$strings['Unknown server type'] = 'Nieznany type serwera...';
265
$strings['Showing messages'] = "Wyświetlenie wiadomości %s do %s &nbsp;&nbsp; (%s wszystkich)\r\n";
266
$strings['View this message'] = 'Zobacz wiadomość';
267
$strings['Message Unavailable'] = 'Wiadomość niedostępna';
268
$strings['My Quarantine'] = 'Moja kwarantanna';
269
$strings['Site Quarantine'] = 'Kwarantanna systemu';
270
$strings['Message Processing'] = 'Przetwarzanie wiadomości';
271
$strings['Quarantine Summary'] = 'Podsumowanie kwarantanny';
272
$strings['Site Quarantine Summary'] = 'Podsumowanie kwarantanny systemu';
273
$strings['Login'] = 'Login';
274
$strings['spam(s)'] = 'spam(ów)';
275
$strings['attachment(s)'] = 'załącznik(ów)';
276
$strings['pending release request(s)'] = 'przetwarzanie żądania(ń) uwolnienia';
277
$strings['virus(es)'] = 'wirus(ów)';
278
$strings['bad header(s)'] = 'zły(ch) nagłów-ek/ków';
279
$strings['You have to type some text'] = 'Musisz podać jakikolwiek tekst';
280
$strings['Release'] = 'Zwolnij';
281
$strings['Release/Request release'] = 'Zwolnij wiadomości oczekujące w kolejce';
282
$strings['Request release'] = 'Prośba o zwolnienie';
283
$strings['Delete'] = 'Skasuj';
284
$strings['Delete All'] = 'Skasuj wszystko';
285
$strings['Send report and go back'] = 'Wyśłanie raportu i powrót';
286
$strings['Go back'] = "Powrót";
287
$strings['Select All'] = "Wybierz wszystko";
288
$strings['Clear All'] = "Wyczyść wszystko";
289
$strings['Access Denied'] = "Dostęp zabroniony";
290
$strings['My Pending Requests'] = "My Pending Requests";
291
$strings['Site Pending Requests'] = "Site Pending Requests";
292
$strings['Cancel Request'] = "Anuluj prośbę";
293
$strings['User is not allowed to login'] = "Brak uprawnień do zalogowania dla użytkownika";
294
$strings['Authentication successful'] = "Uwierzytelnienie poprawne";
295
$strings['Authentication failed'] = "Uwierzytelnienie niepoprawne";
296
$strings['LDAP connection failed'] = "Połączenie LDAP/AD nie powiodło się";
297
$strings['Logout successful'] = "Wylogowanie poprawne";
298
$strings['IMAP Authentication: no match'] = "IMAP Authentication: no match";
299
$strings['Search for messages whose:'] = "Szukaj wiadomości, które:";
300
$strings['Content Type'] = "Content Type";
301
$strings['Clear search results'] = "Wyczyść wyniki wyszukiwania";
302
$strings['contains'] = "zawiera";
303
$strings['doesn\'t contain'] = "nie zawiera";
304
$strings['equals'] = "";
305
$strings['doesn\'t equal'] = "różny od";
306
$strings['All'] = "Wszystko";
307
$strings['Spam'] = "Spam";
308
$strings['Banned'] = "Niepoprawny załącznik";
309
$strings['Virus'] = "Wirus";
310
$strings['Viruses'] = "Viruses";
311
$strings['Bad Header'] = "Bad Header";
312
$strings['Bad Headers'] = "Bad Headers";
313
$strings['Pending Requests'] = "Pending Requests";
314
$strings['last'] = "ostatnie";
315
$strings['first'] = "pierwsze";
316
$strings['previous'] = "poprzedni";
317
$strings['There was an error executing your query'] = 'There was an error executing your query:';
318
$strings['There are no matching records.'] = 'There are no matching records.';
319
$strings['Domain'] = 'Domena';
320
$strings['Total'] = 'Wszystko';
321
$strings['X-Amavis-Alert'] = 'X-Amavis-Alert';
322
$strings['Loading Summary...'] = 'Loading Summary...';
323
$strings['Retrieving Messages...'] = 'Retrieving Messages...';
324
?>
(-)security/mailzu.new/Makefile (-8 / +9 lines)
Lines 1-21 Link Here
1
# Created by: Sahil Tandon <sahil@tandon.net>
1
# Created by: Sahil Tandon <sahil@tandon.net>
2
# $FreeBSD: head/security/mailzu/Makefile 481545 2018-10-08 15:08:13Z antoine $
2
# $FreeBSD: head/security/mailzu/Makefile 477060 2018-08-13 09:25:01Z tz $
3
3
4
PORTNAME=	mailzu
4
PORTNAME=	mailzu
5
DISTVERSION=	0.8rc3
5
DISTVERSION=	0.8rc3
6
PORTREVISION=	4
6
PORTREVISION=	5
7
CATEGORIES=	security
7
CATEGORIES=	security
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/MailZu%200.8RC3
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/MailZu%200.8RC3
9
DISTNAME=	MailZu_${DISTVERSION:S/rc/RC/}
9
DISTNAME=	MailZu_${DISTVERSION:S/rc/RC/}
10
10
11
MAINTAINER=	ports@FreeBSD.org
11
MAINTAINER=	ports@bsdserwis.com
12
COMMENT=	Simple and intuitive web interface to manage amavisd-new quarantine
12
COMMENT=	Simple and intuitive web interface to manage amavisd-new quarantine
13
13
14
LICENSE=	GPLv2
14
LICENSE=	GPLv2
15
LICENSE_FILE=	${WRKSRC}/LICENSE
15
LICENSE_FILE=	${WRKSRC}/LICENSE
16
16
17
IGNORE_WITH_PHP=	70 71 72 73
18
19
RUN_DEPENDS=	${LOCALBASE}/sbin/amavisd:security/amavisd-new \
17
RUN_DEPENDS=	${LOCALBASE}/sbin/amavisd:security/amavisd-new \
20
		${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \
18
		${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \
21
		${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR} \
19
		${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR} \
Lines 40-57 Link Here
40
IMAP_DESC=	Use IMAP auth backend
38
IMAP_DESC=	Use IMAP auth backend
41
LDAP_DESC=	Use LDAP auth backend
39
LDAP_DESC=	Use LDAP auth backend
42
40
43
MYSQL_USE=	PHP=mysql
41
MYSQL_USE=	PHP=mysqli
44
PGSQL_USE=	PHP=pgsql
42
PGSQL_USE=	PHP=pgsql
45
IMAP_USE=	PHP=imap
43
IMAP_USE=	PHP=imap
46
LDAP_USE=	PHP=ldap
44
LDAP_USE=	PHP=ldap
47
45
48
PORTDOCS=	*
46
PORTDOCS=	*
49
47
48
post-patch:
49
	${INSTALL_DATA} ${FILESDIR}/pl.*.php ${WRKSRC}/lang/
50
50
do-install:
51
do-install:
51
	@${MKDIR} ${STAGEDIR}${WWWDIR}
52
	@${MKDIR} ${STAGEDIR}${WWWDIR}
52
	${INSTALL_DATA} ${WRKSRC}/*.php* ${WRKSRC}/*.js* ${WRKSRC}/*.css* ${STAGEDIR}${WWWDIR}
53
	${INSTALL_DATA} ${WRKSRC}/*.php ${WRKSRC}/*.js ${WRKSRC}/*.css ${STAGEDIR}${WWWDIR}
53
	(cd ${WRKSRC} && ${COPYTREE_SHARE} "config contrib img lang lib templates" \
54
	(cd ${WRKSRC} && ${COPYTREE_SHARE} "config contrib img lang lib templates" \
54
		${STAGEDIR}${WWWDIR} "! -name *.orig")
55
		${STAGEDIR}${WWWDIR} "! -name '*.orig'")
55
	(cd ${WRKSRC} && ${COPYTREE_BIN} scripts ${STAGEDIR}${WWWDIR})
56
	(cd ${WRKSRC} && ${COPYTREE_BIN} scripts ${STAGEDIR}${WWWDIR})
56
	${CHMOD} 644 ${STAGEDIR}${WWWDIR}/config/config.php.sample
57
	${CHMOD} 644 ${STAGEDIR}${WWWDIR}/config/config.php.sample
57
58
(-)security/mailzu.new/pkg-plist (+2 lines)
Lines 25-30 Link Here
25
%%WWWDIR%%/lang/fr.lang.php
25
%%WWWDIR%%/lang/fr.lang.php
26
%%WWWDIR%%/lang/it.help.php
26
%%WWWDIR%%/lang/it.help.php
27
%%WWWDIR%%/lang/it.lang.php
27
%%WWWDIR%%/lang/it.lang.php
28
%%WWWDIR%%/lang/pl.help.php
29
%%WWWDIR%%/lang/pl.lang.php
28
%%WWWDIR%%/lang/pt_BR.lang.php
30
%%WWWDIR%%/lang/pt_BR.lang.php
29
%%WWWDIR%%/lib/AmavisdEngine.class.php
31
%%WWWDIR%%/lib/AmavisdEngine.class.php
30
%%WWWDIR%%/lib/Auth.class.php
32
%%WWWDIR%%/lib/Auth.class.php

Return to bug 230712