Updated addon MCV

webtools/remora/app/controllers/addons_controller.php

@@ -241,11 +241,21 @@ class AddonsController extends AppController
             $this->set('manifestData', $manifestData);
             $this->render('add_step2');
         }
-        elseif (isset($this->data['Addon']['add_step2'])) {
-            
-            $this->render('add_step25');
-        }
-        elseif (isset($this->data['Addon']['add_step25'])) {
+        elseif (isset($this->data['Addon']['add_step2']) || isset($this->data['Addon']['add_step25'])) {
+            //Step 2 processing
+            if (isset($this->data['Addon']['add_step2'])) {
+                //Validate stuff
+
+                if($this->data['Addon']['ShowEula'] == 1) {
+                    $this->render('add_step25');
+                    die();
+                }
+                //Else, continue and show step3
+            }
+            //Step 2.5 processing
+            if (isset($this->data['Addon']['add_step25'])) {
+            }
+
             //Get Platforms list
             $platformQry = $this->Platform->findAll();
             foreach ($platformQry as $k => $v) {

webtools/remora/app/views/addons/add_step2.thtml

@@ -44,7 +44,7 @@ echo         '<td>'.$html->textarea('Addon/Description', array('value' => $info[
                                                     )).$html->tagErrorMsg('Addon/Description', _('Please enter a description of your add-on.')).'</td>';
 echo     '</tr>';
 echo     '<tr>';
-echo         '<td colspan=2>'.$html->checkbox('Addon/ShowEULA').' '._('I would like to add an End User License Agreement and/or Privacy Policy').'</td>';
+echo         '<td colspan=2>'.$html->checkbox('Addon/ShowEula').' '._('I would like to add an End User License Agreement and/or Privacy Policy').'</td>';
 echo     '</tr>';
 echo     '<tr>';
 echo         '<td colspan=2>'.$html->submit(_('Next').' &raquo;').'</td>';