hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-14 13:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove http_request

Browse Source
This commit is contained in:
Romain Neutron
2013-11-12 17:41:54 +01:00
parent 5a4b9e5f5f
commit d7a68dbec3
4 changed files with 27 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Alchemy/Phrasea/Helper/User/Edit.php
View File

@@ -443,7 +443,6 @@ class Edit extends \Alchemy\Phrasea\Helper\Helper
public function apply_rights()
{
$request = \http_request::getInstance();
$ACL = $this->app['acl']->get($this->app['authentication']->getUser());
$base_ids = array_keys($ACL->get_granted_base(array('canadmin')));
@@ -477,7 +476,7 @@ class Edit extends \Alchemy\Phrasea\Helper\Helper
}
$rights[$k] = $right . '_' . $base_id;
}
$parm = $request->get_parms_from_serialized_datas($rights, 'values');
$parm = $this->unserializedRequestData($this->app['request'], $rights, 'values');
foreach ($parm as $p => $v) {
if (trim($v) == '')
@@ -518,7 +517,7 @@ class Edit extends \Alchemy\Phrasea\Helper\Helper
$rights[$k] = $right . '_' . $databox->get_sbas_id();
}
$parm = $request->get_parms_from_serialized_datas($rights, 'values');
$parm = $this->unserializedRequestData($this->app['request'], $rights, 'values');
foreach ($parm as $p => $v) {
if (trim($v) == '')
@@ -577,8 +576,6 @@ class Edit extends \Alchemy\Phrasea\Helper\Helper
return $this;
}
$request = \http_request::getInstance();
$infos = array(
'gender'
, 'first_name'
@@ -594,7 +591,7 @@ class Edit extends \Alchemy\Phrasea\Helper\Helper
, 'fax'
);
$parm = $request->get_parms_from_serialized_datas($infos, 'user_infos');
$parm = $this->unserializedRequestData($this->app['request'], $infos, 'user_infos');
if ($parm['email'] && !\Swift_Validate::email($parm['email'])) {
throw new \Exception_InvalidArgument(_('Email addess is not valid'));
@@ -758,4 +755,18 @@ class Edit extends \Alchemy\Phrasea\Helper\Helper
$ACL->revoke_unused_sbas_rights();
}
}
private function unserializedRequestData(Request $request, array $indexes, $requestIndex)
{
$parameters = $data = array();
parse_str($request->get($requestIndex), $data);
if (count($data) > 0) {
foreach ($indexes as $index) {
$parameters[$index] = isset($data[$index]) ? $data[$index] : null;
}
}
return $parameters;
}
}