Changeset 47 for dev

Timestamp:

11/04/06 05:44:08 (14 years ago)

Author:

exi

Message:

Added Custom Shipvalue System, to be enabled in options, as always with autoupgrade(tm) ;)
Changed commenttablefield id to lowercase via autoupgrade.php, compat added in comments.php
Disabled immediate portrait update on IGB-Access

Location:

dev/common

Files:

• admin.php (modified) (2 diffs)
• admin_menu.php (modified) (1 diff)
• admin_shp_val.php (added)
• autoupgrade.php (modified) (3 diffs)
• class.killboard.php (modified) (1 diff)
• class.killlist.php (modified) (6 diffs)
• comments.php (modified) (6 diffs)
• portrait_grab.php (modified) (1 diff)

dev/common/admin.php

@@ -14 +14 @@
     $config->setStyleBanner($_POST['style_banner']);
     $config->setStyleName($_POST['style_name']);
-    if ($_POST['kill_points'] == "on")
-    {
-        $killpoints = 1;
-    }
-    else
-    {
-        $killpoints = 0;
-    }
-    if ($_POST['least_active'] == "on")
-    {
-        $leastactive = 1;
-    }
-    else
-    {
-        $leastactive = 0;
-    }
-    $config->setKillPoints($killpoints);
-    $config->setLeastActive($leastactive);
-    if ($_POST['comments'] == "on")
+
+    // new function checkCheckbox, checks $_POST[arg] and inserts 0 if != 'on'
+    $config->checkCheckbox('kill_points');
+    $config->checkCheckbox('ship_values');
+    $config->checkCheckbox('least_active');
+
+    if ($config->checkCheckbox('comments'))
     {
         require_once('autoupgrade.php');
         check_commenttable();
-        $config->setConfig('comments', '1');
-    }
-    else
-    {
-        $config->setConfig('comments', '0');
-    }
-    if ($_POST['comments_pw'] == "on")
-    {
-        $config->setConfig('comments_pw', '1');
-    }
-    else
-    {
-        $config->setConfig('comments_pw', '0');
-    }
-    if ($_POST['comments_count'] == "on")
-    {
-        $config->setConfig('comments_count', '1');
-    }
-    else
-    {
-        $config->setConfig('comments_count', '0');
-    }
+    }
+    $config->checkCheckbox('comments_pw');
+    $config->checkCheckbox('comments_count');
+
     $config->setPostPassword($_POST['post_password']);
     $config->setPostMailto($_POST['post_mailto']);
@@ -144 +114 @@
 }
 $html .= "></td></tr>";
+$html .= "<tr><td width=120><b>Use custom shipvalues:</b></td><td><input type=checkbox name=ship_values id=ship_values";
+if ($config->getConfig('ship_values'))
+{
+    $html .= " checked=\"checked\"";
+}
+$html .= "></td></tr>";
 $html .= "<tr><td width=120><b>Enable Comments:</b></td><td><input type=checkbox name=comments id=comments";
 if ($config->getConfig('comments'))

dev/common/admin_menu.php

@@ -6 +6 @@
 $menubox->addOption("Contracts", "?a=admin_cc&op=view&type=contract");
 $menubox->addOption("Campaigns", "?a=admin_cc&op=view&type=campaign");
+$menubox->addOption("Ship Values", "?a=admin_shp_val");
 $menubox->addOption("Synchronization", "?a=admin_sync");
 $menubox->addOption("Mods", "?a=admin_mods");

dev/common/autoupgrade.php

@@ -8 +8 @@
     if ($result)
     {
-        check_commenttablerow();
+        check_commenttablerow();
         return;
     }
@@ -29 +29 @@
     if ($result)
     {
-        check_commenttablerow();
+        $query = 'ALTER TABLE `kb3_comments` CHANGE `ID` `id` INT( 11 ) NOT NULL AUTO_INCREMENT';
+        $qry->execute($query);
         return;
     }
@@ -35 +36 @@
     $qry->execute($query);
 }
+
+function check_shipvaltable()
+{
+    $qry = new DBQuery();
+    $query = 'select count(*) from kb3_ships_values';
+    $result = mysql_query($query);
+    if ($result)
+    {
+        return;
+    }
+    $query = 'CREATE TABLE `kb3_ships_values` (
+`shp_id` INT( 11 ) NOT NULL ,
+`shp_value` BIGINT( 4 ) NOT NULL ,
+INDEX ( `shp_id` )
+) TYPE = MYISAM ;';
+    $qry->execute($query);
+}
+
 ?>

dev/common/class.killboard.php

@@ -132 +132 @@
     }
 
+    function checkCheckbox($name)
+    {
+        if ($_POST[$name] == "on")
+        {
+            $this->setConfig($name, '1');
+            return true;
+        }
+        $this->setConfig($name, '0');
+        return false;
+    }
+
     function setStyleName($name)
     {

dev/common/class.killlist.php

@@ -29 +29 @@
         {
             if (!count($this->groupby_))
-                $this->sql_ = "select kll.kll_id, kll.kll_timestamp, plt.plt_name,
+                $this->sql_ = "select distinct kll.kll_id, kll.kll_timestamp, plt.plt_name,
                                 crp.crp_name, ali.all_name, kll.kll_ship_id,
                                 kll.kll_system_id, kll.kll_ship_id,
@@ -41 +41 @@
                                 fbcrp.crp_name as fbcrp_name";
 
+            global $config;
+            if ($config->getConfig('ship_values'))
+            {
+                $this->sql_ .= ', ksv.shp_value';
+            }
             if (count($this->groupby_))
             {
@@ -50 +55 @@
                               on ( shp.shp_id = kll.kll_ship_id )
                            inner join kb3_ship_classes scl
-                              on ( scl.scl_id = shp.shp_class )
-                           inner join kb3_pilots plt
+                              on ( scl.scl_id = shp.shp_class )";
+            if ($config->getConfig('ship_values'))
+            {
+                $this->sql_ .= ' left join kb3_ships_values ksv on (shp.shp_id = ksv.shp_id)';
+            }
+
+            $this->sql_ .= "inner join kb3_pilots plt
                               on ( plt.plt_id = kll.kll_victim_id )
                            inner join kb3_corps crp
@@ -63 +73 @@
                            inner join kb3_systems sys
                               on ( sys.sys_id = kll.kll_system_id )";
+
             // involved filter
             if (! $this->mixedinvolved_)
@@ -180 +191 @@
             }
             if ($this->limit_) $this->sql_ .= " limit " . $this->offset_ . ", " . $this->limit_;
-            // echo $this->sql_."<p>";
+            // echo '<p>'.$this->sql_."</p>";
             $this->qry_->execute($this->sql_);
         }
@@ -234 +245 @@
             if ($row['scl_class'] != 2 && $row['scl_class'] != 3 && $row['scl_class'] != 11)
                 $this->realkillcounter_++;
+
+            global $config;
+            if ($config->getConfig('ship_values'))
+            {
+                if ($row['shp_value'])
+                {
+                    $row['scl_value'] = $row['shp_value'];
+                }
+            }
 
             $this->killisk_ += $row['scl_value'] / 1000000;

dev/common/comments.php

@@ -4 +4 @@
 function bbencode($string)
 {
-    $string = strip_tags(&$string);
+    $string = strip_tags(stripslashes($string));
     $string = str_replace(array('[b]','[/b]','[i]','[/i]','[u]','[/u]'),
                           array('<b>','</b>','<i>','</i>','<u>','</u>'), $string);
@@ -10 +10 @@
     $string = preg_replace('^\[kill=(.*?)](.*?)\[/kill]^', '<a href="\?a=kill_detail&kll_id=\1">\2</a>', $string);
     $string = preg_replace('^\[pilot=(.*?)](.*?)\[/pilot]^', '<a href="\?a=pilot_detail&plt_id=\1">\2</a>', $string);
-        return nl2br($string);
+        return nl2br(addslashes($string));
 }
 
@@ -30 +30 @@
         if ($_POST['comment'] == '')
         {
-            $html .= "Error: Sillent type hey? good for you, bad for a comment.";
+            $html .= "Error: Silent type hey? good for you, bad for a comment.";
         }
         else
@@ -56 +56 @@
 
 $qry = new DBQuery();
-$qry->execute("SELECT * FROM kb3_comments WHERE `kll_id` = $kll_id");
+$qry->execute("SELECT id,* FROM kb3_comments WHERE `kll_id` = $kll_id");
 if ($qry->recordCount() == 0)
 {
@@ -67 +67 @@
     {
         $name = $data['name'];
-        $comment = $data['comment'];
+        $comment = stripslashes($data['comment']);
         $html .= "\n<div class=\"comment-text\" style=\"position: relative;\"><a href=\"?a=search&searchtype=pilot&searchphrase=".$name."\">".$name."</a>:";
         if ($data['posttime'] && $data['posttime'] != '0000-00-00 00:00:00')
@@ -76 +76 @@
         if ($page->isAdmin())
         {
-            $html .= "<a href=\"javascript:openWindow('?a=comments_delete&c_id=".$data['ID']."', null, 480, 350, '' );\">Delete Comment</a>";
+            $html .= "<a href=\"javascript:openWindow('?a=comments_delete&c_id=".$data['id']."', null, 480, 350, '' );\">Delete Comment</a>";
         }
         $html .= "</div>";

dev/common/portrait_grab.php

@@ -40 +40 @@
         $html .= "<a href=\"?a=igb\">Return</a><br>";
 
-        $updated = true;
+        //$updated = true;
     }
 }