| @@ -23,9 +23,9 @@ | ||
| 23 | 23 |      header('Pragma: public'); | 
| 24 | 24 |      header('Cache-Control: maxage=' . $expires); | 
| 25 | 25 |      header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expires) . ' GMT'); | 
| 26 | -    $bookId = getURLParam('id', NULL); | |
| 26 | +    $bookId = getURLParam('id', null); | |
| 27 | 27 |      $type   = getURLParam('type', 'jpg'); | 
| 28 | -    $idData = getURLParam('data', NULL); | |
| 28 | +    $idData = getURLParam('data', null); | |
| 29 | 29 |      if (is_null($bookId)) { | 
| 30 | 30 | $book = Book::getBookByDataId($idData); | 
| 31 | 31 |      } else { | 
| @@ -231,7 +231,7 @@ discard block | ||
| 231 | 231 | * "address.from" => "[email protected]" | 
| 232 | 232 | * ); | 
| 233 | 233 | */ | 
| 234 | - $config['cops_mail_configuration'] = NULL; | |
| 234 | + $config['cops_mail_configuration'] = null; | |
| 235 | 235 | |
| 236 | 236 | /* | 
| 237 | 237 | * Use filter in HTML catalog | 
| @@ -303,7 +303,7 @@ discard block | ||
| 303 | 303 | * array( "username" => "xxx", "password" => "secret") : Enable PHP password protection | 
| 304 | 304 | * NULL : Disable PHP password protection (You can still use htpasswd) | 
| 305 | 305 | */ | 
| 306 | - $config['cops_basic_authentication'] = NULL; | |
| 306 | + $config['cops_basic_authentication'] = null; | |
| 307 | 307 | |
| 308 | 308 | /* | 
| 309 | 309 | * Which template is used by default : | 
| @@ -50,7 +50,7 @@ | ||
| 50 | 50 | } | 
| 51 | 51 |      $headcontent = file_get_contents('templates/' . getCurrentTemplate() . '/file.html'); | 
| 52 | 52 | $template = new doT(); | 
| 53 | - $dot = $template->template($headcontent, NULL); | |
| 53 | + $dot = $template->template($headcontent, null); | |
| 54 | 54 | echo($dot($data)); | 
| 55 | 55 | ?><body> | 
| 56 | 56 | <?php | 
| @@ -25,7 +25,7 @@ discard block | ||
| 25 | 25 | * @return | 
| 26 | 26 | * Transliterated text. | 
| 27 | 27 | */ | 
| 28 | -function _transliteration_process($string, $unknown = '?', $source_langcode = NULL) { | |
| 28 | +function _transliteration_process($string, $unknown = '?', $source_langcode = null) { | |
| 29 | 29 | // ASCII is always valid NFC! If we're only ever given plain ASCII, we can | 
| 30 | 30 | // avoid the overhead of initializing the decomposition tables by skipping | 
| 31 | 31 | // out early. | 
| @@ -174,7 +174,7 @@ discard block | ||
| 174 | 174 | * @return | 
| 175 | 175 | * ASCII replacement character. | 
| 176 | 176 | */ | 
| 177 | -function _transliteration_replace($ord, $unknown = '?', $langcode = NULL) { | |
| 177 | +function _transliteration_replace($ord, $unknown = '?', $langcode = null) { | |
| 178 | 178 | static $map = array(); | 
| 179 | 179 | |
| 180 | 180 | //GL: set language later | 
| @@ -55,7 +55,7 @@ discard block | ||
| 55 | 55 | public function getDescription() | 
| 56 | 56 |      { | 
| 57 | 57 | $desc = $this->getDatabaseDescription(); | 
| 58 | -        if ($desc === NULL || empty($desc)) $desc = str_format(localize("customcolumn.description"), $this->getTitle()); | |
| 58 | +        if ($desc === null || empty($desc)) $desc = str_format(localize("customcolumn.description"), $this->getTitle()); | |
| 59 | 59 | return $desc; | 
| 60 | 60 | } | 
| 61 | 61 | |
| @@ -68,7 +68,7 @@ discard block | ||
| 68 | 68 |          if ($post = $result->fetchObject()) { | 
| 69 | 69 | return new CustomColumn($post->value, $post->value, $this); | 
| 70 | 70 | } | 
| 71 | -        return new CustomColumn(NULL, localize("customcolumn.int.unknown"), $this); | |
| 71 | +        return new CustomColumn(null, localize("customcolumn.int.unknown"), $this); | |
| 72 | 72 | } | 
| 73 | 73 | |
| 74 | 74 | public function isSearchable() | 
| @@ -37,14 +37,14 @@ discard block | ||
| 37 | 37 | /** @var string the datatype of this column (one of the CUSTOM_TYPE_* constant values) */ | 
| 38 | 38 | public $datatype; | 
| 39 | 39 | /** @var null|Entry[] */ | 
| 40 | - private $customValues = NULL; | |
| 40 | + private $customValues = null; | |
| 41 | 41 | |
| 42 | 42 | protected function __construct($pcustomId, $pdatatype) | 
| 43 | 43 |      { | 
| 44 | 44 | $this->columnTitle = self::getTitleByCustomID($pcustomId); | 
| 45 | 45 | $this->customId = $pcustomId; | 
| 46 | 46 | $this->datatype = $pdatatype; | 
| 47 | - $this->customValues = NULL; | |
| 47 | + $this->customValues = null; | |
| 48 | 48 | } | 
| 49 | 49 | |
| 50 | 50 | /** | 
| @@ -110,9 +110,9 @@ discard block | ||
| 110 | 110 | $result->execute(array($this->customId)); | 
| 111 | 111 |          if ($post = $result->fetchObject()) { | 
| 112 | 112 | $json = json_decode($post->display); | 
| 113 | - return (isset($json->description) && !empty($json->description)) ? $json->description : NULL; | |
| 113 | + return (isset($json->description) && !empty($json->description)) ? $json->description : null; | |
| 114 | 114 | } | 
| 115 | - return NULL; | |
| 115 | + return null; | |
| 116 | 116 | } | 
| 117 | 117 | |
| 118 | 118 | /** | 
| @@ -168,7 +168,7 @@ discard block | ||
| 168 | 168 |          if ($post = $result->fetchObject()) { | 
| 169 | 169 | return $post->datatype; | 
| 170 | 170 | } | 
| 171 | - return NULL; | |
| 171 | + return null; | |
| 172 | 172 | } | 
| 173 | 173 | |
| 174 | 174 | /** | 
| @@ -206,7 +206,7 @@ discard block | ||
| 206 | 206 | case self::CUSTOM_TYPE_BOOL: | 
| 207 | 207 | return self::$customColumnCacheID[$customId] = new CustomColumnTypeBool($customId); | 
| 208 | 208 | case self::CUSTOM_TYPE_COMPOSITE: | 
| 209 | - return NULL; //TODO Currently not supported | |
| 209 | + return null; //TODO Currently not supported | |
| 210 | 210 | default: | 
| 211 | 211 |                  throw new Exception("Unkown column type: " . $datatype); | 
| 212 | 212 | } | 
| @@ -229,7 +229,7 @@ discard block | ||
| 229 | 229 |          if ($post = $result->fetchObject()) { | 
| 230 | 230 | return self::$customColumnCacheLookup[$lookup] = self::createByCustomID($post->id); | 
| 231 | 231 | } | 
| 232 | - return self::$customColumnCacheLookup[$lookup] = NULL; | |
| 232 | + return self::$customColumnCacheLookup[$lookup] = null; | |
| 233 | 233 | } | 
| 234 | 234 | |
| 235 | 235 | /** | 
| @@ -241,7 +241,7 @@ discard block | ||
| 241 | 241 | public function getAllCustomValues() | 
| 242 | 242 |      { | 
| 243 | 243 | // lazy loading | 
| 244 | - if ($this->customValues == NULL) | |
| 244 | + if ($this->customValues == null) | |
| 245 | 245 | $this->customValues = $this->getAllCustomValuesFromDatabase(); | 
| 246 | 246 | |
| 247 | 247 | return $this->customValues; | 
| @@ -45,7 +45,7 @@ | ||
| 45 | 45 |          if ($post = $result->fetchObject ()) { | 
| 46 | 46 | return new Language ($post->id, Language::getLanguageString ($post->lang_code)); | 
| 47 | 47 | } | 
| 48 | - return NULL; | |
| 48 | + return null; | |
| 49 | 49 | } | 
| 50 | 50 | |
| 51 | 51 | |
| @@ -41,13 +41,13 @@ discard block | ||
| 41 | 41 | |
| 42 | 42 | protected function getAllCustomValuesFromDatabase() | 
| 43 | 43 |      { | 
| 44 | - return NULL; | |
| 44 | + return null; | |
| 45 | 45 | } | 
| 46 | 46 | |
| 47 | 47 | public function getDescription() | 
| 48 | 48 |      { | 
| 49 | 49 | $desc = $this->getDatabaseDescription(); | 
| 50 | -        if ($desc === NULL || empty($desc)) $desc = str_format(localize("customcolumn.description"), $this->getTitle()); | |
| 50 | +        if ($desc === null || empty($desc)) $desc = str_format(localize("customcolumn.description"), $this->getTitle()); | |
| 51 | 51 | return $desc; | 
| 52 | 52 | } | 
| 53 | 53 | |
| @@ -60,7 +60,7 @@ discard block | ||
| 60 | 60 |          if ($post = $result->fetchObject()) { | 
| 61 | 61 | return new CustomColumn($post->id, $post->value, $this); | 
| 62 | 62 | } | 
| 63 | -        return new CustomColumn(NULL, localize("customcolumn.float.unknown"), $this); | |
| 63 | +        return new CustomColumn(null, localize("customcolumn.float.unknown"), $this); | |
| 64 | 64 | } | 
| 65 | 65 | |
| 66 | 66 | public function isSearchable() | 
| @@ -76,8 +76,8 @@ | ||
| 76 | 76 | $out = self::getBookContentArray ($book); | 
| 77 | 77 | $database = GetUrlParam (DB); | 
| 78 | 78 | |
| 79 | - $out ["coverurl"] = Data::getLink ($book, "jpg", "image/jpeg", Link::OPDS_IMAGE_TYPE, "cover.jpg", NULL)->hrefXhtml (); | |
| 80 | - $out ["thumbnailurl"] = Data::getLink ($book, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", NULL, NULL, $config['cops_html_thumbnail_height'] * 2)->hrefXhtml (); | |
| 79 | + $out ["coverurl"] = Data::getLink ($book, "jpg", "image/jpeg", Link::OPDS_IMAGE_TYPE, "cover.jpg", null)->hrefXhtml (); | |
| 80 | + $out ["thumbnailurl"] = Data::getLink ($book, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", null, null, $config['cops_html_thumbnail_height'] * 2)->hrefXhtml (); | |
| 81 | 81 | $out ["content"] = $book->getComment (false); | 
| 82 | 82 | $out ["datas"] = array (); | 
| 83 | 83 | $dataKindle = $book->GetMostInterestingDataToSendToKindle (); |