Changeset 245
- Timestamp:
- 10/20/07 20:47:56 (15 years ago)
- Location:
- branch/rev3
- Files:
-
- 10 modified
Legend:
- Unmodified
- Added
- Removed
-
branch/rev3/common/admin/option_acache.php
r243 r245 15 15 options::fadd('Current Load', 'none', 'custom', array('admin_acache', 'showLoad')); 16 16 options::fadd('Reinforcement threshold', 'reinforced_threshold', 'edit:size:4'); 17 options::fadd('Disabling threshold', 'reinforced_disable_threshold', 'edit:size:4'); 17 18 options::fadd('Reinforcement chance', 'reinforced_prob', 'edit:size:4'); 18 19 options::fadd('Reinforcement end chance', 'reinforced_rf_prob', 'edit:size:4'); -
branch/rev3/common/includes/class.cache.php
r243 r245 17 17 config::set('is_reinforced', 1); 18 18 } 19 elseif ((float)$array[0] > (float)config::get('reinforced_disable_threshold') && config::get('is_reinforced')) 20 { 21 // do nothing, we are in RF, load is dropping but stil over disabling threshold 22 } 19 23 else 20 24 { 25 // load low, dont enter reinforced 21 26 config::set('is_reinforced', 0); 22 27 } -
branch/rev3/common/includes/class.db.php
r209 r245 33 33 { 34 34 function DBQuery() 35 { 36 if (DB_USE_QCACHE === true) 37 { 38 $this = new DBCachedQuery(); 39 } 40 else 41 { 42 $this = new DBNormalQuery(); 43 } 44 } 45 } 46 47 class DBNormalQuery 48 { 49 function DBNormalQuery() 35 50 { 36 51 $this->executed_ = false; -
branch/rev3/common/includes/class.db_cache.php
r216 r245 1 1 <?php 2 2 3 class DBC onnection3 class DBCachedQuery 4 4 { 5 function DBConnection() 6 { 7 static $conn_id; 8 9 if (is_resource($conn_id)) 10 { 11 $this->id_ = $conn_id; 12 return; 13 } 14 if (!$this->id_ = mysql_connect(DB_HOST, DB_USER, DB_PASS)) 15 die("Unable to connect to mysql database."); 16 17 mysql_select_db(DB_NAME); 18 $conn_id = $this->id_; 19 } 20 21 function id() 22 { 23 return $this->id_; 24 } 25 26 function affectedRows() 27 { 28 return mysql_affected_rows($this->id_); 29 } 30 } 31 32 class DBQuery 33 { 34 function DBQuery() 5 function DBCachedQuery() 35 6 { 36 7 $this->executed_ = false; -
branch/rev3/common/includes/class.thumb.php
r244 r245 109 109 } 110 110 // 20070911 - Gate: Support EVE/Capture/Portraits images 111 elseif (file_exists('cache/portraits/'.$this->_id.'.jpg')) 112 { 113 $img = imagecreatefromjpeg('cache/portraits/'.$this->_id.'.jpg'); 114 $newimg = imagecreatetruecolor($this->_size, $this->_size); 115 imagecopyresampled($newimg, $img, 0, 0, 0, 0, $this->_size, $this->_size, 1024, 1024); 116 imagejpeg($newimg, $this->_thumb, 90); 117 imagedestroy($newimg); 118 119 return; 111 elseif (file_exists('img/portraits/'.$this->_id.'.jpg')) 112 { 113 $img = imagecreatefromjpeg('img/portraits/'.$this->_id.'.jpg'); 120 114 } 121 115 else … … 136 130 } 137 131 132 // in case of a dead eve server we only want to wait 5 seconds 138 133 @ini_set('default_socket_timeout', 5); 139 134 $file = @file_get_contents('http://img.eve.is/serv.asp?s=256&c='.$this->_id); … … 165 160 { 166 161 $newimg = imagecreatetruecolor($this->_size, $this->_size); 167 imagecopyresampled($newimg, $img, 0, 0, 0, 0, $this->_size, $this->_size, 256, 256); 162 $srcwidth = imagesx($img); 163 $srcheight = imagesy($img); 164 165 imagecopyresampled($newimg, $img, 0, 0, 0, 0, $this->_size, $this->_size, $srcwidth, $srcheight); 168 166 imagejpeg($newimg, $this->_thumb, 90); 167 imagedestroy($newimg); 169 168 } 170 169 else -
branch/rev3/common/index.php
r243 r245 69 69 define('DB_HALTONERROR', (bool)config::get('cfg_sqlhalt')); 70 70 define('DB_USE_QCACHE', (bool)config::get('cfg_qcache')); 71 if (DB_USE_QCACHE) 72 { 73 require_once('common/includes/class.db_cache.php'); 74 } 71 75 define('KB_TITLE', config::get('cfg_kbtitle')); 72 76 -
branch/rev3/style/generic.js
r196 r245 70 70 } 71 71 //--> 72 73 /* 74 75 Correctly handle PNG transparency in Win IE 5.5 & 6. 76 http://homepage.ntlworld.com/bobosola. Updated 18-Jan-2006. 77 78 Use in <HEAD> with DEFER keyword wrapped in conditional comments: 79 <!--[if lt IE 7]> 80 <script defer type="text/javascript" src="pngfix.js"></script> 81 <![endif]--> 82 83 */ 84 85 var arVersion = navigator.appVersion.split("MSIE") 86 var version = parseFloat(arVersion[1]) 87 88 if ((version >= 5.5) && (document.body.filters)) 89 { 90 for(var i=0; i<document.images.length; i++) 91 { 92 var img = document.images[i] 93 var imgName = img.src.toUpperCase() 94 if (imgName.substring(imgName.length-3, imgName.length) == "PNG") 95 { 96 var imgID = (img.id) ? "id='" + img.id + "' " : "" 97 var imgClass = (img.className) ? "class='" + img.className + "' " : "" 98 var imgTitle = (img.title) ? "title='" + img.title + "' " : "title='" + img.alt + "' " 99 var imgStyle = "display:inline-block;" + img.style.cssText 100 if (img.align == "left") imgStyle = "float:left;" + imgStyle 101 if (img.align == "right") imgStyle = "float:right;" + imgStyle 102 if (img.parentElement.href) imgStyle = "cursor:hand;" + imgStyle 103 var strNewHTML = "<span " + imgID + imgClass + imgTitle 104 + " style=\"" + "width:" + img.width + "px; height:" + img.height + "px;" + imgStyle + ";" 105 + "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader" 106 + "(src=\'" + img.src + "\', sizingMethod='scale');\"></span>" 107 img.outerHTML = strNewHTML 108 i = i-1 109 } 110 } 111 } -
branch/rev3/templates/icon.tpl
r159 r245 1 <!-- icon.tpl --> 2 <div class="item-icon" style="background: url({$img}); border: none; height:32px; width:32px; text-align:left;"><img border="0" src="{$icon}"/></div> 3 <!-- /icon.tpl --> 1 <span class="item-icon" style="position:relative; border: none; height:32px; width:32px; text-align:left;"> 2 <img border="0" height="32" width="32" style="position:absolute;" src="{$img}"> 3 <img border="0" style="position:absolute;" src="{$icon}"> 4 </span> -
branch/rev3/templates/index.tpl
r243 r245 10 10 {/if} 11 11 <script language=javascript src="{$style_url}/generic.js"></script> 12 12 <!--[if lt IE 7]> 13 <script defer type="text/javascript" src="{$style_url}/generic.js"></script> 14 <![endif]--> 13 15 <style type="text/css"> 14 16 </style> -
branch/rev3/templates/kill_detail.tpl
r244 r245 25 25 {foreach from=$involved key=key item=i} 26 26 <tr class={cycle name=ccl}> 27 <td rowspan=5 width="64"><img {if $i.FB == "true"}class=finalblow{/if} src="{$i.portrait}" border="0"></td>28 <td rowspan=5 width="64"><img {if $i.FB == "true"}class=finalblow{/if} src="{$i.shipImage}" border="0"></td>27 <td rowspan=5 width="64"><img {if $i.FB == "true"}class=finalblow{/if} height="64" width="64" src="{$i.portrait}" border="0"></td> 28 <td rowspan=5 width="64"><img {if $i.FB == "true"}class=finalblow{/if} height="64" width="64" src="{$i.shipImage}" border="0"></td> 29 29 <td class=kb-table-cell style="padding-top: 1px; padding-bottom: 1px;"><a href="{$i.PilotURL}">{$i.PilotName}</a></td> 30 30 </tr> … … 71 71 {if $slot.items or $dropped.slotindex.items} 72 72 <tr class="kb-table-row-even"> 73 <td class="item-icon" width="32"><img src="{$img_url}/{$slot.img}" alt="{$slot.text}" border="0"></td>73 <td class="item-icon" width="32"><img width="32" height="32" src="{$img_url}/{$slot.img}" alt="{$slot.text}" border="0"></td> 74 74 <td colspan="2" class="kb-table-cell"><b>{$slot.text}</b> </td> 75 75 {if $config->get('item_values')}