X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Pman.php;h=c8a4ecbdcd098f7b67eefd9bd7a20e27291faec4;hb=4d71c63c216ff9dbe8ead4b6a076dbdc74c275ff;hp=6e81de1ebf14ed8930c437816b358dd8a5968e65;hpb=3dd30867fd82944568234cdb4f55aec44ddc19e6;p=Pman.Base diff --git a/Pman.php b/Pman.php index 6e81de1..c8a4ecb 100644 --- a/Pman.php +++ b/Pman.php @@ -53,7 +53,7 @@ class Pman extends HTML_FlexyFramework_Page var $appModules = ''; var $appDisabled = array(); // array of disabled modules.. // (based on config option disable) - + var $authUser; // always contains the authenticated user.. var $disable_jstemplate = false; /// disable inclusion of jstemplate code.. @@ -128,6 +128,8 @@ class Pman extends HTML_FlexyFramework_Page (($_SERVER['SERVER_ADDR'] == '127.0.0.1') && ($_SERVER['REMOTE_ADDR'] == '127.0.0.1')) || (($_SERVER['SERVER_ADDR'] == '::1') && ($_SERVER['REMOTE_ADDR'] == '::1')) + || + (preg_match('/^192\.168/', $_SERVER['SERVER_ADDR']) && $_SERVER['SERVER_ADDR'] == $_SERVER['HTTP_HOST']) ) ) || @@ -603,7 +605,7 @@ class Pman extends HTML_FlexyFramework_Page if ($retHTML) { header('Content-type: text/html'); - echo ""; + echo "<"; // encode html characters so they can be read.. echo str_replace(array('<','>'), array('\u003c','\u003e'), $this->jsencode(array('success'=> true, 'data' => $str), false)); @@ -647,11 +649,11 @@ class Pman extends HTML_FlexyFramework_Page if ($retHTML) { header('Content-type: text/html'); - echo ""; + echo "'), array('\u003c','\u003e'), $this->jsencode(array('success' => true, 'total'=> $total, 'data' => $ar) + $extra, false)); - echo ""; + echo "]]>"; exit; } @@ -722,8 +724,9 @@ class Pman extends HTML_FlexyFramework_Page */ function outputJavascriptIncludes() { - // BC support - currently 1 project still relies on this.. (MO portal) - $o = HTML_FlexyFramework::get()->Pman_Core; + // BC support - currently 1 project still relies on this.. (MO portal) + $ff = HTML_FlexyFramework::get(); + $o = isset($ff->Pman_Core) ? $ff->Pman_Core : array(); if (isset($o['packseed'])) { return $this->outputJavascriptIncludesBC(); } @@ -755,7 +758,7 @@ class Pman extends HTML_FlexyFramework_Page } $this->callModules('outputJavascriptIncludes', $this); - + return ''; } var $css_includes = array(); /** @@ -791,10 +794,12 @@ class Pman extends HTML_FlexyFramework_Page continue; } $this->outputCSSDir("Pman/$mod","*.css"); + $this->outputSCSS($mod); + } - + return ''; // needs to return something as we output it.. } @@ -805,14 +810,7 @@ class Pman extends HTML_FlexyFramework_Page - - - - - - - - + // --- OLD CODE - in for BC on MO project.... - needs removing... @@ -841,7 +839,7 @@ class Pman extends HTML_FlexyFramework_Page // and finally the JsTemplate... echo ''."\n"; } - + return ''; } /** * Gather infor for javascript files..