From 637004c5391eb48b473a80df1de425aaae8edc25 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Thu, 23 Jan 2003 09:24:20 +0000 Subject: - Tidied up XHTML. Patch by Ulf. - Added missing t() function. Patch by Stefan. --- modules/aggregator.module | 12 ++++++------ modules/aggregator/aggregator.module | 12 ++++++------ modules/block.module | 4 ++-- modules/block/block.module | 4 ++-- modules/blog.module | 4 ++-- modules/blog/blog.module | 4 ++-- modules/bloggerapi.module | 6 ++++-- modules/book.module | 4 ++-- modules/book/book.module | 4 ++-- modules/comment.module | 18 +++++++++--------- modules/comment/comment.module | 18 +++++++++--------- modules/forum.module | 20 ++++++++++---------- modules/forum/forum.module | 20 ++++++++++---------- modules/import.module | 12 ++++++------ modules/node.module | 2 +- modules/node/node.module | 2 +- modules/profile.module | 4 ++-- modules/profile/profile.module | 4 ++-- modules/search.module | 2 +- modules/search/search.module | 2 +- modules/statistics.module | 14 +++++++------- modules/statistics/statistics.module | 14 +++++++------- modules/taxonomy.module | 8 ++++---- modules/taxonomy/taxonomy.module | 8 ++++---- modules/throttle.module | 8 ++++---- modules/throttle/throttle.module | 8 ++++---- modules/tracker.module | 2 +- modules/tracker/tracker.module | 2 +- modules/user.module | 13 +++++++------ modules/user/user.module | 13 +++++++------ modules/watchdog.module | 4 ++-- modules/watchdog/watchdog.module | 4 ++-- 32 files changed, 130 insertions(+), 126 deletions(-) (limited to 'modules') diff --git a/modules/aggregator.module b/modules/aggregator.module index 0a9c79901..4d5e42a24 100644 --- a/modules/aggregator.module +++ b/modules/aggregator.module @@ -63,7 +63,7 @@ function import_format_item($item, $feed = 0) { global $theme, $user; if ($user->uid && user_access("maintain personal blog")) { - $output .= l("image("blog.gif") ."\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("Blog this item") ."\" />", "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); + $output .= l("image("blog.gif") ."\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("Blog this item") ."\" />", "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); } // external link @@ -136,7 +136,7 @@ function import_get_bundles($attributes = 0) { $result = db_query("SELECT * FROM bundle ORDER BY title"); while ($bundle = db_fetch_object($result)) { $block[$bundle->bid]["subject"] = $bundle->title; - $block[$bundle->bid]["content"] = import_bundle_block($bundle->attributes) ."

". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."

"; + $block[$bundle->bid]["content"] = import_bundle_block($bundle->attributes) ."
". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."
"; $block[$bundle->bid]["info"] = "$bundle->title bundle"; } @@ -525,7 +525,7 @@ function import_page_last() { $output .= ""; while ($item = db_fetch_object($result)) { if (module_exist("blog") && user_access("maintain personal blog")) { - $links[] = l(t("blog it"), "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); + $links[] = l(t("blog it"), "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); } $links[] = l(t("feed"), "import/feed/$item->fid", array("title" => t("Read more syndicated news from this feed."))); @@ -554,14 +554,14 @@ function import_page_feed($fid) { $header .= "

". t("Website") .":

link\">$feed->link

"; $header .= "

". t("Description") .":

$feed->description

"; - $header .= "

". t("Last update") .":

". format_interval(time() - $feed->timestamp) ." ". t("ago") ." url\">image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />

\n"; + $header .= "

". t("Last update") .":

". format_interval(time() - $feed->timestamp) ." ". t("ago") ." url\">image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" alt=\"\" />

\n"; $result = db_query("SELECT * FROM item WHERE fid = '%s' ORDER BY iid DESC LIMIT ". variable_get("import_page_limit", 75), $fid); $output .= "
"; while ($item = db_fetch_object($result)) { if (module_exist("blog") && user_access("maintain personal blog")) { - $links[] = l(t("blog it"), "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); + $links[] = l(t("blog it"), "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); } $links[] = "link\">". t("visit") .""; @@ -598,7 +598,7 @@ function import_page_bundle($bid) { $output .= "
"; while ($item = db_fetch_object($result)) { if (module_exist("blog") && user_access("maintain personal blog")) { - $links[] = l(t("blog it"), "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); + $links[] = l(t("blog it"), "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); } $links[] = l(t("feed"), "import/feed/$item->fid", array("title" => t("Read more syndicated news from this feed."))); $links[] = "link\">". t("visit") .""; diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index 0a9c79901..4d5e42a24 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -63,7 +63,7 @@ function import_format_item($item, $feed = 0) { global $theme, $user; if ($user->uid && user_access("maintain personal blog")) { - $output .= l("image("blog.gif") ."\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("Blog this item") ."\" />", "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); + $output .= l("image("blog.gif") ."\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("Blog this item") ."\" />", "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); } // external link @@ -136,7 +136,7 @@ function import_get_bundles($attributes = 0) { $result = db_query("SELECT * FROM bundle ORDER BY title"); while ($bundle = db_fetch_object($result)) { $block[$bundle->bid]["subject"] = $bundle->title; - $block[$bundle->bid]["content"] = import_bundle_block($bundle->attributes) ."

". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."

"; + $block[$bundle->bid]["content"] = import_bundle_block($bundle->attributes) ."
". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."
"; $block[$bundle->bid]["info"] = "$bundle->title bundle"; } @@ -525,7 +525,7 @@ function import_page_last() { $output .= "
"; while ($item = db_fetch_object($result)) { if (module_exist("blog") && user_access("maintain personal blog")) { - $links[] = l(t("blog it"), "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); + $links[] = l(t("blog it"), "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); } $links[] = l(t("feed"), "import/feed/$item->fid", array("title" => t("Read more syndicated news from this feed."))); @@ -554,14 +554,14 @@ function import_page_feed($fid) { $header .= "

". t("Website") .":

link\">$feed->link

"; $header .= "

". t("Description") .":

$feed->description

"; - $header .= "

". t("Last update") .":

". format_interval(time() - $feed->timestamp) ." ". t("ago") ." url\">image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />

\n"; + $header .= "

". t("Last update") .":

". format_interval(time() - $feed->timestamp) ." ". t("ago") ." url\">image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" alt=\"\" />

\n"; $result = db_query("SELECT * FROM item WHERE fid = '%s' ORDER BY iid DESC LIMIT ". variable_get("import_page_limit", 75), $fid); $output .= "
"; while ($item = db_fetch_object($result)) { if (module_exist("blog") && user_access("maintain personal blog")) { - $links[] = l(t("blog it"), "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); + $links[] = l(t("blog it"), "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); } $links[] = "link\">". t("visit") .""; @@ -598,7 +598,7 @@ function import_page_bundle($bid) { $output .= "
"; while ($item = db_fetch_object($result)) { if (module_exist("blog") && user_access("maintain personal blog")) { - $links[] = l(t("blog it"), "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); + $links[] = l(t("blog it"), "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); } $links[] = l(t("feed"), "import/feed/$item->fid", array("title" => t("Read more syndicated news from this feed."))); $links[] = "link\">". t("visit") .""; diff --git a/modules/block.module b/modules/block.module index 44eddbbdb..08ae03da1 100644 --- a/modules/block.module +++ b/modules/block.module @@ -9,8 +9,8 @@ function block_help() {

As mentioned, blocks may be arranged to fit in two regions: left and right. For theme builders, each region is identified by a corresponding constant: "left" and "right".

The path setting lets you define which pages you want the specific blocks to be shown. If you leave the path blank it will show on all pages. The path uses a regular expression syntax so remember to escape special characters!
Examples:

-
-

The content of the site can be almost entirely altered through boxes. Simply put, boxes are small bits of text, HTML or PHP code which will get plugged into the site just like any other block. Boxes are typically used to add custom blocks to the site.

+

+

The content of the site can be almost entirely altered through boxes. Simply put, boxes are small bits of text, HTML or PHP code which will get plugged into the site just like any other block. Boxes are typically used to add custom blocks to the site.

Each box consists of a title and an associated block of text, HTML or PHP code that can be as long as you wish and that will 'render' the content of the box.

PHP boxes

If you know how to script in PHP, PHP boxes are easy to create. Don't worry if you're no PHP-wizard: simply use HTML boxes instead.

diff --git a/modules/block/block.module b/modules/block/block.module index 44eddbbdb..08ae03da1 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -9,8 +9,8 @@ function block_help() {

As mentioned, blocks may be arranged to fit in two regions: left and right. For theme builders, each region is identified by a corresponding constant: "left" and "right".

The path setting lets you define which pages you want the specific blocks to be shown. If you leave the path blank it will show on all pages. The path uses a regular expression syntax so remember to escape special characters!
Examples:

-
-

The content of the site can be almost entirely altered through boxes. Simply put, boxes are small bits of text, HTML or PHP code which will get plugged into the site just like any other block. Boxes are typically used to add custom blocks to the site.

+

+

The content of the site can be almost entirely altered through boxes. Simply put, boxes are small bits of text, HTML or PHP code which will get plugged into the site just like any other block. Boxes are typically used to add custom blocks to the site.

Each box consists of a title and an associated block of text, HTML or PHP code that can be as long as you wish and that will 'render' the content of the box.

PHP boxes

If you know how to script in PHP, PHP boxes are easy to create. Don't worry if you're no PHP-wizard: simply use HTML boxes instead.

diff --git a/modules/blog.module b/modules/blog.module index 099ece8e3..1d1e7acbd 100644 --- a/modules/blog.module +++ b/modules/blog.module @@ -160,7 +160,7 @@ function blog_page_user($uid = 0) { node_view(node_load(array("nid" => $node->nid)), 1); } print pager_display(NULL, ($user->nodes ? $user->nodes : variable_get("default_nodes_main", 10))); - print l("image("xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" />", "blog/feed/$account->uid", array("title" => t("View the XML version of %username's blog", array ("%username" => $account->name)))); + print l("image("xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"\" />", "blog/feed/$account->uid", array("title" => t("View the XML version of %username's blog", array ("%username" => $account->name)))); } function blog_page_last() { @@ -172,7 +172,7 @@ function blog_page_last() { $output = node_view(node_load(array("nid" => $node->nid)), 1); } $output .= pager_display(NULL, ($user->nodes ? $user->nodes : variable_get("default_nodes_main", 10))); - $output .= l("image("xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" />", "blog/feed", array("title" => t("Read the XML version of all blogs."))); + $output .= l("image("xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"\" />", "blog/feed", array("title" => t("Read the XML version of all blogs."))); return $output; } diff --git a/modules/blog/blog.module b/modules/blog/blog.module index 099ece8e3..1d1e7acbd 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -160,7 +160,7 @@ function blog_page_user($uid = 0) { node_view(node_load(array("nid" => $node->nid)), 1); } print pager_display(NULL, ($user->nodes ? $user->nodes : variable_get("default_nodes_main", 10))); - print l("image("xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" />", "blog/feed/$account->uid", array("title" => t("View the XML version of %username's blog", array ("%username" => $account->name)))); + print l("image("xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"\" />", "blog/feed/$account->uid", array("title" => t("View the XML version of %username's blog", array ("%username" => $account->name)))); } function blog_page_last() { @@ -172,7 +172,7 @@ function blog_page_last() { $output = node_view(node_load(array("nid" => $node->nid)), 1); } $output .= pager_display(NULL, ($user->nodes ? $user->nodes : variable_get("default_nodes_main", 10))); - $output .= l("image("xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" />", "blog/feed", array("title" => t("Read the XML version of all blogs."))); + $output .= l("image("xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"\" />", "blog/feed", array("title" => t("Read the XML version of all blogs."))); return $output; } diff --git a/modules/bloggerapi.module b/modules/bloggerapi.module index 0502357be..796fa6758 100644 --- a/modules/bloggerapi.module +++ b/modules/bloggerapi.module @@ -386,18 +386,20 @@ function bloggerapi_help() {

Drupal's support for the Blogger API is quite complete. Each method with an asterisk below has been implemented in Drupal.

+

blogger.newPost()*
blogger.editPost()*
blogger.getUsersBlogs()*
blogger.getUserInfo()*
blogger.getTemplate()
-blogger.setTemplate()
+blogger.setTemplate()

Drupal also supports the following methods. These methods were added after the those listed above and are not documented on the Blogger API website. Each method is linked to its corresponding blogger-dev mailing list posts:

+

blogger.getPost()*
blogger.getRecentPosts()*
-blogger.deletePost()*
+blogger.deletePost()*

Installation and usage

diff --git a/modules/book.module b/modules/book.module index f8148c20e..b295631a2 100644 --- a/modules/book.module +++ b/modules/book.module @@ -758,11 +758,11 @@ function book_help() {

Administrators may review the hierarchy of their books by clicking on the in the adminstration pages. There, nodes may be edited, reorganized, removed from book, and deleted. This behavior may change in the future. When a parent node is deleted, he may leave behind child nodes. These nodes are now orphans. Administrators should periodically and reaffiliate those pages as desired. Finally, administrators may also to a single, flat HTML page which is suitable for printing.

-

Maintain a FAQ using a collaborative book

+

Maintain a FAQ using a collaborative book

The collaborative book (i.e. book.module) in Drupal is a terrific way to easily manage an FAQ (Frequently Asked Questions) section of your web site. The main benefit for an administrator is that you don't have to write all the questions/answers by yourself. Let the community do it for you!

-

In order to setup the FAQ, you have to create a new Book which will hold all your content. To do so, click on Create Book Page in your user box. Give it a thoughtful Title, and Body. A title like "Estonia Travel - FAQ" is nice. You may always edit these fields later. You will probably want to designate as the parent of this page. Leave the log message and type fields blank for now. After you have submitted this book page, you are ready to begin filling up your book with questions that are frequently asked.

+

In order to setup the FAQ, you have to create a new Book which will hold all your content. To do so, click on Create Book Page in your user box. Give it a thoughtful Title, and Body. A title like "Estonia Travel - FAQ" is nice. You may always edit these fields later. You will probably want to designate <root> as the parent of this page. Leave the log message and type fields blank for now. After you have submitted this book page, you are ready to begin filling up your book with questions that are frequently asked.

Whenever you come across a post which you want to include in your FAQ, click on the administer link. Then click on the edit book outline button at the bottom of the page. Then place the relevant post wherever is most appropriate in your book by selecting a parent. Books are quite flexible. They can have sections like Flying to Estonia, Eating in Estonia and so on. As you get more experienced with the collaborative book, you can reorganize posts in your book so that it stays organized.

diff --git a/modules/book/book.module b/modules/book/book.module index f8148c20e..b295631a2 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -758,11 +758,11 @@ function book_help() {

Administrators may review the hierarchy of their books by clicking on the in the adminstration pages. There, nodes may be edited, reorganized, removed from book, and deleted. This behavior may change in the future. When a parent node is deleted, he may leave behind child nodes. These nodes are now orphans. Administrators should periodically and reaffiliate those pages as desired. Finally, administrators may also to a single, flat HTML page which is suitable for printing.

-

Maintain a FAQ using a collaborative book

+

Maintain a FAQ using a collaborative book

The collaborative book (i.e. book.module) in Drupal is a terrific way to easily manage an FAQ (Frequently Asked Questions) section of your web site. The main benefit for an administrator is that you don't have to write all the questions/answers by yourself. Let the community do it for you!

-

In order to setup the FAQ, you have to create a new Book which will hold all your content. To do so, click on Create Book Page in your user box. Give it a thoughtful Title, and Body. A title like "Estonia Travel - FAQ" is nice. You may always edit these fields later. You will probably want to designate as the parent of this page. Leave the log message and type fields blank for now. After you have submitted this book page, you are ready to begin filling up your book with questions that are frequently asked.

+

In order to setup the FAQ, you have to create a new Book which will hold all your content. To do so, click on Create Book Page in your user box. Give it a thoughtful Title, and Body. A title like "Estonia Travel - FAQ" is nice. You may always edit these fields later. You will probably want to designate <root> as the parent of this page. Leave the log message and type fields blank for now. After you have submitted this book page, you are ready to begin filling up your book with questions that are frequently asked.

Whenever you come across a post which you want to include in your FAQ, click on the administer link. Then click on the edit book outline button at the bottom of the page. Then place the relevant post wherever is most appropriate in your book by selecting a parent. Books are quite flexible. They can have sections like Flying to Estonia, Eating in Estonia and so on. As you get more experienced with the collaborative book, you can reorganize posts in your book so that it stays organized.

diff --git a/modules/comment.module b/modules/comment.module index d1afd7cd4..fcb31f7a2 100644 --- a/modules/comment.module +++ b/modules/comment.module @@ -8,7 +8,7 @@ function comment_help() { $output .= "

The comment module enables users to submit posts that are directly associated with a piece of content. These associated posts are called comments. Comments may be threaded, which means that Drupal keeps track of multiple subconversations around a piece of content. Threading helps to keep the comment conversation more organized. Users are presented with several ways to view the comment conversation, and if desired, users may easily choose a flat presentation of comments instead of threaded. Further, users may choose to order their comments view by newest first or by oldest first. Finally, users may view a folded list or an expanded list of comments. Folded limits the comment display to subject only. Drupal remembers the comment view preference of each registered user whenever he changes a view setting.

"; $output .= "

Users may also choose to view a maximum number of comments; if there are more comments, navigation links are dispayed.

"; $output .= "

Since a busy site generates lots of comments, Drupal takes care to present a personalized view of comments for each user. The home page lists displays the number of read and unread comments for a given post for the current user. Also, the tracker module (when installed) displays all recent comments on the site. Finally, comments which the user has not yet read are highlighted with a red star (this graphic may depend on the current theme).

"; - $output .= "

Comments behave like other user submissions in Drupal. Specifically, ". l("filters", "admin/system&type=filter") ." like smileys and HTML work fine if the administrator has enabled them. Also, throttles are usually enabled to prevent a single user from spamming the web site with too many comments in a short period of time.

"; + $output .= "

Comments behave like other user submissions in Drupal. Specifically, ". l("filters", "admin/system&type=filter") ." like smileys and HTML work fine if the administrator has enabled them. Also, throttles are usually enabled to prevent a single user from spamming the web site with too many comments in a short period of time.

"; $output .= "

Administrators may control which persons are allowed to submit and administer comments. These controls appear in the ". l("user permissions", "admin/user/permission") ." administration page. Additionally, administrators may edit or search through comments on the ". l("comments admininistration page", "admin/comment") .", as well as set the default display view for new users. Administrators can also state whether a certain role will have their comments published immediately, or just put in a queue to be reviewed.

"; $output .= "

If you really have a lot of comments, you can enable moderation. You assign moderation permissions to role(s), then setup some \"moderation votes\"; these votes will appear to moderators in a dropdown menu near the comment. You also have to assign, for every role and every vote, a value, which can be either positive or negative; use the moderation matrix to do this. This allows for some roles having greater \"weight\" in their moderation, if you wish. If you set a value to 0, that vote won't be available to that role. When a user moderates, the value of their vote is added or subtracted to the score of that comment. Finally, you may want to setup the comment thresholds: these are floor/ceiling values which users see in the comment control panel. Threshholds are useful for hiding poorly rated comments while reading your site.

"; @@ -661,8 +661,8 @@ function comment_link($type, $node = 0, $main = 0) { $settings = "If you really have a lot of comments, you can enable moderation. You assign moderation permissions to role(s), then setup some 'moderation votes'; these votes will appear to moderators in a dropdown menu near the comment. You also have to assign, for every role and every vote, a value, which can be either positive or negative; use the moderation matrix to do this. This allows for some roles having greater 'weight' in their moderation, if you wish. If you set a value to 0, that vote won't be available to that role. When a user moderates, the value of their vote is added or subtracted to the score of that comment. Finally, you may want to setup the comment thresholds: these are floor/ceiling values which users see in the comment control panel. Threshholds are useful for hiding poorly rated comments while reading your site."; menu_add("comment management", url("admin/comment"), "Administer comments.", $help["comment"], "content management", 1); - menu_add("new or updated comments", url("admin/comment&status=0"), "Display new or updated comments.", NULL, "comment management"); - menu_add("comments that await approval", url("admin/comment&status=1"), "Display comments that await approval.", NULL, "comment management"); + menu_add("new or updated comments", url("admin/comment&status=0"), "Display new or updated comments.", NULL, "comment management"); + menu_add("comments that await approval", url("admin/comment&status=1"), "Display comments that await approval.", NULL, "comment management"); menu_add("search comment", url("admin/comment/search"), "Search a comment.", NULL, "comment management", 8); menu_add("help", url("admin/comment/help"), "More information about the comment system.", NULL, "comment management", 9); @@ -720,7 +720,7 @@ function comment_page() { case t("Update settings"): global $mode, $order, $threshold, $comments_per_page; comment_settings(check_query($mode), check_query($order), check_query($threshold), check_query($comments_per_page)); - drupal_goto(url("node/view/". $edit["nid"], "mode=$mode&order=$order&threshold=$threshold&comments_per_page=$comments_per_page")); + drupal_goto(url("node/view/". $edit["nid"], "mode=$mode&order=$order&threshold=$threshold&comments_per_page=$comments_per_page")); break; } } @@ -818,7 +818,7 @@ function comment_mod_matrix($edit) { global $tid, $rid; $output .= "

Moderators/vote values matrix

"; - $output .= "

Note: you must assign the moderate comments permission to at least one role in order to use this page."; + $output .= "

Note: you must assign the moderate comments permission to at least one role in order to use this page.

"; $output .= "

In order to use comment moderation, every textbox on this page should be populated with an integer. On this page, you also might wish to value the votes from some users more than others. For example, administrator votes might count twice as much as authenticated users.

"; if ($rid) { @@ -1113,13 +1113,13 @@ function comment_controls($threshold = 1, $mode = 3, $order = 1, $nid, $page = 0 if (($mode == 2 || $mode == 4) && $comment_num > $comments_per_page) { if ($page > 1) { - $p[] = l(t("previous"), "node/view/$nid&comment_page=". $page - 1); + $p[] = l(t("previous"), "node/view/$nid&comment_page=". $page - 1); } for ($n = 1; $n <= ceil($comment_num / $comments_per_page); $n++) { - $p[] = ($n == $page) ? "»$n«" : l($n, "node/view/$nid&comment_page=$n"); + $p[] = ($n == $page) ? "»$n«" : l($n, "node/view/$nid&comment_page=$n"); } if ($page < ceil($comment_num / $comments_per_page)) { - $p[] = l(t("next"), "node/view/$nid&comment_page". $page + 1); + $p[] = l(t("next"), "node/view/$nid&comment_page". $page + 1); } $output .= form_item(t("Browse %a comments", array("%a" => $comment_num)), implode(" • ", $p), t("There are more than %a comments in this node. Use these links to navigate through them.", array("%a" => $comments_per_page))); } @@ -1175,7 +1175,7 @@ function comment($comment, $link = 0) { } function comment_folded($comment) { - print l($comment->subject, "node/view/$comment->nid/$comment->cid#$comment->cid") ." ". t("by") . " " . format_name($comment) ."

"; + print "

". l($comment->subject, "node/view/$comment->nid/$comment->cid#$comment->cid") ." ". t("by") . " " . format_name($comment) ."

"; } function comment_flat_collapsed($comments, $threshold) { diff --git a/modules/comment/comment.module b/modules/comment/comment.module index d1afd7cd4..fcb31f7a2 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -8,7 +8,7 @@ function comment_help() { $output .= "

The comment module enables users to submit posts that are directly associated with a piece of content. These associated posts are called comments. Comments may be threaded, which means that Drupal keeps track of multiple subconversations around a piece of content. Threading helps to keep the comment conversation more organized. Users are presented with several ways to view the comment conversation, and if desired, users may easily choose a flat presentation of comments instead of threaded. Further, users may choose to order their comments view by newest first or by oldest first. Finally, users may view a folded list or an expanded list of comments. Folded limits the comment display to subject only. Drupal remembers the comment view preference of each registered user whenever he changes a view setting.

"; $output .= "

Users may also choose to view a maximum number of comments; if there are more comments, navigation links are dispayed.

"; $output .= "

Since a busy site generates lots of comments, Drupal takes care to present a personalized view of comments for each user. The home page lists displays the number of read and unread comments for a given post for the current user. Also, the tracker module (when installed) displays all recent comments on the site. Finally, comments which the user has not yet read are highlighted with a red star (this graphic may depend on the current theme).

"; - $output .= "

Comments behave like other user submissions in Drupal. Specifically, ". l("filters", "admin/system&type=filter") ." like smileys and HTML work fine if the administrator has enabled them. Also, throttles are usually enabled to prevent a single user from spamming the web site with too many comments in a short period of time.

"; + $output .= "

Comments behave like other user submissions in Drupal. Specifically, ". l("filters", "admin/system&type=filter") ." like smileys and HTML work fine if the administrator has enabled them. Also, throttles are usually enabled to prevent a single user from spamming the web site with too many comments in a short period of time.

"; $output .= "

Administrators may control which persons are allowed to submit and administer comments. These controls appear in the ". l("user permissions", "admin/user/permission") ." administration page. Additionally, administrators may edit or search through comments on the ". l("comments admininistration page", "admin/comment") .", as well as set the default display view for new users. Administrators can also state whether a certain role will have their comments published immediately, or just put in a queue to be reviewed.

"; $output .= "

If you really have a lot of comments, you can enable moderation. You assign moderation permissions to role(s), then setup some \"moderation votes\"; these votes will appear to moderators in a dropdown menu near the comment. You also have to assign, for every role and every vote, a value, which can be either positive or negative; use the moderation matrix to do this. This allows for some roles having greater \"weight\" in their moderation, if you wish. If you set a value to 0, that vote won't be available to that role. When a user moderates, the value of their vote is added or subtracted to the score of that comment. Finally, you may want to setup the comment thresholds: these are floor/ceiling values which users see in the comment control panel. Threshholds are useful for hiding poorly rated comments while reading your site.

"; @@ -661,8 +661,8 @@ function comment_link($type, $node = 0, $main = 0) { $settings = "If you really have a lot of comments, you can enable moderation. You assign moderation permissions to role(s), then setup some 'moderation votes'; these votes will appear to moderators in a dropdown menu near the comment. You also have to assign, for every role and every vote, a value, which can be either positive or negative; use the moderation matrix to do this. This allows for some roles having greater 'weight' in their moderation, if you wish. If you set a value to 0, that vote won't be available to that role. When a user moderates, the value of their vote is added or subtracted to the score of that comment. Finally, you may want to setup the comment thresholds: these are floor/ceiling values which users see in the comment control panel. Threshholds are useful for hiding poorly rated comments while reading your site."; menu_add("comment management", url("admin/comment"), "Administer comments.", $help["comment"], "content management", 1); - menu_add("new or updated comments", url("admin/comment&status=0"), "Display new or updated comments.", NULL, "comment management"); - menu_add("comments that await approval", url("admin/comment&status=1"), "Display comments that await approval.", NULL, "comment management"); + menu_add("new or updated comments", url("admin/comment&status=0"), "Display new or updated comments.", NULL, "comment management"); + menu_add("comments that await approval", url("admin/comment&status=1"), "Display comments that await approval.", NULL, "comment management"); menu_add("search comment", url("admin/comment/search"), "Search a comment.", NULL, "comment management", 8); menu_add("help", url("admin/comment/help"), "More information about the comment system.", NULL, "comment management", 9); @@ -720,7 +720,7 @@ function comment_page() { case t("Update settings"): global $mode, $order, $threshold, $comments_per_page; comment_settings(check_query($mode), check_query($order), check_query($threshold), check_query($comments_per_page)); - drupal_goto(url("node/view/". $edit["nid"], "mode=$mode&order=$order&threshold=$threshold&comments_per_page=$comments_per_page")); + drupal_goto(url("node/view/". $edit["nid"], "mode=$mode&order=$order&threshold=$threshold&comments_per_page=$comments_per_page")); break; } } @@ -818,7 +818,7 @@ function comment_mod_matrix($edit) { global $tid, $rid; $output .= "

Moderators/vote values matrix

"; - $output .= "

Note: you must assign the moderate comments permission to at least one role in order to use this page."; + $output .= "

Note: you must assign the moderate comments permission to at least one role in order to use this page.

"; $output .= "

In order to use comment moderation, every textbox on this page should be populated with an integer. On this page, you also might wish to value the votes from some users more than others. For example, administrator votes might count twice as much as authenticated users.

"; if ($rid) { @@ -1113,13 +1113,13 @@ function comment_controls($threshold = 1, $mode = 3, $order = 1, $nid, $page = 0 if (($mode == 2 || $mode == 4) && $comment_num > $comments_per_page) { if ($page > 1) { - $p[] = l(t("previous"), "node/view/$nid&comment_page=". $page - 1); + $p[] = l(t("previous"), "node/view/$nid&comment_page=". $page - 1); } for ($n = 1; $n <= ceil($comment_num / $comments_per_page); $n++) { - $p[] = ($n == $page) ? "»$n«" : l($n, "node/view/$nid&comment_page=$n"); + $p[] = ($n == $page) ? "»$n«" : l($n, "node/view/$nid&comment_page=$n"); } if ($page < ceil($comment_num / $comments_per_page)) { - $p[] = l(t("next"), "node/view/$nid&comment_page". $page + 1); + $p[] = l(t("next"), "node/view/$nid&comment_page". $page + 1); } $output .= form_item(t("Browse %a comments", array("%a" => $comment_num)), implode(" • ", $p), t("There are more than %a comments in this node. Use these links to navigate through them.", array("%a" => $comments_per_page))); } @@ -1175,7 +1175,7 @@ function comment($comment, $link = 0) { } function comment_folded($comment) { - print l($comment->subject, "node/view/$comment->nid/$comment->cid#$comment->cid") ." ". t("by") . " " . format_name($comment) ."

"; + print "

". l($comment->subject, "node/view/$comment->nid/$comment->cid#$comment->cid") ." ". t("by") . " " . format_name($comment) ."

"; } function comment_flat_collapsed($comments, $threshold) { diff --git a/modules/forum.module b/modules/forum.module index 92d91f6bf..6df7b4eb9 100644 --- a/modules/forum.module +++ b/modules/forum.module @@ -218,7 +218,7 @@ function forum_form(&$node, &$help, &$error) { while($icon = readdir($dir)) { if ($icon == '.' || $icon == '..') {continue;} if ($node->icon == $icon) {$checked = "checked";} else {$checked = "";} - $radio .= " \n"; + $radio .= "\"\" \n"; $icon_num++; } closedir($dir); @@ -230,7 +230,7 @@ function forum_form(&$node, &$help, &$error) { while($icon = readdir($dir)) { if ($icon == '.' || $icon == '..') {continue;} if ($node->icon_num == $icon_num) {$checked = "checked";} else {$checked = "";} - $radio .= " \n"; + $radio .= "\"\" \n"; $icon_num++; } closedir($dir); @@ -238,7 +238,7 @@ function forum_form(&$node, &$help, &$error) { } $output .= form_item(t("Topic icon"), $radio); } - $output .= form_textarea("Body", "body", $node->body, 60, 10); + $output .= form_textarea(t("Body"), "body", $node->body, 60, 10); return $output; } @@ -290,7 +290,7 @@ function _forum_last_reply($nid) { function _forum_format($topic) { if ($topic) { - return "". format_date($topic->timestamp, "small")."
".t("by")." ". format_name($topic) .""; + return "". format_date($topic->timestamp, "small")."
".t("by")." ". format_name($topic) .""; } else { return message_na(); @@ -565,7 +565,7 @@ function forum_forum_list($forums, $parents, $tid) { } $output .= "
"; - $output .= "".$forum->num_topics.($new_topics ? "
(".t("%a new", array("%a" => $new_topics)).")" : "")."".$forum->num_posts.""._forum_format($forum->last_post).""; + $output .= "".$forum->num_topics.($new_topics ? "
(".t("%a new", array("%a" => $new_topics)).")" : "")."".$forum->num_posts.""._forum_format($forum->last_post).""; } } } @@ -684,7 +684,7 @@ function _forum_get_folder_icon($new_posts, $num_posts = 0, $comment_mode = 0) { $file = $base_path."/".$icon.".gif"; } - return ""; + return "\"\""; } else { return " "; @@ -726,15 +726,15 @@ function forum_help() {

Drupal lets you setup a countless number of forums by using the powerful taxonomy module. Therefore to create a forum you first have to create a taxonomy vocuabulary and add some terms to it, each term will be a forum. Creating a vocabulary is done by going the taxonomy page of the administration pages, then selecting the add new vocabulary link. Choose a name for the vocabulary (example: forum, message boards, or debates), and make sure under Types that forum is selected. Nothing else needs to be configured, so unless you have more advanced needs save the vocabulary. Now add a term to the vocabulary just added to create a forum. In the add term window enter the name of the forum (example: general, off topic, support), a description to make it clear to the users what the forum is about, and then save the term. You can now add a new forum by entering another term, repeat until all the forums are entered.

Once a vocabulary is entered go to site configuration in the administration pages and set the Forum vocabulary, don't forget to save! There will now be forums active on the site. For users to access them the proper user permissions must be given in the user management pages.

Containers

-

By designating a forum as a Container, users are not allowed to post into that forum. The forum will be visible on the forum listing page, so it acts as a section delimiter if you will. This is useful if you have a lots of forums which are nested. For example,

- Marketing
+

By designating a forum as a Container, users are not allowed to post into that forum. The forum will be visible on the forum listing page, so it acts as a section delimiter if you will. This is useful if you have a lots of forums which are nested. For example,

+

Marketing
-- Market research
-- Brand management

Sales
-- Closing the deal
- -- Avoiding ear and throat pain
-

If you don't want people posting into the Marketing or Sales folders, you designate them as Containers.

+ -- Avoiding ear and throat pain

+

If you don't want people posting into the Marketing or Sales folders, you designate them as Containers.

Icons

To disable icons, set the icon paths as blank in Admin -> Site Configuration -> Forum

All files in the icon directory are assumed to be images. Usually it is best to use GIF or JPG files as icons. You may use images of whatever size you wish, but it is customary to use 15x15 or 16x16.

diff --git a/modules/forum/forum.module b/modules/forum/forum.module index 92d91f6bf..6df7b4eb9 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -218,7 +218,7 @@ function forum_form(&$node, &$help, &$error) { while($icon = readdir($dir)) { if ($icon == '.' || $icon == '..') {continue;} if ($node->icon == $icon) {$checked = "checked";} else {$checked = "";} - $radio .= " \n"; + $radio .= "\"\" \n"; $icon_num++; } closedir($dir); @@ -230,7 +230,7 @@ function forum_form(&$node, &$help, &$error) { while($icon = readdir($dir)) { if ($icon == '.' || $icon == '..') {continue;} if ($node->icon_num == $icon_num) {$checked = "checked";} else {$checked = "";} - $radio .= " \n"; + $radio .= "\"\" \n"; $icon_num++; } closedir($dir); @@ -238,7 +238,7 @@ function forum_form(&$node, &$help, &$error) { } $output .= form_item(t("Topic icon"), $radio); } - $output .= form_textarea("Body", "body", $node->body, 60, 10); + $output .= form_textarea(t("Body"), "body", $node->body, 60, 10); return $output; } @@ -290,7 +290,7 @@ function _forum_last_reply($nid) { function _forum_format($topic) { if ($topic) { - return "". format_date($topic->timestamp, "small")."
".t("by")." ". format_name($topic) .""; + return "". format_date($topic->timestamp, "small")."
".t("by")." ". format_name($topic) .""; } else { return message_na(); @@ -565,7 +565,7 @@ function forum_forum_list($forums, $parents, $tid) { } $output .= ""; - $output .= "".$forum->num_topics.($new_topics ? "
(".t("%a new", array("%a" => $new_topics)).")" : "")."".$forum->num_posts.""._forum_format($forum->last_post).""; + $output .= "".$forum->num_topics.($new_topics ? "
(".t("%a new", array("%a" => $new_topics)).")" : "")."".$forum->num_posts.""._forum_format($forum->last_post).""; } } } @@ -684,7 +684,7 @@ function _forum_get_folder_icon($new_posts, $num_posts = 0, $comment_mode = 0) { $file = $base_path."/".$icon.".gif"; } - return ""; + return "\"\""; } else { return " "; @@ -726,15 +726,15 @@ function forum_help() {

Drupal lets you setup a countless number of forums by using the powerful taxonomy module. Therefore to create a forum you first have to create a taxonomy vocuabulary and add some terms to it, each term will be a forum. Creating a vocabulary is done by going the taxonomy page of the administration pages, then selecting the add new vocabulary link. Choose a name for the vocabulary (example: forum, message boards, or debates), and make sure under Types that forum is selected. Nothing else needs to be configured, so unless you have more advanced needs save the vocabulary. Now add a term to the vocabulary just added to create a forum. In the add term window enter the name of the forum (example: general, off topic, support), a description to make it clear to the users what the forum is about, and then save the term. You can now add a new forum by entering another term, repeat until all the forums are entered.

Once a vocabulary is entered go to site configuration in the administration pages and set the Forum vocabulary, don't forget to save! There will now be forums active on the site. For users to access them the proper user permissions must be given in the user management pages.

Containers

-

By designating a forum as a Container, users are not allowed to post into that forum. The forum will be visible on the forum listing page, so it acts as a section delimiter if you will. This is useful if you have a lots of forums which are nested. For example,

- Marketing
+

By designating a forum as a Container, users are not allowed to post into that forum. The forum will be visible on the forum listing page, so it acts as a section delimiter if you will. This is useful if you have a lots of forums which are nested. For example,

+

Marketing
-- Market research
-- Brand management

Sales
-- Closing the deal
- -- Avoiding ear and throat pain
-

If you don't want people posting into the Marketing or Sales folders, you designate them as Containers.

+ -- Avoiding ear and throat pain

+

If you don't want people posting into the Marketing or Sales folders, you designate them as Containers.

Icons

To disable icons, set the icon paths as blank in Admin -> Site Configuration -> Forum

All files in the icon directory are assumed to be images. Usually it is best to use GIF or JPG files as icons. You may use images of whatever size you wish, but it is customary to use 15x15 or 16x16.

diff --git a/modules/import.module b/modules/import.module index 0a9c79901..4d5e42a24 100644 --- a/modules/import.module +++ b/modules/import.module @@ -63,7 +63,7 @@ function import_format_item($item, $feed = 0) { global $theme, $user; if ($user->uid && user_access("maintain personal blog")) { - $output .= l("image("blog.gif") ."\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("Blog this item") ."\" />", "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); + $output .= l("image("blog.gif") ."\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("Blog this item") ."\" />", "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); } // external link @@ -136,7 +136,7 @@ function import_get_bundles($attributes = 0) { $result = db_query("SELECT * FROM bundle ORDER BY title"); while ($bundle = db_fetch_object($result)) { $block[$bundle->bid]["subject"] = $bundle->title; - $block[$bundle->bid]["content"] = import_bundle_block($bundle->attributes) ."

". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."

"; + $block[$bundle->bid]["content"] = import_bundle_block($bundle->attributes) ."
". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."
"; $block[$bundle->bid]["info"] = "$bundle->title bundle"; } @@ -525,7 +525,7 @@ function import_page_last() { $output .= ""; while ($item = db_fetch_object($result)) { if (module_exist("blog") && user_access("maintain personal blog")) { - $links[] = l(t("blog it"), "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); + $links[] = l(t("blog it"), "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); } $links[] = l(t("feed"), "import/feed/$item->fid", array("title" => t("Read more syndicated news from this feed."))); @@ -554,14 +554,14 @@ function import_page_feed($fid) { $header .= "

". t("Website") .":

link\">$feed->link

"; $header .= "

". t("Description") .":

$feed->description

"; - $header .= "

". t("Last update") .":

". format_interval(time() - $feed->timestamp) ." ". t("ago") ." url\">image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />

\n"; + $header .= "

". t("Last update") .":

". format_interval(time() - $feed->timestamp) ." ". t("ago") ." url\">image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" alt=\"\" />

\n"; $result = db_query("SELECT * FROM item WHERE fid = '%s' ORDER BY iid DESC LIMIT ". variable_get("import_page_limit", 75), $fid); $output .= "
"; while ($item = db_fetch_object($result)) { if (module_exist("blog") && user_access("maintain personal blog")) { - $links[] = l(t("blog it"), "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); + $links[] = l(t("blog it"), "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); } $links[] = "link\">". t("visit") .""; @@ -598,7 +598,7 @@ function import_page_bundle($bid) { $output .= "
"; while ($item = db_fetch_object($result)) { if (module_exist("blog") && user_access("maintain personal blog")) { - $links[] = l(t("blog it"), "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); + $links[] = l(t("blog it"), "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); } $links[] = l(t("feed"), "import/feed/$item->fid", array("title" => t("Read more syndicated news from this feed."))); $links[] = "link\">". t("visit") .""; diff --git a/modules/node.module b/modules/node.module index ba89972b7..60d724126 100644 --- a/modules/node.module +++ b/modules/node.module @@ -487,7 +487,7 @@ function node_admin_edit($node) { $output .= "
"; $output .= " "; foreach ($node->revisions as $key => $revision) { - $output .= " "; + $output .= " "; } $output .= "
". t("older revisions") ."". t("operations") ."
". t("revision #%r revised by %u on %d", array("%r" => $key, "%u" => format_name(user_load(array("uid" => $revision["uid"]))), "%d" => format_date($revision["timestamp"], "small"))) . ($revision["history"] ? "
". $revision["history"] ."" : "") ."		". l(t("view revision"), "node/view/$node->nid", NULL, "revision=$key") ."". l(t("rollback revision"), "admin/node/rollback+revision/$node->nid/$key") ."". l(t("delete revision"), "admin/node/delete+revision/$node->nid/$key") ."
". t("revision #%r revised by %u on %d", array("%r" => $key, "%u" => format_name(user_load(array("uid" => $revision["uid"]))), "%d" => format_date($revision["timestamp"], "small"))) . ($revision["history"] ? "
". $revision["history"] ."" : "") ."		". l(t("view revision"), "node/view/$node->nid", array(), "revision=$key") ."". l(t("rollback revision"), "admin/node/rollback+revision/$node->nid/$key") ."". l(t("delete revision"), "admin/node/delete+revision/$node->nid/$key") ."
"; } diff --git a/modules/node/node.module b/modules/node/node.module index ba89972b7..60d724126 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -487,7 +487,7 @@ function node_admin_edit($node) { $output .= ""; $output .= " "; foreach ($node->revisions as $key => $revision) { - $output .= " "; + $output .= " "; } $output .= "
". t("older revisions") ."". t("operations") ."
". t("revision #%r revised by %u on %d", array("%r" => $key, "%u" => format_name(user_load(array("uid" => $revision["uid"]))), "%d" => format_date($revision["timestamp"], "small"))) . ($revision["history"] ? "
". $revision["history"] ."" : "") ."		". l(t("view revision"), "node/view/$node->nid", NULL, "revision=$key") ."". l(t("rollback revision"), "admin/node/rollback+revision/$node->nid/$key") ."". l(t("delete revision"), "admin/node/delete+revision/$node->nid/$key") ."
". t("revision #%r revised by %u on %d", array("%r" => $key, "%u" => format_name(user_load(array("uid" => $revision["uid"]))), "%d" => format_date($revision["timestamp"], "small"))) . ($revision["history"] ? "
". $revision["history"] ."" : "") ."		". l(t("view revision"), "node/view/$node->nid", array(), "revision=$key") ."". l(t("rollback revision"), "admin/node/rollback+revision/$node->nid/$key") ."". l(t("delete revision"), "admin/node/delete+revision/$node->nid/$key") ."
"; } diff --git a/modules/profile.module b/modules/profile.module index 83f5ea53a..c1c5b7810 100644 --- a/modules/profile.module +++ b/modules/profile.module @@ -125,7 +125,7 @@ function _profile_form($edit, $mode) { if ($edit["profile_avatar"] && $edit["uid"]) { $file = profile_avatar_path($edit["uid"], $edit["profile_avatar"]); if ($file) { - $output .= "
"; + $output .= "\"\"
"; } } $output .= form_file($profile_fields["avatar"][1], "profile_avatar", 64, $profile_fields["avatar"][2]); @@ -187,7 +187,7 @@ function _profile_user_view(&$user, $mode) { if ($t == "profile_avatar") { $file = profile_avatar_path($user->uid, $user->profile_avatar); if (file_exists($file)) { - $output .= form_item(t("Avatar"), ""); + $output .= form_item(t("Avatar"), "\"\""); } } diff --git a/modules/profile/profile.module b/modules/profile/profile.module index 83f5ea53a..c1c5b7810 100644 --- a/modules/profile/profile.module +++ b/modules/profile/profile.module @@ -125,7 +125,7 @@ function _profile_form($edit, $mode) { if ($edit["profile_avatar"] && $edit["uid"]) { $file = profile_avatar_path($edit["uid"], $edit["profile_avatar"]); if ($file) { - $output .= "
"; + $output .= "\"\"
"; } } $output .= form_file($profile_fields["avatar"][1], "profile_avatar", 64, $profile_fields["avatar"][2]); @@ -187,7 +187,7 @@ function _profile_user_view(&$user, $mode) { if ($t == "profile_avatar") { $file = profile_avatar_path($user->uid, $user->profile_avatar); if (file_exists($file)) { - $output .= form_item(t("Avatar"), ""); + $output .= form_item(t("Avatar"), "\"\""); } } diff --git a/modules/search.module b/modules/search.module index d6acc1b71..fb9e924d9 100644 --- a/modules/search.module +++ b/modules/search.module @@ -5,7 +5,7 @@ function search_help() { $output = "". t("Search guidelines") .""; $output .= "

". t("The search page allows you to search the website's content. You can specify multiple words, and they will all be searched for. You can also use wildcards, so 'walk*' will match 'walk', 'walking', 'walker', 'walkable' and so on. Furthermore, searches are not case sensitive so searching for 'walk', 'Walk' or 'WALK' will yield exactly the same results.") ."

"; $output .= "". t("Words excluded from the search") .""; - $output .= "

". t("Words that frequently occur, typically called 'noise words', are ignored. Example words are 'a', 'at', 'and', 'are', 'as', 'how', 'where', etc. Words shorter than %number letters are also being filtered.", array("%number" => variable_get("minimum_word_size", 2))); + $output .= "

". t("Words that frequently occur, typically called 'noise words', are ignored. Example words are 'a', 'at', 'and', 'are', 'as', 'how', 'where', etc. Words shorter than %number letters are also being filtered.", array("%number" => variable_get("minimum_word_size", 2))) ."

"; return $output; } diff --git a/modules/search/search.module b/modules/search/search.module index d6acc1b71..fb9e924d9 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -5,7 +5,7 @@ function search_help() { $output = "". t("Search guidelines") .""; $output .= "

". t("The search page allows you to search the website's content. You can specify multiple words, and they will all be searched for. You can also use wildcards, so 'walk*' will match 'walk', 'walking', 'walker', 'walkable' and so on. Furthermore, searches are not case sensitive so searching for 'walk', 'Walk' or 'WALK' will yield exactly the same results.") ."

"; $output .= "". t("Words excluded from the search") .""; - $output .= "

". t("Words that frequently occur, typically called 'noise words', are ignored. Example words are 'a', 'at', 'and', 'are', 'as', 'how', 'where', etc. Words shorter than %number letters are also being filtered.", array("%number" => variable_get("minimum_word_size", 2))); + $output .= "

". t("Words that frequently occur, typically called 'noise words', are ignored. Example words are 'a', 'at', 'and', 'are', 'as', 'how', 'where', etc. Words shorter than %number letters are also being filtered.", array("%number" => variable_get("minimum_word_size", 2))) ."

"; return $output; } diff --git a/modules/statistics.module b/modules/statistics.module index ff0c127cc..3121a7dbf 100644 --- a/modules/statistics.module +++ b/modules/statistics.module @@ -164,7 +164,7 @@ function statistics_help() {

Configuring the statistics module

-

There are a couple of configuration options added to the main admin page. +

There are a couple of configuration options added to the main admin page.

The first option, enable access log, allows you to turn the access log on and off. This log is used to store things like referrers and who's online. Enabling the log adds one database call per page displayed by Drupal.

@@ -205,7 +205,7 @@ function statistics_help() {
  • administer statistics module - enable for user roles that get to configure the statistics module.
  • administer statistics - enable for user roles that get to view the referrer statistics.
    • -If 'administer statistics' and 'access statistics' are both enabled, the user will see a link from each node to that node's referrer statistics (if enabled). +

    If 'administer statistics' and 'access statistics' are both enabled, the user will see a link from each node to that node's referrer statistics (if enabled).

    Statistics module (for developers)

    @@ -219,7 +219,7 @@ If 'administer statistics' and 'access statistics' are both enable

    The module automatically adds '# reads' to each node's link section (if enabled).

    Top stories

    -

    The statistics.module provides a function 'statistics_title_list($type)' to return an array of links to any of the following: the top viewed nodes of all time, the top viewed nodes of today, the last viewed nodes. You can pass in: +

    The statistics.module provides a function 'statistics_title_list($type)' to return an array of links to any of the following: the top viewed nodes of all time, the top viewed nodes of today, the last viewed nodes. You can pass in:

    -If 'administer statistics' and 'access statistics' are both enabled, the user will see a link from each node to that node's referrer statistics (if enabled). +

    If 'administer statistics' and 'access statistics' are both enabled, the user will see a link from each node to that node's referrer statistics (if enabled).

    Statistics module (for developers)

    @@ -219,7 +219,7 @@ If 'administer statistics' and 'access statistics' are both enable

    The module automatically adds '# reads' to each node's link section (if enabled).

    Top stories

    -

    The statistics.module provides a function 'statistics_title_list($type)' to return an array of links to any of the following: the top viewed nodes of all time, the top viewed nodes of today, the last viewed nodes. You can pass in: +

    The statistics.module provides a function 'statistics_title_list($type)' to return an array of links to any of the following: the top viewed nodes of all time, the top viewed nodes of today, the last viewed nodes. You can pass in: