make use of the new constants of the config file for db connection and base path

This commit is contained in:
Jonathan Ernst
2004-12-23 01:12:03 +00:00
committed by WineHQ
parent d5a6d34be6
commit ca749d32d9
25 changed files with 100 additions and 146 deletions

View File

@@ -7,8 +7,6 @@ include("path.php");
include(BASE."include/"."incl.php"); include(BASE."include/"."incl.php");
require(BASE."include/"."application.php"); require(BASE."include/"."application.php");
global $apidb_root;
//check for admin privs //check for admin privs
if(!loggedin() || (!havepriv("admin") && !$_SESSION['current']->is_maintainer($appId,$versionId)) ) if(!loggedin() || (!havepriv("admin") && !$_SESSION['current']->is_maintainer($appId,$versionId)) )
{ {
@@ -101,7 +99,7 @@ else
echo html_table_end(); echo html_table_end();
echo html_frame_end(); echo html_frame_end();
echo html_back_link(1,$apidb_root."appview.php?appId=$appId".$versionLink); echo html_back_link(1,BASE."appview.php?appId=$appId".$versionLink);
apidb_footer(); apidb_footer();
} }

View File

@@ -41,7 +41,7 @@ else
$t->create($query, $table, "versionId"); $t->create($query, $table, "versionId");
} }
echo html_back_link(1,$apidb_root."appview.php?appId=$appId"); echo html_back_link(1,BASE."appview.php?appId=$appId");
apidb_footer(); apidb_footer();

View File

@@ -86,13 +86,13 @@ if ($sub)
if($ob->superMaintainer) if($ob->superMaintainer)
{ {
echo " <td><a href='".$apidb_root."appview.php?appId=$ob->appId'>".appIdToName($ob->appId)."</a></td>\n"; echo " <td><a href='".BASE."appview.php?appId=$ob->appId'>".appIdToName($ob->appId)."</a></td>\n";
echo " <td>".versionIdToName($ob->versionId)."&nbsp;</td>\n"; echo " <td>".versionIdToName($ob->versionId)."&nbsp;</td>\n";
echo " <td>Yes</td>\n"; echo " <td>Yes</td>\n";
} else } else
{ {
echo " <td>".appIdToName($ob->appId)."</td>\n"; echo " <td>".appIdToName($ob->appId)."</td>\n";
echo " <td><a href='".$apidb_root."appview.php?appId=$ob->appId&versionId=$ob->versionId'>".versionIdToName($ob->versionId)."</a>&nbsp;</td>\n"; echo " <td><a href='".BASE."appview.php?appId=$ob->appId&versionId=$ob->versionId'>".versionIdToName($ob->versionId)."</a>&nbsp;</td>\n";
echo " <td>No</td>\n"; echo " <td>No</td>\n";
} }

View File

@@ -92,7 +92,7 @@ if($what)
} }
//FIXME need to redirect to the page before the confirmation page //FIXME need to redirect to the page before the confirmation page
redirect($apidb_root."appbrowse.php"); redirect(BASE."appbrowse.php");
} }

View File

@@ -6,15 +6,13 @@ include(BASE."include/"."incl.php");
include(BASE."include/"."tableve.php"); include(BASE."include/"."tableve.php");
include(BASE."include/"."qclass.php"); include(BASE."include/"."qclass.php");
global $apidb_root;
if(!loggedin() || (!havepriv("admin") && !$_SESSION['current']->ownsApp($appId)) ) if(!loggedin() || (!havepriv("admin") && !$_SESSION['current']->ownsApp($appId)) )
{ {
errorpage("Insufficient Privileges!"); errorpage("Insufficient Privileges!");
exit; exit;
} }
if($HTTP_POST_VARS) if($_POST)
{ {
$statusMessage = ''; $statusMessage = '';
// commit changes of form to database // commit changes of form to database
@@ -204,7 +202,7 @@ if($HTTP_POST_VARS)
echo '</table>',"\n"; echo '</table>',"\n";
echo html_frame_end(); echo html_frame_end();
echo html_back_link(1,$apidb_root."appview.php?appId=$appId"); echo html_back_link(1,BASE."appview.php?appId=$appId");
} }

View File

@@ -7,9 +7,6 @@ include("path.php");
include(BASE."include/"."incl.php"); include(BASE."include/"."incl.php");
require(BASE."include/"."application.php"); require(BASE."include/"."application.php");
global $apidb_root;
//check for admin privs //check for admin privs
if(!loggedin() || (!havepriv("admin") && !$_SESSION['current']->is_maintainer($appId,$versionId)) ) if(!loggedin() || (!havepriv("admin") && !$_SESSION['current']->is_maintainer($appId,$versionId)) )
{ {
@@ -164,7 +161,7 @@ else
echo html_table_end(); echo html_table_end();
echo html_frame_end(); echo html_frame_end();
echo html_back_link(1,$apidb_root."appview.php?appId=$appId".$versionLink); echo html_back_link(1,BASE."appview.php?appId=$appId".$versionLink);
} }

View File

@@ -15,8 +15,8 @@ function admin_menu()
else $catId=""; else $catId="";
$m = new htmlmenu("Admin"); $m = new htmlmenu("Admin");
$m->add("Edit this Category", $apidb_root."admin/editCategory.php?catId=$catId"); $m->add("Edit this Category", BASE."admin/editCategory.php?catId=$catId");
$url = $apidb_root."admin/deleteAny.php?what=category&catId=$catId&confirmed=yes"; $url = BASE."admin/deleteAny.php?what=category&catId=$catId&confirmed=yes";
$m->add("Delete this Category", "javascript:deleteURL(\"Are you sure?\", \"".$url."\")"); $m->add("Delete this Category", "javascript:deleteURL(\"Are you sure?\", \"".$url."\")");

View File

@@ -23,32 +23,30 @@ require(BASE."include/"."maintainer.php");
// NOTE: app Owners will see this menu too, make sure we don't show admin-only options // NOTE: app Owners will see this menu too, make sure we don't show admin-only options
function admin_menu() function admin_menu()
{ {
global $apidb_root;
$m = new htmlmenu("Admin"); $m = new htmlmenu("Admin");
if($_REQUEST['versionId']) { if($_REQUEST['versionId']) {
$m->add("Add Note", $apidb_root."admin/addAppNote.php?appId=$appId&versionId=".$_REQUEST['versionId']); $m->add("Add Note", BASE."admin/addAppNote.php?appId=$appId&versionId=".$_REQUEST['versionId']);
$m->addmisc("&nbsp;"); $m->addmisc("&nbsp;");
$m->add("Edit Version", $apidb_root."admin/editAppVersion.php?appId=$appId&versionId=".$_REQUEST['versionId']); $m->add("Edit Version", BASE."admin/editAppVersion.php?appId=$appId&versionId=".$_REQUEST['versionId']);
$url = $apidb_root."admin/deleteAny.php?what=appVersion&versionId=".$_REQUEST['versionId']."&confirmed=yes"; $url = BASE."admin/deleteAny.php?what=appVersion&versionId=".$_REQUEST['versionId']."&confirmed=yes";
$m->add("Delete Version", "javascript:deleteURL(\"Are you sure?\", \"".$url."\")"); $m->add("Delete Version", "javascript:deleteURL(\"Are you sure?\", \"".$url."\")");
} else } else
{ {
$m->add("Add Version", $apidb_root."admin/addAppVersion.php?appId=".$_REQUEST['appId']); $m->add("Add Version", BASE."admin/addAppVersion.php?appId=".$_REQUEST['appId']);
$m->addmisc("&nbsp;"); $m->addmisc("&nbsp;");
$m->add("Edit App", $apidb_root."admin/editAppFamily.php?appId=".$_REQUEST['appId']); $m->add("Edit App", BASE."admin/editAppFamily.php?appId=".$_REQUEST['appId']);
// global admin options // global admin options
if(havepriv("admin")) if(havepriv("admin"))
{ {
$url = $apidb_root."admin/deleteAny.php?what=appFamily&appId=".$_REQUEST['appId']."&confirmed=yes"; $url = BASE."admin/deleteAny.php?what=appFamily&appId=".$_REQUEST['appId']."&confirmed=yes";
$m->add("Delete App", "javascript:deleteURL(\"Are you sure?\", \"".$url."\")"); $m->add("Delete App", "javascript:deleteURL(\"Are you sure?\", \"".$url."\")");
$m->addmisc("&nbsp;"); $m->addmisc("&nbsp;");
$m->add("Edit Owners", $apidb_root."admin/editAppOwners.php?appId=".$_REQUEST['appId']); $m->add("Edit Owners", BASE."admin/editAppOwners.php?appId=".$_REQUEST['appId']);
$m->add("Edit Bundle", $apidb_root."admin/editBundle.php?bundleId=".$_REQUEST['appId']); $m->add("Edit Bundle", BASE."admin/editBundle.php?bundleId=".$_REQUEST['appId']);
} }
} }
@@ -62,8 +60,6 @@ function admin_menu()
*/ */
function get_screenshot_img($appId, $versionId="") function get_screenshot_img($appId, $versionId="")
{ {
global $apidb_root;
if($versionId) if($versionId)
{ {
$result = mysql_query("SELECT *, RAND() AS rand FROM appData WHERE appId = $appId AND versionId = $versionId AND type = 'image' ORDER BY rand"); $result = mysql_query("SELECT *, RAND() AS rand FROM appData WHERE appId = $appId AND versionId = $versionId AND type = 'image' ORDER BY rand");
@@ -74,7 +70,7 @@ function get_screenshot_img($appId, $versionId="")
if(!$result || !mysql_num_rows($result)) if(!$result || !mysql_num_rows($result))
{ {
$imgFile = "<img src='".$apidb_root."images/no_screenshot.gif' alt='No Screenshot' />"; $imgFile = "<img src='".BASE."images/no_screenshot.gif' alt='No Screenshot' />";
} }
else else
{ {

View File

@@ -13,15 +13,9 @@ require(BASE."include/"."appdb.php");
require(BASE."include/"."rating.php"); require(BASE."include/"."rating.php");
require(BASE."include/"."category.php"); require(BASE."include/"."category.php");
global $apidb_root;
function get_screenshot_img($appId, $versionId) function get_screenshot_img($appId, $versionId)
{ {
global $apidb_root;
if(!$versionId) if(!$versionId)
$versionId = 0; $versionId = 0;
@@ -29,7 +23,7 @@ function get_screenshot_img($appId, $versionId)
if(!$result || !mysql_num_rows($result)) if(!$result || !mysql_num_rows($result))
{ {
$imgFile = "<img src='".$apidb_root."images/no_screenshot.gif' alt='No Screenshot'>"; $imgFile = "<img src='".BASE."images/no_screenshot.gif' alt='No Screenshot'>";
} }
else else
{ {
@@ -248,4 +242,3 @@ echo p();
apidb_footer(); apidb_footer();
?> ?>

View File

@@ -6,7 +6,7 @@
include("path.php"); include("path.php");
include(BASE."include/"."incl.php"); include(BASE."include/"."incl.php");
$help_path = $apidb_root."/help"; $help_path = BASE."/help";
if($_GET['topic']) if($_GET['topic'])
{ {
@@ -18,7 +18,6 @@ if($_GET['topic'])
function display_index () function display_index ()
{ {
global $help_path; global $help_path;
global $apidb_root;
apidb_header("Documentation Index"); apidb_header("Documentation Index");
@@ -47,7 +46,7 @@ function display_index ()
$id = $arr[1]; $id = $arr[1];
$title = get_help_title("$help_path/$file"); $title = get_help_title("$help_path/$file");
echo " <li> <a href='".$apidb_root."help?topic=$id'> $title </a><p /></li>\n"; echo " <li> <a href='".BASE."help?topic=$id'> $title </a><p /></li>\n";
} }
echo "</ul><hr noshade>\n"; echo "</ul><hr noshade>\n";

View File

@@ -11,9 +11,8 @@
function banner_display () function banner_display ()
{ {
// import banner paths from config // import banner paths from config
global $apidb_root; $banner_path_468x60 = BASE."banner/468x60/";
$banner_path_468x60 = $apidb_root."banner/468x60/"; $banner_path_xml = BASE."banner/xml/";
$banner_path_xml = $apidb_root."banner/xml/";
// opening html // opening html
$banner = ""; $banner = "";

View File

@@ -33,7 +33,6 @@ function forum_lookup_user ($userid)
*/ */
function view_app_comment($ob) function view_app_comment($ob)
{ {
global $apidb_root;
echo html_frame_start('','98%'); echo html_frame_start('','98%');
echo '<table width="100%" border=0 cellpadding=2 cellspacing=1">',"\n"; echo '<table width="100%" border=0 cellpadding=2 cellspacing=1">',"\n";
@@ -67,7 +66,7 @@ function view_app_comment($ob)
if(havepriv("admin") || $_SESSION['current']->is_maintainer($ob->appId, $ob->versionId)) if(havepriv("admin") || $_SESSION['current']->is_maintainer($ob->appId, $ob->versionId))
{ {
echo "<tr>"; echo "<tr>";
echo "<td><form method=\"post\" name=\"message\" action=\"".$apidb_root."deletecomment.php\"><input type=submit value='Delete' class=button>\n"; echo "<td><form method=\"post\" name=\"message\" action=\"".BASE."deletecomment.php\"><input type=submit value='Delete' class=button>\n";
echo "<input type=\"hidden\" name=\"commentId\" value=\"$ob->commentId\" />"; echo "<input type=\"hidden\" name=\"commentId\" value=\"$ob->commentId\" />";
echo "<input type=\"hidden\" name=\"appId\" value=\"$ob->appId\" />"; echo "<input type=\"hidden\" name=\"appId\" value=\"$ob->appId\" />";
echo "<input type=\"hidden\" name=\"versionId\" value=\"$ob->versionId\" /></form></td>","\n"; echo "<input type=\"hidden\" name=\"versionId\" value=\"$ob->versionId\" /></form></td>","\n";

View File

@@ -13,8 +13,8 @@
<meta http-equiv="Expires" content="Mon, 06 Jan 1990 00:00:01 GMT"> <meta http-equiv="Expires" content="Mon, 06 Jan 1990 00:00:01 GMT">
<meta http-equiv="Pragma" content="no-cache"> <meta http-equiv="Pragma" content="no-cache">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="stylesheet" href="<?php echo $apidb_root; ?>apidb.css" type="text/css"> <link rel="stylesheet" href="<?php echo BASE; ?>apidb.css" type="text/css">
<script src="<?php echo $apidb_root; ?>scripts.js" type="text/javascript"></script> <script src="<?php echo BASE; ?>scripts.js" type="text/javascript"></script>
</head> </head>
<body> <body>
@@ -24,9 +24,9 @@
<td> <td>
<table width="100%" cellpadding=0 cellspacing=0> <table width="100%" cellpadding=0 cellspacing=0>
<tr> <tr>
<td width="100%"><a href="<?php echo $apidb_root; ?>"><img src="<?php echo $apidb_root; ?>images/winehq_top_logo.gif" width=300 height=99 alt="Wine HQ"></a></td> <td width="100%"><a href="<?php echo BASE; ?>"><img src="<?php echo BASE; ?>images/winehq_top_logo.gif" width=300 height=99 alt="Wine HQ"></a></td>
<td> <td>
<img src="<?php echo $apidb_root; ?>images/blank.gif" width=10 height=1 alt=""> <img src="<?php echo BASE; ?>images/blank.gif" width=10 height=1 alt="">
</td> </td>
<td width="100%" align="center" valign="middle"> <td width="100%" align="center" valign="middle">
<?php echo $banner_ad; ?> <?php echo $banner_ad; ?>

View File

@@ -193,8 +193,6 @@ function html_imagebutton($text, $url, $extra = "")
function html_frame_start($title = "", $width = "", $extra = "", $innerPad = 5) function html_frame_start($title = "", $width = "", $extra = "", $innerPad = 5)
{ {
global $apidb_root;
if ($width) { $width = 'width="'.$width.'"'; } if ($width) { $width = 'width="'.$width.'"'; }
$str = '<table '.$width.' border=0 id="mainTable" cellpadding=0 cellspacing=0 align=center>'."\n"; $str = '<table '.$width.' border=0 id="mainTable" cellpadding=0 cellspacing=0 align=center>'."\n";
@@ -206,19 +204,19 @@ $str .= '
<tr><td> <tr><td>
<table width="100%" border="0" cellpadding="0" cellspacing="0" class="topMenu"> <table width="100%" border="0" cellpadding="0" cellspacing="0" class="topMenu">
<tr> <tr>
<td valign="top" align="left"><img src="'.$apidb_root.'images/winehq_border_top_left.gif" alt=""></td> <td valign="top" align="left"><img src="'.BASE.'images/winehq_border_top_left.gif" alt=""></td>
<td rowspan="3" valign="middle" align="left"><img src="'.$apidb_root.'images/winehq_border_dot_left.gif" alt=""></td> <td rowspan="3" valign="middle" align="left"><img src="'.BASE.'images/winehq_border_dot_left.gif" alt=""></td>
<td width="100%" rowspan="3" align="center"><span class="menuTitle">'.$title.'</span></td> <td width="100%" rowspan="3" align="center"><span class="menuTitle">'.$title.'</span></td>
<td rowspan="3" valign="middle" align="right"><img src="'.$apidb_root.'images/winehq_border_dot_right.gif" alt=""></td> <td rowspan="3" valign="middle" align="right"><img src="'.BASE.'images/winehq_border_dot_right.gif" alt=""></td>
<td valign="top" align="left"><img src="'.$apidb_root.'images/winehq_border_top_right.gif" alt=""></td> <td valign="top" align="left"><img src="'.BASE.'images/winehq_border_top_right.gif" alt=""></td>
</tr> </tr>
<tr> <tr>
<td><img src="'.$apidb_root.'images/blank.gif" width="1" height="1" alt=""></td> <td><img src="'.BASE.'images/blank.gif" width="1" height="1" alt=""></td>
<td><img src="'.$apidb_root.'images/blank.gif" width="1" height="1" alt=""></td> <td><img src="'.BASE.'images/blank.gif" width="1" height="1" alt=""></td>
</tr> </tr>
<tr> <tr>
<td valign="bottom" align="right"><img src="'.$apidb_root.'images/winehq_border_bottom_left.gif" alt=""></td> <td valign="bottom" align="right"><img src="'.BASE.'images/winehq_border_bottom_left.gif" alt=""></td>
<td valign="bottom" align="right"><img src="'.$apidb_root.'images/winehq_border_bottom_right.gif" alt=""></td> <td valign="bottom" align="right"><img src="'.BASE.'images/winehq_border_bottom_right.gif" alt=""></td>
</tr> </tr>
</table> </table>
</td></tr> </td></tr>
@@ -228,7 +226,7 @@ $str .= '
$str .= ' $str .= '
<tr> <tr>
<td><img src="'.$apidb_root.'images/blank.gif" width=5 height=1 alt="-"></td> <td><img src="'.BASE.'images/blank.gif" width=5 height=1 alt="-"></td>
<td width="100%"><table width="100%" border=0 cellpadding=0 cellspacing=0> <td width="100%"><table width="100%" border=0 cellpadding=0 cellspacing=0>
<tr><td class=topMenu> <tr><td class=topMenu>
<table width="100%" border=0 cellpadding="'.$innerPad.'" cellspacing="1" '.$extra.'><tr><td class=white> <table width="100%" border=0 cellpadding="'.$innerPad.'" cellspacing="1" '.$extra.'><tr><td class=white>
@@ -239,13 +237,12 @@ $str .= '
function html_frame_end($text = "") function html_frame_end($text = "")
{ {
global $apidb_root;
$str = ' $str = '
</td></tr></table></td></tr> </td></tr></table></td></tr>
</table> </table>
</td> </td>
<td><img src="'.$apidb_root.'images/blank.gif" width=5 height=1 alt="-"></td> <td><img src="'.BASE.'images/blank.gif" width=5 height=1 alt="-"></td>
</tr> </tr>
</table> </table>
<br> <br>

View File

@@ -3,7 +3,6 @@ class htmlmenu {
function htmlmenu($name, $form = null) function htmlmenu($name, $form = null)
{ {
global $apidb_root;
if ($form) if ($form)
echo "<form action='$form' method=get>\n"; echo "<form action='$form' method=get>\n";
@@ -16,14 +15,14 @@ class htmlmenu {
<table width="100%" border="0" cellpadding="0" cellspacing="0" class="topMenu"> <table width="100%" border="0" cellpadding="0" cellspacing="0" class="topMenu">
<tr> <tr>
<td width="100%" rowspan="3" align="left"><span class="menuTitle">&nbsp; '.$name.'</span></td> <td width="100%" rowspan="3" align="left"><span class="menuTitle">&nbsp; '.$name.'</span></td>
<td rowspan="3" valign="middle" align="right"><img src="'.$apidb_root.'images/winehq_border_dot_right.gif" alt=""></td> <td rowspan="3" valign="middle" align="right"><img src="'.BASE.'images/winehq_border_dot_right.gif" alt=""></td>
<td valign="top" align="left"><img src="'.$apidb_root.'images/winehq_border_top_right.gif" alt=""></td> <td valign="top" align="left"><img src="'.BASE.'images/winehq_border_top_right.gif" alt=""></td>
</tr> </tr>
<tr> <tr>
<td><img src="'.$apidb_root.'images/blank.gif" width="1" height="1" alt=""></td> <td><img src="'.BASE.'images/blank.gif" width="1" height="1" alt=""></td>
</tr> </tr>
<tr> <tr>
<td valign="bottom" align="right"><img src="'.$apidb_root.'images/winehq_border_bottom_right.gif" alt=""></td> <td valign="bottom" align="right"><img src="'.BASE.'images/winehq_border_bottom_right.gif" alt=""></td>
</tr> </tr>
</table> </table>
</td> </td>
@@ -56,14 +55,12 @@ class htmlmenu {
function done($form = null) function done($form = null)
{ {
global $apidb_root;
echo ' echo '
</table> </table>
</td></tr> </td></tr>
</table> </table>
</td> </td>
<td><img src="'.$apidb_root.'images/blank.gif" width=5 height=1 alt="-"></td> <td><img src="'.BASE.'images/blank.gif" width=5 height=1 alt="-"></td>
</tr> </tr>
</table> </table>
</div> </div>

View File

@@ -8,7 +8,7 @@ echo html_frame_start("List Users","400","",0)
<!-- start of users query --> <!-- start of users query -->
<form ACTION="<?php echo $apidb_root; ?>stdquery.php" METHOD="get"> <form ACTION="<?php echo BASE ?>stdquery.php" METHOD="get">
<table width="100%" border=0 cellpadding=0 cellspacing=0> <table width="100%" border=0 cellpadding=0 cellspacing=0>

View File

@@ -27,10 +27,9 @@ function rating_current_for_user($versionId, $system)
*/ */
function rating_menu() function rating_menu()
{ {
global $apidb_root;
$s = '<img src="'.$apidb_root.'images/s1.gif" alt="s1">'; $s = '<img src="'.BASE.'images/s1.gif" alt="s1">';
$n = '<img src="'.$apidb_root.'images/s0.gif" alt="s0">'; $n = '<img src="'.BASE.'images/s0.gif" alt="s0">';
$j = new htmlmenu("Compatibility Rating","updaterating.php"); $j = new htmlmenu("Compatibility Rating","updaterating.php");
@@ -68,7 +67,7 @@ function rating_menu()
$j->addmisc("<input type=submit value=' Rate it! ' class=ratebutton>","center"); $j->addmisc("<input type=submit value=' Rate it! ' class=ratebutton>","center");
$j->addmisc("<input type=hidden name=versionId value=".$_REQUEST['versionId'].">"); $j->addmisc("<input type=hidden name=versionId value=".$_REQUEST['versionId'].">");
$j->add("Rating Help", $apidb_root."help/?topic=ratings"); $j->add("Rating Help", BASE."help/?topic=ratings");
$j->done(1); $j->done(1);
} }
@@ -97,13 +96,12 @@ function rating_for_version($versionId, $system)
*/ */
function rating_stars_for_version($versionId, $system) function rating_stars_for_version($versionId, $system)
{ {
global $apidb_root;
$r = rating_for_version($versionId, $system); $r = rating_for_version($versionId, $system);
$s = '<img src="'.$apidb_root.'images/s1.gif" alt="s1">'; $s = '<img src="'.BASE.'images/s1.gif" alt="s1">';
$n = '<img src="'.$apidb_root.'images/s0.gif" alt="s0">'; $n = '<img src="'.BASE.'images/s0.gif" alt="s0">';
$h = '<img src="'.$apidb_root.'images/s2.gif" alt="s2">'; $h = '<img src="'.BASE.'images/s2.gif" alt="s2">';
if ($system == "fake") if ($system == "fake")
{ {

View File

@@ -5,24 +5,22 @@
function global_sidebar_menu() { function global_sidebar_menu() {
global $apidb_root, $q; $g = new htmlmenu(APPDB_OWNER." Menu");
$g->add("Back to ".APPDB_OWNER, APPDB_OWNER_URL);
$g = new htmlmenu("WineHQ Menu");
$g->add("Back to WineHQ", "http://www.winehq.org/");
$g->done(); $g->done();
$g = new htmlmenu("App DB"); $g = new htmlmenu("App DB");
$g->add("AppDB Home", $apidb_root); $g->add("AppDB Home", BASE);
$g->add("Browse Apps", $apidb_root."appbrowse.php"); $g->add("Browse Apps", BASE."appbrowse.php");
$g->add("Top 25", $apidb_root."votestats.php"); $g->add("Top 25", BASE."votestats.php");
$g->add("Submit App", $apidb_root."appsubmit.php"); $g->add("Submit App", BASE."appsubmit.php");
$g->add("Documentation", $apidb_root."help/"); $g->add("Documentation", BASE."help/");
$g->add("Help & Support", $apidb_root."support.php"); $g->add("Help & Support", BASE."support.php");
$g->add("Appdb Stats", $apidb_root."appdbStats.php"); $g->add("Appdb Stats", BASE."appdbStats.php");
$g->done(); $g->done();
$g = new htmlmenu("Search"); $g = new htmlmenu("Search");
$g->addmisc(app_search_box($q)); $g->addmisc(app_search_box($_REQUEST['q']));
$g->done(); $g->done();
} }
@@ -30,8 +28,7 @@ function global_sidebar_menu() {
function app_search_box($q = '') function app_search_box($q = '')
{ {
global $apidb_root; $str = "</span><form method=\"get\" action=\"".BASE."search.php\">\n";
$str = "</span><form method=\"get\" action=\"".$apidb_root."search.php\">\n";
$str .= "<input type=text name=q value='$q' size=8 class=searchfield>"; $str .= "<input type=text name=q value='$q' size=8 class=searchfield>";
$str .= "<input type=submit value='Search' class=searchbutton>\n"; $str .= "<input type=submit value='Search' class=searchbutton>\n";
$str .= "</form>\n<span>"; $str .= "</form>\n<span>";

View File

@@ -5,23 +5,21 @@
function global_admin_menu() { function global_admin_menu() {
global $apidb_root;
$g = new htmlmenu("Global Admin"); $g = new htmlmenu("Global Admin");
$g->add("Add Category", $apidb_root."admin/addCategory.php"); $g->add("Add Category", BASE."admin/addCategory.php");
$g->add("Add Application", $apidb_root."admin/addAppFamily.php?catId=0"); $g->add("Add Application", BASE."admin/addAppFamily.php?catId=0");
$g->add("Add Vendor", $apidb_root."admin/addVendor.php"); $g->add("Add Vendor", BASE."admin/addVendor.php");
$g->addmisc("&nbsp;"); $g->addmisc("&nbsp;");
$g->add("List Users", $apidb_root."admin/"); $g->add("List Users", BASE."admin/");
$g->add("View App Queue (".getQueuedAppCount().")", $apidb_root."admin/adminAppQueue.php"); $g->add("View App Queue (".getQueuedAppCount().")", BASE."admin/adminAppQueue.php");
$g->add("View App Data Queue (".getQueuedAppDataCount().")", $apidb_root."admin/adminAppDataQueue.php"); $g->add("View App Data Queue (".getQueuedAppDataCount().")", BASE."admin/adminAppDataQueue.php");
$g->add("View Maintainer Queue (".getQueuedMaintainerCount().")", $apidb_root."admin/adminMaintainerQueue.php"); $g->add("View Maintainer Queue (".getQueuedMaintainerCount().")", BASE."admin/adminMaintainerQueue.php");
$g->add("View Maintainers (".getMaintainerCount().")", $apidb_root."admin/adminMaintainers.php"); $g->add("View Maintainers (".getMaintainerCount().")", BASE."admin/adminMaintainers.php");
$g->addmisc("&nbsp;"); $g->addmisc("&nbsp;");
$g->add("Comment manager", $apidb_root."admin/adminCommentView.php"); $g->add("Comment manager", BASE."admin/adminCommentView.php");
$g->done(); $g->done();
} }

View File

@@ -9,15 +9,13 @@ require_once(BASE."include/"."category.php");
function global_sidebar_login() { function global_sidebar_login() {
global $apidb_root;
$g = new htmlmenu("User Menu"); $g = new htmlmenu("User Menu");
if(loggedin()) if(loggedin())
{ {
$g->add("Logout", $apidb_root."account.php?cmd=logout"); $g->add("Logout", BASE."account.php?cmd=logout");
$g->add("Preferences", $apidb_root."preferences.php"); $g->add("Preferences", BASE."preferences.php");
/* if this user maintains any applications list them */ /* if this user maintains any applications list them */
/* in their sidebar */ /* in their sidebar */
@@ -29,15 +27,15 @@ function global_sidebar_login() {
while(list($index, list($appId, $versionId, $superMaintainer)) = each($apps_user_maintains)) while(list($index, list($appId, $versionId, $superMaintainer)) = each($apps_user_maintains))
{ {
if($superMaintainer) if($superMaintainer)
$g->addmisc("<a href='".$apidb_root."appview.php?appId=$appId'>".appIdToName($appId)."*</a>", "center"); $g->addmisc("<a href='".BASE."appview.php?appId=$appId'>".appIdToName($appId)."*</a>", "center");
else else
$g->addmisc("<a href='".$apidb_root."appview.php?appId=$appId&versionId=$versionId'>".appIdToName($appId)." ".versionIdToName($versionId)."</a>", "center"); $g->addmisc("<a href='".BASE."appview.php?appId=$appId&versionId=$versionId'>".appIdToName($appId)." ".versionIdToName($versionId)."</a>", "center");
} }
} }
} }
else else
{ {
$g->add("Login", $apidb_root."account.php?cmd=login"); $g->add("Login", BASE."account.php?cmd=login");
} }
$g->done(); $g->done();

View File

@@ -5,7 +5,6 @@ $dbref = 0;
function opendb() function opendb()
{ {
global $apidb_dbuser, $apidb_dbpass, $apidb_dbhost, $apidb_db;
global $dbcon, $dbref; global $dbcon, $dbref;
$dbref++; $dbref++;
@@ -13,13 +12,13 @@ function opendb()
if($dbcon) if($dbcon)
return $dbcon; return $dbcon;
$dbcon = mysql_connect($apidb_dbhost, $apidb_dbuser, $apidb_dbpass); $dbcon = mysql_connect(APPS_DBHOST, APPS_DBUSER, APPS_DBPASS);
if(!$dbcon) if(!$dbcon)
{ {
echo "An error occurred: ".mysql_error()."<p>\n"; echo "An error occurred: ".mysql_error()."<p>\n";
exit; exit;
} }
mysql_select_db($apidb_db); mysql_select_db(APPS_DB);
return $dbcon; return $dbcon;
} }
@@ -175,7 +174,6 @@ function get_xml_tag ($file, $mode = null)
function openbugzilladb() function openbugzilladb()
{ {
global $bugzilla_dbuser, $bugzilla_dbpass, $bugzilla_dbhost, $bugzilla_db, $bugzilla_product_id;
global $dbcon, $dbref; global $dbcon, $dbref;
$dbref++; $dbref++;
@@ -183,13 +181,13 @@ function openbugzilladb()
if($dbcon) if($dbcon)
return $dbcon; return $dbcon;
$dbcon = mysql_connect($bugzilla_dbhost, $bugzilla_dbuser, $bugzilla_dbpass); $dbcon = mysql_connect(BUGZILLA_DBHOST, BUGZILLA_DBUSER, BUGZILLA_DBPASS);
if(!$dbcon) if(!$dbcon)
{ {
echo "An error occurred: ".mysql_error()."<p>\n"; echo "An error occurred: ".mysql_error()."<p>\n";
exit; exit;
} }
mysql_select_db($bugzilla_db); mysql_select_db(BUGZILLA_DB);
return $dbcon; return $dbcon;
} }
@@ -205,10 +203,8 @@ function closebugzilladb()
function make_bugzilla_version_list($varname, $cvalue) function make_bugzilla_version_list($varname, $cvalue)
{ {
global $bugzilla_db, $bugzilla_product_id; $table = BUGZILLA_DB.".versions";
$where = "WHERE product_id=".BUGZILLA_PRODUCT_ID;
$table = $bugzilla_db.".versions";
$where = "WHERE product_id=".$bugzilla_product_id;
$query = "SELECT value FROM $table $where ORDER BY value"; $query = "SELECT value FROM $table $where ORDER BY value";
openbugzilladb(); openbugzilladb();

View File

@@ -112,7 +112,6 @@ function vote_get_user_votes($userId = null)
function vote_menu() function vote_menu()
{ {
global $appId; global $appId;
global $apidb_root;
$m = new htmlmenu("Votes","updatevote.php"); $m = new htmlmenu("Votes","updatevote.php");
@@ -149,8 +148,8 @@ function vote_menu()
$m->addmisc("<input type=hidden name=appId value=$appId>"); $m->addmisc("<input type=hidden name=appId value=$appId>");
$m->add("View Results", $apidb_root."votestats.php"); $m->add("View Results", BASE."votestats.php");
$m->add("Voting Help", $apidb_root."help/?topic=voting"); $m->add("Voting Help", BASE."help/?topic=voting");
$m->done(1); $m->done(1);
} }

View File

@@ -81,7 +81,7 @@ direct formatting related flames to <a href="mailto:dpaun@rogers.com">Dimitrie O
<tr class=white> <tr class=white>
<?php <?php
echo "<td><a href='".$apidb_root."appview.php?appId=134'>Acrobat Reader</a></td>"; echo "<td><a href='".BASE."appview.php?appId=134'>Acrobat Reader</a></td>";
?> ?>
<td>5.0.5</td> <td>5.0.5</td>
<td>This is the solution to your PDF troubles.</td> <td>This is the solution to your PDF troubles.</td>
@@ -92,7 +92,7 @@ direct formatting related flames to <a href="mailto:dpaun@rogers.com">Dimitrie O
<tr class=white> <tr class=white>
<?php <?php
echo "<td><a href='".$apidb_root."appview.php?appId=145'>WS-FTP LE</a></td>"; echo "<td><a href='".BASE."appview.php?appId=145'>WS-FTP LE</a></td>";
?> ?>
<td>5.08</td> <td>5.08</td>
<td>A great application that allows remote file edits, chmods on UNIX boxes and file moves.</td> <td>A great application that allows remote file edits, chmods on UNIX boxes and file moves.</td>
@@ -103,7 +103,7 @@ direct formatting related flames to <a href="mailto:dpaun@rogers.com">Dimitrie O
<tr class=white> <tr class=white>
<?php <?php
echo "<td><a href='".$apidb_root."appview.php?appId=77'>mIRC</a></td>"; echo "<td><a href='".BASE."appview.php?appId=77'>mIRC</a></td>";
?> ?>
<td>6.03</td> <td>6.03</td>
<td>This is a popular IRC client.</td> <td>This is a popular IRC client.</td>
@@ -114,7 +114,7 @@ direct formatting related flames to <a href="mailto:dpaun@rogers.com">Dimitrie O
<tr class=white> <tr class=white>
<?php <?php
echo "<td><a href='".$apidb_root."appview.php?appId=356'>Putty</a></td>"; echo "<td><a href='".BASE."appview.php?appId=356'>Putty</a></td>";
?> ?>
<td>0.52</td> <td>0.52</td>
<td>Simple Telnet/SSH client & console.</td> <td>Simple Telnet/SSH client & console.</td>
@@ -125,7 +125,7 @@ direct formatting related flames to <a href="mailto:dpaun@rogers.com">Dimitrie O
<tr class=white> <tr class=white>
<?php <?php
echo "<td><a href='".$apidb_root."appview.php?appId=1110'>FTP Commander</a></td>"; echo "<td><a href='".BASE."appview.php?appId=1110'>FTP Commander</a></td>";
?> ?>
<td>5.58</td> <td>5.58</td>
<td>A remote file management and command-line FTP client.</td> <td>A remote file management and command-line FTP client.</td>
@@ -136,7 +136,7 @@ direct formatting related flames to <a href="mailto:dpaun@rogers.com">Dimitrie O
<tr class=white> <tr class=white>
<?php <?php
echo "<td><a href='".$apidb_root."appview.php?appId=284'>Pegasus Mail</a></td>"; echo "<td><a href='".BASE."appview.php?appId=284'>Pegasus Mail</a></td>";
?> ?>
<td>4.02</td> <td>4.02</td>
<td>E-mail client of choice for many beginner and advanced users.</td> <td>E-mail client of choice for many beginner and advanced users.</td>
@@ -147,7 +147,7 @@ direct formatting related flames to <a href="mailto:dpaun@rogers.com">Dimitrie O
<tr class=white> <tr class=white>
<?php <?php
echo "<td><a href='".$apidb_root."appview.php?appId=1756'>12Ghosts Zip</a></td>"; echo "<td><a href='".BASE."appview.php?appId=1756'>12Ghosts Zip</a></td>";
?> ?>
<td>XP/31</td> <td>XP/31</td>
<td>This is a fast compression utility.</td> <td>This is a fast compression utility.</td>
@@ -158,7 +158,7 @@ direct formatting related flames to <a href="mailto:dpaun@rogers.com">Dimitrie O
<tr class=white> <tr class=white>
<?php <?php
echo "<td><a href='".$apidb_root."appview.php?appId=1755'>WinMerge</a></td>"; echo "<td><a href='".BASE."appview.php?appId=1755'>WinMerge</a></td>";
?> ?>
<td>2.1.4</td> <td>2.1.4</td>
<td>A visual text file differencing and merging tool for Win32 platforms.</td> <td>A visual text file differencing and merging tool for Win32 platforms.</td>
@@ -169,7 +169,7 @@ direct formatting related flames to <a href="mailto:dpaun@rogers.com">Dimitrie O
<tr class=white> <tr class=white>
<?php <?php
echo "<td><a href='".$apidb_root."appview.php?appId=868'>FileZilla</a></td>"; echo "<td><a href='".BASE."appview.php?appId=868'>FileZilla</a></td>";
?> ?>
<td>2.2.2</td> <td>2.2.2</td>
<td>FileZilla is a fast FTP client for Windows with a lot of features.</td> <td>FileZilla is a fast FTP client for Windows with a lot of features.</td>
@@ -189,7 +189,7 @@ direct formatting related flames to <a href="mailto:dpaun@rogers.com">Dimitrie O
<tr class=white> <tr class=white>
<?php <?php
echo "<td><a href='".$apidb_root."appview.php?appId=2'>WinZip</a></td>"; echo "<td><a href='".BASE."appview.php?appId=2'>WinZip</a></td>";
?> ?>
<td>8.1</td> <td>8.1</td>
<td>The most popular compression utility for Windows just got better.</td> <td>The most popular compression utility for Windows just got better.</td>
@@ -202,7 +202,7 @@ echo "<td><a href='".$apidb_root."appview.php?appId=2'>WinZip</a></td>";
<tr class=white> <tr class=white>
<?php <?php
echo "<td><a href='".$apidb_root."appview.php?appId=55'>ICQ</a></td>"; echo "<td><a href='".BASE."appview.php?appId=55'>ICQ</a></td>";
?> ?>
<td>2002a</td> <td>2002a</td>
<td>The new and improved ICQ is here with all the great features you've come to expect -- plus a whole new set!</td> <td>The new and improved ICQ is here with all the great features you've come to expect -- plus a whole new set!</td>
@@ -217,7 +217,7 @@ echo "<td><a href='".$apidb_root."appview.php?appId=55'>ICQ</a></td>";
<tr class=white> <tr class=white>
<?php <?php
echo "<td><a href='".$apidb_root."appview.php?appId=5'>Winamp</a></td>"; echo "<td><a href='".BASE."appview.php?appId=5'>Winamp</a></td>";
?> ?>
<td>3.0</td> <td>3.0</td>
<td>This program has so many possibilities and offers such a wide <td>This program has so many possibilities and offers such a wide
@@ -230,7 +230,7 @@ range of interfaces, you'll need no other player.</td>
<tr class=white> <tr class=white>
<?php <?php
echo "<td><a href='".$apidb_root."appview.php?appId=391'>WinRAR</a></td>"; echo "<td><a href='".BASE."appview.php?appId=391'>WinRAR</a></td>";
?> ?>
<td>3.00</td> <td>3.00</td>
<td>This is a version of the popular RAR compression format, offering significantly improved compression ratios.</td> <td>This is a version of the popular RAR compression format, offering significantly improved compression ratios.</td>
@@ -246,7 +246,7 @@ echo "<td><a href='".$apidb_root."appview.php?appId=391'>WinRAR</a></td>";
<tr class=white> <tr class=white>
<?php <?php
echo "<td><a href='".$apidb_root."appview.php?appId=288'>WinMX</a></td>"; echo "<td><a href='".BASE."appview.php?appId=288'>WinMX</a></td>";
?> ?>
<td>3.22</td> <td>3.22</td>
<td>Take file sharing to a new level.</td> <td>Take file sharing to a new level.</td>
@@ -259,7 +259,7 @@ echo "<td><a href='".$apidb_root."appview.php?appId=288'>WinMX</a></td>";
<tr class=white> <tr class=white>
<?php <?php
echo "<td><a href='".$apidb_root."appview.php?appId=1757'>SnagIt</a></td>"; echo "<td><a href='".BASE."appview.php?appId=1757'>SnagIt</a></td>";
?> ?>
<td>6.1.1</td> <td>6.1.1</td>
<td>Use this to capture and manage images, text, and video.</td> <td>Use this to capture and manage images, text, and video.</td>

View File

@@ -6,15 +6,12 @@
include("path.php"); include("path.php");
require(BASE."include/"."incl.php"); require(BASE."include/"."incl.php");
global $apidb_root;
function admin_menu() function admin_menu()
{ {
global $noteId; global $noteId;
global $apidb_root;
$m = new htmlmenu("Admin"); $m = new htmlmenu("Admin");
$m->add("Edit this Note", $apidb_root."admin/editAppNote.php?noteId=$noteId"); $m->add("Edit this Note", BASE."admin/editAppNote.php?noteId=$noteId");
$m->done(); $m->done();
} }

View File

@@ -8,8 +8,6 @@ require(BASE."include/"."incl.php");
require(BASE."include/"."application.php"); require(BASE."include/"."application.php");
require(BASE."include/"."comments.php"); require(BASE."include/"."comments.php");
global $apidb_root;
$vendorId = $_REQUEST['vendorId']; $vendorId = $_REQUEST['vendorId'];
//exit with error if no vendor //exit with error if no vendor