Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x

airtime_mvc/application/controllers/PreferenceController.php

@@ -133,6 +133,7 @@ class PreferenceController extends Zend_Controller_Action
         $baseUrl = $request->getBaseUrl();
 
         $this->view->headScript()->appendFile($baseUrl.'/js/airtime/preferences/streamsetting.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/meioMask/jquery.meio.mask.js','text/javascript');
 
         // get current settings
         $temp = Application_Model_StreamSetting::getStreamSetting();

airtime_mvc/application/forms/StreamSetting.php

@@ -68,8 +68,10 @@ class Application_Form_StreamSetting extends Zend_Form
     }
 
     public function isValid($data){
+        if($data['output_sound_device']){
             $this->populate(array("output_sound_device"=>$data['output_sound_device'], "icecast_vorbis_metadata"=>$data['icecast_vorbis_metadata'],
                                 "output_sound_device_type"=>$data['output_sound_device_type'], "streamFormat"=>$data['streamFormat']));
+        }
         return true;
     }
 }

airtime_mvc/application/forms/StreamSettingSubForm.php

@@ -83,10 +83,13 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm{
         $host = new Zend_Form_Element_Text('host');
         $host->setLabel("Server")
                 ->setValue(isset($setting[$prefix.'_host'])?$setting[$prefix.'_host']:"")
+                ->setValidators(array(
+                        array('regex', false, array('/^[0-9a-zA-Z-_.]+$/', 'messages' => 'Invalid character entered'))))
                 ->setDecorators(array('ViewHelper'));
         if($disable_all){
             $host->setAttrib("disabled", "disabled");
         }
+        $host->setAttrib('alt', 'domain');
         $this->addElement($host);
 
         $port = new Zend_Form_Element_Text('port');
@@ -103,10 +106,13 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm{
         $pass = new Zend_Form_Element_Text('pass');
         $pass->setLabel("Password")
                 ->setValue(isset($setting[$prefix.'_pass'])?$setting[$prefix.'_pass']:"")
+                ->setValidators(array(
+                        array('regex', false, array('/^[^ &<>]+$/', 'messages' => 'Invalid character entered'))))
                 ->setDecorators(array('ViewHelper'));
         if($disable_all){
             $pass->setAttrib("disabled", "disabled");
         }
+        $pass->setAttrib('alt', 'regular_text');
         $this->addElement($pass);
 
         $genre = new Zend_Form_Element_Text('genre');
@@ -121,10 +127,13 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm{
         $url = new Zend_Form_Element_Text('url');
         $url->setLabel("URL")
                 ->setValue(isset($setting[$prefix.'_url'])?$setting[$prefix.'_url']:"")
+                ->setValidators(array(
+                        array('regex', false, array('/^[0-9a-zA-Z\-_.:\/]+$/', 'messages' => 'Invalid character entered'))))
                 ->setDecorators(array('ViewHelper'));
         if($disable_all){
             $url->setAttrib("disabled", "disabled");
         }
+        $url->setAttrib('alt', 'url');
         $this->addElement($url);
 
         $description = new Zend_Form_Element_Text('description');
@@ -139,19 +148,25 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm{
         $mount = new Zend_Form_Element_Text('mount');
         $mount->setLabel("Mount Point")
                 ->setValue(isset($setting[$prefix.'_mount'])?$setting[$prefix.'_mount']:"")
+                ->setValidators(array(
+                        array('regex', false, array('/^[^ &<>]+$/', 'messages' => 'Invalid character entered'))))
                 ->setDecorators(array('ViewHelper'));
         if($disable_all){
             $mount->setAttrib("disabled", "disabled");
         }
+        $mount->setAttrib('alt', 'regular_text');
         $this->addElement($mount);
 
         $user = new Zend_Form_Element_Text('user');
         $user->setLabel("Username")
                 ->setValue(isset($setting[$prefix.'_user'])?$setting[$prefix.'_user']:"")
+                ->setValidators(array(
+                        array('regex', false, array('/^[^ &<>]+$/', 'messages' => 'Invalid character entered'))))
                 ->setDecorators(array('ViewHelper'));
         if($disable_all){
             $user->setAttrib("disabled", "disabled");
         }
+        $user->setAttrib('alt', 'regular_text');
         $this->addElement($user);
         
         $liquidsopa_error_msg = '<div class="stream-status status-info"><h3>Getting information from the server...</h3></div>';

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

@@ -174,5 +174,18 @@ $(document).ready(function() {
     
     showErrorSections()
     setInterval('checkLiquidsoapStatus()', 1000)
+    $.mask.rules = {
+        '@': /[^ &<>]/,
+        'u': /[0-9a-zA-Z-_.:/]/,
+        'd': /[0-9a-zA-Z-_.]/
+    }
+    // add masking on the fields that don't allow special chars
+    
+    $.mask.masks = $.extend($.mask.masks,{
+         regular_text:{ mask: '@', type:'repeat', 'maxLength': 256, selectCharsOnFocus: false, autoTab: false, fixedChars : '[(),:/]'},
+         url:{ mask: 'u', type:'repeat', 'maxLength': 261, selectCharsOnFocus: false, autoTab: false, fixedChars : '[(),]'},
+         domain:{ mask: 'd', type:'repeat', 'maxLength': 261, selectCharsOnFocus: false, autoTab: false, fixedChars : '[(),:/]'}
+     })
+    $('input:text').setMask()
     
 });

utils/phone_home_stat.php

@@ -79,7 +79,7 @@ if(Application_Model_Preference::GetSupportFeedback() == '1'){
 
 // Get latest version from stat server and store to db
 if(Application_Model_Preference::GetPlanLevel() == 'disabled'){
-    $url = 'http://stat.sourcefabric.org/airtime_latest_version';
+    $url = 'http://stat.sourcefabric.org/airtime-stats/airtime_latest_version';
     
     $ch = curl_init();
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);