cvs: php-hosts-web / host-add.php search.php showinfo.php /clients host-del.php host-edit.php host-services-edit.php index.php user-edit.php
/include shared.inc /msgboard message.php shared-msgboard.inc /staff option-add.php option-add2.php option-del.php option-del2.php option-sort.php
option-sort2.php service-add2.php service-del.php service-sort.php

jimw Sun Apr 21 21:36:10 2002 EDT Modified files: /php-hosts-web host-add.php search.php showinfo.php /php-hosts-web/clients host-del.php host-edit.php host-services-edit.php index.php user-edit.php /php-hosts-web/include shared.inc /php-hosts-web/msgboard message.php shared-msgboard.inc /php-hosts-web/staff option-add.php option-add2.php option-del.php option-del2.php option-sort.php option-sort2.php service-add2.php service-del.php service-sort.php Log: more cleanup. s/mysql_db_query/mysql_query/

Index: php-hosts-web/host-add.php diff -u php-hosts-web/host-add.php:1.3 php-hosts-web/host-add.php:1.4 --- php-hosts-web/host-add.php:1.3 Sun Apr 21 20:07:15 2002 +++ php-hosts-web/host-add.php Sun Apr 21 21:36:09 2002 @@ -31,7 +31,7 @@ $useremail2 = addslashes($useremail); $query = "SELECT * FROM $USERS_TABLE where UserUser='$useruser2'"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); if (mysql_numrows($q1)!=0) { $ERRORS[]="Username <B>$useruser</B> already taken"; } if ($ERRORS) { @@ -46,7 +46,7 @@ $query = "INSERT INTO $HOSTS_TABLE (HostName,HostURL,HostInfoURL,HostEmail,HostPhone,HostFax,HostCity,HostState,HostCountry) "; $query.= "values ('$hostname2','$hosturl2','$hostinfourl2','$hostemail2','$hostphone2','$hostfax2','$hostcity2','$hoststate2','$hostcountry')"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); $hostid = mysql_insert_id(); $password = randomstring(8); @@ -55,7 +55,7 @@ $query = "INSERT INTO $USERS_TABLE (UserUser, UserPass, HostID, UserEmail) "; $query.= "values ('$useruser2','$crypt',$hostid,'$useremail2')"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); $msg = "You (or someone using your email address) has added your company to the "; $msg.= "listing of PHP Hosting Companies (at http://hosts.php.net).\n\n"; Index: php-hosts-web/search.php diff -u php-hosts-web/search.php:1.3 php-hosts-web/search.php:1.4 --- php-hosts-web/search.php:1.3 Sun Apr 21 21:25:12 2002 +++ php-hosts-web/search.php Sun Apr 21 21:36:09 2002 @@ -88,13 +88,13 @@ echo "<!-- $query -->\n"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); if (mysql_num_rows($q1)==0) { echo "<P>There are no matches for your criteria.</P>"; } else { $query = "select * from $HOSTS_TABLE"; - $q2 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q2 = mysql_query($query) or die ("\"$query\" is a bad query."); while ($result=mysql_fetch_array($q2)) { $hostid = $result["HostID"]; $HOSTS[$hostid] = array( "Name" => $result["HostName"], "URL" => $result["HostURL"]); @@ -118,7 +118,7 @@ if ($hostid!=$last_hostid) { $query = "SELECT count(id) as count FROM $MSGS_TABLE WHERE subgroup = $hostid"; -$q3 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); +$q3 = mysql_query($query) or die ("\"$query\" is a bad query."); $msgs = mysql_result($q3,0,'count'); mysql_free_result($q3); @@ -171,7 +171,7 @@ <OPTION VALUE=0>Doesn't matter <? $query = "select count(HostCountry) as count,HostCountry from $HOSTS_TABLE group by HostCountry"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); while ($r=mysql_fetch_array($q1)) { echo "<OPTION VALUE=\"" . $r["HostCountry"] ."\">"; echo listCountries("lookup",$r["HostCountry"]); @@ -182,7 +182,7 @@ <? $query = "select * from $SERVICES_TABLE order by Sort,ServiceName"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); $i=1; while ($service=mysql_fetch_array($q1)) { @@ -200,7 +200,7 @@ switch ($service["ServiceType"]) { case "single": $query = "select * from $OPTIONS_TABLE where ServiceID=$sid order by Sort,OptionName"; - $q2 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q2 = mysql_query($query) or die ("\"$query\" is a bad query."); echo "<select name=\"value_$sid\"><option value=\"-1\">Doesn't matter</option>\n"; while ($opt=mysql_fetch_array($q2)) { $optid = $opt["OptionID"]; @@ -210,7 +210,7 @@ case "multiple": case "multiplev": $query = "select * from $OPTIONS_TABLE where ServiceID=$sid order by Sort,OptionName"; - $q2 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q2 = mysql_query($query) or die ("\"$query\" is a bad query."); while ($opt=mysql_fetch_array($q2)) { $optid = $opt["OptionID"]; echo "<INPUT TYPE=\"checkbox\" VALUE=" . $optid; Index: php-hosts-web/showinfo.php diff -u php-hosts-web/showinfo.php:1.3 php-hosts-web/showinfo.php:1.4 --- php-hosts-web/showinfo.php:1.3 Sun Apr 21 21:25:12 2002 +++ php-hosts-web/showinfo.php Sun Apr 21 21:36:09 2002 @@ -7,14 +7,14 @@ if (!$hostid) { header("Location: /"); exit; } $query = "select * from $HOSTS_TABLE where HostID=".$hostid; -$q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); +$q1 = mysql_query($query) or die ("\"$query\" is a bad query."); $host = mysql_fetch_array($q1); mysql_free_result($q1); commonHeader($host["HostName"]); $query = "select * from $OPTIONS_TABLE"; -$q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); +$q1 = mysql_query($query) or die ("\"$query\" is a bad query."); while ($temp = mysql_fetch_array($q1)) { $id = $temp["OptionID"]; $OPTIONS[$id] = $temp["OptionName"]; @@ -87,7 +87,7 @@ <? $query = "select * from $SERVICES_TABLE order by Sort,ServiceName"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); $i=0; while ($service=mysql_fetch_array($q1)) { @@ -100,7 +100,7 @@ unset($value); $query = "select * from $HOST_SERVICES_TABLE where HostID=$hostid and ServiceID=$sid"; - $q2 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q2 = mysql_query($query) or die ("\"$query\" is a bad query."); if (mysql_num_rows($q2)!=0) { while($temp = mysql_fetch_array($q2)) { $value[] = array ("ID"=>$temp["OptionID"], "Value"=>$temp["OptionValue"]); Index: php-hosts-web/clients/host-del.php diff -u php-hosts-web/clients/host-del.php:1.2 php-hosts-web/clients/host-del.php:1.3 --- php-hosts-web/clients/host-del.php:1.2 Sun Apr 21 15:35:52 2002 +++ php-hosts-web/clients/host-del.php Sun Apr 21 21:36:09 2002 @@ -11,22 +11,22 @@ if ($MODE=="DELETE") { $query = "delete from $HOSTS_TABLE where HostID=".$hostid; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); echo "<P><B>".$hostname."</B> has been deleted.</P>\n"; $query = "delete from $HOST_SERVICES_TABLE where HostID=".$hostid; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); echo "<P>Service information for <B>".$hostname."</B> has been deleted.</P>\n"; $query = "delete from $USERS_TABLE where HostID=".$hostid; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); echo "<P>User: <B>".$REMOTE_USER."</B> has been deleted.</P>\n"; } else { $hostid = $argv[0]; $query = "select * from $HOSTS_TABLE where HostID=" . $hostid; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); $result = mysql_fetch_array($q1); ?> Index: php-hosts-web/clients/host-edit.php diff -u php-hosts-web/clients/host-edit.php:1.2 php-hosts-web/clients/host-edit.php:1.3 --- php-hosts-web/clients/host-edit.php:1.2 Sun Apr 21 15:35:52 2002 +++ php-hosts-web/clients/host-edit.php Sun Apr 21 21:36:09 2002 @@ -45,7 +45,7 @@ $query.= " HostState='$hoststate2',"; $query.= " HostCountry='$hostcountry'"; $query.= " where HostID=$hostid"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); echo "<P><B>".$hostname."</B> information has been edited.</P>\n"; } @@ -53,7 +53,7 @@ $hostid = $argv[0]; $query = "select * from $HOSTS_TABLE where HostID=" . $hostid; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); $result = mysql_fetch_array($q1); ?> Index: php-hosts-web/clients/host-services-edit.php diff -u php-hosts-web/clients/host-services-edit.php:1.4 php-hosts-web/clients/host-services-edit.php:1.5 --- php-hosts-web/clients/host-services-edit.php:1.4 Sun Apr 21 19:49:22 2002 +++ php-hosts-web/clients/host-services-edit.php Sun Apr 21 21:36:09 2002 @@ -80,12 +80,12 @@ @reset($querys); $query = "delete from $HOST_SERVICES_TABLE where HostID=$hostid"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); if ($querys) { while (list(,$query)=each($querys)) { echo "<!-- $query -->\n"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); } } @@ -132,7 +132,7 @@ <? $query = "select * from $SERVICES_TABLE order by Sort,ServiceName"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); $i=0; while ($service=mysql_fetch_array($q1)) { @@ -148,7 +148,7 @@ switch ($service["ServiceType"]) { case "single": $query = "select * from $OPTIONS_TABLE where ServiceID=$sid order by Sort,OptionName"; - $q2 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q2 = mysql_query($query) or die ("\"$query\" is a bad query."); echo "<SELECT NAME=\"value_" . $sid . "\">\n"; echo "<OPTION VALUE=-1>---\n"; while ($opt=mysql_fetch_array($q2)) { @@ -163,7 +163,7 @@ break; case "multiple": $query = "select * from $OPTIONS_TABLE where ServiceID=$sid order by Sort,OptionName"; - $q2 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q2 = mysql_query($query) or die ("\"$query\" is a bad query."); echo "<SELECT NAME=\"value_" . $sid . "[]\" MULTIPLE SIZE=3>"; while ($opt=mysql_fetch_array($q2)) { $optid = $opt["OptionID"]; @@ -177,7 +177,7 @@ break; case "multiplev": $query = "select * from $OPTIONS_TABLE where ServiceID=$sid order by Sort,OptionName"; - $q2 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q2 = mysql_query($query) or die ("\"$query\" is a bad query."); while ($opt=mysql_fetch_array($q2)) { $optid = $opt["OptionID"]; echo "<INPUT TYPE=checkbox NAME=\"value_" . $sid . "[]\" VALUE=" . $optid; Index: php-hosts-web/clients/index.php diff -u php-hosts-web/clients/index.php:1.2 php-hosts-web/clients/index.php:1.3 --- php-hosts-web/clients/index.php:1.2 Sun Apr 21 15:35:52 2002 +++ php-hosts-web/clients/index.php Sun Apr 21 21:36:09 2002 @@ -7,7 +7,7 @@ $query = "select * from $USERS_TABLE,$HOSTS_TABLE where $USERS_TABLE.UserUser='$REMOTE_USER' "; $query.= "and $USERS_TABLE.HostID=$HOSTS_TABLE.HostID"; -$q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); +$q1 = mysql_query($query) or die ("\"$query\" is a bad query."); $hostid = mysql_result($q1,0,"HostID"); $hostname = mysql_result($q1,0,"HostName"); Index: php-hosts-web/clients/user-edit.php diff -u php-hosts-web/clients/user-edit.php:1.3 php-hosts-web/clients/user-edit.php:1.4 --- php-hosts-web/clients/user-edit.php:1.3 Sun Apr 21 20:07:15 2002 +++ php-hosts-web/clients/user-edit.php Sun Apr 21 21:36:09 2002 @@ -29,7 +29,7 @@ if (!empty($password1)) { $crypt = crypt($password1); $query = "UPDATE $USERS_TABLE set UserPass='$crypt', UserEmail='$useremail2' where UserUser='$REMOTE_USER'"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); $msg = "You (or someone using your email address) has changed your client login "; $msg.= "information (at http://hosts.php.net).\n\n"; @@ -48,7 +48,7 @@ } else { $query = "UPDATE $USERS_TABLE set UserEmail='$useremail2' where UserUser='$REMOTE_USER'"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); echo "<P>Your information has been updated.</P>\n"; } } @@ -56,7 +56,7 @@ } else { $query = "select * from $USERS_TABLE where UserUser='$REMOTE_USER'"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); $result = mysql_fetch_array($q1); Index: php-hosts-web/include/shared.inc diff -u php-hosts-web/include/shared.inc:1.6 php-hosts-web/include/shared.inc:1.7 --- php-hosts-web/include/shared.inc:1.6 Sun Apr 21 20:07:15 2002 +++ php-hosts-web/include/shared.inc Sun Apr 21 21:36:09 2002 @@ -1,17 +1,11 @@ -<? +<?php srand(date("s")); -$ROOT_URL = "http://hosts.php.net"; -$ROOT_DIR = $DOCUMENT_ROOT; - -$CC_FILE = $ROOT_DIR . "/include/country_codes.inc"; -require($CC_FILE); +require 'country_codes.inc'; mysql_pconnect("localhost", "nobody") or die("unable to connect to database: ".mysql_error()); -$DBASE = "phphosts"; - mysql_select_db('phphosts') or die ("unable to select database: ".mysql_error()); @@ -39,12 +33,6 @@ } -function move($oldfile,$newfile) { - copy($oldfile,$newfile); - unlink($oldfile); - return TRUE; -} - function randomString($len) { $possible="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890"; $str=""; @@ -97,19 +85,6 @@ } } } - -function showObject($obj,$indent=0) { - while (list($k,$v)=each($obj)) { - for ($i=0;$i<$indent;$i++) { - echo "&nbsp;"; - } - echo $k."->".$v."\n"; - if (is_Array($v) || is_Object($v)) { - showObject($v,$indent+1); - } - } -} - require("layout.inc"); Index: php-hosts-web/msgboard/message.php diff -u php-hosts-web/msgboard/message.php:1.5 php-hosts-web/msgboard/message.php:1.6 --- php-hosts-web/msgboard/message.php:1.5 Sun Apr 21 21:23:11 2002 +++ php-hosts-web/msgboard/message.php Sun Apr 21 21:36:10 2002 @@ -13,8 +13,8 @@ title("Message: $section"); showMessage("show",$subj,$subgroup,$name,$email,$date,$parent,$id); -$q2=mysql($DBASE, "select id from $TABLE_MSGS where parent=$id and subgroup=$subgroup"); -if (mysql_numrows($q2)!=0): +$q2=mysql_query("select id from $TABLE_MSGS where parent=$id and subgroup=$subgroup"); +if (mysql_num_rows($q2)!=0): echo "<TR VALIGN=top><TD align=left colspan=2>Follow-ups:<p>\n"; echo "<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=100%>\n"; getHeaders($id,$subgroup,"",-1); Index: php-hosts-web/msgboard/shared-msgboard.inc diff -u php-hosts-web/msgboard/shared-msgboard.inc:1.10 php-hosts-web/msgboard/shared-msgboard.inc:1.11 --- php-hosts-web/msgboard/shared-msgboard.inc:1.10 Sun Apr 21 21:23:11 2002 +++ php-hosts-web/msgboard/shared-msgboard.inc Sun Apr 21 21:36:10 2002 @@ -1,14 +1,6 @@ <?php require ("shared.inc"); -mysql_pconnect("localhost","nobody") - or die("unable to connect to database: ".mysql_error()); - -mysql_select_db("phphosts") - or die("unable to select database: ".mysql_error()); - -$DBASE="phphosts"; - $BGTABLE = $COLOR["ltpurple"]; $BGCOLOR[0] = "#F0F0F0"; $BGCOLOR[1] = "#E0E0E0"; @@ -97,10 +89,10 @@ * Threads the message headers * if $mode=1, it's the moderator function */ - global $DBASE, $TABLE_MSGS; + global $TABLE_MSGS; global $BGCOLOR, $DATE_FORMAT,$jjj; $query="select * from $TABLE_MSGS where parent=$parent and subgroup=$subgroup order by date desc"; - $q1=mysql_db_query($DBASE, $query); + $q1=mysql_query( $query); $num=mysql_numrows($q1); if ($num>0): $i=0; @@ -153,7 +145,6 @@ /* * Displays a message (!) */ - global $DBASE; global $TABLE_MSGS, $MSG_FRAME_COLOR, $MSG_FRAME_COLOR2, $MSG_TEXT_COLOR; global $TEXT_COLOR1, $TEXT_COLOR2; echo "<TABLE BORDER=0 cellpadding=3 cellspacing=0 width=\"100%\" BGCOLOR=\"$MSG_FRAME_COLOR2\">\n"; Index: php-hosts-web/staff/option-add.php diff -u php-hosts-web/staff/option-add.php:1.2 php-hosts-web/staff/option-add.php:1.3 --- php-hosts-web/staff/option-add.php:1.2 Sun Apr 21 15:35:53 2002 +++ php-hosts-web/staff/option-add.php Sun Apr 21 21:36:10 2002 @@ -9,7 +9,7 @@ <? $query = "select * from $SERVICES_TABLE where ServiceType='single' or ServiceType='multiple' order by ServiceName"; -$q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); +$q1 = mysql_query($query) or die ("\"$query\" is a bad query."); ?> <P> Index: php-hosts-web/staff/option-add2.php diff -u php-hosts-web/staff/option-add2.php:1.2 php-hosts-web/staff/option-add2.php:1.3 --- php-hosts-web/staff/option-add2.php:1.2 Sun Apr 21 15:35:53 2002 +++ php-hosts-web/staff/option-add2.php Sun Apr 21 21:36:10 2002 @@ -4,7 +4,7 @@ commonHeader("Staff: Add an Option"); $query = "select * from $SERVICES_TABLE where ServiceID=$serviceid"; -$q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); +$q1 = mysql_query($query) or die ("\"$query\" is a bad query."); $servicename = mysql_result($q1,0,"ServiceName"); ?> @@ -22,7 +22,7 @@ if ($optionname) { $query = "INSERT INTO $OPTIONS_TABLE (ServiceID, OptionName,Sort) "; $query.= "values ($serviceid, '$optionname'," . ($maxsort+$i) . ")"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); echo "<LI>Added <B>$optionname</B> to list of options for $servicename\n"; $i++; } @@ -34,7 +34,7 @@ } else { $query = "select * from $OPTIONS_TABLE where ServiceID=$serviceid order by Sort,OptionName"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); ?> Index: php-hosts-web/staff/option-del.php diff -u php-hosts-web/staff/option-del.php:1.2 php-hosts-web/staff/option-del.php:1.3 --- php-hosts-web/staff/option-del.php:1.2 Sun Apr 21 15:35:53 2002 +++ php-hosts-web/staff/option-del.php Sun Apr 21 21:36:10 2002 @@ -9,7 +9,7 @@ <? $query = "select * from $SERVICES_TABLE where ServiceType='single' or ServiceType='multiple' order by ServiceName"; -$q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); +$q1 = mysql_query($query) or die ("\"$query\" is a bad query."); ?> <P> Index: php-hosts-web/staff/option-del2.php diff -u php-hosts-web/staff/option-del2.php:1.2 php-hosts-web/staff/option-del2.php:1.3 --- php-hosts-web/staff/option-del2.php:1.2 Sun Apr 21 15:35:53 2002 +++ php-hosts-web/staff/option-del2.php Sun Apr 21 21:36:10 2002 @@ -4,7 +4,7 @@ commonHeader("Staff: Delete Options"); $query = "select * from $SERVICES_TABLE where ServiceID=$serviceid"; -$q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); +$q1 = mysql_query($query) or die ("\"$query\" is a bad query."); $servicename = mysql_result($q1,0,"ServiceName"); ?> @@ -17,7 +17,7 @@ while (list($id,$del)=each($delete)) { if ($del) { $query = "delete from $OPTIONS_TABLE where OptionID=$id"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); echo "<LI>Option <B>" . $optname[$id] . "</B> deleted\n"; } } @@ -28,7 +28,7 @@ } else { $query = "select * from $OPTIONS_TABLE where ServiceID=$serviceid order by Sort,OptionName"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); ?> <P> Index: php-hosts-web/staff/option-sort.php diff -u php-hosts-web/staff/option-sort.php:1.2 php-hosts-web/staff/option-sort.php:1.3 --- php-hosts-web/staff/option-sort.php:1.2 Sun Apr 21 15:35:53 2002 +++ php-hosts-web/staff/option-sort.php Sun Apr 21 21:36:10 2002 @@ -9,7 +9,7 @@ <? $query = "select * from $SERVICES_TABLE where ServiceType='single' or ServiceType='multiple' order by ServiceName"; -$q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); +$q1 = mysql_query($query) or die ("\"$query\" is a bad query."); ?> <P> Index: php-hosts-web/staff/option-sort2.php diff -u php-hosts-web/staff/option-sort2.php:1.2 php-hosts-web/staff/option-sort2.php:1.3 --- php-hosts-web/staff/option-sort2.php:1.2 Sun Apr 21 15:35:53 2002 +++ php-hosts-web/staff/option-sort2.php Sun Apr 21 21:36:10 2002 @@ -4,7 +4,7 @@ commonHeader("Staff: Sort Options"); $query = "select * from $SERVICES_TABLE where ServiceID=$serviceid"; -$q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); +$q1 = mysql_query($query) or die ("\"$query\" is a bad query."); $servicename = mysql_result($q1,0,"ServiceName"); ?> @@ -18,12 +18,12 @@ $sort = 999; } $query = "update $OPTIONS_TABLE set Sort=$sort where OptionID=$id"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); } echo "<P>New order of options for <B>$servicename</B>:</P>"; $query = "select * from $OPTIONS_TABLE where ServiceID=$serviceid order by Sort,OptionName"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); echo "<OL>\n"; @@ -37,7 +37,7 @@ } else { $query = "select * from $OPTIONS_TABLE where ServiceID=$serviceid order by Sort,OptionName"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); ?> <P> Index: php-hosts-web/staff/service-add2.php diff -u php-hosts-web/staff/service-add2.php:1.2 php-hosts-web/staff/service-add2.php:1.3 --- php-hosts-web/staff/service-add2.php:1.2 Sun Apr 21 15:35:53 2002 +++ php-hosts-web/staff/service-add2.php Sun Apr 21 21:36:10 2002 @@ -33,7 +33,7 @@ $query = "INSERT INTO $SERVICES_TABLE (ServiceName,ServiceType,Sort) "; $query.= "values ('$servicename2','$servicetype',999)"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); $serviceid = mysql_insert_id(); echo "<P>Added <B>$servicename2</B> to list of services.</P>\n"; @@ -47,7 +47,7 @@ if ($optionname) { $query = "INSERT INTO $OPTIONS_TABLE (ServiceID, OptionName,Sort) "; $query.= "values ($serviceid, '$optionname',$i)"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); echo "<LI>Added <B>$optionname</B> to list of options\n"; $i++; } Index: php-hosts-web/staff/service-del.php diff -u php-hosts-web/staff/service-del.php:1.2 php-hosts-web/staff/service-del.php:1.3 --- php-hosts-web/staff/service-del.php:1.2 Sun Apr 21 15:35:53 2002 +++ php-hosts-web/staff/service-del.php Sun Apr 21 21:36:10 2002 @@ -10,12 +10,12 @@ if ($MODE=="DELETE") { $query = "delete from $SERVICES_TABLE where ServiceID=".$serviceid; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); echo "<P>Service deleted.</P>\n"; $query = "delete from $HOST_SERVICES_TABLE where ServiceID=".$serviceid; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); echo "<P>Host service information deleted.</P>\n"; echo "<P>Done.</P>\n"; @@ -23,7 +23,7 @@ } else { $query = "select * from $SERVICES_TABLE order by ServiceName"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); ?> <P> Index: php-hosts-web/staff/service-sort.php diff -u php-hosts-web/staff/service-sort.php:1.2 php-hosts-web/staff/service-sort.php:1.3 --- php-hosts-web/staff/service-sort.php:1.2 Sun Apr 21 15:35:53 2002 +++ php-hosts-web/staff/service-sort.php Sun Apr 21 21:36:10 2002 @@ -14,12 +14,12 @@ $sort = 999; } $query = "update $SERVICES_TABLE set Sort=$sort where ServiceID=$id"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); } echo "<P>New order of services:</P>"; $query = "select * from $SERVICES_TABLE order by Sort,ServiceName"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); echo "<OL>\n"; @@ -33,7 +33,7 @@ } else { $query = "select * from $SERVICES_TABLE order by Sort,ServiceName"; - $q1 = mysql_db_query($DBASE,$query) or die ("\"$query\" is a bad query."); + $q1 = mysql_query($query) or die ("\"$query\" is a bad query."); ?> <P>