extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +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:45:01 +00:00
parent d65dd435e7
commit 1c98d4f5ac
5 changed files with 9 additions and 9 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;
case 'next':
$_POST['addr_fields'] = unserialize(stripslashes($_POST['addr_fields']));
$_POST['trans'] = unserialize(stripslashes($_POST['trans']));
$_POST['addr_fields'] = json_decode(stripslashes($_POST['addr_fields']));
$_POST['trans'] = json_decode(stripslashes($_POST['trans']));
// fall-through
case 'import':
$hiddenvars = html::input_hidden(array(

4
calendar/csv_import.php
View File

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

4
infolog/csv_import.php
View File

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

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

@ -519,7 +519,7 @@ class html
{
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
{

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

@ -105,7 +105,7 @@ class uiaclprefs
if ($_POST['save'] || $_POST['apply'])
{
$processed = $_POST['processed'];
$to_remove = unserialize(urldecode($processed));
$to_remove = json_decode(urldecode($processed));
foreach($to_remove as $uid)
{
//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_value' => isset($query) && $query ? html::htmlspecialchars($query) : '',
'search' => lang('search'),
'processed' => urlencode(serialize($processed))
'processed' => urlencode(json_encode($processed))
);
$letters = lang('alphabet');