Merge remote-tracking branch 'origin/support/3.0' into develop

.make/license/updateLicenses.php

@@ -22,14 +22,21 @@
 $iTopFolder = __DIR__."/../../";
 $xmlFilePath = $iTopFolder."setup/licenses/community-licenses.xml";
 
-function get_scope($product_node)
-{
+$jqExec = shell_exec("jq -V"); // a param is mandatory otherwise the script will freeze
+if ((null === $jqExec) || (false === $jqExec)) {
+	echo "/!\ JQ is required but cannot be launched :( \n";
+	echo "Check this script PHPDoc block for instructions\n";
+	die(-1);
+}
+
+
+function get_scope($product_node) {
 	$scope = $product_node->getAttribute("scope");
 
-	if ($scope === "")
-	{   //put iTop first
+	if ($scope === "") {   //put iTop first
 		return "aaaaaaaaa";
 	}
+
 	return $scope;
 }
 

setup/phpinfo.php

@@ -17,11 +17,27 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+/**
+ * Since N°1934 this page is accessible only to iTop admin users
+ * @since 2.5.2 2.6.1 2.7.0 N°1934 must login as admin user to use
+ *        to check if PHP is up and running, use phpcheck.php !
+ */
 require_once('../approot.inc.php');
 
+try {
 	require_once(APPROOT.'/application/startup.inc.php');
+} catch (Exception $e) {
+	// This means we don't have a valid iTop installation running
+	echo <<<EOF
+No valid installation found, cannot continue !<br>
+If you need to check that PHP is running, use <a href="phpcheck.php">phpcheck.php</a>
+EOF;
+	die(-1);
+}
 
 require_once(APPROOT.'/application/loginwebpage.class.inc.php');
-LoginWebPage::DoLogin(true); // Check user rights and prompt if needed
+LoginWebPage::DoLogin(true); // Check user rights and prompt if needed (N°1934)
+
+/** @noinspection ForgottenDebugOutputInspection */
 phpinfo();
 ?>