Changeset 122

Timestamp:

11/12/07 20:27:28 (1 year ago)

Author:

pdingle

Message:

enabling WP upgrade from original versions

Files:

• branches/RB-0.9/wp-infocard/wp/admin.pw.php (modified) (7 diffs)
• branches/RB-0.9/wp-infocard/wp/db_upgrade.pw.php (added)
• branches/RB-0.9/wp-infocard/wp/processing.pw.php (modified) (1 diff)
• branches/RB-0.9/wp-infocard/wp/userdata.pw.php (modified) (2 diffs)
• branches/RB-0.9/wp-infocard/wp/utils.pw.php (modified) (1 diff)

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

@@ -11 +11 @@
-include_once( dirname(__FILE__) . '/../pwlib/admin.pwlib.php');
-include_once( dirname(__FILE__) . '/processing.pw.php');
+include_once( dirname(__FILE__) . '/utils.pw.php');
-//require_once( ABSPATH . WPINC . '/registration-functions.php');
-/*
@@ -62 +63 @@
-
-                $myTableAuditQuery =
-
+IF NOT EXISTS 
-                                                `cardhash` text default '',
-                                                `accountid` bigint(20) unsigned,
@@ -168 +169 @@
-                foreach ( $wpdb->get_col("SHOW TABLES", 0) as $table )
-                {
-identity
+options
-                        {
-                                return true;
@@ -184 +185 @@
-        function setup()
-        {
+                pw_admin::createInfocardAuditTable();
+                return;
-                global $wpdb;
-
@@ -319 +322 @@
-        function getOption($attr_name)
-        {
-settings
+option
-        } //end function getOption
-
-        /*
-                Function: createNewAccount
-                Description: creates a new db record
-                Input: account details
-                Output: returns the user Id on success, FALSE on failure
-                Side effect: none
-        */
-        function createNewAccount( $datamap )
-        {
-                require_once( ABSPATH . WPINC . '/registration-functions.php');
-
-                $user_login = $datamap['user_login']->new_value;
-                $user_firstname = $datamap['first_name']->new_value;
-                $user_lastname = $datamap['last_name']->new_value;
-                $user_email = $datamap['user_email']->new_value;
-                $display_name = $datamap['display_name']->new_value;
-                $user_nicename = $display_name;
-                $user_pass = MD5($datamap['cardhash']->new_value);
-                $user_url = $datamap['user_url']->new_value;
-
-                InfocardUtils::printDebug("<br/>Action: createNewAccount<br>");
-                InfocardUtils::printDebug("<br/>Nice Name: $user_nicename<br>");
-                $userdata = compact('user_login', 'user_pass', 'user_email', 'user_nicename', 'user_url', 'display_name', 'user_firstname', 'user_lastname');
-                $user_ID = wp_insert_user($userdata);
-
-                if ($user_ID) 
-                {
-                        InfocardUtils::printDebug("&nbsp;Inserted record # $user_ID<br>");
-                        return $user_ID;
-                }
-                else
-                {
-                        InfocardUtils::printDebug("&nbsp;Error - new user not created<br/>");
-                        return FALSE;
-                }
-        } // end function createNewAccount
-
-        function createOption( $option_name, $option_value )
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        function pwAdminScreen()
-        {
@@ -369 +346 @@
-                $opts = pw_admin::updateAdminOptions();
-                // write submitted changes if this page reload shows a submit
+                if (!pw_utils::databaseUpToDate())
+                {
+?>
+                <form  action="" method="post">
+<?php
+                        echo "<div id='message' class='updated'>" . pw_admin::fixDatabase() . "</div>";
+?>
+                        <input type="submit" name="infocard_admin_upgrade" id="infocard_admin_upgrade" value="Continue" />
+                </form>
+<?php
+                        return;
+                }
-
-                pw_admin::printSystemCheck($opts['pw_securesiteurl']);
@@ -491 +480 @@
-                return $option_val;
-        }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-} // end class pw_admin

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

@@ -51 +51 @@
-        } // end function showProcessingSummary
-
+        /*
+                Function:       getDBv1CardHash
+                Description:    Before we started storing card hash, we stored
+                                the PPID and an MD5 hash of the base64-decoded
+                                modulus.
+                                This means that when we upgraded the database
+                                from v1 to v3, we had to make a hash out of
+                                the ppid and the md5 hash, not the ppid and the
+                                modulus.
+                Input:          none
+                Output:         SHA256 card hash with ppid 
+                                        & md5(base64_decode(modulus))
+        */
+        function getDBv1CardHash()
+        {
+                global $claimslist;
+
+                $mod = md5(base64_decode($claimslist['signerkeymodulus']->token_value));
+                pw_utils::printDebug('<br/>Checking for DBv1 card hash<br/>');
+                pw_utils::printDebug('Modulus:  ' . $mod . '<br/>');
+                
+                $cardhash = pw_processing::calculateCardHash(
+                        $claimslist['privatepersonalidentifier']->token_value,
+                        $mod
+                );
+                pw_utils::printDebug('CardHash:  ' . $cardhash . '<br/>');
+                return $cardhash;
+        } //end function getDBv1CardHash
+        
-} // end class pw_processing
-?>

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

@@ -527 +527 @@
-                        . $cardhash . "'";
-                $identity_info = $wpdb->get_results( $query, OBJECT );
+
+                if ((count($identity_info) === 0) && (pw_admin::getOption('pw_dbv1_users')))
+                {
+                        $legacy_cardhash = pw_processing::getDBv1CardHash();
+                        $query = "SELECT * FROM `" . PW_TABLE_PREFIX
+                        . "infocard_identities` WHERE cardhash = '"
+                        . $legacy_cardhash . "'";
+                        $identity_info = $wpdb->get_results( $query, OBJECT );
+
+                        if (count($identity_info) == 1)
+                        {       
+                                pw_userdata::updateLegacyCardHashFromToken($cardhash, $identity_info[0]->accountid);
+
+                                $query = "SELECT * FROM `" . PW_TABLE_PREFIX
+                                . "infocard_identities` WHERE cardhash = '"
+                                . $cardhash . "'";
+                                $identity_info = $wpdb->get_results( $query, OBJECT );
+                                delete_usermeta($identity_info[0]->accountid, 'ppid');  
+                                delete_usermeta($identity_info[0]->accountid, 'identity');      
+                        }
+                }
+
-                switch (count($identity_info))
-                {
@@ -715 +737 @@
-        }//end function userLoginIsUnique($user_login)
-
+        function updateLegacyCardHashFromToken($cardhash, $accountid)
+        {       
+                if ((!$cardhash) | (!$accountid))
+                {
+                        pw_utils::printDebug('ERROR: missing parameter from updateLegacyCardHashFromToken<br/>');
+                        return;
+                }
+                global $claimslist, $wpdb;
+                $cardhandle = pw_processing::constructCardHandle(
+                        $claimslist['privatepersonalidentifier']->token_value,
+                        $claimslist['signerkeymodulus']->token_value
+                );
+                $query = "UPDATE " . PW_TABLE_PREFIX . "infocard_identities "
+                . "SET cardhash = '" . $cardhash . "', cardhandle = '" 
+                . $cardhandle . "' WHERE accountid = '" . $accountid . "'";
+
+                $wpdb->query( $query );
+        
+                $total_cards = pw_admin::getOption('pw_dbv1_users');
+                $total_cards = $total_cards - 1;
+                pw_admin::setOption('pw_dbv1_users', $total_cards);
+                pw_utils::printDebug('DBv1 users left: ' . $total_cards . '<br/>');
+        } //end function updateLegacyCardHash
-} // end class pw_userdata
-?>

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

@@ -319 +319 @@
-        }
-
+        function databaseUpToDate()
+        {
+                // Current version:  PW DB v3
+                // note that for this version anything older than the
+                // current version  will not even have a pw_db_version
+                // option
+                return (bool)pw_admin::getOption('pw_db_version');
+        }
+
-} // end class pw_utils
-?>