Merge branch '6130-remove-aps-installer-limit-from-limit-template' into 'develop'

Resolve "Remove APS Installer limit from limit-Template"

Closes #6130

See merge request ispconfig/ispconfig3!1472

interface/web/client/client_edit.php

@@ -190,6 +190,15 @@ class page_action extends tform_actions {
 			$app->tpl->setVar("show_per_domain_relay_options", 0);
 		}
 
+		// APS is enabled or not
+		$global_config = $app->getconf->get_global_config('sites');
+		if($global_config['show_aps_menu'] == 'y') {
+			$app->tpl->setVar("show_aps_menu", 1);
+		} else {
+			$app->tpl->setVar("show_aps_menu", 0);
+		}
+
+
 
 		//* Set the 'customer no' default value
 		if($this->id == 0) {

interface/web/client/client_template_edit.php

@@ -73,6 +73,13 @@ class page_action extends tform_actions {
 		} else {
 			$app->tpl->setVar("show_per_domain_relay_options", 0);
 		}
+		// APS is enabled or not
+		$global_config = $app->getconf->get_global_config('sites');
+		if($global_config['show_aps_menu'] == 'y') {
+			$app->tpl->setVar("show_aps_menu", 1);
+		} else {
+			$app->tpl->setVar("show_aps_menu", 0);
+		}
 		parent::onShowEnd();
 	}
 

interface/web/client/reseller_edit.php

@@ -184,6 +184,14 @@ class page_action extends tform_actions {
 			$app->tpl->setVar("show_per_domain_relay_options", 0);
 		}
 
+		// APS is enabled or not
+		$global_config = $app->getconf->get_global_config('sites');
+		if($global_config['show_aps_menu'] == 'y') {
+			$app->tpl->setVar("show_aps_menu", 1);
+		} else {
+			$app->tpl->setVar("show_aps_menu", 0);
+		}
+
 		//* Set the 'customer no' default value
 		if($this->id == 0) {
 			//* get the system config

interface/web/client/templates/client_edit_limits.htm

@@ -433,6 +433,7 @@
       </div>
     </div>
   </div>
+  <tmpl_if name="show_aps_menu">
   <div class="panel panel-default">
     <div class="panel-heading" role="tab" id="headingAPS">
       <h4 class="panel-title">
@@ -450,6 +451,7 @@
       </div>
     </div>
   </div>
+  </tmpl_if>
 </div>
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
 

interface/web/client/templates/client_template_edit_limits.htm

@@ -391,6 +391,7 @@
     </div>
   </div>
   <!-- APS -->
+  <tmpl_if name="show_aps_menu">
   <div class="panel panel-default">
     <div class="panel-heading" role="tab" id="headingAPS">
       <h4 class="panel-title">
@@ -408,6 +409,7 @@
       </div>
     </div>
   </div>
+  </tmpl_if>
   <tmpl_if name="is_admin">
   <!-- Client -->
   <div class="panel panel-default">

interface/web/client/templates/reseller_edit_limits.htm

@@ -435,6 +435,7 @@
     </div>
   </div>
   <!-- APS -->
+  <tmpl_if name="show_aps_menu">
   <div class="panel panel-default">
     <div class="panel-heading" role="tab" id="headingAPS">
       <h4 class="panel-title">
@@ -452,6 +453,7 @@
       </div>
     </div>
   </div>
+  </tmpl_if>
   <!-- Client -->
   <div class="panel panel-default">
     <div class="panel-heading" role="tab" id="headingClient">