Skip to content

Commit 98bfb94

Browse files
author
sisishiliu
committed
fix bugs before beta
1 parent f9f86ca commit 98bfb94

7 files changed

Lines changed: 55 additions & 19 deletions

File tree

‎src/config.sample.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
*/
88

99
return array (
10-
'apiPageIndex' => './index.php?action=page.index',
11-
'apiPageLogin' => './index.php?action=page.login',
12-
'apiPageLogout' => './index.php?action=page.logout',
13-
'apiPageJump' => "./index.php?action=page.jump",
10+
'apiPageIndex' => '/index.php?action=page.index',
11+
'apiPageLogin' => '/index.php?action=page.login',
12+
'apiPageLogout' => '/index.php?action=page.logout',
13+
'apiPageJump' => "/index.php?action=page.jump",
1414
'loginPluginId' => '105',
15-
'apiPageWidget' => './index.php?action=page.widget',
16-
'apiPageSiteInit' => "./index.php?action=installDB",
17-
'apiSiteLogin' => './index.php?action=api.site.login&body_format=pb',
15+
'apiPageWidget' => '/index.php?action=page.widget',
16+
'apiPageSiteInit' => "/index.php?action=installDB",
17+
'apiSiteLogin' => '/index.php?action=api.site.login&body_format=pb',
1818
'session_verify_100' => 'http://open.akaxin.com:5208/index.php?action=api.session.verify&body_format=pb',
1919
'session_verify_105' => 'http://127.0.0.1:5207/index.php?action=api.session.verify&body_format=pb',
2020
'mail' =>

‎src/controller/Duckchat/Duckchat_MiniProgramController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function __construct(Wpf_Ctx $context)
8282
if (!$this->checkDBIsExist()) {
8383
$this->action = $_GET['action'];
8484
$this->requestTransportData = new \Zaly\Proto\Core\TransportData();
85-
$this->setRpcError($this->errorSiteInit, ZalyConfig::getConfig("apiPageSiteInit"));
85+
$this->setRpcError($this->errorSiteInit, ZalyConfig::getApiPageSiteInit());
8686
$this->rpcReturn($this->action, null);
8787
return;
8888
}

‎src/controller/HttpBaseController.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function __construct(Wpf_Ctx $context)
3737
{
3838

3939
if(!$this->checkDBIsExist()) {
40-
$initUrl = ZalyConfig::getConfig("apiPageSiteInit");
40+
$initUrl = ZalyConfig::getApiPageSiteInit();
4141
header("Location:" . $initUrl);
4242
exit();
4343
}
@@ -62,7 +62,7 @@ public function doIndex()
6262

6363
if ($preSessionId) {
6464
$this->handlePreSessionId();
65-
$apiPageIndex = ZalyConfig::getConfig("apiPageIndex");
65+
$apiPageIndex = ZalyConfig::getApiPageIndexUrl();
6666
if($x) {
6767
if (strpos($apiPageIndex, "?")) {
6868
header("Location:" . $apiPageIndex."&x=".$x);
@@ -176,7 +176,7 @@ public function setLogout()
176176
{
177177
$x = isset($_GET['x']) ? $_GET['x'] : "";
178178
setcookie ("zaly_site_user", "", time()-3600, "/", "", false, true);
179-
$apiPageLogin = ZalyConfig::getConfig("apiPageLogin");
179+
$apiPageLogin = ZalyConfig::getApiPageLoginUrl();
180180
if($x) {
181181
if (strpos($apiPageLogin, "?")) {
182182
header("Location:" . $apiPageLogin."&x=".$x);
@@ -227,6 +227,7 @@ public function setCookieBase64($userId)
227227
setcookie("zaly_site_user", $cookieBase64, time() + $this->sessionIdTimeOut, "/", "", false, true);
228228
}
229229

230+
230231
/**
231232
* 查库操作
232233
*/

‎src/controller/InstallDBController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function doIndex()
3838
$sqliteName = dirname(__FILE__) . '/../' . $sqliteName;
3939
$isInstalled = file_exists($sqliteName);
4040
if ($isInstalled) {
41-
$apiPageIndex = ZalyConfig::getConfig("apiPageIndex");
41+
$apiPageIndex = ZalyConfig::getApiPageIndexUrl();
4242
header("Location:" . $apiPageIndex);
4343
exit();
4444
}

‎src/controller/Page/Page_LogoutController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Page_LogoutController extends HttpBaseController
1212
public function index()
1313
{
1414
setcookie ("zaly_site_user", "", time()-3600, "/", "", false, true);
15-
$apiPageIndex = ZalyConfig::getConfig("apiPageIndex");
15+
$apiPageIndex = ZalyConfig::getApiPageIndexUrl();
1616
header("Location:".$apiPageIndex);
1717
exit();
1818
}

‎src/controller/UpdateVersionController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function index()
1717
$ownerId = isset($ownerInfo['owner']) ? $ownerInfo['owner'] : "";
1818

1919
if($ownerId != $this->userId) {
20-
$indexUrl = ZalyConfig::getConfig("apiPageIndex");
20+
$indexUrl = ZalyConfig::getApiPageIndexUrl();
2121
header("Location:".$indexUrl);
2222
exit();
2323
}
@@ -41,11 +41,11 @@ public function index()
4141
require (dirname(__DIR__)."/model/DB/".$className.".php");
4242
$className::getInstance()->upgradeDB();
4343
}
44-
$indexUrl = ZalyConfig::getConfig("apiPageIndex");
44+
$indexUrl = ZalyConfig::getApiPageIndexUrl();
4545
header("Location:".$indexUrl);
4646
exit();
4747
} else {
48-
$initUrl = ZalyConfig::getConfig("apiPageSiteInit");
48+
$initUrl = ZalyConfig::getApiPageSiteInit();
4949
header("Location:".$initUrl);
5050
exit();
5151
}

‎src/lib/Util/ZalyConfig.php‎

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ class ZalyConfig
1010
{
1111
public static $config;
1212
private static $verifySessionKey="session_verify_";
13-
1413
public static function getConfigFile()
1514
{
1615
$fileName = dirname(__FILE__) ."/../../config.php";
@@ -37,6 +36,12 @@ public static function getSessionVerifyUrl($pluginId)
3736
return self::$config[$key];
3837
}
3938

39+
public static function getApiPageIndexUrl()
40+
{
41+
$domain = self::getDomain();
42+
return $domain.self::$config['apiPageIndex'];
43+
}
44+
4045
public static function getApiPageJumpUrl()
4146
{
4247
$domain = self::getDomain();
@@ -53,9 +58,39 @@ public static function getDomain()
5358
{
5459
self::getConfigFile();
5560

56-
$scheme = isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME']."://" : "http://";
57-
$domain = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : "" ;
61+
$scheme = isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME']."://" : "";
62+
$domain = isset($_SERVER['HTTP_HOST']) ?$_SERVER['HTTP_HOST'] : "" ;
5863

5964
return $scheme.$domain;
6065
}
66+
67+
public static function getApiPageMsgUrl()
68+
{
69+
$domain = self::getDomain();
70+
return $domain.self::$config['apiPageMsg'];
71+
}
72+
73+
public static function getApiSiteLoginUrl()
74+
{
75+
$domain = self::getDomain();
76+
return $domain.self::$config['apiSiteLogin'];
77+
}
78+
79+
public static function getApiPageLoginUrl()
80+
{
81+
$domain = self::getDomain();
82+
return $domain.self::$config['apiPageLogin'];
83+
}
84+
85+
public static function getApiPageLogoutUrl()
86+
{
87+
$domain = self::getDomain();
88+
return $domain.self::$config['apiPageLogout'];
89+
}
90+
91+
public static function getApiPageSiteInit()
92+
{
93+
$domain = self::getDomain();
94+
return $domain.self::$config['apiPageSiteInit'];
95+
}
6196
}

0 commit comments

Comments
 (0)