Changeset 123

Timestamp:

11/29/06 19:07:22 (16 years ago)

Author:

exi

Message:

Admin: admin_mapoptions.php now deletes all regioncache images on submit of new values.
SQL: default inxed for kb3_ships_values.shp_id is now primary key.
Killlists should now properly show the old date format.
Fixed a typo in admin_mapoptions.tpl.
Added debug code to class.map.php.
The killmail importer should now work also with 1 killmail per request.

Location:

dev

Files:

• common/admin_mapoptions.php (modified) (1 diff)
• common/autoupgrade.php (modified) (1 diff)
• common/class.killlisttable.php (modified) (2 diffs)
• common/class.map.php (modified) (2 diffs)
• common/class.ship.php (modified) (2 diffs)
• common/kill_import.php (modified) (3 diffs)
• install/sql/sql_tbldata_standings.sql (deleted)
• templates/admin_mapoptions.tpl (modified) (1 diff)
• templates/killlisttable.tpl (modified) (1 diff)

dev/common/admin_mapoptions.php

@@ -52 +52 @@
         }
     }
+
+    // on submit delete all region cache files
+    $dir = opendir('cache/map');
+    while ($file = readdir($dir))
+    {
+        if (strpos($file, '.png'))
+        {
+            @unlink('cache/map/'.$file);
+        }
+    }
 }
 

dev/common/autoupgrade.php

@@ -49 +49 @@
 `shp_id` INT( 11 ) NOT NULL ,
 `shp_value` BIGINT( 4 ) NOT NULL ,
-INDEX ( `shp_id` )
+PRIMARY KEY ( `shp_id` )
 ) TYPE = MYISAM ;';
     $qry->execute($query);
-    $qry->execute('ALTER TABLE `kb3_ships_values` ADD PRIMARY KEY ( `shp_id` ) ');
     $qry->execute('UPDATE kb3_ships set shp_class = 8 WHERE shp_id=257 limit 1');
     $qry->execute('UPDATE kb3_ships set shp_class = 8 WHERE shp_id=252 limit 1');

dev/common/class.killlisttable.php

@@ -60 +60 @@
                 if (count($kills) && $this->daybreak_)
                 {
-                    $kl[] = array('kills' => $kills, 'date' => $prevdate);
+                    $kl[] = array('kills' => $kills, 'date' => strtotime($prevdate));
                     $kills = array();
                 }
@@ -86 +86 @@
         if (count($kills))
         {
-            $kl[] = array('kills' => $kills, 'date' => date("l, F jS", strtotime($prevdate)));
+            $kl[] = array('kills' => $kills, 'date' => strtotime($prevdate));
         }
 

dev/common/class.map.php

@@ -132 +132 @@
                 header("Content-type: image/png");
                 readfile($regioncache);
-                $cached = true;
+                return;
             }
             $caption = $this->regname_;
@@ -216 +216 @@
             $xscale = 1 / ($dx / ($this->imgwidth_ - ($this->offset_ * 2)));
             $yscale = 1 / ($dz / ($this->imgheight_ - ($this->offset_ * 2)));
-            // echo "dx:".$dx." dz:".$dz." xscale:".$scale." ".$yscale."<br>";
-            // echo "minx:".$minx." maxx:".$maxx." ";
-            // echo "minz:".$minz." maxz:".$maxz." ";
-            // exit;
-            // exit;
+            if ($_REQUEST['debug'] == 'admovrd')
+            {
+                echo "dx:".$dx." dz:".$dz."<br/> xscale:".$xscale." ".$yscale."<br/>";
+                echo "minx:".$minx." maxx:".$maxx."<br/>";
+                echo "minz:".$minz." maxz:".$maxz."<br/>".$sql."<br/>\n";
+                echo nl2br(print_r($this, 1));
+                echo nl2br(print_r($qry, 1));
+            }
+
             // draw lines
             if ($this->showlines_)

dev/common/class.ship.php

@@ -72 +72 @@
             $this->qry_ = new DBQuery();
 
-            $this->sql_ = "select *
-                           from kb3_ships shp
+            $this->sql_ = "select * from kb3_ships shp
                            inner join kb3_ship_classes scl on shp.shp_class = scl.scl_id";
             if ($config->getConfig('ship_values'))
@@ -79 +78 @@
                 $this->sql_ .= ' left join kb3_ships_values ksv on (shp.shp_id = ksv.shp_id) ';
             }
-            $this->sql_ .= "where shp.shp_id = ".$this->id_;
+            $this->sql_ .= " where shp.shp_id = ".$this->id_;
 
             $this->qry_->execute($this->sql_);

dev/common/kill_import.php

@@ -118 +118 @@
         {
             $i++;
-            if ($i < $_SESSION['kill_import']['startnum'])
+            if ($i <= $_SESSION['kill_import']['startnum'])
             {
                 continue;
             }
-            if ($i < $_SESSION['kill_import']['numcount'])
+            if ($i <= $_SESSION['kill_import']['numcount'])
             {
                 continue;
@@ -137 +137 @@
                 $inv++;
                 $invalid++;
-                #$html .= "Killmail is malformed: $file.<br>\n";
+                $html .= "Killmail is malformed: $file.<br>\n";
                 //unlink($dir.$file);
             }
@@ -144 +144 @@
                 $posted++;
                 $posted_all++;
-                #echo "That $file killmail has already been posted <a href=\"/eve/?a=kill_detail&kll_id=" . $parser->dupeid_ . "\">here</a>.<br>\n";
+                #echo "That $file killmail has already been posted <a href=\"?a=kill_detail&kll_id=" . $parser->dupeid_ . "\">here</a>.<br>\n";
             }
             else

dev/templates/admin_mapoptions.tpl

@@ -2 +2 @@
 <b>Note:</b> You don't need to set colors if you don't want to overwrite the default.<br/>
 The other settings do have an effect if they're touched though.<br/>
-<b>Usage:</b> Input into a RGB-colorfield set of 3 values seperated by ','. If you want to have those values threadened as hex then put an x in front of each.
+<b>Usage:</b> Input into a RGB-colorfield set of 3 values seperated by ','. If you want to have those values treated as hex then put an x in front of each.
 You can omit the 'x' if you're using A-F in the number. It also accepts html codes in the format '#RRGGBB'. If you want to turn back to the default color simply delete everything in the particular editbox.<br/>
 <b>Example:</b> "34,x13,xff" will be evaluated as rgb(34,19,255).

dev/templates/killlisttable.tpl

@@ -1 +1 @@
 {section name=day loop=$killlist}
     {if $daybreak}
-<div class="kb-date-header">{$killlist[day].date}</div><br/>
+<div class="kb-date-header">{"l, F jS"|date:$killlist[day].date}</div><br/>
     {/if}
 <table class="kb-table" width="99%" align="center" cellspacing="1">