diff options
author | Philip Häusler <msquare@notrademark.de> | 2012-12-27 03:04:54 +0100 |
---|---|---|
committer | Philip Häusler <msquare@notrademark.de> | 2012-12-27 03:04:54 +0100 |
commit | caeadadb2734bfc537d3e1701b2a20cad233a07e (patch) | |
tree | e0606c6eb37707b372e65cf1c5f6243254eb94fe /public/index.php | |
parent | 32cae74a585ecc074124aa5b9668b9f0a25a2ad5 (diff) | |
parent | 0f0f847af4c9ffe8138c802086bda7eb15f9baef (diff) |
Merge branch 'dev'
Diffstat (limited to 'public/index.php')
-rw-r--r-- | public/index.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/public/index.php b/public/index.php index 45555a2b..a7efbd86 100644 --- a/public/index.php +++ b/public/index.php @@ -3,6 +3,7 @@ require_once ('bootstrap.php'); require_once ('includes/sys_auth.php'); require_once ('includes/sys_counter.php'); require_once ('includes/sys_lang.php'); +require_once ('includes/sys_log.php'); require_once ('includes/sys_menu.php'); require_once ('includes/sys_mysql.php'); require_once ('includes/sys_page.php'); @@ -10,6 +11,9 @@ require_once ('includes/sys_shift.php'); require_once ('includes/sys_template.php'); require_once ('includes/sys_user.php'); +require_once ('includes/model/LogEntries_model.php'); +require_once ('includes/model/User_model.php'); + require_once ('config/config.php'); require_once ('config/config_db.php'); @@ -39,6 +43,10 @@ if ($p == "ical") { require_once ('includes/pages/user_ical.php'); user_ical(); } +elseif ($p == "atom") { + require_once ('includes/pages/user_atom.php'); + user_atom(); +} // Recht dafür vorhanden? elseif (in_array($p, $privileges)) { if ($p == "news") { @@ -184,6 +192,7 @@ if (isset ($user) && $p != "admin_user_angeltypes") echo template_render('../templates/layout.html', array ( 'theme' => isset ($user) ? $user['color'] : $default_theme, 'title' => $title, + 'atom_link' => ($p == 'news' || $p == 'user_meetings')? '<link href="' . page_link_to('atom') . (($p == 'user_meetings')? '&meetings=1' : '') . '&key=' . $user['ical_key'] . '" type="application/atom+xml" rel="alternate" title="Atom Feed">' : '', 'menu' => make_menu(), 'content' => $content )); |