Changeset 157

Timestamp:

12/16/06 03:19:06 (16 years ago)

Author:

exi

Message:

Added option to show a link to the pod killmail instead of a pod picture on the battle summary.
Battle summaries will now be sorted by shippoints, shipname, pilotname.
Added option to disable mailposting without having to change the password.
Fixed a typo on the standingslist.

Location:

dev

Files:

• common/admin.php (modified) (3 diffs)
• common/kill_related.php (modified) (3 diffs)
• common/post.php (modified) (2 diffs)
• common/post_igb.php (modified) (2 diffs)
• templates/battle_overview.tpl (modified) (2 diffs)
• templates/standings.tpl (modified) (1 diff)

dev/common/admin.php

@@ -35 +35 @@
     $config->checkCheckbox('adapt_items');
     $config->checkCheckbox('show_standing');
+    $config->checkCheckbox('bs_podlink');
+    $config->checkCheckbox('post_forbid');
 
     if ($config->checkCheckbox('comments'))
@@ -164 +166 @@
 }
 $html .= "></td></tr>";
+$html .= "<tr><td width=120><b>Display a link instead of POD on Battlesummary:</b></td><td><input type=checkbox name=bs_podlink id=bs_podlink";
+if ($config->getConfig('bs_podlink'))
+{
+    $html .= " checked=\"checked\"";
+}
+$html .= "></td></tr>";
 // $html .= "<tr><td width=120><b>Display least active:</b></td><td><input type=checkbox name=least_active id=least_active";
 // if ( $config->getLeastActive() )
@@ -177 +185 @@
 $html .= "<tr><td width=120><b>Mailhost:</b></td><td><input type=text name=post_mailhost id=post_mailhost size=20 maxlength=80 value=\"".$config->getConfig('mail_host')."\"></td></tr>";
 $html .= "<tr><td width=120><b>Disallow any killmails before:</b></td><td>".dateSelector($config->getConfig('filter_apply'), $config->getConfig('filter_date'))."</td></tr>";
+$html .= "<tr><td width=120><b>Forbid posting</b></td><td><input type=checkbox name=post_forbid id=post_forbid";
+if ($config->getConfig('post_forbid'))
+{
+    $html .= " checked=\"checked\"";
+}
+$html .= "> (Checking this option disables mailposting)</td></tr>";
 $html .= "<tr><td width=120><b>Enable auto-addition of unknown Items:</b></td><td><input type=checkbox name=adapt_items id=adapt_items";
 if ($config->getConfig('adapt_items'))

dev/common/kill_related.php

@@ -169 +169 @@
     {
         global $pods;
-        $pods[] = $kill->getVictimID();
+        $pods[$kill->getID()] = $kill->getVictimID();
 
         // return when we've added him already
@@ -203 +203 @@
         return -1;
     }
+    // sort after points, shipname, pilotname
     elseif ($a['scl'] == $b['scl'])
     {
-        if ($a['ship'] > $b['ship'])
+        if ($a['ship'] == $b['ship'])
+        {
+            if ($a['name'] > $b['name'])
+            {
+                return 1;
+            }
+            return -1;
+        }
+        elseif ($a['ship'] > $b['ship'])
         {
             return 1;
@@ -232 +241 @@
     global $pods;
 
-    if (in_array((string)$pilot, $pods))
-    {
+    if ($result = array_search((string)$pilot, $pods))
+    {
+        global $smarty;
+
+        $smarty->assign('pod_kll_id', $result);
         return true;
     }

dev/common/post.php

@@ -103 +103 @@
     }
 }
-else
+elseif (!$config->getConfig('post_forbid'))
 {
     $html .= "Paste the killmail from your EVEMail inbox into the box below. Make sure you post the <b>ENTIRE</b> mail.<br>Posting fake or otherwise edited mails is not allowed. All posts are logged.";
@@ -117 +117 @@
     $html .= "</form>";
 }
+else
+{
+    $html .= 'Posting killmails is disabled<br/>';
+}
 
 $page->setContent($html);

dev/common/post_igb.php

@@ -77 +77 @@
     }
 }
-else
+elseif (!$config->getConfig('post_forbid'))
 {
     $html .= "Paste the killmail from your EVEMail inbox into the box below. Make sure you post the <b>ENTIRE</b> mail.<br>Posting fake or otherwise edited mails is not allowed. All posts are logged.";
@@ -88 +88 @@
     $html .= "</form>";
 }
+else
+{
+    $html .= 'Posting killmails is disabled<br/>';
+}
 
 $html .= "</body></html>";

dev/templates/battle_overview.tpl

@@ -21 +21 @@
       </td>
 {if podded($pilot) and $i.ship != 'Capsule'}
+{if $config->getConfig('bs_podlink')}
+      <td class="kb-table-cell">
+        <b>{$i.name}&nbsp;<a href="?a=kill_detail&amp;kll_id={$pod_kll_id}">[Pod]</a></b><br/>{$i.ship}
+      </td>
+{else}
       <td class="kb-table-cell" style="background-image: url({$podpic}); background-repeat: no-repeat; background-position: right;">
         <b>{$i.name}</b><br/>{$i.ship}
       </td>
+{/if}
 {else}
       <td class="kb-table-cell"><b><a href="?a=pilot_detail&amp;plt_id={$pilot}">{$i.name}</a></b><br/>{$i.ship}</td>
@@ -50 +56 @@
       </td>
 {if podded($pilot) and $i.ship != 'Capsule'}
+{if $config->getConfig('bs_podlink')}
+      <td class="kb-table-cell">
+        <b>{$i.name}</b>&nbsp;<a href="?a=kill_detail&amp;kll_id={$pod_kll_id}">[Pod]</a><br/>{$i.ship}
+      </td>
+{else}
       <td class="kb-table-cell" style="background-image: url({$podpic}); background-repeat: no-repeat; background-position: right;">
         <b>{$i.name}</b><br/>{$i.ship}
       </td>
+{/if}
 {else}
       <td class="kb-table-cell"><b><a href="?a=pilot_detail&amp;plt_id={$pilot}">{$i.name}</a></b><br/>{$i.ship}</td>

dev/templates/standings.tpl

@@ -10 +10 @@
 {else}
     <td width="32" height="34" valign="top" align="right" style="background-image: url(?a=corpportrait&size=32&id={$standings[opt].list[idx].id});"><img src="img/sta_{$standings[opt].list[idx].icon}.png"/></td>
-    <td><b><a href="?a=corp_detail&all_id={$standings[opt].list[idx].id}">{$standings[opt].list[idx].text}</a></b>{$standings[opt].list[idx].descr}</td>
+    <td><b><a href="?a=corp_detail&crp_id={$standings[opt].list[idx].id}">{$standings[opt].list[idx].text}</a></b>{$standings[opt].list[idx].descr}</td>
 {/if}
     <td align="right">{$standings[opt].list[idx].value}</td>