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

Merge branch 'sql-changes'

Browse source 
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
commit d5e7185789
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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