Changeset 159 for dev

Show
Ignore:
Timestamp:
12/21/06 17:05:02 (14 years ago)
Author:
exi
Message:

Changed socket timeout in class.http.php to 5s.
Removed references to $qry->getErrorMessage.
Modified parser to be more conservative when it comes to destroyed items in a container.
Changed class.thumb.php to set a socket timeout and supress error messages during image output.
The installer now includes the php_compat file for 4.0.9 compatibility.
Small modification to icon.tpl to fix the display on MSIE.
Added several alliance logos.

Location:
dev
Files:
39 added
1 removed
6 modified

Legend:

Unmodified
Added
Removed

  • dev/common/class.http.php

    r158 r159  
    5151        } 
    5252 
    53         $this->fp = @fsockopen($this->url["host"], 80, $errno, $errstr, 10); 
     53        $this->fp = @fsockopen($this->url["host"], 80, $errno, $errstr, 5); 
    5454        if (!$this->fp) 
    5555        { 

  • dev/common/class.killboard.php

    r91 r159  
    3232                   and ctr_site = '".$this->site_."'"; 
    3333        if ($active) $sql .= " and ctr_ended is null"; 
    34         $qry->execute($sql) or die ($qry->getErrorMessage()); 
     34        $qry->execute($sql); 
    3535        return ($qry->recordCount() > 0); 
    3636    } 
    … …  
    4444                   and ctr_site = '".$this->site_."'"; 
    4545        if ($active) $sql .= " and ( ctr_ended is null or now() <= ctr_ended )"; 
    46         $qry->execute($sql) or die ($qry->getErrorMessage()); 
     46        $qry->execute($sql); 
    4747        return ($qry->recordCount() > 0); 
    4848    } 

  • dev/common/class.parser.php

    r158 r159  
    377377                $locpos = strpos($destroyed[$i], "("); 
    378378 
    379                 if ($container && $qtypos == false) 
     379                if ($container && $locpos != false) 
    380380                { 
    381381                    $container = false; 

  • dev/common/class.thumb.php

    r158 r159  
    2323        } 
    2424 
     25        if (headers_sent()) 
     26        { 
     27            echo 'Error occured.<br/>'; 
     28            return false; 
     29        } 
    2530        if ($this->_encoding == 'jpeg') 
    2631        { 
    … …  
    3742    function validate() 
    3843    { 
     44        if (!$this->_size) 
     45        { 
     46            $this->_size = 32; 
     47        } 
    3948        switch ($this->_type) 
    4049        { 
    … …  
    116125            } 
    117126 
     127            @ini_set('default_socket_timeout', 5); 
    118128            $file = @file_get_contents('http://img.eve.is/serv.asp?s=256&c='.$this->_id); 
    119129            if ($img = @imagecreatefromstring($file)) 
    … …  
    133143                $file = $http->get_content(); 
    134144 
    135                 if ($img = imagecreatefromstring($file)) 
     145                if ($img = @imagecreatefromstring($file)) 
    136146                { 
    137147                    $fp = fopen('cache/portraits/'.$id.'_256.jpg', 'w'); 

  • dev/install/install_step4.php

    r149 r159  
    11<?php 
    22$stoppage = true; 
     3include('../common/php_compat.php'); 
    34 
    45$struct = $opt = $data = array(); 

  • dev/templates/icon.tpl

    r137 r159  
    11<!-- icon.tpl --> 
    2 <div class="item-icon" style="background: url({$img}); border: none; height:32px; width:32px"><img border="0" src="{$icon}"/></div> 
     2<div class="item-icon" style="background: url({$img}); border: none; height:32px; width:32px; text-align:left;"><img border="0" src="{$icon}"/></div> 
    33<!-- /icon.tpl -->