Avoid having to check for notices without rendered copies in upgrade.php

[quix0rs-gnu-social.git] / lib / formaction.php

diff --git a/lib/formaction.php b/lib/formaction.php
index 60d9b3ce130a843ab458fbd3f995ae21d7704ac2..7d74fc47130eaf20f6bb23b116e21eab8f9d6664 100644 (file)
--- a/lib/formaction.php
+++ b/lib/formaction.php
@@ -27,9 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Form action extendable class
@@ -44,6 +42,7 @@ if (!defined('STATUSNET')) {
 class FormAction extends ManagedAction
 {
     protected $form = null;
+    protected $formOpts = array();
     protected $type = null;
     protected $needLogin = true;
     protected $canPost = true;
@@ -51,7 +50,7 @@ class FormAction extends ManagedAction
     protected function prepare(array $args=array()) {
         parent::prepare($args);
 
-        $this->form = $this->form ?: $this->action;
+        $this->form = $this->form ?: ucfirst($this->action);
         $this->args['form'] = $this->form;
 
         $this->type = !is_null($this->type) ? $this->type : $this->trimmed('type');
@@ -93,30 +92,28 @@ class FormAction extends ManagedAction
     /**
      * @return string with instructions to pass into common_markup_to_html()
      */
-    public function getInstructions()
+    protected function getInstructions()
     {
         return null;
     }
 
-    /**
-     * Gets called from handle() if isPost() is true;
-     * @return void
-     */
-    protected function handlePost()
+    public function showForm($msg=null, $success=false)
     {
-        parent::handlePost();
+        $this->msg = $msg;
+        $this->success = $success;
+        $this->showPage();
+    }
 
-        // 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);
-        }
+    protected function showContent()
+    {
+        $form = $this->getForm();
+        $form->show();
+    }
 
-        $this->checkSessionToken();
+    protected function getForm()
+    {
+        $class = $this->form.'Form';
+        $form = new $class($this, $this->formOpts);
+        return $form;
     }
 }