[Mapbender-commits] r8047 - branches/2.7/http/classes

[svn_mapbender at osgeo.org]

Author: astrid_emde
Date: 2011-08-02 07:02:41 -0700 (Tue, 02 Aug 2011)
New Revision: 8047

Modified:
   branches/2.7/http/classes/class_user.php
Log:
merged with trunk - set mb_user_login_count on update of user

Modified: branches/2.7/http/classes/class_user.php
===================================================================
--- branches/2.7/http/classes/class_user.php	2011-08-02 13:59:43 UTC (rev 8046)
+++ branches/2.7/http/classes/class_user.php	2011-08-02 14:02:41 UTC (rev 8047)
@@ -185,6 +185,7 @@
 		$this->name = isset($changes->name) ? $changes->name : $this->name;
 		$this->owner = isset($changes->owner) ? $owner->id : $this->owner;
 		$this->description = isset($changes->description) ? $changes->description : $this->description;
+		$this->loginCount = isset($changes->loginCount) ? $changes->loginCount : $this->loginCount;
 		$this->email = isset($changes->email) ? $changes->email : $this->email;
 		$this->phone = isset($changes->phone) ? $changes->phone : $this->phone;
 		$this->department = isset($changes->department) ? $changes->department : $this->department;
@@ -242,8 +243,9 @@
 			"mb_user_password_ticket = $24, ".
 			"mb_user_firstname = $25, " . 
 			"mb_user_lastname = $26, " . 
-			"mb_user_academictitle = $27 " . 
-			"WHERE mb_user_id = $28;";
+			"mb_user_academictitle = $27, " . 
+			"mb_user_login_count = $28 " .		
+			"WHERE mb_user_id = $29;";
 
 		$v = array(
 			$this->name,
@@ -273,6 +275,7 @@
 			$this->firstName,
 			$this->lastName,
 			$this->academicTitle,
+			is_numeric($this->loginCount) ? intval($this->loginCount) : 0,
 			is_numeric($this->id) ? intval($this->id) : null,
 		);
 
@@ -282,7 +285,7 @@
 			"s", "s", "s", "i", "s", 
 			"s", "s", "s", "s", "s", 
 			"s", "s", "s", "s", "s",
-			"s", "s", "i"
+			"s", "s", "i", "i"
 		);
 
 		$update_result = db_prep_query($sql_update,$v,$t);