X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Fvier%2Ftheme.php;h=b703173bbd9c7484044ff276b4798ba1ccd59dd5;hb=80dde20c64601b7819b14adb2fd4719dd62df5b0;hp=a35afa719bd5cd3207cef574f26ab8a756147c59;hpb=45ebeba643a6d600e8778475f70f827f32bf3146;p=friendica.git diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index a35afa719b..b703173bbd 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -9,9 +9,12 @@ * Description: "Vier" is a very compact and modern theme. It uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/ */ -require_once("include/plugin.php"); -require_once("include/socgraph.php"); -require_once("mod/proxy.php"); +use Friendica\App; +use Friendica\Core\System; + +require_once "include/plugin.php"; +require_once "include/socgraph.php"; +require_once "mod/proxy.php"; function vier_init(App $a) { @@ -19,7 +22,7 @@ function vier_init(App $a) { set_template_engine($a, 'smarty3'); - if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()) { + if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] || $a->argv[0] === "network" && local_user()) { vier_community_info(); $a->page['htmlhead'] .= "\n"; @@ -48,19 +51,11 @@ function insertFormatting(BBcode, id) { if (document.selection) { textarea.focus(); selected = document.selection.createRange(); - if (BBcode == "url") { - selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]"; - } else { - selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]"; - } + selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]"; } else if (textarea.selectionStart || textarea.selectionStart == "0") { var start = textarea.selectionStart; var end = textarea.selectionEnd; - if (BBcode == "url") { - textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); - } else { - textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); - } + textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); } return true; @@ -101,22 +96,25 @@ EOT; } // Hide the left menu bar - if (($a->page['aside'] == "") AND in_array($a->argv[0], array("community", "events", "help", "manage", "notifications", - "probe", "webfinger", "login", "invite", "credits"))) { + /// @TODO maybe move this static array out where it should belong? + if (($a->page['aside'] == "") && in_array($a->argv[0], array("community", "events", "help", "manage", "notifications", + "probe", "webfinger", "login", "invite", "credits"))) { $a->page['htmlhead'] .= ""; } } function get_vier_config($key, $default = false, $admin = false) { - if (local_user() AND !$admin) { + if (local_user() && !$admin) { $result = get_pconfig(local_user(), "vier", $key); - if ($result !== false) + if ($result !== false) { return $result; + } } $result = get_config("vier", $key); - if ($result !== false) + if ($result !== false) { return $result; + } return $default; } @@ -131,8 +129,8 @@ function vier_community_info() { $show_friends = get_vier_config("show_friends", 1); $show_lastusers = get_vier_config("show_lastusers", 1); - //get_baseurl - $url = App::get_baseurl($ssl_state); + // get_baseurl + $url = System::baseUrl($ssl_state); $aside['$url'] = $url; // comunity_profiles @@ -161,7 +159,7 @@ function vier_community_info() { // last 9 users if ($show_lastusers) { - $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 "); + $publish = (get_config('system', 'publish_all') ? '' : " AND `publish` = 1 "); $order = " ORDER BY `register_date` DESC "; $tpl = get_markup_template('ch_directory_item.tpl'); @@ -189,14 +187,14 @@ function vier_community_info() { } //right_aside FIND FRIENDS - if ($show_friends AND local_user()) { + if ($show_friends && local_user()) { $nv = array(); - $nv['title'] = Array("", t('Find Friends'), "", ""); - $nv['directory'] = Array('directory', t('Local Directory'), "", ""); + $nv['title'] = array("", t('Find Friends'), "", ""); + $nv['directory'] = array('directory', t('Local Directory'), "", ""); $nv['global_directory'] = Array(get_server(), t('Global Directory'), "", ""); - $nv['match'] = Array('match', t('Similar Interests'), "", ""); - $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); - $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); + $nv['match'] = array('match', t('Similar Interests'), "", ""); + $nv['suggest'] = array('suggest', t('Friend Suggestions'), "", ""); + $nv['invite'] = array('invite', t('Invite Friends'), "", ""); $nv['search'] = '