added first (pre-beta) version of public section functionality. You m…

…ust run setup to update your ilias.ini OR add the directive [system]ANONYMOUS_USER_ID = <user account id> manually. The user with <user account id> must have username & password set to 'anonymous'. Furthermore you need to enable 'public section' in the basic settings. git-svn-id: http://svn.ilias.de/svn/ilias/trunk@1840 21b2c9ec-7c21-0410-8b45-9bfb8ed2bfc5
Serophos · Aug 11, 2003 · 7a9e8f0 · 7a9e8f0
1 parent 645e2cc
commit 7a9e8f0
Show file tree

Hide file tree

Showing 11 changed files with 74 additions and 9 deletions.
diff --git a/classes/class.ilMainMenuGUI.php b/classes/class.ilMainMenuGUI.php
@@ -90,7 +90,7 @@ function setTemplateVars()
 		global $rbacsystem, $lng, $ilias;
 
 		// administration button
-		if ($rbacsystem->checkAccess("visible", ROOT_FOLDER_ID))
+		if ($rbacsystem->checkAccess("visible", SYSTEM_FOLDER_ID))
 		{
 			$this->tpl->setCurrentBlock("userisadmin");
 			$this->tpl->setVariable("IMG_ADMIN2", ilUtil::getImagePath("navbar/admin.gif", false));
@@ -100,6 +100,23 @@ function setTemplateVars()
 			$this->tpl->setVariable("TARGET2", $this->target);
 			$this->tpl->parseCurrentBlock();
 		}
+
+		if ($_SESSION["AccountId"] == ANONYMOUS_USER_ID)
+		{
+			$this->tpl->setCurrentBlock("userisanonymous");
+			$this->tpl->setVariable("TXT_NOT_LOGGED_IN",$lng->txt("not_logged_in"));
+			$this->tpl->setVariable("TXT_LOGIN",$lng->txt("login"));
+			$this->tpl->setVariable("TXT_REGISTER",$lng->txt("register"));
+			$this->tpl->parseCurrentBlock();
+		}
+		else
+		{
+			$this->tpl->setCurrentBlock("userisloggedin");
+			$this->tpl->setVariable("TXT_WELCOME",$lng->txt("welcome"));
+			$this->tpl->setVariable("TXT_LOGOUT2",$lng->txt("logout"));
+			$this->tpl->setVariable("USERNAME",$ilias->account->getFullname());
+			$this->tpl->parseCurrentBlock();		
+		}
 
 		$var2image = array( "IMG_DESK" => "navbar/desk.gif",
 							"IMG_DESK_O" => "navbar/desk_o.gif",

diff --git a/classes/class.ilObjUser.php b/classes/class.ilObjUser.php
@@ -1035,19 +1035,20 @@ function setSkin($a_str)
 
 	/*
 	* check user id with login name
-	* @param	integer	account id
 	* @access	public
 	*/
-	function checkUserId($AccountId)
+	function checkUserId()
 	{
 		$r = $this->ilias->db->query("SELECT usr_id FROM usr_data WHERE login='".$this->ilias->auth->getUsername()."'");
 		//query has got a result
 		if ($r->numRows() > 0)
 		{
 			$data = $r->fetchRow();
 			$this->id = $data[0];
+
 			return $this->id;
 		}
+
 		return false;
 	}
 

diff --git a/classes/class.ilias.php b/classes/class.ilias.php
@@ -159,6 +159,8 @@ function ILIAS()
 		define ("ILIAS_HTTP_PATH",$this->ini->readVariable('server','http_path'));
 		define ("ILIAS_ABSOLUTE_PATH",$this->ini->readVariable('server','absolute_path'));
 
+		define ("ANONYMOUS_USER_ID",$this->ini->readVariable('system','ANONYMOUS_USER_ID'));
+
 		// build dsn of database connection and connect
 		$this->dsn = $this->ini->readVariable("db","type").
 					 "://".$this->ini->readVariable("db", "user").
@@ -168,6 +170,9 @@ function ILIAS()
 
 		$this->db = new ilDBx($this->dsn);
 
+		// set anonymous user id
+		//define ("ANONYMOUS_USER_ID",$this->getSetting("anonymous_user_id"));
+
 		// build option string for PEAR::Auth
 		$this->auth_params = array(
 									'dsn'		  => $this->dsn,

diff --git a/ilias.master.ini.php b/ilias.master.ini.php
@@ -35,5 +35,6 @@
 ROLE_FOLDER_ID = 8
 MAXLENGTH_OBJ_TITLE = 65
 MAXLENGTH_OBJ_DESC = 123
+ANONYMOUS_USER_ID =
 DEBUG = 0
 */ ?>
diff --git a/include/inc.header.php b/include/inc.header.php
@@ -111,7 +111,6 @@
 $ilias->auth->setExpire($ilias->ini->readVariable("session","expire"),true);
 $ilias->auth->start();
 
-
 // start logging
 $log = new ilLog("ilias.log");
 
@@ -138,7 +137,7 @@
 	//get user id
 	if (empty($_SESSION["AccountId"]))
 	{
-		$_SESSION["AccountId"] = $ilias->account->checkUserId($_SESSION["AccountId"]);
+		$_SESSION["AccountId"] = $ilias->account->checkUserId();
 
         // assigned roles are stored in $_SESSION["RoleId"]
 		$rbacreview = new ilRbacReviewH();
@@ -160,6 +159,10 @@
 	}	
 
 }
+elseif ($script != "login.php" and $script != "nologin.php")
+{
+	header("Location: index.php");
+}
 
 //init language
 $lng = new ilLanguage($ilias->account->prefs["language"]);

diff --git a/index.php b/index.php
@@ -33,6 +33,14 @@
 require_once "include/inc.check_pear.php";
 require_once "include/inc.header.php";
 
+if ($_GET["cmd"] == "login")
+{
+	$ilias->auth->logout();
+	session_destroy();
+	header("location: login.php");
+	exit();
+}
+
 // Specify your start page in ilias.ini.php
 $start = $ilias->ini->readVariable("server", "start");
 
@@ -42,6 +50,11 @@
 	$start = "login.php";
 }
 
+if ($ilias->getSetting("pub_section") == "y")
+{
+	$start = "nologin.php";
+}
+
 // catch reload
 if ($_GET["reload"])
 {

diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang
@@ -36,6 +36,9 @@ common#:#accept_usr_agreement#:#Benutzer-Lizenz akzeptieren?
 common#:#access#:#Zugang
 common#:#action_aborted#:#Aktion abgebrochen###09 Aug 2003 content changed
 common#:#actions#:#Aktionen
+common#:#welcome#:#Willkommen
+common#:#not_logged_in#:#Sie sind nicht eingeloggt
+common#:#register#:#Anmelden
 common#:#active_roles#:#Aktive Rollen
 common#:#add#:#hinzufügen
 common#:#add_author#:#Autor hinzufügen

diff --git a/lang/ilias_en.lang b/lang/ilias_en.lang
@@ -40,6 +40,9 @@ common#:#active_roles#:#Active Roles
 common#:#add#:#Add
 common#:#add_author#:#Add Author
 common#:#add_member#:#Add Member
+common#:#welcome#:#Welcome
+common#:#not_logged_in#:#Your are not logged in
+common#:#register#:#Register
 common#:#administrate#:#Administrate
 common#:#administration#:#Administration
 common#:#administrator#:#Administrator

diff --git a/login.php b/login.php
@@ -31,6 +31,7 @@
 *
 * @package ilias-layout
 */
+
 require_once "include/inc.check_pear.php";
 require_once "include/inc.header.php";
 

diff --git a/templates/default/blueshadow.css b/templates/default/blueshadow.css
@@ -13,6 +13,17 @@ td {
 .btnbar {
 	background-color:#ffffff;
 	background-image: url(blueshadow/images/navbar/back.gif);
+	color:#ffffff;
+}
+
+a.menu:link, a.menu:visited {
+	color:#f7f7f7;
+	text-decoration:underline;
+	font-size:9px;
+}
+
+a.menu:hover {
+	color:#2255a0;
 }
 
 input, textarea {

diff --git a/templates/default/tpl.main_buttons.html b/templates/default/tpl.main_buttons.html
@@ -64,13 +64,14 @@
 <table width="100%" cellpadding="0" cellspacing="0" border="0">
 <tr class="btnbar">
   <td width="1%" height="1"></td>
-  <td width="59%" height="1"></td>
-  <td width="39%" height="1"></td>
+  <td width="43%" height="1"></td>
+  <td width="30%" height="1"></td>
+  <td width="25%" height="1"></td>
   <td width="1%" height="1"></td>
 </tr>
 <tr class="btnbar">
   <td><img class="spacer" src="{IMG_SPACE}" border="0" width="10" height="1" /></td>
-  <td width="100%">
+  <td>
     <table cellpadding="0" cellspacing="0" border="0">
     <tr>
       <td colspan="6"><img class="spacer" border="0" src="{IMG_SPACE}" width="1" height="4" /></td>
@@ -118,6 +119,12 @@
     </tr>
     </table>
   </td>
+<!-- BEGIN userisanonymous -->
+  <td width="100%" align="right" nowrap="nowrap">{TXT_NOT_LOGGED_IN}!<br/><a class="menu" href="index.php?cmd=login" target="_top">{TXT_LOGIN}</a>&nbsp;<a class="menu" href="register.php" target="_top">{TXT_REGISTER}</a></td>
+<!-- END userisanonymous -->
+<!-- BEGIN userisloggedin -->
+  <td width="100%" align="right" nowrap="nowrap">{TXT_WELCOME}, {USERNAME}!<br/><a class="menu" href="logout.php" target="_top">{TXT_LOGOUT2}</a></td>
+<!-- END userisloggedin -->
   <td align="right">
     <table cellpadding="0" cellspacing="0" border="0">
     <tr>
@@ -143,6 +150,6 @@
     </tr>
     </table>
   </td>
-  <td class="btnbar"><small>&nbsp;</small></td>
+  <td><img class="spacer" src="{IMG_SPACE}" border="0" width="10" height="1" /></td>
 </tr>
 </table>
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,6 +31,7 @@ @@
     *
     * @package ilias-layout
     */
     require_once "include/inc.check_pear.php";
     require_once "include/inc.header.php";
@@ Expand Down @@