';
echo "| $this->iSearchRank | ";
- echo "".join(', ', array_map($kf, $this->aName))." | ";
- echo "".join(', ', array_map($kf, $this->aNameNonSearch))." | ";
- echo "".join(', ', array_map($kf, $this->aAddress))." | ";
- echo "".join(', ', array_map($kf, $this->aAddressNonSearch))." | ";
- echo "".$this->sCountryCode." | ";
- echo "".Operator::toString($this->iOperator)." | ";
- echo "".$this->sClass." | ";
- echo "".$this->sType." | ";
- echo "".$this->sPostcode." | ";
- echo "".$this->sHouseNumber." | ";
+ echo ''.join(', ', array_map($kf, $this->aName)).' | ';
+ echo ''.join(', ', array_map($kf, $this->aNameNonSearch)).' | ';
+ echo ''.join(', ', array_map($kf, $this->aAddress)).' | ';
+ echo ''.join(', ', array_map($kf, $this->aAddressNonSearch)).' | ';
+ echo ''.$this->sCountryCode.' | ';
+ echo ''.Operator::toString($this->iOperator).' | ';
+ echo ''.$this->sClass.' | ';
+ echo ''.$this->sType.' | ';
+ echo ''.$this->sPostcode.' | ';
+ echo ''.$this->sHouseNumber.' | ';
- echo "
";
+ echo '';
}
}
diff --git a/lib/cmd.php b/lib/cmd.php
index 898fbe95..a1084938 100644
--- a/lib/cmd.php
+++ b/lib/cmd.php
@@ -99,7 +99,7 @@ function showUsage($aSpec, $bExit = false, $sError = false)
echo 'Try `'.basename($_SERVER['argv'][0]).' --help` for more information.'."\n";
exit;
}
- echo "Usage: ".basename($_SERVER['argv'][0])."\n";
+ echo 'Usage: '.basename($_SERVER['argv'][0])."\n";
$bFirst = true;
foreach ($aSpec as $aLine) {
if (is_array($aLine)) {
diff --git a/lib/db.php b/lib/db.php
index 01fc344b..493d25f5 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -8,7 +8,7 @@ function &getDB($bNew = false, $bPersistent = false)
// Get the database object
$oDB = chksql(
DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), $bPersistent),
- "Failed to establish database connection"
+ 'Failed to establish database connection'
);
$oDB->setFetchMode(DB_FETCHMODE_ASSOC);
$oDB->query("SET DateStyle TO 'sql,european'");
diff --git a/lib/init-website.php b/lib/init-website.php
index 7d5cef1a..d8c012a4 100644
--- a/lib/init-website.php
+++ b/lib/init-website.php
@@ -10,7 +10,7 @@ require_once('ParameterParser.php');
*/
-function chksql($oSql, $sMsg = "Database request failed")
+function chksql($oSql, $sMsg = 'Database request failed')
{
if (!PEAR::isError($oSql)) return $oSql;
@@ -38,10 +38,10 @@ INTERNALFAIL;
if (CONST_Debug) {
var_dump($oSql);
} else {
- echo "