Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
fusiondirectory
fusiondirectory
Commits
dfe5adb9
Commit
dfe5adb9
authored
8 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
Bumped PHP min version to 5.4 and cleaned min PHP version handling
parent
c3bb734b
dev
6342-update-the-locales-for-1-5
6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen
6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account
6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock
6378-orcid-test-method-is-wrong-and-break-orcid-saving
core-php8
master
fusiondirectory-1.5
fusiondirectory-1.4
fusiondirectory-1.3.1
fusiondirectory-1.3
fusiondirectory-1.2.3
fusiondirectory-1.2.2
fusiondirectory-1.2.1
fusiondirectory-1.2
fusiondirectory-1.1.1
fusiondirectory-1.1
fusiondirectory-1.0.20
fusiondirectory-1.0.19
fusiondirectory-1.0.18
fusiondirectory-1.0.17
fusiondirectory-1.0.16
fusiondirectory-1.0.15
fusiondirectory-1.0.14
fusiondirectory-1.0.13
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/php_setup.inc
+2
-2
include/php_setup.inc
include/variables_common.inc
+5
-0
include/variables_common.inc
setup/class_setupStep_Checks.inc
+5
-12
setup/class_setupStep_Checks.inc
with
12 additions
and
14 deletions
+12
-14
include/php_setup.inc
+
2
−
2
View file @
dfe5adb9
...
...
@@ -274,8 +274,8 @@ function dummy_error_handler()
}
/* Bail out for incompatible/old PHP versions */
if
(
!
version_compare
(
phpversion
(),
"5.2.0"
,
">="
))
{
echo
"PHP version needs to be
5.2.0
or above to run FusionDirectory. Aborted."
;
if
(
!
version_compare
(
phpversion
(),
PHP_MIN_VERSION
,
">="
))
{
echo
"PHP version needs to be
"
.
PHP_MIN_VERSION
.
"
or above to run FusionDirectory. Aborted."
;
exit
();
}
...
...
This diff is collapsed.
Click to expand it.
include/variables_common.inc
+
5
−
0
View file @
dfe5adb9
...
...
@@ -70,4 +70,9 @@ define ("FD_VERSION", "1.0.12-fixes"); /*! Define FusionDirectory version */
*/
define
(
"CONFIGRDN"
,
"cn=config,ou=fusiondirectory,"
);
/*! Define FusionDirectory config object */
/*!
* \brief Minimum PHP version
*/
define
(
"PHP_MIN_VERSION"
,
"5.4.0"
);
?>
This diff is collapsed.
Click to expand it.
setup/class_setupStep_Checks.inc
+
5
−
12
View file @
dfe5adb9
...
...
@@ -64,12 +64,12 @@ class Step_Checks extends setupStep
$config_checks
=
array
();
/* PHP version check */
$N
=
_
(
"
Checking PHP version
"
);
$D
=
sprintf
(
_
(
"
PHP must be of version %s or above.
"
),
"5.2.0"
);
$S
=
_
(
"
Please upgrade to a supported version.
"
);
$R
=
$this
->
check_
php
_
version
();
$N
=
_
(
'
Checking PHP version
'
);
$D
=
sprintf
(
_
(
'
PHP must be of version %s or above.
'
),
PHP_MIN_VERSION
);
$S
=
_
(
'
Please upgrade to a supported version.
'
);
$R
=
version_compare
(
phpversion
()
,
PHP_MIN_VERSION
,
'>='
)
;
$M
=
TRUE
;
$basic_checks
[]
=
array
(
"
NAME
"
=>
$N
,
"
DESC
"
=>
$D
,
"
RESULT
"
=>
$R
,
"
SOLUTION
"
=>
$S
,
"
MUST
"
=>
$M
);
$basic_checks
[]
=
array
(
'
NAME
'
=>
$N
,
'
DESC
'
=>
$D
,
'
RESULT
'
=>
$R
,
'
SOLUTION
'
=>
$S
,
'
MUST
'
=>
$M
);
/* Check for LDAP extension */
$N
=
msgPool
::
checkingFor
(
"LDAP"
);
...
...
@@ -229,13 +229,6 @@ class Step_Checks extends setupStep
}
$this
->
is_completed
=
!
$failed
;
}
/* Check if current PHP version is compatible
with the current version of FusionDirectory */
function
check_php_version
()
{
return
version_compare
(
phpversion
(),
'5.2.0'
,
'>='
);
}
}
?>
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets