tbrehm
2012-02-16 86bcf0ee54124109d0beea83f2d01a6588c096c9
Fixed: FS#2065 - Web Aliasdomain Error Invalid redirect path...
5 files modified
1 files deleted
78 ■■■■ changed files
interface/lib/classes/listform.inc.php 6 ●●●● patch | view | raw | blame | history
interface/web/sites/form/web_aliasdomain.tform.php 2 ●●● patch | view | raw | blame | history
interface/web/sites/form/web_domain.tform.php 12 ●●●● patch | view | raw | blame | history
interface/web/sites/form/web_subdomain.tform.php 2 ●●● patch | view | raw | blame | history
remoting_client/examples/sites_database_add.php 8 ●●●● patch | view | raw | blame | history
remoting_client/examples/soap-database-add.php 48 ●●●●● patch | view | raw | blame | history
interface/lib/classes/listform.inc.php
@@ -295,7 +295,7 @@
                    case 'DATETSTAMP':
                        if ($record[$key] > 0) {
                            // is value int?
                            if (preg_match("/^[0-9]+[.]?[0-9]*$/", $record[$key], $p)) {
                            if (preg_match("/^[0-9]+[\.]?[0-9]*$/", $record[$key], $p)) {
                                $record[$key] = date($this->lng('conf_format_dateshort'), $record[$key]);
                            } else {
                                $record[$key] = date($this->lng('conf_format_dateshort'), strtotime($record[$key]));
@@ -305,7 +305,7 @@
                    case 'DATE':
                        if ($record[$key] > 0) {
                            // is value int?
                            if (preg_match("/^[0-9]+[.]?[0-9]*$/", $record[$key], $p)) {
                            if (preg_match("/^[0-9]+[\.]?[0-9]*$/", $record[$key], $p)) {
                                $record[$key] = date($this->lng('conf_format_dateshort'), $record[$key]);
                            } else {
                                $record[$key] = date($this->lng('conf_format_dateshort'), strtotime($record[$key]));
@@ -316,7 +316,7 @@
                    case 'DATETIME':
                        if ($record[$key] > 0) {
                            // is value int?
                            if (preg_match("/^[0-9]+[.]?[0-9]*$/", $record[$key], $p)) {
                            if (preg_match("/^[0-9]+[\.]?[0-9]*$/", $record[$key], $p)) {
                                $record[$key] = date($this->lng('conf_format_datetime'), $record[$key]);
                            } else {
                                $record[$key] = date($this->lng('conf_format_datetime'), strtotime($record[$key]));
interface/web/sites/form/web_aliasdomain.tform.php
@@ -112,7 +112,7 @@
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'validators'    => array (     0 => array (    'type'    => 'REGEX',
                                                        'regex' => '@^(([.]{0})|(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@',
                                                        'regex' => '@^(([\.]{0})|(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@',
                                                        'errmsg'=> 'redirect_error_regex'),
                                    ),
            'default'    => '',
interface/web/sites/form/web_domain.tform.php
@@ -253,7 +253,7 @@
        'redirect_path' => array (
            'datatype'    => 'VARCHAR',
            'validators'    => array (     0 => array (    'type'    => 'REGEX',
                                                        'regex' => '@^(([.]{0})|(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@',
                                                        'regex' => '@^(([\.]{0})|(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@',
                                                        'errmsg'=> 'redirect_error_regex'),
                                    ),
            'formtype'    => 'TEXT',
@@ -287,7 +287,7 @@
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'validators'    => array (     0 => array (    'type'    => 'REGEX',
                                                        'regex' => '/^(([.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
                                                        'regex' => '/^(([\.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
                                                        'errmsg'=> 'ssl_state_error_regex'),
                                    ),
            'default'    => '',
@@ -299,7 +299,7 @@
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'validators'    => array (     0 => array (    'type'    => 'REGEX',
                                                        'regex' => '/^(([.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
                                                        'regex' => '/^(([\.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
                                                        'errmsg'=> 'ssl_locality_error_regex'),
                                    ),
            'default'    => '',
@@ -311,7 +311,7 @@
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'validators'    => array (     0 => array (    'type'    => 'REGEX',
                                                        'regex' => '/^(([.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
                                                        'regex' => '/^(([\.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
                                                        'errmsg'=> 'ssl_organisation_error_regex'),
                                    ),
            'default'    => '',
@@ -323,7 +323,7 @@
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'validators'    => array (     0 => array (    'type'    => 'REGEX',
                                                        'regex' => '/^(([.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
                                                        'regex' => '/^(([\.]{0})|([a-zA-Z0-9\ \.\-\_\,]{1,255}))$/',
                                                        'errmsg'=> 'ssl_organistaion_unit_error_regex'),
                                    ),
            'default'    => '',
@@ -336,7 +336,7 @@
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'validators'    => array (     0 => array (    'type'    => 'REGEX',
                                                        'regex' => '/^(([.]{0})|([A-Z]{2,2}))$/',
                                                        'regex' => '/^(([\.]{0})|([A-Z]{2,2}))$/',
                                                        'errmsg'=> 'ssl_country_error_regex'),
                                    ),
            'default'    => '',
interface/web/sites/form/web_subdomain.tform.php
@@ -112,7 +112,7 @@
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'validators'    => array (     0 => array (    'type'    => 'REGEX',
                                                        'regex' => '@^(([.]{0})|(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@',
                                                        'regex' => '@^(([\.]{0})|(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@',
                                                        'errmsg'=> 'redirect_error_regex'),
                                    ),
            'default'    => '',
remoting_client/examples/sites_database_add.php
@@ -19,11 +19,11 @@
    $params = array(
            'server_id' => 1,
            'type' => 'mysql',
            'database_name' => 'db_name1',
            'database_user' => 'db_name1',
            'database_password' => 'db_name1',
            'database_name' => 'db_name2',
            'database_user' => 'db_name2',
            'database_password' => 'db_name2',
            'database_charset' => 'UTF8',
            'remote_access' => 'n',
            'remote_access' => 'y',
            'remote_ips' => '',
            'active' => 'y'
            );
remoting_client/examples/soap-database-add.php
File was deleted