diff --git a/airtime_mvc/application/controllers/NowplayingController.php b/airtime_mvc/application/controllers/NowplayingController.php index 06cdc0300..dac297494 100644 --- a/airtime_mvc/application/controllers/NowplayingController.php +++ b/airtime_mvc/application/controllers/NowplayingController.php @@ -21,8 +21,11 @@ class NowplayingController extends Zend_Controller_Action //popup if previous page was login $refer_sses = new Zend_Session_Namespace('referrer'); + $userInfo = Zend_Auth::getInstance()->getStorage()->read(); + $user = new User($userInfo->id); + if($refer_sses->referrer == 'login' && Application_Model_Nowplaying::ShouldShowPopUp() - && !Application_Model_Preference::GetSupportFeedback()){ + && !Application_Model_Preference::GetSupportFeedback() && $user->isAdmin()){ $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/register.js','text/javascript'); } } diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index ea2528c73..82b1a1ff3 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -116,42 +116,6 @@ class PreferenceController extends Zend_Controller_Action Application_Model_Preference::SetRemindMeDate($now); die(); } - - /*public function registersubmitAction(){ - $request = $this->getRequest(); - $baseUrl = $request->getBaseUrl(); - - $this->view->headScript()->appendFile($baseUrl.'/js/airtime/preferences/preferences.js','text/javascript'); - $this->view->statusMsg = ""; - - $form = new Application_Form_RegisterAirtime(); - - if ($request->isPost()) { - - if ($form->isValid($request->getPost())) { - - $values = $form->getValues(); - var_dump($values); - Application_Model_Preference::SetHeadTitle($values["stnName"], $this->view); - Application_Model_Preference::SetPhone($values["Phone"]); - Application_Model_Preference::SetEmail($values["Email"]); - Application_Model_Preference::SetStationWebSite($values["StationWebSite"]); - Application_Model_Preference::SetSupportFeedback($values["SupportFeedback"]); - Application_Model_Preference::SetPublicise($values["Publicise"]); - - $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); - - // unset session - Zend_Session::namespaceUnset('referrer'); - } - } - $this->_redirect('Nowplaying'); - }*/ } diff --git a/airtime_mvc/application/forms/RegisterAirtime.php b/airtime_mvc/application/forms/RegisterAirtime.php index 29f0e04fe..ee861cab4 100644 --- a/airtime_mvc/application/forms/RegisterAirtime.php +++ b/airtime_mvc/application/forms/RegisterAirtime.php @@ -17,7 +17,7 @@ class Application_Form_RegisterAirtime extends Zend_Form // Station Name $stnName = new Zend_Form_Element_Text("stnName"); - $stnName->setLabel("Station Name:") + $stnName->setLabel("Station Name:(*)") ->setRequired(true) ->setValue(Application_Model_Preference::GetStationName()) ->setDecorators(array('ViewHelper')); @@ -27,7 +27,7 @@ class Application_Form_RegisterAirtime extends Zend_Form $this->addElement('text', 'Phone', array( 'class' => 'input_text', 'label' => 'Phone:', - 'required' => true, + 'required' => false, 'filters' => array('StringTrim'), 'value' => Application_Model_Preference::GetPhone(), 'decorators' => array( @@ -38,7 +38,7 @@ class Application_Form_RegisterAirtime extends Zend_Form //Email $this->addElement('text', 'Email', array( 'class' => 'input_text', - 'label' => 'Email:', + 'label' => 'Email:(*)', 'required' => true, 'filters' => array('StringTrim'), 'value' => Application_Model_Preference::GetEmail(), @@ -61,7 +61,7 @@ class Application_Form_RegisterAirtime extends Zend_Form // county list dropdown $this->addElement('select', 'Country', array( 'label' => 'Country:', - 'required' => true, + 'required' => false, 'value' => Application_Model_Preference::GetStationCountry(), 'multiOptions' => $country_list, 'decorators' => array( @@ -72,7 +72,7 @@ class Application_Form_RegisterAirtime extends Zend_Form // Station city $this->addElement('text', 'City', array( 'label' => 'City:', - 'required' => true, + 'required' => false, 'class' => 'input_text', 'value' => Application_Model_Preference::GetStationCity(), 'decorators' => array( @@ -84,7 +84,7 @@ class Application_Form_RegisterAirtime extends Zend_Form $description = new Zend_Form_Element_Textarea('Description'); $description->class = 'input_text_area'; $description->setLabel('Station Description:') - ->setRequired(true) + ->setRequired(false) ->setValue(Application_Model_Preference::GetStationDescription()) ->setDecorators(array('ViewHelper')) ->setAttrib('ROWS','2') @@ -99,17 +99,17 @@ class Application_Form_RegisterAirtime extends Zend_Form ->addValidator('Count', false, 1) ->addValidator('Extension', false, 'jpg,png,gif') ->addValidator('ImageSize', false, array( - 'minwidth' => 180, - 'minheight' => 180, - 'maxwidth' => 1000, - 'maxheight' => 1000)); + 'minwidth' => 200, + 'minheight' => 200, + 'maxwidth' => 600, + 'maxheight' => 600)); $this->addElement($upload); //enable support feedback $this->addElement('checkbox', 'SupportFeedback', array( 'label' => 'Send support feedback', 'required' => false, - 'value' => Application_Model_Preference::GetSupportFeedback(), + 'value' => 1, 'decorators' => array( 'ViewHelper' ) @@ -121,9 +121,6 @@ class Application_Form_RegisterAirtime extends Zend_Form ->setRequired(false) ->setDecorators(array('ViewHelper')) ->setValue(Application_Model_Preference::GetPublicise()); - if(!Application_Model_Preference::GetSupportFeedback()){ - $checkboxPublicise->setAttrib("disabled", "disabled"); - } $this->addElement($checkboxPublicise); // text area for sending detail @@ -132,7 +129,8 @@ class Application_Form_RegisterAirtime extends Zend_Form 'required' => false, 'filters' => array('StringTrim'), 'readonly' => true, - 'rows' => 24, + 'rows' => 5, + 'cols' => 61, 'value' => Application_Model_Preference::GetSystemInfo(), 'decorators' => array( 'ViewHelper' diff --git a/airtime_mvc/application/forms/SupportPreferences.php b/airtime_mvc/application/forms/SupportPreferences.php index a3c7a22f1..91dcafe38 100644 --- a/airtime_mvc/application/forms/SupportPreferences.php +++ b/airtime_mvc/application/forms/SupportPreferences.php @@ -16,7 +16,7 @@ class Application_Form_SupportPreferences extends Zend_Form_SubForm $this->addElement('text', 'Phone', array( 'class' => 'input_text', 'label' => 'Phone:', - 'required' => true, + 'required' => false, 'filters' => array('StringTrim'), 'value' => Application_Model_Preference::GetPhone(), 'decorators' => array( @@ -50,7 +50,7 @@ class Application_Form_SupportPreferences extends Zend_Form_SubForm // county list dropdown $this->addElement('select', 'Country', array( 'label' => 'Country:', - 'required' => true, + 'required' => false, 'value' => Application_Model_Preference::GetStationCountry(), 'multiOptions' => $country_list, 'decorators' => array( @@ -61,7 +61,7 @@ class Application_Form_SupportPreferences extends Zend_Form_SubForm // Station city $this->addElement('text', 'City', array( 'label' => 'City:', - 'required' => true, + 'required' => false, 'class' => 'input_text', 'value' => Application_Model_Preference::GetStationCity(), 'decorators' => array( @@ -72,7 +72,7 @@ class Application_Form_SupportPreferences extends Zend_Form_SubForm // Station Description $this->addElement('textarea', 'Description', array( 'label' => 'Station Description:', - 'required' => true, + 'required' => false, 'class' => 'input_text_area', 'value' => Application_Model_Preference::GetStationDescription(), 'decorators' => array( diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index b2f55891d..e92ffbe48 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -288,7 +288,7 @@ class Application_Model_Preference return $out; } - public static function GetSystemInfo(){ + public static function GetSystemInfo($returnArray=false){ exec('/usr/bin/airtime-check-system', $output); $output = preg_replace('/\s+/', ' ', $output); @@ -297,7 +297,7 @@ class Application_Model_Preference foreach( $output as $key => &$out){ $info = explode('=', $out); if(isset($info[1])){ - $key = str_replace(' ', '_', $info[0]); + $key = str_replace(' ', '_', trim($info[0])); $key = strtoupper($key); $systemInfoArray[$key] = $info[1]; } @@ -306,17 +306,26 @@ class Application_Model_Preference $outputArray = array(); $outputArray['STATION_NAME'] = Application_Model_Preference::GetStationName(); + $outputArray['PHONE'] = Application_Model_Preference::GetPhone(); + $outputArray['EMAIL'] = Application_Model_Preference::GetEmail(); $outputArray['STATION_WEB_SITE'] = Application_Model_Preference::GetStationWebSite(); $outputArray['STATION_COUNTRY'] = Application_Model_Preference::GetStationCountry(); $outputArray['STATION_CITY'] = Application_Model_Preference::GetStationCity(); $outputArrat['STATION_DESCRIPTION'] = Application_Model_Preference::GetStationDescription(); - //$outputArray['Version'] = $systemInfoArray['AIRTIME_VERSION']; - $outputArray['WEB_SERVER'] = php_sapi_name(); - //$outputArray['OS Info'] = $systemInfoArray['OS']; + + // get web server info + $url = $systemInfoArray["AIRTIME_VERSION_URL"]; + $index = strpos($url,'/api/'); + $url = substr($url, 0, $index); + + $headerInfo = get_headers(trim($url),1); + $outputArray['WEB_SERVER'] = $headerInfo['Server'][0]; + $outputArray['NUM_OF_USERS'] = User::getUserCount(); $outputArray['NUM_OF_SONGS'] = StoredFile::getFileCount(); $outputArray['NUM_OF_PLAYLISTS'] = Playlist::getPlaylistCount(); - $outputArray['NUM_OF_SCHEDULED_PLAYLIST'] = Schedule::getSchduledPlaylistCount(); + $outputArray['NUM_OF_SCHEDULED_PLAYLISTS'] = Schedule::getSchduledPlaylistCount(); + $outputArray['NUM_OF_PAST_SHOWS'] = ShowInstance::GetShowInstanceCount(date("Y-m-d H:i:s")); $outputArray['UNIQUE_ID'] = Application_Model_Preference::GetUniqueId(); $outputArray = array_merge($outputArray, $systemInfoArray); @@ -325,8 +334,11 @@ class Application_Model_Preference foreach($outputArray as $key => $out){ $outputString .= $key.' : '.$out."\n"; } - - return $outputString; + if($returnArray){ + return $outputArray; + }else{ + return $outputString; + } } public static function SetRemindMeDate($now){ diff --git a/airtime_mvc/application/models/Shows.php b/airtime_mvc/application/models/Shows.php index 017bc6178..d52721a26 100644 --- a/airtime_mvc/application/models/Shows.php +++ b/airtime_mvc/application/models/Shows.php @@ -1866,6 +1866,13 @@ class ShowInstance { return new ShowInstance($id); } } + + // returns number of show instances that ends later than $day + public static function GetShowInstanceCount($day){ + global $CC_CONFIG, $CC_DBC; + $sql = "SELECT count(*) as cnt FROM $CC_CONFIG[showInstances] WHERE ends < '$day'"; + return $CC_DBC->GetOne($sql); + } } /* Show Data Access Layer */ diff --git a/airtime_mvc/application/views/scripts/form/register-dialog.phtml b/airtime_mvc/application/views/scripts/form/register-dialog.phtml index dc52af6e6..3e335e434 100644 --- a/airtime_mvc/application/views/scripts/form/register-dialog.phtml +++ b/airtime_mvc/application/views/scripts/form/register-dialog.phtml @@ -1,162 +1,164 @@ -