New function isDirectory() introduced, fixed GET_DIR_AS_ARRAY() (replaces scandir())

[mailer.git] / inc / libs / rallye_functions.php

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index dd39788ec975d685b5d7d8e5a5fadf67fef001b6..9eaa587fd4be24cd7505cdd03c88144a29211a9a 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -11,9 +11,9 @@
  * Kurzbeschreibung  : Spezielle Funktion fuer rallye-Erweiterung       *
  * -------------------------------------------------------------------- *
  * $Revision:: 856                                                    $ *
  * Kurzbeschreibung  : Spezielle Funktion fuer rallye-Erweiterung       *
  * -------------------------------------------------------------------- *
  * $Revision:: 856                                                    $ *

- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. March 2009)             $ *
+ * $Date::                                                            $ *

  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *

- * $Author:: stelzi                                                   $ *
+ * $Author::                                                          $ *

  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *


@@ -682,11 +682,9 @@ function RALLYE_TEMPLATE_SELECTION($name="template", $default="")
        $OUT = ""; $ral = array();
        $BASE = sprintf("%stemplates/%s/html/rallye/", constant('PATH'), GET_LANGUAGE());
        $dir = opendir($BASE);
        $OUT = ""; $ral = array();
        $BASE = sprintf("%stemplates/%s/html/rallye/", constant('PATH'), GET_LANGUAGE());
        $dir = opendir($BASE);

-       while ($read = readdir($dir))
-       {
+       while ($read = readdir($dir)) {

                // If it is no dir (so a file)
                // If it is no dir (so a file)

-               if (!is_dir($BASE.$read))
-               {
+               if (!isDirectory($BASE.$read)) {

                        // Accept only templates matching with rallye_????.tpl.xx
                        if (eregi("^rallye_.*\.tpl", $read))
                        {
                        // Accept only templates matching with rallye_????.tpl.xx
                        if (eregi("^rallye_.*\.tpl", $read))
                        {