summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/backend.class11
-rw-r--r--modules/comment.module24
-rw-r--r--modules/comment/comment.module24
3 files changed, 18 insertions, 41 deletions
diff --git a/modules/backend.class b/modules/backend.class
index 7cdaa328b..6339afd53 100644
--- a/modules/backend.class
+++ b/modules/backend.class
@@ -51,24 +51,17 @@ class backend {
if ($this->file) {
// Decode URL:
$url = parse_url($this->file);
- $host = $url[host];
- $port = $url[port] ? $url[port] : 80;
- $path = $url[path];
-
- // print "<PRE><B>Debug:</B> $url - $host - $port - $path</PRE>";
// Retrieve data from website:
- $fp = fsockopen($host, $port, &$errno, &$errstr, $timout);
+ $fp = fsockopen($url[host], ($url[port] ? $url[port] : 80), &$errno, &$errstr, $timout);
if ($fp) {
// Request data via URL:
- fputs($fp, "GET $path HTTP/1.0\nUser-Agent: $site_name\nHost: $host\nAccept: */*\n\n");
+ fputs($fp, "GET $url[path]?$url[query] HTTP/1.0\nUser-Agent: $site_name\nHost: $url[host]\nAccept: */*\n\n");
// Read data from socket:
while(!feof($fp)) $data .= fgets($fp, 128);
- // print "<PRE>$data</PRE><HR>";
-
if (strstr($data, "200 OK")) {
// Remove existing entries:
diff --git a/modules/comment.module b/modules/comment.module
index ef0bce34a..6038d5ed2 100644
--- a/modules/comment.module
+++ b/modules/comment.module
@@ -26,24 +26,16 @@ function comment_edit($id) {
$output .= "<FORM ACTION=\"admin.php?mod=comment&op=save&id=$id\" METHOD=\"post\">\n";
- $output .= "<P>\n";
- $output .= " <B>Author:</B><BR>\n";
- $output .= " ". format_username($comment->userid) ."\n";
- $output .= "</P>\n";
+ $output .= "<B>Author:</B><BR>\n";
+ $output .= format_username($comment->userid) ."<P>\n";
- $output .= "<P>\n";
- $output .= " <B>Subject:</B><BR>\n";
- $output .= " <INPUT TYPE=\"text\" NAME=\"subject\" SIZE=\"50\" VALUE=\"". check_textfield($comment->subject) ."\">\n";
- $output .= "</P>\n";
+ $output .= "<B>Subject:</B><BR>\n";
+ $output .= "<INPUT TYPE=\"text\" NAME=\"subject\" SIZE=\"50\" VALUE=\"". check_textfield($comment->subject) ."\"><P>\n";
- $output .= "<P>\n";
$output .= "<B>Comment:</B><BR>\n";
- $output .= " <TEXTAREA WRAP=\"virtual\" COLS=\"50\" ROWS=\"10\" NAME=\"comment\">". check_textarea($comment->comment) ."</TEXTAREA>\n";
- $output .= "</P>\n";
+ $output .= "<TEXTAREA WRAP=\"virtual\" COLS=\"50\" ROWS=\"10\" NAME=\"comment\">". check_textarea($comment->comment) ."</TEXTAREA><P>\n";
- $output .= "<P>\n";
- $output .= " <INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"Save comment\">\n";
- $output .= "</P>\n";
+ $output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"Save comment\">\n";
$output .= "</FORM>\n";
print $output;
@@ -51,7 +43,7 @@ function comment_edit($id) {
function comment_save($id, $subject, $comment) {
db_query("UPDATE comments SET subject = '". check_input($subject) ."', comment = '". check_input($comment) ."' WHERE cid = $id");
- watchdog("message", "comment: modified `$subject'");
+ watchdog("message", "comment: modified '$subject'");
}
function comment_display($order = "date") {
@@ -105,7 +97,7 @@ function comment_admin() {
break;
case "Save comment":
comment_save($id, $subject, $comment);
- comment_edit($id);
+ comment_display();
break;
case "Update":
comment_display($order);
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index ef0bce34a..6038d5ed2 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -26,24 +26,16 @@ function comment_edit($id) {
$output .= "<FORM ACTION=\"admin.php?mod=comment&op=save&id=$id\" METHOD=\"post\">\n";
- $output .= "<P>\n";
- $output .= " <B>Author:</B><BR>\n";
- $output .= " ". format_username($comment->userid) ."\n";
- $output .= "</P>\n";
+ $output .= "<B>Author:</B><BR>\n";
+ $output .= format_username($comment->userid) ."<P>\n";
- $output .= "<P>\n";
- $output .= " <B>Subject:</B><BR>\n";
- $output .= " <INPUT TYPE=\"text\" NAME=\"subject\" SIZE=\"50\" VALUE=\"". check_textfield($comment->subject) ."\">\n";
- $output .= "</P>\n";
+ $output .= "<B>Subject:</B><BR>\n";
+ $output .= "<INPUT TYPE=\"text\" NAME=\"subject\" SIZE=\"50\" VALUE=\"". check_textfield($comment->subject) ."\"><P>\n";
- $output .= "<P>\n";
$output .= "<B>Comment:</B><BR>\n";
- $output .= " <TEXTAREA WRAP=\"virtual\" COLS=\"50\" ROWS=\"10\" NAME=\"comment\">". check_textarea($comment->comment) ."</TEXTAREA>\n";
- $output .= "</P>\n";
+ $output .= "<TEXTAREA WRAP=\"virtual\" COLS=\"50\" ROWS=\"10\" NAME=\"comment\">". check_textarea($comment->comment) ."</TEXTAREA><P>\n";
- $output .= "<P>\n";
- $output .= " <INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"Save comment\">\n";
- $output .= "</P>\n";
+ $output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"Save comment\">\n";
$output .= "</FORM>\n";
print $output;
@@ -51,7 +43,7 @@ function comment_edit($id) {
function comment_save($id, $subject, $comment) {
db_query("UPDATE comments SET subject = '". check_input($subject) ."', comment = '". check_input($comment) ."' WHERE cid = $id");
- watchdog("message", "comment: modified `$subject'");
+ watchdog("message", "comment: modified '$subject'");
}
function comment_display($order = "date") {
@@ -105,7 +97,7 @@ function comment_admin() {
break;
case "Save comment":
comment_save($id, $subject, $comment);
- comment_edit($id);
+ comment_display();
break;
case "Update":
comment_display($order);