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

Even more linting and cleaning.

Browse Source
This commit is contained in:
jgen 2014-04-19 02:33:34 -04:00
parent 2da8c19a07
commit 28d83fda0d
7 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/database.class.php
View File

@ -229,7 +229,7 @@ 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() {} public function __construct($args) {}
public function get($key) { public function get($key) {
assert(!is_null($key)); assert(!is_null($key));

3
core/util.inc.php
View File

@ -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;

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'];

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

@ -380,7 +380,7 @@ YShout.prototype = {
} }
for (var j = 0; j < same.length; j++) { for (var j = 0; j < same.length; j++) {
$('#' + same[j].id).fadeTo(this.animSpeed, .8).fadeTo(this.animSpeed, 1); $('#' + same[j].id).fadeTo(this.animSpeed, 0.8).fadeTo(this.animSpeed, 1);
} }
}, },

5
ext/pools/main.php
View File

@ -806,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
@ -826,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));

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>";