From 766629228493e3062f4dcd7944d7de5dda7132ff Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 27 Jun 2014 07:48:44 +0000
Subject: [PATCH] no need to manually (un)serialize vfs_fstab and detect old
 php serialize and new json_encoded values

---
 phpgwapi/inc/class.vfs_stream_wrapper.inc.php |  3 +--
 setup/inc/hook_config.inc.php                 | 12 ++++++------
 setup/inc/hook_config_validate.inc.php        |  4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
index e8186724fb..4328424c1c 100644
--- a/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.vfs_stream_wrapper.inc.php
@@ -1262,8 +1262,7 @@ class vfs_stream_wrapper implements iface_stream_wrapper
 	{
 		stream_register_wrapper(self::SCHEME,__CLASS__);
 
-		if (($fstab = $GLOBALS['egw_info']['server']['vfs_fstab']) &&
-			(is_array($fstab) || is_array($fstab = unserialize($fstab))) && count($fstab))
+		if (($fstab = $GLOBALS['egw_info']['server']['vfs_fstab']) && is_array($fstab) && count($fstab))
 		{
 			self::$fstab = $fstab;
 		}
diff --git a/setup/inc/hook_config.inc.php b/setup/inc/hook_config.inc.php
index 8895bfa35c..0c9599dda5 100644
--- a/setup/inc/hook_config.inc.php
+++ b/setup/inc/hook_config.inc.php
@@ -18,17 +18,17 @@
  */
 function vfs_storage_mode_options($config)
 {
-	if (!isset($config['vfs_fstab']) || $config['vfs_fstab'] == serialize(array(
+	if (!isset($config['vfs_fstab']) || $config['vfs_fstab'] == json_encode($default=array(
 		'/' => 'sqlfs://$host/',
 		'/apps' => 'links://$host/apps',
-	)))
+	)) || $config['vfs_fstab'] == serialize($default))	// detect old serialized value too
 	{
 		$config['vfs_storage_mode'] = 'fs';
 	}
-	elseif($config['vfs_fstab'] == serialize(array(
+	elseif($config['vfs_fstab'] == json_encode($default_db=array(
 		'/' => 'sqlfs://$host/?storage=db',
 		'/apps' => 'links://$host/apps?storage=db',
-	)))
+	)) || $config['vfs_fstab'] == serialize($default_db))	// detect old serialized value too
 	{
 		$config['vfs_storage_mode'] = 'db';
 	}
@@ -89,12 +89,12 @@ function encryptalgo($config)
 		if(!$found)
 		{
 			/* Something is wrong with their mcrypt install or php.ini */
-			$out = '<option value="">' . lang('no algorithms available') . '</option>' . "\n";;
+			$out = '<option value="">' . lang('no algorithms available') . '</option>' . "\n";
 		}
 	}
 	else
 	{
-		$out = '<option value="tripledes">TRIPLEDES</option>' . "\n";;
+		$out = '<option value="tripledes">TRIPLEDES</option>' . "\n";
 	}
 	return $out;
 }
diff --git a/setup/inc/hook_config_validate.inc.php b/setup/inc/hook_config_validate.inc.php
index 9c52528400..11dfdfa43a 100644
--- a/setup/inc/hook_config_validate.inc.php
+++ b/setup/inc/hook_config_validate.inc.php
@@ -57,10 +57,10 @@ function vfs_storage_mode($settings)
 			config::save_value('vfs_fstab','','phpgwapi');
 			break;
 		case 'db':
-			config::save_value('vfs_fstab',serialize(array(
+			config::save_value('vfs_fstab', array(
 				'/' => 'sqlfs://$host/?storage=db',
 				'/apps' => 'links://$host/apps?storage=db',
-			)),'phpgwapi');
+			),'phpgwapi');
 			break;
 	}
 }