badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More linting. Explicitly declare these class variables, as well as comment out dead code.

Browse source
This commit is contained in:
jgen 2014-04-24 22:13:00 -04:00
parent 6e4ae229ef
commit 780d5f8709
8 changed files with 69 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ext/chatbox/php/ajaxcall.class.php
View file

@ -1,5 +1,8 @@
<?php <?php
class AjaxCall { class AjaxCall {
public $reqType;
function AjaxCall($log = null) { function AjaxCall($log = null) {
header('Content-type: application/json'); header('Content-type: application/json');
session_start(); session_start();
@ -24,8 +27,10 @@
$ys = ys($_SESSION['yLog']); $ys = ys($_SESSION['yLog']);
if ($ys->banned(ip())) { $this->sendBanned(); break; } if ($ys->banned(ip())) { $this->sendBanned(); break; }
if ($post = $ys->post($nickname, $message)) // To use $post somewheres later if ($post = $ys->post($nickname, $message)) {
$this->sendUpdates(); // To use $post somewheres later
$this->sendUpdates();
}
break; break;
case 'refresh': case 'refresh':
@ -138,7 +143,6 @@
$send['error'] = false; $send['error'] = false;
echo jsonEncode($send); echo jsonEncode($send);
} }
function unbanSelf() { function unbanSelf() {
@ -235,7 +239,7 @@
} }
function clearLog() { function clearLog() {
$log = $_POST['log']; //$log = $_POST['log'];
$send = array(); $send = array();
$ys = ys($_SESSION['yLog']); $ys = ys($_SESSION['yLog']);
@ -254,10 +258,10 @@
function clearLogs() { function clearLogs() {
global $prefs; global $prefs;
$log = $_POST['log']; //$log = $_POST['log'];
$send = array(); $send = array();
$ys = ys($_SESSION['yLog']); //$ys = ys($_SESSION['yLog']);
switch(true) { switch(true) {
case !loggedIn(): case !loggedIn():

5
ext/chatbox/php/filestorage.class.php
View file

@ -2,6 +2,8 @@
class FileStorage { class FileStorage {
public $shoutLog, $path, $handle;
function FileStorage($path, $shoutLog = false) { function FileStorage($path, $shoutLog = false) {
$this->shoutLog = $shoutLog; $this->shoutLog = $shoutLog;
$folder = 'logs'; $folder = 'logs';
@ -56,7 +58,6 @@ class FileStorage {
fseek($this->handle, 0); fseek($this->handle, 0);
//return stream_get_contents($this->handle); //return stream_get_contents($this->handle);
return file_get_contents($this->path); return file_get_contents($this->path);
} }
function write($contents) { function write($contents) {
@ -79,7 +80,5 @@ class FileStorage {
$this->save($default, false); $this->save($default, false);
return $default; return $default;
} }
} }
?>

9
ext/chatbox/php/functions.php
View file

@ -16,8 +16,8 @@
} }
function getVar($name) { function getVar($name) {
if (isset($_POST[$name])) return $_POST[$name]; if (isset($_POST[$name])) { return $_POST[$name]; }
if (isset($_GET[$name])) return $_GET[$name]; if (isset($_GET[$name])) { return $_GET[$name]; }
return null; return null;
} }
@ -28,7 +28,7 @@
} }
function magic($s) { function magic($s) {
if (get_magic_quotes_gpc()) $s = stripslashes($s); if (get_magic_quotes_gpc()) { $s = stripslashes($s); }
return $s; return $s;
} }
@ -147,6 +147,5 @@
return $_SESSION['yLoginHash'] == md5($prefs['password']); return $_SESSION['yLoginHash'] == md5($prefs['password']);
return false; return false;
} }
?>

1
ext/chatbox/php/yshout.class.php
View file

@ -250,4 +250,3 @@ class YShout {
} }
?>

31
ext/tagger/script.js
View file

@ -1,4 +1,4 @@
/*jshint bitwise:true, curly:true, forin:false, noarg:true, noempty:true, nonew:true, undef:true, strict:false, browser:true, jquery:true */ /*jshint dojo:true, forin:false, nonew:true, undef:true, strict:false, browser:true, jquery:true */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
* Tagger - Advanced Tagging v2 * * Tagger - Advanced Tagging v2 *
@ -27,7 +27,7 @@ var Tagger = {
this.tag.suggest = null; this.tag.suggest = null;
this.tag.image_tags(); this.tag.image_tags();
// reveal // reveal
this.editor.container.style.display = ""; this.editor.container.style.display = "";
// dragging // dragging
@ -41,7 +41,7 @@ var Tagger = {
}, },
alert : function (type,text,timeout) { alert : function (type,text,timeout) {
var id = "tagger_alert-"+type var id = "tagger_alert-"+type;
var t_alert = byId(id); var t_alert = byId(id);
if (t_alert) { if (t_alert) {
if(text === false) { if(text === false) {
@ -152,10 +152,10 @@ var Tagger = {
}, },
ajax : function (url, callback) { ajax : function (url, callback) {
var http = (new XMLHttpRequest || new ActiveXObject("Microsoft.XMLHTTP")); var http = (new XMLHttpRequest() || new ActiveXObject("Microsoft.XMLHTTP"));
http.open("GET",url,true); http.open("GET",url,true);
http.onreadystatechange = function () { http.onreadystatechange = function () {
if(http.readyState == 4) callback(http); if(http.readyState == 4) { callback(http); }
}; };
http.send(null); http.send(null);
} }
@ -164,22 +164,19 @@ var Tagger = {
position : { position : {
set : function (x,y) { set : function (x,y) {
if (!x || !y) { if (!x || !y) {
with(this.parent.editor.container.style) { this.parent.editor.container.style.top = "25px";
top = "25px"; this.parent.editor.container.style.left = "";
left = ""; this.parent.editor.container.style.right = "25px";
right = "25px"; this.parent.editor.container.style.bottom = "";
bottom = "";
}
var xy = this.get(); var xy = this.get();
x = xy[0]; x = xy[0];
y = xy[1]; y = xy[1];
} }
with(this.parent.editor.container.style) { this.parent.editor.container.style.top = y+"px";
top = y+"px"; this.parent.editor.container.style.left = x+"px";
left = x+"px"; this.parent.editor.container.style.right = "";
right = ""; this.parent.editor.container.style.bottom = "";
bottom = "";
}
}, },
get : function () { get : function () {

8
ext/tagger/theme.php
View file

@ -11,10 +11,14 @@ class taggerTheme extends Themelet {
// Initialization code // Initialization code
$base_href = get_base_href(); $base_href = get_base_href();
// TODO: AJAX test and fallback. // TODO: AJAX test and fallback.
$page->add_html_header("<script src='$base_href/ext/tagger/webtoolkit.drag.js' type='text/javascript'></script>"); $page->add_html_header("<script src='$base_href/ext/tagger/webtoolkit.drag.js' type='text/javascript'></script>");
$page->add_block(new Block(null, $page->add_block(new Block(null,
"<script type='text/javascript'>Tagger.initialize(" "<script type='text/javascript'>
.$event->get_image()->id.");</script>","main",1000)); $( document ).ready(function() {
Tagger.initialize(".$event->get_image()->id.");
});
</script>","main",1000));
// Tagger block // Tagger block
$page->add_block( new Block( $page->add_block( new Block(

12
themes/futaba/themelet.class.php
View file

@ -11,7 +11,7 @@ class Themelet extends BaseThemelet {
private function gen_page_link($base_url, $query, $page, $name) { private function gen_page_link($base_url, $query, $page, $name) {
$link = make_link("$base_url/$page", $query); $link = make_link("$base_url/$page", $query);
return "[<a href='$link'>$name</a>]"; return "[<a href='$link'>{$name}</a>]";
} }
private function gen_page_link_block($base_url, $query, $page, $current_page, $name) { private function gen_page_link_block($base_url, $query, $page, $current_page, $name) {
@ -25,16 +25,16 @@ class Themelet extends BaseThemelet {
private function build_paginator($current_page, $total_pages, $base_url, $query) { private function build_paginator($current_page, $total_pages, $base_url, $query) {
$next = $current_page + 1; $next = $current_page + 1;
$prev = $current_page - 1; $prev = $current_page - 1;
$rand = mt_rand(1, $total_pages); //$rand = mt_rand(1, $total_pages);
$at_start = ($current_page <= 1 || $total_pages <= 1); $at_start = ($current_page <= 1 || $total_pages <= 1);
$at_end = ($current_page >= $total_pages); $at_end = ($current_page >= $total_pages);
$first_html = $at_start ? "First" : $this->gen_page_link($base_url, $query, 1, "First"); //$first_html = $at_start ? "First" : $this->gen_page_link($base_url, $query, 1, "First");
$prev_html = $at_start ? "Prev" : $this->gen_page_link($base_url, $query, $prev, "Prev"); $prev_html = $at_start ? "Prev" : $this->gen_page_link($base_url, $query, $prev, "Prev");
$random_html = $this->gen_page_link($base_url, $query, $rand, "Random"); //$random_html = $this->gen_page_link($base_url, $query, $rand, "Random");
$next_html = $at_end ? "Next" : $this->gen_page_link($base_url, $query, $next, "Next"); $next_html = $at_end ? "Next" : $this->gen_page_link($base_url, $query, $next, "Next");
$last_html = $at_end ? "Last" : $this->gen_page_link($base_url, $query, $total_pages, "Last"); //$last_html = $at_end ? "Last" : $this->gen_page_link($base_url, $query, $total_pages, "Last");
$start = $current_page-5 > 1 ? $current_page-5 : 1; $start = $current_page-5 > 1 ? $current_page-5 : 1;
$end = $start+10 < $total_pages ? $start+10 : $total_pages; $end = $start+10 < $total_pages ? $start+10 : $total_pages;
@ -47,7 +47,7 @@ class Themelet extends BaseThemelet {
//return "<p class='paginator'>$first_html | $prev_html | $random_html | $next_html | $last_html". //return "<p class='paginator'>$first_html | $prev_html | $random_html | $next_html | $last_html".
// "<br>&lt;&lt; $pages_html &gt;&gt;</p>"; // "<br>&lt;&lt; $pages_html &gt;&gt;</p>";
return "<p class='paginator'>$prev_html $pages_html $next_html</p>"; return "<p class='paginator'>{$prev_html} {$pages_html} {$next_html}</p>";
} }
} }

51
themes/lite/layout.class.php
View file

@ -16,21 +16,21 @@ class Layout {
$h = $block->header; $h = $block->header;
$b = $block->body; $b = $block->body;
$i = str_replace(' ', '_', $h) . $salt; $i = str_replace(' ', '_', $h) . $salt;
$html = "<section id='$i'>"; $html = "<section id='{$i}'>";
if(!is_null($h)) { if(!is_null($h)) {
if($salt == "main") { if($salt == "main") {
$html .= "<div class='maintop navside tab shm-toggler' data-toggle-sel='#$i'>$h</div>"; $html .= "<div class='maintop navside tab shm-toggler' data-toggle-sel='#{$i}'>{$h}</div>";
} else { } else {
$html .= "<div class='navtop navside tab shm-toggler' data-toggle-sel='#$i'>$h</div>"; $html .= "<div class='navtop navside tab shm-toggler' data-toggle-sel='#{$i}'>{$h}</div>";
} }
} }
if(!is_null($b)) { if(!is_null($b)) {
if($salt =="main") { if($salt =="main") {
$html .= "<div class='blockbody'>$b</div>"; $html .= "<div class='blockbody'>{$b}</div>";
} }
else { else {
$html .= " $html .= "
<div class='navside tab'>$b</div> <div class='navside tab'>{$b}</div>
"; ";
} }
} }
@ -56,11 +56,11 @@ class Layout {
for($i=0; $i < $count_pages_matched; $i++) { for($i=0; $i < $count_pages_matched; $i++) {
if($url == $pages_matched[$i]) { if($url == $pages_matched[$i]) {
$html = "<a class='tab-selected' href='$link'>$desc</a>"; $html = "<a class='tab-selected' href='{$link}'>{$desc}</a>";
} }
} }
if(is_null($html)) {$html = "<a class='tab' href='$link'>$desc</a>";} if(is_null($html)) {$html = "<a class='tab' href='{$link}'>{$desc}</a>";}
return $html; return $html;
} }
@ -79,12 +79,12 @@ class Layout {
$header_html = ""; $header_html = "";
ksort($page->html_headers); ksort($page->html_headers);
foreach($page->html_headers as $line) { foreach($page->html_headers as $line) {
$header_html .= "\t\t$line\n"; $header_html .= "\t\t{$line}\n";
} }
$menu = "<div class='menu'> $menu = "<div class='menu'>
<script type='text/javascript' src='$data_href/themes/$theme_name/wz_tooltip.js'></script> <script type='text/javascript' src='{$data_href}/themes/{$theme_name}/wz_tooltip.js'></script>
<a href='".make_link()."' onmouseover='Tip(&#39;Home&#39;, BGCOLOR, &#39;#C3D2E0&#39;, FADEIN, 100)' onmouseout='UnTip()'><img src='$data_href/favicon.ico' style='position: relative; top: 3px;'></a> <a href='".make_link()."' onmouseover='Tip(&#39;Home&#39;, BGCOLOR, &#39;#C3D2E0&#39;, FADEIN, 100)' onmouseout='UnTip()'><img src='{$data_href}/favicon.ico' style='position: relative; top: 3px;'></a>
<b>{$site_name}</b> "; <b>{$site_name}</b> ";
// Custom links: These appear on the menu. // Custom links: These appear on the menu.
@ -105,7 +105,7 @@ class Layout {
$custom_links .= $this->navlinks(make_link('wiki/rules'), "Rules", array("wiki/rules")); $custom_links .= $this->navlinks(make_link('wiki/rules'), "Rules", array("wiki/rules"));
$custom_links .= $this->navlinks(make_link('wiki'), "Wiki", array("wiki")); $custom_links .= $this->navlinks(make_link('wiki'), "Wiki", array("wiki"));
} }
$menu .= "$custom_links</div>"; $menu .= "{$custom_links}</div>";
$left_block_html = ""; $left_block_html = "";
$main_block_html = ""; $main_block_html = "";
@ -134,11 +134,9 @@ class Layout {
$custom_sublinks = "<div class='sbar'>"; $custom_sublinks = "<div class='sbar'>";
// 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");
$cs = ""; $cs = "";
// php sucks // php sucks
@ -153,12 +151,14 @@ class Layout {
# the subnav links aren't shown, but it would # the subnav links aren't shown, but it would
# be nice to be correct # be nice to be correct
case "post": case "post":
if(class_exists("NumericScore")){ $cs .= "<b>Popular by </b><a href='".make_link('popular_by_day')."'>Day</a><b>/</b><a href='".make_link('popular_by_month')."'>Month</a><b>/</b><a href='".make_link('popular_by_year')."'>Year</a> ";} if(class_exists("NumericScore")){
$cs .= "<b>Popular by </b><a href='".make_link('popular_by_day')."'>Day</a><b>/</b><a href='".make_link('popular_by_month')."'>Month</a><b>/</b><a href='".make_link('popular_by_year')."'>Year</a> ";
}
$cs .= "<a class='tab' href='".make_link('post/list')."'>All</a>"; $cs .= "<a class='tab' href='".make_link('post/list')."'>All</a>";
if(class_exists("Favorites")){ $cs .= "<a class='tab' href='".make_link("post/list/favorited_by=$username/1")."'>My Favorites</a>";} if(class_exists("Favorites")){ $cs .= "<a class='tab' href='".make_link("post/list/favorited_by={$username}/1")."'>My Favorites</a>";}
if(class_exists("RSS_Images")){ $cs .= "<a class='tab' href='".make_link('rss/images')."'>Feed</a>";} if(class_exists("RSS_Images")){ $cs .= "<a class='tab' href='".make_link('rss/images')."'>Feed</a>";}
if(class_exists("Random_Image")){ $cs .= "<a class='tab' href='".make_link("random_image/view")."'>Random Image</a>";} if(class_exists("Random_Image")){ $cs .= "<a class='tab' href='".make_link("random_image/view")."'>Random Image</a>";}
if($hw){ $cs .= "<a class='tab' href='".make_link("wiki/posts")."'>Help</a>"; if(class_exists("Wiki")){ $cs .= "<a class='tab' href='".make_link("wiki/posts")."'>Help</a>";
}else{ $cs .= "<a class='tab' href='".make_link("ext_doc/index")."'>Help</a>";} }else{ $cs .= "<a class='tab' href='".make_link("ext_doc/index")."'>Help</a>";}
break; break;
case "comment": case "comment":
@ -187,7 +187,7 @@ class Layout {
$cs .= "<a class='tab' href='".make_link("ext_doc/tag_edit")."'>Help</a>"; $cs .= "<a class='tab' href='".make_link("ext_doc/tag_edit")."'>Help</a>";
break; break;
case "upload": case "upload":
if($hw) $cs .= "<a class='tab' href='".make_link("wiki/upload_guidelines")."'>Guidelines</a>"; if(class_exists("Wiki")) { $cs .= "<a class='tab' href='".make_link("wiki/upload_guidelines")."'>Guidelines</a>"; }
break; break;
case "random": case "random":
$cs .= "<a class='tab' href='".make_link('random/view')."'>Shuffle</a>"; $cs .= "<a class='tab' href='".make_link('random/view')."'>Shuffle</a>";
@ -197,25 +197,28 @@ class Layout {
$cs .= "<a class='tab' href='".make_link('featured/download')."'>Download</a>"; $cs .= "<a class='tab' href='".make_link('featured/download')."'>Download</a>";
break; break;
} }
if($cs == "") {$custom_sublinks = "";} else {
$custom_sublinks .= "$cs</div>";}
if($cs == "") {
$custom_sublinks = "";
} else {
$custom_sublinks .= "$cs</div>";
}
$debug = get_debug_info(); $debug = get_debug_info();
$contact = empty($contact_link) ? "" : "<br><a href='mailto:$contact_link'>Contact</a>"; $contact = empty($contact_link) ? "" : "<br><a href='mailto:{$contact_link}'>Contact</a>";
//$subheading = empty($page->subheading) ? "" : "<div id='subtitle'>{$page->subheading}</div>"; //$subheading = empty($page->subheading) ? "" : "<div id='subtitle'>{$page->subheading}</div>";
/*$wrapper = ""; /*$wrapper = "";
if(strlen($page->heading) > 100) { if(strlen($page->heading) > 100) {
$wrapper = ' style="height: 3em; overflow: auto;"'; $wrapper = ' style="height: 3em; overflow: auto;"';
}*/ }*/
if($page->left_enabled==false) { if($page->left_enabled == false) {
$left_block_html = ""; $left_block_html = "";
$main_block_html = "<article id='body_noleft'>$main_block_html</article>"; $main_block_html = "<article id='body_noleft'>{$main_block_html}</article>";
} else { } else {
$left_block_html = "<nav>$left_block_html</nav>"; $left_block_html = "<nav>{$left_block_html}</nav>";
$main_block_html = "<article>$main_block_html</article>"; $main_block_html = "<article>{$main_block_html}</article>";
} }
$flash = get_prefixed_cookie("flash_message"); $flash = get_prefixed_cookie("flash_message");