X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Fvier%2Ftheme.php;h=0f81200890be8b702c22761669b2a08b731f93ac;hb=7499824381b3cb4a90f0d126e3eaeb4b3b786cc4;hp=a42dfe6e13070d0b4d2cf2c58a8b0be8528ecf14;hpb=60552260e1ea446e097ba2e6b7a4d7cec6fcd33b;p=friendica.git
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index a42dfe6e13..0f81200890 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -9,17 +9,24 @@
* 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\Content\ForumManager;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Model\GlobalContact;
+
require_once "include/plugin.php";
-require_once "include/socgraph.php";
require_once "mod/proxy.php";
function vier_init(App $a) {
$a->theme_events_in_profile = false;
- set_template_engine($a, 'smarty3');
+ $a->set_template_engine('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 +55,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,22 +101,22 @@ 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) {
- $result = get_pconfig(local_user(), "vier", $key);
- if ($result !== false) {
+ if (local_user() && !$admin) {
+ $result = PConfig::get(local_user(), "vier", $key);
+ if (!is_null($result)) {
return $result;
}
}
- $result = get_config("vier", $key);
- if ($result !== false) {
+ $result = Config::get("vier", $key);
+ if (!is_null($result)) {
return $result;
}
@@ -135,16 +134,15 @@ 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
if ($show_profiles) {
-
- $r = suggestion_query(local_user(), 0, 9);
+ $r = GlobalContact::suggestionQuery(local_user(), 0, 9);
$tpl = get_markup_template('ch_directory_item.tpl');
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$aside['$comunity_profiles_title'] = t('Community Profiles');
$aside['$comunity_profiles_items'] = array();
@@ -164,7 +162,7 @@ function vier_community_info() {
// last 9 users
if ($show_lastusers) {
- $publish = (get_config('system', 'publish_all') ? '' : " AND `publish` = 1 ");
+ $publish = (Config::get('system', 'publish_all') ? '' : " AND `publish` = 1 ");
$order = " ORDER BY `register_date` DESC ";
$tpl = get_markup_template('ch_directory_item.tpl');
@@ -174,7 +172,7 @@ function vier_community_info() {
WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $order LIMIT %d , %d ",
0, 9);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$aside['$lastusers_title'] = t('Last users');
$aside['$lastusers_items'] = array();
@@ -192,7 +190,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,10 +210,7 @@ function vier_community_info() {
}
//Community_Pages at right_aside
- if ($show_pages AND local_user()) {
-
- require_once 'include/ForumManager.php';
-
+ if ($show_pages && local_user()) {
if (x($_GET, 'cid') && intval($_GET['cid']) != 0) {
$cid = $_GET['cid'];
}
@@ -223,16 +218,14 @@ function vier_community_info() {
//sort by last updated item
$lastitem = true;
- $contacts = ForumManager::get_list($a->user['uid'],true,$lastitem, true);
+ $contacts = ForumManager::getList($a->user['uid'], $lastitem, true, true);
$total = count($contacts);
$visible_forums = 10;
if (count($contacts)) {
-
$id = 0;
foreach ($contacts as $contact) {
-
$selected = (($cid == $contact['id']) ? ' forum-selected' : '');
$entry = array(
@@ -241,7 +234,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;
@@ -250,14 +243,16 @@ function vier_community_info() {
$tpl = get_markup_template('widget_forumlist_right.tpl');
- $page .= replace_macros($tpl, array(
- '$title' => t('Forums'),
- '$forums' => $entries,
- '$link_desc' => t('External link to forum'),
- '$total' => $total,
- '$visible_forums' => $visible_forums,
- '$showmore' => t('show more'),
- ));
+ $page .= replace_macros(
+ $tpl,
+ array(
+ '$title' => t('Forums'),
+ '$forums' => $entries,
+ '$link_desc' => t('External link to forum'),
+ '$total' => $total,
+ '$visible_forums' => $visible_forums,
+ '$showmore' => t('show more'))
+ );
$aside['$page'] = $page;
}
@@ -268,7 +263,7 @@ function vier_community_info() {
if ($show_helpers) {
$r = array();
- $helperlist = get_config("vier", "helperlist");
+ $helperlist = Config::get("vier", "helperlist");
$helpers = explode(",",$helperlist);
@@ -378,13 +373,13 @@ 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") && !Config::get("system","imap_disabled") && !Config::get("system","dfrn_only")) {
$r[] = array("photo" => "images/mail.png", "name" => "E-Mail");
}
$tpl = get_markup_template('ch_connectors.tpl');
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$con_services = array();
$con_services['title'] = array("", t('Connect Services'), "", "");