summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authorSebastian Schmelzer2012-01-11 15:59:04 +0100
committerSebastian Schmelzer2012-01-11 15:59:04 +0100
commitac7df5d8551cbacf60f9adc770783a710737fa90 (patch)
tree6d4823587c44e1e5551a191e6a86547b41a52320 /library
parentfix stylecode output (diff)
downloadpbs2-ac7df5d8551cbacf60f9adc770783a710737fa90.tar.gz
pbs2-ac7df5d8551cbacf60f9adc770783a710737fa90.tar.xz
pbs2-ac7df5d8551cbacf60f9adc770783a710737fa90.zip
fix stupid checkstyle bugs .. once again..
Diffstat (limited to 'library')
-rw-r--r--library/Pbs/Controller/Plugin/Modularlayout.php2
-rw-r--r--library/Pbs/Filter.php4
-rw-r--r--library/Pbs/Graph.php18
-rw-r--r--library/Pbs/Notifier.php16
-rw-r--r--library/Pbs/Pagination.php22
-rw-r--r--library/Pbs/Search.php30
6 files changed, 46 insertions, 46 deletions
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 = "<div class='infobox'>";
- $result2 . = "<table class='json'>";
- $result2 . = "<tr><td><b>info</b>: </td><td>".$result['info']."</td></tr>";
- $result2 . = "<tr><td><b>kernel</b>: </td><td><a href=".$result['kernel'].">".$result['kernel']."<a></td></tr>";
- $result2 . = "<tr><td><b>initramfs</b>: </td><td><a href=".$result['initramfs'].">".$result['initramfs']."<a></td></tr>";
- $result2 . = "<tr><td><b>kcl</b>: </td><td><a href=".$result['kcl'].">".$result['kcl']."<a></td></tr>";
- $result2 . = "<tr><td><b>config</b>: </td><td>".$result['config']."</td></tr>";
- $result2 . = "</table>";
- $result2 . = "</div>";
+ $result2 .= "<table class='json'>";
+ $result2 .= "<tr><td><b>info</b>: </td><td>".$result['info']."</td></tr>";
+ $result2 .= "<tr><td><b>kernel</b>: </td><td><a href=".$result['kernel'].">".$result['kernel']."<a></td></tr>";
+ $result2 .= "<tr><td><b>initramfs</b>: </td><td><a href=".$result['initramfs'].">".$result['initramfs']."<a></td></tr>";
+ $result2 .= "<tr><td><b>kcl</b>: </td><td><a href=".$result['kcl'].">".$result['kcl']."<a></td></tr>";
+ $result2 .= "<tr><td><b>config</b>: </td><td>".$result['config']."</td></tr>";
+ $result2 .= "</table>";
+ $result2 .= "</div>";
$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 = "<div class='pbs_pagination'>";
if ( 1 <= $selected) {
- $str . = "<a href='$url/page/0' >&lt;&lt;</a>";
- $str . = "<a href='$url/page/".(($selected) - 1)."' rel='next'>&lt;</a>";
+ $str .= "<a href='$url/page/0' >&lt;&lt;</a>";
+ $str .= "<a href='$url/page/".(($selected) - 1)."' rel='next'>&lt;</a>";
} else {
- $str . = "<span class='disabled'>&lt;&lt;</span>";
- $str . = "<span class='disabled'>&lt;</span>";
+ $str .= "<span class='disabled'>&lt;&lt;</span>";
+ $str .= "<span class='disabled'>&lt;</span>";
}
#
$rightleft = 2;
for($i = 0; $i < ($max); $i++) {
if($selected == $i)
- { $str . = "<a class='active'>".($i + 1) ."</a> "; }
+ { $str .= "<a class='active'>".($i + 1) ."</a> "; }
else if($i >= $selected - $rightleft && $i <= $selected + $rightleft)
- { $str . = "<a href='$url/page/".($i)."'>".($i + 1) ."</a> "; }
+ { $str .= "<a href='$url/page/".($i)."'>".($i + 1) ."</a> "; }
}
#
if ( $max - 2 >= $selected) {
- $str . = "<a href='$url/page/".(($selected) + 1)."'>&gt;</a> ";
- $str . = "<a href='$url/page/".($max - 1)."'>&gt;&gt;</a> ";
+ $str .= "<a href='$url/page/".(($selected) + 1)."'>&gt;</a> ";
+ $str .= "<a href='$url/page/".($max - 1)."'>&gt;&gt;</a> ";
} else {
- $str . = "<span class='disabled'>&gt;</span> ";
- $str . = "<span class='disabled'>&gt;&gt;</span> ";
+ $str .= "<span class='disabled'>&gt;</span> ";
+ $str .= "<span class='disabled'>&gt;&gt;</span> ";
}
- $str . = "</div>";
+ $str .= "</div>";
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 = "<form style='float:left;' action='";
if($this->type == '') {
- $str . = "/user/".$this->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 .= "'>
<div><input type='text' id='search' name='search' ".(($this->searchTerm != '') ? 'value="'.htmlentities($this->searchTerm, ENT_QUOTES).'"' : '')." />
<button type='submit' class='searchbutton' value='search'> Search</button></div>";
$highlight = array();
if($this->searchTerm != '') {
- $str . = "<a href='/user/".$this->module."/'><img src='/media/img/delete.png' alt='Delete Client'/></a>";
- $str . = "<div class='searchsub'>$this->countresult result".(($this->countresult == 1) ? '' : 's')." found</div>";
- $str . = "<script type='text/javascript' src='/media/js/jquery.highlight-3.js'></script>";
+ $str .= "<a href='/user/".$this->module."/'><img src='/media/img/delete.png' alt='Delete Client'/></a>";
+ $str .= "<div class='searchsub'>$this->countresult result".(($this->countresult == 1) ? '' : 's')." found</div>";
+ $str .= "<script type='text/javascript' src='/media/js/jquery.highlight-3.js'></script>";
foreach($this->getSearchTerms() as $term) {
$highlight[] = "$('table').highlight('".$term."');";
$highlight[] = "$('.element .number').highlight('".$term."');";
@@ -45,13 +45,13 @@ class Pbs_Search {
}
}
- $str . = "<div class='searchsub dsf'>Display searchfilter</div>";
- $str . = "<script type='text/javascript'>
+ $str .= "<div class='searchsub dsf'>Display searchfilter</div>";
+ $str .= "<script type='text/javascript'>
$(document).ready(function(){";
- $str . = implode("\n", $highlight);
- $str . = "$('.searchvars').data('m','0');\n";
+ $str .= implode("\n", $highlight);
+ $str .= "$('.searchvars').data('m','0');\n";
- $str . = "$('.dsf')
+ $str .= "$('.dsf')
.click(function(){
if($('.searchvars').is(':visible') == false){
$('.searchvars').data('m','1').slideDown();
@@ -60,10 +60,10 @@ class Pbs_Search {
$('.searchvars').data('m','0').slideUp();
}
});";
- $str . = "$('.searchvars .code').click(function(){
+ $str .= "$('.searchvars .code').click(function(){
$('#search').val($('#search').val()+' '+$(this).text()+':');
});";
- $str . = "$('#search')
+ $str .= "$('#search')
.focus(function() {
$('table th .code').show();
$('.searchvars').slideDown();
@@ -76,9 +76,9 @@ class Pbs_Search {
$('table th').click(function(){
$('#search').val($('#search').val()+' '+$(this).find('.code').text()+':');
});";
- $str . = "});
+ $str .= "});
</script>";
- $str . = "</form>";
+ $str .= "</form>";
return $str;
}
public function setModule($m) {