harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #859 from subrealist/short_icon_admin_fix

Browse Source 
#858: Fix: Shortcut icon isn't dysplayed when 'Admin' or 'Channel Manager' panel are opened
This commit is contained in:
git-marijus 2017-09-14 10:00:47 +02:00 committed by GitHub
commit 235ba81f25
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
boot.php
View File

@ -80,7 +80,7 @@ define ( 'DIRECTORY_MODE_STANDALONE', 0x0100); // A detached (off the grid) hub
define ( 'DIRECTORY_REALM', 'RED_GLOBAL'); define ( 'DIRECTORY_REALM', 'RED_GLOBAL');
define ( 'DIRECTORY_FALLBACK_MASTER', 'https://gravizot.de'); define ( 'DIRECTORY_FALLBACK_MASTER', 'https://gravizot.de');
$DIRECTORY_FALLBACK_SERVERS = array( $DIRECTORY_FALLBACK_SERVERS = array(
'https://hubzilla.zottel.net', 'https://hubzilla.zottel.net',
'https://my.federated.social', 'https://my.federated.social',
//'https://hubzilla.nl', //'https://hubzilla.nl',
@ -205,7 +205,7 @@ define ( 'PAGE_PREMIUM', 0x0010 );
define ( 'PAGE_ADULT', 0x0020 ); define ( 'PAGE_ADULT', 0x0020 );
define ( 'PAGE_CENSORED', 0x0040 ); // Site admin has blocked this channel from appearing in casual search results and site feeds define ( 'PAGE_CENSORED', 0x0040 ); // Site admin has blocked this channel from appearing in casual search results and site feeds
define ( 'PAGE_SYSTEM', 0x1000 ); define ( 'PAGE_SYSTEM', 0x1000 );
define ( 'PAGE_HUBADMIN', 0x2000 ); // set this to indicate a preferred admin channel rather than the define ( 'PAGE_HUBADMIN', 0x2000 ); // set this to indicate a preferred admin channel rather than the
// default channel of any accounts with the admin role. // default channel of any accounts with the admin role.
define ( 'PAGE_REMOVED', 0x8000 ); define ( 'PAGE_REMOVED', 0x8000 );
@ -606,6 +606,8 @@ function sys_boot() {
define( 'DEFAULT_NOTIFY_ICON', '/images/rm-32.png' ); define( 'DEFAULT_NOTIFY_ICON', '/images/rm-32.png' );
} }
App::head_set_icon(DEFAULT_PLATFORM_ICON);
/* /*
* Try to open the database; * Try to open the database;
*/ */
@ -936,8 +938,6 @@ class App {
self::$is_mobile = $mobile_detect->isMobile(); self::$is_mobile = $mobile_detect->isMobile();
self::$is_tablet = $mobile_detect->isTablet(); self::$is_tablet = $mobile_detect->isTablet();
self::head_set_icon(DEFAULT_PLATFORM_ICON);
/* /*
* register template engines * register template engines
*/ */
@ -1113,7 +1113,7 @@ class App {
* being first * being first
*/ */
self::$page['htmlhead'] = replace_macros(get_markup_template('head.tpl'), self::$page['htmlhead'] = replace_macros(get_markup_template('head.tpl'),
[ [
'$preload_images' => $preload_images, '$preload_images' => $preload_images,
'$user_scalable' => $user_scalable, '$user_scalable' => $user_scalable,
@ -1145,7 +1145,7 @@ class App {
public static function register_template_engine($class, $name = '') { public static function register_template_engine($class, $name = '') {
if(! $name) { if(! $name) {
$v = get_class_vars($class); $v = get_class_vars($class);
if(x($v, "name")) { if(x($v, "name")) {
$name = $v['name']; $name = $v['name'];
} }
} }
@ -1187,7 +1187,7 @@ class App {
} }
} }
echo "template engine <tt>$template_engine</tt> is not registered!\n"; echo "template engine <tt>$template_engine</tt> is not registered!\n";
killme(); killme();
} }
@ -1314,7 +1314,7 @@ function os_mkdir($path, $mode = 0777, $recursive = false) {
$oldumask = @umask(0); $oldumask = @umask(0);
$result = @mkdir($path, $mode, $recursive); $result = @mkdir($path, $mode, $recursive);
@umask($oldumask); @umask($oldumask);
return $result; return $result;
} }
@ -1664,8 +1664,8 @@ function get_account_id() {
* @return int|bool channel_id or false * @return int|bool channel_id or false
*/ */
function local_channel() { function local_channel() {
if(session_id() if(session_id()
&& array_key_exists('authenticated',$_SESSION) && $_SESSION['authenticated'] && array_key_exists('authenticated',$_SESSION) && $_SESSION['authenticated']
&& array_key_exists('uid',$_SESSION) && intval($_SESSION['uid'])) && array_key_exists('uid',$_SESSION) && intval($_SESSION['uid']))
return intval($_SESSION['uid']); return intval($_SESSION['uid']);
@ -1685,8 +1685,8 @@ function local_channel() {
* @return string|bool visitor_id or false * @return string|bool visitor_id or false
*/ */
function remote_channel() { function remote_channel() {
if(session_id() if(session_id()
&& array_key_exists('authenticated',$_SESSION) && $_SESSION['authenticated'] && array_key_exists('authenticated',$_SESSION) && $_SESSION['authenticated']
&& array_key_exists('visitor_id',$_SESSION) && $_SESSION['visitor_id']) && array_key_exists('visitor_id',$_SESSION) && $_SESSION['visitor_id'])
return $_SESSION['visitor_id']; return $_SESSION['visitor_id'];
@ -1705,8 +1705,8 @@ function notice($s) {
if(! x($_SESSION, 'sysmsg')) $_SESSION['sysmsg'] = array(); if(! x($_SESSION, 'sysmsg')) $_SESSION['sysmsg'] = array();
// ignore duplicated error messages which haven't yet been displayed // ignore duplicated error messages which haven't yet been displayed
// - typically seen as multiple 'permission denied' messages // - typically seen as multiple 'permission denied' messages
// as a result of auto-reloading a protected page with &JS=1 // as a result of auto-reloading a protected page with &JS=1
if(in_array($s,$_SESSION['sysmsg'])) if(in_array($s,$_SESSION['sysmsg']))
@ -1728,7 +1728,7 @@ function notice($s) {
function info($s) { function info($s) {
if(! session_id()) if(! session_id())
return; return;
if(! x($_SESSION, 'sysmsg_info')) if(! x($_SESSION, 'sysmsg_info'))
$_SESSION['sysmsg_info'] = array(); $_SESSION['sysmsg_info'] = array();
if(App::$interactive) if(App::$interactive)
$_SESSION['sysmsg_info'][] = $s; $_SESSION['sysmsg_info'][] = $s;
@ -1804,7 +1804,7 @@ function proc_run(){
proc_close(proc_open($cmd, array(), $foo)); proc_close(proc_open($cmd, array(), $foo));
} }
else { else {
if(get_config('system','use_proc_open')) if(get_config('system','use_proc_open'))
proc_close(proc_open($cmdline ." &", array(), $foo)); proc_close(proc_open($cmdline ." &", array(), $foo));
else else
exec($cmdline . ' > /dev/null &'); exec($cmdline . ' > /dev/null &');
@ -1817,8 +1817,8 @@ function proc_run(){
* @return bool true if we run on M$ Windows * @return bool true if we run on M$ Windows
* *
* It's possible you might be able to run on WAMP or XAMPP, and this * It's possible you might be able to run on WAMP or XAMPP, and this
* has been accomplished, but is not officially supported. Good luck. * has been accomplished, but is not officially supported. Good luck.
* *
*/ */
function is_windows() { function is_windows() {
return ((strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? true : false); return ((strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? true : false);
@ -2167,7 +2167,7 @@ function construct_page() {
if(App::$config['system']['x_security_headers']) { if(App::$config['system']['x_security_headers']) {
header("X-Frame-Options: SAMEORIGIN"); header("X-Frame-Options: SAMEORIGIN");
header("X-Xss-Protection: 1; mode=block;"); header("X-Xss-Protection: 1; mode=block;");
header("X-Content-Type-Options: nosniff"); header("X-Content-Type-Options: nosniff");
} }
if(App::$config['system']['public_key_pins']) { if(App::$config['system']['public_key_pins']) {
@ -2280,7 +2280,7 @@ function z_check_cert() {
cert_bad_email(); cert_bad_email();
} }
} }
} }
/** /**
@ -2389,7 +2389,7 @@ function check_for_new_perms() {
function check_cron_broken() { function check_cron_broken() {
$d = get_config('system','lastcron'); $d = get_config('system','lastcron');
if((! $d) || ($d < datetime_convert('UTC','UTC','now - 4 hours'))) { if((! $d) || ($d < datetime_convert('UTC','UTC','now - 4 hours'))) {
Zotlabs\Daemon\Master::Summon(array('Cron')); Zotlabs\Daemon\Master::Summon(array('Cron'));
set_config('system','lastcron',datetime_convert()); set_config('system','lastcron',datetime_convert());
@ -2434,9 +2434,8 @@ function check_cron_broken() {
function observer_prohibited($allow_account = false) { function observer_prohibited($allow_account = false) {
if($allow_account) if($allow_account)
return (((get_config('system','block_public')) && (! get_account_id()) && (! remote_channel())) ? true : false ); return (((get_config('system','block_public')) && (! get_account_id()) && (! remote_channel())) ? true : false );
return (((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) ? true : false ); return (((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) ? true : false );
} }