OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

re-added lib1 login page

Browse Source 
fixes issue #28
This commit is contained in:
following
2013-05-04 23:11:28 +02:00
parent 394099649e
commit 3dfe45a216
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/doc/sql/static-data/data.sql
+2 -2
View File
@@ -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');
htdocs/lang/de/ocstyle/lib/menu.php
+8 -4
View File
@@ -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']);
}
}
}
/*
htdocs/lang/de/ocstyle/old/login.inc.php → htdocs/lang/de/ocstyle/login.inc.php
View File
htdocs/lang/de/ocstyle/old/login.tpl.php → htdocs/lang/de/ocstyle/login.tpl.php
+3 -1
View File
@@ -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.
****************************************************************************/
?>
htdocs/lang/de/ocstyle/main.tpl.php
+5 -1
View File
@@ -192,7 +192,11 @@
<div class="nav2">
<ul>
<?php
mnu_EchoMainMenu($menu[$pageidx]['siteid']);
// $pageidx is -1 e.g. when calling newcache.php as logged-off-user (-> login.tpl.php)
if ($pageidx >= 0)
mnu_EchoMainMenu($menu[$pageidx]['siteid']);
else
mnu_EchoMainMenu(-1);
?>
</ul>
</div>