diff options
author | Starla Insigna <hatkirby@fourisland.com> | 2009-11-26 14:21:20 -0500 |
---|---|---|
committer | Starla Insigna <hatkirby@fourisland.com> | 2009-11-26 14:21:20 -0500 |
commit | 224f9ee5014ae5c5399188afd8d38e3b620e2856 (patch) | |
tree | 6432f783d495626e962835009b6d2f4fd53e42cd /includes/layout.php | |
parent | 34d358ba240bd19491f0f97faf04513318bee6c0 (diff) | |
download | fourisland-224f9ee5014ae5c5399188afd8d38e3b620e2856.tar.gz fourisland-224f9ee5014ae5c5399188afd8d38e3b620e2856.tar.bz2 fourisland-224f9ee5014ae5c5399188afd8d38e3b620e2856.zip |
Added Fouripedia compatibility
Made many strutural changes to Four Island allowing for the reinclusion of Fouripedia.
Diffstat (limited to 'includes/layout.php')
-rw-r--r-- | includes/layout.php | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/includes/layout.php b/includes/layout.php index ffe1aa6..b11c56f 100644 --- a/includes/layout.php +++ b/includes/layout.php | |||
@@ -28,19 +28,17 @@ $template->add('CATEGORY',(isset($pageCategory)) ? $pageCategory : 'none'); | |||
28 | $template->add('AID',(isset($pageAID)) ? $pageAID : 'none'); | 28 | $template->add('AID',(isset($pageAID)) ? $pageAID : 'none'); |
29 | $template->add('EXTRATITLE',isset($title) ? ($title . ' - ') : ''); | 29 | $template->add('EXTRATITLE',isset($title) ? ($title . ' - ') : ''); |
30 | $template->add(strtoupper($pageCategory) . 'ACTIVE', ' class="active"'); | 30 | $template->add(strtoupper($pageCategory) . 'ACTIVE', ' class="active"'); |
31 | $template->add('EXTRASIDEBAR', isset($extraSidebar) ? $extraSidebar : ''); | ||
31 | 32 | ||
32 | if (($pageCategory != 'fourm') && ($pageCategory != 'wiki')) | 33 | $template->add('REDIRPAGE',rawurlencode($_SERVER['REQUEST_URI'])); |
33 | { | 34 | $template->add('LOGDATA',echoLogData()); |
34 | $template->add('REDIRPAGE',rawurlencode($_SERVER['REQUEST_URI'])); | 35 | $template->add('LOWERLOGDATA','log' . strtolower(echoLogData())); |
35 | $template->add('LOGDATA',echoLogData()); | 36 | $template->add('SID',getSessionID()); |
36 | $template->add('LOWERLOGDATA','log' . strtolower(echoLogData())); | 37 | $template->adds_block('MEMBERS',array('exi' => 1)); |
37 | $template->add('SID',getSessionID()); | ||
38 | $template->adds_block('MEMBERS',array('exi' => 1)); | ||
39 | 38 | ||
40 | if (isAdmin()) | 39 | if (isAdmin()) |
41 | { | 40 | { |
42 | $template->adds_block('ADMIN',array('exi' => 1)); | 41 | $template->adds_block('ADMIN',array('exi' => 1)); |
43 | } | ||
44 | } | 42 | } |
45 | 43 | ||
46 | if (isset($hatNav) && is_array($hatNav)) | 44 | if (isset($hatNav) && is_array($hatNav)) |
@@ -274,11 +272,11 @@ foreach ($counts as $tag => $count) | |||
274 | if (!isset($noRightbar)) | 272 | if (!isset($noRightbar)) |
275 | { | 273 | { |
276 | $template->adds_block('RIGHTBAR', array('exi'=>1)); | 274 | $template->adds_block('RIGHTBAR', array('exi'=>1)); |
277 | } | 275 | } |
278 | 276 | ||
279 | $template->add('ME', getRewriteURL()); | 277 | $template->add('ME', getRewriteURL()); |
280 | 278 | ||
281 | $template->add('CONTENT', stripslashes($content)); | 279 | $template->add('CONTENT', $content); |
282 | 280 | ||
283 | $template->display(); | 281 | $template->display(); |
284 | 282 | ||