mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-29 03:01:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ZoneMinder:master' into patch-132

Browse Source
This commit is contained in:
IgorA100
2024-05-31 15:31:29 +03:00
committed by GitHub
parent 5565b8cca1 3c8ebc8599
commit 802ffe12ce
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/index.php
View File

@@ -58,7 +58,9 @@ if ( $_SERVER['REQUEST_METHOD'] == 'OPTIONS' ) {
return;
}
if ( isset($_GET['skin']) ) {
if ( defined('ZM_FORCE_SKIN_DEFAULT') ) {
$skin = ZM_FORCE_SKIN_DEFAULT;
} else if ( isset($_GET['skin']) ) {
$skin = $_GET['skin'];
} else if ( isset($_COOKIE['zmSkin']) ) {
$skin = $_COOKIE['zmSkin'];
@@ -76,7 +78,9 @@ if (!is_dir('skins/'.$skin) ) {
}
}
global $css;
if ( isset($_GET['css']) ) {
if (defined('ZM_FORCE_CSS_DEFAULT')) {
$css = ZM_FORCE_CSS_DEFAULT;
} else if ( isset($_GET['css']) ) {
$css = $_GET['css'];
} else if ( isset($_COOKIE['zmCSS']) ) {
$css = $_COOKIE['zmCSS'];

7
web/skins/classic/includes/functions.php
View File

@@ -91,7 +91,12 @@ function xhtmlHeaders($file, $title) {
<meta name="viewport" content="width=device-width, initial-scale=1">
<title><?php echo validHtmlStr(ZM_WEB_TITLE_PREFIX) . ' - ' . validHtmlStr($title) ?></title>
<?php
if ( file_exists("skins/$skin/css/$css/graphics/favicon.ico") ) {
if (defined('ZM_WEB_FAVICON')) {
echo '
<link rel="icon" type="image/ico" href="'.ZM_WEB_FAVICON.'"/>
<link rel="shortcut icon" href="'.ZM_WEB_FAVICON.'"/>
';
} else if ( file_exists("skins/$skin/css/$css/graphics/favicon.ico") ) {
echo "
<link rel=\"icon\" type=\"image/ico\" href=\"skins/$skin/css/$css/graphics/favicon.ico\"/>
<link rel=\"shortcut icon\" href=\"skins/$skin/css/$css/graphics/favicon.ico\"/>

11
web/skins/classic/views/options.php
View File

@@ -26,6 +26,7 @@ if (!canView('System')) {
$canEdit = canEdit('System');
$tabs = array();
if (!defined('ZM_FORCE_CSS_DEFAULT') or !defined('ZM_FORCE_SKIN_DEFAULT'))
$tabs['skins'] = translate('Display');
$tabs['system'] = translate('System');
$tabs['config'] = translate('Config');
@@ -179,8 +180,14 @@ foreach (array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as $
];
} else if ($tab == 'system') {
// $configCats[$tab]['ZM_LANG_DEFAULT']['Hint'] = join('|', getLanguages());
$configCats[$tab]['ZM_SKIN_DEFAULT']['Hint'] = join('|', array_map('basename', glob('skins/*',GLOB_ONLYDIR)));
$configCats[$tab]['ZM_CSS_DEFAULT']['Hint'] = join('|', array_map ( 'basename', glob('skins/'.ZM_SKIN_DEFAULT.'/css/*',GLOB_ONLYDIR) ));
if (defined('ZM_FORCE_SKIN_DEFAULT'))
$configCats[$tab]['ZM_SKIN_DEFAULT']['Hint'] = ZM_FORCE_SKIN_DEFAULT;
else
$configCats[$tab]['ZM_SKIN_DEFAULT']['Hint'] = join('|', array_map('basename', glob('skins/*',GLOB_ONLYDIR)));
if (defined('ZM_FORCE_CSS_DEFAULT'))
$configCats[$tab]['ZM_CSS_DEFAULT']['Hint'] = ZM_FORCE_CSS_DEFAULT;
else
$configCats[$tab]['ZM_CSS_DEFAULT']['Hint'] = join('|', array_map ( 'basename', glob('skins/'.ZM_SKIN_DEFAULT.'/css/*',GLOB_ONLYDIR) ));
$configCats[$tab]['ZM_BANDWIDTH_DEFAULT']['Hint'] = $bandwidth_options;
// create new multidim array for languages (code1|translation)