Moved the Station Logo field to GeneralPreferences, and stopped using

AJAX on the general prefs form

airtime_mvc/application/controllers/PreferenceController.php

@@ -34,15 +34,11 @@ class PreferenceController extends Zend_Controller_Action
         $form = new Application_Form_Preferences();
         $values = array();
 
-        if ($request->isPost()) {
-            $params = $request->getPost();
-            $postData = explode('&', $params['data']);
-            foreach($postData as $k=>$v) {
-                $v = explode('=', $v);
-                $values[$v[0]] = urldecode($v[1]);
-            }
-            if ($form->isValid($values)) {
 
+        if ($request->isPost()) {
+            $values = $request->getPost();
+            if ($form->isValid($values))
+            {
                 Application_Model_Preference::SetHeadTitle($values["stationName"], $this->view);
                 Application_Model_Preference::SetDefaultCrossfadeDuration($values["stationDefaultCrossfadeDuration"]);
                 Application_Model_Preference::SetDefaultFadeIn($values["stationDefaultFadeIn"]);
@@ -52,6 +48,11 @@ class PreferenceController extends Zend_Controller_Action
                 Application_Model_Preference::SetDefaultTimezone($values["timezone"]);
                 Application_Model_Preference::SetWeekStartDay($values["weekStartDay"]);
 
+                $logoUploadElement = $form->getSubForm('preferences_general')->getElement('stationLogo');
+                $logoUploadElement->receive();
+                $imagePath = $logoUploadElement->getFileName();
+                Application_Model_Preference::SetStationLogo($imagePath);
+
                 Application_Model_Preference::SetEnableSystemEmail($values["enableSystemEmail"]);
                 Application_Model_Preference::SetSystemEmail($values["systemEmail"]);
                 Application_Model_Preference::SetMailServerConfigured($values["configureMailServer"]);
@@ -73,12 +74,14 @@ class PreferenceController extends Zend_Controller_Action
 
                 $this->view->statusMsg = "<div class='success'>". _("Preferences updated.")."</div>";
                 $this->view->form = $form;
-                $this->_helper->json->sendJson(array("valid"=>"true", "html"=>$this->view->render('preference/index.phtml')));
+                //$this->_helper->json->sendJson(array("valid"=>"true", "html"=>$this->view->render('preference/index.phtml')));
             } else {
                 $this->view->form = $form;
-                $this->_helper->json->sendJson(array("valid"=>"false", "html"=>$this->view->render('preference/index.phtml')));
+                //$this->_helper->json->sendJson(array("valid"=>"false", "html"=>$this->view->render('preference/index.phtml')));
             }
         }
+        $this->view->logoImg = Application_Model_Preference::GetStationLogo();
+
         $this->view->form = $form;
     }
 
@@ -111,13 +114,9 @@ class PreferenceController extends Zend_Controller_Action
                 Application_Model_Preference::SetSupportFeedback($values["SupportFeedback"]);
                 Application_Model_Preference::SetPublicise($values["Publicise"]);
 
-                $form->Logo->receive();
-                $imagePath = $form->Logo->getFileName();
-
                 Application_Model_Preference::SetStationCountry($values["Country"]);
                 Application_Model_Preference::SetStationCity($values["City"]);
                 Application_Model_Preference::SetStationDescription($values["Description"]);
-                Application_Model_Preference::SetStationLogo($imagePath);
                 if (isset($values["Privacy"])) {
                     Application_Model_Preference::SetPrivacyPolicyCheck($values["Privacy"]);
                 }
@@ -125,10 +124,6 @@ class PreferenceController extends Zend_Controller_Action
             $this->view->statusMsg = "<div class='success'>"._("Support setting updated.")."</div>";
         }
 
-        $logo = Application_Model_Preference::GetStationLogo();
-        if ($logo) {
-            $this->view->logoImg = $logo;
-        }
         $privacyChecked = false;
         if (Application_Model_Preference::GetPrivacyPolicyCheck() == 1) {
             $privacyChecked = true;

airtime_mvc/application/forms/GeneralPreferences.php

@@ -1,11 +1,14 @@
 <?php
 
+require_once 'customfilters/ImageSize.php';
+
 class Application_Form_GeneralPreferences extends Zend_Form_SubForm
 {
 
     public function init()
     {
         $maxLens = Application_Model_Show::getMaxLengths();
+        $this->setEnctype(Zend_Form::ENCTYPE_MULTIPART);
 
         $notEmptyValidator = Application_Form_Helper_ValidationTypes::overrideNotEmptyValidator();
         $rangeValidator = Application_Form_Helper_ValidationTypes::overrideBetweenValidator(0, 59.9);
@@ -34,6 +37,18 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
         $stationDescription->setAttrib('rows', 4);
         $this->addElement($stationDescription);
 
+        // Station Logo
+        $stationLogoUpload = new Zend_Form_Element_File('stationLogo');
+        $stationLogoUpload->setLabel(_('Station Logo:'))
+            ->setDescription(_("Note: Anything larger than 600x600 will be resized."))
+            ->setRequired(false)
+            ->addValidator('Count', false, 1)
+            ->addValidator('Extension', false, 'jpg,jpeg,png,gif')
+            ->setMaxFileSize(1000000)
+            ->addFilter('ImageSize');
+        $stationLogoUpload->setAttrib('accept', 'image/*');
+        $this->addElement($stationLogoUpload);
+
         //Default station crossfade duration
         $this->addElement('text', 'stationDefaultCrossfadeDuration', array(
             'class' => 'input_text',

airtime_mvc/application/forms/Preferences.php

@@ -7,9 +7,6 @@ class Application_Form_Preferences extends Zend_Form
     {
         $baseUrl = Application_Common_OsPath::getBaseDir();
 
-        $this->setMethod('post');
-
-
         $this->setDecorators(array(
             array('ViewScript', array('viewScript' => 'form/preferences.phtml'))
         ));
@@ -31,5 +28,12 @@ class Application_Form_Preferences extends Zend_Form
         $soundcloud_pref = new Application_Form_SoundcloudPreferences();
         $this->addSubForm($soundcloud_pref, 'preferences_soundcloud');
 
+        $submit = new Zend_Form_Element_Submit('submit');
+        $submit->setLabel(_('Save'));
+        //$submit->removeDecorator('Label');
+        $submit->setAttribs(array('class'=>'btn right-floated'));
+        $submit->removeDecorator('DtDdWrapper');
+
+        $this->addElement($submit);
     }
 }

airtime_mvc/application/forms/SupportSettings.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'customfilters/ImageSize.php';
-
 class Application_Form_SupportSettings extends Zend_Form
 {
 
@@ -96,17 +94,6 @@ class Application_Form_SupportSettings extends Zend_Form
                     ->setAttrib('COLS','58');
         $this->addElement($description);
 
-        // Station Logo
-        $upload = new Zend_Form_Element_File('Logo');
-        $upload->setLabel(_('Station Logo:'))
-                ->setRequired(false)
-                ->setDecorators(array('File'))
-                ->addValidator('Count', false, 1)
-                ->addValidator('Extension', false, 'jpg,jpeg,png,gif')
-                ->addFilter('ImageSize');
-        $upload->setAttrib('accept', 'image/*');
-        $this->addElement($upload);
-
             //enable support feedback
             $this->addElement('checkbox', 'SupportFeedback', array(
                 'label'      => _('Send support feedback'),

airtime_mvc/application/views/scripts/form/preferences.phtml

@@ -1,7 +1,7 @@
 <form method="<?php echo $this->element->getMethod() ?>" enctype="multipart/form-data">
     <?php echo $this->element->getElement('csrf') ?>
-    <?php echo $this->element->getSubform('preferences_general') ?>
 
+    <?php echo $this->element->getSubform('preferences_general') ?>
     <h3 class="collapsible-header" id="email-server-heading"><span class="arrow-icon"></span><?php echo _("Email / Mail Server Settings"); ?></h3>
     <div class="collapsible-content" id="email-server-settings">
         <?php echo $this->element->getSubform('preferences_email_server') ?>
@@ -12,5 +12,7 @@
     <div class="collapsible-content" id="soundcloud-settings">
         <?php echo $this->element->getSubform('preferences_soundcloud') ?>
     </div>
+    <br>
+    <?php echo $this->element->submit->render() ?>
 
 </form>

airtime_mvc/application/views/scripts/form/preferences_general.phtml

@@ -5,6 +5,10 @@
 
         <?php echo $this->element->getElement('stationDescription')->render() ?>
 
+        <?php echo $this->element->getElement('stationLogo')->render() ?>
+
+        <div id="Logo-img-container"><img id="logo-img" onload='resizeImg(this, 450, 450);' src="data:image/png;base64,<?php echo $this->element->getView()->logoImg ?>" /></div>
+
         <?php echo $this->element->getElement('locale')->render() ?>
 
         <?php echo $this->element->getElement('timezone')->render() ?>

airtime_mvc/application/views/scripts/form/support-setting.phtml

@@ -143,26 +143,6 @@
                 </ul>
             <?php endif; ?>
         </dd>
-        <dt id="Logo-label" class="block-display">
-            <label class="optional" for="Description"><?php echo $this->element->getElement('Logo')->getLabel() ?></label>
-        </dt>
-        <dd id="Logo-element" class="block-display clearfix">
-            <?php if($this->element->getView()->logoImg){?>
-            <div id="Logo-img-container"><img id="logo-img" onload='resizeImg(this, 450, 450);' src="data:image/png;base64,<?php echo $this->element->getView()->logoImg ?>" /></div>
-            <?php }?>
-            
-            <?php echo $this->element->getElement('Logo') ?>
-            <div class="info-text">
-                <p><?php echo _("Note: Anything larger than 600x600 will be resized.")?></p>
-            </div>
-            <?php if($this->element->getElement('Logo')->hasErrors()) : ?>
-                <ul class='errors'>
-                    <?php foreach($this->element->getElement('Logo')->getMessages() as $error): ?>
-                        <li><?php echo $error; ?></li>
-                    <?php endforeach; ?>
-                </ul>
-            <?php endif; ?>
-        </dd>
     </dl>
     <div id="show_what_sending" style="display: block;">
         <fieldset class="display_field toggle closed">

airtime_mvc/application/views/scripts/preference/index.phtml

@@ -1,9 +1,9 @@
 <div class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong preferences">
 <h2 style="float:left"><?php echo _("Preferences") ?></h2>
 <?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
-<form method="post" id="pref_form" enctype="application/x-www-form-urlencoded">
+<form method="post" id="pref_form" enctype="multipart/form-data">
 
-    <button name="pref_save" id="pref_save" type="button" class="btn right-floated"><?php echo _("Save") ?></button>
+    <?php echo $this->form->getElement('submit')->render() ?>
     <div style="clear:both"></div>
 
     <?php
@@ -11,6 +11,5 @@
         echo $this->form;
     ?>
     <br />
-    <button name="pref_save" id="pref_save" type="button" class="btn right-floated"><?php echo _("Save") ?></button>
 </form>
 </div>

airtime_mvc/public/css/styles.css

@@ -2121,6 +2121,7 @@ span.errors.sp-errors{
 }
 .preferences {
     width: 500px;
+    margin-bottom: 40px;
 }
 .manage-folders {
     width: 610px;

airtime_mvc/public/js/airtime/preferences/preferences.js

@@ -104,6 +104,7 @@ $(document).ready(function() {
         return false;
     }).next().hide();
 
+    /* No longer using AJAX for this form. Zend + our code makes it needlessly hard to deal with. -- Albert
     $('#pref_save').live('click', function() {
         var data = $('#pref_form').serialize();
         var url = baseUrl+'Preference/index';
@@ -116,7 +117,7 @@ $(document).ready(function() {
             setConfigureMailServerListener();
             setEnableSystemEmailsListener();
         });
-    });
+    });*/
 
     showErrorSections();