seblucas / cops

lib/Base.php

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

@@ -35,7 +35,7 @@ 
 
     const COMPATIBILITY_XML_ALDIKO = "aldiko";
 
-    private static $db = NULL;
+    private static $db = null;
 
     public static function isMultipleDatabaseEnabled () {
         global $config;
@@ -71,7 +71,7 @@ 
         }
     }
 
-    public static function getDbName ($database = NULL) {
+    public static function getDbName ($database = null) {
         global $config;
         if (self::isMultipleDatabaseEnabled ()) {
             if (is_null ($database)) $database = GetUrlParam (DB, 0);
@@ -84,7 +84,7 @@ 
         return "";
     }
 
-    public static function getDbDirectory ($database = NULL) {
+    public static function getDbDirectory ($database = null) {
         global $config;
         if (self::isMultipleDatabaseEnabled ()) {
             if (is_null ($database)) $database = GetUrlParam (DB, 0);
@@ -98,7 +98,7 @@ 
     }
 
     // -DC- Add image directory
-    public static function getImgDirectory ($database = NULL) {
+    public static function getImgDirectory ($database = null) {
     	global $config;
     	if (self::isMultipleDatabaseEnabled ()) {
     		if (is_null ($database)) $database = GetUrlParam (DB, 0);
@@ -108,7 +108,7 @@ 
     	return $config['image_directory'];
     }
 
-    public static function getDbFileName ($database = NULL) {
+    public static function getDbFileName ($database = null) {
         return self::getDbDirectory ($database) .'metadata.db';
     }
 
@@ -119,7 +119,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 {
                 if (is_readable (self::getDbFileName ($database))) {
@@ -150,19 +150,19 @@ 
     }
 
     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;
+        if ($count == 0) return null;
         $entry = new Entry (localize($table . ".title"), $id,
             str_format (localize($numberOfString, $count), $count), "text",
             array ( new LinkNavigation ("?page=".$pageId)), "", $count);
@@ -191,7 +191,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;
 
         if (useNormAndUp ()) {

fetch.php

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

@@ -23,10 +23,10 @@
     header('Pragma: public');
     header('Cache-Control: max-age=' . $expires);
     header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expires) . ' GMT');
-    $bookId   = getURLParam('id', NULL);
+    $bookId   = getURLParam('id', null);
     $type     = getURLParam('type', 'jpg');
-    $idData   = getURLParam('data', NULL);
-    $viewOnly = getURLParam('view', FALSE);
+    $idData   = getURLParam('data', null);
+    $viewOnly = getURLParam('view', false);
 
     if (is_null($bookId)) {
         $book = Book::getBookByDataId($idData);

lib/Tag.php

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

@@ -39,7 +39,7 @@ 
         if ($post = $result->fetchObject ()) {
             return new Tag ($post);
         }
-        return NULL;
+        return null;
     }
 
     public static function getAllTags() {
@@ -54,7 +54,7 @@ 
         return Base::getEntryArrayWithBookNumber ($sql, self::TAG_COLUMNS, array (), "Tag");
     }
 
-    public static function getAllTagsByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getAllTagsByQuery($query, $n, $database = null, $numberPerPage = null) {
         $columns  = "tags.id as id, tags.name as name, (select count(*) from books_tags_link where tags.id = tag) as count";
         $sql = 'select {0} from tags where upper (tags.name) like ? {1} order by tags.name';
         list ($totalNumber, $result) = parent::executeQuery ($sql, $columns, "", array ('%' . $query . '%'), $n, $database, $numberPerPage);

lib/Book.php

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

@@ -99,14 +99,14 @@ 
     public $seriesIndex;
     public $comment;
     public $rating;
-    public $datas = NULL;
-    public $authors = NULL;
-    public $publisher = NULL;
-    public $serie = NULL;
-    public $tags = NULL;
-    public $languages = NULL;
+    public $datas = null;
+    public $authors = null;
+    public $publisher = null;
+    public $serie = null;
+    public $tags = null;
+    public $languages = null;
     public $format = array ();
-    private $coverFileName = NULL;
+    private $coverFileName = null;
 
     public function __construct($line) {
     	global $config;
@@ -136,12 +136,12 @@ 
         		$imgDirectory = Base::getImgDirectory();
         		$this->coverFileName = $line->cover;
         		if (!file_exists($this->coverFileName)) {
-        			$this->coverFileName = NULL;
+        			$this->coverFileName = null;
         		}
         		if (empty($this->coverFileName)) {
         			$this->coverFileName = sprintf('%s%s', $imgDirectory, $line->cover);
         			if (!file_exists($this->coverFileName)) {
-        				$this->coverFileName = NULL;
+        				$this->coverFileName = null;
         			}
         		}
         		if (empty($this->coverFileName)) {
@@ -149,12 +149,12 @@ 
         			if ($data) {
         				$this->coverFileName = sprintf('%s%s/%s', $imgDirectory, $data->name, $line->cover);
         				if (!file_exists($this->coverFileName)) {
-        					$this->coverFileName = NULL;
+        					$this->coverFileName = null;
         				}
         				if (empty($this->coverFileName)) {
         					$this->coverFileName = sprintf('%s%s.jpg', $imgDirectory, $data->name);
         					if (!file_exists($this->coverFileName)) {
-        						$this->coverFileName = NULL;
+        						$this->coverFileName = null;
         					}
         				}
         			}
@@ -306,7 +306,7 @@ 
     /* End of other class (author, series, tag, ...) initialization and accessors */
 
     public static function getFilterString() {
-        $filter = getURLParam('tag', NULL);
+        $filter = getURLParam('tag', null);
         if (empty($filter)) return '';
 
         $exists = true;
@@ -328,7 +328,7 @@ 
     {
         $bestFormatForKindle = array('EPUB', 'PDF', 'AZW3', 'MOBI');
         $bestRank = -1;
-        $bestData = NULL;
+        $bestData = null;
         foreach ($this->getDatas() as $data) {
             $key = array_search($data->format, $bestFormatForKindle);
             if ($key !== false && $key > $bestRank) {
@@ -395,7 +395,7 @@ 
         return reset($reduced);
     }
 
-    public function getFilePath($extension, $idData = NULL, $relative = false)
+    public function getFilePath($extension, $idData = null, $relative = false)
     {
         /*if ($extension == 'jpg')
         {
@@ -431,7 +431,7 @@ 
     	else {
     		$data = $this->getDataById($idData);
     		if (!$data) {
-    			return NULL;
+    			return null;
     		}
     		$file = $data->name . "." . strtolower($data->format);
     		return $this->path . '/' . $file;
@@ -478,7 +478,7 @@ 
         }
     }
 
-    public function getThumbnail($width, $height, $outputfile = NULL, $inType = 'jpg') {
+    public function getThumbnail($width, $height, $outputfile = null, $inType = 'jpg') {
         if (is_null($width) && is_null($height)) {
             return false;
         }
@@ -541,12 +541,12 @@ 
         	//array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_THUMBNAIL_TYPE, 'cover.jpg', NULL));
         	$ext = strtolower(pathinfo($this->coverFileName, PATHINFO_EXTENSION));
         	if ($ext == 'png') {
-        		array_push($linkArray, Data::getLink($this, "png", "image/png", Link::OPDS_IMAGE_TYPE, "cover.png", NULL));
-        		array_push($linkArray, Data::getLink($this, "png", "image/png", Link::OPDS_THUMBNAIL_TYPE, "cover.png", NULL));
+        		array_push($linkArray, Data::getLink($this, "png", "image/png", Link::OPDS_IMAGE_TYPE, "cover.png", null));
+        		array_push($linkArray, Data::getLink($this, "png", "image/png", Link::OPDS_THUMBNAIL_TYPE, "cover.png", null));
         	}
         	else {
-        		array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_IMAGE_TYPE, 'cover.jpg', NULL));
-        		array_push($linkArray, Data::getLink($this, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", NULL));
+        		array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_IMAGE_TYPE, 'cover.jpg', null));
+        		array_push($linkArray, Data::getLink($this, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", null));
         	}
         }
 
@@ -578,7 +578,7 @@ 
             $this->getLinkArray(), $this);
     }
 
-    public static function getBookCount($database = NULL) {
+    public static function getBookCount($database = null) {
         return parent::executeQuerySingle('select count(*) from books', $database);
     }
 
@@ -647,7 +647,7 @@ 
             $book = new Book($post);
             return $book;
         }
-        return NULL;
+        return null;
     }
 
     public static function getBookByDataId($dataId) {
@@ -663,10 +663,10 @@ 
             $book->datas = array($data);
             return $book;
         }
-        return NULL;
+        return null;
     }
 
-    public static function getBooksByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getBooksByQuery($query, $n, $database = null, $numberPerPage = null) {
         $i = 0;
         $critArray = array();
         foreach (array(PageQueryResult::SCOPE_AUTHOR,
@@ -713,11 +713,11 @@ 
         return $entryArray;
     }
 
-    public static function getBooksByStartingLetter($letter, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getBooksByStartingLetter($letter, $n, $database = null, $numberPerPage = null) {
         return self::getEntryArray(self::SQL_BOOKS_BY_FIRST_LETTER, array($letter . '%'), $n, $database, $numberPerPage);
     }
 
-    public static function getEntryArray($query, $params, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getEntryArray($query, $params, $n, $database = null, $numberPerPage = null) {
         /* @var $totalNumber integer */
         /* @var $result PDOStatement */
     	list($totalNumber, $result) = parent::executeQuery($query, self::getBookColumns(), self::getFilterString(), $params, $n, $database, $numberPerPage);