diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/aggregator.module | 7 | ||||
| -rw-r--r-- | modules/aggregator/aggregator.module | 7 | ||||
| -rw-r--r-- | modules/blog.module | 1 | ||||
| -rw-r--r-- | modules/blog/blog.module | 1 | ||||
| -rw-r--r-- | modules/import.module | 7 | ||||
| -rw-r--r-- | modules/user.module | 3 | ||||
| -rw-r--r-- | modules/user/user.module | 3 |
7 files changed, 24 insertions, 5 deletions
diff --git a/modules/aggregator.module b/modules/aggregator.module index e50b77c5b..fe9a2a2cd 100644 --- a/modules/aggregator.module +++ b/modules/aggregator.module @@ -531,6 +531,9 @@ function import_page_info() { $links[] = lm(t("news by source"), array("mod" => "import", "op" => "feeds"), "", array("title" => t("View the latest headlines sorted by source."))); $links[] = lm(t("news by topic"), array("mod" => "import", "op" => "bundles"), "", array("title" => t("View the latest headlines sorted by topic."))); $links[] = lm(t("news sources"), array("mod" => "import", "op" => "sources"), "", array("title" => t("View a list of all the websites we syndicate from."))); + if (user_access("administer news feeds")) { + $links[] = la(t("administer news feeds"), array("mod" => "import"), "", array("title" => t("View the news feed administrative pages."))); + } return "<div align=\"center\">". $theme->links($links) ."</div>"; } @@ -542,7 +545,9 @@ function import_page_last() { $output .= "<table border=\"0\" cellpadding=\"4\" cellspacing=\"2\">"; while ($item = db_fetch_object($result)) { - $links[] = lm(t("blog it"), array("mod" => "node", "op" => "add", "type" => "blog", "iid" => $item->iid), "", array("title" => t("Comment on this news item in your personal blog."))); + if (module_exist("blog")) { + $links[] = lm(t("blog it"), array("mod" => "node", "op" => "add", "type" => "blog", "iid" => $item->iid), "", array("title" => t("Comment on this news item in your personal blog."))); + } $links[] = lm(t("feed"), array("mod" => "import", "op" => "feed", "id" => $item->fid), "", array("title" => t("Read more syndicated news from this feed."))); if ($item->link) { diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index e50b77c5b..fe9a2a2cd 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -531,6 +531,9 @@ function import_page_info() { $links[] = lm(t("news by source"), array("mod" => "import", "op" => "feeds"), "", array("title" => t("View the latest headlines sorted by source."))); $links[] = lm(t("news by topic"), array("mod" => "import", "op" => "bundles"), "", array("title" => t("View the latest headlines sorted by topic."))); $links[] = lm(t("news sources"), array("mod" => "import", "op" => "sources"), "", array("title" => t("View a list of all the websites we syndicate from."))); + if (user_access("administer news feeds")) { + $links[] = la(t("administer news feeds"), array("mod" => "import"), "", array("title" => t("View the news feed administrative pages."))); + } return "<div align=\"center\">". $theme->links($links) ."</div>"; } @@ -542,7 +545,9 @@ function import_page_last() { $output .= "<table border=\"0\" cellpadding=\"4\" cellspacing=\"2\">"; while ($item = db_fetch_object($result)) { - $links[] = lm(t("blog it"), array("mod" => "node", "op" => "add", "type" => "blog", "iid" => $item->iid), "", array("title" => t("Comment on this news item in your personal blog."))); + if (module_exist("blog")) { + $links[] = lm(t("blog it"), array("mod" => "node", "op" => "add", "type" => "blog", "iid" => $item->iid), "", array("title" => t("Comment on this news item in your personal blog."))); + } $links[] = lm(t("feed"), array("mod" => "import", "op" => "feed", "id" => $item->fid), "", array("title" => t("Read more syndicated news from this feed."))); if ($item->link) { diff --git a/modules/blog.module b/modules/blog.module index f6ad0b849..1a2aa8d3c 100644 --- a/modules/blog.module +++ b/modules/blog.module @@ -249,6 +249,7 @@ function blog_form(&$node, &$help, &$error) { } if ($iid && $item = db_fetch_object(db_query("SELECT i.*, f.title as ftitle, f.link as flink FROM item i, feed f WHERE i.iid = '%s' AND i.fid = f.fid", $iid))) { + $node->title = $item->title; $node->body = "<a href=\"$item->link\">$item->title</a> - <i>". check_output($item->description) ."</i> [<a href=\"$item->flink\">$item->ftitle</a>]\n"; } } diff --git a/modules/blog/blog.module b/modules/blog/blog.module index f6ad0b849..1a2aa8d3c 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -249,6 +249,7 @@ function blog_form(&$node, &$help, &$error) { } if ($iid && $item = db_fetch_object(db_query("SELECT i.*, f.title as ftitle, f.link as flink FROM item i, feed f WHERE i.iid = '%s' AND i.fid = f.fid", $iid))) { + $node->title = $item->title; $node->body = "<a href=\"$item->link\">$item->title</a> - <i>". check_output($item->description) ."</i> [<a href=\"$item->flink\">$item->ftitle</a>]\n"; } } diff --git a/modules/import.module b/modules/import.module index e50b77c5b..fe9a2a2cd 100644 --- a/modules/import.module +++ b/modules/import.module @@ -531,6 +531,9 @@ function import_page_info() { $links[] = lm(t("news by source"), array("mod" => "import", "op" => "feeds"), "", array("title" => t("View the latest headlines sorted by source."))); $links[] = lm(t("news by topic"), array("mod" => "import", "op" => "bundles"), "", array("title" => t("View the latest headlines sorted by topic."))); $links[] = lm(t("news sources"), array("mod" => "import", "op" => "sources"), "", array("title" => t("View a list of all the websites we syndicate from."))); + if (user_access("administer news feeds")) { + $links[] = la(t("administer news feeds"), array("mod" => "import"), "", array("title" => t("View the news feed administrative pages."))); + } return "<div align=\"center\">". $theme->links($links) ."</div>"; } @@ -542,7 +545,9 @@ function import_page_last() { $output .= "<table border=\"0\" cellpadding=\"4\" cellspacing=\"2\">"; while ($item = db_fetch_object($result)) { - $links[] = lm(t("blog it"), array("mod" => "node", "op" => "add", "type" => "blog", "iid" => $item->iid), "", array("title" => t("Comment on this news item in your personal blog."))); + if (module_exist("blog")) { + $links[] = lm(t("blog it"), array("mod" => "node", "op" => "add", "type" => "blog", "iid" => $item->iid), "", array("title" => t("Comment on this news item in your personal blog."))); + } $links[] = lm(t("feed"), array("mod" => "import", "op" => "feed", "id" => $item->fid), "", array("title" => t("Read more syndicated news from this feed."))); if ($item->link) { diff --git a/modules/user.module b/modules/user.module index 404713eac..7a075c755 100644 --- a/modules/user.module +++ b/modules/user.module @@ -929,8 +929,9 @@ function user_edit($edit = array()) { } $output .= form_textfield(t("Homepage"), "homepage", $edit["homepage"], 30, 55, t("Optional") .". ". t("Make sure you enter a fully qualified URL: remember to include \"http://\".")); + $options = "<option value=\"\"". (("" == $key) ? " selected=\"selected\"" : "") .">". t("Default theme") ."</option>\n"; foreach (theme_list() as $key => $value) { - $options .= "$value[type]<option value=\"$key\"". (($edit["theme"] == $key) ? " selected=\"selected\"" : "") .">$key - $value->description</option>\n"; + $options .= "<option value=\"$key\"". (($edit["theme"] == $key) ? " selected=\"selected\"" : "") .">$key - $value->description</option>\n"; } $output .= form_item(t("Theme"), "<select name=\"edit[theme]\">$options</select>", t("Selecting a different theme will change the look and feel of the site.")); for ($zone = -43200; $zone <= 46800; $zone += 3600) $zones[$zone] = date("l, F dS, Y - h:i A", time() - date("Z") + $zone) ." (GMT ". $zone / 3600 .")"; diff --git a/modules/user/user.module b/modules/user/user.module index 404713eac..7a075c755 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -929,8 +929,9 @@ function user_edit($edit = array()) { } $output .= form_textfield(t("Homepage"), "homepage", $edit["homepage"], 30, 55, t("Optional") .". ". t("Make sure you enter a fully qualified URL: remember to include \"http://\".")); + $options = "<option value=\"\"". (("" == $key) ? " selected=\"selected\"" : "") .">". t("Default theme") ."</option>\n"; foreach (theme_list() as $key => $value) { - $options .= "$value[type]<option value=\"$key\"". (($edit["theme"] == $key) ? " selected=\"selected\"" : "") .">$key - $value->description</option>\n"; + $options .= "<option value=\"$key\"". (($edit["theme"] == $key) ? " selected=\"selected\"" : "") .">$key - $value->description</option>\n"; } $output .= form_item(t("Theme"), "<select name=\"edit[theme]\">$options</select>", t("Selecting a different theme will change the look and feel of the site.")); for ($zone = -43200; $zone <= 46800; $zone += 3600) $zones[$zone] = date("l, F dS, Y - h:i A", time() - date("Z") + $zone) ." (GMT ". $zone / 3600 .")"; |