Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fusiondirectory
fusiondirectory
Commits
dfe5adb9
Commit
dfe5adb9
authored
May 31, 2016
by
Côme Chilliet
Browse files
Bumped PHP min version to 5.4 and cleaned min PHP version handling
parent
c3bb734b
Changes
3
Hide whitespace changes
Inline
Side-by-side
include/php_setup.inc
View file @
dfe5adb9
...
@@ -274,8 +274,8 @@ function dummy_error_handler()
...
@@ -274,8 +274,8 @@ function dummy_error_handler()
}
}
/* Bail out for incompatible/old PHP versions */
/* Bail out for incompatible/old PHP versions */
if
(
!
version_compare
(
phpversion
(),
"5.2.0"
,
">="
))
{
if
(
!
version_compare
(
phpversion
(),
PHP_MIN_VERSION
,
">="
))
{
echo
"PHP version needs to be
5.2.0
or above to run FusionDirectory. Aborted."
;
echo
"PHP version needs to be
"
.
PHP_MIN_VERSION
.
"
or above to run FusionDirectory. Aborted."
;
exit
();
exit
();
}
}
...
...
include/variables_common.inc
View file @
dfe5adb9
...
@@ -70,4 +70,9 @@ define ("FD_VERSION", "1.0.12-fixes"); /*! Define FusionDirectory version */
...
@@ -70,4 +70,9 @@ define ("FD_VERSION", "1.0.12-fixes"); /*! Define FusionDirectory version */
*/
*/
define
(
"CONFIGRDN"
,
"cn=config,ou=fusiondirectory,"
);
/*! Define FusionDirectory config object */
define
(
"CONFIGRDN"
,
"cn=config,ou=fusiondirectory,"
);
/*! Define FusionDirectory config object */
/*!
* \brief Minimum PHP version
*/
define
(
"PHP_MIN_VERSION"
,
"5.4.0"
);
?>
?>
setup/class_setupStep_Checks.inc
View file @
dfe5adb9
...
@@ -64,12 +64,12 @@ class Step_Checks extends setupStep
...
@@ -64,12 +64,12 @@ class Step_Checks extends setupStep
$config_checks
=
array
();
$config_checks
=
array
();
/* PHP version check */
/* PHP version check */
$N
=
_
(
"
Checking PHP version
"
);
$N
=
_
(
'
Checking PHP version
'
);
$D
=
sprintf
(
_
(
"
PHP must be of version %s or above.
"
),
"5.2.0"
);
$D
=
sprintf
(
_
(
'
PHP must be of version %s or above.
'
),
PHP_MIN_VERSION
);
$S
=
_
(
"
Please upgrade to a supported version.
"
);
$S
=
_
(
'
Please upgrade to a supported version.
'
);
$R
=
$this
->
check_
php
_
version
();
$R
=
version_compare
(
phpversion
()
,
PHP_MIN_VERSION
,
'>='
)
;
$M
=
TRUE
;
$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 */
/* Check for LDAP extension */
$N
=
msgPool
::
checkingFor
(
"LDAP"
);
$N
=
msgPool
::
checkingFor
(
"LDAP"
);
...
@@ -229,13 +229,6 @@ class Step_Checks extends setupStep
...
@@ -229,13 +229,6 @@ class Step_Checks extends setupStep
}
}
$this
->
is_completed
=
!
$failed
;
$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'
,
'>='
);
}
}
}
?>
?>
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment