diff options
Diffstat (limited to 'modules/drupal/drupal.module')
| -rw-r--r-- | modules/drupal/drupal.module | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/modules/drupal/drupal.module b/modules/drupal/drupal.module index 926b1a694..93ebc1205 100644 --- a/modules/drupal/drupal.module +++ b/modules/drupal/drupal.module @@ -4,7 +4,7 @@ function drupal_help($section = "admin/drupal/help") { $output = ""; - switch($section) { + switch ($section) { case 'admin/help': case 'admin/drupal/help': $output .= "<p>The \"Drupal\" module features a capability whereby other drupal sites may <i>call home</i> to report their existence. In turn, this enables a pod of Drupal sites to find, cooperate and advertise each other.</p>"; @@ -14,22 +14,21 @@ function drupal_help($section = "admin/drupal/help") { $output .= "<p>Also note that your installation need not use drupal.org as its directory server. For example, this feature is perfectly capable of aggregating pings from all of your departmental drupal installations sites within an enterprise.</p>"; $output .= t($output, array("%drupal-sites" => "<a href=\"http://www.drupal.org/node/view/3\">". t("Drupal sites page") ."</a>", "%Drupal" => "<a href=\"http://www.drupal.org\">drupal.org</a>", "%xml-rpc" => "<a href=\"http://www.xmlrpc.com/\">XLM-RPC</a>", "%drupal-settings" => l(t("Administration » site configuration » modules » drupal"), "admin/system/modules/drupal"), "%cron" => l(t("cron run"), "admin/system/help#cron") )); break; - case 'admin/system/modules': + case 'admin/system/modules#description': $output = t("Lets users log in using a Drupal ID and can notify drupal.org about your site."); break; case 'admin/system/modules/drupal': - $output = t("Using this your Drupal site can \"call home\" and add itself to the Drupal directory. If you want it to add itself to a different directory server you can change the %Drupal-setting setting -- but the directory server has to be able to handle Drupal XML. To get a full site listing go to the %general and set:<ul><li>The site name,</li><li>The site E-Mail address,</li><li>The site slogan, and</li><li>The site mission statement.</li></ul>", array("%Drupal-setting" => l(t("Drupal XML-RPC server"), "admin/system/modules/drupal"), "%general" => l(t("site configuration"), "admin/system") )); + $output = t("Using this your Drupal site can \"call home\" and add itself to the Drupal directory. If you want it to add itself to a different directory server you can change the %Drupal-setting setting -- but the directory server has to be able to handle Drupal XML. To get a full site listing go to the %general and set:<ul><li>The site name,</li><li>The site E-Mail address,</li><li>The site slogan, and</li><li>The site mission statement.</li></ul>", array("%Drupal-setting" => l(t("Drupal XML-RPC server"), "admin/system/modules/drupal"), "%general" => l(t("site configuration"), "admin/system"))); break; - } - - return $output; -} + case 'user/help': + $site = variable_get("site_name", "this web site"); -function drupal_system($field) { - $output = ""; + $output = "<p>%drupal is the name of the software which powers %site. There are Drupal web sites all over the world, and many of them share their registration databases so that users may freely login to any Drupal site using a single <b>Drupal ID</b>.</p>\n"; + $output .= "<p>So please feel free to login to your account here at %site with a username from another Drupal site. The format of a Drupal ID is similar to an email address: <b>username</b>@<i>server</i>. An example of valid Drupal ID is <b>mwlily</b>@<i>www.drupal.org</i>.</p>"; - if ($field == "description") { $output = drupal_help("admin/system/modules"); } - else if ($field == "admin_help") { $output = drupal_help("admin/system/modules/drupal"); }; + $output = t($output, array("%drupal" => "<a href=\"http://www.drupal.org\">Drupal</a>", "%site" => "<i>$site</i>")); + break; + } return $output; } @@ -160,7 +159,7 @@ function drupal_auth($username, $password, $server) { function drupal_page() { theme("header"); - theme("box", "Drupal", drupal_auth_help()); + theme("box", "Drupal", drupal_help("user/help")); theme("footer"); } @@ -179,15 +178,6 @@ function drupal_login($arguments) { } } -function drupal_auth_help() { - $site = variable_get("site_name", "this web site"); - - $output = "<p><a href=\"http://www.drupal.org\">Drupal</a> is the name of the software which powers %s. There are Drupal web sites all over the world, and many of them share their registration databases so that users may freely login to any Drupal site using a single <b>Drupal ID</b>.</p>\n"; - $output .= "<p>So please feel free to login to your account here at %s with a username from another Drupal site. The format of a Drupal ID is similar to an email address: <b>username</b>@<i>server</i>. An example of valid Drupal ID is <b>mwlily</b>@<i>www.drupal.org</i>.</p>"; - - return t($output, array("%s" => "<i>$site</i>")); -} - function drupal_user($type, $edit, $user) { $module = "drupal"; |