".make_form(make_link("tag_history/revert"))."
@@ -91,7 +91,7 @@ class Tag_HistoryTheme extends Themelet {
$page->add_block(new Block("Tag History", $history_html, "main", 10));
}
- public function display_history_link(Page $page, $image_id) {
+ public function display_history_link(Page $page, /*int*/ $image_id) {
$link = '
';
$page->add_block(new Block(null, $link, "main", 5));
}
@@ -99,7 +99,7 @@ class Tag_HistoryTheme extends Themelet {
/*
* Add a section to the admin page.
*/
- public function display_admin_block($validation_msg='') {
+ public function display_admin_block(/*string*/ $validation_msg='') {
global $page;
if (!empty($validation_msg)) {
@@ -130,7 +130,7 @@ class Tag_HistoryTheme extends Themelet {
$page->add_block(new Block("Revert by IP", $html));
}
- public function add_status($title, $body) {
+ public function add_status(/*string*/ $title, /*string*/ $body) {
$this->messages[] = '
';
}
}
diff --git a/contrib/twitter_soc/main.php b/contrib/twitter_soc/main.php
index 90f60658..c81a2d6a 100644
--- a/contrib/twitter_soc/main.php
+++ b/contrib/twitter_soc/main.php
@@ -2,6 +2,7 @@
/*
* Name: Tweet!
* Author: Shish
+ * Link: http://code.shishnet.org/shimmie2/
* License: GPLv2
* Description: Show a twitter feed with the Sea of Clouds script
*/
diff --git a/contrib/twitter_soc/theme.php b/contrib/twitter_soc/theme.php
index be5c68fe..efbf7959 100644
--- a/contrib/twitter_soc/theme.php
+++ b/contrib/twitter_soc/theme.php
@@ -4,7 +4,7 @@ class TwitterSocTheme extends Themelet {
/*
* Show $text on the $page
*/
- public function display_feed(Page $page, $username) {
+ public function display_feed(Page $page, /*string*/ $username) {
$page->add_block(new Block("Tweets", '
Follow us on Twitter
diff --git a/contrib/word_filter/main.php b/contrib/word_filter/main.php
index df13e73f..f85cc3de 100644
--- a/contrib/word_filter/main.php
+++ b/contrib/word_filter/main.php
@@ -2,6 +2,7 @@
/*
* Name: Word Filter
* Author: Shish
+ * Link: http://code.shishnet.org/shimmie2/
* License: GPLv2
* Description: Simple search and replace
*/
@@ -22,7 +23,7 @@ class WordFilter extends Extension {
$event->panel->add_block($sb);
}
- private function filter($text) {
+ private function filter(/*string*/ $text) {
$map = $this->get_map();
foreach($map as $search => $replace) {
$search = trim($search);
diff --git a/core/util.inc.php b/core/util.inc.php
index 69822c94..4fa1eb88 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -671,16 +671,16 @@ define("SCORE_LOG_NOTSET", 0);
/**
* A shorthand way to send a LogEvent
*/
-function log_msg($section, $priority, $message) {
+function log_msg(/*string*/ $section, /*int*/ $priority, /*string*/ $message) {
send_event(new LogEvent($section, $priority, $message));
}
// More shorthand ways of logging
-function log_debug($section, $message) {log_msg($section, SCORE_LOG_DEBUG, $message);}
-function log_info($section, $message) {log_msg($section, SCORE_LOG_INFO, $message);}
-function log_warning($section, $message) {log_msg($section, SCORE_LOG_WARNING, $message);}
-function log_error($section, $message) {log_msg($section, SCORE_LOG_ERROR, $message);}
-function log_critical($section, $message) {log_msg($section, SCORE_LOG_CRITICAL, $message);}
+function log_debug(/*string*/ $section, /*string*/ $message) {log_msg($section, SCORE_LOG_DEBUG, $message);}
+function log_info(/*string*/ $section, /*string*/ $message) {log_msg($section, SCORE_LOG_INFO, $message);}
+function log_warning(/*string*/ $section, /*string*/ $message) {log_msg($section, SCORE_LOG_WARNING, $message);}
+function log_error(/*string*/ $section, /*string*/ $message) {log_msg($section, SCORE_LOG_ERROR, $message);}
+function log_critical(/*string*/ $section, /*string*/ $message) {log_msg($section, SCORE_LOG_CRITICAL, $message);}
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
diff --git a/ext/ext_manager/theme.php b/ext/ext_manager/theme.php
index 25f4aac7..7dd74d5c 100644
--- a/ext/ext_manager/theme.php
+++ b/ext/ext_manager/theme.php
@@ -1,7 +1,7 @@
Enabled" : "";
$html = "
diff --git a/ext/handle_pixel/main.php b/ext/handle_pixel/main.php
index 2904ed0f..b5bb9601 100644
--- a/ext/handle_pixel/main.php
+++ b/ext/handle_pixel/main.php
@@ -2,6 +2,7 @@
/**
* Name: Handle Pixel
* Author: Shish
+ * Link: http://code.shishnet.org/shimmie2/
* Description: Handle JPEG, PNG, GIF, etc files
*/
@@ -17,7 +18,7 @@ class PixelFileHandler extends DataHandlerExtension {
return in_array(strtolower($ext), $exts);
}
- protected function create_image_from_data($filename, $metadata) {
+ protected function create_image_from_data(/*string*/ $filename, /*array*/ $metadata) {
global $config;
$image = new Image();
@@ -38,7 +39,7 @@ class PixelFileHandler extends DataHandlerExtension {
return $image;
}
- protected function check_contents($file) {
+ protected function check_contents(/*string*/ $file) {
$valid = Array(IMAGETYPE_PNG, IMAGETYPE_GIF, IMAGETYPE_JPEG);
if(!file_exists($file)) return false;
$info = getimagesize($file);
@@ -47,7 +48,7 @@ class PixelFileHandler extends DataHandlerExtension {
return false;
}
- protected function create_thumb($hash) {
+ protected function create_thumb(/*string*/ $hash) {
$outname = warehouse_path("thumbs", $hash);
if(file_exists($outname)) {
return true;
@@ -55,7 +56,7 @@ class PixelFileHandler extends DataHandlerExtension {
return $this->create_thumb_force($hash);
}
- protected function create_thumb_force($hash) {
+ protected function create_thumb_force(/*string*/ $hash) {
$inname = warehouse_path("images", $hash);
$outname = warehouse_path("thumbs", $hash);
global $config;
@@ -76,7 +77,7 @@ class PixelFileHandler extends DataHandlerExtension {
}
// IM thumber {{{
- private function make_thumb_convert($inname, $outname) {
+ private function make_thumb_convert(/*string*/ $inname, /*string*/ $outname) {
global $config;
$w = $config->get_int("thumb_width");
@@ -113,7 +114,7 @@ class PixelFileHandler extends DataHandlerExtension {
}
// }}}
// epeg thumber {{{
- private function make_thumb_epeg($inname, $outname) {
+ private function make_thumb_epeg(/*string*/ $inname, /*string*/ $outname) {
global $config;
$w = $config->get_int("thumb_width");
exec("epeg $inname -c 'Created by EPEG' --max $w $outname");
@@ -121,7 +122,7 @@ class PixelFileHandler extends DataHandlerExtension {
}
// }}}
// GD thumber {{{
- private function make_thumb_gd($inname, $outname) {
+ private function make_thumb_gd(/*string*/ $inname, /*string*/ $outname) {
global $config;
$thumb = $this->get_thumb($inname);
$ok = imagejpeg($thumb, $outname, $config->get_int('thumb_quality'));
@@ -129,7 +130,7 @@ class PixelFileHandler extends DataHandlerExtension {
return $ok;
}
- private function get_thumb($tmpname) {
+ private function get_thumb(/*string*/ $tmpname) {
global $config;
$info = getimagesize($tmpname);
@@ -165,7 +166,7 @@ class PixelFileHandler extends DataHandlerExtension {
}
}
- private function read_file($fname) {
+ private function read_file(/*string*/ $fname) {
$fp = fopen($fname, "r");
if(!$fp) return false;
diff --git a/ext/image/main.php b/ext/image/main.php
index b6d842b0..9446a3e3 100644
--- a/ext/image/main.php
+++ b/ext/image/main.php
@@ -3,6 +3,7 @@
* Name: Image Manager
* Author: Shish
* Modified by: jgen
+ * Link: http://code.shishnet.org/shimmie2/
* Description: Handle the image database
* Visibility: admin
*/
@@ -280,10 +281,7 @@ class ImageIO extends Extension {
// add image {{{
private function add_image($image) {
- global $page;
- global $user;
- global $database;
- global $config;
+ global $page, $user, $database, $config;
/*
* Validate things
diff --git a/ext/upload/main.php b/ext/upload/main.php
index d438febb..6966d198 100644
--- a/ext/upload/main.php
+++ b/ext/upload/main.php
@@ -1,7 +1,8 @@
+ * Link: http://code.shishnet.org/shimmie2/
* Description: Allows people to upload files to the website
*/
@@ -18,7 +19,7 @@ class DataUploadEvent extends Event {
* @param $tmpname The temporary file used for upload.
* @param $metadata Info about the file, should contain at least "filename", "extension", "tags" and "source".
*/
- public function DataUploadEvent(User $user, $tmpname, $metadata) {
+ public function DataUploadEvent(User $user, /*string*/ $tmpname, /*array*/ $metadata) {
assert(file_exists($tmpname));
$this->user = $user;
@@ -272,9 +273,7 @@ class Upload extends Extension {
* @retval bool TRUE on upload successful.
*/
private function try_upload($file, $tags, $source, $replace='') {
- global $page;
- global $config;
- global $user;
+ global $page, $config, $user;
if(empty($source)) $source = null;
@@ -322,9 +321,7 @@ class Upload extends Extension {
* @retval bool TRUE on transload successful.
*/
private function try_transload($url, $tags, $source, $replace='') {
- global $page;
- global $config;
- global $user;
+ global $page, $config, $user;
$ok = true;
diff --git a/ext/upload/theme.php b/ext/upload/theme.php
index 2a493007..986dd8ad 100644
--- a/ext/upload/theme.php
+++ b/ext/upload/theme.php
@@ -155,7 +155,7 @@ class UploadTheme extends Themelet {
}
/* only allows 1 file to be uploaded - for replacing another image file */
- public function display_replace_page(Page $page, $image_id) {
+ public function display_replace_page(Page $page, /*int*/ $image_id) {
global $config, $page;
$page->add_html_header("");
$tl_enabled = ($config->get_string("transload_engine", "none") != "none");
@@ -211,7 +211,7 @@ class UploadTheme extends Themelet {
$page->add_block(new Block("Upload Replacement Image", $html, "main", 20));
}
- public function display_upload_status(Page $page, $ok) {
+ public function display_upload_status(Page $page, /*bool*/ $ok) {
if($ok) {
$page->set_mode("redirect");
$page->set_redirect(make_link());
@@ -223,7 +223,7 @@ class UploadTheme extends Themelet {
}
}
- public function display_upload_error(Page $page, $title, $message) {
+ public function display_upload_error(Page $page, /*string*/ $title, /*string*/ $message) {
$page->add_block(new Block($title, $message));
}