Changeset 216 for dev

Timestamp:

05/10/07 15:17:09 (15 years ago)

Author:

ralle030583

Message:

- new table kb3_navigation
- new Admin Section Navigation - Top Navigation
- removes customable top nav bar changes which came with last revs
- new tablestruct added to autoupgrade.php
- db_cache error when creating new table fixed

Location:

dev/common

Files:

• admin/admin_menu.php (modified) (1 diff)
• admin/admin_navmanager.php (added)
• admin/option_db.php (modified) (1 diff)
• includes/autoupgrade.php (modified) (1 diff)
• includes/class.db_cache.php (modified) (1 diff)
• includes/class.page.php (modified) (3 diffs)

dev/common/admin/admin_menu.php

@@ -63 +63 @@
 options::oldMenu('User', 'Roles', '?a=admin_roles');
 #options::oldMenu('User', 'Titles', '?a=admin_titles');
+
+options::oldMenu('Navigation', "Top Navigation", "?a=admin_navmanager");
 ?>

dev/common/admin/option_db.php

@@ -24 +24 @@
         chk_kb3_items2();
         check_tblstrct6();
-
+                check_navigationtable();
         return 'Maintenance complete.<br/>';
     }

dev/common/includes/autoupgrade.php

@@ -12 +12 @@
     }
     $query = 'CREATE TABLE `kb3_comments` (
-`ID` INT NOT NULL AUTO_INCREMENT ,
-`kll_id` INT NOT NULL ,
-`comment` TEXT NOT NULL ,
-`name` TINYTEXT NOT NULL ,
-`posttime` TIMESTAMP DEFAULT \'0000-00-00 00:00:00\' NOT NULL,
-PRIMARY KEY ( `ID` )
-) TYPE = MYISAM';
-    $qry->execute($query);
-}
+        `ID` INT NOT NULL AUTO_INCREMENT ,
+        `kll_id` INT NOT NULL ,
+        `comment` TEXT NOT NULL ,
+        `name` TINYTEXT NOT NULL ,
+        `posttime` TIMESTAMP DEFAULT \'0000-00-00 00:00:00\' NOT NULL,
+        PRIMARY KEY ( `ID` )
+        ) TYPE = MYISAM';
+    $qry->execute($query);
+}
+
+function check_navigationtable(){
+        $qry = new DBQuery();
+        $query = 'select count(*) from kb3_navigation';
+        $result = mysql_query($query);
+        if ($result)
+        {
+            return;
+        }
+        $query = 'CREATE TABLE `kb3_navigation` (
+        `ID` INT NOT NULL AUTO_INCREMENT ,
+        `nav_type` TINYTEXT NOT NULL,
+        `intern` INT ( 1 ) NOT NULL, 
+        `descr` TINYTEXT NOT NULL ,
+        `url` TINYTEXT NOT NULL ,
+        `target` VARCHAR( 10 )  NOT NULL,
+        `posnr` INT NOT NULL,
+        `page` TINYTEXT NOT NULL,
+        PRIMARY KEY ( `ID` )
+        ) TYPE = MYISAM';
+           $qry->execute($query);
+        if (CORP_ID)
+        {
+            $statlink = '?a=corp_detail&crp_id='.CORP_ID;
+        }
+        elseif (ALLIANCE_ID)
+        {
+            $statlink = '?a=alliance_detail&all_id='.ALLIANCE_ID;
+        }
+        $queries = "INSERT IGNORE INTO `kb3_navigation` VALUES (1,'top',1,'Home','?a=home','_self',1,'ALL_PAGES');
+                INSERT IGNORE INTO `kb3_navigation` VALUES (2,'top',1,'Campaings','?a=campaigns','_self',2,'ALL_PAGES');
+                INSERT IGNORE INTO `kb3_navigation` VALUES (3,'top',1,'Contracts','?a=contracts','_self',3,'ALL_PAGES');
+                INSERT IGNORE INTO `kb3_navigation` VALUES (4,'top',1,'Kills','?a=home','_self',4,'ALL_PAGES');
+                INSERT IGNORE INTO `kb3_navigation` VALUES (5,'top',1,'Losses','?a=losses','_self',5,'ALL_PAGES');
+                INSERT IGNORE INTO `kb3_navigation` VALUES (6,'top',1,'Post Mail','?a=post','_self',6,'ALL_PAGES');
+                INSERT IGNORE INTO `kb3_navigation` VALUES (7,'top',1,'Stats','$statlink','_self',7,'ALL_PAGES');
+                INSERT IGNORE INTO `kb3_navigation` VALUES (8,'top',1,'Awards','?a=awards','_self',8,'ALL_PAGES');
+                INSERT IGNORE INTO `kb3_navigation` VALUES (9,'top',1,'Standings','?a=standings','_self',9,'ALL_PAGES');
+                INSERT IGNORE INTO `kb3_navigation` VALUES (10,'top',1,'Search','?a=search','_self',10,'ALL_PAGES');
+                INSERT IGNORE INTO `kb3_navigation` VALUES (11,'top',1,'Admin','?a=admin','_self',11,'ALL_PAGES');
+                INSERT IGNORE INTO `kb3_navigation` VALUES (12,'top',1,'About','?a=about','_self',12,'ALL_PAGES');";
+        $query = explode("\n", $queries);
+        foreach ($query as $querystring)
+        {
+                if ($string = trim(str_replace(');', ')', $querystring)))
+                {
+                    $qry->execute($string);
+                }
+        }
+}       
 
 function check_commenttablerow()

dev/common/includes/class.db_cache.php

@@ -156 +156 @@
             return false;
         }
+        elseif ($ta[0] == 'create')
+        {
+            return false;
+        }
         else
         {

dev/common/includes/class.page.php

@@ -4 +4 @@
     function Page($title = '', $cachable = true)
     {
-                if (config::get('page_pos_home') == '')
+                if (!config::get('public_stats'))
                 {
-                        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);
+                        config::set('public_stats','do nothing');
                 }
         
@@ -32 +20 @@
         $this->cachable_ = $cachable;
         $this->cachetime_ = 5;
+        
+        // if you have probs with missing tables uncomment this and 
+                // require_once('common/includes/autoupgrade.php');
+        // check_navigationtable();
     }
 
@@ -170 +162 @@
         $campaigns = $this->killboard_->hasCampaigns();
         $layout = array();
+        $statlink = '';
         
-        // 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]);                
-                }
-        
+        $qry = new DBQuery();
+        $query = "SELECT * FROM kb3_navigation WHERE nav_type ='top' ORDER BY posnr";
+        $qry->execute($query);
+        while ($row = $qry->getRow()){
+                $url = $row['url'];
+                // i know thats a bad hack :-)
+                if ($row['target'] == '_blank')
+                        $url .= '" target="_blank"';
+                        
+                if (!$contracts && ($row['ID']==3)){
+                        continue;
+                }elseif (!$campaigns && ($row['ID']==2)){
+                        continue;
+                }elseif ((((config::get('public_stats')=='replace')||(config::get('public_stats')=='remove')))&& $row['ID']==7) {
+                        continue;
+                }elseif (!config::get('show_standings')&& $row['ID']==9){
+                        continue;
+                }elseif ((config::get('public_losses')&& $row['ID']==5)){
+                        continue;
+                }else $menu->add($url , $row['descr']);
+        }
         return $menu;
     }