Added ability for apps to define javascript -- static method scripts -- not core...

[z_archive/KronOS.git] / application / libraries / Core.php

diff --git a/application/libraries/Core.php b/application/libraries/Core.php
index 1c872d34327a719b8b47b0a3ac7cbb0b2fece310..23b9ecf0d359fb258c2a4aa2a7722572d987ac36 100644 (file)
--- a/application/libraries/Core.php
+++ b/application/libraries/Core.php
@@ -21,11 +21,11 @@ class Core {
                );
 
                $ulev = $this->CI->user->level();
-               if ($ulev == 'operator') $chklevel = "a.access = 'user' OR a.access = 'operator'";
-               elseif ($ulev == 'manager') $chklevel = "1"; // full access -> always true
+               if ($ulev == 'manager') $chklevel = "1"; // full access -> always true
+               elseif ($ulev == 'operator') $chklevel = "a.access = 'user' OR a.access = 'operator'";
                else $chklevel = "a.access = 'user'"; // fallback
 
-               $sql = 'SELECT a.parent AS catid, c.catname AS category, a.appname AS appname, a.aid AS appid FROM categories AS c, apps AS a WHERE c.cid = a.parent AND ('.$chklevel.')';
+               $sql = 'SELECT a.parent AS catid, c.catname AS category, a.appname AS appname, a.aid AS appid FROM categories AS c, apps AS a WHERE a.active = 1 AND c.cid = a.parent AND ('.$chklevel.')';
                $q = $this->CI->db->query($sql);
                foreach ($q->result() as $row) {
                        if ($row->category == 'System') {