From 3dfe45a216dc4239316978abe58dd36aa65a7114 Mon Sep 17 00:00:00 2001 From: following Date: Sat, 4 May 2013 23:01:38 +0200 Subject: [PATCH] re-added lib1 login page fixes issue #28 --- htdocs/doc/sql/static-data/data.sql | 4 ++-- htdocs/lang/de/ocstyle/lib/menu.php | 12 ++++++++---- htdocs/lang/de/ocstyle/{old => }/login.inc.php | 0 htdocs/lang/de/ocstyle/{old => }/login.tpl.php | 4 +++- htdocs/lang/de/ocstyle/main.tpl.php | 6 +++++- 5 files changed, 18 insertions(+), 8 deletions(-) rename htdocs/lang/de/ocstyle/{old => }/login.inc.php (100%) rename htdocs/lang/de/ocstyle/{old => }/login.tpl.php (97%) diff --git a/htdocs/doc/sql/static-data/data.sql b/htdocs/doc/sql/static-data/data.sql index 829e8f9d..40e5d90f 100644 --- a/htdocs/doc/sql/static-data/data.sql +++ b/htdocs/doc/sql/static-data/data.sql @@ -4778,7 +4778,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('107', 'DE', 'Entschuldigung, aber diese Seite darfst du nicht sehen.', '2010-08-28 11:48:06'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('108', 'DE', 'Entschuldigung, aber der angeforderte Cache existiert nicht.', '2010-08-28 11:48:06'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('109', 'DE', 'Entschuldigung, aber der angeforderte Vorgang konnte nicht ausgeführt werden.', '2010-08-28 11:48:06'); -INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('110', 'DE', 'Entschuldigung, aber der angeforderte Vorgang konnte nicht ausgeführt werden, weil du nicht angemeldet bist.', '2010-08-28 11:48:06'); +INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('110', 'DE', 'Melde dich an, um fortzufahren:', '2010-08-28 11:48:06'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('111', 'DE', 'Entschuldigung, aber der angeforderte Benutzer existiert nicht.', '2010-08-28 11:48:06'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('112', 'DE', 'Das E-Mail Template existiert nicht.', '2010-08-28 11:48:06'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('113', 'DE', 'Erlaubte HTML-Tags', '2010-08-28 11:48:06'); @@ -6321,7 +6321,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('107', 'EN', 'Sorry, you are not allowed to view this page.', '2010-08-28 11:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('108', 'EN', 'Sorry, the requested cache does not exist.', '2010-08-28 11:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('109', 'EN', 'Sorry, the requested operation cannot be performed.', '2010-08-28 11:48:07'); -INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('110', 'EN', 'Sorry, the requested operation cannot be performed because you are not logged in with an user account.', '2010-08-28 11:48:07'); +INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('110', 'EN', 'Please login to continue:', '2010-08-28 11:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('111', 'EN', 'Sorry, the requested user does not exist.', '2010-08-28 11:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('112', 'EN', 'Mail template does not exist.', '2010-08-28 11:48:07'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('113', 'EN', 'HTML Tags', '2010-08-28 11:48:07'); diff --git a/htdocs/lang/de/ocstyle/lib/menu.php b/htdocs/lang/de/ocstyle/lib/menu.php index 1bef1c98..83ba746a 100644 --- a/htdocs/lang/de/ocstyle/lib/menu.php +++ b/htdocs/lang/de/ocstyle/lib/menu.php @@ -415,12 +415,16 @@ function mnu_EchoBreadCrumb($pageid, $mainmenuindex) { global $menu; - echo htmlspecialchars(t($menu[$mainmenuindex]['menustring']), ENT_COMPAT, 'UTF-8'); + if ($mainmenuindex >= 0) + { // is -1 e.g. when calling newcache.php as logged-off-user (-> login.tpl.php) + echo htmlspecialchars(t($menu[$mainmenuindex]['menustring']), ENT_COMPAT, 'UTF-8'); - if (isset($menu[$mainmenuindex]['submenu']) && ($menu[$mainmenuindex]['siteid'] != $pageid)) - { - mnu_prv_EchoBreadCrumbSubItem($pageid, $menu[$mainmenuindex]['submenu']); + if (isset($menu[$mainmenuindex]['submenu']) && ($menu[$mainmenuindex]['siteid'] != $pageid)) + { + mnu_prv_EchoBreadCrumbSubItem($pageid, $menu[$mainmenuindex]['submenu']); + } } + } /* diff --git a/htdocs/lang/de/ocstyle/old/login.inc.php b/htdocs/lang/de/ocstyle/login.inc.php similarity index 100% rename from htdocs/lang/de/ocstyle/old/login.inc.php rename to htdocs/lang/de/ocstyle/login.inc.php diff --git a/htdocs/lang/de/ocstyle/old/login.tpl.php b/htdocs/lang/de/ocstyle/login.tpl.php similarity index 97% rename from htdocs/lang/de/ocstyle/old/login.tpl.php rename to htdocs/lang/de/ocstyle/login.tpl.php index 79d2ebd9..22a746df 100644 --- a/htdocs/lang/de/ocstyle/old/login.tpl.php +++ b/htdocs/lang/de/ocstyle/login.tpl.php @@ -18,7 +18,9 @@ username default username message message to display the user target page to display after login - + + Is called from lib1 pages when login is required, e.g. newcache.php. + ****************************************************************************/ ?> diff --git a/htdocs/lang/de/ocstyle/main.tpl.php b/htdocs/lang/de/ocstyle/main.tpl.php index 173826d6..576fae1a 100644 --- a/htdocs/lang/de/ocstyle/main.tpl.php +++ b/htdocs/lang/de/ocstyle/main.tpl.php @@ -192,7 +192,11 @@