X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Ffrio%2Ftheme.php;h=a61810f99e4196b9387ab5be4c9852d8a866ea43;hb=0eef382e82c689330ea5071af8e4fb98638ab0df;hp=a873e45131ca82a267dc5c4e57b1d0e9bfabed37;hpb=ffbf330585a5766fcd16e99e10ff56a6c0af0cbd;p=friendica.git
diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index a873e45131..a61810f99e 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -2,63 +2,85 @@
/*
* 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.7
+ * Version: V.0.8.5
* Author: Rabuzarus
*
*/
-$frio = "view/theme/frio";
+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\Logger;
+use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\Model;
+use Friendica\Module;
+use Friendica\Util\Strings;
+
+$frio = 'view/theme/frio';
global $frio;
-function frio_init(App $a) {
-
+function frio_init(App $a)
+{
// disable the events module link in the profile tab
$a->theme_events_in_profile = false;
+ $a->videowidth = 622;
- set_template_engine($a, 'smarty3');
+ Renderer::setActiveTemplateEngine('smarty3');
- $baseurl = App::get_baseurl();
+ $baseurl = System::baseUrl();
- $style = get_pconfig(local_user(), 'frio', 'style');
+ $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
-
EOT;
- }
+ }
- if ($style == "")
- $style = get_config('frio', 'style');
+ if ($style == '') {
+ $style = Config::get('frio', 'style');
+ }
}
-function frio_install() {
- register_hook('prepare_body_final', 'view/theme/frio/theme.php', 'frio_item_photo_links');
- register_hook('item_photo_menu', 'view/theme/frio/theme.php', 'frio_item_photo_menu');
- register_hook('contact_photo_menu', 'view/theme/frio/theme.php', 'frio_contact_photo_menu');
- register_hook('nav_info', 'view/theme/frio/theme.php', 'frio_remote_nav');
- register_hook('acl_lookup_end', 'view/theme/frio/theme.php', 'frio_acl_lookup');
+function frio_install()
+{
+ Addon::registerHook('prepare_body_final', 'view/theme/frio/theme.php', 'frio_item_photo_links');
+ Addon::registerHook('item_photo_menu', 'view/theme/frio/theme.php', 'frio_item_photo_menu');
+ Addon::registerHook('contact_photo_menu', 'view/theme/frio/theme.php', 'frio_contact_photo_menu');
+ Addon::registerHook('nav_info', 'view/theme/frio/theme.php', 'frio_remote_nav');
+ 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::log('installed theme frio');
}
-function frio_uninstall() {
- unregister_hook('prepare_body_final', 'view/theme/frio/theme.php', 'frio_item_photo_links');
- unregister_hook('item_photo_menu', 'view/theme/frio/theme.php', 'frio_item_photo_menu');
- unregister_hook('contact_photo_menu', 'view/theme/frio/theme.php', 'frio_contact_photo_menu');
- unregister_hook('nav_info', 'view/theme/frio/theme.php', 'frio_remote_nav');
- unregister_hook('acl_lookup_end', 'view/theme/frio/theme.php', 'frio_acl_lookup');
+function frio_uninstall()
+{
+ Addon::unregisterHook('prepare_body_final', 'view/theme/frio/theme.php', 'frio_item_photo_links');
+ Addon::unregisterHook('item_photo_menu', 'view/theme/frio/theme.php', 'frio_item_photo_menu');
+ Addon::unregisterHook('contact_photo_menu', 'view/theme/frio/theme.php', 'frio_contact_photo_menu');
+ Addon::unregisterHook('nav_info', 'view/theme/frio/theme.php', 'frio_remote_nav');
+ 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::log('uninstalled theme frio');
}
+
/**
* @brief Replace friendica photo links hook
*
@@ -71,32 +93,29 @@ function frio_uninstall() {
* @param App $a Unused but required by hook definition
* @param array $body_info The item and its html output
*/
-function frio_item_photo_links(App $a, &$body_info) {
- require_once('include/Photo.php');
-
- $phototypes = Photo::supportedTypes();
- $occurence = 1;
- $p = bb_find_open_close($body_info['html'], "");
-
- while($p !== false && ($occurence++ < 500)) {
+function frio_item_photo_links(App $a, &$body_info)
+{
+ $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 = array();
+ $matches = [];
- preg_match("/\/photos\/[\w]+\/image\/([\w]+)/", $link, $matches);
- if($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);
+ // Having any arguments to the link for Colorbox causes it to fetch base64 code instead of the image
+ $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);
}
}
@@ -110,15 +129,14 @@ function frio_item_photo_links(App $a, &$body_info) {
* @param App $a Unused but required by the hook definition
* @param array $arr Contains item data and the original photo_menu
*/
-function frio_item_photo_menu(App $a, &$arr) {
-
- 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;
+function frio_item_photo_menu(App $a, &$arr)
+{
+ 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;
}
}
- $args = array('item' => $item, 'menu' => $menu);
}
/**
@@ -130,18 +148,24 @@ function frio_item_photo_menu(App $a, &$arr) {
* Additionally the profile, status and photo page links will be changed
* to don't open in a new tab if the contact is a friendica contact.
*
- * @param app $a The app data
+ * @param App $a The app data
* @param array $args Contains contact data and the original photo_menu
*/
-function frio_contact_photo_menu(App $a, &$args){
-
- $pokelink = "";
- $pmlink = "";
- $cid = "";
+function frio_contact_photo_menu(App $a, &$args)
+{
+ $cid = $args['contact']['id'];
+
+ if (!empty($args['menu']['poke'])) {
+ $pokelink = $args['menu']['poke'][1];
+ } else {
+ $pokelink = '';
+ }
- $cid = $args["contact"]["id"];
- $pokelink = $args["menu"]["poke"][1];
- $pmlink = $args["menu"]["pm"][1];
+ 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
@@ -150,25 +174,25 @@ 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];
}
}
// Add to pm and poke links a new key with the value 'modal'.
// 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";
-
- if(strpos($pmlink,'message/new/' . $cid) !== false)
- $args["menu"]["pm"][3] = "modal";
+ if (strpos($pokelink, 'poke/?f=&c=' . $cid) !== false) {
+ $args['menu']['poke'][3] = 'modal';
+ }
- $args = array('contact' => $contact, 'menu' => &$menu);
+ if (strpos($pmlink, 'message/new/' . $cid) !== false) {
+ $args['menu']['pm'][3] = 'modal';
+ }
}
/**
@@ -182,14 +206,16 @@ function frio_contact_photo_menu(App $a, &$args){
* Some links will point to the local pages because the user would expect
* local page (these pages are: search, community, help, apps, directory).
*
- * @param app $a The App class
+ * @param App $a The App class
* @param array $nav The original nav menu
*/
-function frio_remote_nav($a,&$nav) {
+function frio_remote_nav($a, &$nav)
+{
// get the homelink from $_XSESSION
- $homelink = get_my_url();
- if(! $homelink)
- $homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : '');
+ $homelink = Model\Profile::getMyURL();
+ if (!$homelink) {
+ $homelink = defaults($_SESSION, 'visitor_home', '');
+ }
// split up the url in it's parts (protocol,domain/directory, /profile/, nickname
// I'm not familiar with regex, so someone might find a better solutionen
@@ -205,64 +231,66 @@ 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
- if(count($url_parts)) {
+ $webbie = '';
+ if (count($url_parts)) {
$server_url = $url_parts[1] . $url_parts[2];
$webbie = $url_parts[4] . '@' . $url_parts[2];
}
// since $userinfo isn't available for the hook we write it to the nav array
// this isn't optimal because the contact query will be done now twice
- if(local_user()) {
+ if (local_user()) {
// empty the server url for local user because we won't need it
$server_url = '';
// 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->removeBaseURL($r[0]['micro']) : 'images/person-48.jpg');
$r[0]['name'] = $a->user['username'];
-
- } elseif(!local_user() && remote_user()) {
+ } elseif (!local_user() && remote_user()) {
$r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));
- $nav['remote'] = t("Guest");
-
- } elseif(get_my_url ()) {
+ $nav['remote'] = L10n::t('Guest');
+ } elseif (Model\Profile::getMyURL()) {
$r = q("SELECT `name`, `nick`, `photo` FROM `gcontact`
WHERE `addr` = '%s' AND `network` = 'dfrn'",
- dbesc($webbie));
- $nav['remote'] = t("Visitor");
+ DBA::escape($webbie));
+ $nav['remote'] = L10n::t('Visitor');
+ } else {
+ $r = false;
}
- if (dbm::is_result($r)){
- $nav['userinfo'] = array(
- 'icon' => (dbm::is_result($r) ? $r[0]['photo'] : "images/person-48.jpg"),
- 'name' => $r[0]['name'],
- );
- }
+ if (DBA::isResult($r)) {
+ $nav['userinfo'] = [
+ 'icon' => (DBA::isResult($r) ? $r[0]['photo'] : 'images/person-48.jpg'),
+ 'name' => $r[0]['name'],
+ ];
+ }
- if(!local_user() && !empty($server_url)) {
- $nav['logout'] = Array($server_url . '/logout', t('Logout'), "", t('End this session'));
+ if (!local_user() && !empty($server_url)) {
+ $nav['logout'] = [$server_url . '/logout', L10n::t('Logout'), '', L10n::t('End this session')];
// user menu
- $nav['usermenu'][] = Array($server_url . '/profile/' . $a->user['nickname'], t('Status'), "", t('Your posts and conversations'));
- $nav['usermenu'][] = Array($server_url . '/profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
- $nav['usermenu'][] = Array($server_url . '/photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
- $nav['usermenu'][] = Array($server_url . '/videos/' . $a->user['nickname'], t('Videos'), "", t('Your videos'));
- $nav['usermenu'][] = Array($server_url . '/events/', t('Events'), "", 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'] = array($server_url . '/network', t('Network'), "", t('Conversations from your friends'));
- $nav['events'] = Array($server_url . '/events', t('Events'), "", t('Events and Calendar'));
- $nav['messages'] = array($server_url . '/message', t('Messages'), "", t('Private mail'));
- $nav['settings'] = array($server_url . '/settings', t('Settings'),"", t('Account settings'));
- $nav['contacts'] = array($server_url . '/contacts', t('Contacts'),"", 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 . '/contact', L10n::t('Contacts'), '', L10n::t('Manage/edit friends and contacts')];
+ $nav['sitename'] = Config::get('config', 'sitename');
}
}
+
/**
* @brief: Search for contacts
*
* This function search for a users contacts. The code is copied from contact search
- * in /mod/contacts.php. With this function the contacts will permitted to acl_lookup()
+ * in /src/Module/Contact.php. With this function the contacts will permitted to acl_lookup()
* and can grabbed as json. For this we use the type="r". This is usful to to let js
* grab the contact data.
* We use this to give the data to textcomplete and have a filter function at the
@@ -271,51 +299,77 @@ function frio_remote_nav($a,&$nav) {
* @param App $a The app data @TODO Unused
* @param array $results The array with the originals from acl_lookup()
*/
-function frio_acl_lookup($a, &$results) {
- require_once("mod/contacts.php");
-
- $nets = ((x($_GET,"nets")) ? notags(trim($_GET["nets"])) : "");
+function frio_acl_lookup(App $a, &$results)
+{
+ $nets = !empty($_GET['nets']) ? Strings::escapeTags(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") {
- $searching = false;
- if ($search) {
- $search_hdr = $search;
- $search_txt = dbesc(protect_sprintf(preg_quote($search)));
- $searching = true;
- }
- $sql_extra .= (($searching) ? " AND (`attag` LIKE '%%".dbesc($search_txt)."%%' OR `name` LIKE '%%".dbesc($search_txt)."%%' OR `nick` LIKE '%%".dbesc($search_txt)."%%') " : "");
-
- if ($nets) {
- $sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
- }
+ // done in /src/Module/Contact.php for connections
+ if ($results['type'] !== 'r') {
+ return;
+ }
- $sql_extra2 = ((($sort_type > 0) && ($sort_type <= CONTACT_IS_FRIEND)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : '');
+ $sql_extra = '';
+ if ($results['search']) {
+ $search_txt = DBA::escape(Strings::protectSprintf(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' ", DBA::escape($nets));
+ }
- $r = q("SELECT COUNT(*) AS `total` FROM `contact`
- WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra $sql_extra2 ",
- intval($_SESSION['uid']));
- if (dbm::is_result($r)) {
- $total = $r[0]["total"];
- }
+ $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 (DBA::isResult($r)) {
+ $total = $r[0]['total'];
+ }
- $sql_extra3 = unavailable_networks();
+ $sql_extra3 = Widget::unavailableNetworks();
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra $sql_extra2 $sql_extra3 ORDER BY `name` ASC LIMIT 100 ",
- intval($_SESSION['uid'])
- );
+ $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra $sql_extra3 ORDER BY `name` ASC LIMIT %d, %d ",
+ intval($_SESSION['uid']), intval($results['start']), intval($results['count'])
+ );
- $contacts = array();
+ $contacts = [];
- if (dbm::is_result($r)) {
- foreach ($r as $rr) {
- $contacts[] = _contact_detail_for_template($rr);
- }
+ if (DBA::isResult($r)) {
+ foreach ($r as $rr) {
+ $contacts[] = Module\Contact::getContactTemplateVars($rr);
}
+ }
+
+ $results['items'] = $contacts;
+ $results['tot'] = $total;
+}
- $results["items"] = $contacts;
- $results["tot"] = $total;
+/**
+ * @brief Manipulate the data of the item
+ *
+ * At the moment we use this function to add some own stuff to the item menu
+ *
+ * @param App $a App $a The app data
+ * @param array $arr Array with the item and the item actions
+ * 'item' => Array with item data
+ * 'output' => Array with item actions
+ */
+function frio_display_item(App $a, &$arr)
+{
+ // Add subthread to the item menu
+ $subthread = [];
+ 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'),
+ 'action' => 'dosubthread(' . $arr['item']['id'] . '); return false;',
+ 'href' => '#'
+ ];
}
+ $arr['output']['subthread'] = $subthread;
}