[Pkg-owncloud-commits] [owncloud] 34/49: lower required php version to 5.3.3

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 8dc3cb2ffba180fea6dcabfcb6d5736064c17eee
Author: Frank Karlitschek <frank at owncloud.org>
Date:   Tue Dec 3 14:30:32 2013 +0100

    lower required php version to 5.3.3
---
 lib/private/util.php         | 12 ++++++++++--
 settings/admin.php           |  1 +
 settings/templates/admin.php | 14 ++++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/lib/private/util.php b/lib/private/util.php
index 38de07a..a73564b 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -437,9 +437,9 @@ class OC_Util {
 			);
 			$webServerRestart = true;
 		}
-		if(version_compare(phpversion(), '5.3.8', '<')) {
+		if(version_compare(phpversion(), '5.3.3', '<')) {
 			$errors[] = array(
-				'error'=>'PHP 5.3.8 or higher is required.',
+				'error'=>'PHP 5.3.3 or higher is required.',
 				'hint'=>'Please ask your server administrator to update PHP to the latest version.'
 					.' Your PHP version is no longer supported by ownCloud and the PHP community.'
 			);
@@ -875,6 +875,14 @@ class OC_Util {
 	}
 
 	/**
+	 * @brief Check if a PHP version older then 5.3.8 is installed.
+	 * @return bool
+	 */
+	public static function isPHPoutdated() {
+		return version_compare(phpversion(), '5.3.8', '<');
+	}
+
+	/**
 	 * @brief Check if the ownCloud server can connect to the internet
 	 * @return bool
 	 */
diff --git a/settings/admin.php b/settings/admin.php
index 0d3868a..c0e4570 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -28,6 +28,7 @@ $tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled(
 $tmpl->assign('isLocaleWorking', OC_Util::isSetLocaleWorking());
 $tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking());
 $tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());
+$tmpl->assign('old_php', OC_Util::isPHPoutdated());
 $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
 $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes'));
 
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 523bbd6..0eabffb 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -72,6 +72,20 @@ if (!$_['has_fileinfo']) {
 <?php
 }
 
+// is PHP at least at 5.3.8?
+if ($_['old_php']) {
+	?>
+<fieldset class="personalblock">
+	<h2><?php p($l->t('Your PHP version is outdated'));?></h2>
+
+		<span class="connectionwarning">
+		<?php p($l->t('Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly.')); ?>
+	</span>
+
+</fieldset>
+<?php
+}
+
 // is locale working ?
 if (!$_['isLocaleWorking']) {
 	?>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git