Changeset 191

Timestamp:

03/19/07 23:38:33 (15 years ago)

Author:

exi

Message:

Fixed a bug which prevented some options from beeing saved properly.
Added code to the http request class to support cookies.
Added a small summary option for the killsummarytables.
System location will now get classified in the battleparser too.

Location:

dev

Files:

• common/admin/admin_roles.php (modified) (1 diff)
• common/admin/option_generic.php (modified) (7 diffs)
• common/includes/class.http.php (modified) (4 diffs)
• common/includes/class.killsummarytable.php (modified) (1 diff)
• common/includes/class.options.php (modified) (1 diff)
• common/kill_related.php (modified) (3 diffs)
• style/blue/style.css (modified) (1 diff)
• style/default/style.css (modified) (1 diff)
• style/revelations/style.css (modified) (1 diff)
• templates/admin_roles.tpl (modified) (1 diff)

dev/common/admin/admin_roles.php

@@ -6 +6 @@
 $page->setTitle('Administration - Role Management');
 
-$hardcoded = &role::get(true);
-$softcoded = &role::get();
+if ($_REQUEST['action'] == 'search')
+{
+    $hitlist = array();
+    $search = slashfix($_REQUEST['search']);
+    $qry = new DBQuery();
+    $qry->execute('select usr_login from kb3_user where usr_login like '."'%".$search."%'");
+    while ($row = $qry->getRow())
+    {
+        $hitlist[] = $row['usr_login'];
+    }
 
-$smarty->assign_by_ref('hroles', $hardcoded);
-$smarty->assign_by_ref('sroles', $softcoded);
+    $smarty->assign_by_ref('user', $hitlist);
 
-$page->addContext($menubox->generate());
-$page->setContent($smarty->fetch(get_tpl('admin_roles')));
-$page->generate();
+    $page->addContext($menubox->generate());
+    $page->setContent($smarty->fetch(get_tpl('admin_roles_assign')));
+    $page->generate();
+}
+elseif ($_REQUEST['action'] == 'create')
+{
+    $page->addContext($menubox->generate());
+    $page->setContent('to be done');
+    $page->generate();
+}
+else
+{
+    $hardcoded = &role::get(true);
+    $softcoded = &role::get();
+
+    $smarty->assign_by_ref('hroles', $hardcoded);
+    $smarty->assign_by_ref('sroles', $softcoded);
+
+    $page->addContext($menubox->generate());
+    $page->setContent($smarty->fetch(get_tpl('admin_roles')));
+    $page->generate();
+}
 ?>

dev/common/admin/option_generic.php

@@ -23 +23 @@
 options::fadd('Use gmdate instead of date', 'date_gmtime', 'checkbox');
 options::fadd('Classify kills for hours:', 'kill_classified', 'edit:size:4', '', '', '0 to disable, 1-24hrs');
+options::fadd('Display a summary line below a killsummarytable', 'summarytable_summary', 'checkbox');
 
 options::cat('Appearance', 'Generic', 'Posting');
@@ -38 +39 @@
     function createSelectBanner()
     {
-        global $config;
-
         $options = array();
         $dir = "img/logo/";
@@ -51 +50 @@
                     if (!is_dir($dir.$file))
                     {
-                        if ($config->getConfig('style_banner') == $file)
+                        if (config::get('style_banner') == $file)
                         {
                             $state = 1;
@@ -71 +70 @@
     function createSelectStyle()
     {
-        global $config;
-
         $dir = "style/";
         if (is_dir($dir))
@@ -86 +83 @@
                             continue;
                         }
-                        if ($config->getConfig('style_name') == $file)
+                        if (config::get('style_name') == $file)
                         {
                             $state = 1;
@@ -106 +103 @@
     function dateSelector()
     {
-        global $config;
-        $apply = $config->getConfig('filter_apply');
-        $date = $config->getConfig('filter_date');
+        $apply = config::get('filter_apply');
+        $date = config::get('filter_date');
 
         if ($date > 0)
@@ -162 +158 @@
     function postDateSelector()
     {
-        global $config;
-
-        if ($_POST['options']['filter_apply'] == "on")
+        if ($_POST['option']['filter_apply'] == 'on')
         {
-            $config->setConfig('filter_apply', '1');
-            $config->setConfig('filter_date', mktime(0, 0, 0, $_POST['options']['filter_month'], ($_POST['options']['filter_day'] > 31 ? 31 : $_POST['options']['filter_day']), $_POST['options']['filter_year']));
+            config::set('filter_apply', '1');
+            config::set('filter_date', mktime(0, 0, 0, $_POST['option']['filter_month'], ($_POST['option']['filter_day'] > 31 ? 31 : $_POST['option']['filter_day']), $_POST['option']['filter_year']));
         }
         else
         {
-                $config->setConfig('filter_apply', '0');
-                $config->setConfig('filter_date', 0);
+                config::set('filter_apply', '0');
+                config::set('filter_date', 0);
         }
 

dev/common/includes/class.http.php

@@ -21 +21 @@
         $this->postdata = array();
         $this->headers = array();
+        $this->cookiedata = array();
         $this->socket_timeout = 5;
     }
@@ -28 +29 @@
     // scripts or compressed data streams
     function setSockettimeout($int)
+    {
+        $this->socket_timeout = $int;
+    }
+
+    function set_timeout($int)
     {
         $this->socket_timeout = $int;
@@ -102 +108 @@
             $request_string .= join($lf, $this->headers).$lf;
         }
+        if (count($this->cookiedata))
+        {
+            $request_string .= 'Cookie: ';
+            foreach ($this->cookiedata as $key => $value)
+            {
+                $request_string .= $key.'='.$value.'; ';
+            }
+            $request_string .= $lf;
+        }
         if ($this->method == 'POST')
         {
@@ -178 +193 @@
     }
 
+    function set_cookie($name, $data)
+    {
+        $this->cookiedata[$name] = $data;
+    }
+
     function set_useragent($string)
     {

dev/common/includes/class.killsummarytable.php

@@ -333 +333 @@
         $html .= "</tr></table>";
 
+        if (config::get('summarytable_summary'))
+        {
+            $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>';
+        }
         if ($_GET['scl_id'] != "")
         {

dev/common/includes/class.options.php

@@ -64 +64 @@
             {
                 // for callbacks we check their callback function on postdata to deal with it
-                if ($element['callback'])
-                {
-                    if (!is_callable($element['callback']))
+                if ($element['onchange'])
+                {
+                    if (!is_callable($element['onchange']))
                     {
-                        trigger_error('Unable to callback to '.$element['callback'][0].'::'.$element['callback'][1], E_USER_ERROR);
+                        trigger_error('Unable to callback to '.$element['onchange'][0].'::'.$element['onchange'][1], E_USER_ERROR);
                         return false;
                     }
-                    call_user_func($element['callback']);
+                    call_user_func($element['onchange'], $element['name']);
                     continue;
                 }

dev/common/kill_related.php

@@ -222 +222 @@
 $pilots = array('a' => array(), 'e' => array());
 $kslist->rewind();
+$classified = false;
 while ($kill = $kslist->getKill())
 {
     handle_involved($kill, 'a');
     handle_destroyed($kill, 'e');
+    if ($kill->isClassified())
+    {
+        $classified = true;
+    }
 }
 $lslist->rewind();
@@ -232 +237 @@
     handle_involved($kill, 'e');
     handle_destroyed($kill, 'a');
+    if ($kill->isClassified())
+    {
+        $classified = true;
+    }
 }
 function cmp_func($a, $b)
@@ -360 +369 @@
 $smarty->assign('friendlycnt', count($pilots['a']));
 $smarty->assign('hostilecnt', count($pilots['e']));
-$smarty->assign('system', $system->getName());
+if ($classified)
+{
+    $smarty->assign('system', 'Classified System');
+}
+else
+{
+    $smarty->assign('system', $system->getName());
+}
 $smarty->assign('firstts', $firstts);
 $smarty->assign('lastts', $lastts);

dev/style/blue/style.css

@@ -559 +559 @@
 background-color:#39475F;
 }
+.killcount
+{
+  color: #ffffff;
+  float:right;
+  font-weight: bold;
+  font-size:9px;
+  padding-right:4px;
+}
+.losscount
+{
+  color: #dd0000;
+  float:left;
+  font-weight: bold;
+  font-size:9px;
+}

dev/style/default/style.css

@@ -559 +559 @@
 background-color:#333333;
 }
+.killcount
+{
+  color: #ffffff;
+  float:right;
+  font-weight: bold;
+  font-size:9px;
+  padding-right:4px;
+}
+.losscount
+{
+  color: #dd0000;
+  float:left;
+  font-weight: bold;
+  font-size:9px;
+}

dev/style/revelations/style.css

@@ -590 +590 @@
 .popup-table
 {
-filter: alpha(opacity=90);
--moz-opacity: 0.9; 
-background-color:#999999;
-}
+  filter: alpha(opacity=90);
+  -moz-opacity: 0.9;
+  background-color:#999999;
+}
+.killcount
+{
+  color: #ffffff;
+  float:right;
+  font-weight: bold;
+  font-size:9px;
+  padding-right:4px;
+}
+.losscount
+{
+  color: #dd0000;
+  float:left;
+  font-weight: bold;
+  font-size:9px;
+}

dev/templates/admin_roles.tpl

@@ -4 +4 @@
 {cycle reset=true print=false name=ccl values="kb-table-row-even,kb-table-row-odd"}
 {foreach from=$hroles item=role key=name}
-  <tr class="{cycle name=ccl}"><td>{$name}</td><td>{$role}</td><td>option stuff</td></tr>
+  <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="action" value="search"/>
+  <input type="text" name="search" size="8"/>&nbsp;
+  <input type="submit" value="Assign to"/></form></td></tr>
 {/foreach}
 </table>
+<br/><br/>
+<div class="block-header2">Softcoded roles</div>
+<table class="kb-table">
+  <tr class="kb-table-header"><td>Role</td><td>Description</td><td>&nbsp;</td></tr>
+{cycle reset=true print=false name=ccl values="kb-table-row-even,kb-table-row-odd"}
+{foreach from=$sroles item=role key=name}
+  <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="text" name="search" size="8"/>&nbsp;
+  <input type="submit" value="Assign to"/></form></td></tr>
+{/foreach}
+  <tr class="{cycle name=ccl}"><td colspan="3" align="center"><form method="post" action="?a=admin_roles">
+  <input type="hidden" name="a" value="admin_roles"/>
+  <input type="hidden" name="action" value="create"/><input type="submit" value="Create Role"></form></td></tr>
+</table>