From 8ca1caecbee4eff7f3959539dba9fe44131fbe97 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Thu, 30 May 2013 15:52:29 -0400 Subject: [PATCH 1/4] CC-5194: Fail to execute phone_home_stat -fixed by using native Zend autoloader --- utils/phone_home_stat.php | 90 ++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 54 deletions(-) diff --git a/utils/phone_home_stat.php b/utils/phone_home_stat.php index 3de05a8da..d09d85c49 100644 --- a/utils/phone_home_stat.php +++ b/utils/phone_home_stat.php @@ -1,4 +1,17 @@ registerNamespace('Application_'); + +$resourceLoader = new Zend_Loader_Autoloader_Resource(array( + 'basePath' => $CC_CONFIG['phpDir'].'/'.'application', + 'namespace' => 'Application', + 'resourceTypes' => array( + 'model' => array( + 'path' => 'models/', + 'namespace' => 'Model', + ), + 'common' => array( + 'path' => 'common/', + 'namespace' => 'Common', + ), + ), +)); $infoArray = Application_Model_Preference::GetSystemInfo(true); @@ -88,6 +82,7 @@ if(Application_Model_Preference::GetSupportFeedback() == '1'){ curl_close($ch); } + // Get latest version from stat server and store to db if(Application_Model_Preference::GetPlanLevel() == 'disabled'){ $url = 'http://stat.sourcefabric.org/airtime-stats/airtime_latest_version'; @@ -113,16 +108,3 @@ if(Application_Model_Preference::GetPlanLevel() == 'disabled'){ curl_close($ch); } -/** - * Ensures that the user is running this PHP script with root - * permissions. If not running with root permissions, causes the - * script to exit. - */ -function exitIfNotRoot() -{ - // Need to check that we are superuser before running this. - if(posix_geteuid() != 0){ - echo "Must be root user.\n"; - exit(1); - } -} From 891cc8006918d2e2d12daef812796b25175e1aa3 Mon Sep 17 00:00:00 2001 From: Naomi Date: Thu, 30 May 2013 16:52:03 -0400 Subject: [PATCH 2/4] CC-5190 : Playlist: Copy playlist will lost cue in/out setting --- airtime_mvc/application/models/Playlist.php | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php index e01484d2f..23150d266 100644 --- a/airtime_mvc/application/models/Playlist.php +++ b/airtime_mvc/application/models/Playlist.php @@ -154,8 +154,6 @@ class Application_Model_Playlist implements Application_Model_LibraryEditable */ public function getContents($filterFiles=false) { - Logging::info("Getting contents for playlist {$this->id}"); - $sql = <<findPK($p_afterItem); $index = $afterItem->getDbPosition(); - Logging::info("index is {$index}"); + $pos = ($addType == 'after') ? $index + 1 : $index; $contentsToUpdate = CcPlaylistcontentsQuery::create() @@ -500,9 +503,6 @@ SQL; } - Logging::info("Adding to playlist"); - Logging::info("at position {$pos}"); - foreach ($p_items as $ac) { $res = $this->insertPlaylistElement($this->buildEntry($ac, $pos)); @@ -512,8 +512,6 @@ SQL; $db_file->setDbIsPlaylist(true)->save($this->con); $pos = $pos + 1; - Logging::info("Adding $ac[1] $ac[0]"); - } //reset the positions of the remaining items. @@ -745,7 +743,6 @@ SQL; if (!is_null($offset)) { $row->setDbTrackOffset($offset); - Logging::info("Setting offset {$offset} on item {$id}"); $row->save($this->con); } } From 2c35a0416a86fda56ddc1ed35ee12baa6657dd44 Mon Sep 17 00:00:00 2001 From: Naomi Date: Thu, 30 May 2013 16:53:03 -0400 Subject: [PATCH 3/4] clrf fix --- airtime_mvc/application/models/Playlist.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php index 23150d266..7011a501f 100644 --- a/airtime_mvc/application/models/Playlist.php +++ b/airtime_mvc/application/models/Playlist.php @@ -437,10 +437,10 @@ SQL; } $entry["ftype"] = $objType; - $entry["fadein"] = isset($p_item['fadein']) ? + $entry["fadein"] = isset($p_item['fadein']) ? $p_item['fadein'] : $entry["fadein"]; - $entry["fadeout"] = isset($p_item['fadeout']) ? + $entry["fadeout"] = isset($p_item['fadeout']) ? $p_item['fadeout'] : $entry["fadeout"]; } From 26c6a7659e9106da5c163c9726adf5595e0bccc3 Mon Sep 17 00:00:00 2001 From: denise Date: Fri, 31 May 2013 09:28:25 -0400 Subject: [PATCH 4/4] Update to de_DE .po file --- .../locale/de_DE/LC_MESSAGES/airtime.mo | Bin 64017 -> 64776 bytes .../locale/de_DE/LC_MESSAGES/airtime.po | 17 ++++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.mo index 335abd14a219a4a715bae4fe821c60e569d5a9a7..f644c43c28542b520ef415d900090e8f67b46957 100644 GIT binary patch delta 18146 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 diff --git a/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po b/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po index a140f874a..42257b99f 100644 --- a/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po @@ -8,10 +8,9 @@ msgstr "" "Project-Id-Version: Airtime 2.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-05-30 11:13-0400\n" -"PO-Revision-Date: 2013-05-30 13:22-0500\n" +"PO-Revision-Date: 2013-05-31 09:27-0500\n" "Last-Translator: Denise Rigato \n" "Language-Team: German Localization \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -1547,7 +1546,7 @@ msgstr "'Länge' sollte im 00:00:00-Format sein" #: airtime_mvc/application/forms/SmartBlockCriteria.php:513 #: airtime_mvc/application/forms/SmartBlockCriteria.php:526 msgid "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)" -msgstr "" +msgstr "Der Wert muß im Timestamp-Format eingegeben werden (zB. 0000-00-00 oder 0000-00-00 00:00:00)" #: airtime_mvc/application/forms/SmartBlockCriteria.php:540 msgid "The value has to be numeric" @@ -2200,7 +2199,7 @@ msgstr "Zu diesem Pfad besteht momentan kein Zugang." #: airtime_mvc/application/controllers/LocaleController.php:170 #, php-format msgid "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." -msgstr "" +msgstr "Manche Stream-Typen erfordern zusätzliche Konfiguration.Details zum Aktivieren von %sAAC+ Support%s oder %sOpus Support%s sind bereitgestellt." #: airtime_mvc/application/controllers/LocaleController.php:171 msgid "Connected to the streaming server" @@ -2274,7 +2273,7 @@ msgstr "Warnung: Sendungen können nicht neu verknüpft werden" #: airtime_mvc/application/controllers/LocaleController.php:196 msgid "By linking your repeating shows any media items scheduled in any repeat show will also get scheduled in the other repeat shows" -msgstr "" +msgstr "Beim Verknüpfen von Sendungswiederholungen werden jegliche Medien, die in einer wiederholten Sendung geplant sind, auch in den anderen Sendungen geplant." #: airtime_mvc/application/controllers/LocaleController.php:200 msgid "Show" @@ -3646,8 +3645,12 @@ msgstr "Wählen Sie eine Option aus." msgid "No Records" msgstr "Keine Datensätze" -#~ msgid "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)" -#~ msgstr "Der Wert sollte in Zeitstempel-Format vorliegen (z.B. 0000-00-00 oder 00-00-00 00:00:00)" +#~ msgid "" +#~ "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 " +#~ "00:00:00)" +#~ msgstr "" +#~ "Der Wert sollte in Zeitstempel-Format vorliegen (z.B. 0000-00-00 oder " +#~ "00-00-00 00:00:00)" #, fuzzy #~ msgid "Playlist"