mbirth / cops

lib/Base.php

Spacing +11 added lines, -11 removed lines

@@ -40,15 +40,15 @@ 
     public static function isMultipleDatabaseEnabled()
     {
         global $config;
-        return is_array ($config['calibre_directory']);
+        return is_array($config['calibre_directory']);
     }
 
     public static function useAbsolutePath()
     {
         global $config;
         $path = self::getDbDirectory();
-        return preg_match ('/^\//', $path) || // Linux /
-               preg_match ('/^\w\:/', $path); // Windows X:
+        return preg_match('/^\//', $path) || // Linux /
+               preg_match('/^\w\:/', $path); // Windows X:
     }
 
     public static function noDatabaseSelected()
@@ -70,9 +70,9 @@ 
     {
         global $config;
         if (self::isMultipleDatabaseEnabled()) {
-            return array_keys ($config['calibre_directory']);
+            return array_keys($config['calibre_directory']);
         } else {
-            return array ('');
+            return array('');
         }
     }
 
@@ -106,7 +106,7 @@ 
 
     public static function getDbFileName($database = NULL)
     {
-        return self::getDbDirectory($database) .'metadata.db';
+        return self::getDbDirectory($database) . 'metadata.db';
     }
 
     private static function error($database)
@@ -117,12 +117,12 @@ 
         throw new Exception('Database <' . $database . '> not found.');
     }
 
-    public static function getDb ($database = NULL)
+    public static function getDb($database = NULL)
     {
-        if (is_null (self::$db)) {
+        if (is_null(self::$db)) {
             try {
-                if (is_readable(self::getDbFileName ($database))) {
-                    self::$db = new PDO('sqlite:'. self::getDbFileName($database));
+                if (is_readable(self::getDbFileName($database))) {
+                    self::$db = new PDO('sqlite:' . self::getDbFileName($database));
                     if (useNormAndUp()) {
                         self::$db->sqliteCreateFunction('normAndUp', 'normAndUp', 1);
                     }
@@ -170,7 +170,7 @@ 
         }
         $entry = new Entry(localize($table . '.title'), $id,
             str_format(localize($numberOfString, $count), $count), 'text',
-            array(new LinkNavigation('?page='.$pageId)), '', $count);
+            array(new LinkNavigation('?page=' . $pageId)), '', $count);
         return $entry;
     }
 

Braces +7 added lines, -4 removed lines

@@ -80,7 +80,9 @@ 
     {
         global $config;
         if (self::isMultipleDatabaseEnabled()) {
-            if (is_null($database)) $database = GetUrlParam(DB, 0);
+            if (is_null($database)) {
+                $database = GetUrlParam(DB, 0);
+            }
             if (!is_null($database) && !preg_match('/^\d+$/', $database)) {
                 self::error($database);
             }
@@ -94,7 +96,9 @@ 
     {
         global $config;
         if (self::isMultipleDatabaseEnabled()) {
-            if (is_null($database)) $database = GetUrlParam(DB, 0);
+            if (is_null($database)) {
+                $database = GetUrlParam(DB, 0);
+            }
             if (!is_null($database) && !preg_match('/^\d+$/', $database)) {
                 self::error($database);
             }
@@ -180,8 +184,7 @@ 
 
         list (, $result) = self::executeQuery($query, $columns, '', $params, -1);
         $entryArray = array();
-        while ($post = $result->fetchObject())
-        {
+        while ($post = $result->fetchObject()) {
             /* @var $instance Author|Tag|Serie|Publisher */
 
             $instance = new $category($post);

Upper-Lower-Casing +10 added lines, -10 removed lines

@@ -35,7 +35,7 @@ 
 
     const COMPATIBILITY_XML_ALDIKO = 'aldiko';
 
-    private static $db = NULL;
+    private static $db = null;
 
     public static function isMultipleDatabaseEnabled()
     {
@@ -76,7 +76,7 @@ 
         }
     }
 
-    public static function getDbName($database = NULL)
+    public static function getDbName($database = null)
     {
         global $config;
         if (self::isMultipleDatabaseEnabled()) {
@@ -90,7 +90,7 @@ 
         return '';
     }
 
-    public static function getDbDirectory($database = NULL)
+    public static function getDbDirectory($database = null)
     {
         global $config;
         if (self::isMultipleDatabaseEnabled()) {
@@ -104,7 +104,7 @@ 
         return $config['calibre_directory'];
     }
 
-    public static function getDbFileName($database = NULL)
+    public static function getDbFileName($database = null)
     {
         return self::getDbDirectory($database) .'metadata.db';
     }
@@ -117,7 +117,7 @@ 
         throw new Exception('Database <' . $database . '> not found.');
     }
 
-    public static function getDb ($database = NULL)
+    public static function getDb ($database = null)
     {
         if (is_null (self::$db)) {
             try {
@@ -151,22 +151,22 @@ 
 
     public static function clearDb()
     {
-        self::$db = NULL;
+        self::$db = null;
     }
 
-    public static function executeQuerySingle($query, $database = NULL)
+    public static function executeQuerySingle($query, $database = null)
     {
         return self::getDb($database)->query($query)->fetchColumn();
     }
 
-    public static function getCountGeneric($table, $id, $pageId, $numberOfString = NULL)
+    public static function getCountGeneric($table, $id, $pageId, $numberOfString = null)
     {
         if (!$numberOfString) {
             $numberOfString = $table . '.alphabetical';
         }
         $count = self::executeQuerySingle('select count(*) from ' . $table);
         if ($count == 0) {
-            return NULL;
+            return null;
         }
         $entry = new Entry(localize($table . '.title'), $id,
             str_format(localize($numberOfString, $count), $count), 'text',
@@ -197,7 +197,7 @@ 
         return $entryArray;
     }
 
-    public static function executeQuery($query, $columns, $filter, $params, $n, $database = NULL, $numberPerPage = NULL)
+    public static function executeQuery($query, $columns, $filter, $params, $n, $database = null, $numberPerPage = null)
     {
         $totalResult = -1;