[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16501] preparing for php7.1
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16501] preparing for php7.1 |
|
Date: |
Thu, 30 Mar 2017 10:26:46 -0400 (EDT) |
Revision: 16501
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16501
Author: sigurdne
Date: 2017-03-30 10:26:46 -0400 (Thu, 30 Mar 2017)
Log Message:
-----------
preparing for php7.1
Modified Paths:
--------------
trunk/header.inc.php.template
trunk/setup/manageheader.php
Modified: trunk/header.inc.php.template
===================================================================
--- trunk/header.inc.php.template 2017-03-30 13:49:23 UTC (rev 16500)
+++ trunk/header.inc.php.template 2017-03-30 14:26:46 UTC (rev 16501)
@@ -7,7 +7,7 @@
* @author Joseph Engo <address@hidden>
* @author Dave Hall <address@hidden>
* @author Sigurd Nes <address@hidden>
- * @copyright Copyright (C) 2000-2010 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @copyright Copyright (C) 2000-2017 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package phpgroupware
* @version $Id: header.inc.php.template 18392 2008-01-26 12:45:06Z
skwashd $
@@ -158,7 +158,7 @@
/**
* @global boolean $phpgw_info['server']['mcrypt_enabled']
* This is used to control mcrypt's use
- * Note: deprecated
+ * Note: deprecated from php 7.1+
*/
$GLOBALS['phpgw_info']['server']['mcrypt_enabled'] = false;
Modified: trunk/setup/manageheader.php
===================================================================
--- trunk/setup/manageheader.php 2017-03-30 13:49:23 UTC (rev 16500)
+++ trunk/setup/manageheader.php 2017-03-30 14:26:46 UTC (rev 16501)
@@ -2,7 +2,7 @@
/**
* phpGroupWare Setup - http://phpgroupware.org
*
- * @copyright Portions Copyright (C) 2000-2014 Free Software Foundation,
Inc. http://www.fsf.org/
+ * @copyright Portions Copyright (C) 2000-2017 Free Software Foundation,
Inc. http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package setup
* @version $Id$
@@ -723,6 +723,12 @@
{
$selected = ' selected ';
}
+
+
if($GLOBALS['phpgw_info']['server']['mcrypt_enabled'] && $stype == 'mcrypt')
+ {
+ $selected = ' selected ';
+ }
+
$crypto_options .= <<<HTML
<option{$selected}
value="{$stype}">{$stype}</option>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16501] preparing for php7.1,
sigurdne <=