Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19257/lib
Modified Files:
WikiUserNew.php
Log Message:
helper to patch to and from php5 (workaround for stricter parser, no macros in
php)
Index: WikiUserNew.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiUserNew.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -2 -b -p -d -r1.37 -r1.38
--- WikiUserNew.php 25 Mar 2004 17:00:31 -0000 1.37
+++ WikiUserNew.php 25 Mar 2004 17:37:36 -0000 1.38
@@ -812,5 +812,5 @@ extends _AnonUser
$user = new
_HttpAuthPassUser($UserName,$this->_prefs);
//todo: with php5 comment the following line.
- $this = $user;
+ /*PHP5 patch*/$this = $user;
return UpgradeUser($user,$this);
}
@@ -822,5 +822,5 @@ extends _AnonUser
$user = new _DbPassUser($UserName,$this->_prefs);
//todo: with php5 comment the following line.
- $this = $user;
+ /*PHP5 patch*/$this = $user;
return UpgradeUser($user,$this);
}
@@ -831,5 +831,5 @@ extends _AnonUser
$user = new _LDAPPassUser($UserName,$this->_prefs);
//todo: with php5 comment the following line.
- $this = $user;
+ /*PHP5 patch*/$this = $user;
return UpgradeUser($user,$this);
}
@@ -840,5 +840,5 @@ extends _AnonUser
$user = new _IMAPPassUser($UserName,$this->_prefs);
//todo: with php5 comment the following line.
- $this = $user;
+ /*PHP5 patch*/$this = $user;
return UpgradeUser($user,$this);
}
@@ -849,5 +849,5 @@ extends _AnonUser
$user = new _FilePassUser($UserName,$this->_prefs);
//todo: with php5 comment the following line.
- $this = $user;
+ /*PHP5 patch*/$this = $user;
return UpgradeUser($user,$this);
}
@@ -858,5 +858,5 @@ extends _AnonUser
$user = new
_PersonalPagePassUser($UserName,$this->_prefs);
//todo: with php5 comment the following line.
- $this = $user;
+ /*PHP5 patch*/$this = $user;
return UpgradeUser($user,$this);
}
@@ -981,5 +981,5 @@ extends _AnonUser
while ($user = new $class($this->_userid,$this->_prefs)) {
//todo: with php5 comment the following line:
- $this = $user;
+ /*PHP5 patch*/$this = $user;
UpgradeUser($this,$user);
if ($user->userExists()) {
@@ -988,5 +988,4 @@ extends _AnonUser
// prevent endless loop. does this work on all PHP's?
// it just has to set the classname, what it correctly does.
- // $this = $user;
$class = $user->nextClass();
if ($class == "_ForbiddenPassUser")
@@ -1107,5 +1106,5 @@ extends _AnonUser
while ($user = new $class($this->_userid,$this->_prefs)) {
//todo: with php5 comment the following line:
- $this = $user;
+ /*PHP5 patch*/$this = $user;
$user = UpgradeUser($this, $user);
if ($user->userExists()) {
@@ -1145,8 +1144,6 @@ extends _PassUser
if ($user->checkPass($submitted_password)) {
//todo: with php5 comment the following line:
- $this = $user;
+ /*PHP5 patch*/$this = $user;
$user = UpgradeUser($this, $user);
- //if (!check_php_version(5))
- // $this = $user;
$this->_level = WIKIAUTH_USER;
return $this->_level;
@@ -1326,5 +1323,5 @@ extends _PassUser
$user = new _AdoDbPassUser($UserName,$this->_prefs);
//todo: with php5 comment the following line:
- $this = $user;
+ /*PHP5 patch*/$this = $user;
return UpgradeUser($user, $this);
}
@@ -1336,5 +1333,5 @@ extends _PassUser
$user = new _PearDbPassUser($UserName,$this->_prefs);
//todo: with php5 comment the following line:
- $this = $user;
+ /*PHP5 patch*/$this = $user;
return UpgradeUser($user, $this);
}
@@ -2593,4 +2590,7 @@ extends UserPreferences
// $Log$
+// Revision 1.38 2004/03/25 17:37:36 rurban
+// helper to patch to and from php5 (workaround for stricter parser, no macros
in php)
+//
// Revision 1.37 2004/03/25 17:00:31 rurban
// more code to convert old-style pref array to new hash
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
|
