Merge branch 'hide-aps' into 'stable-3.1'

Hide APS menu

See merge request ispconfig/ispconfig3!1078

install/tpl/system.ini.master

@@ -35,6 +35,7 @@ client_username_web_check_disabled=n
 backups_include_into_web_quota=n
 reseller_can_use_options=n
 web_php_options=no,fast-cgi,mod,php-fpm
+show_aps_menu=n
 
 
 [tools]

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

@@ -157,33 +157,37 @@ if($app->auth->get_client_limit($userid, 'shell_user') != 0 or $app->auth->get_c
 }
 
 // APS menu
-if($app->auth->get_client_limit($userid, 'aps') != 0)
-{
-	$items = array();
-
-	$items[] = array(   'title'   => 'Available packages',
-		'target'  => 'content',
-		'link'    => 'sites/aps_availablepackages_list.php',
-		'html_id' => 'aps_availablepackages_list');
-
-	$items[] = array(   'title'   => 'Installed packages',
-		'target'  => 'content',
-		'link'    => 'sites/aps_installedpackages_list.php',
-		'html_id' => 'aps_installedpackages_list');
-
-
-	// Second menu group, available only for admins
-	if($_SESSION['s']['user']['typ'] == 'admin')
-	{
-		$items[] = array(   'title'   => 'Update Packagelist',
-			'target'  => 'content',
-			'link'    => 'sites/aps_update_packagelist.php',
-			'html_id' => 'aps_packagedetails_show');
-	}
-
-	$module['nav'][] = array(   'title' => 'APS Installer',
-		'open'  => 1,
-		'items' => $items);
+if($app->auth->get_client_limit($userid, 'aps') != 0) {
+	// read web config
+	$app->uses('getconf');
+	$global_config = $app->getconf->get_global_config('sites');
+	if($global_config['show_aps_menu'] == 'y') {
+	  $items = array();
+
+  	$items[] = array(   'title'   => 'Available packages',
+  		'target'  => 'content',
+  		'link'    => 'sites/aps_availablepackages_list.php',
+  		'html_id' => 'aps_availablepackages_list');
+
+  	$items[] = array(   'title'   => 'Installed packages',
+  		'target'  => 'content',
+  		'link'    => 'sites/aps_installedpackages_list.php',
+  		'html_id' => 'aps_installedpackages_list');
+
+
+  	// Second menu group, available only for admins
+  	if($_SESSION['s']['user']['typ'] == 'admin')
+  	{
+  		$items[] = array(   'title'   => 'Update Packagelist',
+  			'target'  => 'content',
+  			'link'    => 'sites/aps_update_packagelist.php',
+  			'html_id' => 'aps_packagedetails_show');
+  	}
+
+  	$module['nav'][] = array(   'title' => 'APS Installer',
+  		'open'  => 1,
+  		'items' => $items);
+  }
 }
 
 // Statistics menu