Development

Navigation

← Previous Changeset
Next Changeset →

Changeset 1239

Timestamp:

06/23/08 12:35:44 (4 months ago)

Author:

rats

Message:

* Fixed: Missing icons
* Fixed: Message shown on same page on "forward error"

Files:

trunk/CHANGELOG (modified) (1 diff)
trunk/gui/client/edit_mail_acc.php (modified) (3 diffs)
trunk/gui/themes/omega_original/admin/language.tpl (modified) (1 diff)
trunk/gui/themes/omega_original/admin/lostpassword.tpl (modified) (1 diff)
trunk/gui/themes/omega_original/client/add_alias.tpl (modified) (1 diff)
trunk/gui/themes/omega_original/client/add_ftp_acc.tpl (modified) (1 diff)
trunk/gui/themes/omega_original/client/add_mail_acc.tpl (modified) (1 diff)
trunk/gui/themes/omega_original/client/add_sql_database.tpl (modified) (1 diff)
trunk/gui/themes/omega_original/client/add_subdomain.tpl (modified) (1 diff)
trunk/gui/themes/omega_original/client/backup.tpl (modified) (1 diff)
trunk/gui/themes/omega_original/client/catchall.tpl (modified) (1 diff)
trunk/gui/themes/omega_original/client/change_password.tpl (modified) (1 diff)
trunk/gui/themes/omega_original/client/change_personal.tpl (modified) (1 diff)
trunk/gui/themes/omega_original/client/create_catchall.tpl (modified) (1 diff)
trunk/gui/themes/omega_original/client/cronjobs_add.tpl (modified) (1 diff)
trunk/gui/themes/omega_original/client/cronjobs_edit.tpl (modified) (1 diff)
trunk/gui/themes/omega_original/client/cronjobs_overview.tpl (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/CHANGELOG

r1238	r1239
3	3
4	4	2008-06-23 Benedikt Heintel
	5	- RELEASE ispCP ω Omega 1.0.0 RC5a (GUI Update)
	6	- GUI:
	7	* Fixed: Missing icons
	8	* Fixed: Message shown on same page on "forward error"
5	9	- DISTS:
6	10	* Fixed #1362: (Ubuntu) User creation fails

trunk/gui/client/edit_mail_acc.php

r1236	r1239
168	168	if (preg_match('/update_forward/', $_POST['uaction']) == 1 \|\| isset($_POST['mail_forward'])) {
169	169	// The user only wants to update the forward list, not the password
170		if ($_POST['pass'] === '' \|\| $_POST['pass_rep'] === '') {
	170	if ($_POST['pass'] === '' && $_POST['pass_rep'] === '') {
171	171	return true;
172	172	}
…	…
184	184	set_page_message(tr('Entered passwords differ!'));
185	185	return false;
186		} else if (preg_match("/[`\x~~B4'\"\\\|<>^\x00-\x1f~~]/i", $pass)) { // Not permitted chars
	186	} else if (preg_match("/[`\xb4'\"\\\\\x01-\x1f\015\012\|<>^]/i", $pass)) { // Not permitted chars
187	187	set_page_message(tr('Password data includes not valid signs!'));
188	188	return false;
…	…
303	303
304	304	edit_mail_account($tpl, $sql);
305		$ok = update_email_pass($sql);
306		$ok2 = update_email_forward($tpl, $sql);
307
308		if ($ok && $ok2) {
	305
	306	if (update_email_pass($sql) && update_email_forward($tpl, $sql)) {
309	307	set_page_message(tr("Mail were updated successfully!"));
310		}
311		~~if ($ok \|\| $ok2) {~~
312	308	send_request();
313	309	header("Location: email_accounts.php");

trunk/gui/themes/omega_original/admin/language.tpl

r1235	r1239
13	13	<table width="100%" border="0" cellspacing="0" cellpadding="0">
14	14	<tr>
15		<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/~~" width="22" height="22~~" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
	15	<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="16" height="16" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
16	16	</tr>
17	17	</table>

trunk/gui/themes/omega_original/admin/lostpassword.tpl

r1235	r1239
12	12	<!-- BDP: logged_from --><table width="100%" border="0" cellspacing="0" cellpadding="0">
13	13	<tr>
14		<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/~~" width="22" height="22~~" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
	14	<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="16" height="16" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
15	15	</tr>
16	16	</table>

trunk/gui/themes/omega_original/client/add_alias.tpl

r1235	r1239
42	42	<!-- BDP: logged_from --><table width="100%" border="0" cellspacing="0" cellpadding="0">
43	43	<tr>
44		<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/~~" width="22" height="22~~" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
	44	<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="16" height="16" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
45	45	</tr>
46	46	</table>

trunk/gui/themes/omega_original/client/add_ftp_acc.tpl

r1235	r1239
124	124	<!-- BDP: logged_from --><table width="100%" border="0" cellspacing="0" cellpadding="0">
125	125	<tr>
126		<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/~~" width="22" height="22~~" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
	126	<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="16" height="16" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
127	127	</tr>
128	128	</table>

trunk/gui/themes/omega_original/client/add_mail_acc.tpl

r1235	r1239
136	136	<table width="100%" border="0" cellspacing="0" cellpadding="0">
137	137	<tr>
138		<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/~~" width="22" height="22~~" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
	138	<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="16" height="16" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
139	139	</tr>
140	140	</table>

trunk/gui/themes/omega_original/client/add_sql_database.tpl

r1235	r1239
21	21	<!-- BDP: logged_from --><table width="100%" border="0" cellspacing="0" cellpadding="0">
22	22	<tr>
23		<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/~~" width="22" height="22~~" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
	23	<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="16" height="16" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
24	24	</tr>
25	25	</table>

trunk/gui/themes/omega_original/client/add_subdomain.tpl

r1235	r1239
22	22	<!-- BDP: logged_from --><table width="100%" border="0" cellspacing="0" cellpadding="0">
23	23	<tr>
24		<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/~~" width="22" height="22~~" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
	24	<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="16" height="16" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
25	25	</tr>
26	26	</table>

trunk/gui/themes/omega_original/client/backup.tpl

r1235	r1239
12	12	<!-- BDP: logged_from --><table width="100%" border="0" cellspacing="0" cellpadding="0">
13	13	<tr>
14		<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/~~" width="22" height="22~~" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
	14	<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="16" height="16" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
15	15	</tr>
16	16	</table>

trunk/gui/themes/omega_original/client/catchall.tpl

r1235	r1239
27	27	<!-- BDP: logged_from --><table width="100%" border="0" cellspacing="0" cellpadding="0">
28	28	<tr>
29		<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/~~" width="22" height="22~~" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
	29	<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="16" height="16" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
30	30	</tr>
31	31	</table>

trunk/gui/themes/omega_original/client/change_password.tpl

r1235	r1239
12	12	<!-- BDP: logged_from --><table width="100%" border="0" cellspacing="0" cellpadding="0">
13	13	<tr>
14		<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/~~" width="22" height="22~~" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
	14	<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="16" height="16" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
15	15	</tr>
16	16	</table>

trunk/gui/themes/omega_original/client/change_personal.tpl

r1235	r1239
12	12	<!-- BDP: logged_from --><table width="100%" border="0" cellspacing="0" cellpadding="0">
13	13	<tr>
14		<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/~~" width="22" height="22~~" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
	14	<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="16" height="16" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
15	15	</tr>
16	16	</table>

trunk/gui/themes/omega_original/client/create_catchall.tpl

r1235	r1239
53	53	<!-- BDP: logged_from --><table width="100%" border="0" cellspacing="0" cellpadding="0">
54	54	<tr>
55		<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/~~" width="22" height="22~~" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
	55	<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="16" height="16" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
56	56	</tr>
57	57	</table>

trunk/gui/themes/omega_original/client/cronjobs_add.tpl

r1235	r1239
12	12	<!-- BDP: logged_from --><table width="100%" border="0" cellspacing="0" cellpadding="0">
13	13	<tr>
14		<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/~~" width="22" height="22~~" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
	14	<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="16" height="16" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
15	15	</tr>
16	16	</table>

trunk/gui/themes/omega_original/client/cronjobs_edit.tpl

r1235	r1239
12	12	<!-- BDP: logged_from --><table width="100%" border="0" cellspacing="0" cellpadding="0">
13	13	<tr>
14		<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/~~" width="22" height="22~~" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
	14	<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="16" height="16" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
15	15	</tr>
16	16	</table>

trunk/gui/themes/omega_original/client/cronjobs_overview.tpl

r1235	r1239
21	21	<!-- BDP: logged_from --><table width="100%" border="0" cellspacing="0" cellpadding="0">
22	22	<tr>
23		<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/~~" width="22" height="22~~" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
	23	<td height="20" nowrap="nowrap" class="backButton">   <a href="change_user_interface.php?action=go_back"><img src="{THEME_COLOR_PATH}/images/icons/close_interface.png" width="16" height="16" border="0" align="absmiddle"></a> {YOU_ARE_LOGGED_AS}</td>
24	24	</tr>
25	25	</table>

Development

Navigation

Changeset 1239

Legend:

Download in other formats: