From eb9b832c3ab2accd8d12aa50c00c18dc1316edae Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 24 Apr 2018 20:12:43 -0400 Subject: [PATCH] [frio] Normalize quoting style in PHP files --- view/theme/frio/config.php | 104 +++++++++++++++---------------- view/theme/frio/php/Image.php | 8 +-- view/theme/frio/php/schema.php | 24 +++---- view/theme/frio/php/standard.php | 2 +- view/theme/frio/style.php | 76 +++++++++++----------- view/theme/frio/theme.php | 92 +++++++++++++-------------- 6 files changed, 153 insertions(+), 153 deletions(-) diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php index 2827919f9d..05fcd3f9e0 100644 --- a/view/theme/frio/config.php +++ b/view/theme/frio/config.php @@ -15,14 +15,14 @@ function theme_post(App $a) } if (isset($_POST['frio-settings-submit'])) { - PConfig::set(local_user(), 'frio', 'schema', $_POST["frio_schema"]); - PConfig::set(local_user(), 'frio', 'nav_bg', $_POST["frio_nav_bg"]); - PConfig::set(local_user(), 'frio', 'nav_icon_color', $_POST["frio_nav_icon_color"]); - PConfig::set(local_user(), 'frio', 'link_color', $_POST["frio_link_color"]); - PConfig::set(local_user(), 'frio', 'background_color', $_POST["frio_background_color"]); - PConfig::set(local_user(), 'frio', 'contentbg_transp', $_POST["frio_contentbg_transp"]); - PConfig::set(local_user(), 'frio', 'background_image', $_POST["frio_background_image"]); - PConfig::set(local_user(), 'frio', 'bg_image_option', $_POST["frio_bg_image_option"]); + PConfig::set(local_user(), 'frio', 'schema', $_POST['frio_schema']); + PConfig::set(local_user(), 'frio', 'nav_bg', $_POST['frio_nav_bg']); + PConfig::set(local_user(), 'frio', 'nav_icon_color', $_POST['frio_nav_icon_color']); + PConfig::set(local_user(), 'frio', 'link_color', $_POST['frio_link_color']); + PConfig::set(local_user(), 'frio', 'background_color', $_POST['frio_background_color']); + PConfig::set(local_user(), 'frio', 'contentbg_transp', $_POST['frio_contentbg_transp']); + PConfig::set(local_user(), 'frio', 'background_image', $_POST['frio_background_image']); + PConfig::set(local_user(), 'frio', 'bg_image_option', $_POST['frio_bg_image_option']); PConfig::set(local_user(), 'frio', 'css_modified', time()); } } @@ -34,16 +34,16 @@ function theme_admin_post(App $a) } if (isset($_POST['frio-settings-submit'])) { - Config::set('frio', 'schema', $_POST["frio_schema"]); - Config::set('frio', 'nav_bg', $_POST["frio_nav_bg"]); - Config::set('frio', 'nav_icon_color', $_POST["frio_nav_icon_color"]); - Config::set('frio', 'link_color', $_POST["frio_link_color"]); - Config::set('frio', 'background_color', $_POST["frio_background_color"]); - Config::set('frio', 'contentbg_transp', $_POST["frio_contentbg_transp"]); - Config::set('frio', 'background_image', $_POST["frio_background_image"]); - Config::set('frio', 'bg_image_option', $_POST["frio_bg_image_option"]); - Config::set('frio', 'login_bg_image', $_POST["frio_login_bg_image"]); - Config::set('frio', 'login_bg_color', $_POST["frio_login_bg_color"]); + Config::set('frio', 'schema', $_POST['frio_schema']); + Config::set('frio', 'nav_bg', $_POST['frio_nav_bg']); + Config::set('frio', 'nav_icon_color', $_POST['frio_nav_icon_color']); + Config::set('frio', 'link_color', $_POST['frio_link_color']); + Config::set('frio', 'background_color', $_POST['frio_background_color']); + Config::set('frio', 'contentbg_transp', $_POST['frio_contentbg_transp']); + Config::set('frio', 'background_image', $_POST['frio_background_image']); + Config::set('frio', 'bg_image_option', $_POST['frio_bg_image_option']); + Config::set('frio', 'login_bg_image', $_POST['frio_login_bg_image']); + Config::set('frio', 'login_bg_color', $_POST['frio_login_bg_color']); Config::set('frio', 'css_modified', time()); } } @@ -55,14 +55,14 @@ function theme_content(App $a) } $arr = []; - $arr["schema"] = PConfig::get(local_user(), 'frio', 'schema'); - $arr["nav_bg"] = PConfig::get(local_user(), 'frio', 'nav_bg'); - $arr["nav_icon_color"] = PConfig::get(local_user(), 'frio', 'nav_icon_color'); - $arr["link_color"] = PConfig::get(local_user(), 'frio', 'link_color'); - $arr["bgcolor"] = PConfig::get(local_user(), 'frio', 'background_color'); - $arr["contentbg_transp"] = PConfig::get(local_user(), 'frio', 'contentbg_transp'); - $arr["background_image"] = PConfig::get(local_user(), 'frio', 'background_image'); - $arr["bg_image_option"] = PConfig::get(local_user(), 'frio', 'bg_image_option'); + $arr['schema'] = PConfig::get(local_user(), 'frio', 'schema'); + $arr['nav_bg'] = PConfig::get(local_user(), 'frio', 'nav_bg'); + $arr['nav_icon_color'] = PConfig::get(local_user(), 'frio', 'nav_icon_color'); + $arr['link_color'] = PConfig::get(local_user(), 'frio', 'link_color'); + $arr['bgcolor'] = PConfig::get(local_user(), 'frio', 'background_color'); + $arr['contentbg_transp'] = PConfig::get(local_user(), 'frio', 'contentbg_transp'); + $arr['background_image'] = PConfig::get(local_user(), 'frio', 'background_image'); + $arr['bg_image_option'] = PConfig::get(local_user(), 'frio', 'bg_image_option'); return frio_form($arr); } @@ -74,36 +74,36 @@ function theme_admin(App $a) } $arr = []; - $arr["schema"] = Config::get('frio', 'schema'); - $arr["nav_bg"] = Config::get('frio', 'nav_bg'); - $arr["nav_icon_color"] = Config::get('frio', 'nav_icon_color'); - $arr["link_color"] = Config::get('frio', 'link_color'); - $arr["bgcolor"] = Config::get('frio', 'background_color'); - $arr["contentbg_transp"] = Config::get('frio', 'contentbg_transp'); - $arr["background_image"] = Config::get('frio', 'background_image'); - $arr["bg_image_option"] = Config::get('frio', 'bg_image_option'); - $arr["login_bg_image"] = Config::get('frio', 'login_bg_image'); - $arr["login_bg_color"] = Config::get('frio', 'login_bg_color'); + $arr['schema'] = Config::get('frio', 'schema'); + $arr['nav_bg'] = Config::get('frio', 'nav_bg'); + $arr['nav_icon_color'] = Config::get('frio', 'nav_icon_color'); + $arr['link_color'] = Config::get('frio', 'link_color'); + $arr['bgcolor'] = Config::get('frio', 'background_color'); + $arr['contentbg_transp'] = Config::get('frio', 'contentbg_transp'); + $arr['background_image'] = Config::get('frio', 'background_image'); + $arr['bg_image_option'] = Config::get('frio', 'bg_image_option'); + $arr['login_bg_image'] = Config::get('frio', 'login_bg_image'); + $arr['login_bg_color'] = Config::get('frio', 'login_bg_color'); return frio_form($arr); } function frio_form($arr) { - require_once("view/theme/frio/php/schema.php"); + require_once 'view/theme/frio/php/schema.php'; - $scheme_info = get_schema_info($arr["schema"]); - $disable = $scheme_info["overwrites"]; + $scheme_info = get_schema_info($arr['schema']); + $disable = $scheme_info['overwrites']; if (!is_array($disable)) { $disable = []; } $scheme_choices = []; - $scheme_choices["---"] = L10n::t("Default"); + $scheme_choices['---'] = L10n::t('Default'); $files = glob('view/theme/frio/schema/*.php'); if ($files) { foreach ($files as $file) { - $f = basename($file, ".php"); + $f = basename($file, '.php'); if ($f != 'default') { $scheme_name = $f; $scheme_choices[$f] = $scheme_name; @@ -111,28 +111,28 @@ function frio_form($arr) } } - $background_image_help = "" . L10n::t("Note") . ": " . L10n::t("Check image permissions if all users are allowed to visit the image"); + $background_image_help = '' . L10n::t('Note') . ': ' . L10n::t('Check image permissions if all users are allowed to visit the image'); $t = get_markup_template('theme_settings.tpl'); $ctx = [ '$submit' => L10n::t('Submit'), '$baseurl' => System::baseUrl(), - '$title' => L10n::t("Theme settings"), - '$schema' => ['frio_schema', L10n::t("Select scheme"), $arr["schema"], '', $scheme_choices], - '$nav_bg' => array_key_exists("nav_bg", $disable) ? "" : ['frio_nav_bg', L10n::t('Navigation bar background color'), $arr['nav_bg'], '', false], - '$nav_icon_color' => array_key_exists("nav_icon_color", $disable) ? "" : ['frio_nav_icon_color', L10n::t('Navigation bar icon color '), $arr['nav_icon_color'], '', false], - '$link_color' => array_key_exists("link_color", $disable) ? "" : ['frio_link_color', L10n::t('Link color'), $arr['link_color'], '', false], - '$bgcolor' => array_key_exists("bgcolor", $disable) ? "" : ['frio_background_color', L10n::t('Set the background color'), $arr['bgcolor'], '', false], - '$contentbg_transp' => array_key_exists("contentbg_transp", $disable) ? "" : ['frio_contentbg_transp', L10n::t("Content background opacity"), ((isset($arr["contentbg_transp"]) && $arr["contentbg_transp"] != "") ? $arr["contentbg_transp"] : 100), ''], - '$background_image' => array_key_exists("background_image", $disable) ? "" : ['frio_background_image', L10n::t('Set the background image'), $arr['background_image'], $background_image_help, false], + '$title' => L10n::t('Theme settings'), + '$schema' => ['frio_schema', L10n::t('Select scheme'), $arr['schema'], '', $scheme_choices], + '$nav_bg' => array_key_exists('nav_bg', $disable) ? '' : ['frio_nav_bg', L10n::t('Navigation bar background color'), $arr['nav_bg'], '', false], + '$nav_icon_color' => array_key_exists('nav_icon_color', $disable) ? '' : ['frio_nav_icon_color', L10n::t('Navigation bar icon color '), $arr['nav_icon_color'], '', false], + '$link_color' => array_key_exists('link_color', $disable) ? '' : ['frio_link_color', L10n::t('Link color'), $arr['link_color'], '', false], + '$bgcolor' => array_key_exists('bgcolor', $disable) ? '' : ['frio_background_color', L10n::t('Set the background color'), $arr['bgcolor'], '', false], + '$contentbg_transp' => array_key_exists('contentbg_transp', $disable) ? '' : ['frio_contentbg_transp', L10n::t('Content background opacity'), ((isset($arr['contentbg_transp']) && $arr['contentbg_transp'] != '') ? $arr['contentbg_transp'] : 100), ''], + '$background_image' => array_key_exists('background_image', $disable) ? '' : ['frio_background_image', L10n::t('Set the background image'), $arr['background_image'], $background_image_help, false], '$bg_image_options' => Image::get_options($arr), ]; - if (array_key_exists("login_bg_image", $arr) && !array_key_exists("login_bg_image", $disable)) { + if (array_key_exists('login_bg_image', $arr) && !array_key_exists('login_bg_image', $disable)) { $ctx['$login_bg_image'] = ['frio_login_bg_image', L10n::t('Login page background image'), $arr['login_bg_image'], $background_image_help, false]; } - if (array_key_exists("login_bg_color", $arr) && !array_key_exists("login_bg_color", $disable)) { + if (array_key_exists('login_bg_color', $arr) && !array_key_exists('login_bg_color', $disable)) { $ctx['$login_bg_color'] = ['frio_login_bg_color', L10n::t('Login page background color'), $arr['login_bg_color'], L10n::t('Leave background image and color empty for theme defaults'), false]; } diff --git a/view/theme/frio/php/Image.php b/view/theme/frio/php/Image.php index f68e9cf077..2b3cf3be8c 100644 --- a/view/theme/frio/php/Image.php +++ b/view/theme/frio/php/Image.php @@ -21,10 +21,10 @@ class Image public static function get_options($arr) { $bg_image_options = [ - 'repeat' => ['frio_bg_image_option', L10n::t("Repeat the image"), "repeat", L10n::t("Will repeat your image to fill the background."), ($arr["bg_image_option"] == "repeat")], - 'stretch' => ['frio_bg_image_option', L10n::t("Stretch"), "stretch", L10n::t("Will stretch to width/height of the image."), ($arr["bg_image_option"] == "stretch")], - 'cover' => ['frio_bg_image_option', L10n::t("Resize fill and-clip"), "cover", L10n::t("Resize to fill and retain aspect ratio."), ($arr["bg_image_option"] == "cover")], - 'contain' => ['frio_bg_image_option', L10n::t("Resize best fit"), "contain", L10n::t("Resize to best fit and retain aspect ratio."), ($arr["bg_image_option"] == "contain")], + 'repeat' => ['frio_bg_image_option', L10n::t('Repeat the image'), 'repeat', L10n::t('Will repeat your image to fill the background.'), ($arr['bg_image_option'] == 'repeat')], + 'stretch' => ['frio_bg_image_option', L10n::t('Stretch'), 'stretch', L10n::t('Will stretch to width/height of the image.'), ($arr['bg_image_option'] == 'stretch')], + 'cover' => ['frio_bg_image_option', L10n::t('Resize fill and-clip'), 'cover', L10n::t('Resize to fill and retain aspect ratio.'), ($arr['bg_image_option'] == 'cover')], + 'contain' => ['frio_bg_image_option', L10n::t('Resize best fit'), 'contain', L10n::t('Resize to best fit and retain aspect ratio.'), ($arr['bg_image_option'] == 'contain')], ]; return $bg_image_options; diff --git a/view/theme/frio/php/schema.php b/view/theme/frio/php/schema.php index 1c959044de..29ad00e044 100644 --- a/view/theme/frio/php/schema.php +++ b/view/theme/frio/php/schema.php @@ -22,41 +22,41 @@ use Friendica\Core\PConfig; function get_schema_info($schema) { $theme = current_theme(); - $themepath = "view/theme/" . $theme . "/"; + $themepath = 'view/theme/' . $theme . '/'; $schema = PConfig::get(local_user(), 'frio', 'schema'); $info = [ 'name' => $schema, - 'description' => "", + 'description' => '', 'author' => [], - 'version' => "", + 'version' => '', 'overwrites' => [] ]; - if (!is_file($themepath . "schema/" . $schema . ".php")) return $info; + if (!is_file($themepath . 'schema/' . $schema . '.php')) return $info; - $f = file_get_contents($themepath . "schema/" . $schema . ".php"); + $f = file_get_contents($themepath . 'schema/' . $schema . '.php'); - $r = preg_match("|/\*.*\*/|msU", $f, $m); + $r = preg_match('|/\*.*\*/|msU', $f, $m); if ($r) { $ll = explode("\n", $m[0]); foreach ($ll as $l) { $l = trim($l, "\t\n\r */"); - if ($l != "") { - list($k, $v) = array_map("trim", explode(":", $l, 2)); + if ($l != '') { + list($k, $v) = array_map('trim', explode(':', $l, 2)); $k = strtolower($k); - if ($k == "author") { - $r = preg_match("|([^<]+)<([^>]+)>|", $v, $m); + if ($k == 'author') { + $r = preg_match('|([^<]+)<([^>]+)>|', $v, $m); if ($r) { $info['author'][] = ['name' => $m[1], 'link' => $m[2]]; } else { $info['author'][] = ['name' => $v]; } - } elseif ($k == "overwrites") { + } elseif ($k == 'overwrites') { $theme_settings = explode(',', str_replace(' ', '', $v)); foreach ($theme_settings as $key => $value) { - $info["overwrites"][$value] = true; + $info['overwrites'][$value] = true; } } else { if (array_key_exists($k, $info)) { diff --git a/view/theme/frio/php/standard.php b/view/theme/frio/php/standard.php index edfec573b0..64c4544cd8 100644 --- a/view/theme/frio/php/standard.php +++ b/view/theme/frio/php/standard.php @@ -16,7 +16,7 @@ -"; + Skip to main content module !== 'install') { PConfig::load($uid, 'frio'); // Load the profile owners pconfig. - $schema = PConfig::get($uid, "frio", "schema"); - $nav_bg = PConfig::get($uid, "frio", "nav_bg"); - $nav_icon_color = PConfig::get($uid, "frio", "nav_icon_color"); - $link_color = PConfig::get($uid, "frio", "link_color"); - $bgcolor = PConfig::get($uid, "frio", "background_color"); - $contentbg_transp = PConfig::get($uid, "frio", "contentbg_transp"); - $background_image = PConfig::get($uid, "frio", "background_image"); - $bg_image_option = PConfig::get($uid, "frio", "bg_image_option"); - $modified = PConfig::get($uid, "frio", "css_modified"); + $schema = PConfig::get($uid, 'frio', 'schema'); + $nav_bg = PConfig::get($uid, 'frio', 'nav_bg'); + $nav_icon_color = PConfig::get($uid, 'frio', 'nav_icon_color'); + $link_color = PConfig::get($uid, 'frio', 'link_color'); + $bgcolor = PConfig::get($uid, 'frio', 'background_color'); + $contentbg_transp = PConfig::get($uid, 'frio', 'contentbg_transp'); + $background_image = PConfig::get($uid, 'frio', 'background_image'); + $bg_image_option = PConfig::get($uid, 'frio', 'bg_image_option'); + $modified = PConfig::get($uid, 'frio', 'css_modified'); // There is maybe the case that the user did never modify the theme settings. // In this case we store the present time. @@ -38,17 +38,17 @@ if ($a->module !== 'install') { Config::load('frio'); // Load frios system config. - $schema = Config::get("frio", "schema"); - $nav_bg = Config::get("frio", "nav_bg"); - $nav_icon_color = Config::get("frio", "nav_icon_color"); - $link_color = Config::get("frio", "link_color"); - $bgcolor = Config::get("frio", "background_color"); - $contentbg_transp = Config::get("frio", "contentbg_transp"); - $background_image = Config::get("frio", "background_image"); - $bg_image_option = Config::get("frio", "bg_image_option"); - $login_bg_image = Config::get("frio", "login_bg_image"); - $login_bg_color = Config::get("frio", "login_bg_color"); - $modified = Config::get("frio", "css_modified"); + $schema = Config::get('frio', 'schema'); + $nav_bg = Config::get('frio', 'nav_bg'); + $nav_icon_color = Config::get('frio', 'nav_icon_color'); + $link_color = Config::get('frio', 'link_color'); + $bgcolor = Config::get('frio', 'background_color'); + $contentbg_transp = Config::get('frio', 'contentbg_transp'); + $background_image = Config::get('frio', 'background_image'); + $bg_image_option = Config::get('frio', 'bg_image_option'); + $login_bg_image = Config::get('frio', 'login_bg_image'); + $login_bg_color = Config::get('frio', 'login_bg_color'); + $modified = Config::get('frio', 'css_modified'); // There is maybe the case that the user did never modify the theme settings. // In this case we store the present time. @@ -68,7 +68,7 @@ if (x($_REQUEST, 'schema')) { } // Sanitize the data. -$schema = !empty($schema) ? basename($schema) : ""; +$schema = !empty($schema) ? basename($schema) : ''; if (($schema) && ($schema != '---')) { @@ -96,10 +96,10 @@ if (!$schema) { //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting //individually. If we don't, we'll have problems if a user has set one, but not all options. -$nav_bg = (empty($nav_bg) ? "#708fa0" : $nav_bg); -$nav_icon_color = (empty($nav_icon_color) ? "#fff" : $nav_icon_color); -$link_color = (empty($link_color) ? "#6fdbe8" : $link_color); -$bgcolor = (empty($bgcolor) ? "#ededed" : $bgcolor); +$nav_bg = (empty($nav_bg) ? '#708fa0' : $nav_bg); +$nav_icon_color = (empty($nav_icon_color) ? '#fff' : $nav_icon_color); +$link_color = (empty($link_color) ? '#6fdbe8' : $link_color); +$bgcolor = (empty($bgcolor) ? '#ededed' : $bgcolor); // The background image can not be empty. So we use a dummy jpg if no image was set. $background_image = (empty($background_image) ? 'img/none.jpg' : $background_image); $modified = (empty($modified) ? time() : $modified); @@ -109,9 +109,9 @@ $modified = (empty($modified) ? time() : $modified); if (empty($login_bg_image) && empty($login_bg_color)) { $login_bg_image = 'img/login_bg.jpg'; } -$login_bg_color = (empty($login_bg_color) ? "#ededed" : $login_bg_color); +$login_bg_color = (empty($login_bg_color) ? '#ededed' : $login_bg_color); -$contentbg_transp = ((isset($contentbg_transp) && $contentbg_transp != "") ? $contentbg_transp : 100); +$contentbg_transp = ((isset($contentbg_transp) && $contentbg_transp != '') ? $contentbg_transp : 100); // Calculate some colors in dependance of existing colors. // Some colors are calculated to don't have too many selection @@ -153,21 +153,21 @@ if (!isset($bg_image_option)) { $bg_image_option = null; } switch ($bg_image_option) { - case "stretch": - $background_size_img = "100%"; + case 'stretch': + $background_size_img = '100%'; break; - case "cover": - $background_size_img = "cover"; + case 'cover': + $background_size_img = 'cover'; break; - case "repeat": - $background_size_img = "auto"; + case 'repeat': + $background_size_img = 'auto'; break; - case "contain": - $background_size_img = "contain"; + case 'contain': + $background_size_img = 'contain'; break; default: - $background_size_img = "auto"; + $background_size_img = 'auto'; break; } @@ -219,7 +219,7 @@ header('Last-Modified: ' . $modified); // Only send the CSS file if it was changed. if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || isset($_SERVER['HTTP_IF_NONE_MATCH'])) { $cached_modified = gmdate('r', strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE'])); - $cached_etag = str_replace(['"', "-gzip"], ['', ''], + $cached_etag = str_replace(['"', '-gzip'], ['', ''], stripslashes($_SERVER['HTTP_IF_NONE_MATCH'])); if (($cached_modified == $modified) && ($cached_etag == $etag)) { diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php index 74b1577ddf..4f5756caf9 100644 --- a/view/theme/frio/theme.php +++ b/view/theme/frio/theme.php @@ -18,7 +18,7 @@ use Friendica\Core\System; use Friendica\Database\DBM; use Friendica\Model\Profile; -$frio = "view/theme/frio"; +$frio = 'view/theme/frio'; global $frio; @@ -34,21 +34,21 @@ function frio_init(App $a) $style = PConfig::get(local_user(), 'frio', 'style'); - $frio = "view/theme/frio"; + $frio = 'view/theme/frio'; global $frio; // if the device is a mobile device set js is_mobile // variable so the js scripts can use this information if ($a->is_mobile || $a->is_tablet) { - $a->page["htmlhead"] .= <<< EOT + $a->page['htmlhead'] .= <<< EOT EOT; } - if ($style == "") { + if ($style == '') { $style = Config::get('frio', 'style'); } } @@ -62,7 +62,7 @@ function frio_install() Addon::registerHook('acl_lookup_end', 'view/theme/frio/theme.php', 'frio_acl_lookup'); Addon::registerHook('display_item', 'view/theme/frio/theme.php', 'frio_display_item'); - logger("installed theme frio"); + logger('installed theme frio'); } function frio_uninstall() @@ -74,7 +74,7 @@ function frio_uninstall() Addon::unregisterHook('acl_lookup_end', 'view/theme/frio/theme.php', 'frio_acl_lookup'); Addon::unregisterHook('display_item', 'view/theme/frio/theme.php', 'frio_display_item'); - logger("uninstalled theme frio"); + logger('uninstalled theme frio'); } /** @@ -92,26 +92,26 @@ function frio_uninstall() function frio_item_photo_links(App $a, &$body_info) { $occurence = 0; - $p = Plaintext::getBoundariesPosition($body_info['html'], ""); + $p = Plaintext::getBoundariesPosition($body_info['html'], ''); while ($p !== false && ($occurence++ < 500)) { $link = substr($body_info['html'], $p['start'], $p['end'] - $p['start']); $matches = []; - preg_match("/\/photos\/[\w]+\/image\/([\w]+)/", $link, $matches); + preg_match('/\/photos\/[\w]+\/image\/([\w]+)/', $link, $matches); if ($matches) { // Replace the link for the photo's page with a direct link to the photo itself $newlink = str_replace($matches[0], "/photo/{$matches[1]}", $link); // Add a "quiet" parameter to any redir links to prevent the "XX welcomes YY" info boxes - $newlink = preg_replace("/href=\"([^\"]+)\/redir\/([^\"]+)&url=([^\"]+)\"/", 'href="$1/redir/$2&quiet=1&url=$3"', $newlink); + $newlink = preg_replace('/href="([^"]+)\/redir\/([^"]+)&url=([^"]+)"/', 'href="$1/redir/$2&quiet=1&url=$3"', $newlink); // Having any arguments to the link for Colorbox causes it to fetch base64 code instead of the image - $newlink = preg_replace("/\/[?&]zrl=([^&\"]+)/", '', $newlink); + $newlink = preg_replace('/\/[?&]zrl=([^&"]+)/', '', $newlink); $body_info['html'] = str_replace($link, $newlink, $body_info['html']); } - $p = Plaintext::getBoundariesPosition($body_info['html'], "", $occurence); + $p = Plaintext::getBoundariesPosition($body_info['html'], '', $occurence); } } @@ -127,10 +127,10 @@ function frio_item_photo_links(App $a, &$body_info) */ function frio_item_photo_menu(App $a, &$arr) { - foreach ($arr["menu"] as $k => $v) { + foreach ($arr['menu'] as $k => $v) { if (strpos($v, 'poke/?f=&c=') === 0 || strpos($v, 'message/new/') === 0) { - $v = "javascript:addToModal('" . $v . "'); return false;"; - $arr["menu"][$k] = $v; + $v = 'javascript:addToModal(\'' . $v . '\'); return false;'; + $arr['menu'][$k] = $v; } } } @@ -149,9 +149,9 @@ function frio_item_photo_menu(App $a, &$arr) */ function frio_contact_photo_menu(App $a, &$args) { - $cid = $args["contact"]["id"]; - $pokelink = $args["menu"]["poke"][1]; - $pmlink = $args["menu"]["pm"][1]; + $cid = $args['contact']['id']; + $pokelink = $args['menu']['poke'][1]; + $pmlink = $args['menu']['pm'][1]; // Set the the indicator for opening the status, profile and photo pages // in a new tab to false if the contact a dfrn (friendica) contact @@ -160,12 +160,12 @@ function frio_contact_photo_menu(App $a, &$args) // friendica servers as remote user or visitor // // The value for opening in a new tab is e.g. when - // $args["menu"]["status"][2] is true. If the value of the [2] key is true + // $args['menu']['status'][2] is true. If the value of the [2] key is true // and if it's a friendica contact we set it to false - foreach ($args["menu"] as $k => $v) { - if ($k === "status" || $k === "profile" || $k === "photos") { - $v[2] = (($args["contact"]["network"] === "dfrn") ? false : true); - $args["menu"][$k][2] = $v[2]; + foreach ($args['menu'] as $k => $v) { + if ($k === 'status' || $k === 'profile' || $k === 'photos') { + $v[2] = (($args['contact']['network'] === 'dfrn') ? false : true); + $args['menu'][$k][2] = $v[2]; } } @@ -173,11 +173,11 @@ function frio_contact_photo_menu(App $a, &$args) // Later we can make conditions in the corresponing templates (e.g. // contact_template.tpl) if (strpos($pokelink, 'poke/?f=&c=' . $cid) !== false) { - $args["menu"]["poke"][3] = "modal"; + $args['menu']['poke'][3] = 'modal'; } if (strpos($pmlink, 'message/new/' . $cid) !== false) { - $args["menu"]["pm"][3] = "modal"; + $args['menu']['pm'][3] = 'modal'; } } @@ -231,43 +231,43 @@ function frio_remote_nav($a, &$nav) // user info $r = q("SELECT `micro` FROM `contact` WHERE `uid` = %d AND `self`", intval($a->user['uid'])); - $r[0]['photo'] = (DBM::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : "images/person-48.jpg"); + $r[0]['photo'] = (DBM::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : 'images/person-48.jpg'); $r[0]['name'] = $a->user['username']; } elseif (!local_user() && remote_user()) { $r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user())); - $nav['remote'] = L10n::t("Guest"); + $nav['remote'] = L10n::t('Guest'); } elseif (Profile::getMyURL()) { $r = q("SELECT `name`, `nick`, `photo` FROM `gcontact` WHERE `addr` = '%s' AND `network` = 'dfrn'", dbesc($webbie)); - $nav['remote'] = L10n::t("Visitor"); + $nav['remote'] = L10n::t('Visitor'); } else { $r = false; } if (DBM::is_result($r)) { $nav['userinfo'] = [ - 'icon' => (DBM::is_result($r) ? $r[0]['photo'] : "images/person-48.jpg"), + 'icon' => (DBM::is_result($r) ? $r[0]['photo'] : 'images/person-48.jpg'), 'name' => $r[0]['name'], ]; } if (!local_user() && !empty($server_url)) { - $nav['logout'] = [$server_url . '/logout', L10n::t('Logout'), "", L10n::t('End this session')]; + $nav['logout'] = [$server_url . '/logout', L10n::t('Logout'), '', L10n::t('End this session')]; // user menu - $nav['usermenu'][] = [$server_url . '/profile/' . $a->user['nickname'], L10n::t('Status'), "", L10n::t('Your posts and conversations')]; - $nav['usermenu'][] = [$server_url . '/profile/' . $a->user['nickname'] . '?tab=profile', L10n::t('Profile'), "", L10n::t('Your profile page')]; - $nav['usermenu'][] = [$server_url . '/photos/' . $a->user['nickname'], L10n::t('Photos'), "", L10n::t('Your photos')]; - $nav['usermenu'][] = [$server_url . '/videos/' . $a->user['nickname'], L10n::t('Videos'), "", L10n::t('Your videos')]; - $nav['usermenu'][] = [$server_url . '/events/', L10n::t('Events'), "", L10n::t('Your events')]; + $nav['usermenu'][] = [$server_url . '/profile/' . $a->user['nickname'], L10n::t('Status'), '', L10n::t('Your posts and conversations')]; + $nav['usermenu'][] = [$server_url . '/profile/' . $a->user['nickname'] . '?tab=profile', L10n::t('Profile'), '', L10n::t('Your profile page')]; + $nav['usermenu'][] = [$server_url . '/photos/' . $a->user['nickname'], L10n::t('Photos'), '', L10n::t('Your photos')]; + $nav['usermenu'][] = [$server_url . '/videos/' . $a->user['nickname'], L10n::t('Videos'), '', L10n::t('Your videos')]; + $nav['usermenu'][] = [$server_url . '/events/', L10n::t('Events'), '', L10n::t('Your events')]; // navbar links - $nav['network'] = [$server_url . '/network', L10n::t('Network'), "", L10n::t('Conversations from your friends')]; - $nav['events'] = [$server_url . '/events', L10n::t('Events'), "", L10n::t('Events and Calendar')]; - $nav['messages'] = [$server_url . '/message', L10n::t('Messages'), "", L10n::t('Private mail')]; - $nav['settings'] = [$server_url . '/settings', L10n::t('Settings'), "", L10n::t('Account settings')]; - $nav['contacts'] = [$server_url . '/contacts', L10n::t('Contacts'), "", L10n::t('Manage/edit friends and contacts')]; + $nav['network'] = [$server_url . '/network', L10n::t('Network'), '', L10n::t('Conversations from your friends')]; + $nav['events'] = [$server_url . '/events', L10n::t('Events'), '', L10n::t('Events and Calendar')]; + $nav['messages'] = [$server_url . '/message', L10n::t('Messages'), '', L10n::t('Private mail')]; + $nav['settings'] = [$server_url . '/settings', L10n::t('Settings'), '', L10n::t('Account settings')]; + $nav['contacts'] = [$server_url . '/contacts', L10n::t('Contacts'), '', L10n::t('Manage/edit friends and contacts')]; $nav['sitename'] = $a->config['sitename']; } } @@ -289,17 +289,17 @@ function frio_acl_lookup(App $a, &$results) { require_once 'mod/contacts.php'; - $nets = x($_GET, "nets") ? notags(trim($_GET["nets"])) : ""; + $nets = x($_GET, 'nets') ? notags(trim($_GET['nets'])) : ''; // we introduce a new search type, r should do the same query like it's // done in /mod/contacts for connections - if ($results["type"] !== "r") { + if ($results['type'] !== 'r') { return; } $sql_extra = ''; - if ($results["search"]) { - $search_txt = dbesc(protect_sprintf(preg_quote($results["search"]))); + if ($results['search']) { + $search_txt = dbesc(protect_sprintf(preg_quote($results['search']))); $sql_extra .= " AND (`attag` LIKE '%%" . dbesc($search_txt) . "%%' OR `name` LIKE '%%" . dbesc($search_txt) . "%%' OR `nick` LIKE '%%" . dbesc($search_txt) . "%%') "; } @@ -311,7 +311,7 @@ function frio_acl_lookup(App $a, &$results) $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra ", intval($_SESSION['uid'])); if (DBM::is_result($r)) { - $total = $r[0]["total"]; + $total = $r[0]['total']; } $sql_extra3 = Widget::unavailableNetworks(); @@ -328,8 +328,8 @@ function frio_acl_lookup(App $a, &$results) } } - $results["items"] = $contacts; - $results["tot"] = $total; + $results['items'] = $contacts; + $results['tot'] = $total; } /**