X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Ffrio%2Ftheme.php;h=9434b340d219fb35e80acbd06fb62652337972d6;hb=2bd62bfdea6ba720c43683a9b747f9c10d389084;hp=74b1577ddf2837788c90a9c27e2b84b7bc2bb249;hpb=79696a19e505ecded7b257f511ad1691ccb311f4;p=friendica.git diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php index 74b1577ddf..9434b340d2 100644 --- a/view/theme/frio/theme.php +++ b/view/theme/frio/theme.php @@ -2,7 +2,7 @@ /* * 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 * */ @@ -10,71 +10,62 @@ use Friendica\App; use Friendica\Content\Text\Plaintext; use Friendica\Content\Widget; -use Friendica\Core\Addon; use Friendica\Core\Config; +use Friendica\Core\Hook; use Friendica\Core\L10n; +use Friendica\Core\Logger; use Friendica\Core\PConfig; +use Friendica\Core\Renderer; use Friendica\Core\System; -use Friendica\Database\DBM; -use Friendica\Model\Profile; - -$frio = "view/theme/frio"; - -global $frio; +use Friendica\Database\DBA; +use Friendica\Model; +use Friendica\Module; +use Friendica\Util\Strings; function frio_init(App $a) { + global $frio; + $frio = 'view/theme/frio'; + // disable the events module link in the profile tab $a->theme_events_in_profile = false; $a->videowidth = 622; - $a->set_template_engine('smarty3'); - - $baseurl = System::baseUrl(); - - $style = PConfig::get(local_user(), 'frio', 'style'); - - $frio = "view/theme/frio"; - - global $frio; + Renderer::setActiveTemplateEngine('smarty3'); // 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 == "") { - $style = Config::get('frio', 'style'); - } } 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"); + Hook::register('prepare_body_final', 'view/theme/frio/theme.php', 'frio_item_photo_links'); + Hook::register('item_photo_menu', 'view/theme/frio/theme.php', 'frio_item_photo_menu'); + Hook::register('contact_photo_menu', 'view/theme/frio/theme.php', 'frio_contact_photo_menu'); + Hook::register('nav_info', 'view/theme/frio/theme.php', 'frio_remote_nav'); + Hook::register('acl_lookup_end', 'view/theme/frio/theme.php', 'frio_acl_lookup'); + Hook::register('display_item', 'view/theme/frio/theme.php', 'frio_display_item'); + + Logger::log('installed theme frio'); } 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"); + Hook::unregister('prepare_body_final', 'view/theme/frio/theme.php', 'frio_item_photo_links'); + Hook::unregister('item_photo_menu', 'view/theme/frio/theme.php', 'frio_item_photo_menu'); + Hook::unregister('contact_photo_menu', 'view/theme/frio/theme.php', 'frio_contact_photo_menu'); + Hook::unregister('nav_info', 'view/theme/frio/theme.php', 'frio_remote_nav'); + Hook::unregister('acl_lookup_end', 'view/theme/frio/theme.php', 'frio_acl_lookup'); + Hook::unregister('display_item', 'view/theme/frio/theme.php', 'frio_display_item'); + + Logger::log('uninstalled theme frio'); } /** @@ -92,26 +83,26 @@ function frio_uninstall() function frio_item_photo_links(App $a, &$body_info) { $occurence = 0; - $p = Plaintext::getBoundariesPosition($body_info['html'], ""); + $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 = Plaintext::getBoundariesPosition($body_info['html'], "", $occurence); + $p = Plaintext::getBoundariesPosition($body_info['html'], '', $occurence); } } @@ -127,10 +118,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; } } } @@ -149,9 +140,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 @@ -160,12 +161,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]; } } @@ -173,11 +174,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'; } } @@ -198,7 +199,7 @@ function frio_contact_photo_menu(App $a, &$args) function frio_remote_nav($a, &$nav) { // get the homelink from $_XSESSION - $homelink = Profile::getMyURL(); + $homelink = Model\Profile::getMyURL(); if (!$homelink) { $homelink = defaults($_SESSION, 'visitor_home', ''); } @@ -231,44 +232,46 @@ 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->removeBaseURL($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"); - } elseif (Profile::getMyURL()) { + $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'] = L10n::t("Visitor"); + DBA::escape($webbie)); + $nav['remote'] = L10n::t('Visitor'); } else { $r = false; } - if (DBM::is_result($r)) { + $remoteUser = null; + 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'], ]; + $remoteUser = $r[0]; } - if (!local_user() && !empty($server_url)) { - $nav['logout'] = [$server_url . '/logout', L10n::t('Logout'), "", L10n::t('End this session')]; + if (!local_user() && !empty($server_url) && !is_null($remoteUser)) { + $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/' . $remoteUser['nick'], L10n::t('Status'), '', L10n::t('Your posts and conversations')]; + $nav['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '?tab=profile', L10n::t('Profile'), '', L10n::t('Your profile page')]; + $nav['usermenu'][] = [$server_url . '/photos/' . $remoteUser['nick'], L10n::t('Photos'), '', L10n::t('Your photos')]; + $nav['usermenu'][] = [$server_url . '/videos/' . $remoteUser['nick'], 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 . '/contact', L10n::t('Contacts'), '', L10n::t('Manage/edit friends and contacts')]; + $nav['sitename'] = Config::get('config', 'sitename'); } } @@ -276,7 +279,7 @@ function frio_remote_nav($a, &$nav) * @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 @@ -287,49 +290,47 @@ function frio_remote_nav($a, &$nav) */ function frio_acl_lookup(App $a, &$results) { - require_once 'mod/contacts.php'; - - $nets = x($_GET, "nets") ? notags(trim($_GET["nets"])) : ""; + $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") { + // done in /src/Module/Contact.php for connections + if ($results['type'] !== 'r') { return; } $sql_extra = ''; - if ($results["search"]) { - $search_txt = dbesc(protect_sprintf(preg_quote($results["search"]))); - $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(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' ", 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"]; + WHERE `uid` = %d AND NOT `self` AND NOT `deleted` AND NOT `pending` $sql_extra ", intval($_SESSION['uid'])); + if (DBA::isResult($r)) { + $total = $r[0]['total']; } $sql_extra3 = Widget::unavailableNetworks(); - $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 ", + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `deleted` AND NOT `pending` $sql_extra $sql_extra3 ORDER BY `name` ASC LIMIT %d, %d ", intval($_SESSION['uid']), intval($results['start']), intval($results['count']) ); $contacts = []; - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { foreach ($r as $rr) { - $contacts[] = _contact_detail_for_template($rr); + $contacts[] = Module\Contact::getContactTemplateVars($rr); } } - $results["items"] = $contacts; - $results["tot"] = $total; + $results['items'] = $contacts; + $results['tot'] = $total; } /** @@ -346,7 +347,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'),