diff --git a/install/dist/conf/opensuse112.conf.php b/install/dist/conf/opensuse112.conf.php new file mode 100644 index 0000000000000000000000000000000000000000..9f590e6ad8c04b3b03592110c22baffb21cfc1c2 --- /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 c68b0c857a6c8131ef34a0988d1de04d0a8104ea..e7edc37134a631431a93e95081ff94cfcabe22d4 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 0000000000000000000000000000000000000000..da77b423aecf247618a2647aa4b2663d64651ad4 --- /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 6e9379fe7b6e6af49bd82f75edcb0e24a3a91c1a..56c453d16aa00287f02b3e1f2d37d80fceec89d7 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 5b711422f257b4eeb9b0ea998a11346aa4c4330e..729c67759d74d6ca61ebc69aae1bc17e97ee135c 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 e18ef2407e80040c1f0e7875753902c1de61f342..1e1959156483484a0437bf47c5bc81f97357e919 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 b3f3325baec53a8ac870542247fd4cf310f1e311..01281e353cb1e0aed1f6cd1e9426d40bc7399103 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 d013c34cdc4afb383de7cb6afc70933850923440..570f069e253870cf2e90400618204d7dc4ff0a4b 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 49024f3ebd262cc8929fc947e373b21d5a56fac6..254cfe5cbf4b43c81871bb50a863d71326119108 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 fb7bec1a3a60d53ee9103f0a8bb32cc280bc8797..0856467e2de63fbd276cbb80a62493149b988a61 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 a6304fe3234ff6ff70dbb5c594b6882ad8955ea0..4822f3be9a951603ac6a57db781094f8b6a5547e 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 0ef634aec762547e1e92113d3e6be1499c8b9a1a..7531451277c86665e35e6f8a0ef58eb9bf24d37c 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 048a7a81ac85deec4ae936a74515dc9f5cf2748c..0040d1d4ed9bd5f8399e2525a1857c312e3d4836 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 9396b4b46347302374a5e6db92a21faf23a4a7f8..e790a8bf0575a4ca42ee724e7bebf357c5ecb348 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 1693bb154fb875b4c1b337b075d742a8dee1a499..12159b6d1bd6f7749bf1b1505df6ff24254f97e5 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 7414208507640b93d43323597660461f86061f76..7ce7b52f93fac47caf19515ac2dec0cb2604dd79 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 5a149047d60f5cbfccea68a38ecb0c2cc50f40c5..7b137fc3c015174d9447e5212126f5626f37faf6 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 e4b8250cccb65a90804be325ff7505998431c253..ff11da53d7d71121dfd7fda27c11a0466677e5ff 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 1d79412bf6639bc54886b30d19ced2f2ae87b2e2..7b05352494ec4d3132ccf3028f58350d58fa1c8f 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 2f04f98f7ace0b3d753e78214a08f1598cc16f65..0416387299ec369d04f054959d43c46d4afd0005 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' => '',