diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 4ff51349..b8c0837b 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -3,4 +3,4 @@ imports: - php filter: - excluded_paths: [lib/*,ext/tagger/script.js] + excluded_paths: [lib/*,ext/tagger/script.js,ext/chatbox/*] diff --git a/core/config.class.php b/core/config.class.php index c0de6e25..ebd3e8b5 100644 --- a/core/config.class.php +++ b/core/config.class.php @@ -328,8 +328,9 @@ class StaticConfig extends BaseConfig { */ public function __construct($filename) { if(file_exists($filename)) { + $config = array(); require_once $filename; - if(isset($config)) { + if(!empty($config)) { $this->values = $config; } else { diff --git a/ext/comment/theme.php b/ext/comment/theme.php index 11f440d1..b6a94246 100644 --- a/ext/comment/theme.php +++ b/ext/comment/theme.php @@ -66,7 +66,6 @@ class CommentListTheme extends Themelet { $comment_count = count($comments); if($comment_limit > 0 && $comment_count > $comment_limit) { - $hidden = $comment_count - $comment_limit; $comment_html .= '

showing '.$comment_limit.' of '.$comment_count.' comments

'; $comments = array_slice($comments, -$comment_limit); $this->show_anon_id = false; @@ -233,7 +232,6 @@ class CommentListTheme extends Themelet { $i_uid = int_escape($comment->owner_id); $h_name = html_escape($comment->owner_name); - $h_poster_ip = html_escape($comment->poster_ip); $h_timestamp = autodate($comment->posted); $h_comment = ($trim ? truncate($tfe->stripped, 50) : $tfe->formatted); $i_comment_id = int_escape($comment->comment_id); diff --git a/ext/ipban/theme.php b/ext/ipban/theme.php index 9b9996e6..a2f14f21 100644 --- a/ext/ipban/theme.php +++ b/ext/ipban/theme.php @@ -15,7 +15,6 @@ class IPBanTheme extends Themelet { global $database, $user; $h_bans = ""; $prefix = ($database->get_driver_name() == "sqlite" ? "bans." : ""); - $prefix2 = ($database->get_driver_name() == "sqlite" ? "users." : ""); foreach($bans as $ban) { $end_human = date('Y-m-d', $ban[$prefix.'end_timestamp']); $h_bans .= " diff --git a/ext/tag_history/main.php b/ext/tag_history/main.php index eefc3165..fe4b807a 100644 --- a/ext/tag_history/main.php +++ b/ext/tag_history/main.php @@ -143,7 +143,6 @@ class Tag_History extends Extension { } // lets get the values out of the result - $stored_result_id = $result['id']; $stored_image_id = int_escape($result['image_id']); $stored_tags = $result['tags']; diff --git a/ext/update/main.php b/ext/update/main.php index cd70f1cd..aed17253 100644 --- a/ext/update/main.php +++ b/ext/update/main.php @@ -80,7 +80,6 @@ class Update extends Extension { global $config, $page; $commitSHA = $_GET['sha']; - $g_userrepo = $config->get_string('update_guserrepo'); log_info("update", "Download succeeded. Attempting to update Shimmie."); $config->set_bool("in_upgrade", TRUE); diff --git a/install.php b/install.php index ef1d5340..df4520ef 100644 --- a/install.php +++ b/install.php @@ -459,7 +459,7 @@ function write_config() { // {{{ folder manually. Make sure that when you save it, there is no whitespace before the "<?php" or after the "?>" -

+

Once done, Click here to Continue.

diff --git a/themes/lite/user.theme.php b/themes/lite/user.theme.php index 6bcf3370..10638298 100644 --- a/themes/lite/user.theme.php +++ b/themes/lite/user.theme.php @@ -35,7 +35,6 @@ class CustomUserPageTheme extends UserPageTheme { } public function display_user_block(Page $page, User $user, $parts) { - $h_name = html_escape($user->name); $html = ""; $blocked = array("Pools", "Pool Changes", "Alias Editor", "My Profile"); foreach($parts as $part) {