Skip to content

Commit 2b017e8

Browse files
HackmastrHackmastr
committed
(chore) Upgrade Smarty to v5
For custom themes, please read: https://smarty-php.github.io/smarty/stable/upgrading/#upgrading-from-v4-to-v5
1 parent 3da2c17 commit 2b017e8

11 files changed

+60
-49
lines changed

‎web/cache/.gitkeep

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎web/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"require": {
2222
"lcobucci/jwt": "5.3.0",
2323
"maxmind-db/reader": "~1.0",
24-
"smarty/smarty": "~v4.5.3",
24+
"smarty/smarty": "~v5.3.0",
2525
"xpaw/php-source-query-class": "dev-master",
2626
"adodb/adodb-php": "5.22.7",
2727
"symfony/mailer": "^6.0",

‎web/composer.lock

Lines changed: 17 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎web/init.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
Page: <http://www.sourcebans.net/> - <http://www.gameconnect.net/>
1818
*************************************************************************/
1919
//Hotfix for dash_intro_text
20+
use Smarty\Smarty;
21+
2022
if (isset($_POST['dash_intro_text'])) {
2123
$dash_intro_text = $_POST['dash_intro_text'];
2224
}
@@ -194,9 +196,9 @@ function sbError($errno, $errstr, $errfile, $errline)
194196
require_once(INCLUDES_PATH.'/SmartyCustomFunctions.php');
195197

196198
$theme = new Smarty();
197-
$theme->error_reporting = E_ALL;
198-
$theme->use_sub_dirs = false;
199-
$theme->compile_id = $theme_name;
199+
$theme->setErrorReporting(E_ALL);
200+
$theme->setUseSubDirs(false);
201+
$theme->setCompileId($theme_name);
200202
$theme->setCaching(Smarty::CACHING_OFF);
201203
$theme->setTemplateDir(SB_THEMES . $theme_name);
202204
$theme->setCacheDir(SB_CACHE);
@@ -207,5 +209,5 @@ function sbError($errno, $errstr, $errfile, $errline)
207209
$theme->registerPlugin('modifier', 'smarty_htmlspecialchars', 'smarty_htmlspecialchars');
208210

209211
if ((isset($_GET['debug']) && $_GET['debug'] == 1) || DEBUG_MODE) {
210-
$theme->force_compile = true;
212+
$theme->setForceCompile(true);
211213
}

‎web/pages/admin.blockit.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ function BlockPlayer($check, int $sid, $num, $type, int $length)
8080
return $objResponse;
8181
}
8282

83+
// $GLOBALS['PDO']->query("SELECT ip, port FROM `:prefix_servers` WHERE sid = :sid");
84+
// $GLOBALS['PDO']->bind(':sid', $sid);
85+
// $sdata = $GLOBALS['PDO']->single();
86+
8387
// show hostname instead of the ip, but leave the ip in the title
8488
$hostsearch = preg_match_all('/hostname:[ ]*(.+)/', $ret, $hostname, PREG_PATTERN_ORDER);
8589
$hostname = trunc(htmlspecialchars($hostname[1][0]), 25);
@@ -124,8 +128,8 @@ function BlockPlayer($check, int $sid, $num, $type, int $length)
124128
$theme->assign('type', $_GET['type']);
125129
$theme->assign('length', $_GET['length']);
126130

127-
$theme->left_delimiter = "-{";
128-
$theme->right_delimiter = "}-";
131+
$theme->setLeftDelimiter('-{');
132+
$theme->setRightDelimiter('}-');
129133
$theme->display('page_blockit.tpl');
130-
$theme->left_delimiter = "{";
131-
$theme->right_delimiter = "}";
134+
$theme->setLeftDelimiter('{');
135+
$theme->setRightDelimiter('}');

‎web/pages/admin.edit.ban.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,11 +213,11 @@
213213
$theme->assign('ban_demo', (!empty($res['dname']) ? "Uploaded: <b>" . $res['dname'] . "</b>" : ""));
214214
$theme->assign('customreason', (Config::getBool('bans.customreasons')) ? unserialize(Config::get('bans.customreasons')) : false);
215215

216-
$theme->left_delimiter = "-{";
217-
$theme->right_delimiter = "}-";
216+
$theme->setLeftDelimiter('-{');
217+
$theme->setRightDelimiter('}-');
218218
$theme->display('page_admin_edit_ban.tpl');
219-
$theme->left_delimiter = "{";
220-
$theme->right_delimiter = "}";
219+
$theme->setLeftDelimiter('{');
220+
$theme->setRightDelimiter('}');
221221
?>
222222
<script type="text/javascript">window.addEvent('domready', function(){
223223
<?=$errorScript?>

‎web/pages/admin.edit.comms.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,11 @@
153153
$theme->assign('ban_authid', trim($res['authid']));
154154
$theme->assign('customreason', (Config::getBool('bans.customreasons')) ? unserialize(Config::get('bans.customreasons')) : false);
155155

156-
$theme->left_delimiter = "-{";
157-
$theme->right_delimiter = "}-";
156+
$theme->setLeftDelimiter('-{');
157+
$theme->setRightDelimiter('}-');
158158
$theme->display('page_admin_edit_comms.tpl');
159-
$theme->left_delimiter = "{";
160-
$theme->right_delimiter = "}";
159+
$theme->setLeftDelimiter('{');
160+
$theme->setRightDelimiter('}');
161161
?>
162162
<script type="text/javascript">window.addEvent('domready', function(){
163163
<?=$errorScript?>

‎web/pages/admin.kickit.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ function KickPlayer($check, int $sid, $num, $type)
7979
return $objResponse;
8080
}
8181

82+
// $GLOBALS['PDO']->query("SELECT ip, port FROM `:prefix_servers` WHERE sid = :sid");
83+
// $GLOBALS['PDO']->bind(':sid', $sid);
84+
// $sdata = $GLOBALS['PDO']->single();
85+
8286
// show hostname instead of the ip, but leave the ip in the title
8387
$hostsearch = preg_match_all('/hostname:[ ]*(.+)/', $ret, $hostname, PREG_PATTERN_ORDER);
8488
$hostname = trunc(htmlspecialchars($hostname[1][0]), 25);
@@ -142,8 +146,8 @@ function KickPlayer($check, int $sid, $num, $type)
142146
$theme->assign('check', $_GET["check"]); // steamid or ip address
143147
$theme->assign('type', $_GET['type']);
144148

145-
$theme->left_delimiter = "-{";
146-
$theme->right_delimiter = "}-";
149+
$theme->setLeftDelimiter('-{');
150+
$theme->setRightDelimiter('}-');
147151
$theme->display('page_kickit.tpl');
148-
$theme->left_delimiter = "{";
149-
$theme->right_delimiter = "}";
152+
$theme->setLeftDelimiter('{');
153+
$theme->setRightDelimiter('}');

‎web/pages/admin.rcon.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@
4949

5050
$theme->assign('id', $sid);
5151
$theme->assign('permission_rcon', ($access && $userbank->HasAccess(SM_RCON . SM_ROOT)));
52-
$theme->left_delimiter = '-{';
53-
$theme->right_delimiter = '}-';
52+
$theme->setLeftDelimiter('-{');
53+
$theme->setRightDelimiter('}-');
5454

5555
$theme->display('page_admin_servers_rcon.tpl');
5656

57-
$theme->left_delimiter = '{';
58-
$theme->right_delimiter = '}';
57+
$theme->setLeftDelimiter('{');
58+
$theme->setRightDelimiter('}');

‎web/pages/page.login.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,12 @@
7878
HTML;
7979
break;
8080
}
81-
82-
8381
}
8482

8583
$theme->assign('steamlogin_show', Config::getBool('config.enablesteamlogin'));
8684
$theme->assign('redir', "DoLogin('');");
87-
$theme->left_delimiter = "-{";
88-
$theme->right_delimiter = "}-";
85+
$theme->setLeftDelimiter("-{");
86+
$theme->setRightDelimiter("}-");
8987
$theme->display('page_login.tpl');
90-
$theme->left_delimiter = "{";
91-
$theme->right_delimiter = "}";
88+
$theme->setLeftDelimiter("{");
89+
$theme->setRightDelimiter("}");

‎web/pages/page.youraccount.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
$theme->assign('server_permissions', SmFlagsToSb($userbank->GetProperty("srv_flags")));
4646
$theme->assign('min_pass_len', MIN_PASS_LENGTH);
4747

48-
$theme->left_delimiter = "-{";
49-
$theme->right_delimiter = "}-";
48+
$theme->setLeftDelimiter('-{');
49+
$theme->setRightDelimiter('}-');
5050
$theme->display('page_youraccount.tpl');
51-
$theme->left_delimiter = "{";
52-
$theme->right_delimiter = "}";
51+
$theme->setLeftDelimiter('{');
52+
$theme->setRightDelimiter('}');

0 commit comments

Comments
 (0)