extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-02 19:39:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed problem reported by Pedro Ribeiro

Browse Source
This commit is contained in:
Ralf Becker 2014-02-04 13:48:03 +00:00
parent e577e09835
commit 215cc95315
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addressbook/csv_import.php
View File

@ -254,8 +254,8 @@ switch($_POST['action'])
break; break;
case 'next': case 'next':
$_POST['addr_fields'] = unserialize(stripslashes($_POST['addr_fields'])); $_POST['addr_fields'] = json_decode(stripslashes($_POST['addr_fields']));
$_POST['trans'] = unserialize(stripslashes($_POST['trans'])); $_POST['trans'] = json_decode(stripslashes($_POST['trans']));
// fall-through // fall-through
case 'import': case 'import':
$hiddenvars = html::input_hidden(array( $hiddenvars = html::input_hidden(array(

4
calendar/csv_import.php
View File

@ -274,8 +274,8 @@ case 'download':
break; break;
case 'next': case 'next':
$_POST['cal_fields'] = unserialize(stripslashes($_POST['cal_fields'])); $_POST['cal_fields'] = json_decode(stripslashes($_POST['cal_fields']));
$_POST['trans'] = unserialize(stripslashes($_POST['trans'])); $_POST['trans'] = json_decode(stripslashes($_POST['trans']));
// fall-through // fall-through
case 'import': case 'import':
$hiddenvars = html::input_hidden(array( $hiddenvars = html::input_hidden(array(

2
phpgwapi/inc/class.html.inc.php
View File

@ -431,7 +431,7 @@ class html
{ {
if (is_array($value)) if (is_array($value))
{ {
$value = serialize($value); $value = json_encode($value);
} }
if (!$ignore_empty || $value && !($name == 'filter' && $value == 'none')) // dont need to send all the empty vars if (!$ignore_empty || $value && !($name == 'filter' && $value == 'none')) // dont need to send all the empty vars
{ {

4
preferences/inc/class.uiaclprefs.inc.php
View File

@ -105,7 +105,7 @@ class uiaclprefs
if ($_POST['save'] || $_POST['apply']) if ($_POST['save'] || $_POST['apply'])
{ {
$processed = $_POST['processed']; $processed = $_POST['processed'];
$to_remove = unserialize(urldecode($processed)); $to_remove = json_decode(urldecode($processed));
foreach($to_remove as $uid) foreach($to_remove as $uid)
{ {
//echo "deleting acl-records for $uid=".$GLOBALS['egw']->accounts->id2name($uid)." and $acl_app<br>\n"; //echo "deleting acl-records for $uid=".$GLOBALS['egw']->accounts->id2name($uid)." and $acl_app<br>\n";
@ -276,7 +276,7 @@ class uiaclprefs
'search_type' => is_array($query_types) ? html::select('search_type',$search_type,$query_types) : '', 'search_type' => is_array($query_types) ? html::select('search_type',$search_type,$query_types) : '',
'search_value' => isset($query) && $query ? html::htmlspecialchars($query) : '', 'search_value' => isset($query) && $query ? html::htmlspecialchars($query) : '',
'search' => lang('search'), 'search' => lang('search'),
'processed' => urlencode(serialize($processed)) 'processed' => urlencode(json_encode($processed))
); );
$letters = lang('alphabet'); $letters = lang('alphabet');