codysnider / tt-rss

plugins/search_sphinx/sphinxapi.php

Switch Indentation +19 added lines, -19 removed lines

@@ -1003,22 +1003,22 @@ 
             $req .= pack("N", $filter["type"]);
             switch ($filter["type"])
             {
-                case SPH_FILTER_VALUES:
-                    $req .= pack("N", count($filter["values"]));
-                    foreach ($filter["values"] as $value)
-                        $req .= sphPackI64($value);
-                    break;
-
-                case SPH_FILTER_RANGE:
-                    $req .= sphPackI64($filter["min"]).sphPackI64($filter["max"]);
-                    break;
-
-                case SPH_FILTER_FLOATRANGE:
-                    $req .= $this->_PackFloat($filter["min"]).$this->_PackFloat($filter["max"]);
-                    break;
-
-                default:
-                    assert(0 && "internal error: unhandled filter type");
+            case SPH_FILTER_VALUES:
+                $req .= pack("N", count($filter["values"]));
+                foreach ($filter["values"] as $value)
+                    $req .= sphPackI64($value);
+                break;
+
+            case SPH_FILTER_RANGE:
+                $req .= sphPackI64($filter["min"]).sphPackI64($filter["max"]);
+                break;
+
+            case SPH_FILTER_FLOATRANGE:
+                $req .= $this->_PackFloat($filter["min"]).$this->_PackFloat($filter["max"]);
+                break;
+
+            default:
+                assert(0 && "internal error: unhandled filter type");
             }
             $req .= pack("N", $filter["exclude"]);
         }
@@ -1073,9 +1073,9 @@ 
                 $req .= sphPackU64($id);
                 switch ($entry["type"])
                 {
-                    case SPH_ATTR_FLOAT:	$req .= $this->_PackFloat($val); break;
-                    case SPH_ATTR_BIGINT:	$req .= sphPackI64($val); break;
-                    default:				$req .= pack("N", $val); break;
+                case SPH_ATTR_FLOAT:	$req .= $this->_PackFloat($val); break;
+                case SPH_ATTR_BIGINT:	$req .= sphPackI64($val); break;
+                default:				$req .= pack("N", $val); break;
                 }
             }
         }

classes/pref/feeds.php

Switch Indentation +60 added lines, -60 removed lines

@@ -1071,70 +1071,70 @@
                 $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;
 
                 }
 

classes/pref/prefs.php

Switch Indentation +16 added lines, -16 removed lines

@@ -172,26 +172,26 @@
             $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);

classes/feeds.php

Switch Indentation +141 added lines, -141 removed lines

@@ -412,21 +412,21 @@ 
                     $message = $query_error_override;
                 } else {
                     switch ($view_mode) {
-                        case "unread":
-                            $message = __("No unread articles found to display.");
-                            break;
-                        case "updated":
-                            $message = __("No updated articles found to display.");
-                            break;
-                        case "marked":
-                            $message = __("No starred articles found to display.");
-                            break;
-                        default:
-                            if ($feed < LABEL_BASE_INDEX) {
-                                $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.");
-                            } else {
-                                $message = __("No articles found to display.");
-                            }
+                    case "unread":
+                        $message = __("No unread articles found to display.");
+                        break;
+                    case "updated":
+                        $message = __("No updated articles found to display.");
+                        break;
+                    case "marked":
+                        $message = __("No starred articles found to display.");
+                        break;
+                    default:
+                        if ($feed < LABEL_BASE_INDEX) {
+                            $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.");
+                        } else {
+                            $message = __("No articles found to display.");
+                        }
                     }
                 }
 
@@ -893,29 +893,29 @@ 
         // TODO: all this interval stuff needs some generic generator function
 
         switch ($mode) {
-            case "1day":
-                if (DB_TYPE == "pgsql") {
-                    $date_qpart = "date_entered < NOW() - INTERVAL '1 day' ";
-                } else {
-                    $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 DAY) ";
-                }
-                break;
-            case "1week":
-                if (DB_TYPE == "pgsql") {
-                    $date_qpart = "date_entered < NOW() - INTERVAL '1 week' ";
-                } else {
-                    $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 WEEK) ";
-                }
-                break;
-            case "2week":
-                if (DB_TYPE == "pgsql") {
-                    $date_qpart = "date_entered < NOW() - INTERVAL '2 week' ";
-                } else {
-                    $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 2 WEEK) ";
-                }
-                break;
-            default:
-                $date_qpart = "true";
+        case "1day":
+            if (DB_TYPE == "pgsql") {
+                $date_qpart = "date_entered < NOW() - INTERVAL '1 day' ";
+            } else {
+                $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 DAY) ";
+            }
+            break;
+        case "1week":
+            if (DB_TYPE == "pgsql") {
+                $date_qpart = "date_entered < NOW() - INTERVAL '1 week' ";
+            } else {
+                $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 WEEK) ";
+            }
+            break;
+        case "2week":
+            if (DB_TYPE == "pgsql") {
+                $date_qpart = "date_entered < NOW() - INTERVAL '2 week' ";
+            } else {
+                $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 2 WEEK) ";
+            }
+            break;
+        default:
+            $date_qpart = "true";
         }
 
         if (is_numeric($feed)) {
@@ -1237,28 +1237,28 @@ 
 
     public static function getFeedIcon($id) {
         switch ($id) {
-            case 0:
-                return "archive";
-            case -1:
-                return "star";
-            case -2:
-                return "rss_feed";
-            case -3:
-                return "whatshot";
-            case -4:
-                return "inbox";
-            case -6:
-                return "restore";
-            default:
-                if ($id < LABEL_BASE_INDEX) {
-                    return "label";
-                } else {
-                    $icon = self::getIconFile($id);
+        case 0:
+            return "archive";
+        case -1:
+            return "star";
+        case -2:
+            return "rss_feed";
+        case -3:
+            return "whatshot";
+        case -4:
+            return "inbox";
+        case -6:
+            return "restore";
+        default:
+            if ($id < LABEL_BASE_INDEX) {
+                return "label";
+            } else {
+                $icon = self::getIconFile($id);
 
-                    if ($icon && file_exists($icon)) {
-                        return ICONS_URL."/".basename($icon)."?".filemtime($icon);
-                    }
+                if ($icon && file_exists($icon)) {
+                    return ICONS_URL."/".basename($icon)."?".filemtime($icon);
                 }
+            }
         }
 
         return false;
@@ -2263,104 +2263,104 @@ 
             $commandpair = explode(":", mb_strtolower($k), 2);
 
             switch ($commandpair[0]) {
-                case "title":
-                    if ($commandpair[1]) {
-                        array_push($query_keywords, "($not (LOWER(ttrss_entries.title) LIKE ".
-                            $pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
-                    } else {
-                        array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
+            case "title":
+                if ($commandpair[1]) {
+                    array_push($query_keywords, "($not (LOWER(ttrss_entries.title) LIKE ".
+                        $pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
+                } else {
+                    array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-                        array_push($search_words, $k);
-                    }
-                    break;
-                case "author":
-                    if ($commandpair[1]) {
-                        array_push($query_keywords, "($not (LOWER(author) LIKE ".
-                            $pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
-                    } else {
-                        array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
+                    array_push($search_words, $k);
+                }
+                break;
+            case "author":
+                if ($commandpair[1]) {
+                    array_push($query_keywords, "($not (LOWER(author) LIKE ".
+                        $pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
+                } else {
+                    array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-                        array_push($search_words, $k);
-                    }
-                    break;
-                case "note":
-                    if ($commandpair[1]) {
-                        if ($commandpair[1] == "true")
-                            array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))");
-                        else if ($commandpair[1] == "false")
-                            array_push($query_keywords, "($not (note IS NULL OR note = ''))");
-                        else
-                            array_push($query_keywords, "($not (LOWER(note) LIKE ".
-                                $pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
-                    } else {
-                        array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
+                    array_push($search_words, $k);
+                }
+                break;
+            case "note":
+                if ($commandpair[1]) {
+                    if ($commandpair[1] == "true")
+                        array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))");
+                    else if ($commandpair[1] == "false")
+                        array_push($query_keywords, "($not (note IS NULL OR note = ''))");
+                    else
+                        array_push($query_keywords, "($not (LOWER(note) LIKE ".
+                            $pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
+                } else {
+                    array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-                        if (!$not) array_push($search_words, $k);
-                    }
-                    break;
-                case "star":
-
-                    if ($commandpair[1]) {
-                        if ($commandpair[1] == "true")
-                            array_push($query_keywords, "($not (marked = true))");
-                        else
-                            array_push($query_keywords, "($not (marked = false))");
-                    } else {
-                        array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
+                    if (!$not) array_push($search_words, $k);
+                }
+                break;
+            case "star":
+
+                if ($commandpair[1]) {
+                    if ($commandpair[1] == "true")
+                        array_push($query_keywords, "($not (marked = true))");
+                    else
+                        array_push($query_keywords, "($not (marked = false))");
+                } else {
+                    array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-                        if (!$not) array_push($search_words, $k);
-                    }
-                    break;
-                case "pub":
-                    if ($commandpair[1]) {
-                        if ($commandpair[1] == "true")
-                            array_push($query_keywords, "($not (published = true))");
-                        else
-                            array_push($query_keywords, "($not (published = false))");
+                    if (!$not) array_push($search_words, $k);
+                }
+                break;
+            case "pub":
+                if ($commandpair[1]) {
+                    if ($commandpair[1] == "true")
+                        array_push($query_keywords, "($not (published = true))");
+                    else
+                        array_push($query_keywords, "($not (published = false))");
 
-                    } else {
-                        array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
+                } else {
+                    array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-                        if (!$not) array_push($search_words, $k);
-                    }
-                    break;
-                case "unread":
-                    if ($commandpair[1]) {
-                        if ($commandpair[1] == "true")
-                            array_push($query_keywords, "($not (unread = true))");
-                        else
-                            array_push($query_keywords, "($not (unread = false))");
+                    if (!$not) array_push($search_words, $k);
+                }
+                break;
+            case "unread":
+                if ($commandpair[1]) {
+                    if ($commandpair[1] == "true")
+                        array_push($query_keywords, "($not (unread = true))");
+                    else
+                        array_push($query_keywords, "($not (unread = false))");
 
-                    } else {
-                        array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
+                } else {
+                    array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-                        if (!$not) array_push($search_words, $k);
-                    }
-                    break;
-                default:
-                    if (strpos($k, "@") === 0) {
+                    if (!$not) array_push($search_words, $k);
+                }
+                break;
+            default:
+                if (strpos($k, "@") === 0) {
 
-                        $user_tz_string = get_pref('USER_TIMEZONE', $_SESSION['uid']);
-                        $orig_ts = strtotime(substr($k, 1));
-                        $k = date("Y-m-d", convert_timestamp($orig_ts, $user_tz_string, 'UTC'));
+                    $user_tz_string = get_pref('USER_TIMEZONE', $_SESSION['uid']);
+                    $orig_ts = strtotime(substr($k, 1));
+                    $k = date("Y-m-d", convert_timestamp($orig_ts, $user_tz_string, 'UTC'));
 
-                        //$k = date("Y-m-d", strtotime(substr($k, 1)));
+                    //$k = date("Y-m-d", strtotime(substr($k, 1)));
 
-                        array_push($query_keywords, "(".SUBSTRING_FOR_DATE."(updated,1,LENGTH('$k')) $not = '$k')");
-                    } else {
+                    array_push($query_keywords, "(".SUBSTRING_FOR_DATE."(updated,1,LENGTH('$k')) $not = '$k')");
+                } else {
 
-                        if (DB_TYPE == "pgsql") {
-                            $k = mb_strtolower($k);
-                            array_push($search_query_leftover, $not ? "!$k" : $k);
-                        } else {
-                            array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
+                    if (DB_TYPE == "pgsql") {
+                        $k = mb_strtolower($k);
+                        array_push($search_query_leftover, $not ? "!$k" : $k);
+                    } else {
+                        array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-                        }
+                    }
 
-                        if (!$not) {
-                            array_push($search_words, $k);
-                        }
+                    if (!$not) {
+                        array_push($search_words, $k);
                     }
+                }
             }
         }
 

classes/db.php

Switch Indentation +8 added lines, -8 removed lines

@@ -24,14 +24,14 @@
         $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) {

classes/rssutils.php

Switch Indentation +26 added lines, -26 removed lines

@@ -1364,35 +1364,35 @@
                 }
 
                 switch ($rule["type"]) {
-                    case "title":
-                        $match = @preg_match("/$reg_exp/iu", $title);
-                        break;
-                    case "content":
-                        // we don't need to deal with multiline regexps
-                        $content = preg_replace("/[\r\n\t]/", "", $content);
+                case "title":
+                    $match = @preg_match("/$reg_exp/iu", $title);
+                    break;
+                case "content":
+                    // we don't need to deal with multiline regexps
+                    $content = preg_replace("/[\r\n\t]/", "", $content);
 
-                        $match = @preg_match("/$reg_exp/iu", $content);
-                        break;
-                    case "both":
-                        // we don't need to deal with multiline regexps
-                        $content = preg_replace("/[\r\n\t]/", "", $content);
+                    $match = @preg_match("/$reg_exp/iu", $content);
+                    break;
+                case "both":
+                    // we don't need to deal with multiline regexps
+                    $content = preg_replace("/[\r\n\t]/", "", $content);
 
-                        $match = (@preg_match("/$reg_exp/iu", $title) || @preg_match("/$reg_exp/iu", $content));
-                        break;
-                    case "link":
-                        $match = @preg_match("/$reg_exp/iu", $link);
-                        break;
-                    case "author":
-                        $match = @preg_match("/$reg_exp/iu", $author);
-                        break;
-                    case "tag":
-                        foreach ($tags as $tag) {
-                            if (@preg_match("/$reg_exp/iu", $tag)) {
-                                $match = true;
-                                break;
-                            }
+                    $match = (@preg_match("/$reg_exp/iu", $title) || @preg_match("/$reg_exp/iu", $content));
+                    break;
+                case "link":
+                    $match = @preg_match("/$reg_exp/iu", $link);
+                    break;
+                case "author":
+                    $match = @preg_match("/$reg_exp/iu", $author);
+                    break;
+                case "tag":
+                    foreach ($tags as $tag) {
+                        if (@preg_match("/$reg_exp/iu", $tag)) {
+                            $match = true;
+                            break;
                         }
-                        break;
+                    }
+                    break;
                 }
 
                 if ($rule_inverse) {

classes/api.php

Switch Indentation +33 added lines, -33 removed lines

@@ -222,16 +222,16 @@ 
 
             $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 @@ 
         $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") {

classes/backend.php

Switch Indentation +8 added lines, -8 removed lines

@@ -64,14 +64,14 @@
                                         $tmp = '';
                                         foreach (str_split($keys[$i]) as $c) {
                                             switch ($c) {
-                                                case '*':
-                                                    $tmp .= __('Shift').'+';
-                                                    break;
-                                                case '^':
-                                                    $tmp .= __('Ctrl').'+';
-                                                    break;
-                                                default:
-                                                    $tmp .= $c;
+                                            case '*':
+                                                $tmp .= __('Shift').'+';
+                                                break;
+                                            case '^':
+                                                $tmp .= __('Ctrl').'+';
+                                                break;
+                                            default:
+                                                $tmp .= $c;
                                             }
                                         }
                                         $keys[$i] = $tmp;

lib/MiniTemplator.class.php

Switch Indentation +47 added lines, -47 removed lines

@@ -305,23 +305,23 @@ 
     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 @@ 
         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 @@ 
 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 ------------------------------------------------------------------------------------------