xoops-svn Mailing List for XOOPS Web Application System

Revision: 12234
          http://sourceforge.net/p/xoops/svn/12234
Author:   luciorota
Date:     2013-11-26 23:01:25 +0000 (Tue, 26 Nov 2013)
Log Message:
-----------
fixed bug in submit form when anonymous users try to submit

Modified Paths:
--------------
    XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php	2013-11-26 17:15:27 UTC (rev 12233)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php	2013-11-26 23:01:25 UTC (rev 12234)
@@ -447,7 +447,7 @@
         include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
         include_once XOOPS_ROOT_PATH . '/class/tree.php';
 
-        $groups = $xoopsUser->getGroups();
+        $groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
 
         $use_mirrors = $this->wfdownloads->getConfig('enable_mirrors');
 

Revision: 12233
          http://sourceforge.net/p/xoops/svn/12233
Author:   goffy
Date:     2013-11-26 17:15:27 +0000 (Tue, 26 Nov 2013)
Log Message:
-----------
added new error code if no emailaccount available (cesag/goffy)

Modified Paths:
--------------
    XoopsModules/xnewsletter/trunk/xNewsletter/include/task.inc.php
    XoopsModules/xnewsletter/trunk/xNewsletter/language/english/main.php

Modified: XoopsModules/xnewsletter/trunk/xNewsletter/include/task.inc.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/include/task.inc.php	2013-11-26 14:08:09 UTC (rev 12232)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/include/task.inc.php	2013-11-26 17:15:27 UTC (rev 12233)
@@ -178,7 +178,9 @@
     }
 
     //read data of account
-    $obj_account 			    = $accountsHandler->get($obj_letter->getVar("letter_account"));
+    $letter_account = $obj_letter->getVar("letter_account");
+    if ( $letter_account == "" && $letter_account == 0) return _MA_XNEWSLETTER_ACCOUNTS_NONEAVAIL;
+    $obj_account 			    = $accountsHandler->get($letter_account);
     $account_type 			  = $obj_account->getVar("accounts_type");
     $account_yourname 		= $obj_account->getVar("accounts_yourname");
     $account_yourmail 		= $obj_account->getVar("accounts_yourmail");

Modified: XoopsModules/xnewsletter/trunk/xNewsletter/language/english/main.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/language/english/main.php	2013-11-26 14:08:09 UTC (rev 12232)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/language/english/main.php	2013-11-26 17:15:27 UTC (rev 12233)
@@ -86,4 +86,6 @@
 define('_MA_XNEWSLETTER_SUBSCRIPTION_UNFINISHED', "<span style='color:red'>Attention: the registration has not been confirm till now. Please click on the activating link in the e-mail we sent you. If you did not get this e-mail, please click <a href='%link'>here</a> to get this mail once more.</span>");
 define('_MA_XNEWSLETTER_PLEASE_LOGIN', "The email address %s belongs to a registered user. <br /> please login to change the data.");
 define('_MA_XNEWSLETTER_LETTER_NONEAVAIL', "No newsletters available for the moment");
+//1.2.2
+define('_MA_XNEWSLETTER_ACCOUNTS_NONEAVAIL', "No email-accounts available for the moment");
 ?>
\ No newline at end of file

Revision: 12232
          http://sourceforge.net/p/xoops/svn/12232
Author:   goffy
Date:     2013-11-26 14:08:09 +0000 (Tue, 26 Nov 2013)
Log Message:
-----------
fixed bugs in display (cesag/goffy)

Modified Paths:
--------------
    XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_letter.php
    XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_subscr.php

Modified: XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_letter.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_letter.php	2013-11-21 22:19:06 UTC (rev 12231)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_letter.php	2013-11-26 14:08:09 UTC (rev 12232)
@@ -169,6 +169,7 @@
 		$crit_accounts->setSort("accounts_id");
 		$crit_accounts->setOrder("ASC");
     $numrows_accounts = $accountsHandler->getCount($crit_accounts);
+    $account_default = 0;
 		if ($this->isNew()) {
 			$accounts_arr = $accountsHandler->getall($crit_accounts);
 			foreach ($accounts_arr as $account) {

Modified: XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_subscr.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_subscr.php	2013-11-21 22:19:06 UTC (rev 12231)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_subscr.php	2013-11-26 14:08:09 UTC (rev 12232)
@@ -99,13 +99,13 @@
     $form->addElement(new XoopsFormLabel("<span style='text-decoration:underline'>"._MA_XNEWSLETTER_SUBSCRIPTION_INFO_PERS."</span>",""));
     $subscr_id = $this->isNew() ? 0 : $this->getVar("subscr_id");
     if ($subscr_id > 0 || $this->getVar("subscr_email") != "") {
-			$form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_SUBSCR_EMAIL.":&nbsp;&nbsp;&nbsp;", $this->getVar("subscr_email")));
+			$form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_SUBSCR_EMAIL, $this->getVar("subscr_email")));
 			$form->addElement(new XoopsFormHidden("subscr_email", $this->getVar("subscr_email"))); 
 		} else {
-			$form->addElement(new XoopsFormText(_AM_XNEWSLETTER_SUBSCR_EMAIL.":&nbsp;&nbsp;&nbsp;", "subscr_email", 50, 255, $this->getVar("subscr_email")), true);
+			$form->addElement(new XoopsFormText(_AM_XNEWSLETTER_SUBSCR_EMAIL, "subscr_email", 50, 255, $this->getVar("subscr_email")), true);
 		}
     if ($xoopsModuleConfig["xn_use_salutation"] == 1) {   
-      $select_subscr_sex = new XoopsFormSelect(_AM_XNEWSLETTER_SUBSCR_SEX.":&nbsp;&nbsp;&nbsp;", "subscr_sex", $this->getVar("subscr_sex"));
+      $select_subscr_sex = new XoopsFormSelect(_AM_XNEWSLETTER_SUBSCR_SEX, "subscr_sex", $this->getVar("subscr_sex"));
       $select_subscr_sex->addOption(_AM_XNEWSLETTER_SUBSCR_SEX_EMPTY,_AM_XNEWSLETTER_SUBSCR_SEX_EMPTY);
       $select_subscr_sex->addOption(_AM_XNEWSLETTER_SUBSCR_SEX_FEMALE,_AM_XNEWSLETTER_SUBSCR_SEX_FEMALE);
       $select_subscr_sex->addOption(_AM_XNEWSLETTER_SUBSCR_SEX_MALE,_AM_XNEWSLETTER_SUBSCR_SEX_MALE);
@@ -113,9 +113,9 @@
       $select_subscr_sex->addOption(_AM_XNEWSLETTER_SUBSCR_SEX_FAMILY,_AM_XNEWSLETTER_SUBSCR_SEX_FAMILY);
       $form->addElement($select_subscr_sex);
     }    
-    $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_SUBSCR_FIRSTNAME.":&nbsp;&nbsp;&nbsp;", "subscr_firstname", 50, 255, $this->getVar("subscr_firstname")), false);
+    $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_SUBSCR_FIRSTNAME, "subscr_firstname", 50, 255, $this->getVar("subscr_firstname")), false);
     
-		$form->addElement(new XoopsFormText(_AM_XNEWSLETTER_SUBSCR_LASTNAME.":&nbsp;&nbsp;&nbsp;", "subscr_lastname", 50, 255, $this->getVar("subscr_lastname")), false);
+		$form->addElement(new XoopsFormText(_AM_XNEWSLETTER_SUBSCR_LASTNAME, "subscr_lastname", 50, 255, $this->getVar("subscr_lastname")), false);
     
 		$form->addElement(new XoopsFormLabel("<br/><br/>", ""));
     

Revision: 12231
          http://sourceforge.net/p/xoops/svn/12231
Author:   luciorota
Date:     2013-11-21 22:19:06 +0000 (Thu, 21 Nov 2013)
Log Message:
-----------
update jQuery Thickbox plugin to 3.1
fixed: jQuery bug in template

Modified Paths:
--------------
    XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
    XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
    XoopsModules/wfdownloads/trunk/wfdownloads/index.php
    XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php
    XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php
    XoopsModules/wfdownloads/trunk/wfdownloads/ratefile.php
    XoopsModules/wfdownloads/trunk/wfdownloads/review.php
    XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
    XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
    XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_header.html
    XoopsModules/wfdownloads/trunk/wfdownloads/topten.php
    XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php
    XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
    XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php

Added Paths:
-----------
    XoopsModules/wfdownloads/trunk/wfdownloads/js/jquery.ThickBox/
    XoopsModules/wfdownloads/trunk/wfdownloads/js/jquery.ThickBox/loadingAnimation.gif
    XoopsModules/wfdownloads/trunk/wfdownloads/js/jquery.ThickBox/thickbox-compressed.js
    XoopsModules/wfdownloads/trunk/wfdownloads/js/jquery.ThickBox/thickbox.css
    XoopsModules/wfdownloads/trunk/wfdownloads/js/jquery.ThickBox/thickbox.js

Removed Paths:
-------------
    XoopsModules/wfdownloads/trunk/wfdownloads/js/jquery-latest.js
    XoopsModules/wfdownloads/trunk/wfdownloads/js/thickbox-compressed.js
    XoopsModules/wfdownloads/trunk/wfdownloads/thickbox.css

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php	2013-11-20 18:30:26 UTC (rev 12230)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php	2013-11-21 22:19:06 UTC (rev 12231)
@@ -128,8 +128,11 @@
             $catarray['imageheader'] = wfdownloads_headerImage();
             $xoopsTpl->assign('catarray', $catarray);
 
+            $xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
+            $xoTheme->addScript(WFDOWNLOADS_URL . '/js/jquery.ThickBox/thickbox-compressed.js');
+            $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/js/jquery.ThickBox/thickbox.css');
             $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/module.css');
-            $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/thickbox.css');
+
             $xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/');
 
             // Breadcrumb
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt	2013-11-20 18:30:26 UTC (rev 12230)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt	2013-11-21 22:19:06 UTC (rev 12231)
@@ -1,4 +1,6 @@
-<b><u>=> Version 3.23 Beta (2013-10-16)</u></b>
+<b><u>=> Version 3.23 Beta (2013-11-21)</u></b>
+- update jQuery Thickbox plugin to 3.1 (luciorota)
+- fixed: jQuery bug in template (luciorota)
 - standardization of English language files (cesag)
 - fixed: typos in english folder (cesag)
 - module standardization: header.php, admin/admin_header.php, xoops_version.php

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/index.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/index.php	2013-11-20 18:30:26 UTC (rev 12230)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/index.php	2013-11-21 22:19:06 UTC (rev 12231)
@@ -48,8 +48,11 @@
 $xoopsOption['template_main'] = 'wfdownloads_index.html';
 include XOOPS_ROOT_PATH . '/header.php';
 
+$xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js');
+$xoTheme->addScript(WFDOWNLOADS_URL . '/js/jquery.ThickBox/thickbox-compressed.js');
+$xoTheme->addStylesheet(WFDOWNLOADS_URL . '/js/jquery.ThickBox/thickbox.css');
 $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/module.css');
-$xoTheme->addStylesheet(WFDOWNLOADS_URL . '/thickbox.css');
+
 $xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/');
 
 // Breadcrumb

Deleted: XoopsModules/wfdownloads/trunk/wfdownloads/js/jquery-latest.js
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/js/jquery-latest.js	2013-11-20 18:30:26 UTC (rev 12230)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/js/jquery-latest.js	2013-11-21 22:19:06 UTC (rev 12231)
@@ -1,2530 +0,0 @@
-(function () {
-    /*
-     * jQuery 1.1.4 - New Wave Javascript
-     *
-     * Copyright (c) 2007 John Resig (jquery.com)
-     * Dual licensed under the MIT (MIT-LICENSE.txt)
-     * and GPL (GPL-LICENSE.txt) licenses.
-     *
-     * $Date: 2007/09/30 12:52:44 $
-     * $Rev: 2862 $
-     */
-// Map over jQuery in case of overwrite
-    if (typeof jQuery != "undefined")
-        var _jQuery = jQuery;
-
-    var jQuery = window.jQuery = function (a, c) {
-        // If the context is global, return a new object
-        if (window == this || !this.init)
-            return new jQuery(a, c);
-
-        return this.init(a, c);
-    };
-
-// Map over the $ in case of overwrite
-    if (typeof $ != "undefined")
-        var _$ = $;
-
-// Map the jQuery namespace to the '$' one
-    window.$ = jQuery;
-
-    var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/;
-
-    jQuery.fn = jQuery.prototype = {
-        init: function (a, c) {
-            // Make sure that a selection was provided
-            a = a || document;
-
-            // Handle HTML strings
-            if (typeof a == "string") {
-                var m = quickExpr.exec(a);
-                if (m && (m[1] || !c)) {
-                    // HANDLE: $(html) -> $(array)
-                    if (m[1])
-                        a = jQuery.clean([ m[1] ]);
-
-                    // HANDLE: $("#id")
-                    else {
-                        var tmp = document.getElementById(m[3]);
-                        if (tmp)
-                        // Handle the case where IE and Opera return items
-                        // by name instead of ID
-                            if (tmp.id != m[3])
-                                return jQuery().find(a);
-                            else {
-                                this[0] = tmp;
-                                this.length = 1;
-                                return this;
-                            }
-                        else
-                            a = [];
-                    }
-
-                    // HANDLE: $(expr)
-                } else
-                    return new jQuery(c).find(a);
-
-                // HANDLE: $(function)
-                // Shortcut for document ready
-            } else if (jQuery.isFunction(a))
-                return new jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ](a);
-
-            return this.setArray(
-                // HANDLE: $(array)
-                a.constructor == Array && a ||
-
-                    // HANDLE: $(arraylike)
-                    // Watch for when an array-like object is passed as the selector
-                    (a.jquery || a.length && a != window && !a.nodeType && a[0] != undefined && a[0].nodeType) && jQuery.makeArray(a) ||
-
-                    // HANDLE: $(*)
-                    [ a ]);
-        },
-        jquery: "1.1.4",
-
-        size: function () {
-            return this.length;
-        },
-
-        length: 0,
-
-        get: function (num) {
-            return num == undefined ?
-
-                // Return a 'clean' array
-                jQuery.makeArray(this) :
-
-                // Return just the object
-                this[num];
-        },
-        pushStack: function (a) {
-            var ret = jQuery(a);
-            ret.prevObject = this;
-            return ret;
-        },
-        setArray: function (a) {
-            this.length = 0;
-            Array.prototype.push.apply(this, a);
-            return this;
-        },
-        each: function (fn, args) {
-            return jQuery.each(this, fn, args);
-        },
-        index: function (obj) {
-            var pos = -1;
-            this.each(function (i) {
-                if (this == obj) pos = i;
-            });
-            return pos;
-        },
-
-        attr: function (key, value, type) {
-            var obj = key;
-
-            // Look for the case where we're accessing a style value
-            if (key.constructor == String)
-                if (value == undefined)
-                    return this.length && jQuery[ type || "attr" ](this[0], key) || undefined;
-                else {
-                    obj = {};
-                    obj[ key ] = value;
-                }
-
-            // Check to see if we're setting style values
-            return this.each(function (index) {
-                // Set all the styles
-                for (var prop in obj)
-                    jQuery.attr(
-                        type ? this.style : this,
-                        prop, jQuery.prop(this, obj[prop], type, index, prop)
-                    );
-            });
-        },
-
-        css: function (key, value) {
-            return this.attr(key, value, "curCSS");
-        },
-
-        text: function (e) {
-            if (typeof e != "object" && e != null)
-                return this.empty().append(document.createTextNode(e));
-
-            var t = "";
-            jQuery.each(e || this, function () {
-                jQuery.each(this.childNodes, function () {
-                    if (this.nodeType != 8)
-                        t += this.nodeType != 1 ?
-                            this.nodeValue : jQuery.fn.text([ this ]);
-                });
-            });
-            return t;
-        },
-
-        wrap: function () {
-            // The elements to wrap the target around
-            var a, args = arguments;
-
-            // Wrap each of the matched elements individually
-            return this.each(function () {
-                if (!a)
-                    a = jQuery.clean(args, this.ownerDocument);
-
-                // Clone the structure that we're using to wrap
-                var b = a[0].cloneNode(true);
-
-                // Insert it before the element to be wrapped
-                this.parentNode.insertBefore(b, this);
-
-                // Find the deepest point in the wrap structure
-                while (b.firstChild)
-                    b = b.firstChild;
-
-                // Move the matched element to within the wrap structure
-                b.appendChild(this);
-            });
-        },
-        append: function () {
-            return this.domManip(arguments, true, 1, function (a) {
-                this.appendChild(a);
-            });
-        },
-        prepend: function () {
-            return this.domManip(arguments, true, -1, function (a) {
-                this.insertBefore(a, this.firstChild);
-            });
-        },
-        before: function () {
-            return this.domManip(arguments, false, 1, function (a) {
-                this.parentNode.insertBefore(a, this);
-            });
-        },
-        after: function () {
-            return this.domManip(arguments, false, -1, function (a) {
-                this.parentNode.insertBefore(a, this.nextSibling);
-            });
-        },
-        end: function () {
-            return this.prevObject || jQuery([]);
-        },
-        find: function (t) {
-            var data = jQuery.map(this, function (a) {
-                return jQuery.find(t, a);
-            });
-            return this.pushStack(/[^+>] [^+>]/.test(t) || t.indexOf("..") > -1 ?
-                jQuery.unique(data) : data);
-        },
-        clone: function (deep) {
-            deep = deep != undefined ? deep : true;
-            var $this = this.add(this.find("*"));
-            if (jQuery.browser.msie) {
-                // Need to remove events on the element and its descendants
-                $this.each(function () {
-                    this._$events = {};
-                    for (var type in this.$events)
-                        this._$events[type] = jQuery.extend({}, this.$events[type]);
-                }).unbind();
-            }
-
-            // Do the clone
-            var r = this.pushStack(jQuery.map(this, function (a) {
-                return a.cloneNode(deep);
-            }));
-
-            if (jQuery.browser.msie) {
-                $this.each(function () {
-                    // Add the events back to the original and its descendants
-                    var events = this._$events;
-                    for (var type in events)
-                        for (var handler in events[type])
-                            jQuery.event.add(this, type, events[type][handler], events[type][handler].data);
-                    this._$events = null;
-                });
-            }
-
-            // copy form values over
-            if (deep) {
-                var inputs = r.add(r.find('*')).filter('select,input[@type=checkbox]');
-                $this.filter('select,input[@type=checkbox]').each(function (i) {
-                    if (this.selectedIndex)
-                        inputs[i].selectedIndex = this.selectedIndex;
-                    if (this.checked)
-                        inputs[i].checked = true;
-                });
-            }
-
-            // Return the cloned set
-            return r;
-        },
-
-        filter: function (t) {
-            return this.pushStack(
-                jQuery.isFunction(t) &&
-                    jQuery.grep(this, function (el, index) {
-                        return t.apply(el, [index]);
-                    }) ||
-
-                    jQuery.multiFilter(t, this));
-        },
-
-        not: function (t) {
-            return this.pushStack(
-                t.constructor == String &&
-                    jQuery.multiFilter(t, this, true) ||
-
-                    jQuery.grep(this, function (a) {
-                        return ( t.constructor == Array || t.jquery )
-                            ? jQuery.inArray(a, t) < 0
-                            : a != t;
-                    })
-            );
-        },
-
-        add: function (t) {
-            return this.pushStack(jQuery.merge(
-                this.get(),
-                t.constructor == String ?
-                    jQuery(t).get() :
-                    t.length != undefined && (!t.nodeName || t.nodeName == "FORM") ?
-                        t : [t])
-            );
-        },
-        is: function (expr) {
-            return expr ? jQuery.multiFilter(expr, this).length > 0 : false;
-        },
-
-        val: function (val) {
-            return val == undefined ?
-                ( this.length ? this[0].value : null ) :
-                this.attr("value", val);
-        },
-
-        html: function (val) {
-            return val == undefined ?
-                ( this.length ? this[0].innerHTML : null ) :
-                this.empty().append(val);
-        },
-
-        slice: function () {
-            return this.pushStack(Array.prototype.slice.apply(this, arguments));
-        },
-        domManip: function (args, table, dir, fn) {
-            var clone = this.length > 1, a;
-
-            return this.each(function () {
-                if (!a) {
-                    a = jQuery.clean(args, this.ownerDocument);
-                    if (dir < 0)
-                        a.reverse();
-                }
-
-                var obj = this;
-
-                if (table && jQuery.nodeName(this, "table") && jQuery.nodeName(a[0], "tr"))
-                    obj = this.getElementsByTagName("tbody")[0] || this.appendChild(document.createElement("tbody"));
-
-                jQuery.each(a, function () {
-                    if (jQuery.nodeName(this, "script")) {
-                        if (this.src)
-                            jQuery.ajax({ url: this.src, async: false, dataType: "script" });
-                        else
-                            jQuery.globalEval(this.text || this.textContent || this.innerHTML || "");
-                    } else
-                        fn.apply(obj, [ clone ? this.cloneNode(true) : this ]);
-                });
-            });
-        }
-    };
-
-    jQuery.extend = jQuery.fn.extend = function () {
-        // copy reference to target object
-        var target = arguments[0] || {}, a = 1, al = arguments.length, deep = false;
-
-        // Handle a deep copy situation
-        if (target.constructor == Boolean) {
-            deep = target;
-            target = arguments[1] || {};
-        }
-
-        // extend jQuery itself if only one argument is passed
-        if (al == 1) {
-            target = this;
-            a = 0;
-        }
-
-        var prop;
-
-        for (; a < al; a++)
-            // Only deal with non-null/undefined values
-            if ((prop = arguments[a]) != null)
-            // Extend the base object
-                for (var i in prop) {
-                    // Prevent never-ending loop
-                    if (target == prop[i])
-                        continue;
-
-                    // Recurse if we're merging object values
-                    if (deep && typeof prop[i] == 'object' && target[i])
-                        jQuery.extend(target[i], prop[i]);
-
-                    // Don't bring in undefined values
-                    else if (prop[i] != undefined)
-                        target[i] = prop[i];
-                }
-
-        // Return the modified object
-        return target;
-    };
-
-    jQuery.extend({
-        noConflict: function (deep) {
-            window.$ = _$;
-            if (deep)
-                window.jQuery = _jQuery;
-            return jQuery;
-        },
-
-        // This may seem like some crazy code, but trust me when I say that this
-        // is the only cross-browser way to do this. --John
-        isFunction: function (fn) {
-            return !!fn && typeof fn != "string" && !fn.nodeName &&
-                fn.constructor != Array && /function/i.test(fn + "");
-        },
-
-        // check if an element is in a XML document
-        isXMLDoc: function (elem) {
-            return elem.documentElement && !elem.body ||
-                elem.tagName && elem.ownerDocument && !elem.ownerDocument.body;
-        },
-
-        // Evalulates a script in a global context
-        // Evaluates Async. in Safari 2 :-(
-        globalEval: function (data) {
-            data = jQuery.trim(data);
-            if (data) {
-                if (window.execScript)
-                    window.execScript(data);
-                else if (jQuery.browser.safari)
-                // safari doesn't provide a synchronous global eval
-                    window.setTimeout(data, 0);
-                else
-                    eval.call(window, data);
-            }
-        },
-
-        nodeName: function (elem, name) {
-            return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
-        },
-        // args is for internal usage only
-        each: function (obj, fn, args) {
-            if (args) {
-                if (obj.length == undefined)
-                    for (var i in obj)
-                        fn.apply(obj[i], args);
-                else
-                    for (var i = 0, ol = obj.length; i < ol; i++)
-                        if (fn.apply(obj[i], args) === false) break;
-
-                // A special, fast, case for the most common use of each
-            } else {
-                if (obj.length == undefined)
-                    for (var i in obj)
-                        fn.call(obj[i], i, obj[i]);
-                else
-                    for (var i = 0, ol = obj.length, val = obj[0];
-                         i < ol && fn.call(val, i, val) !== false; val = obj[++i]) {
-                    }
-            }
-
-            return obj;
-        },
-
-        prop: function (elem, value, type, index, prop) {
-            // Handle executable functions
-            if (jQuery.isFunction(value))
-                value = value.call(elem, [index]);
-
-            // exclude the following css properties to add px
-            var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i;
-
-            // Handle passing in a number to a CSS property
-            return value && value.constructor == Number && type == "curCSS" && !exclude.test(prop) ?
-                value + "px" :
-                value;
-        },
-
-        className: {
-            // internal only, use addClass("class")
-            add: function (elem, c) {
-                jQuery.each((c || "").split(/\s+/), function (i, cur) {
-                    if (!jQuery.className.has(elem.className, cur))
-                        elem.className += ( elem.className ? " " : "" ) + cur;
-                });
-            },
-
-            // internal only, use removeClass("class")
-            remove: function (elem, c) {
-                elem.className = c != undefined ?
-                    jQuery.grep(elem.className.split(/\s+/),function (cur) {
-                        return !jQuery.className.has(c, cur);
-                    }).join(" ") : "";
-            },
-
-            // internal only, use is(".class")
-            has: function (t, c) {
-                return jQuery.inArray(c, (t.className || t).toString().split(/\s+/)) > -1;
-            }
-        },
-        swap: function (e, o, f) {
-            for (var i in o) {
-                e.style["old" + i] = e.style[i];
-                e.style[i] = o[i];
-            }
-            f.apply(e, []);
-            for (var i in o)
-                e.style[i] = e.style["old" + i];
-        },
-
-        css: function (e, p) {
-            if (p == "height" || p == "width") {
-                var old = {}, oHeight, oWidth, d = ["Top", "Bottom", "Right", "Left"];
-
-                jQuery.each(d, function () {
-                    old["padding" + this] = 0;
-                    old["border" + this + "Width"] = 0;
-                });
-
-                jQuery.swap(e, old, function () {
-                    if (jQuery(e).is(':visible')) {
-                        oHeight = e.offsetHeight;
-                        oWidth = e.offsetWidth;
-                    } else {
-                        e = jQuery(e.cloneNode(true))
-                            .find(":radio").removeAttr("checked").end()
-                            .css({
-                                visibility: "hidden", position: "absolute", display: "block", right: "0", left: "0"
-                            }).appendTo(e.parentNode)[0];
-
-                        var parPos = jQuery.css(e.parentNode, "position") || "static";
-                        if (parPos == "static")
-                            e.parentNode.style.position = "relative";
-
-                        oHeight = e.clientHeight;
-                        oWidth = e.clientWidth;
-
-                        if (parPos == "static")
-                            e.parentNode.style.position = "static";
-
-                        e.parentNode.removeChild(e);
-                    }
-                });
-
-                return p == "height" ? oHeight : oWidth;
-            }
-
-            return jQuery.curCSS(e, p);
-        },
-
-        curCSS: function (elem, prop, force) {
-            var ret, stack = [], swap = [];
-
-            // A helper method for determining if an element's values are broken
-            function color(a) {
-                if (!jQuery.browser.safari)
-                    return false;
-
-                var ret = document.defaultView.getComputedStyle(a, null);
-                return !ret || ret.getPropertyValue("color") == "";
-            }
-
-            if (prop == "opacity" && jQuery.browser.msie) {
-                ret = jQuery.attr(elem.style, "opacity");
-                return ret == "" ? "1" : ret;
-            }
-
-            if (prop.match(/float/i))
-                prop = styleFloat;
-
-            if (!force && elem.style[prop])
-                ret = elem.style[prop];
-
-            else if (document.defaultView && document.defaultView.getComputedStyle) {
-
-                if (prop.match(/float/i))
-                    prop = "float";
-
-                prop = prop.replace(/([A-Z])/g, "-$1").toLowerCase();
-                var cur = document.defaultView.getComputedStyle(elem, null);
-
-                if (cur && !color(elem))
-                    ret = cur.getPropertyValue(prop);
-
-                // If the element isn't reporting its values properly in Safari
-                // then some display: none elements are involved
-                else {
-                    // Locate all of the parent display: none elements
-                    for (var a = elem; a && color(a); a = a.parentNode)
-                        stack.unshift(a);
-
-                    // Go through and make them visible, but in reverse
-                    // (It would be better if we knew the exact display type that they had)
-                    for (a = 0; a < stack.length; a++)
-                        if (color(stack[a])) {
-                            swap[a] = stack[a].style.display;
-                            stack[a].style.display = "block";
-                        }
-
-                    // Since we flip the display style, we have to handle that
-                    // one special, otherwise get the value
-                    ret = prop == "display" && swap[stack.length - 1] != null ?
-                        "none" :
-                        document.defaultView.getComputedStyle(elem, null).getPropertyValue(prop) || "";
-
-                    // Finally, revert the display styles back
-                    for (a = 0; a < swap.length; a++)
-                        if (swap[a] != null)
-                            stack[a].style.display = swap[a];
-                }
-
-                if (prop == "opacity" && ret == "")
-                    ret = "1";
-
-            } else if (elem.currentStyle) {
-                var newProp = prop.replace(/\-(\w)/g, function (m, c) {
-                    return c.toUpperCase();
-                });
-                ret = elem.currentStyle[prop] || elem.currentStyle[newProp];
-            }
-
-            return ret;
-        },
-
-        clean: function (a, doc) {
-            var r = [];
-            doc = doc || document;
-
-            jQuery.each(a, function (i, arg) {
-                if (!arg) return;
-
-                if (arg.constructor == Number)
-                    arg = arg.toString();
-
-                // Convert html string into DOM nodes
-                if (typeof arg == "string") {
-                    // Trim whitespace, otherwise indexOf won't work as expected
-                    var s = jQuery.trim(arg).toLowerCase(), div = doc.createElement("div"), tb = [];
-
-                    var wrap =
-                        // option or optgroup
-                        !s.indexOf("<opt") &&
-                            [1, "<select>", "</select>"] ||
-
-                            !s.indexOf("<leg") &&
-                                [1, "<fieldset>", "</fieldset>"] ||
-
-                            s.match(/^<(thead|tbody|tfoot|colg|cap)/) &&
-                                [1, "<table>", "</table>"] ||
-
-                            !s.indexOf("<tr") &&
-                                [2, "<table><tbody>", "</tbody></table>"] ||
-
-                            // <thead> matched above
-                            (!s.indexOf("<td") || !s.indexOf("<th")) &&
-                                [3, "<table><tbody><tr>", "</tr></tbody></table>"] ||
-
-                            !s.indexOf("<col") &&
-                                [2, "<table><tbody></tbody><colgroup>", "</colgroup></table>"] ||
-
-                            // IE can't serialize <link> and <script> tags normally
-                            jQuery.browser.msie &&
-                                [1, "div<div>", "</div>"] ||
-
-                            [0, "", ""];
-
-                    // Go to html and back, then peel off extra wrappers
-                    div.innerHTML = wrap[1] + arg + wrap[2];
-
-                    // Move to the right depth
-                    while (wrap[0]--)
-                        div = div.lastChild;
-
-                    // Remove IE's autoinserted <tbody> from table fragments
-                    if (jQuery.browser.msie) {
-
-                        // String was a <table>, *may* have spurious <tbody>
-                        if (!s.indexOf("<table") && s.indexOf("<tbody") < 0)
-                            tb = div.firstChild && div.firstChild.childNodes;
-
-                        // String was a bare <thead> or <tfoot>
-                        else if (wrap[1] == "<table>" && s.indexOf("<tbody") < 0)
-                            tb = div.childNodes;
-
-                        for (var n = tb.length - 1; n >= 0; --n)
-                            if (jQuery.nodeName(tb[n], "tbody") && !tb[n].childNodes.length)
-                                tb[n].parentNode.removeChild(tb[n]);
-
-                        // IE completely kills leading whitespace when innerHTML is used
-                        if (/^\s/.test(arg))
-                            div.insertBefore(doc.createTextNode(arg.match(/^\s*/)[0]), div.firstChild);
-
-                    }
-
-                    arg = jQuery.makeArray(div.childNodes);
-                }
-
-                if (0 === arg.length && (!jQuery.nodeName(arg, "form") && !jQuery.nodeName(arg, "select")))
-                    return;
-
-                if (arg[0] == undefined || jQuery.nodeName(arg, "form") || arg.options)
-                    r.push(arg);
-                else
-                    r = jQuery.merge(r, arg);
-
-            });
-
-            return r;
-        },
-
-        attr: function (elem, name, value) {
-            var fix = jQuery.isXMLDoc(elem) ? {} : jQuery.props;
-
-            // Safari mis-reports the default selected property of a hidden option
-            // Accessing the parent's selectedIndex property fixes it
-            if (name == "selected" && jQuery.browser.safari)
-                elem.parentNode.selectedIndex;
-
-            // Certain attributes only work when accessed via the old DOM 0 way
-            if (fix[name]) {
-                if (value != undefined) elem[fix[name]] = value;
-                return elem[fix[name]];
-            } else if (jQuery.browser.msie && name == "style")
-                return jQuery.attr(elem.style, "cssText", value);
-
-            else if (value == undefined && jQuery.browser.msie && jQuery.nodeName(elem, "form") && (name == "action" || name == "method"))
-                return elem.getAttributeNode(name).nodeValue;
-
-            // IE elem.getAttribute passes even for style
-            else if (elem.tagName) {
-
-                if (value != undefined) elem.setAttribute(name, value);
-                if (jQuery.browser.msie && /href|src/.test(name) && !jQuery.isXMLDoc(elem))
-                    return elem.getAttribute(name, 2);
-                return elem.getAttribute(name);
-
-                // elem is actually elem.style ... set the style
-            } else {
-                // IE actually uses filters for opacity
-                if (name == "opacity" && jQuery.browser.msie) {
-                    if (value != undefined) {
-                        // IE has trouble with opacity if it does not have layout
-                        // Force it by setting the zoom level
-                        elem.zoom = 1;
-
-                        // Set the alpha filter to set the opacity
-                        elem.filter = (elem.filter || "").replace(/alpha\([^)]*\)/, "") +
-                            (parseFloat(value).toString() == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
-                    }
-
-                    return elem.filter ?
-                        (parseFloat(elem.filter.match(/opacity=([^)]*)/)[1]) / 100).toString() : "";
-                }
-                name = name.replace(/-([a-z])/ig, function (z, b) {
-                    return b.toUpperCase();
-                });
-                if (value != undefined) elem[name] = value;
-                return elem[name];
-            }
-        },
-        trim: function (t) {
-            return (t || "").replace(/^\s+|\s+$/g, "");
-        },
-
-        makeArray: function (a) {
-            var r = [];
-
-            // Need to use typeof to fight Safari childNodes crashes
-            if (typeof a != "array")
-                for (var i = 0, al = a.length; i < al; i++)
-                    r.push(a[i]);
-            else
-                r = a.slice(0);
-
-            return r;
-        },
-
-        inArray: function (b, a) {
-            for (var i = 0, al = a.length; i < al; i++)
-                if (a[i] == b)
-                    return i;
-            return -1;
-        },
-        merge: function (first, second) {
-            // We have to loop this way because IE & Opera overwrite the length
-            // expando of getElementsByTagName
-
-            // Also, we need to make sure that the correct elements are being returned
-            // (IE returns comment nodes in a '*' query)
-            if (jQuery.browser.msie) {
-                for (var i = 0; second[i]; i++)
-                    if (second[i].nodeType != 8)
-                        first.push(second[i]);
-            } else
-                for (var i = 0; second[i]; i++)
-                    first.push(second[i]);
-
-            return first;
-        },
-        unique: function (first) {
-            var r = [], num = jQuery.mergeNum++;
-
-            try {
-                for (var i = 0, fl = first.length; i < fl; i++)
-                    if (num != first[i].mergeNum) {
-                        first[i].mergeNum = num;
-                        r.push(first[i]);
-                    }
-            } catch (e) {
-                r = first;
-            }
-
-            return r;
-        },
-
-        mergeNum: 0,
-        grep: function (elems, fn, inv) {
-            // If a string is passed in for the function, make a function
-            // for it (a handy shortcut)
-            if (typeof fn == "string")
-                fn = eval("false||function(a,i){return " + fn + "}");
-
-            var result = [];
-
-            // Go through the array, only saving the items
-            // that pass the validator function
-            for (var i = 0, el = elems.length; i < el; i++)
-                if (!inv && fn(elems[i], i) || inv && !fn(elems[i], i))
-                    result.push(elems[i]);
-
-            return result;
-        },
-        map: function (elems, fn) {
-            // If a string is passed in for the function, make a function
-            // for it (a handy shortcut)
-            if (typeof fn == "string")
-                fn = eval("false||function(a){return " + fn + "}");
-
-            var result = [];
-
-            // Go through the array, translating each of the items to their
-            // new value (or values).
-            for (var i = 0, el = elems.length; i < el; i++) {
-                var val = fn(elems[i], i);
-
-                if (val !== null && val != undefined) {
-                    if (val.constructor != Array) val = [val];
-                    result = result.concat(val);
-                }
-            }
-
-            return result;
-        }
-    });
-
-    /*
-     * Whether the W3C compliant box model is being used.
-     *
-     * @property
-     * @name $.boxModel
-     * @type Boolean
-     * @cat JavaScript
-     */
-    var userAgent = navigator.userAgent.toLowerCase();
-
-// Figure out what browser is being used
-    jQuery.browser = {
-        version: (userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/) || [])[1],
-        safari: /webkit/.test(userAgent),
-        opera: /opera/.test(userAgent),
-        msie: /msie/.test(userAgent) && !/opera/.test(userAgent),
-        mozilla: /mozilla/.test(userAgent) && !/(compatible|webkit)/.test(userAgent)
-    };
-
-    var styleFloat = jQuery.browser.msie ? "styleFloat" : "cssFloat";
-
-    jQuery.extend({
-        // Check to see if the W3C box model is being used
-        boxModel: !jQuery.browser.msie || document.compatMode == "CSS1Compat",
-
-        styleFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat",
-
-        props: {
-            "for": "htmlFor",
-            "class": "className",
-            "float": styleFloat,
-            cssFloat: styleFloat,
-            styleFloat: styleFloat,
-            innerHTML: "innerHTML",
-            className: "className",
-            value: "value",
-            disabled: "disabled",
-            checked: "checked",
-            readonly: "readOnly",
-            selected: "selected",
-            maxlength: "maxLength"
-        }
-    });
-
-    jQuery.each({
-        parent: "a.parentNode",
-        parents: "jQuery.parents(a)",
-        next: "jQuery.nth(a,2,'nextSibling')",
-        prev: "jQuery.nth(a,2,'previousSibling')",
-        siblings: "jQuery.sibling(a.parentNode.firstChild,a)",
-        children: "jQuery.sibling(a.firstChild)"
-    }, function (i, n) {
-        jQuery.fn[ i ] = function (a) {
-            var ret = jQuery.map(this, n);
-            if (a && typeof a == "string")
-                ret = jQuery.multiFilter(a, ret);
-            return this.pushStack(jQuery.unique(ret));
-        };
-    });
-
-    jQuery.each({
-        appendTo: "append",
-        prependTo: "prepend",
-        insertBefore: "before",
-        insertAfter: "after"
-    }, function (i, n) {
-        jQuery.fn[ i ] = function () {
-            var a = arguments;
-            return this.each(function () {
-                for (var j = 0, al = a.length; j < al; j++)
-                    jQuery(a[j])[n](this);
-            });
-        };
-    });
-
-    jQuery.each({
-        removeAttr: function (key) {
-            jQuery.attr(this, key, "");
-            this.removeAttribute(key);
-        },
-        addClass: function (c) {
-            jQuery.className.add(this, c);
-        },
-        removeClass: function (c) {
-            jQuery.className.remove(this, c);
-        },
-        toggleClass: function (c) {
-            jQuery.className[ jQuery.className.has(this, c) ? "remove" : "add" ](this, c);
-        },
-        remove: function (a) {
-            if (!a || jQuery.filter(a, [this]).r.length)
-                this.parentNode.removeChild(this);
-        },
-        empty: function () {
-            while (this.firstChild)
-                this.removeChild(this.firstChild);
-        }
-    }, function (i, n) {
-        jQuery.fn[ i ] = function () {
-            return this.each(n, arguments);
-        };
-    });
-
-// DEPRECATED
-    jQuery.each([ "eq", "lt", "gt", "contains" ], function (i, n) {
-        jQuery.fn[ n ] = function (num, fn) {
-            return this.filter(":" + n + "(" + num + ")", fn);
-        };
-    });
-
-    jQuery.each([ "height", "width" ], function (i, n) {
-        jQuery.fn[ n ] = function (h) {
-            return h == undefined ?
-                ( this.length ? jQuery.css(this[0], n) : null ) :
-                this.css(n, h.constructor == String ? h : h + "px");
-        };
-    });
-
-    var chars = jQuery.browser.safari && parseInt(jQuery.browser.version) < 417 ?
-            "(?:[\\w*_-]|\\\\.)" :
-            "(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",
-        quickChild = new RegExp("^[/>]\\s*(" + chars + "+)"),
-        quickID = new RegExp("^(" + chars + "+)(#)(" + chars + "+)"),
-        quickClass = new RegExp("^([#.]?)(" + chars + "*)");
-
-    jQuery.extend({
-        expr: {
-            "": "m[2]=='*'||jQuery.nodeName(a,m[2])",
-            "#": "a.getAttribute('id')==m[2]",
-            ":": {
-                // Position Checks
-                lt: "i<m[3]-0",
-                gt: "i>m[3]-0",
-                nth: "m[3]-0==i",
-                eq: "m[3]-0==i",
-                first: "i==0",
-                last: "i==r.length-1",
-                even: "i%2==0",
-                odd: "i%2",
-
-                // Child Checks
-                "first-child": "a.parentNode.getElementsByTagName('*')[0]==a",
-                "last-child": "jQuery.nth(a.parentNode.lastChild,1,'previousSibling')==a",
-                "only-child": "!jQuery.nth(a.parentNode.lastChild,2,'previousSibling')",
-
-                // Parent Checks
-                parent: "a.firstChild",
-                empty: "!a.firstChild",
-
-                // Text Check
-                contains: "(a.textContent||a.innerText||'').indexOf(m[3])>=0",
-
-                // Visibility
-                visible: '"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden"',
-                hidden: '"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden"',
-
-                // Form attributes
-                enabled: "!a.disabled",
-                disabled: "a.disabled",
-                checked: "a.checked",
-                selected: "a.selected||jQuery.attr(a,'selected')",
-
-                // Form elements
-                text: "'text'==a.type",
-                radio: "'radio'==a.type",
-                checkbox: "'checkbox'==a.type",
-                file: "'file'==a.type",
-                password: "'password'==a.type",
-                submit: "'submit'==a.type",
-                image: "'image'==a.type",
-                reset: "'reset'==a.type",
-                button: '"button"==a.type||jQuery.nodeName(a,"button")',
-                input: "/input|select|textarea|button/i.test(a.nodeName)",
-
-                // :has()
-                has: "jQuery.find(m[3],a).length"
-            },
-            // DEPRECATED
-            "[": "jQuery.find(m[2],a).length"
-        },
-
-        // The regular expressions that power the parsing engine
-        parse: [
-            // Match: [@value='test'], [@foo]
-            /^\[ *(@)([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,
-
-            // DEPRECATED
-            // Match: [div], [div p]
-            /^(\[)\s*(.*?(\[.*?\])?[^[]*?)\s*\]/,
-
-            // Match: :contains('foo')
-            /^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,
-
-            // Match: :even, :last-chlid, #id, .class
-            new RegExp("^([:.#]*)(" + chars + "+)")
-        ],
-
-        multiFilter: function (expr, elems, not) {
-            var old, cur = [];
-
-            while (expr && expr != old) {
-                old = expr;
-                var f = jQuery.filter(expr, elems, not);
-                expr = f.t.replace(/^\s*,\s*/, "");
-                cur = not ? elems = f.r : jQuery.merge(cur, f.r);
-            }
-
-            return cur;
-        },
-        find: function (t, context) {
-            // Quickly handle non-string expressions
-            if (typeof t != "string")
-                return [ t ];
-
-            // Make sure that the context is a DOM Element
-            if (context && !context.nodeType)
-                context = null;
-
-            // Set the correct context (if none is provided)
-            context = context || document;
-
-            // DEPRECATED
-            // Handle the common XPath // expression
-            if (!t.indexOf("//")) {
-                //context = context.documentElement;
-                t = t.substr(2, t.length);
-
-                // DEPRECATED
-                // And the / root expression
-            } else if (!t.indexOf('/') && !context.ownerDocument) {
-                context = context.documentElement;
-                t = t.substr(1, t.length);
-                if (t.indexOf('/') >= 1)
-                    t = t.substr(t.indexOf('/'), t.length);
-            }
-
-            // Initialize the search
-            var ret = [context], done = [], last;
-
-            // Continue while a selector expression exists, and while
-            // we're no longer looping upon ourselves
-            while (t && last != t) {
-                var r = [];
-                last = t;
-
-                // DEPRECATED
-                t = jQuery.trim(t).replace(/^\/\//, "");
-
-                var foundToken = false;
-
-                // An attempt at speeding up child selectors that
-                // point to a specific element tag
-                var re = quickChild;
-                var m = re.exec(t);
-
-                if (m) {
-                    var nodeName = m[1].toUpperCase();
-
-                    // Perform our own iteration and filter
-                    for (var i = 0; ret[i]; i++)
-                        for (var c = ret[i].firstChild; c; c = c.nextSibling)
-                            if (c.nodeType == 1 && (nodeName == "*" || c.nodeName.toUpperCase() == nodeName.toUpperCase()))
-                                r.push(c);
-
-                    ret = r;
-                    t = t.replace(re, "");
-                    if (t.indexOf(" ") == 0) continue;
-                    foundToken = true;
-                } else {
-                    // (.. and /) DEPRECATED
-                    re = /^((\/?\.\.)|([>\/+~]))\s*(\w*)/i;
-
-                    if ((m = re.exec(t)) != null) {
-                        r = [];
-
-                        var nodeName = m[4], mergeNum = jQuery.mergeNum++;
-                        m = m[1];
-
-                        for (var j = 0, rl = ret.length; j < rl; j++)
-                            if (m.indexOf("..") < 0) {
-                                var n = m == "~" || m == "+" ? ret[j].nextSibling : ret[j].firstChild;
-                                for (; n; n = n.nextSibling)
-                                    if (n.nodeType == 1) {
-                                        if (m == "~" && n.mergeNum == mergeNum) break;
-
-                                        if (!nodeName || n.nodeName.toUpperCase() == nodeName.toUpperCase()) {
-                                            if (m == "~") n.mergeNum = mergeNum;
-                                            r.push(n);
-                                        }
-
-                                        if (m == "+") break;
-                                    }
-                                // DEPRECATED
-                            } else
-                                r.push(ret[j].parentNode);
-
-                        ret = r;
-
-                        // And remove the token
-                        t = jQuery.trim(t.replace(re, ""));
-                        foundToken = true;
-                    }
-                }
-
-                // See if there's still an expression, and that we haven't already
-                // matched a token
-                if (t && !foundToken) {
-                    // Handle multiple expressions
-                    if (!t.indexOf(",")) {
-                        // Clean the result set
-                        if (context == ret[0]) ret.shift();
-
-                        // Merge the result sets
-                        done = jQuery.merge(done, ret);
-
-                        // Reset the context
-                        r = ret = [context];
-
-                        // Touch up the selector string
-                        t = " " + t.substr(1, t.length);
-
-                    } else {
-                        // Optimize for the case nodeName#idName
-                        var re2 = quickID;
-                        var m = re2.exec(t);
-
-                        // Re-organize the results, so that they're consistent
-                        if (m) {
-                            m = [ 0, m[2], m[3], m[1] ];
-
-                        } else {
-                            // Otherwise, do a traditional filter check for
-                            // ID, class, and element selectors
-                            re2 = quickClass;
-                            m = re2.exec(t);
-                        }
-
-                        m[2] = m[2].replace(/\\/g, "");
-
-                        var elem = ret[ret.length - 1];
-
-                        // Try to do a global search by ID, where we can
-                        if (m[1] == "#" && elem && elem.getElementById && !jQuery.isXMLDoc(elem)) {
-                            // Optimization for HTML document case
-                            var oid = elem.getElementById(m[2]);
-
-                            // Do a quick check for the existence of the actual ID attribute
-                            // to avoid selecting by the name attribute in IE
-                            // also check to insure id is a string to avoid selecting an element with the name of 'id' inside a form
-                            if ((jQuery.browser.msie || jQuery.browser.opera) && oid && typeof oid.id == "string" && oid.id != m[2])
-                                oid = jQuery('[@id="' + m[2] + '"]', elem)[0];
-
-                            // Do a quick check for node name (where applicable) so
-                            // that div#foo searches will be really fast
-                            ret = r = oid && (!m[3] || jQuery.nodeName(oid, m[3])) ? [oid] : [];
-                        } else {
-                            // We need to find all descendant elements
-                            for (var i = 0; ret[i]; i++) {
-                                // Grab the tag name being searched for
-                                var tag = m[1] != "" || m[0] == "" ? "*" : m[2];
-
-                                // Handle IE7 being really dumb about <object>s
-                                if (tag == "*" && ret[i].nodeName.toLowerCase() == "object")
-                                    tag = "param";
-
-                                r = jQuery.merge(r, ret[i].getElementsByTagName(tag));
-                            }
-
-                            // It's faster to filter by class and be done with it
-                            if (m[1] == ".")
-                                r = jQuery.classFilter(r, m[2]);
-
-                            // Same with ID filtering
-                            if (m[1] == "#") {
-                                var tmp = [];
-
-                                // Try to find the element with the ID
-                                for (var i = 0; r[i]; i++)
-                                    if (r[i].getAttribute("id") == m[2]) {
-                                        tmp = [ r[i] ];
-                                        break;
-                                    }
-
-                                r = tmp;
-                            }
-
-                            ret = r;
-                        }
-
-                        t = t.replace(re2, "");
-                    }
-
-                }
-
-                // If a selector string still exists
-                if (t) {
-                    // Attempt to filter it
-                    var val = jQuery.filter(t, r);
-                    ret = r = val.r;
-                    t = jQuery.trim(val.t);
-                }
-            }
-
-            // An error occurred with the selector;
-            // just return an empty set instead
-            if (t)
-                ret = [];
-
-            // Remove the root context
-            if (ret && context == ret[0])
-                ret.shift();
-
-            // And combine the results
-            done = jQuery.merge(done, ret);
-
-            return done;
-        },
-
-        classFilter: function (r, m, not) {
-            m = " " + m + " ";
-            var tmp = [];
-            for (var i = 0; r[i]; i++) {
-                var pass = (" " + r[i].className + " ").indexOf(m) >= 0;
-                if (!not && pass || not && !pass)
-                    tmp.push(r[i]);
-            }
-            return tmp;
-        },
-
-        filter: function (t, r, not) {
-            var last;
-
-            // Look for common filter expressions
-            while (t && t != last) {
-                last = t;
-
-                var p = jQuery.parse, m;
-
-                for (var i = 0; p[i]; i++) {
-                    m = p[i].exec(t);
-
-                    if (m) {
-                        // Remove what we just matched
-                        t = t.substring(m[0].length);
-
-                        m[2] = m[2].replace(/\\/g, "");
-                        break;
-                    }
-                }
-
-                if (!m)
-                    break;
-
-                // :not() is a special case that can be optimized by
-                // keeping it out of the expression list
-                if (m[1] == ":" && m[2] == "not")
-                    r = jQuery.filter(m[3], r, true).r;
-
-                // We can get a big speed boost by filtering by class here
-                else if (m[1] == ".")
-                    r = jQuery.classFilter(r, m[2], not);
-
-                else if (m[1] == "@") {
-                    var tmp = [], type = m[3];
-
-                    for (var i = 0, rl = r.length; i < rl; i++) {
-                        var a = r[i], z = a[ jQuery.props[m[2]] || m[2] ];
-
-                        if (z == null || /href|src|selected/.test(m[2]))
-                            z = jQuery.attr(a, m[2]) || '';
-
-                        if ((type == "" && !!z ||
-                            type == "=" && z == m[5] ||
-                            type == "!=" && z != m[5] ||
-                            type == "^=" && z && !z.indexOf(m[5]) ||
-                            type == "$=" && z.substr(z.length - m[5].length) == m[5] ||
-                            (type == "*=" || type == "~=") && z.indexOf(m[5]) >= 0) ^ not)
-                            tmp.push(a);
-                    }
-
-                    r = tmp;
-
-                    // We can get a speed boost by handling nth-child here
-                } else if (m[1] == ":" && m[2] == "nth-child") {
-                    var num = jQuery.mergeNum++, tmp = [],
-                        test = /(\d*)n\+?(\d*)/.exec(
-                            m[3] == "even" && "2n" || m[3] == "odd" && "2n+1" ||
-                                !/\D/.test(m[3]) && "n+" + m[3] || m[3]),
-                        first = (test[1] || 1) - 0, last = test[2] - 0;
-
-                    for (var i = 0, rl = r.length; i < rl; i++) {
-                        var node = r[i], parentNode = node.parentNode;
-
-                        if (num != parentNode.mergeNum) {
-                            var c = 1;
-
-                            for (var n = parentNode.firstChild; n; n = n.nextSibling)
-                                if (n.nodeType == 1)
-                                    n.nodeIndex = c++;
-
-                            parentNode.mergeNum = num;
-                        }
-
-                        var add = false;
-
-                        if (first == 1) {
-                            if (last == 0 || node.nodeIndex == last)
-                                add = true;
-                        } else if ((node.nodeIndex + last) % first == 0)
-                            add = true;
-
-                        if (add ^ not)
-                            tmp.push(node);
-                    }
-
-                    r = tmp;
-
-                    // Otherwise, find the expression to execute
-                } else {
-                    var f = jQuery.expr[m[1]];
-                    if (typeof f != "string")
-                        f = jQuery.expr[m[1]][m[2]];
-
-                    // Build a custom macro to enclose it
-                    f = eval("false||function(a,i){return " + f + "}");
-
-                    // Execute it against the current filter
-                    r = jQuery.grep(r, f, not);
-                }
-            }
-
-            // Return an array of filtered elements (r)
-            // and the modified expression string (t)
-            return { r: r, t: t };
-        },
-        parents: function (elem) {
-            var matched = [];
-            var cur = elem.parentNode;
-            while (cur && cur != document) {
-                matched.push(cur);
-                cur = cur.parentNode;
-            }
-            return matched;
-        },
-        nth: function (cur, result, dir, elem) {
-            result = result || 1;
-            var num = 0;
-
-            for (; cur; cur = cur[dir])
-                if (cur.nodeType == 1 && ++num == result)
-                    break;
-
-            return cur;
-        },
-        sibling: function (n, elem) {
-            var r = [];
-
-            for (; n; n = n.nextSibling) {
-                if (n.nodeType == 1 && (!elem || n != elem))
-                    r.push(n);
-            }
-
-            return r;
-        }
-    });
-    /*
-     * A number of helper functions used for managing events.
-     * Many of the ideas behind this code orignated from
-     * Dean Edwards' addEvent library.
-     */
-    jQuery.event = {
-
-        // Bind an event to an element
-        // Original by Dean Edwards
-        add: function (element, type, handler, data) {
-            // For whatever reason, IE has trouble passing the window object
-            // around, causing it to be cloned in the process
-            if (jQuery.browser.msie && element.setInterval != undefined)
-                element = window;
-
-            // Make sure that the function being executed has a unique ID
-            if (!handler.guid)
-                handler.guid = this.guid++;
-
-            // if data is passed, bind to handler
-            if (data != undefined) {
-                // Create temporary function pointer to original handler
-                var fn = handler;
-
-                // Create unique handler function, wrapped around original handler
-                handler = function () {
-                    // Pass arguments and context to original handler
-                    return fn.apply(this, arguments);
-                };
-
-                // Store data in unique handler
-                handler.data = data;
-
-                // Set the guid of unique handler to the same of original handler, so it can be removed
-                handler.guid = fn.guid;
-            }
-
-            // Init the element's event structure
-            if (!element.$events)
-                element.$events = {};
-
-            if (!element.$handle)
-                element.$handle = function () {
-                    // returned undefined or false
-                    var val;
-
-                    // Handle the second event of a trigger and when
-                    // an event is called after a page has unloaded
-                    if (typeof jQuery == "undefined" || jQuery.event.triggered)
-                        return val;
-
-                    val = jQuery.event.handle.apply(element, arguments);
-
-                    return val;
-                };
-
-            // Get the current list of functions bound to this event
-            var handlers = element.$events[type];
-
-            // Init the event handler queue
-            if (!handlers) {
-                handlers = element.$events[type] = {};
-
-                // And bind the global event handler to the element
-                if (element.addEventListener)
-                    element.addEventListener(type, element.$handle, false);
-                else
-                    element.attachEvent("on" + type, element.$handle);
-            }
-
-            // Add the function to the element's handler list
-            handlers[handler.guid] = handler;
-
-            // Keep track of which events have been used, for global triggering
-            this.global[type] = true;
-        },
-
-        guid: 1,
-        global: {},
-
-        // Detach an event or set of events from an element
-        remove: function (element, type, handler) {
-            var events = element.$events, ret, index;
-
-            if (events) {
-                // type is actually an event object here
-                if (type && type.type) {
-                    handler = type.handler;
-                    type = type.type;
-                }
-
-                if (!type) {
-                    for (type in event...
 
[truncated message content]

Revision: 12230
          http://sourceforge.net/p/xoops/svn/12230
Author:   goffy
Date:     2013-11-20 18:30:26 +0000 (Wed, 20 Nov 2013)
Log Message:
-----------
fixed bug concerning attachements (horst/goffy)
cleaned up code

Modified Paths:
--------------
    XoopsModules/xnewsletter/trunk/xNewsletter/include/task.inc.php

Modified: XoopsModules/xnewsletter/trunk/xNewsletter/include/task.inc.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/include/task.inc.php	2013-11-19 18:30:35 UTC (rev 12229)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/include/task.inc.php	2013-11-20 18:30:26 UTC (rev 12230)
@@ -70,7 +70,6 @@
     $subscribers = $xoopsDB->query($sql) or die();
 
     while ($subscriber = $xoopsDB->fetchArray($subscribers)) {
-      //echo "subscr_email:".$subscriber["subscr_email"]
       $subscr_id = $subscriber["subscr_id"];
       if ($op == 'resend_letter') {
         //read subscribers, where send failed
@@ -137,7 +136,7 @@
   require_once( XOOPS_ROOT_PATH."/class/mail/phpmailer/class.pop3.php" );
   require_once( XOOPS_ROOT_PATH."/class/mail/phpmailer/class.smtp.php" );
 
-  global $XoopsTpl, $xoopsDB, $xoopsUser, $letterHandler, $accountsHandler, $subscrHandler, $attachmentHandler;
+  global $XoopsTpl, $xoopsDB, $xoopsUser, $letterHandler, $accountsHandler, $subscrHandler, $attachmentHandler, $xoopsModuleConfig;
   
   $protocolHandler =& xoops_getModuleHandler("xNewsletter_protocol", "xNewsletter");
 
@@ -150,7 +149,6 @@
   if (!is_dir($template_path)) $template_path = XNEWSLETTER_PATH.'/language/english/templates/';  
   if (!is_dir($template_path)) {
     return str_replace("%p",$template_path, _AM_XNEWSLETTER_SEND_ERROR_INALID_TEMPLATE_PATH);
-    //redirect_header("letter.php", 5, str_replace("%p",$template_path, _AM_XNEWSLETTER_SEND_ERROR_INALID_TEMPLATE_PATH));
   }
     
   //get letters ready to send groups by letter_id
@@ -159,7 +157,6 @@
   $sql .= " GROUP BY `task_letter_id`";
   if (!$task_letters = $xoopsDB->query($sql))
   {
-    //ToDo Protocol
     return _AM_XNEWSLETTER_SEND_ERROR_NO_LETTERID;
   }
   
@@ -170,18 +167,14 @@
     $obj_letter =& $letterHandler->get($letter_id);
     if (count($obj_letter)==0) 
     {
-      //ToDo Protocol
       return _AM_XNEWSLETTER_SEND_ERROR_NO_LETTERID;
-      //redirect_header("letter.php", 3, _AM_XNEWSLETTER_SEND_ERROR_NO_LETTERID);
     }
       
     //read categories
     $letter_cats = $obj_letter->getVar("letter_cats"); 
     if ( $letter_cats == "")  //no cats
     {
-      //ToDo Protocol
       return _MA_XNEWSLETTER_LETTER_NONEAVAIL;
-      //redirect_header("letter.php", 3, _MA_XNEWSLETTER_LETTER_NONEAVAIL);
     }
 
     //read data of account
@@ -201,7 +194,6 @@
 
     $tpl = new XoopsTpl();
     $tpl->assign('content', $letter_content);
-    //$tpl->assign('unsubscribe_url', XOOPS_URL.'/modules/xNewsletter/');
 
     // read template
     $letter_template 	= $obj_letter->getVar("letter_template");
@@ -210,12 +202,10 @@
     $recipients = array();
     $sql_tasklist = "SELECT `task_id`, `task_subscr_id` FROM ".$xoopsDB->prefix('mod_xnewsletter_task')." WHERE ((`task_letter_id`= ".$letter_id.") AND (`task_starttime` < ".time()."))";
     if (!$task_letters = $xoopsDB->query($sql_tasklist)) {
-      //ToDo Protocol
       return $task_letters->getErrors();
     }
     $recipients = array();
     while ($task_letter = $xoopsDB->fetchArray($task_letters)) {      
-      //echo "<br/>letter_id:".$letter_id." subcr_id:".$task_letter["task_subscr_id"];
       $subscr_id = $task_letter["task_subscr_id"];
       $task_id = $task_letter["task_id"];
       if ($subscr_id==0) {
@@ -233,32 +223,24 @@
         $sql_subscr = "SELECT * FROM ".$xoopsDB->prefix('mod_xnewsletter_subscr')." WHERE `subscr_id`= ".$subscr_id;
         if (!$task_subscrs = $xoopsDB->query($sql_subscr))
         {
-          //ToDo Protocol
           return $task_subscrs->getErrors();
         }
         
-        //while ($subscriber = $xoopsDB->fetchArray($task_subscrs)) {
-          //echo " email:".$subscriber["subscr_email"];
-          $subscriber = $xoopsDB->fetchArray($task_subscrs);
-          $recipients[] = array(
-              "task_id"           => $task_id,
-              "address"           => $subscriber["subscr_email"],              
-              "firstname"         => $subscriber["subscr_firstname"],
-              "lastname"          => $subscriber["subscr_lastname"],
-              "subscr_sex"        => $subscriber["subscr_sex"],
-              "subscriber_id"     => $subscriber["subscr_id"],
-              "subscriber_actkey" => $subscriber["subscr_actkey"]
-              );
-          //echo "<br/>count:".count($recipients)." address:".$subscriber["subscr_email"]."  firstname:".$subscriber["subscr_firstname"]."  lastname:".$subscriber["subscr_lastname"]."  subscr_sex:".$subscriber["subscr_sex"]."  subscriber_id:".$subscriber["subscr_id"]."  subscriber_actkey:".$subscriber["subscr_actkey"];
-          
-        //}
+        $subscriber = $xoopsDB->fetchArray($task_subscrs);
+        $recipients[] = array(
+            "task_id"           => $task_id,
+            "address"           => $subscriber["subscr_email"],              
+            "firstname"         => $subscriber["subscr_firstname"],
+            "lastname"          => $subscriber["subscr_lastname"],
+            "subscr_sex"        => $subscriber["subscr_sex"],
+            "subscriber_id"     => $subscriber["subscr_id"],
+            "subscriber_actkey" => $subscriber["subscr_actkey"]
+            );
       }
       if ($xn_send_in_packages > 0 && count($recipients)==$xn_send_in_packages) break;
     }
 
     if (count($recipients) == 0) {
-      //ToDo Protocol
-      //return _AM_XNEWSLETTER_SEND_ERROR_NO_SUBSCR;
       return null;
     }
     
@@ -271,14 +253,15 @@
     if ($att_numrows > 0) {
       $attachment_arr = $attachmentHandler->getall($attachment_crit);
       foreach (array_keys($attachment_arr) as $attid) {	
-        $uploaddir = XOOPS_UPLOAD_PATH.$xoopsModuleConfig['xn_attachment_path'].$letter_id."/";
+        $uploaddir = XOOPS_UPLOAD_PATH.$xoopsModuleConfig['xn_attachment_path'];
+        if (substr($uploaddir, -1)!="/") $uploaddir .= "/";  //check, whether path seperator is existing  
+        $uploaddir .= $letter_id."/";
         $attachments[] = $uploaddir.$attachment_arr[$attid]->getVar("attachment_name");
       }
     } else {
       $attachments = array();
     }
 
-    //$senderuid    = $xoopsUser->uid(); //ToDo
     $senderuid = (is_object($xoopsUser) && isset($xoopsUser)) ? $xoopsUser->uid(): 0;
     $count_total  = 0;
     $count_err    = 0;
@@ -321,8 +304,6 @@
       $mail->AddReplyTo($account_yourmail, $account_yourname);	
       $mail->Subject = $letter_title;
       
-      
-
       foreach ($recipients as $recipient) {  
       
         $subscriber_id = $recipient["subscriber_id"];	
@@ -347,11 +328,15 @@
         $mail->AltBody = strip_tags($body . "\n" . $link);
         
         foreach ($attachments as $attachment) {
-          if ( file_exists($attachment)) $mail->AddAttachment($attachment);
+          if ( file_exists($attachment)) {
+            $mail->AddAttachment($attachment);
+            echo "<br>att exist:".$attachment;
+          } else {
+            echo "<br>att not exist:".$attachment;
+          }
         }
         $count_total ++;
         if ( $mail->Send()) {
-          //$protocol_status = _AM_XNEWSLETTER_SEND_SUCCESS;
           if ($subscriber_id == 0) {
             $protocol_status = _AM_XNEWSLETTER_SEND_SUCCESS_TEST." (".$recipient["address"].")";
           } else {
@@ -432,7 +417,7 @@
     echo $obj_protocol->getHtmlErrors();
   }
   unset($obj_protocol);   
-  
+
   return $protocol_status;
 }
 

Revision: 12229
          http://sourceforge.net/p/xoops/svn/12229
Author:   bitc3r0
Date:     2013-11-19 18:30:35 +0000 (Tue, 19 Nov 2013)
Log Message:
-----------
Some changes to adapt to new rmcommon version

Modified Paths:
--------------
    RMC/modules/xthemes/trunk/xthemes/css/themes.css
    RMC/modules/xthemes/trunk/xthemes/preloads/core.php
    RMC/modules/xthemes/trunk/xthemes/templates/xt_index.php
    RMC/modules/xthemes/trunk/xthemes/templates/xt_navigation.php
    RMC/modules/xthemes/trunk/xthemes/templates/xt_settings.php
    RMC/modules/xthemes/trunk/xthemes/templates/xt_themes.php
    RMC/modules/xthemes/trunk/xthemes/themes.php
    RMC/modules/xthemes/trunk/xthemes/xoops_version.php

Modified: RMC/modules/xthemes/trunk/xthemes/css/themes.css
===================================================================
--- RMC/modules/xthemes/trunk/xthemes/css/themes.css	2013-11-18 22:11:28 UTC (rev 12228)
+++ RMC/modules/xthemes/trunk/xthemes/css/themes.css	2013-11-19 18:30:35 UTC (rev 12229)
@@ -470,4 +470,5 @@
     display: block;
     width: 100%; height: 100%;
     border-radius: 0 0 2px 2px;
+    border: 0;
 }
\ No newline at end of file

Modified: RMC/modules/xthemes/trunk/xthemes/preloads/core.php
===================================================================
--- RMC/modules/xthemes/trunk/xthemes/preloads/core.php	2013-11-18 22:11:28 UTC (rev 12228)
+++ RMC/modules/xthemes/trunk/xthemes/preloads/core.php	2013-11-19 18:30:35 UTC (rev 12229)
@@ -11,19 +11,19 @@
 {
     
     public function eventCoreIncludeCommonLanguage(){
-        
+
         load_mod_locale('xthemes');
         define('XTPATH', XOOPS_ROOT_PATH.'/modules/xthemes');
         define('XTURL', XOOPS_URL.'/modules/xthemes');
-        
+
         require_once XTPATH.'/class/xtassembler.class.php';
         $GLOBALS['xtAssembler'] = new XtAssembler();
         $GLOBALS['xtFunctions'] = new XtFunctions();
-        
+
         load_theme_locale($GLOBALS['xtAssembler']->theme()->getInfo('dir'));
-        
+
     }
-    
+
     public function eventCoreHeaderAddMeta(){
         global $xtAssembler;
         /**
@@ -32,12 +32,12 @@
         if(!defined('XOOPS_CPFUNC_LOADED')){
             $xtAssembler->init();
         }
-        
+
     }
-    
+
     public function eventCoreIndexStart(){
-        
+
         define('XTHEMES_IS_HOME', 1);
-        
+
     }
 }

Modified: RMC/modules/xthemes/trunk/xthemes/templates/xt_index.php
===================================================================
--- RMC/modules/xthemes/trunk/xthemes/templates/xt_index.php	2013-11-18 22:11:28 UTC (rev 12228)
+++ RMC/modules/xthemes/trunk/xthemes/templates/xt_index.php	2013-11-19 18:30:35 UTC (rev 12229)
@@ -1,3 +1,4 @@
+<h1 class="cu-section-title"><?php _e('Dashboard', 'xthemes'); ?></h1>
 <div class="outer themes">
     <div class="th"><?php _e('Recent Themes on Xoops Mexico','xthemes'); ?></div>
     <div class="even waiting" id="recent-themes">

Modified: RMC/modules/xthemes/trunk/xthemes/templates/xt_navigation.php
===================================================================
--- RMC/modules/xthemes/trunk/xthemes/templates/xt_navigation.php	2013-11-18 22:11:28 UTC (rev 12228)
+++ RMC/modules/xthemes/trunk/xthemes/templates/xt_navigation.php	2013-11-19 18:30:35 UTC (rev 12229)
@@ -1,4 +1,4 @@
-<h1 class="rmc_titles"><?php _e('Menus and Navigation','xthemes'); ?></h1>
+<h1 class="cu-section-title"><?php _e('Menus and Navigation','xthemes'); ?></h1>
 
 <p class="introduction">
     <?php echo sprintf(__('This theme have %u different menus that can be configured with xThemes menus.','xthemes'), count($menus)); ?>

Modified: RMC/modules/xthemes/trunk/xthemes/templates/xt_settings.php
===================================================================
--- RMC/modules/xthemes/trunk/xthemes/templates/xt_settings.php	2013-11-18 22:11:28 UTC (rev 12228)
+++ RMC/modules/xthemes/trunk/xthemes/templates/xt_settings.php	2013-11-19 18:30:35 UTC (rev 12229)
@@ -1,4 +1,4 @@
-<h1 class="rmc_titles"><?php echo sprintf(__('%s Settings','xthemes'), $xtAssembler->theme()->getInfo("name")); ?></h1>
+<h1 class="cu-section-title"><?php echo sprintf(__('%s Settings','xthemes'), $xtAssembler->theme()->getInfo("name")); ?></h1>
 
 <form name="formSettings" id="frm-settings" action="settings.php" method="post" class="form-horizontal">
     <ul class="nav nav-tabs xt-settings-tabs">

Modified: RMC/modules/xthemes/trunk/xthemes/templates/xt_themes.php
===================================================================
--- RMC/modules/xthemes/trunk/xthemes/templates/xt_themes.php	2013-11-18 22:11:28 UTC (rev 12228)
+++ RMC/modules/xthemes/trunk/xthemes/templates/xt_themes.php	2013-11-19 18:30:35 UTC (rev 12229)
@@ -1,3 +1,4 @@
+<h1 class="cu-section-title"><?php _e('Available Themes', 'xthemes'); ?></h1>
 <div class="xt_current">
     <?php if($current): ?>
     <div class="xt_current_screenshot">
@@ -101,7 +102,7 @@
 </div>
 <div id="xt-previewer-blocker"></div>
 <div id="xt-previewer">
-    <div class="title"><span></span><span class="icon icon-close close"></span></div>
+    <div class="title"><span></span><span class="close">&times;</span></div>
     <div class="website"></div>
 </div>
 

Modified: RMC/modules/xthemes/trunk/xthemes/themes.php
===================================================================
--- RMC/modules/xthemes/trunk/xthemes/themes.php	2013-11-18 22:11:28 UTC (rev 12228)
+++ RMC/modules/xthemes/trunk/xthemes/themes.php	2013-11-19 18:30:35 UTC (rev 12229)
@@ -18,7 +18,7 @@
 function xt_show_themes(){
     global $tpl, $xtf, $xoopsSecurity, $xtAssembler;
     
-    $xtf->menu_options();
+    $xtf->toolbar();
     $current = $xtAssembler->theme();
     
     // Read all available themes
@@ -54,6 +54,9 @@
     $tpl->add_local_script('xthemes.js', 'xthemes');
     $tpl->add_head_script("var xoops_url = '".XOOPS_URL."';");
     $tpl->assign('xoops_pagetitle', __('Themes Manager','xthemes'));
+
+    $bc = RMBreadCrumb::get();
+    $bc->add_crumb(__('Themes', 'xthemes'));
     
     xoops_cp_header();
     

Modified: RMC/modules/xthemes/trunk/xthemes/xoops_version.php
===================================================================
--- RMC/modules/xthemes/trunk/xthemes/xoops_version.php	2013-11-18 22:11:28 UTC (rev 12228)
+++ RMC/modules/xthemes/trunk/xthemes/xoops_version.php	2013-11-19 18:30:35 UTC (rev 12229)
@@ -27,7 +27,7 @@
 $modversion['name'] = 'XThemes';
 $modversion['version'] = 1.5;
 $modversion['rmnative'] = '1';
-$modversion['rmversion'] = array('major'=>1,'minor'=>5, 'revision'=>23,'stage'=>-1,'name'=>'XThemes');
+$modversion['rmversion'] = array('major'=>1,'minor'=>5, 'revision'=>28,'stage'=>0,'name'=>'XThemes');
 $modversion['updateurl'] = "http://www.xoopsmexico.net/modules/vcontrol/?action=check&id=9";
 $modversion['description'] = 'A module to manage themes from Red México';
 $modversion['credits'] = "Eduardo Cortés <i.b...@gm...>";

Revision: 12228
          http://sourceforge.net/p/xoops/svn/12228
Author:   beckmi
Date:     2013-11-18 22:11:28 +0000 (Mon, 18 Nov 2013)
Log Message:
-----------
Adding missing $ret

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/include/update.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/include/update.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/include/update.php	2013-11-12 18:24:19 UTC (rev 12227)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/include/update.php	2013-11-18 22:11:28 UTC (rev 12228)
@@ -32,6 +32,7 @@
 function xoops_module_update_system(&$module, $prev_version = null)
 {
     // irmtfan bug fix: solve templates duplicate issue
+    $ret = null;
     if ($prev_version < 211) {
         $ret = update_system_v211($module);
     }

Revision: 12227
          http://sourceforge.net/p/xoops/svn/12227
Author:   bitc3r0
Date:     2013-11-12 18:24:19 +0000 (Tue, 12 Nov 2013)
Log Message:
-----------
Some minor changes in twop6 theme

Modified Paths:
--------------
    RMC/rmcommon/trunk/rmcommon/class/proxy.php
    RMC/rmcommon/trunk/rmcommon/themes/twop6/class/twop6functions.class.php
    RMC/rmcommon/trunk/rmcommon/themes/twop6/theme.php

Modified: RMC/rmcommon/trunk/rmcommon/class/proxy.php
===================================================================
--- RMC/rmcommon/trunk/rmcommon/class/proxy.php	2013-11-10 14:54:25 UTC (rev 12226)
+++ RMC/rmcommon/trunk/rmcommon/class/proxy.php	2013-11-12 18:24:19 UTC (rev 12227)
@@ -31,7 +31,7 @@
 	
 	function get(){
 
-		global $exmConfig;
+		global $xoopsConfig;
 		// Creamos la petición
 		$hdrs = array(
 			'http'=>array(

Modified: RMC/rmcommon/trunk/rmcommon/themes/twop6/class/twop6functions.class.php
===================================================================
--- RMC/rmcommon/trunk/rmcommon/themes/twop6/class/twop6functions.class.php	2013-11-10 14:54:25 UTC (rev 12226)
+++ RMC/rmcommon/trunk/rmcommon/themes/twop6/class/twop6functions.class.php	2013-11-12 18:24:19 UTC (rev 12227)
@@ -66,16 +66,16 @@
     public function moduleMenu($m){
         
         global $xoopsModule, $xoopsUser;
-        
+
         if(!is_a($xoopsModule, 'XoopsModule')){
             $mod = RMFunctions::load_module($m);
         } else {
             if($xoopsModule->dirname()==$m)
                 $mod = $xoopsModule;
             else
-                $mod = RMFunctions::load_module($m);
+                $mod = RMFunctions::get()->load_module($m);
         }
-        
+
         if(!is_a($mod, 'XoopsModule')) return false;
         
         // Check user
@@ -119,10 +119,9 @@
     public function moduleSubmenu($submenu, $mod){
 
         if(!is_array($submenu)) return array();
-
         foreach($submenu as $i => $menu){
             if($menu=='divider') continue;
-            $submenu[$i]['link'] = strpos($menu['link'], 'http://')!==FALSE && strpos($menu['link'], 'ftp://')!==FALSE ? $menu['link'] : XOOPS_URL.'/modules/'.$mod->getVar('dirname','n').'/'.$menu['link'];
+            $submenu[$i]['link'] = strpos($menu['link'], 'http://')===TRUE && strpos($menu['link'], 'ftp://')===TRUE ? $menu['link'] : XOOPS_URL.'/modules/'.$mod->getVar('dirname','n').'/'.$menu['link'];
         }
         
         return $submenu;

Modified: RMC/rmcommon/trunk/rmcommon/themes/twop6/theme.php
===================================================================
--- RMC/rmcommon/trunk/rmcommon/themes/twop6/theme.php	2013-11-10 14:54:25 UTC (rev 12226)
+++ RMC/rmcommon/trunk/rmcommon/themes/twop6/theme.php	2013-11-12 18:24:19 UTC (rev 12227)
@@ -128,7 +128,7 @@
                         <?php endif; ?>
                         
                         <li class="dropdown">
-                            <a href="#" title="<?php _e('Modules Box','twop6'); ?>" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown">
                                 <i class="xo-icon xicon-modules"></i>
                                 <?php _e('Modules','twop6'); ?>
 	                            <b class="caret"></b>

Revision: 12226
          http://sourceforge.net/p/xoops/svn/12226
Author:   luciorota
Date:     2013-11-10 14:54:25 +0000 (Sun, 10 Nov 2013)
Log Message:
-----------
Xoops Core 2.5.6 language pack ITA UTF8

Modified Paths:
--------------
    XoopsLanguages/italian/core/2.5.6/Changelog_Traduzione.txt

Modified: XoopsLanguages/italian/core/2.5.6/Changelog_Traduzione.txt
===================================================================
--- XoopsLanguages/italian/core/2.5.6/Changelog_Traduzione.txt	2013-11-09 22:10:38 UTC (rev 12225)
+++ XoopsLanguages/italian/core/2.5.6/Changelog_Traduzione.txt	2013-11-10 14:54:25 UTC (rev 12226)
@@ -1,7 +1,7 @@
 *********************************************************************************
 ***************** CHANGELOG TRADUZIONE per CORE XOOPS ***************************
 ---------------------------------------------------------------------------------
--- Ultimo aggiornamento: 23/07/2013 -------------------- by Xoops Italia --------
+-- Ultimo aggiornamento: 10/11/2013 -------------------- by Xoops Italia --------
 ---------------------------------------------------------------------------------
 ---------------------------------------------------------------------------------
 

Revision: 12225
          http://sourceforge.net/p/xoops/svn/12225
Author:   beckmi
Date:     2013-11-09 22:10:38 +0000 (Sat, 09 Nov 2013)
Log Message:
-----------
added missing apostrophe corrections for Date types in CleanVars in /class/model/write.php

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt

Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt	2013-11-09 22:09:17 UTC (rev 12224)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt	2013-11-09 22:10:38 UTC (rev 12225)
@@ -38,7 +38,7 @@
 - added missing info about new language constants in Fast Comments (irmtfan/mamba)
 - fixed Undefined index: uid in file /modules/profile/userinfo.php line 24 (cesag/mamba)
 - set minimum PHP version to 5.3.7 (mamba)
-- added missing apostrophe functions for Date types in CleanVars in /class/model/write.php
+- added missing apostrophe corrections for Date types in CleanVars in /class/model/write.php
 
 
 Security fixes

Revision: 12224
          http://sourceforge.net/p/xoops/svn/12224
Author:   beckmi
Date:     2013-11-09 22:09:17 +0000 (Sat, 09 Nov 2013)
Log Message:
-----------
added missing apostrophe corrections for Date types in CleanVars in /class/model/write.php

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/write.php

Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt	2013-10-31 16:19:43 UTC (rev 12223)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt	2013-11-09 22:09:17 UTC (rev 12224)
@@ -37,8 +37,10 @@
 - bug in commentrenderer.php (Roby73/irmtfan)
 - added missing info about new language constants in Fast Comments (irmtfan/mamba)
 - fixed Undefined index: uid in file /modules/profile/userinfo.php line 24 (cesag/mamba)
-- set minimum PHP version to 5.3.7
+- set minimum PHP version to 5.3.7 (mamba)
+- added missing apostrophe functions for Date types in CleanVars in /class/model/write.php
 
+
 Security fixes
  - XSS issues reported by Mehdi Dadkhah (rgriffith)
 

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/write.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/write.php	2013-10-31 16:19:43 UTC (rev 12223)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/write.php	2013-11-09 22:09:17 UTC (rev 12224)
@@ -55,12 +55,15 @@
             switch ($v["data_type"]) {
             	case XOBJ_DTYPE_TIMESTAMP:
                 	$cleanv = !is_string($cleanv)&&is_numeric($cleanv) ? date(_DBTIMESTAMPSTRING, $cleanv) : date(_DBTIMESTAMPSTRING, strtotime($cleanv));
+                    $cleanv = str_replace('\\"', '"', $this->handler->db->quote($cleanv));
                 	break;
                 case XOBJ_DTYPE_TIME:
                 	$cleanv = !is_string($cleanv)&&is_numeric($cleanv) ? date(_DBTIMESTRING, $cleanv) : date(_DBTIMESTRING, strtotime($cleanv));
+                    $cleanv = str_replace('\\"', '"', $this->handler->db->quote($cleanv));
                 	break;
                 case XOBJ_DTYPE_DATE:
                 	$cleanv = !is_string($cleanv)&&is_numeric($cleanv) ? date(_DBDATESTRING, $cleanv) : date(_DBDATESTRING, strtotime($cleanv));
+                    $cleanv = str_replace('\\"', '"', $this->handler->db->quote($cleanv));
                 	break;
                 case XOBJ_DTYPE_UNICODE_TXTBOX:
                     if ($v['required'] && $cleanv != '0' && $cleanv == '') {