mbirth / cops

fetch.php

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

@@ -22,9 +22,9 @@
     header("Pragma: public");
     header("Cache-Control: maxage=".$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);
+    $idData = getURLParam ("data", null);
     if (is_null ($bookId))
     {
         $book = Book::getBookByDataId($idData);

sendtomail.php

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

@@ -11,7 +11,7 @@ 
         empty ($config['cops_mail_configuration']["address.from"])) {
         return "NOK. bad configuration.";
     }
-    return False;
+    return false;
 }
 
 function checkRequest ($idData, $emailDest) {
@@ -21,7 +21,7 @@ 
     if (empty ($emailDest)) {
         return 'No email sent.';
     }
-    return False;
+    return false;
 }
 
 if (php_sapi_name() === 'cli') { return; }

transliteration.php

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

@@ -25,7 +25,7 @@ 
  * @return
  *   Transliterated text.
  */
-function _transliteration_process($string, $unknown = '?', $source_langcode = NULL) {
+function _transliteration_process($string, $unknown = '?', $source_langcode = null) {
   // ASCII is always valid NFC! If we're only ever given plain ASCII, we can
   // avoid the overhead of initializing the decomposition tables by skipping
   // out early.
@@ -175,7 +175,7 @@ 
  * @return
  *   ASCII replacement character.
  */
-function _transliteration_replace($ord, $unknown = '?', $langcode = NULL) {
+function _transliteration_replace($ord, $unknown = '?', $langcode = null) {
   static $map = array();
 
   //GL: set language later

base.php

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

@@ -36,14 +36,14 @@ 
     // If there is a syntax error in the function created
     // $dot will be equal to FALSE
     if (!$dot) {
-        return FALSE;
+        return false;
     }
     // Execute the template
     if (!empty ($data)) {
         return $dot ($data);
     }
 
-    return NULL;
+    return null;
 }
 
 function getQueryString () {
@@ -60,7 +60,7 @@ 
     $_SERVER['REDIRECT_STATUS'] = 404;
 }
 
-function getURLParam ($name, $default = NULL) {
+function getURLParam ($name, $default = null) {
     if (!empty ($_GET) && isset($_GET[$name]) && $_GET[$name] != "") {
         return $_GET[$name];
     }
@@ -109,10 +109,10 @@ 
 
     switch ($error->level) {
         case LIBXML_ERR_WARNING:
-            $return .= "Warning $error->code: ";
+            $return .= "warning $error->code: ";
             break;
          case LIBXML_ERR_ERROR:
-            $return .= "Error $error->code: ";
+            $return .= "error $error->code: ";
             break;
         case LIBXML_ERR_FATAL:
             $return .= "Fatal Error $error->code: ";
@@ -244,7 +244,7 @@ 
         $langs = getAcceptLanguages();
     }
     //echo var_dump($langs);
-    $lang_file = NULL;
+    $lang_file = null;
     foreach ($langs as $language => $val) {
         $temp_file = dirname(__FILE__). '/lang/Localization_' . $language . '.json';
         if (file_exists($temp_file)) {
@@ -273,13 +273,13 @@ 
         $phrase .= ".many";
 
     /* Static keyword is used to ensure the file is loaded only once */
-    static $translations = NULL;
+    static $translations = null;
     if ($reset) {
-        $translations = NULL;
+        $translations = null;
     }
     /* If no instance of $translations has occured load the language file */
     if (is_null($translations)) {
-        $lang_file_en = NULL;
+        $lang_file_en = null;
         list ($lang, $lang_file) = getLangAndTranslationFile();
         if ($lang != "en") {
             $lang_file_en = dirname(__FILE__). '/lang/' . 'Localization_en.json';
@@ -356,7 +356,7 @@ 
     public $facetGroup;
     public $activeFacet;
 
-    public function __construct($phref, $ptype, $prel = NULL, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE) {
+    public function __construct($phref, $ptype, $prel = null, $ptitle = null, $pfacetGroup = null, $pactiveFacet = false) {
         $this->href = $phref;
         $this->type = $ptype;
         $this->rel = $prel;
@@ -377,7 +377,7 @@ 
 
 class LinkNavigation extends Link
 {
-    public function __construct($phref, $prel = NULL, $ptitle = NULL) {
+    public function __construct($phref, $prel = null, $ptitle = null) {
         parent::__construct ($phref, Link::OPDS_NAVIGATION_TYPE, $prel, $ptitle);
         if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
         if (!preg_match ("#^\?(.*)#", $this->href) && !empty ($this->href)) $this->href = "?" . $this->href;
@@ -391,7 +391,7 @@ 
 
 class LinkFacet extends Link
 {
-    public function __construct($phref, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE) {
+    public function __construct($phref, $ptitle = null, $pfacetGroup = null, $pactiveFacet = false) {
         parent::__construct ($phref, Link::OPDS_PAGING_TYPE, "http://opds-spec.org/facet", $ptitle, $pfacetGroup, $pactiveFacet);
         if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
         $this->href = parent::getScriptName() . $this->href;
@@ -408,7 +408,7 @@ 
     public $linkArray;
     public $localUpdated;
     public $className;
-    private static $updated = NULL;
+    private static $updated = null;
 
     public static $icons = array(
         Author::ALL_AUTHORS_ID       => 'images/author.png',
@@ -640,7 +640,7 @@ 
         if (($this->n) * getCurrentOption ("max_item_per_page") < $this->totalNumber) {
             return new LinkNavigation ($currentUrl . "&n=" . ($this->n + 1), "next", localize ("paging.next.alternate"));
         }
-        return NULL;
+        return null;
     }
 
     public function getPrevLink ()
@@ -649,7 +649,7 @@ 
         if ($this->n > 1) {
             return new LinkNavigation ($currentUrl . "&n=" . ($this->n - 1), "previous", localize ("paging.previous.alternate"));
         }
-        return NULL;
+        return null;
     }
 
     public function getMaxPage ()
@@ -746,7 +746,7 @@ 
 {
     public function InitializeContent ()
     {
-        $customId = getURLParam ("custom", NULL);
+        $customId = getURLParam ("custom", null);
         $custom = CustomColumn::getCustomById ($customId, $this->idGet);
         $this->idPage = $custom->getEntryId ();
         $this->title = $custom->name;
@@ -758,7 +758,7 @@ 
 {
     public function InitializeContent ()
     {
-        $customId = getURLParam ("custom", NULL);
+        $customId = getURLParam ("custom", null);
         $this->title = CustomColumn::getAllTitle ($customId);
         $this->entryArray = CustomColumn::getAllCustoms($customId);
         $this->idPage = CustomColumn::getAllCustomsId ($customId);
@@ -882,9 +882,9 @@ 
         return !is_null (getURLParam ("search"));
     }
 
-    private function searchByScope ($scope, $limit = FALSE) {
+    private function searchByScope ($scope, $limit = false) {
         $n = $this->n;
-        $numberPerPage = NULL;
+        $numberPerPage = null;
         $queryNormedAndUp = $this->query;
         if (useNormAndUp ()) {
             $queryNormedAndUp = normAndUp ($this->query);
@@ -895,7 +895,7 @@ 
         }
         switch ($scope) {
             case self::SCOPE_BOOK :
-                $array = Book::getBooksByStartingLetter ('%' . $queryNormedAndUp, $n, NULL, $numberPerPage);
+                $array = Book::getBooksByStartingLetter ('%' . $queryNormedAndUp, $n, null, $numberPerPage);
                 break;
             case self::SCOPE_AUTHOR :
                 $array = Author::getAuthorsForSearch ('%' . $queryNormedAndUp);
@@ -904,7 +904,7 @@ 
                 $array = Serie::getAllSeriesByQuery ($queryNormedAndUp);
                 break;
             case self::SCOPE_TAG :
-                $array = Tag::getAllTagsByQuery ($queryNormedAndUp, $n, NULL, $numberPerPage);
+                $array = Tag::getAllTagsByQuery ($queryNormedAndUp, $n, null, $numberPerPage);
                 break;
             case self::SCOPE_PUBLISHER :
                 $array = Publisher::getAllPublishersByQuery ($queryNormedAndUp);
@@ -944,7 +944,7 @@ 
                 if (in_array($key, getCurrentOption ('ignored_categories'))) {
                     continue;
                 }
-                $array = $this->searchByScope ($key, TRUE);
+                $array = $this->searchByScope ($key, true);
 
                 $i = 0;
                 if (count ($array) == 2 && is_array ($array [0])) {
@@ -1165,7 +1165,7 @@ 
 
     const COMPATIBILITY_XML_ALDIKO = "aldiko";
 
-    private static $db = NULL;
+    private static $db = null;
 
     public static function isMultipleDatabaseEnabled () {
         global $config;
@@ -1201,7 +1201,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);
@@ -1214,7 +1214,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);
@@ -1228,7 +1228,7 @@ 
     }
 
 
-    public static function getDbFileName ($database = NULL) {
+    public static function getDbFileName ($database = null) {
         return self::getDbDirectory ($database) .'metadata.db';
     }
 
@@ -1239,7 +1239,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))) {
@@ -1270,19 +1270,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);
@@ -1307,7 +1307,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 ()) {

OPDS_renderer.php

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

@@ -10,8 +10,8 @@
 
 class OPDSRenderer
 {
-    private $xmlStream = NULL;
-    private $updated = NULL;
+    private $xmlStream = null;
+    private $updated = null;
 
     private function getUpdatedTime () {
         if (is_null ($this->updated)) {

customcolumn.php

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

@@ -60,7 +60,7 @@ 
         if ($post = $result->fetchObject ()) {
             return $post->id;
         }
-        return NULL;
+        return null;
     }
 
     public static function getCount($customId) {
@@ -77,7 +77,7 @@ 
         if ($post = $result->fetchObject ()) {
             return new CustomColumn ($post->id, $post->name, $customId);
         }
-        return NULL;
+        return null;
     }
 
     public static function getAllCustoms($customId) {

epubreader.php

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

@@ -13,7 +13,7 @@
 
 header ("Content-Type: text/html;charset=utf-8");
 
-$idData = getURLParam ("data", NULL);
+$idData = getURLParam ("data", null);
 $add = "data=$idData&";
 if (!is_null (GetUrlParam (DB))) $add .= DB . "=" . GetUrlParam (DB) . "&";
 $myBook = Book::getBookByDataId($idData);

JSON_renderer.php

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

@@ -66,8 +66,8 @@
         $out = self::getBookContentArray ($book);
         $database = GetUrlParam (DB);
 
-        $out ["coverurl"] = Data::getLink ($book, "jpg", "image/jpeg", Link::OPDS_IMAGE_TYPE, "cover.jpg", NULL)->hrefXhtml ();
-        $out ["thumbnailurl"] = Data::getLink ($book, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", NULL, NULL, $config['cops_html_thumbnail_height'] * 2)->hrefXhtml ();
+        $out ["coverurl"] = Data::getLink ($book, "jpg", "image/jpeg", Link::OPDS_IMAGE_TYPE, "cover.jpg", null)->hrefXhtml ();
+        $out ["thumbnailurl"] = Data::getLink ($book, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", null, null, $config['cops_html_thumbnail_height'] * 2)->hrefXhtml ();
         $out ["content"] = $book->getComment (false);
         $out ["datas"] = array ();
         $dataKindle = $book->GetMostInterestingDataToSendToKindle ();

book.php

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

@@ -70,12 +70,12 @@ 
     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 ();
 
 
@@ -198,7 +198,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;
@@ -220,7 +220,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) {
@@ -287,7 +287,7 @@ 
         return reset ($reduced);
     }
 
-    public function getFilePath ($extension, $idData = NULL, $relative = false)
+    public function getFilePath ($extension, $idData = null, $relative = false)
     {
         if ($extension == "jpg")
         {
@@ -296,7 +296,7 @@ 
         else
         {
             $data = $this->getDataById ($idData);
-            if (!$data) return NULL;
+            if (!$data) return null;
             $file = $data->name . "." . strtolower ($data->format);
         }
 
@@ -346,7 +346,7 @@ 
         }
     }
 
-    public function getThumbnail ($width, $height, $outputfile = NULL) {
+    public function getThumbnail ($width, $height, $outputfile = null) {
         if (is_null ($width) && is_null ($height)) {
             return false;
         }
@@ -387,9 +387,9 @@ 
 
         if ($this->hasCover)
         {
-            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_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_THUMBNAIL_TYPE, "cover.jpg", null));
         }
 
         foreach ($this->getDatas () as $data)
@@ -419,7 +419,7 @@ 
             $this->getLinkArray (), $this);
     }
 
-    public static function getBookCount($database = NULL) {
+    public static function getBookCount($database = null) {
         return parent::executeQuerySingle ('select count(*) from books', $database);
     }
 
@@ -481,7 +481,7 @@ 
             $book = new Book ($post);
             return $book;
         }
-        return NULL;
+        return null;
     }
 
     public static function getBookByDataId($dataId) {
@@ -497,10 +497,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,
@@ -544,11 +544,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) {
         list ($totalNumber, $result) = parent::executeQuery ($query, self::BOOK_COLUMNS, self::getFilterString (), $params, $n, $database, $numberPerPage);
         $entryArray = array();
         while ($post = $result->fetchObject ())