summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/config.inc21
-rw-r--r--includes/database.inc4
-rw-r--r--includes/widget.inc2
3 files changed, 15 insertions, 12 deletions
diff --git a/includes/config.inc b/includes/config.inc
index 4c96aa9a6..a2ec3763f 100644
--- a/includes/config.inc
+++ b/includes/config.inc
@@ -6,21 +6,21 @@
### host: "http://www.drop.org/":
#$db_host = "zind.net";
-#$db_uname = "droporg";
+#$db_name = "droporg";
#$db_pass = "DropIes";
#$db_name = "droporg";
### host: "http://beta.drop.org/":
-$db_host = "zind.net";
-$db_uname = "dries";
-$db_pass = "Abc123";
-$db_name = "dries";
+#$db_host = "zind.net";
+#$db_name = "dries";
+#$db_pass = "Abc123";
+#$db_name = "dries";
### host: "http://localhost/":
-#$db_host = "";
-#$db_uname = "dries";
-#$db_pass = "oakley";
-#$db_name = "dries";
+$db_host = "localhost";
+$db_name = "drop";
+$db_pass = "drop";
+$db_name = "drop";
#
# Administrative information
@@ -84,6 +84,9 @@ $themes = array("Marvin" => array(
"Zaphod" => array(
"themes/zaphod/zaphod.theme",
"classic theme, yellow, structured, advanced navigation"),
+ "Trillian" => array(
+ "themes/trillian/trillian.theme",
+ "simple, easy, black background"),
"UnConeD" => array(
"themes/unconed/unconed.theme",
"modern theme, gray and blue, high coolness factor"));
diff --git a/includes/database.inc b/includes/database.inc
index 6a81b003a..8e0183048 100644
--- a/includes/database.inc
+++ b/includes/database.inc
@@ -8,8 +8,8 @@
*/
function db_connect() {
- global $db_host, $db_uname, $db_pass, $db_name;
- mysql_pconnect($db_host, $db_uname, $db_pass) or die(mysql_Error());
+ global $db_host, $db_name, $db_pass, $db_name;
+ mysql_pconnect($db_host, $db_name, $db_pass) or die(mysql_Error());
mysql_select_db($db_name) or die ("Unable to select database");
// NOTE: we are using a persistent connection!
}
diff --git a/includes/widget.inc b/includes/widget.inc
index 51a17ff2c..b5891a57e 100644
--- a/includes/widget.inc
+++ b/includes/widget.inc
@@ -69,7 +69,7 @@ function display_comment_moderation($id, $author, $score, $votes) {
$output .= "<TABLE BORDER=\"0\" CELLSPACING=\"1\" CELLPADDING=\"0\"><TR><TD>score:</TD><TD>". format_data($score) ."</TD></TR><TR><TD>votes:</TD><TD>". format_data($votes) ."</TR></TABLE>";
}
- print $output;
+ return $output;
}
function display_new_diaries($theme, $num = 20) {