X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=view%2Ftheme%2Ffrio%2Ftheme.php;h=58eb8268c3e5b1a6d35eacd2551108ea551f49cf;hb=4e1263c1f8aa0a3aeba0a95929678c18fc5a3c90;hp=5304d3fd463d4d13874bd12151bdd5b2528b907c;hpb=536fbe5af17a4a393ea440155e2770f63b5a71f5;p=friendica.git diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php index 5304d3fd46..58eb8268c3 100644 --- a/view/theme/frio/theme.php +++ b/view/theme/frio/theme.php @@ -1,25 +1,39 @@ . + * * 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.5 + * Description: Responsive theme based on a modern HTML/CSS/JavaScript framework. + * Version: V.1.0 * Author: Rabuzarus - * + * Maintainer: Hypolite Petovan */ use Friendica\App; use Friendica\Content\Text\Plaintext; -use Friendica\Content\Widget; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Renderer; -use Friendica\Core\Session; use Friendica\Database\DBA; use Friendica\DI; -use Friendica\Model; use Friendica\Model\Contact; -use Friendica\Module; -use Friendica\Util\Strings; +use Friendica\Model\Item; +use Friendica\Model\Profile; const FRIO_SCHEME_ACCENT_BLUE = '#1e87c2'; const FRIO_SCHEME_ACCENT_RED = '#b50404'; @@ -27,13 +41,15 @@ const FRIO_SCHEME_ACCENT_PURPLE = '#a54bad'; const FRIO_SCHEME_ACCENT_GREEN = '#218f39'; const FRIO_SCHEME_ACCENT_PINK = '#d900a9'; +/* + * This script can be included even when the app is in maintenance mode which requires us to avoid any config call + */ + function frio_init(App $a) { global $frio; $frio = 'view/theme/frio'; - // disable the events module link in the profile tab - $a->setThemeInfoValue('events_in_profile', false); $a->setThemeInfoValue('videowidth', 622); Renderer::setActiveTemplateEngine('smarty3'); @@ -55,10 +71,9 @@ function frio_install() 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'); + Logger::info('installed theme frio'); } /** @@ -67,13 +82,12 @@ function frio_install() * This function does replace the links to photos * of other friendica users. Original the photos are * linked to the photo page. Now they will linked directly - * to the photo file. This function is nessesary to use colorbox + * to the photo file. This function is necessary to use colorbox * in the network stream * - * @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) +function frio_item_photo_links(&$body_info) { $occurence = 0; $p = Plaintext::getBoundariesPosition($body_info['html'], ''); @@ -87,7 +101,7 @@ function frio_item_photo_links(App $a, &$body_info) $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="([^"]+)/contact/redir/(\d+)&url=([^"]+)"#', 'href="$1/contact/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); @@ -102,17 +116,16 @@ function frio_item_photo_links(App $a, &$body_info) /** * Replace links of the item_photo_menu hook * - * This function replaces the original poke and the message links + * This function replaces the original message links * to call the addToModal javascript function so this pages can * be loaded in a bootstrap modal * - * @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) +function frio_item_photo_menu(&$arr) { foreach ($arr['menu'] as $k => $v) { - if (strpos($v, '/poke') === 0 || strpos($v, 'message/new/') === 0) { + if (strpos($v, 'message/new/') === 0) { $v = 'javascript:addToModal(\'' . $v . '\'); return false;'; $arr['menu'][$k] = $v; } @@ -122,35 +135,28 @@ function frio_item_photo_menu(App $a, &$arr) /** * Replace links of the contact_photo_menu * - * This function replaces the original poke and the message links + * This function replaces the original message link * to call the addToModal javascript function so this pages can * be loaded in a bootstrap modal * 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 array $args Contains contact data and the original photo_menu */ -function frio_contact_photo_menu(App $a, &$args) +function frio_contact_photo_menu(&$args) { $cid = $args['contact']['id']; - if (!empty($args['menu']['poke'])) { - $pokelink = $args['menu']['poke'][1]; - } else { - $pokelink = ''; - } - - if (!empty($args['menu']['poke'])) { + if (!empty($args['menu']['pm'])) { $pmlink = $args['menu']['pm'][1]; } else { $pmlink = ''; } - // Set the the indicator for opening the status, profile and photo pages + // Set the indicator for opening the status, profile and photo pages // in a new tab to false if the contact a dfrn (friendica) contact - // We do this because we can go back on foreign friendica pages throuhg - // friendicas "magic-link" which indicates a friendica user on froreign + // We do this because we can go back on foreign friendica pages through + // friendicas "magic-link" which indicates a friendica user on foreign // friendica servers as remote user or visitor // // The value for opening in a new tab is e.g. when @@ -163,13 +169,9 @@ function frio_contact_photo_menu(App $a, &$args) } } - // 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, $cid . '/poke') !== false) { - $args['menu']['poke'][3] = 'modal'; - } - + // Add to pm link a new key with the value 'modal'. + // Later we can make conditions in the corresponding templates (e.g. + // contact/entry.tpl) if (strpos($pmlink, 'message/new/' . $cid) !== false) { $args['menu']['pm'][3] = 'modal'; } @@ -190,131 +192,68 @@ function frio_contact_photo_menu(App $a, &$args) * @param array $nav_info The original nav info array: nav, banner, userinfo, sitelocation * @throws Exception */ -function frio_remote_nav(App $a, array &$nav_info) -{ - // get the homelink from $_XSESSION - $homelink = Model\Profile::getMyURL(); - if (!$homelink) { - $homelink = Session::get('visitor_home', ''); - } - - // 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 - $fields = ['id', 'url', 'avatar', 'micro', 'name', 'nick', 'baseurl', 'updated']; - if ($a->isLoggedIn()) { - $remoteUser = Contact::selectFirst($fields, ['uid' => $a->getLoggedInUserId(), 'self' => true]); - } elseif (!local_user() && remote_user()) { - $remoteUser = Contact::getById(remote_user(), $fields); - $nav_info['nav']['remote'] = DI::l10n()->t('Guest'); - } elseif (Model\Profile::getMyURL()) { - $remoteUser = Contact::getByURL($homelink, null, $fields); - $nav_info['nav']['remote'] = DI::l10n()->t('Visitor'); - } else { - $remoteUser = null; - } - - if (DBA::isResult($remoteUser)) { - $nav_info['userinfo'] = [ - 'icon' => Contact::getMicro($remoteUser), - 'name' => $remoteUser['name'], - ]; - $server_url = $remoteUser['baseurl']; - } - - if (!local_user() && !empty($server_url) && !is_null($remoteUser)) { - // user menu - $nav_info['nav']['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'], DI::l10n()->t('Status'), '', DI::l10n()->t('Your posts and conversations')]; - $nav_info['nav']['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '/profile', DI::l10n()->t('Profile'), '', DI::l10n()->t('Your profile page')]; - $nav_info['nav']['usermenu'][] = [$server_url . '/photos/' . $remoteUser['nick'], DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')]; - $nav_info['nav']['usermenu'][] = [$server_url . '/videos/' . $remoteUser['nick'], DI::l10n()->t('Videos'), '', DI::l10n()->t('Your videos')]; - $nav_info['nav']['usermenu'][] = [$server_url . '/events/', DI::l10n()->t('Events'), '', DI::l10n()->t('Your events')]; - - // navbar links - $nav_info['nav']['network'] = [$server_url . '/network', DI::l10n()->t('Network'), '', DI::l10n()->t('Conversations from your friends')]; - $nav_info['nav']['events'] = [$server_url . '/events', DI::l10n()->t('Events'), '', DI::l10n()->t('Events and Calendar')]; - $nav_info['nav']['messages'] = [$server_url . '/message', DI::l10n()->t('Messages'), '', DI::l10n()->t('Private mail')]; - $nav_info['nav']['settings'] = [$server_url . '/settings', DI::l10n()->t('Settings'), '', DI::l10n()->t('Account settings')]; - $nav_info['nav']['contacts'] = [$server_url . '/contact', DI::l10n()->t('Contacts'), '', DI::l10n()->t('Manage/edit friends and contacts')]; - $nav_info['nav']['sitename'] = DI::config()->get('config', 'sitename'); - } -} - -/** - * Search for contacts - * - * This function search for a users contacts. The code is copied from contact search - * 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 - * contact page. - * - * @param App $a The app data @TODO Unused - * @param array $results The array with the originals from acl_lookup() - */ -function frio_acl_lookup(App $a, &$results) +function frio_remote_nav(array &$nav_info) { - $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 /src/Module/Contact.php for connections - if ($results['type'] !== 'r') { - return; - } - - $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)); - } - - $total = 0; - $r = q("SELECT COUNT(*) AS `total` FROM `contact` - 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(); + if (DI::mode()->has(App\Mode::MAINTENANCEDISABLED)) { + // get the homelink from $_SESSION + $homelink = Profile::getMyURL(); + if (!$homelink) { + $homelink = DI::session()->get('visitor_home', ''); + } - $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']) - ); + // 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 + $fields = ['id', 'url', 'avatar', 'micro', 'name', 'nick', 'baseurl', 'updated']; + if (DI::userSession()->isAuthenticated()) { + $remoteUser = Contact::selectFirst($fields, ['uid' => DI::userSession()->getLocalUserId(), 'self' => true]); + } elseif (!DI::userSession()->getLocalUserId() && DI::userSession()->getRemoteUserId()) { + $remoteUser = Contact::getById(DI::userSession()->getRemoteUserId(), $fields); + $nav_info['nav']['remote'] = DI::l10n()->t('Guest'); + } elseif (Profile::getMyURL()) { + $remoteUser = Contact::getByURL($homelink, null, $fields); + $nav_info['nav']['remote'] = DI::l10n()->t('Visitor'); + } else { + $remoteUser = null; + } - $contacts = []; + if (DBA::isResult($remoteUser)) { + $nav_info['userinfo'] = [ + 'icon' => Contact::getMicro($remoteUser), + 'name' => $remoteUser['name'], + ]; + $server_url = $remoteUser['baseurl']; + } - if (DBA::isResult($r)) { - foreach ($r as $rr) { - $contacts[] = Module\Contact::getContactTemplateVars($rr); + if (!DI::userSession()->getLocalUserId() && !empty($server_url) && !is_null($remoteUser)) { + // user menu + $nav_info['nav']['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'], DI::l10n()->t('Status'), '', DI::l10n()->t('Your posts and conversations')]; + $nav_info['nav']['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '/profile', DI::l10n()->t('Profile'), '', DI::l10n()->t('Your profile page')]; + // Kept for backwards-compatibility reasons, the remote server may not have updated to version 2022.12 yet + // @TODO Switch with the new routes by version 2023.12 + //$nav_info['nav']['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '/photos', DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')]; + $nav_info['nav']['usermenu'][] = [$server_url . '/photos/' . $remoteUser['nick'], DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')]; + $nav_info['nav']['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '/media', DI::l10n()->t('Media'), '', DI::l10n()->t('Your postings with media')]; + $nav_info['nav']['usermenu'][] = [$server_url . '/calendar/', DI::l10n()->t('Calendar'), '', DI::l10n()->t('Your calendar')]; + + // navbar links + $nav_info['nav']['network'] = [$server_url . '/network', DI::l10n()->t('Network'), '', DI::l10n()->t('Conversations from your friends')]; + $nav_info['nav']['calendar'] = [$server_url . '/calendar', DI::l10n()->t('Calendar'), '', DI::l10n()->t('Calendar')]; + $nav_info['nav']['messages'] = [$server_url . '/message', DI::l10n()->t('Messages'), '', DI::l10n()->t('Private mail')]; + $nav_info['nav']['settings'] = [$server_url . '/settings', DI::l10n()->t('Settings'), '', DI::l10n()->t('Account settings')]; + $nav_info['nav']['contacts'] = [$server_url . '/contact', DI::l10n()->t('Contacts'), '', DI::l10n()->t('Manage/edit friends and contacts')]; + $nav_info['nav']['sitename'] = DI::config()->get('config', 'sitename'); } } - - $results['items'] = $contacts; - $results['tot'] = $total; } -/** - * 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) +function frio_display_item(&$arr) { // Add follow to the item menu $followThread = []; if ( - local_user() - && local_user() == $arr['item']['uid'] - && $arr['item']['gravity'] == GRAVITY_PARENT + DI::userSession()->getLocalUserId() + && in_array($arr['item']['uid'], [0, DI::userSession()->getLocalUserId()]) + && $arr['item']['gravity'] == Item::GRAVITY_PARENT && !$arr['item']['self'] && !$arr['item']['mention'] ) {