composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Pierre Goiffon
2023-06-14 10:28:30 +02:00
parent 5d5589dd64 5a0b5364d6
commit 1824111de8
2 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
.make/license/updateLicenses.php
View File

@@ -19,17 +19,24 @@
* The target license file path is in `$xmlFilePath` * The target license file path is in `$xmlFilePath`
*/ */
$iTopFolder = __DIR__ . "/../../" ; $iTopFolder = __DIR__."/../../";
$xmlFilePath = $iTopFolder . "setup/licenses/community-licenses.xml"; $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"); $scope = $product_node->getAttribute("scope");
if ($scope === "") if ($scope === "") { //put iTop first
{ //put iTop first
return "aaaaaaaaa"; return "aaaaaaaaa";
} }
return $scope; return $scope;
} }

20
setup/phpinfo.php
View File

@@ -17,11 +17,27 @@
* You should have received a copy of the GNU Affero General Public License * 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'); require_once('../approot.inc.php');
require_once(APPROOT.'/application/startup.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'); 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(); phpinfo();
?> ?>