Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sql-changes' 

Conflicts:
	airtime_mvc/application/models/StreamSetting.php
	airtime_mvc/application/models/Subjects.php
This commit is contained in:
Naomi 2013-05-10 12:23:57 -04:00
parent 5666b688a0 540e817101
commit d5e7185789
1 changed files with 6 additions and 4 deletions
airtime_mvc/application/models
StreamSetting.php

10
airtime_mvc/application/models/StreamSetting.php
View File

@ -72,14 +72,14 @@ class Application_Model_StreamSetting
."WHERE keyname LIKE '%_enable' "
."AND value='true'";
$rows = $con->query($sql)->fetchAll();
$ids = array();
$rows = Application_Common_Database::prepareAndExecute($sql, array(), 'all');
foreach ($rows as $row) {
$ids[] = substr($row["keyname"], 0, strpos($row["keyname"], "_"));
}
//Logging::info(print_r($ids, true));
return $ids;
}
@ -91,7 +91,8 @@ class Application_Model_StreamSetting
."FROM cc_stream_setting "
."WHERE keyname IN ('output_sound_device', 'icecast_vorbis_metadata')";
$rows = $con->query($sql)->fetchAll();
$rows = Application_Common_Database::prepareAndExecute($sql, array(), 'all');
$data = array();
foreach ($rows as $row) {
@ -165,7 +166,7 @@ class Application_Model_StreamSetting
." FROM cc_stream_setting"
." WHERE keyname not like '%_error' AND keyname not like '%_admin_%'";
$rows = $con->query($sql)->fetchAll();
$rows = Application_Common_Database::prepareAndExecute($sql, array(), 'all');
$exists = array();
@ -468,6 +469,7 @@ class Application_Model_StreamSetting
}
public static function GetAllListenerStatErrors(){
$sql = "SELECT * FROM cc_stream_setting WHERE keyname like :p1";
$mounts = Application_Common_Database::prepareAndExecute($sql, array(':p1'=>'%_mount'));