[Fmsystem-commits] [16504] Stable: Merge 16500:16503 from trunk

[sigurdne]

Revision: 16504
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16504
Author:   sigurdne
Date:     2017-03-30 10:34:17 -0400 (Thu, 30 Mar 2017)
Log Message:
-----------
Stable: Merge 16500:16503 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/header.inc.php.template
    branches/Version-2_0-branch/setup/manageheader.php

Property Changed:
----------------
    branches/Version-2_0-branch/

Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-03-30 14:32:38 UTC (rev 16503)
+++ branches/Version-2_0-branch 2017-03-30 14:34:17 UTC (rev 16504)

Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
 /branches/dev-syncromind:13653
 /branches/dev-syncromind-2:14933-16394
 /branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503
\ No newline at end of property
Modified: branches/Version-2_0-branch/header.inc.php.template
===================================================================
--- branches/Version-2_0-branch/header.inc.php.template 2017-03-30 14:32:38 UTC 
(rev 16503)
+++ branches/Version-2_0-branch/header.inc.php.template 2017-03-30 14:34:17 UTC 
(rev 16504)
@@ -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 $
@@ -150,8 +150,8 @@
 
        /**
        * @global string $phpgw_info['server']['enable_crypto']
-       * phpGroupWare offers 2 session management systems - php and db
-       * Unless you really know what you are doing use php here as it works 
better 99.5% of the time
+       * phpGroupWare offers 2 crypto systems - mcrypt and libsodium
+       * Note: mcrypt is deprecated from php 7.1+
        */
        $GLOBALS['phpgw_info']['server']['enable_crypto'] = '{ENABLE_CRYPTO}';
 
@@ -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;
 
@@ -173,19 +173,12 @@
 
        /**
        * @global string $phpgw_info['server']['setup_mcrypt_key']
-       * This is a random string used as the encryption key for mcrypt
+       * This is a random string used as the encryption key for mcrypt or 
libsodium
        * feel free to change it when setting up phpgroupware on a clean 
database,
        * but you must not change it after that point!
        */
        $GLOBALS['phpgw_info']['server']['setup_mcrypt_key'] = 
'{SETUP_MCRYPT_KEY}';
 
-       /**
-       * @global string $phpgw_info['server']['setup_libsodium_key']
-       * This is a random string used as the encryption key for libsodium
-       * Never change it!
-       */
-       $GLOBALS['phpgw_info']['server']['setup_libsodium_key'] = 
'{SETUP_LIBSODIUM_KEY}';
-
        /*
                This ensures IE gets the right character set
        */

Modified: branches/Version-2_0-branch/setup/manageheader.php
===================================================================
--- branches/Version-2_0-branch/setup/manageheader.php  2017-03-30 14:32:38 UTC 
(rev 16503)
+++ branches/Version-2_0-branch/setup/manageheader.php  2017-03-30 14:34:17 UTC 
(rev 16504)
@@ -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>