codysnider /
tt-rss
@@ -295,23 +295,23 @@ discard block |
||
| 295 | 295 | if (!$this->parseWord($cmdL,$p,$cmd)) return true; |
| 296 | 296 | $parms = substr($cmdL,$p); |
| 297 | 297 | switch (strtoupper($cmd)) {
|
| 298 | - case '$BEGINBLOCK': |
|
| 299 | - if (!$this->processBeginBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd)) |
|
| 300 | - return false; |
|
| 301 | - break; |
|
| 302 | - case '$ENDBLOCK': |
|
| 303 | - if (!$this->processEndBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd)) |
|
| 304 | - return false; |
|
| 305 | - break; |
|
| 306 | - case '$INCLUDE': |
|
| 307 | - if (!$this->processincludeCmd($parms,$cmdTPosBegin,$cmdTPosEnd)) |
|
| 308 | - return false; |
|
| 309 | - $resumeFromStart = true; |
|
| 310 | - break; |
|
| 311 | - default: |
|
| 312 | - if ($cmd{0} == '$' && !(strlen($cmd) >= 2 && $cmd{1} == '{')) {
|
|
| 313 | - $this->triggerError ("Unknown command \"$cmd\" in template at offset $cmdTPosBegin.");
|
|
| 314 | - return false; }} |
|
| 298 | + case '$BEGINBLOCK': |
|
| 299 | + if (!$this->processBeginBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd)) |
|
| 300 | + return false; |
|
| 301 | + break; |
|
| 302 | + case '$ENDBLOCK': |
|
| 303 | + if (!$this->processEndBlockCmd($parms,$cmdTPosBegin,$cmdTPosEnd)) |
|
| 304 | + return false; |
|
| 305 | + break; |
|
| 306 | + case '$INCLUDE': |
|
| 307 | + if (!$this->processincludeCmd($parms,$cmdTPosBegin,$cmdTPosEnd)) |
|
| 308 | + return false; |
|
| 309 | + $resumeFromStart = true; |
|
| 310 | + break; |
|
| 311 | + default: |
|
| 312 | + if ($cmd{0} == '$' && !(strlen($cmd) >= 2 && $cmd{1} == '{')) {
|
|
| 313 | + $this->triggerError ("Unknown command \"$cmd\" in template at offset $cmdTPosBegin.");
|
|
| 314 | + return false; }} |
|
| 315 | 315 | return true; } |
| 316 | 316 | |
| 317 | 317 | /** |
@@ -765,25 +765,25 @@ discard block |
||
| 765 | 765 | if ($tPos2 > $tPos) |
| 766 | 766 | $this->writeString (substr($this->template,$tPos,$tPos2-$tPos)); |
| 767 | 767 | switch ($kind) {
|
| 768 | - case 0: // end of block |
|
| 769 | - return; |
|
| 770 | - case 1: // variable |
|
| 771 | - $vrtr =& $this->varRefTab[$varRefNo]; |
|
| 772 | - if ($vrtr['blockNo'] != $blockNo) |
|
| 773 | - $this->programLogicError (4); |
|
| 774 | - $variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']]; |
|
| 775 | - $this->writeString ($variableValue); |
|
| 776 | - $tPos = $vrtr['tPosEnd']; |
|
| 777 | - $varRefNo += 1; |
|
| 778 | - break; |
|
| 779 | - case 2: // sub block |
|
| 780 | - $subBtr =& $this->blockTab[$subBlockNo]; |
|
| 781 | - if ($subBtr['parentBlockNo'] != $blockNo) |
|
| 782 | - $this->programLogicError (3); |
|
| 783 | - $this->writeBlockInstances ($subBlockNo, $bitr['instanceLevel']); // recursive call |
|
| 784 | - $tPos = $subBtr['tPosEnd']; |
|
| 785 | - $subBlockNo += 1; |
|
| 786 | - break; }}} |
|
| 768 | + case 0: // end of block |
|
| 769 | + return; |
|
| 770 | + case 1: // variable |
|
| 771 | + $vrtr =& $this->varRefTab[$varRefNo]; |
|
| 772 | + if ($vrtr['blockNo'] != $blockNo) |
|
| 773 | + $this->programLogicError (4); |
|
| 774 | + $variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']]; |
|
| 775 | + $this->writeString ($variableValue); |
|
| 776 | + $tPos = $vrtr['tPosEnd']; |
|
| 777 | + $varRefNo += 1; |
|
| 778 | + break; |
|
| 779 | + case 2: // sub block |
|
| 780 | + $subBtr =& $this->blockTab[$subBlockNo]; |
|
| 781 | + if ($subBtr['parentBlockNo'] != $blockNo) |
|
| 782 | + $this->programLogicError (3); |
|
| 783 | + $this->writeBlockInstances ($subBlockNo, $bitr['instanceLevel']); // recursive call |
|
| 784 | + $tPos = $subBtr['tPosEnd']; |
|
| 785 | + $subBlockNo += 1; |
|
| 786 | + break; }}} |
|
| 787 | 787 | |
| 788 | 788 | /** |
| 789 | 789 | * @access private |
@@ -791,17 +791,17 @@ discard block |
||
| 791 | 791 | function writeString ($s) {
|
| 792 | 792 | if ($this->outputError) return; |
| 793 | 793 | switch ($this->outputMode) {
|
| 794 | - case 0: // output to PHP output stream |
|
| 795 | - if (!print($s)) |
|
| 796 | - $this->outputError = true; |
|
| 797 | - break; |
|
| 798 | - case 1: // output to file |
|
| 799 | - $rc = fwrite($this->outputFileHandle, $s); |
|
| 800 | - if ($rc === false) $this->outputError = true; |
|
| 801 | - break; |
|
| 802 | - case 2: // output to string |
|
| 803 | - $this->outputString .= $s; |
|
| 804 | - break; }} |
|
| 794 | + case 0: // output to PHP output stream |
|
| 795 | + if (!print($s)) |
|
| 796 | + $this->outputError = true; |
|
| 797 | + break; |
|
| 798 | + case 1: // output to file |
|
| 799 | + $rc = fwrite($this->outputFileHandle, $s); |
|
| 800 | + if ($rc === false) $this->outputError = true; |
|
| 801 | + break; |
|
| 802 | + case 2: // output to string |
|
| 803 | + $this->outputString .= $s; |
|
| 804 | + break; }} |
|
| 805 | 805 | |
| 806 | 806 | //--- name lookup routines ------------------------------------------------------------------------------------------ |
| 807 | 807 | |
@@ -255,14 +255,14 @@ |
||
| 255 | 255 | $mode = $this->identifyMode(0); |
| 256 | 256 | |
| 257 | 257 | switch ($mode) {
|
| 258 | - case QR_MODE_NUM: $length = $this->eatNum(); break; |
|
| 259 | - case QR_MODE_AN: $length = $this->eatAn(); break; |
|
| 260 | - case QR_MODE_KANJI: |
|
| 261 | - if ($this->modeHint == QR_MODE_KANJI) |
|
| 262 | - $length = $this->eatKanji(); |
|
| 263 | - else $length = $this->eat8(); |
|
| 264 | - break; |
|
| 265 | - default: $length = $this->eat8(); break; |
|
| 258 | + case QR_MODE_NUM: $length = $this->eatNum(); break; |
|
| 259 | + case QR_MODE_AN: $length = $this->eatAn(); break; |
|
| 260 | + case QR_MODE_KANJI: |
|
| 261 | + if ($this->modeHint == QR_MODE_KANJI) |
|
| 262 | + $length = $this->eatKanji(); |
|
| 263 | + else $length = $this->eat8(); |
|
| 264 | + break; |
|
| 265 | + default: $length = $this->eat8(); break; |
|
| 266 | 266 | |
| 267 | 267 | } |
| 268 | 268 | |
@@ -201,13 +201,13 @@ discard block |
||
| 201 | 201 | $version = 1; |
| 202 | 202 | |
| 203 | 203 | switch($this->mode) {
|
| 204 | - case QR_MODE_NUM: $bits = QRinput::estimateBitsModeNum($this->size); break; |
|
| 205 | - case QR_MODE_AN: $bits = QRinput::estimateBitsModeAn($this->size); break; |
|
| 206 | - case QR_MODE_8: $bits = QRinput::estimateBitsMode8($this->size); break; |
|
| 207 | - case QR_MODE_KANJI: $bits = QRinput::estimateBitsModeKanji($this->size);break; |
|
| 208 | - case QR_MODE_STRUCTURE: return STRUCTURE_HEADER_BITS; |
|
| 209 | - default: |
|
| 210 | - return 0; |
|
| 204 | + case QR_MODE_NUM: $bits = QRinput::estimateBitsModeNum($this->size); break; |
|
| 205 | + case QR_MODE_AN: $bits = QRinput::estimateBitsModeAn($this->size); break; |
|
| 206 | + case QR_MODE_8: $bits = QRinput::estimateBitsMode8($this->size); break; |
|
| 207 | + case QR_MODE_KANJI: $bits = QRinput::estimateBitsModeKanji($this->size);break; |
|
| 208 | + case QR_MODE_STRUCTURE: return STRUCTURE_HEADER_BITS; |
|
| 209 | + default: |
|
| 210 | + return 0; |
|
| 211 | 211 | } |
| 212 | 212 | |
| 213 | 213 | $l = QRspec::lengthIndicator($this->mode, $version); |
@@ -247,14 +247,14 @@ discard block |
||
| 247 | 247 | $ret = 0; |
| 248 | 248 | |
| 249 | 249 | switch($this->mode) {
|
| 250 | - case QR_MODE_NUM: $ret = $this->encodeModeNum($version); break; |
|
| 251 | - case QR_MODE_AN: $ret = $this->encodeModeAn($version); break; |
|
| 252 | - case QR_MODE_8: $ret = $this->encodeMode8($version); break; |
|
| 253 | - case QR_MODE_KANJI: $ret = $this->encodeModeKanji($version);break; |
|
| 254 | - case QR_MODE_STRUCTURE: $ret = $this->encodeModeStructure(); break; |
|
| 250 | + case QR_MODE_NUM: $ret = $this->encodeModeNum($version); break; |
|
| 251 | + case QR_MODE_AN: $ret = $this->encodeModeAn($version); break; |
|
| 252 | + case QR_MODE_8: $ret = $this->encodeMode8($version); break; |
|
| 253 | + case QR_MODE_KANJI: $ret = $this->encodeModeKanji($version);break; |
|
| 254 | + case QR_MODE_STRUCTURE: $ret = $this->encodeModeStructure(); break; |
|
| 255 | 255 | |
| 256 | - default: |
|
| 257 | - break; |
|
| 256 | + default: |
|
| 257 | + break; |
|
| 258 | 258 | } |
| 259 | 259 | |
| 260 | 260 | if($ret < 0) |
@@ -404,14 +404,14 @@ discard block |
||
| 404 | 404 | $bits = $w * 10; |
| 405 | 405 | |
| 406 | 406 | switch($size - $w * 3) {
|
| 407 | - case 1: |
|
| 408 | - $bits += 4; |
|
| 409 | - break; |
|
| 410 | - case 2: |
|
| 411 | - $bits += 7; |
|
| 412 | - break; |
|
| 413 | - default: |
|
| 414 | - break; |
|
| 407 | + case 1: |
|
| 408 | + $bits += 4; |
|
| 409 | + break; |
|
| 410 | + case 2: |
|
| 411 | + $bits += 7; |
|
| 412 | + break; |
|
| 413 | + default: |
|
| 414 | + break; |
|
| 415 | 415 | } |
| 416 | 416 | |
| 417 | 417 | return $bits; |
@@ -500,14 +500,14 @@ discard block |
||
| 500 | 500 | return false; |
| 501 | 501 | |
| 502 | 502 | switch($mode) {
|
| 503 | - case QR_MODE_NUM: return self::checkModeNum($size, $data); break; |
|
| 504 | - case QR_MODE_AN: return self::checkModeAn($size, $data); break; |
|
| 505 | - case QR_MODE_KANJI: return self::checkModeKanji($size, $data); break; |
|
| 506 | - case QR_MODE_8: return true; break; |
|
| 507 | - case QR_MODE_STRUCTURE: return true; break; |
|
| 503 | + case QR_MODE_NUM: return self::checkModeNum($size, $data); break; |
|
| 504 | + case QR_MODE_AN: return self::checkModeAn($size, $data); break; |
|
| 505 | + case QR_MODE_KANJI: return self::checkModeKanji($size, $data); break; |
|
| 506 | + case QR_MODE_8: return true; break; |
|
| 507 | + case QR_MODE_STRUCTURE: return true; break; |
|
| 508 | 508 | |
| 509 | - default: |
|
| 510 | - break; |
|
| 509 | + default: |
|
| 510 | + break; |
|
| 511 | 511 | } |
| 512 | 512 | |
| 513 | 513 | return false; |
@@ -548,35 +548,35 @@ discard block |
||
| 548 | 548 | {
|
| 549 | 549 | $payload = $bits - 4 - QRspec::lengthIndicator($mode, $version); |
| 550 | 550 | switch($mode) {
|
| 551 | - case QR_MODE_NUM: |
|
| 552 | - $chunks = (int)($payload / 10); |
|
| 553 | - $remain = $payload - $chunks * 10; |
|
| 554 | - $size = $chunks * 3; |
|
| 555 | - if($remain >= 7) {
|
|
| 556 | - $size += 2; |
|
| 557 | - } else if($remain >= 4) {
|
|
| 558 | - $size += 1; |
|
| 559 | - } |
|
| 560 | - break; |
|
| 561 | - case QR_MODE_AN: |
|
| 562 | - $chunks = (int)($payload / 11); |
|
| 563 | - $remain = $payload - $chunks * 11; |
|
| 564 | - $size = $chunks * 2; |
|
| 565 | - if($remain >= 6) |
|
| 566 | - $size++; |
|
| 567 | - break; |
|
| 568 | - case QR_MODE_8: |
|
| 569 | - $size = (int)($payload / 8); |
|
| 570 | - break; |
|
| 571 | - case QR_MODE_KANJI: |
|
| 572 | - $size = (int)(($payload / 13) * 2); |
|
| 573 | - break; |
|
| 574 | - case QR_MODE_STRUCTURE: |
|
| 575 | - $size = (int)($payload / 8); |
|
| 576 | - break; |
|
| 577 | - default: |
|
| 578 | - $size = 0; |
|
| 579 | - break; |
|
| 551 | + case QR_MODE_NUM: |
|
| 552 | + $chunks = (int)($payload / 10); |
|
| 553 | + $remain = $payload - $chunks * 10; |
|
| 554 | + $size = $chunks * 3; |
|
| 555 | + if($remain >= 7) {
|
|
| 556 | + $size += 2; |
|
| 557 | + } else if($remain >= 4) {
|
|
| 558 | + $size += 1; |
|
| 559 | + } |
|
| 560 | + break; |
|
| 561 | + case QR_MODE_AN: |
|
| 562 | + $chunks = (int)($payload / 11); |
|
| 563 | + $remain = $payload - $chunks * 11; |
|
| 564 | + $size = $chunks * 2; |
|
| 565 | + if($remain >= 6) |
|
| 566 | + $size++; |
|
| 567 | + break; |
|
| 568 | + case QR_MODE_8: |
|
| 569 | + $size = (int)($payload / 8); |
|
| 570 | + break; |
|
| 571 | + case QR_MODE_KANJI: |
|
| 572 | + $size = (int)(($payload / 13) * 2); |
|
| 573 | + break; |
|
| 574 | + case QR_MODE_STRUCTURE: |
|
| 575 | + $size = (int)($payload / 8); |
|
| 576 | + break; |
|
| 577 | + default: |
|
| 578 | + $size = 0; |
|
| 579 | + break; |
|
| 580 | 580 | } |
| 581 | 581 | |
| 582 | 582 | $maxsize = QRspec::maximumWords($mode, $version); |
@@ -1461,26 +1461,26 @@ discard block |
||
| 1461 | 1461 | } |
| 1462 | 1462 | $mode = $this->identifyMode(0); |
| 1463 | 1463 | switch ($mode) { |
| 1464 | - case QR_MODE_NM: { |
|
| 1465 | - $length = $this->eatNum(); |
|
| 1466 | - break; |
|
| 1467 | - } |
|
| 1468 | - case QR_MODE_AN: { |
|
| 1469 | - $length = $this->eatAn(); |
|
| 1470 | - break; |
|
| 1471 | - } |
|
| 1472 | - case QR_MODE_KJ: { |
|
| 1473 | - if ($this->hint == QR_MODE_KJ) { |
|
| 1474 | - $length = $this->eatKanji(); |
|
| 1475 | - } else { |
|
| 1476 | - $length = $this->eat8(); |
|
| 1477 | - } |
|
| 1478 | - break; |
|
| 1479 | - } |
|
| 1480 | - default: { |
|
| 1464 | + case QR_MODE_NM: { |
|
| 1465 | + $length = $this->eatNum(); |
|
| 1466 | + break; |
|
| 1467 | + } |
|
| 1468 | + case QR_MODE_AN: { |
|
| 1469 | + $length = $this->eatAn(); |
|
| 1470 | + break; |
|
| 1471 | + } |
|
| 1472 | + case QR_MODE_KJ: { |
|
| 1473 | + if ($this->hint == QR_MODE_KJ) { |
|
| 1474 | + $length = $this->eatKanji(); |
|
| 1475 | + } else { |
|
| 1481 | 1476 | $length = $this->eat8(); |
| 1482 | - break; |
|
| 1483 | 1477 | } |
| 1478 | + break; |
|
| 1479 | + } |
|
| 1480 | + default: { |
|
| 1481 | + $length = $this->eat8(); |
|
| 1482 | + break; |
|
| 1483 | + } |
|
| 1484 | 1484 | } |
| 1485 | 1485 | if ($length == 0) { |
| 1486 | 1486 | return 0; |
@@ -1665,29 +1665,29 @@ discard block |
||
| 1665 | 1665 | $inputitem['bstream'] = $this->appendBitstream($inputitem['bstream'], $st2['bstream']); |
| 1666 | 1666 | } else { |
| 1667 | 1667 | switch($inputitem['mode']) { |
| 1668 | - case QR_MODE_NM: { |
|
| 1669 | - $inputitem = $this->encodeModeNum($inputitem, $version); |
|
| 1670 | - break; |
|
| 1671 | - } |
|
| 1672 | - case QR_MODE_AN: { |
|
| 1673 | - $inputitem = $this->encodeModeAn($inputitem, $version); |
|
| 1674 | - break; |
|
| 1675 | - } |
|
| 1676 | - case QR_MODE_8B: { |
|
| 1677 | - $inputitem = $this->encodeMode8($inputitem, $version); |
|
| 1678 | - break; |
|
| 1679 | - } |
|
| 1680 | - case QR_MODE_KJ: { |
|
| 1681 | - $inputitem = $this->encodeModeKanji($inputitem, $version); |
|
| 1682 | - break; |
|
| 1683 | - } |
|
| 1684 | - case QR_MODE_ST: { |
|
| 1685 | - $inputitem = $this->encodeModeStructure($inputitem); |
|
| 1686 | - break; |
|
| 1687 | - } |
|
| 1688 | - default: { |
|
| 1689 | - break; |
|
| 1690 | - } |
|
| 1668 | + case QR_MODE_NM: { |
|
| 1669 | + $inputitem = $this->encodeModeNum($inputitem, $version); |
|
| 1670 | + break; |
|
| 1671 | + } |
|
| 1672 | + case QR_MODE_AN: { |
|
| 1673 | + $inputitem = $this->encodeModeAn($inputitem, $version); |
|
| 1674 | + break; |
|
| 1675 | + } |
|
| 1676 | + case QR_MODE_8B: { |
|
| 1677 | + $inputitem = $this->encodeMode8($inputitem, $version); |
|
| 1678 | + break; |
|
| 1679 | + } |
|
| 1680 | + case QR_MODE_KJ: { |
|
| 1681 | + $inputitem = $this->encodeModeKanji($inputitem, $version); |
|
| 1682 | + break; |
|
| 1683 | + } |
|
| 1684 | + case QR_MODE_ST: { |
|
| 1685 | + $inputitem = $this->encodeModeStructure($inputitem); |
|
| 1686 | + break; |
|
| 1687 | + } |
|
| 1688 | + default: { |
|
| 1689 | + break; |
|
| 1690 | + } |
|
| 1691 | 1691 | } |
| 1692 | 1692 | } |
| 1693 | 1693 | return $inputitem; |
@@ -1774,17 +1774,17 @@ discard block |
||
| 1774 | 1774 | $w = (int)$size / 3; |
| 1775 | 1775 | $bits = $w * 10; |
| 1776 | 1776 | switch($size - $w * 3) { |
| 1777 | - case 1: { |
|
| 1778 | - $bits += 4; |
|
| 1779 | - break; |
|
| 1780 | - } |
|
| 1781 | - case 2: { |
|
| 1782 | - $bits += 7; |
|
| 1783 | - break; |
|
| 1784 | - } |
|
| 1785 | - default: { |
|
| 1786 | - break; |
|
| 1787 | - } |
|
| 1777 | + case 1: { |
|
| 1778 | + $bits += 4; |
|
| 1779 | + break; |
|
| 1780 | + } |
|
| 1781 | + case 2: { |
|
| 1782 | + $bits += 7; |
|
| 1783 | + break; |
|
| 1784 | + } |
|
| 1785 | + default: { |
|
| 1786 | + break; |
|
| 1787 | + } |
|
| 1788 | 1788 | } |
| 1789 | 1789 | return $bits; |
| 1790 | 1790 | } |
@@ -1876,24 +1876,24 @@ discard block |
||
| 1876 | 1876 | return false; |
| 1877 | 1877 | } |
| 1878 | 1878 | switch($mode) { |
| 1879 | - case QR_MODE_NM: { |
|
| 1880 | - return $this->checkModeNum($size, $data); |
|
| 1881 | - } |
|
| 1882 | - case QR_MODE_AN: { |
|
| 1883 | - return $this->checkModeAn($size, $data); |
|
| 1884 | - } |
|
| 1885 | - case QR_MODE_KJ: { |
|
| 1886 | - return $this->checkModeKanji($size, $data); |
|
| 1887 | - } |
|
| 1888 | - case QR_MODE_8B: { |
|
| 1889 | - return true; |
|
| 1890 | - } |
|
| 1891 | - case QR_MODE_ST: { |
|
| 1892 | - return true; |
|
| 1893 | - } |
|
| 1894 | - default: { |
|
| 1895 | - break; |
|
| 1896 | - } |
|
| 1879 | + case QR_MODE_NM: { |
|
| 1880 | + return $this->checkModeNum($size, $data); |
|
| 1881 | + } |
|
| 1882 | + case QR_MODE_AN: { |
|
| 1883 | + return $this->checkModeAn($size, $data); |
|
| 1884 | + } |
|
| 1885 | + case QR_MODE_KJ: { |
|
| 1886 | + return $this->checkModeKanji($size, $data); |
|
| 1887 | + } |
|
| 1888 | + case QR_MODE_8B: { |
|
| 1889 | + return true; |
|
| 1890 | + } |
|
| 1891 | + case QR_MODE_ST: { |
|
| 1892 | + return true; |
|
| 1893 | + } |
|
| 1894 | + default: { |
|
| 1895 | + break; |
|
| 1896 | + } |
|
| 1897 | 1897 | } |
| 1898 | 1898 | return false; |
| 1899 | 1899 | } |
@@ -1911,28 +1911,28 @@ discard block |
||
| 1911 | 1911 | } |
| 1912 | 1912 | foreach ($items as $item) { |
| 1913 | 1913 | switch($item['mode']) { |
| 1914 | - case QR_MODE_NM: { |
|
| 1915 | - $bits = $this->estimateBitsModeNum($item['size']); |
|
| 1916 | - break; |
|
| 1917 | - } |
|
| 1918 | - case QR_MODE_AN: { |
|
| 1919 | - $bits = $this->estimateBitsModeAn($item['size']); |
|
| 1920 | - break; |
|
| 1921 | - } |
|
| 1922 | - case QR_MODE_8B: { |
|
| 1923 | - $bits = $this->estimateBitsMode8($item['size']); |
|
| 1924 | - break; |
|
| 1925 | - } |
|
| 1926 | - case QR_MODE_KJ: { |
|
| 1927 | - $bits = $this->estimateBitsModeKanji($item['size']); |
|
| 1928 | - break; |
|
| 1929 | - } |
|
| 1930 | - case QR_MODE_ST: { |
|
| 1931 | - return STRUCTURE_HEADER_BITS; |
|
| 1932 | - } |
|
| 1933 | - default: { |
|
| 1934 | - return 0; |
|
| 1935 | - } |
|
| 1914 | + case QR_MODE_NM: { |
|
| 1915 | + $bits = $this->estimateBitsModeNum($item['size']); |
|
| 1916 | + break; |
|
| 1917 | + } |
|
| 1918 | + case QR_MODE_AN: { |
|
| 1919 | + $bits = $this->estimateBitsModeAn($item['size']); |
|
| 1920 | + break; |
|
| 1921 | + } |
|
| 1922 | + case QR_MODE_8B: { |
|
| 1923 | + $bits = $this->estimateBitsMode8($item['size']); |
|
| 1924 | + break; |
|
| 1925 | + } |
|
| 1926 | + case QR_MODE_KJ: { |
|
| 1927 | + $bits = $this->estimateBitsModeKanji($item['size']); |
|
| 1928 | + break; |
|
| 1929 | + } |
|
| 1930 | + case QR_MODE_ST: { |
|
| 1931 | + return STRUCTURE_HEADER_BITS; |
|
| 1932 | + } |
|
| 1933 | + default: { |
|
| 1934 | + return 0; |
|
| 1935 | + } |
|
| 1936 | 1936 | } |
| 1937 | 1937 | $l = $this->lengthIndicator($item['mode'], $version); |
| 1938 | 1938 | $m = 1 << $l; |
@@ -1971,42 +1971,42 @@ discard block |
||
| 1971 | 1971 | protected function lengthOfCode($mode, $version, $bits) { |
| 1972 | 1972 | $payload = $bits - 4 - $this->lengthIndicator($mode, $version); |
| 1973 | 1973 | switch($mode) { |
| 1974 | - case QR_MODE_NM: { |
|
| 1975 | - $chunks = (int)($payload / 10); |
|
| 1976 | - $remain = $payload - $chunks * 10; |
|
| 1977 | - $size = $chunks * 3; |
|
| 1978 | - if ($remain >= 7) { |
|
| 1979 | - $size += 2; |
|
| 1980 | - } elseif ($remain >= 4) { |
|
| 1981 | - $size += 1; |
|
| 1982 | - } |
|
| 1983 | - break; |
|
| 1984 | - } |
|
| 1985 | - case QR_MODE_AN: { |
|
| 1986 | - $chunks = (int)($payload / 11); |
|
| 1987 | - $remain = $payload - $chunks * 11; |
|
| 1988 | - $size = $chunks * 2; |
|
| 1989 | - if ($remain >= 6) { |
|
| 1990 | - ++$size; |
|
| 1991 | - } |
|
| 1992 | - break; |
|
| 1993 | - } |
|
| 1994 | - case QR_MODE_8B: { |
|
| 1995 | - $size = (int)($payload / 8); |
|
| 1996 | - break; |
|
| 1997 | - } |
|
| 1998 | - case QR_MODE_KJ: { |
|
| 1999 | - $size = (int)(($payload / 13) * 2); |
|
| 2000 | - break; |
|
| 2001 | - } |
|
| 2002 | - case QR_MODE_ST: { |
|
| 2003 | - $size = (int)($payload / 8); |
|
| 2004 | - break; |
|
| 2005 | - } |
|
| 2006 | - default: { |
|
| 2007 | - $size = 0; |
|
| 2008 | - break; |
|
| 2009 | - } |
|
| 1974 | + case QR_MODE_NM: { |
|
| 1975 | + $chunks = (int)($payload / 10); |
|
| 1976 | + $remain = $payload - $chunks * 10; |
|
| 1977 | + $size = $chunks * 3; |
|
| 1978 | + if ($remain >= 7) { |
|
| 1979 | + $size += 2; |
|
| 1980 | + } elseif ($remain >= 4) { |
|
| 1981 | + $size += 1; |
|
| 1982 | + } |
|
| 1983 | + break; |
|
| 1984 | + } |
|
| 1985 | + case QR_MODE_AN: { |
|
| 1986 | + $chunks = (int)($payload / 11); |
|
| 1987 | + $remain = $payload - $chunks * 11; |
|
| 1988 | + $size = $chunks * 2; |
|
| 1989 | + if ($remain >= 6) { |
|
| 1990 | + ++$size; |
|
| 1991 | + } |
|
| 1992 | + break; |
|
| 1993 | + } |
|
| 1994 | + case QR_MODE_8B: { |
|
| 1995 | + $size = (int)($payload / 8); |
|
| 1996 | + break; |
|
| 1997 | + } |
|
| 1998 | + case QR_MODE_KJ: { |
|
| 1999 | + $size = (int)(($payload / 13) * 2); |
|
| 2000 | + break; |
|
| 2001 | + } |
|
| 2002 | + case QR_MODE_ST: { |
|
| 2003 | + $size = (int)($payload / 8); |
|
| 2004 | + break; |
|
| 2005 | + } |
|
| 2006 | + default: { |
|
| 2007 | + $size = 0; |
|
| 2008 | + break; |
|
| 2009 | + } |
|
| 2010 | 2010 | } |
| 2011 | 2011 | $maxsize = $this->maximumWords($mode, $version); |
| 2012 | 2012 | if ($size < 0) { |
@@ -415,28 +415,28 @@ |
||
| 415 | 415 | $enc->margin = $margin; |
| 416 | 416 | |
| 417 | 417 | switch ($level.'') {
|
| 418 | - case '0': |
|
| 419 | - case '1': |
|
| 420 | - case '2': |
|
| 421 | - case '3': |
|
| 422 | - $enc->level = $level; |
|
| 423 | - break; |
|
| 424 | - case 'l': |
|
| 425 | - case 'L': |
|
| 426 | - $enc->level = QR_ECLEVEL_L; |
|
| 427 | - break; |
|
| 428 | - case 'm': |
|
| 429 | - case 'M': |
|
| 430 | - $enc->level = QR_ECLEVEL_M; |
|
| 431 | - break; |
|
| 432 | - case 'q': |
|
| 433 | - case 'Q': |
|
| 434 | - $enc->level = QR_ECLEVEL_Q; |
|
| 435 | - break; |
|
| 436 | - case 'h': |
|
| 437 | - case 'H': |
|
| 438 | - $enc->level = QR_ECLEVEL_H; |
|
| 439 | - break; |
|
| 418 | + case '0': |
|
| 419 | + case '1': |
|
| 420 | + case '2': |
|
| 421 | + case '3': |
|
| 422 | + $enc->level = $level; |
|
| 423 | + break; |
|
| 424 | + case 'l': |
|
| 425 | + case 'L': |
|
| 426 | + $enc->level = QR_ECLEVEL_L; |
|
| 427 | + break; |
|
| 428 | + case 'm': |
|
| 429 | + case 'M': |
|
| 430 | + $enc->level = QR_ECLEVEL_M; |
|
| 431 | + break; |
|
| 432 | + case 'q': |
|
| 433 | + case 'Q': |
|
| 434 | + $enc->level = QR_ECLEVEL_Q; |
|
| 435 | + break; |
|
| 436 | + case 'h': |
|
| 437 | + case 'H': |
|
| 438 | + $enc->level = QR_ECLEVEL_H; |
|
| 439 | + break; |
|
| 440 | 440 | } |
| 441 | 441 | |
| 442 | 442 | return $enc; |
@@ -1214,13 +1214,13 @@ discard block |
||
| 1214 | 1214 | $version = 1; |
| 1215 | 1215 | |
| 1216 | 1216 | switch($this->mode) {
|
| 1217 | - case QR_MODE_NUM: $bits = QRinput::estimateBitsModeNum($this->size); break; |
|
| 1218 | - case QR_MODE_AN: $bits = QRinput::estimateBitsModeAn($this->size); break; |
|
| 1219 | - case QR_MODE_8: $bits = QRinput::estimateBitsMode8($this->size); break; |
|
| 1220 | - case QR_MODE_KANJI: $bits = QRinput::estimateBitsModeKanji($this->size);break; |
|
| 1221 | - case QR_MODE_STRUCTURE: return STRUCTURE_HEADER_BITS; |
|
| 1222 | - default: |
|
| 1223 | - return 0; |
|
| 1217 | + case QR_MODE_NUM: $bits = QRinput::estimateBitsModeNum($this->size); break; |
|
| 1218 | + case QR_MODE_AN: $bits = QRinput::estimateBitsModeAn($this->size); break; |
|
| 1219 | + case QR_MODE_8: $bits = QRinput::estimateBitsMode8($this->size); break; |
|
| 1220 | + case QR_MODE_KANJI: $bits = QRinput::estimateBitsModeKanji($this->size);break; |
|
| 1221 | + case QR_MODE_STRUCTURE: return STRUCTURE_HEADER_BITS; |
|
| 1222 | + default: |
|
| 1223 | + return 0; |
|
| 1224 | 1224 | } |
| 1225 | 1225 | |
| 1226 | 1226 | $l = QRspec::lengthIndicator($this->mode, $version); |
@@ -1260,14 +1260,14 @@ discard block |
||
| 1260 | 1260 | $ret = 0; |
| 1261 | 1261 | |
| 1262 | 1262 | switch($this->mode) {
|
| 1263 | - case QR_MODE_NUM: $ret = $this->encodeModeNum($version); break; |
|
| 1264 | - case QR_MODE_AN: $ret = $this->encodeModeAn($version); break; |
|
| 1265 | - case QR_MODE_8: $ret = $this->encodeMode8($version); break; |
|
| 1266 | - case QR_MODE_KANJI: $ret = $this->encodeModeKanji($version);break; |
|
| 1267 | - case QR_MODE_STRUCTURE: $ret = $this->encodeModeStructure(); break; |
|
| 1263 | + case QR_MODE_NUM: $ret = $this->encodeModeNum($version); break; |
|
| 1264 | + case QR_MODE_AN: $ret = $this->encodeModeAn($version); break; |
|
| 1265 | + case QR_MODE_8: $ret = $this->encodeMode8($version); break; |
|
| 1266 | + case QR_MODE_KANJI: $ret = $this->encodeModeKanji($version);break; |
|
| 1267 | + case QR_MODE_STRUCTURE: $ret = $this->encodeModeStructure(); break; |
|
| 1268 | 1268 | |
| 1269 | - default: |
|
| 1270 | - break; |
|
| 1269 | + default: |
|
| 1270 | + break; |
|
| 1271 | 1271 | } |
| 1272 | 1272 | |
| 1273 | 1273 | if($ret < 0) |
@@ -1417,14 +1417,14 @@ discard block |
||
| 1417 | 1417 | $bits = $w * 10; |
| 1418 | 1418 | |
| 1419 | 1419 | switch($size - $w * 3) {
|
| 1420 | - case 1: |
|
| 1421 | - $bits += 4; |
|
| 1422 | - break; |
|
| 1423 | - case 2: |
|
| 1424 | - $bits += 7; |
|
| 1425 | - break; |
|
| 1426 | - default: |
|
| 1427 | - break; |
|
| 1420 | + case 1: |
|
| 1421 | + $bits += 4; |
|
| 1422 | + break; |
|
| 1423 | + case 2: |
|
| 1424 | + $bits += 7; |
|
| 1425 | + break; |
|
| 1426 | + default: |
|
| 1427 | + break; |
|
| 1428 | 1428 | } |
| 1429 | 1429 | |
| 1430 | 1430 | return $bits; |
@@ -1513,14 +1513,14 @@ discard block |
||
| 1513 | 1513 | return false; |
| 1514 | 1514 | |
| 1515 | 1515 | switch($mode) {
|
| 1516 | - case QR_MODE_NUM: return self::checkModeNum($size, $data); break; |
|
| 1517 | - case QR_MODE_AN: return self::checkModeAn($size, $data); break; |
|
| 1518 | - case QR_MODE_KANJI: return self::checkModeKanji($size, $data); break; |
|
| 1519 | - case QR_MODE_8: return true; break; |
|
| 1520 | - case QR_MODE_STRUCTURE: return true; break; |
|
| 1516 | + case QR_MODE_NUM: return self::checkModeNum($size, $data); break; |
|
| 1517 | + case QR_MODE_AN: return self::checkModeAn($size, $data); break; |
|
| 1518 | + case QR_MODE_KANJI: return self::checkModeKanji($size, $data); break; |
|
| 1519 | + case QR_MODE_8: return true; break; |
|
| 1520 | + case QR_MODE_STRUCTURE: return true; break; |
|
| 1521 | 1521 | |
| 1522 | - default: |
|
| 1523 | - break; |
|
| 1522 | + default: |
|
| 1523 | + break; |
|
| 1524 | 1524 | } |
| 1525 | 1525 | |
| 1526 | 1526 | return false; |
@@ -1561,35 +1561,35 @@ discard block |
||
| 1561 | 1561 | {
|
| 1562 | 1562 | $payload = $bits - 4 - QRspec::lengthIndicator($mode, $version); |
| 1563 | 1563 | switch($mode) {
|
| 1564 | - case QR_MODE_NUM: |
|
| 1565 | - $chunks = (int)($payload / 10); |
|
| 1566 | - $remain = $payload - $chunks * 10; |
|
| 1567 | - $size = $chunks * 3; |
|
| 1568 | - if($remain >= 7) {
|
|
| 1569 | - $size += 2; |
|
| 1570 | - } else if($remain >= 4) {
|
|
| 1571 | - $size += 1; |
|
| 1572 | - } |
|
| 1573 | - break; |
|
| 1574 | - case QR_MODE_AN: |
|
| 1575 | - $chunks = (int)($payload / 11); |
|
| 1576 | - $remain = $payload - $chunks * 11; |
|
| 1577 | - $size = $chunks * 2; |
|
| 1578 | - if($remain >= 6) |
|
| 1579 | - $size++; |
|
| 1580 | - break; |
|
| 1581 | - case QR_MODE_8: |
|
| 1582 | - $size = (int)($payload / 8); |
|
| 1583 | - break; |
|
| 1584 | - case QR_MODE_KANJI: |
|
| 1585 | - $size = (int)(($payload / 13) * 2); |
|
| 1586 | - break; |
|
| 1587 | - case QR_MODE_STRUCTURE: |
|
| 1588 | - $size = (int)($payload / 8); |
|
| 1589 | - break; |
|
| 1590 | - default: |
|
| 1591 | - $size = 0; |
|
| 1592 | - break; |
|
| 1564 | + case QR_MODE_NUM: |
|
| 1565 | + $chunks = (int)($payload / 10); |
|
| 1566 | + $remain = $payload - $chunks * 10; |
|
| 1567 | + $size = $chunks * 3; |
|
| 1568 | + if($remain >= 7) {
|
|
| 1569 | + $size += 2; |
|
| 1570 | + } else if($remain >= 4) {
|
|
| 1571 | + $size += 1; |
|
| 1572 | + } |
|
| 1573 | + break; |
|
| 1574 | + case QR_MODE_AN: |
|
| 1575 | + $chunks = (int)($payload / 11); |
|
| 1576 | + $remain = $payload - $chunks * 11; |
|
| 1577 | + $size = $chunks * 2; |
|
| 1578 | + if($remain >= 6) |
|
| 1579 | + $size++; |
|
| 1580 | + break; |
|
| 1581 | + case QR_MODE_8: |
|
| 1582 | + $size = (int)($payload / 8); |
|
| 1583 | + break; |
|
| 1584 | + case QR_MODE_KANJI: |
|
| 1585 | + $size = (int)(($payload / 13) * 2); |
|
| 1586 | + break; |
|
| 1587 | + case QR_MODE_STRUCTURE: |
|
| 1588 | + $size = (int)($payload / 8); |
|
| 1589 | + break; |
|
| 1590 | + default: |
|
| 1591 | + $size = 0; |
|
| 1592 | + break; |
|
| 1593 | 1593 | } |
| 1594 | 1594 | |
| 1595 | 1595 | $maxsize = QRspec::maximumWords($mode, $version); |
@@ -2192,14 +2192,14 @@ discard block |
||
| 2192 | 2192 | $mode = $this->identifyMode(0); |
| 2193 | 2193 | |
| 2194 | 2194 | switch ($mode) {
|
| 2195 | - case QR_MODE_NUM: $length = $this->eatNum(); break; |
|
| 2196 | - case QR_MODE_AN: $length = $this->eatAn(); break; |
|
| 2197 | - case QR_MODE_KANJI: |
|
| 2198 | - if ($this->modeHint == QR_MODE_KANJI) |
|
| 2199 | - $length = $this->eatKanji(); |
|
| 2200 | - else $length = $this->eat8(); |
|
| 2201 | - break; |
|
| 2202 | - default: $length = $this->eat8(); break; |
|
| 2195 | + case QR_MODE_NUM: $length = $this->eatNum(); break; |
|
| 2196 | + case QR_MODE_AN: $length = $this->eatAn(); break; |
|
| 2197 | + case QR_MODE_KANJI: |
|
| 2198 | + if ($this->modeHint == QR_MODE_KANJI) |
|
| 2199 | + $length = $this->eatKanji(); |
|
| 2200 | + else $length = $this->eat8(); |
|
| 2201 | + break; |
|
| 2202 | + default: $length = $this->eat8(); break; |
|
| 2203 | 2203 | |
| 2204 | 2204 | } |
| 2205 | 2205 | |
@@ -3223,28 +3223,28 @@ discard block |
||
| 3223 | 3223 | $enc->margin = $margin; |
| 3224 | 3224 | |
| 3225 | 3225 | switch ($level.'') {
|
| 3226 | - case '0': |
|
| 3227 | - case '1': |
|
| 3228 | - case '2': |
|
| 3229 | - case '3': |
|
| 3230 | - $enc->level = $level; |
|
| 3231 | - break; |
|
| 3232 | - case 'l': |
|
| 3233 | - case 'L': |
|
| 3234 | - $enc->level = QR_ECLEVEL_L; |
|
| 3235 | - break; |
|
| 3236 | - case 'm': |
|
| 3237 | - case 'M': |
|
| 3238 | - $enc->level = QR_ECLEVEL_M; |
|
| 3239 | - break; |
|
| 3240 | - case 'q': |
|
| 3241 | - case 'Q': |
|
| 3242 | - $enc->level = QR_ECLEVEL_Q; |
|
| 3243 | - break; |
|
| 3244 | - case 'h': |
|
| 3245 | - case 'H': |
|
| 3246 | - $enc->level = QR_ECLEVEL_H; |
|
| 3247 | - break; |
|
| 3226 | + case '0': |
|
| 3227 | + case '1': |
|
| 3228 | + case '2': |
|
| 3229 | + case '3': |
|
| 3230 | + $enc->level = $level; |
|
| 3231 | + break; |
|
| 3232 | + case 'l': |
|
| 3233 | + case 'L': |
|
| 3234 | + $enc->level = QR_ECLEVEL_L; |
|
| 3235 | + break; |
|
| 3236 | + case 'm': |
|
| 3237 | + case 'M': |
|
| 3238 | + $enc->level = QR_ECLEVEL_M; |
|
| 3239 | + break; |
|
| 3240 | + case 'q': |
|
| 3241 | + case 'Q': |
|
| 3242 | + $enc->level = QR_ECLEVEL_Q; |
|
| 3243 | + break; |
|
| 3244 | + case 'h': |
|
| 3245 | + case 'H': |
|
| 3246 | + $enc->level = QR_ECLEVEL_H; |
|
| 3247 | + break; |
|
| 3248 | 3248 | } |
| 3249 | 3249 | |
| 3250 | 3250 | return $enc; |
@@ -398,21 +398,21 @@ discard block |
||
| 398 | 398 | $message = $query_error_override; |
| 399 | 399 | } else { |
| 400 | 400 | switch ($view_mode) { |
| 401 | - case "unread": |
|
| 402 | - $message = __("No unread articles found to display."); |
|
| 403 | - break; |
|
| 404 | - case "updated": |
|
| 405 | - $message = __("No updated articles found to display."); |
|
| 406 | - break; |
|
| 407 | - case "marked": |
|
| 408 | - $message = __("No starred articles found to display."); |
|
| 409 | - break; |
|
| 410 | - default: |
|
| 411 | - if ($feed < LABEL_BASE_INDEX) { |
|
| 412 | - $message = __("No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."); |
|
| 413 | - } else { |
|
| 414 | - $message = __("No articles found to display."); |
|
| 415 | - } |
|
| 401 | + case "unread": |
|
| 402 | + $message = __("No unread articles found to display."); |
|
| 403 | + break; |
|
| 404 | + case "updated": |
|
| 405 | + $message = __("No updated articles found to display."); |
|
| 406 | + break; |
|
| 407 | + case "marked": |
|
| 408 | + $message = __("No starred articles found to display."); |
|
| 409 | + break; |
|
| 410 | + default: |
|
| 411 | + if ($feed < LABEL_BASE_INDEX) { |
|
| 412 | + $message = __("No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."); |
|
| 413 | + } else { |
|
| 414 | + $message = __("No articles found to display."); |
|
| 415 | + } |
|
| 416 | 416 | } |
| 417 | 417 | } |
| 418 | 418 | |
@@ -874,29 +874,29 @@ discard block |
||
| 874 | 874 | // TODO: all this interval stuff needs some generic generator function |
| 875 | 875 | |
| 876 | 876 | switch ($mode) { |
| 877 | - case "1day": |
|
| 878 | - if (DB_TYPE == "pgsql") { |
|
| 879 | - $date_qpart = "date_entered < NOW() - INTERVAL '1 day' "; |
|
| 880 | - } else { |
|
| 881 | - $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 DAY) "; |
|
| 882 | - } |
|
| 883 | - break; |
|
| 884 | - case "1week": |
|
| 885 | - if (DB_TYPE == "pgsql") { |
|
| 886 | - $date_qpart = "date_entered < NOW() - INTERVAL '1 week' "; |
|
| 887 | - } else { |
|
| 888 | - $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 WEEK) "; |
|
| 889 | - } |
|
| 890 | - break; |
|
| 891 | - case "2week": |
|
| 892 | - if (DB_TYPE == "pgsql") { |
|
| 893 | - $date_qpart = "date_entered < NOW() - INTERVAL '2 week' "; |
|
| 894 | - } else { |
|
| 895 | - $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 2 WEEK) "; |
|
| 896 | - } |
|
| 897 | - break; |
|
| 898 | - default: |
|
| 899 | - $date_qpart = "true"; |
|
| 877 | + case "1day": |
|
| 878 | + if (DB_TYPE == "pgsql") { |
|
| 879 | + $date_qpart = "date_entered < NOW() - INTERVAL '1 day' "; |
|
| 880 | + } else { |
|
| 881 | + $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 DAY) "; |
|
| 882 | + } |
|
| 883 | + break; |
|
| 884 | + case "1week": |
|
| 885 | + if (DB_TYPE == "pgsql") { |
|
| 886 | + $date_qpart = "date_entered < NOW() - INTERVAL '1 week' "; |
|
| 887 | + } else { |
|
| 888 | + $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 WEEK) "; |
|
| 889 | + } |
|
| 890 | + break; |
|
| 891 | + case "2week": |
|
| 892 | + if (DB_TYPE == "pgsql") { |
|
| 893 | + $date_qpart = "date_entered < NOW() - INTERVAL '2 week' "; |
|
| 894 | + } else { |
|
| 895 | + $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 2 WEEK) "; |
|
| 896 | + } |
|
| 897 | + break; |
|
| 898 | + default: |
|
| 899 | + $date_qpart = "true"; |
|
| 900 | 900 | } |
| 901 | 901 | |
| 902 | 902 | if (is_numeric($feed)) { |
@@ -1212,28 +1212,28 @@ discard block |
||
| 1212 | 1212 | |
| 1213 | 1213 | public static function getFeedIcon($id) { |
| 1214 | 1214 | switch ($id) { |
| 1215 | - case 0: |
|
| 1216 | - return "archive"; |
|
| 1217 | - case -1: |
|
| 1218 | - return "star"; |
|
| 1219 | - case -2: |
|
| 1220 | - return "rss_feed"; |
|
| 1221 | - case -3: |
|
| 1222 | - return "whatshot"; |
|
| 1223 | - case -4: |
|
| 1224 | - return "inbox"; |
|
| 1225 | - case -6: |
|
| 1226 | - return "restore"; |
|
| 1227 | - default: |
|
| 1228 | - if ($id < LABEL_BASE_INDEX) { |
|
| 1229 | - return "label"; |
|
| 1230 | - } else { |
|
| 1231 | - $icon = self::getIconFile($id); |
|
| 1215 | + case 0: |
|
| 1216 | + return "archive"; |
|
| 1217 | + case -1: |
|
| 1218 | + return "star"; |
|
| 1219 | + case -2: |
|
| 1220 | + return "rss_feed"; |
|
| 1221 | + case -3: |
|
| 1222 | + return "whatshot"; |
|
| 1223 | + case -4: |
|
| 1224 | + return "inbox"; |
|
| 1225 | + case -6: |
|
| 1226 | + return "restore"; |
|
| 1227 | + default: |
|
| 1228 | + if ($id < LABEL_BASE_INDEX) { |
|
| 1229 | + return "label"; |
|
| 1230 | + } else { |
|
| 1231 | + $icon = self::getIconFile($id); |
|
| 1232 | 1232 | |
| 1233 | 1233 | if ($icon && file_exists($icon)) { |
| 1234 | - return ICONS_URL . "/" . basename($icon) . "?" . filemtime($icon); |
|
| 1235 | - } |
|
| 1234 | + return ICONS_URL . "/" . basename($icon) . "?" . filemtime($icon); |
|
| 1236 | 1235 | } |
| 1236 | + } |
|
| 1237 | 1237 | } |
| 1238 | 1238 | |
| 1239 | 1239 | return false; |
@@ -2201,102 +2201,102 @@ discard block |
||
| 2201 | 2201 | $commandpair = explode(":", mb_strtolower($k), 2); |
| 2202 | 2202 | |
| 2203 | 2203 | switch ($commandpair[0]) { |
| 2204 | - case "title": |
|
| 2205 | - if ($commandpair[1]) { |
|
| 2206 | - array_push($query_keywords, "($not (LOWER(ttrss_entries.title) LIKE ". |
|
| 2207 | - $pdo->quote('%' . mb_strtolower($commandpair[1]) . '%') ."))"); |
|
| 2208 | - } else { |
|
| 2209 | - array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%') |
|
| 2204 | + case "title": |
|
| 2205 | + if ($commandpair[1]) { |
|
| 2206 | + array_push($query_keywords, "($not (LOWER(ttrss_entries.title) LIKE ". |
|
| 2207 | + $pdo->quote('%' . mb_strtolower($commandpair[1]) . '%') ."))"); |
|
| 2208 | + } else { |
|
| 2209 | + array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%') |
|
| 2210 | 2210 | OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))"); |
| 2211 | - array_push($search_words, $k); |
|
| 2212 | - } |
|
| 2213 | - break; |
|
| 2214 | - case "author": |
|
| 2215 | - if ($commandpair[1]) { |
|
| 2216 | - array_push($query_keywords, "($not (LOWER(author) LIKE ". |
|
| 2217 | - $pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))"); |
|
| 2218 | - } else { |
|
| 2219 | - array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%') |
|
| 2211 | + array_push($search_words, $k); |
|
| 2212 | + } |
|
| 2213 | + break; |
|
| 2214 | + case "author": |
|
| 2215 | + if ($commandpair[1]) { |
|
| 2216 | + array_push($query_keywords, "($not (LOWER(author) LIKE ". |
|
| 2217 | + $pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))"); |
|
| 2218 | + } else { |
|
| 2219 | + array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%') |
|
| 2220 | 2220 | OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))"); |
| 2221 | - array_push($search_words, $k); |
|
| 2222 | - } |
|
| 2223 | - break; |
|
| 2224 | - case "note": |
|
| 2225 | - if ($commandpair[1]) { |
|
| 2226 | - if ($commandpair[1] == "true") |
|
| 2227 | - array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))"); |
|
| 2228 | - else if ($commandpair[1] == "false") |
|
| 2229 | - array_push($query_keywords, "($not (note IS NULL OR note = ''))"); |
|
| 2230 | - else |
|
| 2231 | - array_push($query_keywords, "($not (LOWER(note) LIKE ". |
|
| 2232 | - $pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))"); |
|
| 2233 | - } else { |
|
| 2234 | - array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").") |
|
| 2221 | + array_push($search_words, $k); |
|
| 2222 | + } |
|
| 2223 | + break; |
|
| 2224 | + case "note": |
|
| 2225 | + if ($commandpair[1]) { |
|
| 2226 | + if ($commandpair[1] == "true") |
|
| 2227 | + array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))"); |
|
| 2228 | + else if ($commandpair[1] == "false") |
|
| 2229 | + array_push($query_keywords, "($not (note IS NULL OR note = ''))"); |
|
| 2230 | + else |
|
| 2231 | + array_push($query_keywords, "($not (LOWER(note) LIKE ". |
|
| 2232 | + $pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))"); |
|
| 2233 | + } else { |
|
| 2234 | + array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").") |
|
| 2235 | 2235 | OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))"); |
| 2236 | - if (!$not) array_push($search_words, $k); |
|
| 2237 | - } |
|
| 2238 | - break; |
|
| 2239 | - case "star": |
|
| 2236 | + if (!$not) array_push($search_words, $k); |
|
| 2237 | + } |
|
| 2238 | + break; |
|
| 2239 | + case "star": |
|
| 2240 | 2240 | |
| 2241 | - if ($commandpair[1]) { |
|
| 2242 | - if ($commandpair[1] == "true") |
|
| 2243 | - array_push($query_keywords, "($not (marked = true))"); |
|
| 2244 | - else |
|
| 2245 | - array_push($query_keywords, "($not (marked = false))"); |
|
| 2246 | - } else { |
|
| 2247 | - array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").") |
|
| 2241 | + if ($commandpair[1]) { |
|
| 2242 | + if ($commandpair[1] == "true") |
|
| 2243 | + array_push($query_keywords, "($not (marked = true))"); |
|
| 2244 | + else |
|
| 2245 | + array_push($query_keywords, "($not (marked = false))"); |
|
| 2246 | + } else { |
|
| 2247 | + array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").") |
|
| 2248 | 2248 | OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))"); |
| 2249 | - if (!$not) array_push($search_words, $k); |
|
| 2250 | - } |
|
| 2251 | - break; |
|
| 2252 | - case "pub": |
|
| 2253 | - if ($commandpair[1]) { |
|
| 2254 | - if ($commandpair[1] == "true") |
|
| 2255 | - array_push($query_keywords, "($not (published = true))"); |
|
| 2256 | - else |
|
| 2257 | - array_push($query_keywords, "($not (published = false))"); |
|
| 2249 | + if (!$not) array_push($search_words, $k); |
|
| 2250 | + } |
|
| 2251 | + break; |
|
| 2252 | + case "pub": |
|
| 2253 | + if ($commandpair[1]) { |
|
| 2254 | + if ($commandpair[1] == "true") |
|
| 2255 | + array_push($query_keywords, "($not (published = true))"); |
|
| 2256 | + else |
|
| 2257 | + array_push($query_keywords, "($not (published = false))"); |
|
| 2258 | 2258 | |
| 2259 | - } else { |
|
| 2260 | - array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%') |
|
| 2259 | + } else { |
|
| 2260 | + array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%') |
|
| 2261 | 2261 | OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))"); |
| 2262 | - if (!$not) array_push($search_words, $k); |
|
| 2263 | - } |
|
| 2264 | - break; |
|
| 2265 | - case "unread": |
|
| 2266 | - if ($commandpair[1]) { |
|
| 2267 | - if ($commandpair[1] == "true") |
|
| 2268 | - array_push($query_keywords, "($not (unread = true))"); |
|
| 2269 | - else |
|
| 2270 | - array_push($query_keywords, "($not (unread = false))"); |
|
| 2262 | + if (!$not) array_push($search_words, $k); |
|
| 2263 | + } |
|
| 2264 | + break; |
|
| 2265 | + case "unread": |
|
| 2266 | + if ($commandpair[1]) { |
|
| 2267 | + if ($commandpair[1] == "true") |
|
| 2268 | + array_push($query_keywords, "($not (unread = true))"); |
|
| 2269 | + else |
|
| 2270 | + array_push($query_keywords, "($not (unread = false))"); |
|
| 2271 | 2271 | |
| 2272 | - } else { |
|
| 2273 | - array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").") |
|
| 2272 | + } else { |
|
| 2273 | + array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").") |
|
| 2274 | 2274 | OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))"); |
| 2275 | - if (!$not) array_push($search_words, $k); |
|
| 2276 | - } |
|
| 2277 | - break; |
|
| 2278 | - default: |
|
| 2279 | - if (strpos($k, "@") === 0) { |
|
| 2275 | + if (!$not) array_push($search_words, $k); |
|
| 2276 | + } |
|
| 2277 | + break; |
|
| 2278 | + default: |
|
| 2279 | + if (strpos($k, "@") === 0) { |
|
| 2280 | 2280 | |
| 2281 | - $user_tz_string = get_pref('USER_TIMEZONE', $_SESSION['uid']); |
|
| 2282 | - $orig_ts = strtotime(substr($k, 1)); |
|
| 2283 | - $k = date("Y-m-d", convert_timestamp($orig_ts, $user_tz_string, 'UTC')); |
|
| 2281 | + $user_tz_string = get_pref('USER_TIMEZONE', $_SESSION['uid']); |
|
| 2282 | + $orig_ts = strtotime(substr($k, 1)); |
|
| 2283 | + $k = date("Y-m-d", convert_timestamp($orig_ts, $user_tz_string, 'UTC')); |
|
| 2284 | 2284 | |
| 2285 | - //$k = date("Y-m-d", strtotime(substr($k, 1))); |
|
| 2285 | + //$k = date("Y-m-d", strtotime(substr($k, 1))); |
|
| 2286 | 2286 | |
| 2287 | - array_push($query_keywords, "(".SUBSTRING_FOR_DATE."(updated,1,LENGTH('$k')) $not = '$k')"); |
|
| 2288 | - } else { |
|
| 2287 | + array_push($query_keywords, "(".SUBSTRING_FOR_DATE."(updated,1,LENGTH('$k')) $not = '$k')"); |
|
| 2288 | + } else { |
|
| 2289 | 2289 | |
| 2290 | - if (DB_TYPE == "pgsql") { |
|
| 2291 | - $k = mb_strtolower($k); |
|
| 2292 | - array_push($search_query_leftover, $not ? "!$k" : $k); |
|
| 2293 | - } else { |
|
| 2294 | - array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").") |
|
| 2290 | + if (DB_TYPE == "pgsql") { |
|
| 2291 | + $k = mb_strtolower($k); |
|
| 2292 | + array_push($search_query_leftover, $not ? "!$k" : $k); |
|
| 2293 | + } else { |
|
| 2294 | + array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").") |
|
| 2295 | 2295 | OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))"); |
| 2296 | - } |
|
| 2297 | - |
|
| 2298 | - if (!$not) array_push($search_words, $k); |
|
| 2299 | 2296 | } |
| 2297 | + |
|
| 2298 | + if (!$not) array_push($search_words, $k); |
|
| 2299 | + } |
|
| 2300 | 2300 | } |
| 2301 | 2301 | } |
| 2302 | 2302 | |
@@ -52,14 +52,14 @@ |
||
| 52 | 52 | |
| 53 | 53 | public function __construct() { |
| 54 | 54 | switch (LOG_DESTINATION) { |
| 55 | - case "sql": |
|
| 56 | - $this->adapter = new Logger_SQL(); |
|
| 57 | - break; |
|
| 58 | - case "syslog": |
|
| 59 | - $this->adapter = new Logger_Syslog(); |
|
| 60 | - break; |
|
| 61 | - default: |
|
| 62 | - $this->adapter = false; |
|
| 55 | + case "sql": |
|
| 56 | + $this->adapter = new Logger_SQL(); |
|
| 57 | + break; |
|
| 58 | + case "syslog": |
|
| 59 | + $this->adapter = new Logger_Syslog(); |
|
| 60 | + break; |
|
| 61 | + default: |
|
| 62 | + $this->adapter = false; |
|
| 63 | 63 | } |
| 64 | 64 | } |
| 65 | 65 | |
