added spaces + some curly braces + some usage of dbm::is_result()

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --git a/include/pgettext.php b/include/pgettext.php
index 9b541e8e3c77f6fe1cc3bd776a0490145af3ffe7..756905a43a1bfb760e4f7d5e29aaab3bbafcb701 100644 (file)
--- a/include/pgettext.php
+++ b/include/pgettext.php
@@ -12,15 +12,15 @@
 
 use Friendica\Core\Config;
 
-require_once("include/dba.php");
+require_once "include/dba.php";
 
-if(! function_exists('get_browser_language')) {
+if (! function_exists('get_browser_language')) {
 /**
  * @brief get the prefered language from the HTTP_ACCEPT_LANGUAGE header
  */
 function get_browser_language() {
 
-       if (x($_SERVER,'HTTP_ACCEPT_LANGUAGE')) {
+       if (x($_SERVER, 'HTTP_ACCEPT_LANGUAGE')) {
                // break up string into pieces (languages and q factors)
                preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i',
                        $_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse);
@@ -29,11 +29,11 @@ function get_browser_language() {
                if (count($lang_parse[1])) {
                        // go through the list of prefered languages and add a generic language
                        // for sub-linguas (e.g. de-ch will add de) if not already in array
-                       for ($i=0; $i<count($lang_parse[1]); $i++) {
+                       for ($i = 0; $i < count($lang_parse[1]); $i++) {
                                $lang_list[] = strtolower($lang_parse[1][$i]);
-                               if ( strlen($lang_parse[1][$i])>3 ) {
+                               if (strlen($lang_parse[1][$i])>3 ) {
                                        $dashpos = strpos($lang_parse[1][$i], '-');
-                                       if (! in_array(substr($lang_parse[1][$i], 0, $dashpos), $lang_list ) ) {
+                                       if (!in_array(substr($lang_parse[1][$i], 0, $dashpos), $lang_list ) ) {
                                                $lang_list[] = strtolower(substr($lang_parse[1][$i], 0, $dashpos));
                                        }
                                }
@@ -42,7 +42,7 @@ function get_browser_language() {
        }
 
        // check if we have translations for the preferred languages and pick the 1st that has
-       for ($i=0; $i<count($lang_list); $i++) {
+       for ($i = 0; $i < count($lang_list); $i++) {
                $lang = $lang_list[$i];
                if ($lang === 'en' || (file_exists("view/lang/$lang") && is_dir("view/lang/$lang"))) {
                        $preferred = $lang;
@@ -63,10 +63,11 @@ function push_lang($language) {
 
        $a->langsave = $lang;
 
-       if($language === $lang)
+       if ($language === $lang) {
                return;
+       }
 
-       if(isset($a->strings) && count($a->strings)) {
+       if (isset($a->strings) && count($a->strings)) {
                $a->stringsave = $a->strings;
        }
        $a->strings = array();
@@ -77,13 +78,15 @@ function push_lang($language) {
 function pop_lang() {
        global $lang, $a;
 
-       if($lang === $a->langsave)
+       if ($lang === $a->langsave) {
                return;
+       }
 
-       if(isset($a->stringsave))
+       if (isset($a->stringsave)) {
                $a->strings = $a->stringsave;
-       else
+       } else {
                $a->strings = array();
+       }
 
        $lang = $a->langsave;
 }
@@ -91,7 +94,7 @@ function pop_lang() {
 
 // l
 
-if(! function_exists('load_translation_table')) {
+if (! function_exists('load_translation_table')) {
 /**
  * load string translation table for alternate language
  *
@@ -106,15 +109,15 @@ function load_translation_table($lang) {
        // load enabled plugins strings
        $plugins = q("SELECT name FROM addon WHERE installed=1;");
        if ($plugins!==false) {
-               foreach($plugins as $p) {
+               foreach ($plugins as $p) {
                        $name = $p['name'];
-                       if(file_exists("addon/$name/lang/$lang/strings.php")) {
+                       if (file_exists("addon/$name/lang/$lang/strings.php")) {
                                include("addon/$name/lang/$lang/strings.php");
                        }
                }
        }
 
-       if(file_exists("view/lang/$lang/strings.php")) {
+       if (file_exists("view/lang/$lang/strings.php")) {
                include("view/lang/$lang/strings.php");
        }
 
@@ -122,27 +125,27 @@ function load_translation_table($lang) {
 
 // translate string if translation exists
 
-if(! function_exists('t')) {
+if (! function_exists('t')) {
 function t($s) {
 
        $a = get_app();
 
-       if(x($a->strings,$s)) {
+       if (x($a->strings,$s)) {
                $t = $a->strings[$s];
                return is_array($t)?$t[0]:$t;
        }
        return $s;
 }}
 
-if(! function_exists('tt')){
+if (! function_exists('tt')){
 function tt($singular, $plural, $count){
        global $lang;
        $a = get_app();
 
-       if(x($a->strings,$singular)) {
+       if (x($a->strings,$singular)) {
                $t = $a->strings[$singular];
                $f = 'string_plural_select_' . str_replace('-','_',$lang);
-               if(! function_exists($f))
+               if (! function_exists($f))
                        $f = 'string_plural_select_default';
                $k = $f($count);
                return is_array($t)?$t[$k]:$t;
@@ -158,7 +161,7 @@ function tt($singular, $plural, $count){
 // provide a fallback which will not collide with
 // a function defined in any language file
 
-if(! function_exists('string_plural_select_default')) {
+if (! function_exists('string_plural_select_default')) {
 function string_plural_select_default($n) {
        return ($n != 1);
 }}
@@ -185,7 +188,7 @@ function get_available_languages() {
                        $strings_file_paths[] = 'view/lang/en/strings.php';
                }
                asort($strings_file_paths);
-               foreach($strings_file_paths as $strings_file_path) {
+               foreach ($strings_file_paths as $strings_file_path) {
                        $path_array = explode('/', $strings_file_path);
                        $langs[$path_array[2]] = $path_array[2];
                }

diff --git a/include/plugin.php b/include/plugin.php
index 336b213aa3491324db2582196159a628822dbdb3..9021f814b1c80d27963049ef334029cb002216c4 100644 (file)
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -21,7 +21,7 @@ function uninstall_plugin($plugin){
        );
 
        @include_once('addon/' . $plugin . '/' . $plugin . '.php');
-       if(function_exists($plugin . '_uninstall')) {
+       if (function_exists($plugin . '_uninstall')) {
                $func = $plugin . '_uninstall';
                $func();
        }
@@ -37,12 +37,12 @@ if (! function_exists('install_plugin')){
 function install_plugin($plugin) {
        // silently fail if plugin was removed
 
-       if(! file_exists('addon/' . $plugin . '/' . $plugin . '.php'))
+       if (! file_exists('addon/' . $plugin . '/' . $plugin . '.php'))
                return false;
        logger("Addons: installing " . $plugin);
        $t = @filemtime('addon/' . $plugin . '/' . $plugin . '.php');
        @include_once('addon/' . $plugin . '/' . $plugin . '.php');
-       if(function_exists($plugin . '_install')) {
+       if (function_exists($plugin . '_install')) {
                $func = $plugin . '_install';
                $func();
 
@@ -58,7 +58,7 @@ function install_plugin($plugin) {
                // once most site tables have been updated.
                // This way the system won't fall over dead during the update.
 
-               if(file_exists('addon/' . $plugin . '/.hidden')) {
+               if (file_exists('addon/' . $plugin . '/.hidden')) {
                        q("UPDATE `addon` SET `hidden` = 1 WHERE `name` = '%s'",
                                dbesc($plugin)
                        );
@@ -74,10 +74,10 @@ function install_plugin($plugin) {
 
 // reload all updated plugins
 
-if(! function_exists('reload_plugins')) {
+if (! function_exists('reload_plugins')) {
 function reload_plugins() {
        $plugins = get_config('system','addon');
-       if(strlen($plugins)) {
+       if (strlen($plugins)) {
 
                $r = q("SELECT * FROM `addon` WHERE `installed` = 1");
                if (dbm::is_result($r))
@@ -87,25 +87,25 @@ function reload_plugins() {
 
                $parr = explode(',',$plugins);
 
-               if(count($parr)) {
-                       foreach($parr as $pl) {
+               if (count($parr)) {
+                       foreach ($parr as $pl) {
 
                                $pl = trim($pl);
 
                                $fname = 'addon/' . $pl . '/' . $pl . '.php';
 
-                               if(file_exists($fname)) {
+                               if (file_exists($fname)) {
                                        $t = @filemtime($fname);
-                                       foreach($installed as $i) {
-                                               if(($i['name'] == $pl) && ($i['timestamp'] != $t)) {
+                                       foreach ($installed as $i) {
+                                               if (($i['name'] == $pl) && ($i['timestamp'] != $t)) {
                                                        logger('Reloading plugin: ' . $i['name']);
                                                        @include_once($fname);
 
-                                                       if(function_exists($pl . '_uninstall')) {
+                                                       if (function_exists($pl . '_uninstall')) {
                                                                $func = $pl . '_uninstall';
                                                                $func();
                                                        }
-                                                       if(function_exists($pl . '_install')) {
+                                                       if (function_exists($pl . '_install')) {
                                                                $func = $pl . '_install';
                                                                $func();
                                                        }
@@ -143,7 +143,7 @@ function plugin_enabled($plugin) {
  * @param int $priority A priority (defaults to 0)
  * @return mixed|bool
  */
-if(! function_exists('register_hook')) {
+if (! function_exists('register_hook')) {
 function register_hook($hook,$file,$function,$priority=0) {
 
        $r = q("SELECT * FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s' LIMIT 1",
@@ -171,7 +171,7 @@ function register_hook($hook,$file,$function,$priority=0) {
  * @param string $function the name of the function that the hook called
  * @return array
  */
-if(! function_exists('unregister_hook')) {
+if (! function_exists('unregister_hook')) {
 function unregister_hook($hook,$file,$function) {
 
        $r = q("DELETE FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s'",
@@ -183,7 +183,7 @@ function unregister_hook($hook,$file,$function) {
 }}
 
 
-if(! function_exists('load_hooks')) {
+if (! function_exists('load_hooks')) {
 function load_hooks() {
        $a = get_app();
        $a->hooks = array();
@@ -191,7 +191,7 @@ function load_hooks() {
 
        if (dbm::is_result($r)) {
                foreach ($r as $rr) {
-                       if(! array_key_exists($rr['hook'],$a->hooks))
+                       if (! array_key_exists($rr['hook'],$a->hooks))
                                $a->hooks[$rr['hook']] = array();
                        $a->hooks[$rr['hook']][] = array($rr['file'],$rr['function']);
                }
@@ -245,13 +245,13 @@ function call_single_hook($a, $name, $hook, &$data = null) {
 
 //check if an app_menu hook exist for plugin $name.
 //Return true if the plugin is an app
-if(! function_exists('plugin_is_app')) {
+if (! function_exists('plugin_is_app')) {
 function plugin_is_app($name) {
        $a = get_app();
 
-       if(is_array($a->hooks) && (array_key_exists('app_menu',$a->hooks))) {
-               foreach($a->hooks['app_menu'] as $hook) {
-                       if($hook[0] == 'addon/'.$name.'/'.$name.'.php')
+       if (is_array($a->hooks) && (array_key_exists('app_menu',$a->hooks))) {
+               foreach ($a->hooks['app_menu'] as $hook) {
+                       if ($hook[0] == 'addon/'.$name.'/'.$name.'.php')
                                return true;
                }
        }
@@ -298,7 +298,7 @@ function get_plugin_info($plugin){
 
        if ($r){
                $ll = explode("\n", $m[0]);
-               foreach( $ll as $l ) {
+               foreach ( $ll as $l ) {
                        $l = trim($l,"\t\n\r */");
                        if ($l!=""){
                                list($k,$v) = array_map("trim", explode(":",$l,2));
@@ -353,9 +353,9 @@ function get_theme_info($theme){
                'unsupported' => false
        );
 
-       if(file_exists("view/theme/$theme/experimental"))
+       if (file_exists("view/theme/$theme/experimental"))
                $info['experimental'] = true;
-       if(file_exists("view/theme/$theme/unsupported"))
+       if (file_exists("view/theme/$theme/unsupported"))
                $info['unsupported'] = true;
 
        if (!is_file("view/theme/$theme/theme.php")) return $info;
@@ -369,7 +369,7 @@ function get_theme_info($theme){
 
        if ($r){
                $ll = explode("\n", $m[0]);
-               foreach( $ll as $l ) {
+               foreach ( $ll as $l ) {
                        $l = trim($l,"\t\n\r */");
                        if ($l!=""){
                                list($k,$v) = array_map("trim", explode(":",$l,2));
@@ -413,7 +413,7 @@ function get_theme_info($theme){
  */
 function get_theme_screenshot($theme) {
        $exts = array('.png','.jpg');
-       foreach($exts as $ext) {
+       foreach ($exts as $ext) {
                if (file_exists('view/theme/' . $theme . '/screenshot' . $ext)) {
                        return(App::get_baseurl() . '/view/theme/' . $theme . '/screenshot' . $ext);
                }
@@ -512,11 +512,11 @@ function service_class_fetch($uid,$property) {
                        $service_class = $r[0]['service_class'];
                }
        }
-       if(! x($service_class))
+       if (! x($service_class))
                return false; // everything is allowed
 
        $arr = get_config('service_class',$service_class);
-       if(! is_array($arr) || (! count($arr)))
+       if (! is_array($arr) || (! count($arr)))
                return false;
 
        return((array_key_exists($property,$arr)) ? $arr[$property] : false);
@@ -525,12 +525,14 @@ function service_class_fetch($uid,$property) {
 
 function upgrade_link($bbcode = false) {
        $l = get_config('service_class','upgrade_link');
-       if(! $l)
+       if (! $l) {
                return '';
-       if($bbcode)
+       }
+       if ($bbcode) {
                $t = sprintf('[url=%s]' . t('Click here to upgrade.') . '[/url]', $l);
-       else
+       } else {
                $t = sprintf('<a href="%s">' . t('Click here to upgrade.') . '</div>', $l);
+       }
        return $t;
 }
 
@@ -557,13 +559,15 @@ function upgrade_bool_message($bbcode = false) {
  */
 function theme_include($file, $root = '') {
        // Make sure $root ends with a slash / if it's not blank
-       if($root !== '' && $root[strlen($root)-1] !== '/')
+       if ($root !== '' && $root[strlen($root)-1] !== '/') {
                $root = $root . '/';
+       }
        $theme_info = $a->theme_info;
-       if(is_array($theme_info) AND array_key_exists('extends',$theme_info))
+       if (is_array($theme_info) AND array_key_exists('extends',$theme_info)) {
                $parent = $theme_info['extends'];
-       else
+       } else {
                $parent = 'NOPATH';
+       }
        $theme = current_theme();
        $thname = $theme;
        $ext = substr($file,strrpos($file,'.')+1);
@@ -572,12 +576,13 @@ function theme_include($file, $root = '') {
                "{$root}view/theme/$parent/$ext/$file",
                "{$root}view/$ext/$file",
        );
-       foreach($paths as $p) {
+       foreach ($paths as $p) {
                // strpos() is faster than strstr when checking if one string is in another (http://php.net/manual/en/function.strstr.php)
-               if(strpos($p,'NOPATH') !== false)
+               if (strpos($p,'NOPATH') !== false) {
                        continue;
-               if(file_exists($p))
+               } elseif (file_exists($p)) {
                        return $p;
+               }
        }
        return '';
 }

diff --git a/include/poller.php b/include/poller.php
index ae249ffe46ddc41f8be766534fdfbaa7b4e1c696..0600434a715dd17cbdd0ec2c1d73c1c94e58ce63 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -23,7 +23,7 @@ function poller_run($argv, $argc){
                $a = new App(dirname(__DIR__));
        }
 
-       if(is_null($db)) {
+       if (is_null($db)) {
                @include(".htconfig.php");
                require_once("include/dba.php");
                $db = new dba($db_host, $db_user, $db_pass, $db_data);
@@ -55,7 +55,7 @@ function poller_run($argv, $argc){
                return;
        }
 
-       if(($argc <= 1) OR ($argv[1] != "no_cron")) {
+       if (($argc <= 1) OR ($argv[1] != "no_cron")) {
                poller_run_cron();
        }
 
@@ -378,8 +378,9 @@ function poller_kill_stale_workers() {
                        // Kill long running processes
 
                        // Check if the priority is in a valid range
-                       if (!in_array($pid["priority"], array(PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW, PRIORITY_NEGLIGIBLE)))
+                       if (!in_array($pid["priority"], array(PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW, PRIORITY_NEGLIGIBLE))) {
                                $pid["priority"] = PRIORITY_MEDIUM;
+                       }
 
                        // Define the maximum durations
                        $max_duration_defaults = array(PRIORITY_CRITICAL => 360, PRIORITY_HIGH => 10, PRIORITY_MEDIUM => 60, PRIORITY_LOW => 180, PRIORITY_NEGLIGIBLE => 360);
@@ -421,7 +422,7 @@ function poller_too_much_workers() {
 
        // Decrease the number of workers at higher load
        $load = current_load();
-       if($load) {
+       if ($load) {
                $maxsysload = intval(Config::get("system", "maxloadavg", 50));
 
                $maxworkers = $queues;

diff --git a/include/post_update.php b/include/post_update.php
index 9d18b27b4f3c16a8d42ea52372e1eecf33eb2c40..af49bb555cd86211df7457e1a622be81aa054768 100644 (file)
--- a/include/post_update.php
+++ b/include/post_update.php
@@ -68,7 +68,7 @@ function post_update_1192() {
        }
 
        // Set the "gcontact-id" in the item table and add a new gcontact entry if needed
-       foreach($item_arr AS $item) {
+       foreach ($item_arr AS $item) {
                $gcontact_id = get_gcontact_id(array("url" => $item['author-link'], "network" => $item['network'],
                                                "photo" => $item['author-avatar'], "name" => $item['author-name']));
                q("UPDATE `item` SET `gcontact-id` = %d WHERE `uid` = %d AND `author-link` = '%s' AND `gcontact-id` = 0",
@@ -204,7 +204,7 @@ function post_update_1198() {
        }
 
        // Set the "gcontact-id" in the item table and add a new gcontact entry if needed
-       foreach($item_arr AS $item) {
+       foreach ($item_arr AS $item) {
                $author_id = get_contact($item["author-link"], 0);
                $owner_id = get_contact($item["owner-link"], 0);
 

diff --git a/include/profile_selectors.php b/include/profile_selectors.php
index 8d29fd0998c608ce68a33976225c8b21130945cc..af6c0d96c4f6373b109f2f382da601b38771ef06 100644 (file)
--- a/include/profile_selectors.php
+++ b/include/profile_selectors.php
@@ -8,8 +8,8 @@ function gender_selector($current="",$suffix="") {
        call_hooks('gender_selector', $select);
 
        $o .= "<select name=\"gender$suffix\" id=\"gender-select$suffix\" size=\"1\" >";
-       foreach($select as $selection) {
-               if($selection !== 'NOTRANSLATION') {
+       foreach ($select as $selection) {
+               if ($selection !== 'NOTRANSLATION') {
                        $selected = (($selection == $current) ? ' selected="selected" ' : '');
                        $o .= "<option value=\"$selection\" $selected >$selection</option>";
                }
@@ -26,8 +26,8 @@ function sexpref_selector($current="",$suffix="") {
        call_hooks('sexpref_selector', $select);
 
        $o .= "<select name=\"sexual$suffix\" id=\"sexual-select$suffix\" size=\"1\" >";
-       foreach($select as $selection) {
-               if($selection !== 'NOTRANSLATION') {
+       foreach ($select as $selection) {
+               if ($selection !== 'NOTRANSLATION') {
                        $selected = (($selection == $current) ? ' selected="selected" ' : '');
                        $o .= "<option value=\"$selection\" $selected >$selection</option>";
                }
@@ -44,8 +44,8 @@ function marital_selector($current="",$suffix="") {
        call_hooks('marital_selector', $select);
 
        $o .= "<select name=\"marital\" id=\"marital-select\" size=\"1\" >";
-       foreach($select as $selection) {
-               if($selection !== 'NOTRANSLATION') {
+       foreach ($select as $selection) {
+               if ($selection !== 'NOTRANSLATION') {
                        $selected = (($selection == $current) ? ' selected="selected" ' : '');
                        $o .= "<option value=\"$selection\" $selected >$selection</option>";
                }

diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php
index 24d7b6963792eebde36b51b18288cb0d561d1288..cde256a4034f266dafd4061db8c9de2042a2f308 100644 (file)
--- a/include/pubsubpublish.php
+++ b/include/pubsubpublish.php
@@ -30,10 +30,11 @@ function handle_pubsubhubbub($id) {
        global $a;
 
        $r = q("SELECT * FROM `push_subscriber` WHERE `id` = %d", intval($id));
-       if (!$r)
+       if (!dbm::is_result($r)) {
                return;
-       else
-               $rr = $r[0];
+       }
+
+       $rr = $r[0];
 
        /// @todo Check server status with poco_check_server()
        // Before this can be done we need a way to safely detect the server url.

diff --git a/include/queue.php b/include/queue.php
index b21bf676bae999e7f80e9a120f4f8de206853555..97b8605cbeaeaee2d6e4ae064ce778fdfa3233e2 100644 (file)
--- a/include/queue.php
+++ b/include/queue.php
@@ -29,10 +29,29 @@ function queue_run(&$argv, &$argc){
                // Handling the pubsubhubbub requests
                proc_run(PRIORITY_HIGH,'include/pubsubpublish.php');
 
+               $interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
+
+               // If we are using the worker we don't need a delivery interval
+               /// @TODO To much get_config() here
+               if (get_config("system", "worker")) {
+                       $interval = false;
+               }
+
+               $r = q("select * from deliverq where 1");
+               if ($r) {
+                       foreach ($r as $rr) {
+                               logger('queue: deliverq');
+                               proc_run(PRIORITY_HIGH,'include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']);
+                               if ($interval) {
+                                       time_sleep_until(microtime(true) + (float) $interval);
+                               }
+                       }
+               }
+
                $r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
                        INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
                        WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
-               if ($r) {
+               if (dbm::is_result($r)) {
                        foreach ($r as $rr) {
                                logger('Removing expired queue item for ' . $rr['name'] . ', uid=' . $rr['uid']);
                                logger('Expired queue data: ' . $rr['content'], LOGGER_DATA);

diff --git a/include/queue_fn.php b/include/queue_fn.php
index 9dcefdd244b59288c9177a401735d186480a680b..8840668112300dbb4d96d62ebd63e7047e15a815 100644 (file)
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -49,23 +49,24 @@ function was_recently_delayed($cid) {
 function add_to_queue($cid,$network,$msg,$batch = false) {
 
        $max_queue = get_config('system','max_contact_queue');
-       if($max_queue < 1)
+       if ($max_queue < 1) {
                $max_queue = 500;
+       }
 
        $batch_queue = get_config('system','max_batch_queue');
-       if($batch_queue < 1)
+       if ($batch_queue < 1) {
                $batch_queue = 1000;
+       }
 
        $r = q("SELECT COUNT(*) AS `total` FROM `queue` INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id` 
                WHERE `queue`.`cid` = %d AND `contact`.`self` = 0 ",
                intval($cid)
        );
        if (dbm::is_result($r)) {
-               if($batch &&  ($r[0]['total'] > $batch_queue)) {
+               if ($batch &&  ($r[0]['total'] > $batch_queue)) {
                        logger('add_to_queue: too many queued items for batch server ' . $cid . ' - discarding message');
                        return;
-               }
-               elseif((! $batch) && ($r[0]['total'] > $max_queue)) {
+               } elseif ((! $batch) && ($r[0]['total'] > $max_queue)) {
                        logger('add_to_queue: too many queued items for contact ' . $cid . ' - discarding message');
                        return;
                }

diff --git a/include/quoteconvert.php b/include/quoteconvert.php
index 4473fa99befbdd659af74d789df48109d7518d3a..33e8843b0b5c69d2fba23073052a0ccb727f6081 100644 (file)
--- a/include/quoteconvert.php
+++ b/include/quoteconvert.php
@@ -83,7 +83,7 @@ function removetofu($message)
 
        $start = 0;
 
-       while(($pos = strpos($message, '[quote', $start)) > 0) {
+       while (($pos = strpos($message, '[quote', $start)) > 0) {
                $quotes[$pos] = -1;
                $start = $pos + 7;
                $startquotes++;
@@ -92,7 +92,7 @@ function removetofu($message)
        $endquotes = 0;
        $start = 0;
 
-       while(($pos = strpos($message, '[/quote]', $start)) > 0) {
+       while (($pos = strpos($message, '[/quote]', $start)) > 0) {
                $start = $pos + 7;
                $endquotes++;
        }
@@ -104,7 +104,7 @@ function removetofu($message)
 
        $start = 0;
 
-       while(($pos = strpos($message, '[/quote]', $start)) > 0) {
+       while (($pos = strpos($message, '[/quote]', $start)) > 0) {
                $quotes[$pos] = 1;
                $start = $pos + 7;
        }