ticket #697: merge two dupe config bits in config.php.sample

[quix0rs-gnu-social.git] / index.php

diff --git a/index.php b/index.php
index 5aa40440aafbf2f880fc10309d886f366917ea13..36ba3a0d2163915fa700ef0373b5ee65fa317c63 100644 (file)
--- a/index.php
+++ b/index.php
@@ -165,6 +165,8 @@ function setupRW()
 
 function checkMirror($action_obj, $args)
 {
+    global $config;
+
     if (common_config('db', 'mirror') && $action_obj->isReadOnly($args)) {
         if (is_array(common_config('db', 'mirror'))) {
             // "load balancing", ha ha
@@ -183,7 +185,7 @@ function checkMirror($action_obj, $args)
 
 function isLoginAction($action)
 {
-    static $loginActions =  array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds');
+    static $loginActions =  array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds', 'otp');
 
     $login = null;
 
@@ -283,8 +285,9 @@ function main()
     if (!$user && common_config('site', 'private')
         && !isLoginAction($action)
         && !preg_match('/rss$/', $action)
-        && !preg_match('/^Api/', $action)
-    ) {
+        && $action != 'robotstxt'
+        && !preg_match('/^Api/', $action)) {
+
         // set returnto
         $rargs =& common_copy_args($args);
         unset($rargs['action']);