diff --git a/CHANGELOG b/CHANGELOG index b1b3b5b64ea..3c14299a5b8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -24,7 +24,7 @@ drupal 1.xx, xx/xx/2001 * improved diary module: + diary can be deleted * improved headline module: - + improved parser to support RDF/RSS/XML backend + + improved parser to support more "generic" RDF/RSS/XML backend * improved module module * improved watchdog module * added CREDITS file diff --git a/database/database.mysql b/database/database.mysql index e91d313eb46..792edd7ab5e 100644 --- a/database/database.mysql +++ b/database/database.mysql @@ -67,6 +67,7 @@ CREATE TABLE comments ( timestamp int(11) DEFAULT '0' NOT NULL, score int(6) DEFAULT '0' NOT NULL, votes int(6) DEFAULT '0' NOT NULL, + INDEX lid_link (lid, link), PRIMARY KEY (cid) ); diff --git a/modules/backend.class b/modules/backend.class index 7cdaa328b2f..6339afd5352 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 "
Debug: $url - $host - $port - $path
"; // 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 "
$data

"; - if (strstr($data, "200 OK")) { // Remove existing entries: diff --git a/modules/comment.module b/modules/comment.module index ef0bce34a4e..6038d5ed275 100644 --- a/modules/comment.module +++ b/modules/comment.module @@ -26,24 +26,16 @@ function comment_edit($id) { $output .= "
\n"; - $output .= "

\n"; - $output .= " Author:
\n"; - $output .= " ". format_username($comment->userid) ."\n"; - $output .= "

\n"; + $output .= "Author:
\n"; + $output .= format_username($comment->userid) ."

\n"; - $output .= "

\n"; - $output .= " Subject:
\n"; - $output .= " subject) ."\">\n"; - $output .= "

\n"; + $output .= "Subject:
\n"; + $output .= "subject) ."\">

\n"; - $output .= "

\n"; $output .= "Comment:
\n"; - $output .= " \n"; - $output .= "

\n"; + $output .= "

\n"; - $output .= "

\n"; - $output .= " \n"; - $output .= "

\n"; + $output .= "\n"; $output .= "
\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 ef0bce34a4e..6038d5ed275 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -26,24 +26,16 @@ function comment_edit($id) { $output .= "
\n"; - $output .= "

\n"; - $output .= " Author:
\n"; - $output .= " ". format_username($comment->userid) ."\n"; - $output .= "

\n"; + $output .= "Author:
\n"; + $output .= format_username($comment->userid) ."

\n"; - $output .= "

\n"; - $output .= " Subject:
\n"; - $output .= " subject) ."\">\n"; - $output .= "

\n"; + $output .= "Subject:
\n"; + $output .= "subject) ."\">

\n"; - $output .= "

\n"; $output .= "Comment:
\n"; - $output .= " \n"; - $output .= "

\n"; + $output .= "

\n"; - $output .= "

\n"; - $output .= " \n"; - $output .= "

\n"; + $output .= "\n"; $output .= "
\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/themes/jeroen/jeroen.theme b/themes/jeroen/jeroen.theme index c294188431b..e40aa75dbf9 100644 --- a/themes/jeroen/jeroen.theme +++ b/themes/jeroen/jeroen.theme @@ -83,11 +83,11 @@ - - - - + +
- - +
+ + - -
+ +
  @@ -137,10 +137,10 @@
-
+ +
"; echo " "; echo " "; - echo " "; - echo "
"; - echo " "; - echo " "; + echo " "; + echo "
"; + echo " "; + echo " "; echo " "; echo "
"; echo " "; diff --git a/updates/1.00-to-1.xx b/updates/1.00-to-1.xx index c579c79460b..98209523b02 100644 --- a/updates/1.00-to-1.xx +++ b/updates/1.00-to-1.xx @@ -1,4 +1,8 @@ +# 26/02/2001: performance optimization +ALTER TABLE comments ADD INDEX lid_link (lid, link); + # 19/02/2001: internationalization / translation +alter table users add language varchar(2) DEFAULT '0' NOT NULL; CREATE TABLE locales ( id int(11) DEFAULT '0' NOT NULL auto_increment, location varchar(128) DEFAULT '' NOT NULL,