baoshuo/S2OJ
baoshuo/S2OJ
1
1
Fork 0
mirror of https://github.com/renbaoshuo/S2OJ.git synced 2024-11-27 15:16:21 +00:00
Code Issues Actions Packages Releases Activity

Compare commits

base: baoshuo:29371d550e53e5fc78de245ab7c8cb0d3ccadfd2
Branches Tags
baoshuo:master
baoshuo:s2oj-gcc
baoshuo:limits-in-extra-config
baoshuo:develop
baoshuo:legacy
baoshuo:v1.0
..
compare: baoshuo:b8b0f4fd38fa1ec4a0ee8b42d20ee83b918b346a
Branches Tags
baoshuo:master
baoshuo:s2oj-gcc
baoshuo:limits-in-extra-config
baoshuo:develop
baoshuo:legacy
baoshuo:v1.0

No commits in common. "29371d550e53e5fc78de245ab7c8cb0d3ccadfd2" and "b8b0f4fd38fa1ec4a0ee8b42d20ee83b918b346a" have entirely different histories.
29371d550e ... b8b0f4fd38

2 changed files with 4 additions and 4 deletions
Show Stats Expand all files Collapse all files

6
web/app/models/HTML.php
View File

@ -54,7 +54,7 @@ class HTML {
break;
case 3:
$port = ((UOJConfig::$data['web']['main']['protocol'] === "http" && UOJConfig::$data['web']['main']['port'] == 80) || (UOJConfig::$data['web']['main']['protocol'] === "https" && UOJConfig::$data['web']['main']['port'] == 443)) ? '' : (':'.UOJConfig::$data['web']['main']['port']);
$url = '/blog/'.blog_name_encode($username);
$url = UOJConfig::$data['web']['main']['protocol'].'://'.UOJConfig::$data['web']['main']['host'].$port.'/blog/'.blog_name_encode($username);
break;
}
$url .= $uri;
@ -70,7 +70,7 @@ class HTML {
break;
case 3:
$port = ((UOJConfig::$data['web']['main']['protocol'] === "http" && UOJConfig::$data['web']['main']['port'] == 80) || (UOJConfig::$data['web']['main']['protocol'] === "https" && UOJConfig::$data['web']['main']['port'] == 443)) ? '' : (':'.UOJConfig::$data['web']['main']['port']);
$url = '/blogs';
$url = UOJConfig::$data['web']['main']['protocol'].'://'.UOJConfig::$data['web']['main']['host'].$port.'/blogs';
break;
}
return HTML::escape(rtrim($url, '/'));
@ -97,7 +97,7 @@ class HTML {
// }
if ($param) {
$url .= $path.'?'.HTML::query_string_encode($param);
} else if ($url != '/') {
} else {
$url .= rtrim($path, '/');
}
return HTML::escape($url);

2
web/install.sh
View File

@ -87,7 +87,7 @@ dockerInitProgress() {
chown -R www-data:www-data /var/uoj_data
#Replace password placeholders
sed -i -e "s/salt0/$_salt0_/g" -e "s/salt1/$_salt1_/g" -e "s/salt2/$_salt2_/g" -e "s/salt3/$_salt3_/g" -e "s/_judger_socket_password_/$_judger_socket_password_/g" /var/www/uoj/app/.config.php
sed -i -e "s/'protocol' => 'http'/'protocol' => '$_uoj_protocol_'/g" /var/www/uoj/app/.config.php
sed -i -e "s/'protocol' => 'http'/'protocol' => '$_uoj_protocol_',/g" /var/www/uoj/app/.config.php
#Start services
service ntp restart
service apache2 restart