[evolvis-commits] r18352: get rid of Codendi compatibility crap

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Apr 12 20:40:17 CEST 2012


Author: mirabilos
Date: 2012-04-12 20:40:17 +0200 (Thu, 12 Apr 2012)
New Revision: 18352

Modified:
   trunk/gforge_base/evolvisforge-5.1/plugins/old/webcalendar/common/webcalendarPlugin.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/include/User.class.php
   trunk/gforge_base/evolvisforge-5.1/src/plugins/mailman/include/MailmanList.class.php
   trunk/gforge_base/evolvisforge-5.1/src/plugins/mailman/include/MailmanListFactory.class.php
Log:
get rid of Codendi compatibility crap

Modified: trunk/gforge_base/evolvisforge-5.1/plugins/old/webcalendar/common/webcalendarPlugin.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/plugins/old/webcalendar/common/webcalendarPlugin.class.php	2012-04-12 18:40:13 UTC (rev 18351)
+++ trunk/gforge_base/evolvisforge-5.1/plugins/old/webcalendar/common/webcalendarPlugin.class.php	2012-04-12 18:40:17 UTC (rev 18352)
@@ -226,7 +226,7 @@
 				if ($row[0] == 0) {
 					db_query_params ('INSERT INTO webcal_user (cal_login, cal_passwd, cal_email,cal_firstname, cal_is_admin) VALUES ($1,$2,$3,$4,$5)',
 								    array ($user->getUnixName(),
-									   $user->getUserPw(),
+									   $user->getMD5Passwd(),
 									   $user->getEmail(),
 									   $user->getFirstName(),
 									   'N'));

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/User.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/User.class.php	2012-04-12 18:40:13 UTC (rev 18351)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/User.class.php	2012-04-12 18:40:17 UTC (rev 18352)
@@ -796,11 +796,6 @@
 		return $this->data_array['user_pw'];
 	}
 	
-	//Added to be compatible with codendi getUserPw function
-	function getUserPw() {
-		return  $this->data_array['user_pw'];
-	}
-
 	/**
 	 *	getConfirmHash - the confirm hash in the db.
 	 *

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/mailman/include/MailmanList.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/mailman/include/MailmanList.class.php	2012-04-12 18:40:13 UTC (rev 18351)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/mailman/include/MailmanList.class.php	2012-04-12 18:40:17 UTC (rev 18352)
@@ -370,7 +370,7 @@
 		if(isLogged() && $current_user->isMember($this->Group->getID()) && !$this->isMonitoring())
 		{
 			$user=$current_user->getEmail();
-			$passwd= $current_user->getUserPw();
+			$passwd= $current_user->getMD5Passwd();
 			$name= $current_user->getRealName();
 			$res = $this->_mailingDAO->newSubscriber($user,$name,$passwd,$this->getName());
 			if (!$res) {

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/mailman/include/MailmanListFactory.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/mailman/include/MailmanListFactory.class.php	2012-04-12 18:40:13 UTC (rev 18351)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/mailman/include/MailmanListFactory.class.php	2012-04-12 18:40:17 UTC (rev 18352)
@@ -131,7 +131,7 @@
 		$current_user=UserManager::instance()->getCurrentUser();
 		$mail=$current_user->getEmail();
 		
-		$passwd= $current_user->getUserPw();
+		$passwd= $current_user->getMD5Passwd();
 		$name= $current_user->getRealName();
 		$result =& $this->_mailingDAO->compareInfos($mail);
 		if (!$result) {
@@ -160,7 +160,7 @@
 		$current_user=UserManager::instance()->getCurrentUser();
 		$mail=$current_user->getEmail();
 		
-		$passwd= $current_user->getUserPw();
+		$passwd= $current_user->getMD5Passwd();
 		$name= $current_user->getRealName();
 		
 		$result =& $this->_mailingDAO->updateInfos($mail,$passwd,$name);



More information about the evolvis-commits mailing list