From 3b576016afeecc5cc1085ab940be874512c1903b Mon Sep 17 00:00:00 2001 From: Lana Alber Date: Thu, 23 Sep 2004 00:32:10 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=4228 --- checkin_notes | 9 +++++++++ html/inc/db_ops.inc | 35 ----------------------------------- html/inc/util.inc | 5 +++-- html/inc/util_ops.inc | 5 ----- 4 files changed, 12 insertions(+), 42 deletions(-) diff --git a/checkin_notes b/checkin_notes index d2d4b1d004..657ee9a102 100755 --- a/checkin_notes +++ b/checkin_notes @@ -17607,3 +17607,12 @@ Rom 22 Sept 2004 client/ client_state.h cs_apps.C + +Lana 22 Sept 2004 + - fixed opening of the ops page + + html/ + inc/ + util_ops.inc + db_ops.inc + diff --git a/html/inc/db_ops.inc b/html/inc/db_ops.inc index 2784351476..ec09a66c45 100644 --- a/html/inc/db_ops.inc +++ b/html/inc/db_ops.inc @@ -1,40 +1,5 @@ "); - $pass = parse_config($config, ""); - $host = parse_config($config, ""); - if ($host == null) { - $host = "localhost"; - } - $retval = mysql_connect($host, $user, $pass); - if (!$retval) { - echo "Unable to connect to database - please try again later"; - echo mysql_error(); - exit(); - } - $db_name = parse_config($config, ""); - if(!mysql_select_db($db_name)) { - echo "Unable to select database '$db_name' - please try again later"; - echo mysql_error(); - exit(); - } - - return 0; -} - -function lookup_user_auth($auth) { - $result = mysql_query("select * from user where authenticator='$auth'"); - if ($result) { - $user = mysql_fetch_object($result); - mysql_free_result($result); - return $user; - } else { - return 0; - } -} - function join_query_string($s1, $s2) { if ($s1) { if ($s2) { diff --git a/html/inc/util.inc b/html/inc/util.inc index fb9be2984f..b73b758eb7 100644 --- a/html/inc/util.inc +++ b/html/inc/util.inc @@ -226,8 +226,9 @@ function row3($x, $y, $z) { echo "$x$y$z\n"; } -function row4($w, $x, $y, $z) { - echo "$w$x$y$z\n"; +function row4($xx, $xy, $yx, $yy) { + echo "$xx$xy" + . "$yx$yy\n"; } function rowify($string) { diff --git a/html/inc/util_ops.inc b/html/inc/util_ops.inc index c3ece61dec..e5a8d156fd 100644 --- a/html/inc/util_ops.inc +++ b/html/inc/util_ops.inc @@ -59,9 +59,4 @@ function c_row2($color, $x, $y) { echo "$x$y\n"; } -function row4($xx, $xy, $yx, $yy) { - echo "$xx$xy" - . "$yx$yy\n"; -} - ?>