Skip to content

Commit 29e1b0c

Browse files
author
Marius Cramer
committed
Undone some changes from vhostalias merge.
1 parent e60d4c7 commit 29e1b0c

File tree

8 files changed

+11
-869
lines changed

8 files changed

+11
-869
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ public function sites_web_vhost_aliasdomain_get($session_id, $primary_id)
455455
{
456456
global $app;
457457

458-
if(!$this->checkPerm($session_id, 'sites_web_vhost_aliasdomain_get')) {
458+
if(!$this->checkPerm($session_id, 'sites_web_aliasdomain_get')) {
459459
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
460460
return false;
461461
}
@@ -468,7 +468,7 @@ public function sites_web_vhost_aliasdomain_get($session_id, $primary_id)
468468
public function sites_web_vhost_aliasdomain_add($session_id, $client_id, $params)
469469
{
470470
global $app;
471-
if(!$this->checkPerm($session_id, 'sites_web_vhost_aliasdomain_add')) {
471+
if(!$this->checkPerm($session_id, 'sites_web_aliasdomain_add')) {
472472
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
473473
return false;
474474
}
@@ -491,7 +491,7 @@ public function sites_web_vhost_aliasdomain_add($session_id, $client_id, $params
491491
//* Update a record
492492
public function sites_web_vhost_aliasdomain_update($session_id, $client_id, $primary_id, $params)
493493
{
494-
if(!$this->checkPerm($session_id, 'sites_web_vhost_aliasdomain_update')) {
494+
if(!$this->checkPerm($session_id, 'sites_web_aliasdomain_update')) {
495495
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
496496
return false;
497497
}
@@ -509,7 +509,7 @@ public function sites_web_vhost_aliasdomain_update($session_id, $client_id, $pri
509509
//* Delete a record
510510
public function sites_web_vhost_aliasdomain_delete($session_id, $primary_id)
511511
{
512-
if(!$this->checkPerm($session_id, 'sites_web_vhost_aliasdomain_delete')) {
512+
if(!$this->checkPerm($session_id, 'sites_web_aliasdomain_delete')) {
513513
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
514514
return false;
515515
}
@@ -524,7 +524,7 @@ public function sites_web_vhost_subdomain_get($session_id, $primary_id)
524524
{
525525
global $app;
526526

527-
if(!$this->checkPerm($session_id, 'sites_web_vhost_subdomain_get')) {
527+
if(!$this->checkPerm($session_id, 'sites_web_subdomain_get')) {
528528
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
529529
return false;
530530
}
@@ -537,7 +537,7 @@ public function sites_web_vhost_subdomain_get($session_id, $primary_id)
537537
public function sites_web_vhost_subdomain_add($session_id, $client_id, $params)
538538
{
539539
global $app;
540-
if(!$this->checkPerm($session_id, 'sites_web_vhost_subdomain_add')) {
540+
if(!$this->checkPerm($session_id, 'sites_web_subdomain_add')) {
541541
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
542542
return false;
543543
}
@@ -560,7 +560,7 @@ public function sites_web_vhost_subdomain_add($session_id, $client_id, $params)
560560
//* Update a record
561561
public function sites_web_vhost_subdomain_update($session_id, $client_id, $primary_id, $params)
562562
{
563-
if(!$this->checkPerm($session_id, 'sites_web_vhost_subdomain_update')) {
563+
if(!$this->checkPerm($session_id, 'sites_web_subdomain_update')) {
564564
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
565565
return false;
566566
}
@@ -578,7 +578,7 @@ public function sites_web_vhost_subdomain_update($session_id, $client_id, $prima
578578
//* Delete a record
579579
public function sites_web_vhost_subdomain_delete($session_id, $primary_id)
580580
{
581-
if(!$this->checkPerm($session_id, 'sites_web_vhost_subdomain_delete')) {
581+
if(!$this->checkPerm($session_id, 'sites_web_subdomain_delete')) {
582582
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
583583
return false;
584584
}

‎interface/web/data.sql‎

Lines changed: 0 additions & 851 deletions
This file was deleted.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
$function_list['sites_shell_user_get,sites_shell_user_add,sites_shell_user_update,sites_shell_user_delete'] = 'Sites Shell-User functions';
77
$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';
88
$function_list['sites_web_aliasdomain_get,sites_web_aliasdomain_add,sites_web_aliasdomain_update,sites_web_aliasdomain_delete'] = 'Sites Aliasdomain functions';
9-
$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';
109
$function_list['sites_web_subdomain_get,sites_web_subdomain_add,sites_web_subdomain_update,sites_web_subdomain_delete'] = 'Sites Subdomain functions';
11-
$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';
1210

1311

1412
?>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
<link rel="shortcut icon" href="/themes/default/images/favicon.ico" />
5959
<script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
6060
<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
61-
<script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
6261
<script type="text/javascript" src="js/scrigo.js.php"></script>
6362
<script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
6463
<script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<link rel="shortcut icon" href="/themes/default/images/favicon.ico" />
1515
<script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
1616
<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
17-
<script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
1817
<script type="text/javascript" src="js/scrigo.js.php"></script>
1918
<script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
2019
<script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@
5959
<link rel="shortcut icon" href="/themes/default_304/images/favicon.ico" />
6060
<script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
6161
<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
62-
<script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
63-
<script type="text/javascript" src="js/scrigo.js.php"></script>
62+
<script type="text/javascript" src="js/scrigo.js.php"></script>
6463
<script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
6564
<script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
6665
<script type="text/javascript" src="js/jquery.tipsy.js"></script>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@
5959
<link rel="shortcut icon" href="/themes/default_304/images/favicon.ico" />
6060
<script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
6161
<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
62-
<script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
63-
<script type="text/javascript" src="js/scrigo.js.php"></script>
62+
<script type="text/javascript" src="js/scrigo.js.php"></script>
6463
<script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
6564
<script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
6665
<script type="text/javascript" src="js/jquery.tipsy.js"></script>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@
5959
<link rel="shortcut icon" href="/themes/default_304/images/favicon.ico" />
6060
<script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
6161
<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
62-
<script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
63-
<script type="text/javascript" src="js/scrigo.js.php"></script>
62+
<script type="text/javascript" src="js/scrigo.js.php"></script>
6463
<script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
6564
<script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
6665
<script type="text/javascript" src="js/jquery.tipsy.js"></script>

0 commit comments

Comments
 (0)