Fixed some bug, Added encryption method

sendya · Jul 25, 2017 · b1d4804 · b1d4804
1 parent 998e8b4
commit b1d4804
Show file tree

Hide file tree

Showing 107 changed files with 242 additions and 5,416 deletions.
diff --git a/Library/Controller/Admin/Cron.php b/Library/Controller/Admin/Cron.php
@@ -26,7 +26,7 @@ public function index()
         $data['user'] = User::getCurrent();
         $data['cronList'] = CronModel::getCronArray();
         Template::setContext($data);
-        Template::setView('admin/cron');
+        Template::setView('Xenon/admin/cron');
     }
 
 }
diff --git a/Library/Controller/Admin/Home.php b/Library/Controller/Admin/Home.php
@@ -29,6 +29,6 @@ public function index()
         $data['userCount'] = Stats::countUser();
         $data['money'] = Stats::countMoney();
         Template::setContext($data);
-        Template::setView('admin/index');
+        Template::setView('Xenon/admin/index');
     }
 }
diff --git a/Library/Controller/Admin/Invite.php b/Library/Controller/Admin/Invite.php
@@ -30,7 +30,7 @@ public function inviteList()
         $data['planList'] = json_decode(Option::get('custom_plan_name'), true);
         array_splice($data['planList'], -1, 1); // 移除 Z(固定流量套餐)
         Template::setContext($data);
-        Template::setView('admin/invite');
+        Template::setView('Xenon/admin/invite');
     }
 
     public function inviteOldList()
@@ -40,7 +40,7 @@ public function inviteOldList()
         $data['planList'] = json_decode(Option::get('custom_plan_name'), true);
         array_splice($data['planList'], -1, 1);
         Template::setContext($data);
-        Template::setView('admin/invite');
+        Template::setView('Xenon/admin/invite');
     }
 
     /**

diff --git a/Library/Controller/Admin/Mailer.php b/Library/Controller/Admin/Mailer.php
@@ -32,7 +32,7 @@ public function index()
         $data['selectMail'] = Option::get('MAIL_AVAILABLE');
         $data['user'] = User::getCurrent();
         Template::setContext($data);
-        Template::setView('admin/mailer');
+        Template::setView('Xenon/admin/mailer');
     }
 
     /**

diff --git a/Library/Controller/Admin/Message.php b/Library/Controller/Admin/Message.php
@@ -27,7 +27,7 @@ public function index()
         $data['user'] = User::getCurrent();
         $data['lists'] = MessageModel::getPushMessage(-1);
         Template::setContext($data);
-        Template::setView('admin/message');
+        Template::setView('Xenon/admin/message');
     }
 
     /**

diff --git a/Library/Controller/Admin/Node.php b/Library/Controller/Admin/Node.php
@@ -28,7 +28,7 @@ public function index()
         $data['nodes'] = NodeModel::getNodeArray();
 
         Template::setContext($data);
-        Template::setView('admin/node');
+        Template::setView('Xenon/admin/node');
     }
 
     /**

diff --git a/Library/Controller/Admin/User.php b/Library/Controller/Admin/User.php
@@ -30,7 +30,7 @@ public function index()
         $data['users'] = UserModel::getUserList();
         $data['planList'] = json_decode(Option::get('custom_plan_name'), true);
         Template::setContext($data);
-        Template::setView('admin/user');
+        Template::setView('Xenon/admin/user');
     }
 
     /**

diff --git a/Library/Controller/Auth.php b/Library/Controller/Auth.php
@@ -74,8 +74,11 @@ public function login()
                 return $result;
             } else {
                 $data['globalMessage'] = MessageModel::getGlobalMessage();
+                if (empty($_GET['invite']) && User::getCount() <= 0) {
+                    header("Location:/invite");
+                }
                 Template::setContext($data);
-                Template::setView('panel/login');
+                Template::setView('Xenon/panel/login');
             }
         }
     }
@@ -451,7 +454,7 @@ public function forgePwd()
                 return $result;
             } else {
                 Template::putContext('user', User::getCurrent());
-                Template::setView('panel/forgePwd');
+                Template::setView('Xenon/panel/forgePwd');
             }
         }
 

diff --git a/Library/Controller/Index.php b/Library/Controller/Index.php
@@ -23,7 +23,7 @@ class Index
      */
     public function index()
     {
-        Template::setView('../Home/index');
+        Template::setView('Home/index');
     }
 
     public function test()

diff --git a/Library/Controller/Invite.php b/Library/Controller/Invite.php
@@ -20,7 +20,7 @@ class Invite
     public function index()
     {
         $inviteList = InviteModel::getInviteArray(-1);
-        Template::setView('panel/home_invite');
+        Template::setView('Xenon/panel/home_invite');
         Template::putContext('inviteList', $inviteList);
     }
 

diff --git a/Library/Controller/Member.php b/Library/Controller/Member.php
@@ -66,7 +66,7 @@ public function index()
         $data['allNode'] = Stats::countNode();
 
         Template::setContext($data);
-        Template::setView('panel/member');
+        Template::setView('Xenon/panel/member');
 
     }
 
@@ -331,7 +331,7 @@ public function buyTransfer()
     public function actCard()
     {
         Template::putContext('user', User::getUserByUserId(User::getCurrent()->uid));
-        Template::setView('panel/actCard');
+        Template::setView('Xenon/panel/actCard');
     }
 
     /**

diff --git a/Library/Controller/Node.php b/Library/Controller/Node.php
@@ -25,7 +25,7 @@ public function Index()
         $data['nodeVip'] = MNode::getNodeArray(1);
 
         Template::setContext($data);
-        Template::setView("panel/node");
+        Template::setView("Xenon/panel/node");
     }
 
     /**

diff --git a/Library/Controller/Order.php b/Library/Controller/Order.php
@@ -26,13 +26,13 @@ class Order
     public function index()
     {
         Template::putContext('user', User::getCurrent());
-        Template::setView('panel/order');
+        Template::setView('Xenon/panel/order');
     }
 
     public function lists()
     {
         Template::putContext('user', User::getCurrent());
-        Template::setView('panel/order_lists');
+        Template::setView('Xenon/panel/order_lists');
     }
 
     /**
@@ -88,7 +88,7 @@ public function create()
         Template::putContext('plan_name', $data['custom_plan_name'][$plan]);
         Template::putContext('money', $money);
         Template::putContext('user', $user);
-        Template::setView('panel/order_create');
+        Template::setView('Xenon/panel/order_create');
 
     }
 

diff --git a/Library/Controller/Support.php b/Library/Controller/Support.php
@@ -28,12 +28,12 @@ public function index()
     public function ticket()
     {
         Template::putContext('user', User::getCurrent());
-        Template::setView('panel/ticket');
+        Template::setView('Xenon/panel/ticket');
     }
 
     public function tos()
     {
-        Template::setView('panel/Tos');
+        Template::setView('Xenon/panel/Tos');
     }
 
     public function help()

diff --git a/Library/Controller/Ticket.php b/Library/Controller/Ticket.php
@@ -14,6 +14,6 @@ class Ticket
     public function index()
     {
         Template::putContext('user', User::getCurrent());
-        Template::setView('panel/ticket');
+        Template::setView('Xenon/panel/ticket');
     }
 }
diff --git a/Library/Controller/User.php b/Library/Controller/User.php
@@ -35,7 +35,7 @@ public function info()
         Template::putContext('enable_status', $user->enable == 1 ? '启用' : '停用');
         Template::putContext('is_verification', $flag);
         Template::putContext('user', $user);
-        Template::setView("panel/info");
+        Template::setView("Xenon/panel/info");
     }
 
     /**
@@ -48,7 +48,7 @@ public function invite()
         $data['inviteList'] = Invite::getInvitesByUid($data['user']->uid, "0");
 
         Template::setContext($data);
-        Template::setView("panel/invite");
+        Template::setView("Xenon/panel/invite");
     }
 
     /**
@@ -58,7 +58,7 @@ public function invite()
     public function renew()
     {
         Template::putContext('user', MUser::getUserByUserId(MUser::getCurrent()->uid));
-        Template::setView("panel/renew");
+        Template::setView("Xenon/panel/renew");
     }
 
     /**
@@ -95,7 +95,7 @@ public function password()
             return $result;
         } else {
             Template::putContext('user', $user);
-            Template::setView("panel/change_password");
+            Template::setView("Xenon/panel/change_password");
         }
     }
 
@@ -116,7 +116,7 @@ public function nickname()
             return array('error' => 0, 'message' => '修改昵称成功，刷新页面或重新登录生效。');
         } else {
             Template::putContext('user', $user);
-            Template::setView("panel/change_nickname");
+            Template::setView("Xenon/panel/change_nickname");
         }
     }
 
@@ -142,7 +142,7 @@ public function method()
             $nodeList = Node::getSupportCustomMethodArray();
             Template::putContext('user', $user);
             Template::putContext('nodeList', $nodeList);
-            Template::setView("panel/change_method");
+            Template::setView("Xenon/panel/change_method");
         }
     }
 

diff --git a/Library/Core/Template.php b/Library/Core/Template.php
@@ -27,8 +27,8 @@ public static function load($templateName, $context = array())
         if ($context) {
             self::setContext($context);
         }
-        if (stripos($templateName, "Misc") === false && stripos($templateName, THEME) === false) {
-            $templateName = THEME . '/' . $templateName;
+        if (stripos($templateName, "Misc") === false) {
+            $templateName = '/' . $templateName;
         }
 
         $templateFileOrigin = self::getPath($templateName);

diff --git a/Library/Helper/Cron/ClearLogs.php b/Library/Helper/Cron/ClearLogs.php
@@ -6,7 +6,7 @@
  */
 namespace Helper\Cron;
 
-use Contactable\ICron;
+use Interfaces\ICron;
 use Core\Database;
 
 /**

diff --git a/Library/Helper/Cron/ClearTransfer.php b/Library/Helper/Cron/ClearTransfer.php
@@ -7,7 +7,7 @@
 
 namespace Helper\Cron;
 
-use Contactable\ICron;
+use Interfaces\ICron;
 
 use Core\Database as DB;
 

diff --git a/Library/Helper/Cron/Mail.php b/Library/Helper/Cron/Mail.php
@@ -8,7 +8,7 @@
 namespace Helper\Cron;
 
 
-use Contactable\ICron;
+use Interfaces\ICron;
 use Helper\Logger;
 use Helper\Mailer;
 use Helper\Option;

diff --git a/Library/Helper/Cron/StopExpireUser.php b/Library/Helper/Cron/StopExpireUser.php
@@ -7,7 +7,7 @@
 
 namespace Helper\Cron;
 
-use Contactable\ICron;
+use Interfaces\ICron;
 
 use Helper\Logger;
 use Helper\Mailer;

diff --git a/Library/Helper/Mailer/AliyunDirectMail.php b/Library/Helper/Mailer/AliyunDirectMail.php
@@ -8,7 +8,7 @@
 
 namespace Helper\Mailer;
 
-use Contactable\IMailer;
+use Interfaces\IMailer;
 use Helper\Option;
 use Helper\Utils;
 use Model\Mail;

diff --git a/Library/Helper/Mailer/CoreSend.php b/Library/Helper/Mailer/CoreSend.php
@@ -8,7 +8,7 @@
 
 namespace Helper\Mailer;
 
-use Contactable\IMailer;
+use Interfaces\IMailer;
 use Helper\Option;
 use Helper\Utils;
 use Model\Mail;

diff --git a/Library/Helper/Mailer/MailGun.php b/Library/Helper/Mailer/MailGun.php
@@ -9,7 +9,7 @@
 namespace Helper\Mailer;
 
 
-use Contactable\IMailer;
+use Interfaces\IMailer;
 use Helper\Option;
 use Helper\Utils;
 use Model\Mail;

diff --git a/Library/Helper/Mailer/Smtp.php b/Library/Helper/Mailer/Smtp.php
@@ -8,7 +8,7 @@
 namespace Helper\Mailer;
 
 
-use Contactable\IMailer;
+use Interfaces\IMailer;
 use Core\Error;
 use Helper\Option;
 use Helper\Utils;

diff --git a/Library/Contactable/ICron.php → Library/Interfaces/ICron.php b/Library/Contactable/ICron.php → Library/Interfaces/ICron.php
@@ -4,7 +4,7 @@
  * Add: 2016/3/27 9:39
  * Author: Sendya <[email protected]>
  */
-namespace Contactable;
+namespace Interfaces;
 
 
 interface ICron

diff --git a/Library/Contactable/IMailer.php → Library/Interfaces/IMailer.php b/Library/Contactable/IMailer.php → Library/Interfaces/IMailer.php
@@ -5,7 +5,7 @@
  * Author: Sendya <[email protected]>
  * Time: 2016/3/26 16:18
  */
-namespace Contactable;
+namespace Interfaces;
 
 use Model\Mail;
 

diff --git a/Library/Contactable/IPay.php → Library/Interfaces/IPay.php b/Library/Contactable/IPay.php → Library/Interfaces/IPay.php
@@ -5,7 +5,7 @@
  * Author: Sendya <[email protected]>
  */
 
-namespace Contactable;
+namespace Interfaces;
 
 /**
  * Interface IPay