From c489399fc934f43a4c347935e4e2b206d06778aa Mon Sep 17 00:00:00 2001
From: qkqpttgf <45693631+qkqpttgf@users.noreply.github.com>
Date: Sat, 18 Jan 2020 00:46:26 +0800
Subject: [PATCH] Add files via upload

---
 function/heroku.php | 1 +
 function/normal.php | 2 +-
 index.php           | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/function/heroku.php b/function/heroku.php
index 25d135d..d170e7a 100644
--- a/function/heroku.php
+++ b/function/heroku.php
@@ -2,6 +2,7 @@
 
 function getpath()
 {
+    $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_X_FORWARDED_FOR'];
     $_SERVER['base_path'] = path_format(substr($_SERVER['SCRIPT_NAME'], 0, -10) . '/');
     $p = strpos($_SERVER['REQUEST_URI'],'?');
     if ($p>0) $path = substr($_SERVER['REQUEST_URI'], 0, $p);
diff --git a/function/normal.php b/function/normal.php
index c22a35a..5a1f0c1 100644
--- a/function/normal.php
+++ b/function/normal.php
@@ -158,13 +158,13 @@ run Writeable.sh.';
         }
         $html .= '
     <form action="?install1" method="post" onsubmit="return adminnotnull(this);">
-        <label>admin:<input name="admin" type="password" placeholder="' . getconstStr('EnvironmentsDescription')['admin'] . '" size="' . strlen(getconstStr('EnvironmentsDescription')['admin']) . '"></label><br>
 language:<br>';
         foreach ($constStr['languages'] as $key1 => $value1) {
             $html .= '
         <label><input type="radio" name="language" value="'.$key1.'" '.($key1==$constStr['language']?'checked':'').' onclick="changelanguage(\''.$key1.'\')">'.$value1.'</label><br>';
         }
         $html .= '<br>
+        <label>admin:<input name="admin" type="password" placeholder="' . getconstStr('EnvironmentsDescription')['admin'] . '" size="' . strlen(getconstStr('EnvironmentsDescription')['admin']) . '"></label><br>
         <input type="submit" value="'.getconstStr('Submit').'">
     </form>
     <script>
diff --git a/index.php b/index.php
index e913b81..5aff93b 100644
--- a/index.php
+++ b/index.php
@@ -3,7 +3,7 @@ include 'vendor/autoload.php';
 include 'conststr.php';
 include 'function/common.php';
 
-echo '<pre>'. json_encode($_SERVER, JSON_PRETTY_PRINT).'</pre>';
+//echo '<pre>'. json_encode($_SERVER, JSON_PRETTY_PRINT).'</pre>';
 if ($_SERVER['USER']==='qcloud') {
     include 'function/scf.php';
 } elseif ($_SERVER['HEROKU_APP_DIR']==='/app') {