@@ -64,6 +64,9 @@ discard block |
||
| 64 | 64 | $_SERVER['REDIRECT_STATUS'] = 404; |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | +/** |
|
| 68 | + * @param string $name |
|
| 69 | + */ |
|
| 67 | 70 | function getURLParam($name, $default = NULL) |
| 68 | 71 | { |
| 69 | 72 | if (!empty ($_GET) && isset($_GET[$name]) && $_GET[$name] != '') { |
@@ -104,6 +107,11 @@ discard block |
||
| 104 | 107 | return $url . '?v=' . VERSION; |
| 105 | 108 | } |
| 106 | 109 | |
| 110 | +/** |
|
| 111 | + * @param string $xml |
|
| 112 | + * |
|
| 113 | + * @return string |
|
| 114 | + */ |
|
| 107 | 115 | function xml2xhtml($xml) |
| 108 | 116 | { |
| 109 | 117 | return preg_replace_callback('#<(\w+)([^>]*)\s*/>#s', function($m) { |
@@ -326,6 +334,9 @@ discard block |
||
| 326 | 334 | return $phrase; |
| 327 | 335 | } |
| 328 | 336 | |
| 337 | +/** |
|
| 338 | + * @param string $paramName |
|
| 339 | + */ |
|
| 329 | 340 | function addURLParameter($urlParams, $paramName, $paramValue) |
| 330 | 341 | { |
| 331 | 342 | if (empty ($urlParams)) { |
@@ -32,9 +32,9 @@ discard block |
||
| 32 | 32 | // Generate the function for the template |
| 33 | 33 | $template = new doT (); |
| 34 | 34 | $dot = $template->template ($page, array ('bookdetail' => $bookdetail, |
| 35 | - 'header' => $header, |
|
| 36 | - 'footer' => $footer, |
|
| 37 | - 'main' => $main)); |
|
| 35 | + 'header' => $header, |
|
| 36 | + 'footer' => $footer, |
|
| 37 | + 'main' => $main)); |
|
| 38 | 38 | // If there is a syntax error in the function created |
| 39 | 39 | // $dot will be equal to FALSE |
| 40 | 40 | if (!$dot) { |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | case LIBXML_ERR_WARNING: |
| 126 | 126 | $return .= 'Warning ' . $error->code . ': '; |
| 127 | 127 | break; |
| 128 | - case LIBXML_ERR_ERROR: |
|
| 128 | + case LIBXML_ERR_ERROR: |
|
| 129 | 129 | $return .= 'Error ' . $error->code . ': '; |
| 130 | 130 | break; |
| 131 | 131 | case LIBXML_ERR_FATAL: |
@@ -134,8 +134,8 @@ discard block |
||
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | $return .= trim($error->message) . |
| 137 | - "\n Line: " . $error->line . |
|
| 138 | - "\n Column: " . $error->column; |
|
| 137 | + "\n Line: " . $error->line . |
|
| 138 | + "\n Column: " . $error->column; |
|
| 139 | 139 | |
| 140 | 140 | if ($error->file) { |
| 141 | 141 | $return .= "\n File: " . $error->file; |
@@ -84,6 +84,9 @@ discard block |
||
| 84 | 84 | return ""; |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | + /** |
|
| 88 | + * @return string |
|
| 89 | + */ |
|
| 87 | 90 | public static function getDbDirectory ($database = NULL) { |
| 88 | 91 | global $config; |
| 89 | 92 | if (self::isMultipleDatabaseEnabled ()) { |
@@ -143,10 +146,18 @@ discard block |
||
| 143 | 146 | self::$db = NULL; |
| 144 | 147 | } |
| 145 | 148 | |
| 149 | + /** |
|
| 150 | + * @param string $query |
|
| 151 | + */ |
|
| 146 | 152 | public static function executeQuerySingle ($query, $database = NULL) { |
| 147 | 153 | return self::getDb ($database)->query($query)->fetchColumn(); |
| 148 | 154 | } |
| 149 | 155 | |
| 156 | + /** |
|
| 157 | + * @param string $table |
|
| 158 | + * @param string $id |
|
| 159 | + * @param string $numberOfString |
|
| 160 | + */ |
|
| 150 | 161 | public static function getCountGeneric($table, $id, $pageId, $numberOfString = NULL) { |
| 151 | 162 | if (!$numberOfString) { |
| 152 | 163 | $numberOfString = $table . ".alphabetical"; |
@@ -159,6 +170,10 @@ discard block |
||
| 159 | 170 | return $entry; |
| 160 | 171 | } |
| 161 | 172 | |
| 173 | + /** |
|
| 174 | + * @param string $columns |
|
| 175 | + * @param string $category |
|
| 176 | + */ |
|
| 162 | 177 | public static function getEntryArrayWithBookNumber ($query, $columns, $params, $category) { |
| 163 | 178 | /* @var $result PDOStatement */ |
| 164 | 179 | |
@@ -181,6 +196,9 @@ discard block |
||
| 181 | 196 | return $entryArray; |
| 182 | 197 | } |
| 183 | 198 | |
| 199 | + /** |
|
| 200 | + * @param string $filter |
|
| 201 | + */ |
|
| 184 | 202 | public static function executeQuery($query, $columns, $filter, $params, $n, $database = NULL, $numberPerPage = NULL) { |
| 185 | 203 | $totalResult = -1; |
| 186 | 204 | |
@@ -144,6 +144,9 @@ discard block |
||
| 144 | 144 | return 'index.php' . $urlParam; |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | + /** |
|
| 148 | + * @return string |
|
| 149 | + */ |
|
| 147 | 150 | public function getTitle () { |
| 148 | 151 | return $this->title; |
| 149 | 152 | } |
@@ -331,6 +334,9 @@ discard block |
||
| 331 | 334 | return reset($reduced); |
| 332 | 335 | } |
| 333 | 336 | |
| 337 | + /** |
|
| 338 | + * @param string $extension |
|
| 339 | + */ |
|
| 334 | 340 | public function getFilePath($extension, $idData = NULL, $relative = false) |
| 335 | 341 | { |
| 336 | 342 | if ($extension == 'jpg') |
@@ -464,6 +470,9 @@ discard block |
||
| 464 | 470 | $this->getLinkArray(), $this); |
| 465 | 471 | } |
| 466 | 472 | |
| 473 | + /** |
|
| 474 | + * @param integer $database |
|
| 475 | + */ |
|
| 467 | 476 | public static function getBookCount($database = NULL) { |
| 468 | 477 | return parent::executeQuerySingle('select count(*) from books', $database); |
| 469 | 478 | } |
@@ -512,7 +521,7 @@ discard block |
||
| 512 | 521 | } |
| 513 | 522 | |
| 514 | 523 | /** |
| 515 | - * @param $customColumn CustomColumn |
|
| 524 | + * @param CustomColumn $customColumn CustomColumn |
|
| 516 | 525 | * @param $id integer |
| 517 | 526 | * @param $n integer |
| 518 | 527 | * @return array |
@@ -552,6 +561,10 @@ discard block |
||
| 552 | 561 | return NULL; |
| 553 | 562 | } |
| 554 | 563 | |
| 564 | + /** |
|
| 565 | + * @param integer $database |
|
| 566 | + * @param integer $numberPerPage |
|
| 567 | + */ |
|
| 555 | 568 | public static function getBooksByQuery($query, $n, $database = NULL, $numberPerPage = NULL) { |
| 556 | 569 | $i = 0; |
| 557 | 570 | $critArray = array(); |
@@ -599,6 +612,9 @@ discard block |
||
| 599 | 612 | return $entryArray; |
| 600 | 613 | } |
| 601 | 614 | |
| 615 | + /** |
|
| 616 | + * @param integer $numberPerPage |
|
| 617 | + */ |
|
| 602 | 618 | public static function getBooksByStartingLetter($letter, $n, $database = NULL, $numberPerPage = NULL) { |
| 603 | 619 | return self::getEntryArray(self::SQL_BOOKS_BY_FIRST_LETTER, array($letter . '%'), $n, $database, $numberPerPage); |
| 604 | 620 | } |
@@ -473,15 +473,15 @@ discard block |
||
| 473 | 473 | $nBooks = parent::executeQuerySingle('select count(*) from books'); |
| 474 | 474 | $result = array(); |
| 475 | 475 | $entry = new Entry(localize('allbooks.title'), |
| 476 | - self::ALL_BOOKS_ID, |
|
| 477 | - str_format(localize('allbooks.alphabetical', $nBooks), $nBooks), 'text', |
|
| 478 | - array(new LinkNavigation('?page='.parent::PAGE_ALL_BOOKS)), '', $nBooks); |
|
| 476 | + self::ALL_BOOKS_ID, |
|
| 477 | + str_format(localize('allbooks.alphabetical', $nBooks), $nBooks), 'text', |
|
| 478 | + array(new LinkNavigation('?page='.parent::PAGE_ALL_BOOKS)), '', $nBooks); |
|
| 479 | 479 | array_push($result, $entry); |
| 480 | 480 | if ($config['cops_recentbooks_limit'] > 0) { |
| 481 | 481 | $entry = new Entry(localize('recent.title'), |
| 482 | - self::ALL_RECENT_BOOKS_ID, |
|
| 483 | - str_format(localize('recent.list'), $config['cops_recentbooks_limit']), 'text', |
|
| 484 | - array ( new LinkNavigation ('?page='.parent::PAGE_ALL_RECENT_BOOKS)), '', $config['cops_recentbooks_limit']); |
|
| 482 | + self::ALL_RECENT_BOOKS_ID, |
|
| 483 | + str_format(localize('recent.list'), $config['cops_recentbooks_limit']), 'text', |
|
| 484 | + array ( new LinkNavigation ('?page='.parent::PAGE_ALL_RECENT_BOOKS)), '', $config['cops_recentbooks_limit']); |
|
| 485 | 485 | array_push($result, $entry); |
| 486 | 486 | } |
| 487 | 487 | return $result; |
@@ -556,10 +556,10 @@ discard block |
||
| 556 | 556 | $i = 0; |
| 557 | 557 | $critArray = array(); |
| 558 | 558 | foreach (array(PageQueryResult::SCOPE_AUTHOR, |
| 559 | - PageQueryResult::SCOPE_TAG, |
|
| 560 | - PageQueryResult::SCOPE_SERIES, |
|
| 561 | - PageQueryResult::SCOPE_PUBLISHER, |
|
| 562 | - PageQueryResult::SCOPE_BOOK) as $key) { |
|
| 559 | + PageQueryResult::SCOPE_TAG, |
|
| 560 | + PageQueryResult::SCOPE_SERIES, |
|
| 561 | + PageQueryResult::SCOPE_PUBLISHER, |
|
| 562 | + PageQueryResult::SCOPE_BOOK) as $key) { |
|
| 563 | 563 | if (in_array($key, getCurrentOption('ignored_categories')) || |
| 564 | 564 | (!array_key_exists($key, $query) && !array_key_exists('all', $query))) { |
| 565 | 565 | $critArray[$i] = self::BAD_SEARCH; |
@@ -39,6 +39,9 @@ discard block |
||
| 39 | 39 | /** @var null|Entry[] */ |
| 40 | 40 | private $customValues = NULL; |
| 41 | 41 | |
| 42 | + /** |
|
| 43 | + * @param string $pdatatype |
|
| 44 | + */ |
|
| 42 | 45 | protected function __construct($pcustomId, $pdatatype) |
| 43 | 46 | { |
| 44 | 47 | $this->columnTitle = self::getTitleByCustomID($pcustomId); |
@@ -147,7 +150,7 @@ discard block |
||
| 147 | 150 | /** |
| 148 | 151 | * Encode a value of this column ready to be displayed in an HTML document |
| 149 | 152 | * |
| 150 | - * @param integer|string $value |
|
| 153 | + * @param string $value |
|
| 151 | 154 | * @return string |
| 152 | 155 | */ |
| 153 | 156 | public function encodeHTMLValue($value) |
@@ -277,7 +280,7 @@ discard block |
||
| 277 | 280 | /** |
| 278 | 281 | * Get a CustomColumn for a specified (by ID) value |
| 279 | 282 | * |
| 280 | - * @param string|integer $id the id of the searched value |
|
| 283 | + * @param integer $id the id of the searched value |
|
| 281 | 284 | * @return CustomColumn |
| 282 | 285 | */ |
| 283 | 286 | abstract public function getCustom($id); |
@@ -8,6 +8,9 @@ |
||
| 8 | 8 | |
| 9 | 9 | class LinkFacet extends Link |
| 10 | 10 | { |
| 11 | + /** |
|
| 12 | + * @param string $phref |
|
| 13 | + */ |
|
| 11 | 14 | public function __construct($phref, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE) { |
| 12 | 15 | parent::__construct ($phref, Link::OPDS_PAGING_TYPE, "http://opds-spec.org/facet", $ptitle, $pfacetGroup, $pactiveFacet); |
| 13 | 16 | if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB)); |
@@ -8,6 +8,9 @@ |
||
| 8 | 8 | |
| 9 | 9 | class LinkNavigation extends Link |
| 10 | 10 | { |
| 11 | + /** |
|
| 12 | + * @param string $prel |
|
| 13 | + */ |
|
| 11 | 14 | public function __construct($phref, $prel = NULL, $ptitle = NULL) { |
| 12 | 15 | parent::__construct ($phref, Link::OPDS_NAVIGATION_TYPE, $prel, $ptitle); |
| 13 | 16 | if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB)); |
@@ -8,6 +8,9 @@ discard block |
||
| 8 | 8 | |
| 9 | 9 | class PageCustomize extends Page |
| 10 | 10 | { |
| 11 | + /** |
|
| 12 | + * @param string $key |
|
| 13 | + */ |
|
| 11 | 14 | private function isChecked ($key, $testedValue = 1) { |
| 12 | 15 | $value = getCurrentOption ($key); |
| 13 | 16 | if (is_array ($value)) { |
@@ -22,6 +25,9 @@ discard block |
||
| 22 | 25 | return ""; |
| 23 | 26 | } |
| 24 | 27 | |
| 28 | + /** |
|
| 29 | + * @param string $key |
|
| 30 | + */ |
|
| 25 | 31 | private function isSelected ($key, $value) { |
| 26 | 32 | if (getCurrentOption ($key) == $value) { |
| 27 | 33 | return "selected='selected'"; |
@@ -45,11 +45,11 @@ |
||
| 45 | 45 | $this->entryArray = array (); |
| 46 | 46 | |
| 47 | 47 | $ignoredBaseArray = array (PageQueryResult::SCOPE_AUTHOR, |
| 48 | - PageQueryResult::SCOPE_TAG, |
|
| 49 | - PageQueryResult::SCOPE_SERIES, |
|
| 50 | - PageQueryResult::SCOPE_PUBLISHER, |
|
| 51 | - PageQueryResult::SCOPE_RATING, |
|
| 52 | - "language"); |
|
| 48 | + PageQueryResult::SCOPE_TAG, |
|
| 49 | + PageQueryResult::SCOPE_SERIES, |
|
| 50 | + PageQueryResult::SCOPE_PUBLISHER, |
|
| 51 | + PageQueryResult::SCOPE_RATING, |
|
| 52 | + "language"); |
|
| 53 | 53 | |
| 54 | 54 | $content = ""; |
| 55 | 55 | array_push ($this->entryArray, new Entry ("Template", "", |
@@ -37,14 +37,14 @@ |
||
| 37 | 37 | header('Content-Type:text/html;charset=utf-8'); |
| 38 | 38 | |
| 39 | 39 | $data = array('title' => $config['cops_title_default'], |
| 40 | - 'version' => VERSION, |
|
| 41 | - 'opds_url' => $config['cops_full_url'] . 'feed.php', |
|
| 42 | - 'customHeader' => '', |
|
| 43 | - 'template' => getCurrentTemplate(), |
|
| 44 | - 'server_side_rendering' => useServerSideRendering(), |
|
| 45 | - 'current_css' => getCurrentCss(), |
|
| 46 | - 'favico' => $config['cops_icon'], |
|
| 47 | - 'getjson_url' => 'getJSON.php?' . addURLParameter(getQueryString(), 'complete', 1)); |
|
| 40 | + 'version' => VERSION, |
|
| 41 | + 'opds_url' => $config['cops_full_url'] . 'feed.php', |
|
| 42 | + 'customHeader' => '', |
|
| 43 | + 'template' => getCurrentTemplate(), |
|
| 44 | + 'server_side_rendering' => useServerSideRendering(), |
|
| 45 | + 'current_css' => getCurrentCss(), |
|
| 46 | + 'favico' => $config['cops_icon'], |
|
| 47 | + 'getjson_url' => 'getJSON.php?' . addURLParameter(getQueryString(), 'complete', 1)); |
|
| 48 | 48 | if (preg_match('/Kindle/', $_SERVER['HTTP_USER_AGENT'])) { |
| 49 | 49 | $data['customHeader'] = '<style media="screen" type="text/css"> html { font-size: 75%; -webkit-text-size-adjust: 75%; -ms-text-size-adjust: 75%; }</style>'; |
| 50 | 50 | } |
@@ -26,56 +26,56 @@ discard block |
||
| 26 | 26 | * Transliterated text. |
| 27 | 27 | */ |
| 28 | 28 | function _transliteration_process($string, $unknown = '?', $source_langcode = NULL) { |
| 29 | - // ASCII is always valid NFC! If we're only ever given plain ASCII, we can |
|
| 30 | - // avoid the overhead of initializing the decomposition tables by skipping |
|
| 31 | - // out early. |
|
| 32 | - if (!preg_match('/[\x80-\xff]/', $string)) { |
|
| 29 | + // ASCII is always valid NFC! If we're only ever given plain ASCII, we can |
|
| 30 | + // avoid the overhead of initializing the decomposition tables by skipping |
|
| 31 | + // out early. |
|
| 32 | + if (!preg_match('/[\x80-\xff]/', $string)) { |
|
| 33 | 33 | return $string; |
| 34 | - } |
|
| 34 | + } |
|
| 35 | 35 | |
| 36 | - static $tail_bytes; |
|
| 36 | + static $tail_bytes; |
|
| 37 | 37 | |
| 38 | - if (!isset($tail_bytes)) { |
|
| 38 | + if (!isset($tail_bytes)) { |
|
| 39 | 39 | // Each UTF-8 head byte is followed by a certain number of tail bytes. |
| 40 | 40 | $tail_bytes = array(); |
| 41 | 41 | for ($n = 0; $n < 256; $n++) { |
| 42 | - if ($n < 0xc0) { |
|
| 42 | + if ($n < 0xc0) { |
|
| 43 | 43 | $remaining = 0; |
| 44 | - } |
|
| 45 | - elseif ($n < 0xe0) { |
|
| 44 | + } |
|
| 45 | + elseif ($n < 0xe0) { |
|
| 46 | 46 | $remaining = 1; |
| 47 | - } |
|
| 48 | - elseif ($n < 0xf0) { |
|
| 47 | + } |
|
| 48 | + elseif ($n < 0xf0) { |
|
| 49 | 49 | $remaining = 2; |
| 50 | - } |
|
| 51 | - elseif ($n < 0xf8) { |
|
| 50 | + } |
|
| 51 | + elseif ($n < 0xf8) { |
|
| 52 | 52 | $remaining = 3; |
| 53 | - } |
|
| 54 | - elseif ($n < 0xfc) { |
|
| 53 | + } |
|
| 54 | + elseif ($n < 0xfc) { |
|
| 55 | 55 | $remaining = 4; |
| 56 | - } |
|
| 57 | - elseif ($n < 0xfe) { |
|
| 56 | + } |
|
| 57 | + elseif ($n < 0xfe) { |
|
| 58 | 58 | $remaining = 5; |
| 59 | - } |
|
| 60 | - else { |
|
| 59 | + } |
|
| 60 | + else { |
|
| 61 | 61 | $remaining = 0; |
| 62 | - } |
|
| 63 | - $tail_bytes[chr($n)] = $remaining; |
|
| 62 | + } |
|
| 63 | + $tail_bytes[chr($n)] = $remaining; |
|
| 64 | + } |
|
| 64 | 65 | } |
| 65 | - } |
|
| 66 | 66 | |
| 67 | - // Chop the text into pure-ASCII and non-ASCII areas; large ASCII parts can |
|
| 68 | - // be handled much more quickly. Don't chop up Unicode areas for punctuation, |
|
| 69 | - // though, that wastes energy. |
|
| 70 | - preg_match_all('/[\x00-\x7f]+|[\x80-\xff][\x00-\x40\x5b-\x5f\x7b-\xff]*/', $string, $matches); |
|
| 67 | + // Chop the text into pure-ASCII and non-ASCII areas; large ASCII parts can |
|
| 68 | + // be handled much more quickly. Don't chop up Unicode areas for punctuation, |
|
| 69 | + // though, that wastes energy. |
|
| 70 | + preg_match_all('/[\x00-\x7f]+|[\x80-\xff][\x00-\x40\x5b-\x5f\x7b-\xff]*/', $string, $matches); |
|
| 71 | 71 | |
| 72 | - $result = ''; |
|
| 73 | - foreach ($matches[0] as $str) { |
|
| 72 | + $result = ''; |
|
| 73 | + foreach ($matches[0] as $str) { |
|
| 74 | 74 | if ($str[0] < "\x80") { |
| 75 | - // ASCII chunk: guaranteed to be valid UTF-8 and in normal form C, so |
|
| 76 | - // skip over it. |
|
| 77 | - $result .= $str; |
|
| 78 | - continue; |
|
| 75 | + // ASCII chunk: guaranteed to be valid UTF-8 and in normal form C, so |
|
| 76 | + // skip over it. |
|
| 77 | + $result .= $str; |
|
| 78 | + continue; |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | // We'll have to examine the chunk byte by byte to ensure that it consists |
@@ -91,72 +91,72 @@ discard block |
||
| 91 | 91 | $len = $chunk + 1; |
| 92 | 92 | |
| 93 | 93 | for ($i = -1; --$len; ) { |
| 94 | - $c = $str[++$i]; |
|
| 95 | - if ($remaining = $tail_bytes[$c]) { |
|
| 94 | + $c = $str[++$i]; |
|
| 95 | + if ($remaining = $tail_bytes[$c]) { |
|
| 96 | 96 | // UTF-8 head byte! |
| 97 | 97 | $sequence = $head = $c; |
| 98 | 98 | do { |
| 99 | - // Look for the defined number of tail bytes... |
|
| 100 | - if (--$len && ($c = $str[++$i]) >= "\x80" && $c < "\xc0") { |
|
| 99 | + // Look for the defined number of tail bytes... |
|
| 100 | + if (--$len && ($c = $str[++$i]) >= "\x80" && $c < "\xc0") { |
|
| 101 | 101 | // Legal tail bytes are nice. |
| 102 | 102 | $sequence .= $c; |
| 103 | - } |
|
| 104 | - else { |
|
| 103 | + } |
|
| 104 | + else { |
|
| 105 | 105 | if ($len == 0) { |
| 106 | - // Premature end of string! Drop a replacement character into |
|
| 107 | - // output to represent the invalid UTF-8 sequence. |
|
| 108 | - $result .= $unknown; |
|
| 109 | - break 2; |
|
| 106 | + // Premature end of string! Drop a replacement character into |
|
| 107 | + // output to represent the invalid UTF-8 sequence. |
|
| 108 | + $result .= $unknown; |
|
| 109 | + break 2; |
|
| 110 | 110 | } |
| 111 | 111 | else { |
| 112 | - // Illegal tail byte; abandon the sequence. |
|
| 113 | - $result .= $unknown; |
|
| 114 | - // Back up and reprocess this byte; it may itself be a legal |
|
| 115 | - // ASCII or UTF-8 sequence head. |
|
| 116 | - --$i; |
|
| 117 | - ++$len; |
|
| 118 | - continue 2; |
|
| 112 | + // Illegal tail byte; abandon the sequence. |
|
| 113 | + $result .= $unknown; |
|
| 114 | + // Back up and reprocess this byte; it may itself be a legal |
|
| 115 | + // ASCII or UTF-8 sequence head. |
|
| 116 | + --$i; |
|
| 117 | + ++$len; |
|
| 118 | + continue 2; |
|
| 119 | + } |
|
| 119 | 120 | } |
| 120 | - } |
|
| 121 | 121 | } while (--$remaining); |
| 122 | 122 | |
| 123 | 123 | $n = ord($head); |
| 124 | 124 | if ($n <= 0xdf) { |
| 125 | - $ord = ($n - 192) * 64 + (ord($sequence[1]) - 128); |
|
| 125 | + $ord = ($n - 192) * 64 + (ord($sequence[1]) - 128); |
|
| 126 | 126 | } |
| 127 | 127 | elseif ($n <= 0xef) { |
| 128 | - $ord = ($n - 224) * 4096 + (ord($sequence[1]) - 128) * 64 + (ord($sequence[2]) - 128); |
|
| 128 | + $ord = ($n - 224) * 4096 + (ord($sequence[1]) - 128) * 64 + (ord($sequence[2]) - 128); |
|
| 129 | 129 | } |
| 130 | 130 | elseif ($n <= 0xf7) { |
| 131 | - $ord = ($n - 240) * 262144 + (ord($sequence[1]) - 128) * 4096 + (ord($sequence[2]) - 128) * 64 + (ord($sequence[3]) - 128); |
|
| 131 | + $ord = ($n - 240) * 262144 + (ord($sequence[1]) - 128) * 4096 + (ord($sequence[2]) - 128) * 64 + (ord($sequence[3]) - 128); |
|
| 132 | 132 | } |
| 133 | 133 | elseif ($n <= 0xfb) { |
| 134 | - $ord = ($n - 248) * 16777216 + (ord($sequence[1]) - 128) * 262144 + (ord($sequence[2]) - 128) * 4096 + (ord($sequence[3]) - 128) * 64 + (ord($sequence[4]) - 128); |
|
| 134 | + $ord = ($n - 248) * 16777216 + (ord($sequence[1]) - 128) * 262144 + (ord($sequence[2]) - 128) * 4096 + (ord($sequence[3]) - 128) * 64 + (ord($sequence[4]) - 128); |
|
| 135 | 135 | } |
| 136 | 136 | elseif ($n <= 0xfd) { |
| 137 | - $ord = ($n - 252) * 1073741824 + (ord($sequence[1]) - 128) * 16777216 + (ord($sequence[2]) - 128) * 262144 + (ord($sequence[3]) - 128) * 4096 + (ord($sequence[4]) - 128) * 64 + (ord($sequence[5]) - 128); |
|
| 137 | + $ord = ($n - 252) * 1073741824 + (ord($sequence[1]) - 128) * 16777216 + (ord($sequence[2]) - 128) * 262144 + (ord($sequence[3]) - 128) * 4096 + (ord($sequence[4]) - 128) * 64 + (ord($sequence[5]) - 128); |
|
| 138 | 138 | } else { |
| 139 | - $ord = $n; |
|
| 139 | + $ord = $n; |
|
| 140 | 140 | } |
| 141 | 141 | $result .= _transliteration_replace($ord, $unknown, $source_langcode); |
| 142 | 142 | $head = ''; |
| 143 | - } elseif ($c < "\x80") { |
|
| 143 | + } elseif ($c < "\x80") { |
|
| 144 | 144 | // ASCII byte. |
| 145 | 145 | $result .= $c; |
| 146 | 146 | $head = ''; |
| 147 | - } elseif ($c < "\xc0") { |
|
| 147 | + } elseif ($c < "\xc0") { |
|
| 148 | 148 | // Illegal tail bytes. |
| 149 | 149 | if ($head == '') { |
| 150 | - $result .= $unknown; |
|
| 150 | + $result .= $unknown; |
|
| 151 | 151 | } |
| 152 | - } else { |
|
| 152 | + } else { |
|
| 153 | 153 | // Miscellaneous freaks. |
| 154 | 154 | $result .= $unknown; |
| 155 | 155 | $head = ''; |
| 156 | - } |
|
| 156 | + } |
|
| 157 | 157 | } |
| 158 | - } |
|
| 159 | - return $result; |
|
| 158 | + } |
|
| 159 | + return $result; |
|
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | /** |
@@ -175,38 +175,38 @@ discard block |
||
| 175 | 175 | * ASCII replacement character. |
| 176 | 176 | */ |
| 177 | 177 | function _transliteration_replace($ord, $unknown = '?', $langcode = NULL) { |
| 178 | - static $map = array(); |
|
| 178 | + static $map = array(); |
|
| 179 | 179 | |
| 180 | - //GL: set language later |
|
| 181 | - /* |
|
| 180 | + //GL: set language later |
|
| 181 | + /* |
|
| 182 | 182 | if (!isset($langcode)) { |
| 183 | 183 | global $language; |
| 184 | 184 | $langcode = $language->language; |
| 185 | 185 | } |
| 186 | 186 | */ |
| 187 | 187 | |
| 188 | - $bank = $ord >> 8; |
|
| 188 | + $bank = $ord >> 8; |
|
| 189 | 189 | |
| 190 | - if (!isset($map[$bank][$langcode])) { |
|
| 190 | + if (!isset($map[$bank][$langcode])) { |
|
| 191 | 191 | $file = './resources/transliteration-data/' . sprintf('x%02x', $bank) . '.php'; |
| 192 | 192 | if (file_exists($file)) { |
| 193 | - $base = array(); |
|
| 194 | - $variant = array(); |
|
| 195 | - include $file; |
|
| 196 | - if ($langcode != 'en' && isset($variant[$langcode])) { |
|
| 193 | + $base = array(); |
|
| 194 | + $variant = array(); |
|
| 195 | + include $file; |
|
| 196 | + if ($langcode != 'en' && isset($variant[$langcode])) { |
|
| 197 | 197 | // Merge in language specific mappings. |
| 198 | 198 | $map[$bank][$langcode] = $variant[$langcode] + $base; |
| 199 | - } |
|
| 200 | - else { |
|
| 199 | + } |
|
| 200 | + else { |
|
| 201 | 201 | $map[$bank][$langcode] = $base; |
| 202 | - } |
|
| 202 | + } |
|
| 203 | 203 | } |
| 204 | 204 | else { |
| 205 | - $map[$bank][$langcode] = array(); |
|
| 205 | + $map[$bank][$langcode] = array(); |
|
| 206 | + } |
|
| 206 | 207 | } |
| 207 | - } |
|
| 208 | 208 | |
| 209 | - $ord = $ord & 255; |
|
| 209 | + $ord = $ord & 255; |
|
| 210 | 210 | |
| 211 | - return isset($map[$bank][$langcode][$ord]) ? $map[$bank][$langcode][$ord] : $unknown; |
|
| 211 | + return isset($map[$bank][$langcode][$ord]) ? $map[$bank][$langcode][$ord] : $unknown; |
|
| 212 | 212 | } |