summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes4
-rw-r--r--framework/Web/Security/TMembership.php106
-rw-r--r--framework/Web/Security/TMembershipPasswordFormat.php2
-rw-r--r--framework/Web/Security/TRoles.php28
-rw-r--r--framework/Web/UI/WebControls/TLogin.php15
-rw-r--r--framework/Web/UI/WebControls/TLoginName.php15
-rw-r--r--framework/Web/UI/WebControls/TLoginStatus.php15
-rw-r--r--framework/Web/UI/WebControls/TLoginView.php15
8 files changed, 129 insertions, 71 deletions
diff --git a/.gitattributes b/.gitattributes
index 406796e4..dae1c30f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1859,6 +1859,10 @@ framework/Web/UI/WebControls/TListControlValidator.php -text
framework/Web/UI/WebControls/TListItem.php -text
framework/Web/UI/WebControls/TLiteral.php -text
framework/Web/UI/WebControls/TLiteralColumn.php -text
+framework/Web/UI/WebControls/TLogin.php -text
+framework/Web/UI/WebControls/TLoginName.php -text
+framework/Web/UI/WebControls/TLoginStatus.php -text
+framework/Web/UI/WebControls/TLoginView.php -text
framework/Web/UI/WebControls/TMarkdown.php -text
framework/Web/UI/WebControls/TMultiView.php -text
framework/Web/UI/WebControls/TOutputCache.php -text
diff --git a/framework/Web/Security/TMembership.php b/framework/Web/Security/TMembership.php
index 150f9528..2909eb8b 100644
--- a/framework/Web/Security/TMembership.php
+++ b/framework/Web/Security/TMembership.php
@@ -8,104 +8,90 @@
* @package System.Web.Security
* @since 3.1
*/
-Prado::using('System.Web.Security.');
final class TMembership
{
- public static $ApplicationName;
- public static $EnablePasswordReset=false;
- public static $EnablePasswordRetrieval=false;
- public static $HashAlgorithmType;
- public static $IsHashAlgorithmFromMembershipConfig=false;
- public static $MaxInvalidPasswordAttempts;
- public static $MinRequiredNonAlphanumericCharacters;
- public static $MinRequiredPasswordLength;
- public static $PasswordAttemptWindow;
- public static $PasswordStrengthReqularExpression;
- public static $Provider;
- public static $Providers;
- public static $RequiresQuestionAndAnswer=false;
- public static $UserIsOnlineTimeWindow;
- private static $_punctuations;
- private static $_s_HashAlgorithmFromConfig=false;
- private static $_s_HashAlgorithmType;
- private static $_s_Initialized=false;
- private static $_s_InitializeException;
- private static $_s_lock;
- private static $_s_Provider;
- private static $_s_Providers;
- private static $_s_UserIsOnlineTimeWindow;
+ private static $_ApplicationName;
+ private static $_EnablePasswordReset=false;
+ private static $_EnablePasswordRetrieval=false;
+ private static $_HashAlgorithmType;
+ private static $_IsHashAlgorithmFromMembershipConfig=false;
+ private static $_MaxInvalidPasswordAttempts;
+ private static $_MinRequiredNonAlphanumericCharacters;
+ private static $_MinRequiredPasswordLength;
+ private static $_PasswordAttemptWindow;
+ private static $_PasswordStrengthReqularExpression;
+ private static $_Provider;
+ private static $_Providers;
+ private static $_RequiresQuestionAndAnswer=false;
+ private static $_UserIsOnlineTimeWindow=15;
+ private static $_punctuations='!@#$%^&*()_-+=[{]};:>./?';
+ private static $_HashAlgorithmFromConfig=false;
+ private static $_Initialized=false;
+ private static $_InitializeException;
- public static function __construct()
- {
- self::$_punctuations="!@#$%^&*()_-+=[{]};:>./?";
- self::$_s_UserIsOnlineTimeWindow=15;
- self::$_s_lock = new stdClass();
- self::$_s_Initialized=false;
- self::$_s_InitializeException=null;
- }
public static function getApplicationName()
{
- return self::$ApplicationName;
+ return self::$_ApplicationName;
}
public static function setApplicationName($value)
{
- self::$ApplicationName = TPropertyValue::ensureString($value);
+ self::$_ApplicationName = TPropertyValue::ensureString($value);
}
public static function getEnablePasswordReset()
{
- return self::$EnablePasswordReset;
+ return self::$_EnablePasswordReset;
}
public static function getEnablePasswordRetrieval()
{
- return self::$EnablePasswordRetrieval;
+ return self::$_EnablePasswordRetrieval;
}
public static function getHashAlgorithmType()
{
- return self::$HashAlgorithmType;
+ return self::$_HashAlgorithmType;
}
public static function getHashAlgorithmFromMembershipConfig()
{
- return self::$IsHashAlgorithmFromMembershipConfig;
+ return self::$_IsHashAlgorithmFromMembershipConfig;
}
public static function getMaxInvalidPasswordAttempts()
{
- return self::$MaxInvalidPasswordAttempts;
+ return self::$_MaxInvalidPasswordAttempts;
}
public static function getMinRequiredNonAlphanumericCharacters()
{
- return self::$MinRequiredNonAlphanumericCharacters;
+ return self::$_MinRequiredNonAlphanumericCharacters;
}
public static function getMinRequiredPasswordLength()
{
- return self::$MinRequiredPasswordLength;
+ return self::$_MinRequiredPasswordLength;
}
public static function getPasswordAttemptWindow()
{
- return self::$PasswordAttemptWindow;
+ return self::$_PasswordAttemptWindow;
}
public static function getPasswordStrengthReqularExpression()
{
- return self::$PasswordStrengthReqularExpression;
+ return self::$_PasswordStrengthReqularExpression;
}
public static function getProvider()
{
- return self::$Provider;
+ return self::$_Provider;
}
public static function getProviders()
{
- return self::$Providers;
+ return self::$_Providers;
}
public static function getUserIsOnlineTimeWindow()
{
- return self::$UserIsOnlineTimeWindow;
+ return self::$_UserIsOnlineTimeWindow;
}
public static function CreateUser($username,$password,$email=null,$passwordQuestion=null,$passwordAnswer=null,$isApproved=null,$providerUserKey=null)
{
- return self::$Provider->CreateUser($username,$password,$email,$passwordQuestion,$passwordAnswer,$isApproved,$providerUserKey);
+ return self::$_Provider->CreateUser($username,$password,$email,$passwordQuestion,$passwordAnswer,$isApproved,$providerUserKey);
}
public static function DeleteUser($username,$deleteAllRelatedData=true)
{
- return self::$Provider->DeleteUser($username,$deleteAllRelatedData);
+ return self::$_Provider->DeleteUser($username,$deleteAllRelatedData);
}
public static function FindUsersByEmail($emailToMatch,$pageIndex=null,$pageSize=null)
{
@@ -117,7 +103,7 @@ final class TMembership
{
throw new TException('PageSize_bad',$pageSize);
}
- return self::$Provider->FindUsersByEmail($emailToMatch,$pageIndex,$pageSize);
+ return self::$_Provider->FindUsersByEmail($emailToMatch,$pageIndex,$pageSize);
}
public static function FindUsersByName($usernameToMatch,$pageIndex=null,$pageSize=null)
{
@@ -129,7 +115,7 @@ final class TMembership
{
throw new TException('PageSize_bad',$pageSize);
}
- return self::$Provider->FindUsersByName($usernameToMatch,$pageIndex,$pageSize);
+ return self::$_Provider->FindUsersByName($usernameToMatch,$pageIndex,$pageSize);
}
public static function GeneratePassword($length,$numberOfNonAlphanumericCharacters)
{
@@ -161,7 +147,7 @@ final class TMembership
{
throw new TException('PageSize_bad',$pageSize);
}
- return self::$Provider->GetAllUsers($pageIndex,$pageSize);
+ return self::$_Provider->GetAllUsers($pageIndex,$pageSize);
}
private static function GetCurrentUserName()
{
@@ -169,34 +155,34 @@ final class TMembership
}
public static function GetNumberOfUsersOnline()
{
- return self::$Provider->GetNumberOfUsersOnline();
+ return self::$_Provider->GetNumberOfUsersOnline();
}
public static function GetUser($username=null,$providerUserKey=null,$userIsOnline=false)
{
if ($username===null && $providerUserKey===null)
{
- return self::$Provider->GetUser(self::GetCurrentUserName(),null,true);
+ return self::$_Provider->GetUser(self::GetCurrentUserName(),null,true);
}
if ($username===null && $providerUserKey!==null)
{
- return self::$Provider->GetUser(null,$providerUserKey,$userIsOnline);
+ return self::$_Provider->GetUser(null,$providerUserKey,$userIsOnline);
}
if ($username!==null && $providerUserKey===null)
{
- return self::$Provider->GetUser($username,null,$userIsOnline);
+ return self::$_Provider->GetUser($username,null,$userIsOnline);
}
}
public static function GetUserNameByEmail($emailToMatch)
{
- return self::$Provider->GetUserNameByEmail($emailToMatch);
+ return self::$_Provider->GetUserNameByEmail($emailToMatch);
}
private static function Initialize()
{
- if (self::$_s_Initialized)
+ if (self::$__s_Initialized)
{
- if (self::$_s_InitializeException!==null)
+ if (self::$__s_InitializeException!==null)
{
- throw new self::$_s_InitializeException;
+ throw new self::$__s_InitializeException;
}
}
else
@@ -214,7 +200,7 @@ final class TMembership
}
public static function ValidateUser($username,$password)
{
- return self::$Provider->ValidateUser($username,$password);
+ return self::$_Provider->ValidateUser($username,$password);
}
}
?> \ No newline at end of file
diff --git a/framework/Web/Security/TMembershipPasswordFormat.php b/framework/Web/Security/TMembershipPasswordFormat.php
index 6648c92b..fdff0e39 100644
--- a/framework/Web/Security/TMembershipPasswordFormat.php
+++ b/framework/Web/Security/TMembershipPasswordFormat.php
@@ -5,7 +5,7 @@
*
* Clear Passwords are not encrypted.
* Encrypted Passwords are encrypted using the encryption settings determined by the
- * machineKey Element (ASP.NET Settings Schema) element configuration.
+ * machineKey Element element configuration.
* Hashed Passwords are encrypted one-way using the SHA1 hashing algorithm.
* You can specify a hashing algorithm different than the SHA1
* algorithm using the hashAlgorithmType attribute.
diff --git a/framework/Web/Security/TRoles.php b/framework/Web/Security/TRoles.php
index 45e112c7..5f4c4032 100644
--- a/framework/Web/Security/TRoles.php
+++ b/framework/Web/Security/TRoles.php
@@ -1,4 +1,13 @@
<?php
+/**
+ * TRoles class.
+ * Manages user membership in roles for authorization checking in an PRADO application. This class cannot be inherited.
+ *
+ * @author Jason Ragsdale <jrags@jasrags.net>
+ * @version $Id: TRoles.php 1398 2006-09-08 19:31:03Z xue $
+ * @package System.Web.Security
+ * @since 3.1
+ */
final class TRoles
{
private static $_ApplicationName;
@@ -15,10 +24,9 @@ final class TRoles
private static $_MaxCachedResults;
private static $_Provider;
private static $_Providers;
- private static $_s_EnabledSet=false;
- private static $_s_Initialized=false;
- private static $_s_InitializeException;
- private static $_s_lock;
+ private static $_EnabledSet=false;
+ private static $_Initialized=false;
+ private static $_InitializeException;
public static function getApplicationName()
{
@@ -124,7 +132,7 @@ final class TRoles
private static function EnsureEnabled()
{
self::Initialize();
- if (!self::$_s_Initialized)
+ if (!self::$_Initialized)
{
throw new TException('Roles_feature_not_enabled');
}
@@ -155,20 +163,20 @@ final class TRoles
}
private static function Initialize()
{
- if (self::$_s_Initialized)
+ if (self::$_Initialized)
{
- if (self::$_s_InitializeException!==null)
+ if (self::$_InitializeException!==null)
{
throw new $_s_InitializeException;
}
}
else
{
- if (self::$_s_Initialized)
+ if (self::$_Initialized)
{
- if (self::$_s_InitializeException!==null)
+ if (self::$_InitializeException!==null)
{
- throw new $_s_InitializeException;
+ throw new $_InitializeException;
}
return;
}
diff --git a/framework/Web/UI/WebControls/TLogin.php b/framework/Web/UI/WebControls/TLogin.php
new file mode 100644
index 00000000..3b3be585
--- /dev/null
+++ b/framework/Web/UI/WebControls/TLogin.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * TLogin class.
+ * Provides user interface (UI) elements for logging in to a Web site..
+ *
+ * @author Jason Ragsdale <jrags@jasrags.net>
+ * @version $Id: TLogin.php 1398 2006-09-08 19:31:03Z xue $
+ * @package System.Web.UI.WebControls
+ * @since 3.1
+ */
+class TLogin extends TCompositeControl
+{
+
+}
+?> \ No newline at end of file
diff --git a/framework/Web/UI/WebControls/TLoginName.php b/framework/Web/UI/WebControls/TLoginName.php
new file mode 100644
index 00000000..6367a5a2
--- /dev/null
+++ b/framework/Web/UI/WebControls/TLoginName.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * TLoginName class.
+ * Displays the value of the System.Web.UI.Page.User.Identity.Name property.
+ *
+ * @author Jason Ragsdale <jrags@jasrags.net>
+ * @version $Id: TLoginName.php 1398 2006-09-08 19:31:03Z xue $
+ * @package System.Web.UI.WebControls
+ * @since 3.1
+ */
+class TLoginName extends TWebControl
+{
+
+}
+?> \ No newline at end of file
diff --git a/framework/Web/UI/WebControls/TLoginStatus.php b/framework/Web/UI/WebControls/TLoginStatus.php
new file mode 100644
index 00000000..d82112de
--- /dev/null
+++ b/framework/Web/UI/WebControls/TLoginStatus.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * TLoginStatus class.
+ * Detects the user's authentication state and toggles the state of a link to log in to or log out of a Web site.
+ *
+ * @author Jason Ragsdale <jrags@jasrags.net>
+ * @version $Id: TLoginStatus.php 1398 2006-09-08 19:31:03Z xue $
+ * @package System.Web.UI.WebControls
+ * @since 3.1
+ */
+class TLoginStatus extends TCompositeControl
+{
+
+}
+?> \ No newline at end of file
diff --git a/framework/Web/UI/WebControls/TLoginView.php b/framework/Web/UI/WebControls/TLoginView.php
new file mode 100644
index 00000000..0f4e2105
--- /dev/null
+++ b/framework/Web/UI/WebControls/TLoginView.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * TLoginView class.
+ * Displays the appropriate content template for a given user, based on the user's authentication status and role membership.
+ *
+ * @author Jason Ragsdale <jrags@jasrags.net>
+ * @version $Id: TLoginView.php 1398 2006-09-08 19:31:03Z xue $
+ * @package System.Web.UI.WebControls
+ * @since 3.1
+ */
+class TLoginView extends TControl
+{
+
+}
+?> \ No newline at end of file