Subversion Repositories oidplus

Compare Revisions

No changes between revisions

Regard whitespace Rev 1346 → Rev 1347

/trunk/favicon.ico.php
File deleted
/trunk/doc/website/download.html
5,7 → 5,7
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="favicon.ico">
<link rel="shortcut icon" type="image/x-icon" href="favicon.png">
 
<title>OIDplus - Download and Install</title>
 
/trunk/doc/website/examples.html
5,7 → 5,7
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="favicon.ico">
<link rel="shortcut icon" type="image/x-icon" href="favicon.png">
 
<title>OIDplus - Examples</title>
 
/trunk/doc/website/features.html
5,7 → 5,7
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="favicon.ico">
<link rel="shortcut icon" type="image/x-icon" href="favicon.png">
 
<title>OIDplus - Features</title>
 
/trunk/doc/website/support.html
5,7 → 5,7
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="favicon.ico">
<link rel="shortcut icon" type="image/x-icon" href="favicon.png">
 
<title>OIDplus - Support</title>
 
/trunk/favicon.png.php
0,0 → 1,30
<?php
 
/*
* OIDplus 2.0
* Copyright 2019 - 2023 Daniel Marschall, ViaThinkSoft
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
 
require_once __DIR__ . '/includes/oidplus.inc.php';
 
error_reporting(0);
 
if (file_exists(__DIR__.'/userdata/favicon.png')) {
$out = file_get_contents(__DIR__.'/userdata/favicon.png');
} else {
$out = file_get_contents(__DIR__.'/img/default_favicon.png');
}
 
httpOutWithETag($out, 'image/x-icon', 'favicon.png');
/trunk/img/default_favicon.ico
Cannot display: file marked as a binary type.
svn:mime-type = image/vnd.microsoft.icon
Property changes:
Deleted: svn:mime-type
-image/vnd.microsoft.icon
\ No newline at end of property
/trunk/img/default_favicon.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/trunk/includes/classes/OIDplusGui.class.php
277,7 → 277,7
$head_elems[] = '<script src="'.htmlentities(OIDplus::webpath(null, OIDplus::PATH_RELATIVE)).'polyfill.min.js.php"></script>';
$head_elems[] = '<script src="'.htmlentities(OIDplus::webpath(null, OIDplus::PATH_RELATIVE)).'oidplus.min.js.php?noBaseConfig=1" type="text/javascript"></script>';
$head_elems[] = '<link rel="stylesheet" href="'.htmlentities(OIDplus::webpath(null, OIDplus::PATH_RELATIVE)).'oidplus.min.css.php?noBaseConfig=1">';
$head_elems[] = '<link rel="shortcut icon" type="image/x-icon" href="'.htmlentities(OIDplus::webpath(null, OIDplus::PATH_RELATIVE)).'favicon.ico.php">';
$head_elems[] = '<link rel="shortcut icon" type="image/png" href="'.htmlentities(OIDplus::webpath(null, OIDplus::PATH_RELATIVE)).'favicon.png.php">';
if (OIDplus::baseConfig()->exists('CANONICAL_SYSTEM_URL')) {
$head_elems[] = '<link rel="canonical" href="'.htmlentities(OIDplus::canonicalURL().OIDplus::webpath(null, OIDplus::PATH_RELATIVE)).'">';
}
/trunk/userdata/favicon/info.txt
2,5 → 2,5
About the folder "userdata/favicon"
-----------------------------------
 
If the file favicon.ico is existing, it will be chosen instead of img/favicon.ico
If the file favicon.png is existing, it will be chosen instead of img/favicon.png