Merge branch 'patch-2' into 'master'

Added possibility to set new aps to disabled by default 2

Update for https://git.ispconfig.org/ispconfig/ispconfig3/merge_requests/552

See merge request !558

Author: Till Brehm

install/tpl/system.ini.master

@@ -32,6 +32,7 @@ vhost_aliasdomains=n
 client_username_web_check_disabled=n
 backups_include_into_web_quota=n
 reseller_can_use_options=n
+asp_new_package_disabled=y
 
 
 [tools]

interface/lib/classes/aps_crawler.inc.php

@@ -568,6 +568,9 @@ public function parseFolderToDB()
 				//$pkg_url = $this->app_download_url_list[$pkg];
 				$pkg_url = @file_get_contents($this->interface_pkg_dir.'/'.$pkg.'/PKG_URL');
 
+				//* Get global sites config
+				$sites_config = $app->getconf->get_global_config('sites');
+
 				// Insert only if data is complete
 				if($pkg != '' && $pkg_name != '' && $pkg_category != '' && $pkg_version != '' && $pkg_release != '' && $pkg_url){
 					$insert_data = array(
@@ -577,7 +580,7 @@ public function parseFolderToDB()
 						"version" => $pkg_version,
 						"release" => $pkg_release,
 						"package_url" => $pkg_url,
-						"package_status" => PACKAGE_ENABLED
+						"package_status" => $sites_config['asp_new_package_disabled'] == 'y' ? PACKAGE_LOCKED : PACKAGE_ENABLED
 					);
 					$app->db->datalogInsert('aps_packages', $insert_data, 'id');
 				} else {

interface/web/admin/form/system_config.tform.php

@@ -160,6 +160,12 @@
 			'default' => 'n',
 			'value'  => array(0 => 'n', 1 => 'y')
 		),
+		'asp_new_package_disabled' => array(
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'n',
+			'value' => array(0 => 'n', 1 => 'y')
+		),
 		'client_username_web_check_disabled' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',

interface/web/admin/lib/lang/en_system_config.lng

@@ -17,6 +17,7 @@ $wb['vhost_subdomains_txt'] = 'Create subdomains as web site';
 $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
 $wb['vhost_aliasdomains_txt'] = 'Create aliasdomains as web site';
 $wb['vhost_aliasdomains_note_txt'] = 'You cannot disable this as long as vhost aliasdomains exist in the system!';
+$wb["asp_new_package_disabled_txt"] = 'Disable new aps packages';
 $wb["dbname_prefix_error_regex"] = 'Char not allowed in database name prefix.';
 $wb["dbuser_prefix_error_regex"] = 'Char not allowed in database user prefix.';
 $wb["ftpuser_prefix_error_regex"] = 'Char not allowed in ftp user prefix.';

interface/web/admin/templates/system_config_sites_edit.htm

@@ -45,6 +45,12 @@ <h1><tmpl_var name="list_head_txt"></h1>
                     {tmpl_var name='vhost_aliasdomains'}&nbsp;{tmpl_var name='vhost_aliasdomains_note_txt'}
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='asp_new_package_disabled_txt'}</label>
+                <div class="col-sm-9">
+                    {tmpl_var name='asp_new_package_disabled'}
+                </div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='client_username_web_check_disabled_txt'}</label>
                 <div class="col-sm-9">