Inspection of "Scrutinizer Auto-Fixes" - codysnider/tt-rss - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Pull Request — master (#7)

unknown

created 2019-12-21 04:05 UTC

Status

Switch Indentation +60 added lines, -60 removed lines patch added patch discarded remove patch

@@ -1071,70 +1071,70 @@
 block discarded – undo
 				$qpart = "";
 
 				switch ($k) {
-					case "title":
-						$qpart = "title = ".$this->pdo->quote($feed_title);
-						break;
-
-					case "feed_url":
-						$qpart = "feed_url = ".$this->pdo->quote($feed_url);
-						break;
-
-					case "update_interval":
-						$qpart = "update_interval = ".$this->pdo->quote($upd_intl);
-						break;
-
-					case "purge_interval":
-						$qpart = "purge_interval =".$this->pdo->quote($purge_intl);
-						break;
-
-					case "auth_login":
-						$qpart = "auth_login = ".$this->pdo->quote($auth_login);
-						break;
-
-					case "auth_pass":
-						$qpart = "auth_pass =".$this->pdo->quote($auth_pass).", auth_pass_encrypted = false";
-						break;
-
-					case "private":
-						$qpart = "private = ".$this->pdo->quote($private);
-						break;
-
-					case "include_in_digest":
-						$qpart = "include_in_digest = ".$this->pdo->quote($include_in_digest);
-						break;
-
-					case "always_display_enclosures":
-						$qpart = "always_display_enclosures = ".$this->pdo->quote($always_display_enclosures);
-						break;
-
-					case "mark_unread_on_update":
-						$qpart = "mark_unread_on_update = ".$this->pdo->quote($mark_unread_on_update);
-						break;
-
-					case "cache_images":
-						$qpart = "cache_images = ".$this->pdo->quote($cache_images);
-						break;
-
-					case "hide_images":
-						$qpart = "hide_images = ".$this->pdo->quote($hide_images);
-						break;
-
-					case "cat_id":
-						if (get_pref('ENABLE_FEED_CATS')) {
-							if ($cat_id) {
-								$qpart = "cat_id = ".$this->pdo->quote($cat_id);
-							} else {
-								$qpart = 'cat_id = NULL';
-							}
+				case "title":
+					$qpart = "title = ".$this->pdo->quote($feed_title);
+					break;
+
+				case "feed_url":
+					$qpart = "feed_url = ".$this->pdo->quote($feed_url);
+					break;
+
+				case "update_interval":
+					$qpart = "update_interval = ".$this->pdo->quote($upd_intl);
+					break;
+
+				case "purge_interval":
+					$qpart = "purge_interval =".$this->pdo->quote($purge_intl);
+					break;
+
+				case "auth_login":
+					$qpart = "auth_login = ".$this->pdo->quote($auth_login);
+					break;
+
+				case "auth_pass":
+					$qpart = "auth_pass =".$this->pdo->quote($auth_pass).", auth_pass_encrypted = false";
+					break;
+
+				case "private":
+					$qpart = "private = ".$this->pdo->quote($private);
+					break;
+
+				case "include_in_digest":
+					$qpart = "include_in_digest = ".$this->pdo->quote($include_in_digest);
+					break;
+
+				case "always_display_enclosures":
+					$qpart = "always_display_enclosures = ".$this->pdo->quote($always_display_enclosures);
+					break;
+
+				case "mark_unread_on_update":
+					$qpart = "mark_unread_on_update = ".$this->pdo->quote($mark_unread_on_update);
+					break;
+
+				case "cache_images":
+					$qpart = "cache_images = ".$this->pdo->quote($cache_images);
+					break;
+
+				case "hide_images":
+					$qpart = "hide_images = ".$this->pdo->quote($hide_images);
+					break;
+
+				case "cat_id":
+					if (get_pref('ENABLE_FEED_CATS')) {
+						if ($cat_id) {
+							$qpart = "cat_id = ".$this->pdo->quote($cat_id);
 						} else {
-							$qpart = "";
+							$qpart = 'cat_id = NULL';
 						}
+					} else {
+						$qpart = "";
+					}
 
-						break;
+					break;
 
-					case "feed_language":
-						$qpart = "feed_language = ".$this->pdo->quote($feed_language);
-						break;
+				case "feed_language":
+					$qpart = "feed_language = ".$this->pdo->quote($feed_language);
+					break;
 
 				}
 

Please login to merge, or discard this patch.

classes/pref/prefs.php 1 patch

Switch Indentation +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -172,26 +172,26 @@
 block discarded – undo
 			$value = $_POST[$pref_name];
 
 			switch ($pref_name) {
-				case 'DIGEST_PREFERRED_TIME':
-					if (get_pref('DIGEST_PREFERRED_TIME') != $value) {
+			case 'DIGEST_PREFERRED_TIME':
+				if (get_pref('DIGEST_PREFERRED_TIME') != $value) {
 
-						$sth = $this->pdo->prepare("UPDATE ttrss_users SET
+					$sth = $this->pdo->prepare("UPDATE ttrss_users SET
 						last_digest_sent = NULL WHERE id = ?");
-						$sth->execute([$_SESSION['uid']]);
+					$sth->execute([$_SESSION['uid']]);
 
-					}
-					break;
-				case 'USER_LANGUAGE':
-					if (!$need_reload) {
-					    $need_reload = $_SESSION["language"] != $value;
-					}
-					break;
+				}
+				break;
+			case 'USER_LANGUAGE':
+				if (!$need_reload) {
+				    $need_reload = $_SESSION["language"] != $value;
+				}
+				break;
 
-				case 'USER_CSS_THEME':
-					if (!$need_reload) {
-					    $need_reload = get_pref($pref_name) != $value;
-					}
-					break;
+			case 'USER_CSS_THEME':
+				if (!$need_reload) {
+				    $need_reload = get_pref($pref_name) != $value;
+				}
+				break;
 			}
 
 			set_pref($pref_name, $value);

Please login to merge, or discard this patch.

classes/db.php 1 patch

Switch Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -24,14 +24,14 @@
 block discarded – undo
 		$er = error_reporting(E_ALL);
 
 		switch (DB_TYPE) {
-			case "mysql":
-				$this->adapter = new Db_Mysqli();
-				break;
-			case "pgsql":
-				$this->adapter = new Db_Pgsql();
-				break;
-			default:
-				die("Unknown DB_TYPE: ".DB_TYPE);
+		case "mysql":
+			$this->adapter = new Db_Mysqli();
+			break;
+		case "pgsql":
+			$this->adapter = new Db_Pgsql();
+			break;
+		default:
+			die("Unknown DB_TYPE: ".DB_TYPE);
 		}
 
 		if (!$this->adapter) {

Please login to merge, or discard this patch.

classes/api.php 1 patch

Switch Indentation +33 added lines, -33 removed lines patch added patch discarded remove patch

@@ -222,16 +222,16 @@  discard block
 block discarded – undo
 
 			$override_order = false;
 			switch (clean($_REQUEST["order_by"])) {
-				case "title":
-					$override_order = "ttrss_entries.title, date_entered, updated";
-					break;
-				case "date_reverse":
-					$override_order = "score DESC, date_entered, updated";
-					$skip_first_id_check = true;
-					break;
-				case "feed_dates":
-					$override_order = "updated DESC";
-					break;
+			case "title":
+				$override_order = "ttrss_entries.title, date_entered, updated";
+				break;
+			case "date_reverse":
+				$override_order = "score DESC, date_entered, updated";
+				$skip_first_id_check = true;
+				break;
+			case "feed_dates":
+				$override_order = "updated DESC";
+				break;
 			}
 
 			/* do not rely on params below */
@@ -263,32 +263,32 @@  discard block
 block discarded – undo
 		$set_to = "";
 
 		switch ($field_raw) {
-			case 0:
-				$field = "marked";
-				$additional_fields = ",last_marked = NOW()";
-				break;
-			case 1:
-				$field = "published";
-				$additional_fields = ",last_published = NOW()";
-				break;
-			case 2:
-				$field = "unread";
-				$additional_fields = ",last_read = NOW()";
-				break;
-			case 3:
-				$field = "note";
+		case 0:
+			$field = "marked";
+			$additional_fields = ",last_marked = NOW()";
+			break;
+		case 1:
+			$field = "published";
+			$additional_fields = ",last_published = NOW()";
+			break;
+		case 2:
+			$field = "unread";
+			$additional_fields = ",last_read = NOW()";
+			break;
+		case 3:
+			$field = "note";
 		};
 
 		switch ($mode) {
-			case 1:
-				$set_to = "true";
-				break;
-			case 0:
-				$set_to = "false";
-				break;
-			case 2:
-				$set_to = "not $field";
-				break;
+		case 1:
+			$set_to = "true";
+			break;
+		case 0:
+			$set_to = "false";
+			break;
+		case 2:
+			$set_to = "not $field";
+			break;
 		}
 
 		if ($field == "note") {

Please login to merge, or discard this patch.

lib/MiniTemplator.class.php 1 patch

Switch Indentation +47 added lines, -47 removed lines patch added patch discarded remove patch

@@ -305,23 +305,23 @@  discard block
 block discarded – undo
    if (!$this->parseWord($cmdL, $p, $cmd)) return true;
    $parms = substr($cmdL, $p);
    switch (strtoupper($cmd)) {
-      case '$BEGINBLOCK':
-         if (!$this->processBeginBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd))
-            return false;
-         break;
-      case '$ENDBLOCK':
-         if (!$this->processEndBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd))
-            return false;
-         break;
-      case '$INCLUDE':
-         if (!$this->processincludeCmd($parms, $cmdTPosBegin, $cmdTPosEnd))
-            return false;
-         $resumeFromStart = true;
-         break;
-      default:
-         if ($cmd{0} == '$' && !(strlen($cmd) >= 2 && $cmd{1} == '{')) {
-            $this->triggerError("Unknown command \"$cmd\" in template at offset $cmdTPosBegin.");
-            return false; }}
+   case '$BEGINBLOCK':
+      if (!$this->processBeginBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd))
+         return false;
+      break;
+   case '$ENDBLOCK':
+      if (!$this->processEndBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd))
+         return false;
+      break;
+   case '$INCLUDE':
+      if (!$this->processincludeCmd($parms, $cmdTPosBegin, $cmdTPosEnd))
+         return false;
+      $resumeFromStart = true;
+      break;
+   default:
+      if ($cmd{0} == '$' && !(strlen($cmd) >= 2 && $cmd{1} == '{')) {
+         $this->triggerError("Unknown command \"$cmd\" in template at offset $cmdTPosBegin.");
+         return false; }}
     return true; }
 
 /**
@@ -781,25 +781,25 @@  discard block
 block discarded – undo
       if ($tPos2 > $tPos)
          $this->writeString(substr($this->template, $tPos, $tPos2 - $tPos));
       switch ($kind) {
-         case 0:         // end of block
-            return;
-         case 1:         // variable
-            $vrtr = & $this->varRefTab[$varRefNo];
-            if ($vrtr['blockNo'] != $blockNo)
-               $this->programLogicError(4);
-            $variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']];
-            $this->writeString($variableValue);
-            $tPos = $vrtr['tPosEnd'];
-            $varRefNo += 1;
-            break;
-         case 2:         // sub block
-            $subBtr = & $this->blockTab[$subBlockNo];
-            if ($subBtr['parentBlockNo'] != $blockNo)
-               $this->programLogicError(3);
-            $this->writeBlockInstances($subBlockNo, $bitr['instanceLevel']); // recursive call
-            $tPos = $subBtr['tPosEnd'];
-            $subBlockNo += 1;
-            break; }}}
+      case 0:         // end of block
+         return;
+      case 1:         // variable
+         $vrtr = & $this->varRefTab[$varRefNo];
+         if ($vrtr['blockNo'] != $blockNo)
+            $this->programLogicError(4);
+         $variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']];
+         $this->writeString($variableValue);
+         $tPos = $vrtr['tPosEnd'];
+         $varRefNo += 1;
+         break;
+      case 2:         // sub block
+         $subBtr = & $this->blockTab[$subBlockNo];
+         if ($subBtr['parentBlockNo'] != $blockNo)
+            $this->programLogicError(3);
+         $this->writeBlockInstances($subBlockNo, $bitr['instanceLevel']); // recursive call
+         $tPos = $subBtr['tPosEnd'];
+         $subBlockNo += 1;
+         break; }}}
 
 /**
 * @access private
@@ -807,17 +807,17 @@  discard block
 block discarded – undo
 function writeString($s) {
    if ($this->outputError) return;
    switch ($this->outputMode) {
-      case 0:            // output to PHP output stream
-         if (!print($s))
-            $this->outputError = true;
-         break;
-      case 1:            // output to file
-         $rc = fwrite($this->outputFileHandle, $s);
-         if ($rc === false) $this->outputError = true;
-         break;
-      case 2:            // output to string
-         $this->outputString .= $s;
-         break; }}
+   case 0:            // output to PHP output stream
+      if (!print($s))
+         $this->outputError = true;
+      break;
+   case 1:            // output to file
+      $rc = fwrite($this->outputFileHandle, $s);
+      if ($rc === false) $this->outputError = true;
+      break;
+   case 2:            // output to string
+      $this->outputString .= $s;
+      break; }}
 
 //--- name lookup routines ------------------------------------------------------------------------------------------
 

Please login to merge, or discard this patch.

lib/phpqrcode/qrinput.php 1 patch

Switch Indentation +58 added lines, -58 removed lines patch added patch discarded remove patch

@@ -201,13 +201,13 @@  discard block
 block discarded – undo
                 $version = 1;
 
             switch ($this->mode) {
-                case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size); break;
-                case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size); break;
-                case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size); break;
-                case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size); break;
-                case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            
-                default:
-                    return 0;
+            case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size); break;
+            case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size); break;
+            case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size); break;
+            case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size); break;
+            case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            
+            default:
+                return 0;
             }
 
             $l = QRspec::lengthIndicator($this->mode, $version);
@@ -247,14 +247,14 @@  discard block
 block discarded – undo
                     $ret = 0;
                     
                     switch ($this->mode) {
-                        case QR_MODE_NUM:        $ret = $this->encodeModeNum($version); break;
-                        case QR_MODE_AN:        $ret = $this->encodeModeAn($version); break;
-                        case QR_MODE_8:            $ret = $this->encodeMode8($version); break;
-                        case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version); break;
-                        case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure(); break;
+                    case QR_MODE_NUM:        $ret = $this->encodeModeNum($version); break;
+                    case QR_MODE_AN:        $ret = $this->encodeModeAn($version); break;
+                    case QR_MODE_8:            $ret = $this->encodeMode8($version); break;
+                    case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version); break;
+                    case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure(); break;
                         
-                        default:
-                            break;
+                    default:
+                        break;
                     }
                     
                     if ($ret < 0)
@@ -404,14 +404,14 @@  discard block
 block discarded – undo
             $bits = $w * 10;
             
             switch ($size - $w * 3) {
-                case 1:
-                    $bits += 4;
-                    break;
-                case 2:
-                    $bits += 7;
-                    break;
-                default:
-                    break;
+            case 1:
+                $bits += 4;
+                break;
+            case 2:
+                $bits += 7;
+                break;
+            default:
+                break;
             }
 
             return $bits;
@@ -500,14 +500,14 @@  discard block
 block discarded – undo
                 return false;
 
             switch ($mode) {
-                case QR_MODE_NUM:       return self::checkModeNum($size, $data); break;
-                case QR_MODE_AN:        return self::checkModeAn($size, $data); break;
-                case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;
-                case QR_MODE_8:         return true; break;
-                case QR_MODE_STRUCTURE: return true; break;
+            case QR_MODE_NUM:       return self::checkModeNum($size, $data); break;
+            case QR_MODE_AN:        return self::checkModeAn($size, $data); break;
+            case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;
+            case QR_MODE_8:         return true; break;
+            case QR_MODE_STRUCTURE: return true; break;
                 
-                default:
-                    break;
+            default:
+                break;
             }
 
             return false;
@@ -548,35 +548,35 @@  discard block
 block discarded – undo
         {
             $payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);
             switch ($mode) {
-                case QR_MODE_NUM:
-                    $chunks = (int) ($payload / 10);
-                    $remain = $payload - $chunks * 10;
-                    $size = $chunks * 3;
-                    if ($remain >= 7) {
-                        $size += 2;
-                    } else if ($remain >= 4) {
-                        $size += 1;
-                    }
-                    break;
-                case QR_MODE_AN:
-                    $chunks = (int) ($payload / 11);
-                    $remain = $payload - $chunks * 11;
-                    $size = $chunks * 2;
-                    if ($remain >= 6) 
-                        $size++;
-                    break;
-                case QR_MODE_8:
-                    $size = (int) ($payload / 8);
-                    break;
-                case QR_MODE_KANJI:
-                    $size = (int) (($payload / 13) * 2);
-                    break;
-                case QR_MODE_STRUCTURE:
-                    $size = (int) ($payload / 8);
-                    break;
-                default:
-                    $size = 0;
-                    break;
+            case QR_MODE_NUM:
+                $chunks = (int) ($payload / 10);
+                $remain = $payload - $chunks * 10;
+                $size = $chunks * 3;
+                if ($remain >= 7) {
+                    $size += 2;
+                } else if ($remain >= 4) {
+                    $size += 1;
+                }
+                break;
+            case QR_MODE_AN:
+                $chunks = (int) ($payload / 11);
+                $remain = $payload - $chunks * 11;
+                $size = $chunks * 2;
+                if ($remain >= 6) 
+                    $size++;
+                break;
+            case QR_MODE_8:
+                $size = (int) ($payload / 8);
+                break;
+            case QR_MODE_KANJI:
+                $size = (int) (($payload / 13) * 2);
+                break;
+            case QR_MODE_STRUCTURE:
+                $size = (int) ($payload / 8);
+                break;
+            default:
+                $size = 0;
+                break;
             }
             
             $maxsize = QRspec::maximumWords($mode, $version);

Please login to merge, or discard this patch.

lib/phpqrcode/phpqrcode.php 1 patch

Switch Indentation +88 added lines, -88 removed lines patch added patch discarded remove patch

@@ -1217,13 +1217,13 @@  discard block
 block discarded – undo
                 $version = 1;
 
             switch ($this->mode) {
-                case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size); break;
-                case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size); break;
-                case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size); break;
-                case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size); break;
-                case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            
-                default:
-                    return 0;
+            case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size); break;
+            case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size); break;
+            case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size); break;
+            case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size); break;
+            case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            
+            default:
+                return 0;
             }
 
             $l = QRspec::lengthIndicator($this->mode, $version);
@@ -1263,14 +1263,14 @@  discard block
 block discarded – undo
                     $ret = 0;
                     
                     switch ($this->mode) {
-                        case QR_MODE_NUM:        $ret = $this->encodeModeNum($version); break;
-                        case QR_MODE_AN:        $ret = $this->encodeModeAn($version); break;
-                        case QR_MODE_8:            $ret = $this->encodeMode8($version); break;
-                        case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version); break;
-                        case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure(); break;
+                    case QR_MODE_NUM:        $ret = $this->encodeModeNum($version); break;
+                    case QR_MODE_AN:        $ret = $this->encodeModeAn($version); break;
+                    case QR_MODE_8:            $ret = $this->encodeMode8($version); break;
+                    case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version); break;
+                    case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure(); break;
                         
-                        default:
-                            break;
+                    default:
+                        break;
                     }
                     
                     if ($ret < 0)
@@ -1420,14 +1420,14 @@  discard block
 block discarded – undo
             $bits = $w * 10;
             
             switch ($size - $w * 3) {
-                case 1:
-                    $bits += 4;
-                    break;
-                case 2:
-                    $bits += 7;
-                    break;
-                default:
-                    break;
+            case 1:
+                $bits += 4;
+                break;
+            case 2:
+                $bits += 7;
+                break;
+            default:
+                break;
             }
 
             return $bits;
@@ -1516,14 +1516,14 @@  discard block
 block discarded – undo
                 return false;
 
             switch ($mode) {
-                case QR_MODE_NUM:       return self::checkModeNum($size, $data); break;
-                case QR_MODE_AN:        return self::checkModeAn($size, $data); break;
-                case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;
-                case QR_MODE_8:         return true; break;
-                case QR_MODE_STRUCTURE: return true; break;
+            case QR_MODE_NUM:       return self::checkModeNum($size, $data); break;
+            case QR_MODE_AN:        return self::checkModeAn($size, $data); break;
+            case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;
+            case QR_MODE_8:         return true; break;
+            case QR_MODE_STRUCTURE: return true; break;
                 
-                default:
-                    break;
+            default:
+                break;
             }
 
             return false;
@@ -1564,35 +1564,35 @@  discard block
 block discarded – undo
         {
             $payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);
             switch ($mode) {
-                case QR_MODE_NUM:
-                    $chunks = (int) ($payload / 10);
-                    $remain = $payload - $chunks * 10;
-                    $size = $chunks * 3;
-                    if ($remain >= 7) {
-                        $size += 2;
-                    } else if ($remain >= 4) {
-                        $size += 1;
-                    }
-                    break;
-                case QR_MODE_AN:
-                    $chunks = (int) ($payload / 11);
-                    $remain = $payload - $chunks * 11;
-                    $size = $chunks * 2;
-                    if ($remain >= 6) 
-                        $size++;
-                    break;
-                case QR_MODE_8:
-                    $size = (int) ($payload / 8);
-                    break;
-                case QR_MODE_KANJI:
-                    $size = (int) (($payload / 13) * 2);
-                    break;
-                case QR_MODE_STRUCTURE:
-                    $size = (int) ($payload / 8);
-                    break;
-                default:
-                    $size = 0;
-                    break;
+            case QR_MODE_NUM:
+                $chunks = (int) ($payload / 10);
+                $remain = $payload - $chunks * 10;
+                $size = $chunks * 3;
+                if ($remain >= 7) {
+                    $size += 2;
+                } else if ($remain >= 4) {
+                    $size += 1;
+                }
+                break;
+            case QR_MODE_AN:
+                $chunks = (int) ($payload / 11);
+                $remain = $payload - $chunks * 11;
+                $size = $chunks * 2;
+                if ($remain >= 6) 
+                    $size++;
+                break;
+            case QR_MODE_8:
+                $size = (int) ($payload / 8);
+                break;
+            case QR_MODE_KANJI:
+                $size = (int) (($payload / 13) * 2);
+                break;
+            case QR_MODE_STRUCTURE:
+                $size = (int) ($payload / 8);
+                break;
+            default:
+                $size = 0;
+                break;
             }
             
             $maxsize = QRspec::maximumWords($mode, $version);
@@ -2198,14 +2198,14 @@  discard block
 block discarded – undo
                 $mode = $this->identifyMode(0);
                 
                 switch ($mode) {
-                    case QR_MODE_NUM: $length = $this->eatNum(); break;
-                    case QR_MODE_AN:  $length = $this->eatAn(); break;
-                    case QR_MODE_KANJI:
-                        if ($this->modeHint == QR_MODE_KANJI)
-                                $length = $this->eatKanji();
-                        else    $length = $this->eat8();
-                        break;
-                    default: $length = $this->eat8(); break;
+                case QR_MODE_NUM: $length = $this->eatNum(); break;
+                case QR_MODE_AN:  $length = $this->eatAn(); break;
+                case QR_MODE_KANJI:
+                    if ($this->modeHint == QR_MODE_KANJI)
+                            $length = $this->eatKanji();
+                    else    $length = $this->eat8();
+                    break;
+                default: $length = $this->eat8(); break;
                 
                 }
 
@@ -3234,28 +3234,28 @@  discard block
 block discarded – undo
             $enc->margin = $margin;
             
             switch ($level.'') {
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                        $enc->level = $level;
-                    break;
-                case 'l':
-                case 'L':
-                        $enc->level = QR_ECLEVEL_L;
-                    break;
-                case 'm':
-                case 'M':
-                        $enc->level = QR_ECLEVEL_M;
-                    break;
-                case 'q':
-                case 'Q':
-                        $enc->level = QR_ECLEVEL_Q;
-                    break;
-                case 'h':
-                case 'H':
-                        $enc->level = QR_ECLEVEL_H;
-                    break;
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+                    $enc->level = $level;
+                break;
+            case 'l':
+            case 'L':
+                    $enc->level = QR_ECLEVEL_L;
+                break;
+            case 'm':
+            case 'M':
+                    $enc->level = QR_ECLEVEL_M;
+                break;
+            case 'q':
+            case 'Q':
+                    $enc->level = QR_ECLEVEL_Q;
+                break;
+            case 'h':
+            case 'H':
+                    $enc->level = QR_ECLEVEL_H;
+                break;
             }
             
             return $enc;

Please login to merge, or discard this patch.

lib/phpqrcode/bindings/tcpdf/qrcode.php 1 patch

Switch Indentation +128 added lines, -128 removed lines patch added patch discarded remove patch

@@ -1461,26 +1461,26 @@  discard block
 block discarded – undo
 				}
 				$mode = $this->identifyMode(0);
 				switch ($mode) {
-					case QR_MODE_NM: {
-						$length = $this->eatNum();
-						break;
-					}
-					case QR_MODE_AN: {
-						$length = $this->eatAn();
-						break;
-					}
-					case QR_MODE_KJ: {
-						if ($this->hint == QR_MODE_KJ) {
-							$length = $this->eatKanji();
-						} else {
-							$length = $this->eat8();
-						}
-						break;
-					}
-					default: {
+				case QR_MODE_NM: {
+					$length = $this->eatNum();
+					break;
+				}
+				case QR_MODE_AN: {
+					$length = $this->eatAn();
+					break;
+				}
+				case QR_MODE_KJ: {
+					if ($this->hint == QR_MODE_KJ) {
+						$length = $this->eatKanji();
+					} else {
 						$length = $this->eat8();
-						break;
 					}
+					break;
+				}
+				default: {
+					$length = $this->eat8();
+					break;
+				}
 				}
 				if ($length == 0) {
 					return 0;
@@ -1665,29 +1665,29 @@  discard block
 block discarded – undo
 				$inputitem['bstream'] = $this->appendBitstream($inputitem['bstream'], $st2['bstream']);
 			} else {
 				switch ($inputitem['mode']) {
-					case QR_MODE_NM: {
-						$inputitem = $this->encodeModeNum($inputitem, $version);
-						break;
-					}
-					case QR_MODE_AN: {
-						$inputitem = $this->encodeModeAn($inputitem, $version);
-						break;
-					}
-					case QR_MODE_8B: {
-						$inputitem = $this->encodeMode8($inputitem, $version);
-						break;
-					}
-					case QR_MODE_KJ: {
-						$inputitem = $this->encodeModeKanji($inputitem, $version);
-						break;
-					}
-					case QR_MODE_ST: {
-						$inputitem = $this->encodeModeStructure($inputitem);
-						break;
-					}
-					default: {
-						break;
-					}
+				case QR_MODE_NM: {
+					$inputitem = $this->encodeModeNum($inputitem, $version);
+					break;
+				}
+				case QR_MODE_AN: {
+					$inputitem = $this->encodeModeAn($inputitem, $version);
+					break;
+				}
+				case QR_MODE_8B: {
+					$inputitem = $this->encodeMode8($inputitem, $version);
+					break;
+				}
+				case QR_MODE_KJ: {
+					$inputitem = $this->encodeModeKanji($inputitem, $version);
+					break;
+				}
+				case QR_MODE_ST: {
+					$inputitem = $this->encodeModeStructure($inputitem);
+					break;
+				}
+				default: {
+					break;
+				}
 				}
 			}
 			return $inputitem;
@@ -1774,17 +1774,17 @@  discard block
 block discarded – undo
 			$w = (int) $size / 3;
 			$bits = $w * 10;
 			switch ($size - $w * 3) {
-				case 1: {
-					$bits += 4;
-					break;
-				}
-				case 2: {
-					$bits += 7;
-					break;
-				}
-				default: {
-					break;
-				}
+			case 1: {
+				$bits += 4;
+				break;
+			}
+			case 2: {
+				$bits += 7;
+				break;
+			}
+			default: {
+				break;
+			}
 			}
 			return $bits;
 		}
@@ -1876,24 +1876,24 @@  discard block
 block discarded – undo
 				return false;
 			}
 			switch ($mode) {
-				case QR_MODE_NM: {
-					return $this->checkModeNum($size, $data);
-				}
-				case QR_MODE_AN: {
-					return $this->checkModeAn($size, $data);
-				}
-				case QR_MODE_KJ: {
-					return $this->checkModeKanji($size, $data);
-				}
-				case QR_MODE_8B: {
-					return true;
-				}
-				case QR_MODE_ST: {
-					return true;
-				}
-				default: {
-					break;
-				}
+			case QR_MODE_NM: {
+				return $this->checkModeNum($size, $data);
+			}
+			case QR_MODE_AN: {
+				return $this->checkModeAn($size, $data);
+			}
+			case QR_MODE_KJ: {
+				return $this->checkModeKanji($size, $data);
+			}
+			case QR_MODE_8B: {
+				return true;
+			}
+			case QR_MODE_ST: {
+				return true;
+			}
+			default: {
+				break;
+			}
 			}
 			return false;
 		}
@@ -1911,28 +1911,28 @@  discard block
 block discarded – undo
 			}
 			foreach ($items as $item) {
 				switch ($item['mode']) {
-					case QR_MODE_NM: {
-						$bits = $this->estimateBitsModeNum($item['size']);
-						break;
-					}
-					case QR_MODE_AN: {
-						$bits = $this->estimateBitsModeAn($item['size']);
-						break;
-					}
-					case QR_MODE_8B: {
-						$bits = $this->estimateBitsMode8($item['size']);
-						break;
-					}
-					case QR_MODE_KJ: {
-						$bits = $this->estimateBitsModeKanji($item['size']);
-						break;
-					}
-					case QR_MODE_ST: {
-						return STRUCTURE_HEADER_BITS;
-					}
-					default: {
-						return 0;
-					}
+				case QR_MODE_NM: {
+					$bits = $this->estimateBitsModeNum($item['size']);
+					break;
+				}
+				case QR_MODE_AN: {
+					$bits = $this->estimateBitsModeAn($item['size']);
+					break;
+				}
+				case QR_MODE_8B: {
+					$bits = $this->estimateBitsMode8($item['size']);
+					break;
+				}
+				case QR_MODE_KJ: {
+					$bits = $this->estimateBitsModeKanji($item['size']);
+					break;
+				}
+				case QR_MODE_ST: {
+					return STRUCTURE_HEADER_BITS;
+				}
+				default: {
+					return 0;
+				}
 				}
 				$l = $this->lengthIndicator($item['mode'], $version);
 				$m = 1 << $l;
@@ -1971,42 +1971,42 @@  discard block
 block discarded – undo
 		 protected function lengthOfCode($mode, $version, $bits) {
 			$payload = $bits - 4 - $this->lengthIndicator($mode, $version);
 			switch ($mode) {
-				case QR_MODE_NM: {
-					$chunks = (int) ($payload / 10);
-					$remain = $payload - $chunks * 10;
-					$size = $chunks * 3;
-					if ($remain >= 7) {
-						$size += 2;
-					} elseif ($remain >= 4) {
-						$size += 1;
-					}
-					break;
-				}
-				case QR_MODE_AN: {
-					$chunks = (int) ($payload / 11);
-					$remain = $payload - $chunks * 11;
-					$size = $chunks * 2;
-					if ($remain >= 6) {
-						++$size;
-					}
-					break;
-				}
-				case QR_MODE_8B: {
-					$size = (int) ($payload / 8);
-					break;
-				}
-				case QR_MODE_KJ: {
-					$size = (int) (($payload / 13) * 2);
-					break;
-				}
-				case QR_MODE_ST: {
-					$size = (int) ($payload / 8);
-					break;
-				}
-				default: {
-					$size = 0;
-					break;
-				}
+			case QR_MODE_NM: {
+				$chunks = (int) ($payload / 10);
+				$remain = $payload - $chunks * 10;
+				$size = $chunks * 3;
+				if ($remain >= 7) {
+					$size += 2;
+				} elseif ($remain >= 4) {
+					$size += 1;
+				}
+				break;
+			}
+			case QR_MODE_AN: {
+				$chunks = (int) ($payload / 11);
+				$remain = $payload - $chunks * 11;
+				$size = $chunks * 2;
+				if ($remain >= 6) {
+					++$size;
+				}
+				break;
+			}
+			case QR_MODE_8B: {
+				$size = (int) ($payload / 8);
+				break;
+			}
+			case QR_MODE_KJ: {
+				$size = (int) (($payload / 13) * 2);
+				break;
+			}
+			case QR_MODE_ST: {
+				$size = (int) ($payload / 8);
+				break;
+			}
+			default: {
+				$size = 0;
+				break;
+			}
 			}
 			$maxsize = $this->maximumWords($mode, $version);
 			if ($size < 0) {

Please login to merge, or discard this patch.

		@@ -1071,70 +1071,70 @@
		block discarded – undo
1071	1071	$qpart = "";
1072	1072
1073	1073	switch ($k) {
1074		- case "title":
1075		- $qpart = "title = ".$this->pdo->quote($feed_title);
1076		- break;
1077		-
1078		- case "feed_url":
1079		- $qpart = "feed_url = ".$this->pdo->quote($feed_url);
1080		- break;
1081		-
1082		- case "update_interval":
1083		- $qpart = "update_interval = ".$this->pdo->quote($upd_intl);
1084		- break;
1085		-
1086		- case "purge_interval":
1087		- $qpart = "purge_interval =".$this->pdo->quote($purge_intl);
1088		- break;
1089		-
1090		- case "auth_login":
1091		- $qpart = "auth_login = ".$this->pdo->quote($auth_login);
1092		- break;
1093		-
1094		- case "auth_pass":
1095		- $qpart = "auth_pass =".$this->pdo->quote($auth_pass).", auth_pass_encrypted = false";
1096		- break;
1097		-
1098		- case "private":
1099		- $qpart = "private = ".$this->pdo->quote($private);
1100		- break;
1101		-
1102		- case "include_in_digest":
1103		- $qpart = "include_in_digest = ".$this->pdo->quote($include_in_digest);
1104		- break;
1105		-
1106		- case "always_display_enclosures":
1107		- $qpart = "always_display_enclosures = ".$this->pdo->quote($always_display_enclosures);
1108		- break;
1109		-
1110		- case "mark_unread_on_update":
1111		- $qpart = "mark_unread_on_update = ".$this->pdo->quote($mark_unread_on_update);
1112		- break;
1113		-
1114		- case "cache_images":
1115		- $qpart = "cache_images = ".$this->pdo->quote($cache_images);
1116		- break;
1117		-
1118		- case "hide_images":
1119		- $qpart = "hide_images = ".$this->pdo->quote($hide_images);
1120		- break;
1121		-
1122		- case "cat_id":
1123		- if (get_pref('ENABLE_FEED_CATS')) {
1124		- if ($cat_id) {
1125		- $qpart = "cat_id = ".$this->pdo->quote($cat_id);
1126		- } else {
1127		- $qpart = 'cat_id = NULL';
1128		- }
	1074	+ case "title":
	1075	+ $qpart = "title = ".$this->pdo->quote($feed_title);
	1076	+ break;
	1077	+
	1078	+ case "feed_url":
	1079	+ $qpart = "feed_url = ".$this->pdo->quote($feed_url);
	1080	+ break;
	1081	+
	1082	+ case "update_interval":
	1083	+ $qpart = "update_interval = ".$this->pdo->quote($upd_intl);
	1084	+ break;
	1085	+
	1086	+ case "purge_interval":
	1087	+ $qpart = "purge_interval =".$this->pdo->quote($purge_intl);
	1088	+ break;
	1089	+
	1090	+ case "auth_login":
	1091	+ $qpart = "auth_login = ".$this->pdo->quote($auth_login);
	1092	+ break;
	1093	+
	1094	+ case "auth_pass":
	1095	+ $qpart = "auth_pass =".$this->pdo->quote($auth_pass).", auth_pass_encrypted = false";
	1096	+ break;
	1097	+
	1098	+ case "private":
	1099	+ $qpart = "private = ".$this->pdo->quote($private);
	1100	+ break;
	1101	+
	1102	+ case "include_in_digest":
	1103	+ $qpart = "include_in_digest = ".$this->pdo->quote($include_in_digest);
	1104	+ break;
	1105	+
	1106	+ case "always_display_enclosures":
	1107	+ $qpart = "always_display_enclosures = ".$this->pdo->quote($always_display_enclosures);
	1108	+ break;
	1109	+
	1110	+ case "mark_unread_on_update":
	1111	+ $qpart = "mark_unread_on_update = ".$this->pdo->quote($mark_unread_on_update);
	1112	+ break;
	1113	+
	1114	+ case "cache_images":
	1115	+ $qpart = "cache_images = ".$this->pdo->quote($cache_images);
	1116	+ break;
	1117	+
	1118	+ case "hide_images":
	1119	+ $qpart = "hide_images = ".$this->pdo->quote($hide_images);
	1120	+ break;
	1121	+
	1122	+ case "cat_id":
	1123	+ if (get_pref('ENABLE_FEED_CATS')) {
	1124	+ if ($cat_id) {
	1125	+ $qpart = "cat_id = ".$this->pdo->quote($cat_id);
1129	1126	} else {
1130		- $qpart = "";
	1127	+ $qpart = 'cat_id = NULL';
1131	1128	}
	1129	+ } else {
	1130	+ $qpart = "";
	1131	+ }
1132	1132
1133		- break;
	1133	+ break;
1134	1134
1135		- case "feed_language":
1136		- $qpart = "feed_language = ".$this->pdo->quote($feed_language);
1137		- break;
	1135	+ case "feed_language":
	1136	+ $qpart = "feed_language = ".$this->pdo->quote($feed_language);
	1137	+ break;
1138	1138
1139	1139	}
1140	1140

		@@ -222,16 +222,16 @@ discard block
		block discarded – undo
222	222
223	223	$override_order = false;
224	224	switch (clean($_REQUEST["order_by"])) {
225		- case "title":
226		- $override_order = "ttrss_entries.title, date_entered, updated";
227		- break;
228		- case "date_reverse":
229		- $override_order = "score DESC, date_entered, updated";
230		- $skip_first_id_check = true;
231		- break;
232		- case "feed_dates":
233		- $override_order = "updated DESC";
234		- break;
	225	+ case "title":
	226	+ $override_order = "ttrss_entries.title, date_entered, updated";
	227	+ break;
	228	+ case "date_reverse":
	229	+ $override_order = "score DESC, date_entered, updated";
	230	+ $skip_first_id_check = true;
	231	+ break;
	232	+ case "feed_dates":
	233	+ $override_order = "updated DESC";
	234	+ break;
235	235	}
236	236
237	237	/* do not rely on params below */
		@@ -263,32 +263,32 @@ discard block
		block discarded – undo
263	263	$set_to = "";
264	264
265	265	switch ($field_raw) {
266		- case 0:
267		- $field = "marked";
268		- $additional_fields = ",last_marked = NOW()";
269		- break;
270		- case 1:
271		- $field = "published";
272		- $additional_fields = ",last_published = NOW()";
273		- break;
274		- case 2:
275		- $field = "unread";
276		- $additional_fields = ",last_read = NOW()";
277		- break;
278		- case 3:
279		- $field = "note";
	266	+ case 0:
	267	+ $field = "marked";
	268	+ $additional_fields = ",last_marked = NOW()";
	269	+ break;
	270	+ case 1:
	271	+ $field = "published";
	272	+ $additional_fields = ",last_published = NOW()";
	273	+ break;
	274	+ case 2:
	275	+ $field = "unread";
	276	+ $additional_fields = ",last_read = NOW()";
	277	+ break;
	278	+ case 3:
	279	+ $field = "note";
280	280	};
281	281
282	282	switch ($mode) {
283		- case 1:
284		- $set_to = "true";
285		- break;
286		- case 0:
287		- $set_to = "false";
288		- break;
289		- case 2:
290		- $set_to = "not $field";
291		- break;
	283	+ case 1:
	284	+ $set_to = "true";
	285	+ break;
	286	+ case 0:
	287	+ $set_to = "false";
	288	+ break;
	289	+ case 2:
	290	+ $set_to = "not $field";
	291	+ break;
292	292	}
293	293
294	294	if ($field == "note") {

		@@ -201,13 +201,13 @@ discard block
		block discarded – undo
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
		block discarded – undo
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
		block discarded – undo
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
		block discarded – undo
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
		block discarded – undo
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);

		@@ -172,26 +172,26 @@
		block discarded – undo
172	172	$value = $_POST[$pref_name];
173	173
174	174	switch ($pref_name) {
175		- case 'DIGEST_PREFERRED_TIME':
176		- if (get_pref('DIGEST_PREFERRED_TIME') != $value) {
	175	+ case 'DIGEST_PREFERRED_TIME':
	176	+ if (get_pref('DIGEST_PREFERRED_TIME') != $value) {
177	177
178		- $sth = $this->pdo->prepare("UPDATE ttrss_users SET
	178	+ $sth = $this->pdo->prepare("UPDATE ttrss_users SET
179	179	last_digest_sent = NULL WHERE id = ?");
180		- $sth->execute([$_SESSION['uid']]);
	180	+ $sth->execute([$_SESSION['uid']]);
181	181
182		- }
183		- break;
184		- case 'USER_LANGUAGE':
185		- if (!$need_reload) {
186		- $need_reload = $_SESSION["language"] != $value;
187		- }
188		- break;
	182	+ }
	183	+ break;
	184	+ case 'USER_LANGUAGE':
	185	+ if (!$need_reload) {
	186	+ $need_reload = $_SESSION["language"] != $value;
	187	+ }
	188	+ break;
189	189
190		- case 'USER_CSS_THEME':
191		- if (!$need_reload) {
192		- $need_reload = get_pref($pref_name) != $value;
193		- }
194		- break;
	190	+ case 'USER_CSS_THEME':
	191	+ if (!$need_reload) {
	192	+ $need_reload = get_pref($pref_name) != $value;
	193	+ }
	194	+ break;
195	195	}
196	196
197	197	set_pref($pref_name, $value);

		@@ -24,14 +24,14 @@
		block discarded – undo
24	24	$er = error_reporting(E_ALL);
25	25
26	26	switch (DB_TYPE) {
27		- case "mysql":
28		- $this->adapter = new Db_Mysqli();
29		- break;
30		- case "pgsql":
31		- $this->adapter = new Db_Pgsql();
32		- break;
33		- default:
34		- die("Unknown DB_TYPE: ".DB_TYPE);
	27	+ case "mysql":
	28	+ $this->adapter = new Db_Mysqli();
	29	+ break;
	30	+ case "pgsql":
	31	+ $this->adapter = new Db_Pgsql();
	32	+ break;
	33	+ default:
	34	+ die("Unknown DB_TYPE: ".DB_TYPE);
35	35	}
36	36
37	37	if (!$this->adapter) {

		@@ -305,23 +305,23 @@ discard block
		block discarded – undo
305	305	if (!$this->parseWord($cmdL, $p, $cmd)) return true;
306	306	$parms = substr($cmdL, $p);
307	307	switch (strtoupper($cmd)) {
308		- case '$BEGINBLOCK':
309		- if (!$this->processBeginBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd))
310		- return false;
311		- break;
312		- case '$ENDBLOCK':
313		- if (!$this->processEndBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd))
314		- return false;
315		- break;
316		- case '$INCLUDE':
317		- if (!$this->processincludeCmd($parms, $cmdTPosBegin, $cmdTPosEnd))
318		- return false;
319		- $resumeFromStart = true;
320		- break;
321		- default:
322		- if ($cmd{0} == '$' && !(strlen($cmd) >= 2 && $cmd{1} == '{')) {
323		- $this->triggerError("Unknown command \"$cmd\" in template at offset $cmdTPosBegin.");
324		- return false; }}
	308	+ case '$BEGINBLOCK':
	309	+ if (!$this->processBeginBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd))
	310	+ return false;
	311	+ break;
	312	+ case '$ENDBLOCK':
	313	+ if (!$this->processEndBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd))
	314	+ return false;
	315	+ break;
	316	+ case '$INCLUDE':
	317	+ if (!$this->processincludeCmd($parms, $cmdTPosBegin, $cmdTPosEnd))
	318	+ return false;
	319	+ $resumeFromStart = true;
	320	+ break;
	321	+ default:
	322	+ if ($cmd{0} == '$' && !(strlen($cmd) >= 2 && $cmd{1} == '{')) {
	323	+ $this->triggerError("Unknown command \"$cmd\" in template at offset $cmdTPosBegin.");
	324	+ return false; }}
325	325	return true; }
326	326
327	327	/**
		@@ -781,25 +781,25 @@ discard block
		block discarded – undo
781	781	if ($tPos2 > $tPos)
782	782	$this->writeString(substr($this->template, $tPos, $tPos2 - $tPos));
783	783	switch ($kind) {
784		- case 0: // end of block
785		- return;
786		- case 1: // variable
787		- $vrtr = & $this->varRefTab[$varRefNo];
788		- if ($vrtr['blockNo'] != $blockNo)
789		- $this->programLogicError(4);
790		- $variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']];
791		- $this->writeString($variableValue);
792		- $tPos = $vrtr['tPosEnd'];
793		- $varRefNo += 1;
794		- break;
795		- case 2: // sub block
796		- $subBtr = & $this->blockTab[$subBlockNo];
797		- if ($subBtr['parentBlockNo'] != $blockNo)
798		- $this->programLogicError(3);
799		- $this->writeBlockInstances($subBlockNo, $bitr['instanceLevel']); // recursive call
800		- $tPos = $subBtr['tPosEnd'];
801		- $subBlockNo += 1;
802		- break; }}}
	784	+ case 0: // end of block
	785	+ return;
	786	+ case 1: // variable
	787	+ $vrtr = & $this->varRefTab[$varRefNo];
	788	+ if ($vrtr['blockNo'] != $blockNo)
	789	+ $this->programLogicError(4);
	790	+ $variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']];
	791	+ $this->writeString($variableValue);
	792	+ $tPos = $vrtr['tPosEnd'];
	793	+ $varRefNo += 1;
	794	+ break;
	795	+ case 2: // sub block
	796	+ $subBtr = & $this->blockTab[$subBlockNo];
	797	+ if ($subBtr['parentBlockNo'] != $blockNo)
	798	+ $this->programLogicError(3);
	799	+ $this->writeBlockInstances($subBlockNo, $bitr['instanceLevel']); // recursive call
	800	+ $tPos = $subBtr['tPosEnd'];
	801	+ $subBlockNo += 1;
	802	+ break; }}}
803	803
804	804	/**
805	805	* @access private
		@@ -807,17 +807,17 @@ discard block
		block discarded – undo
807	807	function writeString($s) {
808	808	if ($this->outputError) return;
809	809	switch ($this->outputMode) {
810		- case 0: // output to PHP output stream
811		- if (!print($s))
812		- $this->outputError = true;
813		- break;
814		- case 1: // output to file
815		- $rc = fwrite($this->outputFileHandle, $s);
816		- if ($rc === false) $this->outputError = true;
817		- break;
818		- case 2: // output to string
819		- $this->outputString .= $s;
820		- break; }}
	810	+ case 0: // output to PHP output stream
	811	+ if (!print($s))
	812	+ $this->outputError = true;
	813	+ break;
	814	+ case 1: // output to file
	815	+ $rc = fwrite($this->outputFileHandle, $s);
	816	+ if ($rc === false) $this->outputError = true;
	817	+ break;
	818	+ case 2: // output to string
	819	+ $this->outputString .= $s;
	820	+ break; }}
821	821
822	822	//--- name lookup routines ------------------------------------------------------------------------------------------
823	823

		@@ -1217,13 +1217,13 @@ discard block
		block discarded – undo
1217	1217	$version = 1;
1218	1218
1219	1219	switch ($this->mode) {
1220		- case QR_MODE_NUM: $bits = QRinput::estimateBitsModeNum($this->size); break;
1221		- case QR_MODE_AN: $bits = QRinput::estimateBitsModeAn($this->size); break;
1222		- case QR_MODE_8: $bits = QRinput::estimateBitsMode8($this->size); break;
1223		- case QR_MODE_KANJI: $bits = QRinput::estimateBitsModeKanji($this->size); break;
1224		- case QR_MODE_STRUCTURE: return STRUCTURE_HEADER_BITS;
1225		- default:
1226		- return 0;
	1220	+ case QR_MODE_NUM: $bits = QRinput::estimateBitsModeNum($this->size); break;
	1221	+ case QR_MODE_AN: $bits = QRinput::estimateBitsModeAn($this->size); break;
	1222	+ case QR_MODE_8: $bits = QRinput::estimateBitsMode8($this->size); break;
	1223	+ case QR_MODE_KANJI: $bits = QRinput::estimateBitsModeKanji($this->size); break;
	1224	+ case QR_MODE_STRUCTURE: return STRUCTURE_HEADER_BITS;
	1225	+ default:
	1226	+ return 0;
1227	1227	}
1228	1228
1229	1229	$l = QRspec::lengthIndicator($this->mode, $version);
		@@ -1263,14 +1263,14 @@ discard block
		block discarded – undo
1263	1263	$ret = 0;
1264	1264
1265	1265	switch ($this->mode) {
1266		- case QR_MODE_NUM: $ret = $this->encodeModeNum($version); break;
1267		- case QR_MODE_AN: $ret = $this->encodeModeAn($version); break;
1268		- case QR_MODE_8: $ret = $this->encodeMode8($version); break;
1269		- case QR_MODE_KANJI: $ret = $this->encodeModeKanji($version); break;
1270		- case QR_MODE_STRUCTURE: $ret = $this->encodeModeStructure(); break;
	1266	+ case QR_MODE_NUM: $ret = $this->encodeModeNum($version); break;
	1267	+ case QR_MODE_AN: $ret = $this->encodeModeAn($version); break;
	1268	+ case QR_MODE_8: $ret = $this->encodeMode8($version); break;
	1269	+ case QR_MODE_KANJI: $ret = $this->encodeModeKanji($version); break;
	1270	+ case QR_MODE_STRUCTURE: $ret = $this->encodeModeStructure(); break;
1271	1271
1272		- default:
1273		- break;
	1272	+ default:
	1273	+ break;
1274	1274	}
1275	1275
1276	1276	if ($ret < 0)
		@@ -1420,14 +1420,14 @@ discard block
		block discarded – undo
1420	1420	$bits = $w * 10;
1421	1421
1422	1422	switch ($size - $w * 3) {
1423		- case 1:
1424		- $bits += 4;
1425		- break;
1426		- case 2:
1427		- $bits += 7;
1428		- break;
1429		- default:
1430		- break;
	1423	+ case 1:
	1424	+ $bits += 4;
	1425	+ break;
	1426	+ case 2:
	1427	+ $bits += 7;
	1428	+ break;
	1429	+ default:
	1430	+ break;
1431	1431	}
1432	1432
1433	1433	return $bits;
		@@ -1516,14 +1516,14 @@ discard block
		block discarded – undo
1516	1516	return false;
1517	1517
1518	1518	switch ($mode) {
1519		- case QR_MODE_NUM: return self::checkModeNum($size, $data); break;
1520		- case QR_MODE_AN: return self::checkModeAn($size, $data); break;
1521		- case QR_MODE_KANJI: return self::checkModeKanji($size, $data); break;
1522		- case QR_MODE_8: return true; break;
1523		- case QR_MODE_STRUCTURE: return true; break;
	1519	+ case QR_MODE_NUM: return self::checkModeNum($size, $data); break;
	1520	+ case QR_MODE_AN: return self::checkModeAn($size, $data); break;
	1521	+ case QR_MODE_KANJI: return self::checkModeKanji($size, $data); break;
	1522	+ case QR_MODE_8: return true; break;
	1523	+ case QR_MODE_STRUCTURE: return true; break;
1524	1524
1525		- default:
1526		- break;
	1525	+ default:
	1526	+ break;
1527	1527	}
1528	1528
1529	1529	return false;
		@@ -1564,35 +1564,35 @@ discard block
		block discarded – undo
1564	1564	{
1565	1565	$payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);
1566	1566	switch ($mode) {
1567		- case QR_MODE_NUM:
1568		- $chunks = (int) ($payload / 10);
1569		- $remain = $payload - $chunks * 10;
1570		- $size = $chunks * 3;
1571		- if ($remain >= 7) {
1572		- $size += 2;
1573		- } else if ($remain >= 4) {
1574		- $size += 1;
1575		- }
1576		- break;
1577		- case QR_MODE_AN:
1578		- $chunks = (int) ($payload / 11);
1579		- $remain = $payload - $chunks * 11;
1580		- $size = $chunks * 2;
1581		- if ($remain >= 6)
1582		- $size++;
1583		- break;
1584		- case QR_MODE_8:
1585		- $size = (int) ($payload / 8);
1586		- break;
1587		- case QR_MODE_KANJI:
1588		- $size = (int) (($payload / 13) * 2);
1589		- break;
1590		- case QR_MODE_STRUCTURE:
1591		- $size = (int) ($payload / 8);
1592		- break;
1593		- default:
1594		- $size = 0;
1595		- break;
	1567	+ case QR_MODE_NUM:
	1568	+ $chunks = (int) ($payload / 10);
	1569	+ $remain = $payload - $chunks * 10;
	1570	+ $size = $chunks * 3;
	1571	+ if ($remain >= 7) {
	1572	+ $size += 2;
	1573	+ } else if ($remain >= 4) {
	1574	+ $size += 1;
	1575	+ }
	1576	+ break;
	1577	+ case QR_MODE_AN:
	1578	+ $chunks = (int) ($payload / 11);
	1579	+ $remain = $payload - $chunks * 11;
	1580	+ $size = $chunks * 2;
	1581	+ if ($remain >= 6)
	1582	+ $size++;
	1583	+ break;
	1584	+ case QR_MODE_8:
	1585	+ $size = (int) ($payload / 8);
	1586	+ break;
	1587	+ case QR_MODE_KANJI:
	1588	+ $size = (int) (($payload / 13) * 2);
	1589	+ break;
	1590	+ case QR_MODE_STRUCTURE:
	1591	+ $size = (int) ($payload / 8);
	1592	+ break;
	1593	+ default:
	1594	+ $size = 0;
	1595	+ break;
1596	1596	}
1597	1597
1598	1598	$maxsize = QRspec::maximumWords($mode, $version);
		@@ -2198,14 +2198,14 @@ discard block
		block discarded – undo
2198	2198	$mode = $this->identifyMode(0);
2199	2199
2200	2200	switch ($mode) {
2201		- case QR_MODE_NUM: $length = $this->eatNum(); break;
2202		- case QR_MODE_AN: $length = $this->eatAn(); break;
2203		- case QR_MODE_KANJI:
2204		- if ($this->modeHint == QR_MODE_KANJI)
2205		- $length = $this->eatKanji();
2206		- else $length = $this->eat8();
2207		- break;
2208		- default: $length = $this->eat8(); break;
	2201	+ case QR_MODE_NUM: $length = $this->eatNum(); break;
	2202	+ case QR_MODE_AN: $length = $this->eatAn(); break;
	2203	+ case QR_MODE_KANJI:
	2204	+ if ($this->modeHint == QR_MODE_KANJI)
	2205	+ $length = $this->eatKanji();
	2206	+ else $length = $this->eat8();
	2207	+ break;
	2208	+ default: $length = $this->eat8(); break;
2209	2209
2210	2210	}
2211	2211
		@@ -3234,28 +3234,28 @@ discard block
		block discarded – undo
3234	3234	$enc->margin = $margin;
3235	3235
3236	3236	switch ($level.'') {
3237		- case '0':
3238		- case '1':
3239		- case '2':
3240		- case '3':
3241		- $enc->level = $level;
3242		- break;
3243		- case 'l':
3244		- case 'L':
3245		- $enc->level = QR_ECLEVEL_L;
3246		- break;
3247		- case 'm':
3248		- case 'M':
3249		- $enc->level = QR_ECLEVEL_M;
3250		- break;
3251		- case 'q':
3252		- case 'Q':
3253		- $enc->level = QR_ECLEVEL_Q;
3254		- break;
3255		- case 'h':
3256		- case 'H':
3257		- $enc->level = QR_ECLEVEL_H;
3258		- break;
	3237	+ case '0':
	3238	+ case '1':
	3239	+ case '2':
	3240	+ case '3':
	3241	+ $enc->level = $level;
	3242	+ break;
	3243	+ case 'l':
	3244	+ case 'L':
	3245	+ $enc->level = QR_ECLEVEL_L;
	3246	+ break;
	3247	+ case 'm':
	3248	+ case 'M':
	3249	+ $enc->level = QR_ECLEVEL_M;
	3250	+ break;
	3251	+ case 'q':
	3252	+ case 'Q':
	3253	+ $enc->level = QR_ECLEVEL_Q;
	3254	+ break;
	3255	+ case 'h':
	3256	+ case 'H':
	3257	+ $enc->level = QR_ECLEVEL_H;
	3258	+ break;
3259	3259	}
3260	3260
3261	3261	return $enc;

		@@ -1461,26 +1461,26 @@ discard block
		block discarded – undo
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
		block discarded – undo
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
		block discarded – undo
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
		block discarded – undo
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
		block discarded – undo
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
		block discarded – undo
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) {

codysnider / tt-rss

Pull Request — master (#7)

Status

Category

Switch Indentation +60 added lines, -60 removed lines patch added patch discarded remove patch

Switch Indentation +16 added lines, -16 removed lines patch added patch discarded remove patch

Switch Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

Switch Indentation +33 added lines, -33 removed lines patch added patch discarded remove patch

Switch Indentation +47 added lines, -47 removed lines patch added patch discarded remove patch

Switch Indentation +58 added lines, -58 removed lines patch added patch discarded remove patch

Switch Indentation +88 added lines, -88 removed lines patch added patch discarded remove patch

Switch Indentation +128 added lines, -128 removed lines patch added patch discarded remove patch