Dominik Müller
2014-01-19 33ff5ab0760d15eba6c7773d559bfa3ab018c9a1
check aliasdomains correctly
removed unnecessary bak-files
10 files deleted
1 files modified
3150 ■■■■■ changed files
interface/web/dashboard/ajax_get_json.php.bak 238 ●●●●● patch | view | raw | blame | history
interface/web/dashboard/dashlets/limits.php.bak 177 ●●●●● patch | view | raw | blame | history
interface/web/sites/aps_install_package.php.bak 211 ●●●●● patch | view | raw | blame | history
interface/web/sites/form/web_folder.tform.php.bak 110 ●●●●● patch | view | raw | blame | history
interface/web/sites/list/web_folder.list.php.bak 102 ●●●●● patch | view | raw | blame | history
interface/web/sites/templates/web_sites_stats_list.htm.bak 63 ●●●●● patch | view | raw | blame | history
interface/web/sites/web_aliasdomain_edit.php.bak 191 ●●●●● patch | view | raw | blame | history
interface/web/sites/web_domain_edit.php.bak 1114 ●●●●● patch | view | raw | blame | history
interface/web/sites/web_sites_stats.php.bak 188 ●●●●● patch | view | raw | blame | history
interface/web/sites/web_vhost_aliasdomain_edit.php 7 ●●●● patch | view | raw | blame | history
server/lib/classes/aps_installer.inc.php.bak 749 ●●●●● patch | view | raw | blame | history
interface/web/dashboard/ajax_get_json.php.bak
File was deleted
interface/web/dashboard/dashlets/limits.php.bak
File was deleted
interface/web/sites/aps_install_package.php.bak
File was deleted
interface/web/sites/form/web_folder.tform.php.bak
File was deleted
interface/web/sites/list/web_folder.list.php.bak
File was deleted
interface/web/sites/templates/web_sites_stats_list.htm.bak
File was deleted
interface/web/sites/web_aliasdomain_edit.php.bak
File was deleted
interface/web/sites/web_domain_edit.php.bak
File was deleted
interface/web/sites/web_sites_stats.php.bak
File was deleted
interface/web/sites/web_vhost_aliasdomain_edit.php
@@ -389,17 +389,14 @@
            $app->uses('ini_parser,getconf');
            $settings = $app->getconf->get_global_config('domains');
            if ($settings['use_domain_module'] == 'y') {
                $domain_check = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['sel_domain']);
                $domain_check = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['domain']);
                if(!$domain_check) {
                    // invalid domain selected
                    $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."<br />";
                } else {
                    $this->dataRecord['domain'] = $this->dataRecord['domain'] . '.' . $domain_check;
                    $this->dataRecord['domain'] = $domain_check;
                }
            } else {
                $this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];
            }
            $this->dataRecord['web_folder'] = strtolower($this->dataRecord['web_folder']);
            if(substr($this->dataRecord['web_folder'], 0, 1) === '/') $this->dataRecord['web_folder'] = substr($this->dataRecord['web_folder'], 1);
server/lib/classes/aps_installer.inc.php.bak
File was deleted