Fix for Two Factor Config option

Geeklog-Core · Dec 19, 2017 · dde7fdb · dde7fdb
1 parent d1bf10f
commit dde7fdb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/public_html/admin/configuration_validation.php b/public_html/admin/configuration_validation.php
@@ -360,6 +360,7 @@
 $_CONF_VALIDATE['Core']['login_speedlimit'] = array('rule' => 'numeric');
 $_CONF_VALIDATE['Core']['invalidloginattempts'] = array('rule' => 'numeric');
 $_CONF_VALIDATE['Core']['invalidloginmaxtime'] = array('rule' => 'numeric');
+$_CONF_VALIDATE['Core']['enable_twofactorauth'] = array('rule' => 'boolean');
 
 /* Subgroup User and Submissions, Tab Login Settings, Fieldset Password */
 $_CONF_VALIDATE['Core']['pass_alg'] = array(

diff --git a/sql/updates/mysql_2.1.3_to_2.2.0.php b/sql/updates/mysql_2.1.3_to_2.2.0.php
@@ -90,7 +90,7 @@ function update_ConfValuesFor220()
     $c->add('langurl_article',array('', 'article.php', 'story'),'@hidden',7,31,1,1830,TRUE, $me, 31); 
 
     // Add a config option to decide whether to globally allow two factor auth
-    $c->add('enable_twofactorauth',0,'select',4,18,NULL,1730,TRUE, $me, 18);
+    $c->add('enable_twofactorauth',0,'select',4,18,0,1730,TRUE, $me, 18);
 
     return true;
 }

diff --git a/sql/updates/pgsql_2.1.3_to_2.2.0.php b/sql/updates/pgsql_2.1.3_to_2.2.0.php
@@ -90,7 +90,7 @@ function update_ConfValuesFor220()
     $c->add('langurl_article',array('', 'article.php', 'story'),'@hidden',7,31,1,1830,TRUE, $me, 31);     
 
     // Add a config option to decide whether to globally allow two factor auth
-    $c->add('enable_twofactorauth',0,'select',4,18,NULL,1730,TRUE, $me, 18);
+    $c->add('enable_twofactorauth',0,'select',4,18,0,1730,TRUE, $me, 18);
 
     return true;
 }