Fix : invite bug, register bug

sendya · Jun 4, 2016 · e8eba06 · e8eba06
1 parent 8104ad7
commit e8eba06
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/Data/version.lock b/Data/version.lock
@@ -1 +1 @@
-v1.18
+v1.19.3
diff --git a/Library/Controller/Auth.php b/Library/Controller/Auth.php
@@ -173,7 +173,7 @@ public function register()
                                 'useTraffic' => Utils::flowAutoShow($user->flow_up + $user->flow_down),
                                 'transfer' => Utils::flowAutoShow($user->transfer),
                                 'expireTime' => date('Y-m-d H:i:s', $user->expireTime),
-                                'REGISTER_URL' => base64_encode($user->uid . "\t" . $forgePwdCode['verification'] . "\t" . $forgePwdCode['time'])
+                                'REGISTER_URL' => base64_encode($user->email . "\t" . $forgePwdCode['verification'] . "\t" . $forgePwdCode['time'])
                             ];
                             $mail->content = Utils::placeholderReplace($mail->content, $params);
                             $mailer->send($mail);
@@ -235,7 +235,7 @@ public function resend()
                 'useTraffic' => Utils::flowAutoShow($user->flow_up + $user->flow_down),
                 'transfer' => Utils::flowAutoShow($user->transfer),
                 'expireTime' => date('Y-m-d H:i:s', $user->expireTime),
-                'REGISTER_URL' => base64_encode($user->uid . "\t" . $forgePwdCode['verification'] . "\t" . $forgePwdCode['time'])
+                'REGISTER_URL' => base64_encode($user->email . "\t" . $forgePwdCode['verification'] . "\t" . $forgePwdCode['time'])
             ];
             $mail->content = Utils::placeholderReplace($mail->content, $params);
             $mailer->send($mail);
@@ -255,7 +255,7 @@ public function verification()
             $list = explode("\t", base64_decode($_GET['verification']));
 
             if (count($list) > 2) {
-                $user = User::getUserByUserId($list[0]);
+                $user = User::getUserByEmail($list[0]);
                 $verification = trim($list[1]);
                 $json = json_decode($user->forgePwdCode, true);
                 $userVerificationCode = $json['verification'];

diff --git a/Migrations/20160604144051_update_to1193.php b/Migrations/20160604144051_update_to1193.php
@@ -0,0 +1,17 @@
+<?php
+
+use Phinx\Db\Adapter\MysqlAdapter;
+use Phinx\Migration\AbstractMigration;
+
+class UpdateTo1193 extends AbstractMigration
+{
+    public function up()
+    {
+        $table = $this->table('node');
+        $column = $table->hasColumn('ratio');
+        if(!$column) {
+            $table->addColumn('ratio', 'integer', ['limit' => MysqlAdapter::INT_TINY, 'default' => 1, 'comment' => '节点流量倍率']);
+            $table->save();
+        }
+    }
+}
diff --git a/Template/Default/admin/message.htm b/Template/Default/admin/message.htm
@@ -176,6 +176,7 @@ <h4 class="modal-title"></h4>
                                 </div>
                             </div>
                         </div>
+                        <p>注意，请使用 <code>&lt;br /&gt;</code> 换行，不要直接敲回车</p>
                     </div>
                 </div>
                 <div class="modal-footer">

diff --git a/Template/Default/panel/info.htm b/Template/Default/panel/info.htm
@@ -40,9 +40,6 @@ <h1 class="title">用户中心</h1>
                     <!--
                     <p><button class="btn btn-danger btn-sm" id="deleteMe">删除我的账户</button></p>
                     -->
-                    <div class="form-block">
-                        <input type="checkbox" checked class="iswitch">
-                    </div>
                 </div>
             </div>
         </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -176,6 +176,7 @@ <h4 class="modal-title"></h4> @@
                                     </div>
                                 </div>
                             </div>
+                            <p>注意，请使用 <code>&lt;br /&gt;</code> 换行，不要直接敲回车</p>
                         </div>
                     </div>
                     <div class="modal-footer">
@@ Expand Down @@