Changeset 273

Timestamp:

12/06/07 14:43:04 (13 years ago)

Author:

exi

Message:

Statlink for the board owner need no id anymore.
Removed username on login for admin.
Added drone bandwidth to ship template.

Location:

dev

Files:

• common/admin/admin_navmanager.php (modified) (1 diff)
• common/alliance_detail.php (modified) (9 diffs)
• common/corp_detail.php (modified) (1 diff)
• common/includes/globals.php (modified) (1 diff)
• install/install_step40_tblchk.php (modified) (1 diff)
• templates/invtype_ship.tpl (modified) (1 diff)
• templates/user_login.tpl (modified) (1 diff)

dev/common/admin/admin_navmanager.php

@@ -268 +268 @@
     if (CORP_ID)
     {
-        $statlink = '?a=corp_detail&crp_id='.CORP_ID;
+        $statlink = '?a=corp_detail';
     }elseif (ALLIANCE_ID)
     {
-        $statlink = '?a=alliance_detail&all_id='.ALLIANCE_ID;
+        $statlink = '?a=alliance_detail&';
     }
     $qry = new DBQuery();

dev/common/alliance_detail.php

@@ -7 +7 @@
 require_once('common/includes/class.toplist.php');
 
-$all_id = $_GET['all_id'];
-$alliance = new Alliance(intval($all_id));
+if (!$all_id = intval($_GET['all_id']))
+{
+    if (ALLIANCE_ID)
+    {
+        $all_id = ALLIANCE_ID;
+    }
+    else
+    {
+        echo 'no valid alliance id specified<br/>';
+        return;
+    }
+}
+$alliance = new Alliance($all_id);
 $page = new Page('Alliance details - '.$alliance->getName());
 
@@ -145 +156 @@
     case "corp_kills_class":
         $html .= "<div class=block-header2>Destroyed ships</div>";
-        
+
         // Get all ShipClasses
         $sql = "select scl_id, scl_class from kb3_ship_classes
             where scl_class not in ('Drone','Unknown') order by scl_class";
-        
+
         $qry = new DBQuery();
         $qry->execute($sql);
@@ -159 +170 @@
         $html .= "<tr>";
         $newrow = true;
-        
+
         foreach ($shipclass as $shp){
             if ($newrow){
@@ -176 +187 @@
             $newrow = !$newrow;
             }
-            
+
         }
         $html .= "</tr></table>";
@@ -183 +194 @@
     case "kills_class":
         $html .= "<div class=block-header2>Destroyed ships</div>";
-        
+
         // Get all ShipClasses
         $sql = "select scl_id, scl_class from kb3_ship_classes
             where scl_class not in ('Drone','Unknown') order by scl_class";
-        
+
         $qry = new DBQuery();
         $qry->execute($sql);
@@ -197 +208 @@
         $html .= "<tr>";
         $newrow = true;
-        
+
         foreach ($shipclass as $shp){
             if ($newrow){
@@ -214 +225 @@
             $newrow = !$newrow;
             }
-            
+
         }
         $html .= "</tr></table>";
@@ -225 +236 @@
         $sql = "select scl_id, scl_class from kb3_ship_classes
             where scl_class not in ('Drone','Unknown') order by scl_class";
-        
+
         $qry = new DBQuery();
         $qry->execute($sql);
@@ -262 +273 @@
         $sql = "select scl_id, scl_class from kb3_ship_classes
             where scl_class not in ('Drone','Unknown') order by scl_class";
-        
+
         $qry = new DBQuery();
         $qry->execute($sql);

dev/common/corp_detail.php

@@ -9 +9 @@
 if (!$crp_id = intval($_GET['crp_id']))
 {
-    echo 'no valid corp id specified<br/>';
-    exit;
+    if (CORP_ID)
+    {
+        $crp_id = CORP_ID;
+    }
+    else
+    {
+        echo 'no valid corp id specified<br/>';
+        return;
+    }
 }
 $all_id = $_GET['all_id'];

dev/common/includes/globals.php

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

dev/install/install_step40_tblchk.php

@@ -26 +26 @@
         if (CORP_ID)
         {
-            $statlink = '?a=corp_detail&crp_id='.CORP_ID;
+            $statlink = '?a=corp_detail';
         }
         elseif (ALLIANCE_ID)
         {
-            $statlink = '?a=alliance_detail&all_id='.ALLIANCE_ID;
+            $statlink = '?a=alliance_detail';
         }
 

dev/templates/invtype_ship.tpl

@@ -72 +72 @@
             <div class="block-header">Fitting</div>
             <table class="kb-table" width="360" border="0" cellspacing="1">
-            {php}$this->assign('attribs', array('hiSlots','medSlots','lowSlots','rigSlots','upgradeCapacity','launcherSlotsLeft',
+            {php}$this->assign('attribs', array('hiSlots','medSlots','lowSlots','rigSlots','upgradeCapacity','droneBandwidth','launcherSlotsLeft',
                                                 'turretSlotsLeft','powerOutput','cpuOutput'));{/php}
             {foreach from=$attribs key=i item=key}

dev/templates/user_login.tpl

@@ -5 +5 @@
 {/if}
 <table class="kb-subtable">
-<tr>
+<!--<tr>
   <td width="160"><b>Login:</b></td>
   <td><input type="text" name="usrlogin" maxlength="40"{if $user_name} value="{$user_name}"{/if}></td>
-</tr>
+</tr>-->
 <tr>
   <td width="160"><b>Password:</b></td>