diff --git a/e107_admin/administrator.php b/e107_admin/administrator.php index c512116ab..a1af24484 100644 --- a/e107_admin/administrator.php +++ b/e107_admin/administrator.php @@ -122,8 +122,8 @@ function show_admins()
".ADMSLAN_13." - - +
+ diff --git a/e107_admin/auth.php b/e107_admin/auth.php index 5f1efe169..400a8232b 100644 --- a/e107_admin/auth.php +++ b/e107_admin/auth.php @@ -126,6 +126,7 @@ else } $e_sub_cat = 'logout'; + if (!defset('NO_HEADER')) require_once (e_ADMIN."header.php"); @@ -161,7 +162,7 @@ class auth - + diff --git a/e107_admin/banlist.php b/e107_admin/banlist.php index 24298c1bf..f54fd8baa 100644 --- a/e107_admin/banlist.php +++ b/e107_admin/banlist.php @@ -430,8 +430,8 @@ switch ($action)
".BANLAN_72." -
".(file_exists(THEME."images/password.png") ? "\n" : "\n")." ".ADLAN_89."\n\n
- +
+ @@ -488,8 +488,8 @@ switch ($action)
".BANLAN_74." -
- +
+ @@ -532,11 +532,11 @@ switch ($action)
".BANLAN_77." -
- - - - +
+ + + + @@ -593,8 +593,8 @@ switch ($action)
".$page_title[$action]." -
- +
+ @@ -736,8 +736,8 @@ switch ($action)
".BANLAN_40." -
- +
+ @@ -780,8 +780,8 @@ switch ($action)
".BANLAN_41." -
- +
+ @@ -854,8 +854,8 @@ switch ($action) else { $text .= " -
- +
+ "; foreach($col_widths[$action] as $fw) { diff --git a/e107_admin/cache.php b/e107_admin/cache.php index e96c94e54..3791f74a3 100644 --- a/e107_admin/cache.php +++ b/e107_admin/cache.php @@ -121,8 +121,8 @@ $text = "
".CACLAN_3." -
- +
+ diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php index 5c97151bd..e296f496f 100644 --- a/e107_admin/cpage.php +++ b/e107_admin/cpage.php @@ -322,8 +322,8 @@ class page_admin_ui extends e_admin_ui
".CUSLAN_47." -
- +
+ @@ -422,8 +422,8 @@ class page_admin_ui extends e_admin_ui
".LAN_OPTIONS." -
- +
+ @@ -485,8 +485,8 @@ class page_admin_ui extends e_admin_ui
".LAN_HOOKS." -
- +
+ @@ -546,8 +546,8 @@ class page_admin_ui extends e_admin_ui
".LAN_OPTIONS." -
- +
+ @@ -858,7 +858,7 @@ class page $text = "
".CUSLAN_5." -
". +
". $frm->colGroup($this->fields,$this->fieldpref). $frm->thead($this->fields,$this->fieldpref). diff --git a/e107_admin/db.php b/e107_admin/db.php index 199ae58b1..e04ca1673 100644 --- a/e107_admin/db.php +++ b/e107_admin/db.php @@ -437,10 +437,10 @@ class system_tools
".DBLAN_10." -
- - - +
+ + + "; @@ -492,9 +492,8 @@ class system_tools $text = " -
- - +
+ @@ -540,9 +539,8 @@ class system_tools $text = "
Export Options -
- - +
+ @@ -577,12 +575,10 @@ class system_tools } $text .= "
- - - - - - +
+ + + @@ -611,11 +607,10 @@ class system_tools
- - - - - +
+ + + @@ -719,12 +714,12 @@ class system_tools $text .= " -
- - - - - +
+ + + + + @@ -837,12 +832,12 @@ class system_tools
".ADLAN_CL_7." -
- - - - - +
+ + + + + @@ -1112,9 +1107,9 @@ function verify_sql_record() // deprecated by db_verify.php ( i think).
".DBLAN_39." -
- - +
+ + @@ -1181,8 +1176,8 @@ function verify_sql_record() // deprecated by db_verify.php ( i think).
".DBLAN_40." ".$ctype." -
- +
+ diff --git a/e107_admin/e107_update.php b/e107_admin/e107_update.php index c6b0559b7..42f5e083d 100644 --- a/e107_admin/e107_update.php +++ b/e107_admin/e107_update.php @@ -87,10 +87,10 @@ function show_updates($dbupdate, $what)
{$caption} -
- - - +
+ + + diff --git a/e107_admin/header.php b/e107_admin/header.php index 68fb89d6b..a977d2f94 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -72,8 +72,11 @@ if (isset($pref['del_unv']) && $pref['del_unv'] && $pref['user_reg_veri'] != 2) // send the charset to the browser - overrides spurious server settings with the lan pack settings. header('Content-type: text/html; charset=utf-8', TRUE); + + + +//echo(defined("STANDARDS_MODE") ? "" : "\n")."\n"; -echo(defined("STANDARDS_MODE") ? "" : "\n")."\n"; // // B.2: Include admin LAN defines @@ -94,12 +97,24 @@ if (!defined('ADMIN_WIDTH')) // C: Send start of HTML // -echo " - - - -"; -echo(defined("CORE_LC")) ? "\n" : ""; +// HTML 5 default. +if(!defined('XHTML_FORCE')) +{ + echo "\n"; + echo "\n"; + echo "\n"; +} +else +{ + echo(defined("STANDARDS_MODE") ? "" : "\n")."\n"; + echo "\n"; + echo " + + \n"; + echo(defined("CORE_LC")) ? "\n" : ""; +} +echo "\n"; + echo "".(defined("e_PAGETITLE") ? e_PAGETITLE." - " : (defined("PAGE_NAME") ? PAGE_NAME." - " : "")).LAN_head_4." :: ".SITENAME."\n"; // diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php index e8e5e56b4..c6effc8c7 100644 --- a/e107_admin/includes/infopanel.php +++ b/e107_admin/includes/infopanel.php @@ -101,7 +101,7 @@ if (isset($_POST['submit-mye107']) || varset($_POST['submit-mymenus'])) $text .= "
-
+
"; @@ -127,13 +127,13 @@ $text .= "
- - - - - - - +
+ + + + + + diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php index 1bed225f9..0a0365043 100644 --- a/e107_admin/newspost.php +++ b/e107_admin/newspost.php @@ -1087,7 +1087,7 @@ class admin_newspost
".NWSLAN_4." -
+
".$frm->colGroup($this->fields, $this->fieldpref)." ".$frm->thead($this->fields, $this->fieldpref, 'action=main&sub=[FIELD]&id=[ASC]&filter='.intval($_GET['filter']).'&srch='.$_GET['srch'].'&frm=[FROM]')." "; @@ -1384,8 +1384,8 @@ class admin_newspost
".LAN_NEWS_52." -
- +
+ @@ -1546,8 +1546,8 @@ class admin_newspost $text .= "
SEO -
- +
+ @@ -1578,8 +1578,8 @@ class admin_newspost $text .= "
".LAN_NEWS_53." -
- +
+ @@ -1837,7 +1837,7 @@ class admin_newspost return "
".NWSLAN_27." -
+
@@ -1973,8 +1973,8 @@ class admin_newspost
".NWSLAN_56." - - +
+ @@ -2069,14 +2069,14 @@ class admin_newspost
".NWSLAN_51." -
- - - - - - - +
+ + + + + + + @@ -2172,8 +2172,8 @@ class admin_newspost
".NWSLAN_90." -
- +
+ @@ -2319,16 +2319,16 @@ class admin_newspost
".NWSLAN_47." -
- - - - - - - - - + + + + + + + + + + @@ -2423,11 +2423,11 @@ class admin_newspost
".LAN_NEWS_59." -
- - - - +
+ + + + diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php index 4eed81808..6cd54918f 100644 --- a/e107_admin/prefs.php +++ b/e107_admin/prefs.php @@ -193,8 +193,8 @@ $text = "
".PRFLAN_1." -
- +
+ @@ -328,8 +328,8 @@ $text .= " $text .= "
".PRFLAN_13." -
- +
+ @@ -375,8 +375,8 @@ $text .= " $text .= "
".PRFLAN_77." -
- +
+ @@ -425,8 +425,8 @@ $date3 = $ga->convert_date(time(), "forum"); $text .= "
".PRFLAN_21." -
- +
+ @@ -489,8 +489,8 @@ $text .= " $text .= "
".PRFLAN_28." -
- +
+ @@ -634,8 +634,8 @@ $text .= " $text .= "
".PRFLAN_19." -
- +
+ @@ -701,8 +701,8 @@ if(!isset($pref['post_html'])) $text .= "
".PRFLAN_101." -
- +
+ @@ -848,8 +848,8 @@ $hasGD = extension_loaded("gd"); $text .= "
".PRFLAN_47." -
- +
+ @@ -1034,8 +1034,8 @@ $text .= " $text .= "
".PRFLAN_87." -
- +
+ @@ -1082,8 +1082,8 @@ $text .= "
".PRFLAN_209." - - +
+ @@ -1107,8 +1107,8 @@ $text .= " $text .= "
Javascript Frameworks (for testing purposes only) -
- +
+ @@ -1161,8 +1161,8 @@ $text .= " $text .= "
".PRFLAN_149." -
- +
+ diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php index c2b631764..b7f949543 100644 --- a/e107_core/shortcodes/batch/admin_shortcodes.php +++ b/e107_core/shortcodes/batch/admin_shortcodes.php @@ -1057,7 +1057,7 @@ class admin_shortcodes $text = ""; } - $text .= "
+ $text .= "
"; diff --git a/e107_themes/jayya/admin_template.php b/e107_themes/jayya/admin_template.php index 0ceb4a161..d2a67c48a 100644 --- a/e107_themes/jayya/admin_template.php +++ b/e107_themes/jayya/admin_template.php @@ -58,13 +58,17 @@ $ADMIN_HEADER = "
"; -if (ADMIN) { +if (ADMIN) +{ $ADMIN_HEADER .= "{ADMIN_ALT_NAV}"; -} else { +} +else // Admin LOGIN area. +{ + // file not found errors when logged out. if (file_exists(THEME.'admin_nav.js')) { - $ADMIN_HEADER .= ""; + //$ADMIN_HEADER .= ""; } else { - $ADMIN_HEADER .= ""; + // $ADMIN_HEADER .= ""; } $ADMIN_HEADER .= "
diff --git a/e107_themes/templates/header_default.php b/e107_themes/templates/header_default.php index 7125b1900..5e4d09552 100644 --- a/e107_themes/templates/header_default.php +++ b/e107_themes/templates/header_default.php @@ -105,6 +105,9 @@ echo " "; echo (defined("CORE_LC")) ? "\n" : ""; +e107::meta('copyright',$pref['meta_copyright'][e_LANGUAGE]); +e107::meta('author',$pref['meta_author'][e_LANGUAGE]); +e107::meta('og:image',$tp->replaceConstants($pref['sitelogo'],'full')); echo e107::getUrl()->response()->renderMeta()."\n"; @@ -430,8 +433,8 @@ function render_meta($type) echo (defined("META_DESCRIPTION")) ? "\n\n" : render_meta('description'); echo (defined("META_KEYWORDS")) ? "\n\n" : render_meta('keywords'); -echo render_meta('copyright'); -echo render_meta('author'); +//echo render_meta('copyright'); +//echo render_meta('author'); echo render_meta('tag'); unset($key_merge,$diz_merge);