should this return the value?

[Pman.Base] / Pman.php

diff --git a/Pman.php b/Pman.php
index ae1bef0..d387018 100644 (file)
--- a/Pman.php
+++ b/Pman.php
@@ -158,7 +158,7 @@ class Pman extends HTML_FlexyFramework_Page
                 call_user_func_array(array($c,$fn),$args);
             }
         }
-        return $args;
+         
      }
     
     function get($base, $opts=array()) 
@@ -173,12 +173,13 @@ class Pman extends HTML_FlexyFramework_Page
       
         
         // should really be moved to Login...
-        
+        /*
         if ($bits[0] == 'PasswordReset') {
             $this->linkFail = $this->resetPassword(@$bits[1],@$bits[2],@$bits[3]);
             header('Content-type: text/html; charset=utf-8');
             return;
-        } 
+        }
+        */
          
         $au = $this->getAuthUser();
         if ($au) {
@@ -195,7 +196,7 @@ class Pman extends HTML_FlexyFramework_Page
         }
         
         
-        if (strlen($base)) {
+        if (strlen($base) && $bits[0] != 'PasswordReset') {
             $this->jerror("BADURL","invalid url: $base");
         }
         // deliver template
@@ -350,11 +351,23 @@ class Pman extends HTML_FlexyFramework_Page
     
      
     
-    
+    function jsencode($v, $header = false)
+    {
+        if ($header) {
+            header("Content-type: text/javascript");
+        }
+        if (function_exists("json_encode")) {
+            return json_encode($v);
+        }
+        require_once 'Services/JSON.php';
+        $js = new Services_JSON();
+        return $js->encodeUnsafe($v);
+        
+        
+        
+    }
 
-    
-    
-    
+     
         
     /**
      * ---------------- Global Tools ---------------   
@@ -378,13 +391,32 @@ class Pman extends HTML_FlexyFramework_Page
      * generate a tempory file with an extension (dont forget to delete it)
      */
     
-    function tempName($ext)
+    function tempName($ext, $deleteOnExit=false)
     {
+        if ($deleteOnExit && self::$deleteOnExit === false) {
+            register_shutdown_function(array('Pman','deleteOnExit'));
+            self::$deleteOnExit  = array();
+        }
         $x = tempnam(ini_get('session.save_path'), HTML_FlexyFramework::get()->appNameShort.'TMP');
         unlink($x);
-        return $x .'.'. $ext;
+        $ret = $x .'.'. $ext;
+        if ($deleteOnExit) {
+            self::$deleteOnExit[] = $ret;
+        }
+        return $ret;
+    
     }
    
+    static $deleteOnExit = false;
+    static function deleteOnExit()
+    {
+        
+        foreach(self::$deleteOnExit as $fn) {
+            if (file_exists($fn)) {
+                unlink($fn);
+            }
+        }
+    }
     
     /**
      * ------------- Authentication password reset ------ ??? MOVEME?
@@ -393,35 +425,6 @@ class Pman extends HTML_FlexyFramework_Page
      */
     
     
-    function resetPassword($id,$t, $key)
-    {
-        
-        $au = $this->getAuthUser();
-        if ($au) {
-            return "Already Logged in - no need to use Password Reset";
-        }
-        
-        $u = DB_DataObject::factory('core_person');
-        //$u->company_id = $this->company->id;
-        $u->active = 1;
-        if (!$u->get($id) || !strlen($u->passwd)) {
-            return "invalid id";
-        }
-        
-        // validate key.. 
-        if ($key != $u->genPassKey($t)) {
-            return "invalid key";
-        }
-        $uu = clone($u);
-        $u->no_reset_sent = 0;
-        $u->update($uu);
-        
-        if ($t < strtotime("NOW - 1 DAY")) {
-            return "expired";
-        }
-        $this->showNewPass = implode("/", array($id,$t,$key));
-        return false;
-    }
     
     /**
      * jerrAuth: standard auth failure - with data that let's the UI know..
@@ -496,12 +499,7 @@ class Pman extends HTML_FlexyFramework_Page
             exit;
         } 
         
-        
-        
-        require_once 'Services/JSON.php';
-        $json = new Services_JSON();
-        
-        // log all errors!!!
+     // log all errors!!!
         
         $retHTML = isset($_SERVER['CONTENT_TYPE']) && 
                 preg_match('#multipart/form-data#i', $_SERVER['CONTENT_TYPE']);
@@ -518,14 +516,14 @@ class Pman extends HTML_FlexyFramework_Page
         if ($retHTML) {
             header('Content-type: text/html');
             echo "<HTML><HEAD></HEAD><BODY>";
-            echo  $json->encodeUnsafe(array(
+            echo  $this->jsencode(array(
                     'success'=> false, 
                     'errorMsg' => $str,
                     'message' => $str, // compate with exeption / loadexception.
 
                     'errors' => $errors ? $errors : true, // used by forms to flag errors.
                     'authFailure' => !empty($errors['authFailure']),
-                ));
+                ), false);
             echo "</BODY></HTML>";
             exit;
         }
@@ -543,14 +541,14 @@ class Pman extends HTML_FlexyFramework_Page
                 
         }
         
-        echo $json->encode(array(
+        echo $this->jsencode(array(
             'success'=> false, 
             'data'=> array(), 
             'errorMsg' => $str,
             'message' => $str, // compate with exeption / loadexception.
             'errors' => $errors ? $errors : true, // used by forms to flag errors.
             'authFailure' => !empty($errors['authFailure']),
-        ));
+        ),true);
         
         
         exit;
@@ -567,8 +565,6 @@ class Pman extends HTML_FlexyFramework_Page
             echo "OK: " .$str . "\n";
             exit;
         }
-        require_once 'Services/JSON.php';
-        $json = new Services_JSON();
         
         $retHTML = isset($_SERVER['CONTENT_TYPE']) && 
                 preg_match('#multipart/form-data#i', $_SERVER['CONTENT_TYPE']);
@@ -586,13 +582,13 @@ class Pman extends HTML_FlexyFramework_Page
             echo "<HTML><HEAD></HEAD><BODY>";
             // encode html characters so they can be read..
             echo  str_replace(array('<','>'), array('\u003c','\u003e'),
-                        $json->encodeUnsafe(array('success'=> true, 'data' => $str)));
+                        $this->jsencode(array('success'=> true, 'data' => $str), false));
             echo "</BODY></HTML>";
             exit;
         }
         
         
-        echo  $json->encode(array('success'=> true, 'data' => $str));
+        echo  $this->jsencode(array('success'=> true, 'data' => $str),true);
         
         exit;
         
@@ -611,8 +607,7 @@ class Pman extends HTML_FlexyFramework_Page
             $total = count($ar);
         }
         $extra=  $extra ? $extra : array();
-        require_once 'Services/JSON.php';
-        $json = new Services_JSON();
+        
         
         $retHTML = isset($_SERVER['CONTENT_TYPE']) && 
                 preg_match('#multipart/form-data#i', $_SERVER['CONTENT_TYPE']);
@@ -631,7 +626,7 @@ class Pman extends HTML_FlexyFramework_Page
             echo "<HTML><HEAD></HEAD><BODY>";
             // encode html characters so they can be read..
             echo  str_replace(array('<','>'), array('\u003c','\u003e'),
-                        $json->encodeUnsafe(array('success' =>  true, 'total'=> $total, 'data' => $ar) + $extra));
+                        $this->jsencode(array('success' =>  true, 'total'=> $total, 'data' => $ar) + $extra, false));
             echo "</BODY></HTML>";
             exit;
         }
@@ -656,7 +651,7 @@ class Pman extends HTML_FlexyFramework_Page
         }
         
       
-        $ret =  $json->encode(array('success' =>  true, 'total'=> $total, 'data' => $ar) + $extra);  
+        $ret =  $this->jsencode(array('success' =>  true, 'total'=> $total, 'data' => $ar) + $extra,true);  
         
         if (!empty($cachekey)) {
             
@@ -753,8 +748,13 @@ class Pman extends HTML_FlexyFramework_Page
         $mods = $this->modulesList();
         
         $this->callModules('applyCSSIncludes', $this);
+        foreach($this->css_includes as $module => $ar) {
+            if ($ar) {
+                $this->assetArrayToHtml( $ar , 'css');
+            }
+        }
         
-        
+        // old style... - probably remove this...
         $this->callModules('outputCSSIncludes', $this);
         
         foreach($mods as $mod) {