Merge branch '2.5.x' into cc-5709-airtime-analyzer

Conflicts:
	airtime_mvc/application/controllers/PluploadController.php
	airtime_mvc/application/views/scripts/plupload/index.phtml

airtime_mvc/application/views/scripts/form/edit-user.phtml

@@ -157,6 +157,9 @@
                 </ul>
             <?php endif; ?> 
         </dd>
+
+        <?php echo $this->element->getElement('csrf') ?>
+
         <button type="submit" id="cu_save_user" class="btn btn-small right-floated"><?php echo _("Save")?></button>
     </dl>
 </form>

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

@@ -27,6 +27,8 @@
     <dd id="locale-element">
       <?php echo $this->element->getElement('locale') ?>
     </dd>
+
+    <?php echo $this->element->getElement('csrf') ?>
     
     <?php if (Application_Model_Preference::GetEnableSystemEmail()): ?>
         <dt id="reset-label" class="hidden">&nbsp;</dt>

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

@@ -1,5 +1,5 @@
 <form method="<?php echo $this->element->getMethod() ?>" enctype="multipart/form-data">
-
+    <?php echo $this->element->getElement('csrf') ?>
     <?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>

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

@@ -2,6 +2,7 @@
 #plupload_files input[type="file"] {
     font-size: 200px !important;
 }
+<<<<<<< HEAD
 </style>
 <?php if ($this->quotaLimitReached) { ?>
     <div class="errors quota-reached">
@@ -11,7 +12,8 @@
 }
 ?>
 <form id="plupload_form" <?php if ($this->quotaLimitReached) { ?> class="hidden" <?php } ?>>
-	<div id="plupload_files"></div>	
+    <?php echo $this->form->getElement('csrf') ?>
+    <div id="plupload_files"></div>	
 </form>
 <div id="plupload_error">
 	<table></table>

airtime_mvc/application/views/scripts/preference/stream-setting.phtml

@@ -4,6 +4,7 @@
     <?php if($this->enable_stream_conf == "true"){?>
     <form method="post" id="stream_form" enctype="application/x-www-form-urlencoded">
     <button name="stream_save" id="stream_save" type="button" class="btn btn-small right-floated"><?php echo _("Save") ?></button>
+    <?php echo $this->form->getElement('csrf') ?>
     <div style="clear:both"></div>
     <?php }?>
   <?php echo $this->statusMsg;?>