X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Ffrio%2Ftheme.php;h=72e5ab0b6140b693464ec8d8170e19281d008bdd;hb=253ac95ca03be59ad52acd2d457294b14400e087;hp=3c4d5120cf84dc46e9cf14e6c6ce69a210c2aebe;hpb=30c1cc0e8cec5438fd8fe36bd4ea00991dc01934;p=friendica.git
diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 3c4d5120cf..72e5ab0b61 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -2,22 +2,23 @@
/*
* Name: frio
* Description: Bootstrap V3 theme. The theme is currently under construction, so it is far from finished. For further information have a look at the ReadMe.
- * Version: V.0.8
+ * Version: V.0.8.5
* Author: Rabuzarus
*
*/
+
use Friendica\App;
+use Friendica\Content\Text\Plaintext;
use Friendica\Content\Widget;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
use Friendica\Model\Profile;
-use Friendica\Object\Image;
-$frio = "view/theme/frio";
+$frio = 'view/theme/frio';
global $frio;
@@ -33,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');
}
}
@@ -61,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()
@@ -73,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');
}
/**
@@ -90,29 +91,27 @@ function frio_uninstall()
*/
function frio_item_photo_links(App $a, &$body_info)
{
- $phototypes = Image::supportedTypes();
- $occurence = 1;
- $p = bb_find_open_close($body_info['html'], "");
-
+ $occurence = 0;
+ $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 = bb_find_open_close($body_info['html'], "", $occurence);
+ $p = Plaintext::getBoundariesPosition($body_info['html'], '', $occurence);
}
}
@@ -128,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;
}
}
}
@@ -150,9 +149,19 @@ 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'];
+
+ if (!empty($args['menu']['poke'])) {
+ $pokelink = $args['menu']['poke'][1];
+ } else {
+ $pokelink = '';
+ }
+
+ if (!empty($args['menu']['poke'])) {
+ $pmlink = $args['menu']['pm'][1];
+ } else {
+ $pmlink = '';
+ }
// 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
@@ -161,12 +170,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];
}
}
@@ -174,11 +183,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';
}
}
@@ -218,6 +227,7 @@ function frio_remote_nav($a, &$nav)
// And construct a webbie (e.g. mickey@friendica.domain.com for the search in gcontact
// We use the webbie for search in gcontact because we don't know if gcontact table stores
// the right value if its http or https protocol
+ $webbie = '';
if (count($url_parts)) {
$server_url = $url_parts[1] . $url_parts[2];
$webbie = $url_parts[4] . '@' . $url_parts[2];
@@ -231,44 +241,44 @@ 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'] = (DBA::isResult($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");
+ DBA::escape($webbie));
+ $nav['remote'] = L10n::t('Visitor');
} else {
$r = false;
}
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
$nav['userinfo'] = [
- 'icon' => (DBM::is_result($r) ? $r[0]['photo'] : "images/person-48.jpg"),
+ 'icon' => (DBA::isResult($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['sitename'] = $a->config['sitename'];
+ $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'] = Config::get('config', 'sitename');
}
}
@@ -289,33 +299,29 @@ 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;
}
- $searching = false;
- if ($results["search"]) {
- $search_txt = dbesc(protect_sprintf(preg_quote($results["search"])));
- $searching = true;
- }
-
$sql_extra = '';
- if ($searching) {
- $sql_extra .= " AND (`attag` LIKE '%%" . dbesc($search_txt) . "%%' OR `name` LIKE '%%" . dbesc($search_txt) . "%%' OR `nick` LIKE '%%" . dbesc($search_txt) . "%%') ";
+ if ($results['search']) {
+ $search_txt = DBA::escape(protect_sprintf(preg_quote($results['search'])));
+ $sql_extra .= " AND (`attag` LIKE '%%" . $search_txt . "%%' OR `name` LIKE '%%" . $search_txt . "%%' OR `nick` LIKE '%%" . $search_txt . "%%') ";
}
if ($nets) {
- $sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
+ $sql_extra .= sprintf(" AND network = '%s' ", DBA::escape($nets));
}
+ $total = 0;
$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"];
+ if (DBA::isResult($r)) {
+ $total = $r[0]['total'];
}
$sql_extra3 = Widget::unavailableNetworks();
@@ -326,14 +332,14 @@ function frio_acl_lookup(App $a, &$results)
$contacts = [];
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
foreach ($r as $rr) {
$contacts[] = _contact_detail_for_template($rr);
}
}
- $results["items"] = $contacts;
- $results["tot"] = $total;
+ $results['items'] = $contacts;
+ $results['tot'] = $total;
}
/**
@@ -350,7 +356,12 @@ function frio_display_item(App $a, &$arr)
{
// Add subthread to the item menu
$subthread = [];
- if (local_user() == $arr['item']['uid'] && $arr['item']['parent'] == $arr['item']['id'] && !$arr['item']['self']) {
+ if (
+ local_user()
+ && local_user() == $arr['item']['uid']
+ && $arr['item']['parent'] == $arr['item']['id']
+ && !$arr['item']['self'])
+ {
$subthread = [
'menu' => 'follow_thread',
'title' => L10n::t('Follow Thread'),