Changeset 44

Timestamp:

05/22/07 15:45:15 (2 years ago)

Author:

pdingle

Message:

deleted wp-infocard-settings.php from version control

Files:

• trunk/wp-infocard/processing/class.infocard-processing.php (deleted)
• trunk/wp-infocard/processing/infocard-print-binary.php (deleted)
• trunk/wp-infocard/pw-claimtypes.php (modified) (3 diffs)
• trunk/wp-infocard/pw-config.php (modified) (2 diffs)
• trunk/wp-infocard/pwlib/processing/infocard-post.php (modified) (5 diffs)
• trunk/wp-infocard/wp-infocard-settings.php (deleted)

trunk/wp-infocard/pw-claimtypes.php

@@ -1 +1 @@
-<?php
+include_once( dirname(__FILE__) . '/pwlib/claimtypes.pwlib.php');
-
-$claimslist['privatepersonalidentifier'] = new pw_claimtype(
@@ -41 +42 @@
-        'user_email',
-        'Email Address',
-_
+
-        'return $claimslist[\'emailaddress\']->token_value;' );
-        
@@ -56 +57 @@
-        'return $' . 'claimslist[\'privatepersonalidentifier\']->token_value;' );
-        
+<<<<<<< .mine
+$datamap['user_login'] = new pw_mapping(
+        'user_login',
+        'Login ID',
+        PW_TABLE_PREFIX . 'users',
+=======
-$datamap['user_login'] = new pw_mapping(
-        'user_login',
-        'Login ID',
-        PW_TABLE_PREFIX . '_users',
+>>>>>>> .r42
-        'return pw_userdata::getLoginID();',
-        'Calls out to the getLoginID function in pw_userdata' );
-
-class pw_claimtype
-{
-        var $schemaURI = '';
-        var $handle = '';
-        var $required = FALSE;
-        var $displayname = '';
-        var $token_value;
-        
-        function pw_claimtype( $sch, $han, $req, $dn )
-        {
-                $this->schemaURI = $sch;
-                $this->handle = $han;
-                $this->required = $req;
-                $this->displayname = $dn;
-        } //end function pw_claimtype
-
-        function add_token_value( $val )
-        {
-                $this->token_value = $val;
-        } // end function add_token_value;
-} // end class pw_claimtype
-
-class pw_mapping
-{
-        var $handle;
-        var $displayname;
-        var $mappingattribute;
-        var $mappingtable;
-        var $mappingfunction;
-        var $new_value;
-        var $db_value;
-        var $description = '';   //to describe the mapping for others
-        
-        function pw_mapping( $dn, $ma, $mt, $mf, $desc='' )
-        {
-                $this->handle = $dn;
-                $this->displayname = $dn;
-                $this->mappingattribute = $ma;
-                $this->mappingtable = $mt;
-                $this->mappingfunction = $mf;
-                $this->description = $desc;
-        } // end function pw_mapping    
-        
-        function add_new_value( $val )
-        {
-                $this->new_value = $val;
-        } // end function add_new_value
-
-        function add_db_value( $val )
-        {
-                $this->db_value = $val;
-        }
-
-        function compare( $nodebug='' )
-        {
-                if (strcmp($this->db_value, $this->new_value) == 0)
-                {
-                        // sometimes we just want the value, even when
-                        // in debug mode
-                        if (!$nodebug)
-                        {       
-                                pw_utils::printDebug("&nbsp; $this->displayname: matches ($this->db_value)<br/>");
-                        }
-                        return (TRUE);
-                }
-                else
-                {
-                        // sometimes we just want the value, even when
-                        // in debug mode
-                        if (!$nodebug)
-                        {       
-                                pw_utils::printDebug("&nbsp; $this->displayname:&nbsp;DB: $this->db_value &nbsp;&nbsp;TOKEN: $this->new_value<br/>");           
-                        }
-                        return (FALSE);
-                }
-        
-        }
-                
-} // end class pw_mapping
-?>

trunk/wp-infocard/pw-config.php

@@ -1 +1 @@
-<?php
-define ('PW_PLUGIN', 'wp');
+require( dirname(__FILE__) . '/../../../wp-config.php' );
+define ('PW_TABLE_PREFIX', $table_prefix);
-define ('PW_VALIDITY_WINDOW', 300);
-define ('PW_CLICKBACK_LENGTH', 16);
-
+
+
+
+
-define ('PW_VERSION', 'b2');
-define ('PW_VERSION_DATE', '17May07');
-define ('PW_SELECTORTRIGGER', 'html');
-
-
-
-
+
-define ('PW_DEBUG_ON', get_settings('pw_debug_on'));
-define ('PW_TIMEVALIDATION_ON', false);
@@ -16 +19 @@
-define ('PW_IMGPATH', PW_PATH . '/pwlib/images');
-define ('PW_SITEMESGPATH', PW_PATH . '/site-messages');
-'/' . 
+
-define ('PW_IMGURL', PW_PLUGINURL . '/pwlib/images');
-define ('PW_SECUREPLUGINURL', get_settings('pw_securesiteurl') . '/' . PW_PLUGINPATH );
-define ('PW_SITEMESGURL', PW_PLUGINURL . '/site-messages/infocard-usermessage.php');
+/////Temporary
+define ('PW_SECURESITEURL', get_settings('securesiteurl') );
-?>

trunk/wp-infocard/pwlib/processing/infocard-post.php

@@ -93 +93 @@
-        }
-
+        $incominguser = pw_userdata::evaluateIncomingRequest();
-        pw_userdata::mapTokenData();
-        $user_email     = trim($claims['emailaddress']);
@@ -103 +104 @@
-        $modulusHash    = $claims['modulusHash'];
-        $pass2rounds    = MD5($modulusHash);
-
-
+
+
+
-
-        if (!$incominguser)
@@ -265 +267 @@
-        pw_utils::printDebug("&nbsp;Error: $error <br/>");
-        pw_utils::printDebug("&nbsp;Status: ".$incominguser['status']." <br/>");
-//
-
-
+
+//
+//
-    }
-    else 
@@ -306 +308 @@
-                else 
-                {
-?option=com_hotornot2
+
-                }
-
@@ -340 +342 @@
-        }
-    } else {
-//
+
-        
-
-
-
+//
+//
+//
-                //pw_utils::redirectToURL('http://pamelaproject.com/hotornot/index.php?option=pwjos&task=error&error_code='.$error);
-    }