Undone some changes from vhostalias merge.

Marius Cramer

2014-01-24 29e1b0c9d76d3b4cb4666da67bd541b1a8ae7189

Undone some changes from vhostalias merge.

 interface/lib/classes/remote.d/sites.inc.php

@@ -455,7 +455,7 @@
    {
        global $app;

        if(!$this->checkPerm($session_id, 'sites_web_vhost_aliasdomain_get')) {
        if(!$this->checkPerm($session_id, 'sites_web_aliasdomain_get')) {
            throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
            return false;
        }
@@ -468,7 +468,7 @@
    public function sites_web_vhost_aliasdomain_add($session_id, $client_id, $params)
    {
        global $app;
        if(!$this->checkPerm($session_id, 'sites_web_vhost_aliasdomain_add')) {
        if(!$this->checkPerm($session_id, 'sites_web_aliasdomain_add')) {
            throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
            return false;
        }
@@ -491,7 +491,7 @@
    //* Update a record
    public function sites_web_vhost_aliasdomain_update($session_id, $client_id, $primary_id, $params)
    {
        if(!$this->checkPerm($session_id, 'sites_web_vhost_aliasdomain_update')) {
        if(!$this->checkPerm($session_id, 'sites_web_aliasdomain_update')) {
            throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
            return false;
        }
@@ -509,7 +509,7 @@
    //* Delete a record
    public function sites_web_vhost_aliasdomain_delete($session_id, $primary_id)
    {
        if(!$this->checkPerm($session_id, 'sites_web_vhost_aliasdomain_delete')) {
        if(!$this->checkPerm($session_id, 'sites_web_aliasdomain_delete')) {
            throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
            return false;
        }
@@ -524,7 +524,7 @@
    {
        global $app;

        if(!$this->checkPerm($session_id, 'sites_web_vhost_subdomain_get')) {
        if(!$this->checkPerm($session_id, 'sites_web_subdomain_get')) {
            throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
            return false;
        }
@@ -537,7 +537,7 @@
    public function sites_web_vhost_subdomain_add($session_id, $client_id, $params)
    {
        global $app;
        if(!$this->checkPerm($session_id, 'sites_web_vhost_subdomain_add')) {
        if(!$this->checkPerm($session_id, 'sites_web_subdomain_add')) {
            throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
            return false;
        }
@@ -560,7 +560,7 @@
    //* Update a record
    public function sites_web_vhost_subdomain_update($session_id, $client_id, $primary_id, $params)
    {
        if(!$this->checkPerm($session_id, 'sites_web_vhost_subdomain_update')) {
        if(!$this->checkPerm($session_id, 'sites_web_subdomain_update')) {
            throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
            return false;
        }
@@ -578,7 +578,7 @@
    //* Delete a record
    public function sites_web_vhost_subdomain_delete($session_id, $primary_id)
    {
        if(!$this->checkPerm($session_id, 'sites_web_vhost_subdomain_delete')) {
        if(!$this->checkPerm($session_id, 'sites_web_subdomain_delete')) {
            throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
            return false;
        }

 interface/web/data.sql

File was deleted

 interface/web/sites/lib/remote.conf.php

@@ -6,9 +6,7 @@
$function_list['sites_shell_user_get,sites_shell_user_add,sites_shell_user_update,sites_shell_user_delete'] = 'Sites Shell-User functions';
$function_list['sites_web_domain_get,sites_web_domain_add,sites_web_domain_update,sites_web_domain_delete,sites_web_domain_set_status'] = 'Sites Domain functions';
$function_list['sites_web_aliasdomain_get,sites_web_aliasdomain_add,sites_web_aliasdomain_update,sites_web_aliasdomain_delete'] = 'Sites Aliasdomain functions';
$function_list['sites_web_vhost_aliasdomain_get,sites_web_vhost_aliasdomain_add,sites_web_vhost_aliasdomain_update,sites_web_vhost_aliasdomain_delete'] = 'Sites Aliasdomain (VHost) functions';
$function_list['sites_web_subdomain_get,sites_web_subdomain_add,sites_web_subdomain_update,sites_web_subdomain_delete'] = 'Sites Subdomain functions';
$function_list['sites_web_vhost_subdomain_get,sites_web_vhost_subdomain_add,sites_web_vhost_subdomain_update,sites_web_vhost_subdomain_delete'] = 'Sites Subdomain (VHost) functions';


?>

 interface/web/themes/default-304/templates/main.tpl.htm

@@ -58,7 +58,6 @@
        <link rel="shortcut icon" href="/themes/default/images/favicon.ico" />
        <script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
        <script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
        <script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
        <script type="text/javascript" src="js/scrigo.js.php"></script>
        <script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
        <script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>

 interface/web/themes/default/templates/main.tpl.htm

@@ -14,7 +14,6 @@
        <link rel="shortcut icon" href="/themes/default/images/favicon.ico" />
        <script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
        <script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
        <script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
        <script type="text/javascript" src="js/scrigo.js.php"></script>
        <script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
        <script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>

 interface/web/themes/default_64_navimg/templates/main.tpl.htm

@@ -59,8 +59,7 @@
    <link rel="shortcut icon" href="/themes/default_304/images/favicon.ico" />
    <script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
    <script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
    <script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
        <script type="text/javascript" src="js/scrigo.js.php"></script>
    <script type="text/javascript" src="js/scrigo.js.php"></script>
    <script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
    <script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
    <script type="text/javascript" src="js/jquery.tipsy.js"></script>

 interface/web/themes/default_combobox/templates/main.tpl.htm

@@ -59,8 +59,7 @@
    <link rel="shortcut icon" href="/themes/default_304/images/favicon.ico" />
    <script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
    <script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
    <script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
        <script type="text/javascript" src="js/scrigo.js.php"></script>
    <script type="text/javascript" src="js/scrigo.js.php"></script>
    <script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
    <script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
    <script type="text/javascript" src="js/jquery.tipsy.js"></script>

 interface/web/themes/default_no_navimg/templates/main.tpl.htm

@@ -59,8 +59,7 @@
    <link rel="shortcut icon" href="/themes/default_304/images/favicon.ico" />
    <script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
    <script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
    <script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
        <script type="text/javascript" src="js/scrigo.js.php"></script>
    <script type="text/javascript" src="js/scrigo.js.php"></script>
    <script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
    <script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
    <script type="text/javascript" src="js/jquery.tipsy.js"></script>