\r\nYou can login to your ACP to configure many parts of it.
\r\nNeed help? Join our Telegram group for support.\r\nHave a good day!'); ALTER TABLE `DBPREFIXconfig` @@ -316,25 +71,13 @@ ALTER TABLE `DBPREFIXconfig` ALTER TABLE `DBPREFIXfaq` ADD PRIMARY KEY (`faqid`); -ALTER TABLE `DBPREFIXlanguages` - ADD PRIMARY KEY (`langid`); - ALTER TABLE `DBPREFIXnews` ADD PRIMARY KEY (`newsid`); -ALTER TABLE `DBPREFIXtranslations` - ADD PRIMARY KEY (`id`); - ALTER TABLE `DBPREFIXfaq` MODIFY `faqid` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=4; -ALTER TABLE `DBPREFIXlanguages` - MODIFY `langid` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=4; - ALTER TABLE `DBPREFIXnews` MODIFY `newsid` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=2; - -ALTER TABLE `DBPREFIXtranslations` - MODIFY `id` int(10) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=228; COMMIT; diff --git a/src/installer/dbinstall_mysql_lang.sql b/src/installer/dbinstall_mysql_lang.sql new file mode 100644 index 0000000..1dfbe35 --- /dev/null +++ b/src/installer/dbinstall_mysql_lang.sql @@ -0,0 +1,1595 @@ +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; +SET AUTOCOMMIT = 0; +START TRANSACTION; +SET time_zone = "+00:00"; + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8mb4 */; + + +DROP TABLE IF EXISTS `DBPREFIXlanguages`; +CREATE TABLE `DBPREFIXlanguages` ( + `langid` int(11) NOT NULL, + `englishname` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, + `nativename` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, + `langcode` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'In this format: https://bit.ly/2MCGg6M', + `isdefault` tinyint(1) NOT NULL DEFAULT '0' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `DBPREFIXlanguages` (`langid`, `englishname`, `nativename`, `langcode`, `isdefault`) VALUES +(1, 'English', 'English', 'en', 1), +(2, 'English (US)', 'English (US)', 'en-us', 0), +(3, 'Polish', 'Polski', 'pl', 0), +(4, 'German', 'Deutsch', 'de', 0), +(5, 'Bulgarian', 'български език', 'bg', 0), +(6, 'Spanish', 'Español', 'es', 0), +(7, 'Russian', 'Русский', 'ru', 0), +(8, 'Dutch', 'Nederlands', 'nl', 0), +(9, 'Czech', 'Čeština', 'cs', 0), +(10, 'Hungarian', 'Magyar', 'hu', 0), +(11, 'Belarusian', 'Беларуская', 'be', 0), +(12, 'Bosnian', 'Босански', 'bs', 0), +(13, 'Portuguese', 'Português', 'pt', 0), +(14, 'Greek', 'Ελληνικά', 'el', 0), +(15, 'Danish', 'Dansk', 'da', 0); + +DROP TABLE IF EXISTS `DBPREFIXtranslations`; +CREATE TABLE `DBPREFIXtranslations` ( + `id` int(10) NOT NULL, + `langid` int(10) NOT NULL, + `identifier` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL, + `value` text COLLATE utf8mb4_unicode_ci NOT NULL, + `comment` text COLLATE utf8mb4_unicode_ci +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `DBPREFIXtranslations` (`id`, `langid`, `identifier`, `value`, `comment`) VALUES +(1, 1, 'AUTHORS', 'Wruczek
Oops! We cannot find Composer\'s autoload file.
' . 'In 2.0, the installation procedure is a little different. Go to the ' . - 'releases on GitHub, ' . - 'download the latest version and upload in on your server.
' . + 'wiki ' . + 'and follow the installation tutorial.' . 'Or, if you know what you are doing, runcomposer update in the ' .
'' . realpath(__BASE_DIR) . ' directory'
);
@@ -22,6 +22,10 @@ error_reporting(E_ALL);
set_time_limit(0);
$stepNumber = empty($_GET["step"]) || !file_exists(__DIR__ . "/pages/" . (int)$_GET["step"] . ".php") ? 1 : (int) $_GET["step"];
+
+ob_start();
+require __DIR__ . "/pages/$stepNumber.php";
+$pageContent = ob_get_clean();
?>
@@ -80,7 +84,7 @@ $stepNumber = empty($_GET["step"]) || !file_exists(__DIR__ . "/pages/" . (int)$_
-
+
@@ -131,13 +141,13 @@ function checkRequirements() {
// file / directory writable checks
{
// path => true if file, false if directory
- $paths = [
+ $paths = array(
__CONFIG_FILE => true,
__INSTALLER_LOCK_FILE => true,
__CACHE_DIR => false,
__CACHE_DIR . "/templates" => false,
__CACHE_DIR . "/servericons" => false,
- ];
+ );
foreach ($paths as $path => $isFile) {
$exists = file_exists($path);
@@ -161,7 +171,13 @@ function checkRequirements() {
if(!$exists)
$msg = ($isFile ? "File" : "Directory") . " $value) {
- $confarray .= sprintf(' "%s" => "%s",' . PHP_EOL, addcslashes($key, '"'), addcslashes($value, '"'));
- }
+ // Add all variables to the config
+ foreach ($dbconfig as $key => $value) {
+ $confarray .= sprintf(" '%s' => '%s'," . PHP_EOL, addcslashes($key, '"'), addcslashes($value, '"'));
+ }
- // Remove semicolon and new line from the end
- $confarray = rtrim($confarray, "," . PHP_EOL);
+ // Remove semicolon and new line from the end
+ $confarray = rtrim($confarray, "," . PHP_EOL);
- // Replace all variables with sprintf
- $phpcode = sprintf($phpcode, date("d-m-Y H:i:s"), __TSWEBSITE_VERSION, $confarray);
+ // Replace all variables with sprintf
+ $phpcode = sprintf($phpcode, date("d-m-Y H:i:s"), __TSWEBSITE_VERSION, __TSWEBSITE_COMMIT, $confarray);
- if(file_put_contents(__CONFIG_FILE, $phpcode) === false) {
- $errormessage = "Cannot write to 
';
+ $ttip = $tooltip ? ' data-toggle="tooltip" title="' . Utils::escape($tooltip) . '"' : "";
+ return '';
}
/**
@@ -162,7 +163,7 @@ EOD;
$channel->getId(),
$channel->isSpacer() ? "" : ' tabindex="0"',
$channelIcon,
- htmlspecialchars($channelDisplayName),
+ Utils::escape($channelDisplayName),
$suffixIcons
);
@@ -222,7 +223,7 @@ EOD;
$clientName = implode(" ", $beforeName); // prefix groups
$clientName .= " {$client["client_nickname"]} "; // nickname
$clientName .= implode(" ", $afterName); // suffix groups
- $clientName = htmlspecialchars(trim($clientName)); // trim and sanitize
+ $clientName = Utils::escape(trim($clientName)); // trim and sanitize
$this->add(
$html,
@@ -286,7 +287,7 @@ EOD;
}
if($client["client_away"]) {
- return $this->getIcon("away.svg", htmlspecialchars($client["client_away_message"]) ?: __get("VIEWER_CLIENT_AWAY"));
+ return $this->getIcon("away.svg", Utils::escape($client["client_away_message"]) ?: __get("VIEWER_CLIENT_AWAY"));
}
if(!$client["client_output_hardware"]) {
@@ -340,7 +341,7 @@ EOD;
// to show the group with a "broken-image" icons.
}
- $html .= $this->getIcon($icon, htmlspecialchars($group["name"]));
+ $html .= $this->getIcon($icon, Utils::escape($group["name"]));
}
if($client["client_icon_id"]) {
diff --git a/src/private/php/constants.php b/src/private/php/constants.php
index acb816b..5bcb264 100644
--- a/src/private/php/constants.php
+++ b/src/private/php/constants.php
@@ -1,5 +1,6 @@
translate($identifier, $args);
} catch (\Exception $e) {
- return "(unknown translation for " . htmlspecialchars($identifier) . ")";
+ return "(unknown translation for " . Utils::escape($identifier) . ")";
}
}
}
diff --git a/src/private/templates/bans.latte b/src/private/templates/bans.latte
index 2538805..a6bdd2a 100644
--- a/src/private/templates/bans.latte
+++ b/src/private/templates/bans.latte
@@ -35,10 +35,10 @@
{/if}
- $realpath does not exists, please create it";
- showCheckResult("Is $basename writable?", $exists && $writable ? 0 : 2, $msg);
+ $success = $exists && $writable;
+
+ if (!$success && !defined("FILE_PERM_ERROR")) {
+ define("FILE_PERM_ERROR", true);
+ }
+
+ showCheckResult("Is $basename writable?", $success ? 0 : 2, $msg);
}
}
@@ -232,8 +248,9 @@ function showCheckResult($name, $state, $resulttext) {
} else {
$attr = "fa-times-circle color-danger";
- if(!defined("CANNOT_INSTALL"))
+ if(!defined("CANNOT_INSTALL")) {
define("CANNOT_INSTALL", true);
+ }
}
?>
diff --git a/src/installer/pages/3.php b/src/installer/pages/3.php
index 6867e81..658477a 100644
--- a/src/installer/pages/3.php
+++ b/src/installer/pages/3.php
@@ -44,24 +44,39 @@ if (!empty($_POST)) {
if (isset($dbconfig)) {
try {
$db = new Medoo($dbconfig);
- $sqlfile = $usingMysql ? "dbinstall_mysql" : "dbinstall_sqlite";
- $sqlquery = file_get_contents(__DIR__ . "/../$sqlfile.sql");
- if($sqlquery === false) {
- $errormessage = "Cannot read $sqlfile.sql file!";
+ $sqlfiles = [];
+
+ if ($usingMysql) {
+ $sqlfiles = [
+ "dbinstall_mysql",
+ "dbinstall_mysql_lang"
+ ];
} else {
+ // no other option yet
+ }
+
+ foreach ($sqlfiles as $file) {
+ $sqlquery = file_get_contents(__DIR__ . "/../$file.sql");
+
+ if($sqlquery === false) {
+ throw new Exception("Cannot read SQL file: $file.sql");
+ }
+
$sqlquery = str_replace("DBPREFIX", $dbprefix, $sqlquery);
$sqlresult = $db->pdo->exec($sqlquery);
- if($sqlresult === false) {
+ if ($sqlresult === false) {
throw new Exception("EXEC returned false");
}
+ }
- $phpcode = <<" . __CONFIG_FILE . "! Please check the file/directory permissions";
- } else {
- header("Location: ?step=" . ($stepNumber + 1));
- }
+ if(file_put_contents(__CONFIG_FILE, $phpcode) === false) {
+ $errormessage = "Cannot write to " . __CONFIG_FILE . "! Please check the file/directory permissions";
+ } else {
+ // redirect to next step on success
+ header("Location: ?step=" . ($stepNumber + 1));
}
} catch (Exception $e) {
$errormessage = htmlspecialchars("Error " . $e->getCode() . ": " . $e->getMessage());
diff --git a/src/installer/pages/7.php b/src/installer/pages/7.php
index 1d900de..0d89c00 100644
--- a/src/installer/pages/7.php
+++ b/src/installer/pages/7.php
@@ -13,6 +13,7 @@ if(!empty($_COOKIE["tsw_allow_metrics"])) {
$data = [
"tswVersion" => __TSWEBSITE_VERSION,
+ "tswCommit" => __TSWEBSITE_COMMIT,
"phpVersion" => PHP_VERSION,
"os" => sprintf("%s %s %s %s", php_uname("s"), php_uname("r"), php_uname("v"), php_uname("m")), // no hostname
"webServer" => $_SERVER["SERVER_SOFTWARE"],
diff --git a/src/private/cache/.gitkeep b/src/private/cache/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/src/private/php/Utils/DateUtils.php b/src/private/php/Utils/DateUtils.php
index 0b54011..d7f13fa 100644
--- a/src/private/php/Utils/DateUtils.php
+++ b/src/private/php/Utils/DateUtils.php
@@ -5,12 +5,13 @@ namespace Wruczek\TSWebsite\Utils;
use Wruczek\TSWebsite\Utils\Language\LanguageUtils;
class DateUtils {
+
/**
* Returns current date format based on current user language. If it cannot
* be retrieved, default value is returned
* @return string date format
*/
- public function getDateFormat() {
+ public static function getDateFormat() {
try {
return LanguageUtils::i()->translate("DATE_FORMAT");
} catch (\Exception $e) {
@@ -23,7 +24,7 @@ class DateUtils {
* be retrieved, default value is returned
* @return string time format
*/
- public function getTimeFormat() {
+ public static function getTimeFormat() {
try {
return LanguageUtils::i()->translate("TIME_FORMAT");
} catch (\Exception $e) {
@@ -36,8 +37,8 @@ class DateUtils {
* @param $timestamp
* @return false|string
*/
- public function formatToDate($timestamp) {
- return date($this->getDateFormat(), $timestamp);
+ public static function formatDate($timestamp) {
+ return date(self::getDateFormat(), $timestamp);
}
/**
@@ -45,8 +46,8 @@ class DateUtils {
* @param $timestamp
* @return false|string
*/
- public function formatToTime($timestamp) {
- return date($this->getTimeFormat(), $timestamp);
+ public static function foramtTime($timestamp) {
+ return date(self::getTimeFormat(), $timestamp);
}
/**
@@ -55,63 +56,8 @@ class DateUtils {
* @param string $additional additional date format
* @return false|string
*/
- public function formatToDateTime($timestamp, $additional = "") {
- return date("{$this->getDateFormat()} {$this->getTimeFormat()} $additional", $timestamp);
+ public static function formatDatetime($timestamp, $additional = "") {
+ return date(trim(self::getDateFormat() . ", " . self::getTimeFormat() . " " . $additional), $timestamp);
}
- /**
- * Formats timestamp into "time ago" string
- * For example, timestamp set to 60 seconds ago will return "1 minute ago"
- *
- * Taken from StackOverflow: https://stackoverflow.com/a/18602474
- * @param $timestamp int timestamp with past date
- * @param bool $full if true, full date will be returned. For example "5 hours, 2 minutes, 8 seconds"
- * @return string timestamp formatted to fuzzy date. Marf.
- */
- public function fuzzyDate($timestamp, $full = false) {
- $now = new \DateTime;
- $ago = (new \DateTime)->setTimestamp($timestamp);
-
- $diff = $now->diff($ago);
-
- $diff->w = floor($diff->d / 7);
- $diff->d -= $diff->w * 7;
-
- $string = [
- 'y' => 'year',
- 'm' => 'month',
- 'w' => 'week',
- 'd' => 'day',
- 'h' => 'hour',
- 'i' => 'minute',
- 's' => 'second'
- ];
-
- foreach ($string as $k => &$v) {
- if ($diff->$k) {
- $v = $diff->$k . ' ' . $v . ($diff->$k > 1 ? 's' : '');
- } else {
- unset($string[$k]);
- }
- }
-
- if (!$full) $string = array_slice($string, 0, 1);
- return $string ? implode(', ', $string) . ' ago' : 'just now';
- }
-
-
- /**
- * Returns fuzzy date with abbreviation showing precise date
- * @see fuzzyDate
- * @param $timestamp
- * @param bool $full
- * @return string
- */
- public function fuzzyDateHTML($timestamp, $full = false) {
- $fuzzyDate = $this->fuzzyDate($timestamp, $full);
- $fullDate = $this->formatToDateTime($timestamp, "T");
-
- return '';
-// return '' . htmlentities($fuzzyDate) . '';
- }
}
diff --git a/src/private/php/Utils/Language/LanguageUtils.php b/src/private/php/Utils/Language/LanguageUtils.php
index b1220b9..00cefa5 100644
--- a/src/private/php/Utils/Language/LanguageUtils.php
+++ b/src/private/php/Utils/Language/LanguageUtils.php
@@ -2,8 +2,8 @@
namespace Wruczek\TSWebsite\Utils\Language;
-use function htmlspecialchars;
use Wruczek\PhpFileCache\PhpFileCache;
+use Wruczek\TSWebsite\Config;
use Wruczek\TSWebsite\Utils\DatabaseUtils;
use Wruczek\TSWebsite\Utils\SingletonTait;
@@ -148,10 +148,18 @@ class LanguageUtils {
$langs[] = new Language($langid, $englishname, $nativename, $langcode, $isdefault, $languageItems);
}
+ uasort($langs, function ($a, $b) {
+ if ($a->getLanguageId() === $b->getLanguageId()) {
+ return 0;
+ }
+
+ return strnatcmp($a->getLanguageNameNative(), $b->getLanguageNameNative());
+ });
+
$this->languages = $langs;
if($updateCache)
- $this->cache->store("languages", $langs, 300);
+ $this->cache->store("languages", $langs, Config::get("cache_languages", 300));
return $langs;
}
diff --git a/src/private/php/Utils/TemplateUtils.php b/src/private/php/Utils/TemplateUtils.php
index e0a1f69..95ecf4f 100644
--- a/src/private/php/Utils/TemplateUtils.php
+++ b/src/private/php/Utils/TemplateUtils.php
@@ -27,11 +27,13 @@ class TemplateUtils {
// Add custom filters...
$this->getLatte()->addFilter("fuzzyDateAbbr", function ($s) {
- return new Html('{cannot convert ' . $s . '}');
+ $default = DateUtils::formatDatetime($s);
+ return new Html('' . $default . '');
});
$this->getLatte()->addFilter("fullDate", function ($s) {
- return new Html('{cannot convert ' . $s . '}');
+ $default = DateUtils::formatDatetime($s);
+ return new Html('' . $default . '');
});
$this->getLatte()->addFilter("translate", function ($s, ...$args) {
@@ -165,13 +167,13 @@ class TemplateUtils {
}
} else if (is_string($parameter)) {
// NEEDS to start with a space!
- $attributes = ' integrity="' . htmlspecialchars($parameter) . '" crossorigin="anonymous"';
+ $attributes = ' integrity="' . Utils::escape($parameter) . '" crossorigin="anonymous"';
}
if ($resourceType === "stylesheet") {
- echo '';
+ echo '';
} else if ($resourceType === "script") {
- echo '';
+ echo '';
} else {
throw new \InvalidArgumentException("$resourceType is not a valid resource type");
}
diff --git a/src/private/php/Utils/Utils.php b/src/private/php/Utils/Utils.php
index a2d3b59..f59ae72 100644
--- a/src/private/php/Utils/Utils.php
+++ b/src/private/php/Utils/Utils.php
@@ -9,12 +9,21 @@ use Wruczek\TSWebsite\News\INewsStore;
/**
* Class Utils
* @package Wruczek\TSWebsite\Utils
- * @author Wruczek 2017
+ * @author Wruczek 2017 - 2019
*/
class Utils {
private function __construct() {}
+ /**
+ * Escapes HTML characters with htmlspecialchars
+ * @param $string string String to be escaped
+ * @return string escaped string
+ */
+ public static function escape($string) {
+ return htmlspecialchars((string) $string, ENT_QUOTES, "UTF-8");
+ }
+
/**
* Strips the first line from string
* https://stackoverflow.com/a/7740485
@@ -100,7 +109,7 @@ class Utils {
*/
public static function getClientIp($useCfip = null) {
if ($useCfip === null) {
- $useCfip = (bool) Config::get("usingcloudflare");
+ $useCfip = Config::get("usingcloudflare");
}
// If IPv6 localhost, return IPv4 localhost
@@ -108,7 +117,7 @@ class Utils {
return "127.0.0.1";
}
- if (!empty($_SERVER["HTTP_CF_CONNECTING_IP"]) && $useCfip) {
+ if ($useCfip && !empty($_SERVER["HTTP_CF_CONNECTING_IP"])) {
return $_SERVER["HTTP_CF_CONNECTING_IP"];
}
diff --git a/src/private/php/ViewerRenderer.php b/src/private/php/ViewerRenderer.php
index f7026dc..709046b 100644
--- a/src/private/php/ViewerRenderer.php
+++ b/src/private/php/ViewerRenderer.php
@@ -4,6 +4,7 @@ namespace Wruczek\TSWebsite;
use function __get;
use TeamSpeak3;
+use Wruczek\TSWebsite\Utils\Utils;
class ViewerRenderer {
@@ -77,7 +78,7 @@ EOD;
$this->add(
$html,
$this->getIcon("server_green.svg"),
- htmlspecialchars($this->serverInfo["virtualserver_name"]),
+ Utils::escape($this->serverInfo["virtualserver_name"]),
$suffixIcons
);
@@ -99,8 +100,8 @@ EOD;
$path = "api/geticon.php?iconid=" . (int) $name;
}
- $ttip = $tooltip ? ' data-toggle="tooltip" title="' . htmlspecialchars($tooltip) . '"' : "";
- return '| {_"BANS_HEADER_NAME"} | +{_"BANS_HEADER_TARGET"} | {_"BANS_HEADER_REASON"} | {_"BANS_HEADER_INVOKER"} | {_"BANS_HEADER_BANDATE"} | @@ -49,8 +49,14 @@ {foreach $banlist as $ban} {var $expiretime = $ban["created"] + $ban["duration"]}||
|---|---|---|---|---|---|---|
| {$ban["name"]} | -{$ban["reason"]} | +{$ban["target"]} | ++ {if $ban["reason"]} + {$ban["reason"]} + {else} + {_"NO_REASON_SET"|noescape} + {/if} + | {$ban["invoker"]} | {$ban["created"]|fullDate} | {$ban["duration"] ? ($expiretime|fuzzyDateAbbr) : ("BANS_NEVEREXPIRES"|translate)} | diff --git a/src/private/templates/body.latte b/src/private/templates/body.latte index 5c0c0c1..1ff2b4b 100644 --- a/src/private/templates/body.latte +++ b/src/private/templates/body.latte @@ -12,6 +12,7 @@ $navActiveIndex = isset($navActiveIndex) ? (int) $navActiveIndex : 0; +