Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[9751] trunk/lib
|
From: <var...@us...> - 2016-01-06 17:45:17
|
Revision: 9751
http://sourceforge.net/p/phpwiki/code/9751
Author: vargenau
Date: 2016-01-06 17:45:14 +0000 (Wed, 06 Jan 2016)
Log Message:
-----------
Use __construct
Modified Paths:
--------------
trunk/lib/WikiUser/AdoDb.php
trunk/lib/WikiUser/Db.php
trunk/lib/WikiUser/File.php
trunk/lib/WikiUser/FusionForge.php
trunk/lib/WikiUser/HttpAuth.php
trunk/lib/WikiUser/HttpAuthUpper.php
trunk/lib/WikiUser/PdoDb.php
trunk/lib/WikiUser/PearDb.php
trunk/lib/WikiUser/Session.php
trunk/lib/WikiUser.php
Modified: trunk/lib/WikiUser/AdoDb.php
===================================================================
--- trunk/lib/WikiUser/AdoDb.php 2016-01-06 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/AdoDb.php 2016-01-06 17:45:14 UTC (rev 9751)
@@ -38,7 +38,7 @@
{
public $_authmethod = 'AdoDb';
- function _AdoDbPassUser($UserName = '', $prefs = false)
+ function __construct($UserName = '', $prefs = false)
{
/**
* @var WikiRequest $request
@@ -48,7 +48,7 @@
if (!$this->_prefs and is_a($this, "_AdoDbPassUser")) {
if ($prefs) $this->_prefs = $prefs;
if (!isset($this->_prefs->_method))
- _PassUser::_PassUser($UserName);
+ _PassUser::__construct($UserName);
}
if (!$this->isValidName($UserName)) {
trigger_error(_("Invalid username."), E_USER_WARNING);
Modified: trunk/lib/WikiUser/Db.php
===================================================================
--- trunk/lib/WikiUser/Db.php 2016-01-06 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/Db.php 2016-01-06 17:45:14 UTC (rev 9751)
@@ -49,7 +49,7 @@
// This can only be called from _PassUser, because the parent class
// sets the auth_dbi and pref methods, before this class is initialized.
- function _DbPassUser($UserName = '', $prefs = false)
+ function __construct($UserName = '', $prefs = false)
{
/**
* @var WikiRequest $request
@@ -60,7 +60,7 @@
if ($prefs) $this->_prefs = $prefs;
}
if (!isset($this->_prefs->_method))
- _PassUser::_PassUser($UserName);
+ parent::__construct($UserName);
elseif (!$this->isValidName($UserName)) {
trigger_error(_("Invalid username."), E_USER_WARNING);
return false;
Modified: trunk/lib/WikiUser/File.php
===================================================================
--- trunk/lib/WikiUser/File.php 2016-01-06 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/File.php 2016-01-06 17:45:14 UTC (rev 9751)
@@ -33,12 +33,12 @@
// This can only be called from _PassUser, because the parent class
// sets the pref methods, before this class is initialized.
- function _FilePassUser($UserName = '', $prefs = false, $file = '')
+ function __construct($UserName = '', $prefs = false, $file = '')
{
if (!$this->_prefs and is_a($this, "_FilePassUser")) {
if ($prefs) $this->_prefs = $prefs;
if (!isset($this->_prefs->_method))
- _PassUser::_PassUser($UserName);
+ parent::__construct($UserName);
}
$this->_userid = $UserName;
// read the .htaccess style file. We use our own copy of the standard pear class.
Modified: trunk/lib/WikiUser/FusionForge.php
===================================================================
--- trunk/lib/WikiUser/FusionForge.php 2016-01-06 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/FusionForge.php 2016-01-06 17:45:14 UTC (rev 9751)
@@ -28,11 +28,11 @@
public $_is_external = 0;
- function _FusionForgePassUser($UserName = '', $prefs = false)
+ function __construct($UserName = '', $prefs = false)
{
if ($prefs) $this->_prefs = $prefs;
if (!isset($this->_prefs->_method))
- _PassUser::_PassUser($UserName);
+ parent::__construct($UserName);
if ($UserName) $this->_userid = $UserName;
$this->_authmethod = 'FusionForge';
Modified: trunk/lib/WikiUser/HttpAuth.php
===================================================================
--- trunk/lib/WikiUser/HttpAuth.php 2016-01-06 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/HttpAuth.php 2016-01-06 17:45:14 UTC (rev 9751)
@@ -35,11 +35,11 @@
class _HttpAuthPassUser
extends _PassUser
{
- function _HttpAuthPassUser($UserName = '', $prefs = false)
+ function __construct($UserName = '', $prefs = false)
{
if ($prefs) $this->_prefs = $prefs;
if (!isset($this->_prefs->_method))
- _PassUser::_PassUser($UserName);
+ parent::__construct($UserName);
if ($UserName) $this->_userid = $UserName;
$this->_authmethod = 'HttpAuth';
Modified: trunk/lib/WikiUser/HttpAuthUpper.php
===================================================================
--- trunk/lib/WikiUser/HttpAuthUpper.php 2016-01-06 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/HttpAuthUpper.php 2016-01-06 17:45:14 UTC (rev 9751)
@@ -36,11 +36,11 @@
class _HttpAuthUpperPassUser
extends _PassUser
{
- function _HttpAuthUpperPassUser($UserName = '', $prefs = false)
+ function __construct($UserName = '', $prefs = false)
{
if ($prefs) $this->_prefs = $prefs;
if (!isset($this->_prefs->_method))
- _PassUser::_PassUser($UserName);
+ parent::__construct($UserName);
if ($UserName)
$this->_userid = $UserName;
$this->_authmethod = 'HttpAuthUpper';
Modified: trunk/lib/WikiUser/PdoDb.php
===================================================================
--- trunk/lib/WikiUser/PdoDb.php 2016-01-06 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/PdoDb.php 2016-01-06 17:45:14 UTC (rev 9751)
@@ -35,7 +35,7 @@
{
public $_authmethod = 'PDODb';
- function _PdoDbPassUser($UserName = '', $prefs = false)
+ function __construct($UserName = '', $prefs = false)
{
/**
* @var WikiRequest $request
@@ -46,7 +46,7 @@
if ($prefs) $this->_prefs = $prefs;
}
if (!isset($this->_prefs->_method))
- _PassUser::_PassUser($UserName);
+ _PassUser::__construct($UserName);
elseif (!$this->isValidName($UserName)) {
trigger_error(_("Invalid username."), E_USER_WARNING);
return false;
Modified: trunk/lib/WikiUser/PearDb.php
===================================================================
--- trunk/lib/WikiUser/PearDb.php 2016-01-06 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/PearDb.php 2016-01-06 17:45:14 UTC (rev 9751)
@@ -33,7 +33,7 @@
{
public $_authmethod = 'PearDb';
- function _PearDbPassUser($UserName = '', $prefs = false)
+ function __construct($UserName = '', $prefs = false)
{
/**
* @var WikiRequest $request
@@ -46,7 +46,7 @@
}
}
if (!isset($this->_prefs->_method)) {
- _PassUser::_PassUser($UserName);
+ _PassUser::__construct($UserName);
} elseif (!$this->isValidName($UserName)) {
trigger_error(_("Invalid username."), E_USER_WARNING);
return false;
Modified: trunk/lib/WikiUser/Session.php
===================================================================
--- trunk/lib/WikiUser/Session.php 2016-01-06 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser/Session.php 2016-01-06 17:45:14 UTC (rev 9751)
@@ -30,7 +30,7 @@
class _SessionPassUser
extends _PassUser
{
- function _SessionPassUser($UserName = '', $prefs = false)
+ function __construct($UserName = '', $prefs = false)
{
if ($prefs) $this->_prefs = $prefs;
if (!defined("AUTH_SESS_USER") or !defined("AUTH_SESS_LEVEL")) {
@@ -57,7 +57,7 @@
$this->_userid = $sess[AUTH_SESS_USER];
}
if (!isset($this->_prefs->_method))
- _PassUser::_PassUser($this->_userid);
+ parent::__construct($this->_userid);
$this->_level = AUTH_SESS_LEVEL;
$this->_authmethod = 'Session';
}
Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php 2016-01-06 09:28:54 UTC (rev 9750)
+++ trunk/lib/WikiUser.php 2016-01-06 17:45:14 UTC (rev 9751)
@@ -925,7 +925,7 @@
public $_current_index;
// check and prepare the auth and pref methods only once
- function _PassUser($UserName = '', $prefs = false)
+ function __construct($UserName = '', $prefs = false)
{
/**
* @var WikiRequest $request
@@ -1480,7 +1480,7 @@
{
public $default_value;
- function _UserPreference($default_value)
+ function __construct($default_value)
{
$this->default_value = $default_value;
}
@@ -1534,10 +1534,9 @@
class _UserPreference_numeric
extends _UserPreference
{
- function _UserPreference_numeric($default, $minval = false,
- $maxval = false)
+ function __construct($default, $minval = false, $maxval = false)
{
- $this->_UserPreference((double)$default);
+ parent::__construct((double)$default);
$this->_minval = (double)$minval;
$this->_maxval = (double)$maxval;
}
@@ -1556,9 +1555,9 @@
class _UserPreference_int
extends _UserPreference_numeric
{
- function _UserPreference_int($default, $minval = false, $maxval = false)
+ function __construct($default, $minval = false, $maxval = false)
{
- $this->_UserPreference_numeric((int)$default, (int)$minval, (int)$maxval);
+ parent::__construct((int)$default, (int)$minval, (int)$maxval);
}
function sanify($value)
@@ -1570,9 +1569,9 @@
class _UserPreference_bool
extends _UserPreference
{
- function _UserPreference_bool($default = false)
+ function __construct($default = false)
{
- $this->_UserPreference((bool)$default);
+ parent::__construct((bool)$default);
}
function sanify($value)
@@ -1600,9 +1599,9 @@
class _UserPreference_language
extends _UserPreference
{
- function _UserPreference_language($default = DEFAULT_LANGUAGE)
+ function __construct($default = DEFAULT_LANGUAGE)
{
- $this->_UserPreference($default);
+ parent::__construct($default);
}
// FIXME: check for valid locale
@@ -1634,9 +1633,9 @@
class _UserPreference_theme
extends _UserPreference
{
- function _UserPreference_theme($default = THEME)
+ function __construct($default = THEME)
{
- $this->_UserPreference($default);
+ parent::__construct($default);
}
function sanify($value)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
