Changeset 215

Timestamp:

05/09/07 16:17:28 (14 years ago)

Author:

ralle030583

Message:

2 new Features:
1) its now possible to set some option for an beta 'public-mode'
2) its now possible to change the menu bar through admin panel
- you can change the order of the links in the menu bar
- you can add links to extern sites
- administration isnt very nice atm but works (will change it)

Bugfix in install_step2.php

Location:

dev

Files:

• common/admin/option_generic.php (modified) (2 diffs)
• common/admin/option_page.php (added)
• common/includes/class.killsummarytable.php (modified) (7 diffs)
• common/includes/class.page.php (modified) (3 diffs)
• common/includes/globals.php (modified) (1 diff)
• common/losses.php (modified) (1 diff)
• install/install_step2.php (modified) (1 diff)
• templates/menu.tpl (modified) (1 diff)

dev/common/admin/option_generic.php

@@ -35 +35 @@
 options::fadd('ReAdd known killmails', 'readd_dupes', 'checkbox');
 
+options::cat('Appearance', 'Generic', 'Public-Mode-Beta (Provided by eve-kill.net, the TRUE public KB... *jokeing*)');
+options::fadd('Only Kills in SummaryTables', 'public_summarytable', 'checkbox','','','CORP_ID and ALLIANCE_ID in config.php has to be 0 to work "public"');
+options::fadd('Remove Losses Page', 'public_losses', 'checkbox');
+options::fadd('Stats Page', 'public_stats', 'select',array('admin_generic', 'createSelectStats'));
+
 class admin_generic
 {
@@ -101 +106 @@
     }
 
+        function createSelectStats()
+    {
+        $options = array();
+        if (config::get('public_stats') == 'none')
+            {
+            $state = 1;
+        }
+        else
+        {
+            $state = 0;
+        }
+        $options[] = array('value' => 'do nothing', 'descr' => 'do nothing', 'state' => $state);
+        
+        if (config::get('public_stats') == 'remove')
+            {
+            $state = 1;
+        }
+        else
+        {
+            $state = 0;
+        }
+        $options[] = array('value' => 'remove', 'descr' => 'remove', 'state' => $state);
+
+        if (config::get('public_stats') == 'replace')
+            {
+            $state = 1;
+        }
+        else
+        {
+            $state = 0;
+        }
+        $options[] = array('value' => 'replace', 'descr' => 'replace (not rdy yet)', 'state' => $state);
+        
+        return $options;
+    }
+    
     function dateSelector()
     {

dev/common/includes/class.killsummarytable.php

@@ -7 +7 @@
     {
         $this->klist_ = $klist;
-        $this->llist_ = $llist;
-
+        if (!config::get('public_summarytable')){
+                $this->llist_ = $llist;
+        }
         $this->verbose_ = false;
         $this->filter_ = true;
@@ -141 +142 @@
         }
 
-        $sql = 'SELECT count(*) AS lnb, scl_id, scl_class,';
-        if (config::get('ship_values'))
-        {
-            $sql .= ' sum(ifnull(ksv.shp_value,scl.scl_value)) AS lisk FROM kb3_kills kll
-                    INNER JOIN kb3_ships shp ON ( shp.shp_id = kll.kll_ship_id )
-                    left join kb3_ships_values ksv on (shp.shp_id = ksv.shp_id)';
-        }
-        else
-        {
-            $sql .= ' sum(scl.scl_value) AS lisk FROM kb3_kills kll
-                    INNER JOIN kb3_ships shp ON ( shp.shp_id = kll.kll_ship_id )';
-        }
-        $sql .= ' INNER JOIN kb3_ship_classes scl ON ( scl.scl_id = shp.shp_class )';
-
-        if ($this->inv_crp_)
-        {
-            $sql .= ' where kll.kll_crp_id in ( '.join(',', $this->inv_crp_).' ) ';
-        }
-        elseif ($this->inv_all_)
-        {
-            $sql .= ' where kll.kll_all_id in ( '.join(',', $this->inv_all_).' ) ';
-        }
-        $sql .= 'GROUP BY scl_class order by scl_class';
-
-        $qry = new DBQuery();
-        $qry->execute($sql);
-        while ($row = $qry->getRow())
-        {
-            $this->entry_[$row['scl_class']]['losses'] = $row['lnb'];
-            $this->entry_[$row['scl_class']]['losses_isk'] =  $row['lisk'];
-
-            $this->tlcount_ += $row['lnb'];
-            $this->tlisk_ += $row['lisk'];
+        if (!config::get('public_summarytable'))
+        {
+                $sql = 'SELECT count(*) AS lnb, scl_id, scl_class,';
+                if (config::get('ship_values'))
+                {
+                    $sql .= ' sum(ifnull(ksv.shp_value,scl.scl_value)) AS lisk FROM kb3_kills kll
+                            INNER JOIN kb3_ships shp ON ( shp.shp_id = kll.kll_ship_id )
+                            left join kb3_ships_values ksv on (shp.shp_id = ksv.shp_id)';
+                }
+                else
+                {
+                    $sql .= ' sum(scl.scl_value) AS lisk FROM kb3_kills kll
+                            INNER JOIN kb3_ships shp ON ( shp.shp_id = kll.kll_ship_id )';
+                }
+                $sql .= ' INNER JOIN kb3_ship_classes scl ON ( scl.scl_id = shp.shp_class )';
+        
+                if ($this->inv_crp_)
+                {
+                    $sql .= ' where kll.kll_crp_id in ( '.join(',', $this->inv_crp_).' ) ';
+                }
+                elseif ($this->inv_all_)
+                {
+                    $sql .= ' where kll.kll_all_id in ( '.join(',', $this->inv_all_).' ) ';
+                }
+                $sql .= 'GROUP BY scl_class order by scl_class';
+        
+                $qry = new DBQuery();
+                $qry->execute($sql);
+                while ($row = $qry->getRow())
+                {
+                    $this->entry_[$row['scl_class']]['losses'] = $row['lnb'];
+                    $this->entry_[$row['scl_class']]['losses_isk'] =  $row['lisk'];
+        
+                    $this->tlcount_ += $row['lnb'];
+                    $this->tlisk_ += $row['lisk'];
+                }
         }
     }
@@ -214 +218 @@
             }
             // losses
-            while ($kill = $this->llist_->getKill())
-            {
-                $classname = $kill->getVictimShipClassName();
-                $entry[$classname]['losses']++;
-                $entry[$classname]['losses_isk'] += $kill->getVictimShipValue();
-                $this->tlcount_++;
-                $this->tlisk_ += $kill->getVictimShipValue();
-            }
+            if (!config::get('public_summarytable'))
+                    while ($kill = $this->llist_->getKill())
+                    {
+                        $classname = $kill->getVictimShipClassName();
+                        $entry[$classname]['losses']++;
+                        $entry[$classname]['losses_isk'] += $kill->getVictimShipValue();
+                        $this->tlcount_++;
+                        $this->tlisk_ += $kill->getVictimShipValue();
+                    }
         }
         else
@@ -236 +241 @@
         $counter = 1;
 
-        if ($this->verbose_)
-        {
-            $header = "<tr class=kb-table-header><td class=kb-table-cell width=110>Ship class</td><td class=kb-table-cell width=60 align=center>Kills</td><td class=kb-table-cell width=60 align=center>ISK (M)</td><td class=kb-table-cell width=60 align=center>Losses</td><td class=kb-table-cell width=60 align=center>ISK (M)</td></tr>";
+        if (!config::get('public_summarytable'))
+        {
+                if ($this->verbose_) 
+                {
+                    $header = "<tr class=kb-table-header><td class=kb-table-cell width=110>Ship class</td><td class=kb-table-cell width=60 align=center>Kills</td><td class=kb-table-cell width=60 align=center>ISK (M)</td><td class=kb-table-cell width=60 align=center>Losses</td><td class=kb-table-cell width=60 align=center>ISK (M)</td></tr>";
+                }
+                else
+                {
+                    $header = "<tr class=kb-table-header><td class=kb-table-cell width=110>Ship class</td><td class=kb-table-cell width=30 align=center>K</td><td class=kb-table-cell width=30 align=center>L</td></tr>";
+                }
         }
         else
         {
-            $header = "<tr class=kb-table-header><td class=kb-table-cell width=110>Ship class</td><td class=kb-table-cell width=30 align=center>K</td><td class=kb-table-cell width=30 align=center>L</td></tr>";
+            $header = "<tr class=kb-table-header><td class=kb-table-cell width=110>Ship class</td><td class=kb-table-cell width=60 align=center>Kills</td><td class=kb-table-cell width=60 align=center>ISK (M)</td></tr>";
         }
         $html .= $header;
@@ -284 +296 @@
                 $lclass = "kl-loss";
 
-            if ($this->verbose_)
-            {
-                $kclass .= "-bg";
-                $lclass .= "-bg";
-            }
-
             $html .= "<tr class=".$class.">";
 
@@ -309 +315 @@
 
             $html .= "<td class=".$kclass." align=center>".$v['kills']."</td>";
-            if ($this->verbose_)
+            if (($this->verbose_)||config::get('public_summarytable'))
                 $html .= "<td class=".$kclass." align=center>".round($v['kills_isk']/1000000, 2)."</td>";
-            $html .= "<td class=".$lclass." align=center>".$v['losses']."</td>";
-            if ($this->verbose_)
-                $html .= "<td class=".$lclass." align=center>".round($v['losses_isk']/1000000, 2)."</td>";
-
+            
+            if (!config::get('public_summarytable'))    
+            {   
+                    $html .= "<td class=".$lclass." align=center>".$v['losses']."</td>";
+                    if ($this->verbose_)
+                        $html .= "<td class=".$lclass." align=center>".round($v['losses_isk']/1000000, 2)."</td>";
+            }
             $html .= "</tr>";
 
             $counter++;
+            
             $this->tkcount_ += $kcount;
-            $this->tlcount_ += $lcount;
             $this->tkisk_ += $kisk;
-            $this->tlisk_ += $lisk;
             $this->tkpoints_ += $kpoints;
-            $this->tlpoints_ += $lpoints;
+            
+            if (!config::get('public_summarytable'))
+            {
+                    $this->tlcount_ += $lcount;
+                    $this->tlisk_ += $lisk;
+                    $this->tlpoints_ += $lpoints;
+            }
         }
         if ($this->break_)
@@ -330 +344 @@
         $html .= "</tr></table>";
 
-        if (config::get('summarytable_summary'))
+        if (config::get('summarytable_summary') && !config::get('public_summarytable'))
         {
             $html .= '<table width=100% border=0 cellspacing=2>'
                      .'<tr align=center><td width=51%><span align=right class="killcount">'
-                     .$this->tkcount_.' Ships killed ('.round($this->tkisk_/1000000, 2).'M ISK)</span></td><td width=49%><span class="losscount">'
-                     .$this->tlcount_.' Ships lost ('.round($this->tlisk_/1000000, 2).'M ISK)</span></td></tr></table>';
-        }
+                     .$this->tkcount_.' Ships killed ('.round($this->tkisk_/1000000, 2).'M ISK)</span></td><td width=49%><span class="losscount">'.$this->tlcount_.' Ships lost ('.round($this->tlisk_/1000000, 2).'M ISK)</span></td></tr></table>';
+        }
+        if (config::get('summarytable_summary') && config::get('public_summarytable'))
+        {
+            $html .= '<table width=100% border=0 cellspacing=2>'
+                     .'<tr align=center><th>'.$this->tkcount_.' Ships killed ('.round($this->tkisk_/1000000, 2).'M ISK)</th></tr></table>';
+        }
+        
         if ($_GET['scl_id'] != "")
         {

dev/common/includes/class.page.php

@@ -4 +4 @@
     function Page($title = '', $cachable = true)
     {
-        $this->title_ = $title;
+                if (config::get('page_pos_home') == '')
+                {
+                        config::set('page_count',0);
+                        config::set('page_pos_home', 1);
+                        config::set('page_pos_campaigns',2);
+                        config::set('page_pos_contracts',3);
+                        config::set('page_pos_kills',4);
+                        config::set('page_pos_losses',5);
+                        config::set('page_pos_post',6);
+                        config::set('page_pos_stats',7);
+                        config::set('page_pos_awards',8);
+                        config::set('page_pos_standings',9);
+                        config::set('page_pos_search',10);
+                        config::set('page_pos_admin',11);
+                        config::set('page_pos_about',12);
+                }
+        
+        $this->title_ = $title;
         $this->admin_ = false;
 
@@ -69 +86 @@
             $smarty->assign('banner', $banner);
 
-            $menu = new Menu();
-            $menu->add('home', 'Home');
-
-            $contracts = $this->killboard_->hasContracts();
-            $campaigns = $this->killboard_->hasCampaigns();
-            if ($contracts)
-            {
-                $menu->add('contracts', 'Contracts');
-            }
-            if ($campaigns)
-            {
-                $menu->add('campaigns', 'Campaigns');
-            }
-            $w = 10;
-            if ($campaigns)
-            {
-                $w--;
-            }
-            if ($contracts)
-            {
-                $w--;
-            }
-            if (config::get('show_standings'))
-            {
-                $w--;
-                $menu->add('standings', 'Standings');
-            }
-            $menu->add('kills', 'Kills');
-            $menu->add('losses', 'Losses');
-            $menu->add('post', 'Post Mail');
-
-            if (CORP_ID)
-            {
-                $link = 'corp_detail&crp_id='.CORP_ID;
-            }
-            elseif (ALLIANCE_ID)
-            {
-                $link = 'alliance_detail&all_id='.ALLIANCE_ID;
-            }
-            $menu->add($link, 'Stats');
-            $menu->add('awards', 'Awards');
-            $menu->add('search', 'Search');
-            $menu->add('admin', 'Admin');
-            $menu->add('about', 'About');
-
-            $smarty->assign('menu_w', $w.'%');
+            $menu = $this->generateMenu();
+            $w = floor(100 / count($menu->get()));
+            
+            $smarty->assign('menu_w',$w.'%');
             $smarty->assign('menu', $menu->get());
         }
@@ -189 +164 @@
         $this->cachetime_ = $cachetime;
     }
+     
+    function generateMenu(){
+        $menu = new Menu();
+        $contracts = $this->killboard_->hasContracts();
+        $campaigns = $this->killboard_->hasCampaigns();
+        $layout = array();
+        
+        // Check which stat page should be schown
+            if (config::get('public_stats')=='do nothing')
+        {
+            if (CORP_ID)
+            {
+                $statlink = 'corp_detail&crp_id='.CORP_ID;
+            }
+            elseif (ALLIANCE_ID)
+            {
+                $link = 'alliance_detail&all_id='.ALLIANCE_ID;
+            }
+        }
+        if (config::get('public_stats')=='replace')
+        {
+                // Public Stats Page not rdy yet.       
+                $statlink = '';
+        }
+        
+        
+                //preparing default pages
+        $layout[config::get('page_pos_home')] = array('Home','?a=home');
+                if ($campaigns) 
+                        $layout[config::get('page_pos_campaigns')] = array('Campaigns','?a=campaigns');
+                if ($contracts) 
+                        $layout[config::get('page_pos_contracts')] = array('Contracts','?a=contracts');
+                $layout[config::get('page_pos_kills')] = array('Kills','?a=kills');
+                if (!config::get('public_losses'))
+                        $layout[config::get('page_pos_losses')] = array('Losses','?a=losses');
+                $layout[config::get('page_pos_awards')] = array('Awards','?a=awards');
+                if (config::get('show_standings'))
+                        $layout[config::get('page_pos_standings')] = array('Standings','?a=standings');
+                $layout[config::get('page_pos_search')] = array('Search','?a=search');
+                $layout[config::get('page_pos_admin')] = array('Admin','?a=admin');
+                $layout[config::get('page_pos_stats')] = array('Stats',$statlink);
+                $layout[config::get('page_pos_admin')] = array('Admin','?a=admin');
+                $layout[config::get('page_pos_post')] = array('Post mail','?a=post');
+                $layout[config::get('page_pos_about')] = array('About','?a=about');
+        
+                //preparing custom pages
+                for ($i = 1; $i <= config::get('page_count');$i++)
+                {
+                        $layout[config::get('page_pos_'.$i)] = array(config::get('page_descr_'.$i),config::get('page_url_'.$i).'" target="_blank"');
+                }
+                
+                //sorting menu
+                ksort($layout,SORT_NUMERIC);
+                                        
+                //building menu
+                foreach ($layout as $item){
+                        $menu->add($item[1] , $item[0]);                
+                }
+        
+        return $menu;
+    }
 }
 

dev/common/includes/globals.php

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

dev/common/losses.php

@@ -6 +6 @@
 require_once('common/includes/class.killsummarytable.php');
 require_once('common/includes/class.toplist.php');
+
+if (config::get('public_losses')){
+        die('Forbidden');
+}
 
 $week = $_GET['w'];

dev/install/install_step2.php

@@ -83 +83 @@
 else
 {
-    include('../common/class.http.php');
+    include('../common/includes/class.http.php');
     echo 'allow_url_fopen is disabled, nethertheless i will try a socket connect now.<br/>';
 

dev/templates/menu.tpl

@@ -3 +3 @@
 <tr class="kb-table-row-odd">
 {section name=item loop=$menu}
-<td width="{$menu_w}" align="center"><a class="link" style="display: block;" href="?a={$menu[item].link}">{$menu[item].text}</a></td>
+<td width="{$menu_w}" align="center"><a class="link" style="display: block;" href="{$menu[item].link}">{$menu[item].text}</a></td>
 {/section}
 </tr>