Changeset 84

Timestamp:

06/26/07 14:29:33 (2 years ago)

Author:

pdingle

Message:

added selector trigger, customdata, managedonly, timevalidation to the wp_options table and removed case where customdatapath pointed to either a dummy file or the custom file (now you check the pw_custom_data boolean and include the custom file if applicable)

Files:

• trunk/wp-infocard/pw-config.php (modified) (2 diffs)
• trunk/wp-infocard/wp/admin.pw.php (modified) (5 diffs)
• trunk/wp-infocard/wp/pw-claimtypes.php (modified) (2 diffs)
• trunk/wp-infocard/wp/userdata.pw.php (modified) (2 diffs)

trunk/wp-infocard/pw-config.php

@@ -7 +7 @@
-define ('PW_SHOW_BINARY', false);
-define ('PW_PLUGINPATH', '/wp-content/plugins/wp-infocard');
-define ('PW_SELECTORTRIGGER', 'html' ); // this can also be set to XHTML
-define ('PW_MANAGEDONLY', false );
-define ('PW_VERSION', 'b3');
-define ('PW_VERSION_DATE', '20June07');
-define ('PW_SELECTORTRIGGER', 'html');
-define ('PW_USECAPTCHAS', false );
-define ('PW_CUSTOMDATAPATH', dirname(__FILE__) . '/' . PW_PLUGIN. '/customdata.pw.php');
-//define ('PW_CUSTOMDATAPATH', dirname(__FILE__) . '/custom/customdata.pw.php');
-
-include_once( PW_CUSTOMDATAPATH );
-
-include_once( dirname(__FILE__) . '/' . PW_PLUGIN. '/pw-claimtypes.php');
-define ('PW_DEBUG_ON', get_settings('pw_debug_on'));
-
+
+
+
+
+
+
-define ('PW_PATH', ABSPATH . PW_PLUGINPATH);
-define ('PW_IMGPATH', PW_PATH . '/pwlib/images');
@@ -29 +26 @@
-define ('PW_SITEMESGURL', PW_PLUGINURL . '/site-messages/infocard-usermessage.php');
-define ('PW_SECURESITEURL', get_settings('securesiteurl') );
-
+
+
+
+
+
-?>

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

@@ -169 +169 @@
-                $this->createOption('pw_debug_on', 0);
-                $this->createOption('pw_enable_pass', 0);
-
-
+
+
+
+
+
-
-        } // end function setup
@@ -326 +329 @@
-                $ic_debug = $new_debug = pw_admin::getOption('pw_debug_on');
-                $ic_pass = $new_pass = pw_admin::getOption('pw_enable_pass');
+                $ic_trigger = $new_trigger = pw_admin::getOption('pw_selector_trigger');
+                $ic_customdata = $new_customdata = pw_admin::getOption('pw_custom_data');
+                $ic_timeval = $new_timeval = pw_admin::getOption('pw_time_validation');
+                $ic_managed = $new_managed = pw_admin::getOption('pw_trust_managed_cards');
+                $ic_idplist = $new_idplist = pw_admin::getOption('pw_trusted_idp_list');
-
-                // write submitted changes if this page reload shows a submit
@@ -335 +343 @@
-                        $new_debug = $_POST['pw_debug_on'];
-                        $new_pass = $_POST['pw_enable_pass'];
+                        $new_trigger = $_POST['pw_selector_trigger'];
+                        $new_customdata = $_POST['pw_custom_data'];
+                        $new_timeval = $_POST['pw_time_validation'];
+                        $new_managed = $_POST['pw_trust_managed_cards'];
+                        $new_idplist = $_POST['pw_trusted_idp_list'];
-                }
-
@@ -357 +370 @@
-                }
-                
+                if ( $ic_trigger != $new_trigger ){
+                        update_option('pw_selector_trigger', $new_trigger );
+                }
+
+                if ( $ic_customdata != $new_customdata ){
+                        update_option('pw_custom_data', $new_customdata );
+                }
+
+                if ( $ic_timeval != $new_timeval ){
+                        update_option('pw_time_validation', $new_timeval );
+                }
+
+                if ( $ic_managed != $new_managed ){
+                        update_option('pw_trust_managed_cards', $new_managed );
+                }
+
+                if ( $ic_idplist != $new_idplist ){
+                        update_option('pw_trusted_idp_list', $new_idplist );
+                }
+
-                pw_admin::printSystemCheck($new_secureurl);
-?>
@@ -405 +438 @@
-?>
-                        </td></tr>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        </td></tr>
-                        <tr><td>&nbsp;</td><td/></tr>

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

@@ -38 +38 @@
-
-// Add any custom claims
-
-
+
+
+
+
-
-$datamap['display_name'] = new pw_mapping( 
@@ -94 +96 @@
-
-// Map any custom claims
-// (note - custom claims come from PW_CUSTOMDATAPATH in pw-config.php
-
+if ( PW_CUSTOM_DATA 
+       
-?>

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

@@ -129 +129 @@
-                                        $datamap['last_name']->add_db_value( $last );
-                                }
-
+
+
+
-                        break;
-
@@ -262 +264 @@
-                $userdata = compact('ID', 'user_login', 'user_email', 'user_nicename', 'user_url', 'display_name', 'first_name', 'last_name');
-
-
+
+
-
-                if (wp_update_user($userdata))