diff options
61 files changed, 220 insertions, 220 deletions
diff --git a/application/Functions.php b/application/Functions.php index 5055f03..5b58c35 100644 --- a/application/Functions.php +++ b/application/Functions.php @@ -15,7 +15,7 @@ function randomString($name_laenge = 16) { mt_srand ((double) microtime() * 1000000); for ($i = 0; $i < $name_laenge; $i++ ) { - $name_neu . = $zeichen {mt_rand (0, strlen($zeichen) - 1)}; + $name_neu .= $zeichen {mt_rand (0, strlen($zeichen) - 1)}; } return $name_neu; } @@ -29,7 +29,7 @@ function print_a() { for($a = 0; $a < $numargs; $a++) { print_a(func_get_arg($a)); } echo "</div>"; - $out . = ob_get_contents(); + $out .= ob_get_contents(); ob_end_clean(); echo $out; } else { diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php index 654ae42..e7b654c 100644 --- a/application/controllers/ResourceController.php +++ b/application/controllers/ResourceController.php @@ -526,12 +526,12 @@ class ResourceController extends Zend_Controller_Action { $result = $return_val; $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><a href=".$result['config'].">".$result['config']."<a></td></tr>"; - $result2 . = "</table>"; + $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><a href=".$result['config'].">".$result['config']."<a></td></tr>"; + $result2 .= "</table>"; echo $result2; } diff --git a/application/models/BootIso.php b/application/models/BootIso.php index 65d56fc..8041fa2 100644 --- a/application/models/BootIso.php +++ b/application/models/BootIso.php @@ -157,7 +157,7 @@ class Application_Model_BootIso { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -165,7 +165,7 @@ class Application_Model_BootIso { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/BootIsoMapper.php b/application/models/BootIsoMapper.php index 4414bb2..35a66d0 100644 --- a/application/models/BootIsoMapper.php +++ b/application/models/BootIsoMapper.php @@ -68,7 +68,7 @@ class Application_Model_BootIsoMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_BootIso'); } @@ -79,7 +79,7 @@ class Application_Model_BootIsoMapper { $data = array('bootisoID' => $botiso->getID() , 'membershipID' => $botiso->getMembershipID() , 'title' => $botiso->getTitle(), 'prebootID' => $botiso->getPrebootID() , 'groupID' => $botiso->getGroupID() , 'serialnumber' => $botiso->getSerialnumber() , 'created' => $botiso->getCreated() , 'expires' => $botiso->getExpires() , 'public' => $botiso->getPublic(), 'description' => $botiso->getDescription() ); - if (null == = ($id = $botiso->getID()) ) { + if (null === ($id = $botiso->getID()) ) { unset($data['bootisoID']); return $this->getDbTable()->insert($data); } else { @@ -88,7 +88,7 @@ class Application_Model_BootIsoMapper { } public function delete(Application_Model_BootIso $botiso) { - if (null == = ($id = $botiso->getID()) ) { + if (null === ($id = $botiso->getID()) ) { return; } else { $this->getDbTable()->delete(array('bootisoID = ?' => $id)); diff --git a/application/models/BootMenu.php b/application/models/BootMenu.php index c027312..3b8823b 100644 --- a/application/models/BootMenu.php +++ b/application/models/BootMenu.php @@ -113,7 +113,7 @@ class Application_Model_BootMenu { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -121,7 +121,7 @@ class Application_Model_BootMenu { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/BootMenuEntries.php b/application/models/BootMenuEntries.php index f9bbe07..0da49b3 100644 --- a/application/models/BootMenuEntries.php +++ b/application/models/BootMenuEntries.php @@ -120,7 +120,7 @@ class Application_Model_BootMenuEntries { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -128,7 +128,7 @@ class Application_Model_BootMenuEntries { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/BootMenuEntriesMapper.php b/application/models/BootMenuEntriesMapper.php index b313321..587db5f 100644 --- a/application/models/BootMenuEntriesMapper.php +++ b/application/models/BootMenuEntriesMapper.php @@ -70,7 +70,7 @@ class Application_Model_BootMenuEntriesMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_BootMenuEntries'); } @@ -81,7 +81,7 @@ class Application_Model_BootMenuEntriesMapper { $data = array('bootmenuentriesID' => $botmenuentries->getID(), 'bootosID' => $botmenuentries->getBootosID() , 'bootmenuID' => $botmenuentries->getBootmenuID() , 'configID' => $botmenuentries->getConfigID() , 'title' => $botmenuentries->getTitle() , 'kcl' => $botmenuentries->getKcl(), 'kclappend' => $botmenuentries->getKclappend() , 'order' => $botmenuentries->getOrder() ); - if (null == = ($id = $botmenuentries->getID()) ) { + if (null === ($id = $botmenuentries->getID()) ) { unset($data['bootmenuentriesID']); $this->getDbTable()->insert($data); } else { @@ -112,7 +112,7 @@ class Application_Model_BootMenuEntriesMapper { } public function delete(Application_Model_BootMenuEntries $botmenuentries) { - if (null == = ($id = $botmenuentries->getID()) ) { + if (null === ($id = $botmenuentries->getID()) ) { return; } else { $this->getDbTable()->delete(array('bootmenuentriesID = ?' => $id)); diff --git a/application/models/BootMenuMapper.php b/application/models/BootMenuMapper.php index e788865..c96a9eb 100644 --- a/application/models/BootMenuMapper.php +++ b/application/models/BootMenuMapper.php @@ -70,7 +70,7 @@ class Application_Model_BootMenuMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_BootMenu'); } @@ -87,7 +87,7 @@ class Application_Model_BootMenuMapper { 'created' => $botmenu->getCreated(), 'defaultbootmenu' => $botmenu->getDefaultbootmenu()); - if (null == = ($id = $botmenu->getID()) ) { + if (null === ($id = $botmenu->getID()) ) { unset($data['bootmenuID']); return $this->getDbTable()->insert($data); } else { @@ -96,7 +96,7 @@ class Application_Model_BootMenuMapper { } public function delete(Application_Model_BootMenu $botmenu) { - if (null == = ($id = $botmenu->getID()) ) { + if (null === ($id = $botmenu->getID()) ) { return; } else { $this->getDbTable()->delete(array('bootmenuID = ?' => $id)); diff --git a/application/models/BootOs.php b/application/models/BootOs.php index 0292aae..d0ae354 100644 --- a/application/models/BootOs.php +++ b/application/models/BootOs.php @@ -170,7 +170,7 @@ class Application_Model_BootOs { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -178,7 +178,7 @@ class Application_Model_BootOs { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/BootOsMapper.php b/application/models/BootOsMapper.php index 4fc2016..23eee08 100644 --- a/application/models/BootOsMapper.php +++ b/application/models/BootOsMapper.php @@ -70,7 +70,7 @@ class Application_Model_BootOsMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_BootOs'); } @@ -79,7 +79,7 @@ class Application_Model_BootOsMapper { public function save(Application_Model_BootOs $botos) { $data = array('bootosID' => $botos->getID() , 'groupID' => $botos->getGroupID() , 'title' => $botos->getTitle(), 'membershipID' => $botos->getMembershipID(), 'defaultkcl' => $botos->getDefaultkcl() , 'created' => $botos->getCreated() , 'description' => $botos->getDescription() , 'expires' => $botos->getExpires() , 'public' => $botos->getPublic(), 'source' => $botos->getSource(), 'distro' => $botos->getDistro(), 'distroversion' => $botos->getDistroversion(), 'shortname' => $botos->getShortname(), 'share' => $botos->getShare() ); - if (null == = ($id = $botos->getID()) ) { + if (null === ($id = $botos->getID()) ) { unset($data['bootosID']); return $this->getDbTable()->insert($data); } else { @@ -88,7 +88,7 @@ class Application_Model_BootOsMapper { } public function delete(Application_Model_BootOs $botos) { - if (null == = ($id = $botos->getID()) ) { + if (null === ($id = $botos->getID()) ) { return; } else { $this->getDbTable()->delete(array('bootosID = ?' => $id)); diff --git a/application/models/BootOsUser.php b/application/models/BootOsUser.php index 7a5f54a..eedd289 100644 --- a/application/models/BootOsUser.php +++ b/application/models/BootOsUser.php @@ -111,7 +111,7 @@ class Application_Model_BootOsUser { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -119,7 +119,7 @@ class Application_Model_BootOsUser { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/BootOsUserMapper.php b/application/models/BootOsUserMapper.php index fa5d236..04eb207 100644 --- a/application/models/BootOsUserMapper.php +++ b/application/models/BootOsUserMapper.php @@ -70,7 +70,7 @@ class Application_Model_BootOsUserMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_BootOsUser'); } @@ -79,7 +79,7 @@ class Application_Model_BootOsUserMapper { public function save(Application_Model_BootOsUser $user) { $data = array('bootosuserID' => $user->getID() , 'configID' => $user->getConfigID() , 'login' => $user->getLogin(), 'password' => $user->getPassword(), 'homepath' => $user->getHomepath() , 'hometypeID' => $user->getHometypeID()); - if (null == = ($id = $user->getID()) ) { + if (null === ($id = $user->getID()) ) { unset($data['bootosuserID']); return $this->getDbTable()->insert($data); } else { @@ -88,7 +88,7 @@ class Application_Model_BootOsUserMapper { } public function delete(Application_Model_BootOsUser $user) { - if (null == = ($id = $user->getID()) ) { + if (null === ($id = $user->getID()) ) { return; } else { $this->getDbTable()->delete(array('bootosuserID = ?' => $id)); diff --git a/application/models/Client.php b/application/models/Client.php index b78d9b5..89ce046 100644 --- a/application/models/Client.php +++ b/application/models/Client.php @@ -98,7 +98,7 @@ class Application_Model_Client { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -106,7 +106,7 @@ class Application_Model_Client { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/ClientMapper.php b/application/models/ClientMapper.php index 7d4d615..098fabd 100644 --- a/application/models/ClientMapper.php +++ b/application/models/ClientMapper.php @@ -70,7 +70,7 @@ class Application_Model_ClientMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_Client'); } @@ -86,7 +86,7 @@ class Application_Model_ClientMapper { 'created' => $client->getCreated() ); - if (null == = ($id = $client->getID()) ) { + if (null === ($id = $client->getID()) ) { unset($data['clientID']); return $this->getDbTable()->insert($data); } else { @@ -95,7 +95,7 @@ class Application_Model_ClientMapper { } public function delete(Application_Model_Client $client) { - if (null == = ($id = $client->getID()) ) { + if (null === ($id = $client->getID()) ) { return; } else { $this->getDbTable()->delete(array('clientID = ?' => $id)); diff --git a/application/models/Config.php b/application/models/Config.php index 7211b9d..4f1ff6c 100644 --- a/application/models/Config.php +++ b/application/models/Config.php @@ -123,7 +123,7 @@ class Application_Model_Config { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -131,7 +131,7 @@ class Application_Model_Config { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/ConfigMapper.php b/application/models/ConfigMapper.php index 8ebc3a6..3b198c8 100644 --- a/application/models/ConfigMapper.php +++ b/application/models/ConfigMapper.php @@ -69,7 +69,7 @@ class Application_Model_ConfigMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_Config'); } @@ -80,7 +80,7 @@ class Application_Model_ConfigMapper { $data = array('configID' => $config->getID() , 'groupID' => $config->getGroupID(), 'membershipID' => $config->getMembershipID(), 'title' => $config->getTitle() , 'created' => $config->getCreated(), 'description' => $config->getDescription(), 'visible' => $config->getVisible(), 'bootosID' => $config->getBootosID() ); - if (null == = ($id = $config->getID()) ) { + if (null === ($id = $config->getID()) ) { unset($data['configID']); return $this->getDbTable()->insert($data); } else { @@ -89,7 +89,7 @@ class Application_Model_ConfigMapper { } public function delete(Application_Model_Config $config) { - if (null == = ($id = $config->getID()) ) { + if (null === ($id = $config->getID()) ) { return; } else { $this->getDbTable()->delete(array('configID = ?' => $id)); diff --git a/application/models/Filter.php b/application/models/Filter.php index 4cc7000..856c33a 100644 --- a/application/models/Filter.php +++ b/application/models/Filter.php @@ -122,7 +122,7 @@ class Application_Model_Filter { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -130,7 +130,7 @@ class Application_Model_Filter { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/FilterEntries.php b/application/models/FilterEntries.php index f160901..b309238 100644 --- a/application/models/FilterEntries.php +++ b/application/models/FilterEntries.php @@ -97,7 +97,7 @@ class Application_Model_FilterEntries { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -105,7 +105,7 @@ class Application_Model_FilterEntries { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/FilterEntriesMapper.php b/application/models/FilterEntriesMapper.php index 29443bd..17e70df 100644 --- a/application/models/FilterEntriesMapper.php +++ b/application/models/FilterEntriesMapper.php @@ -70,7 +70,7 @@ class Application_Model_FilterEntriesMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_FilterEntries'); } diff --git a/application/models/FilterMapper.php b/application/models/FilterMapper.php index c367b88..357e8aa 100644 --- a/application/models/FilterMapper.php +++ b/application/models/FilterMapper.php @@ -70,7 +70,7 @@ class Application_Model_FilterMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_Filter'); } @@ -88,7 +88,7 @@ class Application_Model_FilterMapper { 'created' => $filter->getCreated() , 'priority' => $filter->getPriority() ); - if (null == = ($id = $filter->getID()) ) { + if (null === ($id = $filter->getID()) ) { unset($data['filterID']); return $this->getDbTable()->insert($data); } else { @@ -97,7 +97,7 @@ class Application_Model_FilterMapper { } public function delete(Application_Model_Filter $filter) { - if (null == = ($id = $filter->getID()) ) { + if (null === ($id = $filter->getID()) ) { return; } else { $this->getDbTable()->delete(array('filterID = ?' => $id)); diff --git a/application/models/FilterType.php b/application/models/FilterType.php index 1648574..275dab1 100644 --- a/application/models/FilterType.php +++ b/application/models/FilterType.php @@ -74,7 +74,7 @@ class Application_Model_FilterType { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -82,7 +82,7 @@ class Application_Model_FilterType { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/FilterTypeMapper.php b/application/models/FilterTypeMapper.php index 3642ee3..49e8e0f 100644 --- a/application/models/FilterTypeMapper.php +++ b/application/models/FilterTypeMapper.php @@ -69,7 +69,7 @@ class Application_Model_FilterTypeMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_FilterType'); } @@ -80,7 +80,7 @@ class Application_Model_FilterTypeMapper { $data = array('filtertypeID' => $filtertype->getID() , 'filtertypename' => $filtertype->getFiltertypename() ); - if (null == = ($id = $filtertype->getID()) ) { + if (null === ($id = $filtertype->getID()) ) { unset($data['filtertypeID']); $this->getDbTable()->insert($data); } else { @@ -89,7 +89,7 @@ class Application_Model_FilterTypeMapper { } public function delete(Application_Model_FilterType $filtertype) { - if (null == = ($id = $filtertype->getID()) ) { + if (null === ($id = $filtertype->getID()) ) { return; } else { $this->getDbTable()->delete(array('filtertypeID = ?' => $id)); diff --git a/application/models/Group.php b/application/models/Group.php index 6635f6a..1c89b00 100644 --- a/application/models/Group.php +++ b/application/models/Group.php @@ -82,7 +82,7 @@ class Application_Model_Group { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -90,7 +90,7 @@ class Application_Model_Group { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/GroupGroups.php b/application/models/GroupGroups.php index ee60bc6..719aa3d 100644 --- a/application/models/GroupGroups.php +++ b/application/models/GroupGroups.php @@ -74,7 +74,7 @@ class Application_Model_GroupGroups { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -82,7 +82,7 @@ class Application_Model_GroupGroups { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/GroupGroupsMapper.php b/application/models/GroupGroupsMapper.php index 958c233..61e43e5 100644 --- a/application/models/GroupGroupsMapper.php +++ b/application/models/GroupGroupsMapper.php @@ -69,7 +69,7 @@ class Application_Model_GroupGroupsMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_GroupGroups'); } @@ -85,7 +85,7 @@ class Application_Model_GroupGroupsMapper { } public function delete(Application_Model_GroupGroups $groupgroups) { - if (null == = ($id = $groupgroups->getID()) ) { + if (null === ($id = $groupgroups->getID()) ) { return; } else { $this->getDbTable()->delete(array('groupgroupsID = ?' => $id)); diff --git a/application/models/GroupMapper.php b/application/models/GroupMapper.php index 2f7e543..c3de612 100644 --- a/application/models/GroupMapper.php +++ b/application/models/GroupMapper.php @@ -63,7 +63,7 @@ class Application_Model_GroupMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_Group'); } @@ -74,7 +74,7 @@ class Application_Model_GroupMapper { $data = array('groupID' => $group->getID() , 'title' => $group->getTitle() , 'description' => $group->getDescription() ); - if (null == = ($id = $group->getID()) ) { + if (null === ($id = $group->getID()) ) { unset($data['groupID']); $this->getDbTable()->insert($data); } else { @@ -83,7 +83,7 @@ class Application_Model_GroupMapper { } public function delete(Application_Model_Group $group) { - if (null == = ($id = $group->getID()) ) { + if (null === ($id = $group->getID()) ) { return; } else { $this->getDbTable()->delete(array('groupID = ?' => $id)); diff --git a/application/models/GroupRequest.php b/application/models/GroupRequest.php index fbf6b20..8a6abe1 100644 --- a/application/models/GroupRequest.php +++ b/application/models/GroupRequest.php @@ -90,7 +90,7 @@ class Application_Model_GroupRequest { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -98,7 +98,7 @@ class Application_Model_GroupRequest { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/GroupRequestMapper.php b/application/models/GroupRequestMapper.php index 8049634..aab3f0d 100644 --- a/application/models/GroupRequestMapper.php +++ b/application/models/GroupRequestMapper.php @@ -70,7 +70,7 @@ class Application_Model_GroupRequestMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_GroupRequest'); } @@ -81,7 +81,7 @@ class Application_Model_GroupRequestMapper { $data = array('grouprequestID' => $grouprequest->getID() , 'groupID' => $grouprequest->getGroupID() , 'personID' => $grouprequest->getPersonID() , 'time' => $grouprequest->getTime() ); - if (null == = ($id = $grouprequest->getID()) ) { + if (null === ($id = $grouprequest->getID()) ) { unset($data['grouprequestID']); $this->getDbTable()->insert($data); } else { @@ -90,7 +90,7 @@ class Application_Model_GroupRequestMapper { } public function delete(Application_Model_GroupRequest $grouprequest) { - if (null == = ($id = $grouprequest->getID()) ) { + if (null === ($id = $grouprequest->getID()) ) { return; } else { $this->getDbTable()->delete(array('grouprequestID = ?' => $id)); diff --git a/application/models/HomeType.php b/application/models/HomeType.php index 8459c1f..dd476d1 100644 --- a/application/models/HomeType.php +++ b/application/models/HomeType.php @@ -76,7 +76,7 @@ class Application_Model_HomeType { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -84,7 +84,7 @@ class Application_Model_HomeType { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/HomeTypeMapper.php b/application/models/HomeTypeMapper.php index cd6f00d..e38f4af 100644 --- a/application/models/HomeTypeMapper.php +++ b/application/models/HomeTypeMapper.php @@ -69,7 +69,7 @@ class Application_Model_HomeTypeMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_HomeType'); } @@ -80,7 +80,7 @@ class Application_Model_HomeTypeMapper { $data = array('hometypeID' => $hometype->getID() , 'name' => $hometype->getName() ); - if (null == = ($id = $hometype->getID()) ) { + if (null === ($id = $hometype->getID()) ) { unset($data['hometypeID']); $this->getDbTable()->insert($data); } else { @@ -89,7 +89,7 @@ class Application_Model_HomeTypeMapper { } public function delete(Application_Model_HomeType $hometype) { - if (null == = ($id = $hometype->getID()) ) { + if (null === ($id = $hometype->getID()) ) { return; } else { $this->getDbTable()->delete(array('hometypeID = ?' => $id)); diff --git a/application/models/Membership.php b/application/models/Membership.php index 2057f5f..21a9f63 100644 --- a/application/models/Membership.php +++ b/application/models/Membership.php @@ -106,7 +106,7 @@ class Application_Model_Membership { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -114,7 +114,7 @@ class Application_Model_Membership { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/MembershipMapper.php b/application/models/MembershipMapper.php index a823f90..7de1b3d 100644 --- a/application/models/MembershipMapper.php +++ b/application/models/MembershipMapper.php @@ -70,7 +70,7 @@ class Application_Model_MembershipMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_Membership'); } @@ -81,7 +81,7 @@ class Application_Model_MembershipMapper { $data = array('membershipID' => $membership->getID() , 'groupID' => $membership->getGroupID() , 'roleID' => $membership->getRoleID() , 'personID' => $membership->getPersonID() , 'suspend' => $membership->getSuspend(), 'apikey' => $membership->getApikey() ); - if (null == = ($id = $membership->getID()) ) { + if (null === ($id = $membership->getID()) ) { unset($data['membershipID']); return $this->getDbTable()->insert($data); } else { @@ -90,7 +90,7 @@ class Application_Model_MembershipMapper { } public function delete(Application_Model_Membership $membership) { - if (null == = ($id = $membership->getID()) ) { + if (null === ($id = $membership->getID()) ) { return; } else { $this->getDbTable()->delete(array('membershipID = ?' => $id)); diff --git a/application/models/PasswordRecovery.php b/application/models/PasswordRecovery.php index 5427a74..daa44f4 100644 --- a/application/models/PasswordRecovery.php +++ b/application/models/PasswordRecovery.php @@ -73,7 +73,7 @@ class Application_Model_PasswordRecovery { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -81,7 +81,7 @@ class Application_Model_PasswordRecovery { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/PasswordRecoveryMapper.php b/application/models/PasswordRecoveryMapper.php index 5c84cc8..5d2587f 100644 --- a/application/models/PasswordRecoveryMapper.php +++ b/application/models/PasswordRecoveryMapper.php @@ -68,7 +68,7 @@ class Application_Model_PasswordRecoveryMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_PasswordRecovery'); } @@ -79,7 +79,7 @@ class Application_Model_PasswordRecoveryMapper { $data = array('personID' => $passwordrecovery->getID() , 'recoveryID' => $passwordrecovery->getRecoveryID() ); - if (null == = ($id = $passwordrecovery->getID()) ) { + if (null === ($id = $passwordrecovery->getID()) ) { return; } else { $passwordRecoveryFound = $this->find($passwordrecovery->getID()); @@ -95,7 +95,7 @@ class Application_Model_PasswordRecoveryMapper { } public function delete(Application_Model_PasswordRecovery $passwordrecovery) { - if (null == = ($id = $passwordrecovery->getID()) ) { + if (null === ($id = $passwordrecovery->getID()) ) { return; } else { $this->getDbTable()->delete(array('personID = ?' => $id)); diff --git a/application/models/Person.php b/application/models/Person.php index 34e16ed..f9e2559 100644 --- a/application/models/Person.php +++ b/application/models/Person.php @@ -188,7 +188,7 @@ class Application_Model_Person { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -196,7 +196,7 @@ class Application_Model_Person { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/PersonMapper.php b/application/models/PersonMapper.php index 9024da0..33eac96 100644 --- a/application/models/PersonMapper.php +++ b/application/models/PersonMapper.php @@ -71,7 +71,7 @@ class Application_Model_PersonMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_Person'); } @@ -97,7 +97,7 @@ class Application_Model_PersonMapper { 'password_salt' => $person->getPasswordSalt() , 'suspend' => $person->getSuspend() ); - if (null == = ($id = $person->getID()) ) { + if (null === ($id = $person->getID()) ) { unset($data['personID']); $this->getDbTable()->insert($data); } else { @@ -106,7 +106,7 @@ class Application_Model_PersonMapper { } public function delete(Application_Model_Person $person) { - if (null == = ($id = $person->getID()) ) { + if (null === ($id = $person->getID()) ) { return; } else { $this->getDbTable()->delete(array('personID = ?' => $id)); diff --git a/application/models/Pool.php b/application/models/Pool.php index 0e714d7..6191ae8 100644 --- a/application/models/Pool.php +++ b/application/models/Pool.php @@ -98,7 +98,7 @@ class Application_Model_Pool { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -106,7 +106,7 @@ class Application_Model_Pool { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/PoolEntries.php b/application/models/PoolEntries.php index daf841a..abe5499 100644 --- a/application/models/PoolEntries.php +++ b/application/models/PoolEntries.php @@ -81,7 +81,7 @@ class Application_Model_PoolEntries { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -89,7 +89,7 @@ class Application_Model_PoolEntries { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/PoolEntriesMapper.php b/application/models/PoolEntriesMapper.php index b1678c5..1c0a952 100644 --- a/application/models/PoolEntriesMapper.php +++ b/application/models/PoolEntriesMapper.php @@ -70,7 +70,7 @@ class Application_Model_PoolEntriesMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_PoolEntries'); } @@ -81,7 +81,7 @@ class Application_Model_PoolEntriesMapper { $data = array('poolentriesID' => $polentries->getID(), 'poolID' => $polentries->getPoolID() , 'clientID' => $polentries->getClientID() ); - if (null == = ($id = $polentries->getID()) ) { + if (null === ($id = $polentries->getID()) ) { unset($data['poolentriesID']); $this->getDbTable()->insert($data); } else { @@ -90,7 +90,7 @@ class Application_Model_PoolEntriesMapper { } public function delete(Application_Model_PoolEntries $polentries) { - if (null == = ($id = $polentries->getID()) ) { + if (null === ($id = $polentries->getID()) ) { return; } else { $this->getDbTable()->delete(array('poolentriesID = ?' => $id)); diff --git a/application/models/PoolMapper.php b/application/models/PoolMapper.php index dbc1ae4..b42dc88 100644 --- a/application/models/PoolMapper.php +++ b/application/models/PoolMapper.php @@ -70,7 +70,7 @@ class Application_Model_PoolMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_Pool'); } @@ -85,7 +85,7 @@ class Application_Model_PoolMapper { 'description' => $pol->getDescription() , 'location' => $pol->getLocation() ); - if (null == = ($id = $pol->getID()) ) { + if (null === ($id = $pol->getID()) ) { unset($data['poolID']); $this->getDbTable()->insert($data); } else { @@ -94,7 +94,7 @@ class Application_Model_PoolMapper { } public function delete(Application_Model_Pool $pol) { - if (null == = ($id = $pol->getID()) ) { + if (null === ($id = $pol->getID()) ) { return; } else { $this->getDbTable()->delete(array('poolID = ?' => $id)); diff --git a/application/models/PreBoot.php b/application/models/PreBoot.php index c2d0150..8381c84 100644 --- a/application/models/PreBoot.php +++ b/application/models/PreBoot.php @@ -121,7 +121,7 @@ class Application_Model_PreBoot { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -129,7 +129,7 @@ class Application_Model_PreBoot { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/PreBootMapper.php b/application/models/PreBootMapper.php index cbeabc3..4a9b039 100644 --- a/application/models/PreBootMapper.php +++ b/application/models/PreBootMapper.php @@ -72,7 +72,7 @@ class Application_Model_PreBootMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_PreBoot'); } @@ -83,7 +83,7 @@ class Application_Model_PreBootMapper { $data = array('prebootID' => $preboot->getID() , 'membershipID' => $preboot->getMembershipID() , 'title' => $preboot->getTitle() , 'groupID' => $preboot->getGroupID(), 'created' => $preboot->getCreated(), 'source' => $preboot->getSource(), 'description' => $preboot->getDescription()); - if (null == = ($id = $preboot->getID()) ) { + if (null === ($id = $preboot->getID()) ) { unset($data['prebootID']); return $this->getDbTable()->insert($data); } else { @@ -93,7 +93,7 @@ class Application_Model_PreBootMapper { } public function delete(Application_Model_PreBoot $preboot) { - if (null == = ($id = $preboot->getID()) ) { + if (null === ($id = $preboot->getID()) ) { return; } else { $this->getDbTable()->delete(array('prebootID = ?' => $id)); diff --git a/application/models/Right.php b/application/models/Right.php index 0769f02..2b9c7dd 100644 --- a/application/models/Right.php +++ b/application/models/Right.php @@ -98,7 +98,7 @@ class Application_Model_Right { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -106,7 +106,7 @@ class Application_Model_Right { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/RightCategory.php b/application/models/RightCategory.php index b3b3df9..db06a17 100644 --- a/application/models/RightCategory.php +++ b/application/models/RightCategory.php @@ -68,7 +68,7 @@ class Application_Model_RightCategory { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -76,7 +76,7 @@ class Application_Model_RightCategory { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/RightCategoryMapper.php b/application/models/RightCategoryMapper.php index fdbab94..99ce1c8 100644 --- a/application/models/RightCategoryMapper.php +++ b/application/models/RightCategoryMapper.php @@ -70,7 +70,7 @@ class Application_Model_RightCategoryMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_RightCategory'); } @@ -81,7 +81,7 @@ class Application_Model_RightCategoryMapper { $data = array('rightcategoryID' => $rightCategory->getID() , 'title' => $rightCategory->getTitle() ); - if (null == = ($id = $rightCategory->getID()) ) { + if (null === ($id = $rightCategory->getID()) ) { unset($data['rightcategoryID']); $this->getDbTable()->insert($data); } else { @@ -90,7 +90,7 @@ class Application_Model_RightCategoryMapper { } public function delete(Application_Model_RightCategory $rightCategory) { - if (null == = ($id = $rightCategory->getID()) ) { + if (null === ($id = $rightCategory->getID()) ) { return; } else { $this->getDbTable()->delete(array('rightcategoryID = ?' => $id)); diff --git a/application/models/RightMapper.php b/application/models/RightMapper.php index f04a5b7..2d69ad8 100644 --- a/application/models/RightMapper.php +++ b/application/models/RightMapper.php @@ -70,7 +70,7 @@ class Application_Model_RightMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_Right'); } @@ -85,7 +85,7 @@ class Application_Model_RightMapper { 'title' => $right->getTitle() , 'description' => $right->getDescription() ); - if (null == = ($id = $right->getID()) ) { + if (null === ($id = $right->getID()) ) { unset($data['rightID']); $this->getDbTable()->insert($data); } else { @@ -94,7 +94,7 @@ class Application_Model_RightMapper { } public function delete(Application_Model_Right $right) { - if (null == = ($id = $right->getID()) ) { + if (null === ($id = $right->getID()) ) { return; } else { $this->getDbTable()->delete(array('rightID = ?' => $id)); diff --git a/application/models/RightRoles.php b/application/models/RightRoles.php index 7736884..3ef99be 100644 --- a/application/models/RightRoles.php +++ b/application/models/RightRoles.php @@ -74,7 +74,7 @@ class Application_Model_RightRoles { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -82,7 +82,7 @@ class Application_Model_RightRoles { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/RightRolesMapper.php b/application/models/RightRolesMapper.php index 4edf812..1b7d48c 100644 --- a/application/models/RightRolesMapper.php +++ b/application/models/RightRolesMapper.php @@ -69,7 +69,7 @@ class Application_Model_RightRolesMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_RightRoles'); } @@ -79,7 +79,7 @@ class Application_Model_RightRolesMapper { public function save(Application_Model_RightRoles $rightroles) { $data = array('roleID' => $rightroles->getRoleID() , 'rightID' => $rightroles->getRightID() ); - if (null == = $rightroles->getRoleID() || null == = $rightroles->getRightID()) { + if (null === $rightroles->getRoleID() || null === $rightroles->getRightID()) { return; } else { $this->getDbTable()->insert($data); @@ -87,7 +87,7 @@ class Application_Model_RightRolesMapper { } public function delete(Application_Model_RightRoles $rightroles) { - if (null == = ($roleID = $rightroles->getRoleID()) || null == = ($rightID = $rightroles->getRightID())) { + if (null === ($roleID = $rightroles->getRoleID()) || null === ($rightID = $rightroles->getRightID())) { return; } else { $this->getDbTable()->delete(array('roleID = ?' => $roleID, 'rightID = ?' => $rightID)); diff --git a/application/models/Role.php b/application/models/Role.php index a345bd4..95a994d 100644 --- a/application/models/Role.php +++ b/application/models/Role.php @@ -98,7 +98,7 @@ class Application_Model_Role { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -106,7 +106,7 @@ class Application_Model_Role { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/RoleMapper.php b/application/models/RoleMapper.php index 0fe4a58..5658f70 100644 --- a/application/models/RoleMapper.php +++ b/application/models/RoleMapper.php @@ -70,7 +70,7 @@ class Application_Model_RoleMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_Role'); } @@ -81,7 +81,7 @@ class Application_Model_RoleMapper { $data = array('roleID' => $role->getID() , 'groupID' => $role->getGroupID() , 'title' => $role->getTitle() , 'description' => $role->getDescription(), 'inheritance' => $role->getInheritance() ); - if (null == = ($id = $role->getID()) ) { + if (null === ($id = $role->getID()) ) { unset($data['roleID']); $this->getDbTable()->insert($data); } else { @@ -90,7 +90,7 @@ class Application_Model_RoleMapper { } public function delete(Application_Model_Role $role) { - if (null == = ($id = $role->getID()) ) { + if (null === ($id = $role->getID()) ) { return; } else { $this->getDbTable()->delete(array('roleID = ?' => $id)); diff --git a/application/models/Session.php b/application/models/Session.php index a2ff24a..302bb30 100644 --- a/application/models/Session.php +++ b/application/models/Session.php @@ -146,7 +146,7 @@ class Application_Model_Session { $result = array(); foreach ($properties as $property) { $key = $property->name; - if (substr($key, 0, 1) != '_' && $this->$key != = null) { + if (substr($key, 0, 1) != '_' && $this->$key !== null) { $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { $result[$key] = $this->$method(); @@ -154,7 +154,7 @@ class Application_Model_Session { $result[$key] = $this->$key; } } - elseif(substr($key, 0, 1) == '_' && $this->$key != = null) { + elseif(substr($key, 0, 1) == '_' && $this->$key !== null) { $key = substr($key, 1); $method = 'get' . ucfirst($key); if ($reflectionClass->hasMethod($method)) { diff --git a/application/models/SessionMapper.php b/application/models/SessionMapper.php index d048689..6ad5554 100644 --- a/application/models/SessionMapper.php +++ b/application/models/SessionMapper.php @@ -70,7 +70,7 @@ class Application_Model_SessionMapper { } public function getDbTable() { - if (null == = $this->_dbTable) { + if (null === $this->_dbTable) { $this->setDbTable('Application_Model_DbTable_Session'); } @@ -89,7 +89,7 @@ class Application_Model_SessionMapper { 'time' => $session->getTime() , 'ip' => $session->getIp() , 'ip6' => $session->getIp6() ); - if (null == = ($id = $session->getID()) ) { + if (null === ($id = $session->getID()) ) { unset($data['sessionID']); return $this->getDbTable()->insert($data); } else { @@ -98,7 +98,7 @@ class Application_Model_SessionMapper { } public function delete(Application_Model_Session $sesion) { - if (null == = ($id = $sesion->getID()) ) { + if (null === ($id = $sesion->getID()) ) { return; } else { $this->getDbTable()->delete(array('sessionID = ?' => $id)); 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' ><<</a>"; - $str . = "<a href='$url/page/".(($selected) - 1)."' rel='next'><</a>"; + $str .= "<a href='$url/page/0' ><<</a>"; + $str .= "<a href='$url/page/".(($selected) - 1)."' rel='next'><</a>"; } else { - $str . = "<span class='disabled'><<</span>"; - $str . = "<span class='disabled'><</span>"; + $str .= "<span class='disabled'><<</span>"; + $str .= "<span class='disabled'><</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)."'>></a> "; - $str . = "<a href='$url/page/".($max - 1)."'>>></a> "; + $str .= "<a href='$url/page/".(($selected) + 1)."'>></a> "; + $str .= "<a href='$url/page/".($max - 1)."'>>></a> "; } else { - $str . = "<span class='disabled'>></span> "; - $str . = "<span class='disabled'>>></span> "; + $str .= "<span class='disabled'>></span> "; + $str .= "<span class='disabled'>>></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) { diff --git a/public/settergetter.php b/public/settergetter.php index e558206..e18b643 100644 --- a/public/settergetter.php +++ b/public/settergetter.php @@ -29,7 +29,7 @@ if(isset($_POST['submit'])) { $output = ""; foreach($ar as $item) { - $output . = setget("_".trim($item)); + $output .= setget("_".trim($item)); } print_a($output); echo "<a href='".$_SERVER['PHP_SELF']."'>back</a>"; diff --git a/scripts/dbContent.php b/scripts/dbContent.php index 28f28ec..09b2fa7 100644 --- a/scripts/dbContent.php +++ b/scripts/dbContent.php @@ -53,12 +53,12 @@ function getGroups() { global $format; $q = "SELECT groupID,title FROM pbs_group"; $groups = "subgraph cluster_0 {"; - $groups . = "label=Groups;"; + $groups .= "label=Groups;"; $result = mysql_query($q); while($data = mysql_fetch_array($result)) { - $groups . = sprintf($format['groupnode'] , "Group".$data['groupID']); + $groups .= sprintf($format['groupnode'] , "Group".$data['groupID']); } - $groups . = "}"; + $groups .= "}"; return $groups; } function recGroups($groupID, $level = 0, $data = '') { @@ -66,8 +66,8 @@ function recGroups($groupID, $level = 0, $data = '') { $q = "SELECT groupID FROM pbs_groupgroups WHERE parentID = $groupID"; $result = mysql_query($q); while($data = mysql_fetch_array($result)) { - $groups . = sprintf($format['groupgroup'], "Group".$groupID, "Group".$data['groupID']); - $groups . = recGroups($data['groupID']); + $groups .= sprintf($format['groupgroup'], "Group".$groupID, "Group".$data['groupID']); + $groups .= recGroups($data['groupID']); } return $groups; } @@ -76,7 +76,7 @@ function getPersons() { $q = "SELECT personID,title FROM pbs_person"; $result = mysql_query($q); while($data = mysql_fetch_array($result)) { - $persons . = sprintf($format['personnode'] , "Person". $data['personID']); + $persons .= sprintf($format['personnode'] , "Person". $data['personID']); } return $persons; @@ -86,10 +86,10 @@ function getMemberships() { $q = "SELECT personID,groupID,membershipID,roleID FROM pbs_membership"; $result = mysql_query($q); while($data = mysql_fetch_array($result)) { - $memberships . = sprintf($format['membershipnode'], "Member".$data['membershipID']); - $memberships . = sprintf($format['personmember'], "Person".$data['personID'], "Member".$data['membershipID']); - $memberships . = sprintf($format['rolemember'], "Role".$data['roleID'], "Member".$data['membershipID']); - $memberships . = sprintf($format['membergroup'], "Member".$data['membershipID'], "Group".$data['groupID']); + $memberships .= sprintf($format['membershipnode'], "Member".$data['membershipID']); + $memberships .= sprintf($format['personmember'], "Person".$data['personID'], "Member".$data['membershipID']); + $memberships .= sprintf($format['rolemember'], "Role".$data['roleID'], "Member".$data['membershipID']); + $memberships .= sprintf($format['membergroup'], "Member".$data['membershipID'], "Group".$data['groupID']); } return $memberships; } @@ -98,7 +98,7 @@ function getRequests() { $q = "SELECT personID,groupID FROM pbs_grouprequest"; $result = mysql_query($q); while($data = mysql_fetch_array($result)) { - $memberships . = sprintf($format['peronrequests'], "Group".$data['groupID'], "Person".$data['personID']); + $memberships .= sprintf($format['peronrequests'], "Group".$data['groupID'], "Person".$data['personID']); } return $memberships; } @@ -107,8 +107,8 @@ function getPools() { $q = "SELECT poolID,groupID FROM pbs_pool"; $result = mysql_query($q); while($data = mysql_fetch_array($result)) { - $pools . = sprintf($format['poolnode'] , "Pool".$data['poolID']); - $pools . = sprintf($format['poolgroup'], "Pool".$data['poolID'], "Group".$data['groupID']); + $pools .= sprintf($format['poolnode'] , "Pool".$data['poolID']); + $pools .= sprintf($format['poolgroup'], "Pool".$data['poolID'], "Group".$data['groupID']); } return $pools; @@ -118,11 +118,11 @@ function getClients() { $q = "SELECT clientID,groupID FROM pbs_client"; $result = mysql_query($q); while($data = mysql_fetch_array($result)) { - $clients . = sprintf($format['clientnode'] , "Client".$data['clientID']); + $clients .= sprintf($format['clientnode'] , "Client".$data['clientID']); $query2 = "SELECT clientID, poolID FROM pbs_poolentries WHERE clientID = '".$data['clientID']."'"; $result2 = mysql_query($query2); if(mysql_num_rows($result2) == 0) - { $clients . = sprintf($format['clientgroup'], "Client".$data['clientID'], "Group".$data['groupID']); } + { $clients .= sprintf($format['clientgroup'], "Client".$data['clientID'], "Group".$data['groupID']); } } return $clients; @@ -132,7 +132,7 @@ function clientPools() { $q = "SELECT clientID,poolID FROM pbs_poolentries"; $result = mysql_query($q); while($data = mysql_fetch_array($result)) { - $clientpools . = sprintf($format['clientpool'], "Client".$data['clientID'], "Pool".$data['poolID']); + $clientpools .= sprintf($format['clientpool'], "Client".$data['clientID'], "Pool".$data['poolID']); } return $clientpools; } @@ -141,7 +141,7 @@ function getRoles() { $q = "SELECT roleID,groupID FROM pbs_role"; $result = mysql_query($q); while($data = mysql_fetch_array($result)) { - $roles . = sprintf($format['rolenode'] , "Role".$data['roleID']); + $roles .= sprintf($format['rolenode'] , "Role".$data['roleID']); # $roles .= "Role".$data['roleID'] ." -> " . "Group".$data['groupID'].";\n"; } return $roles; @@ -151,8 +151,8 @@ function getBootiso() { $q = "SELECT bootisoID,groupID FROM pbs_bootiso"; $result = mysql_query($q); while($data = mysql_fetch_array($result)) { - $bootiso . = sprintf($format['bootisonode'] , "BootIso".$data['bootisoID']); - $bootiso . = sprintf($format['bootisogroup'], "BootIso".$data['bootisoID'], "Group".$data['groupID']); + $bootiso .= sprintf($format['bootisonode'] , "BootIso".$data['bootisoID']); + $bootiso .= sprintf($format['bootisogroup'], "BootIso".$data['bootisoID'], "Group".$data['groupID']); } return $bootiso; @@ -162,8 +162,8 @@ function getBootMenus() { $q = "SELECT bootmenuID,groupID FROM pbs_bootmenu"; $result = mysql_query($q); while($data = mysql_fetch_array($result)) { - $bootmenu . = sprintf($format['bootmenunode'] , "BootMenu".$data['bootmenuID']); - $bootmenu . = sprintf($format['bootmenugroup'], "BootMenu".$data['bootmenuID'], "Group".$data['groupID']); + $bootmenu .= sprintf($format['bootmenunode'] , "BootMenu".$data['bootmenuID']); + $bootmenu .= sprintf($format['bootmenugroup'], "BootMenu".$data['bootmenuID'], "Group".$data['groupID']); } return $bootmenu; } @@ -172,33 +172,33 @@ function getBootos() { $q = "SELECT bootosID,groupID FROM pbs_bootos"; $result = mysql_query($q); while($data = mysql_fetch_array($result)) { - $bootos . = sprintf($format['bootosnode'] , "BootOs".$data['bootosID']); + $bootos .= sprintf($format['bootosnode'] , "BootOs".$data['bootosID']); $q2 = "SELECT * FROM pbs_bootmenuentries WHERE bootosID = ".$data['bootosID'].""; $result2 = mysql_query($q2); if(mysql_num_rows($result2)) { while($data2 = mysql_fetch_array($result2)) - { $bootos . = sprintf($format['bootosbootmenu'], "BootOs".$data['bootosID'], "BootMenu".$data2['bootmenuID']); } + { $bootos .= sprintf($format['bootosbootmenu'], "BootOs".$data['bootosID'], "BootMenu".$data2['bootmenuID']); } } else - { $bootos . = sprintf($format['bootosgroup'], "BootOs".$data['bootosID'], "Group".$data['groupID']); } + { $bootos .= sprintf($format['bootosgroup'], "BootOs".$data['bootosID'], "Group".$data['groupID']); } } return $bootos; } ## Concatenation $defs = ''; -$defs . = getGroups(); -$defs . = recGroups(1); -$defs . = getPersons(); -$defs . = getMemberships(); -$defs . = getRoles(); -$defs . = getRequests(); -$defs . = getPools(); -$defs . = getClients(); -$defs . = clientPools(); -$defs . = getBootiso(); -$defs . = getBootMenus(); -$defs . = getBootos(); +$defs .= getGroups(); +$defs .= recGroups(1); +$defs .= getPersons(); +$defs .= getMemberships(); +$defs .= getRoles(); +$defs .= getRequests(); +$defs .= getPools(); +$defs .= getClients(); +$defs .= clientPools(); +$defs .= getBootiso(); +$defs .= getBootMenus(); +$defs .= getBootos(); @@ -207,8 +207,8 @@ $str = 'digraph x { ranksep=3; size="20,20"; overlap="0:true"'."\n"; -$str . = str_replace("\n", "\n\t", $defs); -$str . = "}"; +$str .= str_replace("\n", "\n\t", $defs); +$str .= "}"; echo "Write to file ...\n"; // Create the dot file diff --git a/scripts/mysqlGraph.php b/scripts/mysqlGraph.php index 18eb9f6..1074325 100644 --- a/scripts/mysqlGraph.php +++ b/scripts/mysqlGraph.php @@ -44,14 +44,14 @@ $str = 'digraph x { // get all table-fields foreach($tables as $tablename => $data) { - $str . = $tablename .' [label= "{'; + $str .= $tablename .' [label= "{'; $array = array(); $array[] = strtoupper($tablename); foreach($data as $d) { $array[] = "<".$d['Field'].">".$d['Field']; } - $str . = implode("|", $array); - $str . = '}",width=3];'.$b; + $str .= implode("|", $array); + $str .= '}",width=3];'.$b; } echo "Generate the Links ...\n"; @@ -64,7 +64,7 @@ foreach($tables as $tablename1 => $table1) { $f2 = $field2['Field']; if( $tablename1 != $tablename2 && $f1 == $f2 && strstr($f1, 'ID') && "pbs_".str_replace("ID", '', $f1) == $tablename1) { // Draw lines to tables - $str . = $tablename1 ." -> ".$tablename2.";".$b; + $str .= $tablename1 ." -> ".$tablename2.";".$b; // draw lines to table-items #$str .= $tablename1.":".$f1 ." -> ".$tablename2.":".$f2 .";".$b; } @@ -72,7 +72,7 @@ foreach($tables as $tablename1 => $table1) { } } } -$str . = "}"; +$str .= "}"; echo "Write to file ...\n"; // Create the dot file $fp = fopen("mysqlGraph.dot", "w"); |