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

CC-4090: Make code style PSR compliant - part 4

Browse source 
-models dir
This commit is contained in:
Martin Konecny 2012-08-29 10:58:03 -04:00
parent 699a49a103
commit 4848717d4d
17 changed files with 439 additions and 404 deletions
Download patch file Download diff file Expand all files Collapse all files

17
airtime_mvc/application/models/Datatables.php
View file

@ -15,7 +15,7 @@ class Application_Model_Datatables
} else {
$input1 = $term;
}
if ($isRange) {
$sub = array();
if ($input1 != null) {
@ -33,6 +33,7 @@ class Application_Model_Datatables
}
}
}
return implode(" AND ", $where);
}
/*
@ -41,7 +42,7 @@ class Application_Model_Datatables
public static function findEntries($con, $displayColumns, $fromTable, $data, $dataProp = "aaData")
{
$librarySetting = Application_Model_Preference::getCurrentLibraryTableSetting();
// map that maps original column position to db name
$current2dbname = array();
// array of search terms
@ -50,22 +51,22 @@ class Application_Model_Datatables
if (strstr($key, "mDataProp_")) {
list($dump, $index) = explode("_", $key);
$current2dbname[$index] = $d;
} else if (strstr($key, "sSearch_")) {
list($dump, $index) = explode("_", $key);
} elseif (strstr($key, "sSearch_")) {
list($dump, $index) = explode("_", $key);
$orig2searchTerm[$index] = $d;
}
}
// map that maps current column position to original position
$current2orig = $librarySetting['ColReorder'];
// map that maps dbname to searchTerm
$dbname2searchTerm = array();
foreach ($current2dbname as $currentPos=>$dbname) {
$dbname2searchTerm[$dbname] = $orig2searchTerm[$current2orig[$currentPos]];
}
$where = array();
$advancedWhere = self::buildWhereClauseForAdvancedSearch($dbname2searchTerm);
if ($advancedWhere != "") {
$where[] = $advancedWhere;
@ -158,7 +159,7 @@ class Application_Model_Datatables
if ($r['ftype'] == 'playlist') {
$pl = new Application_Model_Playlist($r['id']);
$r['length'] = $pl->getLength();
} else if ($r['ftype'] == "block") {
} elseif ($r['ftype'] == "block") {
$bl = new Application_Model_Block($r['id']);
if ($bl->isStatic()) {
$r['bl_type'] = 'static';