Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '2.1.x' into devel

Browse source 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
This commit is contained in:
denise 2012-07-03 10:42:29 -04:00
commit 3e75b28c9d
6 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/configs/ACL.php
View file

@ -43,7 +43,7 @@ $ccAcl->allow('G', 'index')
->allow('A', 'playouthistory')
->allow('A', 'user')
->allow('A', 'systemstatus')
->allow('A', 'preference', 'admin');
->allow('A', 'preference');
$aclPlugin = new Zend_Controller_Plugin_Acl($ccAcl);

7
airtime_mvc/application/controllers/ApiController.php
View file

@ -136,9 +136,10 @@ class ApiController extends Zend_Controller_Action
*/
if (!$file_base_name) {
$file_base_name = $full_path;
}
$file_base_name = substr($file_base_name, 1);
} else {
$file_base_name = substr($file_base_name, 1);
}
// possibly use fileinfo module here in the future.
// http://www.php.net/manual/en/book.fileinfo.php
$ext = pathinfo($fileID, PATHINFO_EXTENSION);

10
airtime_mvc/application/logging/Logging.php
View file

@ -35,14 +35,20 @@ class Logging {
}
public static function log($p_msg){
$bt = debug_backtrace();
$caller = array_shift($bt);
$logger = self::getLogger();
$logger->info(self::toString($p_msg));
$logger->info(self::toString($p_msg)." - file:".$caller['file'].":".$caller['line']);
}
public static function debug($p_msg){
$bt = debug_backtrace();
$caller = array_shift($bt);
if (defined('APPLICATION_ENV') && APPLICATION_ENV == "development"){
$logger = self::getLogger();
$logger->debug(self::toString($p_msg));
$logger->debug(self::toString($p_msg)." - file:".$caller['file'].":".$caller['line']);
}
}
}

2
airtime_mvc/application/models/ShowBuilder.php
View file

@ -221,7 +221,6 @@ class Application_Model_ShowBuilder {
$row["title"] = $p_item["show_name"];
$row["instance"] = intval($p_item["si_id"]);
$row["image"] = '';
$row["id"] = -1;
$this->getScheduledStatus($startsEpoch, $endsEpoch, $row);
@ -311,7 +310,6 @@ class Application_Model_ShowBuilder {
$row = $this->defaultRowArray;
$row["footer"] = true;
$row["instance"] = intval($p_item["si_id"]);
$row["id"] = -1;
$this->getRowTimestamp($p_item, $row);
$showEndDT = new DateTime($p_item["si_ends"], new DateTimeZone("UTC"));