@@ -21,13 +21,11 @@ |
||
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | if(!is_null($config['cops_basic_authentication']) && |
| 24 | - is_array($config['cops_basic_authentication'])) |
|
| 25 | -{ |
|
| 24 | + is_array($config['cops_basic_authentication'])) { |
|
| 26 | 25 | if (!isset($_SERVER['PHP_AUTH_USER']) || |
| 27 | 26 | (isset($_SERVER['PHP_AUTH_USER']) && |
| 28 | 27 | ($_SERVER['PHP_AUTH_USER']!=$config['cops_basic_authentication']['username'] || |
| 29 | - $_SERVER['PHP_AUTH_PW'] != $config['cops_basic_authentication']['password']))) |
|
| 30 | - { |
|
| 28 | + $_SERVER['PHP_AUTH_PW'] != $config['cops_basic_authentication']['password']))) { |
|
| 31 | 29 | header('WWW-Authenticate: Basic realm="COPS Authentication"'); |
| 32 | 30 | header('HTTP/1.0 401 Unauthorized'); |
| 33 | 31 | echo 'This site is password protected'; |
@@ -14,8 +14,9 @@ |
||
| 14 | 14 | $this->idPage = Book::getEntryIdByLetter ($this->idGet); |
| 15 | 15 | |
| 16 | 16 | $count = $this->totalNumber; |
| 17 | - if ($count == -1) |
|
| 18 | - $count = count ($this->entryArray); |
|
| 17 | + if ($count == -1) { |
|
| 18 | + $count = count ($this->entryArray); |
|
| 19 | + } |
|
| 19 | 20 | |
| 20 | 21 | $this->title = str_format (localize ("splitByLetter.letter"), str_format (localize ("bookword", $count), $count), $this->idGet); |
| 21 | 22 | } |
@@ -8,10 +8,15 @@ |
||
| 8 | 8 | |
| 9 | 9 | class LinkNavigation extends Link |
| 10 | 10 | { |
| 11 | - public function __construct($phref, $prel = NULL, $ptitle = NULL) { |
|
| 11 | + public function __construct($phref, $prel = NULL, $ptitle = NULL) |
|
| 12 | + { |
|
| 12 | 13 | parent::__construct ($phref, Link::OPDS_NAVIGATION_TYPE, $prel, $ptitle); |
| 13 | - if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB)); |
|
| 14 | - if (!preg_match ("#^\?(.*)#", $this->href) && !empty ($this->href)) $this->href = "?" . $this->href; |
|
| 14 | + if (!is_null (GetUrlParam (DB))) { |
|
| 15 | + $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB)); |
|
| 16 | + } |
|
| 17 | + if (!preg_match ("#^\?(.*)#", $this->href) && !empty ($this->href)) { |
|
| 18 | + $this->href = "?" . $this->href; |
|
| 19 | + } |
|
| 15 | 20 | if (preg_match ("/(bookdetail|getJSON).php/", parent::getScriptName())) { |
| 16 | 21 | $this->href = "index.php" . $this->href; |
| 17 | 22 | } else { |
@@ -21,7 +21,8 @@ discard block |
||
| 21 | 21 | public $facetGroup; |
| 22 | 22 | public $activeFacet; |
| 23 | 23 | |
| 24 | - public function __construct($phref, $ptype, $prel = NULL, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE) { |
|
| 24 | + public function __construct($phref, $ptype, $prel = NULL, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE) |
|
| 25 | + { |
|
| 25 | 26 | $this->href = $phref; |
| 26 | 27 | $this->type = $ptype; |
| 27 | 28 | $this->rel = $prel; |
@@ -30,11 +31,13 @@ discard block |
||
| 30 | 31 | $this->activeFacet = $pactiveFacet; |
| 31 | 32 | } |
| 32 | 33 | |
| 33 | - public function hrefXhtml () { |
|
| 34 | + public function hrefXhtml () |
|
| 35 | + { |
|
| 34 | 36 | return $this->href; |
| 35 | 37 | } |
| 36 | 38 | |
| 37 | - public function getScriptName() { |
|
| 39 | + public function getScriptName() |
|
| 40 | + { |
|
| 38 | 41 | $parts = explode('/', $_SERVER["SCRIPT_NAME"]); |
| 39 | 42 | return $parts[count($parts) - 1]; |
| 40 | 43 | } |
@@ -13,8 +13,7 @@ |
||
| 13 | 13 | $this->title = localize("authors.title"); |
| 14 | 14 | if (getCurrentOption ("author_split_first_letter") == 1) { |
| 15 | 15 | $this->entryArray = Author::getAllAuthorsByFirstLetter(); |
| 16 | - } |
|
| 17 | - else { |
|
| 16 | + } else { |
|
| 18 | 17 | $this->entryArray = Author::getAllAuthors(); |
| 19 | 18 | } |
| 20 | 19 | $this->idPage = Author::ALL_AUTHORS_ID; |
@@ -13,14 +13,16 @@ discard block |
||
| 13 | 13 | private $xmlStream = NULL; |
| 14 | 14 | private $updated = NULL; |
| 15 | 15 | |
| 16 | - private function getUpdatedTime () { |
|
| 16 | + private function getUpdatedTime () |
|
| 17 | + { |
|
| 17 | 18 | if (is_null ($this->updated)) { |
| 18 | 19 | $this->updated = time(); |
| 19 | 20 | } |
| 20 | 21 | return date (DATE_ATOM, $this->updated); |
| 21 | 22 | } |
| 22 | 23 | |
| 23 | - private function getXmlStream () { |
|
| 24 | + private function getXmlStream () |
|
| 25 | + { |
|
| 24 | 26 | if (is_null ($this->xmlStream)) { |
| 25 | 27 | $this->xmlStream = new XMLWriter(); |
| 26 | 28 | $this->xmlStream->openMemory(); |
@@ -29,7 +31,8 @@ discard block |
||
| 29 | 31 | return $this->xmlStream; |
| 30 | 32 | } |
| 31 | 33 | |
| 32 | - public function getOpenSearch () { |
|
| 34 | + public function getOpenSearch () |
|
| 35 | + { |
|
| 33 | 36 | global $config; |
| 34 | 37 | $xml = new XMLWriter (); |
| 35 | 38 | $xml->openMemory (); |
@@ -58,7 +61,9 @@ discard block |
||
| 58 | 61 | $xml->startElement ("Url"); |
| 59 | 62 | $xml->writeAttribute ("type", 'application/atom+xml'); |
| 60 | 63 | $urlparam = "?query={searchTerms}"; |
| 61 | - if (!is_null (GetUrlParam (DB))) $urlparam = addURLParameter ($urlparam, DB, GetUrlParam (DB)); |
|
| 64 | + if (!is_null (GetUrlParam (DB))) { |
|
| 65 | + $urlparam = addURLParameter ($urlparam, DB, GetUrlParam (DB)); |
|
| 66 | + } |
|
| 62 | 67 | $urlparam = str_replace ("%7B", "{", $urlparam); |
| 63 | 68 | $urlparam = str_replace ("%7D", "}", $urlparam); |
| 64 | 69 | $xml->writeAttribute ("template", $config['cops_full_url'] . 'feed.php' . $urlparam); |
@@ -72,7 +77,8 @@ discard block |
||
| 72 | 77 | return $xml->outputMemory(true); |
| 73 | 78 | } |
| 74 | 79 | |
| 75 | - private function startXmlDocument ($page) { |
|
| 80 | + private function startXmlDocument ($page) |
|
| 81 | + { |
|
| 76 | 82 | global $config; |
| 77 | 83 | self::getXmlStream ()->startDocument('1.0','UTF-8'); |
| 78 | 84 | self::getXmlStream ()->startElement ("feed"); |
@@ -84,21 +90,19 @@ discard block |
||
| 84 | 90 | self::getXmlStream ()->startElement ("title"); |
| 85 | 91 | self::getXmlStream ()->text ($page->title); |
| 86 | 92 | self::getXmlStream ()->endElement (); |
| 87 | - if ($page->subtitle != "") |
|
| 88 | - { |
|
| 93 | + if ($page->subtitle != "") { |
|
| 89 | 94 | self::getXmlStream ()->startElement ("subtitle"); |
| 90 | 95 | self::getXmlStream ()->text ($page->subtitle); |
| 91 | 96 | self::getXmlStream ()->endElement (); |
| 92 | 97 | } |
| 93 | 98 | self::getXmlStream ()->startElement ("id"); |
| 94 | - if ($page->idPage) |
|
| 95 | - { |
|
| 99 | + if ($page->idPage) { |
|
| 96 | 100 | $idPage = $page->idPage; |
| 97 | - if (!is_null (GetUrlParam (DB))) $idPage = str_replace ("cops:", "cops:" . GetUrlParam (DB) . ":", $idPage); |
|
| 101 | + if (!is_null (GetUrlParam (DB))) { |
|
| 102 | + $idPage = str_replace ("cops:", "cops:" . GetUrlParam (DB) . ":", $idPage); |
|
| 103 | + } |
|
| 98 | 104 | self::getXmlStream ()->text ($idPage); |
| 99 | - } |
|
| 100 | - else |
|
| 101 | - { |
|
| 105 | + } else { |
|
| 102 | 106 | self::getXmlStream ()->text ($_SERVER['REQUEST_URI']); |
| 103 | 107 | } |
| 104 | 108 | self::getXmlStream ()->endElement (); |
@@ -124,14 +128,14 @@ discard block |
||
| 124 | 128 | $link = new LinkNavigation ("?" . getQueryString (), "self"); |
| 125 | 129 | self::renderLink ($link); |
| 126 | 130 | $urlparam = "?"; |
| 127 | - if (!is_null (GetUrlParam (DB))) $urlparam = addURLParameter ($urlparam, DB, GetUrlParam (DB)); |
|
| 131 | + if (!is_null (GetUrlParam (DB))) { |
|
| 132 | + $urlparam = addURLParameter ($urlparam, DB, GetUrlParam (DB)); |
|
| 133 | + } |
|
| 128 | 134 | if ($config['cops_generate_invalid_opds_stream'] == 0 || preg_match("/(MantanoReader|FBReader)/", $_SERVER['HTTP_USER_AGENT'])) { |
| 129 | 135 | // Good and compliant way of handling search |
| 130 | 136 | $urlparam = addURLParameter ($urlparam, "page", Base::PAGE_OPENSEARCH); |
| 131 | 137 | $link = new Link ("feed.php" . $urlparam, "application/opensearchdescription+xml", "search", "Search here"); |
| 132 | - } |
|
| 133 | - else |
|
| 134 | - { |
|
| 138 | + } else { |
|
| 135 | 139 | // Bad way, will be removed when OPDS client are fixed |
| 136 | 140 | $urlparam = addURLParameter ($urlparam, "query", "{searchTerms}"); |
| 137 | 141 | $urlparam = str_replace ("%7B", "{", $urlparam); |
@@ -148,13 +152,15 @@ discard block |
||
| 148 | 152 | } |
| 149 | 153 | } |
| 150 | 154 | |
| 151 | - private function endXmlDocument () { |
|
| 155 | + private function endXmlDocument () |
|
| 156 | + { |
|
| 152 | 157 | self::getXmlStream ()->endElement (); |
| 153 | 158 | self::getXmlStream ()->endDocument (); |
| 154 | 159 | return self::getXmlStream ()->outputMemory(true); |
| 155 | 160 | } |
| 156 | 161 | |
| 157 | - private function renderLink ($link) { |
|
| 162 | + private function renderLink ($link) |
|
| 163 | + { |
|
| 158 | 164 | self::getXmlStream ()->startElement ("link"); |
| 159 | 165 | self::getXmlStream ()->writeAttribute ("href", $link->href); |
| 160 | 166 | self::getXmlStream ()->writeAttribute ("type", $link->type); |
@@ -173,7 +179,8 @@ discard block |
||
| 173 | 179 | self::getXmlStream ()->endElement (); |
| 174 | 180 | } |
| 175 | 181 | |
| 176 | - private function getPublicationDate($book) { |
|
| 182 | + private function getPublicationDate($book) |
|
| 183 | + { |
|
| 177 | 184 | $dateYmd = substr($book->pubdate, 0, 10); |
| 178 | 185 | $pubdate = \DateTime::createFromFormat('Y-m-d', $dateYmd); |
| 179 | 186 | if ($pubdate === false || |
@@ -184,7 +191,8 @@ discard block |
||
| 184 | 191 | return $pubdate->format("Y-m-d"); |
| 185 | 192 | } |
| 186 | 193 | |
| 187 | - private function renderEntry ($entry) { |
|
| 194 | + private function renderEntry ($entry) |
|
| 195 | + { |
|
| 188 | 196 | self::getXmlStream ()->startElement ("title"); |
| 189 | 197 | self::getXmlStream ()->text ($entry->title); |
| 190 | 198 | self::getXmlStream ()->endElement (); |
@@ -244,11 +252,11 @@ discard block |
||
| 244 | 252 | |
| 245 | 253 | } |
| 246 | 254 | |
| 247 | - public function render ($page) { |
|
| 255 | + public function render ($page) |
|
| 256 | + { |
|
| 248 | 257 | global $config; |
| 249 | 258 | self::startXmlDocument ($page); |
| 250 | - if ($page->isPaginated ()) |
|
| 251 | - { |
|
| 259 | + if ($page->isPaginated ()) { |
|
| 252 | 260 | self::getXmlStream ()->startElement ("opensearch:totalResults"); |
| 253 | 261 | self::getXmlStream ()->text ($page->totalNumber); |
| 254 | 262 | self::getXmlStream ()->endElement (); |
@@ -13,8 +13,7 @@ |
||
| 13 | 13 | $this->title = localize ("allbooks.title"); |
| 14 | 14 | if (getCurrentOption ("titles_split_first_letter") == 1) { |
| 15 | 15 | $this->entryArray = Book::getAllBooks(); |
| 16 | - } |
|
| 17 | - else { |
|
| 16 | + } else { |
|
| 18 | 17 | list ($this->entryArray, $this->totalNumber) = Book::getBooks ($this->n); |
| 19 | 18 | } |
| 20 | 19 | $this->idPage = Book::ALL_BOOKS_ID; |
@@ -8,9 +8,12 @@ |
||
| 8 | 8 | |
| 9 | 9 | class LinkFacet extends Link |
| 10 | 10 | { |
| 11 | - public function __construct($phref, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE) { |
|
| 11 | + public function __construct($phref, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE) |
|
| 12 | + { |
|
| 12 | 13 | parent::__construct ($phref, Link::OPDS_PAGING_TYPE, "http://opds-spec.org/facet", $ptitle, $pfacetGroup, $pactiveFacet); |
| 13 | - if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB)); |
|
| 14 | + if (!is_null (GetUrlParam (DB))) { |
|
| 15 | + $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB)); |
|
| 16 | + } |
|
| 14 | 17 | $this->href = parent::getScriptName() . $this->href; |
| 15 | 18 | } |
| 16 | 19 | } |
@@ -8,7 +8,8 @@ discard block |
||
| 8 | 8 | |
| 9 | 9 | class PageCustomize extends Page |
| 10 | 10 | { |
| 11 | - private function isChecked ($key, $testedValue = 1) { |
|
| 11 | + private function isChecked ($key, $testedValue = 1) |
|
| 12 | + { |
|
| 12 | 13 | $value = getCurrentOption ($key); |
| 13 | 14 | if (is_array ($value)) { |
| 14 | 15 | if (in_array ($testedValue, $value)) { |
@@ -22,14 +23,16 @@ discard block |
||
| 22 | 23 | return ""; |
| 23 | 24 | } |
| 24 | 25 | |
| 25 | - private function isSelected ($key, $value) { |
|
| 26 | + private function isSelected ($key, $value) |
|
| 27 | + { |
|
| 26 | 28 | if (getCurrentOption ($key) == $value) { |
| 27 | 29 | return "selected='selected'"; |
| 28 | 30 | } |
| 29 | 31 | return ""; |
| 30 | 32 | } |
| 31 | 33 | |
| 32 | - private function getStyleList () { |
|
| 34 | + private function getStyleList () |
|
| 35 | + { |
|
| 33 | 36 | $result = array (); |
| 34 | 37 | foreach (glob ("templates/" . getCurrentTemplate () . "/styles/style-*.css") as $filename) { |
| 35 | 38 | if (preg_match ('/styles\/style-(.*?)\.css/', $filename, $m)) { |