From 5a6fa4ae87f7ae5c07672b0fd90fef7c52680818 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 7 Nov 2017 21:53:11 +0000 Subject: [PATCH 1/4] Some more --- include/auth_ejabberd.php | 4 ++-- mod/admin.php | 5 +---- mod/cal.php | 3 +-- mod/settings.php | 24 +++++++----------------- src/ParseUrl.php | 22 +++++++++++----------- 5 files changed, 22 insertions(+), 36 deletions(-) diff --git a/include/auth_ejabberd.php b/include/auth_ejabberd.php index 1307d57832..998c6fe3d9 100755 --- a/include/auth_ejabberd.php +++ b/include/auth_ejabberd.php @@ -79,7 +79,7 @@ class exAuth { $this->writeLog(LOG_NOTICE, "start"); // We are connected to the SQL server. - do { + while (!feof(STDIN)) { // Quit if the database connection went down if (!dba::connected()) { $this->writeLog(LOG_ERR, "the database connection went down"); @@ -125,7 +125,7 @@ class exAuth { $this->writeLog(LOG_NOTICE, "invalid command string ".$sData); fwrite(STDOUT, pack("nn", 2, 0)); } - } while (true); + } } /** diff --git a/mod/admin.php b/mod/admin.php index 4f156a0c3b..08c732c6ed 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -2273,10 +2273,7 @@ function admin_page_features(App $a) { $arr[$fname][0] = $fdata[0]; foreach (array_slice($fdata,1) as $f) { - $set = Config::get('feature',$f[0]); - if ($set === false) { - $set = $f[3]; - } + $set = Config::get('feature',$f[0], $f[3]); $arr[$fname][1][] = array( array('feature_' .$f[0],$f[1],$set,$f[2],array(t('Off'), t('On'))), array('featurelock_' .$f[0],sprintf(t('Lock feature %s'),$f[1]),(($f[4] !== false) ? "1" : ''),'',array(t('Off'), t('On'))) diff --git a/mod/cal.php b/mod/cal.php index db5b00879e..4f5bde5d58 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -73,8 +73,7 @@ function cal_content(App $a) { nav_set_selected('events'); // First day of the week (0 = Sunday) - $firstDay = PConfig::get(local_user(),'system','first_day_of_week'); - if ($firstDay === false) $firstDay=0; + $firstDay = PConfig::get(local_user(),'system','first_day_of_week', 0); // get the translation strings for the callendar $i18n = get_event_strings(); diff --git a/mod/settings.php b/mod/settings.php index 6c160a21f0..37daa359c1 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -953,7 +953,7 @@ function settings_content(App $a) { $is_experimental = file_exists('view/theme/' . $th . '/experimental'); $unsupported = file_exists('view/theme/' . $th . '/unsupported'); $is_mobile = file_exists('view/theme/' . $th . '/mobile'); - if (!$is_experimental || ($is_experimental && (Config::get('experimentals', 'exp_themes')==1 || Config::get('experimentals', 'exp_themes')===false))) { + if (!$is_experimental || ($is_experimental && (Config::get('experimentals', 'exp_themes')==1 || is_null(Config::get('experimentals', 'exp_themes'))))) { $theme_name = (($is_experimental) ? sprintf("%s - \x28Experimental\x29", $f) : $f); if ($is_mobile) { $mobile_themes[$f]=$theme_name; @@ -978,24 +978,14 @@ function settings_content(App $a) { $itemspage_mobile_network = intval(PConfig::get(local_user(), 'system', 'itemspage_mobile_network')); $itemspage_mobile_network = (($itemspage_mobile_network > 0 && $itemspage_mobile_network < 101) ? $itemspage_mobile_network : 20); // default if not set: 20 items - $nosmile = PConfig::get(local_user(), 'system', 'no_smilies'); - $nosmile = (($nosmile===false)? '0': $nosmile); // default if not set: 0 - - $first_day_of_week = PConfig::get(local_user(), 'system', 'first_day_of_week'); - $first_day_of_week = (($first_day_of_week===false)? '0': $first_day_of_week); // default if not set: 0 + $nosmile = PConfig::get(local_user(), 'system', 'no_smilies', 0); + $first_day_of_week = PConfig::get(local_user(), 'system', 'first_day_of_week', 0); $weekdays = array(0 => t("Sunday"), 1 => t("Monday")); - $noinfo = PConfig::get(local_user(), 'system', 'ignore_info'); - $noinfo = (($noinfo===false)? '0': $noinfo); // default if not set: 0 - - $infinite_scroll = PConfig::get(local_user(), 'system', 'infinite_scroll'); - $infinite_scroll = (($infinite_scroll===false)? '0': $infinite_scroll); // default if not set: 0 - - $no_auto_update = PConfig::get(local_user(), 'system', 'no_auto_update'); - $no_auto_update = (($no_auto_update===false)? '0': $no_auto_update); // default if not set: 0 - - $bandwidth_saver = PConfig::get(local_user(), 'system', 'bandwidth_saver'); - $bandwidth_saver = (($bandwidth_saver === false) ? '0' : $bandwidth_saver); // default if not set: 0 + $noinfo = PConfig::get(local_user(), 'system', 'ignore_info', 0); + $infinite_scroll = PConfig::get(local_user(), 'system', 'infinite_scroll', 0); + $no_auto_update = PConfig::get(local_user(), 'system', 'no_auto_update', 0); + $bandwidth_saver = PConfig::get(local_user(), 'system', 'bandwidth_saver', 0); $theme_config = ""; if (($themeconfigfile = get_theme_config_file($theme_selected)) != null) { diff --git a/src/ParseUrl.php b/src/ParseUrl.php index 81c5671c90..d6b6b60272 100644 --- a/src/ParseUrl.php +++ b/src/ParseUrl.php @@ -161,13 +161,13 @@ class ParseUrl { $oembed_data = oembed_fetch_url($url); - if (!in_array($oembed_data->type, array("error", "rich"))) { + if (!in_array($oembed_data->type, array("error", "rich", ""))) { $siteinfo["type"] = $oembed_data->type; } if (($oembed_data->type == "link") && ($siteinfo["type"] != "photo")) { if (isset($oembed_data->title)) { - $siteinfo["title"] = $oembed_data->title; + $siteinfo["title"] = trim($oembed_data->title); } if (isset($oembed_data->description)) { $siteinfo["text"] = trim($oembed_data->description); @@ -240,7 +240,7 @@ class ParseUrl { $list = $xpath->query("//title"); if ($list->length > 0) { - $siteinfo["title"] = $list->item(0)->nodeValue; + $siteinfo["title"] = trim($list->item(0)->nodeValue); } //$list = $xpath->query("head/meta[@name]"); @@ -258,10 +258,10 @@ class ParseUrl { if ($attr["content"] != "") { switch (strtolower($attr["name"])) { case "fulltitle": - $siteinfo["title"] = $attr["content"]; + $siteinfo["title"] = trim($attr["content"]); break; case "description": - $siteinfo["text"] = $attr["content"]; + $siteinfo["text"] = trim($attr["content"]); break; case "thumbnail": $siteinfo["image"] = $attr["content"]; @@ -278,16 +278,16 @@ class ParseUrl { } break; case "twitter:description": - $siteinfo["text"] = $attr["content"]; + $siteinfo["text"] = trim($attr["content"]); break; case "twitter:title": - $siteinfo["title"] = $attr["content"]; + $siteinfo["title"] = trim($attr["content"]); break; case "dc.title": - $siteinfo["title"] = $attr["content"]; + $siteinfo["title"] = trim($attr["content"]); break; case "dc.description": - $siteinfo["text"] = $attr["content"]; + $siteinfo["text"] = trim($attr["content"]); break; case "keywords": $keywords = explode(",", $attr["content"]); @@ -329,10 +329,10 @@ class ParseUrl { $siteinfo["image"] = $attr["content"]; break; case "og:title": - $siteinfo["title"] = $attr["content"]; + $siteinfo["title"] = trim($attr["content"]); break; case "og:description": - $siteinfo["text"] = $attr["content"]; + $siteinfo["text"] = trim($attr["content"]); break; } } From 76f73c7236f40ec9a068b91095cd4d90a0488c88 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 7 Nov 2017 22:15:59 +0000 Subject: [PATCH 2/4] And some more places --- include/items.php | 14 ++----- mod/group.php | 7 +--- mod/profperm.php | 8 ++-- view/theme/quattro/style.php | 76 +++++++++++++++++++----------------- 4 files changed, 49 insertions(+), 56 deletions(-) diff --git a/include/items.php b/include/items.php index 96340fc12d..1dae871f8b 100644 --- a/include/items.php +++ b/include/items.php @@ -2021,22 +2021,16 @@ function item_expire($uid, $days, $network = "", $force = false) { return; } - $expire_items = PConfig::get($uid, 'expire', 'items'); - $expire_items = (($expire_items === false) ? 1 : intval($expire_items)); // default if not set: 1 + $expire_items = PConfig::get($uid, 'expire', 'items', 1); // Forcing expiring of items - but not notes and marked items if ($force) { $expire_items = true; } - $expire_notes = PConfig::get($uid, 'expire', 'notes'); - $expire_notes = (($expire_notes === false) ? 1 : intval($expire_notes)); // default if not set: 1 - - $expire_starred = PConfig::get($uid, 'expire', 'starred'); - $expire_starred = (($expire_starred === false) ? 1 : intval($expire_starred)); // default if not set: 1 - - $expire_photos = PConfig::get($uid, 'expire', 'photos'); - $expire_photos = (($expire_photos === false) ? 0 : intval($expire_photos)); // default if not set: 0 + $expire_notes = PConfig::get($uid, 'expire', 'notes', 1); + $expire_starred = PConfig::get($uid, 'expire', 'starred', 1); + $expire_photos = PConfig::get($uid, 'expire', 'photos', 0); logger('User '.$uid.': expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos"); diff --git a/mod/group.php b/mod/group.php index 1646043a9f..5d624e90e4 100644 --- a/mod/group.php +++ b/mod/group.php @@ -84,11 +84,8 @@ function group_content(App $a) { // Switch to text mode interface if we have more than 'n' contacts or group members $switchtotext = PConfig::get(local_user(), 'system', 'groupedit_image_limit'); - if ($switchtotext === false) { - $switchtotext = Config::get('system', 'groupedit_image_limit'); - } - if ($switchtotext === false) { - $switchtotext = 400; + if (is_null($switchtotext)) { + $switchtotext = Config::get('system', 'groupedit_image_limit', 400); } $tpl = get_markup_template('group_edit.tpl'); diff --git a/mod/profperm.php b/mod/profperm.php index 2b3c07526b..c49fb7f282 100644 --- a/mod/profperm.php +++ b/mod/profperm.php @@ -34,11 +34,9 @@ function profperm_content(App $a) { // Switch to text mod interface if we have more than 'n' contacts or group members $switchtotext = PConfig::get(local_user(),'system','groupedit_image_limit'); - if($switchtotext === false) - $switchtotext = Config::get('system','groupedit_image_limit'); - if($switchtotext === false) - $switchtotext = 400; - + if (is_null($switchtotext)) { + $switchtotext = Config::get('system','groupedit_image_limit', 400); + } if(($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) { $r = q("SELECT `id` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `self` = 0 diff --git a/view/theme/quattro/style.php b/view/theme/quattro/style.php index 4d89c4a3ff..29fec2c37a 100644 --- a/view/theme/quattro/style.php +++ b/view/theme/quattro/style.php @@ -5,27 +5,30 @@ $uid = get_theme_uid(); - $color=false; - $quattro_align=false; - $site_color = Config::get("quattro","color"); - $site_quattro_align = Config::get("quattro", "align" ); - + $color = false; + $quattro_align = false; + $site_color = Config::get("quattro", "color", "dark); + $site_quattro_align = Config::get("quattro", "align", false); + if ($uid) { - $color = PConfig::get( $uid, "quattro","color"); - $quattro_align = PConfig::get( $uid, 'quattro', 'align' ); + $color = PConfig::get($uid, "quattro", "color"); + $quattro_align = PConfig::get($uid, 'quattro', 'align'); } - - if ($color===false) $color=$site_color; - if ($color===false) $color="dark"; - if ($quattro_align===false) $quattro_align=$site_quattro_align; - - + + if ($color === false) { + $color = $site_color; + } + + if ($quattro_align === false) { + $quattro_align = $site_quattro_align; + } + if (file_exists("$THEMEPATH/$color/style.css")){ echo file_get_contents("$THEMEPATH/$color/style.css"); } - if($quattro_align=="center"){ + if ($quattro_align == "center"){ echo " html { width: 100%; margin:0px; padding:0px; } body { @@ -35,27 +38,28 @@ "; } - - $textarea_font_size = false; - $post_font_size = false; - - $site_textarea_font_size = Config::get("quattro","tfs"); - $site_post_font_size = Config::get("quattro","pfs"); - if ($site_textarea_font_size===false) $site_textarea_font_size="20"; - if ($site_post_font_size===false) $site_post_font_size="12"; - - if ($uid) { - $textarea_font_size = PConfig::get( $uid, "quattro","tfs"); - $post_font_size = PConfig::get( $uid, "quattro","pfs"); - } - - if ($textarea_font_size===false) $textarea_font_size = $site_textarea_font_size; - if ($post_font_size===false) $post_font_size = $site_post_font_size; + $textarea_font_size = false; + $post_font_size = false; - echo " - textarea { font-size: ${textarea_font_size}px; } - .wall-item-comment-wrapper .comment-edit-text-full { font-size: ${textarea_font_size}px; } - #jot .profile-jot-text:focus { font-size: ${textarea_font_size}px; } - .wall-item-container .wall-item-content { font-size: ${post_font_size}px; } - "; \ No newline at end of file + $site_textarea_font_size = Config::get("quattro", "tfs", "20"); + $site_post_font_size = Config::get("quattro", "pfs", "12"); + + if ($uid) { + $textarea_font_size = PConfig::get($uid, "quattro", "tfs", false); + $post_font_size = PConfig::get($uid, "quattro", "pfs", false); + } + + if ($textarea_font_size === false) { + $textarea_font_size = $site_textarea_font_size; + } + if ($post_font_size === false) { + $post_font_size = $site_post_font_size; + } + + echo " + textarea { font-size: ${textarea_font_size}px; } + .wall-item-comment-wrapper .comment-edit-text-full { font-size: ${textarea_font_size}px; } + #jot .profile-jot-text:focus { font-size: ${textarea_font_size}px; } + .wall-item-container .wall-item-content { font-size: ${post_font_size}px; } + "; From 76caf7a9cff7ad3a64066a774a6f1b5064a1cfe8 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 8 Nov 2017 06:43:20 +0000 Subject: [PATCH 3/4] Small corrections --- mod/admin.php | 2 +- view/theme/quattro/style.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 08c732c6ed..9ccba4e0f9 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -2234,7 +2234,7 @@ function admin_page_features_post(App $a) { } else { $val = 0; } - Config::set('feature',$feature,$val); + Config::set('feature', $feature, $val); if (x($_POST, $featurelock)) { Config::set('feature_lock', $feature, $val); diff --git a/view/theme/quattro/style.php b/view/theme/quattro/style.php index 29fec2c37a..2aaf3af508 100644 --- a/view/theme/quattro/style.php +++ b/view/theme/quattro/style.php @@ -7,12 +7,12 @@ $color = false; $quattro_align = false; - $site_color = Config::get("quattro", "color", "dark); + $site_color = Config::get("quattro", "color", "dark"); $site_quattro_align = Config::get("quattro", "align", false); if ($uid) { - $color = PConfig::get($uid, "quattro", "color"); - $quattro_align = PConfig::get($uid, 'quattro', 'align'); + $color = PConfig::get($uid, "quattro", "color", false); + $quattro_align = PConfig::get($uid, 'quattro', 'align', false); } if ($color === false) { From 063358301f5d2eb5b0400cb03a80fdf228f3e9a1 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 8 Nov 2017 13:08:26 +0000 Subject: [PATCH 4/4] One space more --- mod/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/admin.php b/mod/admin.php index 9ccba4e0f9..005473070e 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -2273,7 +2273,7 @@ function admin_page_features(App $a) { $arr[$fname][0] = $fdata[0]; foreach (array_slice($fdata,1) as $f) { - $set = Config::get('feature',$f[0], $f[3]); + $set = Config::get('feature', $f[0], $f[3]); $arr[$fname][1][] = array( array('feature_' .$f[0],$f[1],$set,$f[2],array(t('Off'), t('On'))), array('featurelock_' .$f[0],sprintf(t('Lock feature %s'),$f[1]),(($f[4] !== false) ? "1" : ''),'',array(t('Off'), t('On')))