X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Pman.php;h=84fb10631523a21aff706bac594e05c817e00168;hb=refs%2Fheads%2Fwip_edward_T5642_Report_designer_hebe;hp=95612b86249fd41678670aa3bf4310dbd146bc34;hpb=229bf07749d58cea9bd07b516e1807b717e8989a;p=Pman.Base

diff --git a/Pman.php b/Pman.php
index 95612b8..84fb106 100644
--- 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
@@ -393,35 +394,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..
@@ -752,9 +724,14 @@ class Pman extends HTML_FlexyFramework_Page
         
         $mods = $this->modulesList();
         
-        $val = $this->callModules('applyCSSIncludes', $this, array());
-        print_r($val);
+        $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) {