icon files for local projects - fix redmatrix icons (edges cutoff)

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'])

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']))   : '');

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 );

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-width="1521"
-     inkscape:window-height="1016"
+     inkscape:window-height="830"
-     inkscape:window-x="72"
+     inkscape:window-x="192"
-     inkscape:window-y="27"
+     inkscape:window-y="212"
-     inkscape:window-maximized="1" />
+     inkscape:window-maximized="0" />
   <metadata
      id="metadata3058">
     <rdf:RDF>
@@ -61,21 +61,20 @@
        id="g2985"
        transform="matrix(4.7619048,0,0,4.7619048,-1370.7143,-2042.6958)">
       <ellipse
-         style="fill:#c60032;fill-opacity:1;stroke-width:0.90943448;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1"
+         style="fill:#c60032;fill-opacity:1;stroke:#000000;stroke-width:0.8202405;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="path3028-4-5-3"
-         transform="matrix(0.94,0,0,0.9075862,191.00001,171.28726)"
+         cx="375.05301"
-         cx="195.74467"
+         cy="532.36218"
-         cy="397.84091"
+         rx="20.532581"
-         rx="22.340425"
+         ry="20.479477" />
-         ry="23.138298" />
       <g
          id="text3003-0-4-0"
-         style="font-style:normal;font-weight:normal;font-size:46px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:0.83999999;stroke-miterlimit:4;stroke-dasharray:none"
+         style="font-style:normal;font-weight:normal;font-size:46px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.83999997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          transform="translate(52.138256,-208.57143)">
         <path
            inkscape:connector-curvature="0"
            id="path3008"
-           style="font-variant:normal;font-weight:bold;font-stretch:normal;font-size:45.09999847px;font-family:generic;-inkscape-font-specification:'generic Bold';fill:#ffffff;stroke:#000000;stroke-opacity:1;stroke-width:0.83999999;stroke-miterlimit:4;stroke-dasharray:none"
+           style="font-variant:normal;font-weight:bold;font-stretch:normal;font-size:45.09999847px;font-family:generic;-inkscape-font-specification:'generic Bold';fill:#ffffff;stroke:#000000;stroke-width:0.83999997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 322.85053,756.03406 h 4.7355 l 1.3079,-7.9827 h 4.8708 v -4.4649 h -4.1492 l 1.0373,-6.4944 h 4.9159 v -4.4649 h -4.1492 l 1.1275,-7.0356 h -4.7355 l -1.1275,7.0356 h -5.1865 l 1.1275,-7.0356 h -4.7355 l -1.1275,7.0356 h -5.0963 v 4.4649 h 4.3296 l -1.0373,6.4944 h -5.0963 v 4.4649 h 4.3747 l -1.3079,7.9827 h 4.7355 l 1.3079,-7.9827 h 5.1865 l -1.3079,7.9827 m 2.0295,-12.4476 h -5.1865 l 1.0373,-6.4944 h 5.1865 l -1.0373,6.4944" />
       </g>
     </g>