Changeset 170

Timestamp:

09/14/08 20:26:02 (4 months ago)

Author:

pdingle

Message:

updates: Utils: showClaimList
Utils: matchLinkProtocol --- ISSUES?
Processing: mapFormElements
Processing: addCard
Processing: updateIdentityLastUsed
Admin: checkFrameworkRegistrationSetting
Admin: cardManagementUrl

UserData?: updateUserInfoFromEmail --- DEPRECATED
UserData?: evaluateIncomingUser -- DEPRECATED
Userdata: updateCardInfoFromAccountID -- DEPRECATED
pwlib_userdata::getAuthenticatedUserRecord --- ISSUES?
pwlib_userdata::loginIDisUnique
pwlib_userdata::emailIsUnique

cardforms.pw.php -- added
triggerobject.pw.php -- added

Files:

• branches/RB-0.91/wp-infocard/pw-config.php (modified) (1 diff)
• branches/RB-0.91/wp-infocard/wp-infocard.php (modified) (1 diff)
• branches/RB-0.91/wp-infocard/wp/admin.pw.php (modified) (4 diffs)
• branches/RB-0.91/wp-infocard/wp/cardforms.pw.php (added)
• branches/RB-0.91/wp-infocard/wp/interface (added)
• branches/RB-0.91/wp-infocard/wp/interface/infocard-menu.php (added)
• branches/RB-0.91/wp-infocard/wp/interface/infocard-newcard.php (added)
• branches/RB-0.91/wp-infocard/wp/interface/infocard-userprofile.php (added)
• branches/RB-0.91/wp-infocard/wp/interface/pw-menu.css (added)
• branches/RB-0.91/wp-infocard/wp/interface/register.css (added)
• branches/RB-0.91/wp-infocard/wp/login/login.pw.php (modified) (1 diff)
• branches/RB-0.91/wp-infocard/wp/processing.pw.php (modified) (3 diffs)
• branches/RB-0.91/wp-infocard/wp/triggerobject.pw.php (added)
• branches/RB-0.91/wp-infocard/wp/userdata.pw.php (modified) (5 diffs)
• branches/RB-0.91/wp-infocard/wp/utils.pw.php (modified) (2 diffs)

branches/RB-0.91/wp-infocard/pw-config.php

@@ -8 +8 @@
-define ('PW_PLUGINPATH', '/wp-content/plugins/wp-infocard');
-define ('PW_VERSION', 'v0.91');
-3/09
+9/13
-define ('PW_DB_VERSION', 'DB v3');
-define ('PW_USECAPTCHAS', false );

branches/RB-0.91/wp-infocard/wp-infocard.php

@@ -3 +3 @@
-Plugin Name: PamelaWare Information Card Login
-Plugin URI: http://code.pamelaproject.com/wiki
-Options" menu and click on "Information Cards" to see what to do next
+Settings" menu and click on "Information Cards" to see what to do next. We strongly recommend that you use this plugin with Wordpress version 2.6.1 or later
-Version: v0.91
-Author: K. Cameron, P. Dingle, and more

branches/RB-0.91/wp-infocard/wp/admin.pw.php

@@ -330 +330 @@
-
-        }
+
+        function checkFrameworkRegistrationSetting()
+        {
+                $comment_reg = get_settings('comment_registration');
+                if ((bool)$comment_reg)
+                        return "Wordpress basic user registration is: enabled";
+                else
+                        return "Wordpress basic user registration is: disabled";
+        } //end function checkFrameworkRegistrationSetting
-        
-        function pwAdminScreen()
@@ -336 +345 @@
-                $opts = pw_admin::updateAdminOptions();
-                // write submitted changes if this page reload shows a submit
-
-
-
-
-
-
+
-                {
-?>
@@ -359 +363 @@
-                        <table border="0"><tr><th valign="bottom" colspan="2" align="left">
-                        <tr><td colspan="4">&nbsp</td></tr>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-                        <tr><td colspan="4">&nbsp;</td></tr>
-                        <tr><th colspan="4" align="left">To Enable Information Card User Login</td></tr>
-                        <tr><td colspan="4"><?php pw_utils::screenPrint('The following changes will result in a login form with the option "Use an Information Card". Please make a copy of the wp-login.php file before you begin, so that you can revert to that original file in case of difficulties.'); ?></td></tr>                        <tr><td colspan="2" id="code">
-<?php
-                        pw_admin::printInstallData();
@@ -571 +545 @@
-
-        /*
+                Function:       cardManagementUrl
+                Description:    returns out the URL to manage cards
+                Input:          none
+                Output:         URL
+                Side-Effects:   none
+        */
+        function cardManagementUrl()
+        {
+                return PW_SECURESITEURL
+                        . "/wp-admin/profile.php";
+        }//end function cardManagementUrl
+
+        /*
-                Function:       getCurrentUserCardProfile
-                Description:    Returns a string with code for maintaining

branches/RB-0.91/wp-infocard/wp/login/login.pw.php

@@ -7 +7 @@
-class pw_login extends pwlib_login 
-{
+
+        function getRegistrationUrl()
+        {
+                return PW_SECURESITEURL
+                        . "/index.php?option=com_pwjos";
+        }
+
+        function getAttachmentUrl()
+        {
+                return PW_SECURESITEURL
+                        . "/index.php?option=com_pwjos";
+        }
-
-        function printPostLoginRedirect()

branches/RB-0.91/wp-infocard/wp/processing.pw.php

@@ -170 +170 @@
-        } //addIdentityRecord
-
+        /*
+                Function:       updateIdentityLastUsed
+                Description:    updates the identity table with a new lastused date
+                Input:          none
+                Output:         none
+                Side-Effect:    updates infocard_identities table
+        */
+        function updateIdentityLastUsed($cardhash, $cardhandle, $accountid)
+        {
+                if (!$cardhash || !$cardhandle || !$accountid)
+                        return FALSE;
+                $today = date('c');
+                global $wpdb;
+
+                $query = "UPDATE `" . PW_TABLE_PREFIX . "infocard_identities` SET "
+                . "lastused = '$today' WHERE accountid = '$accountid' AND cardhash = '$cardhash'";
+                $wpdb->query( $query );
+                //pw_utils::printDebug( '&nbsp; Updated Last Used Date to ' . $today . ' for account ' . $accountid . ', card ' . $cardhandle . '<br/>' );
+        }//end function updateIdentityLastUsed
+
-        /*
-                Function:       deleteIdentityRecords
@@ -185 +205 @@
-                return $wpdb->query( $query );
-        } //end function deleteIdentityRecords
+
+        /*
+                Function:       addCard
+                Description:    adds a single card
+                Input:          datamap
+                Output:         returns an error if an error was encountered
+                Side-Effect:    updates infocard_identities table
+        */
+        function addCard($datamap)
+        {
+                if (!$datamap['ID']->new_value)
+                {
+                        pw_utils::printDebug('ERROR: no ID value in datamap for updateIdentityData<br />');
+                        return 'INTERNALERROR';
+                }
+                global $wpdb;
+                $acct       = $datamap['ID']->new_value;
+                $cardhash   = $datamap['cardhash']->new_value;
+                $cardhandle =  $datamap['cardhandle']->new_value;
+                $today = date('c');
+
+                $query = "SELECT * FROM " . PW_TABLE_PREFIX
+                        . "infocard_identities WHERE cardHash = "
+                        . "'$cardhash'";
+
+                $results = $wpdb->get_results( $query, OBJECT );
+
+                switch ( count($results) )
+                {
+                        case 0:
+                                pw_processing::addIdentityRecord($datamap['cardhash']->new_value, $datamap['cardhandle']->new_value, $datamap['ID']->new_value);
+                        break;
+                        case 1:
+                                if (!pw_utils::dataCompare($results[0]->accountid, $acct, 'Account ID'))
+                                {
+                                        pw_utils::printDebug( '&nbsp; Card used for another account<br/>' );
+                                        return 'CARDINUSE';
+
+                                }
+                        break;
+
+                        default:
+                                // should never happen
+                                return 'MULTIPLECARDERROR';
+                }
+
+                return FALSE;  // no error, life is good
+        }//end function addCard
-
-        /*
@@ -203 +271 @@
-        }//end function deleteCard
-
+        function mapFormElements($datamap, $postdetails)
+        {
+                $user_login = pw_utils::sanitizeData($postdetails['pwchosenloginid']);
+                $user_pwd  = pw_utils::sanitizeData($postdetails['pwchosenpwd']);
+                $user_pwdconfirm  = pw_utils::sanitizeData($postdetails['pwchosenpwdconfirm']);
+                if ($user_login)
+                {
+                        pw_utils::printDebug("User Chosen Login: " . $user_login . "<br/>", 3);
+                        $datamap['loginid']->new_value == $user_login;
+                }
+                if (($user_pwd) && ($user_pwd == $user_pwdconfirm))
+                {
+                        pw_utils::printDebug("User Chosen Password: " . $user_pwd . "<br/>", 3);
+                        $datamap['pwd']->new_value == $user_pwd;
+                }
+        } //end function mapFormElements
-} // end class pw_processing
-?>

branches/RB-0.91/wp-infocard/wp/userdata.pw.php

@@ -253 +253 @@
-        } // end function updateIdentityData
-
+        /*
+                Function:       getAuthenticatedUserRecord
+                Description:    returns a user entry in a standardized format
+                                which may not match the database name
+                Input:          none
+                Output:         - accountid:    the user accountid
+                                - loginid:      the user login name
+                                - name:         the display name
+                Side-Effects:   none
+        */
+        function getAuthenticatedUserRecord()
+        {
+                        $user = wp_get_current_user();
+                        if ( $user->ID )
+                        {
+                                $returnuser->accountid  =  $user->ID;
+                                $returnuser->name       =  $user->display_name;
+                                $returnuser->loginid    =  $user->username;
+                                $returnuser->email      =  $user->email;
+
+                                return $returnuser;
+                        }
+                        else
+                        {
+                                return false;
+                        }
+        } //end getAuthenticatedUserRecord
+
-        // Function:    Perform user login functions
-        // Description: set whatever cookie &/or session information needed
@@ -444 +472 @@
-                return $results;
-        }
-
+
+
-        function updateUserInfoFromEmail($email)
-        {
@@ -490 +519 @@
-                return $results;
-        }
-
+
+
+
-        function updateCardInfoFromAccountID($accountID)
-        {
@@ -528 +559 @@
-                return $results;
-        }//end function updateCardInfoFromAccountID
-
+
-        function checkEmailAddress($claimslist, $datamap)
-        {
@@ -584 +615 @@
-        } //end function updateLegacyCardHash
-
+        /*
+                Function:       loginIDisUnique
+                Description:    returns TRUE if loginID is unique, FALSE otherwise
+        */
+        function loginIDisUnique($loginid)
+        {
+                global $wpdb;
+                $query = "SELECT COUNT(*) FROM `" . PW_TABLE_PREFIX
+                        . "users` WHERE user_login = '"
+                        . $loginid . "'";
+
+                if ($wpdb->get_results( $query, OBJECT ))
+                        return FALSE;
+                else
+                        return TRUE;
+        }
+
+        /*
+                Function:       emailIsUnique
+                Description:    returns TRUE if email is unique
+                                returns TRUE if uniqueness doesn't matter
+                                returns FALSE otherwise
+        */
+        function emailIsUnique($email)
+        {
+                $email_unique = pw_admin::getOption('pw_email_unique');
+                if (!$email_unique)
+                        return TRUE;
+
+                global $wpdb;
+                $query = "SELECT COUNT(*) FROM `" . PW_TABLE_PREFIX
+                        . "users` WHERE user_email = '" . $email . "'";
+
+                if ($wpdb->get_results( $query, OBJECT ))
+                        return FALSE;
+                else
+                        return TRUE;
+        }
-} // end class pw_userdata
-?>

branches/RB-0.91/wp-infocard/wp/utils.pw.php

@@ -250 +250 @@
-        }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                foreach ($claimslist as $claim)
-                {
-                        if ($claim->schemaURI)
-                        {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-        function showDataMap($datamap)
@@ -332 +342 @@
-        }
-
+        function matchLinkProtocol($string)
+        {
+                if (strpos(get_settings('siteurl'), "https"))
+                {
+                        return PW_PLUGINURL . $string;
+                }
+                else
+                {
+                        return PW_SECUREPLUGINURL . $string;
+                }
+        }// end function matchLinkProtocol
-} // end class pw_utils
-?>