diff -urN simple-ldap-login/Simple-LDAP-Login-Admin.php simple-ldap-login.new/Simple-LDAP-Login-Admin.php --- simple-ldap-login/Simple-LDAP-Login-Admin.php 2011-12-08 21:52:12.000000000 -0600 +++ simple-ldap-login.new/Simple-LDAP-Login-Admin.php 2012-02-13 15:51:20.000000000 -0600 @@ -76,29 +76,29 @@ //If admin options updated (uses hidden field) if ($_POST['stage'] == 'process') { - update_option('simpleldap_account_suffix', $_POST['account_suffix']); - update_option('simpleldap_base_dn', $_POST['base_dn']); - update_option('simpleldap_domain_controllers', $_POST['domain_controller']); + update_site_option('simpleldap_account_suffix', $_POST['account_suffix']); + update_site_option('simpleldap_base_dn', $_POST['base_dn']); + update_site_option('simpleldap_domain_controllers', $_POST['domain_controller']); //Version 1.3 - update_option('simpleldap_directory_type',$_POST['LDAP']); - update_option('simpleldap_login_mode',$_POST['mode']); - update_option('simpleldap_group',$_POST['group_name']); - update_option('simpleldap_account_type',$_POST['create_type']); + update_site_option('simpleldap_directory_type',$_POST['LDAP']); + update_site_option('simpleldap_login_mode',$_POST['mode']); + update_site_option('simpleldap_group',$_POST['group_name']); + update_site_option('simpleldap_account_type',$_POST['create_type']); //Version 1.3.0.2 - update_option('simpleldap_security_mode',$_POST['security_mode']); + update_site_option('simpleldap_security_mode',$_POST['security_mode']); //Version 1.4 - update_option('simpleldap_ol_login', $_POST['ol_login']); + update_site_option('simpleldap_ol_login', $_POST['ol_login']); if(isset($_POST['use_tls'])) { - update_option("simpleldap_use_tls", $_POST['use_tls']); + update_site_option("simpleldap_use_tls", $_POST['use_tls']); } else { - update_option("simpleldap_use_tls", "no"); + update_site_option("simpleldap_use_tls", "no"); } } @@ -108,13 +108,13 @@ global $bool_test; //Temporarily change security mode for test. Store old setting. - $temp_holder = get_option("simpleldap_security_mode"); - update_option("simpleldap_security_mode", "security_high"); + $temp_holder = get_site_option("simpleldap_security_mode"); + update_site_option("simpleldap_security_mode", "security_high"); $test_user = wp_authenticate($_POST['test_username'],$_POST['test_password']); //Restore security mode setting. - update_option("simpleldap_security_mode", $temp_holder); + update_site_option("simpleldap_security_mode", $temp_holder); if ($test_user->ID > 0) { @@ -126,22 +126,22 @@ } } //Load settings, etc -$simpleldap_account_suffix = get_option("simpleldap_account_suffix"); -$simpleldap_base_dn = get_option("simpleldap_base_dn"); -$simpleldap_domain_controllers = get_option("simpleldap_domain_controllers"); +$simpleldap_account_suffix = get_site_option("simpleldap_account_suffix"); +$simpleldap_base_dn = get_site_option("simpleldap_base_dn"); +$simpleldap_domain_controllers = get_site_option("simpleldap_domain_controllers"); //Version 1.3 -$simpleldap_directory_type = get_option("simpleldap_directory_type"); -$simpleldap_login_mode = get_option("simpleldap_login_mode"); -$simpleldap_group = get_option("simpleldap_group"); -$simpleldap_account_type = get_option("simpleldap_account_type"); +$simpleldap_directory_type = get_site_option("simpleldap_directory_type"); +$simpleldap_login_mode = get_site_option("simpleldap_login_mode"); +$simpleldap_group = get_site_option("simpleldap_group"); +$simpleldap_account_type = get_site_option("simpleldap_account_type"); //Version 1.3.0.2 -$simpleldap_security_mode = get_option("simpleldap_security_mode"); +$simpleldap_security_mode = get_site_option("simpleldap_security_mode"); //Version 1.4 -$simpleldap_ol_login = get_option("simpleldap_ol_login"); -$simpleldap_use_tls = get_option("simpleldap_use_tls"); +$simpleldap_ol_login = get_site_option("simpleldap_ol_login"); +$simpleldap_use_tls = get_site_option("simpleldap_use_tls"); ?>
@@ -241,11 +241,11 @@ if($debug == "true") { echo "Debug Info:
";
-echo "simpleldap_directory_type: ".get_option("simpleldap_directory_type")."/".$_POST['LDAP']."
";
-echo "simpleldap_login_mode: ".get_option("simpleldap_login_mode")."/".$_POST['mode']."
";
-echo "simpleldap_group: ".get_option("simpleldap_group")."/".$_POST['group_name']."
";
-echo "simpleldap_account_type: ".get_option("simpleldap_account_type")."/".$_POST['create_type']."