Changeset 1233

Timestamp:

06/19/08 19:01:50 (4 months ago)

Author:

rats

Message:

reverted: You can't create a mail alias account if the user part already exists as a subdomain mail account - This patch was no good php coding style

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/gui/admin/email_setup.php (modified) (1 diff)
• trunk/gui/client/add_mail_acc.php (modified) (3 diffs)
• trunk/gui/reseller/email_setup.php (modified) (1 diff)
• trunk/language-files/po/ca_ES.po (modified) (65 diffs)

trunk/CHANGELOG

@@ -1 +1 @@
-ispCP ω 1.0.0 Changelog
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-2008-06-19 Jochen Manz 
-        - GUI: 
-                * Fixed #1355: You can't create a mail alias account if the user part already exists as a subdomain mail account 
-
-2008-06-17 Benedikt Heintel

trunk/gui/admin/email_setup.php

@@ -88 +88 @@
-                        'TR_SENDER_NAME' => tr('Senders name'),
-                        'TR_APPLY_CHANGES' => tr('Apply changes'),
-Benutzertyp
+User type
-                        'TR_BASE_SERVER_VHOST' => tr('URL to this admin panel'),
-                        'SUBJECT_VALUE' => $data['subject'],

trunk/gui/client/add_mail_acc.php

@@ -36 +36 @@
-$tpl->define_dynamic('js_to_all_domain', 'page');               //JavaScript has to be generated, too
-$tpl->define_dynamic('js_not_domain', 'page');                  //JavaScript has to be generated, too
-
-
-// page functions.
@@ -310 +309 @@
-                        $mail_forward = implode(',', $mail_accs);
-                }
-
-
-
+
+
-
-                $check_acc_query = <<<SQL_QUERY
@@ -325 +323 @@
-                                AND
-                                `sub_id` = ?
-                                AND
-                                LEFT (`mail_type`, LOCATE('_', `mail_type`)-1) = ?
-SQL_QUERY;
-
-, $t_
+
-    }
-

trunk/gui/reseller/email_setup.php

@@ -79 +79 @@
-                'TR_SENDER_NAME' => tr('Senders name'),
-                'TR_APPLY_CHANGES' => tr('Apply changes'),
-Benutzertyp
+User type
-                'TR_BASE_SERVER_VHOST' => tr('URL to this admin panel'),
-                'SUBJECT_VALUE' => $data['subject'],

trunk/language-files/po/ca_ES.po

@@ -2 +2 @@
-# Copyright (C) YEAR ispCP Team
-# This file is distributed under the same license as the PACKAGE package.
-
+ 
-# Joan Juvanteny <jjuvan@grn.cat>, 2008.
-# David Bancells <dbancells@grn.es>, 2008.
-# Esteve Camós <ecamos@grn.cat>, 2008.
-msgid ""
-msgstr 
-
+
+msgstr 
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-15 15:08+0200\n"
@@ -19 +19 @@
-"X-Generator: KBabel 1.11.4\n"
-
- 
+
-msgid "encoding"
-msgstr ""
@@ -86 +86 @@
-"(To avoid abuse, we ask you to write the combination of letters on the above "
-"picture into the field \"Security code\")"
-
-
+
-"sobre la imatge dins del camp \"Codi de seguretat\""
-
@@ -124 +123 @@
-
-msgid "Core data"
-
+Dades principals
-
-msgid "Repeat password"
@@ -568 +567 @@
-
-msgid "Show in"
-
+Mostrar a
-
-msgid "Administrator level"
@@ -676 +675 @@
-
-msgid "Feature"
-
+Característica
-
-msgid "Used"
@@ -807 +806 @@
-msgid ""
-"User does not exist or you do not have permission to access this interface!"
-
-
+
-
-msgid "SQL databases limit is <i>disabled</i>!"
@@ -861 +859 @@
-msgid ""
-"Specified number is smaller than <em>%s</em> records, present on the system!"
-
-
+
-"sistema!"
-
@@ -879 +876 @@
-#, php-format
-msgid "You are exceeding reseller limits for the <em>%s</em> service!"
-
-
+
-
-msgid "ispCP - Admin/Manage users/Edit Reseller"
@@ -891 +887 @@
-msgid ""
-"Inconsistency between current_als_cnt and actual alias count: %1$d != %2$d"
-
+Inconsistència entre el nombre d'àlies registrats i els reals (%1$d != %2$d)
-
-msgid "Aliases"
@@ -899 +895 @@
-msgid ""
-"Inconsistency between current_ftp_cnt and actual ftp count: %1$d != %2$d"
-
+Inconsistència entre el nombre de comptes FTP registrats i reals (%1$d != %2$d)
-
-msgid "SQL Databases"
@@ -920 +916 @@
-"This reseller has already assigned more/higher <b>%s</b> accounts/limits "
-"than the new limit you entered."
-
-
+
-"el nou límit que heu introduït."
-
@@ -931 +926 @@
-"This reseller's customers are using/have more/higher <b>%s</b> accounts/"
-"limits than the new limit you entered."
-
-
+
-"comptes/límits que el nou límit que heu introduït."
-
@@ -939 +933 @@
-"This reseller has customer(s) with unlimited rights for the <b>%s</b> "
-"service!<br>"
-
-
+
-"s</b>!<br>"
-
-msgid ""
-"If you want to limit the reseller, you must first limit its customers!<br>"
-
-
+
-
-#, php-format
@@ -974 +966 @@
-
-msgid "Undefined reference to data!"
-
+Referència a dades inexistents!
-
-msgid "Incorrect price. Example: 9.99"
@@ -1019 +1011 @@
-
-msgid "Benutzertyp (admin, reseller, user)"
-
+Tipus d'usuari (admin, reseller, usuari)
-
-msgid "URL to this admin panel"
@@ -1071 +1063 @@
-
-msgid "Couldn't check for updates! Website not reachable."
-
-
+
-
-msgid "New ispCP update is now available"
@@ -1169 +1160 @@
-
-msgid "Set status to \"change\""
-
+Marcar per actualitzar
-
-#, php-format
@@ -1186 +1177 @@
-
-msgid "Get it at"
-
+Obtén-la
-
-msgid "ispCP updates"
@@ -1331 +1322 @@
-"You cannot move <b>%1$s</b> in a destination reseller,<br>which has limits "
-"for the <b>%2$s</b> service!"
-
-
+
-"<b>%2$s</b>!"
-
@@ -1339 +1329 @@
-"<b>%1$s</b> is exceeding limits for a <b>%2$s</b><br>service in destination "
-"reseller!<br>"
-
-
+
-"distribuïdor!<br>"
-
@@ -1350 +1339 @@
-"<b>%s</b> has IP address that cannot be managed from the destination "
-"reseller !<br>This user cannot be moved!"
-
-
+
-"destí!<br> Aquest usuari no es pot moure!"
-
@@ -1409 +1397 @@
-
-msgid "This user has a domain!<br>To delete the user first delete the domain!"
-
-
+
-"el domini!"
-
@@ -1558 +1545 @@
-
-msgid "ispCP Admin / System Tools / Anti-Rootkits Tools Log Checker"
-
-
+
-"Rootkits"
-
@@ -1746 +1732 @@
-
-msgid "Notices, Warnings and Errors"
-
+Notificacions, Alertes i Errors
-
-msgid "Warnings and Errors"
-
+Alertes i Errors
-
-#, fuzzy
@@ -1804 +1790 @@
-
-msgid "To"
-
+A
-
-msgid "Priority"
@@ -1813 +1799 @@
-
-msgid "Delete all"
-
+Esborrar-los tots
-
-msgid "Open tickets"
@@ -2060 +2046 @@
-
-msgid "Mailformat of an address in your forward list is incorrect!"
-
-
+
-"incorrecte!"
-
@@ -2080 +2065 @@
-msgstr "Si us plau introduiu un nom pel compte de correu!"
-
-
+
+
-msgid "Password data is shorter than %s signs or includes not permitted signs!"
-msgstr "La contrasenya inclou caràcters no permesos!"
@@ -2217 +2203 @@
-msgid ""
-"Click the Restore button and the system will restore the last daily backup"
-
-
+
-
-msgid "Restore"
@@ -2349 +2334 @@
-"Domain alias you are trying to remove has email accounts !<br>First remove "
-"them!"
-
-
+
-"Elimineu-los primer!"
-
-msgid ""
-"Domain alias you are trying to remove has FTP accounts!<br>First remove them!"
-
-
+
-"los primer!"
-
@@ -2376 +2359 @@
-msgid ""
-"Subdomain you are trying to remove has email accounts !<br>First remove them!"
-
-
+
-"elimineu-les!"
-
-msgid "Subdomain scheduled for deletion!"
-
+Subdomini programat per eliminiació!
-
-msgid "Mail account scheduled for modification!"
@@ -2402 +2384 @@
-
-msgid "Sum"
-
+Suma
-
-msgid "ispCP - Manage Domain Alias/Edit Alias"
@@ -2492 +2474 @@
-
-msgid "System error - custom error page was NOT updated!"
-
-
+
-
-msgid "Error 401 (unauthorised)"
@@ -2517 +2498 @@
-
-msgid "Cannot open directory !<br />Please contact your administrator !"
-
-
+
-"administrador!"
-
@@ -2651 +2631 @@
-
-msgid "Protected area status should be OK if you want to delete it!"
-
+L'estat de l'àrea protegida hauria de ser OK abans d'intentar eliminar-la!
-
-msgid "Protected area deleted successfully!"
@@ -2727 +2707 @@
-
-msgid "User auth"
-
+Autentificació per usuari
-
-msgid "Group auth"
-
+Autentificació per grup
-
-msgid "Area name"
@@ -2792 +2772 @@
-
-msgid "SQL-user not found! Maybe it was deleted by another user!"
-
-
+
-
-msgid "User name too long!"
@@ -2927 +2906 @@
-
-msgid "Your request for hosting pack update was added successfully"
-
-
+
-
-msgid "[ispCP OrderPanel] - You have an update order"
@@ -2938 +2916 @@
-"\n"
-"Please login into your ispCP control panel for more details"
-
-
+
-"\n"
-"\n"
@@ -2945 +2922 @@
-
-msgid "Your request for hosting pack update was removed successfully"
-
-
+
-"correctament"
-
@@ -3105 +3081 @@
-"\n"
-"You have a new ticket to read"
-
-
+
-"\n"
-"Teniu un nou tiquet per llegir"
@@ -3179 +3154 @@
-msgstr "Tipus desconegut"
-
-
+
+
-msgid "Database update %s failed"
-msgstr "Actualitzacions de la base de dades"
@@ -3205 +3181 @@
-"The ispCP Team.\n"
-"\n"
-
-
+
-"\n"
-"Benvolgut {NAME}!\n"
@@ -3240 +3215 @@
-"The ispCP Team\n"
-"\n"
-
-
+
-"\n"
-"Benvolgut {NAME}!\n"
@@ -3267 +3241 @@
-"The ispCP Team\n"
-"\n"
-
-
+
-"\n"
-"Benvolgut {NAME}!\n"
@@ -3295 +3268 @@
-"The ispCP Team\n"
-"\n"
-
-
+
-"\n"
-"Apreciat {NAME},\n"
@@ -3324 +3296 @@
-"The ispCP Team\n"
-"\n"
-
-
+
-"\n"
-"Apreciat {RESELLER},\n"
@@ -3345 +3316 @@
-"We are sorry, but the system is currently under maintenance.\n"
-"Please try again later."
-
-
+
-"Si us plau, intenteu-ho més tard."
-
@@ -3361 +3331 @@
-
-msgid "System is currently under maintenance! Only administrators can login."
-
-
+
-"entrar"
-
-msgid "User already logged or session sharing problem! Aborting..."
-
-
+
-
-#, php-format
@@ -3427 +3395 @@
-"You have a subdomains limit!<br>You cannot add an user with unlimited "
-"subdomains!"
-
-
+
-"il·limitats!"
-
@@ -3436 +3403 @@
-msgid ""
-"You have an aliases limit!<br>You cannot add an user with unlimited aliases!"
-
-
+
-
-msgid "You Are Exceeding Your Alias Limit!"
@@ -3445 +3411 @@
-"You have a mail accounts limit!<br>You cannot add an user with unlimited "
-"mail accounts!"
-
-
+
-"de correu il·limitats!"
-
@@ -3455 +3420 @@
-"You have a FTP accounts limit!<br>You cannot add an user with unlimited FTP "
-"accounts!"
-
-
+
-"il·limitats!"
-
@@ -3465 +3429 @@
-"You have a SQL databases limit!<br>You cannot add an user with unlimited SQL "
-"databases!"
-
-
+
-"de dades SQL il·limitades!"
-
@@ -3475 +3438 @@
-"You have an SQL users limit!<br>You cannot add an user with unlimited SQL "
-"users!"
-
-
+
-"il·limitats!"
-
@@ -3482 +3444 @@
-"You have disabled SQL databases for this user!<br>You cannot have SQL users "
-"here!"
-
-
+
-"usuaris SQL aquí!"
-
@@ -3491 +3452 @@
-msgid ""
-"You have a traffic limit!<br>You cannot add an user with unlimited traffic!"
-
-
+
-"il·limitat!"
-
-msgid "You have a disk limit!<br>You cannot add an user with unlimited disk!"
-
-
+
-
-msgid "You have a new order"
@@ -3510 +3469 @@
-"Please login into your ispCP control panel for more details.\n"
-"\n"
-
-
+
-"\n"
-"Estimat {RESELLER},\n"
@@ -3547 +3505 @@
-
-msgid "Your Chart"
-
+La seva taula
-
-msgid "Costs"
@@ -3556 +3514 @@
-
-msgid "Check Out"
-
+Procedir al pagament
-
-msgid ""
-"<b>Thank You for purchasing</b><br>You will receive an email with more "
-"details and information"
-
-
+
-"informació"
-
@@ -3620 +3577 @@
-
-msgid "Hosting plan values exceed reseller maximum values!"
-
-
+
-
-msgid "ispCP - Reseller/Change Password"
@@ -3640 +3596 @@
-msgid ""
-"Domain you are trying to remove has email accounts !<br> first remove them !"
-
-
+
-"elimineu-los!"
-
-msgid ""
-"Domain you are trying to remove has FTP accounts !<br> first remove them !"
-
-
+
-"les!"
-
-msgid ""
-"Domain you are trying to remove has domain alias!<br> first remove them !"
-
-
+
-
-msgid ""
-"Domain you are trying to remove has subdomains accounts !<br> first remove "
-"them !"
-
-
+
-"los!"
-
@@ -3862 +3814 @@
-
-msgid "You have no hosting plans. Please contact your system administrator."
-
-
+
-"del sistema"
-
@@ -3916 +3867 @@
-msgid ""
-"This user has domain record !<br>First remove the domain from the system!"
-
-
+
-"sistema!"
-