From ac7df5d8551cbacf60f9adc770783a710737fa90 Mon Sep 17 00:00:00 2001 From: Sebastian Schmelzer Date: Wed, 11 Jan 2012 15:59:04 +0100 Subject: fix stupid checkstyle bugs .. once again.. --- library/Pbs/Controller/Plugin/Modularlayout.php | 2 +- library/Pbs/Filter.php | 4 ++-- library/Pbs/Graph.php | 18 +++++++-------- library/Pbs/Notifier.php | 16 ++++++------- library/Pbs/Pagination.php | 22 +++++++++--------- library/Pbs/Search.php | 30 ++++++++++++------------- 6 files changed, 46 insertions(+), 46 deletions(-) (limited to 'library') diff --git a/library/Pbs/Controller/Plugin/Modularlayout.php b/library/Pbs/Controller/Plugin/Modularlayout.php index 8aa58ea..0f4bfc8 100644 --- a/library/Pbs/Controller/Plugin/Modularlayout.php +++ b/library/Pbs/Controller/Plugin/Modularlayout.php @@ -25,7 +25,7 @@ class Pbs_Controller_Plugin_Modularlayout extends Zend_Controller_Plugin_Abstrac if (isset($config[$moduleName]['resources']['layout']['layoutPath']) && $moduleName != 'default') { $layoutPath = $config[$moduleName]['resources']['layout']['layoutPath']; $moduleDir = Zend_Controller_Front::getInstance()->getModuleDirectory(); - $moduleDir . = "/layouts"; + $moduleDir .= "/layouts"; $layoutScript = $config[$moduleName]['resources']['layout']['layout']; $str = $moduleDir."/".$layoutScript; Zend_Layout::getMvcInstance()->setLayoutPath($moduleDir/*. DIRECTORY_SEPARATOR .$layoutPath*/); diff --git a/library/Pbs/Filter.php b/library/Pbs/Filter.php index a0788e6..09d55b2 100644 --- a/library/Pbs/Filter.php +++ b/library/Pbs/Filter.php @@ -394,8 +394,8 @@ class Pbs_Filter { foreach($result as $e) { $queryTmp[] = "filterID = '$e'"; } - $query . = implode(" OR ", $queryTmp); - $query . = 'ORDER BY priority DESC LIMIT 0,1'; + $query .= implode(" OR ", $queryTmp); + $query .= 'ORDER BY priority DESC LIMIT 0,1'; $bootmenuID = 'null'; try { $stmt = $db->query($query); diff --git a/library/Pbs/Graph.php b/library/Pbs/Graph.php index 4ab1f79..7823a4b 100644 --- a/library/Pbs/Graph.php +++ b/library/Pbs/Graph.php @@ -34,20 +34,20 @@ class Pbs_Graph { graph[ bgcolor=transparent ]; node [ style=filled fillcolor="#ffffffff" ];'; if($this->level < 0) - { $this->graphstring . = '"'.$this->getGroupTitle($groupID).'"'; } + { $this->graphstring .= '"'.$this->getGroupTitle($groupID).'"'; } else - { $this->graphstring . = '"'.$this->getGroupTitle($groupID).'" [ fontcolor="#ffffffff", style=filled, fillcolor="#004A99FF"];'; } + { $this->graphstring .= '"'.$this->getGroupTitle($groupID).'" [ fontcolor="#ffffffff", style=filled, fillcolor="#004A99FF"];'; } if(count($this->childs) >= 1) { foreach($this->childs as $childID) { $this->edges[$groupID][$childID] = 1; - $this->graphstring . = '"'.$this->getGroupTitle($groupID).'" -> "'.$this->getGroupTitle($childID).'";'."\n"; + $this->graphstring .= '"'.$this->getGroupTitle($groupID).'" -> "'.$this->getGroupTitle($childID).'";'."\n"; $this->getChildGroups($childID); } } $this->getParentGroups($groupID); $this->getChildGroups($groupID); - $this->graphstring . = '}'; + $this->graphstring .= '}'; // for debugging # $fp = fopen($path.'thisgraph.dot', "w"); @@ -79,8 +79,8 @@ class Pbs_Graph { if(!file_exists($path.$md5.".png")) { $str = 'echo "'; - $str . = $this->graphstring; - $str . = '" | dot -Tpng >'.$path.$md5.".png"; + $str .= $this->graphstring; + $str .= '" | dot -Tpng >'.$path.$md5.".png"; exec($str); } @@ -109,7 +109,7 @@ class Pbs_Graph { // save the current groupID in level-list #$data[$level][] = $row['parentID']; if($this->edges[$row['parentID']][$groupID] != 1) { - $this->graphstring . = '"'.$this->getGroupTitle($row['parentID']).'" -> "'.$this->getGroupTitle($groupID).'";'."\n"; + $this->graphstring .= '"'.$this->getGroupTitle($row['parentID']).'" -> "'.$this->getGroupTitle($groupID).'";'."\n"; $this->edges[$row['parentID']][$groupID] = 1; } // get the function recursive an increase the level @@ -130,11 +130,11 @@ class Pbs_Graph { // save the current groupID in level-list #$data[$level][] = $row['groupID']; if(@$this->edges[$groupID][$row['groupID']] != 1) { - $this->graphstring . = '"'.$this->getGroupTitle($groupID).'" -> "'.$this->getGroupTitle($row['groupID']).'";'."\n"; + $this->graphstring .= '"'.$this->getGroupTitle($groupID).'" -> "'.$this->getGroupTitle($row['groupID']).'";'."\n"; $this->edges[$groupID][$row['groupID']] = 1; } if($this->level >= $level) { - $this->graphstring . = '"'.$this->getGroupTitle($row['groupID']).'"'.' [ fontcolor="#ffffffff", style=filled, fillcolor="#004A99FF"];'."\n"; + $this->graphstring .= '"'.$this->getGroupTitle($row['groupID']).'"'.' [ fontcolor="#ffffffff", style=filled, fillcolor="#004A99FF"];'."\n"; } // get the function recursive an increase the level $this->getChildGroups($row['groupID'], $level + 1); diff --git a/library/Pbs/Notifier.php b/library/Pbs/Notifier.php index f2c67d5..3a82924 100644 --- a/library/Pbs/Notifier.php +++ b/library/Pbs/Notifier.php @@ -150,14 +150,14 @@ class Pbs_Notifier { $result = unserialize($result); $result2 = "
"; - $result2 . = ""; - $result2 . = ""; - $result2 . = ""; - $result2 . = ""; - $result2 . = ""; - $result2 . = ""; - $result2 . = "
info: ".$result['info']."
kernel: ".$result['kernel']."
initramfs: ".$result['initramfs']."
kcl: ".$result['kcl']."
config: ".$result['config']."
"; - $result2 . = "
"; + $result2 .= ""; + $result2 .= ""; + $result2 .= ""; + $result2 .= ""; + $result2 .= ""; + $result2 .= ""; + $result2 .= "
info: ".$result['info']."
kernel: ".$result['kernel']."
initramfs: ".$result['initramfs']."
kcl: ".$result['kcl']."
config: ".$result['config']."
"; + $result2 .= ""; $result = $result2; } break; diff --git a/library/Pbs/Pagination.php b/library/Pbs/Pagination.php index 504d70c..abb38cd 100644 --- a/library/Pbs/Pagination.php +++ b/library/Pbs/Pagination.php @@ -31,32 +31,32 @@ class Pbs_Pagination { $str = "
"; if ( 1 <= $selected) { - $str . = "<<"; - $str . = ""; + $str .= "<<"; + $str .= ""; } else { - $str . = "<<"; - $str . = "<"; + $str .= "<<"; + $str .= "<"; } # $rightleft = 2; for($i = 0; $i < ($max); $i++) { if($selected == $i) - { $str . = "".($i + 1) ." "; } + { $str .= "".($i + 1) ." "; } else if($i >= $selected - $rightleft && $i <= $selected + $rightleft) - { $str . = "".($i + 1) ." "; } + { $str .= "".($i + 1) ." "; } } # if ( $max - 2 >= $selected) { - $str . = "> "; - $str . = ">> "; + $str .= "> "; + $str .= ">> "; } else { - $str . = "> "; - $str . = ">> "; + $str .= "> "; + $str .= ">> "; } - $str . = "
"; + $str .= ""; return $str; } public function setPerPage($perpage) { diff --git a/library/Pbs/Search.php b/library/Pbs/Search.php index e040863..b919a36 100644 --- a/library/Pbs/Search.php +++ b/library/Pbs/Search.php @@ -23,19 +23,19 @@ class Pbs_Search { public function searchForm() { $str = "
module."/search"; + $str .= "/user/".$this->module."/search"; } else { - $str . = "/user/".$this->module."/search/type/".$this->type; + $str .= "/user/".$this->module."/search/type/".$this->type; } - $str . = "'> + $str .= "'>
searchTerm != '') ? 'value="'.htmlentities($this->searchTerm, ENT_QUOTES).'"' : '')." />
"; $highlight = array(); if($this->searchTerm != '') { - $str . = "Delete Client"; - $str . = "
$this->countresult result".(($this->countresult == 1) ? '' : 's')." found
"; - $str . = ""; + $str .= "Delete Client"; + $str .= "
$this->countresult result".(($this->countresult == 1) ? '' : 's')." found
"; + $str .= ""; foreach($this->getSearchTerms() as $term) { $highlight[] = "$('table').highlight('".$term."');"; $highlight[] = "$('.element .number').highlight('".$term."');"; @@ -45,13 +45,13 @@ class Pbs_Search { } } - $str . = "
Display searchfilter
"; - $str . = ""; - $str . = "
"; + $str .= ""; return $str; } public function setModule($m) { -- cgit v1.2.3-55-g7522