@@ -105,8 +115,10 @@ class Tag_HistoryTheme extends Themelet {
$page->add_block(new Block("Navigation", $nav, "left"));
}
- /*
+ /**
* Add a section to the admin page.
+ *
+ * @param string $validation_msg
*/
public function display_admin_block(/*string*/ $validation_msg='') {
global $page;
@@ -141,7 +153,11 @@ class Tag_HistoryTheme extends Themelet {
$html = implode($this->messages, "\n");
$page->add_block(new Block("Bulk Revert Results", $html));
}
-
+
+ /**
+ * @param string $title
+ * @param string $body
+ */
public function add_status(/*string*/ $title, /*string*/ $body) {
$this->messages[] = '
'. $title .'
'. $body .'
';
}
diff --git a/ext/tips/main.php b/ext/tips/main.php
index 94f8bf2f..ca1753db 100644
--- a/ext/tips/main.php
+++ b/ext/tips/main.php
@@ -132,10 +132,13 @@ class Tips extends Extension {
$this->theme->showAll($url, $tips);
}
+ /**
+ * @param int $tipID
+ */
private function setStatus($tipID) {
global $database;
- $tip = $database->get_row("SELECT * FROM tips WHERE id = ? ", array($tipID));
+ $tip = $database->get_row("SELECT * FROM tips WHERE id = ? ", array(int_escape($tipID)));
if (bool_escape($tip['enable'])) {
$enable = "N";
@@ -143,12 +146,15 @@ class Tips extends Extension {
$enable = "Y";
}
- $database->execute("UPDATE tips SET enable = ? WHERE id = ?", array ($enable, $tipID));
+ $database->execute("UPDATE tips SET enable = ? WHERE id = ?", array ($enable, int_escape($tipID)));
}
+ /**
+ * @param int $tipID
+ */
private function deleteTip($tipID) {
global $database;
- $database->execute("DELETE FROM tips WHERE id = ?", array($tipID));
+ $database->execute("DELETE FROM tips WHERE id = ?", array(int_escape($tipID)));
}
}
diff --git a/ext/upload/main.php b/ext/upload/main.php
index a247b804..69a226ba 100644
--- a/ext/upload/main.php
+++ b/ext/upload/main.php
@@ -123,7 +123,7 @@ class Upload extends Extension {
}
public function onPageRequest(PageRequestEvent $event) {
- global $config, $page, $user;
+ global $page, $user;
if($event->page_matches("upload/replace")) {
// check if the user is an administrator and can upload files.
@@ -333,6 +333,7 @@ class Upload extends Extension {
/**
* Handle an transload.
+ *
* @param string $url
* @param mixed $tags
* @param string $source
diff --git a/ext/upload/theme.php b/ext/upload/theme.php
index e1c9692d..c9865901 100644
--- a/ext/upload/theme.php
+++ b/ext/upload/theme.php
@@ -232,7 +232,12 @@ class UploadTheme extends Themelet {
return $html;
}
- /* only allows 1 file to be uploaded - for replacing another image file */
+ /**
+ * Only allows 1 file to be uploaded - for replacing another image file.
+ *
+ * @param Page $page
+ * @param int $image_id
+ */
public function display_replace_page(Page $page, /*int*/ $image_id) {
global $config, $page;
$tl_enabled = ($config->get_string("transload_engine", "none") != "none");
@@ -275,7 +280,11 @@ class UploadTheme extends Themelet {
$page->add_block(new NavBlock());
$page->add_block(new Block("Upload Replacement Image", $html, "main", 20));
}
-
+
+ /**
+ * @param Page $page
+ * @param bool $ok
+ */
public function display_upload_status(Page $page, /*bool*/ $ok) {
if($ok) {
$page->set_mode("redirect");
@@ -288,6 +297,11 @@ class UploadTheme extends Themelet {
}
}
+ /**
+ * @param Page $page
+ * @param string $title
+ * @param string $message
+ */
public function display_upload_error(Page $page, /*string*/ $title, /*string*/ $message) {
$page->add_block(new Block($title, $message));
}
diff --git a/ext/user/main.php b/ext/user/main.php
index 130930dd..f48074a7 100644
--- a/ext/user/main.php
+++ b/ext/user/main.php
@@ -344,8 +344,7 @@ class UserPage extends Extension {
// }}}
// Things done *with* the user {{{
private function login(Page $page) {
- global $user;
- global $config;
+ global $user, $config;
$name = $_POST['user'];
$pass = $_POST['pass'];
@@ -380,12 +379,12 @@ class UserPage extends Extension {
}
private function check_user_creation($event) { // FIXME type
+ global $database;
+
$name = $event->username;
$pass = $event->password;
$email = $event->email;
- global $database;
-
if(strlen($name) < 1) {
throw new UserCreationException("Username must be at least 1 character");
}
@@ -417,6 +416,10 @@ class UserPage extends Extension {
log_info("user", "Created User #$uid ({$event->username})");
}
+ /**
+ * @param string $name
+ * @param string $pass
+ */
private function set_login_cookie(/*string*/ $name, /*string*/ $pass) {
global $config;
@@ -543,11 +546,14 @@ class UserPage extends Extension {
ORDER BY most_recent DESC", array("id"=>$duser->id));
return $rows;
}
-
+
+ /**
+ * @param Page $page
+ * @param bool $with_images
+ * @param bool $with_comments
+ */
private function delete_user(Page $page, /*boolean*/ $with_images=false, /*boolean*/ $with_comments=false) {
- global $user;
- global $config;
- global $database;
+ global $user, $config, $database;
$page->set_title("Error");
$page->set_heading("Error");