From df7e6d07e623dd74f8f88c61dc4c3bd0770d69de Mon Sep 17 00:00:00 2001 From: tbrehm Date: Wed, 26 May 2010 16:20:16 +0000 Subject: [PATCH] Fixed several bugs (revisions 1772-1779 from stable branch). --- install/dist/conf/opensuse112.conf.php | 187 ++++++++++++++++++ install/dist/lib/opensuse.lib.php | 2 +- install/dist/lib/opensuse112.lib.php | 36 ++++ install/lib/install.lib.php | 6 +- install/tpl/mysql-virtual_domains.cf.master | 2 +- .../tpl/mysql-virtual_email2email.cf.master | 2 +- .../tpl/mysql-virtual_forwardings.cf.master | 2 +- install/tpl/mysql-virtual_mailboxes.cf.master | 2 +- install/tpl/mysql-virtual_recipient.cf.master | 2 +- .../tpl/mysql-virtual_relaydomains.cf.master | 2 +- ...mysql-virtual_relayrecipientmaps.cf.master | 2 +- install/tpl/mysql-virtual_sender.cf.master | 2 +- .../tpl/mysql-virtual_transports.cf.master | 2 +- interface/lib/classes/tform.inc.php | 2 +- interface/lib/lang/en.lng | 43 ++-- interface/web/admin/language_edit.php | 6 +- interface/web/mail/lib/lang/en_mail_user.lng | 1 + .../mail_user_autoresponder_edit.htm | 72 +++---- .../web/sites/form/web_aliasdomain.tform.php | 2 +- interface/web/sites/form/web_domain.tform.php | 2 +- .../web/sites/form/web_subdomain.tform.php | 2 +- 21 files changed, 301 insertions(+), 78 deletions(-) create mode 100644 install/dist/conf/opensuse112.conf.php create mode 100644 install/dist/lib/opensuse112.lib.php diff --git a/install/dist/conf/opensuse112.conf.php b/install/dist/conf/opensuse112.conf.php new file mode 100644 index 0000000000..9f590e6ad8 --- /dev/null +++ b/install/dist/conf/opensuse112.conf.php @@ -0,0 +1,187 @@ + \ No newline at end of file diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index c68b0c857a..e7edc37134 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -381,7 +381,7 @@ class installer_dist extends installer_base { // amavisd user config file $configfile = 'opensuse_amavisd_conf'; - if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) @copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["courier"]["config_dir"].'/amavisd.conf~'); + if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) @copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["amavis"]["config_dir"].'/amavisd.conf~'); if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/amavisd.conf~'); $content = rf("tpl/".$configfile.".master"); $content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content); diff --git a/install/dist/lib/opensuse112.lib.php b/install/dist/lib/opensuse112.lib.php new file mode 100644 index 0000000000..da77b423ae --- /dev/null +++ b/install/dist/lib/opensuse112.lib.php @@ -0,0 +1,36 @@ + \ No newline at end of file diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php index 6e9379fe7b..56c453d16a 100644 --- a/install/lib/install.lib.php +++ b/install/lib/install.lib.php @@ -113,14 +113,14 @@ function get_distname() { swriteln("Operating System: openSUSE 11.1 or compatible\n"); } elseif(stristr(file_get_contents('/etc/SuSE-release'),'11.2')) { $distname = 'openSUSE'; - $distver = '11.1'; - $distid = 'opensuse110'; + $distver = '11.2'; + $distid = 'opensuse112'; $distbaseid = 'opensuse'; swriteln("Operating System: openSUSE 11.2 or compatible\n"); } else { $distname = 'openSUSE'; $distver = 'Unknown'; - $distid = 'opensuse110'; + $distid = 'opensuse112'; $distbaseid = 'opensuse'; swriteln("Operating System: openSUSE or compatible, unknown version.\n"); } diff --git a/install/tpl/mysql-virtual_domains.cf.master b/install/tpl/mysql-virtual_domains.cf.master index 5b711422f2..729c67759d 100644 --- a/install/tpl/mysql-virtual_domains.cf.master +++ b/install/tpl/mysql-virtual_domains.cf.master @@ -4,5 +4,5 @@ dbname = {mysql_server_database} table = mail_domain select_field = domain where_field = domain -additional_conditions = and active = 'y' and server_id = {server_id} +additional_conditions = and active = 'y' hosts = {mysql_server_ip} \ No newline at end of file diff --git a/install/tpl/mysql-virtual_email2email.cf.master b/install/tpl/mysql-virtual_email2email.cf.master index e18ef2407e..1e19591564 100644 --- a/install/tpl/mysql-virtual_email2email.cf.master +++ b/install/tpl/mysql-virtual_email2email.cf.master @@ -4,5 +4,5 @@ dbname = {mysql_server_database} table = mail_user select_field = email where_field = email -additional_conditions = and postfix = 'y' and server_id = {server_id} +additional_conditions = and postfix = 'y' hosts = {mysql_server_ip} \ No newline at end of file diff --git a/install/tpl/mysql-virtual_forwardings.cf.master b/install/tpl/mysql-virtual_forwardings.cf.master index b3f3325bae..01281e353c 100644 --- a/install/tpl/mysql-virtual_forwardings.cf.master +++ b/install/tpl/mysql-virtual_forwardings.cf.master @@ -4,5 +4,5 @@ dbname = {mysql_server_database} table = mail_forwarding select_field = destination where_field = source -additional_conditions = and active = 'y' and server_id = {server_id} +additional_conditions = and active = 'y' hosts = {mysql_server_ip} \ No newline at end of file diff --git a/install/tpl/mysql-virtual_mailboxes.cf.master b/install/tpl/mysql-virtual_mailboxes.cf.master index d013c34cdc..570f069e25 100644 --- a/install/tpl/mysql-virtual_mailboxes.cf.master +++ b/install/tpl/mysql-virtual_mailboxes.cf.master @@ -4,5 +4,5 @@ dbname = {mysql_server_database} table = mail_user select_field = CONCAT(SUBSTRING_INDEX(email,'@',-1),'/',SUBSTRING_INDEX(email,'@',1),'/') where_field = email -additional_conditions = and postfix = 'y' and server_id = {server_id} +additional_conditions = and postfix = 'y' hosts = {mysql_server_ip} \ No newline at end of file diff --git a/install/tpl/mysql-virtual_recipient.cf.master b/install/tpl/mysql-virtual_recipient.cf.master index 49024f3ebd..254cfe5cbf 100644 --- a/install/tpl/mysql-virtual_recipient.cf.master +++ b/install/tpl/mysql-virtual_recipient.cf.master @@ -4,5 +4,5 @@ dbname = {mysql_server_database} table = mail_access select_field = access where_field = source -additional_conditions = and type = 'recipient' and active = 'y' and server_id = {server_id} +additional_conditions = and type = 'recipient' and active = 'y' hosts = {mysql_server_ip} \ No newline at end of file diff --git a/install/tpl/mysql-virtual_relaydomains.cf.master b/install/tpl/mysql-virtual_relaydomains.cf.master index fb7bec1a3a..0856467e2d 100644 --- a/install/tpl/mysql-virtual_relaydomains.cf.master +++ b/install/tpl/mysql-virtual_relaydomains.cf.master @@ -4,5 +4,5 @@ dbname = {mysql_server_database} table = mail_transport select_field = domain where_field = domain -additional_conditions = and active = 'y' and server_id = {server_id} +additional_conditions = and active = 'y' hosts = {mysql_server_ip} \ No newline at end of file diff --git a/install/tpl/mysql-virtual_relayrecipientmaps.cf.master b/install/tpl/mysql-virtual_relayrecipientmaps.cf.master index a6304fe323..4822f3be9a 100644 --- a/install/tpl/mysql-virtual_relayrecipientmaps.cf.master +++ b/install/tpl/mysql-virtual_relayrecipientmaps.cf.master @@ -4,5 +4,5 @@ dbname = {mysql_server_database} table = mail_relay_recipient select_field = access where_field = source -additional_conditions = and active = 'y' and server_id = {server_id} +additional_conditions = and active = 'y' hosts = {mysql_server_ip} \ No newline at end of file diff --git a/install/tpl/mysql-virtual_sender.cf.master b/install/tpl/mysql-virtual_sender.cf.master index 0ef634aec7..7531451277 100644 --- a/install/tpl/mysql-virtual_sender.cf.master +++ b/install/tpl/mysql-virtual_sender.cf.master @@ -4,5 +4,5 @@ dbname = {mysql_server_database} table = mail_access select_field = access where_field = source -additional_conditions = and type = 'sender' and active = 'y' and server_id = {server_id} +additional_conditions = and type = 'sender' and active = 'y' hosts = {mysql_server_ip} \ No newline at end of file diff --git a/install/tpl/mysql-virtual_transports.cf.master b/install/tpl/mysql-virtual_transports.cf.master index 048a7a81ac..0040d1d4ed 100644 --- a/install/tpl/mysql-virtual_transports.cf.master +++ b/install/tpl/mysql-virtual_transports.cf.master @@ -4,5 +4,5 @@ dbname = {mysql_server_database} table = mail_transport select_field = transport where_field = domain -additional_conditions = and active = 'y' and server_id = {server_id} +additional_conditions = and active = 'y' hosts = {mysql_server_ip} \ No newline at end of file diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php index 9396b4b463..e790a8bf05 100644 --- a/interface/lib/classes/tform.inc.php +++ b/interface/lib/classes/tform.inc.php @@ -733,7 +733,7 @@ class tform { } break; case 'ISEMAIL': - if(!preg_match("/^\w+[\w.-]*\w{0,}@\w+[\w.-]*\w+\.[a-z]{2,10}$/i", $field_value)) { + if(!preg_match("/^\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\w+\.[a-z]{2,10}$/i", $field_value)) { $errmsg = $validator['errmsg']; if(isset($this->wordbook[$errmsg])) { $this->errorMessage .= $this->wordbook[$errmsg]."
\r\n"; diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng index 1693bb154f..12159b6d1b 100644 --- a/interface/lib/lang/en.lng +++ b/interface/lib/lang/en.lng @@ -1,26 +1,25 @@ $val) { $val = stripslashes($val); - $val = str_replace("'",'',$val); - $val = str_replace('"','',$val); - $file_content .= '$wb['."'$key'".'] = '."'$val';\n"; + $val = str_replace('"','\"',$val); + $val = str_replace('$','',$val); + $file_content .= '$wb['."'$key'".'] = "'.$val.'";'."\n"; $msg = 'File saved.'; } $file_content .= "?>\n"; diff --git a/interface/web/mail/lib/lang/en_mail_user.lng b/interface/web/mail/lib/lang/en_mail_user.lng index 7414208507..7ce7b52f93 100644 --- a/interface/web/mail/lib/lang/en_mail_user.lng +++ b/interface/web/mail/lib/lang/en_mail_user.lng @@ -36,4 +36,5 @@ $wb["quota_error_value"] = 'Invalid quota value. Allowed values are: 0 for unlim $wb["move_junk_txt"] = 'Move Spam Emails to Junk directory'; $wb["name_txt"] = 'Realname'; $wb["name_optional_txt"] = '(Optional)'; +$wb['autoresponder_active'] = 'Enable the autoresponder'; ?> diff --git a/interface/web/mail/templates/mail_user_autoresponder_edit.htm b/interface/web/mail/templates/mail_user_autoresponder_edit.htm index 5a149047d6..7b137fc3c0 100644 --- a/interface/web/mail/templates/mail_user_autoresponder_edit.htm +++ b/interface/web/mail/templates/mail_user_autoresponder_edit.htm @@ -1,37 +1,37 @@ -

-

- -
- -
-
-
- - -
-
-

{tmpl_var name='autoresponder_txt'}

-
-
-  {tmpl_var format='strtoupper' name='page_and_txt'}
-
- -

- - {tmpl_var name='autoresponder_start_date'} now

- - - {tmpl_var name='autoresponder_end_date'} -
-
-
- - - -
- - -
-
- +

+

+ +
+ +
+
+
+ + +
+
+

{tmpl_var name='autoresponder_txt'}

+
+
+  {tmpl_var name='autoresponder_active'}
+
+ +

+ + {tmpl_var name='autoresponder_start_date'} now

+ + + {tmpl_var name='autoresponder_end_date'} +
+
+
+ + + +
+ + +
+
+
\ No newline at end of file diff --git a/interface/web/sites/form/web_aliasdomain.tform.php b/interface/web/sites/form/web_aliasdomain.tform.php index e4b8250ccc..ff11da53d7 100644 --- a/interface/web/sites/form/web_aliasdomain.tform.php +++ b/interface/web/sites/form/web_aliasdomain.tform.php @@ -112,7 +112,7 @@ $form["tabs"]['domain'] = array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', 'validators' => array ( 0 => array ( 'type' => 'REGEX', - 'regex' => '@^(([.]{0})|(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@', + 'regex' => '@^(([.]{0})|(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@', 'errmsg'=> 'redirect_error_regex'), ), 'default' => '', diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php index 1d79412bf6..7b05352494 100644 --- a/interface/web/sites/form/web_domain.tform.php +++ b/interface/web/sites/form/web_domain.tform.php @@ -224,7 +224,7 @@ $form["tabs"]['redirect'] = array ( 'redirect_path' => array ( 'datatype' => 'VARCHAR', 'validators' => array ( 0 => array ( 'type' => 'REGEX', - 'regex' => '@^(([.]{0})|(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@', + 'regex' => '@^(([.]{0})|(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@', 'errmsg'=> 'redirect_error_regex'), ), 'formtype' => 'TEXT', diff --git a/interface/web/sites/form/web_subdomain.tform.php b/interface/web/sites/form/web_subdomain.tform.php index 2f04f98f7a..0416387299 100644 --- a/interface/web/sites/form/web_subdomain.tform.php +++ b/interface/web/sites/form/web_subdomain.tform.php @@ -112,7 +112,7 @@ $form["tabs"]['domain'] = array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', 'validators' => array ( 0 => array ( 'type' => 'REGEX', - 'regex' => '@^(([.]{0})|(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@', + 'regex' => '@^(([.]{0})|(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@', 'errmsg'=> 'redirect_error_regex'), ), 'default' => '', -- GitLab