[xoops-svn] SF.net SVN: xoops:[8043] XoopsCore/branches/2.6.x/2.6.0/htdocs

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

Revision: 8043
          http://xoops.svn.sourceforge.net/xoops/?rev=8043&view=rev
Author:   trabis
Date:     2011-11-03 23:59:47 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
refactoring xoops->loadModuleForm()

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/avatars/main.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php	2011-11-03 23:34:45 UTC (rev 8042)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php	2011-11-03 23:59:47 UTC (rev 8043)
@@ -787,16 +787,23 @@
     }
 
     /**
+     * @param XoopsObject $obj
      * @param string $name
      * @param string $module_dir
-     * @param XoopsObject $obj
      * @return XoopsForm|bool
      */
-    public function getModuleForm($name, $module_dir, XoopsObject $obj)
+    public function getModuleForm(XoopsObject $obj, $name, $module_dir = null)
     {
-        if (empty($name) || empty($module_dir)) {
+        if (empty($name)) {
             return false;
         }
+        if (empty($module_dir)) {
+            if ($this->isModule()) {
+                $module_dir = $this->module->getVar('dirname', 'n');
+            } else {
+                return false;
+            }
+        }
         if (file_exists($hnd_file = XOOPS_ROOT_PATH . "/modules/{$module_dir}/class/form/{$name}.php")) {
             include_once $hnd_file;
             $class = ucfirst(strtolower($module_dir)) . ucfirst($name) . 'Form';

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/avatars/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/avatars/main.php	2011-11-03 23:34:45 UTC (rev 8042)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/avatars/main.php	2011-11-03 23:59:47 UTC (rev 8043)
@@ -74,7 +74,7 @@
         $xoopsTpl->assign('count_custom', $cavatar_count);
         // Create form
         $avatar = $avatar_handler->create();
-        $form = $xoops->getModuleForm('avatar', 'system', $avatar);
+        $form = $xoops->getModuleForm($avatar, 'avatar');
         // Assign form
         $xoopsTpl->assign('form', $form->render());
         // Call Footer
@@ -161,7 +161,7 @@
         if ($avatar_id > 0) {
             $avatar = $avatar_handler->get($avatar_id);
             // Create form
-            $form = $xoops->getModuleForm('avatar', 'system', $avatar);
+            $form = $xoops->getModuleForm($avatar, 'avatar');
             // Assign form
             $xoopsTpl->assign('form', $form->render());
         } else {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.