You can subscribe to this list here.
2012 |
Jan
|
Feb
(214) |
Mar
(139) |
Apr
(198) |
May
(187) |
Jun
(151) |
Jul
(210) |
Aug
(169) |
Sep
(58) |
Oct
(53) |
Nov
(54) |
Dec
(301) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2013 |
Jan
(348) |
Feb
(178) |
Mar
(219) |
Apr
(154) |
May
(117) |
Jun
(194) |
Jul
(61) |
Aug
(132) |
Sep
(121) |
Oct
(110) |
Nov
(11) |
Dec
(18) |
2014 |
Jan
(34) |
Feb
(50) |
Mar
(82) |
Apr
(98) |
May
(39) |
Jun
(111) |
Jul
(67) |
Aug
(36) |
Sep
(33) |
Oct
(26) |
Nov
(53) |
Dec
(44) |
2015 |
Jan
(29) |
Feb
(47) |
Mar
(25) |
Apr
(19) |
May
(23) |
Jun
(20) |
Jul
(49) |
Aug
(7) |
Sep
(10) |
Oct
(10) |
Nov
(4) |
Dec
(25) |
2016 |
Jan
(8) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
2017 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
|
Jul
(18) |
Aug
(24) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
2018 |
Jan
|
Feb
(22) |
Mar
|
Apr
(11) |
May
(1) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(6) |
Nov
(5) |
Dec
|
2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
From: <wis...@us...> - 2012-02-22 17:58:58
|
Revision: 9049 http://xoops.svn.sourceforge.net/xoops/?rev=9049&view=rev Author: wishcraft Date: 2012-02-22 17:58:44 +0000 (Wed, 22 Feb 2012) Log Message: ----------- samPHPweb - SAM 1.03 - See http://spacialaudio.com for SAM Broadcast the PC Component of this XOOPS Module Added Paths: ----------- XoopsModules/sam/releases/1.03/ XoopsModules/sam/releases/1.03/htdocs/ XoopsModules/sam/releases/1.03/htdocs/modules/ XoopsModules/sam/releases/1.03/htdocs/modules/sam/ XoopsModules/sam/releases/1.03/htdocs/modules/sam/admin/ XoopsModules/sam/releases/1.03/htdocs/modules/sam/admin/about.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/admin/header.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/admin/index.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/admin/menu.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/blocks/ XoopsModules/sam/releases/1.03/htdocs/modules/sam/blocks/index.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/blocks/sam_block_currentsong.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/blocks/sam_block_navigation.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/blocks/sam_block_partnerlinks.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/blocks/sam_block_toprequests.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/ XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/adz.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/category.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/categorylist.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/database/ XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/database/database.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/database/databasefactory.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/database/index.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/database/mysqldatabase.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/disk.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/event.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/eventtime.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/fixedlist.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/fixedlist_item.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/historylist.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/index.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/model/ XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/model/index.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/model/joint.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/model/read.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/model/sammodel.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/model/stats.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/model/sync.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/model/write.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/object.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/queuelist.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/requestlist.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/songlist.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/css/ XoopsModules/sam/releases/1.03/htdocs/modules/sam/css/currentsong.css XoopsModules/sam/releases/1.03/htdocs/modules/sam/css/navigation.css XoopsModules/sam/releases/1.03/htdocs/modules/sam/css/partners.css XoopsModules/sam/releases/1.03/htdocs/modules/sam/css/request.css XoopsModules/sam/releases/1.03/htdocs/modules/sam/css/request.error.css XoopsModules/sam/releases/1.03/htdocs/modules/sam/css/songinfo.css XoopsModules/sam/releases/1.03/htdocs/modules/sam/css/style.css XoopsModules/sam/releases/1.03/htdocs/modules/sam/css/toprequests.css XoopsModules/sam/releases/1.03/htdocs/modules/sam/docs/ XoopsModules/sam/releases/1.03/htdocs/modules/sam/docs/changelog.txt XoopsModules/sam/releases/1.03/htdocs/modules/sam/docs/credits.txt XoopsModules/sam/releases/1.03/htdocs/modules/sam/docs/index.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/docs/install.txt XoopsModules/sam/releases/1.03/htdocs/modules/sam/docs/lang_diff.txt XoopsModules/sam/releases/1.03/htdocs/modules/sam/docs/licence.txt XoopsModules/sam/releases/1.03/htdocs/modules/sam/docs/readme.txt XoopsModules/sam/releases/1.03/htdocs/modules/sam/images/ XoopsModules/sam/releases/1.03/htdocs/modules/sam/images/buy.png XoopsModules/sam/releases/1.03/htdocs/modules/sam/images/home.png XoopsModules/sam/releases/1.03/htdocs/modules/sam/images/index.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/images/info.png XoopsModules/sam/releases/1.03/htdocs/modules/sam/images/logo.png XoopsModules/sam/releases/1.03/htdocs/modules/sam/images/menu/ XoopsModules/sam/releases/1.03/htdocs/modules/sam/images/menu/email.png XoopsModules/sam/releases/1.03/htdocs/modules/sam/images/menu/play.png XoopsModules/sam/releases/1.03/htdocs/modules/sam/images/menu/speaker.png XoopsModules/sam/releases/1.03/htdocs/modules/sam/images/menu/tb-file-list.png XoopsModules/sam/releases/1.03/htdocs/modules/sam/images/request.png XoopsModules/sam/releases/1.03/htdocs/modules/sam/images/sam_slogo.png XoopsModules/sam/releases/1.03/htdocs/modules/sam/images/torqueradio_sponsor.png XoopsModules/sam/releases/1.03/htdocs/modules/sam/include/ XoopsModules/sam/releases/1.03/htdocs/modules/sam/include/code.playing.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/include/code.playlist.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/include/code.request.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/include/code.songcheck.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/include/code.songinfo.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/include/header.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/include/index.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/include/xml.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/index.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/js/ XoopsModules/sam/releases/1.03/htdocs/modules/sam/js/common.js XoopsModules/sam/releases/1.03/htdocs/modules/sam/js/jquery.corner.js XoopsModules/sam/releases/1.03/htdocs/modules/sam/language/ XoopsModules/sam/releases/1.03/htdocs/modules/sam/language/english/ XoopsModules/sam/releases/1.03/htdocs/modules/sam/language/english/admin.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/language/english/blocks.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/language/english/help/ XoopsModules/sam/releases/1.03/htdocs/modules/sam/language/english/help/help.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/language/english/help/index.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/language/english/main.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/language/english/modinfo.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/playing.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/playlist.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/request.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/songcheck.js.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/songinfo.php XoopsModules/sam/releases/1.03/htdocs/modules/sam/sql/ XoopsModules/sam/releases/1.03/htdocs/modules/sam/sql/index.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/templates/ XoopsModules/sam/releases/1.03/htdocs/modules/sam/templates/blocks/ XoopsModules/sam/releases/1.03/htdocs/modules/sam/templates/blocks/index.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/templates/blocks/sam_block_currentsong.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/templates/blocks/sam_block_navigation.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/templates/blocks/sam_block_partnerlinks.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/templates/blocks/sam_block_toprequests.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/templates/index.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/templates/sam_error.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/templates/sam_footer.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/templates/sam_header.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/templates/sam_playing.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/templates/sam_playlist.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/templates/sam_request.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/templates/sam_request_error.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/templates/sam_songcheck.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/templates/sam_songinfo.html XoopsModules/sam/releases/1.03/htdocs/modules/sam/xoops_version.php XoopsModules/sam/releases/1.03/htdocs/uploads/ XoopsModules/sam/releases/1.03/htdocs/uploads/sam/ XoopsModules/sam/releases/1.03/htdocs/uploads/sam/na.png XoopsModules/sam/trunk/htdocs/ XoopsModules/sam/trunk/htdocs/modules/ XoopsModules/sam/trunk/htdocs/modules/sam/ XoopsModules/sam/trunk/htdocs/modules/sam/admin/ XoopsModules/sam/trunk/htdocs/modules/sam/admin/about.php XoopsModules/sam/trunk/htdocs/modules/sam/admin/header.php XoopsModules/sam/trunk/htdocs/modules/sam/admin/index.php XoopsModules/sam/trunk/htdocs/modules/sam/admin/menu.php XoopsModules/sam/trunk/htdocs/modules/sam/blocks/ XoopsModules/sam/trunk/htdocs/modules/sam/blocks/index.html XoopsModules/sam/trunk/htdocs/modules/sam/blocks/sam_block_currentsong.php XoopsModules/sam/trunk/htdocs/modules/sam/blocks/sam_block_navigation.php XoopsModules/sam/trunk/htdocs/modules/sam/blocks/sam_block_partnerlinks.php XoopsModules/sam/trunk/htdocs/modules/sam/blocks/sam_block_toprequests.php XoopsModules/sam/trunk/htdocs/modules/sam/class/ XoopsModules/sam/trunk/htdocs/modules/sam/class/adz.php XoopsModules/sam/trunk/htdocs/modules/sam/class/category.php XoopsModules/sam/trunk/htdocs/modules/sam/class/categorylist.php XoopsModules/sam/trunk/htdocs/modules/sam/class/database/ XoopsModules/sam/trunk/htdocs/modules/sam/class/database/database.php XoopsModules/sam/trunk/htdocs/modules/sam/class/database/databasefactory.php XoopsModules/sam/trunk/htdocs/modules/sam/class/database/index.html XoopsModules/sam/trunk/htdocs/modules/sam/class/database/mysqldatabase.php XoopsModules/sam/trunk/htdocs/modules/sam/class/disk.php XoopsModules/sam/trunk/htdocs/modules/sam/class/event.php XoopsModules/sam/trunk/htdocs/modules/sam/class/eventtime.php XoopsModules/sam/trunk/htdocs/modules/sam/class/fixedlist.php XoopsModules/sam/trunk/htdocs/modules/sam/class/fixedlist_item.php XoopsModules/sam/trunk/htdocs/modules/sam/class/historylist.php XoopsModules/sam/trunk/htdocs/modules/sam/class/index.html XoopsModules/sam/trunk/htdocs/modules/sam/class/model/ XoopsModules/sam/trunk/htdocs/modules/sam/class/model/index.html XoopsModules/sam/trunk/htdocs/modules/sam/class/model/joint.php XoopsModules/sam/trunk/htdocs/modules/sam/class/model/read.php XoopsModules/sam/trunk/htdocs/modules/sam/class/model/sammodel.php XoopsModules/sam/trunk/htdocs/modules/sam/class/model/stats.php XoopsModules/sam/trunk/htdocs/modules/sam/class/model/sync.php XoopsModules/sam/trunk/htdocs/modules/sam/class/model/write.php XoopsModules/sam/trunk/htdocs/modules/sam/class/object.php XoopsModules/sam/trunk/htdocs/modules/sam/class/queuelist.php XoopsModules/sam/trunk/htdocs/modules/sam/class/requestlist.php XoopsModules/sam/trunk/htdocs/modules/sam/class/songlist.php XoopsModules/sam/trunk/htdocs/modules/sam/css/ XoopsModules/sam/trunk/htdocs/modules/sam/css/currentsong.css XoopsModules/sam/trunk/htdocs/modules/sam/css/navigation.css XoopsModules/sam/trunk/htdocs/modules/sam/css/partners.css XoopsModules/sam/trunk/htdocs/modules/sam/css/request.css XoopsModules/sam/trunk/htdocs/modules/sam/css/request.error.css XoopsModules/sam/trunk/htdocs/modules/sam/css/songinfo.css XoopsModules/sam/trunk/htdocs/modules/sam/css/style.css XoopsModules/sam/trunk/htdocs/modules/sam/css/toprequests.css XoopsModules/sam/trunk/htdocs/modules/sam/docs/ XoopsModules/sam/trunk/htdocs/modules/sam/docs/changelog.txt XoopsModules/sam/trunk/htdocs/modules/sam/docs/credits.txt XoopsModules/sam/trunk/htdocs/modules/sam/docs/index.html XoopsModules/sam/trunk/htdocs/modules/sam/docs/install.txt XoopsModules/sam/trunk/htdocs/modules/sam/docs/lang_diff.txt XoopsModules/sam/trunk/htdocs/modules/sam/docs/licence.txt XoopsModules/sam/trunk/htdocs/modules/sam/docs/readme.txt XoopsModules/sam/trunk/htdocs/modules/sam/images/ XoopsModules/sam/trunk/htdocs/modules/sam/images/buy.png XoopsModules/sam/trunk/htdocs/modules/sam/images/home.png XoopsModules/sam/trunk/htdocs/modules/sam/images/index.html XoopsModules/sam/trunk/htdocs/modules/sam/images/info.png XoopsModules/sam/trunk/htdocs/modules/sam/images/logo.png XoopsModules/sam/trunk/htdocs/modules/sam/images/menu/ XoopsModules/sam/trunk/htdocs/modules/sam/images/menu/email.png XoopsModules/sam/trunk/htdocs/modules/sam/images/menu/play.png XoopsModules/sam/trunk/htdocs/modules/sam/images/menu/speaker.png XoopsModules/sam/trunk/htdocs/modules/sam/images/menu/tb-file-list.png XoopsModules/sam/trunk/htdocs/modules/sam/images/request.png XoopsModules/sam/trunk/htdocs/modules/sam/images/sam_slogo.png XoopsModules/sam/trunk/htdocs/modules/sam/images/torqueradio_sponsor.png XoopsModules/sam/trunk/htdocs/modules/sam/include/ XoopsModules/sam/trunk/htdocs/modules/sam/include/code.playing.php XoopsModules/sam/trunk/htdocs/modules/sam/include/code.playlist.php XoopsModules/sam/trunk/htdocs/modules/sam/include/code.request.php XoopsModules/sam/trunk/htdocs/modules/sam/include/code.songcheck.php XoopsModules/sam/trunk/htdocs/modules/sam/include/code.songinfo.php XoopsModules/sam/trunk/htdocs/modules/sam/include/header.php XoopsModules/sam/trunk/htdocs/modules/sam/include/index.html XoopsModules/sam/trunk/htdocs/modules/sam/include/xml.php XoopsModules/sam/trunk/htdocs/modules/sam/index.php XoopsModules/sam/trunk/htdocs/modules/sam/js/ XoopsModules/sam/trunk/htdocs/modules/sam/js/common.js XoopsModules/sam/trunk/htdocs/modules/sam/js/jquery.corner.js XoopsModules/sam/trunk/htdocs/modules/sam/language/ XoopsModules/sam/trunk/htdocs/modules/sam/language/english/ XoopsModules/sam/trunk/htdocs/modules/sam/language/english/admin.php XoopsModules/sam/trunk/htdocs/modules/sam/language/english/blocks.php XoopsModules/sam/trunk/htdocs/modules/sam/language/english/help/ XoopsModules/sam/trunk/htdocs/modules/sam/language/english/help/help.html XoopsModules/sam/trunk/htdocs/modules/sam/language/english/help/index.html XoopsModules/sam/trunk/htdocs/modules/sam/language/english/main.php XoopsModules/sam/trunk/htdocs/modules/sam/language/english/modinfo.php XoopsModules/sam/trunk/htdocs/modules/sam/playing.php XoopsModules/sam/trunk/htdocs/modules/sam/playlist.php XoopsModules/sam/trunk/htdocs/modules/sam/request.php XoopsModules/sam/trunk/htdocs/modules/sam/songcheck.js.php XoopsModules/sam/trunk/htdocs/modules/sam/songinfo.php XoopsModules/sam/trunk/htdocs/modules/sam/sql/ XoopsModules/sam/trunk/htdocs/modules/sam/sql/index.html XoopsModules/sam/trunk/htdocs/modules/sam/templates/ XoopsModules/sam/trunk/htdocs/modules/sam/templates/blocks/ XoopsModules/sam/trunk/htdocs/modules/sam/templates/blocks/index.html XoopsModules/sam/trunk/htdocs/modules/sam/templates/blocks/sam_block_currentsong.html XoopsModules/sam/trunk/htdocs/modules/sam/templates/blocks/sam_block_navigation.html XoopsModules/sam/trunk/htdocs/modules/sam/templates/blocks/sam_block_partnerlinks.html XoopsModules/sam/trunk/htdocs/modules/sam/templates/blocks/sam_block_toprequests.html XoopsModules/sam/trunk/htdocs/modules/sam/templates/index.html XoopsModules/sam/trunk/htdocs/modules/sam/templates/sam_error.html XoopsModules/sam/trunk/htdocs/modules/sam/templates/sam_footer.html XoopsModules/sam/trunk/htdocs/modules/sam/templates/sam_header.html XoopsModules/sam/trunk/htdocs/modules/sam/templates/sam_playing.html XoopsModules/sam/trunk/htdocs/modules/sam/templates/sam_playlist.html XoopsModules/sam/trunk/htdocs/modules/sam/templates/sam_request.html XoopsModules/sam/trunk/htdocs/modules/sam/templates/sam_request_error.html XoopsModules/sam/trunk/htdocs/modules/sam/templates/sam_songcheck.html XoopsModules/sam/trunk/htdocs/modules/sam/templates/sam_songinfo.html XoopsModules/sam/trunk/htdocs/modules/sam/xoops_version.php XoopsModules/sam/trunk/htdocs/uploads/ XoopsModules/sam/trunk/htdocs/uploads/sam/ XoopsModules/sam/trunk/htdocs/uploads/sam/na.png Removed Paths: ------------- XoopsModules/sam/trunk/modules/ XoopsModules/sam/trunk/uploads/ Added: XoopsModules/sam/releases/1.03/htdocs/modules/sam/admin/about.php =================================================================== --- XoopsModules/sam/releases/1.03/htdocs/modules/sam/admin/about.php (rev 0) +++ XoopsModules/sam/releases/1.03/htdocs/modules/sam/admin/about.php 2012-02-22 17:58:44 UTC (rev 9049) @@ -0,0 +1,76 @@ +<?php +// $Id: about.php 5204 2010-09-06 20:10:52Z mageg $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2000 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +// Author: XOOPS Foundation // +// URL: http://www.xoops.org/ // +// Project: The XOOPS Project // +// ------------------------------------------------------------------------- // + + include ('header.php'); + xoops_loadLanguage('admin', 'sam'); + + xoops_cp_header(); + + $aboutAdmin = new ModuleAdmin(); + echo $aboutAdmin->addNavigation('admin/about.php'); + + $paypalitemno='SAM175'; + $about = $aboutAdmin->renderabout($paypalitemno, false); + $donationform = array( 0 => '<form name="donation" id="donation" action="http://www.chronolabs.coop/modules/xpayment/" method="post" onsubmit="return xoopsFormValidate_donation();">', + 1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'.constant('_AM_SAM_ABOUT_MAKEDONATE').'</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">Donation Amount</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 AUD</option><option value="10">10.00 AUD</option><option value="20">20.00 AUD</option><option value="40">40.00 AUD</option><option value="60">60.00 AUD</option><option value="80">80.00 AUD</option><option value="90">90.00 AUD</option><option value="100">100.00 AUD</option><option value="200">200.00 AUD</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'._SUBMIT.'" title="'._SUBMIT.'" type="submit"></td></tr></tbody></table>', + 2 => '<input name="op" id="op" value="createinvoice" type="hidden"><input name="plugin" id="plugin" value="donations" type="hidden"><input name="donation" id="donation" value="1" type="hidden"><input name="drawfor" id="drawfor" value="Chronolabs Co-Operative" type="hidden"><input name="drawto" id="drawto" value="%s" type="hidden"><input name="drawto_email" id="drawto_email" value="%s" type="hidden"><input name="key" id="key" value="%s" type="hidden"><input name="currency" id="currency" value="AUD" type="hidden"><input name="weight_unit" id="weight_unit" value="kgs" type="hidden"><input name="item[A][cat]" id="item[A][cat]" value="XDN%s" type="hidden"><input name="item[A][name]" id="item[A][name]" value="Donation for %s" type="hidden"><input name="item[A][quantity]" id="item[A][quantity]" value="1" type="hidden"><input name="item[A][shipping]" id="item[A][shipping]" value="0" type="hidden"><input name="item[A][handling]" id="item[A][handling]" value="0" type="hidden"><input name="item[A][weight]" id="item[A][weight]" value="0" type="hidden"><input name="item[A][tax]" id="item[A][tax]" value="0" type="hidden"><input name="return" id="return" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"><input name="cancel" id="cancel" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"></form>', 'D'=>'', + 3 => '', + 4 => '<!-- Start Form Validation JavaScript //--> +<script type="text/javascript"> +<!--// +function xoopsFormValidate_donation() { var myform = window.document.donation; +var hasSelected = false; var selectBox = myform.item[A][amount];for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected == true && selectBox.options[i].value != \'\') { hasSelected = true; break; } }if (!hasSelected) { window.alert("Please enter Donation Amount"); selectBox.focus(); return false; }return true; +} +//--></script> +<!-- End Form Validation JavaScript //-->'); + $paypalform = array( 0 => '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">', + 1 => '<input name="cmd" value="_s-xclick" type="hidden">', + 2 => '<input name="hosted_button_id" value="%s" type="hidden">', + 3 => '<img alt="" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" height="1" border="0" width="1">', + 4 => '<input src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" name="submit" alt="PayPal - The safer, easier way to pay online!" border="0" type="image">', + 5 => '</form>'); + for($key=0;$key<=4;$key++) { + switch ($key) { + case 2: + $donationform[$key] = sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'] . ' - ' . (strlen($GLOBALS['xoopsUser']->getVar('name'))>0?$GLOBALS['xoopsUser']->getVar('name'). ' ['.$GLOBALS['xoopsUser']->getVar('uname').']':$GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, strtoupper($GLOBALS['samModule']->getVar('dirname')), strtoupper($GLOBALS['samModule']->getVar('dirname')). ' '.$GLOBALS['samModule']->getVar('name')); + break; + } + } + + $istart = strpos($about, ($paypalform[0]), 1); + $iend = strpos($about, ($paypalform[5]), $istart+1)+strlen($paypalform[5])-1; + echo (substr($about, 0, $istart-1)); + echo implode("\n", $donationform); + echo (substr($about, $iend+1, strlen($about)-$iend-1)); + echo constant('_MI_SAM_SOFTWARESPONSOR'); + xoops_cp_footer(); + +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.03/htdocs/modules/sam/admin/header.php =================================================================== --- XoopsModules/sam/releases/1.03/htdocs/modules/sam/admin/header.php (rev 0) +++ XoopsModules/sam/releases/1.03/htdocs/modules/sam/admin/header.php 2012-02-22 17:58:44 UTC (rev 9049) @@ -0,0 +1,54 @@ +<?php + + require_once (dirname(dirname(dirname(dirname(__FILE__)))).'/include/cp_header.php'); + + if (!defined('_CHARSET')) + define ("_CHARSET","UTF-8"); + if (!defined('_CHARSET_ISO')) + define ("_CHARSET_ISO","ISO-8859-1"); + + $GLOBALS['myts'] = MyTextSanitizer::getInstance(); + + $module_handler = xoops_gethandler('module'); + $config_handler = xoops_gethandler('config'); + $GLOBALS['samModule'] = $module_handler->getByDirname('sam'); + $GLOBALS['samModuleConfig'] = $config_handler->getConfigList($GLOBALS['samModule']->getVar('mid')); + + xoops_load('pagenav'); + xoops_load('xoopslists'); + xoops_load('xoopsformloader'); + + include_once $GLOBALS['xoops']->path('class'.DS.'xoopsmailer.php'); + include_once $GLOBALS['xoops']->path('class'.DS.'xoopstree.php'); + + if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){ + include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'); + }else{ + echo xoops_error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks"); + } + + $GLOBALS['samImageIcon'] = XOOPS_URL .'/'. $GLOBALS['samModule']->getInfo('icons16'); + $GLOBALS['samImageAdmin'] = XOOPS_URL .'/'. $GLOBALS['samModule']->getInfo('icons32'); + + if ($GLOBALS['xoopsUser']) { + $moduleperm_handler =& xoops_gethandler('groupperm'); + if (!$moduleperm_handler->checkRight('module_admin', $GLOBALS['samModule']->getVar( 'mid' ), $GLOBALS['xoopsUser']->getGroups())) { + redirect_header(XOOPS_URL, 1, _NOPERM); + exit(); + } + } else { + redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM); + exit(); + } + + if (!isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl'])) { + include_once(XOOPS_ROOT_PATH."/class/template.php"); + $GLOBALS['xoopsTpl'] = new XoopsTpl(); + } + + $GLOBALS['xoopsTpl']->assign('pathImageIcon', $GLOBALS['samImageIcon']); + $GLOBALS['xoopsTpl']->assign('pathImageAdmin', $GLOBALS['samImageAdmin']); + + error_reporting(E_ALL); + +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.03/htdocs/modules/sam/admin/index.php =================================================================== --- XoopsModules/sam/releases/1.03/htdocs/modules/sam/admin/index.php (rev 0) +++ XoopsModules/sam/releases/1.03/htdocs/modules/sam/admin/index.php 2012-02-22 17:58:44 UTC (rev 9049) @@ -0,0 +1,71 @@ +<?php +// $Id: directory.php 5204 2010-09-06 20:10:52Z mageg $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2000 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +// Author: XOOPS Foundation // +// URL: http://www.xoops.org/ // +// Project: The XOOPS Project // +// ------------------------------------------------------------------------- // + + include ('header.php'); + xoops_loadLanguage('admin', 'sam'); + + xoops_cp_header(); + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation('admin/index.php'); + + $indexAdmin = new ModuleAdmin(); + + if (empty($GLOBALS['samModuleConfig']['db_type'])||empty($GLOBALS['samModuleConfig']['db_host'])||empty($GLOBALS['samModuleConfig']['db_name'])||empty($GLOBALS['samModuleConfig']['db_user'])||empty($GLOBALS['samModuleConfig']['db_pass'])||empty($GLOBALS['samModuleConfig']['db_charset'])||empty($GLOBALS['samModuleConfig']['sam_host'])||empty($GLOBALS['samModuleConfig']['sam_port'])) { + $indexAdmin->addInfoBox(_AM_SAM_PREF_NEEDTOBESET); + $indexAdmin->addInfoBoxLine(_AM_SAM_PREF_NEEDTOBESET, "<label>"._AM_SAM_PREF_DB_TYPE."</label>", empty($GLOBALS['samModuleConfig']['db_type'])?_NO:_YES, empty($GLOBALS['samModuleConfig']['db_type'])?'Red':'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_PREF_NEEDTOBESET, "<label>"._AM_SAM_PREF_DB_HOST."</label>", empty($GLOBALS['samModuleConfig']['db_host'])?_NO:_YES, empty($GLOBALS['samModuleConfig']['db_host'])?'Red':'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_PREF_NEEDTOBESET, "<label>"._AM_SAM_PREF_DB_NAME."</label>", empty($GLOBALS['samModuleConfig']['db_name'])?_NO:_YES, empty($GLOBALS['samModuleConfig']['db_name'])?'Red':'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_PREF_NEEDTOBESET, "<label>"._AM_SAM_PREF_DB_USER."</label>", empty($GLOBALS['samModuleConfig']['db_user'])?_NO:_YES, empty($GLOBALS['samModuleConfig']['db_user'])?'Red':'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_PREF_NEEDTOBESET, "<label>"._AM_SAM_PREF_DB_PASS."</label>", empty($GLOBALS['samModuleConfig']['db_pass'])?_NO:_YES, empty($GLOBALS['samModuleConfig']['db_pass'])?'Red':'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_PREF_NEEDTOBESET, "<label>"._AM_SAM_PREF_DB_CHARSET."</label>", empty($GLOBALS['samModuleConfig']['db_charset'])?_NO:_YES, empty($GLOBALS['samModuleConfig']['db_charset'])?'Red':'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_PREF_NEEDTOBESET, "<label>"._AM_SAM_PREF_SAM_HOST."</label>", empty($GLOBALS['samModuleConfig']['sam_host'])?_NO:_YES, empty($GLOBALS['samModuleConfig']['sam_host'])?'Red':'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_PREF_NEEDTOBESET, "<label>"._AM_SAM_PREF_SAM_PORT."</label>", empty($GLOBALS['samModuleConfig']['sam_port'])?_NO:_YES, empty($GLOBALS['samModuleConfig']['sam_port'])?'Red':'Green'); + } else { + $songlist_handler = xoops_getmodulehandler('songlist', 'sam'); + $requestlist_handler = xoops_getmodulehandler('requestlist', 'sam'); + $indexAdmin->addInfoBox(_AM_SAM_COUNTS); + $indexAdmin->addInfoBoxLine(_AM_SAM_COUNTS, "<label>"._AM_SAM_THEREARE_SONGS."</label>", $songlist_handler->getCount(NULL), 'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_COUNTS, "<label>"._AM_SAM_THEREARE_BROADCAST_SONGS."</label>", $songlist_handler->getCount(new Criteria('`songrights`', 'broadcast')), 'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_COUNTS, "<label>"._AM_SAM_THEREARE_DOWNLOAD_SONGS."</label>", $songlist_handler->getCount(new Criteria('`songrights`', 'download')), 'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_COUNTS, "<label>"._AM_SAM_THEREARE_ONDEMAND_SONGS."</label>", $songlist_handler->getCount(new Criteria('`songrights`', 'on-demand')), 'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_COUNTS, "<label>"._AM_SAM_THEREARE_ROAYALTYFREE_SONGS."</label>", $songlist_handler->getCount(new Criteria('`songrights`', 'royaltyfree')), 'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_COUNTS, "<label>"._AM_SAM_THEREARE_REQUESTS."</label>", $requestlist_handler->getCount(NULL), 'Orange'); + $indexAdmin->addInfoBoxLine(_AM_SAM_COUNTS, "<label>"._AM_SAM_THEREARE_NEW_REQUESTS."</label>", $requestlist_handler->getCount(new Criteria('`status`', 'new')), 'Orange'); + $indexAdmin->addInfoBoxLine(_AM_SAM_COUNTS, "<label>"._AM_SAM_THEREARE_PENDING_REQUESTS."</label>", $requestlist_handler->getCount(new Criteria('`status`', 'pending')), 'Orange'); + $indexAdmin->addInfoBoxLine(_AM_SAM_COUNTS, "<label>"._AM_SAM_THEREARE_IGNORED_REQUESTS."</label>", $requestlist_handler->getCount(new Criteria('`status`', 'ignored')), 'Orange'); + $indexAdmin->addInfoBoxLine(_AM_SAM_COUNTS, "<label>"._AM_SAM_THEREARE_PLAYED_REQUESTS."</label>", $requestlist_handler->getCount(new Criteria('`status`', 'played')), 'Orange'); + } + echo $indexAdmin->renderIndex(); + echo constant('_MI_SAM_SOFTWARESPONSOR'); + xoops_cp_footer(); + +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.03/htdocs/modules/sam/admin/menu.php =================================================================== --- XoopsModules/sam/releases/1.03/htdocs/modules/sam/admin/menu.php (rev 0) +++ XoopsModules/sam/releases/1.03/htdocs/modules/sam/admin/menu.php 2012-02-22 17:58:44 UTC (rev 9049) @@ -0,0 +1,32 @@ +<?php +/** + * Extended User Profile + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @package profile + * @since 2.3.0 + * @author Jan Pedersen + * @author Taiwen Jiang <ph...@us...> + * @version $Id: menu.php 2021 2008-08-31 02:02:45Z phppp $ + */ +$module_handler = xoops_gethandler('module'); +$GLOBALS['profileModule'] = $module_handler->getByDirname('sam'); +$adminmenu = array(); +$adminmenu[0]['title'] = _MI_SAM_DASHBOARD; +$adminmenu[0]['icon'] = '../../'.$GLOBALS['profileModule']->getInfo('icons32').'/about.png'; +$adminmenu[0]['image'] = '../../'.$GLOBALS['profileModule']->getInfo('icons32').'/about.png'; +$adminmenu[0]['link'] = "admin/index.php"; +$adminmenu[1]['title'] = _MI_SAM_ABOUT; +$adminmenu[1]['icon'] = '../../'.$GLOBALS['profileModule']->getInfo('icons32').'/about.png'; +$adminmenu[1]['image'] = '../../'.$GLOBALS['profileModule']->getInfo('icons32').'/about.png'; +$adminmenu[1]['link'] = "admin/about.php"; + +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.03/htdocs/modules/sam/blocks/index.html =================================================================== --- XoopsModules/sam/releases/1.03/htdocs/modules/sam/blocks/index.html (rev 0) +++ XoopsModules/sam/releases/1.03/htdocs/modules/sam/blocks/index.html 2012-02-22 17:58:44 UTC (rev 9049) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/sam/releases/1.03/htdocs/modules/sam/blocks/sam_block_currentsong.php =================================================================== --- XoopsModules/sam/releases/1.03/htdocs/modules/sam/blocks/sam_block_currentsong.php (rev 0) +++ XoopsModules/sam/releases/1.03/htdocs/modules/sam/blocks/sam_block_currentsong.php 2012-02-22 17:58:44 UTC (rev 9049) @@ -0,0 +1,35 @@ +<?php + + +function b_sam_block_currentsong_show( $options ) +{ + xoops_loadLanguage('blocks', 'sam'); + xoops_loadLanguage('modinfo', 'sam'); + + $songlist_handler = xoops_getmodulehandler('songlist', basename(dirname(dirname(__FILE__)))); + + $config_handler = xoops_gethandler('config'); + $module_handler = xoops_gethandler('module'); + $GLOBALS['samModule'] = $module_handler->getByDirname('sam'); + $GLOBALS['samModuleConfig'] = $config_handler->getConfigList($GLOBALS['samModule']->getVar('mid')); + + $block = array(); + $block = $GLOBALS['samModuleConfig']; + $currentSong = $songlist_handler->getCurrentSong(); + $block['currentSong'] = $currentSong->toArray(); + + $GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SAM_JS_JQUERY, array('type'=>'text/javascript'), '', 'jquery'); + $GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SAM_JS_JQUERY_CORNERS, array('type'=>'text/javascript'), '', 'jquery.corner'); + $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._BL_SAM_CSS_CURRENTSONG, array('type'=>'text/css'), '', 'currentsongcss'); + + return $block; +} + + +function b_sam_block_currentsong_edit( $options ) +{ + xoops_load('XoopsFormLoader'); + xoops_loadLanguage('blocks', 'sam'); + +} +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.03/htdocs/modules/sam/blocks/sam_block_navigation.php =================================================================== --- XoopsModules/sam/releases/1.03/htdocs/modules/sam/blocks/sam_block_navigation.php (rev 0) +++ XoopsModules/sam/releases/1.03/htdocs/modules/sam/blocks/sam_block_navigation.php 2012-02-22 17:58:44 UTC (rev 9049) @@ -0,0 +1,45 @@ +<?php + + +function b_sam_block_navigation_show( $options ) +{ + xoops_loadLanguage('blocks', 'sam'); + xoops_loadLanguage('modinfo', 'sam'); + + $config_handler = xoops_gethandler('config'); + $module_handler = xoops_gethandler('module'); + $GLOBALS['samModule'] = $module_handler->getByDirname('sam'); + $GLOBALS['samModuleConfig'] = $config_handler->getConfigList($GLOBALS['samModule']->getVar('mid')); + + $block = array(); + $block = $GLOBALS['samModuleConfig']; + + $block['allow_player'] = $options[0]; + $block['allow_nowplaying'] = $options[1]; + $block['allow_playlistrequest'] = $options[2]; + $block['allow_contactus'] = $options[3]; + + $GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SAM_JS_JQUERY, array('type'=>'text/javascript'), '', 'jquery'); + $GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SAM_JS_JQUERY_CORNERS, array('type'=>'text/javascript'), '', 'jquery.corner'); + $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._BL_SAM_CSS_NAVIGATION, array('type'=>'text/css'), '', 'navigationmenucss'); + return $block; +} + + +function b_sam_block_navigation_edit( $options ) +{ + xoops_load('XoopsFormLoader'); + xoops_loadLanguage('blocks', 'sam'); + + $allow_player = new XoopsFormRadioYN('', 'options[0]', $options[0]); + $allow_nowplaying = new XoopsFormRadioYN('', 'options[1]', $options[1]); + $allow_playlistrequest = new XoopsFormRadioYN('', 'options[2]', $options[2]); + $allow_contactus = new XoopsFormRadioYN('', 'options[3]', $options[3]); + + $form = _BL_SAM_ALLOW_PLAYER.$allow_player->render()."<br/>"; + $form .= _BL_SAM_ALLOW_NOWPLAYING.$allow_nowplaying->render()."<br/>"; + $form .= _BL_SAM_ALLOW_PLAYLISTREQUEST.$allow_playlistrequest->render()."<br/>"; + $form .= _BL_SAM_ALLOW_CONTACTUS.$allow_contactus->render()."<br/>"; + return $form ; +} +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.03/htdocs/modules/sam/blocks/sam_block_partnerlinks.php =================================================================== --- XoopsModules/sam/releases/1.03/htdocs/modules/sam/blocks/sam_block_partnerlinks.php (rev 0) +++ XoopsModules/sam/releases/1.03/htdocs/modules/sam/blocks/sam_block_partnerlinks.php 2012-02-22 17:58:44 UTC (rev 9049) @@ -0,0 +1,35 @@ +<?php + + +function b_sam_block_partnerlinks_show( $options ) +{ + xoops_loadLanguage('blocks', 'sam'); + xoops_loadLanguage('modinfo', 'sam'); + + $config_handler = xoops_gethandler('config'); + $module_handler = xoops_gethandler('module'); + $GLOBALS['samModule'] = $module_handler->getByDirname('sam'); + $GLOBALS['samModuleConfig'] = $config_handler->getConfigList($GLOBALS['samModule']->getVar('mid')); + + $block = array(); + $block = $GLOBALS['samModuleConfig']; + $block['username'] = $options[0]; + + $GLOBALS['xoTheme']->addScript(sprintf(_BL_SAM_ADDTHIS_JAVASCRIPT, $options[0]), array('type'=>'text/javascript')); + $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._BL_SAM_CSS_PARTNERSLINK, array('type'=>'text/css'), '', 'partnerlinkscss'); + + return $block; +} + + +function b_sam_block_partnerlinks_edit( $options ) +{ + xoops_load('XoopsFormLoader'); + xoops_loadLanguage('blocks', 'uitabs'); + + $username = new XoopsFormText('', 'options[0]', 25, 40, $options[0]); + + $form = _BL_SAM_ADDTHIS_USERNAME.$username->render()."<br/>"; + return $form ; +} +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.03/htdocs/modules/sam/blocks/sam_block_toprequests.php =================================================================== --- XoopsModules/sam/releases/1.03/htdocs/modules/sam/blocks/sam_block_toprequests.php (rev 0) +++ XoopsModules/sam/releases/1.03/htdocs/modules/sam/blocks/sam_block_toprequests.php 2012-02-22 17:58:44 UTC (rev 9049) @@ -0,0 +1,37 @@ +<?php + + +function b_sam_block_toprequests_show( $options ) +{ + xoops_loadLanguage('blocks', 'sam'); + xoops_loadLanguage('modinfo', 'sam'); + + $songlist_handler = xoops_getmodulehandler('songlist', basename(dirname(dirname(__FILE__)))); + + $config_handler = xoops_gethandler('config'); + $module_handler = xoops_gethandler('module'); + $GLOBALS['samModule'] = $module_handler->getByDirname('sam'); + $GLOBALS['samModuleConfig'] = $config_handler->getConfigList($GLOBALS['samModule']->getVar('mid')); + + $block = array(); + $block = $GLOBALS['samModuleConfig']; + + foreach ($songlist_handler->getTopRequestedSongs() as $id=>$topRequestedSong) { + $block['topRequestedSongs'][$id] = $topRequestedSong->toArray(); + } + + $GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SAM_JS_JQUERY, array('type'=>'text/javascript'), '', 'jquery'); + $GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SAM_JS_JQUERY_CORNERS, array('type'=>'text/javascript'), '', 'jquery.corner'); + $GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SAM_JS_COMMON, array('type'=>'text/javascript'), '', 'common'); + $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._BL_SAM_CSS_TOPREQUESTS, array('type'=>'text/css'), '', 'toprequestcss'); + return $block; +} + + +function b_sam_block_toprequests_edit( $options ) +{ + xoops_load('XoopsFormLoader'); + xoops_loadLanguage('blocks', 'sam'); + +} +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/adz.php =================================================================== --- XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/adz.php (rev 0) +++ XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/adz.php 2012-02-22 17:58:44 UTC (rev 9049) @@ -0,0 +1,83 @@ +<?php +// $Autho: wishcraft $ + +if (!defined('XOOPS_ROOT_PATH')) { + exit(); +} + +include_once dirname(__FILE__).'/object.php'; +/** + * Class for compunds + * @author Simon Roberts <si...@xo...> + * @copyright copyright (c) 2009-2003 XOOPS.org + * @package kernel + */ +class SamAdz extends SamObject +{ + + function SamAdz($id = null) + { + $this->initVar('ID', XOBJ_DTYPE_INT, null, false); + $this->initVar('PROVIDERID', XOBJ_DTYPE_INT, null, false); + $this->initVar('CAMPAIGNID', XOBJ_DTYPE_INT, null, false); + $this->initVar('CATEGORYID', XOBJ_DTYPE_INT, null, false); + $this->initVar('DATE_START', XOBJ_DTYPE_TXTBOX, null, false, 10); + $this->initVar('DATE_END', XOBJ_DTYPE_TXTBOX, null, false, 10); + $this->initVar('SONGTYPE', XOBJ_DTYPE_TXTBOX, "A", false, 1); + $this->initVar('LOCALFILENAME', XOBJ_DTYPE_TXTBOX, null, false, 200); + $this->initVar('LOCALSTATUS', XOBJ_DTYPE_TXTBOX, 'download', false, 10); + $this->initVar('DOWNLOAD_URL', XOBJ_DTYPE_TXTBOX, null, false, 200); + $this->initVar('LASTUPDATE', XOBJ_DTYPE_TXTBOX, null, false, 19); + $this->initVar('DESCRIPTION', XOBJ_DTYPE_TXTBOX, null, false, 100); + $this->initVar('DATE_END', XOBJ_DTYPE_TXTBOX, null, false, 10); + $this->initVar('CAMPAIGNACTIVE', XOBJ_DTYPE_TXTBOX, 'yes', false, 3); + $this->initVar('STATUS', XOBJ_DTYPE_TXTBOX, 'active', false, 10); + $this->initVar('WEIGHT', XOBJ_DTYPE_DECIMAL, null, false); + $this->initVar('GLOBALWEIGHT', XOBJ_DTYPE_DECIMAL, null, false); + $this->initVar('DURATION', XOBJ_DTYPE_INT, null, false); + $this->initVar('FILESIZE', XOBJ_DTYPE_INT, null, false); + $this->initVar('DATE_PLAYED', XOBJ_DTYPE_TXTBOX, null, false, 19); + $this->initVar('DATE_CATEGORY_PLAYED', XOBJ_DTYPE_TXTBOX, null, false, 19); + $this->initVar('DATE_CAMPAIGN_PLAYED', XOBJ_DTYPE_TXTBOX, null, false, 19); + $this->initVar('DATE_VALID', XOBJ_DTYPE_TXTBOX, null, false, 19); + $this->initVar('SPINS', XOBJ_DTYPE_INT, null, false); + $this->initVar('PERFORMANCES', XOBJ_DTYPE_INT, null, false); + $this->initVar('SPINS_MAX', XOBJ_DTYPE_INT, null, false); + $this->initVar('cap_day', XOBJ_DTYPE_INT, null, false); + $this->initVar('cap_day_cnt', XOBJ_DTYPE_INT, null, false); + $this->initVar('DAYS', XOBJ_DTYPE_TXTBOX, null, false, 100); + $this->initVar('HOURS', XOBJ_DTYPE_TXTBOX, null, false, 100); + $this->initVar('BLOCKED', XOBJ_DTYPE_TXTBOX, null, false, 3); + $this->initVar('LOCALWEIGHT', XOBJ_DTYPE_DECIMAL, null, false); + $this->initVar('LOCALBALANCE', XOBJ_DTYPE_DECIMAL, null, false); + $this->initVar('SORTID', XOBJ_DTYPE_DECIMAL, null, false); + $this->initVar('EXTERNALID', XOBJ_DTYPE_INT, null, false); + $this->initVar('SYNCINFO', XOBJ_DTYPE_TXTBOX, null, false, 200); + $this->initVar('PROGRESS', XOBJ_DTYPE_DECIMAL, null, false); + $this->initVar('timematrix', XOBJ_DTYPE_OTHER, null, false); + $this->initVar('min_separation', XOBJ_DTYPE_INT, null, false); + $this->initVar('min_separation_campaign', XOBJ_DTYPE_INT, null, false); + + } + +} + + +/** +* XOOPS policies handler class. +* This class is responsible for providing data access mechanisms to the data source +* of XOOPS user class objects. +* +* @author Simon Roberts <si...@ch...> +* @package kernel +*/ +class SamAdzHandler extends SamPersistableObjectHandler +{ + function __construct(&$db) + { + $this->db = $db =& SamDatabaseFactory::getDatabaseConnection(); + parent::__construct($db, "adz", 'SamAdz', "ID", "PROVIDERID"); + } +} + +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/category.php =================================================================== --- XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/category.php (rev 0) +++ XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/category.php 2012-02-22 17:58:44 UTC (rev 9049) @@ -0,0 +1,48 @@ +<?php +// $Autho: wishcraft $ + +if (!defined('XOOPS_ROOT_PATH')) { + exit(); +} + +include_once dirname(__FILE__).'/object.php'; +/** + * Class for compunds + * @author Simon Roberts <si...@xo...> + * @copyright copyright (c) 2009-2003 XOOPS.org + * @package kernel + */ +class SamCategory extends SamObject +{ + + function SamCategory($id = null) + { + $this->initVar('ID', XOBJ_DTYPE_INT, null, false); + $this->initVar('name', XOBJ_DTYPE_TXTBOX, null, false, 100); + $this->initVar('parentID', XOBJ_DTYPE_INT, null, false); + $this->initVar('levelindex', XOBJ_DTYPE_INT, null, false); + $this->initVar('itemindex', XOBJ_DTYPE_INT, null, false); + + } + +} + + +/** +* XOOPS policies handler class. +* This class is responsible for providing data access mechanisms to the data source +* of XOOPS user class objects. +* +* @author Simon Roberts <si...@ch...> +* @package kernel +*/ +class SamCategoryHandler extends SamPersistableObjectHandler +{ + function __construct(&$db) + { + $this->db = $db =& SamDatabaseFactory::getDatabaseConnection(); + parent::__construct($db, "category", 'SamCategory', "ID", "name"); + } +} + +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/categorylist.php =================================================================== --- XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/categorylist.php (rev 0) +++ XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/categorylist.php 2012-02-22 17:58:44 UTC (rev 9049) @@ -0,0 +1,47 @@ +<?php +// $Autho: wishcraft $ + +if (!defined('XOOPS_ROOT_PATH')) { + exit(); +} + +include_once dirname(__FILE__).'/object.php'; +/** + * Class for compunds + * @author Simon Roberts <si...@xo...> + * @copyright copyright (c) 2009-2003 XOOPS.org + * @package kernel + */ +class SamCategorylist extends SamObject +{ + + function SamCategorylist($id = null) + { + $this->initVar('ID', XOBJ_DTYPE_INT, null, false); + $this->initVar('songID', XOBJ_DTYPE_INT, null, false); + $this->initVar('categoryID', XOBJ_DTYPE_INT, null, false); + $this->initVar('sortID', XOBJ_DTYPE_DECIMAL, null, false); + + } + +} + + +/** +* XOOPS policies handler class. +* This class is responsible for providing data access mechanisms to the data source +* of XOOPS user class objects. +* +* @author Simon Roberts <si...@ch...> +* @package kernel +*/ +class SamCategorylistHandler extends SamPersistableObjectHandler +{ + function __construct(&$db) + { + $this->db = $db =& SamDatabaseFactory::getDatabaseConnection(); + parent::__construct($db, "categorylist", 'SamCategorylist', "ID", "sortID"); + } +} + +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/database/database.php =================================================================== --- XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/database/database.php (rev 0) +++ XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/database/database.php 2012-02-22 17:58:44 UTC (rev 9049) @@ -0,0 +1,114 @@ +<?php +/** + * Abstract base class for XOOPS Database access classes + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package kernel + * @subpackage database + * @since 1.0.0 + * @author Kazumi Ono <on...@xo...> + * @version $Id: database.php 8066 2011-11-06 05:09:33Z beckmi $ + */ + +defined('XOOPS_ROOT_PATH') or die('Restricted access'); + +/** + * make sure this is only included once! + */ +if (defined('SAM_C_DATABASE_INCLUDED')) { + return; +} + +define('SAM_C_DATABASE_INCLUDED', 1); + +/** + * Abstract base class for Database access classes + * + * @abstract + * @author Kazumi Ono <on...@xo...> + * @package kernel + * @subpackage database + */ +class SamDatabase +{ + /** + * Prefix for tables in the database + * + * @var string + */ + var $prefix = ''; + + /** + * reference to a {@link SamLogger} object + * + * @see SamLogger + * @var object SamLogger + */ + var $logger; + + /** + * If statements that modify the database are selected + * + * @var boolean + */ + var $allowWebChanges = false; + + /** + * constructor + * + * will always fail, because this is an abstract class! + */ + function SamDatabase() + { + // exit('Cannot instantiate this class directly'); + } + + /** + * assign a {@link SamLogger} object to the database + * + * @see SamLogger + * @param object $logger reference to a {@link SamLogger} object + */ + + function setLogger(&$logger) + { + $this->logger = &$logger; + } + + /** + * set the prefix for tables in the database + * + * @param string $value table prefix + */ + function setPrefix($value) + { + $this->prefix = $value; + } + + /** + * attach the prefix.'_' to a given tablename + * + * if tablename is empty, only prefix will be returned + * + * @param string $tablename tablename + * @return string prefixed tablename, just prefix if tablename is empty + */ + function prefix($tablename = '') + { + if ($tablename != '') { + return $this->prefix . '_' . $tablename; + } else { + return $this->prefix; + } + } +} + +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/database/databasefactory.php =================================================================== --- XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/database/databasefactory.php (rev 0) +++ XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/database/databasefactory.php 2012-02-22 17:58:44 UTC (rev 9049) @@ -0,0 +1,108 @@ +<?php +/** + * Factory Class for XOOPS Database + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package kernel + * @subpackage database + * @version $Id: databasefactory.php 8066 2011-11-06 05:09:33Z beckmi $ + */ +defined('XOOPS_ROOT_PATH') or die('Restricted access'); + +/** + * SamDatabaseFactory + * + * @package Kernel + * @author Kazumi Ono <on...@xo...> + * @access public + */ +class SamDatabaseFactory +{ + /** + * SamDatabaseFactory::SamDatabaseFactory() + */ + function SamDatabaseFactory() + { + if (!isset($GLOBALS['samModuleConfig'])||!is_array($GLOBALS['samModuleConfig'])) { + $config_handler = xoops_gethandler('config'); + $module_handler = xoops_gethandler('module'); + $GLOBALS['samModule'] = $module_handler->getDirname('sam'); + $GLOBALS['samModuleConfig'] = $config_handler->getConfigList($GLOBALS['samModule']->getVar('mid')); + } + } + + /** + * Get a reference to the only instance of database class and connects to DB + * + * if the class has not been instantiated yet, this will also take + * care of that + * + * @static + * @staticvar object The only instance of database class + * @return object Reference to the only instance of database class + */ + function &getDatabaseConnection() + { + + static $instance; + if (!isset($instance)) { + if (file_exists($file = XOOPS_ROOT_PATH . '/modules/sam/class/database/' . $GLOBALS['samModuleConfig']['db_type'] . 'database.php')) { + require_once $file; + if (!$GLOBALS['samModuleConfig']['db_proxy']) { + $class = 'Sam' . ucfirst($GLOBALS['samModuleConfig']['db_type']) . 'DatabaseSafe'; + } else { + $class = 'Sam' . ucfirst($GLOBALS['samModuleConfig']['db_type']) . 'DatabaseProxy'; + } + $xoopsPreload =& XoopsPreload::getInstance(); + $xoopsPreload->triggerEvent('sam.class.database.databasefactory.connection', array(&$class)); + $instance = new $class(); + $instance->setLogger(XoopsLogger::getInstance()); + $instance->setPrefix($GLOBALS['samModuleConfig']['db_prefix']); + if (!$instance->connect()) { + trigger_error('notrace:Unable to connect to SAM database, please check database settings for the SAM Module in the module preferences!', E_USER_ERROR); + } + } else { + trigger_error('notrace:Failed to load database of type: ' . $GLOBALS['samModuleConfig']['db_type'] . ' in file: ' . __FILE__ . ' at line ' . __LINE__, E_USER_WARNING); + } + } + return $instance; + } + + /** + * Gets a reference to the only instance of database class. Currently + * only being used within the installer. + * + * @static + * @staticvar object The only instance of database class + * @return object Reference to the only instance of database class + */ + function &getDatabase() + { + static $database; + if (!isset($database)) { + if (file_exists($file = XOOPS_ROOT_PATH . '/modules/sam/class/database/' . $GLOBALS['samModuleConfig']['db_type'] . 'database.php')) { + include_once $file; + if (!$GLOBALS['samModuleConfig']['db_proxy']) { + $class = 'Sam' . ucfirst($GLOBALS['samModuleConfig']['db_type']) . 'DatabaseSafe'; + } else { + $class = 'Sam' . ucfirst($GLOBALS['samModuleConfig']['db_type']) . 'DatabaseProxy'; + } + unset($database); + $database = new $class(); + } else { + trigger_error('notrace:Failed to load database of type: ' . $GLOBALS['samModuleConfig']['db_type'] . ' in file: ' . __FILE__ . ' at line ' . __LINE__, E_USER_WARNING); + } + } + return $database; + } +} + +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/database/index.html =================================================================== --- XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/database/index.html (rev 0) +++ XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/database/index.html 2012-02-22 17:58:44 UTC (rev 9049) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/database/mysqldatabase.php =================================================================== --- XoopsModules/sam/releases/1.03/htdocs/modules/sam/class/database/mysqldatabase.php (rev 0) +++ XoopsModules/sam/rele... [truncated message content] |
From: <be...@us...> - 2012-02-22 11:38:24
|
Revision: 9048 http://xoops.svn.sourceforge.net/xoops/?rev=9048&view=rev Author: beckmi Date: 2012-02-22 11:38:11 +0000 (Wed, 22 Feb 2012) Log Message: ----------- Conversion to 2.5.x GUI Modified Paths: -------------- XoopsModules/defacer/branches/mamba/defacer/admin/admin_header.php XoopsModules/defacer/branches/mamba/defacer/admin/admin_meta.php XoopsModules/defacer/branches/mamba/defacer/admin/admin_page.php XoopsModules/defacer/branches/mamba/defacer/admin/admin_permission.php XoopsModules/defacer/branches/mamba/defacer/admin/admin_theme.php XoopsModules/defacer/branches/mamba/defacer/admin/index.php XoopsModules/defacer/branches/mamba/defacer/admin/menu.php XoopsModules/defacer/branches/mamba/defacer/language/english/admin.php XoopsModules/defacer/branches/mamba/defacer/language/english/modinfo.php XoopsModules/defacer/branches/mamba/defacer/templates/defacer_admin_meta.html XoopsModules/defacer/branches/mamba/defacer/templates/defacer_admin_page.html XoopsModules/defacer/branches/mamba/defacer/templates/defacer_admin_permission.html XoopsModules/defacer/branches/mamba/defacer/templates/defacer_admin_theme.html XoopsModules/defacer/branches/mamba/defacer/xoops_version.php Added Paths: ----------- XoopsModules/defacer/branches/mamba/defacer/admin/about.php XoopsModules/defacer/branches/mamba/defacer/admin/admin_footer.php XoopsModules/defacer/branches/mamba/defacer/docs/ XoopsModules/defacer/branches/mamba/defacer/docs/changelog.txt XoopsModules/defacer/branches/mamba/defacer/docs/credits.txt XoopsModules/defacer/branches/mamba/defacer/docs/index.html XoopsModules/defacer/branches/mamba/defacer/docs/install.txt XoopsModules/defacer/branches/mamba/defacer/docs/lang_diff.txt XoopsModules/defacer/branches/mamba/defacer/docs/licence.txt XoopsModules/defacer/branches/mamba/defacer/docs/readme.txt XoopsModules/defacer/branches/mamba/defacer/language/english/help/ XoopsModules/defacer/branches/mamba/defacer/language/english/help/help.html XoopsModules/defacer/branches/mamba/defacer/language/english/help/index.html Added: XoopsModules/defacer/branches/mamba/defacer/admin/about.php =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/admin/about.php (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/admin/about.php 2012-02-22 11:38:11 UTC (rev 9048) @@ -0,0 +1,29 @@ +<?php +/** + * Marquee module + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project (http://www.xoops.org) + * @license GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html/) + * @package Marquee + * @since 2.5.0 + * @author Mage, Mamba + * @version $Id $ + **/ + +include_once dirname(__FILE__) . '/admin_header.php'; + +xoops_cp_header(); + +$aboutAdmin = new ModuleAdmin(); + +echo $aboutAdmin->addNavigation('about.php'); +echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false); + +include 'admin_footer.php'; \ No newline at end of file Added: XoopsModules/defacer/branches/mamba/defacer/admin/admin_footer.php =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/admin/admin_footer.php (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/admin/admin_footer.php 2012-02-22 11:38:11 UTC (rev 9048) @@ -0,0 +1,27 @@ +<?php +/** + * Marquee module + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @package Marquee + * @since 2.5.0 + * @author Mamba (www.xoops.org) + * @version $Id $ +**/ + +echo "<div class='adminfooter'>\n" + ." <div style='text-align: center;'>\n" + ." <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" + ." </div>\n" + ." " . _AM_DEFACER_FOOTER . "\n" + ."</div>"; + +xoops_cp_footer(); \ No newline at end of file Modified: XoopsModules/defacer/branches/mamba/defacer/admin/admin_header.php =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/admin/admin_header.php 2012-02-22 11:34:02 UTC (rev 9047) +++ XoopsModules/defacer/branches/mamba/defacer/admin/admin_header.php 2012-02-22 11:38:11 UTC (rev 9048) @@ -18,8 +18,13 @@ * @version $Id: admin_header.php 0 2009-06-11 18:47:04Z trabis $ */ -require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php'; -require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php'; +//require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php'; +//require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php'; +$path = dirname(dirname(dirname(dirname(__FILE__)))); +include_once $path . '/mainfile.php'; +include_once $path . '/include/cp_functions.php'; +require_once $path . '/include/cp_header.php'; +require_once $path . '/class/xoopsformloader.php'; include_once dirname(dirname(__FILE__)) . '/include/common.php'; include_once dirname(__FILE__) . '/admin_functions.php'; @@ -28,4 +33,25 @@ include_once XOOPS_ROOT_PATH . '/class/template.php'; $xoopsTpl = new XoopsTpl(); } -?> + +global $xoopsModule; + +$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname'); + +//if functions.php file exist +require_once dirname(dirname(__FILE__)) . '/include/functions.php'; + +// Load language files +xoops_loadLanguage('admin', $thisModuleDir); +xoops_loadLanguage('modinfo', $thisModuleDir); +xoops_loadLanguage('main', $thisModuleDir); + +$pathIcon16 = '../'.$xoopsModule->getInfo('icons16'); +$pathIcon32 = '../'.$xoopsModule->getInfo('icons32'); +$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin'); + +if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){ + include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'); + }else{ + redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false); + } \ No newline at end of file Modified: XoopsModules/defacer/branches/mamba/defacer/admin/admin_meta.php =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/admin/admin_meta.php 2012-02-22 11:34:02 UTC (rev 9047) +++ XoopsModules/defacer/branches/mamba/defacer/admin/admin_meta.php 2012-02-22 11:38:11 UTC (rev 9048) @@ -28,11 +28,13 @@ $start = isset($_REQUEST['start']) ? intval($_REQUEST['start']) : 0; $itemid = isset($_REQUEST['meta_id']) ? intval($_REQUEST['meta_id']) : $itemid; +$indexAdmin = new ModuleAdmin(); switch ($op) { case 'list': xoops_cp_header(); - defacer_adminMenu(2); + echo $indexAdmin->addNavigation('admin_meta.php'); + //defacer_adminMenu(2); echo defacer_index($start, $limit); xoops_cp_footer(); break; @@ -41,7 +43,8 @@ break; case 'edit': xoops_cp_header(); - defacer_adminMenu(2); + echo $indexAdmin->addNavigation('admin_meta.php'); + //defacer_adminMenu(2); echo defacer_form($itemid); xoops_cp_footer(); break; Modified: XoopsModules/defacer/branches/mamba/defacer/admin/admin_page.php =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/admin/admin_page.php 2012-02-22 11:34:02 UTC (rev 9047) +++ XoopsModules/defacer/branches/mamba/defacer/admin/admin_page.php 2012-02-22 11:38:11 UTC (rev 9048) @@ -28,10 +28,14 @@ $start = isset($_REQUEST['start']) ? intval($_REQUEST['start']) : 0; $query = isset($_REQUEST['query']) ? trim($_REQUEST['query']) : ''; +$indexAdmin = new ModuleAdmin(); + + switch ($op) { case 'list': xoops_cp_header(); - defacer_adminMenu(0); + echo $indexAdmin->addNavigation('admin_page.php'); + //defacer_adminMenu(0); echo defacer_index($start, $limit, $query); xoops_cp_footer(); break; @@ -40,7 +44,8 @@ break; case 'edit': xoops_cp_header(); - defacer_adminMenu(0); + echo $indexAdmin->addNavigation('admin_page.php'); + //defacer_adminMenu(0); echo defacer_form($itemid); xoops_cp_footer(); break; Modified: XoopsModules/defacer/branches/mamba/defacer/admin/admin_permission.php =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/admin/admin_permission.php 2012-02-22 11:34:02 UTC (rev 9047) +++ XoopsModules/defacer/branches/mamba/defacer/admin/admin_permission.php 2012-02-22 11:38:11 UTC (rev 9048) @@ -28,11 +28,13 @@ $start = isset($_REQUEST['start']) ? intval($_REQUEST['start']) : 0; $itemid = isset($_REQUEST['permission_id']) ? intval($_REQUEST['permission_id']) : $itemid; +$indexAdmin = new ModuleAdmin(); switch ($op) { case 'list': xoops_cp_header(); - defacer_adminMenu(1); + echo $indexAdmin->addNavigation('admin_permission.php'); + //defacer_adminMenu(1); echo defacer_index($start, $limit); xoops_cp_footer(); break; @@ -41,7 +43,8 @@ break; case 'edit': xoops_cp_header(); - defacer_adminMenu(1); + echo $indexAdmin->addNavigation('admin_permission.php'); + //defacer_adminMenu(1); echo defacer_form($itemid); xoops_cp_footer(); break; Modified: XoopsModules/defacer/branches/mamba/defacer/admin/admin_theme.php =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/admin/admin_theme.php 2012-02-22 11:34:02 UTC (rev 9047) +++ XoopsModules/defacer/branches/mamba/defacer/admin/admin_theme.php 2012-02-22 11:38:11 UTC (rev 9048) @@ -29,10 +29,13 @@ $itemid = isset($_REQUEST['theme_id']) ? intval($_REQUEST['theme_id']) : $itemid; +$indexAdmin = new ModuleAdmin(); + switch ($op) { case 'list': xoops_cp_header(); - defacer_adminMenu(1); + echo $indexAdmin->addNavigation('admin_theme.php'); + //defacer_adminMenu(1); echo defacer_index($start, $limit); xoops_cp_footer(); break; @@ -41,7 +44,8 @@ break; case 'edit': xoops_cp_header(); - defacer_adminMenu(1); + echo $indexAdmin->addNavigation('admin_theme.php'); + //defacer_adminMenu(1); echo defacer_form($itemid); xoops_cp_footer(); break; Modified: XoopsModules/defacer/branches/mamba/defacer/admin/index.php =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/admin/index.php 2012-02-22 11:34:02 UTC (rev 9047) +++ XoopsModules/defacer/branches/mamba/defacer/admin/index.php 2012-02-22 11:38:11 UTC (rev 9048) @@ -18,5 +18,15 @@ * @version $Id: index.php 0 2009-06-11 18:47:04Z trabis $ */ -include dirname(__FILE__) . '/admin_page.php'; -?> \ No newline at end of file + +require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php'; +include_once dirname(__FILE__) . '/admin_header.php'; + +xoops_cp_header(); + + $indexAdmin = new ModuleAdmin(); + + echo $indexAdmin->addNavigation('index.php'); + echo $indexAdmin->renderIndex(); + +include "admin_footer.php"; \ No newline at end of file Modified: XoopsModules/defacer/branches/mamba/defacer/admin/menu.php =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/admin/menu.php 2012-02-22 11:34:02 UTC (rev 9047) +++ XoopsModules/defacer/branches/mamba/defacer/admin/menu.php 2012-02-22 11:38:11 UTC (rev 9048) @@ -20,25 +20,44 @@ defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined"); +$dirname = basename(dirname(dirname(__FILE__))); +$module_handler = xoops_gethandler('module'); +$module = $module_handler->getByDirname($dirname); +$pathIcon32 = $module->getInfo('icons32'); + +$adminmenu = array(); + $i = -1; $i++; +$adminmenu[$i]['title'] = _MI_DEFACER_HOME; +$adminmenu[$i]['link'] = "admin/index.php"; +$adminmenu[$i]['icon'] = $pathIcon32.'/home.png' ; + +$i++; $adminmenu[$i]['title'] = _MI_DEFACER_PAGEMANAGER; $adminmenu[$i]['link'] = "admin/admin_page.php"; +$adminmenu[$i]['icon'] = $pathIcon32.'/index.png' ; $i++; $adminmenu[$i]['title'] = _MI_DEFACER_THEMEMANAGER; $adminmenu[$i]['link'] = "admin/admin_theme.php"; - +$adminmenu[$i]['icon'] = $pathIcon32.'/watermark.png' ; $i++; $adminmenu[$i]['title'] = _MI_DEFACER_METAMANAGER; $adminmenu[$i]['link'] = "admin/admin_meta.php"; +$adminmenu[$i]['icon'] = $pathIcon32.'/administration.png' ; $i++; $adminmenu[$i]['title'] = _MI_DEFACER_PERMISSIONMANAGER; $adminmenu[$i]['link'] = "admin/admin_permission.php"; +$adminmenu[$i]['icon'] = $pathIcon32.'/permissions.png' ; $i++; $adminmenu[$i]['title'] = _MI_DEFACER_ABOUT; -$adminmenu[$i]['link'] = "admin/admin_about.php"; +$adminmenu[$i]['link'] = 'admin/about.php'; +$adminmenu[$i]['icon'] = $pathIcon32.'/about.png'; -?> \ No newline at end of file +//$i++; +//$adminmenu[$i]['title'] = _MI_DEFACER_ABOUT; +//$adminmenu[$i]['link'] = "admin/admin_about.php"; +//$adminmenu[$i]['icon'] = $pathIcon32.'/about.png'; \ No newline at end of file Added: XoopsModules/defacer/branches/mamba/defacer/docs/changelog.txt =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/docs/changelog.txt (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/docs/changelog.txt 2012-02-22 11:38:11 UTC (rev 9048) @@ -0,0 +1,22 @@ +<b><u>=> Version 1.1 RC (2012-02-22)</u></b> +Converted to XOOPS 2.5.x GUI (mamba) + +<b><u>=> Version 1.0 Final (2009-09-05)</u></b> +Added : jgrowl redirection. +Added : blocks anywhere. + +<b><u>=> Version 1.0 RC (2009-09-01)</u></b> +Improved : Refactored admin area. +Added : Defacer in xoopsLogger Extra. + +<b><u>=> Version 1.0 Alpha (2008-10-27)</u></b> +- First public release of the module. +<b><u>=> Version 1.0 Beta (2008-11-08)</u></b> +Improved : More friendly admin area. +Improved : Less queries needed. +Improved : Less language definitions needed. +Added : Defacer in xoopsLogger. +Added : Settings to disable each Defacer actions. + +<b><u>=> Version 1.0 Alpha (2008-10-27)</u></b> +- First public release of the module. Added: XoopsModules/defacer/branches/mamba/defacer/docs/credits.txt =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/docs/credits.txt (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/docs/credits.txt 2012-02-22 11:38:11 UTC (rev 9048) @@ -0,0 +1,6 @@ +Credits +=============== + +Originally developed by Herv\xE9 Thouzard (hervet), + +Updated to XOOPS 2.5.0 Standard GUI by Michael Beck (Mamba), with contributions by Gregory Mage (Mage) \ No newline at end of file Added: XoopsModules/defacer/branches/mamba/defacer/docs/index.html =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/docs/index.html (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/docs/index.html 2012-02-22 11:38:11 UTC (rev 9048) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/defacer/branches/mamba/defacer/docs/install.txt =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/docs/install.txt (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/docs/install.txt 2012-02-22 11:38:11 UTC (rev 9048) @@ -0,0 +1,6 @@ +INSTALL/UNISTALL +================= + +No special measures necessary, follow the standard installation process \x96 extract the /marquee folder into the ../modules directory. Install the module through Admin -> System Module -> Modules. + +Detailed instructions on installing modules are available in the XOOPS Operations Manual: http://goo.gl/adT2i \ No newline at end of file Added: XoopsModules/defacer/branches/mamba/defacer/docs/lang_diff.txt =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/docs/lang_diff.txt (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/docs/lang_diff.txt 2012-02-22 11:38:11 UTC (rev 9048) @@ -0,0 +1,4 @@ +LANGUAGE DIFFERENCES +===================== + +Below are language differences from a version to next version. \ No newline at end of file Added: XoopsModules/defacer/branches/mamba/defacer/docs/licence.txt =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/docs/licence.txt (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/docs/licence.txt 2012-02-22 11:38:11 UTC (rev 9048) @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. Added: XoopsModules/defacer/branches/mamba/defacer/docs/readme.txt =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/docs/readme.txt (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/docs/readme.txt 2012-02-22 11:38:11 UTC (rev 9048) @@ -0,0 +1,91 @@ +What is Defacer Module (v1.0 Final) ? +====================== + +With this Xoops module, your can: +- change themes, metadata and permissions for any given page. +- enable jgrowl redirection system (xoops 2.4 only) +- use blocks anywhere (xoops 2.4 only) + + + +Requirements +==================== + +Works in 2.4.x, xoops 2.3.x, xoops 2.2.x, xoops 2.0.18 & up, impresscms 1.x + +Others cms versions were not tested. + +Php5 only + + + + +How to install Defacer +==================== + +Copy defacer folder into the /modules directory of your website. +Then log in to your site as administrator, go to System Admin > Modules, look for the defacer +icon in the list of uninstalled modules and click in the install icon. +Follow the directions in the screen. + + +ATENTION, if you are NOT using xoops 2.4 or impressCms 1.1 +you have to add a line in header.php and footer.php at the root of your instalation + +In yoursite/header.php paste the line + +@include_once XOOPS_ROOT_PATH . '/modules/defacer/include/beforeheader.php'; + +right after + +defined("XOOPS_ROOT_PATH") or die( 'XOOPS root path not defined' ); + +In yoursite/footer.php paste the line + +@include_once XOOPS_ROOT_PATH . '/modules/defacer/include/beforefooter.php'; + +right after + +if (!defined("XOOPS_ROOT_PATH")) { + die("XOOPS root path not defined"); +} + + + + +Tips +======= +When creating pages you can use '*' symbol in the url field to match any url. + +You should use relative paths +If you select news module your path will be related to yoursite/module/news/ +You should add for example +index.php and not modules/news/index.php + +System module is relative to root +You can select system module and enter this url to cover all userinfo pages: +userinfo.php* + +Tips for blocks anywhere (xoops 2.4 only) +========= +Just prefix your block title with an underscore and you will be able to use it +has a smarty variable inside your theme or template +Example: +-Edit User menu block and rename it to _User Menu +-Take notice of the "bid" in the url, in this case it is '1': + modules/system/admin.php?fct=blocksadmin&op=edit&bid=1 +-Usage on theme/template: +<{$xoops_block_1.title}> --> echos User Menu +<{$xoops_block_1.content}> --> echos the block content + +Limitations +======== + +The block for changing themes is deactivated when using Defacer Theme Changer. + + + +Feedback +======== + +Please use http://www.xuups.com (xoops user utilities) \ No newline at end of file Modified: XoopsModules/defacer/branches/mamba/defacer/language/english/admin.php =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/language/english/admin.php 2012-02-22 11:34:02 UTC (rev 9047) +++ XoopsModules/defacer/branches/mamba/defacer/language/english/admin.php 2012-02-22 11:38:11 UTC (rev 9048) @@ -39,4 +39,11 @@ define("_AM_DEFACER_PERMISSIONMAN","Permission Manager"); define("_AM_DEFACER_PERMISSION_GROUPS","Permited Groups"); -?> + +//1.1 + +//ModuleAdmin +define('_AM_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)'); + +// Text for Admin footer +define("_AM_DEFACER_FOOTER", "<div class='center smallsmall italic pad5'>Defacer is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>"); Added: XoopsModules/defacer/branches/mamba/defacer/language/english/help/help.html =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/language/english/help/help.html (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/language/english/help/help.html 2012-02-22 11:38:11 UTC (rev 9048) @@ -0,0 +1,80 @@ +<div id="help-template" class="outer"> + <h1 class="head">Help: + <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/defacer/admin/index.php" + title="Back to the administration of Defacer"> Defacer + <img src="<{xoAdminIcons home.png}>" + alt="Back to the Administration of Defacer"/> + </a></h1> + + <h4 class="odd">Description</h4> + + <p>Defacer is a new revolutionary XOOPS module that allows you to change themes, metadata and + permissions for any given page on the XOOPS-based Website, thus giving you a level of control and customization + not seen before. </p> + + <p>It also comes with jgrowl redirection system and the ability of using blocks anywhere in your theme and + templates </p><br/> + + <p> + With this Xoops module, your can: + <ul> + <li>change themes, metadata and permissions for any given page.</li> + <li>enable jgrowl redirection system</li> + <li>use blocks anywhere</li> + </ul> + </p> + + <h4 class="odd">Install/uninstall</h4> + + <p class="even">Copy Defacer folder into the /modules directory of your website. + Then log in to your site as administrator, go to System Admin > Modules, look for the defacer + icon in the list of uninstalled modules and click in the install icon. + Follow the directions in the screen.<br/> <br/> + Detailed instructions on installing modules are available in the + <a href="http://goo.gl/adT2i">XOOPS Operations Manual</a></p> + + + <h4 class="odd">Operating instructions</h4> + + <p class="even"> + When creating pages you can use '*' symbol in the url field to match any url. + + You should use relative paths + If you select news module your path will be related to yoursite/module/news/ + You should add for example + index.php and not modules/news/index.php<br/> <br/> + + System module is relative to root + You can select system module and enter this url to cover all userinfo pages: + userinfo.php*<br/> <br/> + + Tips for blocks anywhere (xoops 2.4 only)<br/> + =========<br/> <br/> + Just prefix your block title with an underscore and you will be able to use it + has a smarty variable inside your theme or template <br/> + Example: <br/> + -Edit User menu block and rename it to _User Menu <br/> + -Take notice of the "bid" in the url, in this case it is '1': + modules/system/admin.php?fct=blocksadmin&op=edit&bid=1 <br/> + -Usage on theme/template: <br/> + < {$xoops_block_1.title} > --> echos User Menu <br/> + < {$xoops_block_1.content} > --> echos the block content + + </p> + + <h4 class="odd">Limitations</h4> + + <p class="even"> + The block for changing themes is deactivated when using Defacer Theme Changer. + + </p> + + <h4 class="odd">Tutorial</h4> + + <p class="even"> + Currently no tutorial is available. + + </p> + + +</div> \ No newline at end of file Added: XoopsModules/defacer/branches/mamba/defacer/language/english/help/index.html =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/language/english/help/index.html (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/language/english/help/index.html 2012-02-22 11:38:11 UTC (rev 9048) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Modified: XoopsModules/defacer/branches/mamba/defacer/language/english/modinfo.php =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/language/english/modinfo.php 2012-02-22 11:34:02 UTC (rev 9047) +++ XoopsModules/defacer/branches/mamba/defacer/language/english/modinfo.php 2012-02-22 11:38:11 UTC (rev 9048) @@ -25,4 +25,6 @@ define("_MI_DEFACER_ENABLE_REDIRECT", "Enable jgrowl redirecting system"); define("_MI_DEFACER_ENABLE_REDIRECT_DSC", "Enable this to replace default redirection pages(xoops 2.4 > only)"); -?> \ No newline at end of file + +//1.1 +define("_MI_DEFACER_HOME", "Home"); \ No newline at end of file Modified: XoopsModules/defacer/branches/mamba/defacer/templates/defacer_admin_meta.html =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/templates/defacer_admin_meta.html 2012-02-22 11:34:02 UTC (rev 9047) +++ XoopsModules/defacer/branches/mamba/defacer/templates/defacer_admin_meta.html 2012-02-22 11:38:11 UTC (rev 9048) @@ -11,6 +11,7 @@ document.anchors.item(type+id).scrollIntoView(); } </script> +<!-- <div style="background-image: url(<{$xoops_url}>/modules/defacer/images/pages_big.png); background-repeat: no-repeat; background-position: left top; @@ -24,6 +25,7 @@ <{$smarty.const._AM_DEFACER_METAMAN}> </div> <br /> +--> <br style="clear: right; line-height:1px;" /> <table width="100%" cellspacing="1" cellpadding="0" class="outer"> <tr align="center"> Modified: XoopsModules/defacer/branches/mamba/defacer/templates/defacer_admin_page.html =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/templates/defacer_admin_page.html 2012-02-22 11:34:02 UTC (rev 9047) +++ XoopsModules/defacer/branches/mamba/defacer/templates/defacer_admin_page.html 2012-02-22 11:38:11 UTC (rev 9048) @@ -11,6 +11,7 @@ document.anchors.item(type+id).scrollIntoView(); } </script> +<!-- <div style="background-image: url(<{$xoops_url}>/modules/defacer/images/pages_big.png); background-repeat: no-repeat; background-position: left top; @@ -24,6 +25,7 @@ <{$smarty.const._AM_DEFACER_PAGEMAN}> </div> <br /> +--> <div style="margin-top:0; float: right; width:400px;" align="right"> <form action="admin_page.php?op=list" method="POST"> <input type="text" name="query" id="query" size="30" value="<{$query}>" /> Modified: XoopsModules/defacer/branches/mamba/defacer/templates/defacer_admin_permission.html =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/templates/defacer_admin_permission.html 2012-02-22 11:34:02 UTC (rev 9047) +++ XoopsModules/defacer/branches/mamba/defacer/templates/defacer_admin_permission.html 2012-02-22 11:38:11 UTC (rev 9048) @@ -11,6 +11,7 @@ document.anchors.item(type+id).scrollIntoView(); } </script> +<!-- <div style="background-image: url(<{$xoops_url}>/modules/defacer/images/pages_big.png); background-repeat: no-repeat; background-position: left top; @@ -24,6 +25,7 @@ <{$smarty.const._AM_DEFACER_PERMISSIONMAN}> </div> <br /> +--> <br style="clear: right; line-height:1px;" /> <table width="100%" cellspacing="1" cellpadding="0" class="outer"> <tr align="center"> Modified: XoopsModules/defacer/branches/mamba/defacer/templates/defacer_admin_theme.html =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/templates/defacer_admin_theme.html 2012-02-22 11:34:02 UTC (rev 9047) +++ XoopsModules/defacer/branches/mamba/defacer/templates/defacer_admin_theme.html 2012-02-22 11:38:11 UTC (rev 9048) @@ -11,6 +11,7 @@ document.anchors.item(type+id).scrollIntoView(); } </script> +<!-- <div style="background-image: url(<{$xoops_url}>/modules/defacer/images/pages_big.png); background-repeat: no-repeat; background-position: left top; @@ -24,6 +25,7 @@ <{$smarty.const._AM_DEFACER_THEMEMAN}> </div> <br /> +--> <br style="clear: right; line-height:1px;" /> <table width="100%" cellspacing="1" cellpadding="0" class="outer"> <tr align="center"> Modified: XoopsModules/defacer/branches/mamba/defacer/xoops_version.php =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/xoops_version.php 2012-02-22 11:34:02 UTC (rev 9047) +++ XoopsModules/defacer/branches/mamba/defacer/xoops_version.php 2012-02-22 11:38:11 UTC (rev 9048) @@ -24,15 +24,31 @@ * General Information */ $modversion['name'] = _MI_DEFACER_MD_NAME; -$modversion['version'] = 1.0; +$modversion['version'] = 1.1; $modversion['description'] = _MI_DEFACER_MD_DSC; $modversion['author'] = "Xuups"; $modversion['credits'] = "Trabis (http://www.xuups.com), The ImpressCMS Project (http://www.impresscms.org/) & TheRplima (http://community.impresscms.org/userinfo.php?uid=106)"; -$modversion['help'] = ""; -$modversion['license'] = "GNU General Public License (GPL)"; +$modversion['help'] = 'page=help'; +$modversion['license'] = 'GNU GPL'; +$modversion['license_url'] = 'www.gnu.org/licenses/gpl-2.0.html/'; $modversion['official'] = 0; $modversion['dirname'] = basename(dirname(__FILE__)); +$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin'; +$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16'; +$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32'; + +//about +$modversion['release_date'] = '2011/10/08'; +$modversion["module_website_url"] = "http://www.xoops.org/"; +$modversion["module_website_name"] = "XOOPS"; +$modversion["module_status"] = "RC"; +$modversion['min_php']='5.2'; +$modversion['min_xoops']="2.5"; +$modversion['min_admin'] = '1.1'; +$modversion['min_db'] = array('mysql' => '5.0.7', 'mysqli' => '5.0.7'); + + /** * Images information */ @@ -48,6 +64,7 @@ * Administrative information */ $modversion['hasAdmin'] = 1; +$modversion['system_menu'] = 1; $modversion['adminindex'] = "admin/index.php"; $modversion['adminmenu'] = "admin/menu.php"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-02-22 11:34:17
|
Revision: 9047 http://xoops.svn.sourceforge.net/xoops/?rev=9047&view=rev Author: beckmi Date: 2012-02-22 11:34:02 +0000 (Wed, 22 Feb 2012) Log Message: ----------- Adding Defacer Added Paths: ----------- XoopsModules/defacer/ XoopsModules/defacer/branches/ XoopsModules/defacer/branches/mamba/ XoopsModules/defacer/branches/mamba/defacer/ XoopsModules/defacer/branches/mamba/defacer/admin/ XoopsModules/defacer/branches/mamba/defacer/admin/admin_about.php XoopsModules/defacer/branches/mamba/defacer/admin/admin_functions.php XoopsModules/defacer/branches/mamba/defacer/admin/admin_header.php XoopsModules/defacer/branches/mamba/defacer/admin/admin_meta.php XoopsModules/defacer/branches/mamba/defacer/admin/admin_page.php XoopsModules/defacer/branches/mamba/defacer/admin/admin_permission.php XoopsModules/defacer/branches/mamba/defacer/admin/admin_theme.php XoopsModules/defacer/branches/mamba/defacer/admin/index.html XoopsModules/defacer/branches/mamba/defacer/admin/index.php XoopsModules/defacer/branches/mamba/defacer/admin/menu.php XoopsModules/defacer/branches/mamba/defacer/changelog.txt XoopsModules/defacer/branches/mamba/defacer/class/ XoopsModules/defacer/branches/mamba/defacer/class/about.php XoopsModules/defacer/branches/mamba/defacer/class/defacer.php XoopsModules/defacer/branches/mamba/defacer/class/index.html XoopsModules/defacer/branches/mamba/defacer/class/meta.php XoopsModules/defacer/branches/mamba/defacer/class/object.php XoopsModules/defacer/branches/mamba/defacer/class/page.php XoopsModules/defacer/branches/mamba/defacer/class/permission.php XoopsModules/defacer/branches/mamba/defacer/class/theme.php XoopsModules/defacer/branches/mamba/defacer/images/ XoopsModules/defacer/branches/mamba/defacer/images/0.png XoopsModules/defacer/branches/mamba/defacer/images/1.png XoopsModules/defacer/branches/mamba/defacer/images/bg.png XoopsModules/defacer/branches/mamba/defacer/images/defacer_slogo.png XoopsModules/defacer/branches/mamba/defacer/images/delete_big.png XoopsModules/defacer/branches/mamba/defacer/images/delete_big_off.png XoopsModules/defacer/branches/mamba/defacer/images/delete_med.png XoopsModules/defacer/branches/mamba/defacer/images/edit_big.png XoopsModules/defacer/branches/mamba/defacer/images/edit_big_off.png XoopsModules/defacer/branches/mamba/defacer/images/edit_med.png XoopsModules/defacer/branches/mamba/defacer/images/icon_big.png XoopsModules/defacer/branches/mamba/defacer/images/icon_small.png XoopsModules/defacer/branches/mamba/defacer/images/index.html XoopsModules/defacer/branches/mamba/defacer/images/left_both.png XoopsModules/defacer/branches/mamba/defacer/images/metas_big.png XoopsModules/defacer/branches/mamba/defacer/images/metas_small.png XoopsModules/defacer/branches/mamba/defacer/images/pages_big.png XoopsModules/defacer/branches/mamba/defacer/images/pages_small.png XoopsModules/defacer/branches/mamba/defacer/images/permissions_big.png XoopsModules/defacer/branches/mamba/defacer/images/permissions_small.png XoopsModules/defacer/branches/mamba/defacer/images/right_both.png XoopsModules/defacer/branches/mamba/defacer/images/themes_big.png XoopsModules/defacer/branches/mamba/defacer/images/themes_small.png XoopsModules/defacer/branches/mamba/defacer/images/view_big.png XoopsModules/defacer/branches/mamba/defacer/images/view_big_off.png XoopsModules/defacer/branches/mamba/defacer/include/ XoopsModules/defacer/branches/mamba/defacer/include/beforefooter.php XoopsModules/defacer/branches/mamba/defacer/include/beforeheader.php XoopsModules/defacer/branches/mamba/defacer/include/common.php XoopsModules/defacer/branches/mamba/defacer/include/functions.php XoopsModules/defacer/branches/mamba/defacer/include/index.html XoopsModules/defacer/branches/mamba/defacer/index.html XoopsModules/defacer/branches/mamba/defacer/js/ XoopsModules/defacer/branches/mamba/defacer/js/index.html XoopsModules/defacer/branches/mamba/defacer/js/jgrowl.css XoopsModules/defacer/branches/mamba/defacer/js/jgrowl.js XoopsModules/defacer/branches/mamba/defacer/language/ XoopsModules/defacer/branches/mamba/defacer/language/english/ XoopsModules/defacer/branches/mamba/defacer/language/english/about.php XoopsModules/defacer/branches/mamba/defacer/language/english/admin.php XoopsModules/defacer/branches/mamba/defacer/language/english/index.html XoopsModules/defacer/branches/mamba/defacer/language/english/modinfo.php XoopsModules/defacer/branches/mamba/defacer/language/index.html XoopsModules/defacer/branches/mamba/defacer/preload/ XoopsModules/defacer/branches/mamba/defacer/preload/defacer.php XoopsModules/defacer/branches/mamba/defacer/preloads/ XoopsModules/defacer/branches/mamba/defacer/preloads/core.php XoopsModules/defacer/branches/mamba/defacer/readme.txt XoopsModules/defacer/branches/mamba/defacer/sql/ XoopsModules/defacer/branches/mamba/defacer/sql/index.html XoopsModules/defacer/branches/mamba/defacer/sql/mysql.sql XoopsModules/defacer/branches/mamba/defacer/templates/ XoopsModules/defacer/branches/mamba/defacer/templates/defacer_admin_about.html XoopsModules/defacer/branches/mamba/defacer/templates/defacer_admin_meta.html XoopsModules/defacer/branches/mamba/defacer/templates/defacer_admin_page.html XoopsModules/defacer/branches/mamba/defacer/templates/defacer_admin_permission.html XoopsModules/defacer/branches/mamba/defacer/templates/defacer_admin_theme.html XoopsModules/defacer/branches/mamba/defacer/templates/index.html XoopsModules/defacer/branches/mamba/defacer/xoops_version.php XoopsModules/defacer/releases/ XoopsModules/defacer/trunk/ XoopsModules/defacer/trunk/defacer/ XoopsModules/defacer/trunk/defacer/admin/ XoopsModules/defacer/trunk/defacer/admin/admin_about.php XoopsModules/defacer/trunk/defacer/admin/admin_functions.php XoopsModules/defacer/trunk/defacer/admin/admin_header.php XoopsModules/defacer/trunk/defacer/admin/admin_meta.php XoopsModules/defacer/trunk/defacer/admin/admin_page.php XoopsModules/defacer/trunk/defacer/admin/admin_permission.php XoopsModules/defacer/trunk/defacer/admin/admin_theme.php XoopsModules/defacer/trunk/defacer/admin/index.html XoopsModules/defacer/trunk/defacer/admin/index.php XoopsModules/defacer/trunk/defacer/admin/menu.php XoopsModules/defacer/trunk/defacer/changelog.txt XoopsModules/defacer/trunk/defacer/class/ XoopsModules/defacer/trunk/defacer/class/about.php XoopsModules/defacer/trunk/defacer/class/defacer.php XoopsModules/defacer/trunk/defacer/class/index.html XoopsModules/defacer/trunk/defacer/class/meta.php XoopsModules/defacer/trunk/defacer/class/object.php XoopsModules/defacer/trunk/defacer/class/page.php XoopsModules/defacer/trunk/defacer/class/permission.php XoopsModules/defacer/trunk/defacer/class/theme.php XoopsModules/defacer/trunk/defacer/images/ XoopsModules/defacer/trunk/defacer/images/0.png XoopsModules/defacer/trunk/defacer/images/1.png XoopsModules/defacer/trunk/defacer/images/bg.png XoopsModules/defacer/trunk/defacer/images/defacer_slogo.png XoopsModules/defacer/trunk/defacer/images/delete_big.png XoopsModules/defacer/trunk/defacer/images/delete_big_off.png XoopsModules/defacer/trunk/defacer/images/delete_med.png XoopsModules/defacer/trunk/defacer/images/edit_big.png XoopsModules/defacer/trunk/defacer/images/edit_big_off.png XoopsModules/defacer/trunk/defacer/images/edit_med.png XoopsModules/defacer/trunk/defacer/images/icon_big.png XoopsModules/defacer/trunk/defacer/images/icon_small.png XoopsModules/defacer/trunk/defacer/images/index.html XoopsModules/defacer/trunk/defacer/images/left_both.png XoopsModules/defacer/trunk/defacer/images/metas_big.png XoopsModules/defacer/trunk/defacer/images/metas_small.png XoopsModules/defacer/trunk/defacer/images/pages_big.png XoopsModules/defacer/trunk/defacer/images/pages_small.png XoopsModules/defacer/trunk/defacer/images/permissions_big.png XoopsModules/defacer/trunk/defacer/images/permissions_small.png XoopsModules/defacer/trunk/defacer/images/right_both.png XoopsModules/defacer/trunk/defacer/images/themes_big.png XoopsModules/defacer/trunk/defacer/images/themes_small.png XoopsModules/defacer/trunk/defacer/images/view_big.png XoopsModules/defacer/trunk/defacer/images/view_big_off.png XoopsModules/defacer/trunk/defacer/include/ XoopsModules/defacer/trunk/defacer/include/beforefooter.php XoopsModules/defacer/trunk/defacer/include/beforeheader.php XoopsModules/defacer/trunk/defacer/include/common.php XoopsModules/defacer/trunk/defacer/include/functions.php XoopsModules/defacer/trunk/defacer/include/index.html XoopsModules/defacer/trunk/defacer/index.html XoopsModules/defacer/trunk/defacer/js/ XoopsModules/defacer/trunk/defacer/js/index.html XoopsModules/defacer/trunk/defacer/js/jgrowl.css XoopsModules/defacer/trunk/defacer/js/jgrowl.js XoopsModules/defacer/trunk/defacer/language/ XoopsModules/defacer/trunk/defacer/language/english/ XoopsModules/defacer/trunk/defacer/language/english/about.php XoopsModules/defacer/trunk/defacer/language/english/admin.php XoopsModules/defacer/trunk/defacer/language/english/index.html XoopsModules/defacer/trunk/defacer/language/english/modinfo.php XoopsModules/defacer/trunk/defacer/language/index.html XoopsModules/defacer/trunk/defacer/preload/ XoopsModules/defacer/trunk/defacer/preload/defacer.php XoopsModules/defacer/trunk/defacer/preloads/ XoopsModules/defacer/trunk/defacer/preloads/core.php XoopsModules/defacer/trunk/defacer/readme.txt XoopsModules/defacer/trunk/defacer/sql/ XoopsModules/defacer/trunk/defacer/sql/index.html XoopsModules/defacer/trunk/defacer/sql/mysql.sql XoopsModules/defacer/trunk/defacer/templates/ XoopsModules/defacer/trunk/defacer/templates/defacer_admin_about.html XoopsModules/defacer/trunk/defacer/templates/defacer_admin_meta.html XoopsModules/defacer/trunk/defacer/templates/defacer_admin_page.html XoopsModules/defacer/trunk/defacer/templates/defacer_admin_permission.html XoopsModules/defacer/trunk/defacer/templates/defacer_admin_theme.html XoopsModules/defacer/trunk/defacer/templates/index.html XoopsModules/defacer/trunk/defacer/xoops_version.php Added: XoopsModules/defacer/branches/mamba/defacer/admin/admin_about.php =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/admin/admin_about.php (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/admin/admin_about.php 2012-02-22 11:34:02 UTC (rev 9047) @@ -0,0 +1,27 @@ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +/** + * @copyright The XUUPS Project http://sourceforge.net/projects/xuups/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @package Defacer + * @since 1.0 + * @author trabis <lus...@gm...> + * @version $Id: admin_about.php 0 2009-06-11 18:47:04Z trabis $ + */ + +include_once dirname(__FILE__) . '/admin_header.php'; +include_once dirname(dirname(__FILE__)) . '/class/about.php'; + +$aboutObj = new DefacerAbout(); +$aboutObj->render(); + +?> \ No newline at end of file Added: XoopsModules/defacer/branches/mamba/defacer/admin/admin_functions.php =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/admin/admin_functions.php (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/admin/admin_functions.php 2012-02-22 11:34:02 UTC (rev 9047) @@ -0,0 +1,76 @@ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +/** + * @copyright The XUUPS Project http://sourceforge.net/projects/xuups/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @package Defacer + * @since 1.0 + * @author trabis <lus...@gm...> + * @author InstantZero <http://xoops.instant-zero.com/> + * @version $Id: admin_header.php 0 2009-06-11 18:47:04Z trabis $ + */ + +defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined"); + +include_once dirname(dirname(__FILE__)) . '/include/common.php'; + +function defacer_adminMenu($currentoption = 0, $breadcrumb = '') +{ + $defacer =& DefacerDefacer::getInstance(); + /* Nice buttons styles */ + echo " + <style type='text/css'> + #buttontop { float:left; width:100%; background: #e7e7e7; font-size:93%; line-height:normal; border-top: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; margin: 0; } + #buttonbar { float:left; width:100%; background: #e7e7e7 url('" . XOOPS_URL . "/modules/" . $defacer->getModule()->dirname() . "/images/bg.png') repeat-x left bottom; font-size:93%; line-height:normal; border-left: 1px solid black; border-right: 1px solid black; margin-bottom: 12px; } + #buttonbar ul { margin:0; margin-top: 15px; padding:10px 10px 0; list-style:none; } + #buttonbar li { display:inline; margin:0; padding:0; } + #buttonbar a { float:left; background:url('" . XOOPS_URL . "/modules/" . $defacer->getModule()->dirname() . "/images/left_both.png') no-repeat left top; margin:0; padding:0 0 0 9px; border-bottom:1px solid #000; text-decoration:none; } + #buttonbar a span { float:left; display:block; background:url('" . XOOPS_URL . "/modules/" . $defacer->getModule()->dirname() . "/images/right_both.png') no-repeat right top; padding:5px 15px 4px 6px; font-weight:bold; color:#765; } + /* Commented Backslash Hack hides rule from IE5-Mac \*/ + #buttonbar a span {float:none;} + /* End IE5-Mac hack */ + #buttonbar a:hover span { color:#333; } + #buttonbar #current a { background-position:0 -150px; border-width:0; } + #buttonbar #current a span { background-position:100% -150px; padding-bottom:5px; color:#333; } + #buttonbar a:hover { background-position:0% -150px; } + #buttonbar a:hover span { background-position:100% -150px; } + </style> + "; + + $tblColors = array('', '', '', '', ''); + if($currentoption >= 0) { + $tblColors[$currentoption] = 'current'; + } + + if (file_exists($filename = XOOPS_ROOT_PATH . '/modules/' . $defacer->getModule()->dirname() . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/modinfo.php')) { + include_once $filename; + } else { + include_once XOOPS_ROOT_PATH . '/modules/' . $defacer->getModule()->dirname() . '/language/english/modinfo.php'; + } + + echo "<div id='buttontop'>"; + echo "<table style=\"width: 100%; padding: 0; \" cellspacing=\"0\"><tr>"; + echo "<td style=\"width: 60%; font-size: 10px; text-align: left; color: #2F5376; padding: 0 6px; line-height: 18px;\"><a class=\"nobutton\" href=\"../../system/admin.php?fct=preferences&op=showmod&mod=" . $defacer->getModule()->mid() . "\">" . _AM_DEFACER_GENERALSET . "</a>"; + echo "<td style=\"width: 40%; font-size: 10px; text-align: right; color: #2F5376; padding: 0 6px; line-height: 18px;\"><b>" . $defacer->getModule()->name() . " " . _AM_DEFACER_MODULEADMIN . "</b> " . $breadcrumb . "</td>"; + echo "</tr></table>"; + echo "</div>"; + + echo "<div id='buttonbar'>"; + echo "<ul>"; + echo "<li id='" . $tblColors[0] . "'><a href=\"admin_page.php\"\"><span>" . _MI_DEFACER_PAGEMANAGER . "</span></a></li>\n"; + echo "<li id='" . $tblColors[1] . "'><a href=\"admin_theme.php\"\"><span>" . _MI_DEFACER_THEMEMANAGER . "</span></a></li>\n"; + echo "<li id='" . $tblColors[2] . "'><a href=\"admin_meta.php\"\"><span>" . _MI_DEFACER_METAMANAGER . "</span></a></li>\n"; + echo "<li id='" . $tblColors[3] . "'><a href=\"admin_permission.php\"\"><span>" . _MI_DEFACER_PERMISSIONMANAGER . "</span></a></li>\n"; + echo "<li id='" . $tblColors[4] . "'><a href=\"admin_about.php\"\"><span>" . _MI_DEFACER_ABOUT . "</span></a></li>\n"; + echo "</ul></div><div> </div>"; +} +?> \ No newline at end of file Added: XoopsModules/defacer/branches/mamba/defacer/admin/admin_header.php =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/admin/admin_header.php (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/admin/admin_header.php 2012-02-22 11:34:02 UTC (rev 9047) @@ -0,0 +1,31 @@ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +/** + * @copyright The XUUPS Project http://sourceforge.net/projects/xuups/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @package Defacer + * @since 1.0 + * @author trabis <lus...@gm...> + * @version $Id: admin_header.php 0 2009-06-11 18:47:04Z trabis $ + */ + +require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php'; +require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php'; + +include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once dirname(__FILE__) . '/admin_functions.php'; + +if (!isset($xoopsTpl) || !is_object($xoopsTpl)) { + include_once XOOPS_ROOT_PATH . '/class/template.php'; + $xoopsTpl = new XoopsTpl(); +} +?> Added: XoopsModules/defacer/branches/mamba/defacer/admin/admin_meta.php =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/admin/admin_meta.php (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/admin/admin_meta.php 2012-02-22 11:34:02 UTC (rev 9047) @@ -0,0 +1,233 @@ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +/** + * @copyright The XUUPS Project http://sourceforge.net/projects/xuups/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @package Defacer + * @since 1.0 + * @author trabis <lus...@gm...> + * @version $Id: admin_meta.php 0 2009-06-11 18:47:04Z trabis $ + */ + +require dirname(__FILE__) . '/admin_header.php'; + +$actions = array('list', 'add', 'edit', 'editok', 'del', 'delok'); +$op = isset($_REQUEST['op']) && in_array($_REQUEST['op'], $actions) ? $_REQUEST['op'] : 'list'; + +$itemid = isset($_REQUEST['itemid']) ? intval($_REQUEST['itemid']) : 0; +$limit = isset($_REQUEST['limit']) ? intval($_REQUEST['limit']) : 15; +$start = isset($_REQUEST['start']) ? intval($_REQUEST['start']) : 0; + +$itemid = isset($_REQUEST['meta_id']) ? intval($_REQUEST['meta_id']) : $itemid; + +switch ($op) { + case 'list': + xoops_cp_header(); + defacer_adminMenu(2); + echo defacer_index($start, $limit); + xoops_cp_footer(); + break; + case 'add': + defacer_add(); + break; + case 'edit': + xoops_cp_header(); + defacer_adminMenu(2); + echo defacer_form($itemid); + xoops_cp_footer(); + break; + case 'editok': + defacer_edit($itemid); + break; + case 'del': + defacer_confirmdel($itemid); + break; + case 'delok': + defacer_del($itemid); + break; +} + +function defacer_index($start = 0, $limit = 0) +{ + global $xoopsTpl; + + $defacer =& DefacerDefacer::getInstance(); + + $count = $defacer->getHandler('meta')->getCount(); + $xoopsTpl->assign('count', $count); + + $criteria = new CriteriaCompo(); + $criteria->setStart($start); + $criteria->setLimit($limit); + $objs = $defacer->getHandler('meta')->getObjects($criteria); + + if ($count > $limit) { + include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; + $nav = new XoopsPageNav($count, $limit, $start, 'start', 'op=list'); + $xoopsTpl->assign('pagenav', '<div style="float:left; padding-top:2px;" align="center">' . $nav->renderNav() . '</div>'); + } + + foreach ($objs as $obj) { + $item = $obj->getValues(); + + $page = $defacer->getHandler('page')->get($obj->getVar('meta_id')); + $item['module'] = $page->getVar('name'); + $item['meta_title'] = $page->getVar('page_title'); + $item['meta_url'] = $page->getVar('page_url'); + $item['meta_status'] = $page->getVar('page_status'); + + if (substr($page->getVar('page_url'), -1) == '*') { + $item['meta_vurl'] = 0; + } else { + if ($page->getVar('page_moduleid') == 1){ + $item['meta_vurl'] = XOOPS_URL . '/' . $page->getVar('page_url'); + } else { + $item['meta_vurl'] = XOOPS_URL . '/modules/' . $page->getVar('dirname') . '/' . $page->getVar('page_url'); + } + } + + $xoopsTpl->append('items', $item); + } + + $xoopsTpl->assign('form', defacer_form()); + + return $xoopsTpl->fetch('db:defacer_admin_meta.html'); +} + +function defacer_add() +{ + $defacer =& DefacerDefacer::getInstance(); + + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header(basename(__FILE__), 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); + } + + $obj = $defacer->getHandler('meta')->create(); + $obj->setVars($_POST); + + if (!$defacer->getHandler('meta')->insert($obj)) { + $msg = _AM_DEFACER_ERROR; + } else { + $msg = _AM_DEFACER_DBUPDATED; + } + + redirect_header(basename(__FILE__) , 2, $msg); +} + +function defacer_edit($itemid) +{ + $defacer =& DefacerDefacer::getInstance(); + + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header(basename(__FILE__), 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); + } + + $obj = $defacer->getHandler('meta')->get($itemid); + $obj->setVars($_POST); + + if (!$defacer->getHandler('meta')->insert($obj)) { + $msg = _AM_DEFACER_ERROR; + } else { + $msg = _AM_DEFACER_DBUPDATED; + } + + redirect_header(basename(__FILE__), 2, $msg); +} + +function defacer_del($itemid) +{ + $defacer =& DefacerDefacer::getInstance(); + + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header(basename(__FILE__),1 , implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); + } + + if ($itemid <= 0) { + redirect_header(basename(__FILE__), 1); + } + + $obj = $defacer->getHandler('meta')->get($itemid); + if (!is_object($obj)) { + redirect_header(basename(__FILE__), 1); + } + + if (!$defacer->getHandler('meta')->delete($obj)) { + xoops_cp_header(); + xoops_error(sprintf(_AM_DEFACER_ERROR, $obj->getVar('meta_id'))); + xoops_cp_footer(); + exit(); + } + + redirect_header(basename(__FILE__), 2, _AM_DEFACER_DBUPDATED); +} + +function defacer_confirmdel($itemid) +{ + xoops_cp_header(); + xoops_confirm(array('op' => 'delok', 'itemid' => $itemid), basename(__FILE__), _AM_DEFACER_RUDEL); + xoops_cp_footer(); +} + +function defacer_form($itemid = 0) +{ + $defacer =& DefacerDefacer::getInstance(); + $obj = $defacer->getHandler('meta')->get($itemid); + + if ($obj->isNew()) { + $ftitle = _EDIT; + } else { + $ftitle = _ADD; + } + + $form = new XoopsThemeForm($ftitle, 'meta_form', basename(__FILE__), 'post', true); + + $page_select = new XoopsFormSelect(_AM_DEFACER_PAGE, 'meta_id', $obj->getVar('meta_id', 'e')); + $page_select->customValidationCode[] = 'var value = document.getElementById(\'meta_id\').value; if (value == 0){alert("' . _AM_DEFACER_SELECTPAGE_ERR . '"); return false;}'; + + $criteria = new CriteriaCompo(new Criteria('page_status', 1)); + $criteria->setSort('name'); + $criteria->setOrder('ASC'); + $pageslist = $defacer->getHandler('page')->getList($criteria); + $list = array('0' => '--------------------------'); + $pageslist = $list + $pageslist; + $page_select->addOptionArray($pageslist); + $form->addElement($page_select, true); + + $form->addElement(new XoopsFormText(_AM_DEFACER_META_SITENAME, 'meta_sitename', 50, 50, $obj->getVar('meta_sitename', 'e'))); + $form->addElement(new XoopsFormText(_AM_DEFACER_META_SLOGAN, 'meta_slogan', 50, 50, $obj->getVar('meta_slogan', 'e'))); + $form->addElement(new XoopsFormText(_AM_DEFACER_META_PAGETITLE, 'meta_pagetitle', 50, 50, $obj->getVar('meta_pagetitle', 'e'))); + $form->addElement(new XoopsFormTextArea(_AM_DEFACER_META_KEYWORDS, 'meta_keywords' , $obj->getVar('meta_keywords', 'e'))); + $form->addElement(new XoopsFormTextArea(_AM_DEFACER_META_DESCRIPTION, 'meta_description' , $obj->getVar('meta_description', 'e'))); + + $tray = new XoopsFormElementTray('' ,''); + $tray->addElement(new XoopsFormButton('', 'defacer_button', _SUBMIT, 'submit')); + + $btn = new XoopsFormButton('', 'reset', _CANCEL, 'button'); + if (!$obj->isNew()) { + $btn->setExtra('onclick="document.location.href=\'' . basename(__FILE__) . '\'"'); + } else { + $btn->setExtra('onclick="document.getElementById(\'form\').style.display = \'none\'; return false;"'); + } + $tray->addElement($btn); + $form->addElement($tray); + + if (!$obj->isNew()) { + $form->addElement(new XoopsFormHidden('op', 'editok')); + $form->addElement(new XoopsFormHidden('itemid', $itemid)); + } else { + $form->addElement(new XoopsFormHidden('op', 'add')); + } + + return $form->render(); +} + +?> \ No newline at end of file Added: XoopsModules/defacer/branches/mamba/defacer/admin/admin_page.php =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/admin/admin_page.php (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/admin/admin_page.php 2012-02-22 11:34:02 UTC (rev 9047) @@ -0,0 +1,288 @@ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +/** + * @copyright The XUUPS Project http://sourceforge.net/projects/xuups/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @package Defacer + * @since 1.0 + * @author trabis <lus...@gm...> + * @version $Id: admin_page.php 0 2009-06-11 18:47:04Z trabis $ + */ + +require dirname(__FILE__) . '/admin_header.php'; + +$actions = array('list', 'add', 'edit', 'editok', 'del', 'delok', 'changestatus'); +$op = isset($_REQUEST['op']) && in_array($_REQUEST['op'], $actions) ? $_REQUEST['op'] : 'list'; + +$itemid = isset($_REQUEST['itemid']) ? intval($_REQUEST['itemid']) : 0; +$limit = isset($_REQUEST['limit']) ? intval($_REQUEST['limit']) : 15; +$start = isset($_REQUEST['start']) ? intval($_REQUEST['start']) : 0; +$query = isset($_REQUEST['query']) ? trim($_REQUEST['query']) : ''; + +switch ($op) { + case 'list': + xoops_cp_header(); + defacer_adminMenu(0); + echo defacer_index($start, $limit, $query); + xoops_cp_footer(); + break; + case 'add': + defacer_add(); + break; + case 'edit': + xoops_cp_header(); + defacer_adminMenu(0); + echo defacer_form($itemid); + xoops_cp_footer(); + break; + case 'editok': + defacer_edit($itemid); + break; + case 'del': + defacer_confirmdel($itemid); + break; + case 'delok': + defacer_del($itemid); + break; + case 'changestatus': + defacer_changestatus($itemid); + break; +} + +function defacer_index($start = 0, $limit = 0, $query = '') +{ + global $xoopsTpl; + + $defacer =& DefacerDefacer::getInstance(); + + $xoopsTpl->assign('query', $query); + + $criteria = new CriteriaCompo(); + if (!empty($query)) { + $myts =& MyTextSanitizer::getInstance(); + $criteria->add(new Criteria('page_title', $myts->addSlashes($query) . '%', 'LIKE')); + } + + $count = $defacer->getHandler('page')->getCount($criteria); + $xoopsTpl->assign('count', $count); + + $criteria->setStart($start); + $criteria->setLimit($limit); + $criteria->setSort('name'); + $criteria->setOrder('ASC'); + $objs = $defacer->getHandler('page')->getObjects($criteria); + + if ($count > $limit) { + include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; + $nav = new XoopsPageNav($count, $limit, $start, 'start', 'op=list'); + $xoopsTpl->assign('pagenav', '<div style="float:left; padding-top:2px;" align="center">' . $nav->renderNav() . '</div>'); + } + + foreach ($objs as $obj) { + $item = $obj->getValues(); + + if (substr($obj->getVar('page_url'), -1) == '*'){ + $item['page_vurl'] = 0; + } else { + if ($obj->getVar('page_moduleid') == 1) { + $item['page_vurl'] = XOOPS_URL . '/' . $obj->getVar('page_url'); + } else { + $item['page_vurl'] = XOOPS_URL . '/modules/' . $obj->getVar('dirname') . '/' . $obj->getVar('page_url'); + } + } + + $xoopsTpl->append('items', $item); + } + + $xoopsTpl->assign('form', defacer_form()); + + return $xoopsTpl->fetch('db:defacer_admin_page.html'); +} + +function defacer_add() +{ + $defacer =& DefacerDefacer::getInstance(); + + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header(basename(__FILE__), 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); + } + + if (!isset($_POST['page_moduleid']) || $_POST['page_moduleid'] == 0){ + $_POST['page_moduleid'] = 1; + } + + $obj = $defacer->getHandler('page')->create(); + $obj->setVars($_POST); + + if (!$defacer->getHandler('page')->insert($obj)) { + $msg = _AM_DEFACER_ERROR; + } else { + $msg = _AM_DEFACER_DBUPDATED; + } + + redirect_header(basename(__FILE__) , 2, $msg); +} + +function defacer_edit($itemid) +{ + $defacer =& DefacerDefacer::getInstance(); + + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header(basename(__FILE__), 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); + } + + if (!isset($_POST['page_moduleid']) || $_POST['page_moduleid'] == 0){ + $_POST['page_moduleid'] = 1; + } + + $obj = $defacer->getHandler('page')->get($itemid); + $obj->setVars($_POST); + + if (!$defacer->getHandler('page')->insert($obj)) { + $msg = _AM_DEFACER_ERROR; + } else { + $msg = _AM_DEFACER_DBUPDATED; + } + + redirect_header(basename(__FILE__), 2, $msg); +} + +function defacer_del($itemid) +{ + $defacer =& DefacerDefacer::getInstance(); + + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header(basename(__FILE__),1 , implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); + } + + if ($itemid <= 0) { + redirect_header(basename(__FILE__), 1); + } + + $obj = $defacer->getHandler('page')->get($itemid); + if (!is_object($obj)) { + redirect_header(basename(__FILE__), 1); + } + + if (!$defacer->getHandler('page')->delete($obj)) { + xoops_cp_header(); + xoops_error(sprintf(_AM_DEFACER_ERROR, $obj->getVar('page_id'))); + xoops_cp_footer(); + exit(); + } + + $obj = $defacer->getHandler('theme')->get($itemid); + if (is_object($obj) && !$defacer->getHandler('theme')->delete($obj)) { + xoops_cp_header(); + xoops_error(sprintf(_AM_DEFACER_ERROR, $obj->getVar('theme_id'))); + xoops_cp_footer(); + exit(); + } + + $obj = $defacer->getHandler('meta')->get($itemid); + if (is_object($obj) && !$defacer->getHandler('meta')->delete($obj)) { + xoops_cp_header(); + xoops_error(sprintf(_AM_DEFACER_ERROR, $obj->getVar('meta_id'))); + xoops_cp_footer(); + exit(); + } + + $obj = $defacer->getHandler('permission')->get($itemid); + if (is_object($obj) && !$defacer->getHandler('permission')->delete($obj)) { + xoops_cp_header(); + xoops_error(sprintf(_AM_DEFACER_ERROR, $obj->getVar('permission_id'))); + xoops_cp_footer(); + exit(); + } + + redirect_header(basename(__FILE__), 2, _AM_DEFACER_DBUPDATED); +} + +function defacer_confirmdel($itemid) +{ + xoops_cp_header(); + xoops_confirm(array('op' => 'delok', 'itemid' => $itemid), basename(__FILE__), _AM_DEFACER_RUDEL); + xoops_cp_footer(); +} + +function defacer_changestatus($itemid) +{ + $defacer =& DefacerDefacer::getInstance(); + + $obj = $defacer->getHandler('page')->get($itemid); + $obj->setVar('page_status', !$obj->getVar('page_status')); + + if (!$defacer->getHandler('page')->insert($obj)) { + $msg = _AM_DEFACER_ERROR; + }else{ + $msg = _AM_DEFACER_DBUPDATED; + } + + redirect_header(basename(__FILE__), 2, $msg); +} + +function defacer_form($itemid = 0) +{ + $defacer =& DefacerDefacer::getInstance(); + $obj = $defacer->getHandler('page')->get($itemid); + + if ($obj->isNew()) { + $ftitle = _EDIT; + } else { + $ftitle = _ADD; + } + + $form = new XoopsThemeForm($ftitle, 'page_form', basename(__FILE__), 'post', true); + + $mid = new XoopsFormSelect(_AM_DEFACER_PAGE_MODULE, 'page_moduleid', $obj->getVar('page_moduleid', 'e')); + $mid->customValidationCode[] = 'var value = document.getElementById(\'page_moduleid\').value; if (value == 0){alert("' . _AM_DEFACER_SELECTMODULE_ERR . '"); return false;}'; + + $module_handler =& xoops_gethandler('module'); + $criteria = new CriteriaCompo(new Criteria('hasmain', 1)); + $criteria->add(new Criteria('isactive', 1)); + //$criteria->setSort('name'); + //$criteria->setOrder('ASC'); xoopsModule does not accpet this :( + $moduleslist = $module_handler->getList($criteria); + $module = $module_handler->get(1); + $list = array($module->getVar('mid') => $module->getVar('name')); + $moduleslist = $list + $moduleslist; + $mid->addOptionArray($moduleslist); + $form->addElement($mid, true); + + $form->addElement(new XoopsFormText(_AM_DEFACER_PAGE_TITLE, 'page_title', 50, 255, $obj->getVar('page_title', 'e')), true); + $furl = new XoopsFormText(_AM_DEFACER_PAGE_URL, 'page_url', 50, 255, $obj->getVar('page_url', 'e')); + $furl->setDescription(_AM_DEFACER_PAGE_URL_DESC); + $form->addElement($furl, true); + $form->addElement(new XoopsFormRadioYN(_AM_DEFACER_PAGE_DISPLAY, 'page_status', $obj->getVar('page_status', 'e'), _YES, _NO)); + + $tray = new XoopsFormElementTray('' ,''); + $tray->addElement(new XoopsFormButton('', 'defacer_button', _SUBMIT, 'submit')); + + $btn = new XoopsFormButton('', 'reset', _CANCEL, 'button'); + if (!$obj->isNew()) { + $btn->setExtra('onclick="document.location.href=\'' . basename(__FILE__) . '\'"'); + } else { + $btn->setExtra('onclick="document.getElementById(\'form\').style.display = \'none\'; return false;"'); + } + $tray->addElement($btn); + $form->addElement($tray); + + if (!$obj->isNew()) { + $form->addElement(new XoopsFormHidden('op', 'editok')); + $form->addElement(new XoopsFormHidden('itemid', $itemid)); + } else { + $form->addElement(new XoopsFormHidden('op', 'add')); + } + + return $form->render(); +} +?> \ No newline at end of file Added: XoopsModules/defacer/branches/mamba/defacer/admin/admin_permission.php =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/admin/admin_permission.php (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/admin/admin_permission.php 2012-02-22 11:34:02 UTC (rev 9047) @@ -0,0 +1,235 @@ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +/** + * @copyright The XUUPS Project http://sourceforge.net/projects/xuups/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @package Defacer + * @since 1.0 + * @author trabis <lus...@gm...> + * @version $Id: admin_permission.php 0 2009-06-11 18:47:04Z trabis $ + */ + +require dirname(__FILE__) . '/admin_header.php'; + +$actions = array('list', 'add', 'edit', 'editok', 'del', 'delok'); +$op = isset($_REQUEST['op']) && in_array($_REQUEST['op'], $actions) ? $_REQUEST['op'] : 'list'; + +$itemid = isset($_REQUEST['itemid']) ? intval($_REQUEST['itemid']) : 0; +$limit = isset($_REQUEST['limit']) ? intval($_REQUEST['limit']) : 15; +$start = isset($_REQUEST['start']) ? intval($_REQUEST['start']) : 0; + +$itemid = isset($_REQUEST['permission_id']) ? intval($_REQUEST['permission_id']) : $itemid; + +switch ($op) { + case 'list': + xoops_cp_header(); + defacer_adminMenu(1); + echo defacer_index($start, $limit); + xoops_cp_footer(); + break; + case 'add': + defacer_add(); + break; + case 'edit': + xoops_cp_header(); + defacer_adminMenu(1); + echo defacer_form($itemid); + xoops_cp_footer(); + break; + case 'editok': + defacer_edit($itemid); + break; + case 'del': + defacer_confirmdel($itemid); + break; + case 'delok': + defacer_del($itemid); + break; +} + +function defacer_index($start = 0, $limit = 0) +{ + global $xoopsTpl; + + $defacer =& DefacerDefacer::getInstance(); + + $grouplist_handler =& xoops_gethandler('group'); + $grouplist = $grouplist_handler->getObjects(null, true); + foreach (array_keys($grouplist) as $i) { + $groups[$i] = $grouplist[$i]->getVar('name'); + } + $xoopsTpl->assign('groups', $groups); + + $count = $defacer->getHandler('permission')->getCount(); + $xoopsTpl->assign('count', $count); + + $criteria = new CriteriaCompo(); + $criteria->setStart($start); + $criteria->setLimit($limit); + $objs = $defacer->getHandler('permission')->getObjects($criteria); + + if ($count > $limit) { + include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; + $nav = new XoopsPageNav($count, $limit, $start, 'start', 'op=list'); + $xoopsTpl->assign('pagenav', '<div style="float:left; padding-top:2px;" align="center">' . $nav->renderNav() . '</div>'); + } + + foreach ($objs as $obj) { + $item = $obj->getValues(); + + $page = $defacer->getHandler('page')->get($obj->getVar('permission_id')); + $item['module'] = $page->getVar('name'); + $item['permission_title'] = $page->getVar('page_title'); + $item['permission_url'] = $page->getVar('page_url'); + $item['permission_status'] = $page->getVar('page_status'); + + if (substr($page->getVar('page_url'), -1) == '*') { + $item['permission_vurl'] = 0; + } else { + if ($page->getVar('page_moduleid') == 1){ + $item['permission_vurl'] = XOOPS_URL . '/' . $page->getVar('page_url'); + } else { + $item['permission_vurl'] = XOOPS_URL . '/modules/' . $page->getVar('dirname') . '/' . $page->getVar('page_url'); + } + } + + $xoopsTpl->append('items', $item); + } + + $xoopsTpl->assign('form', defacer_form()); + + return $xoopsTpl->fetch('db:defacer_admin_permission.html'); +} + +function defacer_add() +{ + $defacer =& DefacerDefacer::getInstance(); + + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header(basename(__FILE__), 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); + } + + $obj = $defacer->getHandler('permission')->create(); + $obj->setVars($_POST); + + if (!$defacer->getHandler('permission')->insert($obj)) { + $msg = _AM_DEFACER_ERROR; + } else { + $msg = _AM_DEFACER_DBUPDATED; + } + + redirect_header(basename(__FILE__) , 2, $msg); +} + +function defacer_edit($itemid) +{ + $defacer =& DefacerDefacer::getInstance(); + + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header(basename(__FILE__), 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); + } + + $obj = $defacer->getHandler('permission')->get($itemid); + $obj->setVars($_POST); + + if (!$defacer->getHandler('permission')->insert($obj)) { + $msg = _AM_DEFACER_ERROR; + } else { + $msg = _AM_DEFACER_DBUPDATED; + } + + redirect_header(basename(__FILE__), 2, $msg); +} + +function defacer_del($itemid) +{ + $defacer =& DefacerDefacer::getInstance(); + + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header(basename(__FILE__),1 , implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); + } + + if ($itemid <= 0) { + redirect_header(basename(__FILE__), 1); + } + + $obj = $defacer->getHandler('permission')->get($itemid); + if (!is_object($obj)) { + redirect_header(basename(__FILE__), 1); + } + + if (!$defacer->getHandler('permission')->delete($obj)) { + xoops_cp_header(); + xoops_error(sprintf(_AM_DEFACER_ERROR, $obj->getVar('permission_id'))); + xoops_cp_footer(); + exit(); + } + + redirect_header(basename(__FILE__), 2, _AM_DEFACER_DBUPDATED); +} + +function defacer_confirmdel($itemid) +{ + xoops_cp_header(); + xoops_confirm(array('op' => 'delok', 'itemid' => $itemid), basename(__FILE__), _AM_DEFACER_RUDEL); + xoops_cp_footer(); +} + +function defacer_form($itemid = 0) +{ + $defacer =& DefacerDefacer::getInstance(); + $obj = $defacer->getHandler('permission')->get($itemid); + + if ($obj->isNew()) { + $ftitle = _EDIT; + } else { + $ftitle = _ADD; + } + + $form = new XoopsThemeForm($ftitle, 'permission_form', basename(__FILE__), 'post', true); + + $page_select = new XoopsFormSelect(_AM_DEFACER_PAGE, 'permission_id', $obj->getVar('permission_id', 'e')); + $page_select->customValidationCode[] = 'var value = document.getElementById(\'permission_id\').value; if (value == 0){alert("' . _AM_DEFACER_SELECTPAGE_ERR . '"); return false;}'; + + $criteria = new CriteriaCompo(new Criteria('page_status', 1)); + $criteria->setSort('name'); + $criteria->setOrder('ASC'); + $pageslist = $defacer->getHandler('page')->getList($criteria); + $list = array('0' => '--------------------------'); + $pageslist = $list + $pageslist; + $page_select->addOptionArray($pageslist); + $form->addElement($page_select, true); + + $form->addElement(new XoopsFormSelectGroup(_AM_DEFACER_PERMISSION_GROUPS, 'permission_groups', true, $obj->getVar('permission_groups', 'e'), 8, true)); + + $tray = new XoopsFormElementTray('' ,''); + $tray->addElement(new XoopsFormButton('', 'defacer_button', _SUBMIT, 'submit')); + + $btn = new XoopsFormButton('', 'reset', _CANCEL, 'button'); + if (!$obj->isNew()) { + $btn->setExtra('onclick="document.location.href=\'' . basename(__FILE__) . '\'"'); + } else { + $btn->setExtra('onclick="document.getElementById(\'form\').style.display = \'none\'; return false;"'); + } + $tray->addElement($btn); + $form->addElement($tray); + + if (!$obj->isNew()) { + $form->addElement(new XoopsFormHidden('op', 'editok')); + $form->addElement(new XoopsFormHidden('itemid', $itemid)); + } else { + $form->addElement(new XoopsFormHidden('op', 'add')); + } + + return $form->render(); +} +?> \ No newline at end of file Added: XoopsModules/defacer/branches/mamba/defacer/admin/admin_theme.php =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/admin/admin_theme.php (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/admin/admin_theme.php 2012-02-22 11:34:02 UTC (rev 9047) @@ -0,0 +1,245 @@ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +/** + * @copyright The XUUPS Project http://sourceforge.net/projects/xuups/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @package Defacer + * @since 1.0 + * @author trabis <lus...@gm...> + * @version $Id: admin_theme.php 0 2009-06-11 18:47:04Z trabis $ + */ + +require dirname(__FILE__) . '/admin_header.php'; + +$actions = array('list', 'add', 'edit', 'editok', 'del', 'delok'); +$op = isset($_REQUEST['op']) && in_array($_REQUEST['op'], $actions) ? $_REQUEST['op'] : 'list'; + +$itemid = isset($_REQUEST['itemid']) ? intval($_REQUEST['itemid']) : 0; +$limit = isset($_REQUEST['limit']) ? intval($_REQUEST['limit']) : 15; +$start = isset($_REQUEST['start']) ? intval($_REQUEST['start']) : 0; + +$itemid = isset($_REQUEST['theme_id']) ? intval($_REQUEST['theme_id']) : $itemid; + +switch ($op) { + case 'list': + xoops_cp_header(); + defacer_adminMenu(1); + echo defacer_index($start, $limit); + xoops_cp_footer(); + break; + case 'add': + defacer_add(); + break; + case 'edit': + xoops_cp_header(); + defacer_adminMenu(1); + echo defacer_form($itemid); + xoops_cp_footer(); + break; + case 'editok': + defacer_edit($itemid); + break; + case 'del': + defacer_confirmdel($itemid); + break; + case 'delok': + defacer_del($itemid); + break; +} + +function defacer_index($start = 0, $limit = 0) +{ + global $xoopsTpl; + + $defacer =& DefacerDefacer::getInstance(); + + $count = $defacer->getHandler('theme')->getCount(); + $xoopsTpl->assign('count', $count); + + $criteria = new CriteriaCompo(); + $criteria->setStart($start); + $criteria->setLimit($limit); + $objs = $defacer->getHandler('theme')->getObjects($criteria); + + if ($count > $limit) { + include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; + $nav = new XoopsPageNav($count, $limit, $start, 'start', 'op=list'); + $xoopsTpl->assign('pagenav', '<div style="float:left; padding-top:2px;" align="center">' . $nav->renderNav() . '</div>'); + } + + foreach ($objs as $obj) { + $item = $obj->getValues(); + + $page = $defacer->getHandler('page')->get($obj->getVar('theme_id')); + $item['module'] = $page->getVar('name'); + $item['theme_title'] = $page->getVar('page_title'); + $item['theme_url'] = $page->getVar('page_url'); + $item['theme_status'] = $page->getVar('page_status'); + + if (substr($page->getVar('page_url'), -1) == '*') { + $item['theme_vurl'] = 0; + } else { + if ($page->getVar('page_moduleid') == 1){ + $item['theme_vurl'] = XOOPS_URL . '/' . $page->getVar('page_url'); + } else { + $item['theme_vurl'] = XOOPS_URL . '/modules/' . $page->getVar('dirname') . '/' . $page->getVar('page_url'); + } + } + + $xoopsTpl->append('items', $item); + } + + $xoopsTpl->assign('form', defacer_form()); + + return $xoopsTpl->fetch('db:defacer_admin_theme.html'); +} + +function defacer_add() +{ + $defacer =& DefacerDefacer::getInstance(); + + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header(basename(__FILE__), 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); + } + + $obj = $defacer->getHandler('theme')->create(); + $obj->setVars($_POST); + + if (!$defacer->getHandler('theme')->insert($obj)) { + $msg = _AM_DEFACER_ERROR; + } else { + $msg = _AM_DEFACER_DBUPDATED; + } + + redirect_header(basename(__FILE__) , 2, $msg); +} + +function defacer_edit($itemid) +{ + $defacer =& DefacerDefacer::getInstance(); + + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header(basename(__FILE__), 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); + } + + $obj = $defacer->getHandler('theme')->get($itemid); + $obj->setVars($_POST); + + if (!$defacer->getHandler('theme')->insert($obj)) { + $msg = _AM_DEFACER_ERROR; + } else { + $msg = _AM_DEFACER_DBUPDATED; + } + + redirect_header(basename(__FILE__), 2, $msg); +} + +function defacer_del($itemid) +{ + $defacer =& DefacerDefacer::getInstance(); + + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header(basename(__FILE__),1 , implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); + } + + if ($itemid <= 0) { + redirect_header(basename(__FILE__), 1); + } + + $obj = $defacer->getHandler('theme')->get($itemid); + if (!is_object($obj)) { + redirect_header(basename(__FILE__), 1); + } + + if (!$defacer->getHandler('theme')->delete($obj)) { + xoops_cp_header(); + xoops_error(sprintf(_AM_DEFACER_ERROR, $obj->getVar('theme_id'))); + xoops_cp_footer(); + exit(); + } + + redirect_header(basename(__FILE__), 2, _AM_DEFACER_DBUPDATED); +} + +function defacer_confirmdel($itemid) +{ + xoops_cp_header(); + xoops_confirm(array('op' => 'delok', 'itemid' => $itemid), basename(__FILE__), _AM_DEFACER_RUDEL); + xoops_cp_footer(); +} + +function defacer_form($itemid = 0) +{ + $defacer =& DefacerDefacer::getInstance(); + $obj = $defacer->getHandler('theme')->get($itemid); + + if ($obj->isNew()) { + $ftitle = _EDIT; + } else { + $ftitle = _ADD; + } + + $form = new XoopsThemeForm($ftitle, 'theme_form', basename(__FILE__), 'post', true); + + $page_select = new XoopsFormSelect(_AM_DEFACER_PAGE, 'theme_id', $obj->getVar('theme_id', 'e')); + $page_select->customValidationCode[] = 'var value = document.getElementById(\'theme_id\').value; if (value == 0){alert("' . _AM_DEFACER_SELECTPAGE_ERR . '"); return false;}'; + + $criteria = new CriteriaCompo(new Criteria('page_status', 1)); + $criteria->setSort('name'); + $criteria->setOrder('ASC'); + $pageslist = $defacer->getHandler('page')->getList($criteria); + $list = array('0' => '--------------------------'); + $pageslist = $list + $pageslist; + $page_select->addOptionArray($pageslist); + $form->addElement($page_select, true); + + $dirname = XOOPS_THEME_PATH . '/'; + $dirlist = array(); + if (is_dir($dirname) && $handle = opendir($dirname)) { + while (false !== ($file = readdir($handle))) { + if (!preg_match("/^[\.]{1,2}$/", $file)) { + if (strtolower($file) != 'cvs' && is_dir($dirname . $file) && $file != 'z_changeable_theme') { + $dirlist[$file] = $file; + } + } + } + closedir($handle); + asort($dirlist); + reset($dirlist); + } + + $theme_select = new XoopsFormSelect(_AM_DEFACER_THEME, 'theme_name' , $obj->getVar('theme_name', 'e')); + $theme_select->addOptionArray($dirlist); + $form->addElement($theme_select); + + $tray = new XoopsFormElementTray('' ,''); + $tray->addElement(new XoopsFormButton('', 'defacer_button', _SUBMIT, 'submit')); + + $btn = new XoopsFormButton('', 'reset', _CANCEL, 'button'); + if (!$obj->isNew()) { + $btn->setExtra('onclick="document.location.href=\'' . basename(__FILE__) . '\'"'); + } else { + $btn->setExtra('onclick="document.getElementById(\'form\').style.display = \'none\'; return false;"'); + } + $tray->addElement($btn); + $form->addElement($tray); + + if (!$obj->isNew()) { + $form->addElement(new XoopsFormHidden('op', 'editok')); + $form->addElement(new XoopsFormHidden('itemid', $itemid)); + } else { + $form->addElement(new XoopsFormHidden('op', 'add')); + } + + return $form->render(); +} +?> \ No newline at end of file Added: XoopsModules/defacer/branches/mamba/defacer/admin/index.html =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/admin/index.html (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/admin/index.html 2012-02-22 11:34:02 UTC (rev 9047) @@ -0,0 +1 @@ +<script>history.go(-1);</script> Added: XoopsModules/defacer/branches/mamba/defacer/admin/index.php =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/admin/index.php (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/admin/index.php 2012-02-22 11:34:02 UTC (rev 9047) @@ -0,0 +1,22 @@ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +/** + * @copyright The XUUPS Project http://sourceforge.net/projects/xuups/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @package Defacer + * @since 1.0 + * @author trabis <lus...@gm...> + * @version $Id: index.php 0 2009-06-11 18:47:04Z trabis $ + */ + +include dirname(__FILE__) . '/admin_page.php'; +?> \ No newline at end of file Added: XoopsModules/defacer/branches/mamba/defacer/admin/menu.php =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/admin/menu.php (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/admin/menu.php 2012-02-22 11:34:02 UTC (rev 9047) @@ -0,0 +1,44 @@ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +/** + * @copyright The XUUPS Project http://sourceforge.net/projects/xuups/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @package Defacer + * @since 1.0 + * @author trabis <lus...@gm...> + * @version $Id: menu.php 0 2009-06-11 18:47:04Z trabis $ + */ + +defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined"); + +$i = -1; +$i++; +$adminmenu[$i]['title'] = _MI_DEFACER_PAGEMANAGER; +$adminmenu[$i]['link'] = "admin/admin_page.php"; + +$i++; +$adminmenu[$i]['title'] = _MI_DEFACER_THEMEMANAGER; +$adminmenu[$i]['link'] = "admin/admin_theme.php"; + +$i++; +$adminmenu[$i]['title'] = _MI_DEFACER_METAMANAGER; +$adminmenu[$i]['link'] = "admin/admin_meta.php"; + +$i++; +$adminmenu[$i]['title'] = _MI_DEFACER_PERMISSIONMANAGER; +$adminmenu[$i]['link'] = "admin/admin_permission.php"; + +$i++; +$adminmenu[$i]['title'] = _MI_DEFACER_ABOUT; +$adminmenu[$i]['link'] = "admin/admin_about.php"; + +?> \ No newline at end of file Added: XoopsModules/defacer/branches/mamba/defacer/changelog.txt =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/changelog.txt (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/changelog.txt 2012-02-22 11:34:02 UTC (rev 9047) @@ -0,0 +1,19 @@ +<b><u>=> Version 1.0 Final (2009-09-05)</u></b> +Added : jgrowl redirection. +Added : blocks anywhere. + +<b><u>=> Version 1.0 RC (2009-09-01)</u></b> +Improved : Refactored admin area. +Added : Defacer in xoopsLogger Extra. + +<b><u>=> Version 1.0 Alpha (2008-10-27)</u></b> +- First public release of the module. +<b><u>=> Version 1.0 Beta (2008-11-08)</u></b> +Improved : More friendly admin area. +Improved : Less queries needed. +Improved : Less language definitions needed. +Added : Defacer in xoopsLogger. +Added : Settings to disable each Defacer actions. + +<b><u>=> Version 1.0 Alpha (2008-10-27)</u></b> +- First public release of the module. Added: XoopsModules/defacer/branches/mamba/defacer/class/about.php =================================================================== --- XoopsModules/defacer/branches/mamba/defacer/class/about.php (rev 0) +++ XoopsModules/defacer/branches/mamba/defacer/class/about.php 2012-02-22 11:34:02 UTC (rev 9047) @@ -0,0 +1,179 @@ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +/** + * @copyright The XUUPS Project http://sourceforge.net/projects/xuups/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @package Defacer + * @since 1.0 + * @author trabis <lus...@gm...> + * @author The SmartFactory <www.smartfactory.ca> + * @version $Id: about.php 0 2009-06-11 18:47:04Z trabis $ + */ + +defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined"); + +/** + * Class About is a simple class that lets you build an about page + * @author The SmartFactory <www.smartfactory.ca> + */ + +class DefacerAbout +{ + var $_lang_aboutTitle; + var $_lang_author_info; + var $_lang_developer_lead; + var $_lang_developer_contributor; + var $_lang_developer_website; + var $_lang_developer_email; + var $_lang_developer_credits; + var $_lang_module_info; + var $_lang_module_status; + var $_lang_module_release_date; + var $_lang_module_demo; + var $_lang_module_support; + var $_lang_module_bug; + var $_lang_module_submit_bug; + var $_lang_module_feature; + var $_... [truncated message content] |
From: <be...@us...> - 2012-02-22 04:46:19
|
Revision: 9046 http://xoops.svn.sourceforge.net/xoops/?rev=9046&view=rev Author: beckmi Date: 2012-02-22 04:46:10 +0000 (Wed, 22 Feb 2012) Log Message: ----------- Updating PHPMailer to 5.2.1 Modified Paths: -------------- XoopsCore/releases/2.5.5-beta/docs/changelog.250.txt XoopsCore/releases/2.5.5-beta/htdocs/class/mail/phpmailer/ChangeLog.txt XoopsCore/releases/2.5.5-beta/htdocs/class/mail/phpmailer/LICENSE XoopsCore/releases/2.5.5-beta/htdocs/class/mail/phpmailer/README XoopsCore/releases/2.5.5-beta/htdocs/class/mail/phpmailer/class.phpmailer.php XoopsCore/releases/2.5.5-beta/htdocs/class/mail/phpmailer/class.pop3.php XoopsCore/releases/2.5.5-beta/htdocs/class/mail/phpmailer/class.smtp.php XoopsCore/releases/2.5.5-beta/release_notes.txt Added Paths: ----------- XoopsCore/releases/2.5.5-beta/htdocs/class/mail/phpmailer/docs.ini Removed Paths: ------------- XoopsCore/releases/2.5.5-beta/htdocs/class/mail/phpmailer/aboutus.html XoopsCore/releases/2.5.5-beta/htdocs/class/mail/phpmailer/codeworxtech.html Modified: XoopsCore/releases/2.5.5-beta/docs/changelog.250.txt =================================================================== --- XoopsCore/releases/2.5.5-beta/docs/changelog.250.txt 2012-02-22 04:43:55 UTC (rev 9045) +++ XoopsCore/releases/2.5.5-beta/docs/changelog.250.txt 2012-02-22 04:46:10 UTC (rev 9046) @@ -31,6 +31,7 @@ - TinyMCE to 3.4.8 (mamba) - jQuery to 1.71 (mamba) - jQueryUI to version 1.8.17 (mamba) + - PhpMailer to version 5.2.1 (mamba) =============================== 2011/11/20: Version 2.5.4 Final Modified: XoopsCore/releases/2.5.5-beta/htdocs/class/mail/phpmailer/ChangeLog.txt =================================================================== --- XoopsCore/releases/2.5.5-beta/htdocs/class/mail/phpmailer/ChangeLog.txt 2012-02-22 04:43:55 UTC (rev 9045) +++ XoopsCore/releases/2.5.5-beta/htdocs/class/mail/phpmailer/ChangeLog.txt 2012-02-22 04:46:10 UTC (rev 9046) @@ -1,408 +1,421 @@ -ChangeLog - -NOTE: THIS VERSION OF PHPMAILER IS DESIGNED FOR PHP5/PHP6. - IT WILL NOT WORK WITH PHP4. - -Version 5.1 (October 20, 2009) -* fixed filename issue with AddStringAttachment (thanks to Tony) -* fixed "SingleTo" property, now works with Senmail, Qmail, and SMTP in - addition to PHP mail() -* added DKIM digital signing functionality - New properties: - - DKIM_domain (sets the domain name) - - DKIM_private (holds DKIM private key) - - DKIM_passphrase (holds your DKIM passphrase) - - DKIM_selector (holds the DKIM "selector") - - DKIM_identity (holds the identifying email address) -* added callback function support - - callback function parameters include: - result, to, cc, bcc, subject and body - * see the test/test_callback.php file for usage. -* added "auto" identity functionality - - can automatically add: - - Return-path (if Sender not set) - - Reply-To (if ReplyTo not set) - - can be disabled: - - $mail->SetFrom('you...@yo...','First Last',false); - - or by adding the $mail->Sender and/or $mail->ReplyTo properties - Note: "auto" identity added to help with emails ending up in spam - or junk boxes because of missing headers - -Version 5.0.2 (May 24, 2009) -* Fix for missing attachments when inline graphics are present -* Fix for missing Cc in header when using SMTP (mail was sent, - but not displayed in header -- Cc receiver only saw email To: - line and no Cc line, but did get the email (To receiver - saw same) - -Version 5.0.1 (April 05, 2009) -* Temporary fix for missing attachments - -Version 5.0.0 (April 02, 2009) - -* With the release of this version, we are initiating a new version numbering - system to differentiate from the PHP4 version of PHPMailer. -* Most notable in this release is fully object oriented code. -class.smtp.php: -* Refactored class.smtp.php to support new exception handling - code size reduced from 29.2 Kb to 25.6 Kb -* Removed unnecessary functions from class.smtp.php: - public function Expand($name) { - public function Help($keyword="") { - public function Noop() { - public function Send($from) { - public function SendOrMail($from) { - public function Verify($name) { -class.phpmailer.php: -* Refactored class.phpmailer.php with new exception handling -* Changed processing functionality of Sendmail and Qmail so they cannot be - inadvertently used -* removed getFile() function, just became a simple wrapper for - file_get_contents() -* added check for PHP version (will gracefully exit if not at least PHP 5.0) -class.phpmailer.php enhancements -* enhanced code to check if an attachment source is the same as an embedded or - inline graphic source to eliminate duplicate attachments -New /test_script -* We have written a test script you can use to test the script as part of your - installation. Once you press submit, the test script will send a multi-mime - email with either the message you type in or an HTML email with an inline - graphic. Two attachments are included in the email (one of the attachments - is also the inline graphic so you can see that only one copy of the graphic - is sent in the email). The test script will also display the functional - script that you can copy/paste to your editor to duplicate the functionality. -New examples -* All new examples in both basic and advanced modes. Advanced examples show - Exception handling. -PHPDocumentator (phpdocs) documentation for PHPMailer version 5.0.0 -* all new documentation - -Please note: the website has been updated to reflect the changes in PHPMailer -version 5.0.0. http://phpmailer.codeworxtech.com/ - -Version 2.3 (November 06, 2008) - -* added Arabic language (many thanks to Bahjat Al Mostafa) -* removed English language from language files and made it a default within - class.phpmailer.php - if no language is found, it will default to use - the english language translation -* fixed public/private declarations -* corrected line 1728, $basedir to $directory -* added $sign_cert_file to avoid improper duplicate use of $sign_key_file -* corrected $this->Hello on line 612 to $this->Helo -* changed default of $LE to "\r\n" to comply with RFC 2822. Can be set by the user - if default is not acceptable -* removed trim() from return results in EncodeQP -* /test and three files it contained are removed from version 2.3 -* fixed phpunit.php for compliance with PHP5 -* changed $this->AltBody = $textMsg; to $this->AltBody = html_entity_decode($textMsg); -* We have removed the /phpdoc from the downloads. All documentation is now on - the http://phpmailer.codeworxtech.com website. - -Version 2.2.1 () July 19 2008 - -* fixed line 1092 in class.smtp.php (my apologies, error on my part) - -Version 2.2 () July 15 2008 - -* Fixed redirect issue (display of UTF-8 in thank you redirect) -* fixed error in getResponse function declaration (class.pop3.php) -* PHPMailer now PHP6 compliant -* fixed line 1092 in class.smtp.php (endless loop from missing = sign) - -Version 2.1 (Wed, June 04 2008) - -** NOTE: WE HAVE A NEW LANGUAGE VARIABLE FOR DIGITALLY SIGNED S/MIME EMAILS. - IF YOU CAN HELP WITH LANGUAGES OTHER THAN ENGLISH AND SPANISH, IT WOULD BE - APPRECIATED. - -* added S/MIME functionality (ability to digitally sign emails) - BIG THANKS TO "sergiocambra" for posting this patch back in November 2007. - The "Signed Emails" functionality adds the Sign method to pass the private key - filename and the password to read it, and then email will be sent with - content-type multipart/signed and with the digital signature attached. -* fully compatible with E_STRICT error level - - Please note: - In about half the test environments this development version was subjected - to, an error was thrown for the date() functions used (line 1565 and 1569). - This is NOT a PHPMailer error, it is the result of an incorrectly configured - PHP5 installation. The fix is to modify your 'php.ini' file and include the - date.timezone = America/New York - directive, to your own server timezone - - If you do get this error, and are unable to access your php.ini file: - In your PHP script, add - date_default_timezone_set('America/Toronto'); - - do not try to use - $myVar = date_default_timezone_get(); - as a test, it will throw an error. -* added ability to define path (mainly for embedded images) - function MsgHTML($message,$basedir='') ... where: - $basedir is the fully qualified path -* fixed MsgHTML() function: - - Embedded Images where images are specified by <protocol>:// will not be altered or embedded -* fixed the return value of SMTP exit code ( pclose ) -* addressed issue of multibyte characters in subject line and truncating -* added ability to have user specified Message ID - (default is still that PHPMailer create a unique Message ID) -* corrected unidentified message type to 'application/octet-stream' -* fixed chunk_split() multibyte issue (thanks to Colin Brown, et al). -* added check for added attachments -* enhanced conversion of HTML to text in MsgHTML (thanks to "brunny") - -Version 2.1.0beta2 (Sun, Dec 02 2007) -* implemented updated EncodeQP (thanks to coolbru, aka Marcus Bointon) -* finished all testing, all known bugs corrected, enhancements tested -- note: will NOT work with PHP4. - -please note, this is BETA software -** DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS -INTENDED STRICTLY FOR TESTING - -Version 2.1.0beta1 -please note, this is BETA software -** DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS -INTENDED STRICTLY FOR TESTING - -Version 2.0.0 rc2 (Fri, Nov 16 2007), interim release -* implements new property to control VERP in class.smtp.php - example (requires instantiating class.smtp.php): - $mail->do_verp = true; -* POP-before-SMTP functionality included, thanks to Richard Davey - (see class.pop3.php & pop3_before_smtp_test.php for examples) -* included example showing how to use PHPMailer with GMAIL -* fixed the missing Cc in SendMail() and Mail() - -****************** -A note on sending bulk emails: - -If the email you are sending is not personalized, consider using the -"undisclosed-recipient:;" strategy. That is, put all of your recipients -in the Bcc field and set the To field to "undisclosed-recipients:;". -It's a lot faster (only one send) and saves quite a bit on resources. -Contrary to some opinions, this will not get you listed in spam engines - -it's a legitimate way for you to send emails. - -A partial example for use with PHPMailer: - -$mail->AddAddress("undisclosed-recipients:;"); -$mail->AddBCC("em...@an...,em...@an...,em...@an..."); - -Many email service providers restrict the number of emails that can be sent -in any given time period. Often that is between 50 - 60 emails maximum -per hour or per send session. - -If that's the case, then break up your Bcc lists into chunks that are one -less than your limit, and put a pause in your script. -******************* - -Version 2.0.0 rc1 (Thu, Nov 08 2007), interim release -* dramatically simplified using inline graphics ... it's fully automated and requires no user input -* added automatic document type detection for attachments and pictures -* added MsgHTML() function to replace Body tag for HTML emails -* fixed the SendMail security issues (input validation vulnerability) -* enhanced the AddAddresses functionality so that the "Name" portion is used in the email address -* removed the need to use the AltBody method (set from the HTML, or default text used) -* set the PHP Mail() function as the default (still support SendMail, SMTP Mail) -* removed the need to set the IsHTML property (set automatically) -* added Estonian language file by Indrek Päri -* added header injection patch -* added "set" method to permit users to create their own pseudo-properties like 'X-Headers', etc. - example of use: - $mail->set('X-Priority', '3'); - $mail->set('X-MSMail-Priority', 'Normal'); -* fixed warning message in SMTP get_lines method -* added TLS/SSL SMTP support - example of use: - $mail = new PHPMailer(); - $mail->Mailer = "smtp"; - $mail->Host = "smtp.example.com"; - $mail->SMTPSecure = "tls"; // option - //$mail->SMTPSecure = "ssl"; // option - ... - $mail->Send(); -* PHPMailer has been tested with PHP4 (4.4.7) and PHP5 (5.2.7) -* Works with PHP installed as a module or as CGI-PHP -- NOTE: will NOT work with PHP5 in E_STRICT error mode - -Version 1.73 (Sun, Jun 10 2005) -* Fixed denial of service bug: http://www.cybsec.com/vuln/PHPMailer-DOS.pdf -* Now has a total of 20 translations -* Fixed alt attachments bug: http://tinyurl.com/98u9k - -Version 1.72 (Wed, May 25 2004) -* Added Dutch, Swedish, Czech, Norwegian, and Turkish translations. -* Received: Removed this method because spam filter programs like -SpamAssassin reject this header. -* Fixed error count bug. -* SetLanguage default is now "language/". -* Fixed magic_quotes_runtime bug. - -Version 1.71 (Tue, Jul 28 2003) -* Made several speed enhancements -* Added German and Italian translation files -* Fixed HELO/AUTH bugs on keep-alive connects -* Now provides an error message if language file does not load -* Fixed attachment EOL bug -* Updated some unclear documentation -* Added additional tests and improved others - -Version 1.70 (Mon, Jun 20 2003) -* Added SMTP keep-alive support -* Added IsError method for error detection -* Added error message translation support (SetLanguage) -* Refactored many methods to increase library performance -* Hello now sends the newer EHLO message before HELO as per RFC 2821 -* Removed the boundary class and replaced it with GetBoundary -* Removed queue support methods -* New $Hostname variable -* New Message-ID header -* Received header reformat -* Helo variable default changed to $Hostname -* Removed extra spaces in Content-Type definition (#667182) -* Return-Path should be set to Sender when set -* Adds Q or B encoding to headers when necessary -* quoted-encoding should now encode NULs \000 -* Fixed encoding of body/AltBody (#553370) -* Adds "To: undisclosed-recipients:;" when all recipients are hidden (BCC) -* Multiple bug fixes - -Version 1.65 (Fri, Aug 09 2002) -* Fixed non-visible attachment bug (#585097) for Outlook -* SMTP connections are now closed after each transaction -* Fixed SMTP::Expand return value -* Converted SMTP class documentation to phpDocumentor format - -Version 1.62 (Wed, Jun 26 2002) -* Fixed multi-attach bug -* Set proper word wrapping -* Reduced memory use with attachments -* Added more debugging -* Changed documentation to phpDocumentor format - -Version 1.60 (Sat, Mar 30 2002) -* Sendmail pipe and address patch (Christian Holtje) -* Added embedded image and read confirmation support (A. Ognio) -* Added unit tests -* Added SMTP timeout support (*nix only) -* Added possibly temporary PluginDir variable for SMTP class -* Added LE message line ending variable -* Refactored boundary and attachment code -* Eliminated SMTP class warnings -* Added SendToQueue method for future queuing support - -Version 1.54 (Wed, Dec 19 2001) -* Add some queuing support code -* Fixed a pesky multi/alt bug -* Messages are no longer forced to have "To" addresses - -Version 1.50 (Thu, Nov 08 2001) -* Fix extra lines when not using SMTP mailer -* Set WordWrap variable to int with a zero default - -Version 1.47 (Tue, Oct 16 2001) -* Fixed Received header code format -* Fixed AltBody order error -* Fixed alternate port warning - -Version 1.45 (Tue, Sep 25 2001) -* Added enhanced SMTP debug support -* Added support for multiple ports on SMTP -* Added Received header for tracing -* Fixed AddStringAttachment encoding -* Fixed possible header name quote bug -* Fixed wordwrap() trim bug -* Couple other small bug fixes - -Version 1.41 (Wed, Aug 22 2001) -* Fixed AltBody bug w/o attachments -* Fixed rfc_date() for certain mail servers - -Version 1.40 (Sun, Aug 12 2001) -* Added multipart/alternative support (AltBody) -* Documentation update -* Fixed bug in Mercury MTA - -Version 1.29 (Fri, Aug 03 2001) -* Added AddStringAttachment() method -* Added SMTP authentication support - -Version 1.28 (Mon, Jul 30 2001) -* Fixed a typo in SMTP class -* Fixed header issue with Imail (win32) SMTP server -* Made fopen() calls for attachments use "rb" to fix win32 error - -Version 1.25 (Mon, Jul 02 2001) -* Added RFC 822 date fix (Patrice) -* Added improved error handling by adding a $ErrorInfo variable -* Removed MailerDebug variable (obsolete with new error handler) - -Version 1.20 (Mon, Jun 25 2001) -* Added quoted-printable encoding (Patrice) -* Set Version as public and removed PrintVersion() -* Changed phpdoc to only display public variables and methods - -Version 1.19 (Thu, Jun 21 2001) -* Fixed MS Mail header bug -* Added fix for Bcc problem with mail(). *Does not work on Win32* - (See PHP bug report: http://www.php.net/bugs.php?id=11616) -* mail() no longer passes a fifth parameter when not needed - -Version 1.15 (Fri, Jun 15 2001) -[Note: these changes contributed by Patrice Fournier] -* Changed all remaining \n to \r\n -* Bcc: header no longer writen to message except -when sent directly to sendmail -* Added a small message to non-MIME compliant mail reader -* Added Sender variable to change the Sender email -used in -f for sendmail/mail and in 'MAIL FROM' for smtp mode -* Changed boundary setting to a place it will be set only once -* Removed transfer encoding for whole message when using multipart -* Message body now uses Encoding in multipart messages -* Can set encoding and type to attachments 7bit, 8bit -and binary attachment are sent as is, base64 are encoded -* Can set Encoding to base64 to send 8 bits body -through 7 bits servers - -Version 1.10 (Tue, Jun 12 2001) -* Fixed win32 mail header bug (printed out headers in message body) - -Version 1.09 (Fri, Jun 08 2001) -* Changed date header to work with Netscape mail programs -* Altered phpdoc documentation - -Version 1.08 (Tue, Jun 05 2001) -* Added enhanced error-checking -* Added phpdoc documentation to source - -Version 1.06 (Fri, Jun 01 2001) -* Added optional name for file attachments - -Version 1.05 (Tue, May 29 2001) -* Code cleanup -* Eliminated sendmail header warning message -* Fixed possible SMTP error - -Version 1.03 (Thu, May 24 2001) -* Fixed problem where qmail sends out duplicate messages - -Version 1.02 (Wed, May 23 2001) -* Added multiple recipient and attachment Clear* methods -* Added Sendmail public variable -* Fixed problem with loading SMTP library multiple times - -Version 0.98 (Tue, May 22 2001) -* Fixed problem with redundant mail hosts sending out multiple messages -* Added additional error handler code -* Added AddCustomHeader() function -* Added support for Microsoft mail client headers (affects priority) -* Fixed small bug with Mailer variable -* Added PrintVersion() function - -Version 0.92 (Tue, May 15 2001) -* Changed file names to class.phpmailer.php and class.smtp.php to match - current PHP class trend. -* Fixed problem where body not being printed when a message is attached -* Several small bug fixes - -Version 0.90 (Tue, April 17 2001) -* Intial public release +ChangeLog + +NOTE: THIS VERSION OF PHPMAILER IS DESIGNED FOR PHP5/PHP6. + IT WILL NOT WORK WITH PHP4. + +Version 5.2.1 (January 16, 2012) +* Closed several bugs +* Performance improvements +* MsgHTML() now returns the message as required. +* New method: GetSentMIMEMessage() (returns full copy of sent message) + +Version 5.2 (July 19, 2011) +* protected MIME body and header +* better DKIM DNS Resource Record support +* better aly handling +* htmlfilter class added to extras +* moved to Apache Extras + +Version 5.1 (October 20, 2009) +* fixed filename issue with AddStringAttachment (thanks to Tony) +* fixed "SingleTo" property, now works with Senmail, Qmail, and SMTP in + addition to PHP mail() +* added DKIM digital signing functionality + New properties: + - DKIM_domain (sets the domain name) + - DKIM_private (holds DKIM private key) + - DKIM_passphrase (holds your DKIM passphrase) + - DKIM_selector (holds the DKIM "selector") + - DKIM_identity (holds the identifying email address) +* added callback function support + - callback function parameters include: + result, to, cc, bcc, subject and body + * see the test/test_callback.php file for usage. +* added "auto" identity functionality + - can automatically add: + - Return-path (if Sender not set) + - Reply-To (if ReplyTo not set) + - can be disabled: + - $mail->SetFrom('you...@yo...','First Last',false); + - or by adding the $mail->Sender and/or $mail->ReplyTo properties + Note: "auto" identity added to help with emails ending up in spam + or junk boxes because of missing headers + +Version 5.0.2 (May 24, 2009) +* Fix for missing attachments when inline graphics are present +* Fix for missing Cc in header when using SMTP (mail was sent, + but not displayed in header -- Cc receiver only saw email To: + line and no Cc line, but did get the email (To receiver + saw same) + +Version 5.0.1 (April 05, 2009) +* Temporary fix for missing attachments + +Version 5.0.0 (April 02, 2009) + +* With the release of this version, we are initiating a new version numbering + system to differentiate from the PHP4 version of PHPMailer. +* Most notable in this release is fully object oriented code. +class.smtp.php: +* Refactored class.smtp.php to support new exception handling + code size reduced from 29.2 Kb to 25.6 Kb +* Removed unnecessary functions from class.smtp.php: + public function Expand($name) { + public function Help($keyword="") { + public function Noop() { + public function Send($from) { + public function SendOrMail($from) { + public function Verify($name) { +class.phpmailer.php: +* Refactored class.phpmailer.php with new exception handling +* Changed processing functionality of Sendmail and Qmail so they cannot be + inadvertently used +* removed getFile() function, just became a simple wrapper for + file_get_contents() +* added check for PHP version (will gracefully exit if not at least PHP 5.0) +class.phpmailer.php enhancements +* enhanced code to check if an attachment source is the same as an embedded or + inline graphic source to eliminate duplicate attachments +New /test_script +* We have written a test script you can use to test the script as part of your + installation. Once you press submit, the test script will send a multi-mime + email with either the message you type in or an HTML email with an inline + graphic. Two attachments are included in the email (one of the attachments + is also the inline graphic so you can see that only one copy of the graphic + is sent in the email). The test script will also display the functional + script that you can copy/paste to your editor to duplicate the functionality. +New examples +* All new examples in both basic and advanced modes. Advanced examples show + Exception handling. +PHPDocumentator (phpdocs) documentation for PHPMailer version 5.0.0 +* all new documentation + +Please note: the website has been updated to reflect the changes in PHPMailer +version 5.0.0. http://phpmailer.codeworxtech.com/ + +Version 2.3 (November 06, 2008) + +* added Arabic language (many thanks to Bahjat Al Mostafa) +* removed English language from language files and made it a default within + class.phpmailer.php - if no language is found, it will default to use + the english language translation +* fixed public/private declarations +* corrected line 1728, $basedir to $directory +* added $sign_cert_file to avoid improper duplicate use of $sign_key_file +* corrected $this->Hello on line 612 to $this->Helo +* changed default of $LE to "\r\n" to comply with RFC 2822. Can be set by the user + if default is not acceptable +* removed trim() from return results in EncodeQP +* /test and three files it contained are removed from version 2.3 +* fixed phpunit.php for compliance with PHP5 +* changed $this->AltBody = $textMsg; to $this->AltBody = html_entity_decode($textMsg); +* We have removed the /phpdoc from the downloads. All documentation is now on + the http://phpmailer.codeworxtech.com website. + +Version 2.2.1 () July 19 2008 + +* fixed line 1092 in class.smtp.php (my apologies, error on my part) + +Version 2.2 () July 15 2008 + +* Fixed redirect issue (display of UTF-8 in thank you redirect) +* fixed error in getResponse function declaration (class.pop3.php) +* PHPMailer now PHP6 compliant +* fixed line 1092 in class.smtp.php (endless loop from missing = sign) + +Version 2.1 (Wed, June 04 2008) + +** NOTE: WE HAVE A NEW LANGUAGE VARIABLE FOR DIGITALLY SIGNED S/MIME EMAILS. + IF YOU CAN HELP WITH LANGUAGES OTHER THAN ENGLISH AND SPANISH, IT WOULD BE + APPRECIATED. + +* added S/MIME functionality (ability to digitally sign emails) + BIG THANKS TO "sergiocambra" for posting this patch back in November 2007. + The "Signed Emails" functionality adds the Sign method to pass the private key + filename and the password to read it, and then email will be sent with + content-type multipart/signed and with the digital signature attached. +* fully compatible with E_STRICT error level + - Please note: + In about half the test environments this development version was subjected + to, an error was thrown for the date() functions used (line 1565 and 1569). + This is NOT a PHPMailer error, it is the result of an incorrectly configured + PHP5 installation. The fix is to modify your 'php.ini' file and include the + date.timezone = America/New York + directive, to your own server timezone + - If you do get this error, and are unable to access your php.ini file: + In your PHP script, add + date_default_timezone_set('America/Toronto'); + - do not try to use + $myVar = date_default_timezone_get(); + as a test, it will throw an error. +* added ability to define path (mainly for embedded images) + function MsgHTML($message,$basedir='') ... where: + $basedir is the fully qualified path +* fixed MsgHTML() function: + - Embedded Images where images are specified by <protocol>:// will not be altered or embedded +* fixed the return value of SMTP exit code ( pclose ) +* addressed issue of multibyte characters in subject line and truncating +* added ability to have user specified Message ID + (default is still that PHPMailer create a unique Message ID) +* corrected unidentified message type to 'application/octet-stream' +* fixed chunk_split() multibyte issue (thanks to Colin Brown, et al). +* added check for added attachments +* enhanced conversion of HTML to text in MsgHTML (thanks to "brunny") + +Version 2.1.0beta2 (Sun, Dec 02 2007) +* implemented updated EncodeQP (thanks to coolbru, aka Marcus Bointon) +* finished all testing, all known bugs corrected, enhancements tested +- note: will NOT work with PHP4. + +please note, this is BETA software +** DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS +INTENDED STRICTLY FOR TESTING + +Version 2.1.0beta1 +please note, this is BETA software +** DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS +INTENDED STRICTLY FOR TESTING + +Version 2.0.0 rc2 (Fri, Nov 16 2007), interim release +* implements new property to control VERP in class.smtp.php + example (requires instantiating class.smtp.php): + $mail->do_verp = true; +* POP-before-SMTP functionality included, thanks to Richard Davey + (see class.pop3.php & pop3_before_smtp_test.php for examples) +* included example showing how to use PHPMailer with GMAIL +* fixed the missing Cc in SendMail() and Mail() + +****************** +A note on sending bulk emails: + +If the email you are sending is not personalized, consider using the +"undisclosed-recipient:;" strategy. That is, put all of your recipients +in the Bcc field and set the To field to "undisclosed-recipients:;". +It's a lot faster (only one send) and saves quite a bit on resources. +Contrary to some opinions, this will not get you listed in spam engines - +it's a legitimate way for you to send emails. + +A partial example for use with PHPMailer: + +$mail->AddAddress("undisclosed-recipients:;"); +$mail->AddBCC("em...@an...,em...@an...,em...@an..."); + +Many email service providers restrict the number of emails that can be sent +in any given time period. Often that is between 50 - 60 emails maximum +per hour or per send session. + +If that's the case, then break up your Bcc lists into chunks that are one +less than your limit, and put a pause in your script. +******************* + +Version 2.0.0 rc1 (Thu, Nov 08 2007), interim release +* dramatically simplified using inline graphics ... it's fully automated and requires no user input +* added automatic document type detection for attachments and pictures +* added MsgHTML() function to replace Body tag for HTML emails +* fixed the SendMail security issues (input validation vulnerability) +* enhanced the AddAddresses functionality so that the "Name" portion is used in the email address +* removed the need to use the AltBody method (set from the HTML, or default text used) +* set the PHP Mail() function as the default (still support SendMail, SMTP Mail) +* removed the need to set the IsHTML property (set automatically) +* added Estonian language file by Indrek Päri +* added header injection patch +* added "set" method to permit users to create their own pseudo-properties like 'X-Headers', etc. + example of use: + $mail->set('X-Priority', '3'); + $mail->set('X-MSMail-Priority', 'Normal'); +* fixed warning message in SMTP get_lines method +* added TLS/SSL SMTP support + example of use: + $mail = new PHPMailer(); + $mail->Mailer = "smtp"; + $mail->Host = "smtp.example.com"; + $mail->SMTPSecure = "tls"; // option + //$mail->SMTPSecure = "ssl"; // option + ... + $mail->Send(); +* PHPMailer has been tested with PHP4 (4.4.7) and PHP5 (5.2.7) +* Works with PHP installed as a module or as CGI-PHP +- NOTE: will NOT work with PHP5 in E_STRICT error mode + +Version 1.73 (Sun, Jun 10 2005) +* Fixed denial of service bug: http://www.cybsec.com/vuln/PHPMailer-DOS.pdf +* Now has a total of 20 translations +* Fixed alt attachments bug: http://tinyurl.com/98u9k + +Version 1.72 (Wed, May 25 2004) +* Added Dutch, Swedish, Czech, Norwegian, and Turkish translations. +* Received: Removed this method because spam filter programs like +SpamAssassin reject this header. +* Fixed error count bug. +* SetLanguage default is now "language/". +* Fixed magic_quotes_runtime bug. + +Version 1.71 (Tue, Jul 28 2003) +* Made several speed enhancements +* Added German and Italian translation files +* Fixed HELO/AUTH bugs on keep-alive connects +* Now provides an error message if language file does not load +* Fixed attachment EOL bug +* Updated some unclear documentation +* Added additional tests and improved others + +Version 1.70 (Mon, Jun 20 2003) +* Added SMTP keep-alive support +* Added IsError method for error detection +* Added error message translation support (SetLanguage) +* Refactored many methods to increase library performance +* Hello now sends the newer EHLO message before HELO as per RFC 2821 +* Removed the boundary class and replaced it with GetBoundary +* Removed queue support methods +* New $Hostname variable +* New Message-ID header +* Received header reformat +* Helo variable default changed to $Hostname +* Removed extra spaces in Content-Type definition (#667182) +* Return-Path should be set to Sender when set +* Adds Q or B encoding to headers when necessary +* quoted-encoding should now encode NULs \000 +* Fixed encoding of body/AltBody (#553370) +* Adds "To: undisclosed-recipients:;" when all recipients are hidden (BCC) +* Multiple bug fixes + +Version 1.65 (Fri, Aug 09 2002) +* Fixed non-visible attachment bug (#585097) for Outlook +* SMTP connections are now closed after each transaction +* Fixed SMTP::Expand return value +* Converted SMTP class documentation to phpDocumentor format + +Version 1.62 (Wed, Jun 26 2002) +* Fixed multi-attach bug +* Set proper word wrapping +* Reduced memory use with attachments +* Added more debugging +* Changed documentation to phpDocumentor format + +Version 1.60 (Sat, Mar 30 2002) +* Sendmail pipe and address patch (Christian Holtje) +* Added embedded image and read confirmation support (A. Ognio) +* Added unit tests +* Added SMTP timeout support (*nix only) +* Added possibly temporary PluginDir variable for SMTP class +* Added LE message line ending variable +* Refactored boundary and attachment code +* Eliminated SMTP class warnings +* Added SendToQueue method for future queuing support + +Version 1.54 (Wed, Dec 19 2001) +* Add some queuing support code +* Fixed a pesky multi/alt bug +* Messages are no longer forced to have "To" addresses + +Version 1.50 (Thu, Nov 08 2001) +* Fix extra lines when not using SMTP mailer +* Set WordWrap variable to int with a zero default + +Version 1.47 (Tue, Oct 16 2001) +* Fixed Received header code format +* Fixed AltBody order error +* Fixed alternate port warning + +Version 1.45 (Tue, Sep 25 2001) +* Added enhanced SMTP debug support +* Added support for multiple ports on SMTP +* Added Received header for tracing +* Fixed AddStringAttachment encoding +* Fixed possible header name quote bug +* Fixed wordwrap() trim bug +* Couple other small bug fixes + +Version 1.41 (Wed, Aug 22 2001) +* Fixed AltBody bug w/o attachments +* Fixed rfc_date() for certain mail servers + +Version 1.40 (Sun, Aug 12 2001) +* Added multipart/alternative support (AltBody) +* Documentation update +* Fixed bug in Mercury MTA + +Version 1.29 (Fri, Aug 03 2001) +* Added AddStringAttachment() method +* Added SMTP authentication support + +Version 1.28 (Mon, Jul 30 2001) +* Fixed a typo in SMTP class +* Fixed header issue with Imail (win32) SMTP server +* Made fopen() calls for attachments use "rb" to fix win32 error + +Version 1.25 (Mon, Jul 02 2001) +* Added RFC 822 date fix (Patrice) +* Added improved error handling by adding a $ErrorInfo variable +* Removed MailerDebug variable (obsolete with new error handler) + +Version 1.20 (Mon, Jun 25 2001) +* Added quoted-printable encoding (Patrice) +* Set Version as public and removed PrintVersion() +* Changed phpdoc to only display public variables and methods + +Version 1.19 (Thu, Jun 21 2001) +* Fixed MS Mail header bug +* Added fix for Bcc problem with mail(). *Does not work on Win32* + (See PHP bug report: http://www.php.net/bugs.php?id=11616) +* mail() no longer passes a fifth parameter when not needed + +Version 1.15 (Fri, Jun 15 2001) +[Note: these changes contributed by Patrice Fournier] +* Changed all remaining \n to \r\n +* Bcc: header no longer writen to message except +when sent directly to sendmail +* Added a small message to non-MIME compliant mail reader +* Added Sender variable to change the Sender email +used in -f for sendmail/mail and in 'MAIL FROM' for smtp mode +* Changed boundary setting to a place it will be set only once +* Removed transfer encoding for whole message when using multipart +* Message body now uses Encoding in multipart messages +* Can set encoding and type to attachments 7bit, 8bit +and binary attachment are sent as is, base64 are encoded +* Can set Encoding to base64 to send 8 bits body +through 7 bits servers + +Version 1.10 (Tue, Jun 12 2001) +* Fixed win32 mail header bug (printed out headers in message body) + +Version 1.09 (Fri, Jun 08 2001) +* Changed date header to work with Netscape mail programs +* Altered phpdoc documentation + +Version 1.08 (Tue, Jun 05 2001) +* Added enhanced error-checking +* Added phpdoc documentation to source + +Version 1.06 (Fri, Jun 01 2001) +* Added optional name for file attachments + +Version 1.05 (Tue, May 29 2001) +* Code cleanup +* Eliminated sendmail header warning message +* Fixed possible SMTP error + +Version 1.03 (Thu, May 24 2001) +* Fixed problem where qmail sends out duplicate messages + +Version 1.02 (Wed, May 23 2001) +* Added multiple recipient and attachment Clear* methods +* Added Sendmail public variable +* Fixed problem with loading SMTP library multiple times + +Version 0.98 (Tue, May 22 2001) +* Fixed problem with redundant mail hosts sending out multiple messages +* Added additional error handler code +* Added AddCustomHeader() function +* Added support for Microsoft mail client headers (affects priority) +* Fixed small bug with Mailer variable +* Added PrintVersion() function + +Version 0.92 (Tue, May 15 2001) +* Changed file names to class.phpmailer.php and class.smtp.php to match + current PHP class trend. +* Fixed problem where body not being printed when a message is attached +* Several small bug fixes + +Version 0.90 (Tue, April 17 2001) +* Intial public release Modified: XoopsCore/releases/2.5.5-beta/htdocs/class/mail/phpmailer/LICENSE =================================================================== --- XoopsCore/releases/2.5.5-beta/htdocs/class/mail/phpmailer/LICENSE 2012-02-22 04:43:55 UTC (rev 9045) +++ XoopsCore/releases/2.5.5-beta/htdocs/class/mail/phpmailer/LICENSE 2012-02-22 04:46:10 UTC (rev 9046) @@ -1,504 +1,504 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BEC... [truncated message content] |
From: <be...@us...> - 2012-02-22 04:44:04
|
Revision: 9045 http://xoops.svn.sourceforge.net/xoops/?rev=9045&view=rev Author: beckmi Date: 2012-02-22 04:43:55 +0000 (Wed, 22 Feb 2012) Log Message: ----------- Updating PHPMailer to 5.2.1 Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.5/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.5/htdocs/class/mail/phpmailer/ChangeLog.txt XoopsCore/branches/2.5.x/2.5.5/htdocs/class/mail/phpmailer/LICENSE XoopsCore/branches/2.5.x/2.5.5/htdocs/class/mail/phpmailer/README XoopsCore/branches/2.5.x/2.5.5/htdocs/class/mail/phpmailer/class.phpmailer.php XoopsCore/branches/2.5.x/2.5.5/htdocs/class/mail/phpmailer/class.pop3.php XoopsCore/branches/2.5.x/2.5.5/htdocs/class/mail/phpmailer/class.smtp.php XoopsCore/branches/2.5.x/2.5.5/release_notes.txt Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.5/htdocs/class/mail/phpmailer/docs.ini Removed Paths: ------------- XoopsCore/branches/2.5.x/2.5.5/htdocs/class/mail/phpmailer/aboutus.html XoopsCore/branches/2.5.x/2.5.5/htdocs/class/mail/phpmailer/codeworxtech.html Modified: XoopsCore/branches/2.5.x/2.5.5/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/docs/changelog.250.txt 2012-02-22 03:12:20 UTC (rev 9044) +++ XoopsCore/branches/2.5.x/2.5.5/docs/changelog.250.txt 2012-02-22 04:43:55 UTC (rev 9045) @@ -31,6 +31,7 @@ - TinyMCE to 3.4.8 (mamba) - jQuery to 1.71 (mamba) - jQueryUI to version 1.8.17 (mamba) + - PhpMailer to version 5.2.1 (mamba) =============================== 2011/11/20: Version 2.5.4 Final Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/class/mail/phpmailer/ChangeLog.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/class/mail/phpmailer/ChangeLog.txt 2012-02-22 03:12:20 UTC (rev 9044) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/class/mail/phpmailer/ChangeLog.txt 2012-02-22 04:43:55 UTC (rev 9045) @@ -1,408 +1,421 @@ -ChangeLog - -NOTE: THIS VERSION OF PHPMAILER IS DESIGNED FOR PHP5/PHP6. - IT WILL NOT WORK WITH PHP4. - -Version 5.1 (October 20, 2009) -* fixed filename issue with AddStringAttachment (thanks to Tony) -* fixed "SingleTo" property, now works with Senmail, Qmail, and SMTP in - addition to PHP mail() -* added DKIM digital signing functionality - New properties: - - DKIM_domain (sets the domain name) - - DKIM_private (holds DKIM private key) - - DKIM_passphrase (holds your DKIM passphrase) - - DKIM_selector (holds the DKIM "selector") - - DKIM_identity (holds the identifying email address) -* added callback function support - - callback function parameters include: - result, to, cc, bcc, subject and body - * see the test/test_callback.php file for usage. -* added "auto" identity functionality - - can automatically add: - - Return-path (if Sender not set) - - Reply-To (if ReplyTo not set) - - can be disabled: - - $mail->SetFrom('you...@yo...','First Last',false); - - or by adding the $mail->Sender and/or $mail->ReplyTo properties - Note: "auto" identity added to help with emails ending up in spam - or junk boxes because of missing headers - -Version 5.0.2 (May 24, 2009) -* Fix for missing attachments when inline graphics are present -* Fix for missing Cc in header when using SMTP (mail was sent, - but not displayed in header -- Cc receiver only saw email To: - line and no Cc line, but did get the email (To receiver - saw same) - -Version 5.0.1 (April 05, 2009) -* Temporary fix for missing attachments - -Version 5.0.0 (April 02, 2009) - -* With the release of this version, we are initiating a new version numbering - system to differentiate from the PHP4 version of PHPMailer. -* Most notable in this release is fully object oriented code. -class.smtp.php: -* Refactored class.smtp.php to support new exception handling - code size reduced from 29.2 Kb to 25.6 Kb -* Removed unnecessary functions from class.smtp.php: - public function Expand($name) { - public function Help($keyword="") { - public function Noop() { - public function Send($from) { - public function SendOrMail($from) { - public function Verify($name) { -class.phpmailer.php: -* Refactored class.phpmailer.php with new exception handling -* Changed processing functionality of Sendmail and Qmail so they cannot be - inadvertently used -* removed getFile() function, just became a simple wrapper for - file_get_contents() -* added check for PHP version (will gracefully exit if not at least PHP 5.0) -class.phpmailer.php enhancements -* enhanced code to check if an attachment source is the same as an embedded or - inline graphic source to eliminate duplicate attachments -New /test_script -* We have written a test script you can use to test the script as part of your - installation. Once you press submit, the test script will send a multi-mime - email with either the message you type in or an HTML email with an inline - graphic. Two attachments are included in the email (one of the attachments - is also the inline graphic so you can see that only one copy of the graphic - is sent in the email). The test script will also display the functional - script that you can copy/paste to your editor to duplicate the functionality. -New examples -* All new examples in both basic and advanced modes. Advanced examples show - Exception handling. -PHPDocumentator (phpdocs) documentation for PHPMailer version 5.0.0 -* all new documentation - -Please note: the website has been updated to reflect the changes in PHPMailer -version 5.0.0. http://phpmailer.codeworxtech.com/ - -Version 2.3 (November 06, 2008) - -* added Arabic language (many thanks to Bahjat Al Mostafa) -* removed English language from language files and made it a default within - class.phpmailer.php - if no language is found, it will default to use - the english language translation -* fixed public/private declarations -* corrected line 1728, $basedir to $directory -* added $sign_cert_file to avoid improper duplicate use of $sign_key_file -* corrected $this->Hello on line 612 to $this->Helo -* changed default of $LE to "\r\n" to comply with RFC 2822. Can be set by the user - if default is not acceptable -* removed trim() from return results in EncodeQP -* /test and three files it contained are removed from version 2.3 -* fixed phpunit.php for compliance with PHP5 -* changed $this->AltBody = $textMsg; to $this->AltBody = html_entity_decode($textMsg); -* We have removed the /phpdoc from the downloads. All documentation is now on - the http://phpmailer.codeworxtech.com website. - -Version 2.2.1 () July 19 2008 - -* fixed line 1092 in class.smtp.php (my apologies, error on my part) - -Version 2.2 () July 15 2008 - -* Fixed redirect issue (display of UTF-8 in thank you redirect) -* fixed error in getResponse function declaration (class.pop3.php) -* PHPMailer now PHP6 compliant -* fixed line 1092 in class.smtp.php (endless loop from missing = sign) - -Version 2.1 (Wed, June 04 2008) - -** NOTE: WE HAVE A NEW LANGUAGE VARIABLE FOR DIGITALLY SIGNED S/MIME EMAILS. - IF YOU CAN HELP WITH LANGUAGES OTHER THAN ENGLISH AND SPANISH, IT WOULD BE - APPRECIATED. - -* added S/MIME functionality (ability to digitally sign emails) - BIG THANKS TO "sergiocambra" for posting this patch back in November 2007. - The "Signed Emails" functionality adds the Sign method to pass the private key - filename and the password to read it, and then email will be sent with - content-type multipart/signed and with the digital signature attached. -* fully compatible with E_STRICT error level - - Please note: - In about half the test environments this development version was subjected - to, an error was thrown for the date() functions used (line 1565 and 1569). - This is NOT a PHPMailer error, it is the result of an incorrectly configured - PHP5 installation. The fix is to modify your 'php.ini' file and include the - date.timezone = America/New York - directive, to your own server timezone - - If you do get this error, and are unable to access your php.ini file: - In your PHP script, add - date_default_timezone_set('America/Toronto'); - - do not try to use - $myVar = date_default_timezone_get(); - as a test, it will throw an error. -* added ability to define path (mainly for embedded images) - function MsgHTML($message,$basedir='') ... where: - $basedir is the fully qualified path -* fixed MsgHTML() function: - - Embedded Images where images are specified by <protocol>:// will not be altered or embedded -* fixed the return value of SMTP exit code ( pclose ) -* addressed issue of multibyte characters in subject line and truncating -* added ability to have user specified Message ID - (default is still that PHPMailer create a unique Message ID) -* corrected unidentified message type to 'application/octet-stream' -* fixed chunk_split() multibyte issue (thanks to Colin Brown, et al). -* added check for added attachments -* enhanced conversion of HTML to text in MsgHTML (thanks to "brunny") - -Version 2.1.0beta2 (Sun, Dec 02 2007) -* implemented updated EncodeQP (thanks to coolbru, aka Marcus Bointon) -* finished all testing, all known bugs corrected, enhancements tested -- note: will NOT work with PHP4. - -please note, this is BETA software -** DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS -INTENDED STRICTLY FOR TESTING - -Version 2.1.0beta1 -please note, this is BETA software -** DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS -INTENDED STRICTLY FOR TESTING - -Version 2.0.0 rc2 (Fri, Nov 16 2007), interim release -* implements new property to control VERP in class.smtp.php - example (requires instantiating class.smtp.php): - $mail->do_verp = true; -* POP-before-SMTP functionality included, thanks to Richard Davey - (see class.pop3.php & pop3_before_smtp_test.php for examples) -* included example showing how to use PHPMailer with GMAIL -* fixed the missing Cc in SendMail() and Mail() - -****************** -A note on sending bulk emails: - -If the email you are sending is not personalized, consider using the -"undisclosed-recipient:;" strategy. That is, put all of your recipients -in the Bcc field and set the To field to "undisclosed-recipients:;". -It's a lot faster (only one send) and saves quite a bit on resources. -Contrary to some opinions, this will not get you listed in spam engines - -it's a legitimate way for you to send emails. - -A partial example for use with PHPMailer: - -$mail->AddAddress("undisclosed-recipients:;"); -$mail->AddBCC("em...@an...,em...@an...,em...@an..."); - -Many email service providers restrict the number of emails that can be sent -in any given time period. Often that is between 50 - 60 emails maximum -per hour or per send session. - -If that's the case, then break up your Bcc lists into chunks that are one -less than your limit, and put a pause in your script. -******************* - -Version 2.0.0 rc1 (Thu, Nov 08 2007), interim release -* dramatically simplified using inline graphics ... it's fully automated and requires no user input -* added automatic document type detection for attachments and pictures -* added MsgHTML() function to replace Body tag for HTML emails -* fixed the SendMail security issues (input validation vulnerability) -* enhanced the AddAddresses functionality so that the "Name" portion is used in the email address -* removed the need to use the AltBody method (set from the HTML, or default text used) -* set the PHP Mail() function as the default (still support SendMail, SMTP Mail) -* removed the need to set the IsHTML property (set automatically) -* added Estonian language file by Indrek Päri -* added header injection patch -* added "set" method to permit users to create their own pseudo-properties like 'X-Headers', etc. - example of use: - $mail->set('X-Priority', '3'); - $mail->set('X-MSMail-Priority', 'Normal'); -* fixed warning message in SMTP get_lines method -* added TLS/SSL SMTP support - example of use: - $mail = new PHPMailer(); - $mail->Mailer = "smtp"; - $mail->Host = "smtp.example.com"; - $mail->SMTPSecure = "tls"; // option - //$mail->SMTPSecure = "ssl"; // option - ... - $mail->Send(); -* PHPMailer has been tested with PHP4 (4.4.7) and PHP5 (5.2.7) -* Works with PHP installed as a module or as CGI-PHP -- NOTE: will NOT work with PHP5 in E_STRICT error mode - -Version 1.73 (Sun, Jun 10 2005) -* Fixed denial of service bug: http://www.cybsec.com/vuln/PHPMailer-DOS.pdf -* Now has a total of 20 translations -* Fixed alt attachments bug: http://tinyurl.com/98u9k - -Version 1.72 (Wed, May 25 2004) -* Added Dutch, Swedish, Czech, Norwegian, and Turkish translations. -* Received: Removed this method because spam filter programs like -SpamAssassin reject this header. -* Fixed error count bug. -* SetLanguage default is now "language/". -* Fixed magic_quotes_runtime bug. - -Version 1.71 (Tue, Jul 28 2003) -* Made several speed enhancements -* Added German and Italian translation files -* Fixed HELO/AUTH bugs on keep-alive connects -* Now provides an error message if language file does not load -* Fixed attachment EOL bug -* Updated some unclear documentation -* Added additional tests and improved others - -Version 1.70 (Mon, Jun 20 2003) -* Added SMTP keep-alive support -* Added IsError method for error detection -* Added error message translation support (SetLanguage) -* Refactored many methods to increase library performance -* Hello now sends the newer EHLO message before HELO as per RFC 2821 -* Removed the boundary class and replaced it with GetBoundary -* Removed queue support methods -* New $Hostname variable -* New Message-ID header -* Received header reformat -* Helo variable default changed to $Hostname -* Removed extra spaces in Content-Type definition (#667182) -* Return-Path should be set to Sender when set -* Adds Q or B encoding to headers when necessary -* quoted-encoding should now encode NULs \000 -* Fixed encoding of body/AltBody (#553370) -* Adds "To: undisclosed-recipients:;" when all recipients are hidden (BCC) -* Multiple bug fixes - -Version 1.65 (Fri, Aug 09 2002) -* Fixed non-visible attachment bug (#585097) for Outlook -* SMTP connections are now closed after each transaction -* Fixed SMTP::Expand return value -* Converted SMTP class documentation to phpDocumentor format - -Version 1.62 (Wed, Jun 26 2002) -* Fixed multi-attach bug -* Set proper word wrapping -* Reduced memory use with attachments -* Added more debugging -* Changed documentation to phpDocumentor format - -Version 1.60 (Sat, Mar 30 2002) -* Sendmail pipe and address patch (Christian Holtje) -* Added embedded image and read confirmation support (A. Ognio) -* Added unit tests -* Added SMTP timeout support (*nix only) -* Added possibly temporary PluginDir variable for SMTP class -* Added LE message line ending variable -* Refactored boundary and attachment code -* Eliminated SMTP class warnings -* Added SendToQueue method for future queuing support - -Version 1.54 (Wed, Dec 19 2001) -* Add some queuing support code -* Fixed a pesky multi/alt bug -* Messages are no longer forced to have "To" addresses - -Version 1.50 (Thu, Nov 08 2001) -* Fix extra lines when not using SMTP mailer -* Set WordWrap variable to int with a zero default - -Version 1.47 (Tue, Oct 16 2001) -* Fixed Received header code format -* Fixed AltBody order error -* Fixed alternate port warning - -Version 1.45 (Tue, Sep 25 2001) -* Added enhanced SMTP debug support -* Added support for multiple ports on SMTP -* Added Received header for tracing -* Fixed AddStringAttachment encoding -* Fixed possible header name quote bug -* Fixed wordwrap() trim bug -* Couple other small bug fixes - -Version 1.41 (Wed, Aug 22 2001) -* Fixed AltBody bug w/o attachments -* Fixed rfc_date() for certain mail servers - -Version 1.40 (Sun, Aug 12 2001) -* Added multipart/alternative support (AltBody) -* Documentation update -* Fixed bug in Mercury MTA - -Version 1.29 (Fri, Aug 03 2001) -* Added AddStringAttachment() method -* Added SMTP authentication support - -Version 1.28 (Mon, Jul 30 2001) -* Fixed a typo in SMTP class -* Fixed header issue with Imail (win32) SMTP server -* Made fopen() calls for attachments use "rb" to fix win32 error - -Version 1.25 (Mon, Jul 02 2001) -* Added RFC 822 date fix (Patrice) -* Added improved error handling by adding a $ErrorInfo variable -* Removed MailerDebug variable (obsolete with new error handler) - -Version 1.20 (Mon, Jun 25 2001) -* Added quoted-printable encoding (Patrice) -* Set Version as public and removed PrintVersion() -* Changed phpdoc to only display public variables and methods - -Version 1.19 (Thu, Jun 21 2001) -* Fixed MS Mail header bug -* Added fix for Bcc problem with mail(). *Does not work on Win32* - (See PHP bug report: http://www.php.net/bugs.php?id=11616) -* mail() no longer passes a fifth parameter when not needed - -Version 1.15 (Fri, Jun 15 2001) -[Note: these changes contributed by Patrice Fournier] -* Changed all remaining \n to \r\n -* Bcc: header no longer writen to message except -when sent directly to sendmail -* Added a small message to non-MIME compliant mail reader -* Added Sender variable to change the Sender email -used in -f for sendmail/mail and in 'MAIL FROM' for smtp mode -* Changed boundary setting to a place it will be set only once -* Removed transfer encoding for whole message when using multipart -* Message body now uses Encoding in multipart messages -* Can set encoding and type to attachments 7bit, 8bit -and binary attachment are sent as is, base64 are encoded -* Can set Encoding to base64 to send 8 bits body -through 7 bits servers - -Version 1.10 (Tue, Jun 12 2001) -* Fixed win32 mail header bug (printed out headers in message body) - -Version 1.09 (Fri, Jun 08 2001) -* Changed date header to work with Netscape mail programs -* Altered phpdoc documentation - -Version 1.08 (Tue, Jun 05 2001) -* Added enhanced error-checking -* Added phpdoc documentation to source - -Version 1.06 (Fri, Jun 01 2001) -* Added optional name for file attachments - -Version 1.05 (Tue, May 29 2001) -* Code cleanup -* Eliminated sendmail header warning message -* Fixed possible SMTP error - -Version 1.03 (Thu, May 24 2001) -* Fixed problem where qmail sends out duplicate messages - -Version 1.02 (Wed, May 23 2001) -* Added multiple recipient and attachment Clear* methods -* Added Sendmail public variable -* Fixed problem with loading SMTP library multiple times - -Version 0.98 (Tue, May 22 2001) -* Fixed problem with redundant mail hosts sending out multiple messages -* Added additional error handler code -* Added AddCustomHeader() function -* Added support for Microsoft mail client headers (affects priority) -* Fixed small bug with Mailer variable -* Added PrintVersion() function - -Version 0.92 (Tue, May 15 2001) -* Changed file names to class.phpmailer.php and class.smtp.php to match - current PHP class trend. -* Fixed problem where body not being printed when a message is attached -* Several small bug fixes - -Version 0.90 (Tue, April 17 2001) -* Intial public release +ChangeLog + +NOTE: THIS VERSION OF PHPMAILER IS DESIGNED FOR PHP5/PHP6. + IT WILL NOT WORK WITH PHP4. + +Version 5.2.1 (January 16, 2012) +* Closed several bugs +* Performance improvements +* MsgHTML() now returns the message as required. +* New method: GetSentMIMEMessage() (returns full copy of sent message) + +Version 5.2 (July 19, 2011) +* protected MIME body and header +* better DKIM DNS Resource Record support +* better aly handling +* htmlfilter class added to extras +* moved to Apache Extras + +Version 5.1 (October 20, 2009) +* fixed filename issue with AddStringAttachment (thanks to Tony) +* fixed "SingleTo" property, now works with Senmail, Qmail, and SMTP in + addition to PHP mail() +* added DKIM digital signing functionality + New properties: + - DKIM_domain (sets the domain name) + - DKIM_private (holds DKIM private key) + - DKIM_passphrase (holds your DKIM passphrase) + - DKIM_selector (holds the DKIM "selector") + - DKIM_identity (holds the identifying email address) +* added callback function support + - callback function parameters include: + result, to, cc, bcc, subject and body + * see the test/test_callback.php file for usage. +* added "auto" identity functionality + - can automatically add: + - Return-path (if Sender not set) + - Reply-To (if ReplyTo not set) + - can be disabled: + - $mail->SetFrom('you...@yo...','First Last',false); + - or by adding the $mail->Sender and/or $mail->ReplyTo properties + Note: "auto" identity added to help with emails ending up in spam + or junk boxes because of missing headers + +Version 5.0.2 (May 24, 2009) +* Fix for missing attachments when inline graphics are present +* Fix for missing Cc in header when using SMTP (mail was sent, + but not displayed in header -- Cc receiver only saw email To: + line and no Cc line, but did get the email (To receiver + saw same) + +Version 5.0.1 (April 05, 2009) +* Temporary fix for missing attachments + +Version 5.0.0 (April 02, 2009) + +* With the release of this version, we are initiating a new version numbering + system to differentiate from the PHP4 version of PHPMailer. +* Most notable in this release is fully object oriented code. +class.smtp.php: +* Refactored class.smtp.php to support new exception handling + code size reduced from 29.2 Kb to 25.6 Kb +* Removed unnecessary functions from class.smtp.php: + public function Expand($name) { + public function Help($keyword="") { + public function Noop() { + public function Send($from) { + public function SendOrMail($from) { + public function Verify($name) { +class.phpmailer.php: +* Refactored class.phpmailer.php with new exception handling +* Changed processing functionality of Sendmail and Qmail so they cannot be + inadvertently used +* removed getFile() function, just became a simple wrapper for + file_get_contents() +* added check for PHP version (will gracefully exit if not at least PHP 5.0) +class.phpmailer.php enhancements +* enhanced code to check if an attachment source is the same as an embedded or + inline graphic source to eliminate duplicate attachments +New /test_script +* We have written a test script you can use to test the script as part of your + installation. Once you press submit, the test script will send a multi-mime + email with either the message you type in or an HTML email with an inline + graphic. Two attachments are included in the email (one of the attachments + is also the inline graphic so you can see that only one copy of the graphic + is sent in the email). The test script will also display the functional + script that you can copy/paste to your editor to duplicate the functionality. +New examples +* All new examples in both basic and advanced modes. Advanced examples show + Exception handling. +PHPDocumentator (phpdocs) documentation for PHPMailer version 5.0.0 +* all new documentation + +Please note: the website has been updated to reflect the changes in PHPMailer +version 5.0.0. http://phpmailer.codeworxtech.com/ + +Version 2.3 (November 06, 2008) + +* added Arabic language (many thanks to Bahjat Al Mostafa) +* removed English language from language files and made it a default within + class.phpmailer.php - if no language is found, it will default to use + the english language translation +* fixed public/private declarations +* corrected line 1728, $basedir to $directory +* added $sign_cert_file to avoid improper duplicate use of $sign_key_file +* corrected $this->Hello on line 612 to $this->Helo +* changed default of $LE to "\r\n" to comply with RFC 2822. Can be set by the user + if default is not acceptable +* removed trim() from return results in EncodeQP +* /test and three files it contained are removed from version 2.3 +* fixed phpunit.php for compliance with PHP5 +* changed $this->AltBody = $textMsg; to $this->AltBody = html_entity_decode($textMsg); +* We have removed the /phpdoc from the downloads. All documentation is now on + the http://phpmailer.codeworxtech.com website. + +Version 2.2.1 () July 19 2008 + +* fixed line 1092 in class.smtp.php (my apologies, error on my part) + +Version 2.2 () July 15 2008 + +* Fixed redirect issue (display of UTF-8 in thank you redirect) +* fixed error in getResponse function declaration (class.pop3.php) +* PHPMailer now PHP6 compliant +* fixed line 1092 in class.smtp.php (endless loop from missing = sign) + +Version 2.1 (Wed, June 04 2008) + +** NOTE: WE HAVE A NEW LANGUAGE VARIABLE FOR DIGITALLY SIGNED S/MIME EMAILS. + IF YOU CAN HELP WITH LANGUAGES OTHER THAN ENGLISH AND SPANISH, IT WOULD BE + APPRECIATED. + +* added S/MIME functionality (ability to digitally sign emails) + BIG THANKS TO "sergiocambra" for posting this patch back in November 2007. + The "Signed Emails" functionality adds the Sign method to pass the private key + filename and the password to read it, and then email will be sent with + content-type multipart/signed and with the digital signature attached. +* fully compatible with E_STRICT error level + - Please note: + In about half the test environments this development version was subjected + to, an error was thrown for the date() functions used (line 1565 and 1569). + This is NOT a PHPMailer error, it is the result of an incorrectly configured + PHP5 installation. The fix is to modify your 'php.ini' file and include the + date.timezone = America/New York + directive, to your own server timezone + - If you do get this error, and are unable to access your php.ini file: + In your PHP script, add + date_default_timezone_set('America/Toronto'); + - do not try to use + $myVar = date_default_timezone_get(); + as a test, it will throw an error. +* added ability to define path (mainly for embedded images) + function MsgHTML($message,$basedir='') ... where: + $basedir is the fully qualified path +* fixed MsgHTML() function: + - Embedded Images where images are specified by <protocol>:// will not be altered or embedded +* fixed the return value of SMTP exit code ( pclose ) +* addressed issue of multibyte characters in subject line and truncating +* added ability to have user specified Message ID + (default is still that PHPMailer create a unique Message ID) +* corrected unidentified message type to 'application/octet-stream' +* fixed chunk_split() multibyte issue (thanks to Colin Brown, et al). +* added check for added attachments +* enhanced conversion of HTML to text in MsgHTML (thanks to "brunny") + +Version 2.1.0beta2 (Sun, Dec 02 2007) +* implemented updated EncodeQP (thanks to coolbru, aka Marcus Bointon) +* finished all testing, all known bugs corrected, enhancements tested +- note: will NOT work with PHP4. + +please note, this is BETA software +** DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS +INTENDED STRICTLY FOR TESTING + +Version 2.1.0beta1 +please note, this is BETA software +** DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS +INTENDED STRICTLY FOR TESTING + +Version 2.0.0 rc2 (Fri, Nov 16 2007), interim release +* implements new property to control VERP in class.smtp.php + example (requires instantiating class.smtp.php): + $mail->do_verp = true; +* POP-before-SMTP functionality included, thanks to Richard Davey + (see class.pop3.php & pop3_before_smtp_test.php for examples) +* included example showing how to use PHPMailer with GMAIL +* fixed the missing Cc in SendMail() and Mail() + +****************** +A note on sending bulk emails: + +If the email you are sending is not personalized, consider using the +"undisclosed-recipient:;" strategy. That is, put all of your recipients +in the Bcc field and set the To field to "undisclosed-recipients:;". +It's a lot faster (only one send) and saves quite a bit on resources. +Contrary to some opinions, this will not get you listed in spam engines - +it's a legitimate way for you to send emails. + +A partial example for use with PHPMailer: + +$mail->AddAddress("undisclosed-recipients:;"); +$mail->AddBCC("em...@an...,em...@an...,em...@an..."); + +Many email service providers restrict the number of emails that can be sent +in any given time period. Often that is between 50 - 60 emails maximum +per hour or per send session. + +If that's the case, then break up your Bcc lists into chunks that are one +less than your limit, and put a pause in your script. +******************* + +Version 2.0.0 rc1 (Thu, Nov 08 2007), interim release +* dramatically simplified using inline graphics ... it's fully automated and requires no user input +* added automatic document type detection for attachments and pictures +* added MsgHTML() function to replace Body tag for HTML emails +* fixed the SendMail security issues (input validation vulnerability) +* enhanced the AddAddresses functionality so that the "Name" portion is used in the email address +* removed the need to use the AltBody method (set from the HTML, or default text used) +* set the PHP Mail() function as the default (still support SendMail, SMTP Mail) +* removed the need to set the IsHTML property (set automatically) +* added Estonian language file by Indrek Päri +* added header injection patch +* added "set" method to permit users to create their own pseudo-properties like 'X-Headers', etc. + example of use: + $mail->set('X-Priority', '3'); + $mail->set('X-MSMail-Priority', 'Normal'); +* fixed warning message in SMTP get_lines method +* added TLS/SSL SMTP support + example of use: + $mail = new PHPMailer(); + $mail->Mailer = "smtp"; + $mail->Host = "smtp.example.com"; + $mail->SMTPSecure = "tls"; // option + //$mail->SMTPSecure = "ssl"; // option + ... + $mail->Send(); +* PHPMailer has been tested with PHP4 (4.4.7) and PHP5 (5.2.7) +* Works with PHP installed as a module or as CGI-PHP +- NOTE: will NOT work with PHP5 in E_STRICT error mode + +Version 1.73 (Sun, Jun 10 2005) +* Fixed denial of service bug: http://www.cybsec.com/vuln/PHPMailer-DOS.pdf +* Now has a total of 20 translations +* Fixed alt attachments bug: http://tinyurl.com/98u9k + +Version 1.72 (Wed, May 25 2004) +* Added Dutch, Swedish, Czech, Norwegian, and Turkish translations. +* Received: Removed this method because spam filter programs like +SpamAssassin reject this header. +* Fixed error count bug. +* SetLanguage default is now "language/". +* Fixed magic_quotes_runtime bug. + +Version 1.71 (Tue, Jul 28 2003) +* Made several speed enhancements +* Added German and Italian translation files +* Fixed HELO/AUTH bugs on keep-alive connects +* Now provides an error message if language file does not load +* Fixed attachment EOL bug +* Updated some unclear documentation +* Added additional tests and improved others + +Version 1.70 (Mon, Jun 20 2003) +* Added SMTP keep-alive support +* Added IsError method for error detection +* Added error message translation support (SetLanguage) +* Refactored many methods to increase library performance +* Hello now sends the newer EHLO message before HELO as per RFC 2821 +* Removed the boundary class and replaced it with GetBoundary +* Removed queue support methods +* New $Hostname variable +* New Message-ID header +* Received header reformat +* Helo variable default changed to $Hostname +* Removed extra spaces in Content-Type definition (#667182) +* Return-Path should be set to Sender when set +* Adds Q or B encoding to headers when necessary +* quoted-encoding should now encode NULs \000 +* Fixed encoding of body/AltBody (#553370) +* Adds "To: undisclosed-recipients:;" when all recipients are hidden (BCC) +* Multiple bug fixes + +Version 1.65 (Fri, Aug 09 2002) +* Fixed non-visible attachment bug (#585097) for Outlook +* SMTP connections are now closed after each transaction +* Fixed SMTP::Expand return value +* Converted SMTP class documentation to phpDocumentor format + +Version 1.62 (Wed, Jun 26 2002) +* Fixed multi-attach bug +* Set proper word wrapping +* Reduced memory use with attachments +* Added more debugging +* Changed documentation to phpDocumentor format + +Version 1.60 (Sat, Mar 30 2002) +* Sendmail pipe and address patch (Christian Holtje) +* Added embedded image and read confirmation support (A. Ognio) +* Added unit tests +* Added SMTP timeout support (*nix only) +* Added possibly temporary PluginDir variable for SMTP class +* Added LE message line ending variable +* Refactored boundary and attachment code +* Eliminated SMTP class warnings +* Added SendToQueue method for future queuing support + +Version 1.54 (Wed, Dec 19 2001) +* Add some queuing support code +* Fixed a pesky multi/alt bug +* Messages are no longer forced to have "To" addresses + +Version 1.50 (Thu, Nov 08 2001) +* Fix extra lines when not using SMTP mailer +* Set WordWrap variable to int with a zero default + +Version 1.47 (Tue, Oct 16 2001) +* Fixed Received header code format +* Fixed AltBody order error +* Fixed alternate port warning + +Version 1.45 (Tue, Sep 25 2001) +* Added enhanced SMTP debug support +* Added support for multiple ports on SMTP +* Added Received header for tracing +* Fixed AddStringAttachment encoding +* Fixed possible header name quote bug +* Fixed wordwrap() trim bug +* Couple other small bug fixes + +Version 1.41 (Wed, Aug 22 2001) +* Fixed AltBody bug w/o attachments +* Fixed rfc_date() for certain mail servers + +Version 1.40 (Sun, Aug 12 2001) +* Added multipart/alternative support (AltBody) +* Documentation update +* Fixed bug in Mercury MTA + +Version 1.29 (Fri, Aug 03 2001) +* Added AddStringAttachment() method +* Added SMTP authentication support + +Version 1.28 (Mon, Jul 30 2001) +* Fixed a typo in SMTP class +* Fixed header issue with Imail (win32) SMTP server +* Made fopen() calls for attachments use "rb" to fix win32 error + +Version 1.25 (Mon, Jul 02 2001) +* Added RFC 822 date fix (Patrice) +* Added improved error handling by adding a $ErrorInfo variable +* Removed MailerDebug variable (obsolete with new error handler) + +Version 1.20 (Mon, Jun 25 2001) +* Added quoted-printable encoding (Patrice) +* Set Version as public and removed PrintVersion() +* Changed phpdoc to only display public variables and methods + +Version 1.19 (Thu, Jun 21 2001) +* Fixed MS Mail header bug +* Added fix for Bcc problem with mail(). *Does not work on Win32* + (See PHP bug report: http://www.php.net/bugs.php?id=11616) +* mail() no longer passes a fifth parameter when not needed + +Version 1.15 (Fri, Jun 15 2001) +[Note: these changes contributed by Patrice Fournier] +* Changed all remaining \n to \r\n +* Bcc: header no longer writen to message except +when sent directly to sendmail +* Added a small message to non-MIME compliant mail reader +* Added Sender variable to change the Sender email +used in -f for sendmail/mail and in 'MAIL FROM' for smtp mode +* Changed boundary setting to a place it will be set only once +* Removed transfer encoding for whole message when using multipart +* Message body now uses Encoding in multipart messages +* Can set encoding and type to attachments 7bit, 8bit +and binary attachment are sent as is, base64 are encoded +* Can set Encoding to base64 to send 8 bits body +through 7 bits servers + +Version 1.10 (Tue, Jun 12 2001) +* Fixed win32 mail header bug (printed out headers in message body) + +Version 1.09 (Fri, Jun 08 2001) +* Changed date header to work with Netscape mail programs +* Altered phpdoc documentation + +Version 1.08 (Tue, Jun 05 2001) +* Added enhanced error-checking +* Added phpdoc documentation to source + +Version 1.06 (Fri, Jun 01 2001) +* Added optional name for file attachments + +Version 1.05 (Tue, May 29 2001) +* Code cleanup +* Eliminated sendmail header warning message +* Fixed possible SMTP error + +Version 1.03 (Thu, May 24 2001) +* Fixed problem where qmail sends out duplicate messages + +Version 1.02 (Wed, May 23 2001) +* Added multiple recipient and attachment Clear* methods +* Added Sendmail public variable +* Fixed problem with loading SMTP library multiple times + +Version 0.98 (Tue, May 22 2001) +* Fixed problem with redundant mail hosts sending out multiple messages +* Added additional error handler code +* Added AddCustomHeader() function +* Added support for Microsoft mail client headers (affects priority) +* Fixed small bug with Mailer variable +* Added PrintVersion() function + +Version 0.92 (Tue, May 15 2001) +* Changed file names to class.phpmailer.php and class.smtp.php to match + current PHP class trend. +* Fixed problem where body not being printed when a message is attached +* Several small bug fixes + +Version 0.90 (Tue, April 17 2001) +* Intial public release Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/class/mail/phpmailer/LICENSE =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/class/mail/phpmailer/LICENSE 2012-02-22 03:12:20 UTC (rev 9044) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/class/mail/phpmailer/LICENSE 2012-02-22 04:43:55 UTC (rev 9045) @@ -1,504 +1,504 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO W... [truncated message content] |
From: <be...@us...> - 2012-02-22 03:12:26
|
Revision: 9044 http://xoops.svn.sourceforge.net/xoops/?rev=9044&view=rev Author: beckmi Date: 2012-02-22 03:12:20 +0000 (Wed, 22 Feb 2012) Log Message: ----------- Creating 2.5.5 Beta Release Added Paths: ----------- XoopsCore/releases/2.5.5-beta/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-02-22 02:51:45
|
Revision: 9043 http://xoops.svn.sourceforge.net/xoops/?rev=9043&view=rev Author: beckmi Date: 2012-02-22 02:51:38 +0000 (Wed, 22 Feb 2012) Log Message: ----------- Fixing Upgrade errors. Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.5/upgrade/licence-upgrade-keygen-2.4.0-to-2.4.1/index.php XoopsCore/branches/2.5.x/2.5.5/upgrade/upd-2.5.4-to-2.5.5/index.php Modified: XoopsCore/branches/2.5.x/2.5.5/upgrade/licence-upgrade-keygen-2.4.0-to-2.4.1/index.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/upgrade/licence-upgrade-keygen-2.4.0-to-2.4.1/index.php 2012-02-21 23:17:00 UTC (rev 9042) +++ XoopsCore/branches/2.5.x/2.5.5/upgrade/licence-upgrade-keygen-2.4.0-to-2.4.1/index.php 2012-02-22 02:51:38 UTC (rev 9043) @@ -154,6 +154,7 @@ $checksums = array(1 => 'md5', 2 => 'sha1'); $type = rand(1, 2); $func = $checksums[$type]; + $xoops_key=''; error_reporting(E_ALL); @@ -199,6 +200,7 @@ function xoops_stripeKey($xoops_key, $num = 6, $length = 30, $uu = 0) { $strip = floor(strlen($xoops_key) / 6); + $ret=0; for ($i = 0; $i < strlen($xoops_key); $i++) { if ($i < $length) { $uu++; Modified: XoopsCore/branches/2.5.x/2.5.5/upgrade/upd-2.5.4-to-2.5.5/index.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/upgrade/upd-2.5.4-to-2.5.5/index.php 2012-02-21 23:17:00 UTC (rev 9042) +++ XoopsCore/branches/2.5.x/2.5.5/upgrade/upd-2.5.4-to-2.5.5/index.php 2012-02-22 02:51:38 UTC (rev 9043) @@ -1,14 +1,4 @@ <?php -/* - You may not change or alter any portion of this comment or credits - of supporting developers from this source code or any supporting source code - which is considered copyrighted (c) material of the original comment or credit authors. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -*/ - /** * Upgrader from 2.5.4 to 2.5.5 * @@ -18,7 +8,7 @@ * @copyright The XOOPS project http://www.xoops.org/ * @license http://www.fsf.org/copyleft/gpl.html GNU General Public License (GPL) * @package upgrader - * @since 2.4.0 + * @since 2.5.5 * @author Taiwen Jiang <ph...@us...> * @author trabis <lus...@gm...> * @version $Id$ @@ -26,7 +16,7 @@ class upgrade_255 extends xoopsUpgrade { - var $tasks = array('keys','imptotal'); + var $tasks = array('keys', 'imptotal'); /** @@ -38,7 +28,9 @@ { $tables['groups_users_link'] = array('uid'); - foreach ($tables as $table => $keys) { + foreach ( + $tables as $table => $keys + ) { $sql = "SHOW KEYS FROM `" . $GLOBALS['xoopsDB']->prefix($table) . "`"; if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) { continue; @@ -47,7 +39,9 @@ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) { $existing_keys[] = $row['Key_name']; } - foreach ($keys as $key) { + foreach ( + $keys as $key + ) { if (!in_array($key, $existing_keys)) { return false; } @@ -65,7 +59,9 @@ { $tables['groups_users_link'] = array('uid'); - foreach ($tables as $table=>$keys) { + foreach ( + $tables as $table=> $keys + ) { $sql = "SHOW KEYS FROM `" . $GLOBALS['xoopsDB']->prefix($table) . "`"; if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) { continue; @@ -74,7 +70,9 @@ while ($row = $GLOBALS['xoopsDB']->fetchArray($result)) { $existing_keys[] = $row['Key_name']; } - foreach ($keys as $key) { + foreach ( + $keys as $key + ) { if (!in_array($key, $existing_keys)) { $sql = "ALTER TABLE `" . $GLOBALS['xoopsDB']->prefix($table) . "` ADD INDEX `{$key}` (`{$key}`)"; if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) { @@ -85,7 +83,7 @@ } return true; } - + /** * Check imptotal * @@ -93,9 +91,13 @@ */ function check_imptotal() { - return false; + $sql = "SELECT `imptotal` FROM `" . $GLOBALS['xoopsDB']->prefix('banner') . "` WHERE `bid` = 1"; + if ($result = $GLOBALS['xoopsDB']->queryF($sql)) { + $length = mysql_field_len($result, 0); + return ($length == 8) ? false : true; + } } - + /** * Apply imptotal * @@ -103,7 +105,8 @@ */ function apply_imptotal() { - $sql = "ALTER TABLE `" . $GLOBALS['xoopsDB']->prefix("banner") . "` CHANGE `imptotal` `imptotal` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'"; + $sql = "ALTER TABLE `" . $GLOBALS['xoopsDB']->prefix("banner") + . "` CHANGE `imptotal` `imptotal` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'"; if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) { return false; } @@ -112,7 +115,7 @@ function upgrade_255() { - $this->xoopsUpgrade( basename(dirname(__FILE__)) ); + $this->xoopsUpgrade(basename(dirname(__FILE__))); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <txm...@us...> - 2012-02-21 23:17:11
|
Revision: 9042 http://xoops.svn.sourceforge.net/xoops/?rev=9042&view=rev Author: txmodxoops Date: 2012-02-21 23:17:00 +0000 (Tue, 21 Feb 2012) Log Message: ----------- Deleted unnecessary code Modified Paths: -------------- XoopsModules/TDMCreate/releases/1.39/TDMCreate/admin/tables.php XoopsModules/TDMCreate/releases/1.39/TDMCreate/class/tdmcreate_modules.php XoopsModules/TDMCreate/releases/1.39/TDMCreate/class/tdmcreate_tables.php XoopsModules/TDMCreate/releases/1.39/TDMCreate/language/english/admin.php XoopsModules/TDMCreate/releases/1.39/TDMCreate/language/italian/admin.php XoopsModules/TDMCreate/releases/1.39/TDMCreate/language/update language 1.38 to 1.39.txt XoopsModules/TDMCreate/releases/1.39/TDMCreate/sql/mysql.sql XoopsModules/TDMCreate/releases/1.39/TDMCreate/xoops_version.php Modified: XoopsModules/TDMCreate/releases/1.39/TDMCreate/admin/tables.php =================================================================== --- XoopsModules/TDMCreate/releases/1.39/TDMCreate/admin/tables.php 2012-02-21 15:36:32 UTC (rev 9041) +++ XoopsModules/TDMCreate/releases/1.39/TDMCreate/admin/tables.php 2012-02-21 23:17:00 UTC (rev 9042) @@ -43,154 +43,55 @@ $modules =& $modsHandler->get($_REQUEST['tables_modules']); $modules_name = $modsHandler->getVar('modules_name'); - $obj->setVar('tables_modules', $_REQUEST['tables_modules']); + $obj->setVar('tables_modules', $_REQUEST['tables_modules']); + $obj->setVar('tables_module_table', strtolower($modules_name.'_'.$_REQUEST['tables_name'])); + $obj->setVar('tables_name', strtolower($_REQUEST['tables_name'])); + $obj->setVar('tables_name_empty', $_REQUEST['tables_name_empty']); + $obj->setVar('tables_blocks', $_REQUEST['tables_blocks']); + $obj->setVar('tables_display_admin', $_REQUEST['tables_display_admin']); + $obj->setVar('tables_display_user', $_REQUEST['tables_display_user']); + $obj->setVar('tables_submitter', $_REQUEST['tables_submitter']); + $obj->setVar('tables_publisher', $_REQUEST['tables_publisher']); + $obj->setVar('tables_created', $_REQUEST['tables_created']); + $obj->setVar('tables_published', $_REQUEST['tables_published']); + $obj->setVar('tables_expired', $_REQUEST['tables_expired']); + $obj->setVar('tables_status', $_REQUEST['tables_status']); + $obj->setVar('tables_online', $_REQUEST['tables_online']); + $obj->setVar('tables_pending', $_REQUEST['tables_pending']); + $obj->setVar('tables_search', $_REQUEST['tables_search']); + $obj->setVar('tables_coms', $_REQUEST['tables_coms']); + $obj->setVar('tables_nb_champs', $_REQUEST['tables_nb_champs']); - if ( $_REQUEST['select'] == 1 ) - { - $obj->setVar('tables_module_table', strtolower($modules_name.'_topic')); - $obj->setVar('tables_name', 'topic'); - $obj->setVar('tables_blocks', 0); - $obj->setVar('tables_display_admin', 0); - $obj->setVar('tables_display_user', 0); - $obj->setVar('tables_submitter', 0); - $obj->setVar('tables_publisher', 0); - $obj->setVar('tables_created', 0); - $obj->setVar('tables_published', 0); - $obj->setVar('tables_expired', 0); - $obj->setVar('tables_status', 0); - $obj->setVar('tables_online', 0); - $obj->setVar('tables_pending', 0); - $obj->setVar('tables_search', 0); - $obj->setVar('tables_coms', 0); - $obj->setVar('tables_nb_champs', 15); - - $tables_champs = 'topic_id:int:11:unsigned:NOT NULL: :|topic_pid:int:5:unsigned:NOT NULL:0:|topic_title:varchar:255: :NOT NULL: :|topic_desc:text: : :NOT NULL: :|topic_img:varchar:255: :NOT NULL: :|topic_weight:int:5: :NOT NULL:0:|topic_color:varchar:10: :NULL: :'; - - // Options Extra Champs - if ( isset($_REQUEST['tables_submitter']) == 1 ) - $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_submitter:int:11: :NOT NULL:0:'; - if ( isset($_REQUEST['tables_publisher']) == 1 ) - $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_publisher:text: :NOT NULL: :'; - if ( isset($_REQUEST['tables_created']) == 1 ) - $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_created:int:10: :NOT NULL:0:'; - if ( isset($_REQUEST['tables_published']) == 1 ) - $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_published:int:10: :NOT NULL:0:'; - if ( isset($_REQUEST['tables_expired']) == 1 ) - $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_expired:int:10: :NOT NULL:0:'; - if ( isset($_REQUEST['tables_status']) == 1 ) - $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_status:tinyint:2: :NOT NULL:0:'; - if ( isset($_REQUEST['tables_online']) == 1 ) - $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_online:tinyint:1: :NOT NULL:0:'; - if ( isset($_REQUEST['tables_pending']) == 1 ) - $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_pending:tinyint:1: :NOT NULL:0:'; - - $tables_parametres = 'XoopsFormTopic:0:0:0:0:0:0|XoopsFormText:1:1:0:1:0:1|XoopsFormTextArea:0:1:0:0:0:1|XoopsFormUploadImage:1:1:0:0:0:0|XoopsFormText:1:1:0:0:0:1|XoopsFormColorPicker:1:1:0:0:0:0|XoopsFormSelect:0:0:0:0:0:0|XoopsFormSelectUser:0:0:0:0:0:1|XoopsFormTextDateSelect:0:0:0:0:0:1|XoopsFormCheckBox:1:1:0:0:0:1'; - - //Image - include_once XOOPS_ROOT_PATH.'/class/uploader.php'; - - if(is_dir($pathImageAdmin)){ - $uploaddir = $pathImageAdmin; - }else{ - $uploaddir = XOOPS_ROOT_PATH . "/modules/".$GLOBALS['xoopsModule']->dirname()."/images/uploads/tables/"; - } - - $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null); - - if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) { - $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile1"]['name']) ; - $name_img = $_GET['tables_name'].'.'.$extension; - $uploader->setTargetFileName($name_img); - $uploader->fetchMedia($_POST['xoops_upload_file'][0]); - if (!$uploader->upload()) { - $errors = $uploader->getErrors(); - redirect_header("javascript:history.go(-1)",3, $errors); - } else { - $obj->setVar('tables_img', $uploader->getSavedFileName()); - } + $tables_champs = ''; + $tables_parametres = ''; + for($i=0; $i<$_REQUEST['tables_nb_champs']; $i++) + { + //Coupure entre les champs et coupre entre les parametres + if ( $i != $_REQUEST['tables_nb_champs'] - 1) { + $tables_champs .= '|'; + if ( $i != 0 ) + $tables_parametres .= '|'; } else { - $obj->setVar('tables_img', $_REQUEST['tables_img1']); + // Options Extra Champs + if ( isset($_REQUEST['tables_submitter']) == 1 ) + $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_submitter:int:11: :NOT NULL:0:'; + if ( isset($_REQUEST['tables_publisher']) == 1 ) + $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_publisher:text: :NOT NULL: :'; + if ( isset($_REQUEST['tables_created']) == 1 ) + $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_created:int:10: :NOT NULL:0:'; + if ( isset($_REQUEST['tables_published']) == 1 ) + $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_published:int:10: :NOT NULL:0:'; + if ( isset($_REQUEST['tables_expired']) == 1 ) + $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_expired:int:10: :NOT NULL:0:'; + if ( isset($_REQUEST['tables_status']) == 1 ) + $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_status:tinyint:2: :NOT NULL:0:'; + if ( isset($_REQUEST['tables_online']) == 1 ) + $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_online:tinyint:1: :NOT NULL:0:'; + if ( isset($_REQUEST['tables_pending']) == 1 ) + $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_pending:tinyint:1: :NOT NULL:0:'; + // Parameters + $tables_parametres .= '|XoopsFormSelectUser:1:1:1:0:0:1|XoopsFormTextDateSelect:1:1:1:0:0:1|XoopsFormCheckBox:1:1:1:0:0:1'; } - } else { - - $obj->setVar('tables_module_table', strtolower($modules_name.'_'.$_REQUEST['tables_name'])); - $obj->setVar('tables_name', strtolower($_REQUEST['tables_name'])); - $obj->setVar('tables_blocks', $_REQUEST['tables_blocks']); - $obj->setVar('tables_display_admin', $_REQUEST['tables_display_admin']); - $obj->setVar('tables_display_user', $_REQUEST['tables_display_user']); - if ( isset($_REQUEST['tables_submitter']) ) - $obj->setVar('tables_submitter', $_REQUEST['tables_submitter']); - if ( isset($_REQUEST['tables_publisher']) ) - $obj->setVar('tables_publisher', $_REQUEST['tables_publisher']); - if ( isset($_REQUEST['tables_created']) ) - $obj->setVar('tables_created', $_REQUEST['tables_created']); - if ( isset($_REQUEST['tables_published']) ) - $obj->setVar('tables_published', $_REQUEST['tables_published']); - if ( isset($_REQUEST['tables_expired']) ) - $obj->setVar('tables_expired', $_REQUEST['tables_expired']); - if ( isset($_REQUEST['tables_status']) ) - $obj->setVar('tables_status', $_REQUEST['tables_status']); - if ( isset($_REQUEST['tables_online']) ) - $obj->setVar('tables_online', $_REQUEST['tables_online']); - if ( isset($_REQUEST['tables_pending']) ) - $obj->setVar('tables_pending', $_REQUEST['tables_pending']); - if ( isset($_REQUEST['tables_search']) ) - $obj->setVar('tables_search', $_REQUEST['tables_search']); - if ( isset($_REQUEST['tables_coms']) ) - $obj->setVar('tables_coms', $_REQUEST['tables_coms']); - $obj->setVar('tables_nb_champs', $_REQUEST['tables_nb_champs']); - - $tables_champs = ''; - $tables_parametres = ''; - for($i=0; $i<$_REQUEST['tables_nb_champs']; $i++) - { - //Repare of parameters: text:on:off: ... - if ( $i != 0 ) { - $tables_parametres .= ( !empty($_REQUEST['champs_param_elements'][$i]) ) ? $_REQUEST['champs_param_elements'][$i].":" : " :"; - $tables_parametres .= ( !empty($_REQUEST['champs_param_display_admin'][$i]) ) ? "1:" : "0:"; - $tables_parametres .= ( !empty($_REQUEST['champs_param_display_user'][$i]) ) ? "1:" : "0:"; - $tables_parametres .= ( !empty($_REQUEST['champs_param_display_blocks'][$i]) ) ? "1:" : "0:"; - $tables_parametres .= ( $i == $_REQUEST['champs_param_main_field']) ? "1:" : "0:"; - $tables_parametres .= ( !empty($_REQUEST['champs_param_search_field'][$i]) ) ? "1:" : "0:"; - $tables_parametres .= ( !empty($_REQUEST['champs_param_required_field'][$i]) ) ? "1" : "0"; - } - - //Repare of champs: test:int:4: ... - $tables_champs .= (!empty($_REQUEST['champs_name'][$i])) ? $_REQUEST['champs_name'][$i].":" : " :"; - $tables_champs .= (!empty($_REQUEST['champs_type'][$i])) ? $_REQUEST['champs_type'][$i].":" : " :"; - $tables_champs .= (!empty($_REQUEST['champs_valeur'][$i])) ? $_REQUEST['champs_valeur'][$i].":" : " :"; - $tables_champs .= (!empty($_REQUEST['champs_attributs'][$i])) ? $_REQUEST['champs_attributs'][$i].":" : " :"; - $tables_champs .= (!empty($_REQUEST['champs_null'][$i])) ? strtoupper($_REQUEST['champs_null'][$i]).":" : " :"; - $tables_champs .= (!empty($_REQUEST['champs_default'][$i])) ? $_REQUEST['champs_default'][$i].":" : " :"; - $tables_champs .= (!empty($_REQUEST['champs_clef'][$i])) ? $_REQUEST['champs_clef'][$i]."" : " "; - - //Coupure entre les champs et coupre entre les parametres - if ( $i != $_REQUEST['tables_nb_champs'] - 1) { - $tables_champs .= '|'; - if ( $i != 0 ) - $tables_parametres .= '|'; - } else { - // Options Extra Champs - if ( isset($_REQUEST['tables_submitter']) == 1 ) - $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_submitter:int:11: :NOT NULL:0:'; - if ( isset($_REQUEST['tables_publisher']) == 1 ) - $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_publisher:text: :NOT NULL: :'; - if ( isset($_REQUEST['tables_created']) == 1 ) - $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_created:int:10: :NOT NULL:0:'; - if ( isset($_REQUEST['tables_published']) == 1 ) - $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_published:int:10: :NOT NULL:0:'; - if ( isset($_REQUEST['tables_expired']) == 1 ) - $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_expired:int:10: :NOT NULL:0:'; - if ( isset($_REQUEST['tables_status']) == 1 ) - $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_status:tinyint:2: :NOT NULL:0:'; - if ( isset($_REQUEST['tables_online']) == 1 ) - $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_online:tinyint:1: :NOT NULL:0:'; - if ( isset($_REQUEST['tables_pending']) == 1 ) - $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_pending:tinyint:1: :NOT NULL:0:'; - // Parameters - $tables_parametres .= '|XoopsFormSelectUser:1:1:1:0:0:1|XoopsFormTextDateSelect:1:1:1:0:0:1|XoopsFormCheckBox:1:1:1:0:0:1'; - } - } } $obj->setVar('tables_champs', $tables_champs); $obj->setVar('tables_parametres', $tables_parametres); @@ -215,32 +116,17 @@ } //Name of the module $modules =& $modulesHandler->get($_REQUEST['tables_modules']); - $modules_name = $modules->getVar('modules_name'); - - $tables_blocks = (isset($_REQUEST['tables_blocks'])) ? $_REQUEST['tables_blocks'] : '0'; - $tables_display_admin = (isset($_REQUEST['tables_display_admin'])) ? $_REQUEST['tables_display_admin'] : '0'; - $tables_display_user = (isset($_REQUEST['tables_display_user'])) ? $_REQUEST['tables_display_user'] : '0'; - $tables_submitter = (isset($_REQUEST['tables_submitter'])) ? $_REQUEST['tables_submitter'] : '0'; - $tables_publisher = (isset($_REQUEST['tables_publisher'])) ? $_REQUEST['tables_publisher'] : '0'; - $tables_created = (isset($_REQUEST['tables_created'])) ? $_REQUEST['tables_created'] : '0'; - $tables_published = (isset($_REQUEST['tables_published'])) ? $_REQUEST['tables_published'] : '0'; - $tables_expired = (isset($_REQUEST['tables_expired'])) ? $_REQUEST['tables_expired'] : '0'; - $tables_status = (isset($_REQUEST['tables_status'])) ? $_REQUEST['tables_status'] : '0'; - $tables_online = (isset($_REQUEST['tables_online'])) ? $_REQUEST['tables_online'] : '0'; - $tables_pending = (isset($_REQUEST['tables_pending'])) ? $_REQUEST['tables_pending'] : '0'; - $tables_search = (isset($_REQUEST['tables_search'])) ? $_REQUEST['tables_search'] : '0'; - $tables_coms = (isset($_REQUEST['tables_coms'])) ? $_REQUEST['tables_coms'] : '0'; - $select = (isset($_REQUEST['select'])) ? $_REQUEST['select'] : '0'; + $modules_name = $modules->getVar('modules_name'); //Image include_once XOOPS_ROOT_PATH.'/class/uploader.php'; - if(is_dir($pathImageAdmin)){ + if(is_dir($pathImageAdmin)){ $uploaddir = $pathImageAdmin; }else{ $uploaddir = XOOPS_ROOT_PATH . "/modules/".$GLOBALS['xoopsModule']->dirname()."/images/uploads/tables/"; } - $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null); - + $uploader = new XoopsMediaUploader($uploaddir, $GLOBALS['xoopsModuleConfig']["img_mimetypes"], + $GLOBALS['xoopsModuleConfig']["img_size"], null, null); if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) { $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile"]['name']) ; $name_img = $_GET['tables_name'].'.'.$extension; @@ -259,33 +145,24 @@ $obj->setVar('tables_modules', strtolower($_REQUEST['tables_modules'])); $obj->setVar('tables_module_table', strtolower($modules_name.'_'.$_REQUEST['tables_name'])); $obj->setVar('tables_name', strtolower($_REQUEST['tables_name'])); + $obj->setVar('tables_name_empty', $_REQUEST['tables_name_empty']); $obj->setVar('tables_blocks', $_REQUEST['tables_blocks']); $obj->setVar('tables_display_admin', $_REQUEST['tables_display_admin']); $obj->setVar('tables_display_user', $_REQUEST['tables_display_user']); - if ( isset($_REQUEST['tables_submitter']) ) - $obj->setVar('tables_submitter', $_REQUEST['tables_submitter']); - if ( isset($_REQUEST['tables_publisher']) ) - $obj->setVar('tables_publisher', $_REQUEST['tables_publisher']); - if ( isset($_REQUEST['tables_created']) ) - $obj->setVar('tables_created', $_REQUEST['tables_created']); - if ( isset($_REQUEST['tables_published']) ) - $obj->setVar('tables_published', $_REQUEST['tables_published']); - if ( isset($_REQUEST['tables_expired']) ) - $obj->setVar('tables_expired', $_REQUEST['tables_expired']); - if ( isset($_REQUEST['tables_status']) ) - $obj->setVar('tables_status', $_REQUEST['tables_status']); - if ( isset($_REQUEST['tables_online']) ) - $obj->setVar('tables_online', $_REQUEST['tables_online']); - if ( isset($_REQUEST['tables_pending']) ) - $obj->setVar('tables_pending', $_REQUEST['tables_pending']); - if ( isset($_REQUEST['tables_search']) ) - $obj->setVar('tables_search', $_REQUEST['tables_search']); - if ( isset($_REQUEST['tables_coms']) ) - $obj->setVar('tables_coms', $_REQUEST['tables_coms']); + $obj->setVar('tables_submitter', $_REQUEST['tables_submitter']); + $obj->setVar('tables_publisher', $_REQUEST['tables_publisher']); + $obj->setVar('tables_created', $_REQUEST['tables_created']); + $obj->setVar('tables_published', $_REQUEST['tables_published']); + $obj->setVar('tables_expired', $_REQUEST['tables_expired']); + $obj->setVar('tables_status', $_REQUEST['tables_status']); + $obj->setVar('tables_online', $_REQUEST['tables_online']); + $obj->setVar('tables_pending', $_REQUEST['tables_pending']); + $obj->setVar('tables_search', $_REQUEST['tables_search']); + $obj->setVar('tables_coms', $_REQUEST['tables_coms']); $obj->setVar('tables_nb_champs', $_REQUEST['tables_nb_champs']); if ($tblsHandler->insert($obj)) { - redirect_header('tables.php?op=default', 2, _AM_TDMCREATE_FORMOK); + redirect_header('tables.php?op=tables_list', 2, _AM_TDMCREATE_FORMOK); } break; @@ -324,8 +201,9 @@ if (!$GLOBALS['xoopsSecurity']->check()) { redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); } + $modules_id = TDMCreate_CleanVars( $_REQUEST, 'modules_id', 0, 'int' ); if (isset($_REQUEST['modules_id'])) { - $obj =& $modsHandler->get($_REQUEST['modules_id']); + $obj =& $modsHandler->get($modules_id); } else { $obj =& $modsHandler->create(); } @@ -333,11 +211,11 @@ //Image include_once XOOPS_ROOT_PATH.'/class/uploader.php'; $uploaddir = XOOPS_ROOT_PATH . "/modules/".$GLOBALS['xoopsModule']->dirname()."/images/uploads/modules/"; - $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null); - + $uploader = new XoopsMediaUploader($uploaddir, $GLOBALS['xoopsModuleConfig']["img_mimetypes"], + $GLOBALS['xoopsModuleConfig']["img_size"], null, null); if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) { $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile"]['name']); - $name_img = $_REQUEST['modules_name'].'_slogo.'.$extension; + $name_img = $_GET['modules_name'].'_slogo.'.$extension; $uploader->setTargetFileName($name_img); $uploader->fetchMedia($_POST['xoops_upload_file'][0]); if (!$uploader->upload()) { @@ -404,103 +282,86 @@ } break; - case "tables_champs": - //Champs existe deja ? - $criteria = new CriteriaCompo(); - $criteria->add(new Criteria('tables_name', $_REQUEST['tables_name'])); - $nb_tables1 = $tblsHandler->getCount($criteria); - - if ( $nb_tables1 < 1 ) - { - if (!$GLOBALS['xoopsSecurity']->check()) { - redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); - } - if (isset($_REQUEST['tables_id'])) { - $obj =& $tblsHandler->get($_REQUEST['tables_id']); + case "tables_champs": + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); + } + $tables_id = TDMCreate_CleanVars( $_REQUEST, 'tables_id', 0, 'int' ); + if (isset($_REQUEST['tables_id'])) { + $obj =& $tblsHandler->get($tables_id); + } else { + $obj =& $tblsHandler->create(); + } + + for($i=0; $i<$_GET['tables_nb_champs']; $i++) + { + $obj->setVar('champ_id', $_POST['champ_id'][$i]); + $obj->setVar('champ_name', $_POST['champ_name'][$i]); + $obj->setVar('champ_tables_nb_champs', $_POST['champ_tables_nb_champs'][$i]); + $obj->setVar('champ_tables_champs', $_POST['champ_tables_champs'][$i]); + $obj->setVar('champ_type', $_POST['champ_type'][$i]); + $obj->setVar('champ_value', $_POST['champ_value'][$i]); + $obj->setVar('champ_attribute', $_POST['champ_attribute'][$i]); + $obj->setVar('champ_null', $_POST['champ_null'][$i]); + $obj->setVar('champ_default', $_POST['champ_default'][$i]); + $obj->setVar('champ_key', $_POST['champ_key'][$i]); + $obj->setVar('champ_parameters', $_POST['champ_parameters'][$i]); + $obj->setVar('champ_elements_id', $_POST['champ_elements_id'][$i]); + $obj->setVar('champ_elements_value', $_POST['champ_elements_value'][$i]); + $obj->setVar('champ_elements_name', $_POST['champ_elements_name'][$i]); + $obj->setVar('champ_elements_admin', $_POST['champ_elements_admin'][$i]); + $obj->setVar('champ_elements_user', $_POST['champ_elements_block'][$i]); + $obj->setVar('champ_elements_mfield', $_POST['champ_elements_mfield'][$i]); + $obj->setVar('champ_elements_search', $_POST['champ_elements_search'][$i]); + $obj->setVar('champ_elements_required', $_POST['champ_elements_required'][$i]); + } + + //Image + /*include_once XOOPS_ROOT_PATH.'/class/uploader.php'; + if(!is_dir($pathImageAdmin)){ + $uploaddir = $pathImageAdmin; + }else{ + $uploaddir = XOOPS_ROOT_PATH . "/modules/".$GLOBALS['xoopsModule']->dirname()."/images/uploads/tables/"; + } + $uploader = new XoopsMediaUploader($uploaddir, $GLOBALS['xoopsModuleConfig']["img_mimetypes"], + $GLOBALS['xoopsModuleConfig']["img_size"], null, null); + if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) { + $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile"]['name']) ; + $name_img = $_GET['tables_name'].'.'.$extension; + $uploader->setTargetFileName($name_img); + $uploader->fetchMedia($_POST['xoops_upload_file'][0]); + if (!$uploader->upload()) { + $errors = $uploader->getErrors(); + redirect_header("javascript:history.go(-1)",3, $errors); } else { - $obj =& $tblsHandler->create(); + $obj->setVar('tables_img', $uploader->getSavedFileName()); } - $tables_blocks = (isset($_REQUEST['tables_blocks'])) ? $_REQUEST['tables_blocks'] : '0'; - $tables_display_admin = (isset($_REQUEST['tables_display_admin'])) ? $_REQUEST['tables_display_admin'] : '0'; - $tables_display_user = (isset($_REQUEST['tables_display_user'])) ? $_REQUEST['tables_display_user'] : '0'; - $tables_submitter = (isset($_REQUEST['tables_submitter'])) ? $_REQUEST['tables_submitter'] : '0'; - $tables_publisher = (isset($_REQUEST['tables_publisher'])) ? $_REQUEST['tables_publisher'] : '0'; - $tables_created = (isset($_REQUEST['tables_created'])) ? $_REQUEST['tables_created'] : '0'; - $tables_published = (isset($_REQUEST['tables_published'])) ? $_REQUEST['tables_published'] : '0'; - $tables_expired = (isset($_REQUEST['tables_expired'])) ? $_REQUEST['tables_expired'] : '0'; - $tables_status = (isset($_REQUEST['tables_status'])) ? $_REQUEST['tables_status'] : '0'; - $tables_online = (isset($_REQUEST['tables_online'])) ? $_REQUEST['tables_online'] : '0'; - $tables_pending = (isset($_REQUEST['tables_waiting'])) ? $_REQUEST['tables_waiting'] : '0'; - $tables_search = (isset($_REQUEST['tables_search'])) ? $_REQUEST['tables_search'] : '0'; - $tables_coms = (isset($_REQUEST['tables_coms'])) ? $_REQUEST['tables_coms'] : '0'; - $select = (isset($_REQUEST['select'])) ? $_REQUEST['select'] : '0'; - - //Image - include_once XOOPS_ROOT_PATH.'/class/uploader.php'; - if(!is_dir($pathImageAdmin)){ - $uploaddir = $pathImageAdmin; - }else{ - $uploaddir = XOOPS_ROOT_PATH . "/modules/".$GLOBALS['xoopsModule']->dirname()."/images/uploads/tables/"; - } - $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null); - - if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) { - $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile"]['name']) ; - $name_img = $_REQUEST['tables_name'].'.'.$extension; - $uploader->setTargetFileName($name_img); - $uploader->fetchMedia($_POST['xoops_upload_file'][0]); - if (!$uploader->upload()) { - $errors = $uploader->getErrors(); - redirect_header("javascript:history.go(-1)",3, $errors); - } else { - $obj->setVar('tables_img', $uploader->getSavedFileName()); - } - } else { - $obj->setVar('tables_img', $_REQUEST['tables_img']); - } - - if ($tblsHandler->insert($obj)) { - $tables_id = $GLOBALS['xoopsDB']->getInsertId(); - $obj = $tblsHandler->get($tables_id); - $form = $obj->_getFormChamps(); - $form->display(); - } } else { - redirect_header('tables.php?op=tables_list', 2, _AM_TDMCREATE_TABLES_EXIST); - } + $obj->setVar('tables_img', $_REQUEST['tables_img']); + }*/ + + if ($tblsHandler->insert($obj)) { + $tables_id = $GLOBALS['xoopsDB']->getInsertId(); + $obj = $tblsHandler->get($tables_id); + $form = $obj->getFormChamps(); + $form->display(); + } break; case "tables_create": - echo $tablesAdmin->addNavigation('tables.php'); - $tablesAdmin->addItemButton(_AM_TDMCREATE_TABLES_TOPICS, 'tables.php?op=topics_create', 'add'); + echo $tablesAdmin->addNavigation('tables.php'); $tablesAdmin->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php?op=tables_list', 'list'); echo $tablesAdmin->renderButton(); $obj =& $tblsHandler->create(); $form = $obj->getFormTable(); $form->display(); - break; + break; - case "topics_create": - echo $tablesAdmin->addNavigation('tables.php'); - $tablesAdmin->addItemButton(_AM_TDMCREATE_TABLES_NEW, 'tables.php?op=tables_create', 'add'); - $tablesAdmin->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php?op=tables_list', 'list'); - echo $tablesAdmin->renderButton(); - - $result = $GLOBALS['xoopsDB']->queryF("SELECT COUNT(*) FROM " . $GLOBALS['xoopsDB']->prefix("tdmcreate_tables")." WHERE tables_name = 'topic'"); - list( $topic ) = $GLOBALS['xoopsDB']->fetchRow($result); - $obj =& $tblsHandler->get($_REQUEST['tables_id']); - if ( $topic >= 0 ) { - $form = $obj->getFormTopic(); - $form->display(); - } - break; - case "tables_list": default: echo $tablesAdmin->addNavigation('tables.php'); - $tablesAdmin->addItemButton(_AM_TDMCREATE_TABLES_NEW, 'tables.php?op=tables_create', 'add'); - $tablesAdmin->addItemButton(_AM_TDMCREATE_TABLES_TOPICS, 'tables.php?op=topics_create', 'add'); + $tablesAdmin->addItemButton(_AM_TDMCREATE_TABLES_NEW, 'tables.php?op=tables_create', 'add'); echo $tablesAdmin->renderButton(); //Retirer les tables inutiles @@ -513,8 +374,8 @@ } $criteria = new CriteriaCompo(); - $criteria->setSort('modules_name'); - $criteria->setOrder('ASC'); + $criteria->setSort('modules_id'); + $criteria->setOrder('DESC'); $numrows_modules = $modsHandler->getCount(); if (isset($_REQUEST['limit'])) { $criteria->setLimit($_REQUEST['limit']); @@ -558,78 +419,86 @@ echo '<table width="100%" cellspacing="1" class="outer">'; echo '<tr>'; echo '<th align="center" width="1%">'._AM_TDMCREATE_ID.'</th>'; - echo '<th align="center" width="20%">'._AM_TDMCREATE_NAME.'</th>'; - echo '<th align="center" width="10%">'._AM_TDMCREATE_IMAGE.'</th>'; + echo '<th align="center" width="12%">'._AM_TDMCREATE_NAME.'</th>'; + echo '<th align="center" width="8%">'._AM_TDMCREATE_IMAGE.'</th>'; echo '<th align="center" width="10%">'._AM_TDMCREATE_DISPLAY_ADMIN.'</th>'; echo '<th align="center" width="10%">'._AM_TDMCREATE_DISPLAY_USER.'</th>'; echo '<th align="center" width="10%">'._AM_TDMCREATE_BLOCKS.'</th>'; + echo '<th align="center" width="10%">'._AM_TDMCREATE_SEARCH.'</th>'; + echo '<th align="center" width="10%">'._AM_TDMCREATE_COM.'</th>'; echo '<th align="center" width="10%">'._AM_TDMCREATE_NB_CHAMPS.'</th>'; - echo '<th align="center" width="20%">'._AM_TDMCREATE_FORMACTION.'</th>'; + echo '<th align="center" width="7%">'._AM_TDMCREATE_FORMACTION.'</th>'; echo '</tr>'; $class = 'odd'; foreach (array_keys($mods_arr) as $i) { - $mods_id = $mods_arr[$i]->getVar('modules_id'); - $mods_name = $mods_arr[$i]->getVar('modules_name'); - $mods_image = $mods_arr[$i]->getVar('modules_image'); - $mods_display_admin = $mods_arr[$i]->getVar('modules_display_admin'); - $mods_display_user = $mods_arr[$i]->getVar('modules_display_user'); - $mods_display_admin = ($mods_display_admin == 1) ? _YES : _NO; - $mods_display_user = ($mods_display_user == 1) ? _YES : _NO; - echo '<tr class="odd center">'; - echo '<td class="center"><b>'.$mods_id.'</b></td>'; - echo '<td class="left"><b>'.$mods_name.'</b></td>'; - echo '<td><img src="../images/uploads/modules/'.$mods_image.'" height="30px"></td>'; - echo '<td>'.$mods_display_admin.'</td>'; - echo '<td>'.$mods_display_user.'</td>'; - echo '<td> </td>'; - echo '<td> </td>'; - echo '<td class="center width5">'; - echo '<a href="tables.php?op=edit_modules&modules_id='.$mods_id.'"><img src='. $pathImageIcon ."/edit.png alt="._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="tables.php?op=delete_modules&modules_id='.$mods_id.'"><img src='. $pathImageIcon ."/delete.png alt="._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>'; - echo '</td>'; - echo '</tr>'; - - $criteria = new CriteriaCompo(); - $criteria->add(new Criteria('tables_modules', $mods_id)); - $criteria->setSort('tables_name'); - $criteria->setOrder('ASC'); - $tbls_arr = $tblsHandler->getall($criteria); - $numrows_tables = $tblsHandler->getCount(); - if ( $numrows_tables != 0 ) + $mods_id = $mods_arr[$i]->getVar('modules_id'); + $mods_name = $mods_arr[$i]->getVar('modules_name'); + $mods_image = $mods_arr[$i]->getVar('modules_image'); + $mods_display_admin = $mods_arr[$i]->getVar('modules_display_admin'); + $mods_display_user = $mods_arr[$i]->getVar('modules_display_user'); + $mods_display_admin = ($mods_display_admin == 1) ? _YES : _NO; + $mods_display_user = ($mods_display_user == 1) ? _YES : _NO; + echo '<tr class="odd center">'; + echo '<td class="center big red"><b>'.$mods_id.'</b></td>'; + echo '<td class="left big green"><b>'.$mods_name.'</b></td>'; + echo '<td><img src="../images/uploads/modules/'.$mods_image.'" height="30px"></td>'; + echo '<td>'.$mods_display_admin.'</td>'; + echo '<td>'.$mods_display_user.'</td>'; + echo '<td> </td>'; + echo '<td> </td>'; + echo '<td> </td>'; + echo '<td> </td>'; + echo '<td class="center width5">'; + echo '<a href="tables.php?op=edit_modules&modules_id='.$mods_id.'"><img src='. $pathImageIcon ."/edit.png alt="._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="tables.php?op=delete_modules&modules_id='.$mods_id.'"><img src='. $pathImageIcon ."/delete.png alt="._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>'; + echo '</td>'; + echo '</tr>'; + + $criteria = new CriteriaCompo(); + $criteria->add(new Criteria('tables_modules', $mods_id)); + $criteria->setSort('tables_name'); + $criteria->setOrder('ASC'); + $tbls_arr = $tblsHandler->getall($criteria); + $numrows_tables = $tblsHandler->getCount(); + if ( $numrows_tables != 0 ) + { + foreach (array_keys($tbls_arr) as $i) { - foreach (array_keys($tbls_arr) as $i) - { - $tbls_id = $tbls_arr[$i]->getVar('tables_id'); - $tbls_modules = $tbls_arr[$i]->getVar('tables_modules'); - $tbls_name = $tbls_arr[$i]->getVar('tables_name'); - $tbls_img = $tbls_arr[$i]->getVar('tables_img'); - $tbls_blocks = $tbls_arr[$i]->getVar('tables_blocks'); - $tbls_champs = $tbls_arr[$i]->getVar('tables_champs'); - $tbls_display_admin = $tbls_arr[$i]->getVar('tables_display_admin'); - $tbls_display_user = $tbls_arr[$i]->getVar('tables_display_user'); - $champs = explode("|", $tbls_champs); - $nb_champs = $tbls_arr[$i]->getVar('tables_nb_champs'); - $display_admin = ($tbls_display_admin == 1) ? _YES : _NO; - $display_user = ($tbls_display_user == 1) ? _YES : _NO; - $blocks = ($tbls_blocks == 1) ? _YES : _NO; - echo '<tr class="even center">'; - echo '<td class="center width5">'.$tbls_id.'</td>'; - echo '<td class="left"> <b>- '.$tbls_name.'</b></td>'; - if(!is_dir($pathImageAdmin)){ - echo '<td><img src="'.$pathImageAdmin.'/'.$tbls_img.'" height="30px"></td>'; - }else{ - echo '<td><img src="../images/uploads/tables/'.$tbls_img.'" height="30px"></td>'; - } - echo '<td>'.$display_admin.'</td>'; - echo '<td>'.$display_user.'</td>'; - echo '<td>'.$blocks.'</td>'; - echo '<td>'.$nb_champs.'</td>'; - echo '<td class="center width5">'; - echo '<a href="tables.php?op=edit_tables&tables_id='.$tbls_id.'"><img src='. $pathImageIcon ."/edit.png alt="._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="tables.php?op=edit_champs&tables_id='.$tbls_id.'"><img src='. $pathImageIcon ."/inserttable.png alt="._AM_TDMCREATE_FORMCHAMPS.'" title="'._AM_TDMCREATE_FORMCHAMPS.'"></a> <a href="tables.php?op=delete_tables&tables_id='.$tbls_id.'"><img src='. $pathImageIcon ."/delete.png alt="._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>'; - echo '</td>'; - echo '</tr>'; + $tbls_id = $tbls_arr[$i]->getVar('tables_id'); + $tbls_modules = $tbls_arr[$i]->getVar('tables_modules'); + $tbls_name = $tbls_arr[$i]->getVar('tables_name'); + $tbls_img = $tbls_arr[$i]->getVar('tables_img'); + $tbls_blocks = $tbls_arr[$i]->getVar('tables_blocks'); + $tbls_display_admin = $tbls_arr[$i]->getVar('tables_display_admin'); + $tbls_display_user = $tbls_arr[$i]->getVar('tables_display_user'); + $tbls_search = $tbls_arr[$i]->getVar('tables_search'); + $tbls_coms = $tbls_arr[$i]->getVar('tables_coms'); + $nb_champs = $tbls_arr[$i]->getVar('tables_nb_champs'); + $display_admin = ($tbls_display_admin == 1) ? _YES : _NO; + $display_user = ($tbls_display_user == 1) ? _YES : _NO; + $search = ($tbls_search == 1) ? _YES : _NO; + $coms = ($tbls_coms == 1) ? _YES : _NO; + $blocks = ($tbls_blocks == 1) ? _YES : _NO; + echo '<tr class="even center">'; + echo '<td class="center width5 green">'.$tbls_id.'</td>'; + echo '<td class="left"> <b>- '.$tbls_name.'</b></td>'; + if(!is_dir($pathImageAdmin)){ + echo '<td><img src="'.$pathImageAdmin.'/'.$tbls_img.'" height="30px"></td>'; + }else{ + echo '<td><img src="../images/uploads/tables/'.$tbls_img.'" height="30px"></td>'; } - } + echo '<td>'.$display_admin.'</td>'; + echo '<td>'.$display_user.'</td>'; + echo '<td>'.$blocks.'</td>'; + echo '<td>'.$search.'</td>'; + echo '<td>'.$coms.'</td>'; + echo '<td>'.$nb_champs.'</td>'; + echo '<td class="center width5">'; + echo '<a href="tables.php?op=edit_tables&tables_id='.$tbls_id.'"><img src='. $pathImageIcon ."/edit.png alt="._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="tables.php?op=edit_champs&tables_id='.$tbls_id.'"><img src='. $pathImageIcon ."/inserttable.png alt="._AM_TDMCREATE_FORMCHAMPS.'" title="'._AM_TDMCREATE_FORMCHAMPS.'"></a> <a href="tables.php?op=delete_tables&tables_id='.$tbls_id.'"><img src='. $pathImageIcon ."/delete.png alt="._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>'; + echo '</td>'; + echo '</tr>'; + } + } } echo '</table><br />'; echo "<div class='center'>".$pagenav."</div><br />"; Modified: XoopsModules/TDMCreate/releases/1.39/TDMCreate/class/tdmcreate_modules.php =================================================================== --- XoopsModules/TDMCreate/releases/1.39/TDMCreate/class/tdmcreate_modules.php 2012-02-21 15:36:32 UTC (rev 9041) +++ XoopsModules/TDMCreate/releases/1.39/TDMCreate/class/tdmcreate_modules.php 2012-02-21 23:17:00 UTC (rev 9042) @@ -81,8 +81,10 @@ $form->setExtra('enctype="multipart/form-data"'); $form->insertBreak('<div class="center"><b>'._AM_TDMCREATE_MODULES_IMPORTANT.'</b></div>','head'); + // Name $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_NAME, 'modules_name', 50, 255, $this->getVar('modules_name')), true); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_VERSION, 'modules_version', 50, 255, $this->getVar('modules_version')), true); + // Version + $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_VERSION, 'modules_version', 10, 25, $this->getVar('modules_version')), true); // Name description $editor_configs=array(); $editor_configs["name"] ="modules_description"; @@ -91,13 +93,25 @@ $editor_configs["cols"] = 100; $editor_configs["width"] = "100%"; $editor_configs["height"] = "100px"; - $editor_configs["editor"] = $GLOBALS['xoopsModuleConfig']['TDMCreate_editor']; + $editor_configs["editor"] = $GLOBALS['xoopsModuleConfig']['tdmcreate_editor']; $form->addElement( new XoopsFormEditor(_AM_TDMCREATE_MODULES_DESCRIPTION, "modules_description", $editor_configs), true); // Author $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_AUTHOR, 'modules_author', 50, 255, $this->getVar('modules_author')), true); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_LICENSE, 'modules_license', 50, 255, $this->getVar('modules_license')), true); + // Licenses + $modules_license_select = new XoopsFormSelect(_AM_TDMCREATE_MODULES_LICENSE, 'modules_license', $this->getVar('modules_license')); + $modules_license_select->addOption('GNU General Public License (GPL)', 'General Public License'); + $modules_license_select->addOption('MIT license', 'MIT license'); + $modules_license_select->addOption('Common Development and Distribution License (CDDL-1.0)', 'Common Development'); + $modules_license_select->addOption('Educational Community License', 'Educational Community License'); + $modules_license_select->addOption('Open Font License 1.1 (OFL-1.1)', 'Open Font License'); + $modules_license_select->addOption('Adaptive Public License (APL-1.0)', 'Adaptive Public License'); + $modules_license_select->addOption('Q Public License (QPL-1.0)', 'Q Public License'); + $modules_license_select->addOption('Academic Free License (AFL-3.0)', 'Academic Free License'); + $form->addElement($modules_license_select, true); + // Display Admin $modules_display_admin = $this->isNew() ? 0 : $this->getVar('modules_display_admin'); $form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULES_DISPLAY_ADMIN, 'modules_display_admin', $modules_display_admin, _YES, _NO)); + // Display User $modules_display_user = $this->isNew() ? 0 : $this->getVar('modules_display_user'); $form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULES_DISPLAY_USER, 'modules_display_user', $modules_display_user, _YES, _NO)); $modules_active_search = $this->isNew() ? 0 : $this->getVar('modules_active_search'); @@ -125,8 +139,10 @@ $imgtray->addElement($fileseltray); $form->addElement($imgtray); - $form->insertBreak('<div class="center"><b>'._AM_TDMCREATE_MODULES_NOTIMPORTANT.'</b></div>','head'); + $form->insertBreak('<div class="center"><b>'._AM_TDMCREATE_MODULES_NOTIMPORTANT.'</b></div>','head'); + // Author Email $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_AUTHOR_MAIL, 'modules_author_mail', 50, 255, $this->getVar('modules_author_mail')), false); + // Author Website Url $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_AUTHOR_WEBSITE_URL, 'modules_author_website_url', 50, 255, $this->getVar('modules_author_website_url')), false); $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_AUTHOR_WEBSITE_NAME, 'modules_author_website_name', 50, 255, $this->getVar('modules_author_website_name')), false); $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_CREDITS, 'modules_credits', 50, 255, $this->getVar('modules_credits')), false); Modified: XoopsModules/TDMCreate/releases/1.39/TDMCreate/class/tdmcreate_tables.php =================================================================== --- XoopsModules/TDMCreate/releases/1.39/TDMCreate/class/tdmcreate_tables.php 2012-02-21 15:36:32 UTC (rev 9041) +++ XoopsModules/TDMCreate/releases/1.39/TDMCreate/class/tdmcreate_tables.php 2012-02-21 23:17:00 UTC (rev 9042) @@ -60,7 +60,7 @@ $this->__construct(); } - function _getFormChamps($action = false) + function getFormChamps($action = false) { if ($action === false) { $action = $_SERVER["REQUEST_URI"]; @@ -98,12 +98,20 @@ $tbls_nb_champs = $tablesHandler->getall($criteria); unset($criteria); for($i=1; $i<count($tbls_nb_champs)-1; $i++) - { + { + $tprefix = strtolower($this->getVar("tables_name")); + $class = ($class == 'even') ? 'odd' : 'even'; $ele_tray[$i] = new XoopsFormElementTray(' '); $ele_tray[$i]->addElement(new XoopsFormLabel( '<tr class="center height10 '.$class.'"><td>' )); $ele_tray[$i]->addElement(new XoopsFormLabel( ($i).'</td><td>' )); - $ele_tray[$i]->addElement(new XoopsFormText('', "champs_name", 8, 255, $this->getVar("champs_name"))); + if( $this->getVar("tables_name_empty") == 1 ) { + $table_champ = ( $i == 1 ) ? $tprefix.'_id' : $tprefix.'_'; + $ele_tray[$i]->addElement(new XoopsFormText('', "champs_name", 8, 255, $table_champ)); + } else { + $champs_name = ($this->getVar("tables_name_empty") == 1) ? $tprefix.'_' : $this->getVar("champs_name"); + $ele_tray[$i]->addElement(new XoopsFormText('', "champs_name", 8, 255, $champs_name)); + } $ele_tray[$i]->addElement(new XoopsFormLabel( '</td><td>' )); //$typeHandler =& xoops_getModuleHandler('tdmcreate_champ_type', 'TDMCreate'); $type_select = new XoopsFormSelect('', 'champ_type_name', $this->getVar("champ_type_name")); @@ -194,7 +202,7 @@ foreach (array_keys($tbls_arr2) as $j) { $tbls_name2 = $tbls_arr2[$j]->getVar('tables_name'); - if ( $tbls_name2 != $tbls_name ) + if ( $tbls_name2 != $this->getVar('tables_name') ) { if ( $param_elements[$i] == 'XoopsFormTables-'.$tbls_name2.'' ) { $elements_select->addOption('XoopsFormTables-'.$tbls_name2, 'Table : '.$tbls_name2); @@ -245,657 +253,7 @@ $form->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit")); return $form; } - /* - //Entry form fields - function getFormChamps($action = false, $tbls_id, $tbls_modules, $tbls_name, $tbls_blocks, $tbls_display_admin, $tbls_display_user, $tbls_submitter, $tbls_publisher, $tbls_created, $tbls_published, $tbls_expired, $tbls_status, $tbls_online, $tbls_waiting, $tbls_search, $tbls_coms, $tbls_nb_champs, $select) - { - if ($action === false) { - $action = XOOPS_URL.'/modules/TDMCreate/admin/tables.php'; - } - $class = 'even'; - $title = $this->isNew() ? sprintf(_AM_TDMCREATE_TABLES_CHAMPS_ADD) : sprintf(_AM_TDMCREATE_TABLES_CHAMPS_EDIT); - - $tbls_actions = $tbls_modules. - "&tables_id=".$tbls_id. - "&tables_name=".$tbls_name. - "&tables_blocks=".$tbls_blocks. - "&tables_display_admin=".$tbls_display_admin. - "&tables_display_user=".$tbls_display_user. - "&tables_submitter=".$tbls_submitter. - "&tables_publisher".$tbls_publisher. - "&tables_published".$tbls_published. - "&tables_expired".$tbls_expired. - "&tables_status".$tbls_status. - "&tables_created=".$tbls_created. - "&tables_online=".$tbls_online. - "&tables_waiting=".$tbls_waiting. - "&tables_search=".$tbls_search. - "&tables_coms=".$tbls_coms. - "&tables_nb_champs=".$tbls_nb_champs. - "&select=".$select; - - echo "<FORM Method='POST' Action='".$action."?op=tables_save&tables_modules=".$tbls_actions."'> - <table border='0' width='100%' cellspacing='1' class='outer'> - <tr> - <td colspan='8' class='head center'>".$title."</td> - </tr> - <tr class='head'> - <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_NAME."</td> - <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_TYPE."</td> - <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_VALUE."</td> - <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_ATTRIBUTE."</td> - <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_NULL."</td> - <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_DEFAULT."</td> - <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_KEY."</td> - <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_MORE."</td> - </tr>"; - for($i=0; $i<$tbls_nb_champs ; $i++) - { - $tbl_id = ( $i == 0 ) ? strtolower($tbls_name).'_id' : strtolower($tbls_name).'_'; - $tbl_primary = ( $i == 0 ) ? "checked" : ""; - $tbl_value = ( $i == 0 ) ? "8" : ""; - - $class = ($class == 'even') ? 'odd' : 'even'; - echo "<tr class=".$class."> - <td class='center'><INPUT type='text' size='10' value='".$tbl_id."' name='champs_name[".$i."]'></td> - <td class='center'><SELECT name='champs_type[".$i."]'> - <OPTION VALUE='int'>INT</OPTION> - <OPTION VALUE='tinyint'>TINYINT</OPTION> - <OPTION VALUE='mediumint'>MEDIUMINT</OPTION> - <OPTION VALUE='smallint'>SMALLINT</OPTION> - <OPTION VALUE='float'>FLOAT</OPTION> - <OPTION VALUE='double'>DOUBLE</OPTION> - <OPTION VALUE='decimal'>DECIMAL</OPTION> - <OPTION VALUE='enum'>ENUM</OPTION> - <OPTION VALUE='email'>EMAIL</OPTION> - <OPTION VALUE='url'>URL</OPTION> - <OPTION VALUE='char'>CHAR</OPTION> - <OPTION VALUE='varchar'>VARCHAR</OPTION> - <OPTION VALUE='text'>TEXT</OPTION> - <OPTION VALUE='tinytext'>TINYTEXT</OPTION> - <OPTION VALUE='mediumtext'>MEDIUMTEXT</OPTION> - <OPTION VALUE='longtext'>LONGTEXT</OPTION> - <OPTION VALUE='date'>DATE</OPTION> - <OPTION VALUE='datetime'>DATETIME</OPTION> - <OPTION VALUE='timestamp'>TIMESTAMP</OPTION> - <OPTION VALUE='time'>TIME</OPTION> - <OPTION VALUE='year'>YEAR</OPTION> - </SELECT></td> - <td class='center'><INPUT type='text' size='2' name='champs_value[".$i."]' value='".$tbl_value."'></td> - <td class='center'><SELECT name='champs_attributes[".$i."]'> - <OPTION VALUE=''></OPTION> - <OPTION VALUE='unsigned'>UNSIGNED</OPTION> - <OPTION VALUE='ON UPDATE CURRENT_TIMESTAMP'>on update CURRENT_TIMESTAMP</OPTION> - </SELECT></td> - <td class='center'><SELECT name='champs_null[".$i."]'> - <OPTION VALUE='not null'>NOT NULL</OPTION> - <OPTION VALUE='null'>NULL</OPTION> - </SELECT></td> - <td class='center'><INPUT type='text' size='2' name='champs_default[".$i."]'></td> - <td class='center'><SELECT name='champs_key[".$i."]'> - <OPTION VALUE=''></OPTION> - <OPTION VALUE='primary'>PRIMARY</OPTION> - <OPTION VALUE='unique'>UNIQUE</OPTION> - <OPTION VALUE='index'>INDEX</OPTION> - <OPTION VALUE='fulltext'>FULLTEXT</OPTION> - </SELECT></td> - <td class='center'>"; - if ( $i != 0 ) { - echo "<table border='0' style='border-color:#777'; width='100%' cellspacing='1' class='outer'> - <tr> - <td class='head left' width='95%'>"._AM_TDMCREATE_TABLES_CHAMPS_MORE_ELEMENTS."</td> - <td class='even right' width='5%'> - <SELECT name='champs_param_elements[".$i."]'> - <OPTION VALUE='Null'>None</OPTION> - <OPTION VALUE='XoopsFormText'>Text</OPTION> - <OPTION VALUE='XoopsFormTextArea'>TextArea</OPTION> - <OPTION VALUE='XoopsFormDhtmlTextArea'>DhtmlTextArea</OPTION> - <OPTION VALUE='XoopsFormCheckBox'>CheckBox</OPTION> - <OPTION VALUE='XoopsFormRadioYN'>RadioYN</OPTION> - <OPTION VALUE='XoopsFormSelect'>SelectBox</OPTION> - <OPTION VALUE='XoopsFormSelectUser'>SelectUser</OPTION> - <OPTION VALUE='XoopsFormColorPicker'>ColorPicker</OPTION> - <OPTION VALUE='XoopsFormUploadImage'>UploadImage</OPTION> - <OPTION VALUE='XoopsFormUploadFile'>UploadFile</OPTION> - <OPTION VALUE='XoopsFormTextDateSelect'>TextDateSelect</OPTION>"; - $tablesHandler =& xoops_getModuleHandler('TDMCreate_tables', 'TDMCreate'); - $criteria = new CriteriaCompo(); - $criteria->add(new Criteria('tables_modules', $tbls_modules)); - $criteria->setSort('tables_name'); - $criteria->setOrder('ASC'); - $tbls_arr1 = $tablesHandler->getall($criteria); - - foreach (array_keys($tbls_arr1) as $j) - { - $tbls_name1 = $tbls_arr1[$j]->getVar('tables_name'); - if ( $tbls_name1 != 'topic' ) { - echo "<OPTION VALUE='XoopsFormTables-".$tbls_name1."'>Table : ".$tbls_name1."</OPTION>"; - } else { - echo "<OPTION VALUE='XoopsFormTopic'>Table : topic</OPTION>"; - } - } - - echo " - </SELECT> - </td> - <tr> - <td class='head left'>"._AM_TDMCREATE_TABLES_CHAMPS_MORE_DISPLAY_ADMIN."</td> - <td class='even right'><INPUT type='checkbox' size='4' name='champs_param_display_admin[".$i."]' ".$chk."></td> - </tr> - <tr> - <td class='head left'>"._AM_TDMCREATE_TABLES_CHAMPS_MORE_DISPLAY_USER."</td> - <td class='even right'><INPUT type='checkbox' size='4' name='champs_param_display_user[".$i."]' ".$chk."></td> - </tr> - "; - //Afficher la case blocks - if ( $tbls_blocks == 1 ) - { - //Pour l'affichage dans les blocks - $checked_blocks = ( $i == 1 || $i == 2 ) ? "checked" : ""; - echo "<tr> - <td class='head left'>"._AM_TDMCREATE_TABLES_CHAMPS_MORE_BLOCK."</td> - <td class='even right'><INPUT type='checkbox' size='4' name='champs_param_display_blocks[".$i."]' ".$checked_blocks."></td> - </tr>"; - } - $checked_main_field = ( $i == 1 ) ? "checked" : ""; - echo " - <tr> - <td class='head left'>"._AM_TDMCREATE_TABLES_CHAMPS_MORE_MAIN_FIELD."</td> - <td class='even right'><INPUT type='radio' value='".$i."' name='champs_param_main_field' ".$checked_main_field."></td> - </tr>"; - - //Afficher la case blocks - if ( $tbls_blocks == 1 ) - { - echo " - <tr> - <td class='head left'>"._AM_TDMCREATE_TABLES_CHAMPS_MORE_SEARCH."</td> - <td class='even right'><INPUT type='checkbox' size='4' name='champs_param_search_field[".$i."]' ".$chk."></td> - </tr>"; - } - echo " - <tr> - <td class='head left'>"._AM_TDMCREATE_TABLES_CHAMPS_MORE_REQUIRED."</td> - <td class='even right'><INPUT type='checkbox' size='4' name='champs_param_required_field[".$i."]' ".$chk."></td> - </tr> - </table>"; - } - echo "</td></tr>"; - } - echo "<tr> - <td colspan='8' class='head right'><input type='submit' value="._AM_TDMCREATE_TABLES_CHAMPS_SUBMIT."></td> - </tr>"; - echo "</table> - </FORM>"; - } - //Formulaire d'edition de champs - function getFormEditChamps($action = false, $tbls_id) - { - if ($action === false) { - $action = XOOPS_URL.'/modules/TDMCreate/admin/tables.php'; - } - $class = 'even'; - $title = $this->isNew() ? sprintf(_AM_TDMCREATE_TABLES_CHAMPS_ADD) : sprintf(_AM_TDMCREATE_TABLES_CHAMPS_EDIT); - //Donnees - //$tbls_id = $this->getVar('tables_id'); - $tbls_modules = $this->getVar('tables_modules'); - $tbls_modules_table = $this->getVar('tables_modules_table'); - $tbls_name = $this->getVar('tables_name'); - $tbls_img = $this->getVar('tables_img'); - $tbls_nb_champs = $this->getVar('tables_nb_champs'); - $tbls_champs = $this->getVar('tables_champs'); - $tbls_parameters = $this->getVar('tables_parameters'); - $tbls_blocks = $this->getVar('tables_blocks'); - $tbls_display_admin = $this->getVar('tables_display_admin'); - $tbls_display_user = $this->getVar('tables_display_user'); - $tbls_submitter = $this->getVar('tables_submitter'); - $tbls_publisher = $this->getVar('tables_publisher'); - $tbls_published = $this->getVar('tables_published'); - $tbls_expired = $this->getVar('tables_expired'); - $tbls_status = $this->getVar('tables_status'); - $tbls_created = $this->getVar('tables_created'); - $tbls_online = $this->getVar('tables_online'); - $tbls_waiting = $this->getVar('tables_waiting'); - $tbls_search = $this->getVar('tables_search'); - $tbls_coms = $this->getVar('tables_coms'); - $select = 0; - - $champs_total = explode("|", $tbls_champs); - $count_champs = count($champs_total); - //$count_champs -= 3; - - $parameters_total = explode("|", $tbls_parameters); - $count_parameters = count($parameters_total); - //$count_parameters -= 3; - //echo $count_parameters; - //Champs - for($i=0; $i<$tbls_nb_champs; $i++) - { - if ( $i >= $count_champs ) { - $champs_name[$i] = ''; - $champs_type[$i] = ''; - $champs_value[$i] = ''; - $champs_attributes[$i] = ''; - $champs_null[$i] = ''; - $champs_default[$i] = ''; - $champs_key[$i] = ''; - } else { - $champs = explode(":", $champs_total[$i]); - $champs_name[$i] = $champs[0]; - $champs_type[$i] = $champs[1]; - $champs_value[$i] = $champs[2]; - $champs_attributes[$i] = $champs[3]; - $champs_null[$i] = $champs[4]; - $champs_default[$i] = $champs[5]; - $champs_key[$i] = $champs[6]; - } - } - //Parametres - for($i=0; $i<$tbls_nb_champs; $i++) - { - if ( $i == 0 || $i > $count_parameters) { - $param_elements[$i] = '0'; - $param_display_admin[$i] = '0'; - $param_display_user[$i] = '0'; - $param_display_blocks[$i] = '0'; - } else { - $parameters = explode(":", $parameters_total[$i-1]); - $param_elements[$i] = $parameters[0]; - $param_display_admin[$i] = $parameters[1]; - $param_display_user[$i] = $parameters[2]; - $param_display_blocks[$i] = $parameters[3]; - $param_display_main_field[$i] = $parameters[4]; - $champs_param_search_field[$i] = $parameters[5]; - $champs_param_required_field[$i] = $parameters[6]; - } - } - $tbls_action = $tbls_modules. - "&tables_id=".$tbls_id. - "&tables_name=".$tbls_name. - "&tables_blocks=".$tbls_blocks. - "&tables_display_admin=".$tbls_display_admin. - "&tables_display_user=".$tbls_display_user. - "&tables_submitter=".$tbls_submitter. - "&tables_publisher".$tbls_publisher. - "&tables_published".$tbls_published. - "&tables_expired".$tbls_expired. - "&tables_status".$tbls_status. - "&tables_created=".$tbls_created. - "&tables_online=".$tbls_online. - "&tables_waiting=".$tbls_waiting. - "&tables_search=".$tbls_search. - "&tables_coms=".$tbls_coms. - "&tables_nb_champs=".$tbls_nb_champs. - "&select=".$select; - - echo "<FORM Method='POST' Action='".$action."?op=tables_save&tables_modules=".$tbls_action."'> - <table border='0' width='100%' cellspacing='1' class='outer'> - <tr> - <td colspan='8' class='head center'>".$title."</td> - </tr> - <tr class='head'> - <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_NAME."</td> - <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_TYPE."</td> - <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_VALUE."</td> - <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_ATTRIBUTE."</td> - <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_NULL."</td> - <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_DEFAULT."</td> - <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_KEY."</td> - <td class='center'>"._AM_TDMCREATE_TABLES_CHAMPS_MORE."</td> - </tr>"; - $sel = "selected"; - $chk = "checked"; - for($i=0; $i<$tbls_nb_champs ; $i++) - { - $class = ($class == 'even') ? 'odd' : 'even'; - echo "<tr class=".$class."> - <td class='center'><INPUT type='text' size='10' value='".$champs_name[$i]."' name='champs_name[".$i."]'></td> - <td class='center'><SELECT name='champs_type[".$i."]'>"; - if ( $champs_type[$i] == 'int' ) { - echo "<OPTION VALUE='int' selected>INT</OPTION>"; - } else { - echo "<OPTION VALUE='int'>INT</OPTION>"; - } - if ( $champs_type[$i] == 'tinyint' ) { - echo "<OPTION VALUE='tinyint' selected>TINYINT</OPTION>"; - } else { - echo "<OPTION VALUE='tinyint'>TINYINT</OPTION>"; - } - if ( $champs_type[$i] == 'mediumint' ) { - echo "<OPTION VALUE='mediumint' selected>MEDIUMINT</OPTION>"; - } else { - echo "<OPTION VALUE='mediumint'>MEDIUMINT</OPTION>"; - } - if ( $champs_type[$i] == 'smallint' ) { - echo "<OPTION VALUE='smallint' selected>SMALLINT</OPTION>"; - } else { - echo "<OPTION VALUE='smallint'>SMALLINT</OPTION>"; - } - if ( $champs_type[$i] == 'float' ) { - echo "<OPTION VALUE='float' selected>FLOAT</OPTION>"; - } else { - echo "<OPTION VALUE='float'>FLOAT</OPTION>"; - } - if ( $champs_type[$i] == 'double' ) { - echo "<OPTION VALUE='double' selected>DOUBLE</OPTION>"; - } else { - echo "<OPTION VALUE='double'>DOUBLE</OPTION>"; - } - if ( $champs_type[$i] == 'decimal' ) { - echo "<OPTION VALUE='decimal' selected>DECIMAL</OPTION>"; - } else { - echo "<OPTION VALUE='decimal'>DECIMAL</OPTION>"; - } - if ( $champs_type[$i] == 'enum' ) { - echo "<OPTION VALUE='enum' selected>ENUM</OPTION>"; - } else { - echo "<OPTION VALUE='enum'>ENUM</OPTION>"; - } - if ( $champs_type[$i] == 'email' ) { - echo "<OPTION VALUE='email' selected>EMAIL</OPTION>"; - } else { - echo "<OPTION VALUE='email'>EMAIL</OPTION>"; - } - if ( $champs_type[$i] == 'url' ) { - echo "<OPTION VALUE='url' selected>URL</OPTION>"; - } else { - echo "<OPTION VALUE='url'>URL</OPTION>"; - } - if ( $champs_type[$i] == 'char' ) { - echo "<OPTION VALUE='char' selected>CHAR</OPTION>"; - } e... [truncated message content] |
From: <dj...@us...> - 2012-02-21 15:36:41
|
Revision: 9041 http://xoops.svn.sourceforge.net/xoops/?rev=9041&view=rev Author: djculex Date: 2012-02-21 15:36:32 +0000 (Tue, 21 Feb 2012) Log Message: ----------- uncomment rediredirect Modified Paths: -------------- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js =================================================================== --- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-02-21 14:30:29 UTC (rev 9040) +++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-02-21 15:36:32 UTC (rev 9041) @@ -372,7 +372,7 @@ url: smallworld_url+"submit.php", data: dataString, success: function(){ - //location.href = smallworld_url+'index.php'; + location.href = smallworld_url+'index.php'; } }); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wis...@us...> - 2012-02-21 14:30:41
|
Revision: 9040 http://xoops.svn.sourceforge.net/xoops/?rev=9040&view=rev Author: wishcraft Date: 2012-02-21 14:30:29 +0000 (Tue, 21 Feb 2012) Log Message: ----------- samPHPweb - SAM 1.02 - See http://spacialaudio.com for SAM Broadcast the PC Component of this XOOPS Module Added Paths: ----------- XoopsModules/sam/ XoopsModules/sam/releases/ XoopsModules/sam/releases/1.02/ XoopsModules/sam/releases/1.02/modules/ XoopsModules/sam/releases/1.02/modules/sam/ XoopsModules/sam/releases/1.02/modules/sam/admin/ XoopsModules/sam/releases/1.02/modules/sam/admin/about.php XoopsModules/sam/releases/1.02/modules/sam/admin/header.php XoopsModules/sam/releases/1.02/modules/sam/admin/index.php XoopsModules/sam/releases/1.02/modules/sam/admin/menu.php XoopsModules/sam/releases/1.02/modules/sam/blocks/ XoopsModules/sam/releases/1.02/modules/sam/blocks/index.html XoopsModules/sam/releases/1.02/modules/sam/blocks/sam_block_partnerlinks.php XoopsModules/sam/releases/1.02/modules/sam/class/ XoopsModules/sam/releases/1.02/modules/sam/class/adz.php XoopsModules/sam/releases/1.02/modules/sam/class/category.php XoopsModules/sam/releases/1.02/modules/sam/class/categorylist.php XoopsModules/sam/releases/1.02/modules/sam/class/database/ XoopsModules/sam/releases/1.02/modules/sam/class/database/database.php XoopsModules/sam/releases/1.02/modules/sam/class/database/databasefactory.php XoopsModules/sam/releases/1.02/modules/sam/class/database/index.html XoopsModules/sam/releases/1.02/modules/sam/class/database/mysqldatabase.php XoopsModules/sam/releases/1.02/modules/sam/class/disk.php XoopsModules/sam/releases/1.02/modules/sam/class/event.php XoopsModules/sam/releases/1.02/modules/sam/class/eventtime.php XoopsModules/sam/releases/1.02/modules/sam/class/fixedlist.php XoopsModules/sam/releases/1.02/modules/sam/class/fixedlist_item.php XoopsModules/sam/releases/1.02/modules/sam/class/historylist.php XoopsModules/sam/releases/1.02/modules/sam/class/index.html XoopsModules/sam/releases/1.02/modules/sam/class/model/ XoopsModules/sam/releases/1.02/modules/sam/class/model/index.html XoopsModules/sam/releases/1.02/modules/sam/class/model/joint.php XoopsModules/sam/releases/1.02/modules/sam/class/model/read.php XoopsModules/sam/releases/1.02/modules/sam/class/model/sammodel.php XoopsModules/sam/releases/1.02/modules/sam/class/model/stats.php XoopsModules/sam/releases/1.02/modules/sam/class/model/sync.php XoopsModules/sam/releases/1.02/modules/sam/class/model/write.php XoopsModules/sam/releases/1.02/modules/sam/class/object.php XoopsModules/sam/releases/1.02/modules/sam/class/queuelist.php XoopsModules/sam/releases/1.02/modules/sam/class/requestlist.php XoopsModules/sam/releases/1.02/modules/sam/class/songlist.php XoopsModules/sam/releases/1.02/modules/sam/css/ XoopsModules/sam/releases/1.02/modules/sam/css/request.css XoopsModules/sam/releases/1.02/modules/sam/css/request.error.css XoopsModules/sam/releases/1.02/modules/sam/css/songinfo.css XoopsModules/sam/releases/1.02/modules/sam/css/style.css XoopsModules/sam/releases/1.02/modules/sam/docs/ XoopsModules/sam/releases/1.02/modules/sam/docs/changelog.txt XoopsModules/sam/releases/1.02/modules/sam/docs/credits.txt XoopsModules/sam/releases/1.02/modules/sam/docs/index.html XoopsModules/sam/releases/1.02/modules/sam/docs/install.txt XoopsModules/sam/releases/1.02/modules/sam/docs/lang_diff.txt XoopsModules/sam/releases/1.02/modules/sam/docs/licence.txt XoopsModules/sam/releases/1.02/modules/sam/docs/readme.txt XoopsModules/sam/releases/1.02/modules/sam/images/ XoopsModules/sam/releases/1.02/modules/sam/images/buy.png XoopsModules/sam/releases/1.02/modules/sam/images/home.png XoopsModules/sam/releases/1.02/modules/sam/images/index.html XoopsModules/sam/releases/1.02/modules/sam/images/info.png XoopsModules/sam/releases/1.02/modules/sam/images/logo.png XoopsModules/sam/releases/1.02/modules/sam/images/menu/ XoopsModules/sam/releases/1.02/modules/sam/images/menu/email.png XoopsModules/sam/releases/1.02/modules/sam/images/menu/play.png XoopsModules/sam/releases/1.02/modules/sam/images/menu/speaker.png XoopsModules/sam/releases/1.02/modules/sam/images/menu/tb-file-list.png XoopsModules/sam/releases/1.02/modules/sam/images/request.png XoopsModules/sam/releases/1.02/modules/sam/images/sam_slogo.png XoopsModules/sam/releases/1.02/modules/sam/include/ XoopsModules/sam/releases/1.02/modules/sam/include/code.playing.php XoopsModules/sam/releases/1.02/modules/sam/include/code.playlist.php XoopsModules/sam/releases/1.02/modules/sam/include/code.request.php XoopsModules/sam/releases/1.02/modules/sam/include/code.songcheck.php XoopsModules/sam/releases/1.02/modules/sam/include/code.songinfo.php XoopsModules/sam/releases/1.02/modules/sam/include/header.php XoopsModules/sam/releases/1.02/modules/sam/include/index.html XoopsModules/sam/releases/1.02/modules/sam/include/xml.php XoopsModules/sam/releases/1.02/modules/sam/index.php XoopsModules/sam/releases/1.02/modules/sam/js/ XoopsModules/sam/releases/1.02/modules/sam/js/common.js XoopsModules/sam/releases/1.02/modules/sam/js/jquery.corner.js XoopsModules/sam/releases/1.02/modules/sam/language/ XoopsModules/sam/releases/1.02/modules/sam/language/english/ XoopsModules/sam/releases/1.02/modules/sam/language/english/admin.php XoopsModules/sam/releases/1.02/modules/sam/language/english/blocks.php XoopsModules/sam/releases/1.02/modules/sam/language/english/help/ XoopsModules/sam/releases/1.02/modules/sam/language/english/help/help.html XoopsModules/sam/releases/1.02/modules/sam/language/english/help/index.html XoopsModules/sam/releases/1.02/modules/sam/language/english/main.php XoopsModules/sam/releases/1.02/modules/sam/language/english/modinfo.php XoopsModules/sam/releases/1.02/modules/sam/playing.php XoopsModules/sam/releases/1.02/modules/sam/playlist.php XoopsModules/sam/releases/1.02/modules/sam/request.php XoopsModules/sam/releases/1.02/modules/sam/songcheck.js.php XoopsModules/sam/releases/1.02/modules/sam/songinfo.php XoopsModules/sam/releases/1.02/modules/sam/sql/ XoopsModules/sam/releases/1.02/modules/sam/sql/index.html XoopsModules/sam/releases/1.02/modules/sam/templates/ XoopsModules/sam/releases/1.02/modules/sam/templates/blocks/ XoopsModules/sam/releases/1.02/modules/sam/templates/blocks/index.html XoopsModules/sam/releases/1.02/modules/sam/templates/blocks/sam_block_partnerlinks.html XoopsModules/sam/releases/1.02/modules/sam/templates/index.html XoopsModules/sam/releases/1.02/modules/sam/templates/sam_error.html XoopsModules/sam/releases/1.02/modules/sam/templates/sam_footer.html XoopsModules/sam/releases/1.02/modules/sam/templates/sam_header.html XoopsModules/sam/releases/1.02/modules/sam/templates/sam_playing.html XoopsModules/sam/releases/1.02/modules/sam/templates/sam_playlist.html XoopsModules/sam/releases/1.02/modules/sam/templates/sam_request.html XoopsModules/sam/releases/1.02/modules/sam/templates/sam_request_error.html XoopsModules/sam/releases/1.02/modules/sam/templates/sam_songcheck.html XoopsModules/sam/releases/1.02/modules/sam/templates/sam_songinfo.html XoopsModules/sam/releases/1.02/modules/sam/xoops_version.php XoopsModules/sam/releases/1.02/uploads/ XoopsModules/sam/releases/1.02/uploads/sam/ XoopsModules/sam/releases/1.02/uploads/sam/na.png XoopsModules/sam/trunk/ XoopsModules/sam/trunk/modules/ XoopsModules/sam/trunk/modules/sam/ XoopsModules/sam/trunk/modules/sam/admin/ XoopsModules/sam/trunk/modules/sam/admin/about.php XoopsModules/sam/trunk/modules/sam/admin/header.php XoopsModules/sam/trunk/modules/sam/admin/index.php XoopsModules/sam/trunk/modules/sam/admin/menu.php XoopsModules/sam/trunk/modules/sam/blocks/ XoopsModules/sam/trunk/modules/sam/blocks/index.html XoopsModules/sam/trunk/modules/sam/blocks/sam_block_partnerlinks.php XoopsModules/sam/trunk/modules/sam/class/ XoopsModules/sam/trunk/modules/sam/class/adz.php XoopsModules/sam/trunk/modules/sam/class/category.php XoopsModules/sam/trunk/modules/sam/class/categorylist.php XoopsModules/sam/trunk/modules/sam/class/database/ XoopsModules/sam/trunk/modules/sam/class/database/database.php XoopsModules/sam/trunk/modules/sam/class/database/databasefactory.php XoopsModules/sam/trunk/modules/sam/class/database/index.html XoopsModules/sam/trunk/modules/sam/class/database/mysqldatabase.php XoopsModules/sam/trunk/modules/sam/class/disk.php XoopsModules/sam/trunk/modules/sam/class/event.php XoopsModules/sam/trunk/modules/sam/class/eventtime.php XoopsModules/sam/trunk/modules/sam/class/fixedlist.php XoopsModules/sam/trunk/modules/sam/class/fixedlist_item.php XoopsModules/sam/trunk/modules/sam/class/historylist.php XoopsModules/sam/trunk/modules/sam/class/index.html XoopsModules/sam/trunk/modules/sam/class/model/ XoopsModules/sam/trunk/modules/sam/class/model/index.html XoopsModules/sam/trunk/modules/sam/class/model/joint.php XoopsModules/sam/trunk/modules/sam/class/model/read.php XoopsModules/sam/trunk/modules/sam/class/model/sammodel.php XoopsModules/sam/trunk/modules/sam/class/model/stats.php XoopsModules/sam/trunk/modules/sam/class/model/sync.php XoopsModules/sam/trunk/modules/sam/class/model/write.php XoopsModules/sam/trunk/modules/sam/class/object.php XoopsModules/sam/trunk/modules/sam/class/queuelist.php XoopsModules/sam/trunk/modules/sam/class/requestlist.php XoopsModules/sam/trunk/modules/sam/class/songlist.php XoopsModules/sam/trunk/modules/sam/css/ XoopsModules/sam/trunk/modules/sam/css/request.css XoopsModules/sam/trunk/modules/sam/css/request.error.css XoopsModules/sam/trunk/modules/sam/css/songinfo.css XoopsModules/sam/trunk/modules/sam/css/style.css XoopsModules/sam/trunk/modules/sam/docs/ XoopsModules/sam/trunk/modules/sam/docs/changelog.txt XoopsModules/sam/trunk/modules/sam/docs/credits.txt XoopsModules/sam/trunk/modules/sam/docs/index.html XoopsModules/sam/trunk/modules/sam/docs/install.txt XoopsModules/sam/trunk/modules/sam/docs/lang_diff.txt XoopsModules/sam/trunk/modules/sam/docs/licence.txt XoopsModules/sam/trunk/modules/sam/docs/readme.txt XoopsModules/sam/trunk/modules/sam/images/ XoopsModules/sam/trunk/modules/sam/images/buy.png XoopsModules/sam/trunk/modules/sam/images/home.png XoopsModules/sam/trunk/modules/sam/images/index.html XoopsModules/sam/trunk/modules/sam/images/info.png XoopsModules/sam/trunk/modules/sam/images/logo.png XoopsModules/sam/trunk/modules/sam/images/menu/ XoopsModules/sam/trunk/modules/sam/images/menu/email.png XoopsModules/sam/trunk/modules/sam/images/menu/play.png XoopsModules/sam/trunk/modules/sam/images/menu/speaker.png XoopsModules/sam/trunk/modules/sam/images/menu/tb-file-list.png XoopsModules/sam/trunk/modules/sam/images/request.png XoopsModules/sam/trunk/modules/sam/images/sam_slogo.png XoopsModules/sam/trunk/modules/sam/include/ XoopsModules/sam/trunk/modules/sam/include/code.playing.php XoopsModules/sam/trunk/modules/sam/include/code.playlist.php XoopsModules/sam/trunk/modules/sam/include/code.request.php XoopsModules/sam/trunk/modules/sam/include/code.songcheck.php XoopsModules/sam/trunk/modules/sam/include/code.songinfo.php XoopsModules/sam/trunk/modules/sam/include/header.php XoopsModules/sam/trunk/modules/sam/include/index.html XoopsModules/sam/trunk/modules/sam/include/xml.php XoopsModules/sam/trunk/modules/sam/index.php XoopsModules/sam/trunk/modules/sam/js/ XoopsModules/sam/trunk/modules/sam/js/common.js XoopsModules/sam/trunk/modules/sam/js/jquery.corner.js XoopsModules/sam/trunk/modules/sam/language/ XoopsModules/sam/trunk/modules/sam/language/english/ XoopsModules/sam/trunk/modules/sam/language/english/admin.php XoopsModules/sam/trunk/modules/sam/language/english/blocks.php XoopsModules/sam/trunk/modules/sam/language/english/help/ XoopsModules/sam/trunk/modules/sam/language/english/help/help.html XoopsModules/sam/trunk/modules/sam/language/english/help/index.html XoopsModules/sam/trunk/modules/sam/language/english/main.php XoopsModules/sam/trunk/modules/sam/language/english/modinfo.php XoopsModules/sam/trunk/modules/sam/playing.php XoopsModules/sam/trunk/modules/sam/playlist.php XoopsModules/sam/trunk/modules/sam/request.php XoopsModules/sam/trunk/modules/sam/songcheck.js.php XoopsModules/sam/trunk/modules/sam/songinfo.php XoopsModules/sam/trunk/modules/sam/sql/ XoopsModules/sam/trunk/modules/sam/sql/index.html XoopsModules/sam/trunk/modules/sam/templates/ XoopsModules/sam/trunk/modules/sam/templates/blocks/ XoopsModules/sam/trunk/modules/sam/templates/blocks/index.html XoopsModules/sam/trunk/modules/sam/templates/blocks/sam_block_partnerlinks.html XoopsModules/sam/trunk/modules/sam/templates/index.html XoopsModules/sam/trunk/modules/sam/templates/sam_error.html XoopsModules/sam/trunk/modules/sam/templates/sam_footer.html XoopsModules/sam/trunk/modules/sam/templates/sam_header.html XoopsModules/sam/trunk/modules/sam/templates/sam_playing.html XoopsModules/sam/trunk/modules/sam/templates/sam_playlist.html XoopsModules/sam/trunk/modules/sam/templates/sam_request.html XoopsModules/sam/trunk/modules/sam/templates/sam_request_error.html XoopsModules/sam/trunk/modules/sam/templates/sam_songcheck.html XoopsModules/sam/trunk/modules/sam/templates/sam_songinfo.html XoopsModules/sam/trunk/modules/sam/xoops_version.php XoopsModules/sam/trunk/uploads/ XoopsModules/sam/trunk/uploads/sam/ XoopsModules/sam/trunk/uploads/sam/na.png Added: XoopsModules/sam/releases/1.02/modules/sam/admin/about.php =================================================================== --- XoopsModules/sam/releases/1.02/modules/sam/admin/about.php (rev 0) +++ XoopsModules/sam/releases/1.02/modules/sam/admin/about.php 2012-02-21 14:30:29 UTC (rev 9040) @@ -0,0 +1,76 @@ +<?php +// $Id: about.php 5204 2010-09-06 20:10:52Z mageg $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2000 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +// Author: XOOPS Foundation // +// URL: http://www.xoops.org/ // +// Project: The XOOPS Project // +// ------------------------------------------------------------------------- // + + include ('header.php'); + xoops_loadLanguage('admin', 'sam'); + + xoops_cp_header(); + + $aboutAdmin = new ModuleAdmin(); + echo $aboutAdmin->addNavigation('admin/about.php'); + + $paypalitemno='SAM175'; + $about = $aboutAdmin->renderabout($paypalitemno, false); + $donationform = array( 0 => '<form name="donation" id="donation" action="http://www.chronolabs.coop/modules/xpayment/" method="post" onsubmit="return xoopsFormValidate_donation();">', + 1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'.constant('_AM_SAM_ABOUT_MAKEDONATE').'</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">Donation Amount</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 AUD</option><option value="10">10.00 AUD</option><option value="20">20.00 AUD</option><option value="40">40.00 AUD</option><option value="60">60.00 AUD</option><option value="80">80.00 AUD</option><option value="90">90.00 AUD</option><option value="100">100.00 AUD</option><option value="200">200.00 AUD</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'._SUBMIT.'" title="'._SUBMIT.'" type="submit"></td></tr></tbody></table>', + 2 => '<input name="op" id="op" value="createinvoice" type="hidden"><input name="plugin" id="plugin" value="donations" type="hidden"><input name="donation" id="donation" value="1" type="hidden"><input name="drawfor" id="drawfor" value="Chronolabs Co-Operative" type="hidden"><input name="drawto" id="drawto" value="%s" type="hidden"><input name="drawto_email" id="drawto_email" value="%s" type="hidden"><input name="key" id="key" value="%s" type="hidden"><input name="currency" id="currency" value="AUD" type="hidden"><input name="weight_unit" id="weight_unit" value="kgs" type="hidden"><input name="item[A][cat]" id="item[A][cat]" value="XDN%s" type="hidden"><input name="item[A][name]" id="item[A][name]" value="Donation for %s" type="hidden"><input name="item[A][quantity]" id="item[A][quantity]" value="1" type="hidden"><input name="item[A][shipping]" id="item[A][shipping]" value="0" type="hidden"><input name="item[A][handling]" id="item[A][handling]" value="0" type="hidden"><input name="item[A][weight]" id="item[A][weight]" value="0" type="hidden"><input name="item[A][tax]" id="item[A][tax]" value="0" type="hidden"><input name="return" id="return" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"><input name="cancel" id="cancel" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"></form>', 'D'=>'', + 3 => '', + 4 => '<!-- Start Form Validation JavaScript //--> +<script type="text/javascript"> +<!--// +function xoopsFormValidate_donation() { var myform = window.document.donation; +var hasSelected = false; var selectBox = myform.item[A][amount];for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected == true && selectBox.options[i].value != \'\') { hasSelected = true; break; } }if (!hasSelected) { window.alert("Please enter Donation Amount"); selectBox.focus(); return false; }return true; +} +//--></script> +<!-- End Form Validation JavaScript //-->'); + $paypalform = array( 0 => '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">', + 1 => '<input name="cmd" value="_s-xclick" type="hidden">', + 2 => '<input name="hosted_button_id" value="%s" type="hidden">', + 3 => '<img alt="" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" height="1" border="0" width="1">', + 4 => '<input src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" name="submit" alt="PayPal - The safer, easier way to pay online!" border="0" type="image">', + 5 => '</form>'); + for($key=0;$key<=4;$key++) { + switch ($key) { + case 2: + $donationform[$key] = sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'] . ' - ' . (strlen($GLOBALS['xoopsUser']->getVar('name'))>0?$GLOBALS['xoopsUser']->getVar('name'). ' ['.$GLOBALS['xoopsUser']->getVar('uname').']':$GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, strtoupper($GLOBALS['samModule']->getVar('dirname')), strtoupper($GLOBALS['samModule']->getVar('dirname')). ' '.$GLOBALS['samModule']->getVar('name')); + break; + } + } + + $istart = strpos($about, ($paypalform[0]), 1); + $iend = strpos($about, ($paypalform[5]), $istart+1)+strlen($paypalform[5])-1; + echo (substr($about, 0, $istart-1)); + echo implode("\n", $donationform); + echo (substr($about, $iend+1, strlen($about)-$iend-1)); + + xoops_cp_footer(); + +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.02/modules/sam/admin/header.php =================================================================== --- XoopsModules/sam/releases/1.02/modules/sam/admin/header.php (rev 0) +++ XoopsModules/sam/releases/1.02/modules/sam/admin/header.php 2012-02-21 14:30:29 UTC (rev 9040) @@ -0,0 +1,54 @@ +<?php + + require_once (dirname(dirname(dirname(dirname(__FILE__)))).'/include/cp_header.php'); + + if (!defined('_CHARSET')) + define ("_CHARSET","UTF-8"); + if (!defined('_CHARSET_ISO')) + define ("_CHARSET_ISO","ISO-8859-1"); + + $GLOBALS['myts'] = MyTextSanitizer::getInstance(); + + $module_handler = xoops_gethandler('module'); + $config_handler = xoops_gethandler('config'); + $GLOBALS['samModule'] = $module_handler->getByDirname('sam'); + $GLOBALS['samModuleConfig'] = $config_handler->getConfigList($GLOBALS['samModule']->getVar('mid')); + + xoops_load('pagenav'); + xoops_load('xoopslists'); + xoops_load('xoopsformloader'); + + include_once $GLOBALS['xoops']->path('class'.DS.'xoopsmailer.php'); + include_once $GLOBALS['xoops']->path('class'.DS.'xoopstree.php'); + + if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){ + include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'); + }else{ + echo xoops_error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks"); + } + + $GLOBALS['samImageIcon'] = XOOPS_URL .'/'. $GLOBALS['samModule']->getInfo('icons16'); + $GLOBALS['samImageAdmin'] = XOOPS_URL .'/'. $GLOBALS['samModule']->getInfo('icons32'); + + if ($GLOBALS['xoopsUser']) { + $moduleperm_handler =& xoops_gethandler('groupperm'); + if (!$moduleperm_handler->checkRight('module_admin', $GLOBALS['samModule']->getVar( 'mid' ), $GLOBALS['xoopsUser']->getGroups())) { + redirect_header(XOOPS_URL, 1, _NOPERM); + exit(); + } + } else { + redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM); + exit(); + } + + if (!isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl'])) { + include_once(XOOPS_ROOT_PATH."/class/template.php"); + $GLOBALS['xoopsTpl'] = new XoopsTpl(); + } + + $GLOBALS['xoopsTpl']->assign('pathImageIcon', $GLOBALS['samImageIcon']); + $GLOBALS['xoopsTpl']->assign('pathImageAdmin', $GLOBALS['samImageAdmin']); + + error_reporting(E_ALL); + +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.02/modules/sam/admin/index.php =================================================================== --- XoopsModules/sam/releases/1.02/modules/sam/admin/index.php (rev 0) +++ XoopsModules/sam/releases/1.02/modules/sam/admin/index.php 2012-02-21 14:30:29 UTC (rev 9040) @@ -0,0 +1,70 @@ +<?php +// $Id: directory.php 5204 2010-09-06 20:10:52Z mageg $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2000 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +// Author: XOOPS Foundation // +// URL: http://www.xoops.org/ // +// Project: The XOOPS Project // +// ------------------------------------------------------------------------- // + + include ('header.php'); + xoops_loadLanguage('admin', 'sam'); + + xoops_cp_header(); + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation('admin/index.php'); + + $indexAdmin = new ModuleAdmin(); + + if (empty($GLOBALS['samModuleConfig']['db_type'])||empty($GLOBALS['samModuleConfig']['db_host'])||empty($GLOBALS['samModuleConfig']['db_name'])||empty($GLOBALS['samModuleConfig']['db_user'])||empty($GLOBALS['samModuleConfig']['db_pass'])||empty($GLOBALS['samModuleConfig']['db_charset'])||empty($GLOBALS['samModuleConfig']['sam_host'])||empty($GLOBALS['samModuleConfig']['sam_port'])) { + $indexAdmin->addInfoBox(_AM_SAM_PREF_NEEDTOBESET); + $indexAdmin->addInfoBoxLine(_AM_SAM_PREF_NEEDTOBESET, "<label>"._AM_SAM_PREF_DB_TYPE."</label>", empty($GLOBALS['samModuleConfig']['db_type'])?_NO:_YES, empty($GLOBALS['samModuleConfig']['db_type'])?'Red':'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_PREF_NEEDTOBESET, "<label>"._AM_SAM_PREF_DB_HOST."</label>", empty($GLOBALS['samModuleConfig']['db_host'])?_NO:_YES, empty($GLOBALS['samModuleConfig']['db_host'])?'Red':'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_PREF_NEEDTOBESET, "<label>"._AM_SAM_PREF_DB_NAME."</label>", empty($GLOBALS['samModuleConfig']['db_name'])?_NO:_YES, empty($GLOBALS['samModuleConfig']['db_name'])?'Red':'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_PREF_NEEDTOBESET, "<label>"._AM_SAM_PREF_DB_USER."</label>", empty($GLOBALS['samModuleConfig']['db_user'])?_NO:_YES, empty($GLOBALS['samModuleConfig']['db_user'])?'Red':'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_PREF_NEEDTOBESET, "<label>"._AM_SAM_PREF_DB_PASS."</label>", empty($GLOBALS['samModuleConfig']['db_pass'])?_NO:_YES, empty($GLOBALS['samModuleConfig']['db_pass'])?'Red':'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_PREF_NEEDTOBESET, "<label>"._AM_SAM_PREF_DB_CHARSET."</label>", empty($GLOBALS['samModuleConfig']['db_charset'])?_NO:_YES, empty($GLOBALS['samModuleConfig']['db_charset'])?'Red':'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_PREF_NEEDTOBESET, "<label>"._AM_SAM_PREF_SAM_HOST."</label>", empty($GLOBALS['samModuleConfig']['sam_host'])?_NO:_YES, empty($GLOBALS['samModuleConfig']['sam_host'])?'Red':'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_PREF_NEEDTOBESET, "<label>"._AM_SAM_PREF_SAM_PORT."</label>", empty($GLOBALS['samModuleConfig']['sam_port'])?_NO:_YES, empty($GLOBALS['samModuleConfig']['sam_port'])?'Red':'Green'); + } else { + $songlist_handler = xoops_getmodulehandler('songlist', 'sam'); + $requestlist_handler = xoops_getmodulehandler('requestlist', 'sam'); + $indexAdmin->addInfoBox(_AM_SAM_COUNTS); + $indexAdmin->addInfoBoxLine(_AM_SAM_COUNTS, "<label>"._AM_SAM_THEREARE_SONGS."</label>", $songlist_handler->getCount(NULL), 'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_COUNTS, "<label>"._AM_SAM_THEREARE_BROADCAST_SONGS."</label>", $songlist_handler->getCount(new Criteria('`songrights`', 'broadcast')), 'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_COUNTS, "<label>"._AM_SAM_THEREARE_DOWNLOAD_SONGS."</label>", $songlist_handler->getCount(new Criteria('`songrights`', 'download')), 'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_COUNTS, "<label>"._AM_SAM_THEREARE_ONDEMAND_SONGS."</label>", $songlist_handler->getCount(new Criteria('`songrights`', 'on-demand')), 'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_COUNTS, "<label>"._AM_SAM_THEREARE_ROAYALTYFREE_SONGS."</label>", $songlist_handler->getCount(new Criteria('`songrights`', 'royaltyfree')), 'Green'); + $indexAdmin->addInfoBoxLine(_AM_SAM_COUNTS, "<label>"._AM_SAM_THEREARE_REQUESTS."</label>", $requestlist_handler->getCount(NULL), 'Orange'); + $indexAdmin->addInfoBoxLine(_AM_SAM_COUNTS, "<label>"._AM_SAM_THEREARE_NEW_REQUESTS."</label>", $requestlist_handler->getCount(new Criteria('`status`', 'new')), 'Orange'); + $indexAdmin->addInfoBoxLine(_AM_SAM_COUNTS, "<label>"._AM_SAM_THEREARE_PENDING_REQUESTS."</label>", $requestlist_handler->getCount(new Criteria('`status`', 'pending')), 'Orange'); + $indexAdmin->addInfoBoxLine(_AM_SAM_COUNTS, "<label>"._AM_SAM_THEREARE_IGNORED_REQUESTS."</label>", $requestlist_handler->getCount(new Criteria('`status`', 'ignored')), 'Orange'); + $indexAdmin->addInfoBoxLine(_AM_SAM_COUNTS, "<label>"._AM_SAM_THEREARE_PLAYED_REQUESTS."</label>", $requestlist_handler->getCount(new Criteria('`status`', 'played')), 'Orange'); + } + echo $indexAdmin->renderIndex(); + xoops_cp_footer(); + +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.02/modules/sam/admin/menu.php =================================================================== --- XoopsModules/sam/releases/1.02/modules/sam/admin/menu.php (rev 0) +++ XoopsModules/sam/releases/1.02/modules/sam/admin/menu.php 2012-02-21 14:30:29 UTC (rev 9040) @@ -0,0 +1,32 @@ +<?php +/** + * Extended User Profile + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @package profile + * @since 2.3.0 + * @author Jan Pedersen + * @author Taiwen Jiang <ph...@us...> + * @version $Id: menu.php 2021 2008-08-31 02:02:45Z phppp $ + */ +$module_handler = xoops_gethandler('module'); +$GLOBALS['profileModule'] = $module_handler->getByDirname('sam'); +$adminmenu = array(); +$adminmenu[0]['title'] = _MI_SAM_DASHBOARD; +$adminmenu[0]['icon'] = '../../'.$GLOBALS['profileModule']->getInfo('icons32').'/about.png'; +$adminmenu[0]['image'] = '../../'.$GLOBALS['profileModule']->getInfo('icons32').'/about.png'; +$adminmenu[0]['link'] = "admin/index.php"; +$adminmenu[1]['title'] = _MI_SAM_ABOUT; +$adminmenu[1]['icon'] = '../../'.$GLOBALS['profileModule']->getInfo('icons32').'/about.png'; +$adminmenu[1]['image'] = '../../'.$GLOBALS['profileModule']->getInfo('icons32').'/about.png'; +$adminmenu[1]['link'] = "admin/about.php"; + +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.02/modules/sam/blocks/index.html =================================================================== --- XoopsModules/sam/releases/1.02/modules/sam/blocks/index.html (rev 0) +++ XoopsModules/sam/releases/1.02/modules/sam/blocks/index.html 2012-02-21 14:30:29 UTC (rev 9040) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/sam/releases/1.02/modules/sam/blocks/sam_block_partnerlinks.php =================================================================== --- XoopsModules/sam/releases/1.02/modules/sam/blocks/sam_block_partnerlinks.php (rev 0) +++ XoopsModules/sam/releases/1.02/modules/sam/blocks/sam_block_partnerlinks.php 2012-02-21 14:30:29 UTC (rev 9040) @@ -0,0 +1,34 @@ +<?php + + +function b_sam_block_partnerlinks_show( $options ) +{ + xoops_loadLanguage('blocks', 'sam'); + xoops_loadLanguage('modinfo', 'sam'); + + $config_handler = xoops_gethandler('config'); + $module_handler = xoops_gethandler('module'); + $GLOBALS['samModule'] = $module_handler->getByDirname('sam'); + $GLOBALS['samModuleConfig'] = $config_handler->getConfigList($_Mod->getVar('mid')); + + $block = array(); + $block = $GLOBALS['samModuleConfig']; + $block['username'] = $options[0]; + + $GLOBALS['xoTheme']->addScript(sprintf(_BL_SAM_ADDTHIS_JAVASCRIPT, $options[0]), array('type'=>'text/javascript')); + + return $block; +} + + +function b_sam_block_partnerlinks_edit( $options ) +{ + xoops_load('XoopsFormLoader'); + xoops_loadLanguage('blocks', 'uitabs'); + + $username = new XoopsFormText('', 'options[0]', 25, 40, $options[0]); + + $form = _BL_SAM_ADDTHIS_USERNAME.$username->render()."<br/>"; + return $form ; +} +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.02/modules/sam/class/adz.php =================================================================== --- XoopsModules/sam/releases/1.02/modules/sam/class/adz.php (rev 0) +++ XoopsModules/sam/releases/1.02/modules/sam/class/adz.php 2012-02-21 14:30:29 UTC (rev 9040) @@ -0,0 +1,83 @@ +<?php +// $Autho: wishcraft $ + +if (!defined('XOOPS_ROOT_PATH')) { + exit(); +} + +include_once dirname(__FILE__).'/object.php'; +/** + * Class for compunds + * @author Simon Roberts <si...@xo...> + * @copyright copyright (c) 2009-2003 XOOPS.org + * @package kernel + */ +class SamAdz extends SamObject +{ + + function SamAdz($id = null) + { + $this->initVar('ID', XOBJ_DTYPE_INT, null, false); + $this->initVar('PROVIDERID', XOBJ_DTYPE_INT, null, false); + $this->initVar('CAMPAIGNID', XOBJ_DTYPE_INT, null, false); + $this->initVar('CATEGORYID', XOBJ_DTYPE_INT, null, false); + $this->initVar('DATE_START', XOBJ_DTYPE_TXTBOX, null, false, 10); + $this->initVar('DATE_END', XOBJ_DTYPE_TXTBOX, null, false, 10); + $this->initVar('SONGTYPE', XOBJ_DTYPE_TXTBOX, "A", false, 1); + $this->initVar('LOCALFILENAME', XOBJ_DTYPE_TXTBOX, null, false, 200); + $this->initVar('LOCALSTATUS', XOBJ_DTYPE_TXTBOX, 'download', false, 10); + $this->initVar('DOWNLOAD_URL', XOBJ_DTYPE_TXTBOX, null, false, 200); + $this->initVar('LASTUPDATE', XOBJ_DTYPE_TXTBOX, null, false, 19); + $this->initVar('DESCRIPTION', XOBJ_DTYPE_TXTBOX, null, false, 100); + $this->initVar('DATE_END', XOBJ_DTYPE_TXTBOX, null, false, 10); + $this->initVar('CAMPAIGNACTIVE', XOBJ_DTYPE_TXTBOX, 'yes', false, 3); + $this->initVar('STATUS', XOBJ_DTYPE_TXTBOX, 'active', false, 10); + $this->initVar('WEIGHT', XOBJ_DTYPE_DECIMAL, null, false); + $this->initVar('GLOBALWEIGHT', XOBJ_DTYPE_DECIMAL, null, false); + $this->initVar('DURATION', XOBJ_DTYPE_INT, null, false); + $this->initVar('FILESIZE', XOBJ_DTYPE_INT, null, false); + $this->initVar('DATE_PLAYED', XOBJ_DTYPE_TXTBOX, null, false, 19); + $this->initVar('DATE_CATEGORY_PLAYED', XOBJ_DTYPE_TXTBOX, null, false, 19); + $this->initVar('DATE_CAMPAIGN_PLAYED', XOBJ_DTYPE_TXTBOX, null, false, 19); + $this->initVar('DATE_VALID', XOBJ_DTYPE_TXTBOX, null, false, 19); + $this->initVar('SPINS', XOBJ_DTYPE_INT, null, false); + $this->initVar('PERFORMANCES', XOBJ_DTYPE_INT, null, false); + $this->initVar('SPINS_MAX', XOBJ_DTYPE_INT, null, false); + $this->initVar('cap_day', XOBJ_DTYPE_INT, null, false); + $this->initVar('cap_day_cnt', XOBJ_DTYPE_INT, null, false); + $this->initVar('DAYS', XOBJ_DTYPE_TXTBOX, null, false, 100); + $this->initVar('HOURS', XOBJ_DTYPE_TXTBOX, null, false, 100); + $this->initVar('BLOCKED', XOBJ_DTYPE_TXTBOX, null, false, 3); + $this->initVar('LOCALWEIGHT', XOBJ_DTYPE_DECIMAL, null, false); + $this->initVar('LOCALBALANCE', XOBJ_DTYPE_DECIMAL, null, false); + $this->initVar('SORTID', XOBJ_DTYPE_DECIMAL, null, false); + $this->initVar('EXTERNALID', XOBJ_DTYPE_INT, null, false); + $this->initVar('SYNCINFO', XOBJ_DTYPE_TXTBOX, null, false, 200); + $this->initVar('PROGRESS', XOBJ_DTYPE_DECIMAL, null, false); + $this->initVar('timematrix', XOBJ_DTYPE_OTHER, null, false); + $this->initVar('min_separation', XOBJ_DTYPE_INT, null, false); + $this->initVar('min_separation_campaign', XOBJ_DTYPE_INT, null, false); + + } + +} + + +/** +* XOOPS policies handler class. +* This class is responsible for providing data access mechanisms to the data source +* of XOOPS user class objects. +* +* @author Simon Roberts <si...@ch...> +* @package kernel +*/ +class SamAdzHandler extends SamPersistableObjectHandler +{ + function __construct(&$db) + { + $this->db = $db =& SamDatabaseFactory::getDatabaseConnection(); + parent::__construct($db, "adz", 'SamAdz', "ID", "PROVIDERID"); + } +} + +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.02/modules/sam/class/category.php =================================================================== --- XoopsModules/sam/releases/1.02/modules/sam/class/category.php (rev 0) +++ XoopsModules/sam/releases/1.02/modules/sam/class/category.php 2012-02-21 14:30:29 UTC (rev 9040) @@ -0,0 +1,48 @@ +<?php +// $Autho: wishcraft $ + +if (!defined('XOOPS_ROOT_PATH')) { + exit(); +} + +include_once dirname(__FILE__).'/object.php'; +/** + * Class for compunds + * @author Simon Roberts <si...@xo...> + * @copyright copyright (c) 2009-2003 XOOPS.org + * @package kernel + */ +class SamCategory extends SamObject +{ + + function SamCategory($id = null) + { + $this->initVar('ID', XOBJ_DTYPE_INT, null, false); + $this->initVar('name', XOBJ_DTYPE_TXTBOX, null, false, 100); + $this->initVar('parentID', XOBJ_DTYPE_INT, null, false); + $this->initVar('levelindex', XOBJ_DTYPE_INT, null, false); + $this->initVar('itemindex', XOBJ_DTYPE_INT, null, false); + + } + +} + + +/** +* XOOPS policies handler class. +* This class is responsible for providing data access mechanisms to the data source +* of XOOPS user class objects. +* +* @author Simon Roberts <si...@ch...> +* @package kernel +*/ +class SamCategoryHandler extends SamPersistableObjectHandler +{ + function __construct(&$db) + { + $this->db = $db =& SamDatabaseFactory::getDatabaseConnection(); + parent::__construct($db, "category", 'SamCategory', "ID", "name"); + } +} + +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.02/modules/sam/class/categorylist.php =================================================================== --- XoopsModules/sam/releases/1.02/modules/sam/class/categorylist.php (rev 0) +++ XoopsModules/sam/releases/1.02/modules/sam/class/categorylist.php 2012-02-21 14:30:29 UTC (rev 9040) @@ -0,0 +1,47 @@ +<?php +// $Autho: wishcraft $ + +if (!defined('XOOPS_ROOT_PATH')) { + exit(); +} + +include_once dirname(__FILE__).'/object.php'; +/** + * Class for compunds + * @author Simon Roberts <si...@xo...> + * @copyright copyright (c) 2009-2003 XOOPS.org + * @package kernel + */ +class SamCategorylist extends SamObject +{ + + function SamCategorylist($id = null) + { + $this->initVar('ID', XOBJ_DTYPE_INT, null, false); + $this->initVar('songID', XOBJ_DTYPE_INT, null, false); + $this->initVar('categoryID', XOBJ_DTYPE_INT, null, false); + $this->initVar('sortID', XOBJ_DTYPE_DECIMAL, null, false); + + } + +} + + +/** +* XOOPS policies handler class. +* This class is responsible for providing data access mechanisms to the data source +* of XOOPS user class objects. +* +* @author Simon Roberts <si...@ch...> +* @package kernel +*/ +class SamCategorylistHandler extends SamPersistableObjectHandler +{ + function __construct(&$db) + { + $this->db = $db =& SamDatabaseFactory::getDatabaseConnection(); + parent::__construct($db, "categorylist", 'SamCategorylist', "ID", "sortID"); + } +} + +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.02/modules/sam/class/database/database.php =================================================================== --- XoopsModules/sam/releases/1.02/modules/sam/class/database/database.php (rev 0) +++ XoopsModules/sam/releases/1.02/modules/sam/class/database/database.php 2012-02-21 14:30:29 UTC (rev 9040) @@ -0,0 +1,114 @@ +<?php +/** + * Abstract base class for XOOPS Database access classes + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package kernel + * @subpackage database + * @since 1.0.0 + * @author Kazumi Ono <on...@xo...> + * @version $Id: database.php 8066 2011-11-06 05:09:33Z beckmi $ + */ + +defined('XOOPS_ROOT_PATH') or die('Restricted access'); + +/** + * make sure this is only included once! + */ +if (defined('SAM_C_DATABASE_INCLUDED')) { + return; +} + +define('SAM_C_DATABASE_INCLUDED', 1); + +/** + * Abstract base class for Database access classes + * + * @abstract + * @author Kazumi Ono <on...@xo...> + * @package kernel + * @subpackage database + */ +class SamDatabase +{ + /** + * Prefix for tables in the database + * + * @var string + */ + var $prefix = ''; + + /** + * reference to a {@link SamLogger} object + * + * @see SamLogger + * @var object SamLogger + */ + var $logger; + + /** + * If statements that modify the database are selected + * + * @var boolean + */ + var $allowWebChanges = false; + + /** + * constructor + * + * will always fail, because this is an abstract class! + */ + function SamDatabase() + { + // exit('Cannot instantiate this class directly'); + } + + /** + * assign a {@link SamLogger} object to the database + * + * @see SamLogger + * @param object $logger reference to a {@link SamLogger} object + */ + + function setLogger(&$logger) + { + $this->logger = &$logger; + } + + /** + * set the prefix for tables in the database + * + * @param string $value table prefix + */ + function setPrefix($value) + { + $this->prefix = $value; + } + + /** + * attach the prefix.'_' to a given tablename + * + * if tablename is empty, only prefix will be returned + * + * @param string $tablename tablename + * @return string prefixed tablename, just prefix if tablename is empty + */ + function prefix($tablename = '') + { + if ($tablename != '') { + return $this->prefix . '_' . $tablename; + } else { + return $this->prefix; + } + } +} + +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.02/modules/sam/class/database/databasefactory.php =================================================================== --- XoopsModules/sam/releases/1.02/modules/sam/class/database/databasefactory.php (rev 0) +++ XoopsModules/sam/releases/1.02/modules/sam/class/database/databasefactory.php 2012-02-21 14:30:29 UTC (rev 9040) @@ -0,0 +1,108 @@ +<?php +/** + * Factory Class for XOOPS Database + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package kernel + * @subpackage database + * @version $Id: databasefactory.php 8066 2011-11-06 05:09:33Z beckmi $ + */ +defined('XOOPS_ROOT_PATH') or die('Restricted access'); + +/** + * SamDatabaseFactory + * + * @package Kernel + * @author Kazumi Ono <on...@xo...> + * @access public + */ +class SamDatabaseFactory +{ + /** + * SamDatabaseFactory::SamDatabaseFactory() + */ + function SamDatabaseFactory() + { + if (!isset($GLOBALS['samModuleConfig'])||!is_array($GLOBALS['samModuleConfig'])) { + $config_handler = xoops_gethandler('config'); + $module_handler = xoops_gethandler('module'); + $GLOBALS['samModule'] = $module_handler->getDirname('sam'); + $GLOBALS['samModuleConfig'] = $config_handler->getConfigList($GLOBALS['samModule']->getVar('mid')); + } + } + + /** + * Get a reference to the only instance of database class and connects to DB + * + * if the class has not been instantiated yet, this will also take + * care of that + * + * @static + * @staticvar object The only instance of database class + * @return object Reference to the only instance of database class + */ + function &getDatabaseConnection() + { + + static $instance; + if (!isset($instance)) { + if (file_exists($file = XOOPS_ROOT_PATH . '/modules/sam/class/database/' . $GLOBALS['samModuleConfig']['db_type'] . 'database.php')) { + require_once $file; + if (!$GLOBALS['samModuleConfig']['db_proxy']) { + $class = 'Sam' . ucfirst($GLOBALS['samModuleConfig']['db_type']) . 'DatabaseSafe'; + } else { + $class = 'Sam' . ucfirst($GLOBALS['samModuleConfig']['db_type']) . 'DatabaseProxy'; + } + $xoopsPreload =& XoopsPreload::getInstance(); + $xoopsPreload->triggerEvent('sam.class.database.databasefactory.connection', array(&$class)); + $instance = new $class(); + $instance->setLogger(XoopsLogger::getInstance()); + $instance->setPrefix($GLOBALS['samModuleConfig']['db_prefix']); + if (!$instance->connect()) { + trigger_error('notrace:Unable to connect to SAM database, please check database settings for the SAM Module in the module preferences!', E_USER_ERROR); + } + } else { + trigger_error('notrace:Failed to load database of type: ' . $GLOBALS['samModuleConfig']['db_type'] . ' in file: ' . __FILE__ . ' at line ' . __LINE__, E_USER_WARNING); + } + } + return $instance; + } + + /** + * Gets a reference to the only instance of database class. Currently + * only being used within the installer. + * + * @static + * @staticvar object The only instance of database class + * @return object Reference to the only instance of database class + */ + function &getDatabase() + { + static $database; + if (!isset($database)) { + if (file_exists($file = XOOPS_ROOT_PATH . '/modules/sam/class/database/' . $GLOBALS['samModuleConfig']['db_type'] . 'database.php')) { + include_once $file; + if (!$GLOBALS['samModuleConfig']['db_proxy']) { + $class = 'Sam' . ucfirst($GLOBALS['samModuleConfig']['db_type']) . 'DatabaseSafe'; + } else { + $class = 'Sam' . ucfirst($GLOBALS['samModuleConfig']['db_type']) . 'DatabaseProxy'; + } + unset($database); + $database = new $class(); + } else { + trigger_error('notrace:Failed to load database of type: ' . $GLOBALS['samModuleConfig']['db_type'] . ' in file: ' . __FILE__ . ' at line ' . __LINE__, E_USER_WARNING); + } + } + return $database; + } +} + +?> \ No newline at end of file Added: XoopsModules/sam/releases/1.02/modules/sam/class/database/index.html =================================================================== --- XoopsModules/sam/releases/1.02/modules/sam/class/database/index.html (rev 0) +++ XoopsModules/sam/releases/1.02/modules/sam/class/database/index.html 2012-02-21 14:30:29 UTC (rev 9040) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/sam/releases/1.02/modules/sam/class/database/mysqldatabase.php =================================================================== --- XoopsModules/sam/releases/1.02/modules/sam/class/database/mysqldatabase.php (rev 0) +++ XoopsModules/sam/releases/1.02/modules/sam/class/database/mysqldatabase.php 2012-02-21 14:30:29 UTC (rev 9040) @@ -0,0 +1,404 @@ +<?php +/** + * MySQL access + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package kernel + * @subpackage database + * @since 1.0.0 + * @author Kazumi Ono <on...@xo...> + * @version $Id: mysqldatabase.php 8066 2011-11-06 05:09:33Z beckmi $ + */ +defined('XOOPS_ROOT_PATH') or die('Restricted access'); + +/** + * + * @package kernel + * @subpackage database + * @author Kazumi Ono <on...@xo...> + * @copyright copyright (c) 2000-2003 XOOPS.org + */ + +/** + * base class + */ +include_once XOOPS_ROOT_PATH . '/modules/sam/class/database/database.php'; +// xoops_load( 'xoopsdatabase' ); +/** + * connection to a mysql database + * + * @abstract + * @author Kazumi Ono <on...@xo...> + * @copyright copyright (c) 2000-2003 XOOPS.org + * @package kernel + * @subpackage database + */ +class SamMySQLDatabase extends SamDatabase +{ + /** + * Database connection + * + * @var resource + */ + var $conn; + + /** + * connect to the database + * + * @param bool $selectdb select the database now? + * @return bool successful? + */ + function connect($selectdb = true) + { + static $db_charset_set; + + if (!extension_loaded('mysql')) { + trigger_error('notrace:mysql extension not loaded', E_USER_ERROR); + return false; + } + + $this->allowWebChanges = ($_SERVER['REQUEST_METHOD'] != 'GET'); + if (XOOPS_DB_PCONNECT == 1) { + $this->conn = @mysql_pconnect($GLOBALS['samModuleConfig']['db_host'], $GLOBALS['samModuleConfig']['db_user'], $GLOBALS['samModuleConfig']['db_pass']); + } else { + $this->conn = @mysql_connect($GLOBALS['samModuleConfig']['db_host'], $GLOBALS['samModuleConfig']['db_user'], $GLOBALS['samModuleConfig']['db_pass']); + } + + if (!$this->conn) { + $this->logger->addQuery('', $this->error(), $this->errno()); + return false; + } + if ($selectdb != false) { + if (!mysql_select_db($GLOBALS['samModuleConfig']['db_name'])) { + $this->logger->addQuery('', $this->error(), $this->errno()); + return false; + } + } + if (!isset($db_charset_set) && defined('XOOPS_DB_CHARSET') && XOOPS_DB_CHARSET) { + $this->queryF("SET NAMES '" . $GLOBALS['samModuleConfig']['db_charset'] . "'"); + } + $db_charset_set = 1; + $this->queryF("SET SQL_BIG_SELECTS = 1"); + return true; + } + + /** + * generate an ID for a new row + * + * This is for compatibility only. Will always return 0, because MySQL supports + * autoincrement for primary keys. + * + * @param string $sequence name of the sequence from which to get the next ID + * @return int always 0, because mysql has support for autoincrement + */ + function genId($sequence) + { + return 0; // will use auto_increment + } + + /** + * Get a result row as an enumerated array + * + * @param resource $result + * @return array + */ + function fetchRow($result) + { + return @mysql_fetch_row($result); + } + + /** + * Fetch a result row as an associative array + * + * @return array + */ + function fetchArray($result) + { + return @mysql_fetch_assoc($result); + } + + /** + * Fetch a result row as an associative array + * + * @return array + */ + function fetchBoth($result) + { + return @mysql_fetch_array($result, MYSQL_BOTH); + } + + /** + * SamMySQLDatabase::fetchObjected() + * + * @param mixed $result + * @return + */ + function fetchObject($result) + { + return @mysql_fetch_object($result); + } + + /** + * Get the ID generated from the previous INSERT operation + * + * @return int + */ + function getInsertId() + { + return mysql_insert_id($this->conn); + } + + /** + * Get number of rows in result + * + * @param resource $ query result + * @return int + */ + function getRowsNum($result) + { + return @mysql_num_rows($result); + } + + /** + * Get number of affected rows + * + * @return int + */ + function getAffectedRows() + { + return mysql_affected_rows($this->conn); + } + + /** + * Close MySQL connection + */ + function close() + { + mysql_close($this->conn); + } + + /** + * will free all memory associated with the result identifier result. + * + * @param resource $ query result + * @return bool TRUE on success or FALSE on failure. + */ + function freeRecordSet($result) + { + return mysql_free_result($result); + } + + /** + * Returns the text of the error message from previous MySQL operation + * + * @return bool Returns the error text from the last MySQL function, or '' (the empty string) if no error occurred. + */ + function error() + { + return @mysql_error(); + } + + /** + * Returns the numerical value of the error message from previous MySQL operation + * + * @return int Returns the error number from the last MySQL function, or 0 (zero) if no error occurred. + */ + function errno() + { + return @mysql_errno(); + } + + /** + * Returns escaped string text with single quotes around it to be safely stored in database + * + * @param string $str unescaped string text + * @return string escaped string text with single quotes around + */ + function quoteString($str) + { + return $this->quote($str); + } + + /** + * Quotes a string for use in a query. + */ + function quote($string) + { + return "'" . str_replace("\\\"", '"', str_replace("\\"", '"', mysql_real_escape_string($string, $this->conn))) . "'"; + } + + /** + * perform a query on the database + * + * @param string $sql a valid MySQL query + * @param int $limit number of records to return + * @param int $start offset of first record to return + * @return resource query result or FALSE if successful + * or TRUE if successful and no result + */ + function queryF($sql, $limit = 0, $start = 0) + { + if (!empty($limit)) { + if (empty($start)) { + $start = 0; + } + $sql = $sql . ' LIMIT ' . (int) $start . ', ' . (int) $limit; + } + $this->logger->startTime('query_time'); + $result = mysql_query($sql, $this->conn); + $this->logger->stopTime('query_time'); + $query_time = $this->logger->dumpTime('query_time', true); + if ($result) { + $this->logger->addQuery($sql, null, null, $query_time); + return $result; + } else { + $this->logger->addQuery($sql, $this->error(), $this->errno(), $query_time); + return false; + } + } + + /** + * perform a query + * + * This method is empty and does nothing! It should therefore only be + * used if nothing is exactly what you want done! ;-) + * + * @param string $sql a valid MySQL query + * @param int $limit number of records to return + * @param int $start offset of first record to return + * @abstract + */ + function query($sql, $limit = 0, $start = 0) + { + } + + /** + * perform queries from SQL dump file in a batch + * + * @param string $file file path to an SQL dump file + * @return bool FALSE if failed reading SQL file or TRUE if the file has been read and queries executed + */ + function queryFromFile($file) + { + if (false !== ($fp = fopen($file, 'r'))) { + include_once XOOPS_ROOT_PATH . '/class/database/sqlutility.php'; + $sql_queries = trim(fread($fp, filesize($file))); + SqlUtility::splitMySqlFile($pieces, $sql_queries); + foreach ($pieces as $query) { + // [0] contains the prefixed query + // [4] contains unprefixed table name + $prefixed_query = SqlUtility::prefixQuery(trim($query), $this->prefix()); + if ($prefixed_query != false) { + $this->query($prefixed_query[0]); + } + } + return true; + } + return false; + } + + /** + * Get field name + * + * @param resource $result query result + * @param int $ numerical field index + * @return string + */ + function getFieldName($result, $offset) + { + return mysql_field_name($result, $offset); + } + + /** + * Get field type + * + * @param resource $result query result + * @param int $offset numerical field index + * @return string + */ +... [truncated message content] |
From: <be...@us...> - 2012-02-21 05:19:08
|
Revision: 9039 http://xoops.svn.sourceforge.net/xoops/?rev=9039&view=rev Author: beckmi Date: 2012-02-21 05:18:58 +0000 (Tue, 21 Feb 2012) Log Message: ----------- Updated jQueryUI to version 1.8.17 Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.5/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.accordion.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.all.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.autocomplete.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.base.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.button.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.core.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.datepicker.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.dialog.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.progressbar.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.resizable.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.selectable.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.slider.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.tabs.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.theme.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/images/ui-icons_2694e8_256x240.png XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/images/ui-icons_3d80b3_256x240.png XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.accordion.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.all.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.autocomplete.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.button.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.core.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.custom.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.datepicker.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.dialog.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.progressbar.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.resizable.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.selectable.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.slider.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.tabs.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.theme.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/images/ui-bg_flat_55_fbec88_40x100.png XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/images/ui-bg_glass_85_dfeffc_1x400.png XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/images/ui-icons_6da8d5_256x240.png XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/images/ui-icons_f9bd01_256x240.png XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.accordion.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.all.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.autocomplete.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.button.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.core.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.custom.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.datepicker.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.dialog.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.progressbar.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.resizable.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.selectable.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.slider.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.tabs.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.theme.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/smoothness/ui.accordion.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/smoothness/ui.all.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/smoothness/ui.autocomplete.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/smoothness/ui.base.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/smoothness/ui.button.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/smoothness/ui.core.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/smoothness/ui.custom.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/smoothness/ui.datepicker.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/smoothness/ui.dialog.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/smoothness/ui.progressbar.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/smoothness/ui.resizable.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/smoothness/ui.selectable.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/smoothness/ui.slider.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/smoothness/ui.tabs.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/smoothness/ui.theme.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/south-street/images/ui-bg_gloss-wave_100_ece8da_500x100.png XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-hard_100_f5f3e5_1x100.png XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-hard_100_fafaf4_1x100.png XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-hard_15_459e00_1x100.png XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/south-street/images/ui-icons_847e71_256x240.png XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/south-street/images/ui-icons_8dc262_256x240.png XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/south-street/ui.accordion.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/south-street/ui.all.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/south-street/ui.autocomplete.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/south-street/ui.button.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/south-street/ui.core.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/south-street/ui.datepicker.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/south-street/ui.dialog.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/south-street/ui.progressbar.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/south-street/ui.resizable.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/south-street/ui.selectable.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/south-street/ui.slider.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/south-street/ui.tabs.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/south-street/ui.theme.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-darkness/ui.accordion.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-darkness/ui.all.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-darkness/ui.autocomplete.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-darkness/ui.button.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-darkness/ui.core.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-darkness/ui.custom.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-darkness/ui.datepicker.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-darkness/ui.dialog.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-darkness/ui.progressbar.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-darkness/ui.resizable.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-darkness/ui.selectable.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-darkness/ui.slider.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-darkness/ui.tabs.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-darkness/ui.theme.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-lightness/images/ui-icons_ef8c08_256x240.png XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-lightness/ui.accordion.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-lightness/ui.all.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-lightness/ui.autocomplete.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-lightness/ui.button.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-lightness/ui.core.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-lightness/ui.custom.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-lightness/ui.datepicker.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-lightness/ui.dialog.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-lightness/ui.progressbar.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-lightness/ui.resizable.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-lightness/ui.selectable.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-lightness/ui.slider.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-lightness/ui.tabs.css XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/ui-lightness/ui.theme.css XoopsCore/branches/2.5.x/2.5.5/htdocs/xoops_lib/Frameworks/jquery/plugins/jquery.ui.js Removed Paths: ------------- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/images/ui-icons_222222_256x240.png XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/images/ui-icons_228ef1_256x240.png XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/images/ui-icons_454545_256x240.png XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/images/ui-icons_888888_256x240.png XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/images/ui-icons_ef8c08_256x240.png XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/images/ui-icons_ffd27a_256x240.png XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/images/ui-icons_ffffff_256x240.png Modified: XoopsCore/branches/2.5.x/2.5.5/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/docs/changelog.250.txt 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/docs/changelog.250.txt 2012-02-21 05:18:58 UTC (rev 9039) @@ -16,21 +16,21 @@ - /class/object.php deprecated message, should be /class/xoopsobject.php (mamba/trabis) - /class/module.php deprecated message, should be /class/xoopsmodule.php (mamba) - /class/user.php deprecated message, should be /class/xoopsuser.php (mamba) - - Fixed bug ID: 3443381 (mage) - - Fixed bug ID: 3201929 (mage) - - Fixed bug ID: 3432275 (mage) - - fixed bug (Incorrect value for setOrder() in modulesadmin/main.php - ID: 3461539) (mage) - - Fixed bug "When deleting client, it doesn't delete finished banners - ID: 3469896" (mage) + - ID: 3443381 Images stored in database not given correctly in edit mode (mage) + - ID: 3201929 Change upper limit for Banner impressions (mamba/mage) + - ID: 3432275 html structure (kris_fr/mage) + - ID: 3461539 Incorrect value for setOrder() in modulesadmin/main.php (mage) + - ID: 3469896 When deleting client, it doesn't delete finished banners (mamba/mage) + - ID: 3442270 Date format and Xoops 2.5.4 (cesag/formuss) - - Improved: - Add key 'uid' on 'groups_users_link' table to allow joining 'users' table with better performance (trabis) - Add Comments, Templates, and Uninstall links to Module's Admin (mamba) Updated: - - updated TinyMCE to 3.4.8 (mamba) - - updated jQuery to 1.71 (mamba) + - TinyMCE to 3.4.8 (mamba) + - jQuery to 1.71 (mamba) + - jQueryUI to version 1.8.17 (mamba) =============================== 2011/11/20: Version 2.5.4 Final Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.accordion.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.accordion.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.accordion.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Accordion 1.8.16 + * jQuery UI Accordion 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.all.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.all.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.all.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI CSS Framework 1.8.16 + * jQuery UI CSS Framework 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -8,4 +8,4 @@ * http://docs.jquery.com/UI/Theming */ @import "ui.base.css"; -@import "ui.theme.css"; +@import "ui.theme.css"; \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.autocomplete.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.autocomplete.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.autocomplete.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Autocomplete 1.8.16 + * jQuery UI Autocomplete 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -13,7 +13,7 @@ * html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ /* - * jQuery UI Menu 1.8.16 + * jQuery UI Menu 1.8.17 * * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.base.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.base.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.base.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,21 +1,11 @@ -/* - * jQuery UI CSS Framework 1.8.16 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Theming - */ @import url("ui.core.css"); - +@import url("ui.resizable.css"); +@import url("ui.selectable.css"); @import url("ui.accordion.css"); @import url("ui.autocomplete.css"); @import url("ui.button.css"); -@import url("ui.datepicker.css"); @import url("ui.dialog.css"); -@import url("ui.progressbar.css"); -@import url("ui.resizable.css"); -@import url("ui.selectable.css"); @import url("ui.slider.css"); @import url("ui.tabs.css"); +@import url("ui.datepicker.css"); +@import url("ui.progressbar.css"); \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.button.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.button.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.button.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Button 1.8.16 + * jQuery UI Button 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.core.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.core.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.core.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI CSS Framework 1.8.16 + * jQuery UI CSS Framework 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -13,12 +13,9 @@ .ui-helper-hidden { display: none; } .ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); } .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } -.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } -.ui-helper-clearfix { display: inline-block; } -/* required comment for clearfix to work in Opera \*/ -* html .ui-helper-clearfix { height:1%; } -.ui-helper-clearfix { display:block; } -/* end clearfix */ +.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; } +.ui-helper-clearfix:after { clear: both; } +.ui-helper-clearfix { zoom: 1; } .ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.datepicker.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.datepicker.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.datepicker.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Datepicker 1.8.16 + * jQuery UI Datepicker 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.dialog.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.dialog.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.dialog.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Dialog 1.8.16 + * jQuery UI Dialog 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.progressbar.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.progressbar.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.progressbar.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Progressbar 1.8.16 + * jQuery UI Progressbar 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -7,5 +7,5 @@ * * http://docs.jquery.com/UI/Progressbar#theming */ -.ui-progressbar { height:2em; text-align: left; } +.ui-progressbar { height:2em; text-align: left; overflow: hidden; } .ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.resizable.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.resizable.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.resizable.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Resizable 1.8.16 + * jQuery UI Resizable 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.selectable.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.selectable.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.selectable.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Selectable 1.8.16 + * jQuery UI Selectable 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.slider.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.slider.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.slider.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Slider 1.8.16 + * jQuery UI Slider 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.tabs.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.tabs.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.tabs.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Tabs 1.8.16 + * jQuery UI Tabs 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.theme.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.theme.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/base/ui.theme.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI CSS Framework 1.8.16 + * jQuery UI CSS Framework 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/images/ui-icons_2694e8_256x240.png =================================================================== (Binary files differ) Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/images/ui-icons_3d80b3_256x240.png =================================================================== (Binary files differ) Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.accordion.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.accordion.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.accordion.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Accordion 1.8.16 + * jQuery UI Accordion 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.all.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.all.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.all.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI CSS Framework 1.8.16 + * jQuery UI CSS Framework 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.autocomplete.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.autocomplete.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.autocomplete.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Autocomplete 1.8.16 + * jQuery UI Autocomplete 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -13,7 +13,7 @@ * html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ /* - * jQuery UI Menu 1.8.16 + * jQuery UI Menu 1.8.17 * * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.button.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.button.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.button.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Button 1.8.16 + * jQuery UI Button 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.core.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.core.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.core.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI CSS Framework 1.8.16 + * jQuery UI CSS Framework 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -13,12 +13,9 @@ .ui-helper-hidden { display: none; } .ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); } .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } -.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } -.ui-helper-clearfix { display: inline-block; } -/* required comment for clearfix to work in Opera \*/ -* html .ui-helper-clearfix { height:1%; } -.ui-helper-clearfix { display:block; } -/* end clearfix */ +.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; } +.ui-helper-clearfix:after { clear: both; } +.ui-helper-clearfix { zoom: 1; } .ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.custom.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.custom.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.custom.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI CSS Framework 1.8.10 + * jQuery UI CSS Framework 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -13,12 +13,9 @@ .ui-helper-hidden { display: none; } .ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); } .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } -.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } -.ui-helper-clearfix { display: inline-block; } -/* required comment for clearfix to work in Opera \*/ -* html .ui-helper-clearfix { height:1%; } -.ui-helper-clearfix { display:block; } -/* end clearfix */ +.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; } +.ui-helper-clearfix:after { clear: both; } +.ui-helper-clearfix { zoom: 1; } .ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } @@ -42,7 +39,7 @@ /* - * jQuery UI CSS Framework 1.8.10 + * jQuery UI CSS Framework 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -280,20 +277,15 @@ ----------------------------------*/ /* Corner radius */ -.ui-corner-tl { -moz-border-radius-topleft: 6px; -webkit-border-top-left-radius: 6px; border-top-left-radius: 6px; } -.ui-corner-tr { -moz-border-radius-topright: 6px; -webkit-border-top-right-radius: 6px; border-top-right-radius: 6px; } -.ui-corner-bl { -moz-border-radius-bottomleft: 6px; -webkit-border-bottom-left-radius: 6px; border-bottom-left-radius: 6px; } -.ui-corner-br { -moz-border-radius-bottomright: 6px; -webkit-border-bottom-right-radius: 6px; border-bottom-right-radius: 6px; } -.ui-corner-top { -moz-border-radius-topleft: 6px; -webkit-border-top-left-radius: 6px; border-top-left-radius: 6px; -moz-border-radius-topright: 6px; -webkit-border-top-right-radius: 6px; border-top-right-radius: 6px; } -.ui-corner-bottom { -moz-border-radius-bottomleft: 6px; -webkit-border-bottom-left-radius: 6px; border-bottom-left-radius: 6px; -moz-border-radius-bottomright: 6px; -webkit-border-bottom-right-radius: 6px; border-bottom-right-radius: 6px; } -.ui-corner-right { -moz-border-radius-topright: 6px; -webkit-border-top-right-radius: 6px; border-top-right-radius: 6px; -moz-border-radius-bottomright: 6px; -webkit-border-bottom-right-radius: 6px; border-bottom-right-radius: 6px; } -.ui-corner-left { -moz-border-radius-topleft: 6px; -webkit-border-top-left-radius: 6px; border-top-left-radius: 6px; -moz-border-radius-bottomleft: 6px; -webkit-border-bottom-left-radius: 6px; border-bottom-left-radius: 6px; } -.ui-corner-all { -moz-border-radius: 6px; -webkit-border-radius: 6px; border-radius: 6px; } +.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 6px; -webkit-border-top-left-radius: 6px; -khtml-border-top-left-radius: 6px; border-top-left-radius: 6px; } +.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 6px; -webkit-border-top-right-radius: 6px; -khtml-border-top-right-radius: 6px; border-top-right-radius: 6px; } +.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 6px; -webkit-border-bottom-left-radius: 6px; -khtml-border-bottom-left-radius: 6px; border-bottom-left-radius: 6px; } +.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 6px; -webkit-border-bottom-right-radius: 6px; -khtml-border-bottom-right-radius: 6px; border-bottom-right-radius: 6px; } /* Overlays */ .ui-widget-overlay { background: #eeeeee url(images/ui-bg_diagonals-thick_90_eeeeee_40x40.png) 50% 50% repeat; opacity: .80;filter:Alpha(Opacity=80); } -.ui-widget-shadow { margin: -7px 0 0 -7px; padding: 7px; background: #000000 url(images/ui-bg_highlight-hard_70_000000_1x100.png) 50% top repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/* - * jQuery UI Resizable 1.8.10 +.ui-widget-shadow { margin: -7px 0 0 -7px; padding: 7px; background: #000000 url(images/ui-bg_highlight-hard_70_000000_1x100.png) 50% top repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/* + * jQuery UI Resizable 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -302,7 +294,7 @@ * http://docs.jquery.com/UI/Resizable#theming */ .ui-resizable { position: relative;} -.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;} +.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; } .ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; } .ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; } .ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; } @@ -312,7 +304,7 @@ .ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; } .ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; } .ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* - * jQuery UI Selectable 1.8.10 + * jQuery UI Selectable 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -322,7 +314,7 @@ */ .ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; } /* - * jQuery UI Accordion 1.8.10 + * jQuery UI Accordion 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -341,7 +333,7 @@ .ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; } .ui-accordion .ui-accordion-content-active { display: block; } /* - * jQuery UI Autocomplete 1.8.10 + * jQuery UI Autocomplete 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -355,7 +347,7 @@ * html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ /* - * jQuery UI Menu 1.8.10 + * jQuery UI Menu 1.8.17 * * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -394,7 +386,7 @@ margin: -1px; } /* - * jQuery UI Button 1.8.10 + * jQuery UI Button 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -432,7 +424,7 @@ /* workarounds */ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */ /* - * jQuery UI Dialog 1.8.10 + * jQuery UI Dialog 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -453,7 +445,7 @@ .ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } .ui-draggable .ui-dialog-titlebar { cursor: move; } /* - * jQuery UI Slider 1.8.10 + * jQuery UI Slider 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -476,7 +468,7 @@ .ui-slider-vertical .ui-slider-range { left: 0; width: 100%; } .ui-slider-vertical .ui-slider-range-min { bottom: 0; } .ui-slider-vertical .ui-slider-range-max { top: 0; }/* - * jQuery UI Tabs 1.8.10 + * jQuery UI Tabs 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -494,7 +486,7 @@ .ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; } .ui-tabs .ui-tabs-hide { display: none !important; } /* - * jQuery UI Datepicker 1.8.10 + * jQuery UI Datepicker 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -534,7 +526,7 @@ .ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; } .ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; } .ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } -.ui-datepicker-row-break { clear:both; width:100%; } +.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; } /* RTL support */ .ui-datepicker-rtl { direction: rtl; } @@ -561,7 +553,7 @@ width: 200px; /*must have*/ height: 200px; /*must have*/ }/* - * jQuery UI Progressbar 1.8.10 + * jQuery UI Progressbar 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -569,5 +561,5 @@ * * http://docs.jquery.com/UI/Progressbar#theming */ -.ui-progressbar { height:2em; text-align: left; } +.ui-progressbar { height:2em; text-align: left; overflow: hidden; } .ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.datepicker.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.datepicker.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.datepicker.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Datepicker 1.8.16 + * jQuery UI Datepicker 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.dialog.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.dialog.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.dialog.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Dialog 1.8.16 + * jQuery UI Dialog 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.progressbar.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.progressbar.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.progressbar.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Progressbar 1.8.16 + * jQuery UI Progressbar 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -7,5 +7,5 @@ * * http://docs.jquery.com/UI/Progressbar#theming */ -.ui-progressbar { height:2em; text-align: left; } +.ui-progressbar { height:2em; text-align: left; overflow: hidden; } .ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.resizable.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.resizable.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.resizable.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Resizable 1.8.16 + * jQuery UI Resizable 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.selectable.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.selectable.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.selectable.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Selectable 1.8.16 + * jQuery UI Selectable 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.slider.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.slider.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.slider.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Slider 1.8.16 + * jQuery UI Slider 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.tabs.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.tabs.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.tabs.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Tabs 1.8.16 + * jQuery UI Tabs 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.theme.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.theme.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/cupertino/ui.theme.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,7 +1,7 @@ /* - * jQuery UI CSS Framework 1.8.16 + * jQuery UI CSS Framework 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -9,7 +9,7 @@ * * http://docs.jquery.com/UI/Theming/API * - * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Lucida%20Grande,%20Lucida%20Sans,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=6px&bgColorHeader=deedf7&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=100&borderColorHeader=aed0ea&fcHeader=222222&iconColorHeader=72a7cf&bgColorContent=f2f5f7&bgTextureContent=04_highlight_hard.png&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=362b36&iconColorContent=72a7cf&bgColorDefault=d7ebf9&bgTextureDefault=02_glass.png&bgImgOpacityDefault=80&borderColorDefault=aed0ea&fcDefault=2779aa&iconColorDefault=3d80b3&bgColorHover=e4f1fb&bgTextureHover=02_glass.png&bgImgOpacityHover=100&borderColorHover=74b2e2&fcHover=0070a3&iconColorHover=2694e8&bgColorActive=3baae3&bgTextureActive=02_glass.png&bgImgOpacityActive=50&borderColorActive=2694e8&fcActive=ffffff&iconColorActive=ffffff&bgColorHighlight=ffef8f&bgTextureHighlight=03_highlight_soft.png&bgImgOpacityHighlight=25&borderColorHighlight=f9dd34&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=cd0a0a&bgTextureError=01_flat.png&bgImgOpacityError=15&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffffff&bgColorOverlay=eeeeee&bgTextureOverlay=08_diagonals_thick.png&bgImgOpacityOverlay=90&opacityOverlay=80&bgColorShadow=000000&bgTextureShadow=04_highlight_hard.png&bgImgOpacityShadow=70&opacityShadow=30&thicknessShadow=7px&offsetTopShadow=-7px&offsetLeftShadow=-7px&cornerRadiusShadow=8px + * To view and modify this theme, visit http://jqueryui.com/themeroller/ */ Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/images/ui-bg_flat_55_fbec88_40x100.png =================================================================== (Binary files differ) Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/images/ui-bg_glass_85_dfeffc_1x400.png =================================================================== (Binary files differ) Deleted: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/images/ui-icons_222222_256x240.png =================================================================== (Binary files differ) Deleted: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/images/ui-icons_228ef1_256x240.png =================================================================== (Binary files differ) Deleted: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/images/ui-icons_454545_256x240.png =================================================================== (Binary files differ) Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/images/ui-icons_6da8d5_256x240.png =================================================================== (Binary files differ) Deleted: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/images/ui-icons_888888_256x240.png =================================================================== (Binary files differ) Deleted: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/images/ui-icons_ef8c08_256x240.png =================================================================== (Binary files differ) Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/images/ui-icons_f9bd01_256x240.png =================================================================== (Binary files differ) Deleted: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/images/ui-icons_ffd27a_256x240.png =================================================================== (Binary files differ) Deleted: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/images/ui-icons_ffffff_256x240.png =================================================================== (Binary files differ) Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.accordion.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.accordion.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.accordion.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Accordion 1.8.16 + * jQuery UI Accordion 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.all.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.all.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.all.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI CSS Framework 1.8.16 + * jQuery UI CSS Framework 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.autocomplete.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.autocomplete.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.autocomplete.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Autocomplete 1.8.16 + * jQuery UI Autocomplete 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -13,7 +13,7 @@ * html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ /* - * jQuery UI Menu 1.8.16 + * jQuery UI Menu 1.8.17 * * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.button.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.button.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.button.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI Button 1.8.16 + * jQuery UI Button 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.core.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.core.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.core.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI CSS Framework 1.8.16 + * jQuery UI CSS Framework 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -13,12 +13,9 @@ .ui-helper-hidden { display: none; } .ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); } .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } -.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } -.ui-helper-clearfix { display: inline-block; } -/* required comment for clearfix to work in Opera \*/ -* html .ui-helper-clearfix { height:1%; } -.ui-helper-clearfix { display:block; } -/* end clearfix */ +.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; } +.ui-helper-clearfix:after { clear: both; } +.ui-helper-clearfix { zoom: 1; } .ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.custom.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.custom.css 2012-02-20 19:34:52 UTC (rev 9038) +++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/css/ui/redmond/ui.custom.css 2012-02-21 05:18:58 UTC (rev 9039) @@ -1,5 +1,5 @@ /* - * jQuery UI CSS Framework 1.8.10 + * jQuery UI CSS Framework 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -13,12 +13,9 @@ .ui-helper-hidden { display: none; } .ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); } .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } -.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } -.ui-helper-clearfix { display: inline-block; } -/* required comment for clearfix to work in Opera \*/ -* html .ui-helper-clearfix { height:1%; } -.ui-helper-clearfix { display:block; } -/* end clearfix */ +.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; } +.ui-helper-clearfix:after { clear: both; } +.ui-helper-clearfix { zoom: 1; } .ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } @@ -42,7 +39,7 @@ /* - * jQuery UI CSS Framework 1.8.10 + * jQuery UI CSS Framework 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -280,20 +277,15 @@ ----------------------------------*/ /* Corner radius */ -.ui-corner-tl { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; border-top-left-radius: 5px; } -.ui-corner-tr { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; border-top-right-radius: 5px; } -.ui-corner-bl { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px; } -.ui-corner-br { -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; } -.ui-corner-top { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; border-top-left-radius: 5px; -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; border-top-right-radius: 5px; } -.ui-corner-bottom { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; } -.ui-corner-right { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; border-top-right-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; } -.ui-corner-left { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; border-top-left-radius: 5px; -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px; } -.ui-corner-all { -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; } +.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; -khtml-border-top-left-radius: 5px; border-top-left-radius: 5px; } +.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; -khtml-border-top-right-radius: 5px; border-top-right-radius: 5px; } +.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; -khtml-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px; } +.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; -khtml-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; } /* Overlays */ .ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); } -.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/* - * jQuery UI Resizable 1.8.10 +.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/* + * jQuery UI Resizable 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -302,7 +294,7 @@ * http://docs.jquery.com/UI/Resizable#theming */ .ui-resizable { position: relative;} -.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;} +.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; } .ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; } .ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; } .ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; } @@ -312,7 +304,7 @@ .ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; } .ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; } .ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* - * jQuery UI Selectable 1.8.10 + * jQuery UI Selectable 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -322,7 +314,7 @@ */ .ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; } /* - * jQuery UI Accordion 1.8.10 + * jQuery UI Accordion 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -341,7 +333,7 @@ .ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; } .ui-accordion .ui-accordion-content-active { display: block; } /* - * jQuery UI Autocomplete 1.8.10 + * jQuery UI Autocomplete 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -355,7 +347,7 @@ * html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ /* - * jQuery UI Menu 1.8.10 + * jQuery UI Menu 1.8.17 * * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -394,7 +386,7 @@ margin: -1px; } /* - * jQuery UI Button 1.8.10 + * jQuery UI Button 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -432,7 +424,7 @@ /* workarounds */ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */ /* - * jQuery UI Dialog 1.8.10 + * jQuery UI Dialog 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -453,7 +445,7 @@ .ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } .ui-draggable .ui-dialog-titlebar { cursor: move; } /* - * jQuery UI Slider 1.8.10 + * jQuery UI Slider 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -476,7 +468,7 @@ .ui-slider-vertical .ui-slider-range { left: 0; width: 100%; } .ui-slider-vertical .ui-slider-range-min { bottom: 0; } .ui-slider-vertical .ui-slider-range-max { top: 0; }/* - * jQuery UI Tabs 1.8.10 + * jQuery UI Tabs 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -494,7 +486,7 @@ .ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; } .ui-tabs .ui-tabs-hide { display: none !important; } /* - * jQuery UI Datepicker 1.8.10 + * jQuery UI Datepicker 1.8.17 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL... [truncated message content] |
From: <dj...@us...> - 2012-02-20 19:35:03
|
Revision: 9038 http://xoops.svn.sourceforge.net/xoops/?rev=9038&view=rev Author: djculex Date: 2012-02-20 19:34:52 +0000 (Mon, 20 Feb 2012) Log Message: ----------- Added Paths: ----------- XoopsModules/smallworld/trunk/smallworld/js/jquery-1.7.1.min.js Added: XoopsModules/smallworld/trunk/smallworld/js/jquery-1.7.1.min.js =================================================================== --- XoopsModules/smallworld/trunk/smallworld/js/jquery-1.7.1.min.js (rev 0) +++ XoopsModules/smallworld/trunk/smallworld/js/jquery-1.7.1.min.js 2012-02-20 19:34:52 UTC (rev 9038) @@ -0,0 +1,4 @@ +/*! jQuery v1.7.1 jquery.com | jquery.org/license */ +(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function cb(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function ca(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bE.test(a)?d(a,e):ca(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)ca(a+"["+e+"]",b[e],c,d);else d(a,b)}function b_(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function b$(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bT,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=b$(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=b$(a,c,d,e,"*",g));return l}function bZ(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bP),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bC(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bx:by,g=0,h=e.length;if(d>0){if(c!=="border")for(;g<h;g++)c||(d-=parseFloat(f.css(a,"padding"+e[g]))||0),c==="margin"?d+=parseFloat(f.css(a,c+e[g]))||0:d-=parseFloat(f.css(a,"border"+e[g]+"Width"))||0;return d+"px"}d=bz(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0;if(c)for(;g<h;g++)d+=parseFloat(f.css(a,"padding"+e[g]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+e[g]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+e[g]))||0);return d+"px"}function bp(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c+(i[c][d].namespace?".":"")+i[c][d].namespace,i[c][d],i[c][d].data)}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?m(g):h==="function"&&(!a.unique||!o.has(g))&&c.push(g)},n=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,l=j||0,j=0,k=c.length;for(;c&&l<k;l++)if(c[l].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}i=!1,c&&(a.once?e===!0?o.disable():c=[]:d&&d.length&&(e=d.shift(),o.fireWith(e[0],e[1])))},o={add:function(){if(c){var a=c.length;m(arguments),i?k=c.length:e&&e!==!0&&(j=a,n(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){i&&f<=k&&(k--,f<=l&&l--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&o.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(i?a.once||d.push([b,c]):(!a.once||!e)&&n(b,c));return this},fire:function(){o.fireWith(this,arguments);return this},fired:function(){return!!e}};return o};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p,q=c.createElement("div"),r=c.documentElement;q.setAttribute("className","t"),q.innerHTML=" <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="<div "+n+"><div></div></div>"+"<table "+n+" cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="<div style='width:4px;'></div>",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h=null;if(typeof a=="undefined"){if(this.length){h=f.data(this[0]);if(this[0].nodeType===1&&!f._data(this[0],"parsedAttrs")){e=this[0].attributes;for(var i=0,j=e.length;i<j;i++)g=e[i].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),l(this[0],g,h[g]));f._data(this[0],"parsedAttrs",!0)}}return h}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split("."),d[1]=d[1]?"."+d[1]:"";if(c===b){h=this.triggerHandler("getData"+d[1]+"!",[d[0]]),h===b&&this.length&&(h=f.data(this[0],a),h=l(this[0],a,h));return h===b&&d[1]?this.data(d[0]):h}return this.each(function(){var b=f(this),e=[d[0],c];b.triggerHandler("setData"+d[1]+"!",e),f.data(this,a,c),b.triggerHandler("changeData"+d[1]+"!",e)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise()}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h<g;h++)e=d[h],e&&(c=f.propFix[e]||e,f.attr(a,e,""),a.removeAttribute(v?e:c),u.test(e)&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")}; +f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=[],j,k,l,m,n,o,p,q,r,s,t;g[0]=c,c.delegateTarget=this;if(e&&!c.target.disabled&&(!c.button||c.type!=="click")){m=f(this),m.context=this.ownerDocument||this;for(l=c.target;l!=this;l=l.parentNode||this){o={},q=[],m[0]=l;for(j=0;j<e;j++)r=d[j],s=r.selector,o[s]===b&&(o[s]=r.quick?H(l,r.quick):m.is(s)),o[s]&&q.push(r);q.length&&i.push({elem:l,matches:q})}}d.length>e&&i.push({elem:this,matches:d.slice(e)});for(j=0;j<i.length&&!c.isPropagationStopped();j++){p=i[j],c.currentTarget=p.elem;for(k=0;k<p.matches.length&&!c.isImmediatePropagationStopped();k++){r=p.matches[k];if(h||!c.namespace&&!r.namespace||c.namespace_re&&c.namespace_re.test(r.namespace))c.data=r.data,c.handleObj=r,n=((f.event.special[r.origType]||{}).handle||r.handler).apply(p.elem,g),n!==b&&(c.result=n,n===!1&&(c.preventDefault(),c.stopPropagation()))}}return c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0)}),d._submit_attached=!0)})},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on.call(this,a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.type+"."+e.namespace:e.type,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.POS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0... [truncated message content] |
From: <dj...@us...> - 2012-02-20 18:28:06
|
Revision: 9037 http://xoops.svn.sourceforge.net/xoops/?rev=9037&view=rev Author: djculex Date: 2012-02-20 18:27:56 +0000 (Mon, 20 Feb 2012) Log Message: ----------- - Bugfix: changed selector name .finish to .smallworld_finish - Bugfix: Changed multible return false; to e.preventDefault(); - Changed: claning up code etc Modified Paths: -------------- XoopsModules/smallworld/trunk/smallworld/class/mail.php XoopsModules/smallworld/trunk/smallworld/css/smallworld.css XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt XoopsModules/smallworld/trunk/smallworld/img_upload.php XoopsModules/smallworld/trunk/smallworld/js/ajaxupload.3.5.js XoopsModules/smallworld/trunk/smallworld/js/jquery.stepy.js XoopsModules/smallworld/trunk/smallworld/js/smallworld.js XoopsModules/smallworld/trunk/smallworld/js/wall.js XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_edittemplate.html XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_regtemplate.html Modified: XoopsModules/smallworld/trunk/smallworld/class/mail.php =================================================================== --- XoopsModules/smallworld/trunk/smallworld/class/mail.php 2012-02-20 15:00:38 UTC (rev 9036) +++ XoopsModules/smallworld/trunk/smallworld/class/mail.php 2012-02-20 18:27:56 UTC (rev 9037) @@ -35,7 +35,7 @@ */ function sendMails ($fromUserID, $toUserID, $event, $link=null, array $data) { - global $xoopsConfig, $xoopsUser; + global $xoopsConfig, $xoopsUser; $date = date('m-d-Y H:i:s',time()); $mail = new XoopsMultiMailer; $wall = new Wall_Updates; Modified: XoopsModules/smallworld/trunk/smallworld/css/smallworld.css =================================================================== --- XoopsModules/smallworld/trunk/smallworld/css/smallworld.css 2012-02-20 15:00:38 UTC (rev 9036) +++ XoopsModules/smallworld/trunk/smallworld/css/smallworld.css 2012-02-20 18:27:56 UTC (rev 9037) @@ -348,16 +348,16 @@ } a.button-back { float: left; } -a.button-next, .finish { float: right; } +a.button-next, .smallworld_finish { float: right; } -input.finish { border-style: none; cursor: pointer; padding: 3px 9px; } +input.smallworld_finish { border-style: none; cursor: pointer; padding: 3px 9px; } -a.button-back, a.button-next, .finish { +a.button-back, a.button-next, .smallworld_finish { background-color: #AAA; color: #FFF; padding: 5px 10px; text-decoration: none; border-radius: 4px; -khtml-border-radius: 4px; -moz-border-radius: 4px; -opera-border-radius: 4px; -webkit-border-radius: 4px; } -a.button-back:hover, a.button-next:hover, .finish:hover { background-color: #69C; } +a.button-back:hover, a.button-next:hover, .smallworld_finish:hover { background-color: #69C; } fieldset.step { border: 1px solid #DDD; Modified: XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt =================================================================== --- XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt 2012-02-20 15:00:38 UTC (rev 9036) +++ XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt 2012-02-20 18:27:56 UTC (rev 9037) @@ -53,6 +53,14 @@ - Bugfix: moved ui-anim_basic_16x16.gif to ..images/ - Change: Changed update text when upload new images to use image and default uploaded new text (djculex) +20. February +- NEW: Finished automated message when upload images (showing link, random image from array) (djculex) +- Bugfix: Discovered jquery was 1.5.1 -> Updated to 1.7.1 +- Bugfix: Jquery 1.7.1 revealed bugs in show more/less on updates (djculex) +- Bugfix: changed selector name .finish to .smallworld_finish +- Bugfix: Changed multible return false; to e.preventDefault(); +- Changed: css, jquery for new addions +- Changed: claning up code etc ------------------------------ Changelog v.1.10 RC Modified: XoopsModules/smallworld/trunk/smallworld/img_upload.php =================================================================== --- XoopsModules/smallworld/trunk/smallworld/img_upload.php 2012-02-20 15:00:38 UTC (rev 9036) +++ XoopsModules/smallworld/trunk/smallworld/img_upload.php 2012-02-20 18:27:56 UTC (rev 9037) @@ -26,15 +26,14 @@ include_once(XOOPS_ROOT_PATH."/modules/smallworld/class/class_collector.php"); if ($xoopsUser) { - global $xoTheme; - - $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload-uix.js'); - $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload-ui.js'); - $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload.js'); - $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/upload_application.js'); - $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/jquery.fileupload-ui.css'); - $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.colorbox.js'); - $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/colorbox.css'); + global $xoTheme; + $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload-uix.js'); + $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload-ui.js'); + $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload.js'); + $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/upload_application.js'); + $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/jquery.fileupload-ui.css'); + $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.colorbox.js'); + $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/colorbox.css'); $id = $xoopsUser->getVar('uid'); $check = new SmallWorldUser; $profile = $check->CheckIfProfile($id); Modified: XoopsModules/smallworld/trunk/smallworld/js/ajaxupload.3.5.js =================================================================== --- XoopsModules/smallworld/trunk/smallworld/js/ajaxupload.3.5.js 2012-02-20 15:00:38 UTC (rev 9036) +++ XoopsModules/smallworld/trunk/smallworld/js/ajaxupload.3.5.js 2012-02-20 18:27:56 UTC (rev 9037) @@ -324,7 +324,8 @@ setTimeout(function(){ // we will wait 3 seconds for dialog to open self.justClicked = false; - }, 3000); + }, 3000); + return false; }); this._input = input; Modified: XoopsModules/smallworld/trunk/smallworld/js/jquery.stepy.js =================================================================== --- XoopsModules/smallworld/trunk/smallworld/js/jquery.stepy.js 2012-02-20 15:00:38 UTC (rev 9036) +++ XoopsModules/smallworld/trunk/smallworld/js/jquery.stepy.js 2012-02-20 18:27:56 UTC (rev 9037) @@ -131,7 +131,7 @@ }); var xoops_smallworldtitles = xoops_smallworldtitlesWrapper.children(), - finish = xoops_smallworldthis.children('.finish'); + finish = xoops_smallworldthis.children('.smallworld_finish'); xoops_smallworldtitles.first().addClass('current-step'); @@ -219,7 +219,7 @@ if (next.length) { next.click(); } else { - var finish = buttons.children('input.finish'); + var finish = buttons.children('input.smallworld_finish'); if (finish.length) { finish.click(); Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js =================================================================== --- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-02-20 15:00:38 UTC (rev 9036) +++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-02-20 18:27:56 UTC (rev 9037) @@ -12,7 +12,7 @@ * author 2011 Culex - homepage.: http://culex.dk & email.: cu...@cu... */ xoops_smallworld(function() { - //Attach function for avatar + //Attach function for avatar attachAvatarOpen (); // Get page url and page title (index.php) @@ -20,149 +20,149 @@ var smallworld_PageName = smallworld_pageUrl.substring(smallworld_pageUrl.lastIndexOf('/') + 1); // GET pop for statistics - xoops_smallworld('#smallworld_statistics_lnk').live('click',function() { - if (xoops_smallworld('#smallworld_statistics_lnk').length) { // implies *not* zero - xoops_smallworld('#smallworldStatsDiv').show(); - xoops_smallworld("#smallworldStatsDiv").load('stats.php'); - xoops_smallworld.fn.colorbox({ - width:"75%", - height:"18%", - inline:true, - onCleanup:function() { - xoops_smallworld('#smallworldStatsDiv').hide(); - }, - onClosed:function() { - xoops_smallworld('#smallworldStatsDiv').hide(); - }, - href:"#smallworldStatsDiv" - }); - }; - }); + xoops_smallworld('#smallworld_statistics_lnk').live('click',function(e) { + e.preventDefault(); + if (xoops_smallworld('#smallworld_statistics_lnk').length) { // implies *not* zero + xoops_smallworld('#smallworldStatsDiv').show(); + xoops_smallworld("#smallworldStatsDiv").load('stats.php'); + xoops_smallworld.fn.colorbox({ + width:"75%", + height:"18%", + inline:true, + onCleanup:function() { + xoops_smallworld('#smallworldStatsDiv').hide(); + }, + onClosed:function() { + xoops_smallworld('#smallworldStatsDiv').hide(); + }, + href:"#smallworldStatsDiv" + }); + }; + }); - // Attach colorbox.js to selector in register.php and edit_profile.php - // If other page / no presence of #smallworld_regform1 then exit function and continue - xoops_smallworld(document).ready(function(){ - if (xoops_smallworld('#smallworld_regform1').length) { // implies *not* zero - xoops_smallworld('#smallworld_regform1').show(); - xoops_smallworld.fn.colorbox({ - innerWidth:"75%", - height:"70%", - inline:true, - onComplete: function() { - smallworld_DoValStart (); - }, - onCleanup:function() { - xoops_smallworld('#smallworld_regform1').hide(); - }, - onClosed:function() { - location.href = 'index.php'; - }, - href:"#smallworld_regform1" - }); - }; - }); + // Attach colorbox.js to selector in register.php and edit_profile.php + // If other page / no presence of #smallworld_regform1 then exit function and continue + xoops_smallworld(document).ready(function(){ + if (xoops_smallworld('#smallworld_regform1').length) { // implies *not* zero + xoops_smallworld('#smallworld_regform1').show(); + xoops_smallworld.fn.colorbox({ + innerWidth:"75%", + height:"70%", + inline:true, + onComplete: function() { + smallworld_DoValStart (); + }, + onCleanup:function() { + xoops_smallworld('#smallworld_regform1').hide(); + }, + onClosed:function() { + location.href = 'index.php'; + }, + href:"#smallworld_regform1" + }); + }; + }); - // Function to make friend invitations form into ui dialog - xoops_smallworld(function() { + // Function to make friend invitations form into ui dialog + xoops_smallworld(function() { xoops_smallworld('#friendInvitations_box').css('display','none'); - if (hasmessages > 0) { - if (xoops_smallworld('#friendInvitations_box').length) { // implies *not* zero - xoops_smallworld('#friendInvitations_box').show(); - xoops_smallworld.fn.colorbox({ - width:"50%", - inline:true, - onCleanup:function() { - xoops_smallworld('#friendInvitations_box').hide(); - xoops_smallworld('#friendInvitations_box').css('display','none'); - }, - href:"#friendInvitations_box" - }); - }; - xoops_smallworld('#smallworldrequestlink').live('click',function() { - //xoops_smallworld('#friendInvitations_box').dialog( "close" ); + if (hasmessages > 0) { + if (xoops_smallworld('#friendInvitations_box').length) { // implies *not* zero + xoops_smallworld('#friendInvitations_box').show(); + xoops_smallworld.fn.colorbox({ + width:"50%", + inline:true, + onCleanup:function() { + xoops_smallworld('#friendInvitations_box').hide(); + xoops_smallworld('#friendInvitations_box').css('display','none'); + }, + href:"#friendInvitations_box" + }); + }; + xoops_smallworld('#smallworldrequestlink').live('click',function() { xoops_smallworld('#friendInvitations_box').css('display','none'); - xoops_smallworld.colorbox.close(); - }); - } - }); + xoops_smallworld.colorbox.close(); + }); + } + }); // Function to make Edit image descriptions form into ui dialog - xoops_smallworld(document).ready(function(){ - if (xoops_smallworld('#smallworld_edit_imageform').length) { // implies *not* zero - xoops_smallworld('#smallworld_edit_imageform').show(); - xoops_smallworld.fn.colorbox({ - width:"800", - height:"70%", - inline:true, - onCleanup:function() { - xoops_smallworld('#smallworld_edit_imageform').hide(); - }, - onClosed:function() { - location.href = 'index.php'; - }, - href:"#smallworld_edit_imageform" - }); - }; - }); + xoops_smallworld(document).ready(function(){ + if (xoops_smallworld('#smallworld_edit_imageform').length) { // implies *not* zero + xoops_smallworld('#smallworld_edit_imageform').show(); + xoops_smallworld.fn.colorbox({ + width:"800", + height:"70%", + inline:true, + onCleanup:function() { + xoops_smallworld('#smallworld_edit_imageform').hide(); + }, + onClosed:function() { + location.href = 'index.php'; + }, + href:"#smallworld_edit_imageform" + }); + }; + }); - // Function to make File upload form into ui dialog - xoops_smallworld(document).ready(function(){ - if (xoops_smallworld('#file_upload').length) { // implies *not* zero - xoops_smallworld('#file_upload').show(); - xoops_smallworld.fn.colorbox({ - width:"auto", - height:"70%", - inline:true, - onCleanup:function() { - xoops_smallworld('#file_upload').hide(); - }, - onClosed:function() { - location.href = 'editimages.php'; - }, - href:"#file_upload", - onComplete : function() { - xoops_smallworld(this).colorbox.resize(); - } - }); - }; - }); + // Function to make File upload form into ui dialog + xoops_smallworld(document).ready(function(){ + if (xoops_smallworld('#file_upload').length) { // implies *not* zero + xoops_smallworld('#file_upload').show(); + xoops_smallworld.fn.colorbox({ + width:"auto", + height:"70%", + inline:true, + onCleanup:function() { + xoops_smallworld('#file_upload').hide(); + }, + onClosed:function() { + location.href = 'editimages.php'; + }, + href:"#file_upload", + onComplete : function() { + xoops_smallworld(this).colorbox.resize(); + } + }); + }; + }); - // Function to make Div with id page into ui dialog - xoops_smallworld(document).ready(function(){ - if (xoops_smallworld('div#page').length) { // implies *not* zero - xoops_smallworld('div#page').show(); - xoops_smallworld.fn.colorbox({ - innerWidth:"1000px", - inline:true, - onCleanup:function() { - xoops_smallworld('div#page').hide(); - }, - onClosed:function() { - location.href = 'index.php'; - }, - href:"div#page" - }); - }; - }); + // Function to make Div with id page into ui dialog + xoops_smallworld(document).ready(function(){ + if (xoops_smallworld('div#page').length) { // implies *not* zero + xoops_smallworld('div#page').show(); + xoops_smallworld.fn.colorbox({ + innerWidth:"1000px", + inline:true, + onCleanup:function() { + xoops_smallworld('div#page').hide(); + }, + onClosed:function() { + location.href = 'index.php'; + }, + href:"div#page" + }); + }; + }); - // If user does not have a profile in smallworld then goto register. - // If user has already a profile then goto edit profile dialog - if (userHasProfile === 0) { - var buttons = {}; - buttons[_smallworldContinueToReg] = function() { - location.href = smallworld_url+'register.php'; - } - buttons[_smallworldCancel] = function() { - xoops_smallworld( this ).dialog( "close" ); - } - xoops_smallworld('#smallworld_notyetregistered').dialog({ - minWidth: 500, - show: "blind", - hide: "explode", - width: "550px", - buttons: buttons - }); - } + // If user does not have a profile in smallworld then goto register. + // If user has already a profile then goto edit profile dialog + if (userHasProfile === 0) { + var buttons = {}; + buttons[_smallworldContinueToReg] = function() { + location.href = smallworld_url+'register.php'; + } + buttons[_smallworldCancel] = function() { + xoops_smallworld( this ).dialog( "close" ); + } + xoops_smallworld('#smallworld_notyetregistered').dialog({ + minWidth: 500, + show: "blind", + hide: "explode", + width: "550px", + buttons: buttons + }); + } // Attach jquery-ui datepicker to form. xoops_smallworld("#birthday" ).datepicker({ @@ -198,23 +198,23 @@ // formToWizzard.js xoops_smallworld(function() { xoops_smallworld('#smallworld_profileform').stepy({ - backLabel: SmallworldValidationBackButton, - block: true, - errorImage: true, - nextLabel: SmallworldValidationForwardButton, - legend: true, - description: true, - titleClick: false + backLabel: SmallworldValidationBackButton, + block: true, + errorImage: true, + nextLabel: SmallworldValidationForwardButton, + legend: true, + description: true, + titleClick: false }); }); - // Attach geolocate autocomplete to forms - if (geoL === 1) { - xoops_smallworld('#birthplace').geo_autocomplete(); - xoops_smallworld('#present_city').geo_autocomplete_now(); - } else { - // do something or not - } + // Attach geolocate autocomplete to forms + if (geoL === 1) { + xoops_smallworld('#birthplace').geo_autocomplete(); + xoops_smallworld('#present_city').geo_autocomplete_now(); + } else { + // do something or not + } // Make Textareas elastic xoops_smallworld(function() { @@ -223,7 +223,8 @@ xoops_smallworld('#smallworld_update').css('max-width', xoops_smallworld('#smallworld_wall_container').outerWidth() - 30 + 'px'); }); - // Toggle the form 'partner' if choosen status is married, in relationship, complicated + + // Toggle the form 'partner' if choosen status is married, in relationship, complicated xoops_smallworld(function() { if (xoops_smallworld("#relationship").val == '2') { xoops_smallworld('#partner').fadeOut('slow'); @@ -231,7 +232,7 @@ } xoops_smallworld("#relationship").live('change',function() { var val = xoops_smallworld(this).val(); - if(val != '2') { + if (val != '2') { xoops_smallworld('#partner').fadeIn('slow'); xoops_smallworld('.partner').show(); } else { @@ -244,24 +245,25 @@ // Search for partner in smallworld users or accept username xoops_smallworld(function() { xoops_smallworld("#partner").autocomplete({ - source: smallworld_url+ 'partnersearch.php', - minLength:1, - open: function(event, ui){ - xoops_smallworld("ul.ui-autocomplete li a").each(function(){ - var htmlString = xoops_smallworld(this).html().replace(/</g, '<'); - htmlString = htmlString.replace(/>/g, '>'); - xoops_smallworld(this).html(htmlString); - xoops_smallworld('.ui-autocomplete.ui-menu').width(200); - }); - } + source: smallworld_url+ 'partnersearch.php', + minLength:1, + open: function(event, ui){ + xoops_smallworld("ul.ui-autocomplete li a").each(function(){ + var htmlString = xoops_smallworld(this).html().replace(/</g, '<'); + htmlString = htmlString.replace(/>/g, '>'); + xoops_smallworld(this).html(htmlString); + xoops_smallworld('.ui-autocomplete.ui-menu').width(200); + }); + } }); }); // Keep the searchform empty when clicked xoops_smallworld("input#smallworld_searchform").click(function(event) { - // Erase text from inside textarea + event.preventDefault(); + // Erase text from inside textarea xoops_smallworld(this).val(""); - // Disable text erase + // Disable text erase xoops_smallworld(this).unbind(event); }); @@ -269,49 +271,49 @@ xoops_smallworld(function() { xoops_smallworld("#smallworld_searchform").focus().select(); xoops_smallworld("#smallworld_searchform").autocomplete({ - source: smallworld_url+ 'search.php', - minLength:1, - open: function(event, ui){ - xoops_smallworld("ul.ui-autocomplete li a").each(function(){ - var htmlString = xoops_smallworld(this).html().replace(/</g, '<'); - htmlString = htmlString.replace(/>/g, '>'); - xoops_smallworld(this).html(htmlString); - xoops_smallworld('.ui-autocomplete.ui-menu').width(275); - }); - }, - select: function(event,ui){ - location.href= smallworld_url+'userprofile.php?username='+ui.item.value; - } + source: smallworld_url+ 'search.php', + minLength:1, + open: function(event, ui){ + xoops_smallworld("ul.ui-autocomplete li a").each(function(){ + var htmlString = xoops_smallworld(this).html().replace(/</g, '<'); + htmlString = htmlString.replace(/>/g, '>'); + xoops_smallworld(this).html(htmlString); + xoops_smallworld('.ui-autocomplete.ui-menu').width(275); + }); + }, + select: function(event,ui){ + location.href= smallworld_url+'userprofile.php?username='+ui.item.value; + } }); }); // Function to reset gender, relationshipstatus,politics an religion select:Selected in forms after send and in pagerefresh xoops_smallworld(function() { - if (smallworld_PageName == 'register.php' || smallworld_PageName == 'editprofile.php') { - var sw_data; - xoops_smallworld.ajax({ - url: smallworld_url+"include/getSelects.php?"+ Math.random(), - cache: false, - dataType: "json", - success: function(sw_data) { - xoops_smallworld("select[name=gender] option[value="+sw_data.gender+"]").attr("selected", true); - xoops_smallworld("select[name=relationship] option[value="+sw_data.relat+"]").attr("selected", true); - if (sw_data.relat == 2) { - xoops_smallworld("#partner").hide(); - xoops_smallworld("p.partner").hide(); + if (smallworld_PageName == 'register.php' || smallworld_PageName == 'editprofile.php') { + var sw_data; + xoops_smallworld.ajax({ + url: smallworld_url+"include/getSelects.php?"+ Math.random(), + cache: false, + dataType: "json", + success: function(sw_data) { + xoops_smallworld("select[name=gender] option[value="+sw_data.gender+"]").attr("selected", true); + xoops_smallworld("select[name=relationship] option[value="+sw_data.relat+"]").attr("selected", true); + if (sw_data.relat == 2) { + xoops_smallworld("#partner").hide(); + xoops_smallworld("p.partner").hide(); + } + if (sw_data.relat != 2) { + xoops_smallworld("#partner").show(); + xoops_smallworld("p.partner").show(); + } + xoops_smallworld("select[name=politic] option[value="+sw_data.politic+"]").attr("selected", true); + xoops_smallworld("select[name=religion] option[value="+sw_data.religion+"]").attr("selected", true); + }, + error: function(xhr, status, thrown) { + alert(xhr+" "+status+" "+thrown); } - if (sw_data.relat != 2) { - xoops_smallworld("#partner").show(); - xoops_smallworld("p.partner").show(); - } - xoops_smallworld("select[name=politic] option[value="+sw_data.politic+"]").attr("selected", true); - xoops_smallworld("select[name=religion] option[value="+sw_data.religion+"]").attr("selected", true); - }, - error: function(xhr, status, thrown) { - alert(xhr+" "+status+" "+thrown); - } - }); - } + }); + } }); @@ -320,51 +322,60 @@ xoops_smallworld("input[name=updatePublic] option[value='private']").attr('checked', false); }); - // Functions to add fields in screenname, email, education and jobs - xoops_smallworld('#emailAdd').live('click',function(){ - var num = xoops_smallworld('input[name="emailtype[]"]').length - 1; // how many "duplicatable" input fields we currently have - var newNum = (num + 1); // the numeric ID of the new input field being added + + // Functions to add fields in screenname, email, education and jobs + xoops_smallworld('#emailAdd').live('click',function(e){ + e.preventDefault(); + // how many "duplicatable" input fields we currently have + var num = xoops_smallworld('input[name="emailtype[]"]').length - 1; + + // the numeric ID of the new input field being added + var newNum = (num + 1); xoops_smallworld('span#email:last').clone(true).insertBefore(this).find('input').val('').attr('id','email-'+newNum); - //xoops_smallworld('span#email:last').clone(true).insertBefore(this).find('input').val(''); - xoops_smallworld('span#emailremove:last').clone(true).insertBefore(this); + xoops_smallworld('span#emailremove:last').clone(true).insertBefore(this); }); /* Screen names for facebook etc */ - xoops_smallworld('#screennameAdd').live('click',function(){ - xoops_smallworld('span#screenname:last').clone(true).insertBefore(this).find('input').val(''); - xoops_smallworld('span#screennameremove:last').clone(true).insertBefore(this); + xoops_smallworld('#screennameAdd').live('click',function(e){ + e.preventDefault(); + xoops_smallworld('span#screenname:last').clone(true).insertBefore(this).find('input').val(''); + xoops_smallworld('span#screennameremove:last').clone(true).insertBefore(this); }); /* School */ - xoops_smallworld('#schoolAdd').live('click',function(){ - xoops_smallworld('div#school:last').clone(true).insertBefore(this).find('input').val(''); - xoops_smallworld('span#schoolremove:last').clone(true).insertBefore(this); + xoops_smallworld('#schoolAdd').live('click',function(e){ + e.preventDefault(); + xoops_smallworld('div#school:last').clone(true).insertBefore(this).find('input').val(''); + xoops_smallworld('span#schoolremove:last').clone(true).insertBefore(this); }); /* Jobs - also remove datepicker from :last and apply on NEW :last */ - xoops_smallworld('#jobAdd').live('click',function(){ - xoops_smallworld('div#job:last').clone(true).insertBefore(this).find('input').val(''); - xoops_smallworld('span#jobremove:last').clone(true).insertBefore(this); - xoops_smallworld('.jobstart').removeClass("hasDatepicker").attr('id',"").datepicker(); - xoops_smallworld('.jobstop').removeClass("hasDatepicker").attr('id',"").datepicker(); + xoops_smallworld('#jobAdd').live('click',function(e){ + e.preventDefault(); + xoops_smallworld('div#job:last').clone(true).insertBefore(this).find('input').val(''); + xoops_smallworld('span#jobremove:last').clone(true).insertBefore(this); + xoops_smallworld('.jobstart').removeClass("hasDatepicker").attr('id',"").datepicker(); + xoops_smallworld('.jobstop').removeClass("hasDatepicker").attr('id',"").datepicker(); }); // Registerform saveprofile - xoops_smallworld(".finish").click(function() { + xoops_smallworld(".smallworld_finish").click(function(e) { + e.preventDefault(); var dataString = xoops_smallworld("#smallworld_profileform").serialize(); - if(dataString == '') { + if (dataString == '') { } else { xoops_smallworld.ajax({ type: "POST", + dataType: 'json', + cache: false, url: smallworld_url+"submit.php", data: dataString, success: function(){ - location.href = smallworld_url+'index.php'; + //location.href = smallworld_url+'index.php'; } }); } - return false; }); // Description for images save @@ -417,8 +428,9 @@ }); // Attach on clik open education & work (..more) dialogues - xoops_smallworld('#_smallworld_workmore').live('click',function(){ - if (xoops_smallworld('#workfull').length) { // implies *not* zero + xoops_smallworld('#_smallworld_workmore').live('click',function(event){ + event.preventDefault(); + if (xoops_smallworld('#workfull').length) { // implies *not* zero xoops_smallworld('#workfull').show(); xoops_smallworld.fn.colorbox({ width:"450", @@ -431,12 +443,13 @@ }, href:"#workfull" }); - }; + }; }); // Show educations in dialog when clicked on more - xoops_smallworld('#_smallworld_educationmore').live('click',function(){ - if (xoops_smallworld('#educationfull').length) { // implies *not* zero + xoops_smallworld('#_smallworld_educationmore').live('click',function(event){ + event.preventDefault(); + if (xoops_smallworld('#educationfull').length) { // implies *not* zero xoops_smallworld('#educationfull').show(); xoops_smallworld.fn.colorbox({ width:"450", @@ -449,12 +462,13 @@ }, href:"#educationfull" }); - }; + }; }); // Show more info in dialog - xoops_smallworld('#_SMALLWORLD_MOREINFO').live('click',function(){ - if (xoops_smallworld('#interestsandmore').length) { // implies *not* zero + xoops_smallworld('#_SMALLWORLD_MOREINFO').live('click',function(event){ + event.preventDefault(); + if (xoops_smallworld('#interestsandmore').length) { // implies *not* zero xoops_smallworld('#interestsandmore').show(); xoops_smallworld.fn.colorbox({ width:"600", @@ -467,37 +481,39 @@ }, href:"#interestsandmore" }); - }; + }; }); //Function to show images in birthplace input - xoops_smallworld('#_smallworld_birthplace_maplink').live('click',function(){ - if (xoops_smallworld('#_smallworld_birthplace_map').length) { // implies *not* zero - xoops_smallworld('#_smallworld_birthplace_map').show(); - xoops_smallworld.fn.colorbox({ - innerWidth:"550px", - innerHeight:"550px", - inline:true, - onCleanup:function() { - xoops_smallworld('#_smallworld_birthplace_map').hide(); - }, - onComplete:function() { - initialize_birthplace(smallworld_birthlng,smallworld_birthlatt); - xoops_smallworld('#_smallworld_birthplace_map').show(); - }, - title: function() { - var title = xoops_smallworld("#_smallworld_birthplace_map").attr( 'title' ); - return title != 'undefined' ? title : false; - }, - href:"#_smallworld_birthplace_map", - }); + xoops_smallworld('#_smallworld_birthplace_maplink').live('click',function(event){ + event.preventDefault(); + if (xoops_smallworld('#_smallworld_birthplace_map').length) { // implies *not* zero + xoops_smallworld('#_smallworld_birthplace_map').show(); + xoops_smallworld.fn.colorbox({ + innerWidth:"550px", + innerHeight:"550px", + inline:true, + onCleanup:function() { + xoops_smallworld('#_smallworld_birthplace_map').hide(); + }, + onComplete:function() { + initialize_birthplace(smallworld_birthlng,smallworld_birthlatt); + xoops_smallworld('#_smallworld_birthplace_map').show(); + }, + title: function() { + var title = xoops_smallworld("#_smallworld_birthplace_map").attr( 'title' ); + return title != 'undefined' ? title : false; + }, + href:"#_smallworld_birthplace_map", + }); - }; + }; }); //Function to show images in present location input - xoops_smallworld('#_smallworld_present_maplink').live('click',function(){ - if (xoops_smallworld('#_smallworld_present_map').length) { // implies *not* zero + xoops_smallworld('#_smallworld_present_maplink').live('click',function(event){ + event.preventDefault(); + if (xoops_smallworld('#_smallworld_present_map').length) { // implies *not* zero xoops_smallworld('#_smallworld_present_map').show(); xoops_smallworld.fn.colorbox({ innerWidth:"550px", @@ -516,9 +532,8 @@ }, href:"#_smallworld_present_map" }); - }; - - }); + }; + }); // Function to rewrite urls used in xoops core for directing to profile.php @@ -536,20 +551,21 @@ }); } - xoops_smallworld('#smallworld_stats_scroller').innerfade({ - animationtype: 'fade', - speed: 1200, - timeout: 10000, - type: 'sequence', - containerheight: '50px' - }); + xoops_smallworld('#smallworld_stats_scroller').innerfade({ + animationtype: 'fade', + speed: 1200, + timeout: 10000, + type: 'sequence', + containerheight: '50px' + }); // Return jSon with count of friends smallworld_getCountFriendMessagesEtcJS(); // Sharing bookmarks defines xoops_smallworld(function () { - xoops_smallworld('.share').live('click',function() { + xoops_smallworld('.share').live('click',function(e) { + e.preventDefault(); var id = xoops_smallworld(this).attr('id'); var ref = xoops_smallworld('span[name="' + id + '"]').attr('rel'); var desc = xoops_smallworld('span[name="' + id + '"]').attr('rel1'); @@ -597,7 +613,8 @@ } }); - xoops_smallworld('.smallworld_CommentShowMore').click(function() { + xoops_smallworld('.smallworld_CommentShowMore').click(function(e) { + e.preventDefault(); if (xoops_smallworld(this).text()==showText) { xoops_smallworld(this).text(hideText); } else { @@ -605,7 +622,6 @@ } xoops_smallworld(this).parent().prev('div.smallworld_commentcontainer').children('div:gt(1)').slideToggle('slow'); }); - return false; }); } @@ -655,7 +671,8 @@ // counter = name of item to count items // Culex april 2011 function removelnk (shooter, target,counter) { - xoops_smallworld(shooter).live('click',function() { + xoops_smallworld(shooter).live('click',function(event) { + event.preventDefault(); if (counter == 'email') { var i = xoops_smallworld("input[name='emailtype[]']").length; } @@ -673,7 +690,6 @@ } if(i > 1) { // if you have at least 1 input on the form xoops_smallworld(this).parent().prev().andSelf().remove(); //remove the last input - return false; i--; //deduct 1 from i so if i = 3, after i--, i will be i = 2 } }); @@ -697,7 +713,7 @@ success: function(response){ xoops_smallworld('#resultMsg').html(response.msg); xoops_smallworld('#friendship').html(response.msgChange); - return false; + return false; } }); } @@ -721,7 +737,7 @@ xoops_smallworld('#followfriend').html(response.msgChange); xoops_smallworld('#resultMsgFollow').html(response.msg); xoops_smallworld('#resultMsgFollow').dialog({show: "size",hide:"scale"}); - return false; + return false; } }); } @@ -737,8 +753,10 @@ //xoops_smallworld('#comnMsg').show(); //alert (response.msg); xoops_smallworld('tr#'+targetID).hide(); - xoops_smallworld('#friendship').html(response.msgChange); - return false; + if (response != null && response != '') { + xoops_smallworld('#friendship').html(response.msgChange); + } + return false; } }); } @@ -754,25 +772,28 @@ cache: false, dataType: "json", success: function(data) { - var newcnt = data.NewUserMsgCount; - var diff = newcnt-smallworld_getFriendsMsgComCount; - - if (diff < 0) { - var text = smallworldDeletedMessages + diff; - xoops_smallworld('#smallworld_messagecounter_id').html(text); - xoops_smallworld('#smallworld_messagecounter_id').show(); - } - - if (diff == 0) { - var text = ''; - xoops_smallworld('#smallworld_messagecounter_id').empty(); - xoops_smallworld('#smallworld_messagecounter_id').hide(); - } - if (diff > 0) { - var text = smallworldNewMessages + diff; - xoops_smallworld('#smallworld_messagecounter_id').html(text); - xoops_smallworld('#smallworld_messagecounter_id').show(); - } + if (data != null && data != '') { + var newcnt = data.NewUserMsgCount; + var diff = newcnt-smallworld_getFriendsMsgComCount; + + if (diff < 0) { + var text = smallworldDeletedMessages + diff; + xoops_smallworld('#smallworld_messagecounter_id').html(text); + xoops_smallworld('#smallworld_messagecounter_id').show(); + } + + if (diff == 0) { + var text = ''; + xoops_smallworld('#smallworld_messagecounter_id').empty(); + xoops_smallworld('#smallworld_messagecounter_id').hide(); + } + if (diff > 0) { + var text = smallworldNewMessages + diff; + xoops_smallworld('#smallworld_messagecounter_id').html(text); + xoops_smallworld('#smallworld_messagecounter_id').show(); + } + } + return false; } }); setTimeout('smallworld_getCountFriendMessagesEtcJS()',10000); @@ -884,30 +905,30 @@ function attachAvatarOpen () { // Open comment and update avatar imagen in new window on click xoops_smallworld(function() { - xoops_smallworld('.smallworld_big_face, .smallworld_small_face, .smallworldAttImg').css('cursor', 'pointer'); - xoops_smallworld('.smallworld_big_face, .smallworld_small_face, .smallworldAttImg').live('click',function(event) { - var url = xoops_smallworld(this).attr('src'); - image = "<img src ='"+url+"' />"; - xoops_smallworld('<div id="lookingglassuseravatar">'+image+'</div>').appendTo('body'); - event.preventDefault(); - if (xoops_smallworld('#lookingglassuseravatar').length) { // implies *not* zero - xoops_smallworld('#lookingglassuseravatar').show(); - xoops_smallworld.fn.colorbox({ - width:"auto", - height:"70%", - inline:true, - onCleanup:function() { - xoops_smallworld('#lookingglassuseravatar').hide(); - }, - onClosed:function() { - xoops_smallworld("#lookingglassuseravatar").remove(); - }, - onComplete : function() { - xoops_smallworld(this).colorbox.resize(); - }, - href:"#lookingglassuseravatar" - }); - }; - }); //close click + xoops_smallworld('.smallworld_big_face, .smallworld_small_face, .smallworldAttImg').css('cursor', 'pointer'); + xoops_smallworld('.smallworld_big_face, .smallworld_small_face, .smallworldAttImg').live('click',function(event) { + var url = xoops_smallworld(this).attr('src'); + image = "<img src ='"+url+"' />"; + xoops_smallworld('<div id="lookingglassuseravatar">'+image+'</div>').appendTo('body'); + event.preventDefault(); + if (xoops_smallworld('#lookingglassuseravatar').length) { // implies *not* zero + xoops_smallworld('#lookingglassuseravatar').show(); + xoops_smallworld.fn.colorbox({ + width:"auto", + height:"70%", + inline:true, + onCleanup:function() { + xoops_smallworld('#lookingglassuseravatar').hide(); + }, + onClosed:function() { + xoops_smallworld("#lookingglassuseravatar").remove(); + }, + onComplete : function() { + xoops_smallworld(this).colorbox.resize(); + }, + href:"#lookingglassuseravatar" + }); + }; + }); //close click }); } \ No newline at end of file Modified: XoopsModules/smallworld/trunk/smallworld/js/wall.js =================================================================== --- XoopsModules/smallworld/trunk/smallworld/js/wall.js 2012-02-20 15:00:38 UTC (rev 9036) +++ XoopsModules/smallworld/trunk/smallworld/js/wall.js 2012-02-20 18:27:56 UTC (rev 9037) @@ -3,7 +3,8 @@ xoops_smallworld(document).ready(function() { // Update Status - xoops_smallworld(".smallworld_update_button").click(function() { + xoops_smallworld(".smallworld_update_button").click(function(e) { + e.preventDefault(); var updateval = xoops_smallworld("#smallworld_update").val(); var privatestat = xoops_smallworld('input[name=updatePublic]:checked').val(); var dataString = "update=" + updateval + "&priv=" + privatestat; @@ -27,11 +28,11 @@ } }); } - return false; }); //commment Submint - xoops_smallworld('.smallworld_comment_button').live("click",function() { + xoops_smallworld('.smallworld_comment_button').live("click",function(e) { + e.preventDefault(); var ID = xoops_smallworld(this).attr("id"); var comment= xoops_smallworld("#smallworld_ctextarea"+ID).val(); var dataString = 'comment='+ comment + '&msg_id=' + ID; @@ -51,18 +52,18 @@ } }); } - return false; }); // commentopen - xoops_smallworld('.smallworld_commentopen').live("click",function() { + xoops_smallworld('.smallworld_commentopen').live("click",function(e) { + e.preventDefault(); var ID = xoops_smallworld(this).attr("id"); xoops_smallworld("#smallworld_commentbox"+ID).slideToggle('slow'); - return false; }); // delete comment - xoops_smallworld('.smallworld_stcommentdelete').live("click",function() { + xoops_smallworld('.smallworld_stcommentdelete').live("click",function(e) { + e.preventDefault(); var ID = xoops_smallworld(this).attr("id"); var msgowner = xoops_smallworld(this).attr("rel"); var dataString = 'smallworld_com_id='+ ID + '&msgowner='+msgowner; @@ -78,10 +79,10 @@ } }); } - return false; }); // delete update - xoops_smallworld('.smallworld_stdelete').live("click",function() { + xoops_smallworld('.smallworld_stdelete').live("click",function(e) { + e.preventDefault(); var ID = xoops_smallworld(this).attr("id"); var msgowner = xoops_smallworld(this).attr("rel"); var dataString = 'smallworld_msg_id='+ ID + '&msgowner='+msgowner; @@ -97,13 +98,13 @@ } }); } - return false; }); }); xoops_smallworld(document).ready(function() { xoops_smallworld('.smallworld_msg_counter:last').show(); - xoops_smallworld('.smallworld_msg_counter').live('click', function() { + xoops_smallworld('.smallworld_msg_counter').live('click', function(e) { + e.preventDefault(); xoops_smallworld('#smallworld_moremsg_ajax').show(); var lastmsg = xoops_smallworld(this).attr("id"); var page = xoops_smallworld(this).attr("rel"); @@ -132,7 +133,6 @@ } smallworldCheckNumDivs(); - return false; }); }); @@ -140,7 +140,8 @@ // Calls up.php or down.php xoops_smallworld(document).ready(function() { xoops_smallworld(".smallworld_stcomment_vote").live('click', - function() { + function(e) { + e.preventDefault(); var id = xoops_smallworld(this).attr("id"); var name = xoops_smallworld(this).attr("name"); var type = xoops_smallworld(this).attr("type"); @@ -179,13 +180,13 @@ } }); } - return false; }); }); xoops_smallworld(document).ready(function() { xoops_smallworld(".smallworld_comment_complaint").live('click', - function() { + function(e) { + e.preventDefault(); var id = xoops_smallworld(this).attr("id"); var name = xoops_smallworld(this).attr("name"); var against_user = xoops_smallworld(this).attr("a_user"); @@ -207,8 +208,6 @@ } }); } - - return false; }); }); \ No newline at end of file Modified: XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_edittemplate.html =================================================================== --- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_edittemplate.html 2012-02-20 15:00:38 UTC (rev 9036) +++ XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_edittemplate.html 2012-02-20 18:27:56 UTC (rev 9037) @@ -361,7 +361,7 @@ </table> </fieldset> <input type="hidden" name="function" value="edit" /> - <input type="submit" id="smallworld_save1" value="<{$smallworld_save}>" class="finish"/> + <input type="submit" id="smallworld_save1" value="<{$smallworld_save}>" class="smallworld_finish"/> </form> Modified: XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_regtemplate.html =================================================================== --- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_regtemplate.html 2012-02-20 15:00:38 UTC (rev 9036) +++ XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_regtemplate.html 2012-02-20 18:27:56 UTC (rev 9037) @@ -366,7 +366,7 @@ </tr> </table> </fieldset> - <input type="submit" id="smallworld_save1" value="<{$smallworld_save}>" class="finish"/> + <input type="submit" id="smallworld_save1" value="<{$smallworld_save}>" class="smallworld_finish"/> <input type="hidden" name="function" value="save" /> </form> <{/if}> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tst...@us...> - 2012-02-20 15:00:50
|
Revision: 9036 http://xoops.svn.sourceforge.net/xoops/?rev=9036&view=rev Author: tstempko Date: 2012-02-20 15:00:38 +0000 (Mon, 20 Feb 2012) Log Message: ----------- Added Paths: ----------- XoopsLanguages/polish/modules/xnews/ XoopsLanguages/polish/modules/xnews/1.71/ XoopsLanguages/polish/modules/xnews/1.71/language/ XoopsLanguages/polish/modules/xnews/1.71/language/polish/ XoopsLanguages/polish/modules/xnews/1.71/language/polish/admin.php XoopsLanguages/polish/modules/xnews/1.71/language/polish/blocks.php XoopsLanguages/polish/modules/xnews/1.71/language/polish/index.html XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/ XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/category_newstory_notify.tpl XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/global_newcategory_notify.tpl XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/global_newstory_notify.tpl XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/global_storysubmit_notify.tpl XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/index.html XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/story_approve_notify.tpl XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/topic_newstory_notify.tpl XoopsLanguages/polish/modules/xnews/1.71/language/polish/main.php XoopsLanguages/polish/modules/xnews/1.71/language/polish/modinfo.php XoopsLanguages/polish/modules/xnews/1.71/language/polish/newsletter.php Property changes on: XoopsLanguages/polish/modules/xnews ___________________________________________________________________ Added: bugtraq:number + true Property changes on: XoopsLanguages/polish/modules/xnews/1.71 ___________________________________________________________________ Added: bugtraq:number + true Property changes on: XoopsLanguages/polish/modules/xnews/1.71/language ___________________________________________________________________ Added: bugtraq:number + true Property changes on: XoopsLanguages/polish/modules/xnews/1.71/language/polish ___________________________________________________________________ Added: bugtraq:number + true Added: XoopsLanguages/polish/modules/xnews/1.71/language/polish/admin.php =================================================================== --- XoopsLanguages/polish/modules/xnews/1.71/language/polish/admin.php (rev 0) +++ XoopsLanguages/polish/modules/xnews/1.71/language/polish/admin.php 2012-02-20 15:00:38 UTC (rev 9036) @@ -0,0 +1,251 @@ +<?php +// $Id: admin.php,v 1.4 2005/08/30 04:47:22 dap997 Exp $ +//%%%%%% Admin Module Name Articles %%%%% +define("_AM_NW_DBUPDATED","Baza danych została uaktualniona!"); +define("_AM_NW_CONFIG","Konfiguracja newsów"); +define("_AM_NW_AUTOARTICLES","Artykuły zautomatyzowane"); +define("_AM_NW_STORYID","ID artykułu"); +define("_AM_NW_TITLE","Tytuł"); +define("_AM_NW_TOPIC","Temat"); +define("_AM_NW_POSTER","Wysyłający"); +define("_AM_NW_PROGRAMMED","Zaprogramowana data/czas"); +define("_AM_NW_ACTION","Akcja"); +define("_AM_NW_EDIT","Edytuj"); +define("_AM_NW_DELETE","Usuń"); +define("_AM_NW_LAST10ARTS","Ostatnie 10 artykułów"); +define("_AM_NW_PUBLISHED","Wysłany dnia"); // Published Date +define("_AM_NW_GO","OK!"); +define("_AM_NW_EDITARTICLE","Edytuj artykuł"); +define("_AM_NW_POSTNEWARTICLE","Wyślij nowy artykuł"); +define("_AM_NW_ARTPUBLISHED","Twój artykuł został opublikowany!"); +define("_AM_NW_HELLO","Witaj %s,"); +define("_AM_NW_YOURARTPUB","Twój artykuł proponowany na naszą stronę został opublikowany."); +define("_AM_NW_TITLEC","Tytuł: "); +define("_AM_NW_URLC","URL: "); +define("_AM_NW_PUBLISHEDC","Wysłany dnia: "); +define("_AM_NW_RUSUREDEL","Jesteś pewien że chcesz usunąć ten artykuł i wszystkie jego komentarze?"); +define("_AM_NW_YES","Tak"); +define("_AM_NW_NO","Nie"); +define("_AM_NW_INTROTEXT","Tekst nagłówka"); +define("_AM_NW_EXTEXT","Tekst rozszerzony"); +define("_AM_NW_ALLOWEDHTML","Dozwolony HTML:"); +define("_AM_NW_DISAMILEY","Wyłącz uśmieszki"); +define("_AM_NW_DISHTML","Wyłącz HTML"); +define("_AM_NW_APPROVE","Zatwierdź"); +define("_AM_NW_MOVETOTOP","Przenieś ten artykuł na górę"); +define("_AM_NW_CHANGEDATETIME","Zmień datę / czas opublikowania"); +define("_AM_NW_NOWSETTIME","Teraz jest ustawiona na: %s"); // %s is datetime of publish +define("_AM_NW_CURRENTTIME","Aktualny czas to: %s"); // %s is the current datetime +define("_AM_NW_SETDATETIME","Ustaw datę / czas opublikowania"); +define("_AM_NW_MONTHC","Miesiąc:"); +define("_AM_NW_DAYC","Dzień:"); +define("_AM_NW_YEARC","Rok:"); +define("_AM_NW_TIMEC","Godzina:"); +define("_AM_NW_PREVIEW","Podgląd"); +define("_AM_NW_SAVE","Zapisz"); +define("_AM_NW_PUBINHOME","Opublikować na stronie głównej?"); +define("_AM_NW_ADD","Dodaj"); + +//%%%%%% Admin Module Name Topics %%%%% + +define("_AM_NW_ADDMTOPIC","Dodaj główny temat"); +define("_AM_NW_TOPICNAME","Nazwa tematu"); +// Warning, changed from 40 to 255 characters. +define("_AM_NW_MAX40CHAR","(max: 255 znaków)"); +define("_AM_NW_TOPICIMG","Ikona tematu"); +define("_AM_NW_IMGNAEXLOC","nazwa ikonki + rozszerzenie pliku w katalogu %s"); +define("_AM_NW_FEXAMPLE","na przykład: gry.gif"); +define("_AM_NW_ADDSUBTOPIC","Dodaj podtemat"); +define("_AM_NW_IN","w"); +define("_AM_NW_MODIFYTOPIC","Modyfikuj temat"); +define("_AM_NW_MODIFY","Modyfikuj"); +define("_AM_NW_PARENTTOPIC","Temat główny"); +define("_AM_NW_SAVECHANGE","Zapisz zmiany"); +define("_AM_NW_DEL","Usuń"); +define("_AM_NW_CANCEL","Anuluj"); +define("_AM_NW_WAYSYWTDTTAL","OSTRZEŻENIE: Jesteś pewien że chcesz usunąć ten temat oraz wszystkie newsy i komentarze w nim?"); + + +// Added in Beta6 +define("_AM_NW_TOPICSMNGR","Manager tematów"); +define("_AM_NW_PEARTICLES","Postowanie/edycja artykułów"); +define("_AM_NW_NEWSUB","Nowe artykuły"); +define("_AM_NW_POSTED","Wysłany"); +define("_AM_NW_GENERALCONF","Ustawienia główne"); + +// Added in RC2 +define("_AM_NW_TOPICDISPLAY","Wyświetlać ikonkę tematu?"); +define("_AM_NW_TOPICALIGN","Pozycja"); +define("_AM_NW_RIGHT","Prawo"); +define("_AM_NW_LEFT","Lewo"); + +define("_AM_NW_EXPARTS","Wygasłe artykuły"); +define("_AM_NW_EXPIRED","Wygasły"); +define("_AM_NW_CHANGEEXPDATETIME","Zmień date/czas wygaśnięcia artykuły"); +define("_AM_NW_SETEXPDATETIME" , "Ustaw czas i datę wygaśnięcia artykułu"); +define("_AM_NW_NOWSETEXPTIME" , "Obecnie jest ustawiony na: %s"); + +// Added in RC3 +define("_AM_NW_ERRORTOPICNAME" , "Proszę wprowadzić nazwę tematu!"); +define("_AM_NW_EMPTYNODELETE" , "Nie wybrano nic do skasowania!"); +// Added 240304 (Mithrandir) +define('_AM_NW_GROUPPERM' , 'Prawa dostępu - dodawanie/akceptowanie/oglądanie'); +define('_AM_NW_SELFILE' , 'Wybierz plik to wczytania'); + +// Added by Hervé +define('_AM_NW_UPLOAD_DBERROR_SAVE' , 'Wysąpił błąd w czasie dołączania pliku do wiadomości'); +define('_AM_NW_UPLOAD_ERROR' , 'Błąd w czasie dodawanie pliku'); +define('_AM_NW_UPLOAD_ATTACHFILE' , 'Załączone pliki'); +define('_AM_NW_APPROVEFORM' , 'Prawa akceptacji'); +define('_AM_NW_SUBMITFORM' , 'Prawa dodawania'); +define('_AM_NW_VIEWFORM' , 'Prawa oglądania'); +define('_AM_NW_APPROVEFORM_DESC' , 'Wybierz osoby mogące akceptować wiadomości'); +define('_AM_NW_SUBMITFORM_DESC' , 'Wybierz osoby mogące dodawać nowe wiadomości'); +define('_AM_NW_VIEWFORM_DESC' , 'Ustal prawa do oglądanie tematów przez osoby'); +define('_AM_NW_DELETE_SELFILES' , 'Skasuj wybrane pliki'); +define('_AM_NW_TOPIC_PICTURE' , 'Wczytaj obrazek'); +define('_AM_NW_UPLOAD_WARNING' , '<B>Uwaga, nie zapomnij ustawić prawa zapisu dla następującego katalogu: %s</B>'); + +define('_AM_NW_UPGRADECOMPLETE' , 'Aktualizacja zakończona'); +define('_AM_NW_UPDATEMODULE' , 'Aktualizuj szablony modułów i bloki'); +define('_AM_NW_UPGRADEFAILED' , 'Aktualizacja zakończyła się niepowodzeniem'); +define('_AM_NW_UPGRADE' , 'Aktualizacja'); +define('_AM_NW_ADD_TOPIC' , 'Dodaj temat'); +define('_AM_NW_ADD_TOPIC_ERROR' , 'Błąd. Ten temat już istnieje!'); +define('_AM_NW_ADD_TOPIC_ERROR1' , 'BŁAD! Nie można wybrać tego tematu jako nadrzędnego!'); +define('_AM_NW_SUB_MENU' , 'Opublikuj ten temat jako podmenu'); +define('_AM_NW_SUB_MENU_YESNO' , 'Podmenu?'); +define('_AM_NW_HITS' , 'Oglądnięć'); +define('_AM_NW_CREATED' , 'Utworzony'); + +define('_AM_NW_TOPIC_DESCR' , 'Opis tematu'); +define('_AM_NW_USERS_LIST' , 'Lista użytkowników'); +define('_AM_NW_PUBLISH_FRONTPAGE' , 'Opublikować na stronie głównej?'); +define('_AM_NW_UPGRADEFAILED1' , 'Nie można utworzyć tabeli stories_files'); +define('_AM_NW_UPGRADEFAILED2' , 'Nie można zmienić długości tytułu tematu'); +define('_AM_NW_UPGRADEFAILED21' , 'Nie można dodać nowej kolumy to tabeli tematów'); +define('_AM_NW_UPGRADEFAILED3' , 'Nie można utworzyć tabeli stories_votedata'); +define('_AM_NW_UPGRADEFAILED4' , "Nie można utworzyć dwóch pól 'rating' i 'votes' dla tabeli 'story'"); +define('_AM_NW_UPGRADEFAILED0' , "Proszę przeczytać informacje i spróbować usunąć błędy. Pomocny w tym może być phpMyadmin oraz plik definicji sql-owych znajdujący sie w katalogu 'sql' modułu 'news'"); +define('_AM_NW_UPGR_ACCESS_ERROR' , "Błąd w czasie użycia skryptu do akutalizacji, aby go użyć musisz być administratorem modułu."); +define('_AM_NW_PRUNE_BEFORE' , "Skasuj wiadomości które zostały opublikowane wcześniej."); +define('_AM_NW_PRUNE_EXPIREDONLY' , "Skasuj wiadomości które nie są już aktualne."); +define('_AM_NW_PRUNE_CONFIRM' , "Uwaga, chcesz skasować wiadomości opublikowane przed %s (tej akcji nie można później odwołać). W sumie skasujesz %s wiadomości.<br />Czy jesteś pewien?"); +define('_AM_NW_PRUNE_TOPICS' , "Ogranicz do następujących tematów"); +define('_AM_NW_PRUNENEWS' , 'Wykasuj wiadomości'); +define('_AM_NW_EXPORT_NEWS' , 'Eksportuj wiadomości'); +define('_AM_NW_EXPORT_NOTHING' , "Niestety nie wybrano nic do eksportu. Proszę zdefiniować go na nowo."); +define('_AM_NW_PRUNE_DELETED' , '%d wiadomości zostało skasowanych'); +define('_AM_NW_PERM_WARNING' , '<h2>Uwaga, masz 3 formularze a tym samym 3 przyciski zatwierdzające</h2>'); +define('_AM_NW_EXPORT_BETWEEN' , 'Wyeksportuj wiadomości opublikowane pomiedzy '); +define('_AM_NW_EXPORT_AND' , ' i '); +define('_AM_NW_EXPORT_PRUNE_DSC' , "Jeśli nic nie zaznaczysz zostaną wybrane wszystkie tematy.<br/> Jeśli jednak zaznaczysz, wybrane zostaną zaznaczone tematy."); +define('_AM_NW_EXPORT_INCTOPICS' , 'Razem z definicjami tematów?'); +define('_AM_NW_EXPORT_ERROR' , 'Błąd w czasie tworzenie pliku %s. Proces zatrzymany.'); +define('_AM_NW_EXPORT_READY' , "Twój plik xml z eksportem jest gotowy do ściągnięcia.<br /><a href='%s'>Kliknij na ten link aby go pobrać</a>.<br />Nie zapomnij <a href='%s'>usunąć go</a> po ściągnięciu."); +define('_AM_NW_RSS_URL' , "Link do RSS feed"); +define('_AM_NW_NEWSLETTER' , 'Biuletyn'); +define('_AM_NW_NEWSLETTER_BETWEEN' , 'Wybierz wiadomości opublikowane pomiędzy'); +define('_AM_NW_NEWSLETTER_READY' , "Twój biuletyn jest gotów do pobrania. <br /><a href='%s'>Kliknij na ten link aby go pobrać</a>.<br />Nie zapomnij <a href='%s'>usunąć go</a> po ściągnięciu."); +define('_AM_NW_DELETED_OK' , "Plik został skasowany"); +define('_AM_NW_DELETED_PB' , "Wystąpił błąd w czasie kasowania pliku"); +define('_AM_NW_STATS0' , 'Statystyki tematów'); +define('_AM_NW_STATS' , 'Statystyki'); +define('_AM_NW_STATS1' , 'Liczba autorów'); +define('_AM_NW_STATS2' , 'Razem'); +define('_AM_NW_STATS3' , 'Statystyki artykułów'); +define('_AM_NW_STATS4' , 'Najczęściej czytane artykuły'); +define('_AM_NW_STATS5' , 'Najrzadziej czytane artykuły'); +define('_AM_NW_STATS6' , 'Najwyżej oceniane artykuły'); +define('_AM_NW_STATS7' , 'Najbardziej poczytni autorzy'); +define('_AM_NW_STATS8' , 'Najwyżej oceniani autorzy'); +define('_AM_NW_STATS9' , 'Najwięksi dostawcy wiadomości'); +define('_AM_NW_STATS10' , 'Statystyki autorów'); +define('_AM_NW_STATS11' , "Liczba artykułów"); +define('_AM_NW_HELP' , "Pomoc"); +define("_AM_NW_MODULEADMIN" , "Administracja modułem"); +define("_AM_NW_GENERALSET" , "Ustawienia modułu" ); +define('_AM_NW_GOTOMOD' , 'Przejdź do modułu'); +define('_AM_NW_NOTHING' , "Niestety nie ma nic do ściągnięcia, proszę wybrać ponownie!"); +define('_AM_NW_NOTHING_PRUNE' , "Niestety nie ma nic do skasowania, proszę wybrać ponownie!"); +define('_AM_NW_TOPIC_COLOR' , "Kolor tematu"); +define('_AM_NW_COLOR' , "Kolor"); +define('_AM_NW_REMOVE_BR' , "Zamienić ten znacznik html <br> na nową linię?"); +// Added in 1.3 RC2 +define('_AM_NW_PLEASE_UPGRADE' , "<a href='upgrade.php'><font color='#FF0000'>Proszę zaktualizować moduł!</font></a>"); + +// Added in verisn 1.50 +define('_AM_NW_NEWSLETTER_HEADER', "Header"); +define('_AM_NW_NEWSLETTER_FOOTER', "Footer"); +define('_AM_NW_NEWSLETTER_HTML_TAGS', "Remove html tags ?"); +define('_AM_NW_VERIFY_TABLES','Maintain tables'); +define('_AM_NW_METAGEN',"Metagen"); +define('_AM_NW_METAGEN_DESC',"Metagen is a system that can help you to have your page best indexed by search engines.<br />Except if you type meta keywords and meta descriptions yourself, the module will automatically create them."); +define('_AM_NW_BLACKLIST',"Blacklist"); +define('_AM_NW_BLACKLIST_DESC',"The words in this list will not be used to create meta keywords"); +define('_AM_NW_BLACKLIST_ADD',"Add"); +define('_AM_NW_BLACKLIST_ADD_DSC',"Enter words to add in the list<br />(one word by line)"); +define('_AM_NW_META_KEYWORDS_CNT',"Maximum count of meta keywords to auto-generate"); +define('_AM_NW_META_KEYWORDS_ORDER',"Keywords order"); +define('_AM_NW_META_KEYWORDS_INTEXT',"Create them in the order they appear in the text"); +define('_AM_NW_META_KEYWORDS_FREQ1',"Words frequency's order"); +define('_AM_NW_META_KEYWORDS_FREQ2',"Reverse order of words frequency"); +// Added in version 1.67 Beta +define("_AM_NW_SUBPREFIX", "Prefiks"); + +define("_AM_NW_CLONER", "Menadżer klonowania"); +define("_AM_NW_CLONER_CLONES", "Klony"); +define("_AM_NW_CLONER_ADD", "Sklonuj"); +define("_AM_NW_CLONER_ID", "ID"); +define("_AM_NW_CLONER_NAME", "Nazwa"); +define("_AM_NW_CLONER_DIRFOL", "Katalog/Folder"); +define("_AM_NW_CLONER_VERSION", "Wersja"); + +define("_AM_NW_CLONER_NEWNAME", "Nowa nazwa modułu"); +define("_AM_NW_CLONER_NEWNAMEDESC", "Zostanie utworzony nowy folder dla sklonowanego modułu. <br /> Wielkość liter i odstępy są ignorowane i zostaną automatycznie poprawione. <br /> np. nowa nazwa = <b>Biblioteka</b> nowy katalog = <b>biblioteka</b>, <br /> nowa nazwa = <b>Moja Biblioteka</b> nowy katalog = <b>mojabiblioteka</b>. <br /><br /> Początkowy moduł to: <font color='#008400'><b> %s </b></font><br />"); +define("_AM_NW_CLONER_NEWNAMELABEL", "Nowy moduł:"); + +define("_AM_NW_CLONER_DIREXISTS", "Katalog/Folder '%s' już istnieje!!"); +define("_AM_NW_CLONER_CREATED", "Moduł '%s' został pomyślnie sklonowany!!"); +define("_AM_NW_CLONER_UPRADED", "Moduł '%s' został pomyślnie zaktualizowany!!"); +define("_AM_NW_CLONER_NOMODULEID", "ID modułu NIE zostało ustawione!"); + +define("_AM_NW_CLONER_UPDATE", "Aktualizuj"); +define("_AM_NW_CLONER_INSTALL", "Instaluj"); +define("_AM_NW_CLONER_UNINSTALL", "Odinstaluj"); +define("_AM_NW_CLONER_ACTION_INSTALL", "Instaluj/Odinstaluj"); + +define("_AM_NW_CLONER_IMPORTNEWS", "Importuj dane z oryginalnego modułu News"); +define("_AM_NW_CLONER_IMPORTNEWSDESC1", "Oryginalny moduł News został znaleziony! Zaimportować dane teraz?"); +define("_AM_NW_CLONER_IMPORTNEWSDESC2", "Przycisk importuj dane jest widoczny jedynie gdy nie ma newsów w bazie modułu x"."News. <br /> + Jeśli dodałeś newsa przed importem danych z oryginalnego <br /> + modułu News musisz odinstalować i ponownie zainstalować x"."News. <br /> + Dane z oryginalnego modułu News można zaimportować tylko raz."); +define("_AM_NW_CLONER_IMPORTNEWSSUB", "Importuj"); +define("_AM_NW_CLONER_NEWSIMPORTED", "Dane z oryginalnego modułu News zostały zaimportowane poprawnie."); + +// Added in version 1.68 Beta +define("_AM_NW_DESCRIPTION", "<H3>x"."News jest klonowalnym modułem newsów</H3> + dającym możliwość pisania newsów i komentarzy przez użytkowników. Moduł może być sklonowany aby umożliwić posługiwanie się jedną metodą dla realizacji różnych celów. Dzięki temu może być wykorzytany do krótkich informacji, linków i wielu innych zadań. Każde z nich będzie może mieć własne bloki , tematy, ustawienia."); + +// Added in version 1.68 RC1 +define("_AM_NW_CLONER_CLONEDELETED", "'%s' klon został pomyślnie usunięty."); +define("_AM_NW_CLONER_CLONEDELETEDERR", "'%s' klon nie został usunięty - sprawdź uprawnienia."); +define("_AM_NW_CLONER_CLONEUPGRADED", "Zaktualizowany"); +define("_AM_NW_CLONER_UPGRADEFORCE", "Zaktualizuj na siłę"); +define("_AM_NW_CLONER_CLONEDELETION", "Usuwanie klonów"); +define("_AM_NW_CLONER_SUREDELETE", "Czy potwierdzasz, że chcesz usunąć klon <font color='#000000'>'%s'</font>?<br />"); +define("_AM_NW_CLONER_CLONEID", "ID klonu nie zostało ustawione!"); + +// Added in version 1.68 RC2 +define("_AM_NW_INDEX", "Indeks"); + +// Added in version 1.68 RC3 +define("_AM_NW_DOLINEBREAK", "Dozwól na łamanie linii"); +define("_AM_NW_TOPICS","Tematy"); + +// Added in version 1.71 +define("_AM_NW_IMAGE_ROWS", "Wiersze wyświetlania obrazu"); +define("_AM_NW_PDF_ROWS", "Wiersze wyświetlania PDFa"); + +?> \ No newline at end of file Added: XoopsLanguages/polish/modules/xnews/1.71/language/polish/blocks.php =================================================================== --- XoopsLanguages/polish/modules/xnews/1.71/language/polish/blocks.php (rev 0) +++ XoopsLanguages/polish/modules/xnews/1.71/language/polish/blocks.php 2012-02-20 15:00:38 UTC (rev 9036) @@ -0,0 +1,97 @@ +<?php +// $Id: blocks.php,v 1.3 2005/08/30 04:47:22 dap997 Exp $ +define("_MB_NW_NOTYET" , "Jeszcze nie ma najpopularniejszego newsa dzisiaj."); +define("_MB_NW_TMRSI" , "Dzisiaj najczęściej czytanym artykułem jest:"); +define("_MB_NW_ORDER" , "Kolejność"); +define("_MB_NW_DATE" , "Data opublikowania"); +define("_MB_NW_HITS" , "Ilość odsłon"); +define("_MB_NW_DISP" , "Wyświetl"); +define("_MB_NW_ARTCLS" , "artykuły"); +define("_MB_NW_CHARS" , "Długość tytułu "); +define("_MB_NW_LENGTH" , " znaków"); +define("_MB_NW_TITLE" , "Tytuł"); +define("_MB_NW_POSTED" , "Opublikowany"); +define("_MB_NW_POSTER" , "Autor"); +define("_MB_NW_ACTION" , "Akcja"); +define("_MB_NW_TOPIC" , "Temat"); +define("_MB_NW_DELETE" , "Usuń"); +define("_MB_NW_RESTRICTTOPICS" , "Ograniczyć tematy według użytkowników?"); +define("_MB_NW_TEASER" , "Pokaż długość wprowadzenie (wpisz 0 gdy nie ma wprowadzenia)"); +define("_MB_NW_SPOTLIGHT" , "Widok z newsami w centrum uwagi"); +define("_MB_NW_FIRST" , "--Pierwszy--"); +define("_MB_NW_IMAGE" , "Obrazek przyciągający uwagę"); +define("_MB_NW_SPOTLIGHT_TOPIC" , "Wybierz tematy, których użyjesz"); +define("_MB_NW_SPOTLIGHT_ALL_TOPICS" , "Wszystkie tematy"); +define("_MB_NW_SPOTLIGHT_ARTICLE", "Wybierz wiadomość:"); +define("_MB_NW_READMORE" , "Więcej..."); +define("_MB_NW_RATE" , "ocena"); +define("_MB_NW_SHOW_NEWS_COUNT" , "Pokazywać licznik wiadomości?"); +define("_MB_NW_SPOTLIGHT_TITLE" , "Spotlight"); +define("_MB_NW_VIEW_TYPE1" , "Klasyczny"); +define("_MB_NW_VIEW_TYPE2" , "Z zakładkami"); +define("_MB_NW_TAB_COLOR1" , "Kolor lini podsumowywującej (to ta linia tuż pod zakładkami)"); +define("_MB_NW_TAB_COLOR2" , "Kolor tła wiadomości w zakładce"); +define("_MB_NW_TAB_COLOR3" , "Kolor nagłówka aktualnej zakładki"); +define("_MB_NW_TAB_COLOR4" , "Kolor nagłówka dla pozostałych zakładek"); +define("_MB_NW_TAB_COLOR5" , "Kolor podświetlenia zakładki"); +define("_MB_NW_WHAT_PUBLISH" , "Co chciałbyś opublikować w <br />centrum uwagi?"); +define("_MB_NW_RECENT_NEWS" , "Ostatnie wiadomości (nie używaj listy pod spodem)"); +define("_MB_NW_RECENT_SPECIFIC" , "Wybrana wiadomość (popatrz pod spodem)"); +define("_MB_NW_DEFAULT_COLORS" , "Pozostaw puste pola a zostaną użyte domyślne kolory"); + +// Added in version 1.50 +define("_MB_NW_CAL_YEAR", "Rok"); +define("_MB_NW_CAL_MONTH", "Miesiąc"); +define("_MB_NW_STARTING_DATE", "Data początkowa"); +define("_MB_NW_ENDING_DATE", "Data końcowa"); +define("_MB_NW_UNTIL_TODAY", "or until today"); +define("_MB_NW_RECENT_FIRST", "Najpier najnowsze"); +define("_MB_NW_OLDER_FIRST", "Najpierw najstarsze"); + +// Added in version 1.67 + +define("_MB_NW_LATESTNEWS_POSTER", "Napisany przez "); +define("_MB_NW_SP", " : "); +define("_MB_NW_LDCOUNTER", "Przeczytany"); +define("_MB_NW_LATESTNEWS_COLUMNS", "Liczba kolumn"); +define("_MB_NW_LATESTNEWS_COLUMN", "kolumna"); +define("_MB_NW_LATESTNEWS_TEXTLENGTH", "Liczba liter"); +define("_MB_NW_LATESTNEWS_LETTER", "Litera"); +define("_MB_NW_LATESTNEWS_IMGWIDTH", "Szerokość obrazka"); +define("_MB_NW_LATESTNEWS_IMGHEIGHT", "Wysokość obrazka"); +define("_MB_NW_LATESTNEWS_PIXEL", "piksel"); +define("_MB_NW_LATESTNEWS_BORDER", "Rozmiar obramowania obrazka"); +define("_MB_NW_LATESTNEWS_BORDERCOLOR", "Kolor obramowania obrazka"); +define("_MB_NW_LATESTNEWS_IMGPOSITION", "Pozycja obrazka"); +define("_MB_NW_LATESTNEWS_MORELINK", "Wyświetlać 'Więcej newsów'?"); +define("_MB_NW_LATESTNEWS_TOPICLINK", "Wyświetlać 'Tematy'?"); +define("_MB_NW_LATESTNEWS_ARCHIVELINK", "Wyświetlać 'Archiwum'?"); +define("_MB_NW_LATESTNEWS_SUBMITLINK", "Wyświetlać 'Wyślij'?"); +define("_MB_NW_LATESTNEWS_POSTEDBY", "Wyświetlać 'Napisany przez'?"); +define("_MB_NW_LATESTNEWS_POSTTIME", "Wyświetlać 'Data'?"); +define("_MB_NW_LATESTNEWS_COMMENT", "Komentarze?"); +define("_MB_NW_LATESTNEWS_TOPICTITLE", "Wyświetlać 'Tytuł tematu'?"); +define("_MB_NW_LATESTNEWS_TOPICIMAGE", "Wyświetlać 'Obrazek tematu'?"); +define("_MB_NW_LATESTNEWS_READ", "Wyświetlać 'Licznik odsłon'?"); +define("_MB_NW_LATESTNEWS_DISPLAY", "Wyświetl"); +define("_MB_NW_LATESTNEWS", "Newsy"); +define("_MB_NW_NO_COMMENT", "Brak komentarzy"); +define("_MB_NW_LATESTNEWS_BLOCK", "Najnowsze newsy"); +define("_MB_NW_MORE_STORIES", "więcej newsów"); + +define("_MB_NW_LATESTNEWS_TOPICSDISPLAY", "Tematy do wyświetleniay"); + +define("_MB_NW_LATESTNEWS_ORDERBY", "Uporządkuj według"); +define("_MB_NW_LATESTNEWS_DATE", "Daty"); +define("_MB_NW_LATESTNEWS_HITS", "Liczby odsłon"); +define("_MB_NW_LATESTNEWS_RATE", "Ocen"); + +define("_MB_NW_LATESTNEWS_PRINT", "Wyświetl ikonę druku"); +define("_MB_NW_LATESTNEWS_PDF", "Wyświetl ikonę PDF"); +define("_MB_NW_LATESTNEWS_EMAIL", "Wyświetl ikonę email"); +define("_MB_NW_LATESTNEWS_SCROLL", "Włącz przewijalny pasek informacyjny"); +define("_MB_NW_LATESTNEWS_SCROLLHEIGHT", "Wysokość paska"); +define("_MB_NW_LATESTNEWS_SCROLLSPEED", "Prędkość przewijania"); +define("_MB_NW_LATESTNEWS_SELECTEDSTORIES", "Ustaw ID newsów (np:3,8,23,46) uwaga: ustaw 0 aby pokazać wszystkie"); + +?> \ No newline at end of file Added: XoopsLanguages/polish/modules/xnews/1.71/language/polish/index.html =================================================================== --- XoopsLanguages/polish/modules/xnews/1.71/language/polish/index.html (rev 0) +++ XoopsLanguages/polish/modules/xnews/1.71/language/polish/index.html 2012-02-20 15:00:38 UTC (rev 9036) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template ___________________________________________________________________ Added: bugtraq:number + true Added: XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/category_newstory_notify.tpl =================================================================== --- XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/category_newstory_notify.tpl (rev 0) +++ XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/category_newstory_notify.tpl 2012-02-20 15:00:38 UTC (rev 9036) @@ -0,0 +1,21 @@ +Witaj {X_UNAME}, + +W witrynie {X_SITENAME} został dodany nowy news "{STORY_NAME}". + +Możesz go zobaczyć tutaj: +{STORY_URL} + +----------- + +Otrzymałeś tę widomość ponieważ wybrałeś opcję by być powiadomionym kiedy nowy news jest dodawany do naszej witryny. + +Jeśli to błąd lub nie chcesz w przyszłości dostawać takich powiadomień, uaktualnij proszę swoj powiadomienia tutaj: +{X_UNSUBSCRIBE_URL} + +Nie odpowiadaj na tę wiadomość. + +----------- + +{X_SITENAME} ({X_SITEURL}) +webmaster +{X_ADMINMAIL} \ No newline at end of file Added: XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/global_newcategory_notify.tpl =================================================================== --- XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/global_newcategory_notify.tpl (rev 0) +++ XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/global_newcategory_notify.tpl 2012-02-20 15:00:38 UTC (rev 9036) @@ -0,0 +1,21 @@ +Witaj {X_UNAME}, + +Na stronach {X_SITENAME} został utworzony nowy temat (kategoria) "{TOPIC_NAME}". + +Możesz obejrzeć listę newsów w temacie klikając: +{X_MODULE_URL} + +----------- + +Otrzymałeś tę widomość ponieważ wybrałeś opcję by być powiadomionym kiedy zostanie utworzony nowy temat (kategoria). + +Jeśli to błąd lub nie chcesz w przyszłości dostawać takich powiadomień, uaktualnij proszę swoj powiadomienia tutaj: +{X_UNSUBSCRIBE_URL} + +Nie odpowiadaj na tę wiadomość. + +----------- + +{X_SITENAME} ({X_SITEURL}) +webmaster +{X_ADMINMAIL} Added: XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/global_newstory_notify.tpl =================================================================== --- XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/global_newstory_notify.tpl (rev 0) +++ XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/global_newstory_notify.tpl 2012-02-20 15:00:38 UTC (rev 9036) @@ -0,0 +1,21 @@ +Witaj {X_UNAME}, + +W witrynie {X_SITENAME} został dodany nowy news "{STORY_NAME}". + +Możesz go zobaczyć tutaj: +{STORY_URL} + +----------- + +Otrzymałeś tę widomość ponieważ wybrałeś opcję by być powiadomionym kiedy news zostanie zatwierdzony. + +Jeśli to błąd lub nie chcesz w przyszłości dostawać takich powiadomień, uaktualnij proszę swoj powiadomienia tutaj: +{X_UNSUBSCRIBE_URL} + +Nie odpowiadaj na tę wiadomość. + +----------- + +{X_SITENAME} ({X_SITEURL}) +webmaster +{X_ADMINMAIL} Added: XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/global_storysubmit_notify.tpl =================================================================== --- XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/global_storysubmit_notify.tpl (rev 0) +++ XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/global_storysubmit_notify.tpl 2012-02-20 15:00:38 UTC (rev 9036) @@ -0,0 +1,21 @@ +Witaj {X_UNAME}, + +Na stronach {X_SITENAME} został wysłany nowy news "{STORY_NAME}" i oczekuje na zatwierdzenie. + +Możesz obejrzeć go tutaj: +{WAITINGSTORIES_URL} + +----------- + +Otrzymałeś tę widomość ponieważ wybrałeś opcję by być powiadomionym o nowych newsach. + +Jeśli to błąd lub nie chcesz w przyszłości dostawać takich powiadomień, uaktualnij proszę swoj powiadomienia tutaj: +{X_UNSUBSCRIBE_URL} + +Nie odpowiadaj na tę wiadomość. + +----------- + +{X_SITENAME} ({X_SITEURL}) +webmaster +{X_ADMINMAIL} Added: XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/index.html =================================================================== --- XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/index.html (rev 0) +++ XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/index.html 2012-02-20 15:00:38 UTC (rev 9036) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/story_approve_notify.tpl =================================================================== --- XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/story_approve_notify.tpl (rev 0) +++ XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/story_approve_notify.tpl 2012-02-20 15:00:38 UTC (rev 9036) @@ -0,0 +1,21 @@ +Witaj {X_UNAME}, + +Wysłany przez Ciebie news "{STORY_NAME}" na {X_SITENAME} został zatwierdzony. + +Możesz zobaczyć go tutaj: +{STORY_URL} + +----------- + +Otrzymałeś tę widomość ponieważ wybrałeś opcję by być powiadomionym gdy ten news zostanie zatwierdzony . + +Jeśli to błąd lub nie chcesz w przyszłości dostawać takich powiadomień, uaktualnij proszę swoj powiadomienia tutaj: +{X_UNSUBSCRIBE_URL} + +Nie odpowiadaj na tę wiadomość. + +----------- + +{X_SITENAME} ({X_SITEURL}) +webmaster +{X_ADMINMAIL} Added: XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/topic_newstory_notify.tpl =================================================================== --- XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/topic_newstory_notify.tpl (rev 0) +++ XoopsLanguages/polish/modules/xnews/1.71/language/polish/mail_template/topic_newstory_notify.tpl 2012-02-20 15:00:38 UTC (rev 9036) @@ -0,0 +1,21 @@ +Witaj {X_UNAME}, + +Nowy news "{STORY_NAME}" w temacie {TOPIC_NAME} został dodany w witrynie {X_SITENAME}. + +Możesz zobaczyć go tutaj: +{STORY_URL} + +----------- + +Otrzymałeś tę widomość ponieważ wybrałeś opcję by być powiadomionym gdy nowy news zostanie dodany na naszej witrynie. + +Jeśli to błąd lub nie chcesz w przyszłości dostawać takich powiadomień, uaktualnij proszę swoj powiadomienia tutaj: +{X_UNSUBSCRIBE_URL} + +Nie odpowiadaj na tę wiadomość. + +----------- + +{X_SITENAME} ({X_SITEURL}) +webmaster +{X_ADMINMAIL} Added: XoopsLanguages/polish/modules/xnews/1.71/language/polish/main.php =================================================================== --- XoopsLanguages/polish/modules/xnews/1.71/language/polish/main.php (rev 0) +++ XoopsLanguages/polish/modules/xnews/1.71/language/polish/main.php 2012-02-20 15:00:38 UTC (rev 9036) @@ -0,0 +1,133 @@ +<?php +// $Id: main.php,v 1.4 2005/08/30 04:47:22 dap997 Exp $ +//%%%%%% File Name index.php %%%%% +define("_MA_NW_PRINTER" , "Wersja do wydruku"); +define("_MA_NW_SENDSTORY" , "Powiadom znajomego o tej wiadomości"); +define("_MA_NW_READMORE" , "Czytaj więcej..."); +define("_MA_NW_COMMENTS" , "Komentarze"); +define("_MA_NW_ONECOMMENT" , "1 komentarz"); +define("_MA_NW_BYTESMORE" , "%s bajtów więcej"); +define("_MA_NW_NUMCOMMENTS" , "%s komentarzy"); +define("_MA_NW_MORERELEASES" , "Więcej wydań w... More releases in "); + + +//%%%%%% File Name submit.php %%%%% +define("_MA_NW_SUBMITNEWS" , "Wyślij newsa"); +define("_MA_NW_TITLE" , "Tytuł"); +define("_MA_NW_TOPIC" , "Temat"); +define("_MA_NW_THESCOOP" , "Wstęp - zachęta"); +define("_MA_NW_NOTIFYPUBLISH" , "Powiadom mnie e-mailem gdy artykuł zostanie opublikowany."); +define("_MA_NW_POST" , "Wyślij"); +define("_MA_NW_GO" , "OK!"); +define("_MA_NW_THANKS" , "Dziękujemy za wiadomość."); //submission of news article + +define("_MA_NW_NOTIFYSBJCT" , "Nowa wiadomość na stronie!"); // Notification mail subject +define("_MA_NW_NOTIFYMSG" , "Hej adminie! Masz do opublikowania newsa na stronie."); // Notification mail message + +//%%%%%% File Name archive.php %%%%% +define("_MA_NW_NEWSARCHIVES" , "Archiwum newsów"); +define("_MA_NW_ARTICLES" , "Artykuły"); +define("_MA_NW_VIEWS" , "Odsłon"); +define("_MA_NW_DATE" , "Data"); +define("_MA_NW_ACTIONS" , "Akcje"); +define("_MA_NW_PRINTERFRIENDLY" , "Wersja do wydrukowania"); + +define("_MA_NW_THEREAREINTOTAL" , "W sumie jest już %s artykułów"); + +// %s is your site name +define("_MA_NW_INTARTICLE" , "Interesujący artykuł na stronie %s"); +define("_MA_NW_INTARTFOUND" , "Znalazłem bardzo interesujący artykuł na stronie %s"); + +define("_MA_NW_TOPICC" , "Temat:"); +define("_MA_NW_URL" , "Link:"); +define("_MA_NW_NOSTORY" , "Niestety, wybrany artykuł nie istnieje."); + +//%%%%%% File Name print.php %%%%% + +define("_MA_NW_URLFORSTORY" , "Link do tej wiadomości to:"); + +// %s represents your site name +define("_MA_NW_THISCOMESFROM" , "Ten artykuł pochodzi z %s"); + +// Added by Hervé +define("_MA_NW_ATTACHEDFILES" , "Załączone pliki:"); +define("_MA_NW_ATTACHEDLIB" , "Ten artykuł posiada dodatkowe pliki"); +define("_MA_NW_NEWSSAMEAUTHORLINK" , "Więcej wiadomości tego samego autora"); +define("_MA_NW_NO_TOPICS" , "Nie można dodać wiadomości jeśli nie został utworzony przynajmniej jeden temat"); +define("_MA_NW_PREVIOUS_ARTICLE" , "Wcześniejszy artykuł"); +define("_MA_NW_NEXT_ARTICLE" , "Następny artykuł"); +define("_MA_NW_OTHER_ARTICLES" , "Inne artykuły"); + +// Added by Hervé in version 1.3 for rating +define("_MA_NW_RATETHISNEWS" , "Oceń tę wiadomość"); +define("_MA_NW_RATEIT" , "Oceń to!"); +define("_MA_NW_TOTALRATE" , "Ocen w sumie"); +define("_MA_NW_RATINGLTOH" , "Oceny (od najniższej do najwyższej)"); +define("_MA_NW_RATINGHTOL" , "Oceny (od najwyższej do najniższej)"); +define("_MA_NW_RATINGC" , "Ocena: "); +define("_MA_NW_RATINGSCALE" , "Skala ocen jest od 1 do 10, gdzie 1 to ocena najniższa 10 to najwyższa."); +define("_MA_NW_BEOBJECTIVE" , "Proszę być obiektywnym, jeśli każdy będzie otrzymywał albo 1 albo 10 to ranking nie będzie zbyt użyteczny."); +define("_MA_NW_DONOTVOTE" , "Prosze nie głosować na swoje własne wiadomości."); +define("_MA_NW_RATING" , "Ocena"); +define("_MA_NW_VOTE" , "Głos"); +define("_MA_NW_NORATING" , "Nie wybrano ocen"); +define("_MA_NW_USERAVG" , "Średnia ocena"); +define("_MA_NW_DLRATINGS" , "Ocena wiadomości (ilość głosów: %s)"); +define("_MA_NW_ONEVOTE" , "1 głos"); +define("_MA_NW_NUMVOTES" , "%u głosów"); // Warning +define("_MA_NW_CANTVOTEOWN" , "Nie możesz głosować na swoje własne materiały <br />Wszystkie głosy są logowane i weryfikowane."); +define("_MA_NW_VOTEDELETED" , "Skasowano dane głosowań."); +define("_MA_NW_VOTEONCE" , "Proszę nie głosować na ten sam materiał więcej niż jeden raz."); +define("_MA_NW_VOTEAPPRE" , "Twój głos jest dla nas ważny."); +define("_MA_NW_THANKYOU" , "Dziękuj za głosowanie na naszej stronie %s"); // %s is your site name +define("_MA_NW_RSSFEED","RSS Feed"); // Warning, this text is included insided an Alt attribut (for a picture), so take care to the quotes +define("_MA_NW_AUTHOR" , "Autor "); +define("_MA_NW_META_DESCRIPTION" , "Meta description"); +define("_MA_NW_META_KEYWORDS" , "Meta keywords"); +define("_MA_NW_MAKEPDF" , "Utwórz dokument .pdf z tego artykułu"); +define('_MA_NW_POSTEDON' , "Napisany: "); +define("_MA_NW_AUTHOR_ID" , "Id autora "); +define("_MA_NW_POST_SORRY" , "Niestety albo nie ma jeszcze zdefiniowanych tematów, albo nie masz prawa do publikacji wiadomości w jakimkolwiek temacie. Jeśli jesteś webmasterm, to wejdź do ustawień i zmień prawa do dodawania"); + +// Added in v 1.50 +define("_MA_NW_LINKS","Linki"); +define("_MA_NW_PAGE","Strony"); +define("_MA_NW_BOOKMARK_ME","Dodaj do zakładek"); +define('_AM_NW_TOTAL',"%u newsów"); +define('_AM_NW_WHOS_WHO',"Kto jest kim"); +define('_MA_NW_LIST_OF_AUTHORS',"Tutaj jest lista autorów newsów tej witryny, kliknij na zazwie autora aby zobaczyć jego newsy"); +define('_AM_NW_TOPICS_DIRECTORY',"Katalog tematów"); +define("_MA_NW_PAGE_AUTO_SUMMARY","Strona %d : %s"); + +// Added in version 1.51 +define("_MA_NW_BOOKMARK_TO_BLINKLIST","Bookmark to Blinklist"); +define("_MA_NW_BOOKMARK_TO_DELICIOUS","Bookmark to del.icio.us"); +define("_MA_NW_BOOKMARK_TO_DIGG","Bookmark to Digg"); +define("_MA_NW_BOOKMARK_TO_FARK","Bookmark to Fark"); +define("_MA_NW_BOOKMARK_TO_FURL","Bookmark to Furl"); +define("_MA_NW_BOOKMARK_TO_NEWSVINE","Bookmark to Newsvine"); +define("_MA_NW_BOOKMARK_TO_REDDIT","Bookmark to Reddit"); +define("_MA_NW_BOOKMARK_TO_SIMPY","Bookmark to Simpy"); +define("_MA_NW_BOOKMARK_TO_SPURL","Bookmark to Spurl"); +define("_MA_NW_BOOKMARK_TO_YAHOO","Bookmark to Yahoo"); + +// Added in version 1.56 +define('_MA_NW_NOTYETSTORY',"Ten news zostanie opublikowany później. Odwiedź nas za jakiś czas."); +define("_MA_NW_SELECT_IMAGE", "Wybierz obrazek do dołączenia do newsa"); +define("_MA_NW_CURENT_PICTURE", "Bieżący obrazek"); + +// Added in version 1.68 BETA +define("_MA_NW_SP", ":"); +define("_MA_NW_POSTED", "Wysłany"); + +// Added in version 1.68 RC1 +define("_MA_NW_NO_COMMENT", "Brak komentarzy"); +define("_MA_NW_METASIZE", "Przepraszamy, ale nie możesz dodać więcej niż '+len+' znaków w polu któe właśnie wypełniłeś."); + +// Added in version 1.68 RC3 +define("_MA_NW_SEO_TOPICS", "tematy"); +define("_MA_NW_SEO_ARTICLES", "newsy"); +define("_MA_NW_SEO_PRINT", "drukuj"); +define("_MA_NW_SEO_PDF", "pdf"); + +?> \ No newline at end of file Added: XoopsLanguages/polish/modules/xnews/1.71/language/polish/modinfo.php =================================================================== --- XoopsLanguages/polish/modules/xnews/1.71/language/polish/modinfo.php (rev 0) +++ XoopsLanguages/polish/modules/xnews/1.71/language/polish/modinfo.php 2012-02-20 15:00:38 UTC (rev 9036) @@ -0,0 +1,233 @@ +<?php +// $Id: modinfo.php,v 1.4 2005/08/30 04:47:22 dap997 Exp $ +// Module Info + +// The name of this module +define('_MI_NW_NAME' , 'Wiadomości '); + +// A brief description of this module +define('_MI_NW_DESC' , 'Tworzy sekcję informacyjną, gdzie użytkownicy mogą umieszczać wiadomości i komentarze.'); + +// Names of blocks for this module (Not all module has blocks) +define('_MI_NW_BNAME1' , 'Blok tematów wiadomości'); +define('_MI_NW_BNAME3' , 'Blok wielkiej historii'); +define('_MI_NW_BNAME4' , 'Blok najpopularniejszej wiadomości'); +define('_MI_NW_BNAME5' , 'Blok ostatnio dodanych wiadomości'); +define('_MI_NW_BNAME6' , 'Wieści do sprawdzenia - moderowane'); +define('_MI_NW_BNAME7' , 'Nawigacja przez tematy'); + +// Sub menus in main menu block +define('_MI_NW_SMNAME1' , 'Wyślij wiadomość'); +define('_MI_NW_SMNAME2' , 'Archiwum'); + +// Names of admin menu items +define('_MI_NW_ADMENU2' , 'Tematy'); +define('_MI_NW_ADMENU3' , 'Dodaj i edytuj wiadomości'); +define('_MI_NW_GROUPPERMS' , 'Prawa dostępu'); +// Added by Hervé for prune option +define('_MI_NW_PRUNENEWS' , 'Skasuj wiadomości'); +// Added by Hervé +define('_MI_NW_EXPORT' , 'Eksportuj wiadomości'); + +// Title of config items +define('_MI_NW_STORYHOME' , 'Ile wiadomości ma być wyświetlone na stronie głównej?'); +define('_MI_NW_NOTIFYSUBMIT' , 'Powiadomić e-mailem o oczekującej wiadomości?'); +define('_MI_NW_DISPLAYNAV' , 'Wyświetlić menu nawigacji w górnej części stron z wiadomościami?'); +define('_MI_NW_AUTOAPPROVE' , 'Zezwolić na automatyczne akceptowanie wiadomości?'); +define("_MI_NW_ALLOWEDSUBMITGROUPS" , "Grupy użytkowników, które mogą publikować wiadomości"); +define("_MI_NW_ALLOWEDAPPROVEGROUPS" , "Grupy użytkowników, które mogą akceptować wiadomości"); +define("_MI_NW_NEWSDISPLAY" , "Sposób wyświatlania wiadomości"); +define("_MI_NW_NAMEDISPLAY" , "Imię autora"); +define("_MI_NW_COLUMNMODE" , "Kolumy"); +define("_MI_NW_STORYCOUNTADMIN" , "Ilość nowych artykułów wyświetlanych na stronach administratora (ta opcja ogranicza także ilość tematów oraz jest używana przy wyświetlaniu statystyk)."); +define('_MI_NW_UPLOADFILESIZE' , 'Maksymalna wielkość pliku, który można dodać podana w kilobajtach (1048576 kilobajtów = 1 megabajt).'); +define("_MI_NW_UPLOADGROUPS" , "Dodawanie plików do wiadomości"); + + +// Description of each config items +define('_MI_NW_STORYHOMEDSC' , ''); +define('_MI_NW_NOTIFYSUBMITDSC' , ''); +define('_MI_NW_DISPLAYNAVDSC' , ''); +define('_MI_NW_AUTOAPPROVEDSC' , ''); +define("_MI_NW_ALLOWEDSUBMITGROUPSDESC" , "Wybrane grupy mogą dodawać wiadomości"); +define("_MI_NW_ALLOWEDAPPROVEGROUPSDESC" , "Wybrane grupy mogą akceptować wiadomości"); +define("_MI_NW_NEWSDISPLAYDESC" , "Klasyczny sposób pokazuje wszystkie wiadomości posortowane według daty ich publikacji. Wyświetlanie według tematu pokaże całą ostatnią wiadomość z danego tematu, a dla pozostałych tylko ich tematy."); +define('_MI_NW_ADISPLAYNAMEDSC' , 'Wybierz sposób wyświetlania informacji o autorze.'); +define("_MI_NW_COLUMNMODE_DESC" , "Możesz wybrać ilość kolumn w których będą wyświetlane wiadomości."); +define("_MI_NW_STORYCOUNTADMIN_DESC" , ""); +define("_MI_NW_UPLOADFILESIZE_DESC" , ""); +define("_MI_NW_UPLOADGROUPS_DESC" , "Użytkownicy należący do następujących grup mogą dodawać pliki."); + +// Name of config item values +define("_MI_NW_NEWSCLASSIC" , "Klasyczny"); +define("_MI_NW_NEWSBYTOPIC" , "Według tematu"); +define("_MI_NW_DISPLAYNAME1" , "Nazwa użytkownika"); +define("_MI_NW_DISPLAYNAME2" , "Prawdziwe imię"); +define("_MI_NW_DISPLAYNAME3" , "Nie pokazuj informacji o autorze"); +define("_MI_NW_UPLOAD_GROUP1" , "Grupy mogące dodawać i akceptować pliki "); +define("_MI_NW_UPLOAD_GROUP2" , "Grupy mogące akceptować pliki"); +define("_MI_NW_UPLOAD_GROUP3" , "Wyłącz dodawanie plików"); + +// Text for notifications +define('_MI_NW_GLOBAL_NOTIFY' , 'Globalne'); +define('_MI_NW_GLOBAL_NOTIFYDSC' , 'Globalne opcje powiadamiania.'); + +define('_MI_NW_STORY_NOTIFY' , 'Wiadomości'); +define('_MI_NW_STORY_NOTIFYDSC' , 'Opcje powiadamiania, które będa obowiązywać obecne wiadomości.'); + + +define('_MI_NW_GLOBAL_NEWCATEGORY_NOTIFY' , 'Nowy temat'); +define('_MI_NW_GLOBAL_NEWCATEGORY_NOTIFYCAP' , 'Powiadom mnie gdy zostanie utworzony nowy temat.'); +define('_MI_NW_GLOBAL_NEWCATEGORY_NOTIFYDSC' , 'Otrzymaj powiadomienie gdy zostanie utworzony nowy temat.'); +define('_MI_NW_GLOBAL_NEWCATEGORY_NOTIFYSBJ' , '[{X_SITENAME}] {X_MODULE} automatyczne powiadomienie: Dodano nowy temat'); + +define('_MI_NW_GLOBAL_STORYSUBMIT_NOTIFY' , 'Dodano nową wiadomość '); +define('_MI_NW_GLOBAL_STORYSUBMIT_NOTIFYCAP' , 'Powiadom mnie gdy zostanie dodana nowa wiadomość (oczekująca na zatwierdzenie).'); +define('_MI_NW_GLOBAL_STORYSUBMIT_NOTIFYDSC' , 'Otrzymaj powiadomienie gdy zostanie dodana wiadomość (oczekująca na zatwierdzenie).'); +define('_MI_NW_GLOBAL_STORYSUBMIT_NOTIFYSBJ' , '[{X_SITENAME}] {X_MODULE} automatyczne powiadomienie: Oczekująca nowa wiadomość'); + +define('_MI_NW_GLOBAL_NEWSTORY_NOTIFY' , 'Nowa wiadomość '); +define('_MI_NW_GLOBAL_NEWSTORY_NOTIFYCAP' , 'Powiadom mnie gdy ukaże się nowa wiadomość.'); +define('_MI_NW_GLOBAL_NEWSTORY_NOTIFYDSC' , 'Otrzymaj powiadomienie gdy zostanie dodana wiadomość.'); +define('_MI_NW_GLOBAL_NEWSTORY_NOTIFYSBJ' , '[{X_SITENAME}] {X_MODULE} automatyczne powiadomienie: Nowa wiadomość'); + +define('_MI_NW_STORY_APPROVE_NOTIFY' , 'Wiadomość zaakceptowana'); +define('_MI_NW_STORY_APPROVE_NOTIFYCAP' , 'Powiadom mnie gdy wiadomość zostanie zaakceptowana.'); +define('_MI_NW_STORY_APPROVE_NOTIFYDSC' , 'Otrzymaj powiadomienie gdy wiadomość zostanie zaakceptowana. '); +define('_MI_NW_STORY_APPROVE_NOTIFYSBJ' , '[{X_SITENAME}] {X_MODULE} automatyczne powiadomienie : Wiadomość zaakceptowana'); + +define('_MI_NW_RESTRICTINDEX' , 'Ograniczenie dostępu zgodnie według praw dla grup i tematów'); +define('_MI_NW_RESTRICTINDEXDSC' , 'Jeśli wybierzesz tak to użytkownicy będą mogli zobaczyć wiadomości do których mają prawo oglądania ustawione dla odpowiednich grup w prawach dostępu.'); + +define('_MI_NW_NEWSBYTHISAUTHOR' , 'Wiadomości tego samego autora'); +define('_MI_NW_NEWSBYTHISAUTHORDSC' , 'Jeśli wybierzesz tak to w wiadomości będzie widoczny link \'Wiadomości tego samego autora\'.'); + +define('_MI_NW_PREVNEX_LINK' , 'Pokazywać poprzedni i następny link?'); +define('_MI_NW_PREVNEX_LINK_DESC' , 'Jeśli wybierzesz tak to dwa nowe linki pojawią sie w dole każdego artykułu. Te linki pomogą w nawigowaniu przez wieści zgodni z ich data publikacji.'); +define('_MI_NW_SUMMARY_SHOW' , 'Pokazywać podsumowanie?'); +define('_MI_NW_SUMMARY_SHOW_DESC' , 'Jeśli wybierzesz tak podsumowanie wszystkich ostatnio opublikowanych artykułów będzie widoczne w dole ostatnio opublikowanych artykułów.'); +define('_MI_NW_AUTHOR_EDIT' , 'Umożliwić autorom edytowanie swoich wiadomości?'); +define('_MI_NW_AUTHOR_EDIT_DESC' , 'Jeśli wybierzesz tak to autorzy bedą mogli zmieniać swoje wiadomości.'); +define('_MI_NW_RATE_NEWS' , 'Umożliwić użytkownikom ocenianie wiadomości?'); +define('_MI_NW_TOPICS_RSS' , 'Umożliwić używanie RSS dla tematów?'); +define('_MI_NW_TOPICS_RSS_DESC' , "Jeśli wybierzesz tak zawartość tematu będzie dostępna przez RSS."); +define('_MI_NW_DATEFORMAT' , "Format daty"); +define('_MI_NW_DATEFORMAT_DESC' , "Proszę sprawdzić dokumentację PHP (http://fr.php.net/manual/en/function.date.php) aby uzyskać informację o sposobie wyboru formatu daty. Jeśli nic nie zostanie wpisane, XOOPS użyje standardowego formatu."); +define('_MI_NW_META_DATA' , "Umożliwić wprowadzanie informacji Meta Keywords i Meta Description?"); +define('_MI_NW_META_DATA_DESC' , "Jeśli wybierzesz tak to osoby akceptujące dany artykuł będą mogły wprowadzić informacje w dwoch dodatkowych polach Meta Keywords i Meta Description."); +define('_MI_NW_BNAME8' , 'Losowa wiadomość'); +define('_MI_NW_NEWSLETTER' , 'Biuletyn'); +define('_MI_NW_STATS' , 'Statystyki'); +define("_MI_NW_FORM_OPTIONS" , "Wybierz edytor"); +define("_MI_NW_FORM_COMPACT" , "Compact"); +define("_MI_NW_FORM_DHTML" , "DHTML"); +define("_MI_NW_FORM_SPAW" , "Spaw"); +define("_MI_NW_FORM_HTMLAREA" , "HtmlArea"); +define("_MI_NW_FORM_FCK" , "FCK"); +define("_MI_NW_FORM_KOIVI" , "Koivi"); +define("_MI_NW_FORM_OPTIONS_DESC" , "Wybierz edytor. Jeśli posiadasz standardową instalację (tzn. używasz tylko wbudowanych klas xoops, które są dostarczane w pakiecie standardowym), to możesz wybrać tylko pomiędzy DHTML i Compact."); +define("_MI_NW_KEYWORDS_HIGH" , "Podświetlić szukane wyrazy?"); +define("_MI_NW_KEYWORDS_HIGH_DESC" , "Jeśli wybierzesz tak szukane wyrazy będą podświetlone w artykułach."); +define("_MI_NW_HIGH_COLOR" , "Kolor podświetlania wyrazów"); +define("_MI_NW_HIGH_COLOR_DES" , "Jest używany tylko w wypadku wybrania tak we wcześniejszej opcji."); +define("_MI_NW_INFOTIPS" , "Długość dymka wiadomości"); +define("_MI_NW_INFOTIPS_DES" , "Jeśli wybierzesz tak link do wiadomości bedzie zwierał w dymku (n-ilość liter) pierwszych liter z artykułu. Jeśli ustawisz długość na 0 dymek będzie pusty."); +define("_MI_NW_SITE_NAVBAR" , "Belka nawigacyjna dla Mozilli i Opery (nie wiem o co tu chodzi, jak ktoś wie to proszę o kontakt - dap)"); +define("_MI_NW_SITE_NAVBAR_DESC" , "Jeśli wybierzesz tak to odwiedzjący strone będą mogli użyc belki nawigacyjnej tych przeglądarek na stronie do przechodzenia pomiędzy artykułami."); +define("_MI_NW_TABS_SKIN" , "Wybierz motyw graficzny dla zakładek.s"); +define("_MI_NW_TABS_SKIN_DESC" , "Ten motyw graficzny będzie użyty we wszystkich blokach które używaja zakładek."); +define("_MI_NW_SKIN_1" , "Styl zakładek"); +define("_MI_NW_SKIN_2" , "Ukośny(?)"); +define("_MI_NW_SKIN_3" , "Klasyczny"); +define("_MI_NW_SKIN_4" , "Katalogi"); +define("_MI_NW_SKIN_5" , "Styl Mac Os"); +define("_MI_NW_SKIN_6" , "Prosty"); +define("_MI_NW_SKIN_7" , "Zaokrąglony"); +define("_MI_NW_SKIN_8" , "Styl ZDnet"); + +// Added in version 1.50 +define('_MI_NW_BNAME9','Archives'); +define("_MI_NW_FORM_TINYEDITOR","TinyEditor"); +define("_MI_NW_FOOTNOTES","Shows links in printable versions of your articles ?"); +define("_MI_NW_DUBLINCORE","Ativate Dublin Core Metadata ?"); +define("_MI_NW_DUBLINCORE_DSC","For more information, <a href='http://dublincore.org/'>visit this link</a>"); +define("_MI_NW_BOOKMARK_ME","Display a 'Bookmark this article at these sites' block ?"); +define("_MI_NW_BOOKMARK_ME_DSC","This block will be visible on the article's page"); +define("_MI_NW_FF_MICROFORMAT","Activate Firefox 2 Micro Summaries ?"); +define("_MI_NW_FF_MICROFORMAT_DSC","For more information, see <a href='http://wiki.mozilla.org/Microsummaries' target='_blank'>this page</a>"); +define("_MI_NW_WHOS_WHO","Who's Who"); +define("_MI_NW_METAGEN","Metagen"); +define("_MI_NW_TOPICS_DIRECTORY","Topics Directory"); +define("_MI_NW_ADVERTISEMENT","Advertisement"); +define("_MI_NW_ADV_DESCR","Enter a text or a javascript code to display in your articles"); +define("_MI_NW_MIME_TYPES","Enter authorized Mime Types for upload (separated them on a new line)"); +define("_MI_NW_ENHANCED_PAGENAV","Use enhanced page navigator ?"); +define("_MI_NW_ENHANCED_PAGENAV_DSC","With this option you can separate your pages with something like this : [pagebreak:Page Title], the links to the pages are replaced by a dropdown list and you can use [summary] to create an automatic summary of pages"); + +// Added in version 1.54 +define('_MI_NW_CATEGORY_NOTIFY','Dotyczące tematu/działu'); +define('_MI_NW_CATEGORY_NOTIFYDSC','Opcje powiadamiania które odnoszą się do bieżącej kategorii'); + +define('_MI_NW_CATEGORY_STORYPOSTED_NOTIFY', 'Nowy news został wysłany'); +define('_MI_NW_CATEGORY_STORYPOSTED_NOTIFYCAP', 'Powiadom mnie gdy nowa wiadomość będzie wysłana w tym temacie.'); +define('_MI_NW_CATEGORY_STORYPOSTED_NOTIFYDSC', 'Otbieraj powiadomienia kiedy nowa wiadomość jest wysłana w tym temacie.'); +define('_MI_NW_CATEGORY_STORYPOSTED_NOTIFYSBJ', '[{X_SITENAME}] {X_MODULE} : Nowy news'); + +// Added in version 1.63 +define('_MI_NW_TAGS', "Używać systemu tagów ?"); +define('_MI_NW_TAGS_DSC', "Ta opcja bazuje na module XOOPS Tag napisanym przez phppp"); +define("_MI_NW_BNAME10", "Chmura tagów"); +define("_MI_NW_BNAME11", "Top Tags"); +define("_MI_NW_INTRO_TEXT", "Tekst wprowadzenia pojawi się na stronie wysyłania newsa"); +define("_MI_NW_IMAGE_MAX_WIDTH", "Maksymalna szerokość obrazka gdy jest przeskalowany"); +define("_MI_NW_IMAGE_MAX_HEIGHT", "Maksymalna wysokość obrazka gdy jest przeskalowany"); + +// Added in version 1.67 +define("_MI_NW_CLONER", "Menadżer klonowania"); + +define("_MI_NW_LATESTNEWS_BLOCK", "Blok najnowszych newsów"); + +// Added in version 1.68 BETA +define("_MI_NW_TOPICDISPLAY", "Wyświetl tematy "); +define("_MI_NW_TOPICDISPLAYDESC", "Wyświetlanie tytułów tematów w tytułowych nagłówkach"); + +define("_MI_NW_SEOENABLE", "Włącz SEO "); +define("_MI_NW_SEOENABLEDESC", "This will enable/disable SEO activity.<br /> If <b>htaccess</b> is selected you will get: <br /> http://your.site.com/<b>xnews</b>/topics.1/your-topic-title.html <br /> If path-info is selected you will get: <br /> http://your.site.com/modules/xnews/index.php/topics.1/your-topic-title.html"); + +// Added in version 1.68 RC1 +define("_MI_NW_EXTEND_META_DATA", "Extend meta-data input"); +define("_MI_NW_EXTEND_META_DATA_DESC", "This will toggle between text and textarea for user edit meta-data input<br /> for both description and keywords."); + +define("_MI_NW_NONE", "None"); +define("_MI_NW_TOPONLY", "Top only"); +define("_MI_NW_BOTTOMONLY", "Bottom only"); +define("_MI_NW_BOTH", "Both"); +define("_MI_NW_DISPLAYLINKICNS", "Display Link Icons"); +define("_MI_NW_DISPLAYLINKICNSDESC", "Display print, friend and pdf icons none-top-bottom-both"); + +define("_MI_NW_SEOPATH", "SEO path "); +define("_MI_NW_SEOPATHDESC", "This will add a title to SEO url for both <b>htaccess</b> and <b>path-info</b> modes. <br /> If left empty you will get: <br /> http://your.site.com/topics.1/your-topic-title.html <br /> If you type <b>news</b> you will get: <br /> http://your.site.com/<b>news</b>/topics.1/your-topic-title.html <br /><br /> <b>a-z chars and minus char accepted. eg. news-of-day</b>"); +define("_MI_NW_SEOLEVEL", "SEO level "); +define("_MI_NW_SEOLEVELDESC", "Here you can chose whether to have htaccess in xoops root dir or in module one. <br /> This will change the appearance of the url. <br /> In root level: <br /> http://your.site.com/news/topics.1/your-topic-title.html <br /> In module level: <br /> http://your.site.com/modules/xnews/news.topics.1/your-topic-title.html<br /><br /> Only works in htaccess mode and htaccess files will have to be installed accordingly."); +define("_MI_NW_MODULE_LEVEL", "Module level"); +define("_MI_NW_ROOT_LEVEL", "Root level"); + +//ADDED wishcraft 1.68 +define("_MI_NW_SEOENDOFURL", "End of URL"); +define("_MI_NW_SEOENDOFURL_DESC", "File Extension to HTML Files"); +define("_MI_NW_SEOENDOFURLRSS", "End of URL"); +define("_MI_NW_SEOENDOFURLRSS_DESC", "File Extension to RSS Pages"); +define("_MI_NW_SEOENDOFURLPDF", "End of URL"); +define("_MI_NW_SEOENDOFURLPDF_DESC", "File Extension to Adobe Acrobat (PDF) Files"); + +//ADDED in version 1.71 +define("_MI_NW_PDF_DISPLAY", "Wyświetlaj dołączone pliki PDF"); +define("_MI_NW_PDF_DISPLAY_DESC", "Wyświetla dołączone pliki PDF na stronie newsa."); +define("_MI_NW_PDF_DETECT", "Włącz wykrywanie pluginów PDF"); +define("_MI_NW_PDF_DETECT_DESC", "Włączenie spowoduje, że przeglądarka użytkownika nie będzie pokazywać ramek iframe PDF <br /> gdy plugin PDF nie jest zainstalowany w przeglądarce. <br /> Działa razem z opcją Wyświetlaj dołączone pliki PDF."); +define("_MI_NW_IMAGES_DISPLAY", "Wyświetlaj załączone obrazy"); +define("_MI_NW_IMAGES_DISPLAY_DESC", "Wyświetla załączone obrazy na stronie newsa."); +define("_MI_NW_THUMB_MAX_WIDTH", "Maksymalna szerokość miniaturki załączonego obrazu gdy ten jest przeskalowany"); +define("_MI_NW_THUMB_MAX_HEIGHT", "Maksymalna wysokość miniaturki załączonego obrazu gdy ten jest przeskalowany"); + +?> \ No newline at end of file Added: XoopsLanguages/polish/modules/xnews/1.71/language/polish/newsletter.php =================================================================== --- XoopsLanguages/polish/modules/xnews/1.71/language/polish/newsletter.php (rev 0) +++ XoopsLanguages/polish/modules/xnews/1.71/language/polish/newsletter.php 2012-02-20 15:00:38 UTC (rev 9036) @@ -0,0 +1,17 @@ +<?php +$newslettertemplate=<<<contentend +Tytuł : %title% +Temat : %topic_title% +Wydawca : %publisher% +Wydany dnia : %published% +Ocena : %rating% +Czytany : %reads% + +Zawiera : +%hometext% + +Czytaj więcej : %link% + ---------------------------------------------------------------------------- + +contentend; +?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-02-20 10:31:02
|
Revision: 9035 http://xoops.svn.sourceforge.net/xoops/?rev=9035&view=rev Author: voltan1 Date: 2012-02-20 10:30:51 +0000 (Mon, 20 Feb 2012) Log Message: ----------- Add department Modified Paths: -------------- XoopsModules/contact/branches/v1.8/class/contact.php XoopsModules/contact/branches/v1.8/language/english/main.php XoopsModules/contact/branches/v1.8/language/english/modinfo.php XoopsModules/contact/branches/v1.8/xoops_version.php Modified: XoopsModules/contact/branches/v1.8/class/contact.php =================================================================== --- XoopsModules/contact/branches/v1.8/class/contact.php 2012-02-20 09:28:08 UTC (rev 9034) +++ XoopsModules/contact/branches/v1.8/class/contact.php 2012-02-20 10:30:51 UTC (rev 9035) @@ -106,7 +106,17 @@ if(xoops_getModuleOption('form_address','contact')) { $form->addElement ( new XoopsFormTextArea ( _MD_CONTACT_ADDRESS, 'contact_address', $this->getVar ( 'contact_address', 'e' ), 3, 60 ), false ); } - + if(xoops_getModuleOption('form_dept','contact')) { + // show a drop down with the correct departments listed + $departmentlist = new XoopsFormSelect( _MD_CONTACT_DEPARTMENT, 'contact_department' ); + $departments = xoops_getModuleOption('contact_dept','contact'); + foreach( $departments as $val ) { + $valexplode = explode( ',', $val ); + $departmentlist->addOption($valexplode[0]); + } + $form->addElement( $departmentlist ); + } + $form->addElement ( new XoopsFormText ( _MD_CONTACT_SUBJECT, 'contact_subject', 50, 255, $this->getVar ( 'contact_subject' )), true ); $form->addElement(new XoopsFormTextArea ( _MD_CONTACT_MESSAGE, 'contact_message', $this->getVar ( 'contact_message', 'e' ), 5, 60 ), true ); @@ -214,7 +224,7 @@ $contact['contact_company'] = $this->Contact_CleanVars($_POST, 'contact_company', '', 'string'); $contact['contact_location'] = $this->Contact_CleanVars($_POST, 'contact_location', '', 'text'); $contact['contact_phone'] = $this->Contact_CleanVars($_POST, 'contact_phone', '', 'int'); - $contact['contact_department'] = $this->Contact_CleanVars($_POST, 'contact_department', 'contact', 'string'); + $contact['contact_department'] = $this->Contact_CleanVars($_POST, 'contact_department', _MD_CONTACT_DEFULTDEP, 'string'); $contact['contact_ip'] = getenv ( "REMOTE_ADDR" ); $contact['contact_message'] = $this->Contact_CleanVars($_POST, 'contact_message', '', 'text'); $contact['contact_address'] = $this->Contact_CleanVars($_POST, 'contact_address', '', 'text'); Modified: XoopsModules/contact/branches/v1.8/language/english/main.php =================================================================== --- XoopsModules/contact/branches/v1.8/language/english/main.php 2012-02-20 09:28:08 UTC (rev 9034) +++ XoopsModules/contact/branches/v1.8/language/english/main.php 2012-02-20 10:30:51 UTC (rev 9035) @@ -10,6 +10,8 @@ define("_MD_CONTACT_ADDRESS","Address"); define("_MD_CONTACT_SUBJECT","Subject"); define("_MD_CONTACT_MESSAGE","Comment"); +define("_MD_CONTACT_DEPARTMENT","Department"); +define("_MD_CONTACT_DEFULTDEP","Contact"); define("_MD_CONTACT_MES_SEND","Thank you for Contact Us"); define("_MD_CONTACT_MES_NOVALIDEMAIL","Your Email is not Valida"); Modified: XoopsModules/contact/branches/v1.8/language/english/modinfo.php =================================================================== --- XoopsModules/contact/branches/v1.8/language/english/modinfo.php 2012-02-20 09:28:08 UTC (rev 9034) +++ XoopsModules/contact/branches/v1.8/language/english/modinfo.php 2012-02-20 10:30:51 UTC (rev 9035) @@ -31,7 +31,17 @@ define("_MI_CONTACT_FORM_PHONE_DESC", ""); define("_MI_CONTACT_FORM_ADDRESS", "Get Address"); define("_MI_CONTACT_FORM_ADDRESS_DESC", ""); +define("_MI_CONTACT_FORM_DEPT", "Select Departments"); +define("_MI_CONTACT_FORM_DEPT_DESC", ""); +define("_MI_CONTACT_DEPT", "Departments"); +define("_MI_CONTACT_DEPT_DESC", "Departments allow you to define a department/email combination. Users selecting<br />" +."from a defined department will have their contact information sent to the corresponding<br />" +."email address you define.<br /><br />" +."Define each department/email as follows:<br /><br />" +."dept1,email1|dept2,email2|dept3,email3 etc. - each department and email must be seperated<br />" +."by a comma ',', and each department email combination bust be seperated by a pipe '|'" ); + define("_MI_CONTACT_PERPAGE", "Perpage"); define("_MI_CONTACT_PERPAGE_DESC", ""); Modified: XoopsModules/contact/branches/v1.8/xoops_version.php =================================================================== --- XoopsModules/contact/branches/v1.8/xoops_version.php 2012-02-20 09:28:08 UTC (rev 9034) +++ XoopsModules/contact/branches/v1.8/xoops_version.php 2012-02-20 10:30:51 UTC (rev 9035) @@ -127,7 +127,23 @@ 'description' => '_MI_CONTACT_FORM_ADDRESS_DESC', 'formtype' => 'yesno', 'valuetype' => 'int', - 'default' => 0); + 'default' => 0); + +$modversion['config'][] = array( + 'name' => 'form_dept', + 'title' => '_MI_CONTACT_FORM_DEPT', + 'description' => '_MI_CONTACT_FORM_DEPT_DESC', + 'formtype' => 'yesno', + 'valuetype' => 'int', + 'default' => 0); + +$modversion['config'][] = array( + 'name' => 'contact_dept', + 'title' => '_MI_CONTACT_DEPT', + 'description' => '_MI_CONTACT_DEPT_DESC', + 'formtype' => 'textarea', + 'valuetype' => 'array', + 'default' => ''); $modversion['config'][] = array( 'name' => 'break', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-02-20 09:28:20
|
Revision: 9034 http://xoops.svn.sourceforge.net/xoops/?rev=9034&view=rev Author: voltan1 Date: 2012-02-20 09:28:08 +0000 (Mon, 20 Feb 2012) Log Message: ----------- Add version 1.8 alpah for test and debug Added Paths: ----------- XoopsModules/contact/branches/v1.8/ XoopsModules/contact/branches/v1.8/admin/ XoopsModules/contact/branches/v1.8/admin/about.php XoopsModules/contact/branches/v1.8/admin/contact.php XoopsModules/contact/branches/v1.8/admin/footer.php XoopsModules/contact/branches/v1.8/admin/header.php XoopsModules/contact/branches/v1.8/admin/index.html XoopsModules/contact/branches/v1.8/admin/index.php XoopsModules/contact/branches/v1.8/admin/menu.php XoopsModules/contact/branches/v1.8/admin/tools.php XoopsModules/contact/branches/v1.8/class/ XoopsModules/contact/branches/v1.8/class/contact.php XoopsModules/contact/branches/v1.8/class/index.html XoopsModules/contact/branches/v1.8/css/ XoopsModules/contact/branches/v1.8/css/admin.css XoopsModules/contact/branches/v1.8/css/index.html XoopsModules/contact/branches/v1.8/docs/ XoopsModules/contact/branches/v1.8/docs/changelog.txt XoopsModules/contact/branches/v1.8/docs/credits.txt XoopsModules/contact/branches/v1.8/docs/index.html XoopsModules/contact/branches/v1.8/docs/install.txt XoopsModules/contact/branches/v1.8/docs/lang_diff.txt XoopsModules/contact/branches/v1.8/docs/licence.txt XoopsModules/contact/branches/v1.8/docs/readme.txt XoopsModules/contact/branches/v1.8/header.php XoopsModules/contact/branches/v1.8/images/ XoopsModules/contact/branches/v1.8/images/contact_slogo.png XoopsModules/contact/branches/v1.8/images/index.html XoopsModules/contact/branches/v1.8/include/ XoopsModules/contact/branches/v1.8/include/functions.php XoopsModules/contact/branches/v1.8/include/functions_update.php XoopsModules/contact/branches/v1.8/include/index.html XoopsModules/contact/branches/v1.8/index.php XoopsModules/contact/branches/v1.8/js/ XoopsModules/contact/branches/v1.8/js/admin.js XoopsModules/contact/branches/v1.8/js/index.html XoopsModules/contact/branches/v1.8/language/ XoopsModules/contact/branches/v1.8/language/english/ XoopsModules/contact/branches/v1.8/language/english/admin.php XoopsModules/contact/branches/v1.8/language/english/help/ XoopsModules/contact/branches/v1.8/language/english/help/help.html XoopsModules/contact/branches/v1.8/language/english/help/index.html XoopsModules/contact/branches/v1.8/language/english/index.html XoopsModules/contact/branches/v1.8/language/english/main.php XoopsModules/contact/branches/v1.8/language/english/modinfo.php XoopsModules/contact/branches/v1.8/language/index.html XoopsModules/contact/branches/v1.8/readme.html XoopsModules/contact/branches/v1.8/sql/ XoopsModules/contact/branches/v1.8/sql/index.html XoopsModules/contact/branches/v1.8/sql/mysql.sql XoopsModules/contact/branches/v1.8/templates/ XoopsModules/contact/branches/v1.8/templates/admin/ XoopsModules/contact/branches/v1.8/templates/admin/contact_about.html XoopsModules/contact/branches/v1.8/templates/admin/contact_contact.html XoopsModules/contact/branches/v1.8/templates/admin/contact_index.html XoopsModules/contact/branches/v1.8/templates/admin/contact_tools.html XoopsModules/contact/branches/v1.8/templates/admin/index.html XoopsModules/contact/branches/v1.8/templates/contact_index.html XoopsModules/contact/branches/v1.8/templates/index.html XoopsModules/contact/branches/v1.8/xoops_version.php Added: XoopsModules/contact/branches/v1.8/admin/about.php =================================================================== --- XoopsModules/contact/branches/v1.8/admin/about.php (rev 0) +++ XoopsModules/contact/branches/v1.8/admin/about.php 2012-02-20 09:28:08 UTC (rev 9034) @@ -0,0 +1,33 @@ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +*/ + +/** + * Contact module + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @author Hossein Azizabadi (AKA Voltan) + * @version $Id$ + */ + +// Call header +require dirname(__FILE__) . '/header.php'; +// Display Admin header +xoops_cp_header(); + +$xoopsTpl->assign('navigation', $admin_class->addNavigation('about.php')); +$xoopsTpl->assign('renderabout', $admin_class->renderabout('6KJ7RW5DR3VTJ', false)); + +// Call template file +$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_about.html'); +// Call footer +require dirname(__FILE__) . '/footer.php'; +?> \ No newline at end of file Added: XoopsModules/contact/branches/v1.8/admin/contact.php =================================================================== --- XoopsModules/contact/branches/v1.8/admin/contact.php (rev 0) +++ XoopsModules/contact/branches/v1.8/admin/contact.php 2012-02-20 09:28:08 UTC (rev 9034) @@ -0,0 +1,180 @@ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +*/ + +/** + * Contact module + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @author Hossein Azizabadi (AKA Voltan) + * @version $Id$ + */ + +// Call header +require dirname(__FILE__) . '/header.php'; +// Display Admin header +xoops_cp_header(); +// Define default value +$op = $contact_handler->Contact_CleanVars($_REQUEST, 'op', 'list', 'string'); +$contact_id = $contact_handler->Contact_CleanVars($_REQUEST, 'id', '0', 'int'); + +// Define scripts +$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js'); +$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js'); +$xoTheme->addScript(XOOPS_URL . '/modules/contact/js/admin.js'); +// Add module stylesheet +$xoTheme->addStylesheet(XOOPS_URL . '/modules/contact/css/admin.css'); +$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css'); +$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css'); + +switch ($op) +{ + case 'list': + $contact = array(); + $contact['perpage'] = '10'; + $contact['order'] = 'DESC'; + $contact['sort'] = 'contact_id'; + + // get limited information + if (isset($_REQUEST['limit'])) { + $contact['limit'] = $contact_handler->Contact_CleanVars($_REQUEST, 'limit', 0, 'int'); + } else { + $contact['limit'] = $contact['perpage']; + } + + // get start information + if (isset($_REQUEST['start'])) { + $contact['start'] = $contact_handler->Contact_CleanVars($_REQUEST, 'start', 0, 'int'); + } else { + $contact['start'] = 0; + } + + $contact_numrows = $contact_handler->Contact_GetCount('contact_cid'); + $contacts = $contact_handler->Contact_GetAdminList($contact , 'contact_cid'); + + if ($contact_numrows > $contact['limit']) { + $contact_pagenav = new XoopsPageNav($contact_numrows, $contact['limit'], $contact['start'], 'start', 'limit=' . $contact['limit']); + $contact_pagenav = $contact_pagenav->renderNav(4); + } else { + $contact_pagenav = ''; + } + + $xoopsTpl->assign('contacts', $contacts); + $xoopsTpl->assign('contact_pagenav', $contact_pagenav); + $level = 'list'; + break; + + case 'reply': + if ($contact_id > 0) { + $obj = $contact_handler->get($contact_id); + if($obj->getVar('contact_cid') != 0) { + redirect_header ( 'contact.php', 3, _AM_CONTACT_CANTREPLY); + } + $form = $obj->Contact_ReplyForm(); + $xoopsTpl->assign('replyform', $form->render()); + $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id)); + } else { + redirect_header ( 'contact.php', 3, _AM_CONTACT_EXIST); + } + $level = 'reply'; + break; + + case 'doreply': + + // check email + if ( !$contact_handler->Contact_CleanVars($_POST, 'contact_mailto', '', 'mail') ) { + redirect_header ( "contact.php", 3, _MD_CONTACT_MES_NOVALIDEMAIL ); + exit(); + } + + // Info Processing + $contact = $contact_handler->Contact_InfoProcessing($_POST); + + // insert in DB + if($saveinfo = true) { + $obj = $contact_handler->create(); + $obj->setVars ( $contact ); + + if(!$contact_handler->insert ( $obj )) { + redirect_header ( "contact.php", 3, '4' ); + exit(); + } + + $contact_handler->Contact_AddReply( $contact['contact_cid'] ); + + } + + // send mail can seet message + if($sendmail = true) { + $message = $contact_handler->Contact_SendMail($contact); + } else if ($saveinfo = true) { + $message = _MD_CONTACT_MES_SAVEINDB; + } else { + $message = _MD_CONTACT_MES_SENDERROR; + } + + redirect_header ( "contact.php", 3, $message ); + + $level = 'doreply'; + break; + case 'view': + + $obj = $contact_handler->get ( $contact_id ); + + if(!$obj) { + redirect_header ( 'contact.php', 3, _AM_CONTACT_EXIST); + exit (); + } + + $contact = array (); + $contact = $obj->toArray (); + $contact['contact_id'] = $obj->getVar('contact_id'); + $contact['contact_uid'] = $obj->getVar('contact_uid'); + $contact['contact_name'] = $obj->getVar('contact_name'); + $contact['contact_owner'] = XoopsUser::getUnameFromId ( $obj->getVar('contact_uid') ); + $contact['contact_subject'] = $obj->getVar('contact_subject'); + $contact['contact_mail'] = $obj->getVar('contact_mail'); + $contact['contact_url'] = $obj->getVar('contact_url'); + $contact['contact_create'] = formatTimestamp ( $obj->getVar('contact_create'), _MEDIUMDATESTRING ); + $contact['contact_icq'] = $obj->getVar('contact_icq'); + $contact['contact_company'] = $obj->getVar('contact_company'); + $contact['contact_location'] = $obj->getVar('contact_location'); + $contact['contact_phone'] = $obj->getVar('contact_phone'); + $contact['contact_department'] = $obj->getVar('contact_department'); + $contact['contact_ip'] = $obj->getVar('contact_ip'); + $contact['contact_message'] = $obj->getVar('contact_message'); + $contact['contact_address'] = $obj->getVar('contact_address'); + + $xoopsTpl->assign('contact', $contact); + $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id)); + + $level = 'view'; + break; + + case 'edit': + + $level = 'edit'; + break; + + case 'delete': + + $level = 'delete'; + break; +} + +$xoopsTpl->assign('navigation', $admin_class->addNavigation('contact.php')); +$xoopsTpl->assign('level', $level); + +// Call template file +$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_contact.html'); +// Call footer +require dirname(__FILE__) . '/footer.php'; +?> \ No newline at end of file Added: XoopsModules/contact/branches/v1.8/admin/footer.php =================================================================== --- XoopsModules/contact/branches/v1.8/admin/footer.php (rev 0) +++ XoopsModules/contact/branches/v1.8/admin/footer.php 2012-02-20 09:28:08 UTC (rev 9034) @@ -0,0 +1,22 @@ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +*/ + +/** + * Contact module + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @author Hossein Azizabadi (AKA Voltan) + * @version $Id$ + */ + +xoops_cp_footer(); +?> \ No newline at end of file Added: XoopsModules/contact/branches/v1.8/admin/header.php =================================================================== --- XoopsModules/contact/branches/v1.8/admin/header.php (rev 0) +++ XoopsModules/contact/branches/v1.8/admin/header.php 2012-02-20 09:28:08 UTC (rev 9034) @@ -0,0 +1,51 @@ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +*/ + +/** + * Contact module + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @author Hossein Azizabadi (AKA Voltan) + * @version $Id$ + */ + +$path = dirname(dirname(dirname(dirname(__FILE__)))); + +include_once $path . '/mainfile.php'; +include_once XOOPS_ROOT_PATH . '/include/cp_functions.php'; +include_once XOOPS_ROOT_PATH . '/include/cp_header.php'; +include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; +include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php'; +global $xoopsModule; + +$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname'); + +// Load language files +xoops_loadLanguage('admin', $thisModuleDir); +xoops_loadLanguage('modinfo', $thisModuleDir); +xoops_loadLanguage('main', $thisModuleDir); + +$pathIcon16 = '../'.$xoopsModule->getInfo('icons16'); +$pathIcon32 = '../'.$xoopsModule->getInfo('icons32'); +$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin'); + +// Contact Handler +$contact_handler = & xoops_getModuleHandler ( 'contact', 'contact' ); + +// Locad admin menu class +if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){ + include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'); +}else{ + redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false); +} + +$admin_class = new ModuleAdmin(); \ No newline at end of file Added: XoopsModules/contact/branches/v1.8/admin/index.html =================================================================== --- XoopsModules/contact/branches/v1.8/admin/index.html (rev 0) +++ XoopsModules/contact/branches/v1.8/admin/index.html 2012-02-20 09:28:08 UTC (rev 9034) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/contact/branches/v1.8/admin/index.php =================================================================== --- XoopsModules/contact/branches/v1.8/admin/index.php (rev 0) +++ XoopsModules/contact/branches/v1.8/admin/index.php 2012-02-20 09:28:08 UTC (rev 9034) @@ -0,0 +1,36 @@ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +*/ + +/** + * Contact module + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @author Hossein Azizabadi (AKA Voltan) + * @version $Id$ + */ + +// Call header +require dirname(__FILE__) . '/header.php'; +// Display Admin header +xoops_cp_header(); + +// Display Admin menu class +$admin_class->addInfoBox(_AM_CONTACT_INDEX_ADMENU1); +$admin_class->addInfoBoxLine(_AM_CONTACT_INDEX_ADMENU1, _AM_CONTACT_INDEX_TOTAL, $contact_handler->Contact_GetCount('contact_cid')); +$xoopsTpl->assign('navigation', $admin_class->addNavigation('index.php')); +$xoopsTpl->assign('renderindex', $admin_class->renderIndex()); + +// Call template file +$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_index.html'); +// Call footer +require dirname(__FILE__) . '/footer.php'; +?> \ No newline at end of file Added: XoopsModules/contact/branches/v1.8/admin/menu.php =================================================================== --- XoopsModules/contact/branches/v1.8/admin/menu.php (rev 0) +++ XoopsModules/contact/branches/v1.8/admin/menu.php 2012-02-20 09:28:08 UTC (rev 9034) @@ -0,0 +1,53 @@ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +*/ + +/** + * Contact module + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @author Hossein Azizabadi (AKA Voltan) + * @version $Id$ + */ + +defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined"); + +$dirname = basename(dirname(dirname(__FILE__))); +$module_handler = xoops_gethandler('module'); +$module = $module_handler->getByDirname($dirname); +$pathIcon32 = $module->getInfo('icons32'); + +//xoops_loadLanguage('admin', $dirname); + +$adminmenu = array(); + +$i = 1; +$adminmenu[$i]["title"] = _MI_CONTACT_MENU_HOME; +$adminmenu[$i]["link"] = "admin/index.php"; +$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_HOME_DESC; +$adminmenu[$i]["icon"] = $pathIcon32.'/home.png'; +$i++; +$adminmenu[$i]["title"] = _MI_CONTACT_MENU_CONTACT; +$adminmenu[$i]["link"] = "admin/contact.php"; +$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_CONTACT_DESC; +$adminmenu[$i]["icon"] = $pathIcon32.'/content.png'; +$i++; +$adminmenu[$i]["title"] = _MI_CONTACT_MENU_TOOLS; +$adminmenu[$i]["link"] = "admin/tools.php"; +$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_TOOLS_DESC; +$adminmenu[$i]["icon"] = $pathIcon32.'/exec.png'; +$i++; +$adminmenu[$i]["title"] = _MI_CONTACT_MENU_ABOUT; +$adminmenu[$i]["link"] = "admin/about.php"; +$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_ABOUT_DESC; +$adminmenu[$i]["icon"] = $pathIcon32.'/about.png'; + +?> \ No newline at end of file Added: XoopsModules/contact/branches/v1.8/admin/tools.php =================================================================== --- XoopsModules/contact/branches/v1.8/admin/tools.php (rev 0) +++ XoopsModules/contact/branches/v1.8/admin/tools.php 2012-02-20 09:28:08 UTC (rev 9034) @@ -0,0 +1,31 @@ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +*/ + +/** + * Contact module + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @author Hossein Azizabadi (AKA Voltan) + * @version $Id$ + */ + +// Call header +require dirname(__FILE__) . '/header.php'; +// Display Admin header +xoops_cp_header(); + +$xoopsTpl->assign('navigation', $admin_class->addNavigation('tools.php')); +// Call template file +$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_tools.html'); +// Call footer +require dirname(__FILE__) . '/footer.php'; +?> \ No newline at end of file Added: XoopsModules/contact/branches/v1.8/class/contact.php =================================================================== --- XoopsModules/contact/branches/v1.8/class/contact.php (rev 0) +++ XoopsModules/contact/branches/v1.8/class/contact.php 2012-02-20 09:28:08 UTC (rev 9034) @@ -0,0 +1,330 @@ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +*/ + +/** + * Contact module + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @author Hossein Azizabadi (AKA Voltan) + * @version $Id$ + */ + +if (!defined("XOOPS_ROOT_PATH")) { + die("XOOPS root path not defined"); +} + +class contact extends XoopsObject +{ + + function __construct() + { + $this->XoopsObject(); + $this->initVar("contact_id",XOBJ_DTYPE_INT,null,false,11); + $this->initVar("contact_uid",XOBJ_DTYPE_INT,null,false,11); + $this->initVar("contact_cid",XOBJ_DTYPE_INT,null,false,11); + $this->initVar("contact_name",XOBJ_DTYPE_TXTBOX, null, false); + $this->initVar("contact_subject",XOBJ_DTYPE_TXTBOX, null, false); + $this->initVar("contact_mail",XOBJ_DTYPE_EMAIL, null, false); + $this->initVar("contact_url",XOBJ_DTYPE_TXTBOX, null, false); + $this->initVar("contact_create", XOBJ_DTYPE_INT, null, false); + $this->initVar("contact_icq",XOBJ_DTYPE_TXTBOX, null, false); + $this->initVar("contact_company",XOBJ_DTYPE_TXTBOX, null, false); + $this->initVar("contact_location",XOBJ_DTYPE_TXTBOX, null, false); + $this->initVar("contact_phone",XOBJ_DTYPE_TXTBOX,null,false); + $this->initVar("contact_department",XOBJ_DTYPE_TXTBOX, null, false); + $this->initVar("contact_ip",XOBJ_DTYPE_TXTBOX, null, false); + $this->initVar("contact_message",XOBJ_DTYPE_TXTAREA, null, false); + $this->initVar("contact_address",XOBJ_DTYPE_TXTAREA, null, false); + $this->initVar("contact_reply",XOBJ_DTYPE_INT,null,false,1); + + $this->db = $GLOBALS ['xoopsDB']; + $this->table = $this->db->prefix ( 'contact' ); + } + + function Contact_ContactForm($department) { + + global $xoopsConfig, $xoopsOption, $xoopsUser; + + if($this->isNew()) { + if(!empty($xoopsUser)) { + $contact_uid = $xoopsUser->getVar('uid'); + $contact_name = $xoopsUser->getVar('uname'); + $contact_mail = $xoopsUser->getVar('email'); + $contact_url = $xoopsUser->getVar('url'); + $contact_icq = $xoopsUser->getVar('user_icq'); + $contact_location = $xoopsUser->getVar('user_from'); + + } else { + $contact_uid = 0; + $contact_name = ''; + $contact_mail = ''; + $contact_url = ''; + $contact_icq = ''; + $contact_location = ''; + } + } else { + $contact_uid = $this->getVar ( 'contact_uid'); + $contact_name = $this->getVar ( 'contact_name'); + $contact_mail = $this->getVar ( 'contact_mail'); + $contact_url = $this->getVar ( 'contact_url'); + $contact_icq = $this->getVar ( 'contact_icq'); + $contact_location = $this->getVar ( 'contact_location'); + } + + $form = new XoopsThemeForm(_MD_CONTACT_FORM, 'save', 'index.php', 'post', true); + $form->setExtra ( 'enctype="multipart/form-data"' ); + $form->addElement ( new XoopsFormHidden ( 'op', 'save' ) ); + $form->addElement ( new XoopsFormHidden ( 'contact_id', $this->getVar ( 'contact_id', 'e' ) ) ); + $form->addElement ( new XoopsFormHidden ( 'contact_uid', $contact_uid ) ); + $form->addElement ( new XoopsFormText ( _MD_CONTACT_NAME, 'contact_name', 50, 255, $contact_name), true ); + $form->addElement ( new XoopsFormText ( _MD_CONTACT_MAIL, 'contact_mail', 50, 255, $contact_mail), true ); + + if(xoops_getModuleOption('form_url','contact')) { + $form->addElement ( new XoopsFormText ( _MD_CONTACT_URL, 'contact_url', 50, 255, $contact_url), false ); + } + if(xoops_getModuleOption('form_icq','contact')) { + $form->addElement ( new XoopsFormText ( _MD_CONTACT_ICQ, 'contact_icq', 50, 255, $contact_icq), false ); + } + if(xoops_getModuleOption('form_company','contact')) { + $form->addElement ( new XoopsFormText ( _MD_CONTACT_COMPANY, 'contact_company', 50, 255, $this->getVar ( 'contact_company')), false ); + } + if(xoops_getModuleOption('form_location','contact')) { + $form->addElement ( new XoopsFormText ( _MD_CONTACT_LOCATION, 'contact_location', 50, 255, $contact_location), false ); + } + if(xoops_getModuleOption('form_phone','contact')) { + $form->addElement ( new XoopsFormText ( _MD_CONTACT_PHONE, 'contact_phone', 50, 255, $this->getVar ( 'contact_phone')), false ); + } + if(xoops_getModuleOption('form_address','contact')) { + $form->addElement ( new XoopsFormTextArea ( _MD_CONTACT_ADDRESS, 'contact_address', $this->getVar ( 'contact_address', 'e' ), 3, 60 ), false ); + } + + $form->addElement ( new XoopsFormText ( _MD_CONTACT_SUBJECT, 'contact_subject', 50, 255, $this->getVar ( 'contact_subject' )), true ); + $form->addElement(new XoopsFormTextArea ( _MD_CONTACT_MESSAGE, 'contact_message', $this->getVar ( 'contact_message', 'e' ), 5, 60 ), true ); + + xoops_load('XoopsFormCaptcha'); + $form->addElement(new XoopsFormCaptcha(), true); + + $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit')); + return $form; + } + + function Contact_ReplyForm() { + global $xoopsConfig; + $form = new XoopsThemeForm(_AM_CONTACT_REPLY, 'doreply', 'contact.php', 'post', true); + $form->setExtra ( 'enctype="multipart/form-data"' ); + $form->addElement ( new XoopsFormHidden ( 'op', 'doreply' ) ); + $form->addElement ( new XoopsFormHidden ( 'contact_id', $this->getVar ( 'contact_id', 'e' ) ) ); + $form->addElement ( new XoopsFormHidden ( 'contact_uid', $this->getVar ( 'contact_uid', 'e' ) ) ); + $form->addElement ( new XoopsFormLabel( _AM_CONTACT_FROM, '','')); + $form->addElement ( new XoopsFormText ( _AM_CONTACT_NAMEFROM, 'contact_name', 50, 255, XoopsUser::getUnameFromId ( $this->getVar ( 'contact_uid' ) )), true ); + $form->addElement ( new XoopsFormText ( _AM_CONTACT_MAILFROM, 'contact_mail', 50, 255, $xoopsConfig['adminmail']), true ); + $form->addElement ( new XoopsFormLabel( _AM_CONTACT_TO, '','')); + $form->addElement ( new XoopsFormText ( _AM_CONTACT_NAMETO, 'contact_nameto', 50, 255, $this->getVar ( 'contact_name' )), true ); + $form->addElement ( new XoopsFormText ( _AM_CONTACT_MAILTO, 'contact_mailto', 50, 255, $this->getVar ( 'contact_mail' )), true ); + $form->addElement ( new XoopsFormText ( _AM_CONTACT_SUBJECT, 'contact_subject', 50, 255, _RE . $this->getVar ( 'contact_subject' )), true ); + $form->addElement(new XoopsFormTextArea ( _AM_CONTACT_MESSAGE, 'contact_message', '', 5, 60 ), true ); + $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit')); + return $form; + } + + /** + * Returns an array representation of the object + * + * @return array + **/ + function toArray() { + $ret = array (); + $vars = $this->getVars (); + foreach ( array_keys ( $vars ) as $i ) { + $ret [$i] = $this->getVar ( $i ); + } + return $ret; + } +} + +class ContactContactHandler extends XoopsPersistableObjectHandler +{ + function __construct(&$db) + { + parent::__construct($db, "contact", 'contact', 'contact_id', 'contact_mail'); + } + + /** + * Get variables passed by GET or POST method + * + */ + function Contact_CleanVars(&$global, $key, $default = '', $type = 'int') { + + switch ($type) { + case 'array': + $ret = (isset($global[$key]) && is_array($global[$key])) ? $global[$key] : $default; + break; + case 'date': + $ret = (isset($global[$key])) ? strtotime($global[$key]) : $default; + break; + case 'string': + $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_SANITIZE_MAGIC_QUOTES) : $default; + break; + case 'mail': + $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_VALIDATE_EMAIL) : $default; + break; + case 'url': + $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED) : $default; + break; + case 'ip': + $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_VALIDATE_IP) : $default; + break; + case 'amp': + $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_FLAG_ENCODE_AMP) : $default; + break; + case 'text': + $ret = (isset($global[$key])) ? htmlentities($global[$key], ENT_QUOTES, 'UTF-8') : $default; + break; + case 'int': default: + $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_SANITIZE_NUMBER_INT) : $default; + break; + } + if ($ret === false) { + return $default; + } + return $ret; + } + + function Contact_InfoProcessing($global) { + $contact = array(); + $contact['contact_cid'] = $this->Contact_CleanVars($_POST, 'contact_id', '', 'int'); + $contact['contact_uid'] = $this->Contact_CleanVars($_POST, 'contact_uid', '', 'int'); + $contact['contact_name'] = $this->Contact_CleanVars($_POST, 'contact_name', '', 'string'); + $contact['contact_nameto'] = $this->Contact_CleanVars($_POST, 'contact_nameto', '', 'string'); + $contact['contact_subject'] = $this->Contact_CleanVars($_POST, 'contact_subject', '', 'string'); + $contact['contact_mail'] = $this->Contact_CleanVars($_POST, 'contact_mail', '', 'mail'); + $contact['contact_mailto'] = $this->Contact_CleanVars($_POST, 'contact_mailto', '', 'mail'); + $contact['contact_url'] = $this->Contact_CleanVars($_POST, 'contact_url', '', 'url'); + $contact['contact_create'] = time(); + $contact['contact_icq'] = $this->Contact_CleanVars($_POST, 'contact_icq', '', 'string'); + $contact['contact_company'] = $this->Contact_CleanVars($_POST, 'contact_company', '', 'string'); + $contact['contact_location'] = $this->Contact_CleanVars($_POST, 'contact_location', '', 'text'); + $contact['contact_phone'] = $this->Contact_CleanVars($_POST, 'contact_phone', '', 'int'); + $contact['contact_department'] = $this->Contact_CleanVars($_POST, 'contact_department', 'contact', 'string'); + $contact['contact_ip'] = getenv ( "REMOTE_ADDR" ); + $contact['contact_message'] = $this->Contact_CleanVars($_POST, 'contact_message', '', 'text'); + $contact['contact_address'] = $this->Contact_CleanVars($_POST, 'contact_address', '', 'text'); + return $contact; + } + + function Contact_SendMail($contact) { + $xoopsMailer =& xoops_getMailer(); + $xoopsMailer->useMail(); + $xoopsMailer->setToEmails($this->Contact_ToEmails($contact['contact_department'])); + $xoopsMailer->setFromEmail($contact['contact_mail']); + $xoopsMailer->setFromName($contact['contact_name']); + $xoopsMailer->setSubject($contact['contact_subject']); + $xoopsMailer->setBody($contact['contact_message']); + if($xoopsMailer->send()) { + $message = _MD_CONTACT_MES_SEND; + } else { + $message = $xoopsMailer->getErrors(); + } + return $message; + } + + function Contact_ReplyMail($contact) { + $xoopsMailer =& xoops_getMailer(); + $xoopsMailer->useMail(); + $xoopsMailer->setToEmails($contact['contact_mailto']); + $xoopsMailer->setFromEmail($contact['contact_mail']); + $xoopsMailer->setFromName($contact['contact_name']); + $xoopsMailer->setSubject($contact['contact_subject']); + $xoopsMailer->setBody($contact['contact_message']); + if($xoopsMailer->send()) { + $message = _MD_CONTACT_MES_SEND; + } else { + $message = $xoopsMailer->getErrors(); + } + return $message; + } + + function Contact_ToEmails($department) { + global $xoopsConfig; + $mail = $xoopsConfig['adminmail']; + return $mail; + } + + function Contact_AddReply($contact_id) { + $obj = $this->get ( $contact_id ); + $obj->setVar ( 'contact_reply', 1 ); + if(!$this->insert ( $obj )) { + return false; + } + return true; + } + + function Contact_GetReply($contact_id) { + + $criteria = new CriteriaCompo (); + $criteria->add ( new Criteria ( 'contact_cid', $contact_id ) ); + $contacts = $this->getObjects ( $criteria, false ); + if ($contacts) { + $ret = array (); + foreach ( $contacts as $root ) { + $tab = array (); + $tab = $root->toArray (); + $tab['contact_owner'] = XoopsUser::getUnameFromId ( $root->getVar ( 'contact_uid' ) ); + $tab['contact_create'] = formatTimestamp ( $root->getVar ( 'contact_create' ), _MEDIUMDATESTRING ); + $ret [] = $tab; + } + return $ret; + } else { + return false; + } + } + + function Contact_GetAdminList($contact , $id) { + $ret = array (); + $criteria = new CriteriaCompo (); + $criteria->add ( new Criteria ( $id, '0' ) ); + $criteria->setSort ( $contact['sort'] ); + $criteria->setOrder ( $contact['order'] ); + $criteria->setStart ( $contact['start'] ); + $criteria->setLimit ( $contact['limit'] ); + $contacts = $this->getObjects ( $criteria, false ); + if ($contacts) { + foreach ( $contacts as $root ) { + $tab = array (); + $tab = $root->toArray (); + $tab['contact_owner'] = XoopsUser::getUnameFromId ( $root->getVar ( 'contact_uid' ) ); + $tab['contact_create'] = formatTimestamp ( $root->getVar ( 'contact_create' ), _MEDIUMDATESTRING ); + $ret [] = $tab; + } + } + return $ret; + } + + /** + * Get file Count + */ + function Contact_GetCount($id) { + $criteria = new CriteriaCompo (); + $criteria->add ( new Criteria ( $id, '0' ) ); + return $this->getCount ( $criteria ); + } + + /** + * Get Insert ID + */ + function getInsertId() { + return $this->db->getInsertId (); + } + +} + +?> \ No newline at end of file Added: XoopsModules/contact/branches/v1.8/class/index.html =================================================================== --- XoopsModules/contact/branches/v1.8/class/index.html (rev 0) +++ XoopsModules/contact/branches/v1.8/class/index.html 2012-02-20 09:28:08 UTC (rev 9034) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/contact/branches/v1.8/css/admin.css =================================================================== --- XoopsModules/contact/branches/v1.8/css/admin.css (rev 0) +++ XoopsModules/contact/branches/v1.8/css/admin.css 2012-02-20 09:28:08 UTC (rev 9034) @@ -0,0 +1 @@ + Added: XoopsModules/contact/branches/v1.8/css/index.html =================================================================== --- XoopsModules/contact/branches/v1.8/css/index.html (rev 0) +++ XoopsModules/contact/branches/v1.8/css/index.html 2012-02-20 09:28:08 UTC (rev 9034) @@ -0,0 +1 @@ +<script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/contact/branches/v1.8/docs/changelog.txt =================================================================== --- XoopsModules/contact/branches/v1.8/docs/changelog.txt (rev 0) +++ XoopsModules/contact/branches/v1.8/docs/changelog.txt 2012-02-20 09:28:08 UTC (rev 9034) @@ -0,0 +1,14 @@ +Version 1.80 from 2012-1-19 +================================= +- Rebuild Module (Voltan) + +Version 1.71 from 2011-12-12 +================================= +- converted to XOOPS Standard Module GUI (Mamba) +- included ModuleAdmin class from (Mage) + +Version 1.70 from 11-08-2010 +================================= +- added 2.4.x compatibilty (Trabis) +- added php5.3 compatibilty (Trabis) +- added error checking while sending emails (Trabis) \ No newline at end of file Added: XoopsModules/contact/branches/v1.8/docs/credits.txt =================================================================== --- XoopsModules/contact/branches/v1.8/docs/credits.txt (rev 0) +++ XoopsModules/contact/branches/v1.8/docs/credits.txt 2012-02-20 09:28:08 UTC (rev 9034) @@ -0,0 +1,6 @@ +Credits +=============== + +Originally developed by Kazumi Ono (Onokazu), modified by Ricardo Costa (Trabis) + +Updated to XOOPS 2.5.0 Standard GUI by Michael Beck (Mamba), with contributions by Gregory Mage (Mage) \ No newline at end of file Added: XoopsModules/contact/branches/v1.8/docs/index.html =================================================================== --- XoopsModules/contact/branches/v1.8/docs/index.html (rev 0) +++ XoopsModules/contact/branches/v1.8/docs/index.html 2012-02-20 09:28:08 UTC (rev 9034) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/contact/branches/v1.8/docs/install.txt =================================================================== --- XoopsModules/contact/branches/v1.8/docs/install.txt (rev 0) +++ XoopsModules/contact/branches/v1.8/docs/install.txt 2012-02-20 09:28:08 UTC (rev 9034) @@ -0,0 +1,4 @@ +INSTALL/UNISTALL +================= + +In order to install the module please do following: \ No newline at end of file Added: XoopsModules/contact/branches/v1.8/docs/lang_diff.txt =================================================================== --- XoopsModules/contact/branches/v1.8/docs/lang_diff.txt (rev 0) +++ XoopsModules/contact/branches/v1.8/docs/lang_diff.txt 2012-02-20 09:28:08 UTC (rev 9034) @@ -0,0 +1,29 @@ +LANGUAGE DIFFERENCES +===================== + +Below are language differences from a version to next version. + + +in file /language/english/admin.php: +//1.71 + +// About.php +define("_AM_CONTACT_ABOUT_RELEASEDATE", "Released: "); +define("_AM_CONTACT_ABOUT_UPDATEDATE", "Updated: "); +define("_AM_CONTACT_ABOUT_AUTHOR", "Author: "); +define("_AM_CONTACT_ABOUT_CREDITS", "Credits: "); +define("_AM_CONTACT_ABOUT_LICENSE", "License: "); +define("_AM_CONTACT_ABOUT_MODULE_STATUS", "Status: "); +define("_AM_CONTACT_ABOUT_WEBSITE", "Website: "); +define("_AM_CONTACT_ABOUT_AUTHOR_NAME", "Author name: "); +define("_AM_CONTACT_ABOUT_CHANGELOG", "Change Log"); +define("_AM_CONTACT_ABOUT_MODULE_INFO", "Module Infos"); +define("_AM_CONTACT_ABOUT_AUTHOR_INFO", "Author Infos"); +define("_AM_CONTACT_ABOUT_DESCRIPTION", "Description: "); + +// Configuration +define("_AM_CONTACT_CONFIG","Configuration Check"); +define("_AM_CONTACT_CONFIG_PHP","Minimum PHP required: %s (your version is %s)"); +define("_AM_CONTACT_CONFIG_XOOPS","Minimum XOOPS required: %s (your version is %s)"); +// Text for Admin footer +define("_AM_ADMIN_FOOTER", "<div class='center smallsmall italic pad5'>Contact is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>"); \ No newline at end of file Added: XoopsModules/contact/branches/v1.8/docs/licence.txt =================================================================== --- XoopsModules/contact/branches/v1.8/docs/licence.txt (rev 0) +++ XoopsModules/contact/branches/v1.8/docs/licence.txt 2012-02-20 09:28:08 UTC (rev 9034) @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. Added: XoopsModules/contact/branches/v1.8/docs/readme.txt =================================================================== --- XoopsModules/contact/branches/v1.8/docs/readme.txt (rev 0) +++ XoopsModules/contact/branches/v1.8/docs/readme.txt 2012-02-20 09:28:08 UTC (rev 9034) @@ -0,0 +1,35 @@ +Read Me First +============= + 1. License + _____________________________________________________________________ + + This source code is released under the GPL. + A copy of the license in provided in this package in the file + named LICENSE.txt + +2. What is CONTACT? + _____________________________________________________________________ + + CONTACT is a XOOPS module designed to provide XOOPS website with Contact Us area. + This module provides Contact Information Area which can be configurated by adminstrator panel. + + 3. Requirements + _____________________________________________________________________ + + - PHP version >= 5.2.0 + - ModuleClasses in /Frameworks (download it from here: http://goo.gl/Bmknt) + + + 4. Installation + _____________________________________________________________________ + + Simply upload these module folder to a directory of your xoops modules folder, + and install it via xoops modules administration panel. You can configure + it through Contact module control panel. + Detailed instructions on installing modules are available in the + XOOPS Operations Manual (http://goo.gl/adT2i) + + 5. Tutorial +_____________________________________________________________________ + + You can find a more detailed Tutorial here: http://goo.gl/bz94i Added: XoopsModules/contact/branches/v1.8/header.php =================================================================== --- XoopsMo... [truncated message content] |
From: <dj...@us...> - 2012-02-20 06:40:51
|
Revision: 9033 http://xoops.svn.sourceforge.net/xoops/?rev=9033&view=rev Author: djculex Date: 2012-02-20 06:40:42 +0000 (Mon, 20 Feb 2012) Log Message: ----------- Modified Paths: -------------- XoopsModules/xim/releases/1.02/modules/xim/chat.php XoopsModules/xim/releases/1.02/modules/xim/include/functions.php XoopsModules/xim/releases/1.02/modules/xim/js/chat.js XoopsModules/xim/trunk/modules/xim/chat.php XoopsModules/xim/trunk/modules/xim/include/functions.php XoopsModules/xim/trunk/modules/xim/js/chat.js Modified: XoopsModules/xim/releases/1.02/modules/xim/chat.php =================================================================== --- XoopsModules/xim/releases/1.02/modules/xim/chat.php 2012-02-20 05:15:13 UTC (rev 9032) +++ XoopsModules/xim/releases/1.02/modules/xim/chat.php 2012-02-20 06:40:42 UTC (rev 9033) @@ -41,7 +41,7 @@ **/ include 'header.php'; -require_once XOOPS_ROOT_PATH."/modules/xim/include/functions.php"; +include_once XOOPS_ROOT_PATH.'/modules/xim/include/functions.php'; global $xoopsLogger; $xoopsLogger->activated = false; @@ -73,7 +73,7 @@ $items = $_SESSION['chatHistory'][$chat['from']]; } - $chat['message'] = xoops_smallworld($chat['message']); + $chat['message'] = xim_sanitize($chat['message']); $user = new XoopsUser($chat['from']); // changed to show link to user info for user "from" if ($chat['sys'] != '-1') { @@ -236,7 +236,7 @@ $soundUrl = XOOPS_URL.'/modules/xim/media/0.mp3'; $status = $config['status']; - $messagesan = xoops_smallworld($message); + $messagesan = xim_sanitize($message); header('Content-type: application/json'); echo '{"message":"'.$messagesan.'"}'; if (!isset($_SESSION['chatHistory'][$_POST['to']])) { @@ -249,7 +249,7 @@ unset($_SESSION['tsChatBoxes'][$_POST['to']]); - $sql = "insert into ".$xoopsDB->prefix(xim_chat)." (".$xoopsDB->prefix(xim_chat).".from,".$xoopsDB->prefix(xim_chat).".to,message,sent) values ('".mysql_real_escape_string($from)."', '".mysql_real_escape_string($to)."','".mysql_real_escape_string($message)."',NOW())"; + $sql = "insert into ".$xoopsDB->prefix('xim_chat')." (".$xoopsDB->prefix('xim_chat').".from,".$xoopsDB->prefix('xim_chat').".to,message,sent) values ('".mysql_real_escape_string($from)."', '".mysql_real_escape_string($to)."','".mysql_real_escape_string($message)."',NOW())"; $query = $xoopsDB->queryF($sql); exit(0); } @@ -280,19 +280,19 @@ if ($status == '0') { // User is away $sysmessage = _XIM_SYSTEM_AWAY; - $sql = "insert into ".$xoopsDB->prefix(xim_chat)." (".$xoopsDB->prefix(xim_chat).".from,".$xoopsDB->prefix(xim_chat).".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())"; + $sql = "insert into ".$xoopsDB->prefix('xim_chat')." (".$xoopsDB->prefix('xim_chat').".from,".$xoopsDB->prefix('xim_chat').".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())"; $query = $xoopsDB->queryF($sql); } if ($status == '1') { // User is busy $sysmessage = _XIM_SYSTEM_BUSY; - $sql = "insert into ".$xoopsDB->prefix(xim_chat)." (".$xoopsDB->prefix(xim_chat).".from,".$xoopsDB->prefix(xim_chat).".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())"; + $sql = "insert into ".$xoopsDB->prefix('xim_chat')." (".$xoopsDB->prefix('xim_chat').".from,".$xoopsDB->prefix('xim_chat').".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())"; $query = $xoopsDB->queryF($sql); } if ($status == '3') { // User is offline $sysmessage = _XIM_SYSTEM_OFFLINE; - $sql = "insert into ".$xoopsDB->prefix(xim_chat)." (".$xoopsDB->prefix(xim_chat).".from,".$xoopsDB->prefix(xim_chat).".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())"; + $sql = "insert into ".$xoopsDB->prefix('xim_chat')." (".$xoopsDB->prefix('xim_chat').".from,".$xoopsDB->prefix('xim_chat').".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())"; $query = $xoopsDB->queryF($sql); } } Modified: XoopsModules/xim/releases/1.02/modules/xim/include/functions.php =================================================================== --- XoopsModules/xim/releases/1.02/modules/xim/include/functions.php 2012-02-20 05:15:13 UTC (rev 9032) +++ XoopsModules/xim/releases/1.02/modules/xim/include/functions.php 2012-02-20 06:40:42 UTC (rev 9033) @@ -124,15 +124,16 @@ return $retval; } - function xim_sanitize($text) - { - $text = htmlspecialchars($text, ENT_QUOTES); - $myts = MyTextSanitizer::getInstance(); - $text = $myts->displayTarea($text, 1, 1, 1, 1); - $text = str_replace("\n\r", "\n", $text); - $text = str_replace("\r\n", "\n", $text); - $text = str_replace("\n", "<br />", $text); - $text = str_replace("\"", "'", $text); - return $text; + function xim_sanitize($text) { + $text = htmlspecialchars($text, ENT_QUOTES); + //$text = preg_replace('/([^\s]{10})(?=[^\s])/m', '$1<br />', $text); + $myts = MyTextSanitizer::getInstance(); + $text = $myts->displayTarea($text,1,1,1,1); + $text = str_replace("\n\r","\n",$text); + $text = str_replace("\r\n","\n",$text); + $text = str_replace("\n","<br />",$text); + $text = str_replace("\"","'",$text); + + return $text; } ?> \ No newline at end of file Modified: XoopsModules/xim/releases/1.02/modules/xim/js/chat.js =================================================================== --- XoopsModules/xim/releases/1.02/modules/xim/js/chat.js 2012-02-20 05:15:13 UTC (rev 9032) +++ XoopsModules/xim/releases/1.02/modules/xim/js/chat.js 2012-02-20 06:40:42 UTC (rev 9033) @@ -35,10 +35,11 @@ var newMessagesUser = new Array(); var chatBoxes = new Array(); document.containers= new Object(); - +xoops_im(document).ready(function(){ var refreshId = setInterval(function() { xoops_im('#online_friends').load(xim_url+'blocks/blockupdater.php'); }, 5000); +}); xoops_im(document).ready(function(){ createFooterBar(); @@ -258,6 +259,7 @@ function startChatSession(){ reSetConf(); + updateUserList(); if (showFooterBar==1) { setTimeout('updateUserList()',200); } Modified: XoopsModules/xim/trunk/modules/xim/chat.php =================================================================== --- XoopsModules/xim/trunk/modules/xim/chat.php 2012-02-20 05:15:13 UTC (rev 9032) +++ XoopsModules/xim/trunk/modules/xim/chat.php 2012-02-20 06:40:42 UTC (rev 9033) @@ -41,7 +41,7 @@ **/ include 'header.php'; -require_once XOOPS_ROOT_PATH."/modules/xim/include/functions.php"; +include_once XOOPS_ROOT_PATH.'/modules/xim/include/functions.php'; global $xoopsLogger; $xoopsLogger->activated = false; @@ -73,7 +73,7 @@ $items = $_SESSION['chatHistory'][$chat['from']]; } - $chat['message'] = xoops_smallworld($chat['message']); + $chat['message'] = xim_sanitize($chat['message']); $user = new XoopsUser($chat['from']); // changed to show link to user info for user "from" if ($chat['sys'] != '-1') { @@ -236,7 +236,7 @@ $soundUrl = XOOPS_URL.'/modules/xim/media/0.mp3'; $status = $config['status']; - $messagesan = xoops_smallworld($message); + $messagesan = xim_sanitize($message); header('Content-type: application/json'); echo '{"message":"'.$messagesan.'"}'; if (!isset($_SESSION['chatHistory'][$_POST['to']])) { @@ -249,7 +249,7 @@ unset($_SESSION['tsChatBoxes'][$_POST['to']]); - $sql = "insert into ".$xoopsDB->prefix(xim_chat)." (".$xoopsDB->prefix(xim_chat).".from,".$xoopsDB->prefix(xim_chat).".to,message,sent) values ('".mysql_real_escape_string($from)."', '".mysql_real_escape_string($to)."','".mysql_real_escape_string($message)."',NOW())"; + $sql = "insert into ".$xoopsDB->prefix('xim_chat')." (".$xoopsDB->prefix('xim_chat').".from,".$xoopsDB->prefix('xim_chat').".to,message,sent) values ('".mysql_real_escape_string($from)."', '".mysql_real_escape_string($to)."','".mysql_real_escape_string($message)."',NOW())"; $query = $xoopsDB->queryF($sql); exit(0); } @@ -280,19 +280,19 @@ if ($status == '0') { // User is away $sysmessage = _XIM_SYSTEM_AWAY; - $sql = "insert into ".$xoopsDB->prefix(xim_chat)." (".$xoopsDB->prefix(xim_chat).".from,".$xoopsDB->prefix(xim_chat).".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())"; + $sql = "insert into ".$xoopsDB->prefix('xim_chat')." (".$xoopsDB->prefix('xim_chat').".from,".$xoopsDB->prefix('xim_chat').".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())"; $query = $xoopsDB->queryF($sql); } if ($status == '1') { // User is busy $sysmessage = _XIM_SYSTEM_BUSY; - $sql = "insert into ".$xoopsDB->prefix(xim_chat)." (".$xoopsDB->prefix(xim_chat).".from,".$xoopsDB->prefix(xim_chat).".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())"; + $sql = "insert into ".$xoopsDB->prefix('xim_chat')." (".$xoopsDB->prefix('xim_chat').".from,".$xoopsDB->prefix('xim_chat').".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())"; $query = $xoopsDB->queryF($sql); } if ($status == '3') { // User is offline $sysmessage = _XIM_SYSTEM_OFFLINE; - $sql = "insert into ".$xoopsDB->prefix(xim_chat)." (".$xoopsDB->prefix(xim_chat).".from,".$xoopsDB->prefix(xim_chat).".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())"; + $sql = "insert into ".$xoopsDB->prefix('xim_chat')." (".$xoopsDB->prefix('xim_chat').".from,".$xoopsDB->prefix('xim_chat').".to,message,sent) values ('".mysql_real_escape_string($to)."', '".mysql_real_escape_string($from)."','".mysql_real_escape_string($sysmessage)."',NOW())"; $query = $xoopsDB->queryF($sql); } } Modified: XoopsModules/xim/trunk/modules/xim/include/functions.php =================================================================== --- XoopsModules/xim/trunk/modules/xim/include/functions.php 2012-02-20 05:15:13 UTC (rev 9032) +++ XoopsModules/xim/trunk/modules/xim/include/functions.php 2012-02-20 06:40:42 UTC (rev 9033) @@ -124,16 +124,17 @@ return $retval; } - function xim_sanitize($text) - { - $text = htmlspecialchars($text, ENT_QUOTES); - $myts = MyTextSanitizer::getInstance(); - $text = $myts->displayTarea($text, 1, 1, 1, 1); - $text = str_replace("\n\r", "\n", $text); - $text = str_replace("\r\n", "\n", $text); - $text = str_replace("\n", "<br />", $text); - $text = str_replace("\"", "'", $text); - return $text; + function xim_sanitize($text) { + $text = htmlspecialchars($text, ENT_QUOTES); + //$text = preg_replace('/([^\s]{10})(?=[^\s])/m', '$1<br />', $text); + $myts = MyTextSanitizer::getInstance(); + $text = $myts->displayTarea($text,1,1,1,1); + $text = str_replace("\n\r","\n",$text); + $text = str_replace("\r\n","\n",$text); + $text = str_replace("\n","<br />",$text); + $text = str_replace("\"","'",$text); + + return $text; } ?> \ No newline at end of file Modified: XoopsModules/xim/trunk/modules/xim/js/chat.js =================================================================== --- XoopsModules/xim/trunk/modules/xim/js/chat.js 2012-02-20 05:15:13 UTC (rev 9032) +++ XoopsModules/xim/trunk/modules/xim/js/chat.js 2012-02-20 06:40:42 UTC (rev 9033) @@ -35,10 +35,11 @@ var newMessagesUser = new Array(); var chatBoxes = new Array(); document.containers= new Object(); - +xoops_im(document).ready(function(){ var refreshId = setInterval(function() { xoops_im('#online_friends').load(xim_url+'blocks/blockupdater.php'); }, 5000); +}); xoops_im(document).ready(function(){ createFooterBar(); @@ -258,6 +259,7 @@ function startChatSession(){ reSetConf(); + updateUserList(); if (showFooterBar==1) { setTimeout('updateUserList()',200); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dj...@us...> - 2012-02-20 05:15:22
|
Revision: 9032 http://xoops.svn.sourceforge.net/xoops/?rev=9032&view=rev Author: djculex Date: 2012-02-20 05:15:13 +0000 (Mon, 20 Feb 2012) Log Message: ----------- - NEW: Finished automated message when upload images (showing link, random image from array) (djculex) - Bugfix: Discovered jquery was 1.5.1 -> Updated to 1.7.1 - Bugfix: Jquery 1.7.1 revealed bugs in show more/less on updates (djculex) - Changed: css, jquery for new addions Modified Paths: -------------- XoopsModules/smallworld/trunk/smallworld/css/smallworld.css XoopsModules/smallworld/trunk/smallworld/docs/lang_diff.txt XoopsModules/smallworld/trunk/smallworld/image_edit_submit.php XoopsModules/smallworld/trunk/smallworld/include/functions.php XoopsModules/smallworld/trunk/smallworld/js/smallworld.js XoopsModules/smallworld/trunk/smallworld/language/english/main.php XoopsModules/smallworld/trunk/smallworld/preloads/core.php Removed Paths: ------------- XoopsModules/smallworld/trunk/smallworld/js/jquery-1.5.1.min.js Modified: XoopsModules/smallworld/trunk/smallworld/css/smallworld.css =================================================================== --- XoopsModules/smallworld/trunk/smallworld/css/smallworld.css 2012-02-20 00:45:39 UTC (rev 9031) +++ XoopsModules/smallworld/trunk/smallworld/css/smallworld.css 2012-02-20 05:15:13 UTC (rev 9032) @@ -806,6 +806,17 @@ text-align: center; } +.smallworldUplImgTxt { + font-size: 11px; + position: relative; + text-align: center; +} + +#smallworldUplImgLnk { + display: block; + font-size: 9px; +} + .smallworld_sttext b{ color:#006699; } Modified: XoopsModules/smallworld/trunk/smallworld/docs/lang_diff.txt =================================================================== --- XoopsModules/smallworld/trunk/smallworld/docs/lang_diff.txt 2012-02-20 00:45:39 UTC (rev 9031) +++ XoopsModules/smallworld/trunk/smallworld/docs/lang_diff.txt 2012-02-20 05:15:13 UTC (rev 9032) @@ -15,6 +15,10 @@ + var _smallworldCommentsMoreMore = "..Show more"; + var _smallworldCommentsMoreLess = "..Show less"; +htdocs/modules/smallworld/english/main.php +* _SMALLWORLD_UPLOADEDSOMEIMAGES +* _SMALLWORLD_CLICKIMAGETHUMB + =============================== 2011/12/24: Version 1.00 RC1 =============================== Modified: XoopsModules/smallworld/trunk/smallworld/image_edit_submit.php =================================================================== --- XoopsModules/smallworld/trunk/smallworld/image_edit_submit.php 2012-02-20 00:45:39 UTC (rev 9031) +++ XoopsModules/smallworld/trunk/smallworld/image_edit_submit.php 2012-02-20 05:15:13 UTC (rev 9032) @@ -33,8 +33,7 @@ $riUrl = XOOPS_URL."/uploads/albums_smallworld/".$userID."/".$ri; } - $update = "........" . _SMALLWORLD_UPLOADEDSOMEIMAGES - . "<br/>".$riUrl; + $update = "UPLIMAGE" . " " . $riUrl; $upd->Insert_Update($userID, $update); $db->handleImageEdit (); Modified: XoopsModules/smallworld/trunk/smallworld/include/functions.php =================================================================== --- XoopsModules/smallworld/trunk/smallworld/include/functions.php 2012-02-20 00:45:39 UTC (rev 9031) +++ XoopsModules/smallworld/trunk/smallworld/include/functions.php 2012-02-20 05:15:13 UTC (rev 9032) @@ -224,16 +224,42 @@ // If url is image link return <img> function smallworld_tolink($text) { + global $xoopsUser; $ext = substr($text,-4,4); $ext2 = substr($text,-5,5); + + $userID = $xoopsUser->getVar('uid'); + $user = new XoopsUser($userID); + $username = $user->getVar('uname'); + $gallery = XOOPS_URL."/modules/smallworld/galleryshow.php?username=".$username; + if (in_array($ext,array('.jpg','.bmp','.gif','.png')) || in_array($ext2,array('.jpeg'))){ - $text = preg_replace('/(((f|ht){1}tp:\/\/)[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i', - '<img class="smallworldAttImg" src="\\1"><a class="smallworldAttImgTxt" href="\\1">'._SMALLWORLD_CLICKIMAGETHUMB.' </a><br>', $text); - $text = preg_replace('/(((f|ht){1}tps:\/\/)[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i', - '<a href="\\1">lala</a>', $text); - $text = preg_replace('/([[:space:]()[{}])(www.[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i', - '\\1<img class="smallworldAttImg" src="//\\2"><a class="smallworldAttImgTxt" href="//\\2">'._SMALLWORLD_CLICKIMAGETHUMB.'</a><br>', $text); - $text = html_entity_decode($text,ENT_QUOTES,"UTF-8"); + if (strpos($text, 'UPLIMAGE') !== false ) { + $text = str_replace('UPLIMAGE', '', $text); + $text = preg_replace('/(((f|ht){1}tp:\/\/)[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i', + '<span class="smallworldUplImgTxt"><br/><img class="smallworldAttImg" src="\\1"><br><br><a id="smallworldUplImgLnk" href="' + . $gallery . '" target="_SELF">' + . $username . _SMALLWORLD_UPLOADEDSOMEIMAGES + . '</a><br></span>', $text + ); + $text = preg_replace('/(((f|ht){1}tps:\/\/)[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i', + '<a href="\\1">lala</a>', $text); + $text = preg_replace('/([[:space:]()[{}])(www.[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i', + '\\1<span class="smallworldUplImgTxt"><br/><img class="smallworldAttImg" src="//\\2"><br><br><a id="smallworldUplImgLnk" href="' + . $gallery . '" target="_SELF">' + . $username . _SMALLWORLD_UPLOADEDSOMEIMAGES + . '</a><br></span>', $text + ); + $text = html_entity_decode($text,ENT_QUOTES,"UTF-8"); + } else { + $text = preg_replace('/(((f|ht){1}tp:\/\/)[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i', + '<img class="smallworldAttImg" src="\\1"><a class="smallworldAttImgTxt" href="\\1">'._SMALLWORLD_CLICKIMAGETHUMB.' </a><br>', $text); + $text = preg_replace('/(((f|ht){1}tps:\/\/)[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i', + '<a href="\\1">lala</a>', $text); + $text = preg_replace('/([[:space:]()[{}])(www.[-a-zA-Z0-9@:%_\+.~#?&\/\/=]+)/i', + '\\1<img class="smallworldAttImg" src="//\\2"><a class="smallworldAttImgTxt" href="//\\2">'._SMALLWORLD_CLICKIMAGETHUMB.'</a><br>', $text); + $text = html_entity_decode($text,ENT_QUOTES,"UTF-8"); + } } else { $text = html_entity_decode($text,ENT_QUOTES,"UTF-8"); $text = " " . $text; Deleted: XoopsModules/smallworld/trunk/smallworld/js/jquery-1.5.1.min.js =================================================================== --- XoopsModules/smallworld/trunk/smallworld/js/jquery-1.5.1.min.js 2012-02-20 00:45:39 UTC (rev 9031) +++ XoopsModules/smallworld/trunk/smallworld/js/jquery-1.5.1.min.js 2012-02-20 05:15:13 UTC (rev 9032) @@ -1,16 +0,0 @@ -/*! - * jQuery JavaScript Library v1.5.1 - * http://jquery.com/ - * - * Copyright 2011, John Resig - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * Includes Sizzle.js - * http://sizzlejs.com/ - * Copyright 2011, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * - * Date: Wed Feb 23 13:55:29 2011 -0500 - */ -(function(a,b){function cg(a){return d.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cd(a){if(!bZ[a]){var b=d("<"+a+">").appendTo("body"),c=b.css("display");b.remove();if(c==="none"||c==="")c="block";bZ[a]=c}return bZ[a]}function cc(a,b){var c={};d.each(cb.concat.apply([],cb.slice(0,b)),function(){c[this]=a});return c}function bY(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function bX(){try{return new a.XMLHttpRequest}catch(b){}}function bW(){d(a).unload(function(){for(var a in bU)bU[a](0,1)})}function bQ(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var e=a.dataTypes,f={},g,h,i=e.length,j,k=e[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h==="string"&&(f[h.toLowerCase()]=a.converters[h]);l=k,k=e[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=f[m]||f["* "+k];if(!n){p=b;for(o in f){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=f[j[1]+" "+k];if(p){o=f[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&d.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bP(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bO(a,b,c,e){if(d.isArray(b)&&b.length)d.each(b,function(b,f){c||bq.test(a)?e(a,f):bO(a+"["+(typeof f==="object"||d.isArray(f)?b:"")+"]",f,c,e)});else if(c||b==null||typeof b!=="object")e(a,b);else if(d.isArray(b)||d.isEmptyObject(b))e(a,"");else for(var f in b)bO(a+"["+f+"]",b[f],c,e)}function bN(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bH,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l==="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bN(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bN(a,c,d,e,"*",g));return l}function bM(a){return function(b,c){typeof b!=="string"&&(c=b,b="*");if(d.isFunction(c)){var e=b.toLowerCase().split(bB),f=0,g=e.length,h,i,j;for(;f<g;f++)h=e[f],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bo(a,b,c){var e=b==="width"?bi:bj,f=b==="width"?a.offsetWidth:a.offsetHeight;if(c==="border")return f;d.each(e,function(){c||(f-=parseFloat(d.css(a,"padding"+this))||0),c==="margin"?f+=parseFloat(d.css(a,"margin"+this))||0:f-=parseFloat(d.css(a,"border"+this+"Width"))||0});return f}function ba(a,b){b.src?d.ajax({url:b.src,async:!1,dataType:"script"}):d.globalEval(b.text||b.textContent||b.innerHTML||""),b.parentNode&&b.parentNode.removeChild(b)}function _(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function $(a,b){if(b.nodeType===1){var c=b.nodeName.toLowerCase();b.clearAttributes(),b.mergeAttributes(a);if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(d.expando)}}function Z(a,b){if(b.nodeType===1&&d.hasData(a)){var c=d.expando,e=d.data(a),f=d.data(b,e);if(e=e[c]){var g=e.events;f=f[c]=d.extend({},e);if(g){delete f.handle,f.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)d.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function Y(a,b){return d.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function O(a,b,c){if(d.isFunction(b))return d.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return d.grep(a,function(a,d){return a===b===c});if(typeof b==="string"){var e=d.grep(a,function(a){return a.nodeType===1});if(J.test(b))return d.filter(b,e,!c);b=d.filter(b,e)}return d.grep(a,function(a,e){return d.inArray(a,b)>=0===c})}function N(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function F(a,b){return(a&&a!=="*"?a+".":"")+b.replace(r,"`").replace(s,"&")}function E(a){var b,c,e,f,g,h,i,j,k,l,m,n,o,q=[],r=[],s=d._data(this,"events");if(a.liveFired!==this&&s&&s.live&&!a.target.disabled&&(!a.button||a.type!=="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var t=s.live.slice(0);for(i=0;i<t.length;i++)g=t[i],g.origType.replace(p,"")===a.type?r.push(g.selector):t.splice(i--,1);f=d(a.target).closest(r,a.currentTarget);for(j=0,k=f.length;j<k;j++){m=f[j];for(i=0;i<t.length;i++){g=t[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,e=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,e=d(a.relatedTarget).closest(g.selector)[0];(!e||e!==h)&&q.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=q.length;j<k;j++){f=q[j];if(c&&f.level>c)break;a.currentTarget=f.elem,a.data=f.handleObj.data,a.handleObj=f.handleObj,o=f.handleObj.origHandler.apply(f.elem,arguments);if(o===!1||a.isPropagationStopped()){c=f.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function C(a,c,e){var f=d.extend({},e[0]);f.type=a,f.originalEvent={},f.liveFired=b,d.event.handle.call(c,f),f.isDefaultPrevented()&&e[0].preventDefault()}function w(){return!0}function v(){return!1}function g(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function f(a,c,f){if(f===b&&a.nodeType===1){f=a.getAttribute("data-"+c);if(typeof f==="string"){try{f=f==="true"?!0:f==="false"?!1:f==="null"?null:d.isNaN(f)?e.test(f)?d.parseJSON(f):f:parseFloat(f)}catch(g){}d.data(a,c,f)}else f=b}return f}var c=a.document,d=function(){function I(){if(!d.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(I,1);return}d.ready()}}var d=function(a,b){return new d.fn.init(a,b,g)},e=a.jQuery,f=a.$,g,h=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,i=/\S/,j=/^\s+/,k=/\s+$/,l=/\d/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=navigator.userAgent,w,x=!1,y,z="then done fail isResolved isRejected promise".split(" "),A,B=Object.prototype.toString,C=Object.prototype.hasOwnProperty,D=Array.prototype.push,E=Array.prototype.slice,F=String.prototype.trim,G=Array.prototype.indexOf,H={};d.fn=d.prototype={constructor:d,init:function(a,e,f){var g,i,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!e&&c.body){this.context=c,this[0]=c.body,this.selector="body",this.length=1;return this}if(typeof a==="string"){g=h.exec(a);if(!g||!g[1]&&e)return!e||e.jquery?(e||f).find(a):this.constructor(e).find(a);if(g[1]){e=e instanceof d?e[0]:e,k=e?e.ownerDocument||e:c,j=m.exec(a),j?d.isPlainObject(e)?(a=[c.createElement(j[1])],d.fn.attr.call(a,e,!0)):a=[k.createElement(j[1])]:(j=d.buildFragment([g[1]],[k]),a=(j.cacheable?d.clone(j.fragment):j.fragment).childNodes);return d.merge(this,a)}i=c.getElementById(g[2]);if(i&&i.parentNode){if(i.id!==g[2])return f.find(a);this.length=1,this[0]=i}this.context=c,this.selector=a;return this}if(d.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return d.makeArray(a,this)},selector:"",jquery:"1.5.1",length:0,size:function(){return this.length},toArray:function(){return E.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var e=this.constructor();d.isArray(a)?D.apply(e,a):d.merge(e,a),e.prevObject=this,e.context=this.context,b==="find"?e.selector=this.selector+(this.selector?" ":"")+c:b&&(e.selector=this.selector+"."+b+"("+c+")");return e},each:function(a,b){return d.each(this,a,b)},ready:function(a){d.bindReady(),y.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(E.apply(this,arguments),"slice",E.call(arguments).join(","))},map:function(a){return this.pushStack(d.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:D,sort:[].sort,splice:[].splice},d.fn.init.prototype=d.fn,d.extend=d.fn.extend=function(){var a,c,e,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i==="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!=="object"&&!d.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){e=i[c],f=a[c];if(i===f)continue;l&&f&&(d.isPlainObject(f)||(g=d.isArray(f)))?(g?(g=!1,h=e&&d.isArray(e)?e:[]):h=e&&d.isPlainObject(e)?e:{},i[c]=d.extend(l,h,f)):f!==b&&(i[c]=f)}return i},d.extend({noConflict:function(b){a.$=f,b&&(a.jQuery=e);return d},isReady:!1,readyWait:1,ready:function(a){a===!0&&d.readyWait--;if(!d.readyWait||a!==!0&&!d.isReady){if(!c.body)return setTimeout(d.ready,1);d.isReady=!0;if(a!==!0&&--d.readyWait>0)return;y.resolveWith(c,[d]),d.fn.trigger&&d(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!x){x=!0;if(c.readyState==="complete")return setTimeout(d.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",A,!1),a.addEventListener("load",d.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",A),a.attachEvent("onload",d.ready);var b=!1;try{b=a.frameElement==null}catch(e){}c.documentElement.doScroll&&b&&I()}}},isFunction:function(a){return d.type(a)==="function"},isArray:Array.isArray||function(a){return d.type(a)==="array"},isWindow:function(a){return a&&typeof a==="object"&&"setInterval"in a},isNaN:function(a){return a==null||!l.test(a)||isNaN(a)},type:function(a){return a==null?String(a):H[B.call(a)]||"object"},isPlainObject:function(a){if(!a||d.type(a)!=="object"||a.nodeType||d.isWindow(a))return!1;if(a.constructor&&!C.call(a,"constructor")&&!C.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a){}return c===b||C.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!=="string"||!b)return null;b=d.trim(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return a.JSON&&a.JSON.parse?a.JSON.parse(b):(new Function("return "+b))();d.error("Invalid JSON: "+b)},parseXML:function(b,c,e){a.DOMParser?(e=new DOMParser,c=e.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),e=c.documentElement,(!e||!e.nodeName||e.nodeName==="parsererror")&&d.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(a){if(a&&i.test(a)){var b=c.head||c.getElementsByTagName("head")[0]||c.documentElement,e=c.createElement("script");d.support.scriptEval()?e.appendChild(c.createTextNode(a)):e.text=a,b.insertBefore(e,b.firstChild),b.removeChild(e)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,e){var f,g=0,h=a.length,i=h===b||d.isFunction(a);if(e){if(i){for(f in a)if(c.apply(a[f],e)===!1)break}else for(;g<h;)if(c.apply(a[g++],e)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(var j=a[0];g<h&&c.call(j,g,j)!==!1;j=a[++g]){}return a},trim:F?function(a){return a==null?"":F.call(a)}:function(a){return a==null?"":(a+"").replace(j,"").replace(k,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var e=d.type(a);a.length==null||e==="string"||e==="function"||e==="regexp"||d.isWindow(a)?D.call(c,a):d.merge(c,a)}return c},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length==="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,b,c){var d=[],e;for(var f=0,g=a.length;f<g;f++)e=b(a[f],f,c),e!=null&&(d[d.length]=e);return d.concat.apply([],d)},guid:1,proxy:function(a,c,e){arguments.length===2&&(typeof c==="string"?(e=a,a=e[c],c=b):c&&!d.isFunction(c)&&(e=c,c=b)),!c&&a&&(c=function(){return a.apply(e||this,arguments)}),a&&(c.guid=a.guid=a.guid||c.guid||d.guid++);return c},access:function(a,c,e,f,g,h){var i=a.length;if(typeof c==="object"){for(var j in c)d.access(a,j,c[j],f,g,e);return a}if(e!==b){f=!h&&f&&d.isFunction(e);for(var k=0;k<i;k++)g(a[k],c,f?e.call(a[k],k,g(a[k],c)):e,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},_Deferred:function(){var a=[],b,c,e,f={done:function(){if(!e){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=d.type(i),j==="array"?f.done.apply(f,i):j==="function"&&a.push(i);k&&f.resolveWith(k[0],k[1])}return this},resolveWith:function(d,f){if(!e&&!b&&!c){c=1;try{while(a[0])a.shift().apply(d,f)}catch(g){throw g}finally{b=[d,f],c=0}}return this},resolve:function(){f.resolveWith(d.isFunction(this.promise)?this.promise():this,arguments);return this},isResolved:function(){return c||b},cancel:function(){e=1,a=[];return this}};return f},Deferred:function(a){var b=d._Deferred(),c=d._Deferred(),e;d.extend(b,{then:function(a,c){b.done(a).fail(c);return this},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,promise:function(a){if(a==null){if(e)return e;e=a={}}var c=z.length;while(c--)a[z[c]]=b[z[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){var b=arguments.length,c=b<=1&&a&&d.isFunction(a.promise)?a:d.Deferred(),e=c.promise();if(b>1){var f=E.call(arguments,0),g=b,h=function(a){return function(b){f[a]=arguments.length>1?E.call(arguments,0):b,--g||c.resolveWith(e,f)}};while(b--)a=f[b],a&&d.isFunction(a.promise)?a.promise().then(h(b),c.reject):--g;g||c.resolveWith(e,f)}else c!==a&&c.resolve(a);return e},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}d.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.subclass=this.subclass,a.fn.init=function b(b,c){c&&c instanceof d&&!(c instanceof a)&&(c=a(c));return d.fn.init.call(this,b,c,e)},a.fn.init.prototype=a.fn;var e=a(c);return a},browser:{}}),y=d._Deferred(),d.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){H["[object "+b+"]"]=b.toLowerCase()}),w=d.uaMatch(v),w.browser&&(d.browser[w.browser]=!0,d.browser.version=w.version),d.browser.webkit&&(d.browser.safari=!0),G&&(d.inArray=function(a,b){return G.call(b,a)}),i.test(" ")&&(j=/^[\s\xA0]+/,k=/[\s\xA0]+$/),g=d(c),c.addEventListener?A=function(){c.removeEventListener("DOMContentLoaded",A,!1),d.ready()}:c.attachEvent&&(A=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",A),d.ready())});return d}();(function(){d.support={};var b=c.createElement("div");b.style.display="none",b.innerHTML=" <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";var e=b.getElementsByTagName("*"),f=b.getElementsByTagName("a")[0],g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=b.getElementsByTagName("input")[0];if(e&&e.length&&f){d.support={leadingWhitespace:b.firstChild.nodeType===3,tbody:!b.getElementsByTagName("tbody").length,htmlSerialize:!!b.getElementsByTagName("link").length,style:/red/.test(f.getAttribute("style")),hrefNormalized:f.getAttribute("href")==="/a",opacity:/^0.55$/.test(f.style.opacity),cssFloat:!!f.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,deleteExpando:!0,optDisabled:!1,checkClone:!1,noCloneEvent:!0,noCloneChecked:!0,boxModel:null,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableHiddenOffsets:!0},i.checked=!0,d.support.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,d.support.optDisabled=!h.disabled;var j=null;d.support.scriptEval=function(){if(j===null){var b=c.documentElement,e=c.createElement("script"),f="script"+d.now();try{e.appendChild(c.createTextNode("window."+f+"=1;"))}catch(g){}b.insertBefore(e,b.firstChild),a[f]?(j=!0,delete a[f]):j=!1,b.removeChild(e),b=e=f=null}return j};try{delete b.test}catch(k){d.support.deleteExpando=!1}!b.addEventListener&&b.attachEvent&&b.fireEvent&&(b.attachEvent("onclick",function l(){d.support.noCloneEvent=!1,b.detachEvent("onclick",l)}),b.cloneNode(!0).fireEvent("onclick")),b=c.createElement("div"),b.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";var m=c.createDocumentFragment();m.appendChild(b.firstChild),d.support.checkClone=m.cloneNode(!0).cloneNode(!0).lastChild.checked,d(function(){var a=c.createElement("div"),b=c.getElementsByTagName("body")[0];if(b){a.style.width=a.style.paddingLeft="1px",b.appendChild(a),d.boxModel=d.support.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,d.support.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",d.support.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";var e=a.getElementsByTagName("td");d.support.reliableHiddenOffsets=e[0].offsetHeight===0,e[0].style.display="",e[1].style.display="none",d.support.reliableHiddenOffsets=d.support.reliableHiddenOffsets&&e[0].offsetHeight===0,a.innerHTML="",b.removeChild(a).style.display="none",a=e=null}});var n=function(a){var b=c.createElement("div");a="on"+a;if(!b.attachEvent)return!0;var d=a in b;d||(b.setAttribute(a,"return;"),d=typeof b[a]==="function"),b=null;return d};d.support.submitBubbles=n("submit"),d.support.changeBubbles=n("change"),b=e=f=null}})();var e=/^(?:\{.*\}|\[.*\])$/;d.extend({cache:{},uuid:0,expando:"jQuery"+(d.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?d.cache[a[d.expando]]:a[d.expando];return!!a&&!g(a)},data:function(a,c,e,f){if(d.acceptData(a)){var g=d.expando,h=typeof c==="string",i,j=a.nodeType,k=j?d.cache:a,l=j?a[d.expando]:a[d.expando]&&d.expando;if((!l||f&&l&&!k[l][g])&&h&&e===b)return;l||(j?a[d.expando]=l=++d.uuid:l=d.expando),k[l]||(k[l]={},j||(k[l].toJSON=d.noop));if(typeof c==="object"||typeof c==="function")f?k[l][g]=d.extend(k[l][g],c):k[l]=d.extend(k[l],c);i=k[l],f&&(i[g]||(i[g]={}),i=i[g]),e!==b&&(i[c]=e);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[c]:i}},removeData:function(b,c,e){if(d.acceptData(b)){var f=d.expando,h=b.nodeType,i=h?d.cache:b,j=h?b[d.expando]:d.expando;if(!i[j])return;if(c){var k=e?i[j][f]:i[j];if(k){delete k[c];if(!g(k))return}}if(e){delete i[j][f];if(!g(i[j]))return}var l=i[j][f];d.support.deleteExpando||i!=a?delete i[j]:i[j]=null,l?(i[j]={},h||(i[j].toJSON=d.noop),i[j][f]=l):h&&(d.support.deleteExpando?delete b[d.expando]:b.removeAttribute?b.removeAttribute(d.expando):b[d.expando]=null)}},_data:function(a,b,c){return d.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=d.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),d.fn.extend({data:function(a,c){var e=null;if(typeof a==="undefined"){if(this.length){e=d.data(this[0]);if(this[0].nodeType===1){var g=this[0].attributes,h;for(var i=0,j=g.length;i<j;i++)h=g[i].name,h.indexOf("data-")===0&&(h=h.substr(5),f(this[0],h,e[h]))}}return e}if(typeof a==="object")return this.each(function(){d.data(this,a)});var k=a.split(".");k[1]=k[1]?"."+k[1]:"";if(c===b){e=this.triggerHandler("getData"+k[1]+"!",[k[0]]),e===b&&this.length&&(e=d.data(this[0],a),e=f(this[0],a,e));return e===b&&k[1]?this.data(k[0]):e}return this.each(function(){var b=d(this),e=[k[0],c];b.triggerHandler("setData"+k[1]+"!",e),d.data(this,a,c),b.triggerHandler("changeData"+k[1]+"!",e)})},removeData:function(a){return this.each(function(){d.removeData(this,a)})}}),d.extend({queue:function(a,b,c){if(a){b=(b||"fx")+"queue";var e=d._data(a,b);if(!c)return e||[];!e||d.isArray(c)?e=d._data(a,b,d.makeArray(c)):e.push(c);return e}},dequeue:function(a,b){b=b||"fx";var c=d.queue(a,b),e=c.shift();e==="inprogress"&&(e=c.shift()),e&&(b==="fx"&&c.unshift("inprogress"),e.call(a,function(){d.dequeue(a,b)})),c.length||d.removeData(a,b+"queue",!0)}}),d.fn.extend({queue:function(a,c){typeof a!=="string"&&(c=a,a="fx");if(c===b)return d.queue(this[0],a);return this.each(function(b){var e=d.queue(this,a,c);a==="fx"&&e[0]!=="inprogress"&&d.dequeue(this,a)})},dequeue:function(a){return this.each(function(){d.dequeue(this,a)})},delay:function(a,b){a=d.fx?d.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){d.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var h=/[\n\t\r]/g,i=/\s+/,j=/\r/g,k=/^(?:href|src|style)$/,l=/^(?:button|input)$/i,m=/^(?:button|input|object|select|textarea)$/i,n=/^a(?:rea)?$/i,o=/^(?:radio|checkbox)$/i;d.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"},d.fn.extend({attr:function(a,b){return d.access(this,a,b,!0,d.attr)},removeAttr:function(a,b){return this.each(function(){d.attr(this,a,""),this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.addClass(a.call(this,b,c.attr("class")))});if(a&&typeof a==="string"){var b=(a||"").split(i);for(var c=0,e=this.length;c<e;c++){var f=this[c];if(f.nodeType===1)if(f.className){var g=" "+f.className+" ",h=f.className;for(var j=0,k=b.length;j<k;j++)g.indexOf(" "+b[j]+" ")<0&&(h+=" "+b[j]);f.className=d.trim(h)}else f.className=a}}return this},removeClass:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.removeClass(a.call(this,b,c.attr("class")))});if(a&&typeof a==="string"||a===b){var c=(a||"").split(i);for(var e=0,f=this.length;e<f;e++){var g=this[e];if(g.nodeType===1&&g.className)if(a){var j=(" "+g.className+" ").replace(h," ");for(var k=0,l=c.length;k<l;k++)j=j.replace(" "+c[k]+" "," ");g.className=d.trim(j)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,e=typeof b==="boolean";if(d.isFunction(a))return this.each(function(c){var e=d(this);e.toggleClass(a.call(this,c,e.attr("class"),b),b)});return this.each(function(){if(c==="string"){var f,g=0,h=d(this),j=b,k=a.split(i);while(f=k[g++])j=e?j:!h.hasClass(f),h[j?"addClass":"removeClass"](f)}else if(c==="undefined"||c==="boolean")this.className&&d._data(this,"__className__",this.className),this.className=this.className||a===!1?"":d._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(h," ").indexOf(b)>-1)return!0;return!1},val:function(a){if(!arguments.length){var c=this[0];if(c){if(d.nodeName(c,"option")){var e=c.attributes.value;return!e||e.specified?c.value:c.text}if(d.nodeName(c,"select")){var f=c.selectedIndex,g=[],h=c.options,i=c.type==="select-one";if(f<0)return null;for(var k=i?f:0,l=i?f+1:h.length;k<l;k++){var m=h[k];if(m.selected&&(d.support.optDisabled?!m.disabled:m.getAttribute("disabled")===null)&&(!m.parentNode.disabled||!d.nodeName(m.parentNode,"optgroup"))){a=d(m).val();if(i)return a;g.push(a)}}if(i&&!g.length&&h.length)return d(h[f]).val();return g}if(o.test(c.type)&&!d.support.checkOn)return c.getAttribute("value")===null?"on":c.value;return(c.value||"").replace(j,"")}return b}var n=d.isFunction(a);return this.each(function(b){var c=d(this),e=a;if(this.nodeType===1){n&&(e=a.call(this,b,c.val())),e==null?e="":typeof e==="number"?e+="":d.isArray(e)&&(e=d.map(e,function(a){return a==null?"":a+""}));if(d.isArray(e)&&o.test(this.type))this.checked=d.inArray(c.val(),e)>=0;else if(d.nodeName(this,"select")){var f=d.makeArray(e);d("option",this).each(function(){this.selected=d.inArray(d(this).val(),f)>=0}),f.length||(this.selectedIndex=-1)}else this.value=e}})}}),d.extend({attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,e,f){if(!a||a.nodeType===3||a.nodeType===8||a.nodeType===2)return b;if(f&&c in d.attrFn)return d(a)[c](e);var g=a.nodeType!==1||!d.isXMLDoc(a),h=e!==b;c=g&&d.props[c]||c;if(a.nodeType===1){var i=k.test(c);if(c==="selected"&&!d.support.optSelected){var j=a.parentNode;j&&(j.selectedIndex,j.parentNode&&j.parentNode.selectedIndex)}if((c in a||a[c]!==b)&&g&&!i){h&&(c==="type"&&l.test(a.nodeName)&&a.parentNode&&d.error("type property can't be changed"),e===null?a.nodeType===1&&a.removeAttribute(c):a[c]=e);if(d.nodeName(a,"form")&&a.getAttributeNode(c))return a.getAttributeNode(c).nodeValue;if(c==="tabIndex"){var o=a.getAttributeNode("tabIndex");return o&&o.specified?o.value:m.test(a.nodeName)||n.test(a.nodeName)&&a.href?0:b}return a[c]}if(!d.support.style&&g&&c==="style"){h&&(a.style.cssText=""+e);return a.style.cssText}h&&a.setAttribute(c,""+e);if(!a.attributes[c]&&(a.hasAttribute&&!a.hasAttribute(c)))return b;var p=!d.support.hrefNormalized&&g&&i?a.getAttribute(c,2):a.getAttribute(c);return p===null?b:p}h&&(a[c]=e);return a[c]}});var p=/\.(.*)$/,q=/^(?:textarea|input|select)$/i,r=/\./g,s=/ /g,t=/[^\w\s.|`]/g,u=function(a){return a.replace(t,"\\$&")};d.event={add:function(c,e,f,g){if(c.nodeType!==3&&c.nodeType!==8){try{d.isWindow(c)&&(c!==a&&!c.frameElement)&&(c=a)}catch(h){}if(f===!1)f=v;else if(!f)return;var i,j;f.handler&&(i=f,f=i.handler),f.guid||(f.guid=d.guid++);var k=d._data(c);if(!k)return;var l=k.events,m=k.handle;l||(k.events=l={}),m||(k.handle=m=function(){return typeof d!=="undefined"&&!d.event.triggered?d.event.handle.apply(m.elem,arguments):b}),m.elem=c,e=e.split(" ");var n,o=0,p;while(n=e[o++]){j=i?d.extend({},i):{handler:f,data:g},n.indexOf(".")>-1?(p=n.split("."),n=p.shift(),j.namespace=p.slice(0).sort().join(".")):(p=[],j.namespace=""),j.type=n,j.guid||(j.guid=f.guid);var q=l[n],r=d.event.special[n]||{};if(!q){q=l[n]=[];if(!r.setup||r.setup.call(c,g,p,m)===!1)c.addEventListener?c.addEventListener(n,m,!1):c.attachEvent&&c.attachEvent("on"+n,m)}r.add&&(r.add.call(c,j),j.handler.guid||(j.handler.guid=f.guid)),q.push(j),d.event.global[n]=!0}c=null}},global:{},remove:function(a,c,e,f){if(a.nodeType!==3&&a.nodeType!==8){e===!1&&(e=v);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=d.hasData(a)&&d._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(e=c.handler,c=c.type);if(!c||typeof c==="string"&&c.charAt(0)==="."){c=c||"";for(h in t)d.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+d.map(m.slice(0).sort(),u).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!e){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))d.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=d.event.special[h]||{};for(j=f||0;j<p.length;j++){q=p[j];if(e.guid===q.guid){if(l||n.test(q.namespace))f==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(f!=null)break}}if(p.length===0||f!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&d.removeEvent(a,h,s.handle),g=null,delete t[h]}if(d.isEmptyObject(t)){var w=s.handle;w&&(w.elem=null),delete s.events,delete s.handle,d.isEmptyObject(s)&&d.removeData(a,b,!0)}}},trigger:function(a,c,e){var f=a.type||a,g=arguments[3];if(!g){a=typeof a==="object"?a[d.expando]?a:d.extend(d.Event(f),a):d.Event(f),f.indexOf("!")>=0&&(a.type=f=f.slice(0,-1),a.exclusive=!0),e||(a.stopPropagation(),d.event.global[f]&&d.each(d.cache,function(){var b=d.expando,e=this[b];e&&e.events&&e.events[f]&&d.event.trigger(a,c,e.handle.elem)}));if(!e||e.nodeType===3||e.nodeType===8)return b;a.result=b,a.target=e,c=d.makeArray(c),c.unshift(a)}a.currentTarget=e;var h=d._data(e,"handle");h&&h.apply(e,c);var i=e.parentNode||e.ownerDocument;try{e&&e.nodeName&&d.noData[e.nodeName.toLowerCase()]||e["on"+f]&&e["on"+f].apply(e,c)===!1&&(a.result=!1,a.preventDefault())}catch(j){}if(!a.isPropagationStopped()&&i)d.event.trigger(a,c,i,!0);else if(!a.isDefaultPrevented()){var k,l=a.target,m=f.replace(p,""),n=d.nodeName(l,"a")&&m==="click",o=d.event.special[m]||{};if((!o._default||o._default.call(e,a)===!1)&&!n&&!(l&&l.nodeName&&d.noData[l.nodeName.toLowerCase()])){try{l[m]&&(k=l["on"+m],k&&(l["on"+m]=null),d.event.triggered=!0,l[m]())}catch(q){}k&&(l["on"+m]=k),d.event.triggered=!1}}},handle:function(c){var e,f,g,h,i,j=[],k=d.makeArray(arguments);c=k[0]=d.event.fix(c||a.event),c.currentTarget=this,e=c.type.indexOf(".")<0&&!c.exclusive,e||(g=c.type.split("."),c.type=g.shift(),j=g.slice(0).sort(),h=new RegExp("(^|\\.)"+j.join("\\.(?:.*\\.)?")+"(\\.|$)")),c.namespace=c.namespace||j.join("."),i=d._data(this,"events"),f=(i||{})[c.type];if(i&&f){f=f.slice(0);for(var l=0,m=f.length;l<m;l++){var n=f[l];if(e||h.test(n.namespace)){c.handler=n.handler,c.data=n.data,c.handleObj=n;var o=n.handler.apply(this,k);o!==b&&(c.result=o,o===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[d.expando])return a;var e=a;a=d.Event(e);for(var f=this.props.length,g;f;)g=this.props[--f],a[g]=e[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=c.documentElement,i=c.body;a.pageX=a.clientX+(h&&h.scrollLeft||i&&i.scrollLeft||0)-(h&&h.clientLeft||i&&i.clientLeft||0),a.pageY=a.clientY+(h&&h.scrollTop||i&&i.scrollTop||0)-(h&&h.clientTop||i&&i.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:d.proxy,special:{ready:{setup:d.bindReady,teardown:d.noop},live:{add:function(a){d.event.add(this,F(a.origType,a.selector),d.extend({},a,{handler:E,guid:a.handler.guid}))},remove:function(a){d.event.remove(this,F(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){d.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},d.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},d.Event=function(a){if(!this.preventDefault)return new d.Event(a);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?w:v):this.type=a,this.timeStamp=d.now(),this[d.expando]=!0},d.Event.prototype={preventDefault:function(){this.isDefaultPrevented=w;var a=this.originalEvent;a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=w;var a=this.originalEvent;a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=w,this.stopPropagation()},isDefaultPrevented:v,isPropagationStopped:v,isImmediatePropagationStopped:v};var x=function(a){var b=a.relatedTarget;try{if(b!==c&&!b.parentNode)return;while(b&&b!==this)b=b.parentNode;b!==this&&(a.type=a.data,d.event.handle.apply(this,arguments))}catch(e){}},y=function(a){a.type=a.data,d.event.handle.apply(this,arguments)};d.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){d.event.special[a]={setup:function(c){d.event.add(this,b,c&&c.selector?y:x,a)},teardown:function(a){d.event.remove(this,b,a&&a.selector?y:x)}}}),d.support.submitBubbles||(d.event.special.submit={setup:function(a,b){if(this.nodeName&&this.nodeName.toLowerCase()!=="form")d.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&d(b).closest("form").length&&C("submit",this,arguments)}),d.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&d(b).closest("form").length&&a.keyCode===13&&C("submit",this,arguments)});else return!1},teardown:function(a){d.event.remove(this,".specialSubmit")}});if(!d.support.changeBubbles){var z,A=function(a){var b=a.type,c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?d.map(a.options,function(a){return a.selected}).join("-"):"":a.nodeName.toLowerCase()==="select"&&(c=a.selectedIndex);return c},B=function B(a){var c=a.target,e,f;if(q.test(c.nodeName)&&!c.readOnly){e=d._data(c,"_change_data"),f=A(c),(a.type!=="focusout"||c.type!=="radio")&&d._data(c,"_change_data",f);if(e===b||f===e)return;if(e!=null||f)a.type="change",a.liveFired=b,d.event.trigger(a,arguments[1],c)}};d.event.special.change={filters:{focusout:B,beforedeactivate:B,click:function(a){var b=a.target,c=b.type;(c==="radio"||c==="checkbox"||b.nodeName.toLowerCase()==="select")&&B.call(this,a)},keydown:function(a){var b=a.target,c=b.type;(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&B.call(this,a)},beforeactivate:function(a){var b=a.target;d._data(b,"_change_data",A(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in z)d.event.add(this,c+".specialChange",z[c]);return q.test(this.nodeName)},teardown:function(a){d.event.remove(this,".specialChange");return q.test(this.nodeName)}},z=d.event.special.change.filters,z.focus=z.beforeactivate}c.addEventListener&&d.each({focus:"focusin",blur:"focusout"},function(a,b){function c(a){a=d.event.fix(a),a.type=b;return d.event.handle.call(this,a)}d.event.special[b]={setup:function(){this.addEventListener(a,c,!0)},teardown:function(){this.removeEventListener(a,c,!0)}}}),d.each(["bind","one"],function(a,c){d.fn[c]=function(a,e,f){if(typeof a==="object"){for(var g in a)this[c](g,e,a[g],f);return this}if(d.isFunction(e)||e===!1)f=e,e=b;var h=c==="one"?d.proxy(f,function(a){d(this).unbind(a,h);return f.apply(this,arguments)}):f;if(a==="unload"&&c!=="one")this.one(a,e,f);else for(var i=0,j=this.length;i<j;i++)d.event.add(this[i],a,h,e);return this}}),d.fn.extend({unbind:function(a,b){if(typeof a!=="object"||a.preventDefault)for(var e=0,f=this.length;e<f;e++)d.event.remove(this[e],a,b);else for(var c in a)this.unbind(c,a[c]);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){d.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){var c=d.Event(a);c.preventDefault(),c.stopPropagation(),d.event.trigger(c,b,this[0]);return c.result}},toggle:function(a){var b=arguments,c=1;while(c<b.length)d.proxy(a,b[c++]);return this.click(d.proxy(a,function(e){var f=(d._data(this,"lastToggle"+a.guid)||0)%c;d._data(this,"lastToggle"+a.guid,f+1),e.preventDefault();return b[f].apply(this,arguments)||!1}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var D={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};d.each(["live","die"],function(a,c){d.fn[c]=function(a,e,f,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:d(this.context);if(typeof a==="object"&&!a.preventDefault){for(var o in a)n[c](o,e,a[o],m);return this}d.isFunction(e)&&(f=e,e=b),a=(a||"").split(" ");while((h=a[i++])!=null){j=p.exec(h),k="",j&&(k=j[0],h=h.replace(p,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,h==="focus"||h==="blur"?(a.push(D[h]+k),h=h+k):h=(D[h]||h)+k;if(c==="live")for(var q=0,r=n.length;q<r;q++)d.event.add(n[q],"live."+F(h,m),{data:e,selector:m,handler:f,origType:h,origHandler:f,preType:l});else n.unbind("live."+F(h,m),f)}return this}}),d.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){d.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},d.attrFn&&(d.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!=="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,f=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,e,g){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!=="string")return e;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(f.call(n)==="[object Array]")if(u)if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&e.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&e.push(j[t]);else e.push.apply(e,n);else p(n,e);o&&(k(o,h,e,g),k.uniqueSort(e));return e};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!=="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(f){if(f===!0)continue}else g=o=!0}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b==="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1){}a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b==="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=u;typeof b==="string"&&!j.test(b)&&(b=b.toLowerCase(),d=b,g=t),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=u;typeof b==="string"&&!j.test(b)&&(b=b.toLowerCase(),d=b,g=t),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!=="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!=="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!=="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){return"text"===a.getAttribute("type")},radio:function(a){return"radio"===a.type},checkbox:function(a){return"checkbox"===a.type},file:function(a){return"file"===a.type},password:function(a){return"password"===a.type},submit:function(a){return"submit"===a.type},image:function(a){return"image"===a.type},reset:function(a){return"reset"===a.type},button:function(a){return"button"===a.type||a.nodeName.toLowerCase()==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(f.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length==="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(a===b){g=!0;return 0}if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!=="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!=="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!=="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!=="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector,d=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(e){d=!0}b&&(k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(d||!l.match.PSEUDO.test(c)&&!/!=/.test(c))return b.call(a,c)}catch(e){}return k(c,null,null,[a]).length>0})}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!=="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};d.find=k,d.expr=k.selectors,d.expr[":"]=d.expr.filters,d.unique=k.uniqueSort,d.text=k.getText,d.isXMLDoc=k.isXML,d.contains=k.contains}();var G=/Until$/,H=/^(?:parents|prevUntil|prevAll)/,I=/,/,J=/^.[^:#\[\.,]*$/,K=Array.prototype.slice,L=d.expr.match.POS,M={children:!0,contents:!0,next:!0,prev:!0};d.fn.extend({find:function(a){var b=this.pushStack("","find",a),c=0;for(var e=0,f=this.length;e<f;e++){c=b.length,d.find(a,this[e],b);if(e>0)for(var g=c;g<b.length;g++)for(var h=0;h<c;h++)if(b[h]===b[g]){b.splice(g--,1);break}}return b},has:function(a){var b=d(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(d.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(O(this,a,!1),"not",a)},filter:function(a){return this.pushStack(O(this,a,!0),"filter",a)},is:function(a){return!!a&&d.filter(a,this).length>0},closest:function(a,b){var c=[],e,f,g=this[0];if(d.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(e=0,f=a.length;e<f;e++)i=a[e],j[i]||(j[i]=d.expr.match.POS.test(i)?d(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:d(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=L.test(a)?d(a,b||this.context):null;for(e=0,f=this.length;e<f;e++){g=this[e];while(g){if(l?l.index(g)>-1:d.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b)break}}c=c.length>1?d.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a==="string")return d.inArray(this[0],a?d(a):this.parent().children());return d.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a==="string"?d(a,b):d.makeArray(a),e=d.merge(this.get(),c);return this.pushStack(N(c[0])||N(e[0])?e:d.unique(e))},andSelf:function(){return this.add(this.prevObject)}}),d.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return d.dir(a,"parentNode")},parentsUntil:function(a,b,c){return d.dir(a,"parentNode",c)},next:function(a){return d.nth(a,2,"nextSibling")},prev:function(a){return d.nth(a,2,"previousSibling")},nextAll:function(a){return d.dir(a,"nextSibling")},prevAll:function(a){return d.dir(a,"previousSibling")},nextUntil:function(a,b,c){return d.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return d.dir(a,"previousSibling",c)},siblings:function(a){return d.sibling(a.parentNode.firstChild,a)},children:function(a){return d.sibling(a.firstChild)},contents:function(a){return d.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:d.makeArray(a.childNodes)}},function(a,b){d.fn[a]=function(c,e){var f=d.map(this,b,c),g=K.call(arguments);G.test(a)||(e=c),e&&typeof ... [truncated message content] |
From: <be...@us...> - 2012-02-20 00:45:45
|
Revision: 9031 http://xoops.svn.sourceforge.net/xoops/?rev=9031&view=rev Author: beckmi Date: 2012-02-20 00:45:39 +0000 (Mon, 20 Feb 2012) Log Message: ----------- Adding missing translations Modified Paths: -------------- XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-02-20 00:32:10 UTC (rev 9030) +++ XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-02-20 00:45:39 UTC (rev 9031) @@ -254,4 +254,7 @@ define("_MI_ADVERTISING_DESC","shows a commercial break after the 2nd Thread"); define("_MI_USERATTACH_ENABLE","Display attachments only for registered users"); define("_MI_USERATTACH_DESC","shows attachments in the forum only after logging in."); + +define("_MI_MAX_IMG_HEIGHT","Maximum height of an image"); +define("_MI_MAX_IMG_HEIGHT_DESC", "Sets the maximum allowed height of an uploaded image."); ?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-02-20 00:32:16
|
Revision: 9030 http://xoops.svn.sourceforge.net/xoops/?rev=9030&view=rev Author: beckmi Date: 2012-02-20 00:32:10 +0000 (Mon, 20 Feb 2012) Log Message: ----------- Removing extra </div> Modified Paths: -------------- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html 2012-02-20 00:26:17 UTC (rev 9029) +++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html 2012-02-20 00:32:10 UTC (rev 9030) @@ -1,171 +1,185 @@ <fieldset> -<div class="forum_header"> - <div class="forum_title" style="float:left;"> - <h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php"><{$index_title}></a></h2> - <hr align="left" width="50%" size="1" /> - <{$index_desc}> + <div class="forum_header"> + <div class="forum_title" style="float:left;"> + <h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php"><{$index_title}></a></h2> + <hr align="left" width="50%" size="1"/> + <{$index_desc}> + </div> </div> -</div> -<div style="clear:both;"></div> -<{if $viewer_level gt 1}> - <br /> - <div class="forum_stats"> - <div class="forum_stats_left"> - <{$smarty.const._MD_TOPIC}>: - <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=active#admin" target="_self" title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a> | - <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=pending#admin" target="_self" title="<{$smarty.const._MD_TYPE_PENDING}>"><{if $wait_new_topic}>(<font color="red"><b><{$wait_new_topic}></b></font>) <{/if}><{$smarty.const._MD_TYPE_PENDING}></a> | - <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=deleted#admin" target="_self" title="<{$smarty.const._MD_TYPE_DELETED}>"><{if $delete_topic}>(<font color="red"><b><{$delete_topic}></b></font>) <{/if}><{$smarty.const._MD_TYPE_DELETED}></a><br /> - <{$smarty.const._MD_POST2}>: - <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=active#admin" target="_self" title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a> | - <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=pending#admin" target="_self" title="<{$smarty.const._MD_TYPE_PENDING}>"><{if $wait_new_post}>(<font color="red"><b><{$wait_new_post}></b></font>) <{/if}><{$smarty.const._MD_TYPE_PENDING}></a> | - <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=deleted#admin" target="_self" title="<{$smarty.const._MD_TYPE_DELETED}>"><{if $delete_post}>(<font color="red"><b><{$delete_post}></b></font>) <{/if}><{$smarty.const._MD_TYPE_DELETED}></a> + <div style="clear:both;"></div> + <{if $viewer_level gt 1}> + <br/> + + <div class="forum_stats"> + <div class="forum_stats_left"> + <{$smarty.const._MD_TOPIC}>: + <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=active#admin" target="_self" title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a> + | + <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=pending#admin" target="_self" title="<{$smarty.const._MD_TYPE_PENDING}>"><{if + $wait_new_topic}>(<font color="red"><b><{$wait_new_topic}></b></font>) + <{/if}><{$smarty.const._MD_TYPE_PENDING}></a> | + <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=deleted#admin" target="_self" title="<{$smarty.const._MD_TYPE_DELETED}>"><{if + $delete_topic}>(<font color="red"><b><{$delete_topic}></b></font>) + <{/if}><{$smarty.const._MD_TYPE_DELETED}></a><br/> + <{$smarty.const._MD_POST2}>: + <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=active#admin" target="_self" title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a> + | + <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=pending#admin" target="_self" title="<{$smarty.const._MD_TYPE_PENDING}>"><{if + $wait_new_post}>(<font color="red"><b><{$wait_new_post}></b></font>) + <{/if}><{$smarty.const._MD_TYPE_PENDING}></a> | + <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=deleted#admin" target="_self" title="<{$smarty.const._MD_TYPE_DELETED}>"><{if + $delete_post}>(<font color="red"><b><{$delete_post}></b></font>) + <{/if}><{$smarty.const._MD_TYPE_DELETED}></a> </div> <div class="forum_stats_right"> - <{if $report_post}><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/admin_report.php"><{$report_post}></a><{/if}> - <br /><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/moderate.php" target="_self" title="<{$smarty.const._MD_TYPE_SUSPEND}>"><{$smarty.const._MD_TYPE_SUSPEND}></a> | + <{if $report_post}><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/admin_report.php"><{$report_post}></a><{/if}> + <br/><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/moderate.php" target="_self" title="<{$smarty.const._MD_TYPE_SUSPEND}>"><{$smarty.const._MD_TYPE_SUSPEND}></a> + | <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/index.php" target="_self" title="<{$smarty.const._MD_ADMINCP}>"><{$smarty.const._MD_ADMINCP}></a> - </div> - <div style="clear:both;"></div> - </div> -<{/if}> + </div> + <div style="clear:both;"></div> + </div> + <{/if}> </fieldset> -<br style="clear: both;" /> +<br style="clear: both;"/> <fieldset> -<div class="dropdown"> - <{includeq file="db:newbb_index_menu.html"}> -</div> + <div class="dropdown"> + <{includeq file="db:newbb_index_menu.html"}> + </div> </fieldset> -<br style="clear: both;" /> +<br style="clear: both;"/> <fieldset> -<br /> +<br/> <!-- start forum categories --> -<div class="index_category"> - <!-- start forum categories --> - <{foreachq item=category from=$categories}> - <table class="index_category" cellspacing="0" width="100%"> - <tr class="head"> - <td width="3%" valign="middle" align="center"> - <img onclick="ToggleBlockCategory('<{$category.cat_element_id}>', this, '<{$category_icon.expand}>', '<{$category_icon.collapse}>')" src="<{$category.cat_icon_display}>" alt="" /> - </td> - <{if $category.cat_image}> - <td width="8%"><img src="<{$category.cat_image}>" alt="<{$category.cat_title}>" /></td> - <{/if}> - <td align="left"> - <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?cat=<{$category.cat_id}>"><{$category.cat_title}></a> - <{if $category.cat_description}><p class="desc"><{$category.cat_description}></p><{/if}> - </td> - <{if $category.cat_sponsor}> - <td width="15%" nowrap="nowrap" align="right"> - <p class="desc"><a href="<{$category.cat_sponsor.link}>" title="<{$category.cat_sponsor.title}>" target="_blank"><{$category.cat_sponsor.title}></a></p> - </td> - <{/if}> - </tr> - </table> +<div class="index_category"> +<!-- start forum categories --> +<{foreachq item=category from=$categories}> +<table class="index_category" cellspacing="0" width="100%"> + <tr class="head"> + <td width="3%" valign="middle" align="center"> + <img onclick="ToggleBlockCategory('<{$category.cat_element_id}>', this, '<{$category_icon.expand}>', '<{$category_icon.collapse}>')" src="<{$category.cat_icon_display}>" alt=""/> + </td> + <{if $category.cat_image}> + <td width="8%"><img src="<{$category.cat_image}>" alt="<{$category.cat_title}>"/></td> + <{/if}> + <td align="left"> + <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?cat=<{$category.cat_id}>"><{$category.cat_title}></a> + <{if $category.cat_description}><p class="desc"><{$category.cat_description}></p><{/if}> + </td> + <{if $category.cat_sponsor}> + <td width="15%" nowrap="nowrap" align="right"> + <p class="desc"> + <a href="<{$category.cat_sponsor.link}>" title="<{$category.cat_sponsor.title}>" target="_blank"><{$category.cat_sponsor.title}></a> + </p> + </td> + <{/if}> + </tr> +</table> - <div id="<{$category.cat_element_id}>" style="display: <{$category.cat_display}>"> - <table border="0" cellspacing="2" cellpadding="0" width="100%"> - <{if $category.forums}> - <tr class="head" align="center"> - <td width="5%"> </td> - <{if $subforum_display == "expand"}> - <td colspan="2" width="37%" nowrap="nowrap" align="left"><{$smarty.const._MD_FORUM}></td> - <{else}> - <td width="37%" nowrap="nowrap" align="left"><{$smarty.const._MD_FORUM}></td> - <{/if}> - <td width="9%" nowrap="nowrap"><{$smarty.const._MD_TOPICS}></td> - <td width="9%" nowrap="nowrap"><{$smarty.const._MD_POSTS}></td> - <td width="40%" nowrap="nowrap"><{$smarty.const._MD_LASTPOST}></td> - </tr> - <{/if}> +<div id="<{$category.cat_element_id}>" style="display: <{$category.cat_display}>"> +<table border="0" cellspacing="2" cellpadding="0" width="100%"> +<{if $category.forums}> +<tr class="head" align="center"> + <td width="5%"> </td> + <{if $subforum_display == "expand"}> + <td colspan="2" width="37%" nowrap="nowrap" align="left"><{$smarty.const._MD_FORUM}></td> + <{else}> + <td width="37%" nowrap="nowrap" align="left"><{$smarty.const._MD_FORUM}></td> + <{/if}> + <td width="9%" nowrap="nowrap"><{$smarty.const._MD_TOPICS}></td> + <td width="9%" nowrap="nowrap"><{$smarty.const._MD_POSTS}></td> + <td width="40%" nowrap="nowrap"><{$smarty.const._MD_LASTPOST}></td> +</tr> +<{/if}> - <!-- start forums --> +<!-- start forums --> - <{if $subforum_display == "expand"}> - <{foreachq item=forum from=$category.forums}> - <tr> - <td width="5%" class="even" align="center" valign="middle"><{$forum.forum_folder}></td> - <td colspan="2" class="odd"> - <div id="index_forum"> +<{if $subforum_display == "expand"}> +<{foreachq item=forum from=$category.forums}> +<tr> + <td width="5%" class="even" align="center" valign="middle"><{$forum.forum_folder}></td> + <td colspan="2" class="odd"> + <div id="index_forum"> <span class="item"><a href="<{$forum.topic_link}>"><{$forum.forum_name}></a> <{if $rss_enable}> (<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?f=<{$forum.forum_id}>" target="_blank" title="RSS feed">RSS</a>) <{/if}> - <br /><{$forum.forum_desc}> + <br/><{$forum.forum_desc}> </span> - <{if $forum.forum_moderators}> + <{if $forum.forum_moderators}> <span class="extra"> <{$smarty.const._MD_MODERATOR}>: <{$forum.forum_moderators}> </span> - <{/if}> - </div> - </td> - <td class="even" align="center" valign="middle"> - <{if $stats[$forum.forum_id].topic.day}><strong><{$stats[$forum.forum_id].topic.day}></strong>/<{/if}> - <{$forum.forum_topics}> - </td> - <td class="odd" align="center" valign="middle"> - <{if $stats[$forum.forum_id].post.day}><strong><{$stats[$forum.forum_id].post.day}></strong>/<{/if}> - <{$forum.forum_posts}> - </td> - <td class="even" align="right" valign="middle"> - <{if $forum.forum_lastpost_subject}> - <{$forum.forum_lastpost_time}> <{$smarty.const._MD_BY}> <{$forum.forum_lastpost_user}><br /> - <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$forum.forum_lastpost_id}>"> - <{$forum.forum_lastpost_subject}> <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/<{$forum.forum_lastpost_icon}>" alt="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" title="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" /> - </a> - <{else}> - <{$smarty.const._AM_NEWBB_NOTOPIC}> - <{/if}> - </td> - </tr> + <{/if}> + </div> + </td> + <td class="even" align="center" valign="middle"> + <{if $stats[$forum.forum_id].topic.day}><strong><{$stats[$forum.forum_id].topic.day}></strong>/<{/if}> + <{$forum.forum_topics}> + </td> + <td class="odd" align="center" valign="middle"> + <{if $stats[$forum.forum_id].post.day}><strong><{$stats[$forum.forum_id].post.day}></strong>/<{/if}> + <{$forum.forum_posts}> + </td> + <td class="even" align="right" valign="middle"> + <{if $forum.forum_lastpost_subject}> + <{$forum.forum_lastpost_time}> <{$smarty.const._MD_BY}> <{$forum.forum_lastpost_user}><br/> + <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$forum.forum_lastpost_id}>"> + <{$forum.forum_lastpost_subject}> <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/<{$forum.forum_lastpost_icon}>" alt="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" title="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>"/> + </a> + <{else}> + <{$smarty.const._AM_NEWBB_NOTOPIC}> + <{/if}> + </td> +</tr> <{if $forum.subforum}> - <tr class="head" > - <td width="5%"> </td> - <td width="5%" align="center"><{$img_subforum}> </td> - <td width="32%" align="center"><{$smarty.const._MD_SUBFORUMS}> </td> - <td width="9%" nowrap="nowrap"> </td> - <td width="9%" nowrap="nowrap"> </td> - <td width="40%" nowrap="nowrap"> </td> - </tr> +<tr class="head"> + <td width="5%"> </td> + <td width="5%" align="center"><{$img_subforum}> </td> + <td width="32%" align="center"><{$smarty.const._MD_SUBFORUMS}> </td> + <td width="9%" nowrap="nowrap"> </td> + <td width="9%" nowrap="nowrap"> </td> + <td width="40%" nowrap="nowrap"> </td> +</tr> <{foreachq item=subforum from=$forum.subforum}> - <tr> - <td class="odd" width="5%"> </td> - <td class="even" align="center" valign="middle" width="5%"><{$subforum.forum_folder}></td> - <td width="32%" class="odd"> - <div id="index_forum"> +<tr> + <td class="odd" width="5%"> </td> + <td class="even" align="center" valign="middle" width="5%"><{$subforum.forum_folder}></td> + <td width="32%" class="odd"> + <div id="index_forum"> <span class="item"><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$subforum.forum_id}>"><strong><{$subforum.forum_name}></strong></a> <{if $rss_enable}> (<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?f=<{$subforum.forum_id}>" target="_blank" title="RSS feed">RSS</a>) <{/if}> - <br /><{$subforum.forum_desc}> + <br/><{$subforum.forum_desc}> </span> - <{if $subforum.forum_moderators}> + <{if $subforum.forum_moderators}> <span class="extra"> <{$smarty.const._MD_MODERATOR}>: <{$subforum.forum_moderators}> </span> - <{/if}> + <{/if}> </div> - </td> - <td class="even" width="9%" align="center" valign="middle"> - <{if $stats[$subforum.forum_id].topic.day}><strong><{$stats[$subforum.forum_id].topic.day}></strong>/<{/if}> - <{$subforum.forum_topics}> - </td> - <td class="odd" width="9%" align="center" valign="middle"> - <{if $stats[$subforum.forum_id].post.day}><strong><{$stats[$subforum.forum_id].post.day}></strong>/<{/if}> - <{$subforum.forum_posts}> - </td> - <td class="even" width="40%" align="right" valign="middle"> - <{if $subforum.forum_lastpost_subject}> - <{$subforum.forum_lastpost_time}> <{$smarty.const._MD_BY}> <{$subforum.forum_lastpost_user}><br /> - <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$subforum.forum_lastpost_id}>"> - <{$subforum.forum_lastpost_subject}> <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/<{$forum.forum_lastpost_icon}>" alt="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" title="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" /> - </a> - <{else}> - <{$smarty.const._AM_NEWBB_NOTOPIC}> - <{/if}> - </td> - </tr> + </td> + <td class="even" width="9%" align="center" valign="middle"> + <{if $stats[$subforum.forum_id].topic.day}><strong><{$stats[$subforum.forum_id].topic.day}></strong>/<{/if}> + <{$subforum.forum_topics}> + </td> + <td class="odd" width="9%" align="center" valign="middle"> + <{if $stats[$subforum.forum_id].post.day}><strong><{$stats[$subforum.forum_id].post.day}></strong>/<{/if}> + <{$subforum.forum_posts}> + </td> + <td class="even" width="40%" align="right" valign="middle"> + <{if $subforum.forum_lastpost_subject}> + <{$subforum.forum_lastpost_time}> <{$smarty.const._MD_BY}> <{$subforum.forum_lastpost_user}><br/> + <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$subforum.forum_lastpost_id}>"> + <{$subforum.forum_lastpost_subject}> <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/<{$forum.forum_lastpost_icon}>" alt="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" title="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>"/> + </a> + <{else}> + <{$smarty.const._AM_NEWBB_NOTOPIC}> + <{/if}> + </td> +</tr> <{/foreach}> <{/if}> <{/foreach}> @@ -173,180 +187,181 @@ <{elseif $subforum_display == "collapse"}> <{foreachq item=forum from=$category.forums}> - <tr> - <{if $forum.subforum}> - <td class="even" rowspan="2" align="center" valign="middle"><{$forum.forum_folder}></td> - <{else}> - <td class="even" align="center" valign="middle"><{$forum.forum_folder}></td> - <{/if}> - <td class="odd"> - <div id="index_forum"> +<tr> + <{if $forum.subforum}> + <td class="even" rowspan="2" align="center" valign="middle"><{$forum.forum_folder}></td> + <{else}> + <td class="even" align="center" valign="middle"><{$forum.forum_folder}></td> + <{/if}> + <td class="odd"> + <div id="index_forum"> <span class="item"><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum.forum_id}>"><{$forum.forum_name}></a> <{if $rss_enable}> (<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?f=<{$forum.forum_id}>" target="_blank" title="RSS feed">RSS</a>) <{/if}> - <br /><{$forum.forum_desc}> + <br/><{$forum.forum_desc}> </span> - <{if $forum.forum_moderators}> + <{if $forum.forum_moderators}> <span class="extra"> <{$smarty.const._MD_MODERATOR}>: <{$forum.forum_moderators}> </span> - <{/if}> + <{/if}> </div> - </td> - <td class="even" align="center" valign="middle"> - <{if $stats[$forum.forum_id].topic.day}><strong><{$stats[$forum.forum_id].topic.day}></strong>/<{/if}> - <{$forum.forum_topics}> - </td> - <td class="odd" align="center" valign="middle"> - <{if $stats[$forum.forum_id].post.day}><strong><{$stats[$forum.forum_id].post.day}></strong>/<{/if}> - <{$forum.forum_posts}> - </td> - <td class="even" align="right" valign="middle"> - <{if $forum.forum_lastpost_subject}> - <{$forum.forum_lastpost_time}> <{$smarty.const._MD_BY}> <{$forum.forum_lastpost_user}><br /> - <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$forum.forum_lastpost_id}>"> - <{$forum.forum_lastpost_subject}> <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/<{$forum.forum_lastpost_icon}>" alt="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" title="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" /> - </a> - <{else}> - <{$smarty.const._AM_NEWBB_NOTOPIC}> - <{/if}> - </td> - </tr> + </td> + <td class="even" align="center" valign="middle"> + <{if $stats[$forum.forum_id].topic.day}><strong><{$stats[$forum.forum_id].topic.day}></strong>/<{/if}> + <{$forum.forum_topics}> + </td> + <td class="odd" align="center" valign="middle"> + <{if $stats[$forum.forum_id].post.day}><strong><{$stats[$forum.forum_id].post.day}></strong>/<{/if}> + <{$forum.forum_posts}> + </td> + <td class="even" align="right" valign="middle"> + <{if $forum.forum_lastpost_subject}> + <{$forum.forum_lastpost_time}> <{$smarty.const._MD_BY}> <{$forum.forum_lastpost_user}><br/> + <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$forum.forum_lastpost_id}>"> + <{$forum.forum_lastpost_subject}> <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/<{$forum.forum_lastpost_icon}>" alt="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" title="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>"/> + </a> + <{else}> + <{$smarty.const._AM_NEWBB_NOTOPIC}> + <{/if}> + </td> +</tr> - <{if $forum.subforum}> - <tr> - <td class="odd" colspan="4" align="left"><{$smarty.const._MD_SUBFORUMS}> <{$img_subforum}> - <{foreachq item=subforum from=$forum.subforum}> - [<a href="viewforum.php?forum=<{$subforum.forum_id}>"><{$subforum.forum_name}></a>] - <{/foreach}> - </td> - </tr> - <{/if}> +<{if $forum.subforum}> +<tr> + <td class="odd" colspan="4" align="left"><{$smarty.const._MD_SUBFORUMS}> <{$img_subforum}> + <{foreachq item=subforum from=$forum.subforum}> + [<a href="viewforum.php?forum=<{$subforum.forum_id}>"><{$subforum.forum_name}></a>] + <{/foreach}> + </td> +</tr> +<{/if}> <{/foreach}> <{else}> <{foreachq item=forum from=$category.forums}> - <tr> - <td class="even" align="center" valign="middle"><{$forum.forum_folder}></td> - <td class="odd"> - <div id="index_forum"> +<tr> + <td class="even" align="center" valign="middle"><{$forum.forum_folder}></td> + <td class="odd"> + <div id="index_forum"> <span class="item"><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum.forum_id}>"><{$forum.forum_name}></a> <{if $rss_enable}> (<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?f=<{$forum.forum_id}>" target="_blank" title="RSS feed">RSS</a>) <{/if}> - <br /><{$forum.forum_desc}> + <br/><{$forum.forum_desc}> </span> - <{if $forum.forum_moderators}> + <{if $forum.forum_moderators}> <span class="extra"> <{$smarty.const._MD_MODERATOR}>: <{$forum.forum_moderators}> </span> - <{/if}> + <{/if}> </div> - </td> - <td class="even" align="center" valign="middle"> - <{if $stats[$forum.forum_id].topic.day}><strong><{$stats[$forum.forum_id].topic.day}></strong>/<{/if}> - <{$forum.forum_topics}> - </td> - <td class="odd" align="center" valign="middle"> - <{if $stats[$forum.forum_id].post.day}><strong><{$stats[$forum.forum_id].post.day}></strong>/<{/if}> - <{$forum.forum_posts}> - </td> - <td class="even" align="right" valign="middle"> - <{if $forum.forum_lastpost_subject}> - <{$forum.forum_lastpost_time}> <{$smarty.const._MD_BY}> <{$forum.forum_lastpost_user}><br /> - <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$forum.forum_lastpost_id}>"> - <{$forum.forum_lastpost_subject}> <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/<{$forum.forum_lastpost_icon}>" alt="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" title="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" /> - </a> - <{else}> - <{$smarty.const._AM_NEWBB_NOTOPIC}> - <{/if}> - </td> - </tr> + </td> + <td class="even" align="center" valign="middle"> + <{if $stats[$forum.forum_id].topic.day}><strong><{$stats[$forum.forum_id].topic.day}></strong>/<{/if}> + <{$forum.forum_topics}> + </td> + <td class="odd" align="center" valign="middle"> + <{if $stats[$forum.forum_id].post.day}><strong><{$stats[$forum.forum_id].post.day}></strong>/<{/if}> + <{$forum.forum_posts}> + </td> + <td class="even" align="right" valign="middle"> + <{if $forum.forum_lastpost_subject}> + <{$forum.forum_lastpost_time}> <{$smarty.const._MD_BY}> <{$forum.forum_lastpost_user}><br/> + <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$forum.forum_lastpost_id}>"> + <{$forum.forum_lastpost_subject}> <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/<{$forum.forum_lastpost_icon}>" alt="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" title="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>"/> + </a> + <{else}> + <{$smarty.const._AM_NEWBB_NOTOPIC}> + <{/if}> + </td> +</tr> <{/foreach}> <{/if}> - <!-- end forums --> +<!-- end forums --> </table> -<br /> +<br/> </div> <{/foreach}> <!-- end forum categories --> </fieldset> <fieldset> -<div> - <div style="float: left; text-align: left;"> - <{$img_forum_new}> = <{$smarty.const._MD_NEWPOSTS}><br /> - <{$img_forum}> = <{$smarty.const._MD_NONEWPOSTS}><br /> - </div> - <div style="float: right; text-align: right;"> - <form action="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php" method="post" name="search" id="search"> - <input name="term" id="term" type="text" size="20" /> - <input type="hidden" name="forum" id="forum" value="all" /> - <input type="hidden" name="sortby" id="sortby" value="p.post_time desc" /> - <input type="hidden" name="searchin" id="searchin" value="both" /> - <input type="submit" name="submit" id="submit" value="<{$smarty.const._MD_SEARCH}>" /> - <br /> - [ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php"><{$smarty.const._MD_ADVSEARCH}></a> ] - </form> - <{if $rss_button}> - <br /> - <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?c=<{$viewcat}>" target="_blank" title="RSS FEED"> - <{$rss_button}> - </a> - <br /><font size="0.7em;">NewBB Version <{$version/100}></font> - <br /> - <{/if}> - </div> -</div> + <div> + <div style="float: left; text-align: left;"> + <{$img_forum_new}> = <{$smarty.const._MD_NEWPOSTS}><br/> + <{$img_forum}> = <{$smarty.const._MD_NONEWPOSTS}><br/> + </div> + <div style="float: right; text-align: right;"> + <form action="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php" method="post" name="search" id="search"> + <input name="term" id="term" type="text" size="20"/> + <input type="hidden" name="forum" id="forum" value="all"/> + <input type="hidden" name="sortby" id="sortby" value="p.post_time desc"/> + <input type="hidden" name="searchin" id="searchin" value="both"/> + <input type="submit" name="submit" id="submit" value="<{$smarty.const._MD_SEARCH}>"/> + <br/> + [ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php"><{$smarty.const._MD_ADVSEARCH}></a> ] + </form> + <{if $rss_button}> + <br/> + <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?c=<{$viewcat}>" target="_blank" title="RSS FEED"> + <{$rss_button}> + </a> + <br/><font size="0.7em;">NewBB Version <{$version/100}></font> + <br/> + <{/if}> + </div> + </div> </fieldset> -<br style="clear: both;" /> -<{if $currenttime}> +<br style="clear: both;"/> +<{if $currenttime}> <fieldset> - <div> - <div class="even" style="padding: 5px; line-height: 150%;"> - <span style="padding: 2px;"><{$online.statistik}></span> - <strong><{$smarty.const._MD_NEWBB_STATS}></strong> - </div> - <div class="forum_stats odd" style="padding: 5px; line-height: 150%;"> - <!-- <div class="odd" style="padding: 5px; line-height: 150%;"> //--> - <div class="forum_stats_left odd"> - <{$currenttime}><br /> - <{$smarty.const._MD_TOTALTOPICSC}> - <strong><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php" title="<{$smarty.const._MD_ALL}>"><{$stats[0].topic.total}></a></strong> - | <{$smarty.const._MD_TOTALPOSTSC}><strong><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php" title="<{$smarty.const._MD_ALLPOSTS}>"><{$stats[0].post.total}></a></strong> - <{if $stats[0].digest.total}> - | <{$smarty.const._MD_TOTALDIGESTSC}><strong><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=digest" title="<{$smarty.const._MD_TOTALDIGESTSC}>"><{$stats[0].digest.total}></a></strong> - <{/if}> - <{if $userstats}> - <br /><br /> - <{$userstats.lastvisit}><br /><{$userstats.lastpost}> - <{/if}> - </div> - <div class="forum_stats_right odd"> - <!-- <div style="align :right; float: right; width: 48%">//--> - <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=new" title="<{$smarty.const._MD_VIEW_NEWPOSTS}>"><{$smarty.const._MD_VIEW_NEWPOSTS}></a><br /> - <{$smarty.const._MD_TODAYTOPICSC}><strong><{$stats[0].topic.day|default:0}></strong> - | <{$smarty.const._MD_TODAYPOSTSC}><strong><{$stats[0].post.day|default:0}></strong> - <{if $userstats}> - <br /><br /> - <{$userstats.topics}> | <{$userstats.posts}><{if $userstats.digests}><br /><{$userstats.digests}><{/if}> - <{/if}> - </div> - </div> - </div> + <div> + <div class="even" style="padding: 5px; line-height: 150%;"> + <span style="padding: 2px;"><{$online.statistik}></span> + <strong><{$smarty.const._MD_NEWBB_STATS}></strong> + </div> + <div class="forum_stats odd" style="padding: 5px; line-height: 150%;"> + <!-- <div class="odd" style="padding: 5px; line-height: 150%;"> //--> + <div class="forum_stats_left odd"> + <{$currenttime}><br/> + <{$smarty.const._MD_TOTALTOPICSC}> + <strong><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php" title="<{$smarty.const._MD_ALL}>"><{$stats[0].topic.total}></a></strong> + | + <{$smarty.const._MD_TOTALPOSTSC}><strong><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php" title="<{$smarty.const._MD_ALLPOSTS}>"><{$stats[0].post.total}></a></strong> + <{if $stats[0].digest.total}> + | + <{$smarty.const._MD_TOTALDIGESTSC}><strong><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=digest" title="<{$smarty.const._MD_TOTALDIGESTSC}>"><{$stats[0].digest.total}></a></strong> + <{/if}> + <{if $userstats}> + <br/><br/> + <{$userstats.lastvisit}><br/><{$userstats.lastpost}> + <{/if}> + </div> + <div class="forum_stats_right odd"> + <!-- <div style="align :right; float: right; width: 48%">//--> + <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=new" title="<{$smarty.const._MD_VIEW_NEWPOSTS}>"><{$smarty.const._MD_VIEW_NEWPOSTS}></a><br/> + <{$smarty.const._MD_TODAYTOPICSC}><strong><{$stats[0].topic.day|default:0}></strong> + | <{$smarty.const._MD_TODAYPOSTSC}><strong><{$stats[0].post.day|default:0}></strong> + <{if $userstats}> + <br/><br/> + <{$userstats.topics}> | <{$userstats.posts}><{if $userstats.digests}><br/><{$userstats.digests}><{/if}> + <{/if}> + </div> + </div> + </div> </fieldset> <{/if}> <br style="clear:both;"/> <{if $online}> - <fieldset> - <{includeq file="db:newbb_online.html"}> - </fieldset> +<fieldset> + <{includeq file="db:newbb_online.html"}> +</fieldset> <{/if}> <fieldset> -<{includeq file='db:newbb_notification_select.html'}> + <{includeq file='db:newbb_notification_select.html'}> </fieldset> -<!-- end module contents --> -</div> \ No newline at end of file +<!-- end module contents --> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-02-20 00:26:23
|
Revision: 9029 http://xoops.svn.sourceforge.net/xoops/?rev=9029&view=rev Author: beckmi Date: 2012-02-20 00:26:17 +0000 (Mon, 20 Feb 2012) Log Message: ----------- fixing links to previous/next page Modified Paths: -------------- XoopsModules/newbb/branches/alfred/newbb/viewtopic.php Modified: XoopsModules/newbb/branches/alfred/newbb/viewtopic.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/viewtopic.php 2012-02-20 00:17:12 UTC (rev 9028) +++ XoopsModules/newbb/branches/alfred/newbb/viewtopic.php 2012-02-20 00:26:17 UTC (rev 9029) @@ -253,7 +253,7 @@ if ( $total_posts > $xoopsModuleConfig['posts_per_page'] ) { include XOOPS_ROOT_PATH.'/class/pagenav.php'; $nav = new XoopsPageNav($total_posts, $xoopsModuleConfig['posts_per_page'] , $start , "start", 'topic_id='.$topic_id.'&order='.$order.'&status='.$status."&mode=".$mode); - $nav->url = XOOPS_URL . $nav->url; + //$nav->url = XOOPS_URL . $nav->url; if ($xoopsModuleConfig['pagenav_display'] == 'select') { $navi = $nav->renderSelect(); } elseif ($xoopsModuleConfig['pagenav_display'] == 'bild') { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-02-20 00:17:19
|
Revision: 9028 http://xoops.svn.sourceforge.net/xoops/?rev=9028&view=rev Author: beckmi Date: 2012-02-20 00:17:12 +0000 (Mon, 20 Feb 2012) Log Message: ----------- Fixing English translations Modified Paths: -------------- XoopsModules/newbb/branches/alfred/newbb/language/english/main.php Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/main.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-02-19 18:09:08 UTC (rev 9027) +++ XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-02-20 00:17:12 UTC (rev 9028) @@ -188,7 +188,7 @@ define('_MD_RATE4','Good'); define('_MD_RATE5','Excellent'); define('_MD_TOPICOPTION','Topic options'); -define('_MD_KARMA_REQUIREMENT', 'Your personal karm %s does not reach the required karma %s. <br /> Please try later.'); +define('_MD_KARMA_REQUIREMENT', 'Your personal karma %s does not reach the required karma %s. <br /> Please try later.'); define('_MD_REPLY_REQUIREMENT', 'To view this post, you must login and reply first.'); define('_MD_TOPICOPTIONADMIN','Topic Admin options'); define('_MD_POLLOPTIONADMIN','Poll Admin options'); @@ -432,14 +432,14 @@ define("_MD_NEWBB_REPORTSUBJECT","A contribution has been reported"); define("_MD_NEWBB_GOTOLASTPOST","Go to last post"); define("_MD_EDITEDMSG","Reason:"); -define("_MD_DELEDEDMSG","Grund des Löschens<br /><small>(Wird ein grund angegeben wird der User benachrichtigt)</small>:"); +define("_MD_DELEDEDMSG","Reason for deleting<br /><small>(If a reason is provided, the user will receive a message)</small>:"); define("_MD_DELEDEDMSG_SUBJECT","Deletion of your article"); define("_MD_DELEDEDMSG_BODY","Hello %s, your post in the forum %s was deleted by me -As justification, I am taking the following information on: +As justification, I would like to let you know following: %s @@ -450,7 +450,7 @@ %s %s"); define("_MD_FORUMHOME","Board index"); -define("_MD_NEWBB_SEEWAITREPORT","There were <font color=\"red\"> <b>% s </ b> Contributions reported </ font>"); +define("_MD_NEWBB_SEEWAITREPORT","There were <font color=\"red\"> <b>%s </b> Contributions reported </font>"); define('NEWBB_PDF_SUBJECT','Title: '); define('NEWBB_PDF_TOPIC','Post: '); define('NEWBB_PDF_AUTHOR','Author: '); @@ -463,8 +463,8 @@ define("_MD_POSTTIME","posted on"); // 4.2 -define("_MD_ADVERTISING_BLOCK","<br />Hier könnte auch Ihre Werbung stehen!<br />Kontaktieren Sie uns dazu und wir unterbreiten Ihnen ein Angebot."); -define("_MD_ADVERTISING_USER","Werbung"); +define("_MD_ADVERTISING_BLOCK","<br />Here you could place your Ad!<br />Please contact us to learn more about it."); +define("_MD_ADVERTISING_USER","Advertisement"); define('_MD_SHARE_FACEBOOK', "Facebook"); define('_MD_SHARE_TWITTER', "Twitter"); define('_MD_SHARE_BUZZ', "Google Buzz"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <for...@us...> - 2012-02-19 18:09:18
|
Revision: 9027 http://xoops.svn.sourceforge.net/xoops/?rev=9027&view=rev Author: forxoops Date: 2012-02-19 18:09:08 +0000 (Sun, 19 Feb 2012) Log Message: ----------- Replace bootstrap version to the lastest Replace some system tool by plugin Modified Paths: -------------- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/css/icons.css XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/category.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/field.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/regstep.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/main.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/plugins/xoops_version.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/main.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/user.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/css/module.css XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/docs/lang_diff.txt XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/js/module.js XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/groups.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/plugins.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/users.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/admin_about.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/admin_breadcrumb.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/admin_buttons.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/admin_tabs.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/admin_tips.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_blocks.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_groups.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_header.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_help.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_modules.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_modules_available.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_modules_card.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_modules_logger.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_modules_menu.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_modules_table.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_plugins.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_users.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/css/menu.css XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/css/style.css XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/icons/blocks.png XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/icons/comments.png XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/icons/configuration.png XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/icons/edituser.png XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/icons/groups.png XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/icons/help.png XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/icons/images.png XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/icons/mailuser.png XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/icons/modules.png XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/icons/prefs.png XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/icons/tpls.png XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/js/ddsmoothmenu.js XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/js/tooltip.js XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/language/english/admin.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/theme.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/head.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/icons.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/menu.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php Removed Paths: ------------- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/avatars/ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/avatars.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/avatars.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/banners.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_avatars.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_banners.html XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/js/formenu.js XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/js/menu.js XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/js/styleswitch.js XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/js/tabs.jquery.tools.min.js XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/topbar.html Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php 2012-02-19 12:59:12 UTC (rev 9026) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php 2012-02-19 18:09:08 UTC (rev 9027) @@ -184,7 +184,7 @@ { $ret['title'] = $title; $ret['link'] = $link; - $ret['icon'] = XOOPS_URL . '/media/xoops/images/icons/32/' . $icon . '.png'; + $ret['icon'] = $icon; $ret['extra'] = $extra; $this->_itemButton[] = $ret; return true; Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/css/icons.css =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/css/icons.css 2012-02-19 12:59:12 UTC (rev 9026) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/media/xoops/css/icons.css 2012-02-19 18:09:08 UTC (rev 9027) @@ -1,1119 +1,1110 @@ -.icon, .icon-disabled { - display: inline !important; - display: -moz-inline-stack !important; - display: inline-block !important; - zoom: 1; - width: 16px !important; - height: 16px !important; - overflow: hidden !important; - padding: 0 !important; - border: 0 !important; - margin: 0 !important; - vertical-align: middle !important; - line-height: 0 !important; - font-size: 0 !important; - text-decoration: none !important; - text-indent: -999px !important; - background-color: transparent !important; - background-image: url('../images/icons/icons.png') !important; +[class^="ico-"], [class*=" ico-"] { + display: inline-block; + width: 16px; + height: 16px; + line-height: 14px; + vertical-align: text-top; + background-image: url("../images/icons/icons.png"); + background-position: 16px 16px; + background-repeat: no-repeat; + *margin-right: .3em; } -.icon-disabled { - background-image: url('../images/icons/icons-disabled.png') !important; - cursor: default; +[class^="ico-"]:last-child, [class*=" ico-"]:last-child { + *margin-left: 0; } -.icon-add{background-position: 0 0;} -.icon-anchor{background-position: 0 -26px;} -.icon-application{background-position: 0 -52px;} -.icon-application-add{background-position: 0 -78px;} -.icon-application-cascade{background-position: 0 -104px;} -.icon-application-delete{background-position: 0 -130px;} -.icon-application-double{background-position: 0 -156px;} -.icon-application-edit{background-position: 0 -182px;} -.icon-application-error{background-position: 0 -208px;} -.icon-application-form{background-position: 0 -234px;} -.icon-application-form-add{background-position: 0 -260px;} -.icon-application-form-delete{background-position: 0 -286px;} -.icon-application-form-edit{background-position: 0 -312px;} -.icon-application-form-magnify{background-position: 0 -338px;} -.icon-application-get{background-position: 0 -364px;} -.icon-application-go{background-position: 0 -390px;} -.icon-application-home{background-position: 0 -416px;} -.icon-application-key{background-position: 0 -442px;} -.icon-application-lightning{background-position: 0 -468px;} -.icon-application-link{background-position: 0 -494px;} -.icon-application-osx{background-position: 0 -520px;} -.icon-application-osx-terminal{background-position: 0 -546px;} -.icon-application-put{background-position: 0 -572px;} -.icon-application-side-boxes{background-position: 0 -598px;} -.icon-application-side-contract{background-position: 0 -624px;} -.icon-application-side-expand{background-position: 0 -650px;} -.icon-application-side-list{background-position: 0 -676px;} -.icon-application-side-tree{background-position: 0 -702px;} -.icon-application-split{background-position: 0 -728px;} -.icon-application-tile-horizontal{background-position: 0 -754px;} -.icon-application-tile-vertical{background-position: 0 -780px;} -.icon-application-view-columns{background-position: 0 -806px;} -.icon-application-view-detail{background-position: 0 -832px;} -.icon-application-view-gallery{background-position: 0 -858px;} -.icon-application-view-icons{background-position: 0 -884px;} -.icon-application-view-list{background-position: 0 -910px;} -.icon-application-view-tile{background-position: 0 -936px;} -.icon-application-xp{background-position: 0 -962px;} -.icon-application-xp-terminal{background-position: 0 -988px;} -.icon-arrow-branch{background-position: 0 -1014px;} -.icon-arrow-divide{background-position: 0 -1040px;} -.icon-arrow-down{background-position: 0 -1066px;} -.icon-arrow-in{background-position: 0 -1092px;} -.icon-arrow-inout{background-position: 0 -1118px;} -.icon-arrow-join{background-position: 0 -1144px;} -.icon-arrow-left{background-position: 0 -1170px;} -.icon-arrow-merge{background-position: 0 -1196px;} -.icon-arrow-out{background-position: 0 -1222px;} -.icon-arrow-redo{background-position: 0 -1248px;} -.icon-arrow-refresh{background-position: 0 -1274px;} -.icon-arrow-refresh-small{background-position: 0 -1300px;} -.icon-arrow-right{background-position: 0 -1326px;} -.icon-arrow-rotate-anticlockwise{background-position: 0 -1352px;} -.icon-arrow-rotate-clockwise{background-position: 0 -1378px;} -.icon-arrow-switch{background-position: 0 -1404px;} -.icon-arrow-turn-left{background-position: 0 -1430px;} -.icon-arrow-turn-right{background-position: 0 -1456px;} -.icon-arrow-undo{background-position: 0 -1482px;} -.icon-arrow-up{background-position: 0 -1508px;} -.icon-asterisk1{background-position: 0 -1534px;} -.icon-asterisk2{background-position: 0 -1560px;} -.icon-asterisk3{background-position: 0 -1586px;} -.icon-asterisk4{background-position: 0 -1612px;} -.icon-asterisk5{background-position: 0 -1638px;} -.icon-asterisk6{background-position: 0 -1664px;} -.icon-asterisk7{background-position: 0 -1690px;} -.icon-attach{background-position: 0 -1716px;} -.icon-award-star-add{background-position: 0 -1742px;} -.icon-award-star-bronze-1{background-position: 0 -1768px;} -.icon-award-star-bronze-2{background-position: 0 -1794px;} -.icon-award-star-bronze-3{background-position: 0 -1820px;} -.icon-award-star-delete{background-position: 0 -1846px;} -.icon-award-star-gold-1{background-position: 0 -1872px;} -.icon-award-star-gold-2{background-position: 0 -1898px;} -.icon-award-star-gold-3{background-position: 0 -1924px;} -.icon-award-star-silver-1{background-position: 0 -1950px;} -.icon-award-star-silver-2{background-position: 0 -1976px;} -.icon-award-star-silver-3{background-position: -26px 0;} -.icon-basket{background-position: -26px -26px;} -.icon-basket-add{background-position: -26px -52px;} -.icon-basket-delete{background-position: -26px -78px;} -.icon-basket-edit{background-position: -26px -104px;} -.icon-basket-error{background-position: -26px -130px;} -.icon-basket-go{background-position: -26px -156px;} -.icon-basket-put{background-position: -26px -182px;} -.icon-basket-remove{background-position: -26px -208px;} -.icon-bell{background-position: -26px -234px;} -.icon-bell-add{background-position: -26px -260px;} -.icon-bell-delete{background-position: -26px -286px;} -.icon-bell-error{background-position: -26px -312px;} -.icon-bell-go{background-position: -26px -338px;} -.icon-bell-link{background-position: -26px -364px;} -.icon-bin{background-position: -26px -390px;} -.icon-bin-closed{background-position: -26px -416px;} -.icon-bin-empty{background-position: -26px -442px;} -.icon-bomb{background-position: -26px -468px;} -.icon-book{background-position: -26px -494px;} -.icon-book-add{background-position: -26px -520px;} -.icon-book-addresses{background-position: -26px -546px;} -.icon-book-delete{background-position: -26px -572px;} -.icon-book-edit{background-position: -26px -598px;} -.icon-book-error{background-position: -26px -624px;} -.icon-book-go{background-position: -26px -650px;} -.icon-book-key{background-position: -26px -676px;} -.icon-book-link{background-position: -26px -702px;} -.icon-book-next{background-position: -26px -728px;} -.icon-book-open{background-position: -26px -754px;} -.icon-book-previous{background-position: -26px -780px;} -.icon-box{background-position: -26px -806px;} -.icon-brick{background-position: -26px -832px;} -.icon-brick-add{background-position: -26px -858px;} -.icon-brick-delete{background-position: -26px -884px;} -.icon-brick-edit{background-position: -26px -910px;} -.icon-brick-error{background-position: -26px -936px;} -.icon-brick-go{background-position: -26px -962px;} -.icon-brick-link{background-position: -26px -988px;} -.icon-bricks{background-position: -26px -1014px;} -.icon-briefcase{background-position: -26px -1040px;} -.icon-bug{background-position: -26px -1066px;} -.icon-bug-add{background-position: -26px -1092px;} -.icon-bug-delete{background-position: -26px -1118px;} -.icon-bug-edit{background-position: -26px -1144px;} -.icon-bug-error{background-position: -26px -1170px;} -.icon-bug-go{background-position: -26px -1196px;} -.icon-bug-link{background-position: -26px -1222px;} -.icon-building{background-position: -26px -1248px;} -.icon-building-add{background-position: -26px -1274px;} -.icon-building-delete{background-position: -26px -1300px;} -.icon-building-edit{background-position: -26px -1326px;} -.icon-building-error{background-position: -26px -1352px;} -.icon-building-go{background-position: -26px -1378px;} -.icon-building-key{background-position: -26px -1404px;} -.icon-building-link{background-position: -26px -1430px;} -.icon-bullet-add{background-position: -26px -1456px;} -.icon-bullet-arrow-bottom{background-position: -26px -1482px;} -.icon-bullet-arrow-down{background-position: -26px -1508px;} -.icon-bullet-arrow-top{background-position: -26px -1534px;} -.icon-bullet-arrow-up{background-position: -26px -1560px;} -.icon-bullet-black{background-position: -26px -1586px;} -.icon-bullet-blue{background-position: -26px -1612px;} -.icon-bullet-delete{background-position: -26px -1638px;} -.icon-bullet-disk{background-position: -26px -1664px;} -.icon-bullet-error{background-position: -26px -1690px;} -.icon-bullet-feed{background-position: -26px -1716px;} -.icon-bullet-go{background-position: -26px -1742px;} -.icon-bullet-green{background-position: -26px -1768px;} -.icon-bullet-key{background-position: -26px -1794px;} -.icon-bullet-orange{background-position: -26px -1820px;} -.icon-bullet-picture{background-position: -26px -1846px;} -.icon-bullet-pink{background-position: -26px -1872px;} -.icon-bullet-purple{background-position: -26px -1898px;} -.icon-bullet-red{background-position: -26px -1924px;} -.icon-bullet-star{background-position: -26px -1950px;} -.icon-bullet-toggle-minus{background-position: -26px -1976px;} -.icon-bullet-toggle-plus{background-position: -52px 0;} -.icon-bullet-white{background-position: -52px -26px;} -.icon-bullet-wrench{background-position: -52px -52px;} -.icon-bullet-yellow{background-position: -52px -78px;} -.icon-cake{background-position: -52px -104px;} -.icon-calculator{background-position: -52px -130px;} -.icon-calculator-add{background-position: -52px -156px;} -.icon-calculator-delete{background-position: -52px -182px;} -.icon-calculator-edit{background-position: -52px -208px;} -.icon-calculator-error{background-position: -52px -234px;} -.icon-calculator-link{background-position: -52px -260px;} -.icon-calendar{background-position: -52px -286px;} -.icon-calendar-add{background-position: -52px -312px;} -.icon-calendar-delete{background-position: -52px -338px;} -.icon-calendar-edit{background-position: -52px -364px;} -.icon-calendar-link{background-position: -52px -390px;} -.icon-calendar-view-day{background-position: -52px -416px;} -.icon-calendar-view-month{background-position: -52px -442px;} -.icon-calendar-view-week{background-position: -52px -468px;} -.icon-camera{background-position: -52px -494px;} -.icon-camera-add{background-position: -52px -520px;} -.icon-camera-delete{background-position: -52px -546px;} -.icon-camera-edit{background-position: -52px -572px;} -.icon-camera-error{background-position: -52px -598px;} -.icon-camera-go{background-position: -52px -624px;} -.icon-camera-link{background-position: -52px -650px;} -.icon-camera-small{background-position: -52px -676px;} -.icon-cancel{background-position: -52px -702px;} -.icon-car{background-position: -52px -728px;} -.icon-car-add{background-position: -52px -754px;} -.icon-car-delete{background-position: -52px -780px;} -.icon-cart{background-position: -52px -806px;} -.icon-cart-add{background-position: -52px -832px;} -.icon-cart-delete{background-position: -52px -858px;} -.icon-cart-edit{background-position: -52px -884px;} -.icon-cart-error{background-position: -52px -910px;} -.icon-cart-go{background-position: -52px -936px;} -.icon-cart-put{background-position: -52px -962px;} -.icon-cart-remove{background-position: -52px -988px;} -.icon-cd{background-position: -52px -1014px;} -.icon-cd-add{background-position: -52px -1040px;} -.icon-cd-burn{background-position: -52px -1066px;} -.icon-cd-delete{background-position: -52px -1092px;} -.icon-cd-edit{background-position: -52px -1118px;} -.icon-cd-eject{background-position: -52px -1144px;} -.icon-cd-go{background-position: -52px -1170px;} -.icon-chart-bar{background-position: -52px -1196px;} -.icon-chart-bar-add{background-position: -52px -1222px;} -.icon-chart-bar-delete{background-position: -52px -1248px;} -.icon-chart-bar-edit{background-position: -52px -1274px;} -.icon-chart-bar-error{background-position: -52px -1300px;} -.icon-chart-bar-link{background-position: -52px -1326px;} -.icon-chart-curve{background-position: -52px -1352px;} -.icon-chart-curve-add{background-position: -52px -1378px;} -.icon-chart-curve-delete{background-position: -52px -1404px;} -.icon-chart-curve-edit{background-position: -52px -1430px;} -.icon-chart-curve-error{background-position: -52px -1456px;} -.icon-chart-curve-go{background-position: -52px -1482px;} -.icon-chart-curve-link{background-position: -52px -1508px;} -.icon-chart-line{background-position: -52px -1534px;} -.icon-chart-line-add{background-position: -52px -1560px;} -.icon-chart-line-delete{background-position: -52px -1586px;} -.icon-chart-line-edit{background-position: -52px -1612px;} -.icon-chart-line-error{background-position: -52px -1638px;} -.icon-chart-line-link{background-position: -52px -1664px;} -.icon-chart-organisation{background-position: -52px -1690px;} -.icon-chart-organisation-add{background-position: -52px -1716px;} -.icon-chart-organisation-delete{background-position: -52px -1742px;} -.icon-chart-pie{background-position: -52px -1768px;} -.icon-chart-pie-add{background-position: -52px -1794px;} -.icon-chart-pie-delete{background-position: -52px -1820px;} -.icon-chart-pie-edit{background-position: -52px -1846px;} -.icon-chart-pie-error{background-position: -52px -1872px;} -.icon-chart-pie-link{background-position: -52px -1898px;} -.icon-clock{background-position: -52px -1924px;} -.icon-clock-add{background-position: -52px -1950px;} -.icon-clock-delete{background-position: -52px -1976px;} -.icon-clock-edit{background-position: -78px 0;} -.icon-clock-error{background-position: -78px -26px;} -.icon-clock-go{background-position: -78px -52px;} -.icon-clock-link{background-position: -78px -78px;} -.icon-clock-pause{background-position: -78px -104px;} -.icon-clock-play{background-position: -78px -130px;} -.icon-clock-red{background-position: -78px -156px;} -.icon-clock-stop{background-position: -78px -182px;} -.icon-code-tag{background-position: -78px -208px;} -.icon-cog{background-position: -78px -234px;} -.icon-cog-add{background-position: -78px -260px;} -.icon-cog-delete{background-position: -78px -286px;} -.icon-cog-edit{background-position: -78px -312px;} -.icon-cog-error{background-position: -78px -338px;} -.icon-cog-go{background-position: -78px -364px;} -.icon-coins{background-position: -78px -390px;} -.icon-coins-add{background-position: -78px -416px;} -.icon-coins-delete{background-position: -78px -442px;} -.icon-color-swatch{background-position: -78px -468px;} -.icon-color-wheel{background-position: -78px -494px;} -.icon-comment{background-position: -78px -520px;} -.icon-comment-add{background-position: -78px -546px;} -.icon-comment-delete{background-position: -78px -572px;} -.icon-comment-edit{background-position: -78px -598px;} -.icon-comments{background-position: -78px -624px;} -.icon-comments-add{background-position: -78px -650px;} -.icon-comments-delete{background-position: -78px -676px;} -.icon-compress{background-position: -78px -702px;} -.icon-computer{background-position: -78px -728px;} -.icon-computer-add{background-position: -78px -754px;} -.icon-computer-delete{background-position: -78px -780px;} -.icon-computer-edit{background-position: -78px -806px;} -.icon-computer-error{background-position: -78px -832px;} -.icon-computer-go{background-position: -78px -858px;} -.icon-computer-key{background-position: -78px -884px;} -.icon-computer-link{background-position: -78px -910px;} -.icon-connect{background-position: -78px -936px;} -.icon-contrast{background-position: -78px -962px;} -.icon-contrast-decrease{background-position: -78px -988px;} -.icon-contrast-high{background-position: -78px -1014px;} -.icon-contrast-increase{background-position: -78px -1040px;} -.icon-contrast-low{background-position: -78px -1066px;} -.icon-control-eject-1{background-position: -78px -1092px;} -.icon-control-eject-2{background-position: -78px -1118px;} -.icon-control-eject-3{background-position: -78px -1144px;} -.icon-control-eject-4{background-position: -78px -1170px;} -.icon-control-eject-5{background-position: -78px -1196px;} -.icon-control-eject-6{background-position: -78px -1222px;} -.icon-control-eject-7{background-position: -78px -1248px;} -.icon-control-end-1{background-position: -78px -1274px;} -.icon-control-end-2{background-position: -78px -1300px;} -.icon-control-end-3{background-position: -78px -1326px;} -.icon-control-end-4{background-position: -78px -1352px;} -.icon-control-end-5{background-position: -78px -1378px;} -.icon-control-end-6{background-position: -78px -1404px;} -.icon-control-end-7{background-position: -78px -1430px;} +.ico-add{background-position: 0 0;} +.ico-anchor{background-position: 0 -26px;} +.ico-application{background-position: 0 -52px;} +.ico-application-add{background-position: 0 -78px;} +.ico-application-cascade{background-position: 0 -104px;} +.ico-application-delete{background-position: 0 -130px;} +.ico-application-double{background-position: 0 -156px;} +.ico-application-edit{background-position: 0 -182px;} +.ico-application-error{background-position: 0 -208px;} +.ico-application-form{background-position: 0 -234px;} +.ico-application-form-add{background-position: 0 -260px;} +.ico-application-form-delete{background-position: 0 -286px;} +.ico-application-form-edit{background-position: 0 -312px;} +.ico-application-form-magnify{background-position: 0 -338px;} +.ico-application-get{background-position: 0 -364px;} +.ico-application-go{background-position: 0 -390px;} +.ico-application-home{background-position: 0 -416px;} +.ico-application-key{background-position: 0 -442px;} +.ico-application-lightning{background-position: 0 -468px;} +.ico-application-link{background-position: 0 -494px;} +.ico-application-osx{background-position: 0 -520px;} +.ico-application-osx-terminal{background-position: 0 -546px;} +.ico-application-put{background-position: 0 -572px;} +.ico-application-side-boxes{background-position: 0 -598px;} +.ico-application-side-contract{background-position: 0 -624px;} +.ico-application-side-expand{background-position: 0 -650px;} +.ico-application-side-list{background-position: 0 -676px;} +.ico-application-side-tree{background-position: 0 -702px;} +.ico-application-split{background-position: 0 -728px;} +.ico-application-tile-horizontal{background-position: 0 -754px;} +.ico-application-tile-vertical{background-position: 0 -780px;} +.ico-application-view-columns{background-position: 0 -806px;} +.ico-application-view-detail{background-position: 0 -832px;} +.ico-application-view-gallery{background-position: 0 -858px;} +.ico-application-view-icons{background-position: 0 -884px;} +.ico-application-view-list{background-position: 0 -910px;} +.ico-application-view-tile{background-position: 0 -936px;} +.ico-application-xp{background-position: 0 -962px;} +.ico-application-xp-terminal{background-position: 0 -988px;} +.ico-arrow-branch{background-position: 0 -1014px;} +.ico-arrow-divide{background-position: 0 -1040px;} +.ico-arrow-down{background-position: 0 -1066px;} +.ico-arrow-in{background-position: 0 -1092px;} +.ico-arrow-inout{background-position: 0 -1118px;} +.ico-arrow-join{background-position: 0 -1144px;} +.ico-arrow-left{background-position: 0 -1170px;} +.ico-arrow-merge{background-position: 0 -1196px;} +.ico-arrow-out{background-position: 0 -1222px;} +.ico-arrow-redo{background-position: 0 -1248px;} +.ico-arrow-refresh{background-position: 0 -1274px;} +.ico-arrow-refresh-small{background-position: 0 -1300px;} +.ico-arrow-right{background-position: 0 -1326px;} +.ico-arrow-rotate-anticlockwise{background-position: 0 -1352px;} +.ico-arrow-rotate-clockwise{background-position: 0 -1378px;} +.ico-arrow-switch{background-position: 0 -1404px;} +.ico-arrow-turn-left{background-position: 0 -1430px;} +.ico-arrow-turn-right{background-position: 0 -1456px;} +.ico-arrow-undo{background-position: 0 -1482px;} +.ico-arrow-up{background-position: 0 -1508px;} +.ico-asterisk1{background-position: 0 -1534px;} +.ico-asterisk2{background-position: 0 -1560px;} +.ico-asterisk3{background-position: 0 -1586px;} +.ico-asterisk4{background-position: 0 -1612px;} +.ico-asterisk5{background-position: 0 -1638px;} +.ico-asterisk6{background-position: 0 -1664px;} +.ico-asterisk7{background-position: 0 -1690px;} +.ico-attach{background-position: 0 -1716px;} +.ico-award-star-add{background-position: 0 -1742px;} +.ico-award-star-bronze-1{background-position: 0 -1768px;} +.ico-award-star-bronze-2{background-position: 0 -1794px;} +.ico-award-star-bronze-3{background-position: 0 -1820px;} +.ico-award-star-delete{background-position: 0 -1846px;} +.ico-award-star-gold-1{background-position: 0 -1872px;} +.ico-award-star-gold-2{background-position: 0 -1898px;} +.ico-award-star-gold-3{background-position: 0 -1924px;} +.ico-award-star-silver-1{background-position: 0 -1950px;} +.ico-award-star-silver-2{background-position: 0 -1976px;} +.ico-award-star-silver-3{background-position: -26px 0;} +.ico-basket{background-position: -26px -26px;} +.ico-basket-add{background-position: -26px -52px;} +.ico-basket-delete{background-position: -26px -78px;} +.ico-basket-edit{background-position: -26px -104px;} +.ico-basket-error{background-position: -26px -130px;} +.ico-basket-go{background-position: -26px -156px;} +.ico-basket-put{background-position: -26px -182px;} +.ico-basket-remove{background-position: -26px -208px;} +.ico-bell{background-position: -26px -234px;} +.ico-bell-add{background-position: -26px -260px;} +.ico-bell-delete{background-position: -26px -286px;} +.ico-bell-error{background-position: -26px -312px;} +.ico-bell-go{background-position: -26px -338px;} +.ico-bell-link{background-position: -26px -364px;} +.ico-bin{background-position: -26px -390px;} +.ico-bin-closed{background-position: -26px -416px;} +.ico-bin-empty{background-position: -26px -442px;} +.ico-bomb{background-position: -26px -468px;} +.ico-book{background-position: -26px -494px;} +.ico-book-add{background-position: -26px -520px;} +.ico-book-addresses{background-position: -26px -546px;} +.ico-book-delete{background-position: -26px -572px;} +.ico-book-edit{background-position: -26px -598px;} +.ico-book-error{background-position: -26px -624px;} +.ico-book-go{background-position: -26px -650px;} +.ico-book-key{background-position: -26px -676px;} +.ico-book-link{background-position: -26px -702px;} +.ico-book-next{background-position: -26px -728px;} +.ico-book-open{background-position: -26px -754px;} +.ico-book-previous{background-position: -26px -780px;} +.ico-box{background-position: -26px -806px;} +.ico-brick{background-position: -26px -832px;} +.ico-brick-add{background-position: -26px -858px;} +.ico-brick-delete{background-position: -26px -884px;} +.ico-brick-edit{background-position: -26px -910px;} +.ico-brick-error{background-position: -26px -936px;} +.ico-brick-go{background-position: -26px -962px;} +.ico-brick-link{background-position: -26px -988px;} +.ico-bricks{background-position: -26px -1014px;} +.ico-briefcase{background-position: -26px -1040px;} +.ico-bug{background-position: -26px -1066px;} +.ico-bug-add{background-position: -26px -1092px;} +.ico-bug-delete{background-position: -26px -1118px;} +.ico-bug-edit{background-position: -26px -1144px;} +.ico-bug-error{background-position: -26px -1170px;} +.ico-bug-go{background-position: -26px -1196px;} +.ico-bug-link{background-position: -26px -1222px;} +.ico-building{background-position: -26px -1248px;} +.ico-building-add{background-position: -26px -1274px;} +.ico-building-delete{background-position: -26px -1300px;} +.ico-building-edit{background-position: -26px -1326px;} +.ico-building-error{background-position: -26px -1352px;} +.ico-building-go{background-position: -26px -1378px;} +.ico-building-key{background-position: -26px -1404px;} +.ico-building-link{background-position: -26px -1430px;} +.ico-bullet-add{background-position: -26px -1456px;} +.ico-bullet-arrow-bottom{background-position: -26px -1482px;} +.ico-bullet-arrow-down{background-position: -26px -1508px;} +.ico-bullet-arrow-top{background-position: -26px -1534px;} +.ico-bullet-arrow-up{background-position: -26px -1560px;} +.ico-bullet-black{background-position: -26px -1586px;} +.ico-bullet-blue{background-position: -26px -1612px;} +.ico-bullet-delete{background-position: -26px -1638px;} +.ico-bullet-disk{background-position: -26px -1664px;} +.ico-bullet-error{background-position: -26px -1690px;} +.ico-bullet-feed{background-position: -26px -1716px;} +.ico-bullet-go{background-position: -26px -1742px;} +.ico-bullet-green{background-position: -26px -1768px;} +.ico-bullet-key{background-position: -26px -1794px;} +.ico-bullet-orange{background-position: -26px -1820px;} +.ico-bullet-picture{background-position: -26px -1846px;} +.ico-bullet-pink{background-position: -26px -1872px;} +.ico-bullet-purple{background-position: -26px -1898px;} +.ico-bullet-red{background-position: -26px -1924px;} +.ico-bullet-star{background-position: -26px -1950px;} +.ico-bullet-toggle-minus{background-position: -26px -1976px;} +.ico-bullet-toggle-plus{background-position: -52px 0;} +.ico-bullet-white{background-position: -52px -26px;} +.ico-bullet-wrench{background-position: -52px -52px;} +.ico-bullet-yellow{background-position: -52px -78px;} +.ico-cake{background-position: -52px -104px;} +.ico-calculator{background-position: -52px -130px;} +.ico-calculator-add{background-position: -52px -156px;} +.ico-calculator-delete{background-position: -52px -182px;} +.ico-calculator-edit{background-position: -52px -208px;} +.ico-calculator-error{background-position: -52px -234px;} +.ico-calculator-link{background-position: -52px -260px;} +.ico-calendar{background-position: -52px -286px;} +.ico-calendar-add{background-position: -52px -312px;} +.ico-calendar-delete{background-position: -52px -338px;} +.ico-calendar-edit{background-position: -52px -364px;} +.ico-calendar-link{background-position: -52px -390px;} +.ico-calendar-view-day{background-position: -52px -416px;} +.ico-calendar-view-month{background-position: -52px -442px;} +.ico-calendar-view-week{background-position: -52px -468px;} +.ico-camera{background-position: -52px -494px;} +.ico-camera-add{background-position: -52px -520px;} +.ico-camera-delete{background-position: -52px -546px;} +.ico-camera-edit{background-position: -52px -572px;} +.ico-camera-error{background-position: -52px -598px;} +.ico-camera-go{background-position: -52px -624px;} +.ico-camera-link{background-position: -52px -650px;} +.ico-camera-small{background-position: -52px -676px;} +.ico-cancel{background-position: -52px -702px;} +.ico-car{background-position: -52px -728px;} +.ico-car-add{background-position: -52px -754px;} +.ico-car-delete{background-position: -52px -780px;} +.ico-cart{background-position: -52px -806px;} +.ico-cart-add{background-position: -52px -832px;} +.ico-cart-delete{background-position: -52px -858px;} +.ico-cart-edit{background-position: -52px -884px;} +.ico-cart-error{background-position: -52px -910px;} +.ico-cart-go{background-position: -52px -936px;} +.ico-cart-put{background-position: -52px -962px;} +.ico-cart-remove{background-position: -52px -988px;} +.ico-cd{background-position: -52px -1014px;} +.ico-cd-add{background-position: -52px -1040px;} +.ico-cd-burn{background-position: -52px -1066px;} +.ico-cd-delete{background-position: -52px -1092px;} +.ico-cd-edit{background-position: -52px -1118px;} +.ico-cd-eject{background-position: -52px -1144px;} +.ico-cd-go{background-position: -52px -1170px;} +.ico-chart-bar{background-position: -52px -1196px;} +.ico-chart-bar-add{background-position: -52px -1222px;} +.ico-chart-bar-delete{background-position: -52px -1248px;} +.ico-chart-bar-edit{background-position: -52px -1274px;} +.ico-chart-bar-error{background-position: -52px -1300px;} +.ico-chart-bar-link{background-position: -52px -1326px;} +.ico-chart-curve{background-position: -52px -1352px;} +.ico-chart-curve-add{background-position: -52px -1378px;} +.ico-chart-curve-delete{background-position: -52px -1404px;} +.ico-chart-curve-edit{background-position: -52px -1430px;} +.ico-chart-curve-error{background-position: -52px -1456px;} +.ico-chart-curve-go{background-position: -52px -1482px;} +.ico-chart-curve-link{background-position: -52px -1508px;} +.ico-chart-line{background-position: -52px -1534px;} +.ico-chart-line-add{background-position: -52px -1560px;} +.ico-chart-line-delete{background-position: -52px -1586px;} +.ico-chart-line-edit{background-position: -52px -1612px;} +.ico-chart-line-error{background-position: -52px -1638px;} +.ico-chart-line-link{background-position: -52px -1664px;} +.ico-chart-organisation{background-position: -52px -1690px;} +.ico-chart-organisation-add{background-position: -52px -1716px;} +.ico-chart-organisation-delete{background-position: -52px -1742px;} +.ico-chart-pie{background-position: -52px -1768px;} +.ico-chart-pie-add{background-position: -52px -1794px;} +.ico-chart-pie-delete{background-position: -52px -1820px;} +.ico-chart-pie-edit{background-position: -52px -1846px;} +.ico-chart-pie-error{background-position: -52px -1872px;} +.ico-chart-pie-link{background-position: -52px -1898px;} +.ico-clock{background-position: -52px -1924px;} +.ico-clock-add{background-position: -52px -1950px;} +.ico-clock-delete{background-position: -52px -1976px;} +.ico-clock-edit{background-position: -78px 0;} +.ico-clock-error{background-position: -78px -26px;} +.ico-clock-go{background-position: -78px -52px;} +.ico-clock-link{background-position: -78px -78px;} +.ico-clock-pause{background-position: -78px -104px;} +.ico-clock-play{background-position: -78px -130px;} +.ico-clock-red{background-position: -78px -156px;} +.ico-clock-stop{background-position: -78px -182px;} +.ico-code-tag{background-position: -78px -208px;} +.ico-cog{background-position: -78px -234px;} +.ico-cog-add{background-position: -78px -260px;} +.ico-cog-delete{background-position: -78px -286px;} +.ico-cog-edit{background-position: -78px -312px;} +.ico-cog-error{background-position: -78px -338px;} +.ico-cog-go{background-position: -78px -364px;} +.ico-coins{background-position: -78px -390px;} +.ico-coins-add{background-position: -78px -416px;} +.ico-coins-delete{background-position: -78px -442px;} +.ico-color-swatch{background-position: -78px -468px;} +.ico-color-wheel{background-position: -78px -494px;} +.ico-comment{background-position: -78px -520px;} +.ico-comment-add{background-position: -78px -546px;} +.ico-comment-delete{background-position: -78px -572px;} +.ico-comment-edit{background-position: -78px -598px;} +.ico-comments{background-position: -78px -624px;} +.ico-comments-add{background-position: -78px -650px;} +.ico-comments-delete{background-position: -78px -676px;} +.ico-compress{background-position: -78px -702px;} +.ico-computer{background-position: -78px -728px;} +.ico-computer-add{background-position: -78px -754px;} +.ico-computer-delete{background-position: -78px -780px;} +.ico-computer-edit{background-position: -78px -806px;} +.ico-computer-error{background-position: -78px -832px;} +.ico-computer-go{background-position: -78px -858px;} +.ico-computer-key{background-position: -78px -884px;} +.ico-computer-link{background-position: -78px -910px;} +.ico-connect{background-position: -78px -936px;} +.ico-contrast{background-position: -78px -962px;} +.ico-contrast-decrease{background-position: -78px -988px;} +.ico-contrast-high{background-position: -78px -1014px;} +.ico-contrast-increase{background-position: -78px -1040px;} +.ico-contrast-low{background-position: -78px -1066px;} +.ico-control-eject-1{background-position: -78px -1092px;} +.ico-control-eject-2{background-position: -78px -1118px;} +.ico-control-eject-3{background-position: -78px -1144px;} +.ico-control-eject-4{background-position: -78px -1170px;} +.ico-control-eject-5{background-position: -78px -1196px;} +.ico-control-eject-6{background-position: -78px -1222px;} +.ico-control-eject-7{background-position: -78px -1248px;} +.ico-control-end-1{background-position: -78px -1274px;} +.ico-control-end-2{background-position: -78px -1300px;} +.ico-control-end-3{background-position: -78px -1326px;} +.ico-control-end-4{background-position: -78px -1352px;} +.ico-control-end-5{background-position: -78px -1378px;} +.ico-control-end-6{background-position: -78px -1404px;} +.ico-control-end-7{background-position: -78px -1430px;} -.icon-control-equalizer-1{background-position: -78px -1456px;} -.icon-control-equalizer-2{background-position: -78px -1482px;} -.icon-control-equalizer-3{background-position: -78px -1508px;} -.icon-control-equalizer-4{background-position: -78px -1534px;} -.icon-control-equalizer-5{background-position: -78px -1560px;} -.icon-control-equalizer-6{background-position: -78px -1586px;} -.icon-control-equalizer-7{background-position: -78px -1612px;} -.icon-control-fastforward-1{background-position: -78px -1638px;} -.icon-control-fastforward-2{background-position: -78px -1664px;} -.icon-control-fastforward-3{background-position: -78px -1690px;} -.icon-control-fastforward-4{background-position: -78px -1716px;} -.icon-control-fastforward-5{background-position: -78px -1742px;} -.icon-control-fastforward-6{background-position: -78px -1768px;} -.icon-control-fastforward-7{background-position: -78px -1794px;} -.icon-control-pause-1{background-position: -78px -1820px;} -.icon-control-pause-2{background-position: -78px -1846px;} -.icon-control-pause-3{background-position: -78px -1872px;} -.icon-control-pause-4{background-position: -78px -1898px;} -.icon-control-pause-5{background-position: -78px -1924px;} -.icon-control-pause-6{background-position: -78px -1950px;} -.icon-control-pause-7{background-position: -78px -1976px;} -.icon-control-play-1{background-position: -104px 0;} -.icon-control-play-2{background-position: -104px -26px;} -.icon-control-play-3{background-position: -104px -52px;} -.icon-control-play-4{background-position: -104px -78px;} -.icon-control-play-5{background-position: -104px -104px;} -.icon-control-play-6{background-position: -104px -130px;} -.icon-control-play-7{background-position: -104px -156px;} -.icon-control-repeat-1{background-position: -104px -182px;} -.icon-control-repeat-2{background-position: -104px -208px;} -.icon-control-repeat-3{background-position: -104px -234px;} -.icon-control-repeat-4{background-position: -104px -260px;} -.icon-control-repeat-5{background-position: -104px -286px;} -.icon-control-repeat-6{background-position: -104px -312px;} -.icon-control-repeat-7{background-position: -104px -338px;} -.icon-control-rewind-1{background-position: -104px -364px;} -.icon-control-rewind-2{background-position: -104px -390px;} -.icon-control-rewind-3{background-position: -104px -416px;} -.icon-control-rewind-4{background-position: -104px -442px;} -.icon-control-rewind-5{background-position: -104px -468px;} -.icon-control-rewind-6{background-position: -104px -494px;} -.icon-control-rewind-7{background-position: -104px -520px;} -.icon-control-start-1{background-position: -104px -546px;} -.icon-control-start-2{background-position: -104px -572px;} -.icon-control-start-3{background-position: -104px -598px;} -.icon-control-start-4{background-position: -104px -624px;} -.icon-control-start-5{background-position: -104px -650px;} -.icon-control-start-6{background-position: -104px -676px;} -.icon-control-start-7{background-position: -104px -702px;} -.icon-control-stop-1{background-position: -104px -728px;} -.icon-control-stop-2{background-position: -104px -754px;} -.icon-control-stop-3{background-position: -104px -780px;} -.icon-control-stop-4{background-position: -104px -806px;} -.icon-control-stop-5{background-position: -104px -832px;} -.icon-control-stop-6{background-position: -104px -858px;} -.icon-control-stop-7{background-position: -104px -884px;} -.icon-controller{background-position: -104px -910px;} -.icon-controller-add{background-position: -104px -936px;} -.icon-controller-delete{background-position: -104px -962px;} -.icon-controller-error{background-position: -104px -988px;} -.icon-creditcards{background-position: -104px -1014px;} -.icon-cross{background-position: -104px -1040px;} -.icon-css{background-position: -104px -1066px;} -.icon-css-add{background-position: -104px -1092px;} -.icon-css-delete{background-position: -104px -1118px;} -.icon-css-go{background-position: -104px -1144px;} -.icon-css-valid{background-position: -104px -1170px;} -.icon-cup{background-position: -104px -1196px;} -.icon-cup-add{background-position: -104px -1222px;} -.icon-cup-delete{background-position: -104px -1248px;} -.icon-cup-edit{background-position: -104px -1274px;} -.icon-cup-error{background-position: -104px -1300px;} -.icon-cup-go{background-position: -104px -1326px;} -.icon-cup-key{background-position: -104px -1352px;} -.icon-cup-link{background-position: -104px -1378px;} -.icon-cursor{background-position: -104px -1404px;} -.icon-cut{background-position: -104px -1430px;} -.icon-cut-red{background-position: -104px -1456px;} -.icon-database{background-position: -104px -1482px;} -.icon-database-add{background-position: -104px -1508px;} -.icon-database-connect{background-position: -104px -1534px;} -.icon-database-delete{background-position: -104px -1560px;} -.icon-database-edit{background-position: -104px -1586px;} -.icon-database-error{background-position: -104px -1612px;} -.icon-database-gear{background-position: -104px -1638px;} -.icon-database-go{background-position: -104px -1664px;} -.icon-database-key{background-position: -104px -1690px;} -.icon-database-lightning{background-position: -104px -1716px;} -.icon-database-link{background-position: -104px -1742px;} -.icon-database-refresh{background-position: -104px -1768px;} -.icon-database-save{background-position: -104px -1794px;} -.icon-database-table{background-position: -104px -1820px;} -.icon-date{background-position: -104px -1846px;} -.icon-date-add{background-position: -104px -1872px;} -.icon-date-delete{background-position: -104px -1898px;} -.icon-date-edit{background-position: -104px -1924px;} -.icon-date-error{background-position: -104px -1950px;} -.icon-date-go{background-position: -104px -1976px;} -.icon-date-link{background-position: -130px 0;} -.icon-date-magnify{background-position: -130px -26px;} -.icon-date-next{background-position: -130px -52px;} -.icon-date-previous{background-position: -130px -78px;} -.icon-delete{background-position: -130px -104px;} -.icon-disconnect{background-position: -130px -130px;} -.icon-disk{background-position: -130px -156px;} -.icon-disk-multiple{background-position: -130px -182px;} -.icon-dollar{background-position: -130px -208px;} -.icon-door{background-position: -130px -234px;} -.icon-door-in{background-position: -130px -260px;} -.icon-door-open{background-position: -130px -286px;} -.icon-door-out{background-position: -130px -312px;} -.icon-drink{background-position: -130px -338px;} -.icon-drink-empty{background-position: -130px -364px;} -.icon-drive{background-position: -130px -390px;} -.icon-drive-add{background-position: -130px -416px;} -.icon-drive-burn{background-position: -130px -442px;} -.icon-drive-cd{background-position: -130px -468px;} -.icon-drive-cd-empty{background-position: -130px -494px;} -.icon-drive-delete{background-position: -130px -520px;} -.icon-drive-disk{background-position: -130px -546px;} -.icon-drive-edit{background-position: -130px -572px;} -.icon-drive-error{background-position: -130px -598px;} -.icon-drive-go{background-position: -130px -624px;} -.icon-drive-key{background-position: -130px -650px;} -.icon-drive-link{background-position: -130px -676px;} -.icon-drive-magnify{background-position: -130px -702px;} -.icon-drive-network{background-position: -130px -728px;} -.icon-drive-rename{background-position: -130px -754px;} -.icon-drive-user{background-position: -130px -780px;} -.icon-drive-web{background-position: -130px -806px;} -.icon-dvd{background-position: -130px -832px;} -.icon-dvd-add{background-position: -130px -858px;} -.icon-dvd-delete{background-position: -130px -884px;} -.icon-dvd-edit{background-position: -130px -910px;} -.icon-dvd-error{background-position: -130px -936px;} -.icon-dvd-go{background-position: -130px -962px;} -.icon-dvd-key{background-position: -130px -988px;} -.icon-dvd-link{background-position: -130px -1014px;} -.icon-email{background-position: -130px -1040px;} -.icon-email-add{background-position: -130px -1066px;} -.icon-email-attach{background-position: -130px -1092px;} -.icon-email-delete{background-position: -130px -1118px;} -.icon-email-edit{background-position: -130px -1144px;} -.icon-email-error{background-position: -130px -1170px;} -.icon-email-go{background-position: -130px -1196px;} -.icon-email-link{background-position: -130px -1222px;} -.icon-email-open{background-position: -130px -1248px;} -.icon-email-open-image{background-position: -130px -1274px;} -.icon-emoticon-evilgrin{background-position: -130px -1300px;} -.icon-emoticon-grin{background-position: -130px -1326px;} -.icon-emoticon-happy{background-position: -130px -1352px;} -.icon-emoticon-smile{background-position: -130px -1378px;} -.icon-emoticon-surprised{background-position: -130px -1404px;} -.icon-emoticon-tongue{background-position: -130px -1430px;} -.icon-emoticon-unhappy{background-position: -130px -1456px;} -.icon-emoticon-waii{background-position: -130px -1482px;} -.icon-emoticon-wink{background-position: -130px -1508px;} -.icon-error{background-position: -130px -1534px;} -.icon-euro{background-position: -130px -1560px;} -.icon-exclamation{background-position: -130px -1586px;} -.icon-eye{background-position: -130px -1612px;} -.icon-feed{background-position: -130px -1638px;} -.icon-feed-add{background-position: -130px -1664px;} -.icon-feed-delete{background-position: -130px -1690px;} -.icon-feed-disk{background-position: -130px -1716px;} -.icon-feed-edit{background-position: -130px -1742px;} -.icon-feed-error{background-position: -130px -1768px;} -.icon-feed-go{background-position: -130px -1794px;} -.icon-feed-key{background-position: -130px -1820px;} -.icon-feed-link{background-position: -130px -1846px;} -.icon-feed-magnify{background-position: -130px -1872px;} -.icon-female{background-position: -130px -1898px;} -.icon-film{background-position: -130px -1924px;} -.icon-film-add{background-position: -130px -1950px;} -.icon-film-delete{background-position: -130px -1976px;} -.icon-film-edit{background-position: -156px 0;} -.icon-film-error{background-position: -156px -26px;} -.icon-film-go{background-position: -156px -52px;} -.icon-film-key{background-position: -156px -78px;} -.icon-film-link{background-position: -156px -104px;} -.icon-film-save{background-position: -156px -130px;} -.icon-find{background-position: -156px -156px;} -.icon-flag-blue{background-position: -156px -182px;} -.icon-flag-green{background-position: -156px -208px;} -.icon-flag-orange{background-position: -156px -234px;} -.icon-flag-pink{background-position: -156px -260px;} -.icon-flag-purple{background-position: -156px -286px;} -.icon-flag-red{background-position: -156px -312px;} -.icon-flag-yellow{background-position: -156px -338px;} -.icon-folder{background-position: -156px -364px;} -.icon-folder-add{background-position: -156px -390px;} -.icon-folder-bell{background-position: -156px -416px;} -.icon-folder-brick{background-position: -156px -442px;} -.icon-folder-bug{background-position: -156px -468px;} -.icon-folder-camera{background-position: -156px -494px;} -.icon-folder-database{background-position: -156px -520px;} -.icon-folder-delete{background-position: -156px -546px;} -.icon-folder-edit{background-position: -156px -572px;} -.icon-folder-error{background-position: -156px -598px;} -.icon-folder-explore{background-position: -156px -624px;} -.icon-folder-feed{background-position: -156px -650px;} -.icon-folder-find{background-position: -156px -676px;} -.icon-folder-go{background-position: -156px -702px;} -.icon-folder-heart{background-position: -156px -728px;} -.icon-folder-image{background-position: -156px -754px;} -.icon-folder-key{background-position: -156px -780px;} -.icon-folder-lightbulb{background-position: -156px -806px;} -.icon-folder-link{background-position: -156px -832px;} -.icon-folder-magnify{background-position: -156px -858px;} -.icon-folder-page{background-position: -156px -884px;} -.icon-folder-page-white{background-position: -156px -910px;} -.icon-folder-palette{background-position: -156px -936px;} -.icon-folder-picture{background-position: -156px -962px;} -.icon-folder-star{background-position: -156px -988px;} -.icon-folder-table{background-position: -156px -1014px;} -.icon-folder-user{background-position: -156px -1040px;} -.icon-folder-wrench{background-position: -156px -1066px;} -.icon-font{background-position: -156px -1092px;} -.icon-font-add{background-position: -156px -1118px;} -.icon-font-delete{background-position: -156px -1144px;} -.icon-font-go{background-position: -156px -1170px;} -.icon-group{background-position: -156px -1196px;} -.icon-group-add{background-position: -156px -1222px;} -.icon-group-delete{background-position: -156px -1248px;} -.icon-group-edit{background-position: -156px -1274px;} -.icon-group-error{background-position: -156px -1300px;} -.icon-group-gear{background-position: -156px -1326px;} -.icon-group-go{background-position: -156px -1352px;} -.icon-group-key{background-position: -156px -1378px;} -.icon-group-link{background-position: -156px -1404px;} -.icon-heart{background-position: -156px -1430px;} -.icon-heart-add{background-position: -156px -1456px;} -.icon-heart-delete{background-position: -156px -1482px;} -.icon-help{background-position: -156px -1508px;} -.icon-hourglass{background-position: -156px -1534px;} -.icon-hourglass-add{background-position: -156px -1560px;} -.icon-hourglass-delete{background-position: -156px -1586px;} -.icon-hourglass-go{background-position: -156px -1612px;} -.icon-hourglass-link{background-position: -156px -1638px;} -.icon-house{background-position: -156px -1664px;} -.icon-house-go{background-position: -156px -1690px;} -.icon-house-link{background-position: -156px -1716px;} -.icon-html{background-position: -156px -1742px;} -.icon-html-add{background-position: -156px -1768px;} -.icon-html-delete{background-position: -156px -1794px;} -.icon-html-go{background-position: -156px -1820px;} -.icon-html-valid{background-position: -156px -1846px;} -.icon-image{background-position: -156px -1872px;} -.icon-image-add{background-position: -156px -1898px;} -.icon-image-delete{background-position: -156px -1924px;} -.icon-image-edit{background-position: -156px -1950px;} -.icon-image-link{background-position: -156px -1976px;} -.icon-images{background-position: -182px 0;} -.icon-information{background-position: -182px -26px;} -.icon-ipod{background-position: -182px -52px;} -.icon-ipod-cast{background-position: -182px -78px;} -.icon-ipod-cast-add{background-position: -182px -104px;} -.icon-ipod-cast-delete{background-position: -182px -130px;} -.icon-ipod-sound{background-position: -182px -156px;} -.icon-joystick{background-position: -182px -182px;} -.icon-joystick-add{background-position: -182px -208px;} -.icon-joystick-delete{background-position: -182px -234px;} -.icon-joystick-error{background-position: -182px -260px;} -.icon-key{background-position: -182px -286px;} -.icon-key-add{background-position: -182px -312px;} -.icon-key-delete{background-position: -182px -338px;} -.icon-key-go{background-position: -182px -364px;} -.icon-keyboard{background-position: -182px -390px;} -.icon-keyboard-add{background-position: -182px -416px;} -.icon-keyboard-delete{background-position: -182px -442px;} -.icon-keyboard-magnify{background-position: -182px -468px;} -.icon-layers{background-position: -182px -494px;} -.icon-layout{background-position: -182px -520px;} -.icon-layout-add{background-position: -182px -546px;} -.icon-layout-content{background-position: -182px -572px;} -.icon-layout-delete{background-position: -182px -598px;} -.icon-layout-edit{background-position: -182px -624px;} -.icon-layout-error{background-position: -182px -650px;} -.icon-layout-header{background-position: -182px -676px;} -.icon-layout-link{background-position: -182px -702px;} -.icon-layout-sidebar{background-position: -182px -728px;} -.icon-lightbulb{background-position: -182px -754px;} -.icon-lightbulb-add{background-position: -182px -780px;} -.icon-lightbulb-delete{background-position: -182px -806px;} -.icon-lightbulb-off{background-position: -182px -832px;} -.icon-lightning{background-position: -182px -858px;} -.icon-lightning-add{background-position: -182px -884px;} -.icon-lightning-delete{background-position: -182px -910px;} -.icon-lightning-go{background-position: -182px -936px;} -.icon-link{background-position: -182px -962px;} -.icon-link-add{background-position: -182px -988px;} -.icon-link-break{background-position: -182px -1014px;} -.icon-link-delete{background-position: -182px -1040px;} -.icon-link-edit{background-position: -182px -1066px;} -.icon-link-error{background-position: -182px -1092px;} -.icon-link-go{background-position: -182px -1118px;} -.icon-lock{background-position: -182px -1144px;} -.icon-lock-add{background-position: -182px -1170px;} -.icon-lock-break{background-position: -182px -1196px;} -.icon-lock-delete{background-position: -182px -1222px;} -.icon-lock-edit{background-position: -182px -1248px;} -.icon-lock-go{background-position: -182px -1274px;} -.icon-lock-open{background-position: -182px -1300px;} -.icon-lorry{background-position: -182px -1326px;} -.icon-lorry-add{background-position: -182px -1352px;} -.icon-lorry-delete{background-position: -182px -1378px;} -.icon-lorry-error{background-position: -182px -1404px;} -.icon-lorry-flatbed{background-position: -182px -1430px;} -.icon-lorry-go{background-position: -182px -1456px;} -.icon-lorry-link{background-position: -182px -1482px;} -.icon-magifier-zoom-out{background-position: -182px -1508px;} -.icon-magnifier{background-position: -182px -1534px;} -.icon-magnifier-zoom-in{background-position: -182px -1560px;} -.icon-male{background-position: -182px -1586px;} -.icon-map{background-position: -182px -1612px;} -.icon-map-add{background-position: -182px -1638px;} -.icon-map-delete{background-position: -182px -1664px;} -.icon-map-edit{background-position: -182px -1690px;} -.icon-map-go{background-position: -182px -1716px;} -.icon-map-magnify{background-position: -182px -1742px;} -.icon-medal-bronze-1{background-position: -182px -1768px;} -.icon-medal-bronze-2{background-position: -182px -1794px;} -.icon-medal-bronze-3{background-position: -182px -1820px;} -.icon-medal-bronze-add{background-position: -182px -1846px;} -.icon-medal-bronze-delete{background-position: -182px -1872px;} -.icon-medal-gold-1{background-position: -182px -1898px;} -.icon-medal-gold-2{background-position: -182px -1924px;} -.icon-medal-gold-3{background-position: -182px -1950px;} -.icon-medal-gold-add{background-position: -182px -1976px;} -.icon-medal-gold-delete{background-position: -208px 0;} -.icon-medal-silver-1{background-position: -208px -26px;} -.icon-medal-silver-2{background-position: -208px -52px;} -.icon-medal-silver-3{background-position: -208px -78px;} -.icon-medal-silver-add{background-position: -208px -104px;} -.icon-medal-silver-delete{background-position: -208px -130px;} -.icon-money{background-position: -208px -156px;} -.icon-money-add{background-position: -208px -182px;} -.icon-money-delete{background-position: -208px -208px;} -.icon-monitor{background-position: -208px -234px;} -.icon-monitor-add{background-position: -208px -260px;} -.icon-monitor-delete{background-position: -208px -286px;} -.icon-monitor-edit{background-position: -208px -312px;} -.icon-monitor-error{background-position: -208px -338px;} -.icon-monitor-go{background-position: -208px -364px;} -.icon-monitor-lightning{background-position: -208px -390px;} -.icon-monitor-link{background-position: -208px -416px;} -.icon-mouse{background-position: -208px -442px;} -.icon-mouse-add{background-position: -208px -468px;} -.icon-mouse-delete{background-position: -208px -494px;} -.icon-mouse-error{background-position: -208px -520px;} -.icon-music{background-position: -208px -546px;} -.icon-new{background-position: -208px -572px;} -.icon-newspaper{background-position: -208px -598px;} -.icon-newspaper-add{background-position: -208px -624px;} -.icon-newspaper-delete{background-position: -208px -650px;} -.icon-newspaper-go{background-position: -208px -676px;} -.icon-newspaper-link{background-position: -208px -702px;} -.icon-note{background-position: -208px -728px;} -.icon-note-add{background-position: -208px -754px;} -.icon-note-delete{background-position: -208px -780px;} -.icon-note-edit{background-position: -208px -806px;} -.icon-note-error{background-position: -208px -832px;} -.icon-note-go{background-position: -208px -858px;} -.icon-overlays{background-position: -208px -884px;} -.icon-package{background-position: -208px -910px;} -.icon-package-add{background-position: -208px -936px;} -.icon-package-delete{background-position: -208px -962px;} -.icon-package-go{background-po... [truncated message content] |
From: <dh...@us...> - 2012-02-19 12:59:18
|
Revision: 9026 http://xoops.svn.sourceforge.net/xoops/?rev=9026&view=rev Author: dhcst Date: 2012-02-19 12:59:12 +0000 (Sun, 19 Feb 2012) Log Message: ----------- fix move/merge topics Modified Paths: -------------- XoopsModules/newbb/branches/alfred/newbb/class/forum.php XoopsModules/newbb/branches/alfred/newbb/topicmanager.php Modified: XoopsModules/newbb/branches/alfred/newbb/class/forum.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-02-19 12:26:40 UTC (rev 9025) +++ XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-02-19 12:59:12 UTC (rev 9026) @@ -651,7 +651,7 @@ } } } - + return $this->insert($object, true); } Modified: XoopsModules/newbb/branches/alfred/newbb/topicmanager.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/topicmanager.php 2012-02-19 12:26:40 UTC (rev 9025) +++ XoopsModules/newbb/branches/alfred/newbb/topicmanager.php 2012-02-19 12:59:12 UTC (rev 9026) @@ -52,6 +52,12 @@ $topic_handler =& xoops_getmodulehandler('topic', 'newbb'); $forum_handler =& xoops_getmodulehandler('forum', 'newbb'); +if ( !$forum ) { + $topic_obj =& $topic_handler->get($topic_id); + $forum = $topic_obj->getVar("forum_id"); + unset($topic_obj); +} + if ($xoopsModuleConfig['wol_enabled']) { $online_handler =& xoops_getmodulehandler('online', 'newbb'); $online_handler->init($forum); @@ -89,7 +95,7 @@ //sync($topic_id, "topic"); //xoops_notification_deletebyitem ($xoopsModule->getVar('mid'), 'thread', $topic_id); } - echo $action[$mode]['msg']."<p><a href='viewforum.php?forum=$forum'>"._MD_RETURNTOTHEFORUM."</a></p><p><a href='index.php'>"._MD_RETURNFORUMINDEX."</a></p>"; + echo $action[$mode]['msg']."<p><a href='".XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum'>"._MD_RETURNTOTHEFORUM."</a></p><p><a href='index.php'>"._MD_RETURNFORUMINDEX."</a></p>"; } elseif ('restore' == $mode) { //$topic_handler =& xoops_getmodulehandler('topic', 'newbb'); $forums = array(); @@ -183,7 +189,7 @@ } elseif ('move' == $mode) { if ($newforum > 0) { $topic_id = $topic_id[0]; - $topic_obj =& $topic_handler->get($topic_id); + $topic_obj = $topic_handler->get($topic_id); $topic_obj->loadFilters("update"); $topic_obj->setVar("forum_id", $newforum, true); $topic_handler->insert($topic_obj, true); @@ -193,7 +199,9 @@ if ( !$r = $xoopsDB->query($sql) ) { return false; } - $forum_handler->synchronization(); + $forum_handler->synchronization($forum); + $forum_handler->synchronization($newforum); + echo $action[$mode]['msg']."<p><a href='viewtopic.php?topic_id=$topic_id&forum=$newforum'>"._MD_GOTONEWFORUM."</a></p><p><a href='".XOOPS_URL."/modules/newbb/index.php'>"._MD_RETURNFORUMINDEX."</a></p>"; } else { redirect_header("javascript:history.go(-1)",2,_MD_ERRORFORUM); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dh...@us...> - 2012-02-19 12:26:47
|
Revision: 9025 http://xoops.svn.sourceforge.net/xoops/?rev=9025&view=rev Author: dhcst Date: 2012-02-19 12:26:40 +0000 (Sun, 19 Feb 2012) Log Message: ----------- fix pfad for seo Modified Paths: -------------- XoopsModules/newbb/branches/alfred/newbb/class/forum.php XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_menu.html XoopsModules/newbb/branches/alfred/newbb/topicmanager.php Modified: XoopsModules/newbb/branches/alfred/newbb/class/forum.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-02-19 12:12:07 UTC (rev 9024) +++ XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-02-19 12:26:40 UTC (rev 9025) @@ -32,7 +32,7 @@ function __construct() { - //$this->XoopsObject(); + $this->XoopsObject(); $this->initVar('forum_id', XOBJ_DTYPE_INT); $this->initVar('forum_name', XOBJ_DTYPE_TXTBOX); $this->initVar('forum_desc', XOBJ_DTYPE_TXTBOX); @@ -78,7 +78,7 @@ } - function insert(&$forum) + function insert($forum) { if (!parent::insert($forum, true)) { return false; @@ -613,19 +613,20 @@ */ function synchronization($object = null) { - if (empty($object)) { + if (empty($object)) { $forums = $this->getIds(); foreach ($forums as $id) { $this->synchronization($id); } return true; } - + if (!is_object($object)) { $object =& $this->get(intval($object)); } + if (!$object->getVar("forum_id")) return false; - + $sql = "SELECT MAX(post_id) AS last_post, COUNT(*) AS total FROM " . $this->db->prefix("bb_posts") . " AS p LEFT JOIN " . $this->db->prefix("bb_topics") . " AS t ON p.topic_id=t.topic_id WHERE p.approved=1 AND t.approved=1 AND p.forum_id = ".$object->getVar("forum_id"); if ( $result = $this->db->query($sql)) { $last_post = 0; @@ -641,7 +642,7 @@ $object->setVar("forum_posts", $posts); } } - + $sql = "SELECT COUNT(*) AS total FROM " . $this->db->prefix("bb_topics") . " WHERE approved=1 AND forum_id = " . $object->getVar("forum_id"); if ( $result = $this->db->query($sql) ) { if ( $row = $this->db->fetchArray($result) ) { @@ -649,9 +650,7 @@ $object->setVar("forum_topics", $row['total']); } } - } - - + } return $this->insert($object, true); } Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_menu.html =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_menu.html 2012-02-19 12:12:07 UTC (rev 9024) +++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_menu.html 2012-02-19 12:26:40 UTC (rev 9025) @@ -3,15 +3,15 @@ class="menu" onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}" > <option value=""><{$smarty.const._MD_FORUMOPTION}></option> - <option value="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$mark_read}>"><{$smarty.const._MD_MARK_ALL_TOPICS}> <{$smarty.const._MD_MARK_READ}></option> - <option value="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$mark_unread}>"><{$smarty.const._MD_MARK_ALL_TOPICS}> <{$smarty.const._MD_MARK_UNREAD}></option> + <option value="<{$mark_read}>"><{$smarty.const._MD_MARK_ALL_TOPICS}> <{$smarty.const._MD_MARK_READ}></option> + <option value="<{$mark_unread}>"><{$smarty.const._MD_MARK_ALL_TOPICS}> <{$smarty.const._MD_MARK_UNREAD}></option> <option value="">--------</option> - <option value="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$post_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_ALLPOSTS}></option> - <option value="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$newpost_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_NEWPOSTS}></option> - <option value="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$all_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_ALL}></option> - <option value="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$digest_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_DIGEST}></option> - <option value="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$unreplied_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_UNREPLIED}></option> - <option value="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$unread_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_UNREAD}></option> + <option value="<{$post_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_ALLPOSTS}></option> + <option value="<{$newpost_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_NEWPOSTS}></option> + <option value="<{$all_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_ALL}></option> + <option value="<{$digest_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_DIGEST}></option> + <option value="<{$unreplied_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_UNREPLIED}></option> + <option value="<{$unread_link}>"><{$smarty.const._MD_VIEW}> <{$smarty.const._MD_UNREAD}></option> </select> <{if $type_options}> Modified: XoopsModules/newbb/branches/alfred/newbb/topicmanager.php =================================================================== --- XoopsModules/newbb/branches/alfred/newbb/topicmanager.php 2012-02-19 12:12:07 UTC (rev 9024) +++ XoopsModules/newbb/branches/alfred/newbb/topicmanager.php 2012-02-19 12:26:40 UTC (rev 9025) @@ -193,8 +193,7 @@ if ( !$r = $xoopsDB->query($sql) ) { return false; } - $forum_handler->synchronization($newforum); - $forum_handler->synchronization($forum); + $forum_handler->synchronization(); echo $action[$mode]['msg']."<p><a href='viewtopic.php?topic_id=$topic_id&forum=$newforum'>"._MD_GOTONEWFORUM."</a></p><p><a href='".XOOPS_URL."/modules/newbb/index.php'>"._MD_RETURNFORUMINDEX."</a></p>"; } else { redirect_header("javascript:history.go(-1)",2,_MD_ERRORFORUM); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |