X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Fvier%2Ftheme.php;h=b703173bbd9c7484044ff276b4798ba1ccd59dd5;hb=80dde20c64601b7819b14adb2fd4719dd62df5b0;hp=a42dfe6e13070d0b4d2cf2c58a8b0be8528ecf14;hpb=60552260e1ea446e097ba2e6b7a4d7cec6fcd33b;p=friendica.git
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index a42dfe6e13..b703173bbd 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -9,6 +9,9 @@
* Description: "Vier" is a very compact and modern theme. It uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/
*/
+use Friendica\App;
+use Friendica\Core\System;
+
require_once "include/plugin.php";
require_once "include/socgraph.php";
require_once "mod/proxy.php";
@@ -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;
@@ -102,14 +97,14 @@ EOT;
// Hide the left menu bar
/// @TODO maybe move this static array out where it should belong?
- if (($a->page['aside'] == "") AND in_array($a->argv[0], array("community", "events", "help", "manage", "notifications",
+ 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) {
return $result;
@@ -135,7 +130,7 @@ function vier_community_info() {
$show_lastusers = get_vier_config("show_lastusers", 1);
// get_baseurl
- $url = App::get_baseurl($ssl_state);
+ $url = System::baseUrl($ssl_state);
$aside['$url'] = $url;
// comunity_profiles
@@ -192,7 +187,7 @@ 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'), "", "");
@@ -212,7 +207,7 @@ function vier_community_info() {
}
//Community_Pages at right_aside
- if ($show_pages AND local_user()) {
+ if ($show_pages && local_user()) {
require_once 'include/ForumManager.php';
@@ -241,7 +236,7 @@ function vier_community_info() {
'name' => $contact['name'],
'cid' => $contact['id'],
'selected' => $selected,
- 'micro' => App::remove_baseurl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)),
+ 'micro' => System::removedBaseUrl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)),
'id' => ++$id,
);
$entries[] = $entry;
@@ -378,7 +373,7 @@ function vier_community_info() {
$r[] = array("photo" => "images/wordpress.png", "name" => "Wordpress");
}
- if (function_exists("imap_open") AND !get_config("system","imap_disabled") AND !get_config("system","dfrn_only")) {
+ if (function_exists("imap_open") && !get_config("system","imap_disabled") && !get_config("system","dfrn_only")) {
$r[] = array("photo" => "images/mail.png", "name" => "E-Mail");
}