Changeset 110

Timestamp:

10/08/07 21:29:25 (1 year ago)

Author:

pdingle

Message:

major updates, to error subsystem and to userdata, audit, and admin

Files:

• trunk/wp-infocard/site-messages/en-us/new-card.html (modified) (1 diff)
• trunk/wp-infocard/site-messages/en-us/new-email.html (modified) (1 diff)
• trunk/wp-infocard/site-messages/en-us/new-user.html (modified) (1 diff)
• trunk/wp-infocard/site-messages/en-us/trusted-new-user.html (added)
• trunk/wp-infocard/site-messages/en-us/verified-new-card.html (added)
• trunk/wp-infocard/site-messages/en-us/verified-new-user.html (added)
• trunk/wp-infocard/wp/admin.pw.php (modified) (2 diffs)
• trunk/wp-infocard/wp/audit.pw.php (modified) (1 diff)
• trunk/wp-infocard/wp/userdata.pw.php (modified) (14 diffs)
• trunk/wp-infocard/wp/utils.pw.php (modified) (1 diff)

trunk/wp-infocard/site-messages/en-us/new-card.html

@@ -1 +1 @@
-    <h2>Changing Your Card</h2>
-Y
+For now, y
-
-<p><a href="<?php bloginfo('home'); ?>"><?php bloginfo('blogname'); ?></a> is sending you an email.  It contains a link back to the site.  Please click on that link, which will take you to a page where you will log in using your new Information Card. These steps validate you by proving that your claim to control an email address is legitimate.</p>

trunk/wp-infocard/site-messages/en-us/new-email.html

@@ -1 +1 @@
-    <h2>Email Address Change</h2>
-
-
-
-
-
+

trunk/wp-infocard/site-messages/en-us/new-user.html

@@ -1 @@
-
+ Required
-
-      <p>Thank you for registering an Information Card. You must validate the email address in your card before you can continue.</p>
-
-<p>This blog is currently sending you an email.  It contains a link back to this site.  Please click on that link, which will validate you by proving that your claim to control the registered email address is legitimate.</p>
-<p>Once you have successfully clicked on the email link, you will be able to post without going through a moderation queue.</p>
-

trunk/wp-infocard/wp/admin.pw.php

@@ -63 +63 @@
-                $myTableAuditQuery =
-                                "CREATE TABLE `$this->table_audit` (
-
-
+
-                                                `accountid` bigint(20) unsigned,
-                                                `email` varchar(128) NOT NULL default '',
@@ -204 +203 @@
-                $this->createOption('pw_custom_data', 0);
-                $this->createOption('pw_time_validation', 1);
-0
-0
+'validate'
+'validate'
-                $this->createOption('pw_trusted_idp_list', '');
-

trunk/wp-infocard/wp/audit.pw.php

@@ -14 +14 @@
-        // Output:              none
-        // Side Effects:  alters DB table
-modulus='NA', $ppid
+cardhash
-        {
-                global $wpdb;

trunk/wp-infocard/wp/userdata.pw.php

@@ -169 +169 @@
-                        $datamap[$key]->new_value = eval($datamap[$key]->mappingfunction);
-                        //pw_utils::printDebug('&nbsp;Mapping Function: '.$datamap[$key]->mappingfunction.'<br/>');
-Newly Mapped Value: '.
+' . 
-                }
-                pw_utils::printDebug('<br />');
@@ -182 +182 @@
-        {
-                include_once( ABSPATH . WPINC . '/registration-functions.php');
+                        
-                $user_login = $datamap['user_login']->new_value;
+                pw_utils::printDebug('Creating account: ' . $user_login . '<br />');
+
+                if (!pw_userdata::userLoginIsUnique($user_login))
+                {
+                        pw_utils::printDebug('ERROR: User Login ID is NOT unique<br />');
+                        return FALSE;
+                }
+                else
+                {
+                        pw_utils::printDebug('User Login ID is unique<br />');
+                }
+
-                if (!$datamap['display_name']->compare())
-                {
@@ -190 +203 @@
-                if (!$datamap['user_email']->compare())
-                        $user_email = $datamap['user_email']->new_value;
+                
+                if (!$datamap['cardhash']->compare())
+                        $user_pass = $datamap['cardhash']->new_value;
+
-                if (($datamap['user_url']) && (!$datamap['user_url']->compare()))
-                        $user_url = $datamap['user_url']->new_value;
@@ -196 +213 @@
-                if (!$datamap['last_name']->compare())
-                        $last_name = $datamap['last_name']->new_value;
-
+pass', 'user_
-
-                pw_utils::printDebug("<br/>Action: createNewAccount<br>");
@@ -204 +221 @@
-                {
-                        pw_utils::printDebug("&nbsp;Inserted record # $user_ID<br>");
+                        $datamap['user_login']->add_db_value($datamap['user_login']->new_value);
-                        return $user_ID;
-                } 
@@ -251 +269 @@
-        function updateUserData( $ID, $datamap )
-        {
-
-
+
-
-                // not sure if there is a more graceful way to do this...
@@ -281 +298 @@
-                {
-                        pw_utils::printDebug('&nbsp;WP-User Updates Successful');
-                        pw_utils::printDebug($query);
-                }
-        } // end function updateUserData
@@ -294 +310 @@
-        function updateIdentityData( $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;
@@ -341 +363 @@
-                                else
-                                {
-Updates N
+Card updates n
-                                }
-                        break;
@@ -360 +382 @@
-        function doUserLogin( $id )
-        {
+                if (!$id)
+                {
+                        pw_utils::printDebug('ERROR: No ID passed to doUserLogin!');
+                        return FALSE;
+                }
+        
-                global $datamap, $wpdb;
+                if (!$datamap['user_login']->db_value)
+                {
+                        pw_utils::printDebug('ERROR: No user login in datamap to doUserLogin!');
+                        return FALSE;
+                }
+        
-                // note - don't put any debug statements in here, we are buffering in the main infocard-post file
-                $query = "SELECT user_pass FROM " . PW_TABLE_PREFIX . "users "
-
+
+
-                . $datamap['user_login']->db_value . "'";
+
-                $pass = $wpdb->get_var( $query );
-                if (!$pass)
-                {
-                        // this might be a new user
-modulusH
+cardh
-                }
-                $url = ($datamap['user_url']?$datamap['user_url']->new_value:"");
@@ -422 +458 @@
-                        case 0:
-                                // Not found: return the defaults
-
+ via card hash
-                                break;
-
@@ -441 +477 @@
-
-                $query = "SELECT * from " . PW_TABLE_PREFIX
-
+user_
-                        . $claimslist['emailaddress']->token_value . "'";
-
-identity
+user
-
-                switch (count($user_info))
@@ -454 +490 @@
-                                {
-                                        if (array_key_exists($datamap[$key]->mappingattribute, $user_info[0]))
+                                        {
-                                                $datamap[$key]->add_db_value($user_info[0][$datamap[$key]->mappingattribute]);
+                                                pw_utils::printDebug('Added: ' . $datamap[$key]->db_value . '<br />');
+                                        }
-                                }
-
@@ -466 +505 @@
-                        break;
-                         default:
-
+getIdentityFromUserTable: 
-                                $card_info['error'] = "USERIDNOTUNIQUE";
-                }
-        } //end function getIdentityFromUserTable
-
+        function updateCardInfoFromCardHash($cardhash)
+        {
+                $results['found'] = FALSE;
+                $results['error'] = '';
+                if (!$cardhash)
+                {
+                        pw_utils::printDebug('ERROR: updateCardInfoFromCardHash called without a Card Hash!<br/>');
+                        $results['error'] = 'INTERNALERROR';
+                }
+                global $wpdb, $datamap;
+
+                 pw_utils::printDebug( '<br/>Getting Card Info from Card Hash:' . $cardhash . '<br/>');
+
+                $query = "SELECT * FROM `" . PW_TABLE_PREFIX
+                        . "infocard_identities` WHERE cardhash = '"
+                        . $cardhash . "'";
+                $identity_info = $wpdb->get_results( $query, OBJECT );
+                switch (count($identity_info))
+                {
+                        case 1:
+                                // card is found
+                                $datamap['ID']->add_db_value($identity_info[0]->accountid);
+                                $datamap['cardhash']->add_db_value($identity_info[0]->cardhash);
+                                $datamap['cardhandle']->add_db_value($identity_info[0]->cardhandle);
+                                $results['found'] = TRUE;
+                                pw_utils::printDebug('&nbsp;&nbsp;Card belongs to account #: ' . $datamap['ID']->db_value . "<br/>" );
+                                break;
+                        case 0:
+                                // Not found: return the defaults
+                                pw_utils::printDebug('&nbsp;&nbsp;Card not found.<br />' );
+                                break;
+
+                        default:
+                                pw_utils::printDebug('&nbsp;&nbsp;Multiple cards match the hash, return an error.<br />' );
+                                $results['error'] = "CARDNOTUNIQUE";
+                }
+
+                return $results;
+        }
+
+        function updateUserInfoFromAccountID($accountID)
+        {
+                $results['found'] = FALSE;
+                $results['error'] = '';
+                if (!$accountID)
+                {
+                        pw_utils::printDebug('ERROR: updateUserInfoFromAccountID called without an AccountID!<br/>');
+                        $results['error'] = 'INTERNALERROR';
+                }
+                global $wpdb, $datamap;
+
+                $query = "SELECT * from " . PW_TABLE_PREFIX
+                        . "users WHERE ID = '"
+                        . $accountID . "'";
+
+                $user_info = $wpdb->get_results( $query, ARRAY_A );
+
+                switch (count($user_info))
+                {
+                        case 1:
+                                //
+                                $results['found'] = TRUE;
+                                pw_utils::printDebug('&nbsp;&nbsp;User Data found & mapped, based on Account ID.<br />' );
+                                foreach (array_keys($datamap) as $key)
+                                {
+                                        if (array_key_exists($datamap[$key]->mappingattribute, $user_info[0]))
+                                        {
+                                                // pw_utils::printDebug($key . ' updated to ' . $user_info[0][$key] . ': ' . $datamap[$key]->db_value . '<br />');
+                                                $datamap[$key]->add_db_value($user_info[0][$datamap[$key]->mappingattribute]);
+                                        }
+                                }
+
+                                if ( PW_CUSTOM_DATA )
+                                        pw_customdata::evaluateIncomingCustomData( $accountID );
+                        break;
+
+                        case 0:
+                                pw_utils::printDebug('&nbsp;&nbsp;Card not found.<br />' );
+                        break;
+                        default:
+                                pw_utils::printDebug('&nbsp;&nbsp;Multiple user accounts have the same ID.<br />' );
+                                $results['error'] = "USERIDNOTUNIQUE";
+                }
+                return $results;
+        }
+
+        function updateCardInfoFromPPID($ppid, $modulus)
+        {
+                // not done yet;        
+                $results['found'] = FALSE;
+                $results['error'] = '';
+                return $results;
+        }
+        
+        function updateUserInfoFromEmail($email)
+        {
+                $results['found'] = FALSE;
+                $results['error'] = '';
+                if (!$email)
+                {
+                        pw_utils::printDebug('ERROR: updateUserInfoFromEmail called without an Email!<br/>');
+                        $results['error'] = 'INTERNALERROR';
+                }
+                global $wpdb, $datamap;
+
+                $query = "SELECT * from " . PW_TABLE_PREFIX
+                        . "users WHERE user_email = '"
+                        . $email . "'";
+
+                $user_info = $wpdb->get_results( $query, ARRAY_A );
+
+                switch (count($user_info))
+                {
+                        case 1:
+                                //
+                                $results['found'] = TRUE;
+                                pw_utils::printDebug('&nbsp;&nbsp;User Email address found & mapped.<br />' );
+                                foreach (array_keys($datamap) as $key)
+                                {
+                                        if (array_key_exists($datamap[$key]->mappingattribute, $user_info[0]))
+                                                $datamap[$key]->add_db_value($user_info[0][$datamap[$key]->mappingattribute]);
+                                }
+
+                                if ( PW_CUSTOM_DATA )
+                                        pw_customdata::evaluateIncomingCustomData( $accountID );
+                        break;
+
+                        case 0:
+                                pw_utils::printDebug('&nbsp;&nbsp;Card not found via Email.<br />' );
+                        break;
+                        default:
+                                pw_utils::printDebug('&nbsp;&nbsp;Multiple user accounts have the same Email.<br />' );
+                                $results['error'] = "USERIDNOTUNIQUE";
+                }
+                return $results;
+        }
+
+        function updateCardInfoFromAccountID($accountID)
+        {
+                $results['found'] = FALSE;
+                $results['error'] = '';
+                if (!$accountID)
+                {
+                        pw_utils::printDebug('ERROR: updateCardInfoFromAccountID called without an Account ID!<br/>');
+                        $results['error'] = 'INTERNALERROR';
+                }
+                global $wpdb, $datamap;
+
+                 pw_utils::printDebug( '<br/>Getting Card Info from Account ID:' . $accountID . '<br/>');
+
+                $query = "SELECT * FROM `" . PW_TABLE_PREFIX
+                        . "infocard_identities` WHERE accountid = '"
+                        . $accountID . "'";
+                $identity_info = $wpdb->get_results( $query, OBJECT );
+                switch (count($identity_info))
+                {
+                        case 1:
+                                // card is found
+                                $datamap['cardhash']->add_db_value($identity_info[0]->cardhash);
+                                $datamap['cardhandle']->add_db_value($identity_info[0]->cardhandle);
+                                $results['found'] = TRUE;
+                                pw_utils::printDebug('&nbsp;&nbsp;Card belongs to account #: ' . $accountID . "<br/>" );
+                                break;
+                        case 0:
+                                // Not found: return the defaults
+                                break;
+
+                        default:
+                                pw_utils::printDebug('&nbsp;&nbsp;Multiple cards match the hash, return an error.<br />' );
+                                $card_info['error'] = "CARDNOTUNIQUE";
+                }
+
+                return $results;
+        }//end function updateCardInfoFromAccountID
+
+        function checkEmailAddress($claimslist, $datamap)
+        {
+                return $datamap['user_email']->db_value === $claimslist['emailaddress']->token_value; 
+        }//end function checkEmailAddress
+
+        function userLoginIsUnique($user_login, $ID='impossible')
+        {
+                global $wpdb;
+                $query = 'SELECT user_login FROM ' . PW_TABLE_PREFIX
+                . 'users WHERE user_login = "' . $user_login . '"';
+
+                $identity_info = $wpdb->get_results( $query, OBJECT );
+                
+                switch( count($identity_info) )
+                {
+                        case 0: 
+                                return TRUE;
+                        break;
+                        case 1: 
+                                pw_utils::printDebug('userLoginUnique - loginID found for Account # ' . $identity_info[0]->ID . '<br />');
+                                if ($identity_info[0]->ID == $ID)
+                                        return TRUE;
+                                else
+                                        return FALSE;
+                        
+                        default:
+                                return FALSE;   
+                }
+        }//end function userLoginIsUnique($user_login)
+
-} // end class pw_userdata
-?>

trunk/wp-infocard/wp/utils.pw.php

@@ -168 +168 @@
-        } // end function printUserMessageText
-
+        function getMessageLinks( $home='', $profile='', $login='', $pp='')
+        {
+                $output = "<ul>";
+                if ($home)
+                {       
+                        print "<li><a href='";
+                        print bloginfo('home');
+                        print "'>";
+                        _e('Go to Blog');
+                        print "&raquo;</a></li>";
+                }
+        
+                if ($profile)
+                {
+                        print "&nbsp;<li><a href='";
+                        print bloginfo('home');
+                        print "/wp-admin/profile.php'>";
+                        _e('View Profile');
+                        print "&raquo</a></li></ul>";
+                }
+
+                if ($login)
+                {
+                        print "<a href='";
+                        print bloginfo('home');
+                        print "/wp-login.php'>";
+                        _e('Login Again');
+                        print "&raquo</a></li></ul>";
+                }
+
+                if ($pp)
+                {
+                }
+                $output .= "</ul>";
+                return $output;
+        
+        }
-        function printUserMessageLinks( $mesg_type ) 
-        {