diff --git a/inc/config.php b/inc/config.php
index 956851f2..888cbeb8 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -357,6 +357,8 @@
// Allow "uploading" images via URL as well. Users can enter the URL of the image and then Tinyboard will
// download it. Not usually recommended.
$config['allow_upload_by_url'] = false;
+ // The timeout for the above, in seconds.
+ $config['upload_by_url_timeout'] = 15;
// A wordfilter (sometimes referred to as just a "filter" or "censor") automatically scans users’ posts
// as they are submitted and changes or censors particular words or phrases.
diff --git a/inc/display.php b/inc/display.php
index 7ca4386c..84055d5f 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -232,11 +232,50 @@ function truncate($body, $url, $max_lines = false, $max_chars = false) {
return $body;
}
-function bidi_cleanup($str) {
- // Removes all embedded RTL and LTR unicode formatting blocks in a string so that
+function bidi_cleanup($data) {
+ // Closes all embedded RTL and LTR unicode formatting blocks in a string so that
// it can be used inside another without controlling its direction.
- return "$str ";
+ $explicits = '\xE2\x80\xAA|\xE2\x80\xAB|\xE2\x80\xAD|\xE2\x80\xAE';
+ $pdf = '\xE2\x80\xAC';
+
+ preg_match_all("!$explicits!", $data, $m1, PREG_OFFSET_CAPTURE | PREG_SET_ORDER);
+ preg_match_all("!$pdf!", $data, $m2, PREG_OFFSET_CAPTURE | PREG_SET_ORDER);
+
+ if (count($m1) || count($m2)){
+
+ $p = array();
+ foreach ($m1 as $m){ $p[$m[0][1]] = 'push'; }
+ foreach ($m2 as $m){ $p[$m[0][1]] = 'pop'; }
+ ksort($p);
+
+ $offset = 0;
+ $stack = 0;
+ foreach ($p as $pos => $type){
+
+ if ($type == 'push'){
+ $stack++;
+ }else{
+ if ($stack){
+ $stack--;
+ }else{
+ # we have a pop without a push - remove it
+ $data = substr($data, 0, $pos-$offset)
+ .substr($data, $pos+3-$offset);
+ $offset += 3;
+ }
+ }
+ }
+
+ # now add some pops if your stack is bigger than 0
+ for ($i=0; $i<$stack; $i++){
+ $data .= "\xE2\x80\xAC";
+ }
+
+ return $data;
+ }
+
+ return $data;
}
function secure_link_confirm($text, $title, $confirm_message, $href) {
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 6a9f07c7..2ca7eb55 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -359,10 +359,12 @@ function mod_edit_board($boardName) {
$query->bindValue(':uri', $board['uri']);
$query->execute() or error(db_error($query));
- modLog('Deleted board: ' . sprintf($config['board_abbreviation'], $board['uri']), false);
+ if ($config['cache']['enabled']) {
+ cache::delete('board_' . $board['uri']);
+ cache::delete('all_boards');
+ }
- // Delete entire board directory
- rrmdir($board['uri'] . '/');
+ modLog('Deleted board: ' . sprintf($config['board_abbreviation'], $board['uri']), false);
// Delete posting table
$query = query(sprintf('DROP TABLE IF EXISTS ``posts_%s``', $board['uri'])) or error(db_error());
@@ -409,6 +411,9 @@ function mod_edit_board($boardName) {
$_query->execute() or error(db_error($_query));
}
}
+
+ // Delete entire board directory
+ rrmdir($board['uri'] . '/');
} else {
$query = prepare('UPDATE ``boards`` SET `title` = :title, `subtitle` = :subtitle WHERE `uri` = :uri');
$query->bindValue(':uri', $board['uri']);
diff --git a/install.php b/install.php
index 47c277ff..8453d2ae 100644
--- a/install.php
+++ b/install.php
@@ -658,18 +658,18 @@ if ($step == 0) {
$sql_errors .= '' . db_error() . ' ';
}
- $boards = listBoards();
- foreach ($boards as &$_board) {
- setupBoard($_board);
- buildIndex();
- }
-
$page['title'] = 'Installation complete';
$page['body'] = 'Thank you for using Tinyboard. Please remember to report any bugs you discover. How do I edit the config files?
';
if (!empty($sql_errors)) {
$page['body'] .= 'SQL errors SQL errors were encountered when trying to install the database. This may be the result of using a database which is already occupied with a Tinyboard installation; if so, you can probably ignore this.
The errors encountered were:
Ignore errors and complete installation.
Delete install.php! I couldn\'t remove install.php . You will have to remove it manually.
Thank you for using Tinyboard. Please remember to report any bugs you discover.
';
+ $boards = listBoards();
+ foreach ($boards as &$_board) {
+ setupBoard($_board);
+ buildIndex();
+ }
+
file_write($config['has_installed'], VERSION);
if (!file_unlink(__FILE__)) {
$page['body'] .= 'Delete install.php! I couldn\'t remove install.php . You will have to remove it manually.
{{ post.ip }} ]
+ [{{ post.ip }} ]
{% endif %}
{% if config.display_flags and post.modifiers.flag %}
{{ post.time|date(config.post_date) }}
diff --git a/templates/post_thread.html b/templates/post_thread.html
index 97fad11c..70c03f8e 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -80,12 +80,12 @@
{{ capcode.cap }}
{% endif %}
{% if post.mod and post.mod|hasPermission(config.mod.show_ip, board.uri) %}
- [{{ post.ip }} ]
+ [{{ post.ip }} ]
{% endif %}
{% if config.display_flags and post.modifiers.flag %}
{{ post.time|date(config.post_date) }}