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\Hook;
use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
use Friendica\Core\Renderer;
-use Friendica\Core\System;
+use Friendica\Core\Session;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model;
use Friendica\Module;
use Friendica\Util\Strings;
-$frio = 'view/theme/frio';
-
-global $frio;
-
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;
Renderer::setActiveTemplateEngine('smarty3');
- $baseurl = System::baseUrl();
-
- $style = PConfig::get(local_user(), 'frio', 'style');
-
- $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
+ if (DI::mode()->isMobile() || DI::mode()->isMobile()) {
+ DI::page()['htmlhead'] .= <<< EOT
<script type="text/javascript">
var is_mobile = 1;
</script>
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');
+ 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');
+ 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');
}
/**
- * @brief Replace friendica photo links hook
+ * Replace friendica photo links hook
*
* This function does replace the links to photos
* of other friendica users. Original the photos are
}
/**
- * @brief Replace links of the item_photo_menu hook
+ * Replace links of the item_photo_menu hook
*
* This function replaces the original poke and the message links
* to call the addToModal javascript function so this pages can
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) {
+ if (strpos($v, 'poke?c=') === 0 || strpos($v, 'message/new/') === 0) {
$v = 'javascript:addToModal(\'' . $v . '\'); return false;';
$arr['menu'][$k] = $v;
}
}
/**
- * @brief Replace links of the contact_photo_menu
+ * Replace links of the contact_photo_menu
*
* This function replaces the original poke and the message links
* to call the addToModal javascript function so this pages can
// 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) {
+ if (strpos($pokelink, 'poke?c=' . $cid) !== false) {
$args['menu']['poke'][3] = 'modal';
}
}
/**
- * @brief Construct remote nav menu
+ * Construct remote nav menu
*
* It creates a remote baseurl form $_SESSION for remote users and friendica
* visitors. This url will be added to some of the nav links. With this behaviour
// get the homelink from $_XSESSION
$homelink = Model\Profile::getMyURL();
if (!$homelink) {
- $homelink = defaults($_SESSION, 'visitor_home', '');
+ $homelink = Session::get('visitor_home', '');
}
// split up the url in it's parts (protocol,domain/directory, /profile/, nickname
// user info
$r = q("SELECT `micro` FROM `contact` WHERE `uid` = %d AND `self`", intval($a->user['uid']));
- $r[0]['photo'] = (DBA::isResult($r) ? $a->removeBaseURL($r[0]['micro']) : 'images/person-48.jpg');
+ $r[0]['photo'] = (DBA::isResult($r) ? DI::baseUrl()->remove($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'] = DI::l10n()->t('Guest');
} elseif (Model\Profile::getMyURL()) {
$r = q("SELECT `name`, `nick`, `photo` FROM `gcontact`
WHERE `addr` = '%s' AND `network` = 'dfrn'",
DBA::escape($webbie));
- $nav['remote'] = L10n::t('Visitor');
+ $nav['remote'] = DI::l10n()->t('Visitor');
} else {
$r = false;
}
+ $remoteUser = null;
if (DBA::isResult($r)) {
$nav['userinfo'] = [
'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)) {
// 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'], DI::l10n()->t('Status'), '', DI::l10n()->t('Your posts and conversations')];
+ $nav['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '/profile', DI::l10n()->t('Profile'), '', DI::l10n()->t('Your profile page')];
+ $nav['usermenu'][] = [$server_url . '/photos/' . $remoteUser['nick'], DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')];
+ $nav['usermenu'][] = [$server_url . '/videos/' . $remoteUser['nick'], DI::l10n()->t('Videos'), '', DI::l10n()->t('Your videos')];
+ $nav['usermenu'][] = [$server_url . '/events/', DI::l10n()->t('Events'), '', DI::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 . '/contact', L10n::t('Contacts'), '', L10n::t('Manage/edit friends and contacts')];
- $nav['sitename'] = Config::get('config', 'sitename');
+ $nav['network'] = [$server_url . '/network', DI::l10n()->t('Network'), '', DI::l10n()->t('Conversations from your friends')];
+ $nav['events'] = [$server_url . '/events', DI::l10n()->t('Events'), '', DI::l10n()->t('Events and Calendar')];
+ $nav['messages'] = [$server_url . '/message', DI::l10n()->t('Messages'), '', DI::l10n()->t('Private mail')];
+ $nav['settings'] = [$server_url . '/settings', DI::l10n()->t('Settings'), '', DI::l10n()->t('Account settings')];
+ $nav['contacts'] = [$server_url . '/contact', DI::l10n()->t('Contacts'), '', DI::l10n()->t('Manage/edit friends and contacts')];
+ $nav['sitename'] = DI::config()->get('config', 'sitename');
}
}
/**
- * @brief: Search for contacts
+ * 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()
*/
function frio_acl_lookup(App $a, &$results)
{
- $nets = x($_GET, 'nets') ? Strings::removeTags(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 /src/Module/Contact.php for connections
$total = 0;
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
- WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra ", intval($_SESSION['uid']));
+ 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'])
);
}
/**
- * @brief Manipulate the data of the item
+ * Manipulate the data of the item
*
* At the moment we use this function to add some own stuff to the item menu
*
{
$subthread = [
'menu' => 'follow_thread',
- 'title' => L10n::t('Follow Thread'),
- 'action' => 'dosubthread(' . $arr['item']['id'] . '); return false;',
+ 'title' => DI::l10n()->t('Follow Thread'),
+ 'action' => 'dosubthread(' . $arr['item']['id'] . ');',
'href' => '#'
];
}
$arr['output']['subthread'] = $subthread;
}
+
+/**
+ * @param int|null $uid
+ * @return string
+ * @see \Friendica\Core\Theme::getBackgroundColor()
+ */
+function frio_get_background_color(int $uid = null)
+{
+ $background_color = DI::config()->get('frio', 'background_color') ?: '#ededed';
+
+ if ($uid) {
+ $background_color = DI::pConfig()->get($uid, 'frio', 'background_color') ?: $background_color;
+ }
+
+ $scheme = DI::config()->get('frio', 'scheme', DI::config()->get('frio', 'schema'));
+ $scheme = Strings::sanitizeFilePathItem($scheme);
+
+ if ($scheme && ($scheme != '---') && file_exists('view/theme/frio/scheme/' . $scheme . '.php')) {
+ $schemefile = 'view/theme/frio/scheme/' . $scheme . '.php';
+ require_once $schemefile;
+ }
+
+ return $background_color;
+}
+
+/**
+ * @param int|null $uid
+ * @return string
+ * @see \Friendica\Core\Theme::getThemeColor()
+ */
+function frio_get_theme_color(int $uid = null)
+{
+ $nav_bg = DI::config()->get('frio', 'nav_bg') ?: '#708fa0';
+
+ if ($uid) {
+ $nav_bg = DI::pConfig()->get($uid, 'frio', 'background_color') ?: $nav_bg;
+ }
+
+ $scheme = DI::config()->get('frio', 'scheme', DI::config()->get('frio', 'schema'));
+ $scheme = Strings::sanitizeFilePathItem($scheme);
+
+ if ($scheme && ($scheme != '---') && file_exists('view/theme/frio/scheme/' . $scheme . '.php')) {
+ $schemefile = 'view/theme/frio/scheme/' . $scheme . '.php';
+ require_once $schemefile;
+ }
+
+ return $nav_bg;
+}
projects / friendica.git / blobdiff