GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Move more POST handling into ManagedAction

This commit is contained in:
Mikael Nordfeldth 2015-03-08 21:08:27 +01:00
parent 1ea876296d
commit 05006f687a
2 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/formaction.php
View File

@ -116,24 +116,4 @@ class FormAction extends ManagedAction
$form = new $class($this, $this->formOpts);
return $form;
}
/**
* Gets called from handle() if isPost() is true;
* @return void
*/
protected function handlePost()
{
// check for this before token since all POST and FILES data
// is losts when size is exceeded
if (empty($_POST) && $_SERVER['CONTENT_LENGTH']>0) {
// TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
// TRANS: %s is the number of bytes of the CONTENT_LENGTH.
$msg = _m('The server was unable to handle that much POST data (%s MiB) due to its current configuration.',
'The server was unable to handle that much POST data (%s MiB) due to its current configuration.',
round($_SERVER['CONTENT_LENGTH']/1024/1024,2));
throw new ClientException($msg);
}
return parent::handlePost();
}
}

13
lib/managedaction.php
View File

@ -75,6 +75,17 @@ class ManagedAction extends Action
// This will only be run if the Action has the property canPost==true
assert($this->canPost);
// check for this before token since all POST and FILES data
// is losts when size is exceeded
if (empty($_POST) && $_SERVER['CONTENT_LENGTH']>0) {
// TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
// TRANS: %s is the number of bytes of the CONTENT_LENGTH.
$msg = _m('The server was unable to handle that much POST data (%s MiB) due to its current configuration.',
'The server was unable to handle that much POST data (%s MiB) due to its current configuration.',
round($_SERVER['CONTENT_LENGTH']/1024/1024,2));
throw new ClientException($msg);
}
$this->checkSessionToken();
return $this->doPost();
}
@ -85,6 +96,6 @@ class ManagedAction extends Action
* exception on failure, with a descriptive message.
*/
protected function doPost() {
throw new Exception('Unhandled POST');
return false;
}
}