minify custom.js

edited nzbget to allow no username and password

api/config/default.php

@@ -148,5 +148,6 @@ return array(
 	'mediaSearchType' => '',
 	'mediaSearchAuth' => '1',
 	'registrationPassword' => '',
-	'hideRegistration' => false
+	'hideRegistration' => false,
+	'favIcon' => ''
 );

api/functions/organizr-functions.php

@@ -733,6 +733,42 @@ function getCustomizeAppearance()
 					)
 				)
 			),
+			'FavIcon' => array(
+				array(
+					'type' => 'textbox',
+					'name' => 'favIcon',
+					'class' => '',
+					'label' => 'Fav Icon Code',
+					'value' => $GLOBALS['favIcon'],
+					'placeholder' => 'Paste Contents from https://realfavicongenerator.net/',
+					'attr' => 'rows="10"',
+				),
+				array(
+					'type' => 'html',
+					'label' => 'Instructions',
+					'html' => '
+					<div class="panel panel-default">
+						<div class="panel-heading">
+							<a href="https://realfavicongenerator.net/" target="_blank"><span class="label label-info m-l-5">Visit FavIcon Site</span></a>
+						</div>
+						<div class="panel-wrapper collapse in">
+							<div class="panel-body">
+								<ul class="list-icons">
+									<li lang="en"><i class="fa fa-caret-right text-info"></i> Click "Select your Favicon picture"</li>
+									<li lang="en"><i class="fa fa-caret-right text-info"></i> Choose your image to use</li>
+									<li lang="en"><i class="fa fa-caret-right text-info"></i> Edit settings to your liking</li>
+									<li lang="en"><i class="fa fa-caret-right text-info"></i> At bottom of page on "Favicon Generator Options" under "Path" choose "I cannot or I do not want to place favicon files at the root of my web site."</li>
+									<li lang="en"><i class="fa fa-caret-right text-info"></i> Enter this path <code>plugins/images/faviconCustom</code></li>
+									<li lang="en"><i class="fa fa-caret-right text-info"></i> Click "Generate your Favicons and HTML code"</li>
+									<li lang="en"><i class="fa fa-caret-right text-info"></i> Download and unzip file and place in <code>plugins/images/faviconCustom</code></li>
+									<li lang="en"><i class="fa fa-caret-right text-info"></i> Copy code and paste inside left box</li>
+								</ul>
+							</div>
+						</div>
+					</div>
+					'
+				),
+			),
 			'Custom CSS' => array(
 				array(
 					'type' => 'html',

api/functions/static-globals.php

@@ -1,30 +1,53 @@
 <?php
-
 // ===================================
 // Organizr Version
 $GLOBALS['installedVersion'] = '2.0.0-beta.100';
 // ===================================
 // Set GLOBALS from config file
-$GLOBALS['userConfigPath'] = dirname(__DIR__, 1).DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'config.php';
-$GLOBALS['defaultConfigPath'] = dirname(__DIR__, 1).DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'default.php';
+$GLOBALS['userConfigPath'] = dirname(__DIR__, 1) . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'config.php';
+$GLOBALS['defaultConfigPath'] = dirname(__DIR__, 1) . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'default.php';
 $GLOBALS['currentTime'] = gmdate("Y-m-d\TH:i:s\Z");
 // Quick function for plugins
 function pluginFiles($type)
 {
-    $files = '';
-    switch ($type) {
-        case 'js':
-            foreach (glob(dirname(__DIR__, 1).DIRECTORY_SEPARATOR.'plugins' . DIRECTORY_SEPARATOR . 'js' . DIRECTORY_SEPARATOR . "*.js") as $filename) {
-                $files .= '<script src="api/plugins/js/'.basename($filename).'?v='.$GLOBALS['installedVersion'].'" defer="true"></script>';
-            }
-            break;
-        case 'css':
-            foreach (glob(dirname(__DIR__, 1).DIRECTORY_SEPARATOR.'plugins' . DIRECTORY_SEPARATOR . 'css' . DIRECTORY_SEPARATOR . "*.js") as $filename) {
-                $files .= '<link href="api/plugins/css/'.basename($filename).$GLOBALS['installedVersion'].'" rel="stylesheet">';
-            }
-            break;
-        default:
-            break;
-    }
-    return $files;
+	$files = '';
+	switch ($type) {
+		case 'js':
+			foreach (glob(dirname(__DIR__, 1) . DIRECTORY_SEPARATOR . 'plugins' . DIRECTORY_SEPARATOR . 'js' . DIRECTORY_SEPARATOR . "*.js") as $filename) {
+				$files .= '<script src="api/plugins/js/' . basename($filename) . '?v=' . $GLOBALS['installedVersion'] . '" defer="true"></script>';
+			}
+			break;
+		case 'css':
+			foreach (glob(dirname(__DIR__, 1) . DIRECTORY_SEPARATOR . 'plugins' . DIRECTORY_SEPARATOR . 'css' . DIRECTORY_SEPARATOR . "*.js") as $filename) {
+				$files .= '<link href="api/plugins/css/' . basename($filename) . $GLOBALS['installedVersion'] . '" rel="stylesheet">';
+			}
+			break;
+		default:
+			break;
+	}
+	return $files;
 }
+
+function favIcons()
+{
+	$favicon = '
+	<link rel="apple-touch-icon" sizes="180x180" href="plugins/images/favicon/apple-touch-icon.png">
+	<link rel="icon" type="image/png" sizes="32x32" href="plugins/images/favicon/favicon-32x32.png">
+	<link rel="icon" type="image/png" sizes="16x16" href="plugins/images/favicon/favicon-16x16.png">
+	<link rel="manifest" href="plugins/images/favicon/site.webmanifest">
+	<link rel="mask-icon" href="plugins/images/favicon/safari-pinned-tab.svg" color="#5bbad5">
+	<link rel="shortcut icon" href="plugins/images/favicon/favicon.ico">
+	<meta name="msapplication-TileColor" content="#da532c">
+	<meta name="msapplication-TileImage" content="plugins/images/favicon/mstile-144x144.png">
+	<meta name="msapplication-config" content="plugins/images/favicon/browserconfig.xml">
+	<meta name="theme-color" content="#ffffff">
+	';
+	if (file_exists('config' . DIRECTORY_SEPARATOR . 'config.php')) {
+		if (isset($GLOBALS['favIcon'])) {
+			if ($GLOBALS['favIcon'] !== '') {
+				$favicon = $GLOBALS['favIcon'];
+			}
+		}
+	}
+	return $favicon;
+}

index.php

@@ -8,7 +8,7 @@
     <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport">
     <meta content="Organizr - Accept no others" name="description">
     <meta content="CauseFX" name="author">
-    <link href="plugins/images/favicon.png" rel="icon" sizes="16x16" type="image/png">
+	<?php echo favIcons(); ?>
     <title>Organizr v2</title>
     <link href="bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
     <link href="plugins/bower_components/sidebar-nav/dist/sidebar-nav.min.css" rel="stylesheet">