diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/config.inc | 22 | ||||
| -rw-r--r-- | includes/function.inc | 12 |
2 files changed, 23 insertions, 11 deletions
diff --git a/includes/config.inc b/includes/config.inc index 61ff05f86..c5fdffd8f 100644 --- a/includes/config.inc +++ b/includes/config.inc @@ -4,20 +4,19 @@ # MySQL settings: # - -### www.drop.org: +### http://www.drop.org/: #$dbhost = "zind.net"; #$dbuname = "droporg"; #$dbpass = "DropIes"; #$dbname = "droporg"; -### beta.drop.org: +### http://beta.drop.org/: $dbhost = "zind.net"; $dbuname = "dries"; $dbpass = "Abc123"; $dbname = "dries"; -### localhost Dries: +### http://dione/: #$dbhost = ""; #$dbuname = "dries"; #$dbpass = "oakley"; @@ -27,12 +26,13 @@ $dbname = "dries"; # Name of the site # $sitename = "drop.org"; +$siteurl = "http://www.drop.org/"; # # Contact information: # The contact information will be used to send out automated mails # to users, account holders or visitors. -$contact_email = "droppies@zind.net"; +$contact_email = "droppies@drop.org"; # # Notify: @@ -49,12 +49,19 @@ $notify = 0; $notify_email = $contact_email; $notify_subject = "submission: "; $notify_message = "New submission: '$subject'\n\n$story"; -$notify_from = "droppies@zind.net"; +$notify_from = "droppies@drop.org"; # # Comment meta reasons: # -$comment_votes = array("none" => "none", "-1" => "- 1", "0" => "+ 0", "+1" => "+ 1", "+2" => "+ 2", "+3" => "+ 3", "+4" => "+ 4", "+5" => "+ 5"); +$comment_votes = array("none" => "none", + "-1" => "- 1", + "0" => "+ 0", + "+1" => "+ 1", + "+2" => "+ 2", + "+3" => "+ 3", + "+4" => "+ 4", + "+5" => "+ 5"); # # Categories: @@ -82,7 +89,6 @@ $allowed_html = "<A><B><BR><DD><DL><DT><EM><HR><I><IL><SMALL><OL><U><UL>"; # $anonymous = "Anonymous Chicken"; - # # Themes: # the first theme listed in the associative array `$themes' will diff --git a/includes/function.inc b/includes/function.inc index c9b80e0a6..1331a21e6 100644 --- a/includes/function.inc +++ b/includes/function.inc @@ -24,12 +24,14 @@ function check_field($message) { } function check_input($message) { - return strip_tags($message); + global $allowed_html; + return strip_tags(addslashes($message), $allowed_html); } -function check_output($message) { +function check_output($message, $nl2br = 0) { global $allowed_html; - return strip_tags(stripslashes($message), $allowed_html); + if ($nl2br == 1) return nl2br(strip_tags(stripslashes($message), $allowed_html)); + else return strip_tags(stripslashes($message), $allowed_html); } function discussion_num_replies($id, $count = 0) { @@ -49,6 +51,10 @@ function format_plural($count, $one, $more) { } function format_date($timestamp, $type = "medium") { + global $user; + + $timestamp += ($user->timezone) ? $user->timezone - date("Z") : 0; + switch ($type) { case "small": $date = date("D, m/d/y - H:i", $timestamp); |