james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #409 from jgen/linting

Browse Source 
Linting
This commit is contained in:
Shish 2014-04-20 00:29:53 +01:00
commit 75c3d8e453
17 changed files with 93 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/database.class.php
View File

@ -229,7 +229,9 @@ class MemcacheCache implements CacheEngine {
class APCCache implements CacheEngine { class APCCache implements CacheEngine {
var $hits=0, $misses=0; var $hits=0, $misses=0;
public function __construct($args) {} public function __construct($args) {
// $args is not used, but is passed in when APC cache is created.
}
public function get($key) { public function get($key) {
assert(!is_null($key)); assert(!is_null($key));

61
core/util.inc.php
View File

@ -10,7 +10,7 @@ require_once "lib/context.php";
/** /**
* Make some data safe for printing into HTML * Make some data safe for printing into HTML
* *
* @retval string * @return string
*/ */
function html_escape($input) { function html_escape($input) {
return htmlentities($input, ENT_QUOTES, "UTF-8"); return htmlentities($input, ENT_QUOTES, "UTF-8");
@ -19,7 +19,7 @@ function html_escape($input) {
/** /**
* Make sure some data is safe to be used in integer context * Make sure some data is safe to be used in integer context
* *
* @retval int * @return int
*/ */
function int_escape($input) { function int_escape($input) {
/* /*
@ -32,7 +32,7 @@ function int_escape($input) {
/** /**
* Make sure some data is safe to be used in URL context * Make sure some data is safe to be used in URL context
* *
* @retval string * @return string
*/ */
function url_escape($input) { function url_escape($input) {
/* /*
@ -66,7 +66,7 @@ function url_escape($input) {
/** /**
* Make sure some data is safe to be used in SQL context * Make sure some data is safe to be used in SQL context
* *
* @retval string * @return string
*/ */
function sql_escape($input) { function sql_escape($input) {
global $database; global $database;
@ -77,7 +77,7 @@ function sql_escape($input) {
/** /**
* Turn all manner of HTML / INI / JS / DB booleans into a PHP one * Turn all manner of HTML / INI / JS / DB booleans into a PHP one
* *
* @retval boolean * @return boolean
*/ */
function bool_escape($input) { function bool_escape($input) {
/* /*
@ -112,7 +112,7 @@ function bool_escape($input) {
* Some functions require a callback function for escaping, * Some functions require a callback function for escaping,
* but we might not want to alter the data * but we might not want to alter the data
* *
* @retval string * @return string
*/ */
function no_escape($input) { function no_escape($input) {
return $input; return $input;
@ -156,7 +156,7 @@ function truncate($string, $limit, $break=" ", $pad="...") {
/** /**
* Turn a human readable filesize into an integer, eg 1KB -> 1024 * Turn a human readable filesize into an integer, eg 1KB -> 1024
* *
* @retval int * @return int
*/ */
function parse_shorthand_int($limit) { function parse_shorthand_int($limit) {
if(is_numeric($limit)) { if(is_numeric($limit)) {
@ -167,8 +167,8 @@ function parse_shorthand_int($limit) {
$value = $m[1]; $value = $m[1];
if (isset($m[2])) { if (isset($m[2])) {
switch(strtolower($m[2])) { switch(strtolower($m[2])) {
case 'g': $value *= 1024; # fallthrough case 'g': $value *= 1024; // fall through
case 'm': $value *= 1024; # fallthrough case 'm': $value *= 1024; // fall through
case 'k': $value *= 1024; break; case 'k': $value *= 1024; break;
default: $value = -1; default: $value = -1;
} }
@ -182,7 +182,7 @@ function parse_shorthand_int($limit) {
/** /**
* Turn an integer into a human readable filesize, eg 1024 -> 1KB * Turn an integer into a human readable filesize, eg 1024 -> 1KB
* *
* @retval string * @return string
*/ */
function to_shorthand_int($int) { function to_shorthand_int($int) {
if($int >= pow(1024, 3)) { if($int >= pow(1024, 3)) {
@ -203,7 +203,7 @@ function to_shorthand_int($int) {
/** /**
* Turn a date into a time, a date, an "X minutes ago...", etc * Turn a date into a time, a date, an "X minutes ago...", etc
* *
* @retval string * @return string
*/ */
function autodate($date, $html=true) { function autodate($date, $html=true) {
$cpu = date('c', strtotime($date)); $cpu = date('c', strtotime($date));
@ -214,7 +214,7 @@ function autodate($date, $html=true) {
/** /**
* Check if a given string is a valid date-time. ( Format: yyyy-mm-dd hh:mm:ss ) * Check if a given string is a valid date-time. ( Format: yyyy-mm-dd hh:mm:ss )
* *
* @retval boolean * @return boolean
*/ */
function isValidDateTime($dateTime) { function isValidDateTime($dateTime) {
if (preg_match("/^(\d{4})-(\d{2})-(\d{2}) ([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])$/", $dateTime, $matches)) { if (preg_match("/^(\d{4})-(\d{2})-(\d{2}) ([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])$/", $dateTime, $matches)) {
@ -229,7 +229,7 @@ function isValidDateTime($dateTime) {
/** /**
* Check if a given string is a valid date. ( Format: yyyy-mm-dd ) * Check if a given string is a valid date. ( Format: yyyy-mm-dd )
* *
* @retval boolean * @return boolean
*/ */
function isValidDate($date) { function isValidDate($date) {
if (preg_match("/^(\d{4})-(\d{2})-(\d{2})$/", $date, $matches)) { if (preg_match("/^(\d{4})-(\d{2})-(\d{2})$/", $date, $matches)) {
@ -248,7 +248,7 @@ function isValidDate($date) {
* *
* FIXME: also check that IP ban ext is installed * FIXME: also check that IP ban ext is installed
* *
* @retval string * @return string
*/ */
function show_ip($ip, $ban_reason) { function show_ip($ip, $ban_reason) {
global $user; global $user;
@ -264,7 +264,7 @@ function show_ip($ip, $ban_reason) {
* *
* @param $haystack String to examine. * @param $haystack String to examine.
* @param $needle String to look for. * @param $needle String to look for.
* @retval bool * @return bool
*/ */
function startsWith(/*string*/ $haystack, /*string*/ $needle) { function startsWith(/*string*/ $haystack, /*string*/ $needle) {
$length = strlen($needle); $length = strlen($needle);
@ -276,7 +276,7 @@ function startsWith(/*string*/ $haystack, /*string*/ $needle) {
* *
* @param $haystack String to examine. * @param $haystack String to examine.
* @param $needle String to look for. * @param $needle String to look for.
* @retval bool * @return bool
*/ */
function endsWith(/*string*/ $haystack, /*string*/ $needle) { function endsWith(/*string*/ $haystack, /*string*/ $needle) {
$length = strlen($needle); $length = strlen($needle);
@ -295,7 +295,7 @@ function endsWith(/*string*/ $haystack, /*string*/ $needle) {
* *
* eg make_link("post/list") becomes "/v2/index.php?q=post/list" * eg make_link("post/list") becomes "/v2/index.php?q=post/list"
* *
* @retval string * @return string
*/ */
function make_link($page=null, $query=null) { function make_link($page=null, $query=null) {
global $config; global $config;
@ -331,7 +331,7 @@ function make_link($page=null, $query=null) {
/** /**
* Take the current URL and modify some paramaters * Take the current URL and modify some paramaters
* *
* @retval string * @return string
*/ */
function modify_current_url($changes) { function modify_current_url($changes) {
return modify_url($_SERVER['QUERY_STRING'], $changes); return modify_url($_SERVER['QUERY_STRING'], $changes);
@ -372,7 +372,7 @@ function modify_url($url, $changes) {
/** /**
* Turn a relative link into an absolute one, including hostname * Turn a relative link into an absolute one, including hostname
* *
* @retval string * @return string
*/ */
function make_http(/*string*/ $link) { function make_http(/*string*/ $link) {
if(strpos($link, "ttp://") > 0) return $link; if(strpos($link, "ttp://") > 0) return $link;
@ -639,7 +639,7 @@ function _count_execs($db, $sql, $inputarray) {
/** /**
* Compare two Block objects, used to sort them before being displayed * Compare two Block objects, used to sort them before being displayed
* *
* @retval int * @return int
*/ */
function blockcmp(Block $a, Block $b) { function blockcmp(Block $a, Block $b) {
if($a->position == $b->position) { if($a->position == $b->position) {
@ -653,7 +653,7 @@ function blockcmp(Block $a, Block $b) {
/** /**
* Figure out PHP's internal memory limit * Figure out PHP's internal memory limit
* *
* @retval int * @return int
*/ */
function get_memory_limit() { function get_memory_limit() {
global $config; global $config;
@ -702,7 +702,7 @@ function get_memory_limit() {
* Get the currently active IP, masked to make it not change when the last * Get the currently active IP, masked to make it not change when the last
* octet or two change, for use in session cookies and such * octet or two change, for use in session cookies and such
* *
* @retval string * @return string
*/ */
function get_session_ip(Config $config) { function get_session_ip(Config $config) {
$mask = $config->get_string("session_hash_mask", "255.255.0.0"); $mask = $config->get_string("session_hash_mask", "255.255.0.0");
@ -765,7 +765,7 @@ function flash_message(/*string*/ $text, /*string*/ $type="info") {
* *
* PHP really, really sucks. * PHP really, really sucks.
* *
* @retval string * @return string
*/ */
function get_base_href() { function get_base_href() {
$possible_vars = array('SCRIPT_NAME', 'PHP_SELF', 'PATH_INFO', 'ORIG_PATH_INFO'); $possible_vars = array('SCRIPT_NAME', 'PHP_SELF', 'PATH_INFO', 'ORIG_PATH_INFO');
@ -788,7 +788,7 @@ function get_base_href() {
* A shorthand way to send a TextFormattingEvent and get the * A shorthand way to send a TextFormattingEvent and get the
* results * results
* *
* @retval string * @return string
*/ */
function format_text(/*string*/ $string) { function format_text(/*string*/ $string) {
$tfe = new TextFormattingEvent($string); $tfe = new TextFormattingEvent($string);
@ -867,6 +867,9 @@ function transload($url, $mfile) {
fwrite($fp, $data); fwrite($fp, $data);
fclose($fp); fclose($fp);
// Scrutinizer-ci complains that $http_response_header not defined.
// However, it is auto defined by PHP.
// See: http://us2.php.net/manual/en/reserved.variables.httpresponseheader.php
$headers = http_parse_headers(implode("\n", $http_response_header)); $headers = http_parse_headers(implode("\n", $http_response_header));
return $headers; return $headers;
@ -1001,7 +1004,7 @@ function get_request_id() {
/** /**
* Remove an item from an array * Remove an item from an array
* *
* @retval array * @return array
*/ */
function array_remove($array, $to_remove) { function array_remove($array, $to_remove) {
$array = array_unique($array); $array = array_unique($array);
@ -1019,7 +1022,7 @@ function array_remove($array, $to_remove) {
* *
* Also removes duplicate values from the array. * Also removes duplicate values from the array.
* *
* @retval array * @return array
*/ */
function array_add($array, $element) { function array_add($array, $element) {
// Could we just use array_push() ? // Could we just use array_push() ?
@ -1032,7 +1035,7 @@ function array_add($array, $element) {
/** /**
* Return the unique elements of an array, case insensitively * Return the unique elements of an array, case insensitively
* *
* @retval array * @return array
*/ */
function array_iunique($array) { function array_iunique($array) {
$ok = array(); $ok = array();
@ -1055,7 +1058,7 @@ function array_iunique($array) {
* *
* from http://uk.php.net/network * from http://uk.php.net/network
* *
* @retval bool * @return bool
*/ */
function ip_in_range($IP, $CIDR) { function ip_in_range($IP, $CIDR) {
list ($net, $mask) = explode("/", $CIDR); list ($net, $mask) = explode("/", $CIDR);
@ -1204,7 +1207,7 @@ $_load_start = microtime(true);
* Collects some debug information (execution time, memory usage, queries, etc) * Collects some debug information (execution time, memory usage, queries, etc)
* and formats it to stick in the footer of the page. * and formats it to stick in the footer of the page.
* *
* @retval String of debug info to add to the page. * @return String of debug info to add to the page.
*/ */
function get_debug_info() { function get_debug_info() {
global $config, $_event_count, $database, $_execs, $_load_start; global $config, $_event_count, $database, $_execs, $_load_start;

2
ext/artists/main.php
View File

@ -805,7 +805,7 @@ class Artists extends Extension {
$urls = $_POST["urls"]; $urls = $_POST["urls"];
$userID = $user->id; $userID = $user->id;
$artistID = ""; //$artistID = "";
//// WE CHECK IF THE ARTIST ALREADY EXISTS ON DATABASE; IF NOT WE CREATE //// WE CHECK IF THE ARTIST ALREADY EXISTS ON DATABASE; IF NOT WE CREATE
if(!$this->artist_exists($name)) if(!$this->artist_exists($name))

2
ext/blotter/theme.php
View File

@ -106,7 +106,7 @@ class BlotterTheme extends Themelet {
// Reset variables: // Reset variables:
$i_open = ""; $i_open = "";
$i_close = ""; $i_close = "";
$id = $entries[$i]['id']; //$id = $entries[$i]['id'];
$messy_date = $entries[$i]['entry_date']; $messy_date = $entries[$i]['entry_date'];
$clean_date = date("y/m/d", strtotime($messy_date)); $clean_date = date("y/m/d", strtotime($messy_date));
$entry_text = $entries[$i]['entry_text']; $entry_text = $entries[$i]['entry_text'];

5
ext/chatbox/history/index.php
View File

@ -1,4 +1,4 @@
<? <?php
error_reporting(E_ALL); error_reporting(E_ALL);
include '../php/filestorage.class.php'; include '../php/filestorage.class.php';
@ -39,6 +39,9 @@
$banned = $ys->banned($post['adminInfo']['ip']); $banned = $ys->banned($post['adminInfo']['ip']);
$html .= '<div ' . ($admin ? 'rel="' . $post['adminInfo']['ip'] . '" ' : '') . 'id="ys-post-' . $id . '" class="ys-post' . ($post['admin'] ? ' ys-admin-post' : '') . ($banned ? ' ys-banned-post' : '') . '">' . "\n"; $html .= '<div ' . ($admin ? 'rel="' . $post['adminInfo']['ip'] . '" ' : '') . 'id="ys-post-' . $id . '" class="ys-post' . ($post['admin'] ? ' ys-admin-post' : '') . ($banned ? ' ys-banned-post' : '') . '">' . "\n";
$ts = '';
switch($prefs['timestamp']) { switch($prefs['timestamp']) {
case 12: case 12:
$ts = date('h:i', $post['timestamp']); $ts = date('h:i', $post['timestamp']);

7
ext/chatbox/js/yshout.js
View File

@ -374,12 +374,13 @@ YShout.prototype = {
if (!$.browser.safari) return; if (!$.browser.safari) return;
var same = []; var same = [];
for (var i = 0; i < this.p.length; i++) for (var i = 0; i < this.p.length; i++) {
if (this.p[i].adminInfo.ip == ip) if (this.p[i].adminInfo.ip == ip)
same.push(this.p[i]); same.push(this.p[i]);
}
for (var i = 0; i < same.length; i++) { for (var j = 0; j < same.length; j++) {
$('#' + same[i].id).fadeTo(this.animSpeed, .8).fadeTo(this.animSpeed, 1); $('#' + same[j].id).fadeTo(this.animSpeed, 0.8).fadeTo(this.animSpeed, 1);
} }
}, },

1
ext/danbooru_api/main.php
View File

@ -208,6 +208,7 @@ class DanbooruApi extends Extension {
// Fire off an event which should process the new file and add it to the db // Fire off an event which should process the new file and add it to the db
$fileinfo = pathinfo($filename); $fileinfo = pathinfo($filename);
$metadata = array();
$metadata['filename'] = $fileinfo['basename']; $metadata['filename'] = $fileinfo['basename'];
$metadata['extension'] = $fileinfo['extension']; $metadata['extension'] = $fileinfo['extension'];
$metadata['tags'] = $posttags; $metadata['tags'] = $posttags;

27
ext/pools/main.php
View File

@ -342,7 +342,7 @@ class Pools extends Extension {
/** /**
* Check if the given user has permission to edit/change the pool. * Check if the given user has permission to edit/change the pool.
* TODO: Should the user variable be global? * TODO: Should the user variable be global?
* @retval bool * @return bool
*/ */
private function have_permission($user, $pool) { private function have_permission($user, $pool) {
// If the pool is public and user is logged OR if the user is admin OR if the pool is owned by the user. // If the pool is public and user is logged OR if the user is admin OR if the pool is owned by the user.
@ -415,12 +415,13 @@ class Pools extends Extension {
throw new PoolCreationException("A pool using this title already exists."); throw new PoolCreationException("A pool using this title already exists.");
} }
$public = $_POST["public"] == "Y" ? "Y" : "N"; $public = $_POST["public"] === "Y" ? "Y" : "N";
$database->execute(" $database->execute("
INSERT INTO pools (user_id, public, title, description, date) INSERT INTO pools (user_id, public, title, description, date)
VALUES (:uid, :public, :title, :desc, now())", VALUES (:uid, :public, :title, :desc, now())",
array("uid"=>$user->id, "public"=>$public, "title"=>$_POST["title"], "desc"=>$_POST["description"])); array("uid"=>$user->id, "public"=>$public, "title"=>$_POST["title"], "desc"=>$_POST["description"]));
$result = array();
$result['poolID'] = $database->get_last_insert_id('pools_id_seq'); $result['poolID'] = $database->get_last_insert_id('pools_id_seq');
log_info("pools", "Pool {$result["poolID"]} created by {$user->name}"); log_info("pools", "Pool {$result["poolID"]} created by {$user->name}");
@ -429,9 +430,9 @@ class Pools extends Extension {
} }
/** /**
* Retrieve information about pools given mulitiple pool IDs. * Retrieve information about pools given multiple pool IDs.
* @param $poolID Array of integers * @param $poolID Array of integers
* @retval 2D Array * @return 2D Array
*/ */
private function get_pool(/*int*/ $poolID) { private function get_pool(/*int*/ $poolID) {
global $database; global $database;
@ -441,7 +442,7 @@ class Pools extends Extension {
/** /**
* Retrieve information about a pool given a pool ID. * Retrieve information about a pool given a pool ID.
* @param $poolID Integer * @param $poolID Integer
* @retval 2D array (with only 1 element in the one dimension) * @return 2D array (with only 1 element in the one dimension)
*/ */
private function get_single_pool(/*int*/ $poolID) { private function get_single_pool(/*int*/ $poolID) {
global $database; global $database;
@ -451,7 +452,7 @@ class Pools extends Extension {
/** /**
* Retrieve information about a pool given a pool title. * Retrieve information about a pool given a pool title.
* @param $poolTitle Integer * @param $poolTitle Integer
* @retval 2D array (with only 1 element in the one dimension) * @return 2D array (with only 1 element in the one dimension)
*/ */
private function get_single_pool_from_title(/*string*/ $poolTitle) { private function get_single_pool_from_title(/*string*/ $poolTitle) {
global $database; global $database;
@ -461,7 +462,7 @@ class Pools extends Extension {
/** /**
* Get all of the pool IDs that an image is in, given an image ID. * Get all of the pool IDs that an image is in, given an image ID.
* @param $imageID Integer * @param $imageID Integer
* @retval 2D array * @return 2D array
*/ */
private function get_pool_id(/*int*/ $imageID) { private function get_pool_id(/*int*/ $imageID) {
global $database; global $database;
@ -581,7 +582,7 @@ class Pools extends Extension {
* @see add_posts() * @see add_posts()
* @param $poolID integer * @param $poolID integer
* @param $imageID integer * @param $imageID integer
* @retval bool * @return bool
*/ */
private function check_post(/*int*/ $poolID, /*int*/ $imageID) { private function check_post(/*int*/ $poolID, /*int*/ $imageID) {
global $database; global $database;
@ -594,7 +595,7 @@ class Pools extends Extension {
* *
* @param $pool Array for the given pool * @param $pool Array for the given pool
* @param $imageID Integer * @param $imageID Integer
* @retval Integer which is the next Image ID or NULL if none. * @return Integer which is the next Image ID or NULL if none.
*/ */
private function get_next_post(/*array*/ $pool, /*int*/ $imageID) { private function get_next_post(/*array*/ $pool, /*int*/ $imageID) {
global $database; global $database;
@ -684,7 +685,7 @@ class Pools extends Extension {
/** /**
* This function gets the current order of images from a given pool. * This function gets the current order of images from a given pool.
* @param $poolID integer * @param $poolID integer
* @retval Array of image objects. * @return Array of image objects.
*/ */
private function edit_posts(/*int*/ $poolID) { private function edit_posts(/*int*/ $poolID) {
global $database; global $database;
@ -750,6 +751,7 @@ class Pools extends Extension {
*/ */
private function add_history(/*int*/ $poolID, $action, $images, $count) { private function add_history(/*int*/ $poolID, $action, $images, $count) {
global $user, $database; global $user, $database;
$database->execute(" $database->execute("
INSERT INTO pool_history (pool_id, user_id, action, images, count, date) INSERT INTO pool_history (pool_id, user_id, action, images, count, date)
VALUES (:pid, :uid, :act, :img, :count, now())", VALUES (:pid, :uid, :act, :img, :count, now())",
@ -804,6 +806,7 @@ class Pools extends Extension {
$images = explode(" ", $images); $images = explode(" ", $images);
$poolID = $entry['pool_id']; $poolID = $entry['pool_id'];
$imageArray = ""; $imageArray = "";
$newAction = -1;
if($entry['action'] == 0) { if($entry['action'] == 0) {
// READ ENTRIES // READ ENTRIES
@ -824,6 +827,10 @@ class Pools extends Extension {
$imageArray .= " ".$imageID; $imageArray .= " ".$imageID;
$newAction = 0; $newAction = 0;
} }
} else {
// FIXME: should this throw an exception instead?
log_error("pools", "Invalid history action.");
continue; // go on to the next one.
} }
$count = $database->get_one("SELECT COUNT(*) FROM pool_images WHERE pool_id=:pid", array("pid"=>$poolID)); $count = $database->get_one("SELECT COUNT(*) FROM pool_images WHERE pool_id=:pid", array("pid"=>$poolID));

2
ext/sitemap/main.php
View File

@ -62,7 +62,9 @@ class XMLSitemap extends Extension {
private function handle_full_sitemap() private function handle_full_sitemap()
{ {
global $database, $config; global $database, $config;
// add index // add index
$index = array();
$index[0] = $config->get_string("front_page"); $index[0] = $config->get_string("front_page");
$this->add_sitemap_queue($index, "weekly", "1"); $this->add_sitemap_queue($index, "weekly", "1");

1
ext/statsd/main.php
View File

@ -109,6 +109,7 @@ class StatsDInterface extends Extension {
} }
fclose($fp); fclose($fp);
} catch (Exception $e) { } catch (Exception $e) {
// ignore any failures.
} }
} }
} }

2
ext/tag_editcloud/script.js
View File

@ -20,7 +20,7 @@ Array.prototype.editcloud_remove = function (ele) {
var hide_text = null; var hide_text = null;
function tageditcloud_toggle_extra(hide) { function tageditcloud_toggle_extra(hide) {
if (hide_text == null) { if (hide_text === null) {
hide_text = hide.innerHTML; hide_text = hide.innerHTML;
} }

12
ext/tag_history/main.php
View File

@ -135,13 +135,13 @@ class Tag_History extends Extension {
// there is no history entry with that id so either the image was deleted // there is no history entry with that id so either the image was deleted
// while the user was viewing the history, someone is playing with form // while the user was viewing the history, someone is playing with form
// variables or we have messed up in code somewhere. // variables or we have messed up in code somewhere.
/* calling die() is probably not a good idea, we should throw an Exception */ /* FIXME: calling die() is probably not a good idea, we should throw an Exception */
die("Error: No tag history with specified id was found."); die("Error: No tag history with specified id was found.");
} }
// lets get the values out of the result // lets get the values out of the result
$stored_result_id = $result['id']; $stored_result_id = $result['id'];
$stored_image_id = $result['image_id']; $stored_image_id = int_escape($result['image_id']);
$stored_tags = $result['tags']; $stored_tags = $result['tags'];
log_debug("tag_history", 'Reverting tags of Image #'.$stored_image_id.' to ['.$stored_tags.']'); log_debug("tag_history", 'Reverting tags of Image #'.$stored_image_id.' to ['.$stored_tags.']');
@ -267,7 +267,7 @@ class Tag_History extends Extension {
log_info("tag_history", 'Attempting to revert edits where '.implode(" and ", $select_code)." (".implode(" / ", $select_args).")"); log_info("tag_history", 'Attempting to revert edits where '.implode(" and ", $select_code)." (".implode(" / ", $select_args).")");
// Get all the images that the given IP has changed tags on (within the timeframe) that were last editied by the given IP // Get all the images that the given IP has changed tags on (within the timeframe) that were last edited by the given IP
$result = $database->get_col(' $result = $database->get_col('
SELECT t1.image_id SELECT t1.image_id
FROM tag_histories t1 FROM tag_histories t1
@ -304,8 +304,8 @@ class Tag_History extends Extension {
} }
// lets get the values out of the result // lets get the values out of the result
$stored_result_id = $result['id']; $stored_result_id = int_escape($result['id']);
$stored_image_id = $result['image_id']; $stored_image_id = int_escape($result['image_id']);
$stored_tags = $result['tags']; $stored_tags = $result['tags'];
log_debug("tag_history", 'Reverting tags of Image #'.$stored_image_id.' to ['.$stored_tags.']'); log_debug("tag_history", 'Reverting tags of Image #'.$stored_image_id.' to ['.$stored_tags.']');
@ -351,7 +351,7 @@ class Tag_History extends Extension {
} }
// add a history entry // add a history entry
$row = $database->execute(" $database->execute("
INSERT INTO tag_histories(image_id, tags, user_id, user_ip, date_set) INSERT INTO tag_histories(image_id, tags, user_id, user_ip, date_set)
VALUES (?, ?, ?, ?, now())", VALUES (?, ?, ?, ?, now())",
array($image->id, $new_tags, $user->id, $_SERVER['REMOTE_ADDR'])); array($image->id, $new_tags, $user->id, $_SERVER['REMOTE_ADDR']));

4
ext/tag_list/main.php
View File

@ -48,7 +48,7 @@ class TagList extends Extension {
else if($event->page_matches("api/internal/tag_list/complete")) { else if($event->page_matches("api/internal/tag_list/complete")) {
if(!isset($_GET["s"])) return; if(!isset($_GET["s"])) return;
$limit = 0; //$limit = 0;
$limitSQL = ""; $limitSQL = "";
$SQLarr = array("search"=>$_GET["s"]."%"); $SQLarr = array("search"=>$_GET["s"]."%");
if(isset($_GET["limit"]) && $_GET["limit"] !== 0){ if(isset($_GET["limit"]) && $_GET["limit"] !== 0){
@ -321,7 +321,7 @@ class TagList extends Extension {
private function build_tag_list() { private function build_tag_list() {
global $database; global $database;
$tags_min = $this->get_tags_min(); //$tags_min = $this->get_tags_min();
$tag_data = $database->get_all("SELECT tag,count FROM tags ORDER BY count DESC, tag ASC LIMIT 9"); $tag_data = $database->get_all("SELECT tag,count FROM tags ORDER BY count DESC, tag ASC LIMIT 9");
$html = "<table>"; $html = "<table>";

4
ext/update/script.js
View File

@ -2,9 +2,9 @@ $(function() {
if($('#updatecheck').length !== 0){ if($('#updatecheck').length !== 0){
$.getJSON('https://api.github.com/repos/shish/shimmie2/commits', function(data){ $.getJSON('https://api.github.com/repos/shish/shimmie2/commits', function(data){
var c = data[0]; var c = data[0];
$('#updatecheck').html('<a href="'+c['html_url']+'">'+c['sha']+'</a>' + " ("+c['commit']['message']+")"); $('#updatecheck').html('<a href="'+ c.html_url+'">'+ c.sha+'</a>' + " ("+ c.commit.message+")");
var params = $.param({sha: c['sha'], date: c['commit']['committer']['date']}); var params = $.param({sha: c.sha, date: c.commit.committer.date});
$('#updatelink').attr('href', function(i, val){ return val + "?" + params; }); $('#updatelink').attr('href', function(i, val){ return val + "?" + params; });
$('#updatelink').text("Update"); $('#updatelink').text("Update");
}).fail(function(){ }).fail(function(){

2
ext/upload/main.php
View File

@ -279,6 +279,7 @@ class Upload extends Extension {
} }
$pathinfo = pathinfo($file['name']); $pathinfo = pathinfo($file['name']);
$metadata = array();
$metadata['filename'] = $pathinfo['basename']; $metadata['filename'] = $pathinfo['basename'];
$metadata['extension'] = $pathinfo['extension']; $metadata['extension'] = $pathinfo['extension'];
$metadata['tags'] = $tags; $metadata['tags'] = $tags;
@ -349,6 +350,7 @@ class Upload extends Extension {
}else{ }else{
global $user; global $user;
$pathinfo = pathinfo($url); $pathinfo = pathinfo($url);
$metadata = array();
$metadata['filename'] = $filename; $metadata['filename'] = $filename;
$metadata['extension'] = getExtension($headers['Content-Type']) ?: $pathinfo['extension']; $metadata['extension'] = getExtension($headers['Content-Type']) ?: $pathinfo['extension'];
$metadata['tags'] = $tags; $metadata['tags'] = $tags;

10
themes/danbooru/layout.class.php
View File

@ -47,7 +47,7 @@ class Layout {
global $config, $user; global $config, $user;
$theme_name = $config->get_string('theme'); $theme_name = $config->get_string('theme');
$base_href = $config->get_string('base_href'); //$base_href = $config->get_string('base_href');
$data_href = get_base_href(); $data_href = get_base_href();
$contact_link = $config->get_string('contact_link'); $contact_link = $config->get_string('contact_link');
@ -122,11 +122,9 @@ class Layout {
$custom_sublinks = ""; $custom_sublinks = "";
// hack // hack
global $user;
$username = url_escape($user->name); $username = url_escape($user->name);
// hack // hack
$qp = explode("/", ltrim(@$_GET["q"], "/")); $qp = explode("/", ltrim(@$_GET["q"], "/"));
$hw = class_exists("Wiki");
// php sucks // php sucks
switch($qp[0]) { switch($qp[0]) {
default: default:
@ -142,10 +140,10 @@ class Layout {
case "upload": case "upload":
if(class_exists("NumericScore")){ $custom_sublinks .= "<li><b>Popular by </b><a href='".make_link('popular_by_day')."'>Day</a>/<a href='".make_link('popular_by_month')."'>Month</a>/<a href='".make_link('popular_by_year')."'>Year</a></li>";} if(class_exists("NumericScore")){ $custom_sublinks .= "<li><b>Popular by </b><a href='".make_link('popular_by_day')."'>Day</a>/<a href='".make_link('popular_by_month')."'>Month</a>/<a href='".make_link('popular_by_year')."'>Year</a></li>";}
$custom_sublinks .= "<li><a href='".make_link('post/list')."'>All</a></li>"; $custom_sublinks .= "<li><a href='".make_link('post/list')."'>All</a></li>";
if(class_exists("Favorites")){ $custom_sublinks .= "<li><a href='".make_link("post/list/favorited_by=$username/1")."'>My Favorites</a></li>";} if(class_exists("Favorites")){ $custom_sublinks .= "<li><a href='".make_link("post/list/favorited_by={$username}/1")."'>My Favorites</a></li>";}
if(class_exists("RSS_Images")){ $custom_sublinks .= "<li><a href='".make_link('rss/images')."'>Feed</a></li>";} if(class_exists("RSS_Images")){ $custom_sublinks .= "<li><a href='".make_link('rss/images')."'>Feed</a></li>";}
if(class_exists("RandomImage")){ $custom_sublinks .= "<li><a href='".make_link("random_image/view")."'>Random Image</a></li>";} if(class_exists("RandomImage")){ $custom_sublinks .= "<li><a href='".make_link("random_image/view")."'>Random Image</a></li>";}
if($hw){ $custom_sublinks .= "<li><a href='".make_link("wiki/posts")."'>Help</a></li>"; if(class_exists("Wiki")){ $custom_sublinks .= "<li><a href='".make_link("wiki/posts")."'>Help</a></li>";
}else{ $custom_sublinks .= "<li><a href='".make_link("ext_doc/index")."'>Help</a></li>";} }else{ $custom_sublinks .= "<li><a href='".make_link("ext_doc/index")."'>Help</a></li>";}
break; break;
case "comment": case "comment":
@ -252,7 +250,7 @@ EOD;
$re1='.*?'; $re1='.*?';
$re2='((?:[a-z][a-z_]+))'; $re2='((?:[a-z][a-z_]+))';
if ($c=preg_match_all ("/".$re1.$re2."/is", $url, $matches)) { if (preg_match_all("/".$re1.$re2."/is", $url, $matches)) {
$url=$matches[1][0]; $url=$matches[1][0];
} }

14
themes/danbooru2/layout.class.php
View File

@ -46,9 +46,9 @@ class Layout {
public function display_page($page) { public function display_page($page) {
global $config, $user; global $config, $user;
$theme_name = $config->get_string('theme'); //$theme_name = $config->get_string('theme');
$base_href = $config->get_string('base_href'); //$base_href = $config->get_string('base_href');
$data_href = get_base_href(); //$data_href = get_base_href();
$contact_link = $config->get_string('contact_link'); $contact_link = $config->get_string('contact_link');
@ -124,11 +124,9 @@ class Layout {
$custom_sublinks = ""; $custom_sublinks = "";
// hack // hack
global $user;
$username = url_escape($user->name); $username = url_escape($user->name);
// hack // hack
$qp = explode("/", ltrim(@$_GET["q"], "/")); $qp = explode("/", ltrim(@$_GET["q"], "/"));
$hw = class_exists("Wiki");
// php sucks // php sucks
switch($qp[0]) { switch($qp[0]) {
default: default:
@ -156,11 +154,11 @@ class Layout {
case "upload": case "upload":
if(class_exists("NumericScore")){ $custom_sublinks .= "<li><b>Popular by </b><a href='".make_link('popular_by_day')."'>Day</a>/<a href='".make_link('popular_by_month')."'>Month</a>/<a href='".make_link('popular_by_year')."'>Year</a></li>";} if(class_exists("NumericScore")){ $custom_sublinks .= "<li><b>Popular by </b><a href='".make_link('popular_by_day')."'>Day</a>/<a href='".make_link('popular_by_month')."'>Month</a>/<a href='".make_link('popular_by_year')."'>Year</a></li>";}
$custom_sublinks .= "<li><a href='".make_link('post/list')."'>Listing</a></li>"; $custom_sublinks .= "<li><a href='".make_link('post/list')."'>Listing</a></li>";
if(class_exists("Favorites")){ $custom_sublinks .= "<li><a href='".make_link("post/list/favorited_by=$username/1")."'>My Favorites</a></li>";} if(class_exists("Favorites")){ $custom_sublinks .= "<li><a href='".make_link("post/list/favorited_by={$username}/1")."'>My Favorites</a></li>";}
if(class_exists("RSS_Images")){ $custom_sublinks .= "<li><a href='".make_link('rss/images')."'>Feed</a></li>";} if(class_exists("RSS_Images")){ $custom_sublinks .= "<li><a href='".make_link('rss/images')."'>Feed</a></li>";}
if(class_exists("RandomImage")){ $custom_sublinks .= "<li><a href='".make_link("random_image/view")."'>Random</a></li>";} if(class_exists("RandomImage")){ $custom_sublinks .= "<li><a href='".make_link("random_image/view")."'>Random</a></li>";}
$custom_sublinks .= "<li><a href='".make_link('upload')."'>Upload</a></li>"; $custom_sublinks .= "<li><a href='".make_link('upload')."'>Upload</a></li>";
if($hw){ $custom_sublinks .= "<li><a href='".make_link("wiki/posts")."'>Help</a></li>"; if(class_exists("Wiki")){ $custom_sublinks .= "<li><a href='".make_link("wiki/posts")."'>Help</a></li>";
}else{ $custom_sublinks .= "<li><a href='".make_link("ext_doc/index")."'>Help</a></li>";} }else{ $custom_sublinks .= "<li><a href='".make_link("ext_doc/index")."'>Help</a></li>";}
break; break;
case "comment": case "comment":
@ -278,7 +276,7 @@ EOD;
$re1='.*?'; $re1='.*?';
$re2='((?:[a-z][a-z_]+))'; $re2='((?:[a-z][a-z_]+))';
if ($c=preg_match_all ("/".$re1.$re2."/is", $url, $matches)) { if (preg_match_all("/".$re1.$re2."/is", $url, $matches)) {
$url=$matches[1][0]; $url=$matches[1][0];
} }