From d3fbef7840b348df6bdcbe388fc460cbccbb02cd Mon Sep 17 00:00:00 2001 From: Cameron Date: Fri, 21 Aug 2015 12:53:09 -0700 Subject: [PATCH] Issue #1114, Fixes #1041 - Mail validation issues. Removed problematic remote-server email-check feature. --- e107_admin/prefs.php | 10 +++++++- e107_admin/update_routines.php | 25 +++++++++++++------ e107_core/xml/default_install.xml | 1 - e107_handlers/validator_class.php | 4 ++- .../English/admin/lan_e107_update.php | 20 +++++++++------ 5 files changed, 42 insertions(+), 18 deletions(-) diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php index cf8e5501c..fe06601a1 100644 --- a/e107_admin/prefs.php +++ b/e107_admin/prefs.php @@ -1469,14 +1469,22 @@ $text .= " $text .= " + "; + + /* + // Highly problematic. + $text .= " ".$frm->radio_switch('signup_remote_emailcheck', $pref['signup_remote_emailcheck'])." - + "; + + */ + $text .= " diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php index d610b5962..a3f55ff2b 100644 --- a/e107_admin/update_routines.php +++ b/e107_admin/update_routines.php @@ -48,8 +48,8 @@ $update_debug = TRUE; // TRUE gives extra messages in places if (defined('TEST_UPDATE')) $update_debug = TRUE; -if (!defined('LAN_UPDATE_8')) { define('LAN_UPDATE_8', ''); } -if (!defined('LAN_UPDATE_9')) { define('LAN_UPDATE_9', ''); } +//if (!defined('LAN_UPDATE_8')) { define('LAN_UPDATE_8', ''); } +//if (!defined('LAN_UPDATE_9')) { define('LAN_UPDATE_9', ''); } // Determine which installed plugins have an update file - save the path and the installed version in an array @@ -128,8 +128,8 @@ if (!$dont_check_update) } // set 'master' to true to prevent other upgrades from running before it is complete. - $dbupdate['706_to_800'] = array('master'=>true, 'title'=>LAN_UPDATE_8.' 1.x '.LAN_UPDATE_9.' 2.0','message'=> LAN_UPDATE_29); - $dbupdate['core_prefs'] = array('master'=>true, 'title'=>LAN_UPDATE_13); // Prefs check + $dbupdate['706_to_800'] = array('master'=>true, 'title'=> e107::getParser()->lanVars(LAN_UPDATE_4, array('1.x','2.0')), 'message'=> LAN_UPDATE_29); + $dbupdate['core_prefs'] = array('master'=>true, 'title'=> LAN_UPDATE_13); // Prefs check // $dbupdate['70x_to_706'] = LAN_UPDATE_8.' .70x '.LAN_UPDATE_9.' .706'; } // End if (!$dont_check_update) @@ -176,7 +176,9 @@ class e107Update function updateCore($func='') { $mes = e107::getMessage(); - + $tp = e107::getParser(); + + // foreach($this->core as $func => $data) // { if(function_exists('update_'.$func)) // Legacy Method. @@ -187,7 +189,8 @@ class e107Update { if(function_exists("update_".$func)) { - $message = LAN_UPDATE_7." ".$func; + // $message = LAN_UPDATE_7." ".$func; + $message = $tp->lanVars(LAN_UPDATE_7, $this->core[$func]['title']); $error = call_user_func("update_".$func, "do"); if($error != '') @@ -254,6 +257,8 @@ class e107Update $mes = e107::getMessage(); $text = ""; + + foreach($this->core as $func => $data) { @@ -500,7 +505,9 @@ function update_706_to_800($type='') // List of unwanted $pref values which can go $obs_prefs = array('frontpage_type','rss_feeds', 'log_lvcount', 'zone', 'upload_allowedfiletype', 'real', 'forum_user_customtitle', 'utf-compatmode','frontpage_method','standards_mode','image_owner','im_quality', 'signup_option_timezone', - 'modules', 'plug_sc', 'plug_bb', 'plug_status', 'plug_latest', 'subnews_hide_news', 'upload_storagetype' + 'modules', 'plug_sc', 'plug_bb', 'plug_status', 'plug_latest', 'subnews_hide_news', 'upload_storagetype', + 'signup_remote_emailcheck' + ); // List of DB tables not required (includes a few from 0.6xx) @@ -1132,7 +1139,8 @@ function update_706_to_800($type='') { if ($just_check) return update_needed('Remove obsolete prefs'); unset($pref[$p]); - $do_save = TRUE; + e107::getConfig()->remove($p); + $do_save = true; $log->addDebug('Removed obsolete pref: '.$p); // $accum[] = $p; } @@ -1657,6 +1665,7 @@ function update_706_to_800($type='') { // save_prefs(); e107::getConfig()->setPref($pref)->save(false,true,true); + $log->logMessage(LAN_UPDATE_50); // $log->logMessage(implode(', ', $accum), E_MESSAGE_NODISPLAY); diff --git a/e107_core/xml/default_install.xml b/e107_core/xml/default_install.xml index 445aa42f2..1599796b8 100644 --- a/e107_core/xml/default_install.xml +++ b/e107_core/xml/default_install.xml @@ -211,7 +211,6 @@ 0 0 6 - 0 admin diff --git a/e107_handlers/validator_class.php b/e107_handlers/validator_class.php index 45cda51e3..39b3083df 100644 --- a/e107_handlers/validator_class.php +++ b/e107_handlers/validator_class.php @@ -1281,7 +1281,8 @@ class validatorClass } break; case 3 : // Check email address against remote server - if (vartrue($pref['signup_remote_emailcheck'])) + + /* if (vartrue($pref['signup_remote_emailcheck'])) { require_once(e_HANDLER."mail_validation_class.php"); list($adminuser,$adminhost) = split ("@", SITEADMINEMAIL); @@ -1296,6 +1297,7 @@ class validatorClass $errMsg = ERR_INVALID_EMAIL; } } + */ break; default : echo 'Invalid vetMethod: '.$options['vetMethod'].'
'; // Really a debug aid - should never get here diff --git a/e107_languages/English/admin/lan_e107_update.php b/e107_languages/English/admin/lan_e107_update.php index a76245fd5..4f5e21bc0 100644 --- a/e107_languages/English/admin/lan_e107_update.php +++ b/e107_languages/English/admin/lan_e107_update.php @@ -6,15 +6,14 @@ * */ + + + + define("LAN_UPDATE_2", "Action"); define("LAN_UPDATE_3", "Not Needed"); - -// define("LAN_UPDATE_5", "Update available"); -define("LAN_UPDATE_7", "Executed"); -define("LAN_UPDATE_8", "Update from"); -define("LAN_UPDATE_9", "to"); -//define("LAN_UPDATE_10", "Available Updates"); -//define("LAN_UPDATE_11", ".617 to .7 Update Continued"); +define("LAN_UPDATE_4", "Update from [x] to [y]"); +define("LAN_UPDATE_7", "Executed [x]"); define("LAN_UPDATE_12", "One of your tables contains duplicate entries."); define("LAN_UPDATE_13", "Add additional/missing core settings"); define("LAN_UPDATE_14", "Start version: "); @@ -59,4 +58,11 @@ define("LAN_UPDATE_57", "Before continuing, please manually delete the following define("LAN_UPDATE_CAPTION_PLUGIN", "Plugin Updates"); // Unused define("LAN_UPDATE_CAPTION_CORE", "Core Updates"); // Unused +// define("LAN_UPDATE_5", "Update available"); +// define("LAN_UPDATE_8", "Update from"); +// define("LAN_UPDATE_9", "to"); +//define("LAN_UPDATE_10", "Available Updates"); +//define("LAN_UPDATE_11", ".617 to .7 Update Continued"); + + ?> \ No newline at end of file