Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

Author: Till Brehm

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

@@ -43,8 +43,7 @@ public function sites_aps_update_package_list($session_id)
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
 			return false;
 		}
-		
-		require_once '../../../lib/config.inc.php';
+
 		$app->load('aps_crawler');
 
 		$aps = new ApsCrawler($app, true); // true = Interface mode, false = Server mode

interface/web/sites/lib/lang/en_aps.lng

@@ -28,7 +28,7 @@ $wb['installation_txt'] = 'Installation';
 $wb['install_location_txt'] = 'Install location';
 $wb['btn_install_txt'] = 'Install';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb['acceptance_txt'] = 'Acceptance';
+$wb['acceptance_txt'] = 'I accept the license';
 $wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
 $wb['install_language_txt'] = 'Interface language';
 $wb['new_database_password_txt'] = 'New database password';

interface/web/sites/list/aps_installedpackages.list.php

@@ -28,6 +28,12 @@
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+// Load the APS language file
+$lngfile = 'lib/lang/'.$app->functions->check_language($_SESSION['s']['language']).'_aps.lng';
+require_once $lngfile;
+$app->tpl->setVar($wb);
+$app->load_language_file('web/sites/'.$lngfile);
+
 $liste['name'] = 'aps_instances'; // Name of the list
 $liste['table'] = 'aps_instances'; // Database table
 $liste['table_idx'] = 'id'; // Table index
@@ -85,9 +91,9 @@
 	'prefix'   => '',
 	'suffix'   => '',
 	'width'    => '',
-	'value'    => array(INSTANCE_INSTALL => $app->lng('Installation_task'),
-		INSTANCE_ERROR => $app->lng('Installation_error'),
-		INSTANCE_SUCCESS => $app->lng('Installation_success'),
-		INSTANCE_REMOVE => $app->lng('Installation_remove')),
+	'value'    => array(INSTANCE_INSTALL => $app->lng('installation_task_txt'),
+		INSTANCE_ERROR => $app->lng('installation_error_txt'),
+		INSTANCE_SUCCESS => $app->lng('installation_success_txt'),
+		INSTANCE_REMOVE => $app->lng('installation_remove_txt')),
 	'table' => 'aps_instances');
 ?>

interface/web/sites/templates/aps_install_package.htm

@@ -57,7 +57,7 @@ <h1>
 		<input type="hidden" name="install" value="0" />
 		<div class="clear">
 			<div class="right">
-				<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_install_txt'}" name="btn_install" onclick="document.pageForm.install.value=1; ISPConfig.submitForm('pageForm','sites/aps_install_package.php?id={tmpl_var name='pkg_id'}');">{tmpl_var name='btn_install_txt'}</button>
+				<button class="btn btn-default formbutton-success positive" type="button" value="{tmpl_var name='btn_install_txt'}" name="btn_install" onclick="document.pageForm.install.value=1; ISPConfig.submitForm('pageForm','sites/aps_install_package.php?id={tmpl_var name='pkg_id'}');">{tmpl_var name='btn_install_txt'}</button>
 				<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/aps_availablepackages_list.php">{tmpl_var name='btn_cancel_txt'}</button>
 			</div>
 		</div>

interface/web/sites/templates/aps_packages_list.htm

@@ -6,7 +6,7 @@ <h1>{tmpl_var name="list_head_txt"}</h1>
 <table class="table">
                 <thead class="dark form-group-sm">
                     <tr>
-                        <th>{tmpl_var name='name_txt'}</th>
+                        <th colspan="2">{tmpl_var name='name_txt'}</th>
                         <th>{tmpl_var name='version_txt'}</th>
                         <th>{tmpl_var name='category_txt'}</th>
                             <tmpl_if name='is_admin'>
@@ -15,7 +15,7 @@ <h1>{tmpl_var name="list_head_txt"}</h1>
                         <th class="small-col text-right">&nbsp;</th>
                     </tr>
                     <tr>
-                        <td><input class="form-control" type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+                        <td colspan="2"><input class="form-control" type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
                         <td><input class="form-control" type="text" name="search_version" value="{tmpl_var name='search_version'}" /></td>
                         <td><select class="form-control" name="search_category" onChange="ISPConfig.submitForm('pageForm','sites/aps_availablepackages_list.php');">{tmpl_var name='search_category'}</select></td>
                             <tmpl_if name='is_admin'>
@@ -27,7 +27,7 @@ <h1>{tmpl_var name="list_head_txt"}</h1>
                 <tbody>
                     <tmpl_loop name='records'>
                         <tr>
-                            <td><a href="#" data-load-content="sites/aps_packagedetails_show.php?id={tmpl_var name='id'}">{tmpl_var name='name'}</a></td>
+                            <td colspan="2"><a href="#" data-load-content="sites/aps_packagedetails_show.php?id={tmpl_var name='id'}">{tmpl_var name='name'}</a></td>
                             <td>{tmpl_var name='version'}-{tmpl_var name='release'}</td>
                             <td>{tmpl_var name='category'}</td>
                                 <tmpl_if name='is_admin'>

remoting_client/API-docs/navigation.html

@@ -2,11 +2,11 @@
 <html><head>
   <title>ISCPConfig 3 API Functions</title>
 
-  
-  
+
+
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 
-  
+
   <style type="text/css">
 <!--
 .command {
@@ -200,6 +200,7 @@ <h3>S</h3>
 <p><a href="server_get_php_versions.html" target="content">server_get_php_versions</a></p>
 <p><a href="server_get_serverid_by_ip.html" target="content">server_get_serverid_by_ip</a></p>
 <p><a href="sites_aps_available_packages_list.html" target="content">sites_aps_available_packages_list</a></p>
+<p><a href="sites_aps_change_package_status.html" target="content">sites_aps_change_package_status</a></p>
 <p><a href="sites_aps_get_package_details.html" target="content">sites_aps_get_package_details</a></p>
 <p><a href="sites_aps_get_package_file.html" target="content">sites_aps_get_package_file</a></p>
 <p><a href="sites_aps_get_package_settings.html" target="content">sites_aps_get_package_settings</a></p>

remoting_client/API-docs/sites_aps_change_package_status.html

@@ -0,0 +1,29 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html><head><title>ISPConfig 3 remote API documentation</title>
+
+
+
+
+
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  <link rel="stylesheet" type="text/css" href="definitionen.css">
+  <style type="text/css">
+  </style></head>
+
+<body>
+<div style="padding:40px">
+<h1>sites_aps_change_package_status(<span class="var">$session_id</span>, <span class="var">$primary_id</span>, <span class="var">$params</span>);</h1>
+<br>
+<p class="headgrp">Description: </p>
+<p class="margin"> Changes the status for specified APS package. Supply the APS package ID in $primary_id.</p><br>
+<p class="headgrp">Input Variables: </p>
+<p class="margin"> <span class="var">$session_id</span>, <span class="var">$primary_id</span>, <span class="var">$params</span></p>
+<p class="headgrp">Parameters (in <span class="var">$params</span>): </p>
+<p class="margin"> package_status&nbsp;&nbsp;(<span class="paratype">int</span>) - can be 1 (= PACKAGE_LOCKED) or 2 (= PACKAGE_ENABLED)</p>
+<p class="headgrp">Output: </p>
+<p class="margin"> Returns true package status was changed.</p>
+<!--<b>Output:</b>
+<p style="margin-left:100px">Gives a record of </p> -->
+</div>
+
+</body></html>