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

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

Revision: 10216
          http://sourceforge.net/p/xoops/svn/10216
Author:   dugris
Date:     2012-10-15 17:32:44 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
add $modversion['paypal'] in xoops_version.php for moduleadmin->renderAbout()

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/admin_about.html

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php	2012-10-15 09:27:16 UTC (rev 10215)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php	2012-10-15 17:32:44 UTC (rev 10216)
@@ -376,7 +376,7 @@
      * @param string $paypal
      * @param bool $logo_xoops
      */
-    public function renderAbout($paypal = '', $logo_xoops = true)
+    public function renderAbout($logo_xoops = true)
     {
         $xoops = Xoops::getInstance();
 
@@ -413,7 +413,9 @@
 
         $this->_obj->setInfo('release_date', $release_date);
         $this->_obj->setInfo('author_list', $author_list);
-        $this->_obj->setInfo('paypal', $paypal);
+        if (is_array($this->_obj->getInfo('paypal'))) {
+            $this->_obj->setInfo('paypal', $this->_obj->getInfo('paypal'));
+        }
         $this->_obj->setInfo('changelog', $changelog);
         $xoops->tpl->assign('module', $this->_obj);
 

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/admin_about.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/admin_about.html	2012-10-15 09:27:16 UTC (rev 10215)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/admin_about.html	2012-10-15 17:32:44 UTC (rev 10216)
@@ -16,11 +16,17 @@
                         <div class="spacer marg5"><a href="http://<{$module->getInfo('website')}>" target="_blank"><{$module->getInfo('website')}></a></div>
                         <{/if}>
                         <{if $module->getInfo('paypal')}>
-                        <form id="paypal-form" action="https://www.paypal.com/cgi-bin/webscr" method="post">
-                            <input type="hidden" name="cmd" value="_s-xclick">
-                            <input type="hidden" name="hosted_button_id" value="<{$module->getInfo('paypal')}>">
-                            <img src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" onclick="$('#paypal-form').submit()" alt="PayPal - The safer, easier way to pay online!" />
-                        </form>
+                            <form id="paypal-form" name="_xclick" action="https://www.paypal.com/fr/cgi-bin/webscr" method="post">
+                                <input type="hidden" name="cmd" value="_xclick">
+                                <{foreachq from=$module->getInfo('paypal') item=value key=key}>
+                                        <{if is_numeric($value)}>
+                                    <input type="hidden" name="<{$key}>" value=<{$value}>>
+                                        <{else}>
+                                    <input type="hidden" name="<{$key}>" value="<{$value}>">
+                                    <{/if}>
+                                <{/foreach}>
+                                <img src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" onclick="$('#paypal-form').submit()" alt="PayPal - The safer, easier way to pay online!" />
+                            </form>
                         <{/if}>
                         <{includeq file="admin:system|admin_infobox.html" class="width100"}>
                     </td>