Changeset 30

Timestamp:

10/22/06 21:12:01 (16 years ago)

Author:

exi

Message:

Added base killmail importer, it takes killmails from a specified directory, 1 mail per file.
Changed session interface to php, that reduces siteload by one mysql query and offers room for page variables.
Removed the need to enter a password to post comments if you're logged in as admin.

Location:

dev/common

Files:

• admin.php (modified) (9 diffs)
• admin_menu.php (modified) (1 diff)
• class.page.php (modified) (1 diff)
• class.session.php (modified) (5 diffs)
• comments.php (modified) (3 diffs)
• index.php (modified) (3 diffs)

dev/common/admin.php

@@ -10 +10 @@
 $page->setAdmin();
 
-$config = $killboard->getConfig();
 if ($_POST['submit'])
 {
@@ -53 +52 @@
     $config->setPostPassword($_POST['post_password']);
     $config->setPostMailto($_POST['post_mailto']);
-    
+
     if ($_POST['filter_apply'] == "on")
-    {           
+    {
         $config->setConfig('filter_apply', '1');
-        $config->setConfig('filter_date', mktime(0,0,0,$_POST['filter_month'],($_POST['filter_day'] > 31 ? 31 : $_POST['filter_day']),$_POST['filter_year']));        
-    }else{
+        $config->setConfig('filter_date', mktime(0, 0, 0, $_POST['filter_month'], ($_POST['filter_day'] > 31 ? 31 : $_POST['filter_day']), $_POST['filter_year']));
+    }
+    else
+    {
         $config->setConfig('filter_apply', '0');
         $config->setConfig('filter_date', 0);
@@ -70 +71 @@
 $html .= "<table class=kb-subtable>";
 $html .= "<tr><td width=120><b>Banner:</b></td><td><select id=style_banner name=style_banner>";
+
 $dir = "img/banners/";
 if (is_dir($dir))
@@ -82 +84 @@
                 $html .= "<option value=\"" . $file . "\"";
                 if ($file == $config->getStyleBanner())
+                {
                     $html .= " selected=\"selected\"";
+                }
                 $html .= ">" . $file . "</option>";
             }
@@ -91 +95 @@
 $html .= "<option value=\"custom\"";
 if ($config->getStyleBanner() == "custom")
+{
     $html .= " selected=\"selected\"";
+}
 $html .= ">custom</option></select></td></tr>";
 $html .= "<tr><td width=120><b>Style:</b></td><td><select id=style_name name=style_name>";
+
 $dir = "style/";
 if (is_dir($dir))
@@ -104 +111 @@
             {
                 if ($file == "." || $file == ".." || $file == ".svn")
+                {
                     continue;
+                }
                 $html .= "<option value=\"" . $file . "\"";
                 if ($file == $config->getStyleName())
+                {
                     $html .= " selected=\"selected\"";
+                }
                 $html .= ">" . $file . "</option>";
             }
@@ -121 +132 @@
 $html .= "<tr><td width=120><b>Display killpoints:</b></td><td><input type=checkbox name=kill_points id=kill_points";
 if ($config->getConfig('kill_points'))
+{
     $html .= " checked=\"checked\"";
+}
 $html .= "></td></tr>";
 $html .= "<tr><td width=120><b>Enable Comments:</b></td><td><input type=checkbox name=comments id=comments";
 if ($config->getConfig('comments'))
+{
     $html .= " checked=\"checked\"";
+}
 $html .= "></td></tr>";
 $html .= "<tr><td width=120><b>Require password for Comments:</b></td><td><input type=checkbox name=comments_pw id=comments_pw";
 if ($config->getConfig('comments_pw'))
+{
         $html .= " checked=\"checked\"";
+}
 $html .= "></td></tr>";
 
@@ -143 +160 @@
 $html .= "<tr><td width=120><b>Post password:</b></td><td><input type=text name=post_password id=post_password size=20 maxlength=20 value=\"" . $config->getPostPassword() . "\"></td></tr>";
 $html .= "<tr><td width=120><b>Killmail CC:</b></td><td><input type=text name=post_mailto id=post_mailto size=20 maxlength=80 value=\"" . $config->getPostMailto() . "\"> (e-mail address)</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>Disallow any killmails before:</b></td><td>" . dateSelector($config->getConfig('filter_apply'), $config->getConfig('filter_date')) . "</td></tr>";
 $html .= "</table>";
 
@@ -158 +175 @@
 $page->generate();
 
-function dateSelector($apply,$date){
-        if($date > 0){
-                $date = getdate($date);         
-        }else{
+function dateSelector($apply, $date)
+{
+        if ($date > 0)
+    {
+                $date = getdate($date);
+        }
+    else
+    {
                 $date = getdate();
-        }       
+        }
         $html = "<input type=\"text\" name=\"filter_day\" id=\"filter_day\" style=\"width:20px\" value=\"{$date['mday']}\"/>&nbsp;";
         $html .= "<select name=\"filter_month\" id=\"filter_month\">";
-        for($i=1;$i<=12;$i++){
-                $t = mktime(0,0,0,$i,1,1980);           
-                $month = date("M",$t);          
-                if($date['mon'] == $i) $selected = " selected=\"selected\""; else $selected = "";
+        for ($i = 1; $i <= 12; $i++)
+    {
+                $t = mktime(0, 0, 0, $i, 1, 1980);
+                $month = date("M", $t);
+                if($date['mon'] == $i)
+        {
+            $selected = " selected=\"selected\"";
+        }
+        else
+        {
+            $selected = "";
+        }
+
                 $html .= "<option value=\"$i\"$selected>$month</option>";
         }
         $html .= "</select>&nbsp;";
-        
+
         $html .= "<select name=\"filter_year\" id=\"filter_year\">";
-        for($i=date("Y")-7;$i<=date("Y");$i++){         
-                if($date['year'] == $i) $selected = " selected=\"selected\""; else $selected = "";
+        for ($i = date("Y")-7; $i <= date("Y"); $i++)
+    {
+                if ($date['year'] == $i)
+        {
+            $selected = " selected=\"selected\"";
+        }
+        else
+        {
+            $selected = "";
+        }
                 $html .= "<option value=\"$i\"$selected>$i</option>";
         }
         $html .= "</select>&nbsp;";
         $html .= "<input type=checkbox name=filter_apply id=filter_apply";
-        if($apply=="1") $html .= " checked=\"checked\"";
-        $html .= "/>Apply&nbsp;";       
+        if ($apply)
+    {
+        $html .= " checked=\"checked\"";
+    }
+        $html .= "/>Apply&nbsp;";
         return $html;
 }

dev/common/admin_menu.php

@@ -8 +8 @@
 $menubox->addOption("Synchronization", "?a=admin_sync");
 $menubox->addOption("Mods", "?a=admin_mods");
+$menubox->addOption("Kill Import", "?a=kill_import");
 //$menubox->addOption("Rental", "?a=admin_rental");
 ?>

dev/common/class.page.php

@@ -20 +20 @@
         $this->killboard_ = new Killboard(KB_SITE);
 
-        $this->session_ = new Session($_COOKIE['EVK_COOKIE'],
-            $_SERVER['REMOTE_ADDR']);
+        $this->session_ = new Session();
 
         $this->cachable_ = $cachable;

dev/common/class.session.php

@@ -1 +1 @@
 <?php
-require_once("db.php");
+require_once('db.php');
 
 class Session
 {
-    function Session($cookie, $ip)
+    function Session()
     {
-        $this->qry_ = new DBQuery();
-        $this->sql_ = "select *
-                       from kb3_sessions ses
-                      where ses.ses_id = '" . $cookie . "'
-                        and ses.ses_ip = '" . $ip . "'";
+        if ($_REQUEST['PHPSESSID'])
+        {
+            session_start();
+        }
+//        $this->qry_ = new DBQuery();
+//        $this->sql_ = "select *
+//                       from kb3_sessions ses
+//                      where ses.ses_id = '" . $cookie . "'
+//                      and ses.ses_ip = '" . $ip . "'";
     }
 
     function isAdmin()
     {
+        return isset($_SESSION['admin']);
+
         $this->execQuery();
         return $this->qry_->recordCount() == 1;
@@ -21 +27 @@
     function isSuperAdmin()
     {
+        return isset($_SESSION['admin_super']);
+
         $this->execQuery();
         return ($this->qry_->recordCount() == 1 && $this->row_['ses_super'] == 1);
@@ -27 +35 @@
     function execQuery()
     {
+        return true;
+
         if (!$this->qry_->executed_)
             $this->qry_->execute($this->sql_);
@@ -35 +45 @@
     function cleanup()
     {
+        return true;
+
         $qry = new DBQuery();
         $qry->execute("delete from kb3_sessions
@@ -42 +54 @@
     function create($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 . " )");
+        session_start();
+        $_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 . " )");
     }
 }

dev/common/comments.php

@@ -21 +21 @@
 
     $pw = false;
-    if (!$config->getConfig('comments_pw'))
+    if (!$config->getConfig('comments_pw') || $page->isAdmin())
     {
         $pw = true;
@@ -27 +27 @@
     if ($_POST['password'] == $config->getPostPassword() || $pw)
     {
-        if ($_POST['comment'] == null)
+        if ($_POST['comment'] == '')
         {
             $html .= "Error: Sillent type hey? good for you, bad for a comment.";
@@ -81 +81 @@
 $html .= "<b>Name:</b>";
 $html .= "<input style=\"position:relative; right:-3px;\" class=\"comment-button\" name=\"name\" type=\"text\" size=\"24\" maxlength=\"24\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
-if ($config->getConfig('comments_pw'))
+if ($config->getConfig('comments_pw') && !$page->isAdmin())
 {
     $html .= "<br><b>Password:</b>";

dev/common/index.php

@@ -1 +1 @@
 <?php
-require_once("db.php");
-require_once("class.killboard.php");
+require_once('db.php');
+require_once('class.killboard.php');
 
-$page = str_replace(".", "", $_GET['a']);
-$page = str_replace("/", "", $page);
-
-require_once("config.php");
-
-$killboard = new Killboard(KB_SITE);
-//if ($killboard->isSuspended())
-//    $page = "suspended";
-
-if (substr($_SERVER['HTTP_USER_AGENT'], 0, 15) == "EVE-minibrowser" && $page != "igb" && $page != "post_igb" && $page != "portrait_grab" && $page != "bills")
-    $page = "igb";
-    
-if ($page == "")
-    $page = "home";
-if(substr($page,0,9) == "settings_"){
-        $settingsPage = true;
+$page = str_replace('.', '', $_GET['a']);
+$page = str_replace('/', '', $page);
+if ($page == '')
+{
+    $page = 'home';
 }
-$config = $killboard->getConfig();
-$mods_active = explode(",",$config->getConfig("mods_active"));
-$modOverrides = false;
-foreach($mods_active as $mod){
-        if(file_exists("mods/$mod/$page.php")){
-                if($modOverrides) die("Error: Two or more of the mods you have activated are conflicting");
-                $modOverrides = true;
-                $modOverride = $mod;
-        }
-}
-if(!$settingsPage && !file_exists("common/".$page.".php") && !$modOverrides){
-    $page = "home";
+if (substr($_SERVER['HTTP_USER_AGENT'], 0, 15) == 'EVE-minibrowser' && $page != 'igb' && $page != 'post_igb' && $page != 'portrait_grab' && $page != 'bills')
+{
+    $page = 'igb';
 }
 
-if (KB_CACHE == 1 && count($_POST) == 0 && !in_array($page, $cacheignore)) $docache = true;
+require_once('config.php');
+$killboard = new Killboard(KB_SITE);
+$config = $killboard->getConfig();
+// if ($killboard->isSuspended())
+// $page = 'suspended';
+
+if (substr($page, 0, 9) == 'settings_')
+{
+    $settingsPage = true;
+}
+$mods_active = explode(',', $config->getConfig('mods_active'));
+$modOverrides = false;
+foreach ($mods_active as $mod)
+{
+    if (file_exists('mods/'.$mod.'/'.$page.'.php'))
+    {
+        if ($modOverrides)
+        {
+            die('Error: Two or more of the mods you have activated are conflicting');
+        }
+        $modOverrides = true;
+        $modOverride = $mod;
+    }
+}
+if (!$settingsPage && !file_exists('common/'.$page.'.php') && !$modOverrides)
+{
+    $page = 'home';
+}
+
+if (KB_CACHE == 1 && count($_POST) == 0 && !in_array($page, $cacheignore))
+{
+    $docache = true;
+}
 
 if ($docache)
 {
-    if (!file_exists(KB_CACHEDIR . "/" . KB_SITE))
-        @mkdir(KB_CACHEDIR . "/" . KB_SITE);
+    if (!file_exists(KB_CACHEDIR . '/' . KB_SITE))
+    {
+        @mkdir(KB_CACHEDIR . '/' . KB_SITE);
+    }
 
-    if ($cachetimes[$page]) $cachetime = $cachetimes[$page];
-    else $cachetime = 5;
+    if ($cachetimes[$page])
+    {
+        $cachetime = $cachetimes[$page];
+    }
+    else
+    {
+        $cachetime = 5;
+    }
 
     $cachetime = $cachetime * 60;
 
-    $cachefile = KB_CACHEDIR . "/" . KB_SITE . "/" . md5($_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']) . ".cache";
+    $cachefile = KB_CACHEDIR . '/' . KB_SITE . '/' . md5($_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']) . '.cache';
     $timestamp = ((@file_exists($cachefile))) ? @filemtime($cachefile) : 0;
 
@@ -60 +80 @@
 }
 
-if($settingsPage) include ("mods/" . substr($page,9,strlen($page)-9) . "/settings.php");
-elseif($modOverrides) include("mods/$modOverride/" . $page . ".php");
-else include("common/" . $page . ".php");
+if ($settingsPage)
+{
+    include ('mods/'.substr($page, 9, strlen($page)-9).'/settings.php');
+}
+elseif ($modOverrides)
+{
+    include('mods/'.$modOverride.'/'.$page.'.php');
+}
+else
+{
+    include('common/'.$page.'.php');
+}
 
 if ($docache)
@@ -68 +97 @@
     $fp = @fopen($cachefile, 'w');
     @fwrite($fp, ob_get_contents());
-    @fwrite($fp, "<!-- Generated from cache -->");
+    @fwrite($fp, '<!-- Generated from cache -->');
     @fclose($fp);
     ob_end_flush();