Changeset 366

Timestamp:

12/18/08 00:28:21 (13 years ago)

Author:

exi

Message:

Fixed apiuser to not enable xajax on all pages
Added a html tweak for opera on killsummarytables
Reworked ajcron::getNextRun(), it didnt work on values greater than 60 minutes
Now no xajax code is inserted when board is in IGB mode

Location:

dev

Files:

• common/includes/class.killsummarytable.php (modified) (1 diff)
• mods/ajcron/auto_settings.php (modified) (1 diff)
• mods/ajcron/init.php (modified) (1 diff)
• mods/apiuser/auto_settings.php (modified) (1 diff)
• mods/apiuser/init.php (modified) (1 diff)
• mods/xajax/init.php (modified) (2 diffs)

dev/common/includes/class.killsummarytable.php

@@ -245 +245 @@
         else
         {
-            $header = "<tr class=kb-table-header><td class=kb-table-cell width=\"$width_abs\">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>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>";
         }
 

dev/mods/ajcron/auto_settings.php

@@ -10 +10 @@
 options::fadd('Blocking Cronjobs', 'ajcron_blocking', 'checkbox');
 options::fadd('Next scheduled run', 'none', 'custom', array('ajcron', 'getNextRunDisplay'), array('ajcron', 'resetNextRunCheckbox'));
-options::fadd('Jobs', 'ajcron_jobs', 'textarea:cols:60:rows:10');
+options::fadd('Jobs', 'ajcron_jobs', 'textarea:cols:70:rows:10');
 options::fadd('Runtable', 'anone', 'custom', array('ajcron', 'getRuntable'));

dev/mods/ajcron/init.php

@@ -78 +78 @@
         {
             $int = substr($intervall, 1);
-            if ($int == 60)
-            {
-                $mintoh = 59-date('i', $time);
-                $stoh = 60-date('s', $time);
-                $nextrun = $time+$mintoh*60+$stoh;
-            }
-            else
-            {
-                $mintot = 59 % $int - date('i', $time);
-                $stot = 60 - date('s', $time);
-                while ($mintot < 0)
-                {
-                    $mintot += $int;
-                }
-                $nextrun = $time + $mintot * 60 + $stot;
-            }
+
+            // seconds till interval has passed (counts from 0 to int)
+            $seconds_passed = $time % ($int*60);
+
+            // reverse, how many seconds are left til 0
+            $seconds_to_go = ($int*60) - $seconds_passed;
+
+            // just add to current time and we have the next intervall
+            $nextrun = $time + $seconds_to_go;
         }
         return $nextrun;

dev/mods/apiuser/auto_settings.php

@@ -1 +1 @@
 <?php
+// this little trick will only request xajax for admin pages
+event::register('mod_xajax_initialised', array('mod_xajax', 'xajax'));
 
 options::oldMenu('APIUser', 'User Management', '?a=user_management');

dev/mods/apiuser/init.php

@@ -29 +29 @@
                 $xajax->register(XAJAX_FUNCTION, array('showGroup', 'apiuser', 'showGroup'));
                 $xajax->register(XAJAX_FUNCTION, array('editGroup', 'apiuser', 'editGroup'));
-
-                mod_xajax::xajax();
             }
         }

dev/mods/xajax/init.php

@@ -3 +3 @@
 // templates/index.tpl
 // you should not change anything in this file but the image generator / whatever bypass change the functions.php
-
 // bypass some of the image generators..
 if ($page != "thumb" && $page != "mapview" && $page != "sig")
 {
-        require_once('mods/xajax/xajax_core/xajax.inc.php');
+    require_once('mods/xajax/xajax_core/xajax.inc.php');
     $xajax = new xajax();
-        require_once('mods/xajax/functions.php');
+    require_once('mods/xajax/functions.php');
     event::register('page_assembleheader', 'mod_xajax::insertHTML');
 
@@ -26 +25 @@
 
     // on page assembly look wether xajax is needed or not
-        function insertHTML($obj)
+    function insertHTML($obj)
     {
-            global $mod_xajax_enable;
-            if (!isset($mod_xajax_enable))
-            {
-                return;
-            }
+        global $mod_xajax_enable;
+        if (!isset($mod_xajax_enable))
+        {
+            return;
+        }
+        if (IS_IGB)
+        {
+            return;
+        }
 
-            global $xajax;
+        global $xajax;
         $obj->addBody($xajax->getJavascript("mods/xajax/"));
     }