Changeset 317 for dev

Timestamp:

01/25/08 09:00:29 (14 years ago)

Author:

ralle030583

Message:

- ADD (TEST) api class for testing, getCharId from eve, atm commented out
- fixes for Tickets #74,#75,#77
- DBUpdate004: trinity ships had wrong tech level
- mailer should now send the killmail per email instead of msg that is classified
- and fixed the version in readme cause of the confusion ;-)

Location:

dev

Files:

• README.txt (modified) (1 diff)
• common/admin/option_acache.php (modified) (1 diff)
• common/includes/autoupgrade.php (modified) (2 diffs)
• common/includes/class.api.php (added)
• common/includes/class.cache.php (modified) (1 diff)
• common/includes/class.pilot.php (modified) (1 diff)
• common/includes/globals.php (modified) (1 diff)
• common/post.php (modified) (1 diff)
• mods/history/history.xml (modified) (1 diff)
• templates/igb.tpl (modified) (1 diff)

dev/README.txt

@@ -1 @@
-This is the EDK - EVE Development Network Killboard v1.3 - Tigerduck Memorial Edition
+This is the EDK - EVE Development Network Killboard v1.4 - Trinity Edition
 
 Check out the EVE-Development Network for support, 

dev/common/admin/option_acache.php

@@ -23 +23 @@
     function showLoad()
     {
-        $load = file_get_contents('/proc/loadavg');
-        $array = explode(' ', $load);
-        return (float)$array[0];
+        $load = @file_get_contents('/proc/loadavg');
+        if (false === $load)
+        {
+            return "Your web host does not allow access to the load metric. Reinforced mode will not work.";
+        }
+        else
+        {
+            $array = explode(' ', $load);
+            return (float)$array[0];
+        }
     }
 }

dev/common/includes/autoupgrade.php

@@ -12 +12 @@
 define(CURRENT_DB_UPDATE,config::get("DBUpdate"));
 //Update version of this autoupgrade.php
-define(LASTEST_DB_UPDATE,"003");
+define(LASTEST_DB_UPDATE,"004");
 
 function updateDB(){
@@ -92 +92 @@
 }
 
+function update004(){
+        // new trinity ships are wrong saved as T1 shipes
+        if (CURRENT_DB_UPDATE < "004" )
+        {
+                $qry = new DBQuery();
+                
+                $query = "UPDATE kb3_ships 
+                                        INNER JOIN kb3_ship_classes ON scl_id = shp_class
+                                        SET shp_techlevel = 2 
+                                        WHERE scl_class IN ('Electronic Attack Ship','Heavy Interdictor','Black Ops','Marauder','Heavy Interdictor','Jump Freighter')
+                                        AND shp_techlevel = 1;";
+                $qry->execute($query);          
+                config::set("DBUpdate","004");  
+        }
+}
+
 function update_slot_of_group($id,$oldSlot = 0 ,$newSlot){
         $qry  = new DBQuery();

dev/common/includes/class.cache.php

@@ -10 +10 @@
         }
 
-        $load = file_get_contents('/proc/loadavg');
+        $load = @file_get_contents('/proc/loadavg');
+        if (false === $load)
+        {
+            return false;
+        }
         $array = explode(' ', $load);
         if ((float)$array[0] > (float)config::get('reinforced_threshold'))

dev/common/includes/class.pilot.php

@@ -35 +35 @@
     {
         $this->execQuery();
-        return '?a=thumb&id='.$this->row_['plt_externalid'].'&size='.$size;
+        /* charID api readout - in work, feel free to test
+        if ($this->row_['plt_externalid'] == 0) && config::get('apiCharId'){
+                require_once("class.api.php");
+                $api = new Api();
+                $id = $api->getCharId(plt_name);
+                if ($id > 0){
+                        setCharacterID($id);
+                }
+                return '?a=thumb&id='.$id.'&size='.$size;
+                        
+        }*/
+        return '?a=thumb&id='.$this->row_['plt_externalid'].'&size='.$size;
     }
-
+    
     function execQuery()
     {

dev/common/includes/globals.php

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

dev/common/post.php

@@ -87 +87 @@
                 $mailer->AddReplyTo("no_reply@".config::get('post_mailhost'), "No-Reply");
                 $mailer->Sender = "mailer@".config::get('post_mailhost');
-                $mailer->Body = $kill->getRawMail();
+                $mailer->Body = $_POST['killmail'];
                 $mailer->AddAddress(config::get('post_mailhost'));
                 $mailer->Send();

dev/mods/history/history.xml

@@ -2 +2 @@
 <history>
         <changeset>
-                <rev>314</rev>
+                <rev>317</rev>
+                <author>ralle030583</author>
+                <date>24.01.2008</date>
+                <comment>
+                        <type>ADD</type>
+                        <text>
+                                EVE-Api class (beta), see pilot getCharId(), only for testing, its atm commented out
+                        </text>
+                </comment>
+                <comment>
+                        <type>FIX</type>
+                        <text>
+                                Ticket #74 pilot portrait issues with img url
+                        </text>
+                </comment>
+                <comment>
+                        <type>FIX</type>
+                        <text>
+                                Ticker #77 small fix in igb template with kb_host
+                        </text>
+                </comment>
+                <comment>
+                        <type>FIX</type>
+                        <text>
+                                DB Update004: trinity ships had wrong tech level 
+                        </text>
+                </comment>
+                <comment>
+                        <type>FIX</type>
+                        <text>
+                                Ticket #75 Reinforced mode generated errors if /proc/loadavg cannot be read
+                        </text>
+                </comment>
+                <comment>
+                        <type>FIX</type>
+                        <text>
+                                Mailer sends now the killmail and not the msg that mail is classified, when classification for x hours is enabled.
+                        </text>
+                </comment>
+        </changeset>
+        <changeset>
+                <rev>316</rev>
+                <author>ralle030583</author>
+                <date>23.01.2008</date>
+                <comment>
+                        <type>FIX</type>
+                        <text>
+                                Ticket #73 Typo in portrait_grab + reformat
+                        </text>
+                </comment>
+                <comment>
+                        <type>FIX</type>
+                        <text>
+                                Ticket #72 KB_HOST wasn't available in $smarty by default
+                        </text>
+                </comment>
+        </changeset>
+        <changeset>
+                <rev>314-315</rev>
                 <author>ralle030583</author>
                 <date>21.01.2008</date>

dev/templates/igb.tpl

@@ -1 @@
-<a href="{kb_host}/?a=igb_home">Home</a> | <a href="{kb_host}/?a=post_igb">Post killmail</a> | <a href="{kb_host}/?a=portrait_grab">Update portrait</a>
+<a href="{$kb_host}/?a=igb_home">Home</a> | <a href="{$kb_host}/?a=post_igb">Post killmail</a> | <a href="{$kb_host}/?a=portrait_grab">Update portrait</a>