diff --git a/account.php b/account.php index e1e60cfdef1d..92015c3ae75b 100644 --- a/account.php +++ b/account.php @@ -159,7 +159,7 @@ switch ($op) { } } break; - case "edituser": + case "user": if ($user && $user->valid()) { ### Generate output/content: $output .= "
\n"; @@ -180,7 +180,7 @@ switch ($op) { $output .= "Optional. This biographical information is publicly displayed on your user page.

\n"; $output .= "User block: (255 char limit)
\n"; $output .= "
\n"; - $output .= "ublockon == 1 ? " CHECKED" : "") .">Enable user block
\n"; + $output .= "ublockon == 1 ? " CHECKED" : "") ."> Enable user block
\n"; $output .= "Enable the checkbox and whatever you enter below will appear on your costum main page.

\n"; $output .= "Password:
\n"; $output .= "
\n"; @@ -201,7 +201,7 @@ switch ($op) { $theme->footer(); } break; - case "editpage": + case "page": if ($user && $user->valid()) { ### Generate output/content: $output .= "\n"; diff --git a/calendar.class.php b/calendar.class.php index f47846be5653..f550f73939c9 100644 --- a/calendar.class.php +++ b/calendar.class.php @@ -61,8 +61,8 @@ class calendar { $nday++; } - ### Finish the calendar: - if ($sday != 0) { + ### Complete the calendar: + if ($sday) { $end = 7 - $sday; $output .= "  \n \n"; } diff --git a/functions.inc b/functions.inc index 2c748a9cc98e..83476c9a2731 100644 --- a/functions.inc +++ b/functions.inc @@ -230,8 +230,8 @@ function displayAccountSettings($theme) { if ($user && $user->userid) { ### Display account settings: $content = "

  • User info
    • "; - $content .= "
  • Edit user info
    • "; - $content .= "
  • Customize page
    • "; + $content .= "
  • Edit user info
    • "; + $content .= "
  • Customize page
    • "; $content .= "
  • Logout
    • "; $theme->box("$user->userid's account", "$content"); diff --git a/submit.php b/submit.php index f94e17b6b454..1661f5b5212c 100644 --- a/submit.php +++ b/submit.php @@ -1,7 +1,7 @@ Got some news or some thoughts you would like to share? Fill out this form and they will automatically get whisked away to our submission queue where our moderators will frown at it, poke at it and hopefully post it. Every registered user is automatically a moderator and can vote whether or not your sumbission should be carried to the front page for discussion.

    \n"; @@ -56,7 +56,7 @@ function submit_enter() { } function submit_preview($subject, $abstract, $story, $category) { - global $user, $theme; + global $user, $theme, $categories; $output .= "\n"; diff --git a/themes/jeroen/theme.class.php b/themes/jeroen/theme.class.php index 33b6f767af49..866d7b623ac0 100644 --- a/themes/jeroen/theme.class.php +++ b/themes/jeroen/theme.class.php @@ -50,9 +50,6 @@ ### Display admin blocks: displayAdminblock($this); - - ### Display referring sites: - displayReferrals($this); ?> @@ -308,7 +305,7 @@ @@ -326,12 +323,12 @@ ###### # Syntax.......: comment(...); # Description..: this function is used to theme user comments. - function comment($poster, $subject, $tid, $date, $url, $email, $score, $reason, $comment, $link, $thread = "") { + function comment($poster, $subject, $cid, $date, $url, $email, $score, $reason, $comment, $link, $thread = "") { include "config.inc"; if (!eregi("[a-z0-9]",$poster)) $poster = $anonymous; if (!eregi("[a-z0-9]",$subject)) $subject = "[no subject]"; - echo ""; + echo ""; ### Create comment header: echo ""; @@ -350,7 +347,7 @@ ### Moderation: echo " "); - - if (strstr($PHP_SELF, "index.php")) { - global $user, $date; + $this->box("Drop where?", ""); - ### Display account: + if (strstr($PHP_SELF, "index.php")) { + global $user, $date; + + ### Display account: displayAccount($this); - ### Display calendar: + ### Display calendar: displayCalendar($this, $date); + ### Display calendar: + displayOldHeadlines($this); + ### Display voting poll: displayPoll($this); - - ### Display old headlines: - displayOldHeadlines($this); - } - elseif (strstr($PHP_SELF, "account.php")) { + } + elseif (strstr($PHP_SELF, "account.php")) { ### Display account settings: displayAccountSettings($this); - } - elseif (strstr($PHP_SELF, "article.php")) { - global $sid; - ### Display account: + ### Display account: + displayAccount($this); + } + elseif (strstr($PHP_SELF, "submit.php")) { + ### Display account: displayAccount($this); - - ### Display related links: - displayRelatedLinks($this, $sid); ### Display new headlines: displayNewHeadlines($this); - } - else { - ### Display new headlines: - displayNewHeadlines($this); - } + } + elseif (strstr($PHP_SELF, "discussion.php")) { + global $id; + + if ($id && $story = id2story($id)) { + if ($story->status == 2) { + ### Display account: + displayAccount($this); + + ### Display related links: + displayRelatedLinks($this, $story); + + ### Display new headlines: + displayNewHeadlines($this); + } + else { + ### Display results of moderation: + displayModerationResults($this, $story); + } + } + else { + ### Display account: + displayAccount($this); + + ### Display new headlines: + displayNewHeadlines($this); + } + } + else { + ### Display new headlines: + displayNewHeadlines($this); + } + ?> @@ -548,7 +571,7 @@
    "; - echo " "; echo " \n"; for ($i = 0; $i < sizeof($comments_meta_reasons); $i++) { echo " \n"; @@ -503,43 +500,69 @@ box("Drop where?", "home
    faq
    search    		submit news
    your account
    webboard    		home
    faq
    search    		submit news
    your account
    - [ home | faq | search | submit news | your account | webboard ] + [ home | faq | search | submit news | your account ]