Changeset 226 for dev

Timestamp:

05/17/07 19:51:23 (15 years ago)

Author:

exi

Message:

if ($_POSTpassword? == config::get('post_mailto')).... NC

Location:

dev

Files:

• common/admin/admin_navmanager.php (modified) (9 diffs)
• common/admin/admin_roles.php (modified) (2 diffs)
• common/includes/class.config.php (modified) (3 diffs)
• common/includes/class.event.php (modified) (1 diff)
• common/includes/class.kill.php (modified) (2 diffs)
• common/includes/class.user.php (modified) (1 diff)
• common/post_igb.php (modified) (1 diff)
• mods/feed_syndication/feed_fetcher.php (modified) (4 diffs)
• mods/feed_syndication/settings.php (modified) (1 diff)
• templates/admin_postperm.tpl (modified) (1 diff)
• templates/admin_roles.tpl (modified) (1 diff)
• templates/admin_roles_assign.tpl (modified) (1 diff)

dev/common/admin/admin_navmanager.php

@@ -9 +9 @@
 $page->setTitle('Administration - Navigation - Top Navigation');
 
-if ($_GET['incPrio']){
-        increasePriority($_GET['incPrio']);
-}
-elseif ($_GET['decPrio']){
-        decreasePriority($_GET['decPrio']);
-}
-elseif ($_POST['new']){
-        newPage($_POST['name'],$_POST['url'],$_POST['target']);
-}
-elseif ($_POST['name']){
-        renamePage($_POST['id'],$_POST['name']);
-}
-elseif ($_POST['target']){
-        changeTarget($_POST['id'],$_POST['target']);
-}
-elseif ($_POST['newUrl']){
-        changeUrl($_POST['id'],$_POST['newUrl']);
-}
-elseif ($_POST['delete']){
-        delPage($_POST['id']);
-}
-elseif ($_POST['syncStat']){
-        repairStatLink();
+if ($_GET['incPrio'])
+{
+    increasePriority($_GET['incPrio']);
+}
+elseif ($_GET['decPrio'])
+{
+    decreasePriority($_GET['decPrio']);
+}
+elseif ($_POST['new'])
+{
+    newPage($_POST['name'], $_POST['url'], $_POST['target']);
+}
+elseif ($_POST['name'])
+{
+    renamePage($_POST['id'], $_POST['name']);
+}
+elseif ($_POST['target'])
+{
+    changeTarget($_POST['id'], $_POST['target']);
+}
+elseif ($_POST['newUrl'])
+{
+    changeUrl($_POST['id'], $_POST['newUrl']);
+}
+elseif ($_POST['delete'])
+{
+    delPage($_POST['id']);
+}
+elseif ($_POST['syncStat'])
+{
+    repairStatLink();
 }
 
@@ -41 +49 @@
 if ($result)
 {
-        $html .= "<table class=kb-table>";
-        $html .= "<tr><td width=100><u><b>Page</b></u></td><th colspan=2><u>Actions</u></th></tr>";
-        $odd = false;
-        while ($row = $qry->getRow())
-        {
-                 $html .= "<tr class=$class><td>".$row['descr']."</td><form action ='?a=admin_navmanager' method='POST'><td><input name='name' type='text' value='".$row['descr']."'></td><td><input type='hidden' name='id' value='".$row['ID']."'><input type='submit' value='rename'></td></form></tr>";
-                if (!$odd)
+    $html .= "<table class=kb-table>";
+    $html .= "<tr><td width=100><u><b>Page</b></u></td><th colspan=2><u>Actions</u></th></tr>";
+    $odd = false;
+    while ($row = $qry->getRow())
+    {
+        $html .= "<tr class=$class><td>".$row['descr']."</td><form action ='?a=admin_navmanager' method='POST'><td><input name='name' type='text' value='".$row['descr']."'></td><td><input type='hidden' name='id' value='".$row['ID']."'><input type='submit' value='rename'></td></form></tr>";
+        if (!$odd)
         {
             $odd = true;
@@ -57 +65 @@
             $class = 'kb-table-row-even';
         }
-        }
-        $html .= "<tr class=$class>";
-        if (!$odd)
+    }
+    $html .= "<tr class=$class>";
+    if (!$odd)
     {
         $odd = true;
@@ -69 +77 @@
         $class = 'kb-table-row-even';
     }
-        $html .= "<tr class=$class><form action ='?a=admin_navmanager' method='POST'><td  colspan=2>Statlink must have the name \"Stats\"<br> during repair</td><td><input type='hidden' name='syncStat' value='1'><center><input type='submit' value='Repair Stats'></center></td></form></tr>";
-        $html .= "</table>";
-}       
+    $html .= "<tr class=$class><form action ='?a=admin_navmanager' method='POST'><td  colspan=2>Statlink must have the name \"Stats\"<br> during repair</td><td><input type='hidden' name='syncStat' value='1'><center><input type='submit' value='Repair Stats'></center></td></form></tr>";
+    $html .= "</table>";
+}
 $html .= "<div class=block-header2>Navigation for extern pages</div>";
 $qry = new DBQuery();
@@ -79 +87 @@
 if ($result)
 {
-        $html .= "<table class=kb-table>";
-        $html .= "<tr><td width=100><u><b>Page</b></u></td><th colspan=2>Rename</th><th colspan=2>URL</th><th colspan=2>Target</th></tr>";
-        $odd = false;
-        while ($row = $qry->getRow())
-        {
-                $html .= "<tr class=$class><td>".$row['descr']."</td>";
-                $html .= "<form action ='?a=admin_navmanager' method='POST'><td><input name='name' type='text' value='".$row['descr']."'></td><td><input type='hidden' name='id' value='".$row['ID']."'><input type='submit' value='rename'></td></form>";
-                $html .= "<form action ='?a=admin_navmanager' method='POST'><td><input name='newUrl' type='text' value='".$row['url']."'></td><td><input type='hidden' name='id' value='".$row['ID']."'><input type='submit' value='change'></td></form>";
-                $html .= "<form action ='?a=admin_navmanager' method='POST'><td><select name='target'>";
-                $html .= "<option value='_self' ";
-                if ($row['target'] == '_self')
-                {
-                        $html .= "selected";
-                }
-                $html .= ">_self</option>";
-                $html .= "<option value='_blank' ";
-                if ($row['target'] == '_blank')
-                {
-                        $html .= "selected";
-                }
-                $html .=">_blank</option></select>";
-                $html .= "</td><td><input type='hidden' name='id' value='".$row['ID']."'><input type='submit' value='change'></td></form>";
-                $html .= "<form action ='?a=admin_navmanager' method='POST'><td><input name='delete' type='hidden' value='1'><input type='hidden' name='id' value='".$row['ID']."'><input type='submit' value='delete'></td></form>";
-                $html .= "</tr>";
-                if (!$odd)
+    $html .= "<table class=kb-table>";
+    $html .= "<tr><td width=100><u><b>Page</b></u></td><th colspan=2>Rename</th><th colspan=2>URL</th><th colspan=2>Target</th></tr>";
+    $odd = false;
+    while ($row = $qry->getRow())
+    {
+        $html .= "<tr class=$class><td>".$row['descr']."</td>";
+        $html .= "<form action ='?a=admin_navmanager' method='POST'><td><input name='name' type='text' value='".$row['descr']."'></td><td><input type='hidden' name='id' value='".$row['ID']."'><input type='submit' value='rename'></td></form>";
+        $html .= "<form action ='?a=admin_navmanager' method='POST'><td><input name='newUrl' type='text' value='".$row['url']."'></td><td><input type='hidden' name='id' value='".$row['ID']."'><input type='submit' value='change'></td></form>";
+        $html .= "<form action ='?a=admin_navmanager' method='POST'><td><select name='target'>";
+        $html .= "<option value='_self' ";
+        if ($row['target'] == '_self')
+        {
+            $html .= "selected";
+        }
+        $html .= ">_self</option>";
+        $html .= "<option value='_blank' ";
+        if ($row['target'] == '_blank')
+        {
+            $html .= "selected";
+        }
+        $html .= ">_blank</option></select>";
+        $html .= "</td><td><input type='hidden' name='id' value='".$row['ID']."'><input type='submit' value='change'></td></form>";
+        $html .= "<form action ='?a=admin_navmanager' method='POST'><td><input name='delete' type='hidden' value='1'><input type='hidden' name='id' value='".$row['ID']."'><input type='submit' value='delete'></td></form>";
+        $html .= "</tr>";
+        if (!$odd)
         {
             $odd = true;
@@ -113 +121 @@
             $class = 'kb-table-row-even';
         }
-        }
-        $html .= "<tr class=$class><td colspan=10><b><u>New Page:</b></u></td></tr>";
-        if (!$odd)
-       {
-           $odd = true;
-           $class = 'kb-table-row-odd';
-       }
-       else
-       {
-           $odd = false;
-           $class = 'kb-table-row-even';
-       }
-        $html .= "<tr class=$class><td>Description:</td>";
-        $html .= "<form action ='?a=admin_navmanager' method='POST'><td><input name='name' type='text'></td>";
-        $html .= "<td>URL:</td><td><input name='url' type='text' value='http://'></td><td>Target:</td>";
-        $html .= "<td><select name='target'><option value='_self'>_self</option><option value='_blank'>_blank</option></select>";
-        $html .= "</td><td><input type='hidden' name='new' value='1'><input type='submit' value='add'></td></form>";
-        $html .= "</tr>";
-        $html .= "</table>";
+    }
+    $html .= "<tr class=$class><td colspan=10><b><u>New Page:</b></u></td></tr>";
+    if (!$odd)
+    {
+        $odd = true;
+        $class = 'kb-table-row-odd';
+    }
+    else
+    {
+        $odd = false;
+        $class = 'kb-table-row-even';
+    }
+    $html .= "<tr class=$class><td>Description:</td>";
+    $html .= "<form action ='?a=admin_navmanager' method='POST'><td><input name='name' type='text'></td>";
+    $html .= "<td>URL:</td><td><input name='url' type='text' value='http://'></td><td>Target:</td>";
+    $html .= "<td><select name='target'><option value='_self'>_self</option><option value='_blank'>_blank</option></select>";
+    $html .= "</td><td><input type='hidden' name='new' value='1'><input type='submit' value='add'></td></form>";
+    $html .= "</tr>";
+    $html .= "</table>";
 }
 
@@ -140 +148 @@
 
 if ($result)
-{       
-        $html .= "<table class=kb-table>";
-        $html .= "<tr><th><u>Nr</u></th><td><u><b>Page</b></u></td><th colspan=2><u>Actions</u></th></tr>";
-        $odd = false;
-        while ($row = $qry->getRow())
-        {
-                if (!$odd)
+{
+    $html .= "<table class=kb-table>";
+    $html .= "<tr><th><u>Nr</u></th><td><u><b>Page</b></u></td><th colspan=2><u>Actions</u></th></tr>";
+    $odd = false;
+    while ($row = $qry->getRow())
+    {
+        if (!$odd)
         {
             $odd = true;
@@ -156 +164 @@
             $class = 'kb-table-row-even';
         }
-                $html .= "<tr class=$class><td align=right>". $row['posnr'] ."</td><td>" . $row['descr']."</td>";
-                $html .= "<td><a href='?a=admin_navmanager&decPrio=".$row['ID']."'><b> move up </b></a></td>";          
-                $html .= "<td><a href='?a=admin_navmanager&incPrio=".$row['ID']."'><b> down </b></a></td>";             
-                $html .= "<tr>" ;
-
-        }
-        $html .= "</table>";    
-}       
+        $html .= "<tr class=$class><td align=right>".$row['posnr']."</td><td>".$row['descr']."</td>";
+        $html .= "<td><a href='?a=admin_navmanager&decPrio=".$row['ID']."'><b> move up </b></a></td>";
+        $html .= "<td><a href='?a=admin_navmanager&incPrio=".$row['ID']."'><b> down </b></a></td>";
+        $html .= "<tr>" ;
+    }
+    $html .= "</table>";
+}
 $page->addContext($menubox->generate());
 $page->setContent($html);
@@ -170 +177 @@
 function increasePriority($id)
 {
-        $qry = new DBQuery();
-        $query = "SELECT posnr FROM kb3_navigation WHERE ID = $id AND KBSITE = '".KB_SITE."'";
-        $qry->execute($query);
-        $row = $qry->getRow();
-        $next = $row['posnr']+1;
-        
-        $qry = new DBQuery();
-        $query = "UPDATE kb3_navigation SET posnr = (posnr-1) WHERE nav_type = 'top' AND posnr = $next AND KBSITE = '".KB_SITE."'";
-        $qry->execute($query);
-        
-        $qry = new DBQuery();
-        $query = "UPDATE kb3_navigation SET posnr = (posnr+1) WHERE ID = $id";
-        $qry->execute($query);
+    $qry = new DBQuery();
+    $query = "SELECT posnr FROM kb3_navigation WHERE ID = $id AND KBSITE = '".KB_SITE."'";
+    $qry->execute($query);
+    $row = $qry->getRow();
+    $next = $row['posnr'] + 1;
+
+    $qry = new DBQuery();
+    $query = "UPDATE kb3_navigation SET posnr = (posnr-1) WHERE nav_type = 'top' AND posnr = $next AND KBSITE = '".KB_SITE."'";
+    $qry->execute($query);
+
+    $qry = new DBQuery();
+    $query = "UPDATE kb3_navigation SET posnr = (posnr+1) WHERE ID = $id";
+    $qry->execute($query);
 }
 function decreasePriority($id)
 {
-        $qry = new DBQuery();
-        $query = "SELECT posnr FROM kb3_navigation WHERE ID = $id AND KBSITE = '".KB_SITE."'";
-        $qry->execute($query);
-        $row = $qry->getRow();
-        $prev = $row['posnr']-1;
-        
-        $qry = new DBQuery();
-        $query = "UPDATE kb3_navigation SET posnr = (posnr+1) WHERE nav_type = 'top' AND posnr = $prev AND KBSITE = '".KB_SITE."'";
-        $qry->execute($query);
-        
-        $qry = new DBQuery();
-        $query = "UPDATE kb3_navigation SET posnr = (posnr-1) WHERE ID = $id";
-        $qry->execute($query);
-}
-
-function renamePage($id,$name){
-        $qry = new DBQuery();
-        $query = "UPDATE kb3_navigation SET descr ='$name' WHERE ID=$id";
-        $qry->execute($query);
-}
-
-function changeUrl($id,$url){
-        $qry = new DBQuery();
-        $query = "UPDATE kb3_navigation SET url ='$url' WHERE ID=$id";
-        $qry->execute($query);
-}
-function changeTarget($id,$target){
-        $qry = new DBQuery();
-        $query = "UPDATE kb3_navigation SET target ='$target' WHERE ID=$id";
-        $qry->execute($query);
-}       
-function newPage($descr,$url,$target){
-        $qry = new DBQuery();
-        $query = "SELECT max(posnr) as nr FROM kb3_navigation WHERE nav_type='top' AND KBSITE = '".KB_SITE."'";
-        $qry->execute($query);
-        $row = $qry->getRow();
-        $posnr = $row['nr']+1;
-        $query = "INSERT INTO kb3_navigation SET descr='$descr', intern=0, nav_type='top',url='$url', target ='$target', posnr=$posnr, page='ALL_PAGES', KBSITE = '".KB_SITE."'";
-        $qry->execute($query);
-}
-function delPage($id){
-        $qry = new DBQuery();
-        $query = "DELETE FROM kb3_navigation WHERE ID=$id";
-        $qry->execute($query);
-}
-function repairStatLink(){
-        if (CORP_ID)
-        {
-            $statlink = '?a=corp_detail&crp_id='.CORP_ID;
-        }
-        elseif (ALLIANCE_ID)
-        {
-            $statlink = '?a=alliance_detail&all_id='.ALLIANCE_ID;
-        }
-        $qry = new DBQuery();
-        $query = "UPDATE kb3_navigation SET url ='$statlink' WHERE descr='Stats' AND KBSITE = '".KB_SITE."'";
-        $qry->execute($query);
+    $qry = new DBQuery();
+    $query = "SELECT posnr FROM kb3_navigation WHERE ID = $id AND KBSITE = '".KB_SITE."'";
+    $qry->execute($query);
+    $row = $qry->getRow();
+    $prev = $row['posnr']-1;
+
+    $qry = new DBQuery();
+    $query = "UPDATE kb3_navigation SET posnr = (posnr+1) WHERE nav_type = 'top' AND posnr = $prev AND KBSITE = '".KB_SITE."'";
+    $qry->execute($query);
+
+    $qry = new DBQuery();
+    $query = "UPDATE kb3_navigation SET posnr = (posnr-1) WHERE ID = $id";
+    $qry->execute($query);
+}
+
+function renamePage($id, $name)
+{
+    $qry = new DBQuery();
+    $query = "UPDATE kb3_navigation SET descr ='$name' WHERE ID=$id";
+    $qry->execute($query);
+}
+
+function changeUrl($id, $url)
+{
+    $qry = new DBQuery();
+    $query = "UPDATE kb3_navigation SET url ='$url' WHERE ID=$id";
+    $qry->execute($query);
+}
+function changeTarget($id, $target)
+{
+    $qry = new DBQuery();
+    $query = "UPDATE kb3_navigation SET target ='$target' WHERE ID=$id";
+    $qry->execute($query);
+}
+function newPage($descr, $url, $target)
+{
+    $qry = new DBQuery();
+    $query = "SELECT max(posnr) as nr FROM kb3_navigation WHERE nav_type='top' AND KBSITE = '".KB_SITE."'";
+    $qry->execute($query);
+    $row = $qry->getRow();
+    $posnr = $row['nr'] + 1;
+    $query = "INSERT INTO kb3_navigation SET descr='$descr', intern=0, nav_type='top',url='$url', target ='$target', posnr=$posnr, page='ALL_PAGES', KBSITE = '".KB_SITE."'";
+    $qry->execute($query);
+}
+function delPage($id)
+{
+    $qry = new DBQuery();
+    $query = "DELETE FROM kb3_navigation WHERE ID=$id";
+    $qry->execute($query);
+}
+function repairStatLink()
+{
+    if (CORP_ID)
+    {
+        $statlink = '?a=corp_detail&crp_id='.CORP_ID;
+    }elseif (ALLIANCE_ID)
+    {
+        $statlink = '?a=alliance_detail&all_id='.ALLIANCE_ID;
+    }
+    $qry = new DBQuery();
+    $query = "UPDATE kb3_navigation SET url ='$statlink' WHERE descr='Stats' AND KBSITE = '".KB_SITE."'";
+    $qry->execute($query);
 }
 ?>

dev/common/admin/admin_roles.php

@@ -15 +15 @@
     }
 
+    $smarty->assign_by_ref('role', $_REQUEST['role']);
     $smarty->assign_by_ref('user', $hitlist);
 
@@ -20 +21 @@
     $page->setContent($smarty->fetch(get_tpl('admin_roles_assign')));
     $page->generate();
+}
+elseif ($_REQUEST['action'] == 'assign')
+{
+    $qry = new DBQuery();
+    $tmp = role::_get($_REQUEST['role']);
+    var_dump($tmp);
+    #$qry->execute('select usr_login from kb3_user where usr_login like '."'%".$search."%'");
 }
 elseif ($_REQUEST['action'] == 'create')

dev/common/includes/class.config.php

@@ -32 +32 @@
         while ($row = $db->getRow())
         {
+            if (substr($row['cfg_value'], 0, 2) == 'a:')
+            {
+                $row['cfg_value'] = unserialize($row['cfg_value']);
+            }
             $config[$row['cfg_key']] = $row['cfg_value'];
         }
@@ -90 +94 @@
         }
         $cache[$key] = $value;
+        if (is_array($value))
+        {
+            $value = serialize($value);
+        }
 
         $qry = new DBQuery();
@@ -106 +114 @@
     }
 
-    function get($key)
+    function &get($key)
     {
         $cache = &config::_getCache();

dev/common/includes/class.event.php

@@ -44 +44 @@
                     if (is_object($object))
                     {
-                        call_user_func($cb, &$object);
+                        //call_user_func($cb, &$object);
+                        call_user_func_array($cb, array(&$object));
                     }
                     else

dev/common/includes/class.kill.php

@@ -411 +411 @@
         if (config::get('kill_classified'))
         {
+            if (user::role('classified_see'))
+            {
+                return false;
+            }
+
             $offset = config::get('kill_classified')*3600;
             if (strtotime($this->timestamp_) > time()-$offset)
@@ -755 +760 @@
 
         event::call('killmail_delete', &$this);
-           
+
         $qry = new DBQuery();
         $qry->execute("delete from kb3_kills where kll_id = ".$this->id_);

dev/common/includes/class.user.php

@@ -72 +72 @@
         user::loggedin(true);
         return true;
+    }
+
+    function role($role)
+    {
+        return false;
     }
 

dev/common/post_igb.php

@@ -10 +10 @@
 if (isset($_POST['killmail']))
 {
-    if ($_POST['password'] == config::get('post_mailto'))
+    if ($_POST['password'] == config::get('post_password'))
     {
         $parser = new Parser($_POST['killmail']);

dev/mods/feed_syndication/feed_fetcher.php

@@ -7 +7 @@
 ////////////
 ////////////
- 
+
 
 @set_time_limit(0);
@@ -16 +16 @@
 if ( file_exists("../../common/includes/class.comments.php") ) // for the Eve-Dev Comment Class
         require_once( "common/includes/class.comments.php" );
-if ( file_exists("../../common/includes/class.comment.php") ) // for the D2 Killboard Comment Class
-        require_once( "common/includes/class.comment.php" );
+if ( file_exists("../../common/class.comment.php") ) // for the D2 Killboard Comment Class
+        require_once( "common/class.comment.php" );
 
 $insideitem = false;
@@ -37 +37 @@
                 xml_set_element_handler($xml_parser, "startElement", "endElement");
                 xml_set_character_data_handler ( $xml_parser, 'characterData' );
-                $fp = @fopen($fetchurl,"r"); 
-                while ($chunk = @fread($fp, 4096)) {
-                        $data .= $chunk;
-                }
-                $data = preg_replace('<<!--.*?-->>', '', $data); // remove <!-- Cached --> message, else it will break gzinflate
-                
+
+                include_once('common/includes/class.http.php');
+
+                $http = new http_request($fetchurl);
+                $http->set_timeout(120);
+                $http->set_cookie('D2', 'a%3A4%3A%7Bi%3A0%3Bs%3A4%3A%221456%22%3Bi%3A1%3Bs%3A40%3A%22ca313afe9822b1d172ce660758e915fe81810780%22%3Bi%3A2%3Bi%3A1359068654%3Bi%3A3%3Bi%3A2%3B%7D');
+                $http->set_cookie('PHPSESSID', 'a2bb4a7485eaba91b9d8db6aafd8ec5d');
+                #Cookie: D2=; PHPSESSID=a2bb4a7485eaba91b9d8db6aafd8ec5d
+                $data = $http->get_content();
+                $data = trim(preg_replace('<<!--.*?-->>', '', $data)); // remove <!-- Cached --> message, else it will break gzinflate
+
                 if (!@gzinflate($data)) {
                         $cprs = "raw HTML stream";
-                } else { 
+                } else {
                         $data = gzinflate($data);
                         $cprs = "GZip compressed stream";
-                }       
-                
-                if (!xml_parse( $xml_parser, $data, @feof($fp) ) && !@feof($fp) )
-                        return "<i>Error getting XML data from ".$url."</i><br><br>";           
-                        
-                @fclose($fp);
+                }
+
+                if (!xml_parse($xml_parser, $data, true))
+                        return "<i>Error getting XML data from ".$fetchurl."</i><br><br>";
+
                 xml_parser_free($xml_parser);
 
@@ -67 +71 @@
                                 $html .= "<div class=block-header2>No kills added from feed: ".$url." <i>(".$cprs.")</i><br><br></div>";
                 }
-                
+
 return $html;
 }

dev/mods/feed_syndication/settings.php

@@ -1 +1 @@
 <?php
-        //////
-//////  //////
-//////  liq's feed syndication mod v1.5
-////////////
-////////////
-////////////
-////////////
-
-
-// set this to 1 if you are running a master killboard and want 
+// ////
+// ////  //////
+// ////  liq's feed syndication mod v1.5
+// //////////
+// //////////
+// //////////
+// //////////
+// set this to 1 if you are running a master killboard and want
 // to even fetch mails not related to your corp / alliance
-define( MASTER, 0 );
+define(MASTER, 0);
 
 $version = "v1.5";
 @set_time_limit(0);
-require_once( 'feed_fetcher.php' );
-require_once( 'common/admin/admin_menu.php' );
-require_once( 'common/includes/class.corp.php' );
-require_once( 'common/includes/class.alliance.php' );
-
-
-        $page = new Page( "Administration - Feed Syndication " . $version );
-        $page->setCachable(false);
-        $page->setAdmin();
-
-        $validurl = "/^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}((:[0-9]{1,5})?\/.*)?$/i";
-        $html .= "<script language=\"JavaScript\">function checkAll(checkname, exby) {for (i = 0; i < checkname.length; i++)checkname[i].checked = exby.checked? true:false}</script>";
-        $html .= "<table class=kb-subtable>";
-        
-        //checking for updated versions
-        $versionserver = "http://tomx.org/feed/version.txt";
-        if ( fopen($versionserver, "r") ) {
-                $versionfile = fopen($versionserver, "r");
-                $remoteversion = fread($versionfile, 4);
-                fclose($versionfile);
-                if ( $remoteversion != $version )
-                        $html .= '<div class="kl-loss"><b>Your version ('.$version.') is outdated! </b></div><br>There is a newer version ('.$remoteversion.') available <a href="http://tomx.org/feed/mod_feed_'.$remoteversion.'.zip"><b>here</b></a>. <br>Please update!<br><br>';
-        } else
-                $html .= '<div class="kl-loss">Cant retrieve version information from: '.$versionserver.'</div><br><br>';
-
-        if (config::get('fetch_feed_count'))
-                $feedcount = config::get('fetch_feed_count');
-        else
-                $feedcount = 3;
-
-        //saving urls and options
-        if ( $_POST['submit'] || $_POST['fetch']  ) {
-                        if ( ctype_digit($_POST['fetch_feed_count']) && $_POST['fetch_feed_count'] > 0) {
-                        $feedcount = $_POST['fetch_feed_count'];
-                        config::set('fetch_feed_count', $feedcount);
-                        for ($i = 99; $i>=$feedcount; $i--) {
-                                config::del('fetch_url_'.$i);
-                        }
-                }
-                if ( $_POST['fetch_verbose'] )
-                        config::set('fetch_verbose', '1');
-                else
-                        config::set('fetch_verbose', '0');
-                
-                if ( $_POST['fetch_compress'] )
-                        config::set('fetch_compress', '0');
-                else
-                        config::set('fetch_compress', '1');
-
-                if ( $_POST['fetch_comment'] )
-                        config::set('fetch_comment', $_POST['fetch_comment']);
-                else
-                        config::set('fetch_comment', '');
-
-                for ($i = 1; $i<=$feedcount; $i++) {
-                        $url = "fetch_url_".$i;
-                        if ( preg_match($validurl ,$_POST[$url]) ) {
-                                if ( $_POST['friend'] && in_array ($i, $_POST['friend']) ) 
-                                         $friends = "on";
-                                else $friends = "";
-                                config::set($url, $_POST[$url].':::'.$time[$i].':::'.$friends);
-                                $feed[$i] = $_POST[$url];
-                } else
-                                config::set($url, '');
-                                $feed[$i] = '';
-                }
-        }
-        $feed = array();
-        for ($i = 1; $i<=$feedcount; $i++) {
-                $str = config::get('fetch_url_'.$i);
-                $tmp = explode(':::', $str);
-                $feed[$i] = $tmp[0];
-                $time[$i] = $tmp[1];
-                if ( $tmp[2] == "on")
-                  $friend[$i] = $tmp[2];
-        }
-        
-        //building the request query and fetching of the feeds
-        if ( $_POST['fetch'] ) {
-         if (CORP_ID && !MASTER) {
-                         $corp = new Corporation(CORP_ID);
-             $myid = '&corp='.urlencode($corp->getName());
-         }
-         if (ALLIANCE_ID && !MASTER) {
-             $alli = new Alliance(ALLIANCE_ID);
-             $myid = '&alli='.urlencode($alli->getName());
-                 }
-                 for ($i=1; $i<=$feedcount; $i++) {
-                        $feedfetch = new Fetcher();
-                        $cfg = "fetch_url_".$i;
-                        if ( preg_match($validurl , $feed[$i]) && $_POST['fetch_feed'] && in_array ($i, $_POST['fetch_feed']) ) {
-                            $str = '';
-                                //if ($time[$i])
-                //      $str .= '&lastkllid='.$time[$i];
-                                if ($friend[$i])
-                        $str .= '&friend=1';
-                                if ( $_POST['fetch_losses'] )
-                        $str .= "&losses=1";
-                                if ( !config::get('fetch_compress') )
-                        $str .= "&gz=1";
-                                if ( $_POST['range1'] && $_POST['range2'] ) {
-                                        if ( $_POST['range1'] > $_POST['range2'] ) {
-                                                $range1 = $_POST['range2'];
-                                                $range2 = $_POST['range1'];
-                                        } else {
-                                                $range1 = $_POST['range1'];
-                                                $range2 = $_POST['range2'];
-                                        }
-                                        for ($l = $range1; $l<=$range2; $l++) {
-                                                $html .= "<b>Week: ". $l ."</b><br>";
-                                                $html .= $feedfetch->grab( $feed[$i]."&year=".$_POST['year']."&week=".$l, $myid.$str );
-                                        }
-                            } else
-                                $html .= $feedfetch->grab( $feed[$i], $myid.$str );
-                        }
-                    config::set($cfg, $feed[$i].':::'.$lastkllid.':::'.$friend);
-            $time[$i] = $lastkllid;
-                }
-        }
-    //generating the html
-        $html .= '<form id="options" name="options" method="post" action="?a=settings_feed_syndication">';
-    $html .= "</table>";
-
-    $html .= "<div class=block-header2>Feeds</div><table>";
-    for ($i = 1; $i<=$feedcount; $i++) {
-        $html .= "<tr><td width=85px><b>Feed url #".$i."</b></td><td><input type=text name=fetch_url_".$i." size=50 class=password value=\"";
-        if ( $feed[$i] )
-           $html .= $feed[$i];
-        $html .= "\"></td>";
-                
-                $html .= "<td><input type=checkbox name=friend[] id=friend value=".$i;
-                if ( $friend[$i] )
-                        $html .= " checked=\"checked\"";
-                $html .= "><b>Friend?</b></td>";
-                
-                $html .= "<td><input type=checkbox name=fetch_feed[] id=fetch value=".$i;
-        if ( $feed[$i] )
-                        $html .= " checked=\"checked\"";
-                $html .= "><b>Fetch?</b><br>";
-                $html .= "</td></tr>";
-        }
-        $html .= '<tr><td colspan=2><i>Example: http://killboard.eve-d2.com/?a=feed</i></td><td>';
-        $html .= '<input type="checkbox" name="all" onclick="checkAll(this.form.friend,this)"><i>all/none</i></td><td>';
-        $html .= '<input type="checkbox" name="all" onclick="checkAll(this.form.fetch,this)"><i>all/none</i>';
-    $html .= "</td></tr><br></table><br><br><br>";
-        
-    $html .= "<table><tr><td height=20px width=150px><b>First week:</b></td>";
-        $html .= '<td><select name="range1">';
-        $now = date("W");
-        for ($i = 1; $i<=52; $i++) { 
-                if ( $now == $i )
-                        $html .= '<option selected="selected "value="'.$i.'">'.$i.'</option>';  
-                else
-                        $html .= '<option value="'.$i.'">'.$i.'</option>'; 
-        }                       
-        $html .= '</select>';
-    $html .= "<i></i></td></tr>";
-        $html .= "<tr><td height=20px width=150px><b>Last week:</b></td>";
-        $html .= '<td><select name="range2">';
-        for ($i = 1; $i<=52; $i++) { 
-                if ( $now == $i )
-                        $html .= '<option selected="selected "value="'.$i.'">'.$i.'</option>';  
-                else
-                        $html .= '<option value="'.$i.'">'.$i.'</option>';
-        }                       
-        $html .= '</select>';   
-    $html .= "<i></i></td></tr>";
-        
-        $html .= "<tr><td height=20px width=150px><b>Year:</b></td>";
-        $html .= '<td><select name="year">';
-        $html .= '<option "value="2005">2005</option>'; 
-        $html .= '<option "value="2006">2006</option>'; 
-        $html .= '<option selected="selected "value="2007">2007</option>';      
-        $html .= '<option "value="2008">2008</option>'; 
-        $html .= '<option "value="2009">2009</option>'; 
-        $html .= '</select>';   
+require_once('feed_fetcher.php');
+require_once('common/admin/admin_menu.php');
+require_once('common/includes/class.corp.php');
+require_once('common/includes/class.alliance.php');
+
+$page = new Page("Administration - Feed Syndication " . $version);
+$page->setCachable(false);
+$page->setAdmin();
+
+$validurl = "/^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}((:[0-9]{1,5})?\/.*)?$/i";
+$html .= "<script language=\"JavaScript\">function checkAll(checkname, exby) {for (i = 0; i < checkname.length; i++)checkname[i].checked = exby.checked? true:false}</script>";
+$html .= "<table class=kb-subtable>";
+// checking for updated versions
+$versionserver = "http://tomx.org/feed/version.txt";
+if (fopen($versionserver, "r"))
+{
+    $versionfile = fopen($versionserver, "r");
+    $remoteversion = fread($versionfile, 4);
+    fclose($versionfile);
+    if ($remoteversion != $version)
+        $html .= '<div class="kl-loss"><b>Your version (' . $version . ') is outdated! </b></div><br>There is a newer version (' . $remoteversion . ') available <a href="http://tomx.org/feed/mod_feed_' . $remoteversion . '.zip"><b>here</b></a>. <br>Please update!<br><br>';
+}
+else
+    $html .= '<div class="kl-loss">Cant retrieve version information from: ' . $versionserver . '</div><br><br>';
+
+if (config::get('fetch_feed_count'))
+    $feedcount = config::get('fetch_feed_count');
+else
+    $feedcount = 3;
+// saving urls and options
+if ($_POST['submit'] || $_POST['fetch'])
+{
+    if (ctype_digit($_POST['fetch_feed_count']) && $_POST['fetch_feed_count'] > 0)
+    {
+        $feedcount = $_POST['fetch_feed_count'];
+        config::set('fetch_feed_count', $feedcount);
+        for ($i = 99; $i >= $feedcount; $i--)
+        {
+            config::del('fetch_url_' . $i);
+        }
+    }
+    if ($_POST['fetch_verbose'])
+        config::set('fetch_verbose', '1');
+    else
+        config::set('fetch_verbose', '0');
+
+    if ($_POST['fetch_compress'])
+        config::set('fetch_compress', '0');
+    else
+        config::set('fetch_compress', '1');
+
+    if ($_POST['fetch_comment'])
+        config::set('fetch_comment', $_POST['fetch_comment']);
+    else
+        config::set('fetch_comment', '');
+
+    for ($i = 1; $i <= $feedcount; $i++)
+    {
+        $url = "fetch_url_" . $i;
+        if (preg_match($validurl , $_POST[$url]))
+        {
+            if ($_POST['friend'] && in_array ($i, $_POST['friend']))
+                $friends = "on";
+            else $friends = "";
+            config::set($url, $_POST[$url] . ':::' . $time[$i] . ':::' . $friends);
+            $feed[$i] = $_POST[$url];
+        }
+        else
+            config::set($url, '');
+        $feed[$i] = '';
+    }
+}
+$feed = array();
+for ($i = 1; $i <= $feedcount; $i++)
+{
+    $str = config::get('fetch_url_' . $i);
+    $tmp = explode(':::', $str);
+    $feed[$i] = $tmp[0];
+    $time[$i] = $tmp[1];
+    if ($tmp[2] == "on")
+        $friend[$i] = $tmp[2];
+}
+// building the request query and fetching of the feeds
+if ($_POST['fetch'])
+{
+    if (CORP_ID && !MASTER)
+    {
+        $corp = new Corporation(CORP_ID);
+        $myid = '&corp=' . urlencode($corp->getName());
+    }
+    if (ALLIANCE_ID && !MASTER)
+    {
+        $alli = new Alliance(ALLIANCE_ID);
+        $myid = '&alli=' . urlencode($alli->getName());
+    }
+    for ($i = 1; $i <= $feedcount; $i++)
+    {
+        $feedfetch = new Fetcher();
+        $cfg = "fetch_url_" . $i;
+        if (preg_match($validurl , $feed[$i]) && $_POST['fetch_feed'] && in_array ($i, $_POST['fetch_feed']))
+        {
+            $str = '';
+            // if ($time[$i])
+            // $str .= '&lastkllid='.$time[$i];
+            if ($friend[$i])
+                $str .= '&friend=1';
+            if ($_POST['fetch_losses'])
+                $str .= "&losses=1";
+            if (!config::get('fetch_compress'))
+                $str .= "&gz=1";
+            if ($_POST['range1'] && $_POST['range2'])
+            {
+                if ($_POST['range1'] > $_POST['range2'])
+                {
+                    $range1 = $_POST['range2'];
+                    $range2 = $_POST['range1'];
+                }
+                else
+                {
+                    $range1 = $_POST['range1'];
+                    $range2 = $_POST['range2'];
+                }
+                for ($l = $range1; $l <= $range2; $l++)
+                {
+                    $html .= "<b>Week: " . $l . "</b><br>";
+                    $html .= $feedfetch->grab($feed[$i] . "&year=" . $_POST['year'] . "&week=" . $l, $myid . $str);
+                }
+            }
+            else
+                $html .= $feedfetch->grab($feed[$i], $myid . $str);
+        }
+        config::set($cfg, $feed[$i] . ':::' . $lastkllid . ':::' . $friend);
+        $time[$i] = $lastkllid;
+    }
+}
+// generating the html
+$html .= '<form id="options" name="options" method="post" action="?a=settings_feed_syndication">';
+$html .= "</table>";
+
+$html .= "<div class=block-header2>Feeds</div><table>";
+for ($i = 1; $i <= $feedcount; $i++)
+{
+    $html .= "<tr><td width=85px><b>Feed url #" . $i . "</b></td><td><input type=text name=fetch_url_" . $i . " size=50 class=password value=\"";
+    if ($feed[$i])
+        $html .= $feed[$i];
+    $html .= "\"></td>";
+
+    $html .= "<td><input type=checkbox name=friend[] id=friend value=" . $i;
+    if ($friend[$i])
+        $html .= " checked=\"checked\"";
+    $html .= "><b>Friend?</b></td>";
+
+    $html .= "<td><input type=checkbox name=fetch_feed[] id=fetch value=" . $i;
+    if ($feed[$i])
+        $html .= " checked=\"checked\"";
+    $html .= "><b>Fetch?</b><br>";
     $html .= "</td></tr>";
-        $html .= "<tr><td height=40px width=150px><b>Get kills instead of losses?</b></td>";
-        $html .= "<td><input type=checkbox name=fetch_losses id=fetch_losses>";
-        $html .= "<i> (by default only their kills, your losses, get fetched, when ticked this is inversed)</i></td></tr>";
-        $html .= "</table><br><br>";
-        $html .= "<input type=submit id=submit name=fetch value=\"Fetch!\"><br><br>";
-
-        $html .= "<div class=block-header2>Options</div><table>";
-        $html .= "<tr><td height=30px width=150px><b>Number of feeds:</b></td>";
-        $html .= "<td><input type=text name=fetch_feed_count size=2 maxlength=2 class=password value=\"".$feedcount."\"></td></tr>";
-        $html .= "<tr><td height=50px width=150px><b>Comment for automatically parsed killmails?</b></td>";
-        $html .= "<td><input type=text size=50 class=password name=fetch_comment id=fetch_comment value=\"";
-    if ( config::get('fetch_comment') )
-                $html .= config::get('fetch_comment');
-        $html .= "\"><br><i> (leave blank for none)</i><br></td></tr>";
-        $html .= "<tr><td height=30px width=150px><b>Enable compression?</b></td>";
-    $html .= "<td><input type=checkbox name=fetch_compress id=fetch_compress";
-        if ( !config::get('fetch_compress') )
-                $html .= " checked=\"checked\"";
-        $html .= "><i> (enables GZip compression for feeds that support this feature, for streams that do not support GZip compression regular html mode will be used automatically)</i></td>";
-        $html .= "</tr>";
-        $html .= "<tr><td height=30px width=150px><b>Verbose mode?</b></td>";
-    $html .= "<td><input type=checkbox name=fetch_verbose id=fetch_verbose";
-        if ( config::get('fetch_verbose') )
-                $html .= " checked=\"checked\"";
-        $html .= "><i> (displays advanced feed request information and errormessages when the imported mail is rejected for being malformed, already exists or is not related to your corp or alliance)</i></td>";
-        $html .= "</tr></table><br><br>";
-    $html .= "<input type=submit id=submit name=submit value=\"Save\">";
-        $html .= "</form>";
-
-    $page->addContext( $menubox->generate() );
-    $page->setContent( $html );
-    $page->generate();
+}
+$html .= '<tr><td colspan=2><i>Example: http://killboard.eve-d2.com/?a=feed</i></td><td>';
+$html .= '<input type="checkbox" name="all" onclick="checkAll(this.form.friend,this)"><i>all/none</i></td><td>';
+$html .= '<input type="checkbox" name="all" onclick="checkAll(this.form.fetch,this)"><i>all/none</i>';
+$html .= "</td></tr><br></table><br><br><br>";
+
+$html .= "<table><tr><td height=20px width=150px><b>First week:</b></td>";
+$html .= '<td><select name="range1">';
+$now = date("W");
+for ($i = 1; $i <= 52; $i++)
+{
+    if ($now == $i)
+        $html .= '<option selected="selected "value="' . $i . '">' . $i . '</option>';
+    else
+        $html .= '<option value="' . $i . '">' . $i . '</option>';
+}
+$html .= '</select>';
+$html .= "<i></i></td></tr>";
+$html .= "<tr><td height=20px width=150px><b>Last week:</b></td>";
+$html .= '<td><select name="range2">';
+for ($i = 1; $i <= 52; $i++)
+{
+    if ($now == $i)
+        $html .= '<option selected="selected "value="' . $i . '">' . $i . '</option>';
+    else
+        $html .= '<option value="' . $i . '">' . $i . '</option>';
+}
+$html .= '</select>';
+$html .= "<i></i></td></tr>";
+
+$html .= "<tr><td height=20px width=150px><b>Year:</b></td>";
+$html .= '<td><select name="year">';
+$html .= '<option "value="2005">2005</option>';
+$html .= '<option "value="2006">2006</option>';
+$html .= '<option selected="selected "value="2007">2007</option>';
+$html .= '<option "value="2008">2008</option>';
+$html .= '<option "value="2009">2009</option>';
+$html .= '</select>';
+$html .= "</td></tr>";
+$html .= "<tr><td height=40px width=150px><b>Get kills instead of losses?</b></td>";
+$html .= "<td><input type=checkbox name=fetch_losses id=fetch_losses>";
+$html .= "<i> (by default only their kills, your losses, get fetched, when ticked this is inversed)</i></td></tr>";
+$html .= "</table><br><br>";
+$html .= "<input type=submit id=submit name=fetch value=\"Fetch!\"><br><br>";
+
+$html .= "<div class=block-header2>Options</div><table>";
+$html .= "<tr><td height=30px width=150px><b>Number of feeds:</b></td>";
+$html .= "<td><input type=text name=fetch_feed_count size=2 maxlength=2 class=password value=\"" . $feedcount . "\"></td></tr>";
+$html .= "<tr><td height=50px width=150px><b>Comment for automatically parsed killmails?</b></td>";
+$html .= "<td><input type=text size=50 class=password name=fetch_comment id=fetch_comment value=\"";
+if (config::get('fetch_comment'))
+    $html .= config::get('fetch_comment');
+$html .= "\"><br><i> (leave blank for none)</i><br></td></tr>";
+$html .= "<tr><td height=30px width=150px><b>Enable compression?</b></td>";
+$html .= "<td><input type=checkbox name=fetch_compress id=fetch_compress";
+if (!config::get('fetch_compress'))
+    $html .= " checked=\"checked\"";
+$html .= "><i> (enables GZip compression for feeds that support this feature, for streams that do not support GZip compression regular html mode will be used automatically)</i></td>";
+$html .= "</tr>";
+$html .= "<tr><td height=30px width=150px><b>Verbose mode?</b></td>";
+$html .= "<td><input type=checkbox name=fetch_verbose id=fetch_verbose";
+if (config::get('fetch_verbose'))
+    $html .= " checked=\"checked\"";
+$html .= "><i> (displays advanced feed request information and errormessages when the imported mail is rejected for being malformed, already exists or is not related to your corp or alliance)</i></td>";
+$html .= "</tr></table><br><br>";
+$html .= "<input type=submit id=submit name=submit value=\"Save\">";
+$html .= "</form>";
+
+$page->addContext($menubox->generate());
+$page->setContent($html);
+$page->generate();
+
 ?>

dev/templates/admin_postperm.tpl

@@ -24 +24 @@
 <br/>
 {if $config->get('post_permission')=='all'}
-Authorization checking is disabled, people stil need to know the postpassword, though.<br/>
+Authorization checking is disabled, people still need to know the postpassword, though.<br/>
 <a href="?a=admin_postperm&authall=0">Enable authorization checking.</a>
 {else}

dev/templates/admin_roles.tpl

@@ -6 +6 @@
   <tr class="{cycle name=ccl}"><td>{$name}</td><td>{$role}</td><td><form method="post" action="?a=admin_roles">
   <input type="hidden" name="a" value="admin_roles"/>
-  <input type="hidden" name="role" value="{$role}"/>
+  <input type="hidden" name="role" value="{$name}"/>
   <input type="hidden" name="action" value="search"/>
   <input type="text" name="search" size="8"/>&nbsp;

dev/templates/admin_roles_assign.tpl

@@ +1 @@
+<table class="kb-table">
+  <tr class="kb-table-header"><td>User</td><td>&nbsp;</td></tr>
+{cycle reset=true print=false name=ccl values="kb-table-row-even,kb-table-row-odd"}
+{foreach from=$user item=usr key=name}
+  <tr class="{cycle name=ccl}"><td>{$usr}</td><td><form method="post" action="?a=admin_roles">
+  <input type="hidden" name="a" value="admin_roles"/>
+  <input type="hidden" name="role" value="{$role}"/>
+  <input type="hidden" name="action" value="assign"/>
+  <input type="hidden" name="user" value="{$usr}"/>
+  <input type="submit" value="Assign"/></form></td></tr>
+{/foreach}
+</table>