diff --git a/Zotlabs/Lib/System.php b/Zotlabs/Lib/System.php index 5cac1e2b3..acd07699c 100644 --- a/Zotlabs/Lib/System.php +++ b/Zotlabs/Lib/System.php @@ -33,6 +33,13 @@ class System { return z_root() . '/images/' . PLATFORM_NAME . '-64.png'; } + static public function get_project_favicon() { + if(is_array(App::$config) && is_array(App::$config['system']) && array_key_exists('favicon',App::$config['system'])) { + return App::$config['system']['favicon']; + } + return z_root() . '/images/' . PLATFORM_NAME . '.ico'; + } + static public function get_project_version() { if(is_array(App::$config) && is_array(App::$config['system']) && App::$config['system']['hide_version']) @@ -62,6 +69,11 @@ class System { return self::get_project_icon(); } + static public function get_site_favicon() { + if(is_array(App::$config) && is_array(App::$config['system']) && App::$config['system']['site_favicon_url']) + return App::$config['system']['site_favicon_url']; + return self::get_project_favicon(); + } static public function get_project_link() { if(is_array(App::$config) && is_array(App::$config['system']) && App::$config['system']['project_link']) diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php index 4998dcfc8..0aa639490 100644 --- a/Zotlabs/Module/Settings/Channel.php +++ b/Zotlabs/Module/Settings/Channel.php @@ -131,7 +131,7 @@ class Channel { PermissionLimits::Set(local_channel(),'post_comments',$post_comments); $publish = (((x($_POST,'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0); - $username = ((x($_POST,'username')) ? notags(trim($_POST['username'])) : ''); + $username = ((x($_POST,'username')) ? escape_tags(trim($_POST['username'])) : ''); $timezone = ((x($_POST,'timezone_select')) ? notags(trim($_POST['timezone_select'])) : ''); $defloc = ((x($_POST,'defloc')) ? notags(trim($_POST['defloc'])) : ''); $openid = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url'])) : ''); diff --git a/boot.php b/boot.php index 7a87b23c6..0570e3656 100755 --- a/boot.php +++ b/boot.php @@ -16,7 +16,7 @@ use Zotlabs\Daemon\Run; * @brief This file defines some global constants and includes the central App class. */ -define ( 'STD_VERSION', '20.10.26' ); +define ( 'STD_VERSION', '20.10.27' ); define ( 'ZOT_REVISION', '6.0' ); define ( 'DB_UPDATE_VERSION', 1243 ); diff --git a/images/misty.ico b/images/misty.ico new file mode 100644 index 000000000..e8bce6daf Binary files /dev/null and b/images/misty.ico differ diff --git a/images/osada.ico b/images/osada.ico new file mode 100644 index 000000000..77faf385e Binary files /dev/null and b/images/osada.ico differ diff --git a/images/redmatrix-64.png b/images/redmatrix-64.png index af85bbb76..822ac4b66 100644 Binary files a/images/redmatrix-64.png and b/images/redmatrix-64.png differ diff --git a/images/redmatrix.ico b/images/redmatrix.ico new file mode 100644 index 000000000..30062bb0a Binary files /dev/null and b/images/redmatrix.ico differ diff --git a/images/redmatrix.png b/images/redmatrix.png index f048b6706..9b4d610ef 100644 Binary files a/images/redmatrix.png and b/images/redmatrix.png differ diff --git a/images/redmatrix.svg b/images/redmatrix.svg index 875a9c41d..23bc1a9b1 100644 --- a/images/redmatrix.svg +++ b/images/redmatrix.svg @@ -26,7 +26,7 @@ inkscape:pageshadow="2" inkscape:zoom="1.979899" inkscape:cx="35.049163" - inkscape:cy="27.799654" + inkscape:cy="88.408806" inkscape:document-units="px" inkscape:current-layer="g2985" showgrid="false" @@ -34,11 +34,11 @@ fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" - inkscape:window-width="1848" - inkscape:window-height="1016" - inkscape:window-x="72" - inkscape:window-y="27" - inkscape:window-maximized="1" /> + inkscape:window-width="1521" + inkscape:window-height="830" + inkscape:window-x="192" + inkscape:window-y="212" + inkscape:window-maximized="0" /> @@ -61,21 +61,20 @@ id="g2985" transform="matrix(4.7619048,0,0,4.7619048,-1370.7143,-2042.6958)"> + cx="375.05301" + cy="532.36218" + rx="20.532581" + ry="20.479477" /> diff --git a/images/zap.ico b/images/zap.ico new file mode 100644 index 000000000..b04de2bb4 Binary files /dev/null and b/images/zap.ico differ