Resolved differences merging 2.5.x into saas

airtime_mvc/application/forms/AddUser.php

@@ -21,6 +21,10 @@ class Application_Form_AddUser extends Zend_Form
         $hidden->setDecorators(array('ViewHelper'));
         $this->addElement($hidden);
 
+        $this->addElement('hash', 'csrf', array(
+           'salt' => 'unique'
+        ));
+
         $login = new Zend_Form_Element_Text('login');
         $login->setLabel(_('Username:'));
         $login->setAttrib('class', 'input_text');

airtime_mvc/application/forms/EditUser.php

@@ -22,6 +22,10 @@ class Application_Form_EditUser extends Zend_Form
         $this->setDecorators(array(
                 array('ViewScript', array('viewScript' => 'form/edit-user.phtml', "currentUser" => $currentUser->getLogin()))));
         $this->setAttrib('id', 'current-user-form');
+
+        $this->addElement('hash', 'csrf', array(
+           'salt' => 'unique'
+        ));
         
         $hidden = new Zend_Form_Element_Hidden('cu_user_id');
         $hidden->setDecorators(array('ViewHelper'));

airtime_mvc/application/forms/Login.php

@@ -10,6 +10,10 @@ class Application_Form_Login extends Zend_Form
         // Set the method for the display form to POST
         $this->setMethod('post');
 
+        $this->addElement('hash', 'csrf', array(
+           'salt' => 'unique'
+        ));
+
         $this->setDecorators(array(
             array('ViewScript', array('viewScript' => 'form/login.phtml'))
         ));

airtime_mvc/application/forms/Preferences.php

@@ -13,6 +13,14 @@ class Application_Form_Preferences extends Zend_Form
         ));
 
         $general_pref = new Application_Form_GeneralPreferences();
+
+        $this->addElement('hash', 'csrf', array(
+           'salt' => 'unique',
+           'decorators' => array(
+                'ViewHelper'
+            )
+        ));
+
         $this->addSubForm($general_pref, 'preferences_general');
 
         $soundcloud_pref = new Application_Form_SoundcloudPreferences();