mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-30 19:30:25 +02:00
Code Issues Releases Wiki Activity

Introducing e_IFRAME mod; NOHEADER changed to e_NOHEADER; overall menu.php url checks cleaned (API, header, footer); menu related code cleanup and fixes, e_parse improvements (more work is needed); smarter getSingleton() and getObject() (in progress)

Browse Source
This commit is contained in:
secretr
2009-08-19 14:39:57 +00:00
parent e8f6645d10
commit 3099bf9052
9 changed files with 356 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
e107_admin/header.php
View File

@@ -12,15 +12,19 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $
| $Revision: 1.43 $
| $Date: 2009-08-06 22:41:34 $
| $Author: bugrain $
| $Revision: 1.44 $
| $Date: 2009-08-19 14:39:56 $
| $Author: secretr $
+---------------------------------------------------------------+
*/
if (!defined('e107_INIT')) { exit; }
define("ADMIN_AREA",TRUE);
define("USER_AREA",FALSE);
if(!defined('ADMIN_AREA'))
{
//avoid PHP warning
define("ADMIN_AREA", TRUE);
}
define("USER_AREA", FALSE);
$sql->db_Mark_Time('(Header Top)');
//
@@ -201,9 +205,12 @@ echo "<!-- *JS* -->\n";
// Wysiwyg JS support on or off.
// your code should run off e_WYSIWYG
if (varset($pref['wysiwyg'],FALSE) && check_class($pref['post_html'])) {
if (varset($pref['wysiwyg'],FALSE) && check_class($pref['post_html']))
{
define("e_WYSIWYG",TRUE);
}else{
}
else
{
define("e_WYSIWYG",FALSE);
}
@@ -212,10 +219,10 @@ $hash = md5(serialize(varset($pref['e_jslib'])).serialize(varset($THEME_JSLIB)).
//echo "<script type='text/javascript' src='".e_FILE_ABS."e_js.php'></script>\n";
echo "<script type='text/javascript' src='".e_FILE_ABS."e_jslib.php?{$hash}'></script>\n";
if (strpos(e_SELF.'?'.e_QUERY, 'menus.php?configure') === FALSE) {
//if (strpos(e_SELF.'?'.e_QUERY, 'menus.php?configure') === FALSE) {
//echo "<script type='text/javascript' src='".e_FILE_ABS."e_ajax.php'></script>\n";
}
//}
if (file_exists(THEME.'theme.js')) { echo "<script type='text/javascript' src='".THEME_ABS."theme.js'></script>\n"; }
if (is_readable(e_FILE.'user.js') && filesize(e_FILE.'user.js')) { echo "<script type='text/javascript' src='".e_FILE_ABS."user.js'></script>\n"; }
@@ -272,22 +279,25 @@ if (isset($eplug_css) && $eplug_css) {
}
echo "<!-- Theme css -->\n";
if (strpos(e_SELF.'?'.e_QUERY, 'menus.php?configure') === FALSE && isset($pref['admincss']) && $pref['admincss'] && file_exists(THEME.$pref['admincss'])) {
//NEW - Iframe mod
if (!defsettrue('e_IFRAME') && isset($pref['admincss']) && $pref['admincss'] && file_exists(THEME.$pref['admincss']))
{
$css_file = file_exists(THEME.'admin_'.$pref['admincss']) ? THEME_ABS.'admin_'.$pref['admincss'] : THEME_ABS.$pref['admincss'];
echo "<link rel='stylesheet' href='".$css_file."' type='text/css' />\n";
} else if (isset($pref['themecss']) && $pref['themecss'] && file_exists(THEME.$pref['themecss']))
}
elseif (isset($pref['themecss']) && $pref['themecss'] && file_exists(THEME.$pref['themecss']))
{
$css_file = file_exists(THEME.'admin_'.$pref['themecss']) ? THEME_ABS.'admin_'.$pref['themecss'] : THEME_ABS.$pref['themecss'];
echo "<link rel='stylesheet' href='".$css_file."' type='text/css' />\n";
}
else
{
$css_file = file_exists(THEME.'admin_style.css') ? THEME_ABS.'admin_style.css' : THEME_ABS.'style.css';
echo "<link rel='stylesheet' href='".$css_file."' type='text/css' />\n";
}
if (!isset($no_core_css) || !$no_core_css) {
if (!isset($no_core_css) || !$no_core_css)
{
echo "<link rel='stylesheet' href='".e_FILE_ABS."e107.css' type='text/css' />\n";
}
@@ -755,9 +765,14 @@ function admin_purge_related($table, $id)
$sql->db_Mark_Time('Parse Admin Header');
if (strpos(e_SELF.'?'.e_QUERY, 'menus.php?configure') === FALSE) {
//NEW - Iframe mod
if (!defsettrue('e_IFRAME'))
{
//removed check strpos(e_SELF.'?'.e_QUERY, 'menus.php?configure') === FALSE
parse_admin($ADMIN_HEADER);
}
$sql->db_Mark_Time('(End: Parse Admin Header)');
}