Alexander Nicolaysen Sørnes : Remove some no longer used voting code

[Chris Morgan]

Module: appdb
Branch: master
Commit: 18a3b97694127009a7b164b8104005536ce811e1
URL:    http://source.winehq.org/git/appdb.git/?a=commit;h=18a3b97694127009a7b164b8104005536ce811e1

Author: Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
Date:   Fri Dec  7 01:16:32 2007 +0100

Remove some no longer used voting code

---

 include/version.php |    4 -
 include/vote.php    |  186 ---------------------------------------------------
 updatevote.php      |   16 -----
 3 files changed, 0 insertions(+), 206 deletions(-)

diff --git a/include/version.php b/include/version.php
index 37f3d79..70c176a 100644
--- a/include/version.php
+++ b/include/version.php
@@ -794,10 +794,6 @@ class version {
 
         $oApp = $this->objectGetParent();
 
-        // show Vote Menu
-        if($_SESSION['current']->isLoggedIn())
-            apidb_sidebar_add("vote_menu");
-
         // cat
         $oCategory = new Category($oApp->iCatId);
         $oCategory->display($oApp->iAppId, $this->iVersionId);
diff --git a/include/vote.php b/include/vote.php
index e636571..c97295e 100644
--- a/include/vote.php
+++ b/include/vote.php
@@ -239,24 +239,6 @@ function vote_count($iVersionId, $iUserId = null)
     return query_num_rows($hResult);
 }
 
-
-/**
- * total votes by userId
- */
-function vote_count_user_total($iUserId = null)
-{
-    if(!$iUserId)
-    {
-        if($_SESSION['current']->isLoggedIn())
-            $iUserId = $_SESSION['current']->iUserId;
-        else
-            return 0;
-    }
-    $hResult = query_parameters("SELECT * FROM appVotes WHERE userId = '?'", $iUserId);
-    return query_num_rows($hResult);
-}
-
-
 /*
  * total votes for versionId
  */
@@ -267,172 +249,4 @@ function vote_count_version_total($iVersionId)
     return query_num_rows($hResult);
 }
 
-
-/**
- * add a vote for appId
- */
-function vote_add($iVersionId, $iSlot, $iUserId = null)
-{
-    if(!$iUserId)
-    {
-        if($_SESSION['current']->isLoggedIn())
-            $iUserId = $_SESSION['current']->iUserId;
-        else
-            return;
-    }
-
-    if($iSlot > MAX_VOTES)
-        return;
-    
-    vote_remove($iSlot, $iUserId);
-
-    query_parameters("INSERT INTO appVotes (id, time, versionId, userId, slot)
-                      VALUES (?, ?, '?', '?', '?')", "null", "NOW()",
-                          $iVersionId, $iUserId, $iSlot);
-}
-
-
-/**
- * remove vote for a slot
- */
-function vote_remove($iSlot, $iUserId = null)
-{
-    if(!$iUserId)
-    {
-        if($_SESSION['current']->isLoggedIn())
-            $iUserId = $_SESSION['current']->iUserId;
-        else
-            return;
-    }
-
-    $sQuery = "DELETE FROM appVotes WHERE userId = '?' AND slot = '?'";
-    query_parameters($sQuery, $iUserId, $iSlot);
-}
-
-
-function vote_get_user_votes($iUserId = null)
-{
-    if(!$iUserId)
-    {
-        if($_SESSION['current']->isLoggedIn())
-            $iUserId = $_SESSION['current']->iUserId;
-        if(!$iUserId)
-            return array();
-    }
-    $hResult = query_parameters("SELECT * FROM appVotes WHERE userId = '?'", $iUserId);
-    if(!$hResult)
-        return array();
-
-    $obs = array();
-    while($oRow = query_fetch_object($hResult))
-        $obs[$oRow->slot] = $oRow;
-    return $obs;
-}
-
-
-function vote_menu()
-{
-    global $aClean;
-
-    $m = new htmlmenu("Votes","updatevote.php");
-
-    $oVersion = new version($aClean['iVersionId']);
-
-    if($oVersion->iObsoleteBy)
-    {
-        $m->add("This version is marked as obsolete, so you cannot vote for it.");
-    } else
-    {
-        $votes = vote_get_user_votes();
-
-        for($i = 1;$i <= MAX_VOTES; $i++)
-        {
-            if(isset($votes[$i]))
-                $str = Version::fullNameLink($votes[$i]->versionId);
-            else
-                $str = "No App Selected";
-
-            $m->add("<input type=radio name=iSlot value='$i'> $str");
-        }
-
-        $m->addmisc("&nbsp;");
-
-        $m->add("<input type=submit name=sClear value=' Clear Vote   ' class=votebutton>");
-        $m->add("<input type=submit name=sVote value='Vote for App' class=votebutton>");
-
-        $m->addmisc("<input type=hidden name=iVersionId value={$aClean['iVersionId']}>");
-
-        $m->add("View Results", BASE."votestats.php");
-        $m->add("Voting Help", BASE."help/?sTopic=voting");
-    }
-
-    $m->done(1);
-}
-
-
-function vote_update($vars)
-{
-    if(!$_SESSION['current']->isLoggedIn())
-        util_show_error_page_and_exit("You must be logged in to vote");
-
-    $oVersion = new version($vars['iVersionId']);
-
-    if( !is_numeric($vars['iVersionId']) OR !is_numeric($vars['iSlot']))
-    {
-        if(is_numeric($vars['iVersionId']))
-        {
-            addmsg("You need to select a voting slot", "red");
-            util_redirect_and_exit($oVersion->objectMakeUrl());
-        } else
-        {
-            util_redirect_and_exit(apidb_fullurl("index.php"));
-        }
-
-        return;
-    }
-
-    if($vars["sVote"])
-    {
-        addmsg("Registered vote for App #".$vars['iVersionId'], "green");
-        vote_add($vars['iVersionId'], $vars['iSlot']);
-    } else if($vars['sClear'])
-    {
-        /* see if we have a vote in this slot, if we don't there is */
-        /* little reason to remove it or even mention that we did anything */
-        if(is_vote_in_slot($vars['iSlot']))
-        {
-            vote_remove($vars['iSlot']);
-            addmsg("Removed vote for App #".$vars['iVersionId'], "green");
-        }
-    }
-
-    util_redirect_and_exit($oVersion->objectMakeUrl());
-}
-
-// tell us if there is a vote in a given slot so we don't
-// display incorrect information to the user or go
-// through the trouble of trying to remove a vote that doesn't exist
-function is_vote_in_slot($iSlot, $iUserId = null)
-{
-    if(!$iUserId)
-    {
-        if($_SESSION['current']->isLoggedIn())
-            $iUserId = $_SESSION['current']->iUserId;
-        else
-            return;
-    }
-
-    $sQuery = "SELECT COUNT(*) as count from appVotes WHERE userId = '?' AND slot = '?'";
-    if($hResult = query_parameters($sQuery, $iUserId, $iSlot))
-    {
-        $oRow = query_fetch_object($hResult);        
-        if($oRow->count != 0)
-            return true;
-        else
-            return false;
-    }
-    
-    return false;
-}
-
 ?>
diff --git a/updatevote.php b/updatevote.php
deleted file mode 100644
index 516f50e..0000000
--- a/updatevote.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/*************************/
-/* code to modify voting */
-/*************************/
-
-/*
- * application environment
- */ 
-require("path.php");
-require(BASE."include/incl.php");
-require(BASE."include/vote.php");
-
-vote_update($aClean);
-
-apidb_footer();
-?>