From: <be...@us...> - 2014-06-16 11:28:02
|
Revision: 12612 http://sourceforge.net/p/xoops/svn/12612 Author: beckmi Date: 2014-06-16 11:27:58 +0000 (Mon, 16 Jun 2014) Log Message: ----------- Setting up 2.5.8 Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/include/version.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-06-16 11:21:43 UTC (rev 12611) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-06-16 11:27:58 UTC (rev 12612) @@ -1,6 +1,11 @@ XOOPS 2.5.x Changelog (Language changes: see: /docs/lang_diff.txt) =============================== +NOT RELEASED: Version 2.5.8 Beta 1 +=============================== +Bugfixes: + +=============================== 2014/06/14: Version 2.5.7 Final =============================== - updated XoopsMediaUploader to use system memory values from php.ini, and to offer random file names (mamba/luciorota/zyspec) Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/include/version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/include/version.php 2014-06-16 11:21:43 UTC (rev 12611) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/include/version.php 2014-06-16 11:27:58 UTC (rev 12612) @@ -30,4 +30,4 @@ /** * Define XOOPS version */ -define('XOOPS_VERSION', 'XOOPS 2.5.7'); +define('XOOPS_VERSION', 'XOOPS 2.5.8_Beta1'); |
From: <be...@us...> - 2014-06-22 19:55:14
|
Revision: 12635 http://sourceforge.net/p/xoops/svn/12635 Author: beckmi Date: 2014-06-22 19:55:09 +0000 (Sun, 22 Jun 2014) Log Message: ----------- Updating docu for the correct version of tablesorter, synch with 2.5.7 changes Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/about.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/groupperm.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-06-22 19:51:11 UTC (rev 12634) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-06-22 19:55:09 UTC (rev 12635) @@ -41,7 +41,7 @@ - jQuery UI 1.10.4 (mamba) - jQuery Lightbox to 1.2.3 (mamba) - jQuery Form to 3.50.0 (mamba) - - jQuery Tablesorter to 2.5.11 (mamba) + - jQuery Tablesorter to 2.15.11 (mamba) - jGrowl to 1.2.14 (mamba) =============================== Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php 2014-06-22 19:51:11 UTC (rev 12634) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php 2014-06-22 19:55:09 UTC (rev 12635) @@ -17,7 +17,7 @@ * @version $Id $ **/ -include_once dirname(__FILE__) . '../../../include/cp_header.php'; +include_once dirname(__FILE__) . '/../../../include/cp_header.php'; include '../../../class/xoopsformloader.php'; include_once dirname(__FILE__) . '/admin_header.php'; xoops_cp_header(); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/about.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/about.php 2014-06-22 19:51:11 UTC (rev 12634) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/about.php 2014-06-22 19:55:09 UTC (rev 12635) @@ -17,7 +17,7 @@ * @version $Id $ **/ -include_once dirname(__FILE__) . '../../../include/cp_header.php'; +include_once dirname(__FILE__) . '/../../../include/cp_header.php'; include_once dirname(__FILE__) . '/admin_header.php'; xoops_cp_header(); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/groupperm.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/groupperm.php 2014-06-22 19:51:11 UTC (rev 12634) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/groupperm.php 2014-06-22 19:55:09 UTC (rev 12635) @@ -1,7 +1,7 @@ <?php // $Id$ -include_once dirname(__FILE__) . '../../../include/cp_header.php'; +include_once dirname(__FILE__) . '/../../../include/cp_header.php'; $modid = isset($_POST['modid']) ? intval($_POST['modid']) : 0; // we don't want system module permissions to be changed here |
From: <be...@us...> - 2014-06-29 01:45:05
|
Revision: 12663 http://sourceforge.net/p/xoops/svn/12663 Author: beckmi Date: 2014-06-29 01:44:58 +0000 (Sun, 29 Jun 2014) Log Message: ----------- replaced "dirname(__FILE__)" with "__DIR__" Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/extras/altsys_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/backend.php XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php XoopsCore/branches/2.5.x/2.5.8/htdocs/browse.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xoopscache.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/recaptcha.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/file/xoopsfile.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/xoopsmodel.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty.class.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/censor/censor.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/flash/flash.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/image/image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/mms/mms.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/readme.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/rtsp/rtsp.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/soundcloud/soundcloud.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/textfilter/textfilter.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wiki/wiki.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wmp/wmp.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/formtinymce.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/xoopseditor.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/edituser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/imagemanager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/cp_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/findusers.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/formdhtmltextarea_preview.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/makedata.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/object.php XoopsCore/branches/2.5.x/2.5.8/htdocs/lostpass.php XoopsCore/branches/2.5.x/2.5.8/htdocs/misc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/prune.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/include/update.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/pmlite.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/readpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/viewpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/activate.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/about.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/admin_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/category.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/deactivate.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/field.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/permissions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/step.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/visibility.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/changemail.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/changepass.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/edituser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/include/update.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/lostpass.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/register.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/userinfo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/groupperm.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpThumb.config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpThumb.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/default.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/legacy/legacy.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/zetadigme.php XoopsCore/branches/2.5.x/2.5.8/htdocs/notifications.php XoopsCore/branches/2.5.x/2.5.8/htdocs/pda.php XoopsCore/branches/2.5.x/2.5.8/htdocs/pmlite.php XoopsCore/branches/2.5.x/2.5.8/htdocs/readpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/register.php XoopsCore/branches/2.5.x/2.5.8/htdocs/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/blocks/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/class/category.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/class/item.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/item.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/userinfo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/viewpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xmlrpc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/admin_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/advisory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/center.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/mymenu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/class/ProtectorFilter.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/class/protector.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_htmlpurify4everyone.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_htmlpurify4guest.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/include/postcheck.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/include/postcheck_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/include/precheck.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/include/precheck_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Bootstrap.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/LanguageFactory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.auto.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.kses.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.path.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.safe-includes.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/module_icon.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/notification.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/oninstall.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/onuninstall.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/onupdate.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/upgrade/cnt-2.2.x-to-2.3.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.3.0-to-2.3.1/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.3.3-to-2.4.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.4.0-to-2.4.1/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.4.x-to-2.5.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.5.4-to-2.5.5/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.5.5-to-2.5.6/index.php Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.8/extras/mainfile.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-06-29 01:44:58 UTC (rev 12663) @@ -3,9 +3,18 @@ =============================== NOT RELEASED: Version 2.5.8 Beta 1 =============================== -Bugfixes: +- replaced "dirname(__FILE__)" with "__DIR__" since the min. PHP is now 5.3.7, and __DIR__ is faster (mamba) =============================== +2014-06-20: Version 2.5.7 Final (Patch) +=============================== + +- Updating docu for the correct version of tablesorter (mamba) +- Fix path specified for include (rgriffith, mamba) +- added mainfile.php to /extras for use on servers where write to root is not possible (rgriffith) +- fix for array issue in pm/viempmsg.php (Roby73/mamba) + +=============================== 2014/06/14: Version 2.5.7 Final =============================== - updated XoopsMediaUploader to use system memory values from php.ini, and to offer random file names (mamba/luciorota/zyspec) @@ -30,7 +39,7 @@ Bugfixes: - fixed System Module image manager html/js bugs (luciorota) - replaced "array_diff_assoc" with "array_diff_key" in /class/theme_blocks.php (masel/mamba) -- icons for active module sections in System module not shown correctly (Slider84/mamba) +- icons for active module sections in System module not shown correctly (Slider84/mamba) - added two new language definitions (see lang_diff.txt) - added Office 2007 MIME types (Voltan) - added xml MIME type (Goffy) @@ -837,4 +846,4 @@ - modules/system/class/users.php: User Class Manager (Add) * Manage user with a specific class - modules/system/language/english/admin/users.php: User variable (Modify) - * Changed define name to follow XOOPS standard \ No newline at end of file + * Changed define name to follow XOOPS standard Modified: XoopsCore/branches/2.5.x/2.5.8/extras/altsys_functions.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/extras/altsys_functions.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/extras/altsys_functions.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -33,7 +33,7 @@ foreach( $mymenu_find_paths as $mymenu_find_path ) { if( file_exists( $mymenu_find_path ) ) { include $mymenu_find_path ; - include_once dirname(__FILE__).'/adminmenu_functions.php' ; + include_once __DIR__.'/adminmenu_functions.php' ; altsys_adminmenu_insert_mymenu( $xoopsModule ) ; altsys_adminmenu_hack_ft() ; break ; @@ -120,4 +120,4 @@ } -?> \ No newline at end of file +?> Added: XoopsCore/branches/2.5.x/2.5.8/extras/mainfile.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/extras/mainfile.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8/extras/mainfile.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -0,0 +1,19 @@ +<?php +/** + * This is a dummy placeholder for mainfile.php, the XOOPS configuration file + * + * This is only needed for installation on servers that cannot write a file directly + * into the main XOOPS root directory. On these servers, the install will stop + * progressing after configuring the database (install/page_dbconnection.php) + * + * If you experience this problem: + * - copy this file to the XOOPS root directory + * - set the file permissions to make it writeable + * - rerun the install + * + * Typical writable permission would be 665 (user read/write, group read/write, other read) + * If problems persist, escalate permission to 777 (world read/write/execute) as a last resort. + */ +if (! defined('XOOPS_INSTALL')) { + header('Location: install/index.php'); +} Property changes on: XoopsCore/branches/2.5.x/2.5.8/extras/mainfile.php ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.admin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.admin.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.admin.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -14,7 +14,7 @@ if(!defined("FRAMEWORKS_ART_FUNCTIONS_ADMIN")): define("FRAMEWORKS_ART_FUNCTIONS_ADMIN", true); -defined("FRAMEWORKS_ART_FUNCTIONS_INI") || include_once dirname(__FILE__) . "/functions.ini.php"; +defined("FRAMEWORKS_ART_FUNCTIONS_INI") || include_once __DIR__ . "/functions.ini.php"; /** * @param $currentoption Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -14,7 +14,7 @@ if (defined('XOOPS_ART_FUNCTIONS')) return false; define('XOOPS_ART_FUNCTIONS', true); -include_once dirname(__FILE__) . "/functions.ini.php"; +include_once __DIR__ . "/functions.ini.php"; load_functions("cache"); load_functions("user"); @@ -22,7 +22,7 @@ load_functions("admin"); if (!class_exists('ArtObject')) - include_once dirname(__FILE__) . "/object.php"; + include_once __DIR__ . "/object.php"; /** * get MySQL server version Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -15,7 +15,7 @@ */ $xoopsOption['pagetype'] = 'admin'; -include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include __DIR__ . DIRECTORY_SEPARATOR . 'mainfile.php'; include_once $GLOBALS['xoops']->path('include/cp_functions.php'); /** * Admin Authentication Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/backend.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/backend.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/backend.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -15,7 +15,7 @@ * @version $Id$ */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include __DIR__ . DIRECTORY_SEPARATOR . 'mainfile.php'; $GLOBALS['xoopsLogger']->activated = false; if (function_exists('mb_http_output')) { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -20,7 +20,7 @@ */ $xoopsOption['pagetype'] = 'banners'; -include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include __DIR__ . DIRECTORY_SEPARATOR . 'mainfile.php'; /********************************************/ /* Function to let your client login to see */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/browse.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/browse.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/browse.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -21,7 +21,7 @@ defined('NWLINE')or define('NWLINE', "\n"); $xoopsOption['nocommon'] = true; -require_once dirname(__FILE__) . DS . 'mainfile.php'; +require_once __DIR__ . DS . 'mainfile.php'; error_reporting(0); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xoopscache.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xoopscache.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xoopscache.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -86,7 +86,7 @@ function loadEngine($name) { if (!class_exists('XoopsCache' . ucfirst($name))) { - if (file_exists($file = dirname(__FILE__) . '/' . strtolower($name) . '.php')) { + if (file_exists($file = __DIR__ . '/' . strtolower($name) . '.php')) { include $file; } else { trigger_error('File :' . $file . ' not found in file : ' . __FILE__ . ' at line: ' . __LINE__, E_USER_WARNING); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/recaptcha.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/recaptcha.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/recaptcha.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -42,7 +42,7 @@ */ function render() { - require_once dirname(__FILE__) . '/recaptcha/recaptchalib.php'; + require_once __DIR__ . '/recaptcha/recaptchalib.php'; $form = "<script type=\"text/javascript\"> var RecaptchaOptions = { theme : '" . $this->config['theme']."', @@ -64,7 +64,7 @@ function verify($sessionName) { $is_valid = false; - require_once dirname(__FILE__) . '/recaptcha/recaptchalib.php'; + require_once __DIR__ . '/recaptcha/recaptchalib.php'; if (!empty($_POST['recaptcha_response_field'])) { $resp = recaptcha_check_answer( $this->config['private_key'], Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/file/xoopsfile.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/file/xoopsfile.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/file/xoopsfile.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -71,7 +71,7 @@ switch ($name) { case 'folder': if (!class_exists('XoopsFolderHandler')) { - if (file_exists($folder = dirname(__FILE__) . '/folder.php')) { + if (file_exists($folder = __DIR__ . '/folder.php')) { include $folder; } else { trigger_error('Require Item : ' . str_replace(XOOPS_ROOT_PATH, '', $folder) . ' In File ' . __FILE__ . ' at Line ' . __LINE__, E_USER_WARNING); @@ -83,7 +83,7 @@ case 'file': default: if (!class_exists('XoopsFileHandler')) { - if (file_exists($file = dirname(__FILE__) . '/file.php')) { + if (file_exists($file = __DIR__ . '/file.php')) { include $file; } else { trigger_error('Require File : ' . str_replace(XOOPS_ROOT_PATH, '', $file) . ' In File ' . __FILE__ . ' at Line ' . __LINE__, E_USER_WARNING); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/xoopsmodel.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/xoopsmodel.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/xoopsmodel.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -79,7 +79,7 @@ { static $handlers; if (!isset($handlers[$name])) { - if (file_exists($file = dirname(__FILE__) . '/' . $name . '.php')) { + if (file_exists($file = __DIR__ . '/' . $name . '.php')) { include_once $file; $className = 'XoopsModel' . ucfirst($name); $handler = new $className(); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty.class.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty.class.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty.class.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -46,7 +46,7 @@ */ if (!defined('SMARTY_DIR')) { - define('SMARTY_DIR', dirname(__FILE__) . DIRECTORY_SEPARATOR); + define('SMARTY_DIR', __DIR__ . DIRECTORY_SEPARATOR); } if (!defined('SMARTY_CORE_DIR')) { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/censor/censor.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/censor/censor.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/censor/censor.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -40,7 +40,7 @@ if (!isset($censorConf)) { $config_handler = & xoops_gethandler('config'); $censorConf = $config_handler->getConfigsByCat(XOOPS_CONF_CENSOR); - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); //merge and allow config override $censorConf = array_merge($censorConf, $config); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/flash/flash.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/flash/flash.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/flash/flash.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -31,7 +31,7 @@ */ function encode($textarea_id) { - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); $code = "<img src='{$this->image_path}/swf.gif' alt='" . _XOOPS_FORM_ALTFLASH . "' title='" . _XOOPS_FORM_ALTFLASH . "' '" . "' onclick='xoopsCodeFlash(\"{$textarea_id}\",\"" . htmlspecialchars(_XOOPS_FORM_ENTERFLASHURL, ENT_QUOTES) . "\",\"" . htmlspecialchars(_XOOPS_FORM_ALT_ENTERHEIGHT, ENT_QUOTES) . "\",\"" @@ -98,7 +98,7 @@ */ static function decode($url, $width, $height) { - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); if ((empty($width) || empty($height)) && !empty($config['detect_dimension'])) { if (!$dimension = @getimagesize($url)) { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/image/image.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/image/image.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/image/image.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -35,7 +35,7 @@ { static $jsLoaded; - $config = $this->loadConfig(dirname(__FILE__)); + $config = $this->loadConfig(__DIR__); $ts->patterns[] = "/\[img align=(['\"]?)(left|center|right)\\1 width=(['\"]?)([0-9]*)\\3]([^\"\(\)\?\&'<>]*)\[\/img\]/sU"; $ts->patterns[] = "/\[img align=(['\"]?)(left|center|right)\\1]([^\"\(\)\?\&'<>]*)\[\/img\]/sU"; $ts->patterns[] = "/\[img width=(['\"]?)([0-9]*)\\1]([^\"\(\)\?\&'<>]*)\[\/img\]/sU"; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/mms/mms.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/mms/mms.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/mms/mms.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -31,7 +31,7 @@ */ function encode($textarea_id) { - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); $code = "<img src='{$this->image_path}/mmssrc.gif' alt='" . _XOOPS_FORM_ALTMMS . "' title='" . _XOOPS_FORM_ALTMMS . "' '" . "' onclick='xoopsCodeMms(\"{$textarea_id}\",\"" . htmlspecialchars(_XOOPS_FORM_ENTERMMSURL, ENT_QUOTES) . "\",\"" . htmlspecialchars(_XOOPS_FORM_ALT_ENTERHEIGHT, ENT_QUOTES) . "\",\"" Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/readme.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/readme.txt 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/readme.txt 2014-06-29 01:44:58 UTC (rev 12663) @@ -14,7 +14,7 @@ function encode($textarea_id) { // If the extension has config data, load it - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); // Make sure that the icon is available /images/form/mycode.gif $code = "<img src='{$this->image_path}/mycode.gif' alt='" . _XOOPS_FORM_ALTMYCODE . "' onclick='xoopsCodeMycode(\"{$textarea_id}\",\"" . htmlspecialchars(_XOOPS_FORM_ENTERMYCODETERM, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> "; $javascript = <<<EOH @@ -39,26 +39,26 @@ // Return the scripts to be displayed in editor form and the javascript for relevant actions return array($code, $javascript); } - + // The code parser - function load(&$ts) + function load(&$ts) { $ts->patterns[] = "/\[mycode\]([^\]]*)\[\/mycode\]/esU"; - $ts->replacements[] = __CLASS__."::decode( '\\1' )"; + $ts->replacements[] = __CLASS__."::decode( '\\1' )"; } - + // Processing the text function decode($text) { // Load config data if any - $config = parent::loadConfig( dirname(__FILE__) ); + $config = parent::loadConfig( __DIR__ ); if ( empty($text) || empty($config['enabled']) ) return $text; $ret = someFunctionToConvertTheTextToDefinedFormat($text); return $ret; } } -config.custom.php: +config.custom.php: return $config = array( "extensions" => array( "iframe" => 0, Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/rtsp/rtsp.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/rtsp/rtsp.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/rtsp/rtsp.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -31,7 +31,7 @@ */ function encode($textarea_id) { - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); $code = "<img src='{$this->image_path}/rtspimg.gif' alt='" . _XOOPS_FORM_ALTRTSP . "' title='" . _XOOPS_FORM_ALTRTSP . "' '" . "' onclick='xoopsCodeRtsp(\"{$textarea_id}\",\"" . htmlspecialchars(_XOOPS_FORM_ENTERRTSPURL, ENT_QUOTES) . "\",\"" . htmlspecialchars(_XOOPS_FORM_ALT_ENTERHEIGHT, ENT_QUOTES) . "\",\"" Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/soundcloud/soundcloud.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/soundcloud/soundcloud.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/soundcloud/soundcloud.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -12,7 +12,7 @@ */ public function encode($textarea_id) { - $config = parent::loadConfig( dirname(__FILE__) ); + $config = parent::loadConfig( __DIR__ ); $code = "<img src='{$this->image_path}/soundcloud.png' alt='" . _XOOPS_FORM_ALT_SOUNDCLOUD . "' title='" . _XOOPS_FORM_ALT_SOUNDCLOUD . "' '" @@ -57,7 +57,7 @@ public static function myCallback($match) { $url = $match[1] . $match[2]; - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); if (!preg_match("/^http[s]?:\/\/(www\.)?soundcloud\.com\/(.*)/i", $url, $matches)) { trigger_error("Not matched: {$url}", E_USER_WARNING); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -33,7 +33,7 @@ */ function load(&$ts, $source, $language) { - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); if (empty($config['highlight'])) { return "<pre>{$source}</pre>"; } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/textfilter/textfilter.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/textfilter/textfilter.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/textfilter/textfilter.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -55,7 +55,7 @@ $tags = array(); $search = array(); $replace = array(); - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); if (!empty($config["patterns"])) { foreach ($config["patterns"] as $pattern) { if (empty($pattern['search'])) Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wiki/wiki.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wiki/wiki.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wiki/wiki.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -34,7 +34,7 @@ */ function encode($textarea_id) { - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); $code = "<img src='{$this->image_path}/wiki.gif' alt='" . _XOOPS_FORM_ALTWIKI . "' title='" . _XOOPS_FORM_ALTWIKI . "' '" . "' onclick='xoopsCodeWiki(\"{$textarea_id}\",\"" . htmlspecialchars(_XOOPS_FORM_ENTERWIKITERM, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> "; @@ -94,7 +94,7 @@ */ static function decode($text) { - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); if (empty($text) || empty($config['link'])) { return $text; } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wmp/wmp.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wmp/wmp.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wmp/wmp.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -31,7 +31,7 @@ */ function encode($textarea_id) { - $config = parent::loadConfig(dirname(__FILE__)); + $config = parent::loadConfig(__DIR__); $code = "<img src='{$this->image_path}/wmp.gif' alt='" . _XOOPS_FORM_ALTWMP . "' title='" . _XOOPS_FORM_ALTWMP . "' '" . "' onclick='xoopsCodeWmp(\"{$textarea_id}\",\"" . htmlspecialchars(_XOOPS_FORM_ENTERWMPURL, ENT_QUOTES) . "\",\"" . htmlspecialchars(_XOOPS_FORM_ALT_ENTERHEIGHT, ENT_QUOTES) . "\",\"" Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -27,7 +27,7 @@ */ function encode($textarea_id) { - $config = parent::loadConfig( dirname(__FILE__) ); + $config = parent::loadConfig( __DIR__ ); $code = "<img src='{$this->image_path}/youtube.gif' alt='" . _XOOPS_FORM_ALTYOUTUBE . "' title='" . _XOOPS_FORM_ALTYOUTUBE . "' '" . "' onclick='xoopsCodeYoutube(\"{$textarea_id}\",\"" . htmlspecialchars(_XOOPS_FORM_ENTERYOUTUBEURL, ENT_QUOTES) . "\",\"" . htmlspecialchars(_XOOPS_FORM_ALT_ENTERHEIGHT, ENT_QUOTES) Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/formtinymce.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/formtinymce.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/formtinymce.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -54,7 +54,7 @@ $this->configs["area_height"] = isset($this->configs["height"]) ? $this->configs["height"] : $this->height; $this->configs["fonts"] = $this->getFonts(); - require_once dirname(__FILE__) . "/tinymce.php"; + require_once __DIR__ . "/tinymce.php"; $this->editor = new TinyMCE($this->configs); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -14,7 +14,7 @@ */ // load mainfile.php - start -$current_path = dirname(__FILE__); +$current_path = __DIR__; if (DIRECTORY_SEPARATOR != "/") { $current_path = str_replace( DIRECTORY_SEPARATOR, "/", $current_path); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -14,7 +14,7 @@ */ // load mainfile.php -$current_path = dirname(__FILE__); +$current_path = __DIR__; if (DIRECTORY_SEPARATOR != "/") { $current_path = str_replace( DIRECTORY_SEPARATOR, "/", $current_path); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -14,7 +14,7 @@ */ // load mainfile.php -$current_path = dirname(__FILE__); +$current_path = __DIR__; if (DIRECTORY_SEPARATOR != "/") { $current_path = str_replace( DIRECTORY_SEPARATOR, "/", $current_path); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -14,7 +14,7 @@ */ // load mainfile.php - start -$current_path = dirname(__FILE__); +$current_path = __DIR__; if (DIRECTORY_SEPARATOR != "/") { $current_path = str_replace( DIRECTORY_SEPARATOR, "/", $current_path); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -90,7 +90,7 @@ // Load default settings if ( ! ($this->setting = @include( $GLOBALS['xoops']->path( "var/configs/tinymce.php" ) ) ) ) { - $this->setting = include dirname(__FILE__) . "/settings.php"; + $this->setting = include __DIR__ . "/settings.php"; } // get editor language (from ...) Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/xoopseditor.inc.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/xoopseditor.inc.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/xoopseditor.inc.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -32,7 +32,7 @@ return true; } -$mainfile = dirname(dirname(dirname(__FILE__))) . '/mainfile.php'; +$mainfile = dirname(dirname(__DIR__)) . '/mainfile.php'; if (DIRECTORY_SEPARATOR != '/') { $mainfile = str_replace(DIRECTORY_SEPARATOR, '/', $mainfile); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/edituser.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/edituser.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/edituser.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -16,7 +16,7 @@ * @version $Id$ */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include __DIR__ . DIRECTORY_SEPARATOR . 'mainfile.php'; $xoopsPreload =& XoopsPreload::getInstance(); $xoopsPreload->triggerEvent('core.edituser.start'); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/image.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/image.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/image.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -78,7 +78,7 @@ } $xoopsOption['nocommon'] = true; -require_once dirname(__FILE__) . DS . 'mainfile.php'; +require_once __DIR__ . DS . 'mainfile.php'; include_once XOOPS_ROOT_PATH . DS . 'include' . DS .'defines.php'; include_once XOOPS_ROOT_PATH . DS . 'include' . DS . 'functions.php'; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/imagemanager.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/imagemanager.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/imagemanager.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -16,7 +16,7 @@ * @version $Id$ */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include __DIR__ . DIRECTORY_SEPARATOR . 'mainfile.php'; XoopsLoad::load('XoopsFilterInput'); if (isset($_REQUEST['target'])) { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/include/cp_header.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/include/cp_header.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/include/cp_header.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -21,7 +21,7 @@ * the file that will include this file must be located under xoops_url/modules/module_directory_name/admin_directory_name/ */ $xoopsOption['pagetype'] = 'admin'; -include_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'mainfile.php'; include_once $GLOBALS['xoops']->path('include/cp_functions.php'); $moduleperm_handler =& xoops_gethandler('groupperm'); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/include/findusers.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/include/findusers.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/include/findusers.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -16,7 +16,7 @@ * @author Taiwen Jiang <ph...@us...> * @version $Id$ */ -include_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'mainfile.php'; xoops_header(false); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/include/formdhtmltextarea_preview.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/include/formdhtmltextarea_preview.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/include/formdhtmltextarea_preview.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -17,7 +17,7 @@ * @author Taiwen Jiang <ph...@us...> * @version $Id$ */ -include_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'mainfile.php'; $xoopsLogger->activated = false; $myts =& MyTextSanitizer::getInstance(); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -1143,5 +1143,5 @@ return $domain; } -include_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'functions.encoding.php'; -include_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'functions.legacy.php'; +include_once __DIR__ . DIRECTORY_SEPARATOR . 'functions.encoding.php'; +include_once __DIR__ . DIRECTORY_SEPARATOR . 'functions.legacy.php'; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/include/version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/include/version.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/include/version.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -25,7 +25,7 @@ * It is highly discouraged to use the license file * It will be depreciated and removed */ -@include_once dirname(__FILE__) . '/license.php'; +@include_once __DIR__ . '/license.php'; /** * Define XOOPS version Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/index.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/index.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/index.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -19,11 +19,11 @@ * @version $Id$ */ -if (file_exists(dirname(__FILE__) . '/mainfile.php')) { - include dirname(__FILE__) . '/mainfile.php'; +if (file_exists(__DIR__ . '/mainfile.php')) { + include __DIR__ . '/mainfile.php'; } if (!defined('XOOPS_MAINFILE_INCLUDED')) { - if (file_exists(dirname(__FILE__) . '/install/index.php')) { + if (file_exists(__DIR__ . '/install/index.php')) { header('Location: install/index.php'); exit; } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/functions.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/functions.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/functions.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -491,7 +491,7 @@ // Private Key $xoops_serdat['file'] = $func(__FILE__); $xoops_serdat['basename'] = $func(basename(__FILE__)); - $xoops_serdat['path'] = $func(dirname(__FILE__)); + $xoops_serdat['path'] = $func(__DIR__); foreach ($_SERVER as $key => $data) { $xoops_serdat[$key] = substr($func(serialize($data)),0, 4); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/makedata.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/makedata.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/makedata.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -343,5 +343,5 @@ { set_time_limit(180); - return xoPutLicenseKey(xoBuildLicenceKey(), XOOPS_ROOT_PATH . '/include/license.php', dirname(__FILE__) . '/license.dist.php'); + return xoPutLicenseKey(xoBuildLicenceKey(), XOOPS_ROOT_PATH . '/include/license.php', __DIR__ . '/license.dist.php'); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/object.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/object.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/object.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -880,7 +880,7 @@ } $loaded = 1; - $path = empty($this->plugin_path) ? dirname(__FILE__) . '/filters' : $this->plugin_path; + $path = empty($this->plugin_path) ? __DIR__ . '/filters' : $this->plugin_path; if (file_exists($file = $path . '/filter.php')) { include_once $file; foreach ($this->_filters as $f) { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/lostpass.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/lostpass.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/lostpass.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -16,7 +16,7 @@ * @version $Id$ */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include __DIR__ . DIRECTORY_SEPARATOR . 'mainfile.php'; $xoopsPreload =& XoopsPreload::getInstance(); $xoopsPreload->triggerEvent('core.lostpass.start'); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/misc.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/misc.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/misc.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -16,7 +16,7 @@ * @version $Id$ */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include __DIR__ . DIRECTORY_SEPARATOR . 'mainfile.php'; xoops_loadLanguage('misc'); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -17,9 +17,9 @@ * @version $Id $ **/ -include_once dirname(__FILE__) . '/../../../include/cp_header.php'; +include_once __DIR__ . '/../../../include/cp_header.php'; include '../../../class/xoopsformloader.php'; -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/admin_header.php'; xoops_cp_header(); $aboutAdmin = new ModuleAdmin(); @@ -27,5 +27,5 @@ echo $aboutAdmin->addNavigation('about.php'); echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false); -include_once dirname(__FILE__) . '/admin_footer.php'; +include_once __DIR__ . '/admin_footer.php'; //xoops_cp_footer(); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -17,7 +17,7 @@ * @version $Id$ */ -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/admin_header.php'; xoops_cp_header(); $indexAdmin = new ModuleAdmin(); @@ -25,5 +25,5 @@ echo $indexAdmin->addNavigation('admin.php'); echo $indexAdmin->renderIndex(); -include_once dirname(__FILE__) . '/admin_footer.php'; +include_once __DIR__ . '/admin_footer.php'; //xoops_cp_footer(); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin_header.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin_header.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin_header.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -18,7 +18,7 @@ */ -$path = dirname(dirname(dirname(dirname(__FILE__)))); +$path = dirname(dirname(dirname(__DIR__))); include_once $path . '/mainfile.php'; include_once $path . '/include/cp_functions.php'; require_once $path . '/include/cp_header.php'; @@ -28,7 +28,7 @@ $thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname'); //if functions.php file exist -//require_once dirname(dirname(__FILE__)) . '/include/functions.php'; +//require_once dirname(__DIR__) . '/include/functions.php'; // Load language files xoops_loadLanguage('admin', $thisModuleDir); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/menu.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/menu.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/menu.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -19,10 +19,10 @@ // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); -$path = dirname(dirname(dirname(dirname(__FILE__)))); +$path = dirname(dirname(dirname(__DIR__))); include_once $path . '/mainfile.php'; -$dirname = basename(dirname(dirname(__FILE__))); +$dirname = basename(dirname(__DIR__)); $module_handler = xoops_gethandler('module'); $module = $module_handler->getByDirname($dirname); $pathIcon32 = $module->getInfo('icons32'); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/prune.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/prune.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/prune.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -17,7 +17,7 @@ * @author Taiwen Jiang <ph...@us...> * @version $Id$ */ -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/admin_header.php'; xoops_cp_header(); $indexAdmin = new ModuleAdmin(); @@ -84,5 +84,5 @@ redirect_header('admin.php', 2, sprintf(_PM_AM_MESSAGESPRUNED, $deletedrows)); break; } -include_once dirname(__FILE__) . '/admin_footer.php'; +include_once __DIR__ . '/admin_footer.php'; //xoops_cp_footer(); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/include/update.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/include/update.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/include/update.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -17,7 +17,7 @@ * @version $Id$ */ -$path = dirname(dirname(dirname(dirname(__FILE__)))); +$path = dirname(dirname(dirname(__DIR__))); require_once $path . DIRECTORY_SEPARATOR . 'include' . DIRECTORY_SEPARATOR . 'cp_header.php'; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/pmlite.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/pmlite.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/pmlite.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -19,7 +19,7 @@ */ if (!defined('XOOPS_MAINFILE_INCLUDED')) { - include_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'mainfile.php'; + include_once dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'mainfile.php'; } else { chdir(XOOPS_ROOT_PATH . '/modules/pm/'); xoops_loadLanguage('main', 'pm'); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/readpmsg.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/readpmsg.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/readpmsg.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -18,7 +18,7 @@ * @version $Id$ */ -include_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include_once dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'mainfile.php'; if (!is_object($GLOBALS['xoopsUser'])) { redirect_header(XOOPS_URL, 3, _NOPERM); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/viewpmsg.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/viewpmsg.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/viewpmsg.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -18,7 +18,7 @@ * @version $Id$ */ -include_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include_once dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'mainfile.php'; if (!is_object($GLOBALS['xoopsUser'])) { redirect_header(XOOPS_URL, 3, _NOPERM); @@ -44,7 +44,7 @@ } else { $clean_msg_id = json_decode($_POST['msg_id'], true, 2); if (!empty($clean_msg_id)) { - $clean_msg_id = array_map("intval", $clean_msg_id); + $clean_msg_id = array_map("intval", (array) $clean_msg_id); } $size = count($clean_msg_id); $msg =& $clean_msg_id; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/activate.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/activate.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/activate.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -19,7 +19,7 @@ */ $xoopsOption['pagetype'] = "user"; -include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'header.php'; +include __DIR__ . DIRECTORY_SEPARATOR . 'header.php'; include $GLOBALS['xoops']->path('header.php'); if (!empty($_GET['id']) && !empty($_GET['actkey'])) { @@ -62,7 +62,7 @@ } else { printf(_US_ACTVMAILOK, $thisuser->getVar('uname') ); } - include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'footer.php'; + include __DIR__ . DIRECTORY_SEPARATOR . 'footer.php'; } else { redirect_header(XOOPS_URL . '/user.php', 5, _US_ACTLOGIN, false); } @@ -106,4 +106,4 @@ } $xoBreadcrumbs[] = array('title' => _PROFILE_MA_REGISTER); -include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'footer.php'; +include __DIR__ . DIRECTORY_SEPARATOR . 'footer.php'; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/about.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/about.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/about.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -17,8 +17,8 @@ * @version $Id $ **/ -include_once dirname(__FILE__) . '/../../../include/cp_header.php'; -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/../../../include/cp_header.php'; +include_once __DIR__ . '/admin_header.php'; xoops_cp_header(); $module_info =& $module_handler->get($xoopsModule->getVar("mid")); @@ -28,4 +28,4 @@ echo $aboutAdmin->addNavigation('about.php'); echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false); -include_once dirname(__FILE__) . '/admin_footer.php'; +include_once __DIR__ . '/admin_footer.php'; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/admin_header.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/admin_header.php 2014-06-28 21:02:47 UTC (rev 12662) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/admin_header.php 2014-06-29 01:44:58 UTC (rev 12663) @@ -17,7 +17,7 @@ * @version $Id$ */ -$path = dirname(dirname(dirname(dirname(__FILE__)))); +$path = dirname(dirname(dirname(__DIR__))); include_once $path . '/mainfile.php'; include_once $path . '/include/cp_functions.php'; require_once $path . '/include/cp_header.php'; @@ -27,7 +27,7 @@ $thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname'); //if functions.php file exis... [truncated message content] |
From: <be...@us...> - 2014-06-29 03:11:58
|
Revision: 12664 http://sourceforge.net/p/xoops/svn/12664 Author: beckmi Date: 2014-06-29 03:11:49 +0000 (Sun, 29 Jun 2014) Log Message: ----------- replaced "dirname(__FILE__)" with "__DIR__" (part 2) Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/readme.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/soundcloud/soundcloud.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/dhtmltextarea.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/about.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/admin_menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/advisory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/center.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/prefix_manager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/blocks/blocks.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/module_icon.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/mytrustdirname.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification_update.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/oninstall.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onuninstall.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onupdate.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/jquery.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpThumb.config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/mymenu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/blocks.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/class/gtickets.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/include/install_extramodcheck.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/main.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.3.0-to-2.3.1/index.php Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/readme.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/readme.txt 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/readme.txt 2014-06-29 03:11:49 UTC (rev 12664) @@ -51,7 +51,7 @@ function decode($text) { // Load config data if any - $config = parent::loadConfig( __DIR__ ); + $config = parent::loadConfig(__DIR__); if ( empty($text) || empty($config['enabled']) ) return $text; $ret = someFunctionToConvertTheTextToDefinedFormat($text); return $ret; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/soundcloud/soundcloud.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/soundcloud/soundcloud.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/soundcloud/soundcloud.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -12,7 +12,7 @@ */ public function encode($textarea_id) { - $config = parent::loadConfig( __DIR__ ); + $config = parent::loadConfig(__DIR__); $code = "<img src='{$this->image_path}/soundcloud.png' alt='" . _XOOPS_FORM_ALT_SOUNDCLOUD . "' title='" . _XOOPS_FORM_ALT_SOUNDCLOUD . "' '" Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -27,7 +27,7 @@ */ function encode($textarea_id) { - $config = parent::loadConfig( __DIR__ ); + $config = parent::loadConfig(__DIR__); $code = "<img src='{$this->image_path}/youtube.gif' alt='" . _XOOPS_FORM_ALTYOUTUBE . "' title='" . _XOOPS_FORM_ALTYOUTUBE . "' '" . "' onclick='xoopsCodeYoutube(\"{$textarea_id}\",\"" . htmlspecialchars(_XOOPS_FORM_ENTERYOUTUBEURL, ENT_QUOTES) . "\",\"" . htmlspecialchars(_XOOPS_FORM_ALT_ENTERHEIGHT, ENT_QUOTES) Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/dhtmltextarea.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/dhtmltextarea.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/dhtmltextarea.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -48,7 +48,7 @@ function __construct($options = array()) { parent::__construct( $options ); - $this->rootPath = '/class/xoopseditor/' . basename( dirname( __FILE__ ) ); + $this->rootPath = '/class/xoopseditor/' . basename(__DIR__); $hiddenText = isset( $this->configs['hiddenText'] ) ? $this->configs['hiddenText'] : $this->_hiddenText; xoops_load('XoopsFormDhtmlTextArea'); $this->renderer = new XoopsFormDhtmlTextArea( '', $this->getName(), $this->getValue(), $this->getRows(), $this->getCols(), $hiddenText, $this->configs ); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -18,7 +18,7 @@ **/ include_once __DIR__ . '/../../../include/cp_header.php'; -include '../../../class/xoopsformloader.php'; +include_once __DIR__ . '/../../../class/xoopsformloader.php'; include_once __DIR__ . '/admin_header.php'; xoops_cp_header(); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/about.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/about.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/about.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -3,8 +3,8 @@ require '../../../mainfile.php' ; if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ; -$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ; -$mydirpath = dirname( dirname( __FILE__ ) ) ; +$mydirname = basename( dirname(__DIR__) ) ; +$mydirpath = dirname(__DIR__) ; require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin/about.php' ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/admin_menu.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/admin_menu.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/admin_menu.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -2,8 +2,8 @@ if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ; -$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ; -$mydirpath = dirname( dirname( __FILE__ ) ) ; +$mydirname = basename( dirname(__DIR__) ) ; +$mydirpath = dirname(__DIR__) ; require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin_menu.php' ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/advisory.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/advisory.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/advisory.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -3,8 +3,8 @@ require '../../../mainfile.php' ; if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ; -$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ; -$mydirpath = dirname( dirname( __FILE__ ) ) ; +$mydirname = basename( dirname(__DIR__) ) ; +$mydirpath = dirname(__DIR__) ; require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin/advisory.php' ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/center.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/center.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/center.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -3,8 +3,8 @@ require '../../../mainfile.php' ; if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ; -$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ; -$mydirpath = dirname( dirname( __FILE__ ) ) ; +$mydirname = basename( dirname(__DIR__) ) ; +$mydirpath = dirname(__DIR__) ; require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname //require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin.php' ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/index.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/index.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/index.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -3,8 +3,8 @@ require '../../../mainfile.php' ; if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ; -$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ; -$mydirpath = dirname( dirname( __FILE__ ) ) ; +$mydirname = basename( dirname(__DIR__) ) ; +$mydirpath = dirname(__DIR__) ; require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin/index.php' ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/prefix_manager.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/prefix_manager.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/prefix_manager.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -3,8 +3,8 @@ require '../../../mainfile.php' ; if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ; -$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ; -$mydirpath = dirname( dirname( __FILE__ ) ) ; +$mydirname = basename( dirname(__DIR__) ) ; +$mydirpath = dirname(__DIR__) ; require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin/prefix_manager.php' ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/blocks/blocks.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/blocks/blocks.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/blocks/blocks.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -2,8 +2,8 @@ if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ; -$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ; -$mydirpath = dirname( dirname( __FILE__ ) ) ; +$mydirname = basename( dirname( __DIR__ ) ) ; +$mydirpath = dirname(__DIR__) ; require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/blocks.php' ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/index.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/index.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/index.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -3,8 +3,8 @@ require '../../mainfile.php' ; if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ; -$mydirname = basename( dirname( __FILE__ ) ) ; -$mydirpath = dirname( __FILE__ ) ; +$mydirname = basename(__DIR__) ; +$mydirpath = __DIR__ ; require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname if( @$_GET['mode'] == 'admin' ) { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/module_icon.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/module_icon.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/module_icon.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -5,8 +5,8 @@ if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ; -$mydirname = basename( dirname( __FILE__ ) ) ; -$mydirpath = dirname( __FILE__ ) ; +$mydirname = basename(__DIR__) ; +$mydirpath = __DIR__ ; require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/module_icon.php' ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/mytrustdirname.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/mytrustdirname.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/mytrustdirname.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -6,7 +6,7 @@ include_once XOOPS_TRUST_PATH . '/modules/' . $mytrustdirname . '/class/registry.php'; $registry =& ProtectorRegistry::getInstance(); -$registry->setEntry('mydirname', basename(dirname( __FILE__ ))); -$registry->setEntry('mydirpath', dirname( __FILE__ )); +$registry->setEntry('mydirname', basename(__DIR__)); +$registry->setEntry('mydirpath', __DIR__); $registry->setEntry('mytrustdirname', $mytrustdirname); $registry->setEntry('language', empty($xoopsConfig['language']) ? "english" : $xoopsConfig['language']); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -2,8 +2,8 @@ if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ; -$mydirname = basename( dirname( __FILE__ ) ) ; -$mydirpath = dirname( __FILE__ ) ; +$mydirname = basename(__DIR__) ; +$mydirpath = __DIR__ ; require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/notification.php' ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification_update.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification_update.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification_update.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -2,8 +2,8 @@ require '../../mainfile.php' ; if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ; -$mydirname = basename( dirname( __FILE__ ) ) ; -$mydirpath = dirname( __FILE__ ) ; +$mydirname = basename(__DIR__) ; +$mydirpath = __DIR__ ; $mydirurl = XOOPS_URL.'/modules/'.$mydirname; require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/oninstall.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/oninstall.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/oninstall.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -2,8 +2,8 @@ if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ; -$mydirname = basename( dirname( __FILE__ ) ) ; -$mydirpath = dirname( __FILE__ ) ; +$mydirname = basename(__DIR__) ; +$mydirpath = __DIR__ ; require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/oninstall.php' ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onuninstall.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onuninstall.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onuninstall.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -2,8 +2,8 @@ if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ; -$mydirname = basename( dirname( __FILE__ ) ) ; -$mydirpath = dirname( __FILE__ ) ; +$mydirname = basename(__DIR__) ; +$mydirpath = __DIR__ ; require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/onuninstall.php' ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onupdate.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onupdate.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onupdate.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -2,8 +2,8 @@ if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ; -$mydirname = basename( dirname( __FILE__ ) ) ; -$mydirpath = dirname( __FILE__ ) ; +$mydirname = basename(__DIR__) ; +$mydirpath = __DIR__ ; require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/onupdate.php' ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/search.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/search.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/search.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -2,8 +2,8 @@ if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ; -$mydirname = basename( dirname( __FILE__ ) ) ; -$mydirpath = dirname( __FILE__ ) ; +$mydirname = basename(__DIR__) ; +$mydirpath = __DIR__ ; require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/search.php' ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/xoops_version.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/xoops_version.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -2,8 +2,8 @@ if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ; -$mydirname = basename( dirname( __FILE__ ) ) ; -$mydirpath = dirname( __FILE__ ) ; +$mydirname = basename(__DIR__) ; +$mydirpath = __DIR__ ; require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/xoops_version.php' ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/jquery.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/jquery.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/jquery.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -17,7 +17,7 @@ * @version $Id$ */ -include dirname( dirname( dirname( __FILE__ ) ) ) . '/header.php'; +include dirname( dirname(__DIR__) ) . '/header.php'; // defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpThumb.config.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpThumb.config.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpThumb.config.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -9,7 +9,7 @@ // THIS CONFIG FILE ONLY APPLIES TO phpThumb.php // // /// ////////////////////////////////////////////////////////////// -require dirname( dirname( dirname( __FILE__ ) ) ) . '/header.php'; +require dirname( dirname(__DIR__) ) . '/header.php'; ob_start(); if (!file_exists(__DIR__.'/phpthumb.functions.php') || !include_once(__DIR__.'/phpthumb.functions.php')) { ob_end_flush(); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -9,9 +9,9 @@ ////////////////////////////////////////////////////////////// ob_start(); -if (!include_once(__DIR__.'/phpthumb.functions.php')) { +if (!include_once(__DIR__ . '/phpthumb.functions.php')) { ob_end_flush(); - die('failed to include_once("'.realpath(__DIR__.'/phpthumb.functions.php').'")'); + die('failed to include_once("'.realpath(__DIR__ . '/phpthumb.functions.php').'")'); } ob_end_clean(); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/header.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/header.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/header.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -15,7 +15,7 @@ */ // Include XOOPS control panel header -include_once dirname( dirname( dirname( __FILE__ ) ) ) . '/include/cp_header.php'; +include_once dirname( dirname(__DIR__) ) . '/include/cp_header.php'; // Check user rights if (is_object($xoopsUser)) { $admintest = 0; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/mymenu.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/mymenu.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/mymenu.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -3,7 +3,7 @@ if( defined( 'XOOPS_ORETEKI' ) ) return ; global $xoopsModule; -$mydirpath = dirname( dirname( __FILE__ ) ) ; +$mydirpath = dirname(__DIR__) ; if( ! is_object( $xoopsModule ) ) die( '$xoopsModule is not set' ) ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -8,8 +8,8 @@ $language = $registry->getEntry('language'); // end hack by Trabis -$mytrustdirname = basename( dirname( __FILE__ ) ) ; -$mytrustdirpath = dirname( __FILE__ ) ; +$mytrustdirname = basename(__DIR__) ; +$mytrustdirpath = __DIR__ ; // environment require_once XOOPS_ROOT_PATH.'/class/template.php' ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/blocks.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/blocks.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/blocks.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -8,8 +8,8 @@ $language = $registry->getEntry('language'); // end hack by Trabis -$mytrustdirname = basename( dirname( __FILE__ ) ) ; -$mytrustdirpath = dirname( __FILE__ ) ; +$mytrustdirname = basename(__DIR__) ; +$mytrustdirpath = __DIR__ ; // language files //$language = empty( $GLOBALS['xoopsConfig']['language'] ) ? 'english' : $GLOBALS['xoopsConfig']['language'] ; //hack by Trabis Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/class/gtickets.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/class/gtickets.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/class/gtickets.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -19,8 +19,8 @@ // language file if ( defined( 'XOOPS_ROOT_PATH' ) && ! empty( $xoopsConfig['language'] ) && ! strstr( $xoopsConfig['language'] , '/' ) ) { - if ( file_exists( dirname( dirname( __FILE__ ) ) . '/language/' . $xoopsConfig['language'] . '/gticket_messages.phtml' ) ) { - include dirname( dirname( __FILE__ ) ) . '/language/' . $xoopsConfig['language'] . '/gticket_messages.phtml' ; + if ( file_exists( dirname(__DIR__) . '/language/' . $xoopsConfig['language'] . '/gticket_messages.phtml' ) ) { + include dirname(__DIR__) . '/language/' . $xoopsConfig['language'] . '/gticket_messages.phtml' ; } } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/include/install_extramodcheck.inc.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/include/install_extramodcheck.inc.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/include/install_extramodcheck.inc.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -8,5 +8,5 @@ */ function get_writeoks_from_protector( $xoops_root_path , $mytrustdirname ) { - return array( dirname(dirname( __FILE__ )) . '/configs' ) ; + return array( __DIR__ . '/configs' ) ; } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/main.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/main.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -8,8 +8,8 @@ $language = $registry->getEntry('language'); // end hack by Trabis -$mytrustdirname = basename( dirname( __FILE__ ) ) ; -$mytrustdirpath = dirname( __FILE__ ) ; +$mytrustdirname = basename(__DIR__) ; +$mytrustdirpath = __DIR__ ; // check permission of 'module_read' of this module // (already checked by common.php) Modified: XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/index.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/index.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/index.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -179,7 +179,7 @@ { $allowWebChanges = $GLOBALS['xoopsDB']->allowWebChanges; $GLOBALS['xoopsDB']->allowWebChanges = true; - $result = $GLOBALS['xoopsDB']->queryFromFile( __DIR__ . "/mysql.structure.sql" ); + $result = $GLOBALS['xoopsDB']->queryFromFile(__DIR__ . "/mysql.structure.sql" ); $GLOBALS['xoopsDB']->allowWebChanges = $allowWebChanges; return $result; Modified: XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.3.0-to-2.3.1/index.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.3.0-to-2.3.1/index.php 2014-06-29 01:44:58 UTC (rev 12663) +++ XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.3.0-to-2.3.1/index.php 2014-06-29 03:11:49 UTC (rev 12664) @@ -72,7 +72,7 @@ { $allowWebChanges = $GLOBALS['xoopsDB']->allowWebChanges; $GLOBALS['xoopsDB']->allowWebChanges = true; - $result = $GLOBALS['xoopsDB']->queryFromFile( __DIR__ . "/mysql.structure.sql" ); + $result = $GLOBALS['xoopsDB']->queryFromFile(__DIR__ . "/mysql.structure.sql" ); $GLOBALS['xoopsDB']->allowWebChanges = $allowWebChanges; return $result; } |
From: <be...@us...> - 2014-06-30 10:02:16
|
Revision: 12666 http://sourceforge.net/p/xoops/svn/12666 Author: beckmi Date: 2014-06-30 10:02:07 +0000 (Mon, 30 Jun 2014) Log Message: ----------- normalizing copyright notice Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/jquery.php XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/main.php XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/language/english/admin/filemanager.php XoopsCore/branches/2.5.x/2.5.8/extras/mysqli/mysqldatabase.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.cache.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.ini.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.locale.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/object.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoopsart.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/language/english/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/backend.php XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php XoopsCore/branches/2.5.x/2.5.8/htdocs/browse.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ads.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ldap.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_provisionning.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_xoops.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/authfactory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/apc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/file.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/memcache.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/model.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xcache.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xoopscache.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/config.image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/config.recaptcha.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/config.text.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/image/scripts/image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/recaptcha.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/text.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/xoopscaptcha.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/commentrenderer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/criteria.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/database/database.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/database/databasefactory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/database/mysqldatabase.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/database/sqlutility.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/downloader.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/errorhandler.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/file/file.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/file/folder.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/file/xoopsfile.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/logger/render.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/logger/xoopslogger.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/logger.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/logger_render.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/xoopsmultimailer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mimetypes.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/joint.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/read.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/stats.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/sync.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/write.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/xoopsmodel.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/module.errorhandler.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/module.textsanitizer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/pagenav.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/preload.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.foreachq.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.includeq.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.xoAdminIcons.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.xoAdminNav.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.xoAppUrl.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.xoImgUrl.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIcons16.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIcons32.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIconsBookmarks.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoMemberInfo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoops_link.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/resource.db.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/tardownloader.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/template.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/censor/censor.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/censor/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/config.custom.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/flash/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/flash/flash.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/iframe/iframe.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/image/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/image/image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/li/li.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/mms/mms.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/mp3/mp3.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/rtsp/rtsp.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/syntaxhighlight/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/textfilter/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/textfilter/textfilter.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/ul/ul.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wiki/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wiki/wiki.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wmp/wmp.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/theme.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/theme_blocks.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/tree.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/uploader.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/userutility.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/utility/xoopsutility.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/bloggerapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/metaweblogapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/movabletypeapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpcapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpcparser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpctag.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xoopsapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rss/xmlrss2parser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/themesetparser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsblock.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopscomments.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/dhtmltextarea.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/editor_registry.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/language/english.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/sampleform.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/textarea/editor_registry.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/textarea/language/english.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/textarea/textarea.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/editor_registry.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/formtinymce.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopscode.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsemotions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsimagemanager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsmlcontent.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsquote.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/language/english.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/settings.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/xoopseditor.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/xoopseditor.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsfilterinput.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/form.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formbutton.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formbuttontray.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formcaptcha.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formcheckbox.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formcolorpicker.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formdatetime.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formdhtmltextarea.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formeditor.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formelement.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formelementtray.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formfile.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formhidden.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formhiddentoken.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formlabel.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formpassword.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formradio.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formradioyn.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselect.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselectcheckgroup.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselectcountry.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselecteditor.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselectgroup.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselectlang.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselectmatchoption.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselecttheme.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselecttimezone.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselectuser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formtext.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formtextarea.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formtextdateselect.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/grouppermform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/simpleform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/tableform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/themeform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsformloader.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopskernel.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopslists.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsload.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopslocal.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsmailer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsmodule.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsobject.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsrequest.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopssecurity.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsstory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopstopic.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopstree.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsuser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/zipdownloader.php XoopsCore/branches/2.5.x/2.5.8/htdocs/edituser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/footer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/imagemanager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/checklogin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_constants.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_delete.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_edit.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_form.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_new.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_post.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_reply.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_view.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/commentform.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/common.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/cp_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/cp_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/defines.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/findusers.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/formdhtmltextarea_preview.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.encoding.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.legacy.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/license.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/mimetypes.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_constants.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_select.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_update.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/old_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/old_theme_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/registerform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/searchform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/site-closed.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/xoops13_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/xoopscodes.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/xoopslocal.php XoopsCore/branches/2.5.x/2.5.8/htdocs/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/class/dbmanager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/class/installwizard.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/class/pathcontroller.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/cleanup.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/css/reset.css XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/common.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/createconfigform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/install_tpl.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/license.dist.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/makedata.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/modulesadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/page.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/language/english/install.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_configsave.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_configsite.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_dbconnection.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_dbsettings.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_end.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_langselect.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_modcheck.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_moduleinstaller.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_pathsettings.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_siteinit.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_start.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_tablescreate.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_tablesfill.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_theme.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/avatar.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/block.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/blockinstance.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/comment.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/configcategory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/configitem.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/configoption.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/group.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/groupperm.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/handlerregistry.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/imagecategory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/imageset.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/imagesetimg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/member.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/module.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/notification.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/object.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/online.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/privmessage.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/session.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/tplfile.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/tplset.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/language/english/formdhtmltextarea.php XoopsCore/branches/2.5.x/2.5.8/htdocs/language/english/locale.php XoopsCore/branches/2.5.x/2.5.8/htdocs/language/english/logger.php XoopsCore/branches/2.5.x/2.5.8/htdocs/language/english/xoopsmailerlocal.php XoopsCore/branches/2.5.x/2.5.8/htdocs/lostpass.php XoopsCore/branches/2.5.x/2.5.8/htdocs/mainfile.dist.php XoopsCore/branches/2.5.x/2.5.8/htdocs/misc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin_footer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/prune.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/class/message.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/include/install.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/include/update.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/pmlite.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/preloads/core.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/preloads/system.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/readpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/viewpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/activate.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/about.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/admin_footer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/admin_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/category.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/field.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/permissions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/step.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/visibility.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/changemail.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/changepass.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/class/category.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/class/field.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/class/profile.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/class/regstep.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/class/visibility.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/edituser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/footer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/include/forms.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/include/install.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/include/update.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/lostpass.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/preloads/core.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/register.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/userinfo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/preloads/core.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/avatars/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/avatars/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/banners/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/banners/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/blocksadmin/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/blocksadmin/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/admin_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/comment_delete.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/comment_edit.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/comment_post.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/groups/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/groups/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/images/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/images/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/mailusers/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/mailusers/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/maintenance/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/maintenance/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/preferences/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/preferences/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/smilies/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/smilies/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/jquery.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/userrank/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/userrank/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/jquery.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/users.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/blocks/system_blocks.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/avatar.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/banner.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/bannerclient.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/bannerfinish.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/block.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/blocklinkmodule.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/breadcrumb.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/cookie.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/cpanel.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/group.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/gui.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/maintenance.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/smilies.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/userrank.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/users.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/constants.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/menu.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/help.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/include/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/include/update.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/js/admin.js XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/js/module.js XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/avatars.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/banners.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/blocksadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/comments.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/images.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/mailusers.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/maintenance.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/preferences.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/smilies.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/tplsets.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/userrank.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/users.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/preloads/core.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/accordion.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/buttonbar.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/choosestyle.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/content.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/dark.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/dashboard.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/footer.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/forms.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/globalnav.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/icons.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/logger.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/orange.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/pagenav.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/reset.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/silver.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/style.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/tablesorter.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/tabs.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/toolbar.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/tooltip.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/default.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/legacy/cp_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/legacy/legacy.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/thadmin/thadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/css/reset.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/css/tooltip.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/zetadigme.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/notifications.php XoopsCore/branches/2.5.x/2.5.8/htdocs/pda.php XoopsCore/branches/2.5.x/2.5.8/htdocs/pmlite.php XoopsCore/branches/2.5.x/2.5.8/htdocs/readpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/register.php XoopsCore/branches/2.5.x/2.5.8/htdocs/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/xo-info.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/baradmin.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/globalnav.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/layout-soup.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/print.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/reset.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/style.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/userbar.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/extras/function.xoMemberInfo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/language/english/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/xo-info.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/class/pagenav.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/blocks/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/class/category.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/class/item.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/item.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/zetagenesis/xo-info.php XoopsCore/branches/2.5.x/2.5.8/htdocs/user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/userinfo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/viewpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xmlrpc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_data/data/secure.dist.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/about.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/admin_footer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/admin_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/abstract.php XoopsCore/branches/2.5.x/2.5.8/upgrade/check_version.php XoopsCore/branches/2.5.x/2.5.8/upgrade/cnt-2.2.x-to-2.3.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/language.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/mainfile.dist.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/pathcontroller.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/settings_db.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/settings_path.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.3.0-to-2.3.1/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.3.3-to-2.4.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.3.3-to-2.4.0/license.dist.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.4.0-to-2.4.1/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.4.0-to-2.4.1/license.dist.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.4.x-to-2.5.0/dbmanager.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.4.x-to-2.5.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.5.4-to-2.5.5/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.5.5-to-2.5.6/index.php Modified: XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/jquery.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/jquery.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/jquery.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -11,7 +11,7 @@ * 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/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Maxime Cointin (AKA Kraven30) * @package system @@ -378,7 +378,7 @@ $form->addElement( new XoopsFormButton( '', 'dir_button', _SUBMIT, 'submit')); echo $form->render(); break; - + //Confirm delete directory case 'filemanager_confirm_delete_directory': $path = system_CleanVars ( $_REQUEST, 'path', '', 'string' ); @@ -388,16 +388,16 @@ // Delete one directory case 'filemanager_delete_directory': $path = system_CleanVars ( $_REQUEST, 'path', '', 'string' ); - + function deltree($dossier){ if(($dir=opendir($dossier))===false) return; - + while($name=readdir($dir)){ if($name==='.' or $name==='..') continue; $full_name=$dossier.'/'.$name; - + if(is_dir($full_name)) deltree($full_name); else unlink($full_name); @@ -406,7 +406,7 @@ @rmdir($dossier); return true; } - + if(deltree($_REQUEST['path'])) { xoops_result(_AM_SYSTEM_FILEMANAGER_DELDIR_OK); } else { @@ -469,4 +469,4 @@ break; } -?> \ No newline at end of file +?> Modified: XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/main.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/main.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -9,7 +9,7 @@ * 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/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Maxime Cointin (AKA Kraven30) * @package system Modified: XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/xoops_version.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/xoops_version.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -9,9 +9,9 @@ * 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/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) - * @author Maxime Cointin (AKA Kraven30) + * @author Maxime Cointin (AKA Kraven30) * @package system * @version $Id$ */ @@ -30,4 +30,4 @@ $modversion['adminpath'] = 'admin.php?fct=filemanager'; $modversion['category'] = XOOPS_SYSTEM_FILEMANAGER; -?> \ No newline at end of file +?> Modified: XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/language/english/admin/filemanager.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/language/english/admin/filemanager.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/language/english/admin/filemanager.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -1,12 +1,12 @@ <?php /** - * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license * _LANGCODE en * _CHARSET UTF-8 * @version $Id$ */ - + //Nav define('_AM_SYSTEM_FILEMANAGER_NAV_MANAGER','File Manager'); define('_AM_SYSTEM_FILEMANAGER_NAV_MAIN','File Manager'); Modified: XoopsCore/branches/2.5.x/2.5.8/extras/mysqli/mysqldatabase.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/extras/mysqli/mysqldatabase.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/extras/mysqli/mysqldatabase.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -9,7 +9,7 @@ * 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/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @package class * @subpackage database @@ -27,7 +27,7 @@ * * @abstract * @author Kazumi Ono <on...@xo...> - * @copyright copyright (c) 2000-2014 XOOPS.org + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @package class * @subpackage database */ @@ -444,7 +444,7 @@ * Safe Connection to a MySQL database. * * @author Kazumi Ono <on...@xo...> - * @copyright copyright (c) 2000-2003 XOOPS.org + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @package kernel * @subpackage database */ @@ -472,7 +472,7 @@ * {@link query()} method for security reasons. * * @author Kazumi Ono <on...@xo...> - * @copyright copyright (c) 2000-2003 XOOPS.org + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @package class * @subpackage database */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.admin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.admin.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.admin.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -2,7 +2,7 @@ /** * Module admin functions * - * @copyright The XOOPS project http://sourceforge.net/projects/xoops/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.cache.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.cache.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.cache.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -2,7 +2,7 @@ /** * Cache handlers * - * @copyright The XOOPS project http://sourceforge.net/projects/xoops/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.config.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.config.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.config.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -2,7 +2,7 @@ /** * Functions handling module configs * - * @copyright The XOOPS project http://sourceforge.net/projects/xoops/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.ini.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.ini.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.ini.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -2,7 +2,7 @@ /** * Initial functions * - * @copyright The XOOPS project http://sourceforge.net/projects/xoops/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.locale.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.locale.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.locale.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -12,7 +12,7 @@ /** * Xoops Localization class * - * @copyright The XOOPS project http://sourceforge.net/projects/xoops/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -2,7 +2,7 @@ /** * common functions * - * @copyright The XOOPS project http://sourceforge.net/projects/xoops/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.user.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.user.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.user.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -2,7 +2,7 @@ /** * user/member handlers * - * @copyright The XOOPS project http://sourceforge.net/projects/xoops/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/object.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/object.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/object.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -4,7 +4,7 @@ * * For backward compatibility * - * @copyright The XOOPS project http://sourceforge.net/projects/xoops/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 @@ -20,7 +20,7 @@ * Art Object * * @author D.J. (phppp) - * @copyright copyright © 2005 XoopsForge.com + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @package module::article * * {@link XoopsObject} @@ -47,7 +47,7 @@ * @package module::article * * @author D.J. (phppp) -* @copyright copyright © 2000 The XOOPS Project +* @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * * {@link XoopsPersistableObjectHandler} * Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoops_version.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoops_version.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -2,7 +2,7 @@ /** * Xoops Frameworks addon: art * - * @copyright The XOOPS project http://sourceforge.net/projects/xoops/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoopsart.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoopsart.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoopsart.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -2,7 +2,7 @@ /** * Xoops Frameworks addon: art * - * @copyright The XOOPS project http://sourceforge.net/projects/xoops/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/language/english/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/language/english/main.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/language/english/main.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * * @copyright Grégory Mage (Aka Mage) + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Grégory Mage (Aka Mage) */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * * @copyright Grégory Mage (Aka Mage) + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Grégory Mage (Aka Mage) */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/xoops_version.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/xoops_version.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * * @copyright Grégory Mage (Aka Mage) + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Grégory Mage (Aka Mage) */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -9,7 +9,7 @@ * 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/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @version $Id$ */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/backend.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/backend.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/backend.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -9,7 +9,7 @@ * 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/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @since 2.0.0 * @version $Id$ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -9,7 +9,7 @@ * 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/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @since 2.0.0 * @author Kazumi Ono <web...@my...> Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/browse.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/browse.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/browse.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -9,7 +9,7 @@ * 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/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @package core * @since 2.4.0 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -9,7 +9,7 @@ * 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/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @package kernel * @subpackage auth @@ -26,7 +26,7 @@ * @subpackage auth * @description Authentification base class * @author Pierre-Eric MENUET <pe...@fr...> - * @copyright copyright (c) 2000-2003 XOOPS.org + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) */ class XoopsAuth { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ads.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ads.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ads.php 2014-06-30 10:02:07 UTC (rev 12666) @@ -9,7 +9,7 @@ * 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/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @package kernel * @subpackage auth @@ -26,7 +26,7 @@ * @subpackage auth * @description Authentification class for Active Directory * @author Pierre-Eric MENUET <pe...@fr...> - * @copyright copyright (c) 2000-2003 XOOPS.org + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) */ include_once $GLOBALS['xoops']->path('class/auth/auth_ldap.php'); @@ -35,7 +35,7 @@ * * @package * @author John - * @copyright Copyright (c) 2009 + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @version $Id$ * @access public */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ldap.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ldap.php 2014-06-29 21:44:03 UTC (rev 12665) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/aut... [truncated message content] |
From: <be...@us...> - 2014-07-13 00:21:34
|
Revision: 12706 http://sourceforge.net/p/xoops/svn/12706 Author: beckmi Date: 2014-07-13 00:21:21 +0000 (Sun, 13 Jul 2014) Log Message: ----------- - updating some copyright notices Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoMemberInfo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoops_link.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/bloggerapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/metaweblogapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/movabletypeapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpcapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpcparser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpctag.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xoopsapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rss/xmlrss2parser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/class/dbmanager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/category.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/avatars/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/avatars/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/banners/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/banners/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/blocksadmin/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/blocksadmin/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/admin_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/comment_delete.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/comment_edit.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/comment_post.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/groups/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/images/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/images/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/mailusers/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/mailusers/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/preferences/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/preferences/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/smilies/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/smilies/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/userrank/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/userrank/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/users.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/blocks/system_blocks.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/constants.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/include/update.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/extras/function.xoMemberInfo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/index.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-07-13 00:21:21 UTC (rev 12706) @@ -4,6 +4,7 @@ NOT RELEASED: Version 2.5.8 Beta 1 =============================== - replaced "dirname(__FILE__)" with "__DIR__" since the min. PHP is now 5.3.7, and __DIR__ is faster (mamba) +- updating some copyright notices =============================== 2014-06-20: Version 2.5.7 Final (Patch) Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoMemberInfo.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoMemberInfo.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoMemberInfo.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id: function.xoMemberInfo.php // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoops_link.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoops_link.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoops_link.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/bloggerapi.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/bloggerapi.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/bloggerapi.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/metaweblogapi.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/metaweblogapi.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/metaweblogapi.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/movabletypeapi.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/movabletypeapi.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/movabletypeapi.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpcapi.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpcapi.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpcapi.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpcparser.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpcparser.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpcparser.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpctag.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpctag.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpctag.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xoopsapi.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xoopsapi.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xoopsapi.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rss/xmlrss2parser.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rss/xmlrss2parser.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rss/xmlrss2parser.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/install/class/dbmanager.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/install/class/dbmanager.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/install/class/dbmanager.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -1,7 +1,7 @@ <?php // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/category.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/category.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/category.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/index.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/index.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/index.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/avatars/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/avatars/main.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/avatars/main.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/avatars/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/avatars/xoops_version.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/avatars/xoops_version.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/banners/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/banners/main.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/banners/main.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/banners/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/banners/xoops_version.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/banners/xoops_version.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/blocksadmin/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/blocksadmin/main.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/blocksadmin/main.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/blocksadmin/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/blocksadmin/xoops_version.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/blocksadmin/xoops_version.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/admin_header.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/admin_header.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/admin_header.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/comment_delete.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/comment_delete.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/comment_delete.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/comment_edit.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/comment_edit.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/comment_edit.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/comment_post.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/comment_post.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/comment_post.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/main.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/main.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/xoops_version.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/xoops_version.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/groups/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/groups/xoops_version.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/groups/xoops_version.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/images/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/images/main.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/images/main.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/images/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/images/xoops_version.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/images/xoops_version.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/mailusers/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/mailusers/main.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/mailusers/main.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/mailusers/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/mailusers/xoops_version.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/mailusers/xoops_version.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/main.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/main.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/xoops_version.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/xoops_version.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/preferences/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/preferences/main.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/preferences/main.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/preferences/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/preferences/xoops_version.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/preferences/xoops_version.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/smilies/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/smilies/main.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/smilies/main.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/smilies/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/smilies/xoops_version.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/smilies/xoops_version.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/main.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/main.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/xoops_version.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/xoops_version.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/userrank/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/userrank/main.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/userrank/main.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/userrank/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/userrank/xoops_version.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/userrank/xoops_version.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/main.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/main.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/users.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/users.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/users.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/xoops_version.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/xoops_version.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/blocks/system_blocks.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/blocks/system_blocks.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/blocks/system_blocks.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/constants.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/constants.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/constants.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/include/update.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/include/update.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/include/update.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/menu.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/menu.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/menu.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/menu.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/menu.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/menu.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/xoops_version.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/xoops_version.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/extras/function.xoMemberInfo.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/extras/function.xoMemberInfo.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/extras/function.xoMemberInfo.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id: function.xoMemberInfo.php // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/index.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/index.php 2014-07-12 20:54:04 UTC (rev 12705) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/index.php 2014-07-13 00:21:21 UTC (rev 12706) @@ -2,7 +2,7 @@ // $Id$ // ------------------------------------------------------------------------ // // XOOPS - PHP Content Management System // -// copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // // <http://www.xoops.org/> // // ------------------------------------------------------------------------ // // This program is free software; you can redistribute it and/or modify // |
From: <be...@us...> - 2014-07-13 00:23:47
|
Revision: 12707 http://sourceforge.net/p/xoops/svn/12707 Author: beckmi Date: 2014-07-13 00:23:40 +0000 (Sun, 13 Jul 2014) Log Message: ----------- fix for Update setting Template import date to 0 Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/main.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-07-13 00:21:21 UTC (rev 12706) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-07-13 00:23:40 UTC (rev 12707) @@ -5,6 +5,7 @@ =============================== - replaced "dirname(__FILE__)" with "__DIR__" since the min. PHP is now 5.3.7, and __DIR__ is faster (mamba) - updating some copyright notices +- fix for Update setting Template import date to 0 (timgno/mamba) =============================== 2014-06-20: Version 2.5.7 Final (Patch) Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/main.php 2014-07-13 00:21:21 UTC (rev 12706) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/main.php 2014-07-13 00:23:40 UTC (rev 12707) @@ -582,7 +582,7 @@ $tplfile = empty($tplfiles) ? $tplfile_handler->create() : $tplfiles[0]; // END irmtfan solve templates duplicate issue $tplfile->setVar('tpl_refid', $newmid); - $tplfile->setVar('tpl_lastimported', 0); +// $tplfile->setVar('tpl_lastimported', 0); $tplfile->setVar('tpl_lastmodified', time()); $tplfile->setVar('tpl_type', $type); $tplfile->setVar('tpl_source', $tpldata, true); @@ -686,7 +686,7 @@ $tplfile_new->setVar('tpl_source', $content, true); $tplfile_new->setVar('tpl_desc', $block['description'], true); $tplfile_new->setVar('tpl_lastmodified', time()); - $tplfile_new->setVar('tpl_lastimported', 0); +// $tplfile_new->setVar('tpl_lastimported', 0); $tplfile_new->setVar( 'tpl_file', $block['template'], |
From: <be...@us...> - 2014-07-13 00:34:43
|
Revision: 12708 http://sourceforge.net/p/xoops/svn/12708 Author: beckmi Date: 2014-07-13 00:34:40 +0000 (Sun, 13 Jul 2014) Log Message: ----------- - Fix issues when protector 'id_forceintval' preference is enabled, that manifests as an error when deleting private messages. Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/viewpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/viewpmsg.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-07-13 00:23:40 UTC (rev 12707) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-07-13 00:34:40 UTC (rev 12708) @@ -5,6 +5,7 @@ =============================== - replaced "dirname(__FILE__)" with "__DIR__" since the min. PHP is now 5.3.7, and __DIR__ is faster (mamba) - updating some copyright notices +- Fix issues when protector 'id_forceintval' preference is enabled, that manifests as an error when deleting private messages. (rgriffith) - fix for Update setting Template import date to 0 (timgno/mamba) =============================== Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/viewpmsg.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/viewpmsg.php 2014-07-13 00:23:40 UTC (rev 12707) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/viewpmsg.php 2014-07-13 00:34:40 UTC (rev 12708) @@ -34,17 +34,17 @@ $start = empty($_REQUEST["start"]) ? 0 : intval($_REQUEST["start"]); $pm_handler =& xoops_getModuleHandler('message'); -if (isset($_POST['delete_messages']) && isset($_POST['msg_id'])) { +if (isset($_POST['delete_messages']) && (isset($_POST['msg_id']) || isset($_POST['msg_ids']))) { if (!$GLOBALS['xoopsSecurity']->check()) { $GLOBALS['xoopsTpl']->assign('errormsg', implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); } else if (empty($_REQUEST['ok'])) { - xoops_confirm(array('ok' => 1, 'delete_messages' => 1, 'op' => $_REQUEST['op'], 'msg_id'=> json_encode(array_map("intval", $_POST['msg_id']))), $_SERVER['REQUEST_URI'], _PM_SURE_TO_DELETE); + xoops_confirm(array('ok' => 1, 'delete_messages' => 1, 'op' => $_REQUEST['op'], 'msg_ids'=> json_encode(array_map("intval", $_POST['msg_id']))), $_SERVER['REQUEST_URI'], _PM_SURE_TO_DELETE); include $GLOBALS['xoops']->path('footer.php'); exit(); } else { - $clean_msg_id = json_decode($_POST['msg_id'], true, 2); + $clean_msg_id = json_decode($_POST['msg_ids'], true, 2); if (!empty($clean_msg_id)) { - $clean_msg_id = array_map("intval", (array) $clean_msg_id); + $clean_msg_id = array_map("intval", $clean_msg_id); } $size = count($clean_msg_id); $msg =& $clean_msg_id; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/viewpmsg.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/viewpmsg.php 2014-07-13 00:23:40 UTC (rev 12707) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/viewpmsg.php 2014-07-13 00:34:40 UTC (rev 12708) @@ -27,17 +27,17 @@ redirect_header("user.php", 2, $errormessage); } else { $pm_handler =& xoops_gethandler('privmessage'); - if (isset($_POST['delete_messages']) && isset($_POST['msg_id'])) { + if (isset($_POST['delete_messages']) && (isset($_POST['msg_id']) || isset($_POST['msg_ids']))) { if (!$GLOBALS['xoopsSecurity']->check()) { echo implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()); exit(); } elseif (empty($_REQUEST['ok'])) { include $GLOBALS['xoops']->path('header.php'); - xoops_confirm(array('ok' => 1, 'delete_messages' => 1, 'msg_id'=> json_encode(array_map("intval", $_POST['msg_id']))), $_SERVER['REQUEST_URI'], _PM_SURE_TO_DELETE); + xoops_confirm(array('ok' => 1, 'delete_messages' => 1, 'msg_ids'=> json_encode(array_map("intval", $_POST['msg_id']))), $_SERVER['REQUEST_URI'], _PM_SURE_TO_DELETE); include $GLOBALS['xoops']->path('footer.php'); exit(); } - $clean_msg_id = json_decode($_POST['msg_id'], true, 2); + $clean_msg_id = json_decode($_POST['msg_ids'], true, 2); if (!empty($clean_msg_id)) { $clean_msg_id = array_map("intval", $clean_msg_id); } |
From: <be...@us...> - 2014-09-14 10:03:12
|
Revision: 12778 http://sourceforge.net/p/xoops/svn/12778 Author: beckmi Date: 2014-09-14 10:03:01 +0000 (Sun, 14 Sep 2014) Log Message: ----------- fixing links to module after its installation Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/lang_diff.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/lang_diff.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/lang_diff.txt 2014-09-08 06:08:43 UTC (rev 12777) +++ XoopsCore/branches/2.5.x/2.5.8/docs/lang_diff.txt 2014-09-14 10:03:01 UTC (rev 12778) @@ -4,6 +4,15 @@ Below are language differences from a version to next version. =============================== +NOT RELEASED: Version 2.5.8 Beta +=============================== +ADDED/DELETED DEFINES + +/install/language/english/install.php +/modules/system/language/english/admin/modulesadmin.php +- added define('_AM_SYSTEM_MODULES_INSTALL_MORE',"Install more modules"); + +=============================== 2014/06/14: Version 2.5.7 Final =============================== ADDED/DELETED DEFINES Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2014-09-08 06:08:43 UTC (rev 12777) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2014-09-14 10:03:01 UTC (rev 12778) @@ -422,24 +422,26 @@ $msgs[] = '</div></div>'; $blocks = $module->getInfo('blocks'); - $msgs[] = '<div class="noininstall center"><a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . '</a> | - <a href="admin.php?fct=modulesadmin&op=installlist">' . _AM_SYSTEM_MODULES_TOINSTALL . '</a> | '; + $redDevider = '<span class="red bold"> | </span>'; + $msgs[] = '<div class="noininstall center"><a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN . $redDevider . ' + </a> <a href="admin.php?fct=modulesadmin&op=installlist">' . _AM_SYSTEM_MODULES_INSTALL_MORE . '</a>'; $msgs[] = '<br /><span class="red bold">' . _AM_SYSTEM_MODULES_MODULE . ' ' . $module->getInfo('name') . ': </span></div>'; + $msg0 = '<div class="center">'; + $msgBlocks = $msgAdmin = $msgTestData = ''; if ($blocks != false) { - $msgs[] = '<div class="center"><a href="admin.php?fct=blocksadmin&op=list&filter=1&selgen=' . $newmid . '&selmod=-2&selgrp=-1&selvis=-1&filsave=1">' . _AM_SYSTEM_BLOCKS . '</a></div>'; - } - ; - $msgs[] = '<div class="noininstall center"><a href="admin.php?fct=preferences&op=showmod&mod=' . $newmid . '">' . _AM_SYSTEM_PREF . '</a>'; - $msgs[] = '<a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/' . $module->getInfo('adminindex') . '">' . _AM_SYSTEM_MODULES_ADMIN . '</a>'; + $msgBlocks = '<a href="admin.php?fct=blocksadmin&op=list&filter=1&selgen=' . $newmid . '&selmod=-2&selgrp=-1&selvis=-1&filsave=1">' . _AM_SYSTEM_BLOCKS . '</a> ' . $redDevider; + }; + $msgAdmin = '<a href="admin.php?fct=preferences&op=showmod&mod=' . $newmid . '">' . _AM_SYSTEM_PREF . '</a> ' . $redDevider . ' + <a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/' . $module->getInfo('adminindex') . '">' . _AM_SYSTEM_MODULES_ADMIN . '</a>'; $testdataDirectory = XOOPS_ROOT_PATH . '/modules/' . $module->getInfo('dirname', 'e') . '/testdata'; if (file_exists($testdataDirectory)) { - $msgs[] = '<a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/testdata/index.php' . '">' . _AM_SYSTEM_MODULES_INSTALL_TESTDATA . '</a></div>'; + $msgTestData = $redDevider . ' <a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/testdata/index.php' . '">' . _AM_SYSTEM_MODULES_INSTALL_TESTDATA . '</a></div>'; } else { - $msgs[] = '</div>'; + $msgTestData = '</div>'; } + $msgs[] = $msg0 . $msgBlocks . $msgAdmin . $msgTestData; - $ret = implode('<br />', $msgs); unset($blocks); unset($msgs); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php 2014-09-08 06:08:43 UTC (rev 12777) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php 2014-09-14 10:03:01 UTC (rev 12778) @@ -167,3 +167,5 @@ </ul>"); // 2.5.7 define('_AM_SYSTEM_MODULES_INSTALL_TESTDATA',"Add Test Data"); +// 2.5.8 +define('_AM_SYSTEM_MODULES_INSTALL_MORE',"Install more modules"); |
From: <be...@us...> - 2014-09-15 03:39:10
|
Revision: 12781 http://sourceforge.net/p/xoops/svn/12781 Author: beckmi Date: 2014-09-15 03:39:05 +0000 (Mon, 15 Sep 2014) Log Message: ----------- allowing for "https" URL in YouTube links in Textsanitizer Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-09-14 10:06:34 UTC (rev 12780) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-09-15 03:39:05 UTC (rev 12781) @@ -8,6 +8,7 @@ - Fix issues when protector 'id_forceintval' preference is enabled, that manifests as an error when deleting private messages. (rgriffith) - fix for Update setting Template import date to 0 (timgno/mamba) - adding Adding language constants for Protector's Prefix Manager (slider84/mamba) +- allowing for "https" URL in YouTube links in Textsanitizer (mamba) =============================== 2014-06-20: Version 2.5.7 Final (Patch) Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php 2014-09-14 10:06:34 UTC (rev 12780) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php 2014-09-15 03:39:05 UTC (rev 12781) @@ -88,7 +88,7 @@ */ static function decode($url, $width, $height) { - if (!preg_match("/^http:\/\/(www\.)?youtube\.com\/watch\?v=(.*)/i", $url, $matches)) { + if (!preg_match("/^http[s]?:\/\/(www\.)?youtube\.com\/watch\?v=(.*)/i", $url, $matches)) { trigger_error("Not matched: {$url} {$width} {$height}", E_USER_WARNING); return ""; |
From: <be...@us...> - 2014-09-21 05:42:04
|
Revision: 12795 http://sourceforge.net/p/xoops/svn/12795 Author: beckmi Date: 2014-09-21 05:41:46 +0000 (Sun, 21 Sep 2014) Log Message: ----------- converting $i++ to ++$i for improved performance Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xcache.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/image/scripts/image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/class.tar.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/commentrenderer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/criteria.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/database/sqlutility.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/class.phpmailer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/write.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/module.textsanitizer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/pagenav.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/preload.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Config_File.class.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.process_cached_inserts.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_cache_file.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_compiled_include.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/block.textformat.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.config_load.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_select_date.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_select_time.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_table.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.mailto.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/modifier.escape.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/outputfilter.trimwhitespace.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoPageNav.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/snoopy.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/tardownloader.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/template.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/bloggerapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/metaweblogapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpctag.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xoopsapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsblock.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopscomments.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/xoopseditor.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsfilterinput.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/form.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formcheckbox.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formdhtmltextarea.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formelementtray.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formradio.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/grouppermform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/imagemanager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_view.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/findusers.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.encoding.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_select.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/old_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/xoopscodes.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/createconfigform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/makedata.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/modulesadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_moduleinstaller.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/configitem.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/object.php XoopsCore/branches/2.5.x/2.5.8/htdocs/misc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/blocksadmin/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/images/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/mailusers/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/preferences/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/blocks/system_blocks.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/block.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/gui.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/maintenance.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpThumb.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.filters.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.gif.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.ico.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.unsharp.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/help.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/class/pagenav.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/class/category.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/class/item.php XoopsCore/branches/2.5.x/2.5.8/htdocs/userinfo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/viewpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/class/ProtectorMysqlDatabase.class.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/class/protector.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Arborize.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrCollections.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Background.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Font.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/FontFamily.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Ident.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/ListStyle.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Multiple.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/Clone.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/Lang.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/URI/Host.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Nofollow.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/TargetBlank.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/List.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Encoder.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Filter/ExtractStyleBlocks.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Generator.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Iframe.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Legacy.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Nofollow.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/TargetBlank.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tidy.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/AutoParagraph.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/Linkify.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/PurifierLinkify.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/RemoveEmpty.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Language.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/LanguageFactory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Lexer/DOMLex.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Lexer/DirectLex.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Lexer/PH5P.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/PercentEncoder.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/FixNesting.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/MakeWellFormed.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Token.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/DisableResources.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/MakeAbsolute.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/SafeIframe.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/data.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/file.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/UnitConverter.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Zipper.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/onuninstall.php XoopsCore/branches/2.5.x/2.5.8/upgrade/cnt-2.2.x-to-2.3.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/language.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.3.3-to-2.4.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.4.0-to-2.4.1/index.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-09-21 05:41:46 UTC (rev 12795) @@ -9,6 +9,7 @@ - fix for Update setting Template import date to 0 (timgno/mamba) - adding Adding language constants for Protector's Prefix Manager (slider84/mamba) - allowing for "https" URL in YouTube links in Textsanitizer (mamba) +- converting $i++ to ++$i for improved performance (mamba) =============================== 2014-06-20: Version 2.5.7 Final (Patch) Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -332,7 +332,7 @@ $iReqVerParts = array_map('intval', $reqVerParts); $icount = $j = count($iReqVerParts); $reqVer = $curVer = 0; - for ($i=0; $i<$icount; $i++) { + for ($i=0; $i<$icount; ++$i) { $j--; $reqVer += $iReqVerParts[$i] * pow(10, $j); if (isset($iCurrentVerParts[$i])) { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -97,7 +97,7 @@ if (false != $rss2parser->parse()) { $_items = $rss2parser->getItems(); $count = count($_items); - for ($i = 0; $i < $count; $i ++) { + for ($i = 0; $i < $count; ++$i) { $_items[$i]['title'] = XoopsLocal::convert_encoding($_items[$i]['title'], _CHARSET, 'UTF-8'); $_items[$i]['description'] = XoopsLocal::convert_encoding($_items[$i]['description'], _CHARSET, 'UTF-8'); $items[strval(strtotime($_items[$i]['pubdate'])) . "-" . strval(++$cnt)] = $_items[$i]; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -149,7 +149,7 @@ <td>{$clicks}</td> <td>{$percent}%</td> <td><a href='banners.php?op=EmailStats&cid={$cid}&bid={$bid}' title='" . _BANNERS_STATS . "'>" . _BANNERS_STATS . "</a></td></tr></tbody>"; - $i++; + ++$i; } echo "</table> <br /><br /> Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xcache.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xcache.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xcache.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -134,7 +134,7 @@ { $result = true; $this->__auth(); - for ($i = 0, $max = xcache_count(XC_TYPE_VAR); $i < $max; $i++) { + for ($i = 0, $max = xcache_count(XC_TYPE_VAR); $i < $max; ++$i) { if (!xcache_clear_cache(XC_TYPE_VAR, $i)) { $result = false; break; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/image/scripts/image.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/image/scripts/image.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/image/scripts/image.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -213,8 +213,8 @@ $oImage = imagecreatetruecolor(100, 100); $text_color = imagecolorallocate($oImage, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100)); $FontSize = $this->config["fontsize_max"]; - for ($Angle = -30; $Angle <= 30; $Angle++) { - for ($i = 65; $i <= 90; $i++) { + for ($Angle = -30; $Angle <= 30; ++$Angle) { + for ($i = 65; $i <= 90; ++$i) { $CharDetails = imageftbbox($FontSize, $Angle, $this->font, chr($i), array()); $_MaxCharWidth = abs($CharDetails[0] + $CharDetails[2]); if ($_MaxCharWidth > $MaxCharWidth) { @@ -282,7 +282,7 @@ */ function drawCode() { - for ($i = 0; $i < $this->config["num_chars"] ; $i++) { + for ($i = 0; $i < $this->config["num_chars"] ; ++$i) { // select random greyscale colour $text_color = imagecolorallocate($this->oImage, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100)); @@ -321,7 +321,7 @@ */ function drawCircles() { - for ($i = 1; $i <= $this->config["background_num"]; $i++) { + for ($i = 1; $i <= $this->config["background_num"]; ++$i) { $randomcolor = imagecolorallocate ($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255)); imagefilledellipse($this->oImage, mt_rand(0, $this->width - 10), mt_rand(0, $this->height - 3), mt_rand(10, 20), mt_rand(20, 30), $randomcolor); } @@ -332,7 +332,7 @@ */ function drawLines() { - for ($i = 0; $i < $this->config["background_num"]; $i++) { + for ($i = 0; $i < $this->config["background_num"]; ++$i) { $randomcolor = imagecolorallocate($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255)); imageline($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor); } @@ -343,7 +343,7 @@ */ function drawRectangles() { - for ($i = 1; $i <= $this->config["background_num"]; $i++) { + for ($i = 1; $i <= $this->config["background_num"]; ++$i) { $randomcolor = imagecolorallocate ($this->oImage , mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255)); imagefilledrectangle($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor); } @@ -371,7 +371,7 @@ */ function drawEllipses() { - for ($i = 1; $i <= $this->config["background_num"]; $i++) { + for ($i = 1; $i <= $this->config["background_num"]; ++$i) { $randomcolor = imagecolorallocate ($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255)); imageellipse($this->oImage, mt_rand(0, $this->width), mt_rand(0, $this->height), mt_rand(0, $this->width), mt_rand(0, $this->height), $randomcolor); } @@ -382,10 +382,10 @@ */ function drawPolygons() { - for ($i = 1; $i <= $this->config["background_num"]; $i++) { + for ($i = 1; $i <= $this->config["background_num"]; ++$i) { $randomcolor = imagecolorallocate ($this->oImage, mt_rand(190, 255), mt_rand(190, 255), mt_rand(190, 255)); $coords = array(); - for ($j = 1; $j <= $this->config["polygon_point"]; $j++) { + for ($j = 1; $j <= $this->config["polygon_point"]; ++$j) { $coords[] = mt_rand(0, $this->width); $coords[] = mt_rand(0, $this->height); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/class.tar.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/class.tar.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/class.tar.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -135,10 +135,10 @@ function __computeUnsignedChecksum($bytestring) { $unsigned_chksum = ''; - for ($i = 0; $i < 512; $i++) { + for ($i = 0; $i < 512; ++$i) { $unsigned_chksum += ord($bytestring[$i]); } - for ($i = 0; $i < 8; $i++) { + for ($i = 0; $i < 8; ++$i) { $unsigned_chksum -= ord($bytestring[148 + $i]); $unsigned_chksum += ord(' ') * 8; } @@ -316,7 +316,7 @@ $header .= str_repeat(chr(0), 12); // Compute header checksum $checksum = str_pad(decoct($this->__computeUnsignedChecksum($header)), 6, "0", STR_PAD_LEFT); - for ($i = 0; $i < 6; $i ++) { + for ($i = 0; $i < 6; ++$i) { $header[(148 + $i)] = substr($checksum, $i, 1); } $header[154] = chr(0); @@ -351,7 +351,7 @@ $header .= str_repeat(chr(0), 12); // Compute header checksum $checksum = str_pad(decoct($this->__computeUnsignedChecksum($header)), 6, "0", STR_PAD_LEFT); - for ($i = 0; $i < 6; $i++) { + for ($i = 0; $i < 6; ++$i) { $header[(148 + $i)] = substr($checksum, $i, 1); } $header[154] = chr(0); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/commentrenderer.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/commentrenderer.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/commentrenderer.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -99,7 +99,7 @@ function renderFlatView($admin_view = false) { $count = count($this->_comments); - for ($i = 0; $i < $count; $i++) { + for ($i = 0; $i < $count; ++$i) { if (false != $this->_useIcons) { $title = $this->_getTitleIcon($this->_comments[$i]->getVar('com_icon')) . ' ' . $this->_comments[$i]->getVar('com_title'); } else { @@ -219,7 +219,7 @@ $current_prefix .= $prefix; } if (isset($thread[$key]['child']) && ! empty($thread[$key]['child'])) { - $depth++; + ++$depth; foreach ($thread[$key]['child'] as $childkey) { if (!$admin_view && $thread[$childkey]['obj']->getVar('com_status') != XOOPS_COMMENT_ACTIVE) { // skip this comment if it is not active and continue on processing its child comments instead @@ -311,7 +311,7 @@ $prefix = $prefix + 25; } if (isset($thread[$key]['child']) && ! empty($thread[$key]['child'])) { - $depth++; + ++$depth; foreach ($thread[$key]['child'] as $childkey) { if (!$admin_view && $thread[$childkey]['obj']->getVar('com_status') != XOOPS_COMMENT_ACTIVE) { // skip this comment if it is not active and continue on processing its child comments instead Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/criteria.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/criteria.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/criteria.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -235,7 +235,7 @@ $count = count($this->criteriaElements); if ($count > 0) { $render_string = $this->criteriaElements[0]->render(); - for ($i = 1; $i < $count; $i++) { + for ($i = 1; $i < $count; ++$i) { if (!$render = $this->criteriaElements[$i]->render()) continue; $render_string .= (empty($render_string) ? "" : ' ' . $this->conditions[$i] . ' ') . $render; @@ -271,7 +271,7 @@ $count = count($this->criteriaElements); if ($count > 0) { $retval = $this->criteriaElements[0]->renderLdap(); - for ($i = 1; $i < $count; $i++) { + for ($i = 1; $i < $count; ++$i) { $cond = strtoupper($this->conditions[$i]); $op = ($cond == "OR") ? "|" : "&"; $retval = "({$op}{$retval}" . $this->criteriaElements[$i]->renderLdap() . ")"; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/database/sqlutility.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/database/sqlutility.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/database/sqlutility.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -78,7 +78,7 @@ $escaped_backslash = false; while ($i - $j > 0 && $sql[$i - $j] == '\\') { $escaped_backslash = !$escaped_backslash; - $j++; + ++$j; } // ... if escaped backslashes: it's really the // end of the string -> exit the loop @@ -89,7 +89,7 @@ } // ... else loop else { - $i++; + ++$i; } } // end if...elseif...else } // end for Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/class.phpmailer.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/class.phpmailer.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/class.phpmailer.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -969,7 +969,7 @@ } } } - $index++; + ++$index; if (!$connection) { throw new phpmailerException($this->Lang('connect_host')); } @@ -1112,10 +1112,10 @@ $line = explode($this->LE, $message); $message = ''; - for ($i = 0 ;$i < count($line); $i++) { + for ($i = 0 ;$i < count($line); ++$i) { $line_part = explode(' ', $line[$i]); $buf = ''; - for ($e = 0; $e<count($line_part); $e++) { + for ($e = 0; $e<count($line_part); ++$e) { $word = $line_part[$e]; if ($qp_mode and (strlen($word) > $length)) { $space_left = $length - strlen($buf) - 1; @@ -1318,7 +1318,7 @@ } // Add custom headers - for ($index = 0; $index < count($this->CustomHeader); $index++) { + for ($index = 0; $index < count($this->CustomHeader); ++$index) { $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1]))); } if (!$this->sign_key_file) { @@ -1918,7 +1918,7 @@ $offset = $avgLength - $lookBack; $chunk = mb_substr($str, $i, $offset, $this->CharSet); $chunk = base64_encode($chunk); - $lookBack++; + ++$lookBack; } while (strlen($chunk) > $length); $encoded .= $chunk . $this->LE; @@ -1950,7 +1950,7 @@ while ( list(, $line) = each($lines) ) { $linlen = strlen($line); $newline = ''; - for ($i = 0; $i < $linlen; $i++) { + for ($i = 0; $i < $linlen; ++$i) { $c = substr( $line, $i, 1 ); $dec = ord( $c ); if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E @@ -2593,7 +2593,7 @@ { $tmp = ''; $line = ''; - for ($i = 0; $i < strlen($txt); $i++) { + for ($i = 0; $i < strlen($txt); ++$i) { $ord = ord($txt[$i]); if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) { $line .= $txt[$i]; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/write.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/write.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/write.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -331,7 +331,7 @@ { if (is_array($this->handler->keyName)) { $clause = array(); - for ($i = 0; $i < count($this->handler->keyName); $i++) { + for ($i = 0; $i < count($this->handler->keyName); ++$i) { $clause[] = "`" . $this->handler->keyName[$i] . "` = " . $this->handler->db->quote($object->getVar($this->handler->keyName[$i])); } $whereclause = implode(" AND ", $clause); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/module.textsanitizer.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/module.textsanitizer.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/module.textsanitizer.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -445,7 +445,7 @@ //------------------------------------------------------------------------------- $count = sizeof($this->callbackPatterns); - for ($i = 0; $i < $count; $i++) { + for ($i = 0; $i < $count; ++$i) { $text = preg_replace_callback($this->callbackPatterns[$i], $this->callbacks[$i] , $text); } //------------------------------------------------------------------------------ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/pagenav.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/pagenav.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/pagenav.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -92,7 +92,7 @@ $ret .= '... '; } } - $counter ++; + ++$counter; } $next = $this->current + $this->perpage; if ($this->total > $next) { @@ -129,7 +129,7 @@ } else { $ret .= '<option value="' . $this->url . (($counter - 1) * $this->perpage) . $this->extra . '">' . $counter . '</option>'; } - $counter ++; + ++$counter; } $ret .= '</select>'; if ($showbutton) { @@ -176,7 +176,7 @@ $ret .= '<td class="paginact">...</td>'; } } - $counter ++; + ++$counter; } $next = $this->current + $this->perpage; if ($this->total > $next) { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/preload.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/preload.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/preload.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -92,7 +92,7 @@ $file = substr($file, 0, -4); $this->_preloads[$i]['module'] = $module; $this->_preloads[$i]['file'] = $file; - $i++; + ++$i; } } } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Config_File.class.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Config_File.class.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Config_File.class.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -290,7 +290,7 @@ /* parse file line by line */ preg_match_all('!^.*\r?\n?!m', $contents, $match); $lines = $match[0]; - for ($i=0, $count=count($lines); $i<$count; $i++) { + for ($i=0, $count=count($lines); $i<$count; ++$i) { $line = $lines[$i]; if (empty($line)) continue; @@ -324,7 +324,7 @@ $var_value = ''; while ($i<$count) { if (($pos = strpos($lines[$i], '"""')) === false) { - $var_value .= $lines[$i++]; + $var_value .= $lines[++$i]; } else { /* end of multiline-value */ $var_value .= substr($lines[$i], 0, $pos); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -276,17 +276,17 @@ $text_blocks = preg_split("~{$ldq}.*?{$rdq}~s", $source_content); /* loop through text blocks */ - for ($curr_tb = 0, $for_max = count($text_blocks); $curr_tb < $for_max; $curr_tb++) { + for ($curr_tb = 0, $for_max = count($text_blocks); $curr_tb < $for_max; ++$curr_tb) { /* match anything resembling php tags */ if (preg_match_all('~(<\?(?:\w+|=)?|\?>|language\s*=\s*[\"\']?\s*php\s*[\"\']?)~is', $text_blocks[$curr_tb], $sp_match)) { /* replace tags with placeholders to prevent recursive replacements */ $sp_match[1] = array_unique($sp_match[1]); usort($sp_match[1], '_smarty_sort_length'); - for ($curr_sp = 0, $for_max2 = count($sp_match[1]); $curr_sp < $for_max2; $curr_sp++) { + for ($curr_sp = 0, $for_max2 = count($sp_match[1]); $curr_sp < $for_max2; ++$curr_sp) { $text_blocks[$curr_tb] = str_replace($sp_match[1][$curr_sp],'%%%SMARTYSP'.$curr_sp.'%%%',$text_blocks[$curr_tb]); } /* process each one */ - for ($curr_sp = 0, $for_max2 = count($sp_match[1]); $curr_sp < $for_max2; $curr_sp++) { + for ($curr_sp = 0, $for_max2 = count($sp_match[1]); $curr_sp < $for_max2; ++$curr_sp) { if ($this->php_handling == SMARTY_PHP_PASSTHRU) { /* echo php contents */ $text_blocks[$curr_tb] = str_replace('%%%SMARTYSP'.$curr_sp.'%%%', '<?php echo \''.str_replace("'", "\'", $sp_match[1][$curr_sp]).'\'; ?>'."\n", $text_blocks[$curr_tb]); @@ -307,7 +307,7 @@ /* Compile the template tags into PHP code. */ $compiled_tags = array(); - for ($i = 0, $for_max = count($template_tags); $i < $for_max; $i++) { + for ($i = 0, $for_max = count($template_tags); $i < $for_max; ++$i) { $this->_current_line_no += substr_count($text_blocks[$i], "\n"); $compiled_tags[] = $this->_compile_tag($template_tags[$i]); $this->_current_line_no += substr_count($template_tags[$i], "\n"); @@ -321,7 +321,7 @@ /* Reformat $text_blocks between 'strip' and '/strip' tags, removing spaces, tabs and newlines. */ $strip = false; - for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; $i++) { + for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; ++$i) { if ($compiled_tags[$i] == '{strip}') { $compiled_tags[$i] = ''; $strip = true; @@ -330,7 +330,7 @@ } if ($strip) { /* strip all $text_blocks before the next '/strip' */ - for ($j = $i + 1; $j < $for_max; $j++) { + for ($j = $i + 1; $j < $for_max; ++$j) { /* remove leading and trailing whitespaces of each line */ $text_blocks[$j] = preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $text_blocks[$j]); if ($compiled_tags[$j] == '{/strip}') { @@ -353,7 +353,7 @@ $tag_guard = '%%%SMARTYOTG' . md5(uniqid(rand(), true)) . '%%%'; /* Interleave the compiled contents and text blocks to get the final result. */ - for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; $i++) { + for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; ++$i) { if ($compiled_tags[$i] == '') { // tag result empty, remove first newline from following text block $text_blocks[$i+1] = preg_replace('~^(\r\n|\r|\n)~', '', $text_blocks[$i+1]); @@ -1279,7 +1279,7 @@ $is_arg_stack = array(); - for ($i = 0; $i < count($tokens); $i++) { + for ($i = 0; $i < count($tokens); ++$i) { $token = &$tokens[$i]; @@ -1474,8 +1474,8 @@ switch ($expr_type) { case 'even': if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by') { - $expr_end++; - $expr_arg = $tokens[$expr_end++]; + ++$expr_end; + $expr_arg = $tokens[++$expr_end]; $expr = "!(1 & ($is_arg / " . $this->_parse_var_props($expr_arg) . "))"; } else $expr = "!(1 & $is_arg)"; @@ -1483,8 +1483,8 @@ case 'odd': if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by') { - $expr_end++; - $expr_arg = $tokens[$expr_end++]; + ++$expr_end; + $expr_arg = $tokens[++$expr_end]; $expr = "(1 & ($is_arg / " . $this->_parse_var_props($expr_arg) . "))"; } else $expr = "(1 & $is_arg)"; @@ -1492,8 +1492,8 @@ case 'div': if (@$tokens[$expr_end] == 'by') { - $expr_end++; - $expr_arg = $tokens[$expr_end++]; + ++$expr_end; + $expr_arg = $tokens[++$expr_end]; $expr = "!($is_arg % " . $this->_parse_var_props($expr_arg) . ")"; } else { $this->_syntax_error("expecting 'by' after 'div'", E_USER_ERROR, __FILE__, __LINE__); @@ -1847,7 +1847,7 @@ $orig_vals = $match = $match[0]; $this->_parse_vars_props($match); $replace = array(); - for ($i = 0, $count = count($match); $i < $count; $i++) { + for ($i = 0, $count = count($match); $i < $count; ++$i) { $replace[$orig_vals[$i]] = $match[$i]; } return strtr($parenth_args, $replace); @@ -1909,7 +1909,7 @@ preg_match_all('~\|(@?\w+)((?>:(?:'. $this->_qstr_regexp . '|[^|]+))*)~', '|' . $modifier_string, $_match); list(, $_modifiers, $modifier_arg_strings) = $_match; - for ($_i = 0, $_for_max = count($_modifiers); $_i < $_for_max; $_i++) { + for ($_i = 0, $_for_max = count($_modifiers); $_i < $_for_max; ++$_i) { $_modifier_name = $_modifiers[$_i]; if($_modifier_name == 'smarty') { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.process_cached_inserts.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.process_cached_inserts.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.process_cached_inserts.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -17,7 +17,7 @@ $params['results'], $match); list($cached_inserts, $insert_args) = $match; - for ($i = 0, $for_max = count($cached_inserts); $i < $for_max; $i++) { + for ($i = 0, $for_max = count($cached_inserts); $i < $for_max; ++$i) { if ($smarty->debugging) { $_params = array(); require_once(SMARTY_CORE_DIR . 'core.get_microtime.php'); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_cache_file.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_cache_file.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_cache_file.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -43,16 +43,16 @@ $level = 0; $j = 0; - for ($i=0, $results_count = count($results); $i < $results_count && $j < $match_count; $i++) { + for ($i=0, $results_count = count($results); $i < $results_count && $j < $match_count; ++$i) { if ($results[$i] == $match[0][$j]) { // nocache tag if ($match[1][$j]) { // closing tag $level--; unset($results[$i]); } else { // opening tag - if ($level++ > 0) unset($results[$i]); + if (++$level > 0) unset($results[$i]); } - $j++; + ++$j; } elseif ($level > 0) { unset($results[$i]); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_compiled_include.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_compiled_include.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_compiled_include.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -37,7 +37,7 @@ $_include_compiled .= "<?php"; $this_varname = ((double)phpversion() >= 5.0) ? '_smarty' : 'this'; - for ($_i = 0, $_for_max = count($_match_source); $_i < $_for_max; $_i++) { + for ($_i = 0, $_for_max = count($_match_source); $_i < $_for_max; ++$_i) { $_match =& $_match_source[$_i]; $source = $_match[4]; if ($this_varname == '_smarty') { @@ -56,7 +56,7 @@ if ($open_tag == '<?php ') break; } - for ($i=0, $count = count($tokens); $i < $count; $i++) { + for ($i=0, $count = count($tokens); $i < $count; ++$i) { if (is_array($tokens[$i])) { if ($tokens[$i][0] == T_VARIABLE && $tokens[$i][1] == '$this') { $tokens[$i] = '$' . $this_varname; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/block.textformat.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/block.textformat.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/block.textformat.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -75,7 +75,7 @@ $_paragraphs = preg_split('![\r\n][\r\n]!',$content); $_output = ''; - for($_x = 0, $_y = count($_paragraphs); $_x < $_y; $_x++) { + for($_x = 0, $_y = count($_paragraphs); $_x < $_y; ++$_x) { if ($_paragraphs[$_x] == '') { continue; } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.config_load.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.config_load.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.config_load.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -120,7 +120,7 @@ $smarty->_config[1]['vars'] = @array_merge($smarty->_config[1]['vars'], $_config_vars); $smarty->_config[1]['files'][$_file] = true; } else if ($_scope == 'global') { - for ($i = 1, $for_max = count($smarty->_config); $i < $for_max; $i++) { + for ($i = 1, $for_max = count($smarty->_config); $i < $for_max; ++$i) { $smarty->_config[$i]['vars'] = @array_merge($smarty->_config[$i]['vars'], $_config_vars); $smarty->_config[$i]['files'][$_file] = true; } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_select_date.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_select_date.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_select_date.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -180,14 +180,14 @@ $field_separator_count = -1; if ($display_months) { - $field_separator_count++; + ++$field_separator_count; $month_names = array(); $month_values = array(); if(isset($month_empty)) { $month_names[''] = $month_empty; $month_values[''] = ''; } - for ($i = 1; $i <= 12; $i++) { + for ($i = 1; $i <= 12; ++$i) { $month_names[$i] = strftime($month_format, mktime(0, 0, 0, $i, 1, 2000)); $month_values[$i] = strftime($month_value_format, mktime(0, 0, 0, $i, 1, 2000)); } @@ -218,13 +218,13 @@ } if ($display_days) { - $field_separator_count++; + ++$field_separator_count; $days = array(); if (isset($day_empty)) { $days[''] = $day_empty; $day_values[''] = ''; } - for ($i = 1; $i <= 31; $i++) { + for ($i = 1; $i <= 31; ++$i) { $days[] = sprintf($day_format, $i); $day_values[] = sprintf($day_value_format, $i); } @@ -254,7 +254,7 @@ } if ($display_years) { - $field_separator_count++; + ++$field_separator_count; if (null !== $field_array){ $year_name = $field_array . '[' . $prefix . 'Year]'; } else { @@ -302,7 +302,7 @@ } // Loop through the field_order field - for ($i = 0; $i <= 2; $i++){ + for ($i = 0; $i <= 2; ++$i){ $c = substr($field_order, $i, 1); switch ($c){ case 'D': Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_select_time.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_select_time.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_select_time.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -84,7 +84,7 @@ if ($display_hours) { $hours = $use_24_hours ? range(0, 23) : range(1, 12); $hour_fmt = $use_24_hours ? '%H' : '%I'; - for ($i = 0, $for_max = count($hours); $i < $for_max; $i++) + for ($i = 0, $for_max = count($hours); $i < $for_max; ++$i) $hours[$i] = sprintf('%02d', $hours[$i]); $html_result .= '<select name='; if (null !== $field_array) { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_table.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_table.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_table.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -127,7 +127,7 @@ $cols = ($hdir == 'right') ? $cols : array_reverse($cols); $output .= "<thead><tr>\n"; - for ($r=0; $r<$cols_count; $r++) { + for ($r=0; $r<$cols_count; ++$r) { $output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>'; $output .= $cols[$r]; $output .= "</th>\n"; @@ -136,11 +136,11 @@ } $output .= "<tbody>\n"; - for ($r=0; $r<$rows; $r++) { + for ($r=0; $r<$rows; ++$r) { $output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n"; $rx = ($vdir == 'down') ? $r*$cols_count : ($rows-1-$r)*$cols_count; - for ($c=0; $c<$cols_count; $c++) { + for ($c=0; $c<$cols_count; ++$c) { $x = ($hdir == 'right') ? $rx+$c : $rx+$cols_count-1-$c; if ($inner!='cols') { /* shuffle x to loop over rows*/ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.mailto.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.mailto.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.mailto.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -88,7 +88,7 @@ } $mail_parm_vals = ''; - for ($i=0; $i<count($mail_parms); $i++) { + for ($i=0; $i<count($mail_parms); ++$i) { $mail_parm_vals .= (0==$i) ? '?' : '&'; $mail_parm_vals .= $mail_parms[$i]; } @@ -104,7 +104,7 @@ $string = 'document.write(\'<a href="mailto:'.$address.'" '.$extra.'>'.$text.'</a>\');'; $js_encode = ''; - for ($x=0; $x < strlen($string); $x++) { + for ($x=0; $x < strlen($string); ++$x) { $js_encode .= '%' . bin2hex($string[$x]); } @@ -113,7 +113,7 @@ } elseif ($encode == 'javascript_charcode' ) { $string = '<a href="mailto:'.$address.'" '.$extra.'>'.$text.'</a>'; - for($x = 0, $y = strlen($string); $x < $y; $x++ ) { + for($x = 0, $y = strlen($string); $x < $y; ++$x ) { $ord[] = ord($string[$x]); } @@ -137,7 +137,7 @@ return; } $address_encode = ''; - for ($x=0; $x < strlen($address); $x++) { + for ($x=0; $x < strlen($address); ++$x) { if(preg_match('!\w!',$address[$x])) { $address_encode .= '%' . bin2hex($address[$x]); } else { @@ -145,7 +145,7 @@ } } $text_encode = ''; - for ($x=0; $x < strlen($text); $x++) { + for ($x=0; $x < strlen($text); ++$x) { $text_encode .= '&#x' . bin2hex($text[$x]).';'; } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/modifier.escape.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/modifier.escape.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/modifier.escape.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -40,7 +40,7 @@ case 'hex': // escape every character into hex $return = ''; - for ($x=0; $x < strlen($string); $x++) { + for ($x=0; $x < strlen($string); ++$x) { $return .= '%' . bin2hex($string[$x]); } @@ -48,7 +48,7 @@ case 'hexentity': $return = ''; - for ($x=0; $x < strlen($string); $x++) { + for ($x=0; $x < strlen($string); ++$x) { $return .= '&#x' . bin2hex($string[$x]) . ';'; } @@ -56,7 +56,7 @@ case 'decentity': $return = ''; - for ($x=0; $x < strlen($string); $x++) { + for ($x=0; $x < strlen($string); ++$x) { $return .= '&#' . ord($string[$x]) . ';'; } @@ -73,7 +73,7 @@ case 'nonstd': // escape non-standard chars, such as ms document quotes $_res = ''; - for ($_i = 0, $_len = strlen($string); $_i < $_len; $_i++) { + for ($_i = 0, $_len = strlen($string); $_i < $_len; ++$_i) { $_ord = ord(substr($string, $_i, 1)); // non-standard char, escape it if ($_ord >= 126) { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/outputfilter.trimwhitespace.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/outputfilter.trimwhitespace.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/outputfilter.trimwhitespace.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -65,7 +65,7 @@ { $_len = strlen($search_str); $_pos = 0; - for ($_i=0, $_count=count($replace); $_i<$_count; $_i++) + for ($_i=0, $_count=count($replace); $_i<$_count; ++$_i) if (($_pos=strpos($subject, $search_str, $_pos))!==false) $subject = substr_replace($subject, $replace[$_i], $_pos, $_len); else Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoPageNav.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoPageNav.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoPageNav.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -38,7 +38,7 @@ if ($currentPage > 1) { $str .= '<a href="' . $xoops->url(str_replace( '%s', $offset - $pageSize, $url)) . '">Previous</a>'; } - for ($i = $minPage; $i <= $maxPage; $i++) { + for ($i = $minPage; $i <= $maxPage; ++$i) { $tgt = htmlspecialchars($xoops->url(str_replace('%s', ($i - 1) * $pageSize, $url)), ENT_QUOTES); $str .= "<a href='$tgt'>$i</a>"; } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/snoopy.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/snoopy.php 2014-09-18 21:56:17 UTC (rev 12794) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/snoopy.php 2014-09-21 05:41:46 UTC (rev 12795) @@ -423,7 +423,7 @@ if($this->lastredirectaddr) $URI = $this->lastredirectaddr; if (is_array($this->results)) { - for($x=0;$x<count($this->results);$x++) + for($x=0;$x<count($this->results);++$x) $this->results[$x] = $this->_striplinks($this->results[$x]); } else $this->results = $this->_striplinks($this->results); @@ -455,7 +455,7 @@ if ($this->fetch($URI)) { if (is_array($this->results)) { - for($x=0;$x<count($this->results);$x++) + for($x=0;$x<count($this->results);++$x) $this->results[$x] = $this->_stripform($this->results[$x]); } else $this->results = $this->_stripform($this->results); @@ -482,7 +482,7 @@ { if ($this->fetch($URI)) { if (is_array($this->results)) { - for($x=0;$x<count($this->results);$x++) + for($x=0;$x<count($this->results);++$x) $this->results[$x] = $this->_striptext($this->results[$x]); } else $this->results = $this->_striptext($this->results); @@ -513,7 +513,7 @@ if($this->lastredirectaddr) $URI = $this->lastredirectaddr; if (is_array($this->results)) { - for ($x=0;$x<count($this->results);$x++) { + for ($x=0;$x<count($this->results);++$x) { $this->results[$x] = $this->_striplinks($this->results[$x]); if($this->expandlinks) $this->results[$x] = $this->_expandlinks($this->results[$x],$URI); @@ -550,7 +550,7 @@ if($this->lastredirectaddr) $URI = $this->lastredirectaddr; if (is_array($this->results)) { - for ($x=0;$x<count($this->results);$x++) { + for ($x=0;$x<count($this->results);++$x) { $this->results[$x] = $this->_striptext($this->results[$x]); if($this->expandlinks) $this->results[$x] = $this->_expandlinks($this->results[$x],$URI); @@ -931,7 +931,7 @@ // have we hit our frame depth and is there frame src to fetch? if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match)) { $this->results[] = $results; - for($x=0; $x<count($match[1]); $x++) + for($x=0; $x<count($match[1]); ++$x) $this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host); } // have we already fetched framed content? @@ -1015,7 +1015,7 @@ if(!empty($this->user) || !empty($this->pass)) $headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass); - for ($curr_header = 0; $curr_header < count($headers); $curr_header++) { + for ($curr_header = 0; $curr_header < count($headers); ++$curr_header) { $safer_header = strtr( $headers[$curr_header], "\"", " " ); $cmdline_params .= " -H \"".$safer_header."\""; } @@ -1043,7 +1043,7 @@ $this->_redirectaddr = false; unset($this->headers); - for ($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++) { + for ($currentHeader = 0; $currentHeader < count($result_headers); ++$currentHeader) { // if a header begins with Location: or URI:, set the redirect if (preg_match("/^(Location: |URI: )/i",$result_headers[$currentHeader])) { @@ -1077,7 +1077,7 @@ // have we hit our frame depth and is there frame src to fetch? if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match)) { $this->results[] = $results; - for($x=0; $x<count($match[1]); $x++) + for($x=0; $x<count($match[1]); ++$x) $this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host); } // have we already fetched framed content? @@ -1099,7 +1099,7 @@ function setcookies() { - for ($x=0; $x<count($this->headers); $x++) { + for ($x=0; $x<count($this->headers); ++$x) { if(preg_match('/^set-cookie:[\s]+([^=]+)=([^;]+)/i', $this->headers[$x],$match)) $this->cookies[$match[1]] = urldecode($match[2]); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/tardownloader.php =================================... [truncated message content] |
From: <be...@us...> - 2014-09-22 08:24:09
|
Revision: 12796 http://sourceforge.net/p/xoops/svn/12796 Author: beckmi Date: 2014-09-22 08:23:59 +0000 (Mon, 22 Sep 2014) Log Message: ----------- reverting couple of $i++ conversions Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Config_File.class.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_cache_file.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Generator.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/FixNesting.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-09-21 05:41:46 UTC (rev 12795) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-09-22 08:23:59 UTC (rev 12796) @@ -10,6 +10,7 @@ - adding Adding language constants for Protector's Prefix Manager (slider84/mamba) - allowing for "https" URL in YouTube links in Textsanitizer (mamba) - converting $i++ to ++$i for improved performance (mamba) +- reverting couple of $i++ conversions (zyspec/mamba) =============================== 2014-06-20: Version 2.5.7 Final (Patch) Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php 2014-09-21 05:41:46 UTC (rev 12795) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php 2014-09-22 08:23:59 UTC (rev 12796) @@ -100,7 +100,7 @@ for ($i = 0; $i < $count; ++$i) { $_items[$i]['title'] = XoopsLocal::convert_encoding($_items[$i]['title'], _CHARSET, 'UTF-8'); $_items[$i]['description'] = XoopsLocal::convert_encoding($_items[$i]['description'], _CHARSET, 'UTF-8'); - $items[strval(strtotime($_items[$i]['pubdate'])) . "-" . strval(++$cnt)] = $_items[$i]; + $items[strval(strtotime($_items[$i]['pubdate'])) . "-" . strval($cnt++)] = $_items[$i]; } } else { echo $rss2parser->getErrors(); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Config_File.class.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Config_File.class.php 2014-09-21 05:41:46 UTC (rev 12795) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Config_File.class.php 2014-09-22 08:23:59 UTC (rev 12796) @@ -324,7 +324,7 @@ $var_value = ''; while ($i<$count) { if (($pos = strpos($lines[$i], '"""')) === false) { - $var_value .= $lines[++$i]; + $var_value .= $lines[$i++]; } else { /* end of multiline-value */ $var_value .= substr($lines[$i], 0, $pos); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php 2014-09-21 05:41:46 UTC (rev 12795) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php 2014-09-22 08:23:59 UTC (rev 12796) @@ -162,7 +162,7 @@ . '(?:\s*,\s*' . $this->_obj_single_param_regexp . ')*)?\)'; $this->_obj_start_regexp = '(?:' . $this->_dvar_regexp . '(?:' . $this->_obj_ext_regexp . ')+)'; $this->_obj_call_regexp = '(?:' . $this->_obj_start_regexp . '(?:' . $this->_obj_params_regexp . ')?(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?)'; - + // matches valid modifier syntax: // |foo // |@foo @@ -304,7 +304,7 @@ } } } - + /* Compile the template tags into PHP code. */ $compiled_tags = array(); for ($i = 0, $for_max = count($template_tags); $i < $for_max; ++$i) { @@ -333,7 +333,7 @@ for ($j = $i + 1; $j < $for_max; ++$j) { /* remove leading and trailing whitespaces of each line */ $text_blocks[$j] = preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $text_blocks[$j]); - if ($compiled_tags[$j] == '{/strip}') { + if ($compiled_tags[$j] == '{/strip}') { /* remove trailing whitespaces from the last text_block */ $text_blocks[$j] = rtrim($text_blocks[$j]); } @@ -349,9 +349,9 @@ } } $compiled_content = ''; - + $tag_guard = '%%%SMARTYOTG' . md5(uniqid(rand(), true)) . '%%%'; - + /* Interleave the compiled contents and text blocks to get the final result. */ for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; ++$i) { if ($compiled_tags[$i] == '') { @@ -361,7 +361,7 @@ // replace legit PHP tags with placeholder $text_blocks[$i] = str_replace('<?', $tag_guard, $text_blocks[$i]); $compiled_tags[$i] = str_replace('<?', $tag_guard, $compiled_tags[$i]); - + $compiled_content .= $text_blocks[$i] . $compiled_tags[$i]; } $compiled_content .= str_replace('<?', $tag_guard, $text_blocks[$i]); @@ -371,8 +371,8 @@ $compiled_content = preg_replace("~(?<!')language\s*=\s*[\"\']?\s*php\s*[\"\']?~", "<?php echo 'language=php' ?>\n", $compiled_content); // recover legit tags - $compiled_content = str_replace($tag_guard, '<?', $compiled_content); - + $compiled_content = str_replace($tag_guard, '<?', $compiled_content); + // remove \n from the end of the file, if any if (strlen($compiled_content) && (substr($compiled_content, -1) == "\n") ) { $compiled_content = substr($compiled_content, 0, -1); @@ -437,7 +437,7 @@ /* Matched comment. */ if (substr($template_tag, 0, 1) == '*' && substr($template_tag, -1) == '*') return ''; - + /* Split tag into two three parts: command, command modifiers and the arguments. */ if(! preg_match('~^(?:(' . $this->_num_const_regexp . '|' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '|\/?' . $this->_reg_obj_regexp . '|\/?' . $this->_func_regexp . ')(' . $this->_mod_regexp . '*)) @@ -445,7 +445,7 @@ ~xs', $template_tag, $match)) { $this->_syntax_error("unrecognized tag: $template_tag", E_USER_ERROR, __FILE__, __LINE__); } - + $tag_command = $match[1]; $tag_modifier = isset($match[2]) ? $match[2] : null; $tag_args = isset($match[3]) ? $match[3] : null; @@ -585,7 +585,7 @@ } else if ($this->_compile_block_tag($tag_command, $tag_args, $tag_modifier, $output)) { return $output; } else if ($this->_compile_custom_tag($tag_command, $tag_args, $tag_modifier, $output)) { - return $output; + return $output; } else { $this->_syntax_error("unrecognized tag '$tag_command'", E_USER_ERROR, __FILE__, __LINE__); } @@ -936,7 +936,7 @@ if (empty($name)) { return $this->_syntax_error("missing insert name", E_USER_ERROR, __FILE__, __LINE__); } - + if (!preg_match('~^\w+$~', $name)) { return $this->_syntax_error("'insert: 'name' must be an insert function name", E_USER_ERROR, __FILE__, __LINE__); } @@ -1225,7 +1225,7 @@ $buffer = isset($attrs['name']) ? $attrs['name'] : "'default'"; $assign = isset($attrs['assign']) ? $attrs['assign'] : null; $append = isset($attrs['append']) ? $attrs['append'] : null; - + $output = "<?php ob_start(); ?>"; $this->_capture_stack[] = array($buffer, $assign, $append); } else { @@ -1266,11 +1266,11 @@ if(empty($tokens)) { $_error_msg = $elseif ? "'elseif'" : "'if'"; - $_error_msg .= ' statement requires arguments'; + $_error_msg .= ' statement requires arguments'; $this->_syntax_error($_error_msg, E_USER_ERROR, __FILE__, __LINE__); } - - + + // make sure we have balanced parenthesis $token_count = array_count_values($tokens); if(isset($token_count['(']) && $token_count['('] != $token_count[')']) { @@ -1368,8 +1368,8 @@ if ($is_arg_start != 0) { if (preg_match('~^' . $this->_func_regexp . '$~', $tokens[$is_arg_start-1])) { $is_arg_start--; - } - } + } + } } else $is_arg_start = $i-1; /* Construct the argument for 'is' expression, so it knows @@ -1400,7 +1400,7 @@ } } elseif(preg_match('~^' . $this->_var_regexp . '$~', $token) && (strpos('+-*/^%&|', substr($token, -1)) === false) && isset($tokens[$i+1]) && $tokens[$i+1] == '(') { // variable function call - $this->_syntax_error("variable function call '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__); + $this->_syntax_error("variable function call '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__); } elseif(preg_match('~^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '(?:' . $this->_mod_regexp . '*)$~', $token)) { // object or variable $token = $this->_parse_var_props($token); @@ -1475,7 +1475,7 @@ case 'even': if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by') { ++$expr_end; - $expr_arg = $tokens[++$expr_end]; + $expr_arg = $tokens[$expr_end++]; $expr = "!(1 & ($is_arg / " . $this->_parse_var_props($expr_arg) . "))"; } else $expr = "!(1 & $is_arg)"; @@ -1484,7 +1484,7 @@ case 'odd': if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by') { ++$expr_end; - $expr_arg = $tokens[++$expr_end]; + $expr_arg = $tokens[$expr_end++]; $expr = "(1 & ($is_arg / " . $this->_parse_var_props($expr_arg) . "))"; } else $expr = "(1 & $is_arg)"; @@ -1493,7 +1493,7 @@ case 'div': if (@$tokens[$expr_end] == 'by') { ++$expr_end; - $expr_arg = $tokens[++$expr_end]; + $expr_arg = $tokens[$expr_end++]; $expr = "!($is_arg % " . $this->_parse_var_props($expr_arg) . ")"; } else { $this->_syntax_error("expecting 'by' after 'div'", E_USER_ERROR, __FILE__, __LINE__); @@ -1753,12 +1753,12 @@ $_var_ref = $var_expr; else $_var_ref = substr($var_expr, 1); - + if(!$_has_math) { - + // get [foo] and .foo and ->foo and (...) pieces preg_match_all('~(?:^\w+)|' . $this->_obj_params_regexp . '|(?:' . $this->_var_bracket_regexp . ')|->\$?\w+|\.\$?\w+|\S+~', $_var_ref, $match); - + $_indexes = $match[0]; $_var_name = array_shift($_indexes); @@ -2018,7 +2018,7 @@ array_shift($indexes); $compiled_ref = "(\$this->_foreach[$_var]['iteration']-1)"; break; - + case 'first': array_shift($indexes); $compiled_ref = "(\$this->_foreach[$_var]['iteration'] <= 1)"; @@ -2028,12 +2028,12 @@ array_shift($indexes); $compiled_ref = "(\$this->_foreach[$_var]['iteration'] == \$this->_foreach[$_var]['total'])"; break; - + case 'show': array_shift($indexes); $compiled_ref = "(\$this->_foreach[$_var]['total'] > 0)"; break; - + default: unset($_max_index); $compiled_ref = "\$this->_foreach[$_var]"; @@ -2159,7 +2159,7 @@ case 'rdelim': $compiled_ref = "'$this->right_delimiter'"; break; - + default: $this->_syntax_error('$smarty.' . $_ref . ' is an unknown reference', E_USER_ERROR, __FILE__, __LINE__); break; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_cache_file.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_cache_file.php 2014-09-21 05:41:46 UTC (rev 12795) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/internals/core.write_cache_file.php 2014-09-22 08:23:59 UTC (rev 12796) @@ -50,7 +50,7 @@ $level--; unset($results[$i]); } else { // opening tag - if (++$level > 0) unset($results[$i]); + if ($level++ > 0) unset($results[$i]); } ++$j; } elseif ($level > 0) { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php 2014-09-21 05:41:46 UTC (rev 12795) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php 2014-09-22 08:23:59 UTC (rev 12796) @@ -368,13 +368,13 @@ // BYTE rgbGreen; // BYTE rgbRed; // BYTE rgbReserved; - $blue = $this->LittleEndian2Int(substr($BMPpalette, ++$paletteoffset, 1)); - $green = $this->LittleEndian2Int(substr($BMPpalette, ++$paletteoffset, 1)); - $red = $this->LittleEndian2Int(substr($BMPpalette, ++$paletteoffset, 1)); + $blue = $this->LittleEndian2Int(substr($BMPpalette, $paletteoffset++, 1)); + $green = $this->LittleEndian2Int(substr($BMPpalette, $paletteoffset++, 1)); + $red = $this->LittleEndian2Int(substr($BMPpalette, $paletteoffset++, 1)); if (($thisfile_bmp['type_os'] == 'OS/2') && ($thisfile_bmp['type_version'] == 1)) { // no padding byte } else { - ++$paletteoffset; // padding byte + $paletteoffset++; // padding byte } $thisfile_bmp['palette'][$i] = (($red << 16) | ($green << 8) | ($blue)); } @@ -395,7 +395,7 @@ case 1: for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) { for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col = $col) { - $paletteindexbyte = ord($BMPpixelData{++$pixeldataoffset}); + $paletteindexbyte = ord($BMPpixelData{$pixeldataoffset++}); for ($i = 7; $i >= 0; $i--) { $paletteindex = ($paletteindexbyte & (0x01 << $i)) >> $i; $thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex]; @@ -404,7 +404,7 @@ } while (($pixeldataoffset % 4) != 0) { // lines are padded to nearest DWORD - ++$pixeldataoffset; + $pixeldataoffset++; } } break; @@ -412,7 +412,7 @@ case 4: for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) { for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col = $col) { - $paletteindexbyte = ord($BMPpixelData{++$pixeldataoffset}); + $paletteindexbyte = ord($BMPpixelData{$pixeldataoffset++}); for ($i = 1; $i >= 0; $i--) { $paletteindex = ($paletteindexbyte & (0x0F << (4 * $i))) >> (4 * $i); $thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex]; @@ -421,7 +421,7 @@ } while (($pixeldataoffset % 4) != 0) { // lines are padded to nearest DWORD - ++$pixeldataoffset; + $pixeldataoffset++; } } break; @@ -429,12 +429,12 @@ case 8: for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) { for ($col = 0; $col < $thisfile_bmp_header_raw['width']; ++$col) { - $paletteindex = ord($BMPpixelData{++$pixeldataoffset}); + $paletteindex = ord($BMPpixelData{$pixeldataoffset++}); $thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex]; } while (($pixeldataoffset % 4) != 0) { // lines are padded to nearest DWORD - ++$pixeldataoffset; + $pixeldataoffset++; } } break; @@ -447,7 +447,7 @@ } while (($pixeldataoffset % 4) != 0) { // lines are padded to nearest DWORD - ++$pixeldataoffset; + $pixeldataoffset++; } } break; @@ -460,7 +460,7 @@ } while (($pixeldataoffset % 4) != 0) { // lines are padded to nearest DWORD - ++$pixeldataoffset; + $pixeldataoffset++; } } break; @@ -481,8 +481,8 @@ case 8: $pixelcounter = 0; while ($pixeldataoffset < strlen($BMPpixelData)) { - $firstbyte = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1)); - $secondbyte = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1)); + $firstbyte = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1)); + $secondbyte = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1)); if ($firstbyte == 0) { // escaped/absolute mode - the first byte of the pair can be set to zero to @@ -503,8 +503,8 @@ // delta - The 2 bytes following the escape contain unsigned values // indicating the horizontal and vertical offsets of the next pixel // from the current position. - $colincrement = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1)); - $rowincrement = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1)); + $colincrement = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1)); + $rowincrement = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1)); $col = ($pixelcounter % $thisfile_bmp_header_raw['width']) + $colincrement; $row = ($thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width'])) - $rowincrement; $pixelcounter = ($row * $thisfile_bmp_header_raw['width']) + $col; @@ -516,7 +516,7 @@ // number of bytes that follow, each of which contains the color index // of a single pixel. Each run must be aligned on a word boundary. for ($i = 0; $i < $secondbyte; ++$i) { - $paletteindex = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1)); + $paletteindex = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1)); $col = $pixelcounter % $thisfile_bmp_header_raw['width']; $row = $thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width']); $thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex]; @@ -524,7 +524,7 @@ } while (($pixeldataoffset % 2) != 0) { // Each run must be aligned on a word boundary. - ++$pixeldataoffset; + $pixeldataoffset++; } break; } @@ -557,8 +557,8 @@ case 4: $pixelcounter = 0; while ($pixeldataoffset < strlen($BMPpixelData)) { - $firstbyte = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1)); - $secondbyte = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1)); + $firstbyte = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1)); + $secondbyte = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1)); if ($firstbyte == 0) { // escaped/absolute mode - the first byte of the pair can be set to zero to @@ -579,8 +579,8 @@ // delta - The 2 bytes following the escape contain unsigned values // indicating the horizontal and vertical offsets of the next pixel // from the current position. - $colincrement = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1)); - $rowincrement = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1)); + $colincrement = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1)); + $rowincrement = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1)); $col = ($pixelcounter % $thisfile_bmp_header_raw['width']) + $colincrement; $row = ($thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width'])) - $rowincrement; $pixelcounter = ($row * $thisfile_bmp_header_raw['width']) + $col; @@ -593,13 +593,13 @@ // each run must be aligned on a word boundary. unset($paletteindexes); for ($i = 0; $i < ceil($secondbyte / 2); ++$i) { - $paletteindexbyte = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1)); + $paletteindexbyte = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1)); $paletteindexes[] = ($paletteindexbyte & 0xF0) >> 4; $paletteindexes[] = ($paletteindexbyte & 0x0F); } while (($pixeldataoffset % 2) != 0) { // Each run must be aligned on a word boundary. - ++$pixeldataoffset; + $pixeldataoffset++; } foreach ($paletteindexes as $dummy => $paletteindex) { @@ -652,13 +652,13 @@ return false; } while ((($thisfile_bmp_header_raw['red_mask'] >> $redshift) & 0x01) == 0) { - ++$redshift; + $redshift++; } while ((($thisfile_bmp_header_raw['green_mask'] >> $greenshift) & 0x01) == 0) { - ++$greenshift; + $greenshift++; } while ((($thisfile_bmp_header_raw['blue_mask'] >> $blueshift) & 0x01) == 0) { - ++$blueshift; + $blueshift++; } for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) { for ($col = 0; $col < $thisfile_bmp_header_raw['width']; ++$col) { @@ -672,7 +672,7 @@ } while (($pixeldataoffset % 4) != 0) { // lines are padded to nearest DWORD - ++$pixeldataoffset; + $pixeldataoffset++; } } break; @@ -875,4 +875,4 @@ } -?> \ No newline at end of file +?> Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php 2014-09-21 05:41:46 UTC (rev 12795) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php 2014-09-22 08:23:59 UTC (rev 12796) @@ -2439,7 +2439,7 @@ $this->DebugMessage('AntiOffsiteLinking() writing '.count($nohotlink_text_array).' lines of text "'.$message.'" (in #'.$this->config_error_textcolor.') on top of image', __FILE__, __LINE__); foreach ($nohotlink_text_array as $textline) { $leftoffset = max(0, round(($this->thumbnail_width - (strlen($textline) * ImageFontWidth($this->config_error_fontsize))) / 2)); - ImageString($this->gdimg_output, $this->config_error_fontsize, $leftoffset, $topoffset + (++$rowcounter * ImageFontHeight($this->config_error_fontsize)), $textline, $nohotlink_text_color); + ImageString($this->gdimg_output, $this->config_error_fontsize, $leftoffset, $topoffset + ($rowcounter++ * ImageFontHeight($this->config_error_fontsize)), $textline, $nohotlink_text_color); } } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php 2014-09-21 05:41:46 UTC (rev 12795) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php 2014-09-22 08:23:59 UTC (rev 12796) @@ -215,7 +215,7 @@ $has_xoopscomments = false ; foreach ($tables as $table) { if( $table == $prefix['name'] . '_xoopscomments' ) $has_xoopscomments = true ; - if( substr( $table , 0 , strlen( $prefix['name'] ) + 1 ) === $prefix['name'] . '_' ) ++$table_count ; + if( substr( $table , 0 , strlen( $prefix['name'] ) + 1 ) === $prefix['name'] . '_' ) ++$table_count; } // check if prefix_xoopscomments exists Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Generator.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Generator.php 2014-09-21 05:41:46 UTC (rev 12795) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Generator.php 2014-09-22 08:23:59 UTC (rev 12796) @@ -94,8 +94,8 @@ // script special case // the contents of the script block must be ONE token // for this to work. - $html .= $this->generateFromToken($tokens[++$i]); - $html .= $this->generateScriptFromToken($tokens[++$i]); + $html .= $this->generateFromToken($tokens[$i++]); + $html .= $this->generateScriptFromToken($tokens[$i++]); } $html .= $this->generateFromToken($tokens[$i]); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/FixNesting.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/FixNesting.php 2014-09-21 05:41:46 UTC (rev 12795) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/FixNesting.php 2014-09-22 08:23:59 UTC (rev 12796) @@ -114,7 +114,7 @@ $go = false; $def = empty($stack) ? $definition->info_parent_def : $definition->info[$node->name]; while (isset($node->children[$ix])) { - $child = $node->children[++$ix]; + $child = $node->children[$ix++]; if ($child instanceof HTMLPurifier_Node_Element) { $go = true; $stack[] = array($node, $is_inline, $excludes, $ix); |
From: <be...@us...> - 2014-11-16 11:00:29
|
Revision: 12849 http://sourceforge.net/p/xoops/svn/12849 Author: beckmi Date: 2014-11-16 11:00:20 +0000 (Sun, 16 Nov 2014) Log Message: ----------- Cosmetic changes/updates (mamba) Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/userutility.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/dhtmltextarea.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/editor_registry.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopscode.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsemotions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsimagemanager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsmlcontent.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsquote.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopstopic.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/about.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/admin_menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/advisory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/center.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/prefix_manager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/blocks/blocks.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/module_icon.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/mytrustdirname.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification_update.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/oninstall.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onuninstall.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onupdate.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/templates/system_banner.html Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-11-16 11:00:20 UTC (rev 12849) @@ -4,14 +4,21 @@ NOT RELEASED: Version 2.5.8 Beta 1 =============================== - replaced "dirname(__FILE__)" with "__DIR__" since the min. PHP is now 5.3.7, and __DIR__ is faster (mamba) -- updating some copyright notices +- updating some copyright notices (mamba) - Fix issues when protector 'id_forceintval' preference is enabled, that manifests as an error when deleting private messages. (rgriffith) - fix for Update setting Template import date to 0 (timgno/mamba) -- adding Adding language constants for Protector's Prefix Manager (slider84/mamba) +- Adding language constants for Protector's Prefix Manager (slider84/mamba) - allowing for "https" URL in YouTube links in Textsanitizer (mamba) - converting $i++ to ++$i for improved performance (mamba) - reverting couple of $i++ conversions (zyspec/mamba) +- updated xBootstrap to Bootstrap 3.3.1 (Angelo Rocha) +- Some code cleanup for private messages (Dingjie (Daniel) Yang/rgriffith) +Security fixes +- ID: 1295 Added X-Frame-Options header to prevent clickjacking in modern browsers, reported by Narendra Bhati. + By default set to 'sameorigin', but can be overridden by setting desired value in 'xFrameOptions' key in xoopsconfig. (rgriffith) + + =============================== 2014-06-20: Version 2.5.7 Final (Patch) =============================== Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -62,7 +62,7 @@ /** * version is rev of this class */ - Include_once 'xoops_version.php'; + include_once 'xoops_version.php'; $version = XOOPS_FRAMEWORKS_MODULEADMIN_VERSION; return $version; @@ -77,7 +77,7 @@ /** * version is rev of this class */ - Include_once 'xoops_version.php'; + include_once 'xoops_version.php'; $releasedate = XOOPS_FRAMEWORKS_MODULEADMIN_RELEASEDATE; return $releasedate; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/Smarty_Compiler.class.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -1032,7 +1032,7 @@ $arg_list = array(); foreach($attrs as $arg_name => $arg_value) { - if($arg_name != 'file' AND $arg_name != 'once' AND $arg_name != 'assign') { + if($arg_name != 'file' && $arg_name != 'once' && $arg_name != 'assign') { if(is_bool($arg_value)) $arg_value = $arg_value ? 'true' : 'false'; $arg_list[] = "'$arg_name' => $arg_value"; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/userutility.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/userutility.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/userutility.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -223,23 +223,17 @@ $proxy_ip = ''; if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) { $proxy_ip = $_SERVER['HTTP_X_FORWARDED_FOR']; - } else - if (!empty($_SERVER['HTTP_X_FORWARDED'])) { + } elseif (!empty($_SERVER['HTTP_X_FORWARDED'])) { $proxy_ip = $_SERVER['HTTP_X_FORWARDED']; - } else - if (! empty($_SERVER['HTTP_FORWARDED_FOR'])) { + } elseif (! empty($_SERVER['HTTP_FORWARDED_FOR'])) { $proxy_ip = $_SERVER['HTTP_FORWARDED_FOR']; - } else - if (!empty($_SERVER['HTTP_FORWARDED'])) { + } elseif (!empty($_SERVER['HTTP_FORWARDED'])) { $proxy_ip = $_SERVER['HTTP_FORWARDED']; - } else - if (!empty($_SERVER['HTTP_VIA'])) { + } elseif (!empty($_SERVER['HTTP_VIA'])) { $proxy_ip = $_SERVER['HTTP_VIA']; - } else - if (!empty($_SERVER['HTTP_X_COMING_FROM'])) { + } elseif (!empty($_SERVER['HTTP_X_COMING_FROM'])) { $proxy_ip = $_SERVER['HTTP_X_COMING_FROM']; - } else - if (!empty($_SERVER['HTTP_COMING_FROM'])) { + } elseif (!empty($_SERVER['HTTP_COMING_FROM'])) { $proxy_ip = $_SERVER['HTTP_COMING_FROM']; } if (!empty($proxy_ip) && $is_ip = preg_match('/^([0-9]{1,3}.){3,3}[0-9]{1,3}/', $proxy_ip, $regs) && count($regs) > 0) { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/dhtmltextarea.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/dhtmltextarea.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/dhtmltextarea.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -17,7 +17,7 @@ * @author Taiwen Jiang <ph...@us...> * @version $Id$ */ -defined( 'XOOPS_ROOT_PATH' ) or die( 'Restricted access' ); +defined('XOOPS_ROOT_PATH') || die('Restricted access'); xoops_load('XoopsEditor'); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/editor_registry.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/editor_registry.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/editor_registry.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -16,7 +16,7 @@ * @version $Id$ * @package xoopseditor */ -defined( 'XOOPS_ROOT_PATH' ) or die( 'Restricted access' ); +defined('XOOPS_ROOT_PATH') || die('Restricted access'); return $config = array( 'class' => 'FormDhtmlTextArea', 'file' => XOOPS_ROOT_PATH . '/class/xoopseditor/dhtmltextarea/dhtmltextarea.php', Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopscode.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopscode.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopscode.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -11,7 +11,7 @@ * @version $Id$ */ -if (!defined("XOOPS_ROOT_PATH")) { die("XOOPS root path not defined"); } +defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); // Add your code here to check access by groups Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsemotions.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsemotions.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsemotions.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -11,7 +11,7 @@ * @version $Id$ */ -if (!defined("XOOPS_ROOT_PATH")) { die("XOOPS root path not defined"); } +defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); include_once XOOPS_ROOT_PATH . "/modules/system/constants.php"; // Add your code here to check access by groups Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsimagemanager.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsimagemanager.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsimagemanager.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -11,7 +11,7 @@ * @version $Id$ */ -if (!defined("XOOPS_ROOT_PATH")) { die("XOOPS root path not defined"); } +defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); // check categories readability by group $groups = is_object( $GLOBALS["xoopsUser"] ) ? $GLOBALS["xoopsUser"]->getGroups() : array( XOOPS_GROUP_ANONYMOUS ); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsmlcontent.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsmlcontent.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsmlcontent.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -11,7 +11,7 @@ * @version $Id$ */ -if (!defined("XOOPS_ROOT_PATH")) { die("XOOPS root path not defined"); } +defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); // Xlanguage if ( $GLOBALS["module_handler"]->getByDirname("xlanguage") && defined("XLANGUAGE_LANG_TAG") ) { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsquote.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsquote.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsquote.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -11,7 +11,7 @@ * @version $Id$ */ -if (!defined("XOOPS_ROOT_PATH")) { die("XOOPS root path not defined"); } +defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); // Add your code here to check access by groups Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -20,7 +20,7 @@ } $xoops_root_path = substr($current_path, 0, strpos(strtolower($current_path), "/class/xoopseditor/tinymce/")); include_once $xoops_root_path . "/mainfile.php"; -if (!defined("XOOPS_ROOT_PATH")) { die("XOOPS root path not defined"); } +defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); // load mainfile.php - end // get current filename Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -20,7 +20,7 @@ } $xoops_root_path = substr($current_path, 0, strpos(strtolower($current_path), "/class/xoopseditor/tinymce/")); include_once $xoops_root_path . "/mainfile.php"; -if (!defined("XOOPS_ROOT_PATH")) exit(); +defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); /** * This code was moved to the top to avoid overriding variables that do not come from post Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -20,7 +20,7 @@ } $xoops_root_path = substr($current_path, 0, strpos(strtolower($current_path), "/class/xoopseditor/tinymce/")); include_once $xoops_root_path . "/mainfile.php"; -if (!defined("XOOPS_ROOT_PATH")) { die("XOOPS root path not defined"); } +defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); // include include_once XOOPS_ROOT_PATH."/modules/system/constants.php"; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -20,7 +20,7 @@ } $xoops_root_path = substr($current_path, 0, strpos(strtolower($current_path), "/class/xoopseditor/tinymce/")); include_once $xoops_root_path . "/mainfile.php"; -if (!defined("XOOPS_ROOT_PATH")) { die("XOOPS root path not defined"); } +defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); // load mainfile.php - end function langDropdown() { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopstopic.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopstopic.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopstopic.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -18,9 +18,8 @@ * @deprecated */ -if (!defined('XOOPS_ROOT_PATH')) { - exit(); -} +defined('XOOPS_ROOT_PATH') || die('Restricted access'); + $GLOBALS['xoopsLogger']->addDeprecated("'/class/xoopstopic.php' is deprecated since XOOPS 2.5.4, please create your own class instead."); include_once XOOPS_ROOT_PATH . '/class/xoopstree.php'; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/about.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/about.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/about.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -1,7 +1,7 @@ <?php -require '../../../mainfile.php' ; -if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ; +require dirname(dirname(dirname(__DIR__))) . '/mainfile.php'; +defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php'); $mydirname = basename( dirname(__DIR__) ) ; $mydirpath = dirname(__DIR__) ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/admin_menu.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/admin_menu.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/admin_menu.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -1,6 +1,6 @@ <?php -if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ; +defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php'); $mydirname = basename( dirname(__DIR__) ) ; $mydirpath = dirname(__DIR__) ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/advisory.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/advisory.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/advisory.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -1,7 +1,7 @@ <?php -require '../../../mainfile.php' ; -if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ; +require dirname(dirname(dirname(__DIR__))) . '/mainfile.php'; +defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php'); $mydirname = basename( dirname(__DIR__) ) ; $mydirpath = dirname(__DIR__) ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/center.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/center.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/center.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -1,7 +1,7 @@ <?php -require '../../../mainfile.php' ; -if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ; +require dirname(dirname(dirname(__DIR__))) . '/mainfile.php'; +defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php'); $mydirname = basename( dirname(__DIR__) ) ; $mydirpath = dirname(__DIR__) ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/index.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/index.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/index.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -1,7 +1,7 @@ <?php -require '../../../mainfile.php' ; -if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ; +require dirname(dirname(dirname(__DIR__))) . '/mainfile.php'; +defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php'); $mydirname = basename( dirname(__DIR__) ) ; $mydirpath = dirname(__DIR__) ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/prefix_manager.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/prefix_manager.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/admin/prefix_manager.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -1,7 +1,7 @@ <?php -require '../../../mainfile.php' ; -if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ; +require dirname(dirname(dirname(__DIR__))) . '/mainfile.php'; +defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php'); $mydirname = basename( dirname(__DIR__) ) ; $mydirpath = dirname(__DIR__) ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/blocks/blocks.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/blocks/blocks.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/blocks/blocks.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -1,6 +1,6 @@ <?php -if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ; +defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php'); $mydirname = basename( dirname( __DIR__ ) ) ; $mydirpath = dirname(__DIR__) ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/index.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/index.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/index.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -1,7 +1,7 @@ <?php -require '../../mainfile.php' ; -if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ; +require dirname(dirname(__DIR__)) . '/mainfile.php'; +defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php'); $mydirname = basename(__DIR__) ; $mydirpath = __DIR__ ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/module_icon.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/module_icon.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/module_icon.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -1,9 +1,9 @@ <?php $xoopsOption['nocommon'] = true ; -require '../../mainfile.php' ; +require dirname(dirname(__DIR__)) . '/mainfile.php'; -if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ; +defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php'); $mydirname = basename(__DIR__) ; $mydirpath = __DIR__ ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/mytrustdirname.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/mytrustdirname.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/mytrustdirname.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -1,6 +1,6 @@ <?php // edit for xoops 2.4 core by phppp and trabis -if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ; +defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php'); $mytrustdirname = 'protector'; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -1,6 +1,6 @@ <?php -if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ; +defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php'); $mydirname = basename(__DIR__) ; $mydirpath = __DIR__ ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification_update.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification_update.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/notification_update.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -1,6 +1,6 @@ <?php -require '../../mainfile.php' ; -if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ; +require dirname(dirname(__DIR__)) . '/mainfile.php'; +defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php'); $mydirname = basename(__DIR__) ; $mydirpath = __DIR__ ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/oninstall.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/oninstall.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/oninstall.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -1,6 +1,6 @@ <?php -if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ; +defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php'); $mydirname = basename(__DIR__) ; $mydirpath = __DIR__ ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onuninstall.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onuninstall.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onuninstall.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -1,6 +1,6 @@ <?php -if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ; +defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php'); $mydirname = basename(__DIR__) ; $mydirpath = __DIR__ ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onupdate.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onupdate.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/onupdate.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -1,6 +1,6 @@ <?php -if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ; +defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php'); $mydirname = basename(__DIR__) ; $mydirpath = __DIR__ ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/search.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/search.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/search.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -1,6 +1,6 @@ <?php -if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ; +defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php'); $mydirname = basename(__DIR__) ; $mydirpath = __DIR__ ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/xoops_version.php 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/xoops_version.php 2014-11-16 11:00:20 UTC (rev 12849) @@ -1,6 +1,6 @@ <?php -if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ; +defined("XOOPS_TRUST_PATH") || die('set XOOPS_TRUST_PATH into mainfile.php'); $mydirname = basename(__DIR__) ; $mydirpath = __DIR__ ; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/templates/system_banner.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/templates/system_banner.html 2014-11-16 10:46:18 UTC (rev 12848) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/templates/system_banner.html 2014-11-16 11:00:20 UTC (rev 12849) @@ -67,4 +67,4 @@ <tr> <td class="head" colspan="7"> </td> </tr> -</table><br /> \ No newline at end of file +</table><br /> |
From: <be...@us...> - 2014-11-16 11:23:33
|
Revision: 12850 http://sourceforge.net/p/xoops/svn/12850 Author: beckmi Date: 2014-11-16 11:23:28 +0000 (Sun, 16 Nov 2014) Log Message: ----------- Added spinner.icon (timgno) Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/icons/16/spinner.gif Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-11-16 11:00:20 UTC (rev 12849) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-11-16 11:23:28 UTC (rev 12850) @@ -20,7 +20,7 @@ =============================== -2014-06-20: Version 2.5.7 Final (Patch) +2014-06-20: Version 2.5.7 Final (Patch 1) =============================== - Updating docu for the correct version of tablesorter (mamba) Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/icons/16/spinner.gif =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/icons/16/spinner.gif =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/icons/16/spinner.gif 2014-11-16 11:00:20 UTC (rev 12849) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/icons/16/spinner.gif 2014-11-16 11:23:28 UTC (rev 12850) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/icons/16/spinner.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property |
From: <be...@us...> - 2014-11-24 11:31:48
|
Revision: 12869 http://sourceforge.net/p/xoops/svn/12869 Author: beckmi Date: 2014-11-24 11:31:40 +0000 (Mon, 24 Nov 2014) Log Message: ----------- fixes for Footer blocks, incl. Default theme Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/class/theme_blocks.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/defines.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/style.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/xo-info.php Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_c.html XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_l.html XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_r.html Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-11-23 20:41:51 UTC (rev 12868) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-11-24 11:31:40 UTC (rev 12869) @@ -13,6 +13,7 @@ - reverting couple of $i++ conversions (zyspec/mamba) - updated xBootstrap to Bootstrap 3.3.1 (Angelo Rocha) - Some code cleanup for private messages (Dingjie (Daniel) Yang/rgriffith) +- Adding Footer blocks (timgno/mamba) Security fixes - ID: 1295 Added X-Frame-Options header to prevent clickjacking in modern browsers, reported by Narendra Bhati. Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/theme_blocks.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/theme_blocks.php 2014-11-23 20:41:51 UTC (rev 12868) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/theme_blocks.php 2014-11-24 11:31:40 UTC (rev 12869) @@ -106,8 +106,8 @@ XOOPS_FOOTERBLOCK_LEFT => 'footer_left', - XOOPS_FOOTERBLOCK_RIGHT => 'footer_center' , - XOOPS_FOOTERBLOCK_CENTER => 'footer_right' , + XOOPS_FOOTERBLOCK_RIGHT => 'footer_right' , + XOOPS_FOOTERBLOCK_CENTER => 'footer_center' , XOOPS_FOOTERBLOCK_ALL => 'footer_all' ); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/include/defines.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/include/defines.php 2014-11-23 20:41:51 UTC (rev 12868) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/include/defines.php 2014-11-24 11:31:40 UTC (rev 12869) @@ -33,8 +33,8 @@ define('XOOPS_CENTERBLOCK_BOTTOM', 9); // Footer blocks (Timgno) define('XOOPS_FOOTERBLOCK_LEFT', 10); -define('XOOPS_FOOTERBLOCK_CENTER', 11); -define('XOOPS_FOOTERBLOCK_RIGHT', 12); +define('XOOPS_FOOTERBLOCK_RIGHT', 11); +define('XOOPS_FOOTERBLOCK_CENTER', 12); define('XOOPS_FOOTERBLOCK_ALL', 13); define('XOOPS_BLOCK_INVISIBLE', 0); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/style.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/style.css 2014-11-23 20:41:51 UTC (rev 12868) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/style.css 2014-11-24 11:31:40 UTC (rev 12869) @@ -69,7 +69,7 @@ #centercolumn th {background-color: #2A75C5; color: #fff; vertical-align: middle;} #centerCcolumn, #bottomCcolumn {padding: 0 3px 1px 3px;} -#centerCcolumn .blockTitle, #bottomCcolumn .blockTitle {padding: 3px; color: #2A75C5; font-weight: bold; margin-top: 0; margin-right: 0; margin-left: 0; font-size:1.1em;} +#centerCcolumn .blockTitle, #bottomCcolumn .blockTitle {padding: 3px; color: #2A75C5; font-weight: bold; margin-top: 0; margin-right: 0; margin-left: 0; font-size:1.1em;} #centerCcolumn .blockContent, #bottomCcolumn .blockContent {border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-bottom: 1px solid #ddd; padding: 3px; margin-right: 0; margin-left: 0; margin-bottom: 2px; line-height: 1.2em;} #centerLcolumn, #bottomLcolumn, #centerRcolumn, #bottomRcolumn { @@ -89,6 +89,18 @@ #rightcolumn .blockTitle {padding: 3px; background-color: #ddd; color: #2A75C5; font-weight: bold;} #rightcolumn .blockContent {padding: 3px; line-height: 1.2em;} +/* ------------------ start Footer Blocks ----------------- */ + +#footerLeft .blockTitle, #footerCenter .blockTitle, #footerRight .blockTitle { + padding: 3px; + color: #2A75C5; + font-weight: bold; +} + +#footerLeft .blockContent, #footerCenter .blockContent, #footerRight .blockContent {border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-bottom: 1px solid #ddd; padding: 3px; margin-right: 0; margin-left: 0; margin-bottom: 2px; line-height: 1.2em;} + +/* ------------------ end Footer Blocks ----------------- */ + #footerbar { background-image: url(hbar.gif); font-size:.9em; height : 23px;} #footerbar td { vertical-align : middle; text-align:center;} Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_c.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_c.html (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_c.html 2014-11-24 11:31:40 UTC (rev 12869) @@ -0,0 +1,8 @@ +<div style="padding: 5px;"> + <fieldset> + <{if $block.title}> + <legend class="blockTitle"><{$block.title}></legend> + <{/if}> + <div class="blockContent"><{$block.content}></div> + </fieldset> +</div> Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_l.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_l.html (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_l.html 2014-11-24 11:31:40 UTC (rev 12869) @@ -0,0 +1,8 @@ +<div style="padding: 5px;"> + <fieldset> + <{if $block.title}> + <legend class="blockTitle"><{$block.title}></legend> + <{/if}> + <div class="blockContent"><{$block.content}></div> + </fieldset> +</div> Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_r.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_r.html (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_r.html 2014-11-24 11:31:40 UTC (rev 12869) @@ -0,0 +1,8 @@ +<div style="padding: 5px;"> + <fieldset> + <{if $block.title}> + <legend class="blockTitle"><{$block.title}></legend> + <{/if}> + <div class="blockContent"><{$block.content}></div> + </fieldset> +</div> Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/xo-info.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/xo-info.php 2014-11-23 20:41:51 UTC (rev 12868) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/xo-info.php 2014-11-24 11:31:40 UTC (rev 12869) @@ -23,7 +23,7 @@ return array( - 'copyright' => '© XOOPS Core Team, maintained by XOOPS Design Team led by Kris', + 'copyright' => '© XOOPS Core Team, maintained by XOOPS Design Team', // Types of language constants "languages" => array("main", "admin"), ); |
From: <be...@us...> - 2015-02-14 10:36:58
|
Revision: 12977 http://sourceforge.net/p/xoops/svn/12977 Author: beckmi Date: 2015-02-14 10:36:50 +0000 (Sat, 14 Feb 2015) Log Message: ----------- fix "setExtra" in moduleadmin.php, Admin buttons can now use "onClick" assignments (mamba) Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-02-13 22:47:42 UTC (rev 12976) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-02-14 10:36:50 UTC (rev 12977) @@ -5,7 +5,7 @@ =============================== - replaced "dirname(__FILE__)" with "__DIR__" since the min. PHP is now 5.3.7, and __DIR__ is faster (mamba) - updating some copyright notices (mamba) -- Fix issues when protector 'id_forceintval' preference is enabled, that manifests as an error when deleting private messages. (rgriffith) +- fix issues when protector 'id_forceintval' preference is enabled, that manifests as an error when deleting private messages. (rgriffith) - fix for Update setting Template import date to 0 (timgno/mamba) - Adding language constants for Protector's Prefix Manager (slider84/mamba) - allowing for "https" URL in YouTube links in Textsanitizer (mamba) @@ -17,6 +17,7 @@ - fixing a bug in xmlrpc.php (wppd/rgriffith) - remove addrFormat override in XoopsMultiMailer (rgriffith) - patch from Xoops 2.5.6 XoopsFormSelectUser is not compatible with some old modules like xNews (luciorota) +- fix "setExtra" in moduleadmin.php, Admin buttons can now use "onClick" assignments (mamba) Security fixes Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2015-02-13 22:47:42 UTC (rev 12976) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2015-02-14 10:36:50 UTC (rev 12977) @@ -178,8 +178,8 @@ } $ret .= "<div class=\"xo-buttons\">\n"; foreach (array_keys( $this -> _itemButton) as $i) { - $ret .= "<a class='ui-corner-all tooltip' href='" . $this -> _itemButton[$i]['link'] . "' title='" . $this -> _itemButton[$i]['title'] . "'>"; - $ret .= "<img src='" . $path . $this -> _itemButton[$i]['icon'] . "' title='" . $this -> _itemButton[$i]['title'] . "' />" . $this -> _itemButton[$i]['title'] . ' ' . $this -> _itemButton[$i]['extra']; + $ret .= "<a class='ui-corner-all tooltip' href='" . $this -> _itemButton[$i]['link'] . "' title='" . $this -> _itemButton[$i]['title'] . "' " . $this -> _itemButton[$i]['extra']. ">"; + $ret .= "<img src='" . $path . $this -> _itemButton[$i]['icon'] . "' title='" . $this -> _itemButton[$i]['title'] . "' alt='" . $this -> _itemButton[$i]['title'] . "' />" . $this -> _itemButton[$i]['title'] ; $ret .= "</a>\n"; $ret .= $delimeter; } |
From: <be...@us...> - 2015-05-23 04:29:29
|
Revision: 13065 http://sourceforge.net/p/xoops/svn/13065 Author: beckmi Date: 2015-05-23 04:29:24 +0000 (Sat, 23 May 2015) Log Message: ----------- Updating jQuery to 1.11.3, UI to 1.11.4 Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_65_ffffff_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_222222_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-bg_flat_0_aaaaaa_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-bg_flat_75_ffffff_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_55_fbf9ee_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_65_ffffff_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_75_dadada_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_75_e6e6e6_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_95_fef1ec_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-bg_highlight-soft_75_cccccc_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-icons_222222_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-icons_2e83ff_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-icons_454545_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-icons_888888_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-icons_cd0a0a_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/ui.all.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/ui.all.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-bg_glass_50_3baae3_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-icons_2694e8_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-icons_2e83ff_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-icons_3d80b3_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-icons_72a7cf_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-icons_ffffff_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/ui.all.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-bg_flat_55_fbec88_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-bg_glass_85_dfeffc_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-bg_glass_95_fef1ec_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-icons_217bc0_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-icons_2e83ff_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-icons_469bdd_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-icons_6da8d5_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-icons_cd0a0a_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-icons_d8e7f3_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-icons_f9bd01_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/ui.all.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-bg_flat_75_ffffff_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-bg_glass_65_ffffff_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-bg_glass_75_dadada_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-icons_222222_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-icons_2e83ff_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-icons_454545_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-icons_888888_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-icons_cd0a0a_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/ui.all.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-bg_glass_55_fcf0ba_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-bg_gloss-wave_100_ece8da_500x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-hard_100_f5f3e5_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-hard_100_fafaf4_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-hard_15_459e00_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-hard_95_cccccc_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-soft_25_67b021_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-soft_95_ffedad_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-bg_inset-soft_15_2b2922_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-icons_808080_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-icons_847e71_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-icons_8dc262_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-icons_cd0a0a_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-icons_eeeeee_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-icons_ffffff_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/ui.all.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_flat_30_cccccc_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_flat_50_5c5c5c_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_glass_20_555555_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_glass_40_0078a3_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_glass_40_ffc73d_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_gloss-wave_25_333333_500x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_highlight-soft_80_eeeeee_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_inset-soft_25_000000_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_inset-soft_30_f58400_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-icons_222222_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-icons_4b8e0b_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-icons_a83300_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-icons_cccccc_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-icons_ffffff_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/ui.all.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_flat_10_000000_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-icons_222222_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-icons_228ef1_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-icons_ef8c08_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-icons_ffd27a_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-icons_ffffff_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/ui.all.css XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/Frameworks/jquery/jquery.js XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/Frameworks/jquery/plugins/jquery.ui.js Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_18_b81900_40x40.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_20_666666_40x40.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_flat_10_000000_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_f6f6f6_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_fdf5ce_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_gloss-wave_35_f6a828_500x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_100_eeeeee_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_75_ffe45c_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_228ef1_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ef8c08_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffd27a_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffffff_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.structure.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery-ui.structure.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery-ui.theme.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/theme.css Removed Paths: ------------- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_flat_0_aaaaaa_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_flat_75_ffffff_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_55_fbf9ee_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_75_dadada_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_75_e6e6e6_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_95_fef1ec_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_2e83ff_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_454545_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_888888_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_cd0a0a_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.accordion.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.all.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.autocomplete.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.base.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.button.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.core.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.datepicker.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.dialog.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.menu.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.progressbar.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.resizable.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.selectable.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.slider.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.spinner.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.tabs.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.tooltip.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.accordion.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.autocomplete.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.button.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.core.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.datepicker.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.dialog.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.menu.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.progressbar.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.resizable.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.selectable.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.slider.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.spinner.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.tabs.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.theme.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.tooltip.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/jquery.ui.theme.css Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-05-23 04:29:24 UTC (rev 13065) @@ -27,6 +27,8 @@ Updated: - TinyMCE to 3.5.11 (mamba) - PHPMailer to 5.2.9 (rgriffith) + - jQuery to 1.11.3 (mamba) + - jQuery UI 1.11.4 (mamba) =============================== Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/animated-overlay.gif =================================================================== (Binary files differ) Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_18_b81900_40x40.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_18_b81900_40x40.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_18_b81900_40x40.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_18_b81900_40x40.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_18_b81900_40x40.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_20_666666_40x40.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_20_666666_40x40.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_20_666666_40x40.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_20_666666_40x40.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_20_666666_40x40.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_flat_0_aaaaaa_40x100.png =================================================================== (Binary files differ) Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_flat_10_000000_40x100.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_flat_10_000000_40x100.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_flat_10_000000_40x100.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_flat_10_000000_40x100.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_flat_10_000000_40x100.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_flat_75_ffffff_40x100.png =================================================================== (Binary files differ) Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_f6f6f6_1x400.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_f6f6f6_1x400.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_f6f6f6_1x400.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_f6f6f6_1x400.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_f6f6f6_1x400.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_fdf5ce_1x400.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_fdf5ce_1x400.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_fdf5ce_1x400.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_fdf5ce_1x400.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_fdf5ce_1x400.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_55_fbf9ee_1x400.png =================================================================== (Binary files differ) Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_65_ffffff_1x400.png =================================================================== (Binary files differ) Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_75_dadada_1x400.png =================================================================== (Binary files differ) Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_75_e6e6e6_1x400.png =================================================================== (Binary files differ) Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_95_fef1ec_1x400.png =================================================================== (Binary files differ) Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_gloss-wave_35_f6a828_500x100.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_gloss-wave_35_f6a828_500x100.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_gloss-wave_35_f6a828_500x100.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_gloss-wave_35_f6a828_500x100.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_gloss-wave_35_f6a828_500x100.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_100_eeeeee_1x100.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_100_eeeeee_1x100.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_100_eeeeee_1x100.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_100_eeeeee_1x100.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_100_eeeeee_1x100.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png =================================================================== (Binary files differ) Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_75_ffe45c_1x100.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_75_ffe45c_1x100.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_75_ffe45c_1x100.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_75_ffe45c_1x100.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_75_ffe45c_1x100.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_222222_256x240.png =================================================================== (Binary files differ) Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_228ef1_256x240.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_228ef1_256x240.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_228ef1_256x240.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_228ef1_256x240.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_228ef1_256x240.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_2e83ff_256x240.png =================================================================== (Binary files differ) Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_454545_256x240.png =================================================================== (Binary files differ) Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_888888_256x240.png =================================================================== (Binary files differ) Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_cd0a0a_256x240.png =================================================================== (Binary files differ) Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ef8c08_256x240.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ef8c08_256x240.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ef8c08_256x240.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ef8c08_256x240.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ef8c08_256x240.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffd27a_256x240.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffd27a_256x240.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffd27a_256x240.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffd27a_256x240.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffd27a_256x240.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffffff_256x240.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffffff_256x240.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffffff_256x240.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffffff_256x240.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffffff_256x240.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.css 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.css 2015-05-23 04:29:24 UTC (rev 13065) @@ -1,7 +1,9 @@ -/*! jQuery UI - v1.10.4 - 2014-01-17 +/*! jQuery UI - v1.11.4 - 2015-05-23 * http://jqueryui.com -* Includes: jquery.ui.core.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css, jquery.ui.theme.css -* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */ +* Includes: core.css, draggable.css, resizable.css, selectable.css, sortable.css, accordion.css, autocomplete.css, button.css, datepicker.css, dialog.css, menu.css, progressbar.css, selectmenu.css, slider.css, spinner.css, tabs.css, tooltip.css, theme.css +* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px +* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */ + /* Layout helpers ----------------------------------*/ .ui-helper-hidden { @@ -46,7 +48,7 @@ left: 0; position: absolute; opacity: 0; - filter:Alpha(Opacity=0); + filter:Alpha(Opacity=0); /* support: IE8 */ } .ui-front { @@ -84,21 +86,105 @@ width: 100%; height: 100%; } - +.ui-draggable-handle { + -ms-touch-action: none; + touch-action: none; +} +.ui-resizable { + position: relative; +} +.ui-resizable-handle { + position: absolute; + font-size: 0.1px; + display: block; + -ms-touch-action: none; + touch-action: none; +} +.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; +} +.ui-resizable-e { + cursor: e-resize; + width: 7px; + right: -5px; + top: 0; + height: 100%; +} +.ui-resizable-w { + cursor: w-resize; + width: 7px; + left: -5px; + top: 0; + height: 100%; +} +.ui-resizable-se { + cursor: se-resize; + width: 12px; + height: 12px; + right: 1px; + bottom: 1px; +} +.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; +} +.ui-selectable { + -ms-touch-action: none; + touch-action: none; +} +.ui-selectable-helper { + position: absolute; + z-index: 100; + border: 1px dotted black; +} +.ui-sortable-handle { + -ms-touch-action: none; + touch-action: none; +} .ui-accordion .ui-accordion-header { display: block; cursor: pointer; position: relative; - margin-top: 2px; + margin: 2px 0 0 0; padding: .5em .5em .5em .7em; min-height: 0; /* support: IE7 */ + font-size: 100%; } .ui-accordion .ui-accordion-icons { padding-left: 2.2em; } -.ui-accordion .ui-accordion-noicons { - padding-left: .7em; -} .ui-accordion .ui-accordion-icons .ui-accordion-icons { padding-left: 2.2em; } @@ -113,14 +199,12 @@ border-top: 0; overflow: auto; } - .ui-autocomplete { position: absolute; top: 0; left: 0; cursor: default; } - .ui-button { display: inline-block; position: relative; @@ -225,7 +309,6 @@ border: 0; padding: 0; } - .ui-datepicker { width: 17em; padding: .2em .2em 0; @@ -278,7 +361,7 @@ } .ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year { - width: 49%; + width: 45%; } .ui-datepicker table { width: 100%; @@ -391,7 +474,6 @@ border-right-width: 0; border-left-width: 1px; } - .ui-dialog { overflow: hidden; position: absolute; @@ -452,77 +534,59 @@ .ui-draggable .ui-dialog-titlebar { cursor: move; } - .ui-menu { list-style: none; - padding: 2px; + padding: 0; margin: 0; display: block; outline: none; } .ui-menu .ui-menu { - margin-top: -3px; position: absolute; } .ui-menu .ui-menu-item { + position: relative; margin: 0; - padding: 0; - width: 100%; + padding: 3px 1em 3px .4em; + cursor: pointer; + min-height: 0; /* support: IE7 */ /* support: IE10, see #8844 */ - list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7); + list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"); } .ui-menu .ui-menu-divider { - margin: 5px -2px 5px -2px; + margin: 5px 0; height: 0; font-size: 0; line-height: 0; border-width: 1px 0 0 0; } -.ui-menu .ui-menu-item a { - text-decoration: none; - display: block; - padding: 2px .4em; - line-height: 1.5; - min-height: 0; /* support: IE7 */ - font-weight: normal; -} -.ui-menu .ui-menu-item a.ui-state-focus, -.ui-menu .ui-menu-item a.ui-state-active { - font-weight: normal; +.ui-menu .ui-state-focus, +.ui-menu .ui-state-active { margin: -1px; } -.ui-menu .ui-state-disabled { - font-weight: normal; - margin: .4em 0 .2em; - line-height: 1.5; -} -.ui-menu .ui-state-disabled a { - cursor: default; -} - /* icon support */ .ui-menu-icons { position: relative; } -.ui-menu-icons .ui-menu-item a { - position: relative; +.ui-menu-icons .ui-menu-item { padding-left: 2em; } /* left-aligned */ .ui-menu .ui-icon { position: absolute; - top: .2em; + top: 0; + bottom: 0; left: .2em; + margin: auto 0; } /* right-aligned */ .ui-menu .ui-menu-icon { - position: static; - float: right; + left: auto; + right: 0; } - .ui-progressbar { height: 2em; text-align: left; @@ -533,90 +597,63 @@ height: 100%; } .ui-progressbar .ui-progressbar-overlay { - background: url("images/animated-overlay.gif"); + background: url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw=="); height: 100%; - filter: alpha(opacity=25); + filter: alpha(opacity=25); /* support: IE8 */ opacity: 0.25; } .ui-progressbar-indeterminate .ui-progressbar-value { background-image: none; } - -.ui-resizable { - position: relative; -} -.ui-resizable-handle { +.ui-selectmenu-menu { + padding: 0; + margin: 0; position: absolute; - font-size: 0.1px; - display: block; -} -.ui-resizable-disabled .ui-resizable-handle, -.ui-resizable-autohide .ui-resizable-handle { + top: 0; + left: 0; display: none; } -.ui-resizable-n { - cursor: n-resize; - height: 7px; - width: 100%; - top: -5px; - left: 0; +.ui-selectmenu-menu .ui-menu { + overflow: auto; + /* Support: IE7 */ + overflow-x: hidden; + padding-bottom: 1px; } -.ui-resizable-s { - cursor: s-resize; - height: 7px; - width: 100%; - bottom: -5px; - left: 0; +.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup { + font-size: 1em; + font-weight: bold; + line-height: 1.5; + padding: 2px 0.4em; + margin: 0.5em 0 0 0; + height: auto; + border: 0; } -.ui-resizable-e { - cursor: e-resize; - width: 7px; - right: -5px; - top: 0; - height: 100%; +.ui-selectmenu-open { + display: block; } -.ui-resizable-w { - cursor: w-resize; - width: 7px; - left: -5px; - top: 0; - height: 100%; +.ui-selectmenu-button { + display: inline-block; + overflow: hidden; + position: relative; + text-decoration: none; + cursor: pointer; } -.ui-resizable-se { - cursor: se-resize; - width: 12px; - height: 12px; - right: 1px; - bottom: 1px; +.ui-selectmenu-button span.ui-icon { + right: 0.5em; + left: auto; + margin-top: -8px; + position: absolute; + top: 50%; } -.ui-resizable-sw { - cursor: sw-resize; - width: 9px; - height: 9px; - left: -5px; - bottom: -5px; +.ui-selectmenu-button span.ui-selectmenu-text { + text-align: left; + padding: 0.4em 2.1em 0.4em 1em; + display: block; + line-height: 1.4; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } -.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; -} - -.ui-selectable-helper { - position: absolute; - z-index: 100; - border: 1px dotted black; -} - .ui-slider { position: relative; text-align: left; @@ -627,6 +664,8 @@ width: 1.2em; height: 1.2em; cursor: default; + -ms-touch-action: none; + touch-action: none; } .ui-slider .ui-slider-range { position: absolute; @@ -637,7 +676,7 @@ background-position: 0 0; } -/* For IE8 - See #6727 */ +/* support: IE8 - See #6727 */ .ui-slider.ui-state-disabled .ui-slider-handle, .ui-slider.ui-state-disabled .ui-slider-range { filter: inherit; @@ -680,7 +719,6 @@ .ui-slider-vertical .ui-slider-range-max { top: 0; } - .ui-spinner { position: relative; display: inline-block; @@ -736,7 +774,6 @@ /* need to fix icons sprite */ background-position: -65px -16px; } - .ui-tabs { position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */ padding: .2em; @@ -778,7 +815,6 @@ padding: 1em 1.4em; background: none; } - .ui-tooltip { padding: 8px; position: absolute; @@ -794,8 +830,8 @@ /* Component containers ----------------------------------*/ .ui-widget { - font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; - font-size: 1.1em/*{fsDefault}*/; + font-family: Verdana,Arial,sans-serif; + font-size: 1.1em; } .ui-widget .ui-widget { font-size: 1em; @@ -804,25 +840,25 @@ .ui-widget select, .ui-widget textarea, .ui-widget button { - font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; + font-family: Verdana,Arial,sans-serif; font-size: 1em; } .ui-widget-content { - border: 1px solid #aaaaaa/*{borderColorContent}*/; - background: #ffffff/*{bgColorContent}*/ url(images/ui-bg_flat_75_ffffff_40x100.png)/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/; - color: #222222/*{fcContent}*/; + border: 1px solid #aaaaaa; + background: #ffffff url("images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x; + color: #222222; } .ui-widget-content a { - color: #222222/*{fcContent}*/; + color: #222222; } .ui-widget-header { - border: 1px solid #aaaaaa/*{borderColorHeader}*/; - background: #cccccc/*{bgColorHeader}*/ url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/; - color: #222222/*{fcHeader}*/; + border: 1px solid #aaaaaa; + background: #cccccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x; + color: #222222; font-weight: bold; } .ui-widget-header a { - color: #222222/*{fcHeader}*/; + color: #222222; } /* Interaction states @@ -830,15 +866,15 @@ .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { - border: 1px solid #d3d3d3/*{borderColorDefault}*/; - background: #e6e6e6/*{bgColorDefault}*/ url(images/ui-bg_glass_75_e6e6e6_1x400.png)/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/; - font-weight: normal/*{fwDefault}*/; - color: #555555/*{fcDefault}*/; + border: 1px solid #d3d3d3; + background: #e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x; + font-weight: normal; + color: #555555; } .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { - color: #555555/*{fcDefault}*/; + color: #555555; text-decoration: none; } .ui-state-hover, @@ -847,10 +883,10 @@ .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { - border: 1px solid #999999/*{borderColorHover}*/; - background: #dadada/*{bgColorHover}*/ url(images/ui-bg_glass_75_dadada_1x400.png)/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/; - font-weight: normal/*{fwDefault}*/; - color: #212121/*{fcHover}*/; + border: 1px solid #999999; + background: #dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x; + font-weight: normal; + color: #212121; } .ui-state-hover a, .ui-state-hover a:hover, @@ -860,21 +896,21 @@ .ui-state-focus a:hover, .ui-state-focus a:link, .ui-state-focus a:visited { - color: #212121/*{fcHover}*/; + color: #212121; text-decoration: none; } .ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { - border: 1px solid #aaaaaa/*{borderColorActive}*/; - background: #ffffff/*{bgColorActive}*/ url(images/ui-bg_glass_65_ffffff_1x400.png)/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/; - font-weight: normal/*{fwDefault}*/; - color: #212121/*{fcActive}*/; + border: 1px solid #aaaaaa; + background: #ffffff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x; + font-weight: normal; + color: #212121; } .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { - color: #212121/*{fcActive}*/; + color: #212121; text-decoration: none; } @@ -883,31 +919,31 @@ .ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight { - border: 1px solid #fcefa1/*{borderColorHighlight}*/; - background: #fbf9ee/*{bgColorHighlight}*/ url(images/ui-bg_glass_55_fbf9ee_1x400.png)/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/; - color: #363636/*{fcHighlight}*/; + border: 1px solid #fcefa1; + background: #fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x; + color: #363636; } .ui-state-highlight a, .ui-widget-content .ui-state-highlight a, .ui-widget-header .ui-state-highlight a { - color: #363636/*{fcHighlight}*/; + color: #363636; } .ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error { - border: 1px solid #cd0a0a/*{borderColorError}*/; - background: #fef1ec/*{bgColorError}*/ url(images/ui-bg_glass_95_fef1ec_1x400.png)/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/; - color: #cd0a0a/*{fcError}*/; + border: 1px solid #cd0a0a; + background: #fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x; + color: #cd0a0a; } .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { - color: #cd0a0a/*{fcError}*/; + color: #cd0a0a; } .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { - color: #cd0a0a/*{fcError}*/; + color: #cd0a0a; } .ui-priority-primary, .ui-widget-content .ui-priority-primary, @@ -918,18 +954,18 @@ .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; - filter:Alpha(Opacity=70); + filter:Alpha(Opacity=70); /* support: IE8 */ font-weight: normal; } .ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; - filter:Alpha(Opacity=35); + filter:Alpha(Opacity=35); /* support: IE8 */ background-image: none; } .ui-state-disabled .ui-icon { - filter:Alpha(Opacity=35); /* For IE8 - See #6059 */ + filter:Alpha(Opacity=35); /* support: IE8 - See #6059 */ } /* Icons @@ -942,27 +978,27 @@ } .ui-icon, .ui-widget-content .ui-icon { - background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; + background-image: url("images/ui-icons_222222_256x240.png"); } .ui-widget-header .ui-icon { - background-image: url(images/ui-icons_222222_256x240.png)/*{iconsHeader}*/; + background-image: url("images/ui-icons_222222_256x240.png"); } .ui-state-default .ui-icon { - background-image: url(images/ui-icons_888888_256x240.png)/*{iconsDefault}*/; + background-image: url("images/ui-icons_888888_256x240.png"); } .ui-state-hover .ui-icon, .ui-state-focus .ui-icon { - background-image: url(images/ui-icons_454545_256x240.png)/*{iconsHover}*/; + background-image: url("images/ui-icons_454545_256x240.png"); } .ui-state-active .ui-icon { - background-image: url(images/ui-icons_454545_256x240.png)/*{iconsActive}*/; + background-image: url("images/ui-icons_454545_256x240.png"); } .ui-state-highlight .ui-icon { - background-image: url(images/ui-icons_2e83ff_256x240.png)/*{iconsHighlight}*/; + background-image: url("images/ui-icons_2e83ff_256x240.png"); } .ui-state-error .ui-icon, .ui-state-error-text .ui-icon { - background-image: url(images/ui-icons_cd0a0a_256x240.png)/*{iconsError}*/; + background-image: url("images/ui-icons_cd0a0a_256x240.png"); } /* positioning */ @@ -1152,38 +1188,38 @@ .ui-corner-top, .ui-corner-left, .ui-corner-tl { - border-top-left-radius: 4px/*{cornerRadius}*/; + border-top-left-radius: 4px; } .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { - border-top-right-radius: 4px/*{cornerRadius}*/; + border-top-right-radius: 4px; } .ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { - border-bottom-left-radius: 4px/*{cornerRadius}*/; + border-bottom-left-radius: 4px; } .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { - border-bottom-right-radius: 4px/*{cornerRadius}*/; + border-bottom-right-radius: 4px; } /* Overlays */ .ui-widget-overlay { - background: #aaaaaa/*{bgColorOverlay}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/; - opacity: .3/*{opacityOverlay}*/; - filter: Alpha(Opacity=30)/*{opacityFilterOverlay}*/; + background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x; + opacity: .3; + filter: Alpha(Opacity=30); /* support: IE8 */ } .ui-widget-shadow { - margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/; - padding: 8px/*{thicknessShadow}*/; - background: #aaaaaa/*{bgColorShadow}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/; - opacity: .3/*{opacityShadow}*/; - filter: Alpha(Opacity=30)/*{opacityFilterShadow}*/; - border-radius: 8px/*{cornerRadiusShadow}*/; + margin: -8px 0 0 -8px; + padding: 8px; + background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x; + opacity: .3; + filter: Alpha(Opacity=30); /* support: IE8 */ + border-radius: 8px; } Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.structure.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.structure.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.structure.css 2015-05-23 04:29:24 UTC (rev 13065) @@ -0,0 +1,833 @@ +/*! + * jQuery UI CSS Framework 1.11.4 + * http://jqueryui.com + * + * Copyright jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + * + * http://api.jqueryui.com/category/theming/ + */ + +/* Layout helpers +----------------------------------*/ +.ui-helper-hidden { + display: none; +} +.ui-helper-hidden-accessible { + border: 0; + clip: rect(0 0 0 0); + height: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + width: 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:before, +.ui-helper-clearfix:after { + content: ""; + display: table; + border-collapse: collapse; +} +.ui-helper-clearfix:after { + clear: both; +} +.ui-helper-clearfix { + min-height: 0; /* support: IE7 */ +} +.ui-helper-zfix { + width: 100%; + height: 100%; + top: 0; + left: 0; + position: absolute; + opacity: 0; + filter:Alpha(Opacity=0); /* support: IE8 */ +} + +.ui-front { + z-index: 100; +} + + +/* Interaction Cues +----------------------------------*/ +.ui-state-disabled { + cursor: default !important; +} + + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { + display: block; + text-indent: -99999px; + overflow: hidden;... [truncated message content] |
From: <be...@us...> - 2015-06-06 21:59:47
|
Revision: 13082 http://sourceforge.net/p/xoops/svn/13082 Author: beckmi Date: 2015-06-06 21:59:41 +0000 (Sat, 06 Jun 2015) Log Message: ----------- Updating XOOPS copyright to 2015 Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/jquery.php XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/main.php XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/language/english/admin/filemanager.php XoopsCore/branches/2.5.x/2.5.8/extras/mysqli/mysqldatabase.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.cache.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.ini.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.locale.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/object.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoopsart.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/language/english/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/backend.php XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php XoopsCore/branches/2.5.x/2.5.8/htdocs/browse.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ads.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ldap.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_provisionning.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_xoops.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/authfactory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/apc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/file.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/memcache.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/model.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xcache.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xoopscache.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/config.image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/config.recaptcha.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/config.text.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/image/scripts/image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/recaptcha.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/text.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/xoopscaptcha.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/commentrenderer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/criteria.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/database/database.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/database/databasefactory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/database/mysqldatabase.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/database/sqlutility.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/downloader.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/errorhandler.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/file/file.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/file/folder.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/file/xoopsfile.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/logger/render.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/logger/xoopslogger.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/logger.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/logger_render.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/xoopsmultimailer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mimetypes.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/joint.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/read.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/stats.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/sync.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/write.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/xoopsmodel.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/module.errorhandler.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/module.textsanitizer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/pagenav.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/preload.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.foreachq.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.includeq.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.xoAdminIcons.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.xoAdminNav.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.xoAppUrl.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.xoImgUrl.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIcons16.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIcons32.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIconsBookmarks.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoMemberInfo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoops_link.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/resource.db.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/tardownloader.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/template.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/censor/censor.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/censor/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/config.custom.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/flash/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/flash/flash.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/iframe/iframe.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/image/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/image/image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/li/li.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/mms/mms.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/mp3/mp3.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/rtsp/rtsp.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/syntaxhighlight/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/textfilter/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/textfilter/textfilter.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/ul/ul.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wiki/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wiki/wiki.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wmp/wmp.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/theme.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/theme_blocks.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/tree.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/uploader.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/userutility.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/utility/xoopsutility.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/bloggerapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/metaweblogapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/movabletypeapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpcapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpcparser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpctag.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xoopsapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rss/xmlrss2parser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/themesetparser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsblock.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopscomments.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/dhtmltextarea.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/editor_registry.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/language/english.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/sampleform.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/textarea/editor_registry.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/textarea/language/english.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/textarea/textarea.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/editor_registry.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/formtinymce.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopscode.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsemotions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsimagemanager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsmlcontent.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsquote.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/language/english.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/settings.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/xoopseditor.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/xoopseditor.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsfilterinput.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/form.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formbutton.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formbuttontray.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formcaptcha.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formcheckbox.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formcolorpicker.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formdatetime.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formdhtmltextarea.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formeditor.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formelement.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formelementtray.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formfile.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formhidden.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formhiddentoken.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formlabel.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formpassword.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formradio.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formradioyn.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselect.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselectcheckgroup.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselectcountry.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselecteditor.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselectgroup.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselectlang.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselectmatchoption.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselecttheme.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselecttimezone.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formtext.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formtextarea.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formtextdateselect.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/grouppermform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/simpleform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/tableform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/themeform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsformloader.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopskernel.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopslists.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsload.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopslocal.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsmailer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsmodule.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsobject.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsrequest.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopssecurity.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsstory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopstopic.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopstree.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsuser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/zipdownloader.php XoopsCore/branches/2.5.x/2.5.8/htdocs/edituser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/footer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/imagemanager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/checklogin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_constants.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_delete.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_edit.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_form.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_new.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_post.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_reply.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_view.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/commentform.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/common.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/cp_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/cp_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/defines.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/findusers.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/formdhtmltextarea_preview.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.encoding.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.legacy.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/license.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/mimetypes.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_constants.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_select.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_update.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/old_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/old_theme_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/registerform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/searchform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/site-closed.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/xoops13_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/xoopscodes.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/xoopslocal.php XoopsCore/branches/2.5.x/2.5.8/htdocs/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/class/dbmanager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/class/installwizard.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/class/pathcontroller.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/cleanup.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/css/reset.css XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/common.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/createconfigform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/install_tpl.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/license.dist.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/makedata.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/modulesadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/page.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/language/english/install.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_configsave.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_configsite.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_dbconnection.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_dbsettings.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_end.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_langselect.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_modcheck.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_moduleinstaller.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_pathsettings.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_siteinit.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_start.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_tablescreate.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_tablesfill.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_theme.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/avatar.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/block.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/blockinstance.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/comment.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/configcategory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/configitem.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/configoption.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/group.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/groupperm.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/handlerregistry.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/imagecategory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/imageset.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/imagesetimg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/member.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/module.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/notification.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/object.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/online.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/privmessage.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/session.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/tplfile.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/tplset.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/language/english/formdhtmltextarea.php XoopsCore/branches/2.5.x/2.5.8/htdocs/language/english/locale.php XoopsCore/branches/2.5.x/2.5.8/htdocs/language/english/logger.php XoopsCore/branches/2.5.x/2.5.8/htdocs/language/english/xoopsmailerlocal.php XoopsCore/branches/2.5.x/2.5.8/htdocs/lostpass.php XoopsCore/branches/2.5.x/2.5.8/htdocs/mainfile.dist.php XoopsCore/branches/2.5.x/2.5.8/htdocs/misc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin_footer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/prune.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/class/message.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/include/install.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/include/update.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/pmlite.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/preloads/core.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/preloads/system.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/readpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/viewpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/activate.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/about.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/admin_footer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/admin_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/category.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/field.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/permissions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/step.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/visibility.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/changemail.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/changepass.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/class/category.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/class/field.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/class/profile.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/class/regstep.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/class/visibility.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/edituser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/footer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/include/forms.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/include/install.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/include/update.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/lostpass.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/preloads/core.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/register.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/userinfo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/preloads/core.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/avatars/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/avatars/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/banners/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/banners/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/blocksadmin/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/blocksadmin/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/admin_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/comment_delete.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/comment_edit.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/comment_post.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/groups/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/groups/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/images/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/images/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/mailusers/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/mailusers/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/maintenance/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/maintenance/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/preferences/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/preferences/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/smilies/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/smilies/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/jquery.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/userrank/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/userrank/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/jquery.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/users.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/blocks/system_blocks.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/avatar.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/banner.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/bannerclient.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/bannerfinish.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/block.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/blocklinkmodule.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/breadcrumb.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/cookie.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/cpanel.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/group.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/gui.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/maintenance.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/smilies.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/userrank.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/users.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/constants.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/menu.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/help.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/include/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/include/update.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/js/admin.js XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/js/module.js XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/avatars.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/banners.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/blocksadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/comments.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/images.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/mailusers.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/maintenance.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/preferences.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/smilies.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/tplsets.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/userrank.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/users.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/preloads/core.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/accordion.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/buttonbar.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/choosestyle.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/content.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/dark.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/dashboard.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/footer.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/forms.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/globalnav.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/icons.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/logger.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/orange.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/pagenav.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/reset.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/silver.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/style.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/tablesorter.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/tabs.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/toolbar.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/tooltip.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/default.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/legacy/cp_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/legacy/legacy.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/thadmin/thadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/css/reset.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/css/tooltip.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/zetadigme.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/notifications.php XoopsCore/branches/2.5.x/2.5.8/htdocs/pda.php XoopsCore/branches/2.5.x/2.5.8/htdocs/pmlite.php XoopsCore/branches/2.5.x/2.5.8/htdocs/readpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/register.php XoopsCore/branches/2.5.x/2.5.8/htdocs/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/xo-info.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/baradmin.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/globalnav.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/layout-soup.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/print.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/reset.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/style.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/userbar.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/extras/function.xoMemberInfo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/language/english/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/xo-info.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/class/pagenav.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/blocks/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/class/category.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/class/item.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/item.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/zetagenesis/xo-info.php XoopsCore/branches/2.5.x/2.5.8/htdocs/user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/userinfo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/viewpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xmlrpc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_data/data/secure.dist.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/about.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/admin_footer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/admin_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/abstract.php XoopsCore/branches/2.5.x/2.5.8/upgrade/check_version.php XoopsCore/branches/2.5.x/2.5.8/upgrade/cnt-2.2.x-to-2.3.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/language.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/mainfile.dist.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/pathcontroller.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/settings_db.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/settings_path.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.3.0-to-2.3.1/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.3.3-to-2.4.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.3.3-to-2.4.0/license.dist.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.4.0-to-2.4.1/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.4.0-to-2.4.1/license.dist.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.4.x-to-2.5.0/dbmanager.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.4.x-to-2.5.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.5.4-to-2.5.5/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.5.5-to-2.5.6/index.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-06-06 21:59:41 UTC (rev 13082) @@ -17,7 +17,8 @@ - fixing a bug in xmlrpc.php (wppd/rgriffith) - remove addrFormat override in XoopsMultiMailer (rgriffith) - patch from Xoops 2.5.6 XoopsFormSelectUser is not compatible with some old modules like xNews (luciorota) -- fix "setExtra" in moduleadmin.php, Admin buttons can now use "onClick" assignments (mamba) +- fix "setExtra" in moduleadmin.php, Admin buttons can now use "onClick" assignments (mamba) +- updated XOOPS copyright to 2015, changed links to http://xoops.org (mamba) Security fixes Modified: XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/jquery.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/jquery.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/jquery.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -11,7 +11,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Maxime Cointin (AKA Kraven30) * @package system Modified: XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/main.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/main.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -9,7 +9,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Maxime Cointin (AKA Kraven30) * @package system Modified: XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/xoops_version.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/xoops_version.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -9,7 +9,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Maxime Cointin (AKA Kraven30) * @package system Modified: XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/language/english/admin/filemanager.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/language/english/admin/filemanager.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/language/english/admin/filemanager.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -1,6 +1,6 @@ <?php /** - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license * _LANGCODE en * _CHARSET UTF-8 Modified: XoopsCore/branches/2.5.x/2.5.8/extras/mysqli/mysqldatabase.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/extras/mysqli/mysqldatabase.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/extras/mysqli/mysqldatabase.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -9,7 +9,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @package class * @subpackage database @@ -27,7 +27,7 @@ * * @abstract * @author Kazumi Ono <on...@xo...> - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @package class * @subpackage database */ @@ -444,7 +444,7 @@ * Safe Connection to a MySQL database. * * @author Kazumi Ono <on...@xo...> - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @package kernel * @subpackage database */ @@ -472,7 +472,7 @@ * {@link query()} method for security reasons. * * @author Kazumi Ono <on...@xo...> - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @package class * @subpackage database */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.admin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.admin.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.admin.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -2,7 +2,7 @@ /** * Module admin functions * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.cache.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.cache.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.cache.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -2,7 +2,7 @@ /** * Cache handlers * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.config.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.config.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.config.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -2,7 +2,7 @@ /** * Functions handling module configs * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.ini.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.ini.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.ini.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -2,7 +2,7 @@ /** * Initial functions * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.locale.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.locale.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.locale.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -12,7 +12,7 @@ /** * Xoops Localization class * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -2,7 +2,7 @@ /** * common functions * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.user.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.user.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.user.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -2,7 +2,7 @@ /** * user/member handlers * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/object.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/object.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/object.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -4,7 +4,7 @@ * * For backward compatibility * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 @@ -20,7 +20,7 @@ * Art Object * * @author D.J. (phppp) - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @package module::article * * {@link XoopsObject} @@ -47,7 +47,7 @@ * @package module::article * * @author D.J. (phppp) -* @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) +* @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * * {@link XoopsPersistableObjectHandler} * Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoops_version.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoops_version.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -2,7 +2,7 @@ /** * Xoops Frameworks addon: art * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoopsart.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoopsart.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoopsart.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -2,7 +2,7 @@ /** * Xoops Frameworks addon: art * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/language/english/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/language/english/main.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/language/english/main.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -10,7 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * * @copyright Grégory Mage (Aka Mage) - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Grégory Mage (Aka Mage) */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -10,7 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * * @copyright Grégory Mage (Aka Mage) - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Grégory Mage (Aka Mage) */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/xoops_version.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/xoops_version.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -10,7 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * * @copyright Grégory Mage (Aka Mage) - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Grégory Mage (Aka Mage) */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -9,7 +9,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @version $Id$ */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/backend.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/backend.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/backend.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -9,7 +9,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @since 2.0.0 * @version $Id$ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -9,7 +9,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @since 2.0.0 * @author Kazumi Ono <web...@my...> Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/browse.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/browse.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/browse.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -9,7 +9,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @package core * @since 2.4.0 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -9,7 +9,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @package kernel * @subpackage auth @@ -26,7 +26,7 @@ * @subpackage auth * @description Authentification base class * @author Pierre-Eric MENUET <pe...@fr...> - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) */ class XoopsAuth { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ads.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ads.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ads.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -9,7 +9,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @package kernel * @subpackage auth @@ -26,7 +26,7 @@ * @subpackage auth * @description Authentification class for Active Directory * @author Pierre-Eric MENUET <pe...@fr...> - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) */ include_once $GLOBALS['xoops']->path('class/auth/auth_ldap.php'); @@ -35,7 +35,7 @@ * * @package * @author John - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @version $Id$ * @access public */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ldap.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ldap.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ldap.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -25,7 +25,7 @@ * @subpackage auth * @description Authentification class for standard LDAP Server V2 or V3 * @author Pierre-Eric MENUET <pe...@fr...> - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) */ if (file_exists($file = $GLOBALS['xoops']->path('class/auth/auth_provisionning.php'))) { include_once $file; @@ -42,7 +42,7 @@ * * @package * @author John - * @copyright (... [truncated message content] |
From: <be...@us...> - 2015-06-20 20:30:32
|
Revision: 13092 http://sourceforge.net/p/xoops/svn/13092 Author: beckmi Date: 2015-06-20 20:30:30 +0000 (Sat, 20 Jun 2015) Log Message: ----------- added possibility to include full icon URL in module's menu.php Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/default.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/zetadigme.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-06-16 21:08:34 UTC (rev 13091) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-06-20 20:30:30 UTC (rev 13092) @@ -19,6 +19,8 @@ - patch from Xoops 2.5.6 XoopsFormSelectUser is not compatible with some old modules like xNews (luciorota) - fix "setExtra" in moduleadmin.php, Admin buttons can now use "onClick" assignments (mamba) - updated XOOPS copyright to 2015, changed links to http://xoops.org (mamba) +- replaced intval() with (int) (mamba) +- added possibility to include full icon URL in module's menu.php (mamba) Security fixes Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2015-06-16 21:08:34 UTC (rev 13091) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2015-06-20 20:30:30 UTC (rev 13092) @@ -132,7 +132,10 @@ foreach (array_keys( $this->_obj->adminmenu) as $i) { if ($this->_obj->adminmenu[$i]['link'] != 'admin/index.php') { $ret .= "<a href=\"../" . $this->_obj->adminmenu[$i]['link'] . "\" title=\"" . (isset($this->_obj->adminmenu[$i]['desc']) ? $this->_obj->adminmenu[$i]['desc'] : '') . "\">"; - $ret .= "<img src=\"" . $path . $this->_obj->adminmenu[$i]['icon']. "\" alt=\"" . $this->_obj->adminmenu[$i]['title'] . "\" />"; + //$ret .= "<img src=\"" . $path . $this->_obj->adminmenu[$i]['icon']. "\" alt=\"" . $this->_obj->adminmenu[$i]['title'] . "\" />"; + //mb for direct URL access to icons in modules Admin + $ret .= "<img src=\"" . ((filter_var($this->_obj->adminmenu[$i]['icon'], FILTER_VALIDATE_URL)) ? $this->_obj->adminmenu[$i]['icon'] : $path . $this->_obj->adminmenu[$i]['icon']) . "\" alt=\"" . $this->_obj->adminmenu[$i]['title'] . "\" />"; + $ret .= "<span>" . $this->_obj->adminmenu[$i]['title'] . "</span>"; $ret .= "</a>"; } @@ -177,9 +180,12 @@ $ret = "<div class=\"aligncenter\">\n"; } $ret .= "<div class=\"xo-buttons\">\n"; - foreach (array_keys( $this -> _itemButton) as $i) { - $ret .= "<a class='ui-corner-all tooltip' href='" . $this -> _itemButton[$i]['link'] . "' title='" . $this -> _itemButton[$i]['title'] . "' " . $this -> _itemButton[$i]['extra']. ">"; - $ret .= "<img src='" . $path . $this -> _itemButton[$i]['icon'] . "' title='" . $this -> _itemButton[$i]['title'] . "' alt='" . $this -> _itemButton[$i]['title'] . "' />" . $this -> _itemButton[$i]['title'] ; + foreach (array_keys($this->_itemButton) as $i) { + $ret .= "<a class='ui-corner-all tooltip' href='" . $this->_itemButton[$i]['link'] . "' title='" . $this->_itemButton[$i]['title'] . "' " . $this->_itemButton[$i]['extra'] . ">"; + $ret .= "<img src='" + //. $path . $this -> _itemButton[$i]['icon'] + //mb for direct URL access to icons in modules Admin + . ((filter_var($this->_itemButton[$i]['icon'], FILTER_VALIDATE_URL)) ? $this->_itemButton[$i]['icon'] : $path . $this->_itemButton[$i]['icon']) . "' title='" . $this->_itemButton[$i]['title'] . "' alt='" . $this->_itemButton[$i]['title'] . "' />" . $this->_itemButton[$i]['title']; $ret .= "</a>\n"; $ret .= $delimeter; } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/default.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/default.php 2015-06-16 21:08:34 UTC (rev 13091) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/default.php 2015-06-20 20:30:30 UTC (rev 13092) @@ -135,7 +135,9 @@ $mod_options = $xoopsModule->getAdminMenu(); foreach (array_keys($mod_options) as $item) { $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) ? XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['link'] : $mod_options[$item]['link']; - $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['icon']; +// $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['icon']; + //mb for direct URL access to icons in modules Admin + $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : (filter_var($mod_options[$item]['icon'], FILTER_VALIDATE_URL) ? $mod_options[$item]['icon'] : (XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['icon'])); } } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/zetadigme.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/zetadigme.php 2015-06-16 21:08:34 UTC (rev 13091) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/zetadigme.php 2015-06-20 20:30:30 UTC (rev 13092) @@ -174,7 +174,9 @@ $mod_options = $xoopsModule->getAdminMenu(); foreach (array_keys($mod_options) as $item) { $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) ? XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['link'] : $mod_options[$item]['link']; - $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['icon']; + //$mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['icon']; + //mb for direct URL access to icons in modules Admin + $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : (filter_var($mod_options[$item]['icon'], FILTER_VALIDATE_URL) ? $mod_options[$item]['icon'] : (XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['icon'])); } } $tpl->assign('mod_options', $mod_options); |
From: <be...@us...> - 2015-09-07 00:00:23
|
Revision: 13146 http://sourceforge.net/p/xoops/svn/13146 Author: beckmi Date: 2015-09-07 00:00:20 +0000 (Mon, 07 Sep 2015) Log Message: ----------- jGrowl 1.4.3 Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/Frameworks/jquery/plugins/jquery.jgrowl.js Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-02 17:42:02 UTC (rev 13145) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-07 00:00:20 UTC (rev 13146) @@ -1,8 +1,8 @@ XOOPS 2.5.x Changelog (Language changes: see: /docs/lang_diff.txt) -=============================== -NOT RELEASED: Version 2.5.8 Beta 1 -=============================== +=================================== +2.5.8 Beta 1 NOT RELEASED +=================================== - replaced "dirname(__FILE__)" with "__DIR__" since the min. PHP is now 5.3.7, and __DIR__ is faster (mamba) - updating some copyright notices (mamba) - fix issues when protector 'id_forceintval' preference is enabled, that manifests as an error when deleting private messages. (rgriffith) @@ -32,20 +32,21 @@ - PHPMailer to 5.2.9 (rgriffith) - jQuery to 1.11.3 (mamba) - jQuery UI 1.11.4 (mamba) + - jGrowl to 1.4.3 (mamba) -=============================== -2014-06-20: Version 2.5.7 Final (Patch 1) -=============================== +=================================== +2.5.7 Final (Patch 1) 2014-06-20 +=================================== - Updating docu for the correct version of tablesorter (mamba) - Fix path specified for include (rgriffith, mamba) - added mainfile.php to /extras for use on servers where write to root is not possible (rgriffith) - fix for array issue in pm/viempmsg.php (Roby73/mamba) -=============================== -2014/06/14: Version 2.5.7 Final -=============================== +=================================== +2.5.7 Final 2014/06/14 +=================================== - updated XoopsMediaUploader to use system memory values from php.ini, and to offer random file names (mamba/luciorota/zyspec) - added .tpl to XoopsList's getHtmlListAsArray (wizanda) - updating xBootstrap (voltan, Angelo Rocha) @@ -61,9 +62,9 @@ Updated: - TinyMCE to 3.5.11 (mamba) -=============================== -2014/04/06: Version 2.5.7 RC 1 -=============================== +=================================== +2.5.7 RC 1 2014/04/06 +=================================== Bugfixes: - fixed System Module image manager html/js bugs (luciorota) @@ -82,9 +83,9 @@ - jQuery Tablesorter to 2.15.11 (mamba) - jGrowl to 1.2.14 (mamba) -=============================== -2014/03/06: Version 2.5.7 Beta 1 -=============================== +=================================== +2.5.7 Beta 1 2014/03/06 +=================================== Bugfixes: - ID: 1143 (old ID 430840) class/module.errorhandler.php (uberrookie/zyspec) - ID: 1225 Restore user theme choice during "Remember me" processing. (rgriffith) @@ -162,18 +163,18 @@ - TinyMCE to 3.5.10 (mamba) - prototype.js to 1.7.1, Aug 2012 (rgriffith) -=============================== -2013/04/21: Version 2.5.6 Final -=============================== +=================================== +2.5.6 Final 2013/04/21 +=================================== Bugfixes: - updated English translations (Cesag,Mamba) - extra check for $noHtml in XoopsEditorHandler->get (luciorota) - fixing $GLOBAL typo in jquery.php (Zyspec) - improving protection against spam by turning off registration's 1st step saving (timgno) -=============================== -2013/03/25: Version 2.5.6 RC1 -=============================== +=================================== +2.5.6 RC1 2013/03/25 +=================================== Bugfixes: - Array to string conversion (geekwright/mamba) - issues with missing xoopscomments table (geekwright/sabahan/Mamba) @@ -191,9 +192,9 @@ - XSS/CSRF vulnerability in system/admin/blocksadmin/main.php (Marcin,Ariko-Security Team/trabis) - LFI vulnerability in system/admin/tplsets/jquery.php (Marcin,Ariko-Security Team/trabis) -=============================== -2013/01/22: Version 2.5.6 Beta -=============================== +=================================== +2.5.6 Beta 2013/01/22 +=================================== Security fixes: - XSS (Cross Site Scripting) vulnerability in Maintenance (Dingjie Yang,Qualys/trabis) @@ -210,9 +211,9 @@ Added: - Fast Comment Hack (Voltan) -=============================== -2012/04/15: Version 2.5.5 Final -=============================== +=================================== +2.5.5 Final 2012/04/15 +=================================== Bugfixes: - preventing division by zero in pagenav.php (timgno) - ID: 3466534 tooltip "$ not defined" fix (culex) @@ -224,9 +225,9 @@ - phpThumb to 1.7.11 (mamba) - jGrowl to 1.2.6 (mowaffaq/mamba) -=============================== -2012/03/14: Version 2.5.5 RC -=============================== +=================================== +2.5.5 RC 2012/03/14 +=================================== Bugfixes: - ID: 3494895 When changing the # of visible entries in Protector, it goes to Admin (jcweb/mamba) - ID: 3494894 Calendar shows 40 days (peekay/mage) @@ -245,9 +246,9 @@ - jQuery to 1.72 (mamba) - jQueryUI to version 1.8.18 (mamba) -=============================== -2012/02/19: Version 2.5.5 Beta -=============================== +=================================== +2.5.5 Beta 2012/02/19 +=================================== Security fixes: - XSS (Cross Site Scripting) vulnerability in PM module and tinymce (High-Tech Bridge Security Research Lab/trabis) @@ -278,9 +279,9 @@ - jQueryUI to version 1.8.17 (mamba) - PhpMailer to version 5.2.1 (mamba) -=============================== -2011/11/20: Version 2.5.4 Final -=============================== +=================================== +2.5.4 Final 2011/11/20 +=================================== Bugfixes: - ID: 3430112 Java problem in xoops editor (voltan/mamba/trabis) - dhtml smilie is always inserted in the end (mamba/trabis) @@ -291,9 +292,9 @@ Updated: - updated jQuery to 1.7 (mamba) -=============================== -2011/10/10: Version 2.5.4 RC -=============================== +=================================== +2.5.4 RC 2011/10/10 +=================================== Bugfixes: - quoteConv causing problems with large number of quotes (Roby73/trabis) - Cache bug. The key's not generated correctly (andrey3761/trabis) @@ -308,9 +309,9 @@ - Replacing deprecated Database::getInstance(); calls with XoopsDatabaseFactory::getDatabaseConnection(); (trabis) - Logging deprecated methods and files that will be removed on XOOPS 2.6.0 (trabis) -=============================== -2011/10/05: Version 2.5.4 Beta -=============================== +=================================== +2.5.4 Beta 2011/10/05 +=================================== Bugfixes: - Remove a call of non existing css file in admin menu - ID: 3419812 Drag and drop Xoops 2.5.3 bug (cesag/trabis) @@ -328,25 +329,25 @@ Deleted: - Delete xoops_lib/data/secure.php file for exclude update error -=============================== -2011/10/03: Version 2.5.3 -=============================== +=================================== +2.5.3 2011/10/03 +=================================== Bugfixes: - Style switcher does not work on default admin GUI(trabis) - Reverting fix for bug ID: 2672723 Changed the code in Install to omits the SQL command: "ALTER DATABASE ... CHARACTER SET ..." (trabis) -=============================== -2011/09/29: Version 2.5.2 Final -=============================== +=================================== +2.5.2 Final 2011/09/29 +=================================== Bugfixes: - ID: 3416069 - avatars upload problem (cesag/trabis) - MyTextSanitizer::htmlSpecialChars() using UTF-8 by default (trabis) - System Waiting block produces queries for inactive modules (trabis) - 'Selected modules does not exist' if using inactive module on startpage (trabis) -=============================== -2011/09/06: Version 2.5.2 RC -=============================== +=================================== +2.5.2 RC 2011/09/06 +=================================== Security fixes: - Removed support for script driven images!!! (High-Tech Bridge Security Research Lab/trabis) - Fixed XSS (Cross Site Scripting) vulnerability in /include/formdhtmltextarea_preview.php (High-Tech Bridge Security Research Lab/trabis) @@ -428,9 +429,9 @@ - Moved js and css from xo_scripts template into gui class(using $xoTheme) to avoid module conflicts - require class/xoopslocal.php causing problems with RMCommon (mamba/trabis) -=============================== -2011/04/12: Version 2.5.2 Beta -=============================== +=================================== +2.5.2 Beta 2011/04/12 +=================================== Bugfixes: - Module names and orders were not able to update (phppp/aitor) - Custom block was not able to add due to missing of 'block_type' (phppp/tatane/mr-reda04_fr/aitor) @@ -438,24 +439,24 @@ - Improved translations (phppp/mamba) -=============================== -2011/03/23: Version 2.5.1 Final -=============================== +=================================== +2.5.1 Final 2011/03/23 +=================================== Bugfixes: - ID: 3219412 Block Cloning : parent module (mid) not saved when cloning(trabis) - ID: 3219408 Block management : data not saved when editing(trabis) - ID: 3229007 Setting # of banner impressions has no effect(trabis) -=============================== -2011/03/15: Version 2.5.1 RC -=============================== +=================================== +2.5.1 RC 2011/03/15 +=================================== Updates: - Updated suico and zetagenesis themes, zetadigme system admin theme (kris_fr) -=============================== -2011/03/15: Version 2.5.1 RC -=============================== +=================================== +2.5.1 RC 2011/03/15 +=================================== Security improvements: - Added filters to output data to avoid potential XSS (phppp/Aung Khant) Updates: @@ -471,9 +472,9 @@ - ID: 3111137 Module Block is cloned as custom block(trabis) -=============================== -Updated 2010/10/23: Version 2.5.0 -=============================== +=================================== +2.5.0 2010/10/23 +=================================== Bug Fixes: - Fix security bug in Profile (gaba/phppp) Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/Frameworks/jquery/plugins/jquery.jgrowl.js =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/Frameworks/jquery/plugins/jquery.jgrowl.js 2015-09-02 17:42:02 UTC (rev 13145) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/Frameworks/jquery/plugins/jquery.jgrowl.js 2015-09-07 00:00:20 UTC (rev 13146) @@ -1,2 +1,2 @@ -!function(e){var t=function(){return!1===e.support.boxModel&&e.support.objectAll&&e.support.leadingWhitespace}();e.jGrowl=function(t,i){0==e("#jGrowl").size()&&e('<div id="jGrowl"></div>').addClass(i&&i.position?i.position:e.jGrowl.defaults.position).appendTo("body"),e("#jGrowl").jGrowl(t,i)},e.fn.jGrowl=function(t,i){if(e.isFunction(this.each)){var o=arguments;return this.each(function(){void 0==e(this).data("jGrowl.instance")&&(e(this).data("jGrowl.instance",e.extend(new e.fn.jGrowl,{notifications:[],element:null,interval:null})),e(this).data("jGrowl.instance").startup(this)),e.isFunction(e(this).data("jGrowl.instance")[t])?e(this).data("jGrowl.instance")[t].apply(e(this).data("jGrowl.instance"),e.makeArray(o).slice(1)):e(this).data("jGrowl.instance").create(t,i)})}},e.extend(e.fn.jGrowl.prototype,{defaults:{pool:0,header:"",group:"",sticky:!1,position:"top-right",glue:"after",theme:"default",themeState:"highlight",corners:"10px",check:250,life:3e3,closeDuration:"normal",openDuration:"normal",easing:"swing",closer:!0,closeTemplate:"×",closerTemplate:"<div>[ close all ]</div>",log:function(){},beforeOpen:function(){},afterOpen:function(){},open:function(){},beforeClose:function(){},close:function(){},animateOpen:{opacity:"show"},animateClose:{opacity:"hide"}},notifications:[],element:null,interval:null,create:function(t,i){var i=e.extend({},this.defaults,i);"undefined"!=typeof i.speed&&(i.openDuration=i.speed,i.closeDuration=i.speed),this.notifications.push({message:t,options:i}),i.log.apply(this.element,[this.element,t,i])},render:function(t){var i=this,o=t.message,n=t.options;n.themeState=""==n.themeState?"":"ui-state-"+n.themeState;var t=e("<div/>").addClass("jGrowl-notification "+n.themeState+" ui-corner-all"+(void 0!=n.group&&""!=n.group?" "+n.group:"")).append(e("<div/>").addClass("jGrowl-close").html(n.closeTemplate)).append(e("<div/>").addClass("jGrowl-header").html(n.header)).append(e("<div/>").addClass("jGrowl-message").html(o)).data("jGrowl",n).addClass(n.theme).children("div.jGrowl-close").bind("click.jGrowl",function(){e(this).parent().trigger("jGrowl.beforeClose")}).parent();e(t).bind("mouseover.jGrowl",function(){e("div.jGrowl-notification",i.element).data("jGrowl.pause",!0)}).bind("mouseout.jGrowl",function(){e("div.jGrowl-notification",i.element).data("jGrowl.pause",!1)}).bind("jGrowl.beforeOpen",function(){n.beforeOpen.apply(t,[t,o,n,i.element])!==!1&&e(this).trigger("jGrowl.open")}).bind("jGrowl.open",function(){n.open.apply(t,[t,o,n,i.element])!==!1&&("after"==n.glue?e("div.jGrowl-notification:last",i.element).after(t):e("div.jGrowl-notification:first",i.element).before(t),e(this).animate(n.animateOpen,n.openDuration,n.easing,function(){e.support.opacity===!1&&this.style.removeAttribute("filter"),null!==e(this).data("jGrowl")&&(e(this).data("jGrowl").created=new Date),e(this).trigger("jGrowl.afterOpen")}))}).bind("jGrowl.afterOpen",function(){n.afterOpen.apply(t,[t,o,n,i.element])}).bind("jGrowl.beforeClose",function(){n.beforeClose.apply(t,[t,o,n,i.element])!==!1&&e(this).trigger("jGrowl.close")}).bind("jGrowl.close",function(){e(this).data("jGrowl.pause",!0),e(this).animate(n.animateClose,n.closeDuration,n.easing,function(){e.isFunction(n.close)?n.close.apply(t,[t,o,n,i.element])!==!1&&e(this).remove():e(this).remove()})}).trigger("jGrowl.beforeOpen"),""!=n.corners&&void 0!=e.fn.corner&&e(t).corner(n.corners),e("div.jGrowl-notification:parent",i.element).size()>1&&0==e("div.jGrowl-closer",i.element).size()&&this.defaults.closer!==!1&&e(this.defaults.closerTemplate).addClass("jGrowl-closer "+this.defaults.themeState+" ui-corner-all").addClass(this.defaults.theme).appendTo(i.element).animate(this.defaults.animateOpen,this.defaults.speed,this.defaults.easing).bind("click.jGrowl",function(){e(this).siblings().trigger("jGrowl.beforeClose"),e.isFunction(i.defaults.closer)&&i.defaults.closer.apply(e(this).parent()[0],[e(this).parent()[0]])})},update:function(){e(this.element).find("div.jGrowl-notification:parent").each(function(){void 0!=e(this).data("jGrowl")&&void 0!==e(this).data("jGrowl").created&&e(this).data("jGrowl").created.getTime()+parseInt(e(this).data("jGrowl").life)<(new Date).getTime()&&e(this).data("jGrowl").sticky!==!0&&(void 0==e(this).data("jGrowl.pause")||e(this).data("jGrowl.pause")!==!0)&&e(this).trigger("jGrowl.beforeClose")}),this.notifications.length>0&&(0==this.defaults.pool||e(this.element).find("div.jGrowl-notification:parent").size()<this.defaults.pool)&&this.render(this.notifications.shift()),e(this.element).find("div.jGrowl-notification:parent").size()<2&&e(this.element).find("div.jGrowl-closer").animate(this.defaults.animateClose,this.defaults.speed,this.defaults.easing,function(){e(this).remove()})},startup:function(i){this.element=e(i).addClass("jGrowl").append('<div class="jGrowl-notification"></div>'),this.interval=setInterval(function(){e(i).data("jGrowl.instance").update()},parseInt(this.defaults.check)),t&&e(this.element).addClass("ie6")},shutdown:function(){e(this.element).removeClass("jGrowl").find("div.jGrowl-notification").trigger("jGrowl.close").parent().empty(),clearInterval(this.interval)},close:function(){e(this.element).find("div.jGrowl-notification").each(function(){e(this).trigger("jGrowl.beforeClose")})}}),e.jGrowl.defaults=e.fn.jGrowl.prototype.defaults}(jQuery); +!function(a){a.jGrowl=function(b,c){0===a("#jGrowl").length&&a('<div id="jGrowl"></div>').addClass(c&&c.position?c.position:a.jGrowl.defaults.position).appendTo(c&&c.appendTo?c.appendTo:a.jGrowl.defaults.appendTo),a("#jGrowl").jGrowl(b,c)},a.fn.jGrowl=function(b,c){if(void 0===c&&a.isPlainObject(b)&&(c=b,b=c.message),a.isFunction(this.each)){var d=arguments;return this.each(function(){void 0===a(this).data("jGrowl.instance")&&(a(this).data("jGrowl.instance",a.extend(new a.fn.jGrowl,{notifications:[],element:null,interval:null})),a(this).data("jGrowl.instance").startup(this)),a.isFunction(a(this).data("jGrowl.instance")[b])?a(this).data("jGrowl.instance")[b].apply(a(this).data("jGrowl.instance"),a.makeArray(d).slice(1)):a(this).data("jGrowl.instance").create(b,c)})}},a.extend(a.fn.jGrowl.prototype,{defaults:{pool:0,header:"",group:"",sticky:!1,position:"top-right",appendTo:"body",glue:"after",theme:"default",themeState:"highlight",corners:"10px",check:250,life:3e3,closeDuration:"normal",openDuration:"normal",easing:"swing",closer:!0,closeTemplate:"×",closerTemplate:"<div>[ close all ]</div>",log:function(){},beforeOpen:function(){},afterOpen:function(){},open:function(){},beforeClose:function(){},close:function(){},click:function(){},animateOpen:{opacity:"show"},animateClose:{opacity:"hide"}},notifications:[],element:null,interval:null,create:function(b,c){var d=a.extend({},this.defaults,c);"undefined"!=typeof d.speed&&(d.openDuration=d.speed,d.closeDuration=d.speed),this.notifications.push({message:b,options:d}),d.log.apply(this.element,[this.element,b,d])},render:function(b){var c=this,d=b.message,e=b.options;e.themeState=""===e.themeState?"":"ui-state-"+e.themeState;var f=a("<div/>").addClass("jGrowl-notification alert "+e.themeState+" ui-corner-all"+(void 0!==e.group&&""!==e.group?" "+e.group:"")).append(a("<button/>").addClass("jGrowl-close").html(e.closeTemplate)).append(a("<div/>").addClass("jGrowl-header").html(e.header)).append(a("<div/>").addClass("jGrowl-message").html(d)).data("jGrowl",e).addClass(e.theme).children(".jGrowl-close").bind("click.jGrowl",function(){return a(this).parent().trigger("jGrowl.beforeClose"),!1}).parent();a(f).bind("mouseover.jGrowl",function(){a(".jGrowl-notification",c.element).data("jGrowl.pause",!0)}).bind("mouseout.jGrowl",function(){a(".jGrowl-notification",c.element).data("jGrowl.pause",!1)}).bind("jGrowl.beforeOpen",function(){e.beforeOpen.apply(f,[f,d,e,c.element])!==!1&&a(this).trigger("jGrowl.open")}).bind("jGrowl.open",function(){e.open.apply(f,[f,d,e,c.element])!==!1&&("after"==e.glue?a(".jGrowl-notification:last",c.element).after(f):a(".jGrowl-notification:first",c.element).before(f),a(this).animate(e.animateOpen,e.openDuration,e.easing,function(){a.support.opacity===!1&&this.style.removeAttribute("filter"),null!==a(this).data("jGrowl")&&"undefined"!=typeof a(this).data("jGrowl")&&(a(this).data("jGrowl").created=new Date),a(this).trigger("jGrowl.afterOpen")}))}).bind("jGrowl.afterOpen",function(){e.afterOpen.apply(f,[f,d,e,c.element])}).bind("click",function(){e.click.apply(f,[f.message,e,c.element])}).bind("jGrowl.beforeClose",function(){e.beforeClose.apply(f,[f,d,e,c.element])!==!1&&a(this).trigger("jGrowl.close")}).bind("jGrowl.close",function(){a(this).data("jGrowl.pause",!0),a(this).animate(e.animateClose,e.closeDuration,e.easing,function(){a.isFunction(e.close)?e.close.apply(f,[f,d,e,c.element])!==!1&&a(this).remove():a(this).remove()})}).trigger("jGrowl.beforeOpen"),""!==e.corners&&void 0!==a.fn.corner&&a(f).corner(e.corners),a(".jGrowl-notification:parent",c.element).length>1&&0===a(".jGrowl-closer",c.element).length&&this.defaults.closer!==!1&&a(this.defaults.closerTemplate).addClass("jGrowl-closer "+this.defaults.themeState+" ui-corner-all").addClass(this.defaults.theme).appendTo(c.element).animate(this.defaults.animateOpen,this.defaults.speed,this.defaults.easing).bind("click.jGrowl",function(){a(this).siblings().trigger("jGrowl.beforeClose"),a.isFunction(c.defaults.closer)&&c.defaults.closer.apply(a(this).parent()[0],[a(this).parent()[0]])})},update:function(){a(this.element).find(".jGrowl-notification:parent").each(function(){void 0!==a(this).data("jGrowl")&&void 0!==a(this).data("jGrowl").created&&a(this).data("jGrowl").created.getTime()+parseInt(a(this).data("jGrowl").life,10)<(new Date).getTime()&&a(this).data("jGrowl").sticky!==!0&&(void 0===a(this).data("jGrowl.pause")||a(this).data("jGrowl.pause")!==!0)&&a(this).trigger("jGrowl.beforeClose")}),this.notifications.length>0&&(0===this.defaults.pool||a(this.element).find(".jGrowl-notification:parent").length<this.defaults.pool)&&this.render(this.notifications.shift()),a(this.element).find(".jGrowl-notification:parent").length<2&&a(this.element).find(".jGrowl-closer").animate(this.defaults.animateClose,this.defaults.speed,this.defaults.easing,function(){a(this).remove()})},startup:function(b){this.element=a(b).addClass("jGrowl").append('<div class="jGrowl-notification"></div>'),this.interval=setInterval(function(){var c=a(b).data("jGrowl.instance");void 0!==c&&c.update()},parseInt(this.defaults.check,10))},shutdown:function(){a(this.element).removeClass("jGrowl").find(".jGrowl-notification").trigger("jGrowl.close").parent().empty(),clearInterval(this.interval)},close:function(){a(this.element).find(".jGrowl-notification").each(function(){a(this).trigger("jGrowl.beforeClose")})}}),a.jGrowl.defaults=a.fn.jGrowl.prototype.defaults}(jQuery); //# sourceMappingURL=jquery.jgrowl.map \ No newline at end of file |
From: <be...@us...> - 2015-09-12 08:49:01
|
Revision: 13147 http://sourceforge.net/p/xoops/svn/13147 Author: beckmi Date: 2015-09-12 08:48:58 +0000 (Sat, 12 Sep 2015) Log Message: ----------- adding "strong { font-weight: bold; }" to reset.css Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/reset.css Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-07 00:00:20 UTC (rev 13146) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-12 08:48:58 UTC (rev 13147) @@ -21,6 +21,7 @@ - updated XOOPS copyright to 2015, changed links to http://xoops.org (mamba) - replaced intval() with (int) (mamba) - added possibility to include full icon URL in module's menu.php (mamba) +- added strong { font-weight: bold; } to reset.css (mamba) Security fixes Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/reset.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/reset.css 2015-09-07 00:00:20 UTC (rev 13146) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/reset.css 2015-09-12 08:48:58 UTC (rev 13147) @@ -26,6 +26,7 @@ /* remember to define focus styles! */ :focus { outline: 0;} body { line-height: 1; color: #000; background: #fff;} +strong { font-weight: bold; } ol, ul { list-style: none;} /* tables still need 'cellspacing="0"' in the markup */ table { border-collapse: separate; border-spacing: 0;} |
From: <be...@us...> - 2015-09-21 19:55:43
|
Revision: 13148 http://sourceforge.net/p/xoops/svn/13148 Author: beckmi Date: 2015-09-21 19:55:41 +0000 (Mon, 21 Sep 2015) Log Message: ----------- added .tpl option for module Help files Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/help.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-12 08:48:58 UTC (rev 13147) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-21 19:55:41 UTC (rev 13148) @@ -22,6 +22,7 @@ - replaced intval() with (int) (mamba) - added possibility to include full icon URL in module's menu.php (mamba) - added strong { font-weight: bold; } to reset.css (mamba) +- added .tpl option for module Help files (mamba) Security fixes Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/help.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/help.php 2015-09-12 08:48:58 UTC (rev 13147) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/help.php 2015-09-21 19:55:41 UTC (rev 13148) @@ -88,24 +88,16 @@ if ($page != '') { // Call template - if (file_exists( - XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.html' - ) - ) { - $helpcontent = $xoopsTpl->fetch( - XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.html' - ); + if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.html')) { + $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.html'); + } elseif (file_exists(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.tpl')) { + $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.tpl'); + } elseif (file_exists(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.html')) { + $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.html'); + } elseif (file_exists(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.tpl')) { + $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.tpl'); } else { - if (file_exists( - XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.html' - ) - ) { - $helpcontent = $xoopsTpl->fetch( - XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.html' - ); - } else { - $xoopsTpl->assign('load_error', 1); - } + $xoopsTpl->assign('load_error', 1); } $xoopsTpl->assign('helpcontent', $helpcontent); } else { |
From: <be...@us...> - 2015-09-21 19:59:59
|
Revision: 13149 http://sourceforge.net/p/xoops/svn/13149 Author: beckmi Date: 2015-09-21 19:59:57 +0000 (Mon, 21 Sep 2015) Log Message: ----------- moved "count($tagsArray)" and "count($attrArray)" outside of FOR loop Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsfilterinput.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-21 19:55:41 UTC (rev 13148) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-21 19:59:57 UTC (rev 13149) @@ -23,6 +23,7 @@ - added possibility to include full icon URL in module's menu.php (mamba) - added strong { font-weight: bold; } to reset.css (mamba) - added .tpl option for module Help files (mamba) +- fix moved "count($tagsArray)" and "count($attrArray)" outside of FOR loop in xoopsfilterinput.php (mamba) Security fixes Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsfilterinput.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsfilterinput.php 2015-09-21 19:55:41 UTC (rev 13148) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsfilterinput.php 2015-09-21 19:59:57 UTC (rev 13149) @@ -66,10 +66,12 @@ $xssAuto = 1 ) { // make sure user defined arrays are in lowercase - for ($i = 0; $i < count($tagsArray); ++$i) { + $tagsArrayCount = count($tagsArray); + for ($i = 0; $i < $tagsArrayCount; ++$i) { $tagsArray[$i] = strtolower($tagsArray[$i]); } - for ($i = 0; $i < count($attrArray); ++$i) { + $attrArrayCount = count($attrArray); + for ($i = 0; $i < $attrArrayCount; ++$i) { $attrArray[$i] = strtolower($attrArray[$i]); } // assign to member vars @@ -378,7 +380,8 @@ if (!$isCloseTag) { $attrSet = $this->filterAttr($attrSet); $preTag .= '<' . $tagName; - for ($i = 0; $i < count($attrSet); ++$i) { + $attrSetCount = count($attrSet); + for ($i = 0; $i < $attrSetCount; ++$i) { $preTag .= ' ' . $attrSet[$i]; } // reformat single tags to XHTML @@ -413,7 +416,8 @@ { $newSet = array(); // process attributes - for ($i = 0; $i <count($attrSet); ++$i) { + $attrSetCount = count($attrSet); + for ($i = 0; $i < $attrSetCount; ++$i) { // skip blank spaces in tag if (!$attrSet[$i]) { continue; |
From: <be...@us...> - 2015-09-21 20:09:43
|
Revision: 13150 http://sourceforge.net/p/xoops/svn/13150 Author: beckmi Date: 2015-09-21 20:09:40 +0000 (Mon, 21 Sep 2015) Log Message: ----------- add option to set height of Themes block Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/docs/lang_diff.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/blocks/system_blocks.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/blocks.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/xoops_version.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-21 19:59:57 UTC (rev 13149) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-21 20:09:40 UTC (rev 13150) @@ -24,6 +24,7 @@ - added strong { font-weight: bold; } to reset.css (mamba) - added .tpl option for module Help files (mamba) - fix moved "count($tagsArray)" and "count($attrArray)" outside of FOR loop in xoopsfilterinput.php (mamba) +- add option to set height of Themes block (mamba) Security fixes Modified: XoopsCore/branches/2.5.x/2.5.8/docs/lang_diff.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/lang_diff.txt 2015-09-21 19:59:57 UTC (rev 13149) +++ XoopsCore/branches/2.5.x/2.5.8/docs/lang_diff.txt 2015-09-21 20:09:40 UTC (rev 13150) @@ -12,6 +12,12 @@ /modules/system/language/english/admin/modulesadmin.php - added define('_AM_SYSTEM_MODULES_INSTALL_MORE',"Install more modules"); +/modules/system/language/english/admin\users.php +define('_AM_SYSTEM_USERS_ACTIVATE', 'Activate User'); + +/modules/system/language/english/blocks.php +define('_MB_SYSTEM_BLOCK_HEIGHT',"Block Height (lines)"); + =============================== 2014/06/14: Version 2.5.7 Final =============================== Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/blocks/system_blocks.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/blocks/system_blocks.php 2015-09-21 19:59:57 UTC (rev 13149) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/blocks/system_blocks.php 2015-09-21 20:09:40 UTC (rev 13150) @@ -642,7 +642,7 @@ if ($options[0] == 1) { $block['theme_select'] = "<img vspace=\"2\" id=\"xoops_theme_img\" src=\"".XOOPS_THEME_URL."/".$xoopsConfig['theme_set']."/shot.gif\" alt=\"screenshot\" width=\"".(int)($options[1])."\" /><br /><select id=\"xoops_theme_select\" name=\"xoops_theme_select\" onchange=\"showImgSelected('xoops_theme_img', 'xoops_theme_select', 'themes', '/shot.gif', '".XOOPS_URL."');\">".$theme_options."</select><input type=\"submit\" value=\""._GO."\" />"; } else { - $block['theme_select'] = '<select name="xoops_theme_select" onchange="submit();" size="3">'.$theme_options.'</select>'; + $block['theme_select'] = '<select name="xoops_theme_select" onchange="submit();" size="'. $options[2] .'">'.$theme_options.'</select>'; } $block['theme_select'] .= '<br />('.sprintf(_MB_SYSTEM_NUMTHEME, '<strong>'.count($xoopsConfig['theme_set_allowed']).'</strong>').')<br />'; @@ -671,6 +671,8 @@ $form .= ' <input type="radio" name="options[0]" value="0"'.$chk.' />'._NO; $form .= '<br />'._MB_SYSTEM_THWIDTH.' '; $form .= "<input type='text' name='options[1]' value='".$options[1]."' />"; + $form .= '<br />'._MB_SYSTEM_BLOCK_HEIGHT.' '; + $form .= "<input type='text' name='options[2]' value='".$options[2]."' />"; return $form; } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/blocks.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/blocks.php 2015-09-21 19:59:57 UTC (rev 13149) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/blocks.php 2015-09-21 20:09:40 UTC (rev 13150) @@ -44,3 +44,5 @@ define('_MB_SYSTEM_THSHOW',"Display screenshot image"); define('_MB_SYSTEM_THWIDTH',"Screenshot image width"); define('_MB_SYSTEM_REMEMBERME',"Remember me"); +//2.5.8 +define('_MB_SYSTEM_BLOCK_HEIGHT',"Block Height (lines)"); \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/xoops_version.php 2015-09-21 19:59:57 UTC (rev 13149) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/xoops_version.php 2015-09-21 20:09:40 UTC (rev 13150) @@ -175,7 +175,7 @@ $modversion['blocks'][12]['name'] = _MI_SYSTEM_BNAME13; $modversion['blocks'][12]['description'] = 'Shows theme selection box'; $modversion['blocks'][12]['show_func'] = 'b_system_themes_show'; -$modversion['blocks'][12]['options'] = '0|80'; +$modversion['blocks'][12]['options'] = '0|80|3'; $modversion['blocks'][12]['edit_func'] = 'b_system_themes_edit'; $modversion['blocks'][12]['template'] = 'system_block_themes.html'; |
From: <be...@us...> - 2015-09-29 10:22:39
|
Revision: 13154 http://sourceforge.net/p/xoops/svn/13154 Author: beckmi Date: 2015-09-29 10:22:37 +0000 (Tue, 29 Sep 2015) Log Message: ----------- Invalid argument supplied for foreach Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_functions.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-25 10:12:26 UTC (rev 13153) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-29 10:22:37 UTC (rev 13154) @@ -24,7 +24,8 @@ - added strong { font-weight: bold; } to reset.css (mamba) - added .tpl option for module Help files (mamba) - fix moved "count($tagsArray)" and "count($attrArray)" outside of FOR loop in xoopsfilterinput.php (mamba) -- add option to set height of Themes block (mamba) +- add option to set height of Themes block (mamba) +- fix: Invalid argument supplied for foreach() (cesagonchu/mamba) Security fixes Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_functions.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_functions.php 2015-09-25 10:12:26 UTC (rev 13153) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_functions.php 2015-09-29 10:22:37 UTC (rev 13154) @@ -10,14 +10,14 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) - * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) - * @package kernel - * @subpackage Xoop Notifications Functions - * @since 2.0.0 - * @author Kazumi Ono (AKA onokazu) http://www.myweb.ne.jp/, http://jp.xoops.org/ - * @version $Id$ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package kernel + * @subpackage Xoop Notifications Functions + * @since 2.0.0 + * @author Kazumi Ono (AKA onokazu) http://www.myweb.ne.jp/, http://jp.xoops.org/ + * @version $Id$ */ -defined('XOOPS_ROOT_PATH') || die('Restricted access'); +defined('XOOPS_ROOT_PATH') || exit('Restricted access'); // RMV-NOTIFY @@ -27,8 +27,8 @@ /** * Determine if notification is enabled for the selected module. * - * @param string $style Subscription style: 'block' or 'inline' - * @param int $module_id ID of the module (default current module) + * @param string $style Subscription style: 'block' or 'inline' + * @param int $module_id ID of the module (default current module) * @return bool */ function notificationEnabled($style, $module_id = null) @@ -36,28 +36,28 @@ if (isset($GLOBALS['xoopsModuleConfig']['notification_enabled'])) { $status = $GLOBALS['xoopsModuleConfig']['notification_enabled']; } else { - if (! isset($module_id)) { + if (!isset($module_id)) { return false; } - $module_handler =& xoops_gethandler('module'); - $module =& $module_handler->get($module_id); + $module_handler =& xoops_getHandler('module'); + $module =& $module_handler->get($module_id); if (!empty($module) && $module->getVar('hasnotification') == 1) { - $config_handler =& xoops_gethandler('config'); - $config = $config_handler->getConfigsByCat(0, $module_id); - $status = $config['notification_enabled']; + $config_handler =& xoops_getHandler('config'); + $config = $config_handler->getConfigsByCat(0, $module_id); + $status = $config['notification_enabled']; } else { return false; } } include_once $GLOBALS['xoops']->path('include/notification_constants.php'); - if (($style == 'block') && ($status == XOOPS_NOTIFICATION_ENABLEBLOCK || $status == XOOPS_NOTIFICATION_ENABLEBOTH)) { + if (($style === 'block') && ($status === XOOPS_NOTIFICATION_ENABLEBLOCK || $status === XOOPS_NOTIFICATION_ENABLEBOTH)) { return true; } - if (($style == 'inline') && ($status == XOOPS_NOTIFICATION_ENABLEINLINE || $status == XOOPS_NOTIFICATION_ENABLEBOTH)) { + if (($style === 'inline') && ($status === XOOPS_NOTIFICATION_ENABLEINLINE || $status === XOOPS_NOTIFICATION_ENABLEBOTH)) { return true; } // if ($status != XOOPS_NOTIFICATION_DISABLE) { - // return true; + // return true; // } return false; } @@ -78,12 +78,12 @@ if (!isset($module_id)) { global $xoopsModule; $module_id = !empty($xoopsModule) ? $xoopsModule->getVar('mid') : 0; - $module =& $xoopsModule; + $module =& $xoopsModule; } else { - $module_handler =& xoops_gethandler('module'); - $module = &$module_handler->get($module_id); + $module_handler =& xoops_getHandler('module'); + $module = &$module_handler->get($module_id); } - $not_config = & $module->getInfo('notification'); + $not_config = &$module->getInfo('notification'); if (empty($category_name)) { return $not_config['category']; } @@ -107,12 +107,12 @@ * of comments, and also remove the restriction that * all notification categories must have unique item_name. (TODO) * - * @param int $module_id ID of the module (default current module) + * @param int $module_id ID of the module (default current module) * @return mixed Associative array of category info */ function ¬ificationCommentCategoryInfo($module_id = null) { - $ret = false; + $ret = false; $all_categories =& notificationCategoryInfo('', $module_id); if (empty($all_categories)) { return $ret; @@ -123,7 +123,7 @@ continue; } foreach ($all_events as $event) { - if ($event['name'] == 'comment') { + if ($event['name'] === 'comment') { return $category; } } @@ -138,9 +138,9 @@ * Get an array of info for all events (each event has associative array) * in the selected category of the selected module. * - * @param string $category_name Category name - * @param bool $enabled_only If true, return only enabled events - * @param int $module_id ID of the module (default current module) + * @param string $category_name Category name + * @param bool $enabled_only If true, return only enabled events + * @param int $module_id ID of the module (default current module) * @return mixed */ function ¬ificationEvents($category_name, $enabled_only, $module_id = null) @@ -148,23 +148,23 @@ if (!isset($module_id)) { global $xoopsModule; $module_id = !empty($xoopsModule) ? $xoopsModule->getVar('mid') : 0; - $module =& $xoopsModule; + $module =& $xoopsModule; } else { - $module_handler =& xoops_gethandler('module'); - $module = $module_handler->get($module_id); + $module_handler =& xoops_getHandler('module'); + $module = $module_handler->get($module_id); } - $not_config = $module->getInfo('notification'); - $config_handler = & xoops_gethandler('config'); - $mod_config = $config_handler->getConfigsByCat(0, $module_id); + $not_config = $module->getInfo('notification'); + $config_handler = &xoops_getHandler('config'); + $mod_config = $config_handler->getConfigsByCat(0, $module_id); $category = notificationCategoryInfo($category_name, $module_id); global $xoopsConfig; $event_array = array(); - $override_comment = false; + $override_comment = false; $override_commentsubmit = false; - $override_bookmark = false; + $override_bookmark = false; foreach ($not_config['event'] as $event) { if ($event['category'] == $category_name) { @@ -175,13 +175,13 @@ if (!$enabled_only || notificationEventEnabled($category, $event, $module)) { $event_array[] = $event; } - if ($event['name'] == 'comment') { + if ($event['name'] === 'comment') { $override_comment = true; } - if ($event['name'] == 'comment_submit') { + if ($event['name'] === 'comment_submit') { $override_commentsubmit = true; } - if ($event['name'] == 'bookmark') { + if ($event['name'] === 'bookmark') { $override_bookmark = true; } } @@ -199,14 +199,14 @@ $mail_template_dir = $dir; include_once $GLOBALS['xoops']->path('include/comment_constants.php'); - $config_handler =& xoops_gethandler('config'); - $com_config = $config_handler->getConfigsByCat(0, $module_id); + $config_handler =& xoops_getHandler('config'); + $com_config = $config_handler->getConfigsByCat(0, $module_id); if (!$enabled_only) { $insert_comment = true; - $insert_submit = true; + $insert_submit = true; } else { $insert_comment = false; - $insert_submit = false; + $insert_submit = false; switch ($com_config['com_rule']) { case XOOPS_COMMENT_APPROVENONE: // comments disabled, no comment events @@ -231,47 +231,45 @@ } if ($insert_comment) { $event = array( - 'name' => 'comment' , - 'category' => $category['name'] , - 'title' => _NOT_COMMENT_NOTIFY , - 'caption' => _NOT_COMMENT_NOTIFYCAP , - 'description' => _NOT_COMMENT_NOTIFYDSC , - 'mail_template_dir' => $mail_template_dir , - 'mail_template' => 'comment_notify' , - 'mail_subject' => _NOT_COMMENT_NOTIFYSBJ); + 'name' => 'comment', + 'category' => $category['name'], + 'title' => _NOT_COMMENT_NOTIFY, + 'caption' => _NOT_COMMENT_NOTIFYCAP, + 'description' => _NOT_COMMENT_NOTIFYDSC, + 'mail_template_dir' => $mail_template_dir, + 'mail_template' => 'comment_notify', + 'mail_subject' => _NOT_COMMENT_NOTIFYSBJ); if (!$enabled_only || notificationEventEnabled($category, $event, $module)) { $event_array[] = $event; } } if ($insert_submit) { $event = array( - 'name' => 'comment_submit' , - 'category' => $category['name'] , - 'title' => _NOT_COMMENTSUBMIT_NOTIFY , - 'caption' => _NOT_COMMENTSUBMIT_NOTIFYCAP , - 'description' => _NOT_COMMENTSUBMIT_NOTIFYDSC , - 'mail_template_dir' => $mail_template_dir , - 'mail_template' => 'commentsubmit_notify' , - 'mail_subject' => _NOT_COMMENTSUBMIT_NOTIFYSBJ , - 'admin_only' => 1); + 'name' => 'comment_submit', + 'category' => $category['name'], + 'title' => _NOT_COMMENTSUBMIT_NOTIFY, + 'caption' => _NOT_COMMENTSUBMIT_NOTIFYCAP, + 'description' => _NOT_COMMENTSUBMIT_NOTIFYDSC, + 'mail_template_dir' => $mail_template_dir, + 'mail_template' => 'commentsubmit_notify', + 'mail_subject' => _NOT_COMMENTSUBMIT_NOTIFYSBJ, + 'admin_only' => 1); if (!$enabled_only || notificationEventEnabled($category, $event, $module)) { $event_array[] = $event; } } - } } // Insert bookmark info if appropriate - if (!empty($category['allow_bookmark'])) { if (!$override_bookmark) { $event = array( - 'name' => 'bookmark' , - 'category' => $category['name'] , - 'title' => _NOT_BOOKMARK_NOTIFY , - 'caption' => _NOT_BOOKMARK_NOTIFYCAP , + 'name' => 'bookmark', + 'category' => $category['name'], + 'title' => _NOT_BOOKMARK_NOTIFY, + 'caption' => _NOT_BOOKMARK_NOTIFYCAP, 'description' => _NOT_BOOKMARK_NOTIFYDSC); if (!$enabled_only || notificationEventEnabled($category, $event, $module)) { $event_array[] = $event; @@ -280,7 +278,6 @@ } return $event_array; - } /** @@ -290,22 +287,22 @@ * @todo Check that this works correctly for comment and other * events which depend on additional config options... * - * @param array $category Category info array - * @param array $event Event info array - * @param object $module Module + * @param array $category Category info array + * @param array $event Event info array + * @param object $module Module * @return bool **/ function notificationEventEnabled(&$category, &$event, &$module) { - $config_handler =& xoops_gethandler('config'); - $mod_config = $config_handler->getConfigsByCat(0, $module->getVar('mid')); + $config_handler =& xoops_getHandler('config'); + $mod_config = $config_handler->getConfigsByCat(0, $module->getVar('mid')); if (is_array($mod_config['notification_events']) && $mod_config['notification_events'] != array()) { $option_name = notificationGenerateConfig($category, $event, 'option_name'); if (in_array($option_name, $mod_config['notification_events'])) { return true; } - $notification_handler = & xoops_gethandler('notification'); + $notification_handler = &xoops_getHandler('notification'); } return false; @@ -315,9 +312,9 @@ * Get associative array of info for the selected event in the selected * category (for the selected module). * - * @param string $category_name Notification category - * @param string $event_name Notification event - * @param int $module_id ID of the module (default current module) + * @param string $category_name Notification category + * @param string $event_name Notification event + * @param int $module_id ID of the module (default current module) * @return mixed */ function ¬ificationEventInfo($category_name, $event_name, $module_id = null) @@ -337,7 +334,7 @@ * Get an array of associative info arrays for subscribable categories * for the selected module. * - * @param int $module_id ID of the module + * @param int $module_id ID of the module * @return mixed */ @@ -346,15 +343,16 @@ $all_categories = notificationCategoryInfo('', $module_id); // FIXME: better or more standardized way to do this? - $script_url = explode('/', $_SERVER['PHP_SELF']); + $script_url = explode('/', $_SERVER['PHP_SELF']); $script_name = $script_url[count($script_url) - 1]; $sub_categories = array(); + if (null != $all_categories) { foreach ($all_categories as $category) { // Check the script name $subscribe_from = $category['subscribe_from']; if (!is_array($subscribe_from)) { - if ($subscribe_from == '*') { + if ($subscribe_from === '*') { $subscribe_from = array( $script_name); // FIXME: this is just a hack: force a match @@ -370,20 +368,19 @@ // check if that argument exists... if (empty($category['item_name'])) { $category['item_name'] = ''; - $category['item_id'] = 0; - $sub_categories[] = $category; + $category['item_id'] = 0; + $sub_categories[] = $category; } else { $item_name = $category['item_name']; - $id = ($item_name != '' && isset($_GET[$item_name])) ? (int)($_GET[$item_name]) : 0; + $id = ($item_name != '' && isset($_GET[$item_name])) ? (int)($_GET[$item_name]) : 0; if ($id > 0) { $category['item_id'] = $id; - $sub_categories[] = $category; + $sub_categories[] = $category; } } } - + } return $sub_categories; - } /** |