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

CC-1927: Remove PEAR DB

Browse source 
-various fixes
This commit is contained in:
Martin Konecny 2012-04-19 16:54:38 -04:00
parent 235997c616
commit cba253439a
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -87,7 +87,7 @@ class Application_Model_Preference
} }
$result = $con->query($sql)->fetchColumn(0); $result = $con->query($sql)->fetchColumn(0);
return $result ? $result : ""; return ($result !== false) ? $result : "";
} }
} }

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

@ -459,7 +459,7 @@ class Application_Model_Show {
." ORDER BY last_show DESC"; ." ORDER BY last_show DESC";
$query = $con->query($sql)->fetchColumn(0); $query = $con->query($sql)->fetchColumn(0);
return $query ? $query : ""; return ($query !== false) ? $query : "";
} }
/** /**

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

@ -665,7 +665,7 @@ class Application_Model_ShowInstance {
."LIMIT 1"; ."LIMIT 1";
$query = $con->query($sql)->fetchColumn(0); $query = $con->query($sql)->fetchColumn(0);
return $query ? $query : NULL; return ($query !== false) ? $query : NULL;
} }
public function getShowEndGapTime(){ public function getShowEndGapTime(){

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

@ -44,7 +44,7 @@ class Application_Model_StreamSetting {
." WHERE keyname = '$key'"; ." WHERE keyname = '$key'";
$result = $con->query($sql)->fetchColumn(0); $result = $con->query($sql)->fetchColumn(0);
return $result ? $result : NULL; return ($result !== false) ? $result : NULL;
} }
} }
@ -231,7 +231,7 @@ class Application_Model_StreamSetting {
." WHERE keyname = '$keyname'"; ." WHERE keyname = '$keyname'";
$result = $con->query($sql)->fetchColumn(0); $result = $con->query($sql)->fetchColumn(0);
return $result ? $result : NULL; return ($result !== false) ? $result : NULL;
} }
public static function getStreamEnabled($stream_id) public static function getStreamEnabled($stream_id)

4
airtime_mvc/application/models/Subjects.php
View file

@ -90,7 +90,7 @@ class Application_Model_Subjects {
$sql = "SELECT id FROM ".$CC_CONFIG['subjTable'] $sql = "SELECT id FROM ".$CC_CONFIG['subjTable']
." WHERE login='$login'"; ." WHERE login='$login'";
$query = $con->query($sql)->fetchColumn(0); $query = $con->query($sql)->fetchColumn(0);
return $query ? $query : NULL; return ($query !== false) ? $query : NULL;
} }
@ -140,7 +140,7 @@ class Application_Model_Subjects {
$con = Propel::getConnection(); $con = Propel::getConnection();
$sql = "SELECT login_attempts FROM ".$CC_CONFIG['subjTable']." WHERE login='$login'"; $sql = "SELECT login_attempts FROM ".$CC_CONFIG['subjTable']." WHERE login='$login'";
$res = $con->query($sql)->fetchColumn(0); $res = $con->query($sql)->fetchColumn(0);
return $res ? $res : 0; return ($res !== false) ? $res : 0;
} }
} // class Subjects } // class Subjects

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

@ -238,7 +238,7 @@ class Application_Model_User {
} }
$query = $con->query($sql)->fetchColumn(0); $query = $con->query($sql)->fetchColumn(0);
return $query ? $query : NULL; return ($query !== false) ? $query : NULL;
} }
public static function getHosts($search=NULL) { public static function getHosts($search=NULL) {