xoops-svn

[xoops-svn] SF.net SVN: xoops-svn:[10311] XoopsCore/branches/2.6.x/2.6.0/htdocs/class/ xoopsload.php

[<du...@us...>]

Revision: 10311
          http://sourceforge.net/p/xoops/svn/10311
Author:   dugris
Date:     2012-12-02 23:45:50 +0000 (Sun, 02 Dec 2012)
Log Message:
-----------
Add two form type :
<input type='mail' .....>
<input type='url' .....>

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php	2012-12-02 23:36:20 UTC (rev 10310)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php	2012-12-02 23:45:50 UTC (rev 10311)
@@ -298,6 +298,8 @@
             'xoopsformtext' => XOOPS_ROOT_PATH . '/class/xoopsform/formtext.php',
             'xoopsformtextarea' => XOOPS_ROOT_PATH . '/class/xoopsform/formtextarea.php',
             'xoopsformtextdateselect' => XOOPS_ROOT_PATH . '/class/xoopsform/formtextdateselect.php',
+            'xoopsformmail' => XOOPS_ROOT_PATH . '/class/xoopsform/formmail.php',
+            'xoopsformurl' => XOOPS_ROOT_PATH . '/class/xoopsform/formurl.php',
             'xoopsgroupformcheckbox' => XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php',
             'xoopsgrouppermform' => XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php',
             'xoopsguestuser' => XOOPS_ROOT_PATH . '/kernel/user.php',

[xoops-svn] SF.net SVN: xoops-svn:[10317] XoopsCore/branches/2.6.x/2.6.0/htdocs/class/ xoopsload.php

[<du...@us...>]

Revision: 10317
          http://sourceforge.net/p/xoops/svn/10317
Author:   dugris
Date:     2012-12-03 23:33:54 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
replace XOOPS_TRUST_PATH with XOOPS_PATH

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php	2012-12-03 21:55:44 UTC (rev 10316)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php	2012-12-03 23:33:54 UTC (rev 10317)
@@ -434,7 +434,7 @@
         }
 
         $file = str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
-        if (!self::loadFile(XOOPS_TRUST_PATH . DIRECTORY_SEPARATOR . $file)) {
+        if (!self::loadFile(XOOPS_PATH . DIRECTORY_SEPARATOR . $file)) {
             return false;
         }
 

[xoops-svn] SF.net SVN: xoops-svn:[10319] XoopsCore/branches/2.6.x/2.6.0/htdocs/class/ xoopsload.php

[<tr...@us...>]

Revision: 10319
          http://sourceforge.net/p/xoops/svn/10319
Author:   trabis
Date:     2012-12-05 19:14:00 +0000 (Wed, 05 Dec 2012)
Log Message:
-----------
Allowing modules/preloads/etc to add their own classes using maps

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php	2012-12-04 20:08:57 UTC (rev 10318)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php	2012-12-05 19:14:00 UTC (rev 10319)
@@ -25,6 +25,33 @@
 class XoopsLoad
 {
     /**
+     * holds classes name and classes paths
+     *
+     * @var array
+     */
+    static protected $map = array();
+
+    /**
+     * Allow modules/preloads/etc to add their own maps
+     * Use XoopsLoad::addMap(array('classname', 'path/to/class');
+     *
+     * @param array $map
+     *
+     * @return array
+     */
+    static function addMap(array $map) {
+        XoopsLoad::$map = array_merge(XoopsLoad::$map, $map);
+        return XoopsLoad::$map;
+    }
+
+    /**
+     * @return array
+     */
+    static function getMap() {
+        return XoopsLoad::$map;
+    }
+
+    /**
      * @static
      *
      * @param string $name
@@ -88,14 +115,10 @@
      */
     static private function loadCore($name)
     {
-        static $configs;
-
-        if (!isset($configs)) {
-            $configs = XoopsLoad::loadCoreConfig();
-        }
-        if (isset($configs[$name])) {
+        $map = XoopsLoad::addMap(XoopsLoad::loadCoreConfig());
+        if (isset($map[$name])) {
             //attempt loading from map
-            require $configs[$name];
+            require $map[$name];
             if (class_exists($name) && method_exists($name, '__autoload')) {
                 call_user_func(array($name, '__autoload'));
             }
@@ -118,7 +141,7 @@
      *
      * @static
      * @param string $name
-     * @return false|string
+     * @return bool|string
      */
     static private function loadFramework($name)
     {

[xoops-svn] SF.net SVN: xoops-svn:[10685] XoopsCore/branches/2.6.x/2.6.0/htdocs/class/ xoopsload.php

[<tr...@us...>]

Revision: 10685
          http://sourceforge.net/p/xoops/svn/10685
Author:   trabis
Date:     2013-01-06 18:33:49 +0000 (Sun, 06 Jan 2013)
Log Message:
-----------
Fixing bug in XoopsLoad

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php	2013-01-06 17:48:42 UTC (rev 10684)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php	2013-01-06 18:33:49 UTC (rev 10685)
@@ -71,8 +71,9 @@
                 'calendar' => 'xoopscalendar', 'userutility' => 'xoopsuserutility',
             );
         }
+
         $lname = strtolower($name);
-        if (array_key_exists($lname, $deprecated)) {
+        if (in_array($type, array('core','class')) && array_key_exists($lname, $deprecated)) {
             trigger_error("xoops_load('{$lname}') is deprecated, use xoops_load('{$deprecated[$lname]}')", E_USER_WARNING);
             $lname = $deprecated[$lname];
         }
@@ -82,7 +83,7 @@
             return $loaded[$type][$lname];
         }
 
-        if (class_exists($lname)) {
+        if (class_exists($lname, false)) {
             $loaded[$type][$lname] = true;
             return true;
         }
@@ -480,7 +481,6 @@
      */
     public static function fileExists($file)
     {
-        //return file_exists($file);
         static $included = array();
         if (!isset($included[$file])) {
             $included[$file] = file_exists($file);