more quote identeiifers fixessss

[Pman.Core] / AssetTrait.php

diff --git a/AssetTrait.php b/AssetTrait.php
index eda0399..5199ef2 100644 (file)
--- a/AssetTrait.php
+++ b/AssetTrait.php
@@ -32,7 +32,9 @@ trait Pman_Core_AssetTrait {
                     $ar = array_merge($ar ,  glob($dir . '/'. $f));
                     continue;
                 }
-                
+                if (!preg_match('/\.js$/', $f)) {
+                    $f .= ".js";
+                }
                 $ar[] = $dir .'/'. $f;
             }
           
@@ -54,7 +56,7 @@ trait Pman_Core_AssetTrait {
         $mtime = 0;
         foreach($ar as $fn) {
             $f = basename($fn);
-            if (!preg_match('/\.js$/', $f)) { // only javascript files... (so XXX.Dialog.YYY*  works..)
+            if (!preg_match('/\.js$/', $f) || $fn == '.js' || !file_exists($dir . '/' . $f)) { // only javascript files... (so XXX.Dialog.YYY*  works..)
                 continue;
             }
             // got the 'module file..'
@@ -66,9 +68,8 @@ trait Pman_Core_AssetTrait {
         
         ksort($arfiles); // just sort by name so it's consistant for serialize..
         
-        require_once 'Pman/Asset.php';
-        
-        $compiledir = Pman_Asset::getCompileDir(js, '', true);
+        require_once 'Pman/Core/Asset.php';
+        $compiledir = Pman_Core_Asset::getCompileDir('js', '', true);
         
          
         
@@ -211,13 +212,11 @@ trait Pman_Core_AssetTrait {
         
          
         //print_r($relfiles);
+      
+        require_once 'Pman/Core/Asset.php';
+        $compiledir = Pman_Core_Asset::getCompileDir('css', '', true);
         
-        $ui = posix_getpwuid(posix_geteuid());
-       
-        
-        $compiledir = session_save_path() . '/' .
-                $ui['name'] . '-' . $ff->project . '-'. $ff->version . '-csscompile';
-        
+         
         if (!file_exists($compiledir)) {
             mkdir($compiledir,0700,true);
         }