[Tikiwiki-cvs] tiki/lib tikilib.php,1.736,1.737

[<sy...@us...>]

Update of /cvsroot/tikiwiki/tiki/lib
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1415/lib

Modified Files:
	tikilib.php 
Log Message:
[MOD]log: do not put the IP and client for timeout (as it is the info of the user who kicks out and not the kick one)

Index: tikilib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v
retrieving revision 1.736
retrieving revision 1.737
diff -u -d -r1.736 -r1.737
--- tikilib.php	19 Apr 2007 16:21:11 -0000	1.736
+++ tikilib.php	26 Apr 2007 13:26:21 -0000	1.737
@@ -323,7 +323,7 @@
 		case 'topic_article_created':
 		    global $userlib, $topicId;
 		    $res['perm']= ($userlib->user_has_permission($res['user'],'tiki_p_read_article') &&
-		                   $this->user_has_perm_on_object($res['user'],$topicId,'topic','tiki_p_topic_read'));
+		                   (empty($topicId) || $this->user_has_perm_on_object($res['user'],$topicId,'topic','tiki_p_topic_read')));
 		    break;
 		case 'calendar_changed':
 			$res['perm']= $this->user_has_perm_on_object($res['user'],$object,'calendar','tiki_p_view_calendar');
@@ -2727,7 +2727,7 @@
 	$result = $this->query($query, array($oldy));
 	while ($res = $result->fetchRow()) {
 		if ($res['user'] && $res['user'] != $user)
-			$logslib->add_log('login', 'timeout', $res['user'], '', '', $res['timestamp']+ $delay);
+			$logslib->add_log('login', 'timeout', $res['user'], ' ', ' ', $res['timestamp']+ $delay);
 	}
 	$query = "delete from `tiki_sessions` where `sessionId`=? or `timestamp`<?";
 	$bindvars = array($sessionId, $oldy);