Menu
▾
▴
[Sciret-svn] SF.net SVN: sciret:[676] trunk
|
From: <al...@us...> - 2008-09-16 15:56:28
|
Revision: 676
http://sciret.svn.sourceforge.net/sciret/?rev=676&view=rev
Author: alpeb
Date: 2008-09-16 22:56:26 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
added entry in views array to determine whether they should load the html head section
Modified Paths:
--------------
trunk/classes/Controller.php
trunk/flowMap.php
Modified: trunk/classes/Controller.php
===================================================================
--- trunk/classes/Controller.php 2008-09-16 21:28:15 UTC (rev 675)
+++ trunk/classes/Controller.php 2008-09-16 22:56:26 UTC (rev 676)
@@ -11,8 +11,9 @@
define('MINIMUM_ROLE', 0);
define('LOAD_CONFIGURATION', 1);
-define('SHOW_HEADER', 2);
-define('ALLOW_VIEW_ONLY_IF_PUBLIC_KB', 3);
+define('SHOW_HEAD', 2);
+define('SHOW_HEADER', 3);
+define('ALLOW_VIEW_ONLY_IF_PUBLIC_KB', 4);
define('ALLOW_ACTION_ONLY_IF_PUBLIC_KB', 2);
require 'models/Configuration.php';
@@ -68,7 +69,9 @@
$obj = new $view($this->user, $this->configuration);
$obj->setTemplate(new KB_Template('templates', $this->user));
$obj->preDispatch();
- $obj->setHTMLHeader($this->views[$view][SHOW_HEADER]);
+ if ($this->views[$view][SHOW_HEAD]) {
+ $obj->setHTMLHeader($this->views[$view][SHOW_HEADER]);
+ }
$obj->dispatch();
if ($this->views[$view][SHOW_HEADER]) {
$obj->showFooter();
Modified: trunk/flowMap.php
===================================================================
--- trunk/flowMap.php 2008-09-16 21:28:15 UTC (rev 675)
+++ trunk/flowMap.php 2008-09-16 22:56:26 UTC (rev 676)
@@ -11,37 +11,37 @@
define('VIEW_DEFAULT', 'MainView');
-// ClassName => array(minimumRole, loadConfiguration, showHeader, allowOnlyIfPublicKB(for User::ROLE_ANONYMOUS)?)
+// ClassName => array(minimumRole, loadConfiguration, showHead, showHeader, allowOnlyIfPublicKB(for User::ROLE_ANONYMOUS)?)
$views = array(
- 'NotInstalled' => array(User::ROLE_ANONYMOUS, false, false, false),
- 'InstallEnterCredentials' => array(User::ROLE_ANONYMOUS, false, false, false),
- 'InstallOk' => array(User::ROLE_ANONYMOUS, true, false, false),
- 'Login' => array(User::ROLE_ANONYMOUS, true, true, false),
- 'MainView' => array(User::ROLE_ANONYMOUS, true, true, true),
- 'EditArticle' => array(User::ROLE_REGISTERED, true, true),
- 'EditBookmark' => array(User::ROLE_REGISTERED, true, true),
- 'ViewArticle' => array(User::ROLE_ANONYMOUS, true, true, true),
- 'ViewBookmark' => array(User::ROLE_ANONYMOUS, true, true, true),
- 'ManageUsers' => array(User::ROLE_ADMIN, true, true),
- 'EditUser' => array(User::ROLE_REGISTERED, true, true),
- 'AddQuestion' => array(User::ROLE_ANONYMOUS, true, true, true),
- 'EditCategories' => array(User::ROLE_ANONYMOUS, true, true, true),
- 'EditCategory' => array(User::ROLE_ADMIN, true, true),
- 'EditPreferences' => array(User::ROLE_ANONYMOUS, true, true, true),
- 'ManageArticles' => array(User::ROLE_REGISTERED, true, false),
- 'ManageQuestions' => array(User::ROLE_REGISTERED, true, true),
- 'SearchResults' => array(User::ROLE_ANONYMOUS, true, true, true),
- 'AdvancedSearch' => array(User::ROLE_ANONYMOUS, true, true, true),
- 'PrinterView' => array(User::ROLE_ANONYMOUS, true, false, true),
- 'MailArticle' => array(User::ROLE_ANONYMOUS, true, true, true),
- 'ViewComments' => array(User::ROLE_ANONYMOUS, true, false, true),
- 'ViewBookmarkDetails' => array(User::ROLE_ANONYMOUS, true, false, true),
- 'ViewRelatedArticles' => array(User::ROLE_ANONYMOUS, true, false, true),
- 'GetFavoritesDropdown' => array(User::ROLE_REGISTERED, true, false),
- 'GetTodosDropdown' => array(User::ROLE_REGISTERED, true, false),
- 'EditTodo' => array(User::ROLE_REGISTERED, true, false),
- 'Upgrade' => array(User::ROLE_ANONYMOUS, true, true, false),
- 'UpgradeOk' => array(User::ROLE_ANONYMOUS, true, true, false),
+ 'NotInstalled' => array(User::ROLE_ANONYMOUS, false, true, false, false),
+ 'InstallEnterCredentials' => array(User::ROLE_ANONYMOUS, false, true, false, false),
+ 'InstallOk' => array(User::ROLE_ANONYMOUS, true, true, false, false),
+ 'Login' => array(User::ROLE_ANONYMOUS, true, true, true, false),
+ 'MainView' => array(User::ROLE_ANONYMOUS, true, true, true, true),
+ 'EditArticle' => array(User::ROLE_REGISTERED, true, true, true),
+ 'EditBookmark' => array(User::ROLE_REGISTERED, true, true, true),
+ 'ViewArticle' => array(User::ROLE_ANONYMOUS, true, true, true, true),
+ 'ViewBookmark' => array(User::ROLE_ANONYMOUS, true, true, true, true),
+ 'ManageUsers' => array(User::ROLE_ADMIN, true, true, true),
+ 'EditUser' => array(User::ROLE_REGISTERED, true, true, true),
+ 'AddQuestion' => array(User::ROLE_ANONYMOUS, true, true, true, true),
+ 'EditCategories' => array(User::ROLE_ANONYMOUS, true, true, true, true),
+ 'EditCategory' => array(User::ROLE_ADMIN, true, true, true),
+ 'EditPreferences' => array(User::ROLE_ANONYMOUS, true, true, true, true),
+ 'ManageArticles' => array(User::ROLE_REGISTERED, true, true, false),
+ 'ManageQuestions' => array(User::ROLE_REGISTERED, true, true, true),
+ 'SearchResults' => array(User::ROLE_ANONYMOUS, true, true, true, true),
+ 'AdvancedSearch' => array(User::ROLE_ANONYMOUS, true, true, true, true),
+ 'PrinterView' => array(User::ROLE_ANONYMOUS, true, true, false, true),
+ 'MailArticle' => array(User::ROLE_ANONYMOUS, true, true, true, true),
+ 'ViewComments' => array(User::ROLE_ANONYMOUS, true, true, false, true),
+ 'ViewBookmarkDetails' => array(User::ROLE_ANONYMOUS, true, true, false, true),
+ 'ViewRelatedArticles' => array(User::ROLE_ANONYMOUS, true, true, false, true),
+ 'GetFavoritesDropdown' => array(User::ROLE_REGISTERED, true, true, false),
+ 'GetTodosDropdown' => array(User::ROLE_REGISTERED, true, true, false),
+ 'EditTodo' => array(User::ROLE_REGISTERED, true, false, false),
+ 'Upgrade' => array(User::ROLE_ANONYMOUS, true, true, true, false),
+ 'UpgradeOk' => array(User::ROLE_ANONYMOUS, true, true, true, false),
);
// ClassName => array(minimumRole, loadConfiguration, allowOnlyIfPublicKB(for User::ROLE_ANONYMOUS)?)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
