* [MOD] UI tweaks

nuxsmin · Apr 21, 2017 · d9dad0c · d9dad0c
1 parent c59eab8
commit d9dad0c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/config.php b/config.php
@@ -48,7 +48,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="icon" type="image/png" href="imgs/logo_small.png">
     <link rel="stylesheet" type="text/css" href="css/reset.min.css">
-    <link rel="stylesheet" type="text/css" href="css/pure-min.css">
+    <link rel="stylesheet" type="text/css" href="css/pure.min.css">
     <link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
     <link rel="stylesheet" type="text/css" href="css/alertify.min.css">
     <link rel="stylesheet" type="text/css" href="css/styles.min.css?v=<?php echo Session::getCssHash(); ?>">

diff --git a/css/pure-min.css → css/pure.min.css b/css/pure-min.css → css/pure.min.css
diff --git a/inc/Exts/Zabbix/V225/ZabbixApiAbstract.class.php b/inc/Exts/Zabbix/V225/ZabbixApiAbstract.class.php
@@ -469,7 +469,7 @@ final public function userLogin($params=array(), $arrayKeyProperty='', $tokenCac
 
         // build filename for cached auth token
         if($tokenCacheDir && array_key_exists('user', $params) && is_dir($tokenCacheDir))
-            $tokenCacheFile = $tokenCacheDir.'/.zabbixapi-token-'.md5($params['user'].'|'.posix_getuid());
+            $tokenCacheFile = $tokenCacheDir.'/.zabbixapi-token-'.md5($params['user'].'|'.getmyuid());
 
         // try to read cached auth token
         if(isset($tokenCacheFile) && is_file($tokenCacheFile))

diff --git a/inc/Exts/Zabbix/V245/ZabbixApiAbstract.class.php b/inc/Exts/Zabbix/V245/ZabbixApiAbstract.class.php
@@ -24,6 +24,7 @@
 
 namespace Exts\Zabbix\V245;
 use Exception;
+use SMD\Core\Config;
 
 /**
  * @brief   Abstract class for the Zabbix API.
@@ -468,7 +469,7 @@ final public function userLogin($params=array(), $arrayKeyProperty='', $tokenCac
 
         // build filename for cached auth token
         if($tokenCacheDir && array_key_exists('user', $params) && is_dir($tokenCacheDir))
-            $tokenCacheFile = $tokenCacheDir.'/.zabbixapi-token-'.md5($params['user'].'|'.posix_getuid());
+            $tokenCacheFile = $tokenCacheDir.'/.zabbixapi-token-'.md5($params['user'].'|'.getmyuid());
 
         // try to read cached auth token
         if(isset($tokenCacheFile) && is_file($tokenCacheFile))
@@ -485,6 +486,8 @@ final public function userLogin($params=array(), $arrayKeyProperty='', $tokenCac
                 $this->authToken = '';
                 unlink($tokenCacheFile);
             }
+        } else {
+            error_log('NO_CACHE');
         }
 
         // no cached token found so far, so login (again)

diff --git a/index.php b/index.php
@@ -53,7 +53,7 @@
     <link rel="icon" type="image/png" href="imgs/logo_small.png">
     <script type="text/javascript" src="js/jquery.min.js"></script>
     <link rel="stylesheet" type="text/css" href="css/reset.min.css">
-    <link rel="stylesheet" type="text/css" href="css/pure-min.css">
+    <link rel="stylesheet" type="text/css" href="css/pure.min.css">
     <link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
     <link rel="stylesheet" type="text/css" href="css/styles.min.css?v=<?php echo Session::getCssHash(); ?>">
 </head>