@@ -165,18 +165,18 @@ discard block |
||
| 165 | 165 | Debug::set_enabled(true); |
| 166 | 166 | |
| 167 | 167 | if (isset($options["log-level"])) { |
| 168 | - Debug::set_loglevel((int)$options["log-level"]); |
|
| 169 | - } |
|
| 168 | + Debug::set_loglevel((int)$options["log-level"]); |
|
| 169 | + } |
|
| 170 | 170 | |
| 171 | 171 | if (isset($options["log"])) { |
| 172 | 172 | Debug::set_quiet(isset($options['quiet'])); |
| 173 | 173 | Debug::set_logfile($options["log"]); |
| 174 | - Debug::log("Logging to " . $options["log"]); |
|
| 175 | - } else { |
|
| 176 | - if (isset($options['quiet'])) { |
|
| 174 | + Debug::log("Logging to " . $options["log"]); |
|
| 175 | + } else { |
|
| 176 | + if (isset($options['quiet'])) { |
|
| 177 | 177 | Debug::set_loglevel(Debug::$LOG_DISABLED); |
| 178 | - } |
|
| 179 | - } |
|
| 178 | + } |
|
| 179 | + } |
|
| 180 | 180 | |
| 181 | 181 | if (!isset($options["daemon"])) { |
| 182 | 182 | $lock_filename = "update.lock"; |
@@ -229,8 +229,8 @@ discard block |
||
| 229 | 229 | if (isset($options["daemon"])) { |
| 230 | 230 | while (true) { |
| 231 | 231 | $quiet = (isset($options["quiet"])) ? "--quiet" : ""; |
| 232 | - $log = isset($options['log']) ? '--log '.$options['log'] : ''; |
|
| 233 | - $log_level = isset($options['log-level']) ? '--log-level '.$options['log-level'] : ''; |
|
| 232 | + $log = isset($options['log']) ? '--log '.$options['log'] : ''; |
|
| 233 | + $log_level = isset($options['log-level']) ? '--log-level '.$options['log-level'] : ''; |
|
| 234 | 234 | |
| 235 | 235 | passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet $log $log_level"); |
| 236 | 236 | |
@@ -153,9 +153,9 @@ |
||
| 153 | 153 | title="<i class='material-icons'>info_outline</i> <?php echo __('System') ?>"></div> |
| 154 | 154 | <?php } ?> |
| 155 | 155 | <?php |
| 156 | - PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TABS, |
|
| 157 | - "hook_prefs_tabs", false); |
|
| 158 | - ?> |
|
| 156 | + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TABS, |
|
| 157 | + "hook_prefs_tabs", false); |
|
| 158 | + ?> |
|
| 159 | 159 | </div> |
| 160 | 160 | <div id="footer" dojoType="dijit.layout.ContentPane" region="bottom"> |
| 161 | 161 | <a class="text-muted" target="_blank" href="http://tt-rss.org/"> |
@@ -1003,22 +1003,22 @@ discard block |
||
| 1003 | 1003 | $req .= pack ( "N", $filter["type"] ); |
| 1004 | 1004 | switch ( $filter["type"] ) |
| 1005 | 1005 | { |
| 1006 | - case SPH_FILTER_VALUES: |
|
| 1007 | - $req .= pack ( "N", count($filter["values"]) ); |
|
| 1008 | - foreach ( $filter["values"] as $value ) |
|
| 1009 | - $req .= sphPackI64 ( $value ); |
|
| 1010 | - break; |
|
| 1011 | - |
|
| 1012 | - case SPH_FILTER_RANGE: |
|
| 1013 | - $req .= sphPackI64 ( $filter["min"] ) . sphPackI64 ( $filter["max"] ); |
|
| 1014 | - break; |
|
| 1015 | - |
|
| 1016 | - case SPH_FILTER_FLOATRANGE: |
|
| 1017 | - $req .= $this->_PackFloat ( $filter["min"] ) . $this->_PackFloat ( $filter["max"] ); |
|
| 1018 | - break; |
|
| 1019 | - |
|
| 1020 | - default: |
|
| 1021 | - assert ( 0 && "internal error: unhandled filter type" ); |
|
| 1006 | + case SPH_FILTER_VALUES: |
|
| 1007 | + $req .= pack ( "N", count($filter["values"]) ); |
|
| 1008 | + foreach ( $filter["values"] as $value ) |
|
| 1009 | + $req .= sphPackI64 ( $value ); |
|
| 1010 | + break; |
|
| 1011 | + |
|
| 1012 | + case SPH_FILTER_RANGE: |
|
| 1013 | + $req .= sphPackI64 ( $filter["min"] ) . sphPackI64 ( $filter["max"] ); |
|
| 1014 | + break; |
|
| 1015 | + |
|
| 1016 | + case SPH_FILTER_FLOATRANGE: |
|
| 1017 | + $req .= $this->_PackFloat ( $filter["min"] ) . $this->_PackFloat ( $filter["max"] ); |
|
| 1018 | + break; |
|
| 1019 | + |
|
| 1020 | + default: |
|
| 1021 | + assert ( 0 && "internal error: unhandled filter type" ); |
|
| 1022 | 1022 | } |
| 1023 | 1023 | $req .= pack ( "N", $filter["exclude"] ); |
| 1024 | 1024 | } |
@@ -1073,9 +1073,9 @@ discard block |
||
| 1073 | 1073 | $req .= sphPackU64 ( $id ); |
| 1074 | 1074 | switch ( $entry["type"] ) |
| 1075 | 1075 | { |
| 1076 | - case SPH_ATTR_FLOAT: $req .= $this->_PackFloat ( $val ); break; |
|
| 1077 | - case SPH_ATTR_BIGINT: $req .= sphPackI64 ( $val ); break; |
|
| 1078 | - default: $req .= pack ( "N", $val ); break; |
|
| 1076 | + case SPH_ATTR_FLOAT: $req .= $this->_PackFloat ( $val ); break; |
|
| 1077 | + case SPH_ATTR_BIGINT: $req .= sphPackI64 ( $val ); break; |
|
| 1078 | + default: $req .= pack ( "N", $val ); break; |
|
| 1079 | 1079 | } |
| 1080 | 1080 | } |
| 1081 | 1081 | } |
@@ -544,7 +544,7 @@ discard block |
||
| 544 | 544 | $this->_mbenc = mb_internal_encoding(); |
| 545 | 545 | mb_internal_encoding ( "latin1" ); |
| 546 | 546 | } |
| 547 | - } |
|
| 547 | + } |
|
| 548 | 548 | |
| 549 | 549 | /// leave mbstring workaround mode |
| 550 | 550 | public function _MBPop () |
@@ -938,9 +938,9 @@ discard block |
||
| 938 | 938 | |
| 939 | 939 | /// clear all attribute value overrides (for multi-queries) |
| 940 | 940 | public function ResetOverrides () |
| 941 | - { |
|
| 942 | - $this->_overrides = array (); |
|
| 943 | - } |
|
| 941 | + { |
|
| 942 | + $this->_overrides = array (); |
|
| 943 | + } |
|
| 944 | 944 | |
| 945 | 945 | ////////////////////////////////////////////////////////////////////////////// |
| 946 | 946 | |
@@ -6,5 +6,5 @@ |
||
| 6 | 6 | |
| 7 | 7 | class DOMElement extends \DOMElement |
| 8 | 8 | { |
| 9 | - use NodeTrait; |
|
| 9 | + use NodeTrait; |
|
| 10 | 10 | } |
@@ -6,5 +6,5 @@ |
||
| 6 | 6 | |
| 7 | 7 | class DOMCdataSection extends \DOMCdataSection |
| 8 | 8 | { |
| 9 | - use NodeTrait; |
|
| 9 | + use NodeTrait; |
|
| 10 | 10 | } |
@@ -6,5 +6,5 @@ |
||
| 6 | 6 | |
| 7 | 7 | class DOMDocumentType extends \DOMDocumentType |
| 8 | 8 | { |
| 9 | - use NodeTrait; |
|
| 9 | + use NodeTrait; |
|
| 10 | 10 | } |
@@ -6,5 +6,5 @@ |
||
| 6 | 6 | |
| 7 | 7 | class DOMProcessingInstruction extends \DOMProcessingInstruction |
| 8 | 8 | { |
| 9 | - use NodeTrait; |
|
| 9 | + use NodeTrait; |
|
| 10 | 10 | } |
@@ -6,5 +6,5 @@ |
||
| 6 | 6 | |
| 7 | 7 | class DOMCharacterData extends \DOMCharacterData |
| 8 | 8 | { |
| 9 | - use NodeTrait; |
|
| 9 | + use NodeTrait; |
|
| 10 | 10 | } |
@@ -10,5 +10,5 @@ |
||
| 10 | 10 | */ |
| 11 | 11 | class DOMNode extends \DOMNode |
| 12 | 12 | { |
| 13 | - use NodeTrait; |
|
| 13 | + use NodeTrait; |
|
| 14 | 14 | } |