AJAX installation is 'basicly finished' :) Plus I threw in a small christmas present...

[mailer.git] / inc / wrapper-functions.php

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 4324ae39c9ebfd4c9805e5c99424d868b8e44a5d..fe5834dcd714c9193771088455116752f3d19e7a 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -326,7 +326,7 @@ function isInstalling () {
        // Determine whether we are installing
        if (!isset($GLOBALS['__mailer_installing'])) {
                // Check URL (css.php/js.php need this)
-               $GLOBALS['__mailer_installing'] = isGetRequestElementSet('installing');
+               $GLOBALS['__mailer_installing'] = (isGetRequestElementSet('installing') || ((isGetRequestElementSet('level')) && (getRequestElement('level') == 'install')));
        } // END - if
 
        // Return result
@@ -3354,5 +3354,23 @@ function encodeJson ($data) {
        return json_encode($data, JSON_FORCE_OBJECT);
 }
 
+// Get all extension files
+function loadAllExtensionsByTemplate () {
+       // Get all
+       $extensions = getArrayFromDirectory(
+               'templates/' . getLanguage() . '/html/ext/',
+               'ext_',
+               false,
+               false,
+               array(),
+               '.tpl',
+               '@(\.|\.\.)$@',
+               false
+       );
+
+       // Return them
+       return $extensions;
+}
+
 // [EOF]
 ?>