Changeset 95

Timestamp:

11/28/06 08:54:08 (16 years ago)

Author:

exi

Message:

Added Logout option to admin menu.
Autoupgrade now checks for index rather than just creating it.
Fixed that no system error for contracts during upgrade.
Added a warning to the installer in case it doesnt get any id on step5.

Location:

dev

Files:

• common/admin_menu.php (modified) (1 diff)
• common/autoupgrade.php (modified) (1 diff)
• common/class.contract.php (modified) (1 diff)
• common/class.item.php (modified) (1 diff)
• common/class.session.php (modified) (4 diffs)
• common/logout.php (added)
• install/install_step5.php (modified) (1 diff)
• install/install_step7.php (modified) (1 diff)
• style/revelations/style.css (modified) (1 diff)

dev/common/admin_menu.php

@@ -16 +16 @@
 $menubox->addOption("Kill Export - files", "?a=kill_export");
 $menubox->addOption("Kill Export - csv", "?a=kill_export_search");
+$menubox->addOption("Logout", "?a=logout");
 ?>

dev/common/autoupgrade.php

@@ -99 +99 @@
     }
     $qry->execute('ALTER TABLE `kb3_contract_details` ADD `ctd_sys_id` INT(11) NOT NULL DEFAULT \'0\'');
+
+    $qry->execute('SHOW columns from `kb3_contract_details` like \'ctd_ctr_id\'');
+    $arr = $qry->getRow();
+    if ($arr['Key'] == 'PRI')
+    {
+        return;
+    }
     $qry->execute('ALTER TABLE `kb3_contract_details` ADD INDEX (`ctd_ctr_id`) ');
 }

dev/common/class.contract.php

@@ -56 +56 @@
 
         $caqry = new DBQuery();
-        $caqry->execute($sql) or die($caqry->getErrorMsg());
+        if (!$caqry->execute($sql))
+        {
+            include_once('autoupgrade.php');
+            check_contracts();
+            $caqry->execute($sql);
+        }
 
         while ($carow = $caqry->getRow())

dev/common/class.item.php

@@ -24 +24 @@
     {
         $this->execQuery();
-//        if (strstr($this->row_['itt_name'], 'Drone'))
-//        {
-//            $html .= "<td class=item-icon width=\"30\" height=\"34\" background=\"".IMG_URL."/drones/".$size."_".$size."/".$this->row_['itm_externalid'].".png\" valign=top>";
-//        }
-//        else
-//        {
+
+        // slot 6 is dronebay
+        if ($this->row_['itt_slot'] == 6)
+        {
+            $html .= "<td class=item-icon width=\"30\" height=\"34\" background=\"".IMG_URL."/drones/".$size."_".$size."/".$this->row_['itm_externalid'].".png\" valign=top>";
+        }
+        else
+        {
+            // fix for new db structure, just make sure old clients dont break
+            if (!strpos($this->row_['itm_icon'], 'icon'))
+            {
+                $this->row_['itm_icon'] = 'icon'.$this->row_['itm_icon'];
+            }
             $html .= "<td class=item-icon width=\"30\" height=\"34\" background=\"".IMG_URL."/items/".$size."_".$size."/".$this->row_['itm_icon'].".png\" valign=top>";
-//        }
+        }
         // return IMG_URL."/items/".$size."_".$size."/".$this->row_['itm_icon'].".png";
 

dev/common/class.session.php

@@ -10 +10 @@
             session_start();
         }
-//        $this->qry_ = new DBQuery();
-//        $this->sql_ = "select *
-//                       from kb3_sessions ses
-//                      where ses.ses_id = '" . $cookie . "'
-//                      and ses.ses_ip = '" . $ip . "'";
     }
 
@@ -20 +15 @@
     {
         return isset($_SESSION['admin']);
-
-        $this->execQuery();
-        return $this->qry_->recordCount() == 1;
     }
 
@@ -28 +20 @@
     {
         return isset($_SESSION['admin_super']);
-
-        $this->execQuery();
-        return ($this->qry_->recordCount() == 1 && $this->row_['ses_super'] == 1);
-    }
-
-    function execQuery()
-    {
-        return true;
-
-        if (!$this->qry_->executed_)
-            $this->qry_->execute($this->sql_);
-
-        $this->row_ = $this->qry_->getRow();
-    }
-
-    function cleanup()
-    {
-        return true;
-
-        $qry = new DBQuery();
-        $qry->execute("delete from kb3_sessions
-                       where ses_logon < date_sub( now(), INTERVAL '120:0' MINUTE_SECOND )");
     }
 
@@ -57 +27 @@
         $_SESSION['admin'] = 1;
         $_SESSION['admin_super'] = $super;
-//        $current = time();
-//        $random = $_SERVER['REMOTE_ADDR'] . $current . KB_SITE;
-//        $ses_id = md5($random);
-//
-//        if (!setcookie("EVK_COOKIE", $ses_id, 0))
-//            die("Unable to set cookie");
-//
-//        $qry = new DBQuery();
-//        $qry->execute("insert into kb3_sessions values ('" . $ses_id . "',
-//                                                        '" . $_SERVER['REMOTE_ADDR'] . "',
-//                                                        now(), " . $super . " )");
+    }
+
+    function destroy()
+    {
+        session_destroy();
     }
 }

dev/install/install_step5.php

@@ -150 +150 @@
 {
     return;
-}?>
+}
+if ($_SESSION['sett']['aid'] == 0 && $_SESSION['sett']['aid'] == 0)
+{
+    echo '<b>Warning:</b> It seems like i got no alliance and corpid, you can continue but you might have to edit it into the config yourself.<br/>';
+}
+?>
 <p><a href="?step=<?php echo ($_SESSION['state']+1); ?>">Next Step</a></p>

dev/install/install_step7.php

@@ -10 +10 @@
 $config = preg_replace("/\{([^\}]+)\}/e", "\\1", join('', file('config.tpl')));
 $fp = fopen('../cache/config.php', 'w');
-fwrite($fp, $config);
+fwrite($fp, trim($config));
 fclose($fp);
 ?>

dev/style/revelations/style.css

@@ -178 +178 @@
 {
   padding-right: 5px;
+  padding-top: 5px;
+ padding-bottom: 6px;
 }