kashire/lainchan
4
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

...

Browse Source
This commit is contained in:
Savetheinternet 2011-05-25 20:15:47 +10:00
parent 4e49d08359
commit 38cc13f9b9
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inc/display.php
View File

@ -260,11 +260,15 @@
} }
public function build($index=false) { public function build($index=false) {
global $board, $config, $memcached; global $board, $config, $memcached, $debug;
if(!$this->mod && $config['memcached']['enabled']) { if(!$this->mod && $config['memcached']['enabled']) {
if($built = $memcached->get($this->memcached_key($index))) if($built = $memcached->get($this->memcached_key($index))) {
if($config['debug']) {
$debug['memcached'][] = $this->memcached_key($index);
}
return $built; return $built;
}
} }
$built = '<div class="post reply" id="reply_' . $this->id . '">' . $built = '<div class="post reply" id="reply_' . $this->id . '">' .

50
mod.php
View File

@ -249,7 +249,7 @@
header('Location: ?/', true, $config['redirect_http']); header('Location: ?/', true, $config['redirect_http']);
} elseif(preg_match('/^\/confirm\/(.+)$/', $query, $matches)) { } elseif(preg_match('/^\/confirm\/(.+)$/', $query, $matches)) {
$uri = $matches[1]; $uri = &$matches[1];
$body = '<p style="text-align:center">' . $body = '<p style="text-align:center">' .
'<span class="heading" style="margin-bottom:6px">Are you sure you want to do that?</span>' . '<span class="heading" style="margin-bottom:6px">Are you sure you want to do that?</span>' .
@ -330,7 +330,7 @@
error('Cannot open homepage directory; check permissions.'); error('Cannot open homepage directory; check permissions.');
if(isset($match[2])) { if(isset($match[2])) {
$_theme = $match[2]; $_theme = &$match[2];
if(!$theme = loadThemeConfig($_theme)) { if(!$theme = loadThemeConfig($_theme)) {
error($config['error']['invalidtheme']); error($config['error']['invalidtheme']);
@ -556,9 +556,9 @@
$query = prepare("INSERT INTO `news` VALUES (NULL, :name, :time, :subject, :body)"); $query = prepare("INSERT INTO `news` VALUES (NULL, :name, :time, :subject, :body)");
if(isset($_POST['name']) && $mod['type'] >= $config['mod']['news_custom']) if(isset($_POST['name']) && $mod['type'] >= $config['mod']['news_custom'])
$name = $_POST['name']; $name = &$_POST['name'];
else else
$name = $mod['username']; $name = &$mod['username'];
$query->bindValue(':name', utf8tohtml($name), PDO::PARAM_INT); $query->bindValue(':name', utf8tohtml($name), PDO::PARAM_INT);
$query->bindvalue(':time', time(), PDO::PARAM_INT); $query->bindvalue(':time', time(), PDO::PARAM_INT);
@ -653,7 +653,7 @@
) )
); );
} elseif(preg_match('/^\/PM\/(\d+)$/', $query, $match)) { } elseif(preg_match('/^\/PM\/(\d+)$/', $query, $match)) {
$id = $match[1]; $id = &$match[1];
if($mod['type'] >= $config['mod']['master_pm']) { if($mod['type'] >= $config['mod']['master_pm']) {
$query = prepare("SELECT `pms`.`id`, `time`, `sender`, `to`, `message`, `username` FROM `pms` LEFT JOIN `mods` ON `mods`.`id` = `sender` WHERE `pms`.`id` = :id"); $query = prepare("SELECT `pms`.`id`, `time`, `sender`, `to`, `message`, `username` FROM `pms` LEFT JOIN `mods` ON `mods`.`id` = `sender` WHERE `pms`.`id` = :id");
@ -689,7 +689,7 @@
$query->execute() or error(db_error($query)); $query->execute() or error(db_error($query));
if($_mod = $query->fetch()) { if($_mod = $query->fetch()) {
$__to = $_mod['username']; $__to = &$_mod['username'];
} else { } else {
$__to = '<em>??</em>'; $__to = '<em>??</em>';
} }
@ -732,7 +732,7 @@
} elseif(preg_match('/^\/new_PM\/(\d+)(\/(\d+))?$/', $query, $match)) { } elseif(preg_match('/^\/new_PM\/(\d+)(\/(\d+))?$/', $query, $match)) {
if($mod['type'] < $config['mod']['create_pm']) error($config['error']['noaccess']); if($mod['type'] < $config['mod']['create_pm']) error($config['error']['noaccess']);
$to = $match[1]; $to = &$match[1];
$query = prepare("SELECT `username`,`id` FROM `mods` WHERE `id` = :id"); $query = prepare("SELECT `username`,`id` FROM `mods` WHERE `id` = :id");
$query->bindValue(':id', $to, PDO::PARAM_INT); $query->bindValue(':id', $to, PDO::PARAM_INT);
@ -745,7 +745,7 @@
if(isset($_POST['message'])) { if(isset($_POST['message'])) {
// Post message // Post message
$message = $_POST['message']; $message = &$_POST['message'];
if(empty($message)) if(empty($message))
error($config['error']['tooshort_body']); error($config['error']['tooshort_body']);
@ -771,7 +771,7 @@
} else { } else {
$value = ''; $value = '';
if(isset($match[3])) { if(isset($match[3])) {
$reply = $match[3]; $reply = &$match[3];
$query = prepare("SELECT `message` FROM `pms` WHERE `sender` = :sender AND `to` = :mod AND `id` = :id"); $query = prepare("SELECT `message` FROM `pms` WHERE `sender` = :sender AND `to` = :mod AND `id` = :id");
$query->bindValue(':sender', $to['id'], PDO::PARAM_INT); $query->bindValue(':sender', $to['id'], PDO::PARAM_INT);
@ -825,7 +825,7 @@
'</div>'; '</div>';
if(isset($_POST['search']) && !empty($_POST['search'])) { if(isset($_POST['search']) && !empty($_POST['search'])) {
$phrase = $_POST['search']; $phrase = &$_POST['search'];
$_body = ''; $_body = '';
// Escape escape character // Escape escape character
@ -1026,7 +1026,7 @@
) )
); );
} elseif(preg_match('/^\/users\/(\d+)(\/(promote|demote|delete))?$/', $query, $matches)) { } elseif(preg_match('/^\/users\/(\d+)(\/(promote|demote|delete))?$/', $query, $matches)) {
$modID = $matches[1]; $modID = &$matches[1];
if(isset($matches[2])) { if(isset($matches[2])) {
if($matches[3] == 'delete') { if($matches[3] == 'delete') {
@ -1619,7 +1619,7 @@
} elseif(preg_match('/^\/' . $regex['board'] . '(' . $regex['index'] . '|' . $regex['page'] . ')?$/', $query, $matches)) { } elseif(preg_match('/^\/' . $regex['board'] . '(' . $regex['index'] . '|' . $regex['page'] . ')?$/', $query, $matches)) {
// Board index // Board index
$boardName = $matches[1]; $boardName = &$matches[1];
// Open board // Open board
if(!openBoard($boardName)) if(!openBoard($boardName))
@ -1641,8 +1641,8 @@
} elseif(preg_match('/^\/' . $regex['board'] . $regex['res'] . $regex['page'] . '$/', $query, $matches)) { } elseif(preg_match('/^\/' . $regex['board'] . $regex['res'] . $regex['page'] . '$/', $query, $matches)) {
// View thread // View thread
$boardName = $matches[1]; $boardName = &$matches[1];
$thread = $matches[2]; $thread = &$matches[2];
// Open board // Open board
if(!openBoard($boardName)) if(!openBoard($boardName))
error($config['error']['noboard']); error($config['error']['noboard']);
@ -1654,8 +1654,8 @@
if($mod['type'] < $config['mod']['deletefile']) error($config['error']['noaccess']); if($mod['type'] < $config['mod']['deletefile']) error($config['error']['noaccess']);
// Delete file from post // Delete file from post
$boardName = $matches[1]; $boardName = &$matches[1];
$post = $matches[2]; $post = &$matches[2];
// Open board // Open board
if(!openBoard($boardName)) if(!openBoard($boardName))
error($config['error']['noboard']); error($config['error']['noboard']);
@ -1679,8 +1679,8 @@
if($mod['type'] < $config['mod']['delete']) error($config['error']['noaccess']); if($mod['type'] < $config['mod']['delete']) error($config['error']['noaccess']);
// Delete post // Delete post
$boardName = $matches[1]; $boardName = &$matches[1];
$post = $matches[2]; $post = &$matches[2];
// Open board // Open board
if(!openBoard($boardName)) if(!openBoard($boardName))
error($config['error']['noboard']); error($config['error']['noboard']);
@ -1703,8 +1703,8 @@
if($mod['type'] < $config['mod']['sticky']) error($config['error']['noaccess']); if($mod['type'] < $config['mod']['sticky']) error($config['error']['noaccess']);
// Add/remove sticky // Add/remove sticky
$boardName = $matches[1]; $boardName = &$matches[1];
$post = $matches[3]; $post = &$matches[3];
// Open board // Open board
if(!openBoard($boardName)) if(!openBoard($boardName))
error($config['error']['noboard']); error($config['error']['noboard']);
@ -1737,8 +1737,8 @@
if($mod['type'] < $config['mod']['lock']) error($config['error']['noaccess']); if($mod['type'] < $config['mod']['lock']) error($config['error']['noaccess']);
// Lock/Unlock // Lock/Unlock
$boardName = $matches[1]; $boardName = &$matches[1];
$post = $matches[3]; $post = &$matches[3];
// Open board // Open board
if(!openBoard($boardName)) if(!openBoard($boardName))
error($config['error']['noboard']); error($config['error']['noboard']);
@ -1770,8 +1770,8 @@
} elseif(preg_match('/^\/' . $regex['board'] . 'deletebyip\/(\d+)$/', $query, $matches)) { } elseif(preg_match('/^\/' . $regex['board'] . 'deletebyip\/(\d+)$/', $query, $matches)) {
// Delete all posts by an IP // Delete all posts by an IP
$boardName = $matches[1]; $boardName = &$matches[1];
$post = $matches[2]; $post = &$matches[2];
// Open board // Open board
if(!openBoard($boardName)) if(!openBoard($boardName))
error($config['error']['noboard']); error($config['error']['noboard']);
@ -1919,7 +1919,7 @@
if($mod['type'] < $config['mod']['ban']) error($config['error']['noaccess']); if($mod['type'] < $config['mod']['ban']) error($config['error']['noaccess']);
// Ban by post // Ban by post
$boardName = $matches[1]; $boardName = &$matches[1];
$delete = isset($matches[2]) && $matches[2] == '&delete'; $delete = isset($matches[2]) && $matches[2] == '&delete';
if($delete && $mod['type'] < $config['mod']['delete']) error($config['error']['noaccess']); if($delete && $mod['type'] < $config['mod']['delete']) error($config['error']['noaccess']);