Changeset 254 for dev/common/includes/class.map.php

Timestamp:

12/05/07 20:53:40 (15 years ago)

Author:

exi

Message:

Merging 242:253 branch into dev

Files:

• dev/common/includes/class.map.php (modified) (2 diffs)

dev/common/includes/class.map.php

@@ -139 +139 @@
                    and sjp.sjp_from = sys.sys_eve_id';
 
-        $regioncache = 'cache/map/'.KB_SITE.'_'.$this->regionid_.'_'.$this->imgwidth_.'.png';
-        $cached = false;
-
         if ($this->mode_ == "map")
         {
-            if (file_exists($regioncache))
-            {
-                header("Content-type: image/png");
-                readfile($regioncache);
-                return;
-            }
+            $regioncache = 'cache/map/'.KB_SITE.'_'.$this->regionid_.'_'.$this->imgwidth_.'.png';
             $caption = $this->regname_;
         }
-
-        if ($this->mode_ == "region")
-        {
+        elseif ($this->mode_ == "region")
+        {
+            $regioncache = 'cache/map/'.KB_SITE.'_'.$this->conid_.'_'.$this->imgwidth_.'.png';
             $sql .= " and reg.reg_id = ".$this->regionid_;
             $caption = $this->conname_;
         }
-
-        if ($this->mode_ == "cons")
-        {
+        elseif ($this->mode_ == "cons")
+        {
+            $regioncache = 'cache/map/'.KB_SITE.'_'.$this->systemid_.'_'.$this->imgwidth_.'.png';
+
             $sql .= " and con.con_id = ".$this->conid_;
             $caption = $this->sysname_." (".roundsec($this->syssec_).")";
         }
-
-        if (!$cached)
+        if (file_exists($regioncache))
+        {
+            header("Content-type: image/png");
+            readfile($regioncache);
+            return;
+        }
+
+        if (true)
         {
             $qry = new DBQuery();
@@ -357 +356 @@
 
         imagestring($img, 1, 2, 2, $title, $captioncolor);
-        // imagettftext ( $img, 6, 0,
-        // 5,
-        // 10,
-        // $captioncolor,
-        // "../fonts/04B_03__.TTF",
-        // $title );
-        if ($this->mode_ == "map" && !$cached)
+        if ($this->mode_ == "map")
+        {
+            imagepng($img, $regioncache);
+        }
+        // optionally cache constellation maps
+        elseif ($this->mode_ == 'region' && config::get('map_region_cache'))
+        {
+            imagepng($img, $regioncache);
+        }
+        // cache everything if we are reinforced
+        elseif (config::get('is_reinforced'))
         {
             imagepng($img, $regioncache);