diff --git a/apidb.css b/apidb.css index 7a86e28..fe08f7c 100644 --- a/apidb.css +++ b/apidb.css @@ -220,7 +220,7 @@ TD.stub { color: #0000B1; font-style: italic; text-align: center } /*******************************************************************/ /* Main table */ -#mainTable { padding-left: 7px; } +.mainTable { padding-left: 7px; } /* Banner div */ #banner { border: 1px solid black; } diff --git a/appview.php b/appview.php index 6d5b938..5bc0e8d 100644 --- a/appview.php +++ b/appview.php @@ -32,7 +32,6 @@ function display_catpath($catId, $appId, $versionId = '') /** * display the SUB apps that belong to this app - * FIXME: */ function display_bundle($appId) { @@ -45,9 +44,9 @@ function display_bundle($appId) } echo html_frame_start("","98%","",0); - echo "\n\n"; + echo "
\n\n"; - echo "\n"; + echo "\n"; echo " \n"; echo " \n"; echo "\n\n"; @@ -58,8 +57,8 @@ function display_bundle($appId) $bgcolor = ($c % 2 == 0) ? "color0" : "color1"; //display row - echo "\n"; - echo " \n"; + echo "\n"; + echo " \n"; echo " \n"; echo "\n\n"; @@ -97,17 +96,17 @@ function show_note($sType,$oData){ $s = html_frame_start("","98%",'',0); - $s .= "
Application NameDescription
".stripslashes($ob->appName)."
appId\">".stripslashes($ob->appName)."".trim_description($oApp->sDescription)."
\n"; - $s .= "\n"; - $s .= "
$title
\n"; + $s .= "\n"; + $s .= "\n"; + $s .= "\n"; if ($_SESSION['current']->hasPriv("admin") || $_SESSION['current']->isMaintainer($_REQUEST['versionId'])) { - $s .= "'; } @@ -125,7 +124,7 @@ function display_versions($iAppId, $aVersionsIds) if ($aVersionsIds) { echo html_frame_start("","98%","",0); - echo "
".$title."
\n"; $s .= $oData->noteDesc; $s .= "
"; - $s .= "
"; - $s .= ''; + $s .= "
"; + $s .= "noteId}\">"; + $s .= ''; $s .= '
\n\n"; + echo "
\n\n"; echo "\n"; echo " \n"; @@ -194,12 +193,11 @@ if($_REQUEST['appId']) // start display application echo html_frame_start("","98%","",0); - echo ""; echo "
Version
\n"; echo " \n"; echo " \n"; - - echo " \n"; - echo "
\n"; - echo ' ',"\n"; + echo '
',"\n"; echo " \n"; echo " \n"; + echo "\n"; echo "
Name ".$oApp->sName."
Vendor ". " ".$oVendor->sName."  \n"; @@ -227,7 +225,7 @@ if($_REQUEST['appId']) // image $img = get_screenshot_img($oApp->iAppId); - echo "
$img
$img
\n"; /* close of name/vendor/bugs/url table */ @@ -235,24 +233,25 @@ if($_REQUEST['appId']) echo "
\n"; // Display all supermaintainers maintainers of this application - echo " \n"; - echo " \n"; + echo "
Super maintainers:
\n"; + echo " \n"; $other_maintainers = getSuperMaintainersUserIdsFromAppId($oApp->iAppId); if($other_maintainers) { + echo " \n"; + echo "
  • ".$oUser->sRealname."
    • \n"; } + echo "\n"; } else { echo " \n"; } // Display the app maintainer button - echo " \n"; + echo " \n"; echo "
    Super maintainers:
      \n"; while(list($index, list($userIdValue)) = each($other_maintainers)) { $oUser = new User($userIdValue); - echo "
    \n"; - echo "
  • ".$oUser->sRealname."
    • No maintainers.Volunteer today!
    \n"; + echo '
    '; if($_SESSION['current']->isLoggedIn()) { /* are we already a maintainer? */ @@ -274,13 +273,13 @@ if($_REQUEST['appId']) } if($_SESSION['current']->isLoggedIn()) { - echo '
    '; + echo ''; echo ''; echo '
    '; } if($_SESSION['current']->hasPriv("admin")) { - $url = BASE."admin/deleteAny.php?what=appFamily&appId=".$oApp->iAppId."&confirmed=yes"; + $url = BASE."admin/deleteAny.php?what=appFamily&appId=".$oApp->iAppId."&confirmed=yes"; echo "
    "; echo '
    '; } @@ -288,13 +287,9 @@ if($_REQUEST['appId']) { echo '
    '; } - echo "
    \n"; /* close of super maintainers table */ - echo "
    \n"; /* close the table that contains the whole left hand side of the upper table */ // description @@ -347,11 +342,10 @@ else if($_REQUEST['versionId']) // start version display echo html_frame_start("","98%","",0); - echo ""; - echo '
    ',"\n"; - echo '',"\n"; - echo "\n"; - echo "\n"; + echo '
    Name".$oApp->sName."
    Version".$oVersion->sName."
    ',"\n"; + echo '',"\n"; + echo "\n"; + echo "\n"; // links $result = query_appdb("SELECT * FROM appData WHERE versionID = ".$oVersion->iVersionId." AND type = 'url'"); @@ -360,31 +354,32 @@ else if($_REQUEST['versionId']) echo " \n"; } // rating Area - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; // image $img = get_screenshot_img($oApp->iAppId, $oVersion->iVersionId); - echo "\n"; + echo "\n"; // display all maintainers of this application - echo "
    Name".$oApp->sName."
    Version".$oVersion->sName."
    Links\n"; while($ob = mysql_fetch_object($result)) { - echo " ".substr(stripslashes($ob->description),0,30)."
    \n"; + echo " url\">".substr(stripslashes($ob->description),0,30)."
    \n"; } echo "
    Maintainer Rating".$oVersion->sTestedRating."
    Maintainers Version".$oVersion->sTestedRelease."
    Maintainer Rating".$oVersion->sTestedRating."
    Maintainers Version".$oVersion->sTestedRelease."
    $img
    $img
    Maintainers of this application:\n"; - echo ""; + echo ""; // display the app maintainer button - echo ""; + echo ""; if ($_SESSION['current']->hasPriv("admin") || $_SESSION['current']->isMaintainer($oVersion->iVersionId)) { - echo ""; + echo ""; } echo "
    Maintainers of this application:\n"; + echo ""; $other_maintainers = getMaintainersUserIdsFromAppIdVersionId($oApp->iAppId, $oVersion->iVersionId); if($other_maintainers) { + echo "\n"; + echo "
  • ".$oUser->sRealname."
    • "; } + echo "\n"; } else { echo "
      "; while(list($index, list($userIdValue)) = each($other_maintainers)) { $oUser = new User($userIdValue); - echo "
    "; - echo "
  • ".$oUser->sRealname."
    • "; @@ -393,25 +388,28 @@ else if($_REQUEST['versionId']) echo "
    "; + echo '
    '; if($_SESSION['current']->isLoggedIn()) { /* is this user a maintainer of this version by virtue of being a super maintainer */ /* of this app family? */ if($_SESSION['current']->isSuperMaintainer($oApp->iAppId)) { - echo '
    '; - echo ""; + echo ''; + echo ''; + echo ''; } else { /* are we already a maintainer? */ if($_SESSION['current']->isMaintainer($oVersion->iVersionId)) /* yep */ { - echo ''; - echo ""; + echo ''; + echo ''; + echo ''; } else /* nope */ { - echo ''; + echo ''; + echo ''; } } @@ -420,37 +418,38 @@ else if($_REQUEST['versionId']) echo "
    "; } else { - echo '
    '; - echo ''; + echo ''; + echo ''; + echo ''; echo '
    '; } - echo "
    "; - echo '
    '; - echo ''; + echo '
    '; + echo ''; + echo ''; + echo ''; + echo ''; echo ''; - $url = BASE."admin/deleteAny.php?what=appVersion&appId=".$oApp->iAppId."&versionId=".$oVersion->iVersionId."&confirmed=yes"; + $url = BASE."admin/deleteAny.php?what=appVersion&appId=".$oApp->iAppId."&versionId=".$oVersion->iVersionId."&confirmed=yes"; echo "
    "; - echo ''; + echo ''; echo '
    '; echo '
    iVersionId.'>'; - echo ''; - echo '
    '; + echo ''; echo ''; echo '
    iVersionId.'>'; - echo ''; - echo ''; - echo '
    '; + echo ''; + echo ''; echo ''; echo '
    iVersionId.'>'; - echo ''; - echo ''; + echo ''; + echo ''; echo '
    '; - echo "
    		\n"; diff --git a/help/appdb_faq.help b/help/appdb_faq.help index 5cc8d72..c1e72e0 100644 --- a/help/appdb_faq.help +++ b/help/appdb_faq.help @@ -38,7 +38,7 @@ allowing many unmodified Windows binaries to run on x86-based Unixes, including Solaris.

    More information can be found at the -Wine FAQ.

    +Wine FAQ.

    Q: What are the benefits of this Application Database?

    diff --git a/help/index.php b/help/index.php index d409722..0b7a93f 100644 --- a/help/index.php +++ b/help/index.php @@ -46,7 +46,7 @@ function display_index () $id = $arr[1]; $title = get_help_title("$help_path/$file"); - echo "
  • $title

    • \n"; + echo "
  • $title

    • \n"; } echo "
    \n"; diff --git a/help/maintainer_guidelines.help b/help/maintainer_guidelines.help index 8ec1bb9..f08c8b0 100644 --- a/help/maintainer_guidelines.help +++ b/help/maintainer_guidelines.help @@ -3,7 +3,7 @@

    Maintainers Guidelines

    -This page gives informations on how to maintain an application once being an application maintainer. If you are looking on informations on how to become an application maintainer, this topic is covered in the FAQ. +This page gives informations on how to maintain an application once being an application maintainer. If you are looking on informations on how to become an application maintainer, this topic is covered in the FAQ.

    diff --git a/include/comment.php b/include/comment.php index 1a3958e..120821c 100644 --- a/include/comment.php +++ b/include/comment.php @@ -77,7 +77,7 @@ class Comment { if($sEmail) { $sSubject = "Comment for ".lookup_app_name($this->iAppId)." ".lookup_version_name($this->iVersionId)." added by ".$_SESSION['current']->sRealname; - $sMsg = APPDB_ROOT."appview.php?appId=".$this->iAppId."&versionId=".$this->iVersionId."\n"; + $sMsg = APPDB_ROOT."appview.php?appId=".$this->iAppId."&versionId=".$this->iVersionId."\n"; $sMsg .= "\n"; $sMsg .= "Subject: ".$this->sSubject."\r\n"; $sMsg .= "\n"; @@ -148,7 +148,7 @@ class Comment { if($sEmail) { $sSubject = "Comment for ".lookup_app_name($this->iAppId)." ".lookup_version_name($this->iVersionId)." deleted by ".$_SESSION['current']->sRealname; - $sMsg = APPDB_ROOT."appview.php?appId=".$this->iAppId."&versionId=".$this->iVersionId."\n"; + $sMsg = APPDB_ROOT."appview.php?appId=".$this->iAppId."&versionId=".$this->iVersionId."\n"; $sMsg .= "\n"; $sMsg .= "This comment was made on ".substr($this->sDateCreated,0,10)." by ".$this->oOwner->sRealname."\n"; $sMsg .= "\n"; @@ -185,7 +185,7 @@ function forum_lookup_user($iUserId) } if (!$iUserId || !$oUser->isLoggedIn()) { - $sMailto = 'Anonymous'; + $sMailto = 'Anonymous'; } return $sMailto; } @@ -197,19 +197,19 @@ function view_app_comment($ob) { echo html_frame_start('','98%'); - echo '',"\n"; + echo '
    ',"\n"; $ob->subject = stripslashes($ob->subject); $ob->body = stripslashes($ob->body); // message header - echo "\n"; @@ -228,10 +228,10 @@ function view_app_comment($ob) if ($_SESSION['current']->isLoggedIn() && ($_SESSION['current']->hasPriv("admin") || $_SESSION['current']->isMaintainer($ob->appId,$ob->versionId) )) { echo ""; - echo "","\n"; + echo "versionId\" />","\n"; echo ""; } @@ -307,7 +307,7 @@ function do_display_comments_threaded($handle, $is_main) view_app_comment($ob); } else { - echo '
  • '. + echo '
  • '. $ob->subject.' by '.forum_lookup_user($ob->userId).' on '.$ob->time.'
    • '."\n"; } @@ -357,9 +357,9 @@ function view_app_comments($versionId, $threadId = 0) //start comment format table echo html_frame_start("","98%",'',0); - echo '
    \n"; - echo " ".$ob->subject."
    \n"; - echo " by ".forum_lookup_user($ob->userId)." on ".$ob->time."
    \n"; + echo "
    \n"; + echo " ".$ob->subject."
    \n"; + echo " by ".forum_lookup_user($ob->userId)." on ".$ob->time."
    \n"; echo "
    \n"; // body - echo htmlify_urls($ob->body), "

    \n"; + echo htmlify_urls($ob->body), "

    \n"; // only add RE: once if(eregi("RE:", $ob->subject)) @@ -218,9 +218,9 @@ function view_app_comment($ob) $subject = "RE: ".$ob->subject; // reply post buttons - echo " [post new] \n"; - echo " [reply to this] \n"; + echo " [appId&versionId=$ob->versionId\">post new] \n"; + echo " [appId&versionId=$ob->versionId&subject=". + urlencode("$subject")."&thread=$ob->commentId\">reply to this] \n"; echo "
    \n"; + echo "
    		\n"; echo "commentId\" />"; echo "appId\" />"; - echo "versionId\" />
    ',"\n"; + echo '
    ',"\n"; - echo '
    ',"\n"; + echo '',"\n"; @@ -398,7 +398,7 @@ function view_app_comments($versionId, $threadId = 0) } //start comments - echo '
    ',"\n"; // message display mode changer if ($_SESSION['current']->isLoggedIn()) @@ -369,7 +369,7 @@ function view_app_comments($versionId, $threadId = 0) $_SESSION['current']->setpref("comments:mode", $_REQUEST['cmode']); $sel[$_SESSION['current']->getpref("comments:mode")] = 'selected'; - echo '',"\n"; + echo '',"\n"; } // blank space echo '',"\n"; // post new message button - echo '',"\n"; + echo '',"\n"; //end comment format table echo '
    ',"\n"; + echo '
    		',"\n"; echo "Application Comments $messageCount total comments "; echo 'Mode ',"\n"; - echo '  
    ',"\n"; - echo '
    ',"\n"; + echo '
    ',"\n"; + echo '
    ',"\n"; //hide or display depending on pref if ($_SESSION['current']->isLoggedIn()) diff --git a/include/footer.php b/include/footer.php index 2ccc974..308b1d0 100644 --- a/include/footer.php +++ b/include/footer.php @@ -1,4 +1,2 @@ - - diff --git a/include/header.php b/include/header.php index 2c4989a..afa259c 100644 --- a/include/header.php +++ b/include/header.php @@ -3,37 +3,33 @@ /* Application Database - Header */ /*********************************/ ?> - - - Wine Application DB <?php echo $title; ?> + - - +
    + +
    - +
    - + - -
    Wine HQWine HQ - + -
    +
    - diff --git a/include/html.php b/include/html.php index 191a180..2befe2f 100644 --- a/include/html.php +++ b/include/html.php @@ -195,7 +195,7 @@ function html_frame_start($title = "", $width = "", $extra = "", $innerPad = 5) if ($width) { $width = 'width="'.$width.'"'; } -$str = ''."\n"; +$str = '
    '."\n"; if ($title) { diff --git a/include/screenshot.php b/include/screenshot.php index fa34100..9baf31e 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -297,12 +297,12 @@ function get_screenshot_img($iAppId = null, $iVersionId = null) } else { $oRow = mysql_fetch_object($hResult); - $sImgFile = ''.$oRow->description.''; + $sImgFile = ''.$oRow->description.''; } $sImg = html_frame_start("",'128','',2); if($iVersionId || mysql_num_rows($hResult)) - $sImg .= "$sImgFile"; + $sImg .= "$sImgFile"; else // no link for adding app screenshot as screenshots are linked to versions $sImg .= $sImgFile; $sImg .= html_frame_end()."
    "; diff --git a/include/sidebar.php b/include/sidebar.php index ff08f7e..891a6bf 100644 --- a/include/sidebar.php +++ b/include/sidebar.php @@ -14,7 +14,7 @@ function global_sidebar_menu() { $g->add("Browse Apps", BASE."appbrowse.php"); $g->add("Top 25", BASE."votestats.php"); $g->add("Submit Application", BASE."appsubmit.php?apptype=1"); - $g->add("Help & Documentation", BASE."help/"); + $g->add("Help & Documentation", BASE."help/"); $g->add("AppDB Stats", BASE."appdbStats.php"); $g->done(); diff --git a/index.php b/index.php index baaa5cd..c8cb74b 100644 --- a/index.php +++ b/index.php @@ -12,7 +12,6 @@ require(BASE."include/application.php"); require(BASE."include/screenshot.php"); apidb_header("Wine Application Database"); - ?> Wine AppDB @@ -25,10 +24,10 @@ application.

    -
  • Ability to Vote on Favorite Applications
    • +
  • Ability to vote on Favorite Applications
  • Ability to customize the layout and behaviour of the AppDB and comments system
    • -
  • Take Credit for your witty posts
    • -
  • Ability to sign up to be an application maintainer.
    • +
  • Take credit for your witty posts
    • +
  • Ability to sign up to be an application maintainer.
  • Submit new applications and versions.
  • Submit new screenshots.
    • @@ -154,10 +153,9 @@ application site. The site contains tips and howtos on getting listed apps to ru

    Sidenet Wine configuration utility: Installs Internet Explorer 6 and Windows Media Player 7 automatically (works also with MSN Messenger and RealPlayer).

    +

    WineTools: WineTools is an menu driven installer for installing Windows programs under Wine (DCOM98, IE6, Windows Core Fonts, Windows System Software, Office & Office Viewer, Adobe Photoshop 7, Illustrator 9, Acrobat Reader 5.1, ...).

    -

     

    -