Commit 3d73a48e authored by Dries's avatar Dries
Browse files

- Merged "system settings" and "module settings" into one page.  IMHO
  it wasn't a good idea to split them up in first place, and it turned
  out to be quite hard to decide where to put some variables.

  Also moved some variables around and even renamed a few variables
  while doing so.

- Added a page_header() and page_footer() to all top-level .php pages.
parent 03c06a86
...@@ -133,7 +133,7 @@ function account_site_edit() { ...@@ -133,7 +133,7 @@ function account_site_edit() {
} }
else { else {
$theme->header(); $theme->header();
if (variable_get("account_reg_allow", 1)) $theme->box(t("Create user account"), account_create()); if (variable_get("account_register", 1)) $theme->box(t("Create user account"), account_create());
$theme->box(t("E-mail new password"), account_email()); $theme->box(t("E-mail new password"), account_email());
$theme->footer(); $theme->footer();
} }
...@@ -202,7 +202,7 @@ function account_user($uname) { ...@@ -202,7 +202,7 @@ function account_user($uname) {
} }
elseif ($uname && $account = account_get_user($uname)) { elseif ($uname && $account = account_get_user($uname)) {
$output .= "<TABLE BORDER=\"0\" CELLPADDING=\"1\" CELLSPACING=\"1\">\n"; $output .= "<TABLE BORDER=\"0\" CELLPADDING=\"1\" CELLSPACING=\"1\">\n";
$output .= " <TR><TD ALIGN=\"right\"><B>". t("Username") .":</B></TD><TD>$account->userid</TD></TR>\n"; $output .= " <TR><TD ALIGN=\"right\"><B>". t("Username") .":</B></TD><TD>". check_output($account->userid) ."</TD></TR>\n";
$output .= " <TR><TD ALIGN=\"right\"><B>". t("E-mail") .":</B></TD><TD>". format_email($account->fake_email) ."</TD></TR>\n"; $output .= " <TR><TD ALIGN=\"right\"><B>". t("E-mail") .":</B></TD><TD>". format_email($account->fake_email) ."</TD></TR>\n";
$output .= " <TR><TD ALIGN=\"right\"><B>". t("Homepage") .":</B></TD><TD>". format_url($account->url) ."</TD></TR>\n"; $output .= " <TR><TD ALIGN=\"right\"><B>". t("Homepage") .":</B></TD><TD>". format_url($account->url) ."</TD></TR>\n";
$output .= " <TR><TD ALIGN=\"right\"><B>". t("Bio") .":</B></TD><TD>". check_output($account->bio) ."</TD></TR>\n"; $output .= " <TR><TD ALIGN=\"right\"><B>". t("Bio") .":</B></TD><TD>". check_output($account->bio) ."</TD></TR>\n";
...@@ -216,7 +216,7 @@ function account_user($uname) { ...@@ -216,7 +216,7 @@ function account_user($uname) {
else { else {
// Display login form: // Display login form:
$theme->header(); $theme->header();
if (variable_get("account_reg_allow", 1)) $theme->box(t("Create user account"), account_create()); if (variable_get("account_register", 1)) $theme->box(t("Create user account"), account_create());
$theme->box(t("E-mail new password"), account_email()); $theme->box(t("E-mail new password"), account_email());
$theme->footer(); $theme->footer();
} }
...@@ -405,7 +405,7 @@ function account_track_site() { ...@@ -405,7 +405,7 @@ function account_track_site() {
account_email_submit(check_input($userid), check_input($email)); account_email_submit(check_input($userid), check_input($email));
break; break;
case t("Create account"): case t("Create account"):
if (variable_get("account_reg_allow", 1)) account_create_submit(check_input($userid), check_input($email)); if (variable_get("account_register", 1)) account_create_submit(check_input($userid), check_input($email));
break; break;
case t("Save user information"): case t("Save user information"):
account_user_save($edit); account_user_save($edit);
......
...@@ -250,11 +250,17 @@ function timer_print() { ...@@ -250,11 +250,17 @@ function timer_print() {
} }
function page_header() { function page_header() {
if (variable_get("dev_timer", 0)) timer_start(); global $user;
if (variable_get("dev_timer", 0)) {
timer_start();
}
} }
function page_footer() { function page_footer() {
if (variable_get("dev_timer", 0)) timer_print(); if (variable_get("dev_timer", 0)) {
timer_print();
}
} }
$conf = conf_init(); $conf = conf_init();
......
...@@ -81,7 +81,7 @@ function theme_account($theme) { ...@@ -81,7 +81,7 @@ function theme_account($theme) {
$output .= " <B>". t("Username") .":</B><BR><INPUT NAME=\"userid\" SIZE=\"15\"><P>\n"; $output .= " <B>". t("Username") .":</B><BR><INPUT NAME=\"userid\" SIZE=\"15\"><P>\n";
$output .= " <B>". t("Password") .":</B><BR><INPUT NAME=\"passwd\" SIZE=\"15\" TYPE=\"password\"><BR>\n"; $output .= " <B>". t("Password") .":</B><BR><INPUT NAME=\"passwd\" SIZE=\"15\" TYPE=\"password\"><BR>\n";
$output .= " <INPUT TYPE=\"submit\" VALUE=\"". t("Login") ."\"><BR>\n"; $output .= " <INPUT TYPE=\"submit\" VALUE=\"". t("Login") ."\"><BR>\n";
if (variable_get("account_reg_allow", 1)) $output .= " <A HREF=\"account.php\">". t("REGISTER") ."</A>\n"; if (variable_get("account_register", 1)) $output .= " <A HREF=\"account.php\">". t("REGISTER") ."</A>\n";
$output .= " </FORM>\n"; $output .= " </FORM>\n";
$output .= "</DIV>\n"; $output .= "</DIV>\n";
......
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
include_once "includes/common.inc"; include_once "includes/common.inc";
page_header(); page_header();
module_invoke($mod, "page"); module_invoke($mod, "page");
page_footer(); page_footer();
?> ?>
...@@ -32,6 +32,11 @@ function account_help() { ...@@ -32,6 +32,11 @@ function account_help() {
<?php <?php
} }
function account_conf_options() {
$output .= form_select(t("Public accounts"), "account_register", variable_get("account_register", 1), array("Disabled", "Enabled"), "If enabled, everyone can create a new user account. If disabled, new user accounts can only be created by site administrators.");
return $output;
}
function account_password($min_length=6) { function account_password($min_length=6) {
mt_srand((double)microtime() * 1000000); mt_srand((double)microtime() * 1000000);
$words = array("foo","bar","guy","neo","tux","moo","sun","asm","dot","god","axe","geek","nerd","fish","hack","star","mice","warp","moon","hero","cola","girl","fish","java","perl","boss","dark","sith","jedi","drop","mojo"); $words = array("foo","bar","guy","neo","tux","moo","sun","asm","dot","god","axe","geek","nerd","fish","hack","star","mice","warp","moon","hero","cola","girl","fish","java","perl","boss","dark","sith","jedi","drop","mojo");
...@@ -291,7 +296,7 @@ function account_query($type = "") { ...@@ -291,7 +296,7 @@ function account_query($type = "") {
function account_admin() { function account_admin() {
global $op, $edit, $id, $mod, $keys, $order, $name, $query; global $op, $edit, $id, $mod, $keys, $order, $name, $query;
print "<SMALL><A HREF=\"admin.php?mod=account&op=access\">access control</A> | <A HREF=\"admin.php?mod=account&op=listing\">account listings</A> | <A HREF=\"admin.php?mod=account&op=search\">search account</A> | <A HREF=\"admin.php?mod=account&op=add\">add account</A> | <A HREF=\"admin.php?mod=account\">overview</A> | <A HREF=\"admin.php?mod=account&op=help\">help</A></SMALL><HR>"; print "<SMALL><A HREF=\"admin.php?mod=account&op=access\">access control</A> | <A HREF=\"admin.php?mod=account&op=add\">add new account</A> | <A HREF=\"admin.php?mod=account&op=listing\">account listings</A> | <A HREF=\"admin.php?mod=account&op=search\">search account</A> | <A HREF=\"admin.php?mod=account\">overview</A> | <A HREF=\"admin.php?mod=account&op=help\">help</A></SMALL><HR>";
$query = $query ? $query : 0; $query = $query ? $query : 0;
$name = $name ? $name : $edit[name]; $name = $name ? $name : $edit[name];
......
...@@ -12,7 +12,7 @@ function conf_help() { ...@@ -12,7 +12,7 @@ function conf_help() {
<?php <?php
} }
function conf_view_system() { function conf_view_options() {
global $conf, $cmodes, $corder, $themes; global $conf, $cmodes, $corder, $themes;
// general settings: // general settings:
...@@ -24,14 +24,13 @@ function conf_view_system() { ...@@ -24,14 +24,13 @@ function conf_view_system() {
$output .= form_textfield(t("Anonymous user"), "anonymous", variable_get("anonymous", "Anonymous"), 30, 55, t("The name used to indicate anonymous users.")); $output .= form_textfield(t("Anonymous user"), "anonymous", variable_get("anonymous", "Anonymous"), 30, 55, t("The name used to indicate anonymous users."));
$output .= "<HR>\n"; $output .= "<HR>\n";
// account settings: // submission settings:
$output .= "<H3>Account settings</H3>\n"; $output .= "<H3>Submission settings</H3>\n";
$output .= form_select(t("Allow registrations"), "account_reg_allow", variable_get("account_reg_allow", 1), array("Disabled", "Enabled")); $size = array(1000 => "1.000 characters", 5000 => "5.000 characters", 10000 => "10.000 characters", 15000 => "15.000 characters", 30.000 => "30.000 characters", 50000 => "50.000 characters", 100000 => "100.000 characters");
$output .= "<HR>\n"; $output .= form_select(t("Maximum submission size"), "max_input_size", variable_get("max_input_size", 10000), $size, t("The maximum number of characters someone can enter in a form."));
$rate = array(1 => "Maximum 1 every second", 5 => "Maximum 1 every 5 seconds", 15 => "Maximum 1 every 15 seconds", 30 => "Maximum 1 every 30 seconds", 60 => "Maximum 1 every minute", 300 => "Maximum 1 every 5 minutes", 900 => "Maximum 1 every 15 minutes", 1800 => "Maximum 1 every 30 minutes", 3600 => "Maximum 1 every hour", 21600 => "Maximum 1 every 6 hour", 43200 => "Maximum 1 every 12 hour");
// node settings: $output .= form_select(t("Maximum node rate"), "max_node_rate", variable_get("max_node_rate", 900), $rate, t("The maximum submission rate for nodes. Its purpose is to stop potential abuse or denial of service attacks."));
$output .= "<H3>Node settings</H3>\n"; $output .= form_select(t("Maximum comment rate"), "max_comment_rate", variable_get("max_comment_rate", 120), $rate, t("The maximum submission rate for comments. Its purpose is to stop potential abuse or denial of service attacks."));
$output .= form_select(t("Default number of nodes to display"), "default_nodes_main", variable_get("default_nodes_main", 10), array(1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10, 15 => 15, 20 => 20, 25 => 25, 30 => 30), t("The default maximum number of nodes to display on the main page."));
$output .= "<HR>\n"; $output .= "<HR>\n";
// comment settings: // comment settings:
...@@ -42,17 +41,8 @@ function conf_view_system() { ...@@ -42,17 +41,8 @@ function conf_view_system() {
$output .= form_select(t("Default filter threshold"), "default_comment_threshold", $conf[default_comment_threshold], $threshold, t("The default threshold used to filter comments.")); $output .= form_select(t("Default filter threshold"), "default_comment_threshold", $conf[default_comment_threshold], $threshold, t("The default threshold used to filter comments."));
$output .= "<HR>\n"; $output .= "<HR>\n";
// submission settings: // layout settings:
$output .= "<H3>Submission settings</H3>\n"; $output .= "<H3>Layout settings</H3>\n";
$size = array(1000 => "1.000 characters", 5000 => "5.000 characters", 10000 => "10.000 characters", 15000 => "15.000 characters", 30.000 => "30.000 characters", 50000 => "50.000 characters", 100000 => "100.000 characters");
$output .= form_select(t("Maximum submission size"), "max_input_size", variable_get("max_input_size", 10000), $size, t("The maximum number of characters someone can enter in a form."));
$rate = array(1 => "Maximum 1 every second", 5 => "Maximum 1 every 5 seconds", 15 => "Maximum 1 every 15 seconds", 30 => "Maximum 1 every 30 seconds", 60 => "Maximum 1 every minute", 300 => "Maximum 1 every 5 minutes", 900 => "Maximum 1 every 15 minutes", 1800 => "Maximum 1 every 30 minutes", 3600 => "Maximum 1 every hour", 21600 => "Maximum 1 every 6 hour", 43200 => "Maximum 1 every 12 hour");
$output .= form_select(t("Maximum node rate"), "max_node_rate", variable_get("max_node_rate", 900), $rate, t("The maximum submission rate for nodes. Its purpose is to stop potential abuse or denial of service attacks."));
$output .= form_select(t("Maximum comment rate"), "max_comment_rate", variable_get("max_comment_rate", 120), $rate, t("The maximum submission rate for comments. Its purpose is to stop potential abuse or denial of service attacks."));
$output .= "<HR>\n";
// theme settings:
$output .= "<H3>Theme settings</H3>\n";
foreach ($themes as $key=>$value) $options .= "<OPTION VALUE=\"$key\"". (variable_get("theme_default", key($themes)) == $key ? " SELECTED" : "") .">$key</OPTION>\n"; foreach ($themes as $key=>$value) $options .= "<OPTION VALUE=\"$key\"". (variable_get("theme_default", key($themes)) == $key ? " SELECTED" : "") .">$key</OPTION>\n";
$output .= form_item(t("Default theme"), "<SELECT NAME=\"edit[theme_default]\">$options</SELECT>", t("The default theme as seen by new visitors and anonymous users.")); $output .= form_item(t("Default theme"), "<SELECT NAME=\"edit[theme_default]\">$options</SELECT>", t("The default theme as seen by new visitors and anonymous users."));
$output .= "<HR>\n"; $output .= "<HR>\n";
...@@ -62,10 +52,6 @@ function conf_view_system() { ...@@ -62,10 +52,6 @@ function conf_view_system() {
$output .= form_select(t("Display timer information"), "dev_timer", variable_get("dev_timer", 0), array("Disabled", "Enabled"), t("Display the time it took to generate a page. For Drupal development only.")); $output .= form_select(t("Display timer information"), "dev_timer", variable_get("dev_timer", 0), array("Disabled", "Enabled"), t("Display the time it took to generate a page. For Drupal development only."));
$output .= "<HR>\n"; $output .= "<HR>\n";
return $output;
}
function conf_view_module() {
foreach (module_list() as $name) { foreach (module_list() as $name) {
if (module_hook($name, "conf_options")) { if (module_hook($name, "conf_options")) {
$output .= "<H3>". ucfirst($name) ." settings</H3>". module_invoke($name, "conf_options") ."<HR>\n"; $output .= "<H3>". ucfirst($name) ." settings</H3>". module_invoke($name, "conf_options") ."<HR>\n";
...@@ -74,7 +60,7 @@ function conf_view_module() { ...@@ -74,7 +60,7 @@ function conf_view_module() {
return $output; return $output;
} }
function conf_view_filter() { function conf_view_filters() {
foreach (module_list() as $name) { foreach (module_list() as $name) {
if (module_hook($name, "conf_filters")) { if (module_hook($name, "conf_filters")) {
$output .= module_invoke($name, "conf_filters"); $output .= module_invoke($name, "conf_filters");
...@@ -98,13 +84,10 @@ function conf_view($type) { ...@@ -98,13 +84,10 @@ function conf_view($type) {
switch ($type) { switch ($type) {
case "filter": case "filter":
$form = conf_view_filter(); $form = conf_view_filters();
break;
case "module":
$form = conf_view_module();
break; break;
default: default:
$form = conf_view_system(); $form = conf_view_options();
} }
$form .= form_submit("Save configuration"); $form .= form_submit("Save configuration");
...@@ -116,7 +99,7 @@ function conf_view($type) { ...@@ -116,7 +99,7 @@ function conf_view($type) {
function conf_admin() { function conf_admin() {
global $edit, $op, $type; global $edit, $op, $type;
print "<SMALL><A HREF=\"admin.php?mod=conf&type=system\">system settings</A> | <A HREF=\"admin.php?mod=conf&type=module\">module settings</A> | <A HREF=\"admin.php?mod=conf&type=filter\">content filters</A> | <A HREF=\"admin.php?mod=conf&op=help\">help</A></SMALL><HR>\n"; print "<SMALL><A HREF=\"admin.php?mod=conf&type=options\">site settings</A> | <A HREF=\"admin.php?mod=conf&type=filter\">content filters</A> | <A HREF=\"admin.php?mod=conf&op=help\">help</A></SMALL><HR>\n";
switch ($op) { switch ($op) {
case "help": case "help":
......
...@@ -26,6 +26,11 @@ function node_help() { ...@@ -26,6 +26,11 @@ function node_help() {
} }
} }
function node_conf_options() {
$output .= form_select(t("Default number of nodes to display"), "default_nodes_main", variable_get("default_nodes_main", 10), array(1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10, 15 => 15, 20 => 20, 25 => 25, 30 => 30), t("The default maximum number of nodes to display on the main page."));
return $output;
}
function node_conf_filters() { function node_conf_filters() {
$output .= form_select(t("Enable HTML tags"), "filter_html", variable_get("filter_html", 0), array("Disabled", "Enabled"), t("Strip HTML and PHP tags.")); $output .= form_select(t("Enable HTML tags"), "filter_html", variable_get("filter_html", 0), array("Disabled", "Enabled"), t("Strip HTML and PHP tags."));
$output .= form_textfield(t("Allowed HTML tags"), "allowed_html", variable_get("allowed_html", "<A><B><BLOCKQUOTE><DD><DL><DT><I><LI><OL><U><UL>"), 64, 128, t("If enabled, optionally specify tags which should not be stripped. 'STYLE' attributes, 'ON' attributes and unclosed tags are always stripped.")); $output .= form_textfield(t("Allowed HTML tags"), "allowed_html", variable_get("allowed_html", "<A><B><BLOCKQUOTE><DD><DL><DT><I><LI><OL><U><UL>"), 64, 128, t("If enabled, optionally specify tags which should not be stripped. 'STYLE' attributes, 'ON' attributes and unclosed tags are always stripped."));
......
...@@ -26,6 +26,11 @@ function node_help() { ...@@ -26,6 +26,11 @@ function node_help() {
} }
} }
function node_conf_options() {
$output .= form_select(t("Default number of nodes to display"), "default_nodes_main", variable_get("default_nodes_main", 10), array(1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10, 15 => 15, 20 => 20, 25 => 25, 30 => 30), t("The default maximum number of nodes to display on the main page."));
return $output;
}
function node_conf_filters() { function node_conf_filters() {
$output .= form_select(t("Enable HTML tags"), "filter_html", variable_get("filter_html", 0), array("Disabled", "Enabled"), t("Strip HTML and PHP tags.")); $output .= form_select(t("Enable HTML tags"), "filter_html", variable_get("filter_html", 0), array("Disabled", "Enabled"), t("Strip HTML and PHP tags."));
$output .= form_textfield(t("Allowed HTML tags"), "allowed_html", variable_get("allowed_html", "<A><B><BLOCKQUOTE><DD><DL><DT><I><LI><OL><U><UL>"), 64, 128, t("If enabled, optionally specify tags which should not be stripped. 'STYLE' attributes, 'ON' attributes and unclosed tags are always stripped.")); $output .= form_textfield(t("Allowed HTML tags"), "allowed_html", variable_get("allowed_html", "<A><B><BLOCKQUOTE><DD><DL><DT><I><LI><OL><U><UL>"), 64, 128, t("If enabled, optionally specify tags which should not be stripped. 'STYLE' attributes, 'ON' attributes and unclosed tags are always stripped."));
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
include_once "includes/common.inc"; include_once "includes/common.inc";
page_header();
function find_module($name) { function find_module($name) {
global $options, $type; global $options, $type;
if (module_hook($name, "search")) $options .= "<OPTION VALUE=\"$name\"". ($name == $type ? " SELECTED" : "") .">$name</OPTION>\n"; if (module_hook($name, "search")) $options .= "<OPTION VALUE=\"$name\"". ($name == $type ? " SELECTED" : "") .">$name</OPTION>\n";
...@@ -22,4 +24,6 @@ function find_module($name) { ...@@ -22,4 +24,6 @@ function find_module($name) {
$theme->box(t("Result"), $output); $theme->box(t("Result"), $output);
$theme->footer(); $theme->footer();
page_footer();
?> ?>
\ No newline at end of file
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
include_once "includes/common.inc"; include_once "includes/common.inc";
page_header();
$theme->header(); $theme->header();
if ($user->id) { if ($user->id) {
...@@ -28,4 +30,6 @@ ...@@ -28,4 +30,6 @@
$theme->footer(); $theme->footer();
page_footer();
?> ?>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment