Cool_Tools/vichan
1
0
Fork 0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-28 01:10:51 +01:00
Code Releases Wiki Activity

Merge branch 'master' of github.com:vichan-devel/Tinyboard

Browse Source
This commit is contained in:
czaks 2015-03-30 06:27:05 +02:00
commit 8f30b02c97
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/quick-reply.js
View File

@ -83,11 +83,12 @@
}\ }\
#quick-reply textarea {\ #quick-reply textarea {\
width: 100%;\ width: 100%;\
min-width: 100%;\
box-sizing: border-box;\ box-sizing: border-box;\
-webkit-box-sizing:border-box;\ -webkit-box-sizing:border-box;\
-moz-box-sizing: border-box;\ -moz-box-sizing: border-box;\
font-size: 10pt;\ font-size: 10pt;\
resize: vertical;\ resize: vertical horizontal;\
}\ }\
#quick-reply input, #quick-reply select, #quick-reply textarea {\ #quick-reply input, #quick-reply select, #quick-reply textarea {\
margin: 0 0 1px 0;\ margin: 0 0 1px 0;\

13
templates/themes/recent/theme.php
View File

@ -125,15 +125,20 @@
$stats['unique_posters'] = number_format($query->fetchColumn()); $stats['unique_posters'] = number_format($query->fetchColumn());
// Active content // Active content
/*$query = 'SELECT SUM(`filesize`) FROM ('; $query = 'SELECT DISTINCT(`files`) FROM (';
foreach ($boards as &$_board) { foreach ($boards as &$_board) {
if (in_array($_board['uri'], $this->excluded)) if (in_array($_board['uri'], $this->excluded))
continue; continue;
$query .= sprintf("SELECT `filesize` FROM ``posts_%s`` UNION ALL ", $_board['uri']); $query .= sprintf("SELECT `files` FROM ``posts_%s`` UNION ALL ", $_board['uri']);
} }
$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query); $query = preg_replace('/UNION ALL $/', ' WHERE `num_files` > 0) AS `posts_all`', $query);
$query = query($query) or error(db_error()); $query = query($query) or error(db_error());
$stats['active_content'] = $query->fetchColumn();*/ $files = $query->fetchAll();
$stats['active_content'] = 0;
foreach ($files as &$file) {
preg_match_all('/"size":([0-9]*)/', $file[0], $matches);
$stats['active_content'] += array_sum($matches[1]);
}
return Element('themes/recent/recent.html', Array( return Element('themes/recent/recent.html', Array(
'settings' => $settings, 'settings' => $settings,