Changeset 239

Timestamp:

09/19/07 15:00:16 (15 years ago)

Author:

ralle030583

Message:

possible fix for problems with top navigation
and not shown entries for campaigns and contract cause
of probs with killboard::hasCampaign() / hasContract()

Location:

dev/common

Files:

• admin/admin.php (modified) (1 diff)
• admin/admin_mods.php (modified) (1 diff)
• awards.php (modified) (1 diff)
• corp_detail.php (modified) (1 diff)
• includes/class.killboard.php (modified) (3 diffs)
• includes/globals.php (modified) (1 diff)
• index.php (modified) (1 diff)
• register.php (modified) (1 diff)

dev/common/admin/admin.php

@@ -3 +3 @@
 require_once('common/admin/admin_menu.php');
 
-$killboard = new Killboard(KB_SITE);
 $page = new Page();
 $page->setAdmin();

dev/common/admin/admin_mods.php

@@ -3 +3 @@
 
 $page = new Page('Administration - Mods');
-$killboard = new Killboard(KB_SITE);
 $page->setAdmin();
 

dev/common/awards.php

@@ -58 +58 @@
 $html .= "<td valign=top align=center>".$tkbox->generate()."</td>";
 // top scorers
-$killboard = $page->killboard_;
 if (config::get('kill_points'))
 {

dev/common/corp_detail.php

@@ -407 +407 @@
 $menubox->addOption("link","Top killers", "?a=corp_detail&crp_id=" . $corp->getID() . "&view=pilot_kills");
 
-$killboard = $page->killboard_;
 if (config::get('kill_points'))
     $menubox->addOption("link","Top scorers", "?a=corp_detail&crp_id=" . $corp->getID() . "&view=pilot_scores");

dev/common/includes/class.killboard.php

@@ -1 +1 @@
 <?php
-require_once('common/includes/class.config.php');
 
 class Killboard
 {
-    function Killboard($site)
-    {
-        $this->qry_ = new DBQuery();
-
-        $this->site_ = $site;
-        $this->config_ = new Config($site);
-    }
-
-    function isSuspended()
-    {
-        $this->execQuery();
-        return $this->row_['rtl_suspended'] == "1";
-    }
-
-    function getConfig()
-    {
-        $this->execQuery();
-        return $this->config_;
-    }
-
     function hasCampaigns($active = false)
     {
@@ -30 +9 @@
                  from kb3_contracts
                  where ctr_campaign = 1
-                   and ctr_site = '".$this->site_."'";
+                   and ctr_site = '".KB_SITE."'";
         if ($active) $sql .= " and ( ctr_ended is null or now() <= ctr_ended )";
         $qry->execute($sql);
@@ -42 +21 @@
                  from kb3_contracts
                  where ctr_campaign = 0
-                   and ctr_site = '".$this->site_."'";
+                   and ctr_site = '".KB_SITE."'";
         if ($active) $sql .= " and ( ctr_ended is null or now() <= ctr_ended )";
         $qry->execute($sql);
         return ($qry->recordCount() > 0);
     }
-
-    function execQuery()
-    {
-    }
 }
 ?>

dev/common/includes/globals.php

@@ -1 +1 @@
 <?php
 // current subversion revision
-preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 234 $', $match);
+preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 239 $', $match);
 define('SVN_REV', $match[1]);
 

dev/common/index.php

@@ -23 +23 @@
 // many ppl had issues with pear and relative paths
 require_once('common/includes/db.php');
+require_once('common/includes/class.config.php');
 require_once('common/includes/class.killboard.php');
 require_once('common/includes/class.page.php');

dev/common/register.php

@@ -1 +1 @@
 <?php
-$killboard = new Killboard(KB_SITE);
 $page = new Page('User - Registration');