|
From: <be...@us...> - 2013-05-12 07:46:11
|
Revision: 11531
http://sourceforge.net/p/xoops/svn/11531
Author: beckmi
Date: 2013-05-12 07:46:06 +0000 (Sun, 12 May 2013)
Log Message:
-----------
Updating English files (Cesag)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/language/english/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopscomments.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/textarea/language/english.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install2.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/calendar.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/comment.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/xoopsmailerlocal.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/language/english/admin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/language/english/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/language/english/modinfo.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/language/english/admin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/language/english/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/language/english/modinfo.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/avatars.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/banners.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/blocksadmin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/comments.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/groups.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/images.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/mailusers.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/maintenance.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/modulesadmin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/preferences.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/smilies.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/tplsets.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/userrank.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/users.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/blocks.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/cpanel.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/help/groups.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/modinfo.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/default/language/english/admin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/zetadigme/language/english/admin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/language/english/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/zetagenesis/language/english/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/language/english/admin.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/language/english/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/language/english/main.php 2013-05-12 07:32:48 UTC (rev 11530)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/language/english/main.php 2013-05-12 07:46:06 UTC (rev 11531)
@@ -13,18 +13,15 @@
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
* @author Grégory Mage (Aka Mage)
*/
-
// Info
define('_AM_MODULEADMIN_CONFIG','Configuration Check');
-define('_AM_MODULEADMIN_CONFIG_CHMOD',"The folder '%s' must be with a chmod '%s' (it's now set on %s).'");
+define('_AM_MODULEADMIN_CONFIG_CHMOD',"The folder '%s' must be with a chmod '%s' (it's now set on %s).");
define('_AM_MODULEADMIN_CONFIG_FOLDERKO',"The folder '%s' does not exist");
define('_AM_MODULEADMIN_CONFIG_FOLDEROK',"The folder '%s' exists");
define('_AM_MODULEADMIN_CONFIG_PHP','Minimum PHP required: %s (your version is %s)');
define('_AM_MODULEADMIN_CONFIG_XOOPS','Minimum XOOPS required: %s (your version is %s)');
-
-define('_AM_MODULEADMIN_CONFIG_DB','minimum version required: %s (your version is %s)');
+define('_AM_MODULEADMIN_CONFIG_DB','Minimum version required: %s (your version is %s)');
define('_AM_MODULEADMIN_CONFIG_ADMIN','Minimum ModuleAdmin required: %s (your version is %s)');
-
// About
define('_AM_MODULEADMIN_ABOUT_CHANGELOG','Change log');
define('_AM_MODULEADMIN_ABOUT_DESCRIPTION','Description');
@@ -32,18 +29,15 @@
define('_AM_MODULEADMIN_ABOUT_MODULESTATUS','Status:');
define('_AM_MODULEADMIN_ABOUT_UPDATEDATE','Updated:');
define('_AM_MODULEADMIN_ABOUT_WEBSITE',"Website:");
-
define("_AM_MODULEADMIN_ABOUT_RELEASEDATE","Released: ");
define("_AM_MODULEADMIN_ABOUT_AUTHOR","Author: ");
define("_AM_MODULEADMIN_ABOUT_CREDITS","Credits: ");
define("_AM_MODULEADMIN_ABOUT_LICENSE","License: ");
define("_AM_MODULEADMIN_ABOUT_AUTHOR_NAME","Author name: ");
define("_AM_MODULEADMIN_ABOUT_AUTHOR_INFO","Author Info");
-
define("_AM_MODULEADMIN_HOME","Home");
define("_AM_MODULEADMIN_DASHBOARD","Dashboard");
define("_AM_MODULEADMIN_ABOUT","About");
define("_AM_MODULEADMIN_PERMISSIONS","Permissions");
-
//ModuleAdmin
define("_AM_MODULEADMIN_ADMIN_FOOTER","<div class='center smallsmall italic pad5'>This module is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>");
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopscomments.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopscomments.php 2013-05-12 07:32:48 UTC (rev 11530)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopscomments.php 2013-05-12 07:46:06 UTC (rev 11531)
@@ -20,7 +20,7 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsobject.php';
+require_once XOOPS_ROOT_PATH . '/kernel/object.php';
include_once XOOPS_ROOT_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/comment.php';
$GLOBALS['xoopsLogger']->addDeprecated("'/class/xoopscommments.php' is deprecated since XOOPS 2.5.4, please use 'kernel/comment.php' instead.");
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/textarea/language/english.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/textarea/language/english.php 2013-05-12 07:32:48 UTC (rev 11530)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/textarea/language/english.php 2013-05-12 07:46:06 UTC (rev 11531)
@@ -9,9 +9,8 @@
* @version $Id$
* @package xoopseditor
*/
-
/*
* Assocated with editor_registry.php
*/
-define("_XOOPS_EDITOR_TEXTAREA","Plain Text");
-?>
+define('_XOOPS_EDITOR_TEXTAREA',"Plain Text");
+?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php 2013-05-12 07:32:48 UTC (rev 11530)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php 2013-05-12 07:46:06 UTC (rev 11531)
@@ -14,12 +14,10 @@
* Assocated with editor_registry.php
*/
// Name of the editor
-define("_XOOPS_EDITOR_TINYMCE","TinyMCE");
-
+define('_XOOPS_EDITOR_TINYMCE',"TinyMCE");
// The value must be the same as /tinymce/jscripts/langs/your_language_code, for example, "en" for English, "fr" for French
// For details, check http://tinymce.moxiecode.com/download_i18n.php
-define("_XOOPS_EDITOR_TINYMCE_LANGUAGE","en");
-
+define('_XOOPS_EDITOR_TINYMCE_LANGUAGE',"en");
// FONT LIST, FORMAT: "Name=value1,value2;Name=value"
-define("_XOOPS_EDITOR_TINYMCE_FONTS","Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings");
+define('_XOOPS_EDITOR_TINYMCE_FONTS',"Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings");
?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install.php 2013-05-12 07:32:48 UTC (rev 11530)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install.php 2013-05-12 07:46:06 UTC (rev 11531)
@@ -13,204 +13,169 @@
* @author dugris <du...@fr...>
* @version $Id$
*/
-
// _LANGCODE: en
// _CHARSET : UTF-8
// Translator: XOOPS Translation Team
-
-define("SHOW_HIDE_HELP","Show/hide help text");
-
+define('SHOW_HIDE_HELP',"Show/hide help text");
// License
define('LICENSE_NOT_WRITEABLE','License is %s . <br/><font style="colour:#ff0000">Make ../include/license.php Writable</font>');
define('LICENSE_IS_WRITEABLE','License is %s');
-
// Configuration check page
-define("SERVER_API","Server API");
-define("PHP_EXTENSION","%s extension");
-define("CHAR_ENCODING","Character encoding");
-define("XML_PARSING","XML parsing");
-define("REQUIREMENTS","Requirements");
-define("_PHP_VERSION","PHP version");
-define("RECOMMENDED_SETTINGS","Recommended settings");
-define("RECOMMENDED_EXTENSIONS","Recommended extensions");
-define("SETTING_NAME","Setting name");
-define("RECOMMENDED","Recommended");
-define("CURRENT","Current");
-define("RECOMMENDED_EXTENSIONS_MSG","These extensions are not required for normal use, but may be necessary to explore
+define('SERVER_API',"Server API");
+define('PHP_EXTENSION',"%s extension");
+define('CHAR_ENCODING',"Character encoding");
+define('XML_PARSING',"XML parsing");
+define('REQUIREMENTS',"Requirements");
+define('_PHP_VERSION',"PHP version");
+define('RECOMMENDED_SETTINGS',"Recommended settings");
+define('RECOMMENDED_EXTENSIONS',"Recommended extensions");
+define('SETTING_NAME',"Setting name");
+define('RECOMMENDED',"Recommended");
+define('CURRENT',"Current");
+define('RECOMMENDED_EXTENSIONS_MSG',"These extensions are not required for normal use, but may be necessary to explore
some specific features (like the multi-language or RSS support). Thus, it is recommended to have them installed.");
-define("NONE","None");
-define("SUCCESS","Success");
-define("WARNING","Warning");
-define("FAILED","Failed");
-
+define('NONE',"None");
+define('SUCCESS',"Success");
+define('WARNING',"Warning");
+define('FAILED',"Failed");
// Titles (main and pages)
-define("XOOPS_INSTALL_WIZARD","XOOPS Installation Wizard");
-
-define("LANGUAGE_SELECTION","Language selection");
-define("LANGUAGE_SELECTION_TITLE","Select your language"); // L128
-define("INTRODUCTION","Introduction");
-define("INTRODUCTION_TITLE","Welcome to the XOOPS Installation Wizard"); // L0
-define("CONFIGURATION_CHECK","Configuration check");
-define("CONFIGURATION_CHECK_TITLE","Checking your server configuration");
-define("PATHS_SETTINGS","Paths settings");
-define("PATHS_SETTINGS_TITLE","Paths settings");
-define("DATABASE_CONNECTION","Database connection");
-define("DATABASE_CONNECTION_TITLE","Database connection");
-define("DATABASE_CONFIG","Database configuration");
-define("DATABASE_CONFIG_TITLE","Database configuration");
-define("CONFIG_SAVE","Save Configuration");
-define("CONFIG_SAVE_TITLE","Saving your system configuration");
-define("TABLES_CREATION","Tables creation");
-define("TABLES_CREATION_TITLE","Database tables creation");
-define("INITIAL_SETTINGS","Initial settings");
-define("INITIAL_SETTINGS_TITLE","Please enter your initial settings");
-define("DATA_INSERTION","Data insertion");
-define("DATA_INSERTION_TITLE","Saving your settings to the database");
-define("WELCOME","Welcome");
-define("WELCOME_TITLE","Welcome to your XOOPS site"); // L0
-
-
+define('XOOPS_INSTALL_WIZARD',"XOOPS Installation Wizard");
+define('LANGUAGE_SELECTION',"Language selection");
+define('LANGUAGE_SELECTION_TITLE',"Select your language"); // L128
+define('INTRODUCTION',"Introduction");
+define('INTRODUCTION_TITLE',"Welcome to the XOOPS Installation Wizard"); // L0
+define('CONFIGURATION_CHECK',"Configuration check");
+define('CONFIGURATION_CHECK_TITLE',"Checking your server configuration");
+define('PATHS_SETTINGS',"Paths settings");
+define('PATHS_SETTINGS_TITLE',"Paths settings");
+define('DATABASE_CONNECTION',"Database connection");
+define('DATABASE_CONNECTION_TITLE',"Database connection");
+define('DATABASE_CONFIG',"Database configuration");
+define('DATABASE_CONFIG_TITLE',"Database configuration");
+define('CONFIG_SAVE',"Save Configuration");
+define('CONFIG_SAVE_TITLE',"Saving your system configuration");
+define('TABLES_CREATION',"Tables creation");
+define('TABLES_CREATION_TITLE',"Database tables creation");
+define('INITIAL_SETTINGS',"Initial settings");
+define('INITIAL_SETTINGS_TITLE',"Please enter your initial settings");
+define('DATA_INSERTION',"Data insertion");
+define('DATA_INSERTION_TITLE',"Saving your settings to the database");
+define('WELCOME',"Welcome");
+define('WELCOME_TITLE',"Welcome to your XOOPS site"); // L0
// Settings (labels and help text)
-define("XOOPS_PATHS","XOOPS Physical paths");
-define("XOOPS_URLS","Web locations");
-
-define("XOOPS_ROOT_PATH_LABEL","XOOPS documents root physical path");
-define("XOOPS_ROOT_PATH_HELP","Physical path to the XOOPS documents (served) directory WITHOUT trailing slash");
-
-define("XOOPS_LIB_PATH_LABEL","XOOPS library directory");
-define("XOOPS_LIB_PATH_HELP","Physical path to the XOOPS library directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of " . XOOPS_ROOT_PATH_LABEL . " to make it secure.");
-define("XOOPS_DATA_PATH_LABEL","XOOPS data files directory");
-define("XOOPS_DATA_PATH_HELP","Physical path to the XOOPS data files (writable) directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of " . XOOPS_ROOT_PATH_LABEL . " to make it secure.");
-
-define("XOOPS_URL_LABEL","Website location (URL)"); // L56
-define("XOOPS_URL_HELP","Main URL that will be used to access your XOOPS installation"); // L58
-
-define("LEGEND_CONNECTION","Server connection");
-define("LEGEND_DATABASE","Database"); // L51
-
-define("DB_HOST_LABEL","Server hostname"); // L27
-define("DB_HOST_HELP", "Hostname of the database server. If you are unsure, <em>localhost</em> works in most cases"); // L67
-define("DB_USER_LABEL","User name"); // L28
-define("DB_USER_HELP", "Name of the user account that will be used to connect to the database server"); // L65
-define("DB_PASS_LABEL","Password"); // L52
-define("DB_PASS_HELP", "Password of your database user account"); // L68
-define("DB_NAME_LABEL","Database name"); // L29
-define("DB_NAME_HELP", "The name of database on the host. The installer will attempt to create the database if not exist"); // L64
-define("DB_CHARSET_LABEL","Database character set");
-define("DB_CHARSET_HELP", "MySQL includes character set support that enables you to store data using a variety of character sets and perform comparisons according to a variety of collations.");
-define("DB_COLLATION_LABEL","Database collation");
-define("DB_COLLATION_HELP", "A collation is a set of rules for comparing characters in a character set.");
-define("DB_PREFIX_LABEL","Table prefix"); // L30
-define("DB_PREFIX_HELP", "This prefix will be added to all new tables created to avoid name conflicts in the database. If you are unsure, just keep the default"); // L63
-define("DB_PCONNECT_LABEL","Use persistent connection"); // L54
-define("DB_PCONNECT_HELP", "Default is 'No'. Leave it blank if you are unsure"); // L69
-define("DB_DATABASE_LABEL","Database");
-
-define("LEGEND_ADMIN_ACCOUNT","Administrator account");
-define("ADMIN_LOGIN_LABEL","Admin login"); // L37
-define("ADMIN_EMAIL_LABEL","Admin e-mail"); // L38
-define("ADMIN_PASS_LABEL","Admin password"); // L39
-define("ADMIN_CONFIRMPASS_LABEL","Confirm password"); // L74
-
+define('XOOPS_PATHS',"XOOPS Physical paths");
+define('XOOPS_URLS',"Web locations");
+define('XOOPS_ROOT_PATH_LABEL',"XOOPS documents root physical path");
+define('XOOPS_ROOT_PATH_HELP',"Physical path to the XOOPS documents (served) directory WITHOUT trailing slash");
+define('XOOPS_LIB_PATH_LABEL',"XOOPS library directory");
+define('XOOPS_LIB_PATH_HELP',"Physical path to the XOOPS library directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of " . XOOPS_ROOT_PATH_LABEL . " to make it secure.");
+define('XOOPS_DATA_PATH_LABEL',"XOOPS data files directory");
+define('XOOPS_DATA_PATH_HELP',"Physical path to the XOOPS data files (writable) directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of " . XOOPS_ROOT_PATH_LABEL . " to make it secure.");
+define('XOOPS_URL_LABEL',"Website location (URL)"); // L56
+define('XOOPS_URL_HELP',"Main URL that will be used to access your XOOPS installation"); // L58
+define('LEGEND_CONNECTION',"Server connection");
+define('LEGEND_DATABASE',"Database"); // L51
+define('DB_HOST_LABEL',"Server hostname"); // L27
+define('DB_HOST_HELP',"Hostname of the database server. If you are unsure, <em>localhost</em> works in most cases"); // L67
+define('DB_USER_LABEL',"User name"); // L28
+define('DB_USER_HELP',"Name of the user account that will be used to connect to the database server"); // L65
+define('DB_PASS_LABEL',"Password"); // L52
+define('DB_PASS_HELP',"Password of your database user account"); // L68
+define('DB_NAME_LABEL',"Database name"); // L29
+define('DB_NAME_HELP',"The name of database on the host. The installer will attempt to create the database if not exist"); // L64
+define('DB_CHARSET_LABEL',"Database character set");
+define('DB_CHARSET_HELP',"MySQL includes character set support that enables you to store data using a variety of character sets and perform comparisons according to a variety of collations.");
+define('DB_COLLATION_LABEL',"Database collation");
+define('DB_COLLATION_HELP',"A collation is a set of rules for comparing characters in a character set.");
+define('DB_PREFIX_LABEL',"Table prefix"); // L30
+define('DB_PREFIX_HELP',"This prefix will be added to all new tables created to avoid name conflicts in the database. If you are unsure, just keep the default"); // L63
+define('DB_PCONNECT_LABEL',"Use persistent connection"); // L54
+define('DB_PCONNECT_HELP',"Default is 'No'. Leave it blank if you are unsure"); // L69
+define('DB_DATABASE_LABEL',"Database");
+define('LEGEND_ADMIN_ACCOUNT',"Administrator account");
+define('ADMIN_LOGIN_LABEL',"Admin login"); // L37
+define('ADMIN_EMAIL_LABEL',"Admin e-mail"); // L38
+define('ADMIN_PASS_LABEL',"Admin password"); // L39
+define('ADMIN_CONFIRMPASS_LABEL',"Confirm password"); // L74
// Buttons
-define("BUTTON_PREVIOUS","Previous"); // L42
-define("BUTTON_NEXT","Next"); // L47
-
+define('BUTTON_PREVIOUS',"Previous"); // L42
+define('BUTTON_NEXT',"Next"); // L47
// Messages
-define("XOOPS_FOUND","%s found");
-define("CHECKING_PERMISSIONS","Checking file and directory permissions..."); // L82
-define("IS_NOT_WRITABLE","%s is NOT writable."); // L83
-define("IS_WRITABLE","%s is writable."); // L84
-
-define("XOOPS_PATH_FOUND","Path found.");
-
-define("READY_CREATE_TABLES","No XOOPS tables were detected.<br />The installer is now ready to create the XOOPS system tables.<br />Press <em>next</em> to proceed.");
-define("XOOPS_TABLES_FOUND","The XOOPS system tables already exists in your database.<br />Press <em>next</em> to go to the next step."); // L131
-define("XOOPS_TABLES_CREATED","XOOPS system tables have been created.<br />Press <em>next</em> to go to the next step.");
-define("READY_INSERT_DATA","The installer is now ready to insert initial data into your database.");
-define("READY_SAVE_MAINFILE","The installer is now ready to save the specified settings to <em>mainfile.php</em>.<br />Press <em>next</em> to proceed.");
-define("SAVED_MAINFILE","Settings saved in mainfile.php");
-define("SAVED_MAINFILE_MSG","The installer has saved the specified settings to <em>mainfile.php</em> and <em>secure.php</em>. Press <em>next</em> to go to the next step.");
-define("DATA_ALREADY_INSERTED","XOOPS data found in database.<br />Press <em>next</em> to go to the next step.");
-define("DATA_INSERTED","Initial data has been inserted into database.<br />Press <em>next</em> to go to the next step.");
-
-
+define('XOOPS_FOUND',"%s found");
+define('CHECKING_PERMISSIONS',"Checking file and directory permissions..."); // L82
+define('IS_NOT_WRITABLE',"%s is NOT writable."); // L83
+define('IS_WRITABLE',"%s is writable."); // L84
+define('XOOPS_PATH_FOUND',"Path found.");
+define('READY_CREATE_TABLES',"No XOOPS tables were detected.<br />The installer is now ready to create the XOOPS system tables.<br />Press <em>next</em> to proceed.");
+define('XOOPS_TABLES_FOUND',"The XOOPS system tables already exists in your database.<br />Press <em>next</em> to go to the next step."); // L131
+define('XOOPS_TABLES_CREATED',"XOOPS system tables have been created.<br />Press <em>next</em> to go to the next step.");
+define('READY_INSERT_DATA',"The installer is now ready to insert initial data into your database.");
+define('READY_SAVE_MAINFILE',"The installer is now ready to save the specified settings to <em>mainfile.php</em>.<br />Press <em>next</em> to proceed.");
+define('SAVED_MAINFILE',"Settings saved in mainfile.php");
+define('SAVED_MAINFILE_MSG',"The installer has saved the specified settings to <em>mainfile.php</em> and <em>secure.php</em>. Press <em>next</em> to go to the next step.");
+define('DATA_ALREADY_INSERTED',"XOOPS data found in database.<br />Press <em>next</em> to go to the next step.");
+define('DATA_INSERTED',"Initial data has been inserted into database.<br />Press <em>next</em> to go to the next step.");
// %s is database name
-define("DATABASE_CREATED","Database %s created!"); // L43
+define('DATABASE_CREATED',"Database %s created!"); // L43
// %s is table name
-define("TABLE_NOT_CREATED","Unable to create table %s"); // L118
-define("TABLE_CREATED","Table %s created."); // L45
-define("ROWS_INSERTED","%d entries inserted to table %s."); // L119
-define("ROWS_FAILED","Failed inserting %d entries to table %s."); // L120
-define("TABLE_ALTERED","Table %s updated."); // L133
-define("TABLE_NOT_ALTERED","Failed updating table %s."); // L134
-define("TABLE_DROPPED","Table %s dropped."); // L163
-define("TABLE_NOT_DROPPED","Failed deleting table %s."); // L164
-
+define('TABLE_NOT_CREATED',"Unable to create table %s"); // L118
+define('TABLE_CREATED',"Table %s created."); // L45
+define('ROWS_INSERTED',"%d entries inserted to table %s."); // L119
+define('ROWS_FAILED',"Failed inserting %d entries to table %s."); // L120
+define('TABLE_ALTERED',"Table %s updated."); // L133
+define('TABLE_NOT_ALTERED',"Failed updating table %s."); // L134
+define('TABLE_DROPPED',"Table %s dropped."); // L163
+define('TABLE_NOT_DROPPED',"Failed deleting table %s."); // L164
// Error messages
-define("ERR_COULD_NOT_ACCESS","Could not access the specified folder. Please verify that it exists and is readable by the server.");
-define("ERR_NO_XOOPS_FOUND","No XOOPS installation could be found in the specified folder.");
-define("ERR_INVALID_EMAIL","Invalid Email"); // L73
-define("ERR_REQUIRED","Information is required."); // L41
-define("ERR_PASSWORD_MATCH","The two passwords do not match");
-define("ERR_NEED_WRITE_ACCESS","The server must be given write access to the following files and folders<br />(i.e. <em>chmod 777 directory_name</em> on a UNIX/LINUX server)<br />If they are not available or not created correctly, please create manually and set proper permissions.");
-define("ERR_NO_DATABASE","Could not create database. Contact the server administrator for details."); // L31
-define("ERR_NO_DBCONNECTION","Could not connect to the database server."); // L106
-define("ERR_WRITING_CONSTANT","Failed writing constant %s."); // L122
-
-define("ERR_COPY_MAINFILE","Could not copy the distribution file to mainfile.php");
-define("ERR_WRITE_MAINFILE","Could not write into mainfile.php. Please check the file permission and try again.");
-define("ERR_READ_MAINFILE","Could not open mainfile.php for reading");
-
-define("ERR_INVALID_DBCHARSET","The charset '%s' is not supported.");
-define("ERR_INVALID_DBCOLLATION","The collation '%s' is not supported.");
-define("ERR_CHARSET_NOT_SET","Default character set is not set for XOOPS database.");
-
-
-define("_INSTALL_CHARSET","UTF-8");
-
-define("SUPPORT","Supports");
-
-define("LOGIN","Authentication");
-define("LOGIN_TITLE","Authentication");
-define("USER_LOGIN","Administrator Login");
-define("USERNAME","Username :");
-define("PASSWORD","Password :");
-
-define("ICONV_CONVERSION","Character set conversion");
-define("ZLIB_COMPRESSION","Zlib Compression");
-define("IMAGE_FUNCTIONS","Image functions");
-define("IMAGE_METAS","Image meta data (exif)");
-define("FILTER_FUNCTIONS","Filter functions");
-
-define("ADMIN_EXIST","The administrator account already exists.<br />Press <strong>next</strong> to go to the next step.");
-
-define("CONFIG_SITE","Site configuration");
-define("CONFIG_SITE_TITLE","Site configuration");
-define("MODULES","Modules installation");
-define("MODULES_TITLE","Modules installation");
-define("THEME","Select theme");
-define("THEME_TITLE","Select the default theme");
-
-define("INSTALLED_MODULES","The following modules have been installed.<br />Press <strong>next</strong> to go to the next step.");
-define("NO_MODULES_FOUND","No modules found.<br />Press <strong>next</strong> to go to the next step.");
-define("NO_INSTALLED_MODULES","No module installed.<br />Press <strong>next</strong> to go to the next step.");
-
-define("THEME_NO_SCREENSHOT","No screenshot found");
-
-define("IS_VALOR"," => ");
-
+define('ERR_COULD_NOT_ACCESS',"Could not access the specified folder. Please verify that it exists and is readable by the server.");
+define('ERR_NO_XOOPS_FOUND',"No XOOPS installation could be found in the specified folder.");
+define('ERR_INVALID_EMAIL',"Invalid Email"); // L73
+define('ERR_REQUIRED',"Information is required."); // L41
+define('ERR_PASSWORD_MATCH',"The two passwords do not match");
+define('ERR_NEED_WRITE_ACCESS',"The server must be given write access to the following files and folders<br />(i.e. <em>chmod 777 directory_name</em> on a UNIX/LINUX server)<br />If they are not available or not created correctly, please create manually and set proper permissions.");
+define('ERR_NO_DATABASE',"Could not create database. Contact the server administrator for details."); // L31
+define('ERR_NO_DBCONNECTION',"Could not connect to the database server."); // L106
+define('ERR_WRITING_CONSTANT',"Failed writing constant %s."); // L122
+define('ERR_COPY_MAINFILE',"Could not copy the distribution file to mainfile.php");
+define('ERR_WRITE_MAINFILE',"Could not write into mainfile.php. Please check the file permission and try again.");
+define('ERR_READ_MAINFILE',"Could not open mainfile.php for reading");
+define('ERR_INVALID_DBCHARSET',"The charset '%s' is not supported.");
+define('ERR_INVALID_DBCOLLATION',"The collation '%s' is not supported.");
+define('ERR_CHARSET_NOT_SET',"Default character set is not set for XOOPS database.");
+define('_INSTALL_CHARSET',"UTF-8");
+define('SUPPORT',"Supports");
+define('LOGIN',"Authentication");
+define('LOGIN_TITLE',"Authentication");
+define('USER_LOGIN',"Administrator Login");
+define('USERNAME',"Username :");
+define('PASSWORD',"Password :");
+define('ICONV_CONVERSION',"Character set conversion");
+define('ZLIB_COMPRESSION',"Zlib Compression");
+define('IMAGE_FUNCTIONS',"Image functions");
+define('IMAGE_METAS',"Image meta data (exif)");
+define('FILTER_FUNCTIONS',"Filter functions");
+define('ADMIN_EXIST',"The administrator account already exists.<br />Press <strong>next</strong> to go to the next step.");
+define('CONFIG_SITE',"Site configuration");
+define('CONFIG_SITE_TITLE',"Site configuration");
+define('MODULES',"Modules installation");
+define('MODULES_TITLE',"Modules installation");
+define('THEME',"Select theme");
+define('THEME_TITLE',"Select the default theme");
+define('INSTALLED_MODULES',"The following modules have been installed.<br />Press <strong>next</strong> to go to the next step.");
+define('NO_MODULES_FOUND',"No modules found.<br />Press <strong>next</strong> to go to the next step.");
+define('NO_INSTALLED_MODULES',"No module installed.<br />Press <strong>next</strong> to go to the next step.");
+define('THEME_NO_SCREENSHOT',"No screenshot found");
+define('IS_VALOR'," => ");
// password message
-define("PASSWORD_LABEL","Password strength : ");
-define("PASSWORD_DESC","Password not entered");
-define("PASSWORD_GENERATOR","Password generator");
-define("PASSWORD_GENERATE","Generate");
-define("PASSWORD_COPY","Copy");
-
-define("PASSWORD_VERY_WEAK","Very Weak");
-define("PASSWORD_WEAK","Weak")...
[truncated message content] |
|
From: <be...@us...> - 2013-08-11 20:44:44
|
Revision: 11896
http://sourceforge.net/p/xoops/svn/11896
Author: beckmi
Date: 2013-08-11 20:44:42 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
added: check if 'date.timezone' is set in php.ini, set it to UTC, if not
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php
Added Paths:
-----------
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/empty.png
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/empty.png
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/empty.png
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/empty.png 2013-08-11 20:39:34 UTC (rev 11895)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/empty.png 2013-08-11 20:44:42 UTC (rev 11896)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/empty.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.7/htdocs/include/common.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php 2013-08-11 20:39:34 UTC (rev 11895)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php 2013-08-11 20:44:42 UTC (rev 11896)
@@ -136,6 +136,10 @@
// $xoops_server_timezone .="+".$xoopsConfig["server_TZ"]; } else{
// $xoops_server_timezone .=$xoopsConfig["server_TZ"]; } date_default_timezone_set($xoops_server_timezone);
+//check if 'date.timezone' is set in php.ini
+if (!ini_get('date.timezone')) {
+ date_default_timezone_set('UTC');
+}
/**
* Enable Gzip compression, r
|
|
From: <be...@us...> - 2013-09-14 03:16:55
|
Revision: 12033
http://sourceforge.net/p/xoops/svn/12033
Author: beckmi
Date: 2013-09-14 03:16:44 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
removing php_closing_tag
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.admin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.cache.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.ini.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.locale.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/functions.user.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/object.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/art/xoopsart.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/textsanitizer/module.textsanitizer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/admin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/backend.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/banners.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/browse.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ads.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ldap.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_provisionning.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_xoops.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/authfactory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/apc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/file.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/memcache.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/model.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xcache.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xoopscache.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.recaptcha.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/image/scripts/image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/recaptcha/recaptchalib.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/recaptcha.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/text.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/xoopscaptcha.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/class.tar.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/class.zipfile.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/commentrenderer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/criteria.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/database.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/databasefactory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/mysqldatabase.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/downloader.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/errorhandler.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/file/file.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/file/folder.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/file/xoopsfile.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger/render.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger/xoopslogger.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger_render.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/phpmailer/class.phpmailer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/phpmailer/class.pop3.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/phpmailer/class.smtp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/phpmailer/language/phpmailer.lang-en.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/xoopsmultimailer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mimetypes.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/joint.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/read.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/stats.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/sync.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/write.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/xoopsmodel.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/module.errorhandler.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/pagenav.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/preload.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Config_File.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty_Compiler.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.assemble_plugin_filepath.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.assign_smarty_interface.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.create_dir_structure.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.display_debug_console.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.get_include_path.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.get_microtime.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.get_php_resource.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.is_secure.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.is_trusted.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.load_plugins.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.load_resource_plugin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.process_cached_inserts.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.process_compiled_include.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.read_cache_file.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.rm_auto.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.rmdir.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.run_insert_handler.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.smarty_include_php.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.write_cache_file.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.write_compiled_include.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.write_compiled_resource.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.write_file.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/block.textformat.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/compiler.assign.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.assign_debug_info.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.config_load.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.counter.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.cycle.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.debug.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.eval.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.fetch.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.html_checkboxes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.html_image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.html_options.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.html_radios.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.html_select_date.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.html_select_time.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.html_table.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.mailto.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.math.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.popup.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.popup_init.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.capitalize.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.cat.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.count_characters.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.count_paragraphs.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.count_sentences.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.count_words.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.date_format.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.debug_print_var.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.default.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.escape.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.indent.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.lower.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.nl2br.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.regex_replace.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.replace.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.spacify.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.string_format.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.strip.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.strip_tags.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.truncate.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.upper.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.wordwrap.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/outputfilter.trimwhitespace.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/shared.escape_special_chars.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/shared.make_timestamp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.foreachq.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.includeq.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.xoAdminIcons.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.xoAdminNav.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.xoAppUrl.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.xoImgUrl.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIcons16.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIcons32.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIconsBookmarks.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/function.block.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/function.xoInboxCount.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/function.xoMemberInfo.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/function.xoPageNav.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/function.xoops_link.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/modifier.debug_print_var.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/resource.db.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/snoopy.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/tardownloader.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/template.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/censor/censor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/censor/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/config.custom.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/flash/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/flash/flash.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/iframe/iframe.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/li/li.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/mms/mms.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/mp3/mp3.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/rtsp/rtsp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/syntaxhighlight/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/textfilter/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/textfilter/textfilter.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/ul/ul.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wiki/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wiki/wiki.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wmp/wmp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/youtube/youtube.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme_blocks.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/tree.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/uploader.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/userutility.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/utility/xoopsutility.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/bloggerapi.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/metaweblogapi.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/movabletypeapi.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/xmlrpcapi.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/xmlrpcparser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/xmlrpctag.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/xoopsapi.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rss/xmlrss2parser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/saxparser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/themesetparser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/xmltaghandler.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsblock.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopscomments.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/dhtmltextarea/dhtmltextarea.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/dhtmltextarea/editor_registry.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/dhtmltextarea/language/english.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/sampleform.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/textarea/editor_registry.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/textarea/language/english.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/textarea/textarea.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/xoopseditor.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/xoopseditor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/form.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formbutton.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formbuttontray.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcaptcha.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcheckbox.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcolorpicker.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdhtmltextarea.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formeditor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelement.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelementtray.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formfile.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formhidden.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formhiddentoken.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formlabel.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formpassword.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formradio.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formradioyn.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselect.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectcheckgroup.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectcountry.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecteditor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectgroup.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectlang.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectmatchoption.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecttheme.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecttimezone.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectuser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formtext.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formtextarea.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formtextdateselect.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/grouppermform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/simpleform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/tableform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/themeform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsformloader.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopskernel.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopslists.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsload.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopslocal.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsmailer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsmodule.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsobject.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopssecurity.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsstory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopstopic.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopstree.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsuser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/zipdownloader.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/edituser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/footer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/header.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/imagemanager.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/checklogin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_constants.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_delete.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_edit.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_form.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_new.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_post.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_reply.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_view.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/commentform.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/common.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/cp_functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/cp_header.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/defines.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/findusers.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/formdhtmltextarea_preview.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.encoding.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.legacy.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/license.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/mimetypes.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/notification_constants.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/notification_functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/notification_select.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/notification_update.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/old_functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/old_theme_functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/registerform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/searchform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/site-closed.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/xoops13_header.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/xoopscodes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/xoopslocal.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/index.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/class/dbmanager.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/class/installwizard.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/class/pathcontroller.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/common.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/createconfigform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/license.dist.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/makedata.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/modulesadmin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/page.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/index.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/finish.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/install2.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/support.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/language/english/welcome.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_configsave.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_configsite.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_dbconnection.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_dbsettings.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_end.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_langselect.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_modcheck.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_moduleinstaller.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_pathsettings.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_siteinit.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_start.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_tablescreate.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_tablesfill.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_theme.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/avatar.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/block.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/blockinstance.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/comment.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/configcategory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/configitem.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/configoption.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/group.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/groupperm.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/handlerregistry.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/imagecategory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/imageset.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/imagesetimg.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/member.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/module.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/notification.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/object.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/online.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/privmessage.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/session.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/tplfile.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/tplset.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/user.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/lostpass.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/mainfile.dist.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/mainfile.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/misc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/header.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/class/message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/install.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/include/update.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/index.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/pmlite.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/core.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/system.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/readpmsg.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/viewpmsg.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/activate.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/deactivate.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/changemail.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/changepass.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/category.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/field.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/profile.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/regstep.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/visibility.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/edituser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/footer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/header.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/forms.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/install.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/include/update.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/index.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/lostpass.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/preloads/core.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/register.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/search.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/user.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/userinfo.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/admin/about.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/admin/admin_menu.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/admin/advisory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/admin/center.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/admin/index.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/admin/prefix_manager.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/blocks/blocks.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/index.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/module_icon.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/mytrustdirname.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/notification.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/notification_update.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/oninstall.php
XoopsCore/branches/2....
[truncated message content] |
|
From: <be...@us...> - 2013-09-14 04:38:09
|
Revision: 12034
http://sourceforge.net/p/xoops/svn/12034
Author: beckmi
Date: 2013-09-14 04:38:02 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
removing php_closing_tag in few more files
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopscode.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsemotions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsimagemanager.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsmlcontent.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsquote.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.filters.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopscode.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopscode.php 2013-09-14 03:16:44 UTC (rev 12033)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopscode.php 2013-09-14 04:38:02 UTC (rev 12034)
@@ -16,4 +16,3 @@
// Add your code here to check acces by groups
return true;
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsemotions.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsemotions.php 2013-09-14 03:16:44 UTC (rev 12033)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsemotions.php 2013-09-14 04:38:02 UTC (rev 12034)
@@ -17,4 +17,3 @@
// Add your code here to check acces by groups
return true;
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsimagemanager.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsimagemanager.php 2013-09-14 03:16:44 UTC (rev 12033)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsimagemanager.php 2013-09-14 04:38:02 UTC (rev 12034)
@@ -20,4 +20,3 @@
return false;
}
return true;
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsmlcontent.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsmlcontent.php 2013-09-14 03:16:44 UTC (rev 12033)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsmlcontent.php 2013-09-14 04:38:02 UTC (rev 12034)
@@ -24,4 +24,3 @@
}
return false;
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsquote.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsquote.php 2013-09-14 03:16:44 UTC (rev 12033)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/include/xoopsquote.php 2013-09-14 04:38:02 UTC (rev 12034)
@@ -16,4 +16,3 @@
// Add your code here to check acces by groups
return true;
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php 2013-09-14 03:16:44 UTC (rev 12033)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php 2013-09-14 04:38:02 UTC (rev 12034)
@@ -20,4 +20,3 @@
define('_XOOPS_EDITOR_TINYMCE_LANGUAGE',"en");
// FONT LIST, FORMAT: "Name=value1,value2;Name=value"
define('_XOOPS_EDITOR_TINYMCE_FONTS',"Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings");
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.filters.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.filters.php 2013-09-14 03:16:44 UTC (rev 12033)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.filters.php 2013-09-14 04:38:02 UTC (rev 12034)
@@ -10,61 +10,62 @@
class phpthumb_filters {
- var $phpThumbObject = null;
+ var $phpThumbObject = null;
- function phpthumb_filters() {
- return true;
- }
+ function phpthumb_filters() {
+ return true;
+ }
- function ApplyMask(&$gdimg_mask, &$gdimg_image) {
- if (phpthumb_functions::gd_version() < 2) {
- $this->DebugMessage('Skipping ApplyMask() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
- return false;
- }
- if (phpthumb_functions::version_compare_replacement(phpversion(), '4.3.2', '>=')) {
+ function ApplyMask(&$gdimg_mask, &$gdimg_image) {
+ if (phpthumb_functions::gd_version() < 2) {
+ $this->DebugMessage('Skipping ApplyMask() because gd_version is "'.phpthumb_functions::gd_version().'"', __FILE__, __LINE__);
- $this->DebugMessage('Using alpha ApplyMask() technique', __FILE__, __LINE__);
- if ($gdimg_mask_resized = phpthumb_functions::ImageCreateFunction(ImageSX($gdimg_image), ImageSY($gdimg_image))) {
+ return false;
+ }
+ if (phpthumb_functions::version_compare_replacement(phpversion(), '4.3.2', '>=')) {
- ImageCopyResampled($gdimg_mask_resized, $gdimg_mask, 0, 0, 0, 0, ImageSX($gdimg_image), ImageSY($gdimg_image), ImageSX($gdimg_mask), ImageSY($gdimg_mask));
- if ($gdimg_mask_blendtemp = phpthumb_functions::ImageCreateFunction(ImageSX($gdimg_image), ImageSY($gdimg_image))) {
+ $this->DebugMessage('Using alpha ApplyMask() technique', __FILE__, __LINE__);
+ if ($gdimg_mask_resized = phpthumb_functions::ImageCreateFunction(ImageSX($gdimg_image), ImageSY($gdimg_image))) {
- $color_background = ImageColorAllocate($gdimg_mask_blendtemp, 0, 0, 0);
- ImageFilledRectangle($gdimg_mask_blendtemp, 0, 0, ImageSX($gdimg_mask_blendtemp), ImageSY($gdimg_mask_blendtemp), $color_background);
- ImageAlphaBlending($gdimg_mask_blendtemp, false);
- ImageSaveAlpha($gdimg_mask_blendtemp, true);
- for ($x = 0; $x < ImageSX($gdimg_image); $x++) {
- for ($y = 0; $y < ImageSY($gdimg_image); $y++) {
- //$RealPixel = phpthumb_functions::GetPixelColor($gdimg_mask_blendtemp, $x, $y);
- $RealPixel = phpthumb_functions::GetPixelColor($gdimg_image, $x, $y);
- $MaskPixel = phpthumb_functions::GrayscalePixel(phpthumb_functions::GetPixelColor($gdimg_mask_resized, $x, $y));
- $MaskAlpha = 127 - (floor($MaskPixel['red'] / 2) * (1 - ($RealPixel['alpha'] / 127)));
- $newcolor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg_mask_blendtemp, $RealPixel['red'], $RealPixel['green'], $RealPixel['blue'], $MaskAlpha);
- ImageSetPixel($gdimg_mask_blendtemp, $x, $y, $newcolor);
- }
- }
- ImageAlphaBlending($gdimg_image, false);
- ImageSaveAlpha($gdimg_image, true);
- ImageCopy($gdimg_image, $gdimg_mask_blendtemp, 0, 0, 0, 0, ImageSX($gdimg_mask_blendtemp), ImageSY($gdimg_mask_blendtemp));
- ImageDestroy($gdimg_mask_blendtemp);
+ ImageCopyResampled($gdimg_mask_resized, $gdimg_mask, 0, 0, 0, 0, ImageSX($gdimg_image), ImageSY($gdimg_image), ImageSX($gdimg_mask), ImageSY($gdimg_mask));
+ if ($gdimg_mask_blendtemp = phpthumb_functions::ImageCreateFunction(ImageSX($gdimg_image), ImageSY($gdimg_image))) {
- } else {
- $this->DebugMessage('ImageCreateFunction() failed', __FILE__, __LINE__);
- }
- ImageDestroy($gdimg_mask_resized);
+ $color_background = ImageColorAllocate($gdimg_mask_blendtemp, 0, 0, 0);
+ ImageFilledRectangle($gdimg_mask_blendtemp, 0, 0, ImageSX($gdimg_mask_blendtemp), ImageSY($gdimg_mask_blendtemp), $color_background);
+ ImageAlphaBlending($gdimg_mask_blendtemp, false);
+ ImageSaveAlpha($gdimg_mask_blendtemp, true);
+ for ($x = 0; $x < ImageSX($gdimg_image); $x++) {
+ for ($y = 0; $y < ImageSY($gdimg_image); $y++) {
+ //$RealPixel = phpthumb_functions::GetPixelColor($gdimg_mask_blendtemp, $x, $y);
+ $RealPixel = phpthumb_functions::GetPixelColor($gdimg_image, $x, $y);
+ $MaskPixel = phpthumb_functions::GrayscalePixel(phpthumb_functions::GetPixelColor($gdimg_mask_resized, $x, $y));
+ $MaskAlpha = 127 - (floor($MaskPixel['red'] / 2) * (1 - ($RealPixel['alpha'] / 127)));
+ $newcolor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg_mask_blendtemp, $RealPixel['red'], $RealPixel['green'], $RealPixel['blue'], $MaskAlpha);
+ ImageSetPixel($gdimg_mask_blendtemp, $x, $y, $newcolor);
+ }
+ }
+ ImageAlphaBlending($gdimg_image, false);
+ ImageSaveAlpha($gdimg_image, true);
+ ImageCopy($gdimg_image, $gdimg_mask_blendtemp, 0, 0, 0, 0, ImageSX($gdimg_mask_blendtemp), ImageSY($gdimg_mask_blendtemp));
+ ImageDestroy($gdimg_mask_blendtemp);
- } else {
- $this->DebugMessage('ImageCreateFunction() failed', __FILE__, __LINE__);
- }
+ } else {
+ $this->DebugMessage('ImageCreateFunction() failed', __FILE__, __LINE__);
+ }
+ ImageDestroy($gdimg_mask_resized);
- } else {
- // alpha merging requires PHP v4.3.2+
- $this->DebugMessage('Skipping ApplyMask() technique because PHP is v"'.phpversion().'"', __FILE__, __LINE__);
- }
- return true;
- }
+ } else {
+ $this->DebugMessage('ImageCreateFunction() failed', __FILE__, __LINE__);
+ }
+ } else {
+ // alpha merging requires PHP v4.3.2+
+ $this->DebugMessage('Skipping ApplyMask() technique because PHP is v"'.phpversion().'"', __FILE__, __LINE__);
+ }
+ return true;
+ }
+
function Bevel(&$gdimg, $width, $hexcolor1, $hexcolor2) {
$width = ($width ? $width : 5);
$hexcolor1 = ($hexcolor1 ? $hexcolor1 : 'FFFFFF');
@@ -81,1464 +82,1501 @@
ImageLine($gdimg, ImageSX($gdimg) - $i, ImageSY($gdimg) - $i - 1, ImageSX($gdimg) - $i, $i + 1, $color2); // right
ImageLine($gdimg, ImageSX($gdimg) - $i, ImageSY($gdimg) - $i , $i, ImageSY($gdimg) - $i , $color2); // bottom
}
+
return true;
}
+ function Blur(&$gdimg, $radius=0.5) {
+ // Taken from Torstein H\xF8nsi's phpUnsharpMask (see phpthumb.unsharp.php)
- function Blur(&$gdimg, $radius=0.5) {
- // Taken from Torstein H\xF8nsi's phpUnsharpMask (see phpthumb.unsharp.php)
+ $radius = round(max(0, min($radius, 50)) * 2);
+ if (!$radius) {
+ return false;
+ }
- $radius = round(max(0, min($radius, 50)) * 2);
- if (!$radius) {
- return false;
- }
+ $w = ImageSX($gdimg);
+ $h = ImageSY($gdimg);
+ if ($imgBlur = ImageCreateTrueColor($w, $h)) {
+ // Gaussian blur matrix:
+ // 1 2 1
+ // 2 4 2
+ // 1 2 1
- $w = ImageSX($gdimg);
- $h = ImageSY($gdimg);
- if ($imgBlur = ImageCreateTrueColor($w, $h)) {
- // Gaussian blur matrix:
- // 1 2 1
- // 2 4 2
- // 1 2 1
+ // Move copies of the image around one pixel at the time and merge them with weight
+ // according to the matrix. The same matrix is simply repeated for higher radii.
+ for ($i = 0; $i < $radius; $i++) {
+ ImageCopy ($imgBlur, $gdimg, 0, 0, 1, 1, $w - 1, $h - 1); // up left
+ ImageCopyMerge($imgBlur, $gdimg, 1, 1, 0, 0, $w, $h, 50.00000); // down right
+ ImageCopyMerge($imgBlur, $gdimg, 0, 1, 1, 0, $w - 1, $h, 33.33333); // down left
+ ImageCopyMerge($imgBlur, $gdimg, 1, 0, 0, 1, $w, $h - 1, 25.00000); // up right
+ ImageCopyMerge($imgBlur, $gdimg, 0, 0, 1, 0, $w - 1, $h, 33.33333); // left
+ ImageCopyMerge($imgBlur, $gdimg, 1, 0, 0, 0, $w, $h, 25.00000); // right
+ ImageCopyMerge($imgBlur, $gdimg, 0, 0, 0, 1, $w, $h - 1, 20.00000); // up
+ ImageCopyMerge($imgBlur, $gdimg, 0, 1, 0, 0, $w, $h, 16.666667); // down
+ ImageCopyMerge($imgBlur, $gdimg, 0, 0, 0, 0, $w, $h, 50.000000); // center
+ ImageCopy ($gdimg, $imgBlur, 0, 0, 0, 0, $w, $h);
+ }
- // Move copies of the image around one pixel at the time and merge them with weight
- // according to the matrix. The same matrix is simply repeated for higher radii.
- for ($i = 0; $i < $radius; $i++) {
- ImageCopy ($imgBlur, $gdimg, 0, 0, 1, 1, $w - 1, $h - 1); // up left
- ImageCopyMerge($imgBlur, $gdimg, 1, 1, 0, 0, $w, $h, 50.00000); // down right
- ImageCopyMerge($imgBlur, $gdimg, 0, 1, 1, 0, $w - 1, $h, 33.33333); // down left
- ImageCopyMerge($imgBlur, $gdimg, 1, 0, 0, 1, $w, $h - 1, 25.00000); // up right
- ImageCopyMerge($imgBlur, $gdimg, 0, 0, 1, 0, $w - 1, $h, 33.33333); // left
- ImageCopyMerge($imgBlur, $gdimg, 1, 0, 0, 0, $w, $h, 25.00000); // right
- ImageCopyMerge($imgBlur, $gdimg, 0, 0, 0, 1, $w, $h - 1, 20.00000); // up
- ImageCopyMerge($imgBlur, $gdimg, 0, 1, 0, 0, $w, $h, 16.666667); // down
- ImageCopyMerge($imgBlur, $gdimg, 0, 0, 0, 0, $w, $h, 50.000000); // center
- ImageCopy ($gdimg, $imgBlur, 0, 0, 0, 0, $w, $h);
- }
- return true;
- }
- return false;
- }
+ return true;
+ }
+ return false;
+ }
- function BlurGaussian(&$gdimg) {
- if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
- if (ImageFilter($gdimg, IMG_FILTER_GAUSSIAN_BLUR)) {
- return true;
- }
- $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_GAUSSIAN_BLUR)', __FILE__, __LINE__);
- // fall through and try it the hard way
- }
- $this->DebugMessage('FAILED: phpthumb_filters::BlurGaussian($gdimg) [using phpthumb_filters::Blur() instead]', __FILE__, __LINE__);
- return phpthumb_filters::Blur($gdimg, 0.5);
- }
+ function BlurGaussian(&$gdimg) {
+ if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+ if (ImageFilter($gdimg, IMG_FILTER_GAUSSIAN_BLUR)) {
+ return true;
+ }
+ $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_GAUSSIAN_BLUR)', __FILE__, __LINE__);
+ // fall through and try it the hard way
+ }
+ $this->DebugMessage('FAILED: phpthumb_filters::BlurGaussian($gdimg) [using phpthumb_filters::Blur() instead]', __FILE__, __LINE__);
- function BlurSelective(&$gdimg) {
- if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
- if (ImageFilter($gdimg, IMG_FILTER_SELECTIVE_BLUR)) {
- return true;
- }
- $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_SELECTIVE_BLUR)', __FILE__, __LINE__);
- // fall through and try it the hard way
- }
- // currently not implemented "the hard way"
- $this->DebugMessage('FAILED: phpthumb_filters::BlurSelective($gdimg) [function not implemented]', __FILE__, __LINE__);
- return false;
- }
+ return phpthumb_filters::Blur($gdimg, 0.5);
+ }
- function Brightness(&$gdimg, $amount=0) {
- if ($amount == 0) {
- return true;
- }
- $amount = max(-255, min(255, $amount));
+ function BlurSelective(&$gdimg) {
+ if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+ if (ImageFilter($gdimg, IMG_FILTER_SELECTIVE_BLUR)) {
+ return true;
+ }
+ $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_SELECTIVE_BLUR)', __FILE__, __LINE__);
+ // fall through and try it the hard way
+ }
+ // currently not implemented "the hard way"
+ $this->DebugMessage('FAILED: phpthumb_filters::BlurSelective($gdimg) [function not implemented]', __FILE__, __LINE__);
- if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
- if (ImageFilter($gdimg, IMG_FILTER_BRIGHTNESS, $amount)) {
- return true;
- }
- $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_BRIGHTNESS, '.$amount.')', __FILE__, __LINE__);
- // fall through and try it the hard way
- }
+ return false;
+ }
- $scaling = (255 - abs($amount)) / 255;
- $baseamount = (($amount > 0) ? $amount : 0);
- for ($x = 0; $x < ImageSX($gdimg); $x++) {
- for ($y = 0; $y < ImageSY($gdimg); $y++) {
- $OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
- foreach ($OriginalPixel as $key => $value) {
- $NewPixel[$key] = round($baseamount + ($OriginalPixel[$key] * $scaling));
- }
- $newColor = ImageColorAllocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
- ImageSetPixel($gdimg, $x, $y, $newColor);
- }
- }
- return true;
- }
+ function Brightness(&$gdimg, $amount=0) {
+ if ($amount == 0) {
+ return true;
+ }
+ $amount = max(-255, min(255, $amount));
- function Contrast(&$gdimg, $amount=0) {
- if ($amount == 0) {
- return true;
- }
- $amount = max(-255, min(255, $amount));
+ if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+ if (ImageFilter($gdimg, IMG_FILTER_BRIGHTNESS, $amount)) {
+ return true;
+ }
+ $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_BRIGHTNESS, '.$amount.')', __FILE__, __LINE__);
+ // fall through and try it the hard way
+ }
- if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
- // ImageFilter(IMG_FILTER_CONTRAST) has range +100 to -100 (positive numbers make it darker!)
- $amount = ($amount / 255) * -100;
- if (ImageFilter($gdimg, IMG_FILTER_CONTRAST, $amount)) {
- return true;
- }
- $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_CONTRAST, '.$amount.')', __FILE__, __LINE__);
- // fall through and try it the hard way
- }
+ $scaling = (255 - abs($amount)) / 255;
+ $baseamount = (($amount > 0) ? $amount : 0);
+ for ($x = 0; $x < ImageSX($gdimg); $x++) {
+ for ($y = 0; $y < ImageSY($gdimg); $y++) {
+ $OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
+ foreach ($OriginalPixel as $key => $value) {
+ $NewPixel[$key] = round($baseamount + ($OriginalPixel[$key] * $scaling));
+ }
+ $newColor = ImageColorAllocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
+ ImageSetPixel($gdimg, $x, $y, $newColor);
+ }
+ }
- if ($amount > 0) {
- $scaling = 1 + ($amount / 255);
- } else {
- $scaling = (255 - abs($amount)) / 255;
- }
- for ($x = 0; $x < ImageSX($gdimg); $x++) {
- for ($y = 0; $y < ImageSY($gdimg); $y++) {
- $OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
- foreach ($OriginalPixel as $key => $value) {
- $NewPixel[$key] = min(255, max(0, round($OriginalPixel[$key] * $scaling)));
- }
- $newColor = ImageColorAllocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
- ImageSetPixel($gdimg, $x, $y, $newColor);
- }
- }
- }
+ return true;
+ }
- function Colorize(&$gdimg, $amount, $targetColor) {
- $amount = (is_numeric($amount) ? $amount : 25);
- $amountPct = $amount / 100;
- $targetColor = (phpthumb_functions::IsHexColor($targetColor) ? $targetColor : 'gray');
+ function Contrast(&$gdimg, $amount=0) {
+ if ($amount == 0) {
+ return true;
+ }
+ $amount = max(-255, min(255, $amount));
- if ($amount == 0) {
- return true;
- }
+ if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+ // ImageFilter(IMG_FILTER_CONTRAST) has range +100 to -100 (positive numbers make it darker!)
+ $amount = ($amount / 255) * -100;
+ if (ImageFilter($gdimg, IMG_FILTER_CONTRAST, $amount)) {
+ return true;
+ }
+ $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_CONTRAST, '.$amount.')', __FILE__, __LINE__);
+ // fall through and try it the hard way
+ }
- if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
- if ($targetColor == 'gray') {
- $targetColor = '808080';
- }
- $r = round($amountPct * hexdec(substr($targetColor, 0, 2)));
- $g = round($amountPct * hexdec(substr($targetColor, 2, 2)));
- $b = round($amountPct * hexdec(substr($targetColor, 4, 2)));
- if (ImageFilter($gdimg, IMG_FILTER_COLORIZE, $r, $g, $b)) {
- return true;
- }
- $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_COLORIZE)', __FILE__, __LINE__);
- // fall through and try it the hard way
- }
+ if ($amount > 0) {
+ $scaling = 1 + ($amount / 255);
+ } else {
+ $scaling = (255 - abs($amount)) / 255;
+ }
+ for ($x = 0; $x < ImageSX($gdimg); $x++) {
+ for ($y = 0; $y < ImageSY($gdimg); $y++) {
+ $OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
+ foreach ($OriginalPixel as $key => $value) {
+ $NewPixel[$key] = min(255, max(0, round($OriginalPixel[$key] * $scaling)));
+ }
+ $newColor = ImageColorAllocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
+ ImageSetPixel($gdimg, $x, $y, $newColor);
+ }
+ }
+ }
- // overridden below for grayscale
- if ($targetColor != 'gray') {
- $TargetPixel['red'] = hexdec(substr($targetColor, 0, 2));
- $TargetPixel['green'] = hexdec(substr($targetColor, 2, 2));
- $TargetPixel['blue'] = hexdec(substr($targetColor, 4, 2));
- }
- for ($x = 0; $x < ImageSX($gdimg); $x++) {
- for ($y = 0; $y < ImageSY($gdimg); $y++) {
- $OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
- if ($targetColor == 'gray') {
- $TargetPixel = phpthumb_functions::GrayscalePixel($OriginalPixel);
- }
- foreach ($TargetPixel as $key => $value) {
- $NewPixel[$key] = round(max(0, min(255, ($OriginalPixel[$key] * ((100 - $amount) / 100)) + ($TargetPixel[$key] * $amountPct))));
- }
- //$newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue'], $OriginalPixel['alpha']);
- $newColor = ImageColorAllocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
- ImageSetPixel($gdimg, $x, $y, $newColor);
- }
- }
- return true;
- }
+ function Colorize(&$gdimg, $amount, $targetColor) {
+ $amount = (is_numeric($amount) ? $amount : 25);
+ $amountPct = $amount / 100;
+ $targetColor = (phpthumb_functions::IsHexColor($targetColor) ? $targetColor : 'gray');
+ if ($amount == 0) {
+ return true;
+ }
- function Crop(&$gdimg, $left=0, $right=0, $top=0, $bottom=0) {
- if (!$left && !$right && !$top && !$bottom) {
- return true;
- }
- $oldW = ImageSX($gdimg);
- $oldH = ImageSY($gdimg);
- if (($left > 0) && ($left < 1)) { $left = round($left * $oldW); }
- if (($right > 0) && ($right < 1)) { $right = round($right * $oldW); }
- if (($top > 0) && ($top < 1)) { $top = round($top * $oldH); }
- if (($bottom > 0) && ($bottom < 1)) { $bottom = round($bottom * $oldH); }
- $right = min($oldW - $left - 1, $right);
- $bottom = min($oldH - $top - 1, $bottom);
- $newW = $oldW - $left - $right;
- $newH = $oldH - $top - $bottom;
+ if (phpthumb_functions::version_compare_replacement(phpversion(), '5.0.0', '>=') && phpthumb_functions::gd_is_bundled()) {
+ if ($targetColor == 'gray') {
+ $targetColor = '808080';
+ }
+ $r = round($amountPct * hexdec(substr($targetColor, 0, 2)));
+ $g = round($amountPct * hexdec(substr($targetColor, 2, 2)));
+ $b = round($amountPct * hexdec(substr($targetColor, 4, 2)));
+ if (ImageFilter($gdimg, IMG_FILTER_COLORIZE, $r, $g, $b)) {
+ return true;
+ }
+ $this->DebugMessage('FAILED: ImageFilter($gdimg, IMG_FILTER_COLORIZE)', __FILE__, __LINE__);
+ // fall through and try it the hard way
+ }
- if ($imgCropped = ImageCreateTrueColor($newW, $newH)) {
- ImageCopy($imgCropped, $gdimg, 0, 0, $left, $top, $newW, $newH);
- if ($gdimg = ImageCreateTrueColor($newW, $newH)) {
- ImageCopy($gdimg, $imgCropped, 0, 0, 0, 0, $newW, $newH);
- ImageDestroy($imgCropped);
- return true;
- }
- ImageDestroy($imgCropped);
- }
- return false;
- }
+ // overridden below for grayscale
+ if ($targetColor != 'gray') {
+ $TargetPixel['red'] = hexdec(substr($targetColor, 0, 2));
+ $TargetPixel['green'] = hexdec(substr($targetColor, 2, 2));
+ $TargetPixel['blue'] = hexdec(substr($targetColor, 4, 2));
+ }
+ for ($x = 0; $x < ImageSX($gdimg); $x++) {
+ for ($y = 0; $y < ImageSY($gdimg); $y++) {
+ $OriginalPixel = phpthumb_functions::GetPixelColor($gdimg, $x, $y);
+ if ($targetColor == 'gray') {
+ $TargetPixel = phpthumb_functions::GrayscalePixel($OriginalPixel);
+ }
+ foreach ($TargetPixel as $key => $value) {
+ $NewPixel[$key] = round(max(0, min(255, ($OriginalPixel[$key] * ((100 - $amount) / 100)) + ($TargetPixel[$key] * $amountPct))));
+ }
+ //$newColor = phpthumb_functions::ImageColorAllocateAlphaSafe($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue'], $OriginalPixel['alpha']);
+ $newColor = ImageColorAllocate($gdimg, $NewPixel['red'], $NewPixel['green'], $NewPixel['blue']);
+ ImageSetPixel($gdimg, $x, $y, $newColor);
+ }
+ }
- function Desaturate(&$gdimg, $amount, $color='') {
- if ($amount == 0) {
- return true;
- }
- return phpthumb_filters::Colorize($gdimg, $amount, (phpthumb_functions::IsHexColor($color) ? $color : 'gray'));
- }
+ return true;
+ }
- function DropShadow(&$gdimg, $distance, $width, $hexcolor, $angle, $alpha) {
- if (phpthumb_functions::gd_version() < 2) {
- return false;
- }
- $distance = ($distance ? $distance : 10);
- $width = ($width ? $width : 10);
- $hexcolor = ($hexcolor ? $hexcolor : '000000');
- $angle = ($angle ? $angle : 225) % 360;
- $alpha = max(0, min(100, ($alpha ? $alpha : 100)));
+ function Crop(&$gdimg, $left=0, $right=0, $top=0, $bottom=0) {
+ if (!$left && !$right && !$top && !$bottom) {
+ return true;
+ }
+ $oldW = ImageSX($gdimg);
+ $oldH = ImageSY($gdimg);
+ if (($left > 0) && ($left < 1)) { $left = round($left * $oldW); }
+ if (($right > 0) && ($right < 1)) { $right = round($right * $oldW); }
+ if (($top > 0) && ($top < 1)) { $top = round($top * $oldH); }
+ if (($bottom > 0) && ($bottom < 1)) { $bottom = round($bottom * $oldH); }
+ $right = min($oldW - $left - 1, $right);
+ $bottom = min($oldH - $top - 1, $bottom);
+ $newW = $oldW - $left - $right;
+ $newH = $oldH - $top - $bottom;
- if ($alpha <= 0) {
- // invisible shadow, nothing to do
- return true;
- }
- if ($distance <= 0) {
- // shadow completely obscured by source image, nothing to do
- return true;
- }
+ if ($imgCropped = ImageCreateTrueColor($newW, $newH)) {
+ ImageCopy($imgCropped, $gdimg, 0, 0, $left, $top, $newW, $newH);
+ if ($gdimg = ImageCreateTrueColor($newW, $newH)) {
+ ImageCopy($gdimg, $imgCropped, 0, 0, 0, 0, $newW, $newH);
+ ImageDestroy($imgCropped);
- $width_shadow = cos(deg2rad($angle)) * ($distance + $width);
- $height_shadow = sin(deg2rad($angle)) * ($distance + $width);
+ return true;
+ }
+ ImageDestroy($imgCropped);
+ }
- $scaling = min(ImageSX($gdimg) / (ImageSX($gdimg) + abs($width_shadow)), ImageSY($gdimg) / (ImageSY($gdimg) + abs($height_shadow)));
+ return false;
+ }
- for ($i = 0; $i < $width; $i++) {
- $WidthAlpha[$i] = (abs(($width / 2) - $i) / $width);
- $Offset['x'] = cos(deg2rad($angle)) * ($distance + $i);
- $Offset['y'] = sin(deg2rad($angle)) * ($distance + $i);
- }
- $tempImageWidth = ImageSX($gdimg) + abs($Offset['x']);
- $tempImageHeight = ImageSY($gdimg) + abs($Offset['y']);
+ function Desaturate(&$gdimg, $amount, $color='') {
+ if ($amount ==...
[truncated message content] |
|
From: <be...@us...> - 2013-09-14 04:49:40
|
Revision: 12035
http://sourceforge.net/p/xoops/svn/12035
Author: beckmi
Date: 2013-09-14 04:49:34 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
standardizing include statements
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/image/scripts/image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_configsite.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_moduleinstaller.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_tablescreate.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_tablesfill.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_theme.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/header.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/field.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/step.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/jquery.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/users/jquery.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/admin/admin_header.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/image/scripts/image.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/image/scripts/image.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/image/scripts/image.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -18,7 +18,7 @@
* @subpackage CAPTCHA
*/
-include "../../../../mainfile.php";
+include '../../../../mainfile.php';
error_reporting(0);
$xoopsLogger->activated = false;
@@ -86,6 +86,7 @@
}
}
$this->captcha_handler->setCode($this->code);
+
return true;
}
@@ -94,6 +95,7 @@
if ($this->invalid) {
header("Content-type: image/gif");
readfile(XOOPS_ROOT_PATH."/images/subject/icon2.gif");
+
return;
}
@@ -115,12 +117,13 @@
require_once XOOPS_ROOT_PATH."/class/xoopslists.php";
$file_path = XOOPS_ROOT_PATH . "/class/captcha/image/{$name}";
$files = XoopsLists::getFileListAsArray($file_path);
- foreach( $files as $item ) {
+ foreach ($files as $item) {
if ( empty($extension) || preg_match("/(\.{$extension})$/i",$item) ) {
$items[] = $item;
}
}
XoopsCache::write("captcha_captcha_{$name}", $items);
+
return $items;
}
@@ -199,11 +202,11 @@
for ($i = 65; $i <= 90; $i++) {
$CharDetails = imageftbbox($FontSize, $Angle, $this->font, chr($i), array());
$_MaxCharWidth = abs($CharDetails[0] + $CharDetails[2]);
- if ($_MaxCharWidth > $MaxCharWidth ) {
+ if ($_MaxCharWidth > $MaxCharWidth) {
$MaxCharWidth = $_MaxCharWidth;
}
$_MaxCharHeight = abs($CharDetails[1] + $CharDetails[5]);
- if ($_MaxCharHeight > $MaxCharHeight ) {
+ if ($_MaxCharHeight > $MaxCharHeight) {
$MaxCharHeight = $_MaxCharHeight;
}
}
@@ -226,6 +229,7 @@
if ( $backgrounds = $this->getList("backgrounds", "(gif|jpg|png)") ) {
$RandBackground = XOOPS_ROOT_PATH . "/class/captcha/image/backgrounds/" . $backgrounds[array_rand($backgrounds)];
}
+
return $RandBackground;
}
@@ -236,7 +240,7 @@
{
if ( $RandImage = $this->loadBackground() ) {
$ImageType = @getimagesize($RandImage);
- switch ( @$ImageType[2] ) {
+ switch (@$ImageType[2]) {
case 1:
$BackgroundImage = imagecreatefromgif($RandImage);
break;
@@ -302,7 +306,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);
}
@@ -352,7 +356,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);
}
@@ -363,7 +367,7 @@
*/
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++) {
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_configsite.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_configsite.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_configsite.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -37,11 +37,11 @@
$pageHasHelp = true;
if (!@include_once "../modules/system/language/{$wizard->language}/admin.php") {
- include_once "../modules/system/language/english/admin.php";
+ include_once '../modules/system/language/english/admin.php';
}
if (!@include_once "../modules/system/language/{$wizard->language}/admin/preferences.php") {
- include_once "../modules/system/language/english/admin/preferences.php";
+ include_once '../modules/system/language/english/admin/preferences.php';
}
$config_handler = xoops_gethandler('config');
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_moduleinstaller.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_moduleinstaller.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_moduleinstaller.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -21,10 +21,10 @@
defined('XOOPS_INSTALL') or die('XOOPS Installation wizard die');
if (!@include_once "../language/{$wizard->language}/global.php") {
- include_once "../language/english/global.php";
+ include_once '../language/english/global.php';
}
if (!@include_once "../modules/system/language/{$wizard->language}/admin/modulesadmin.php") {
- include_once "../modules/system/language/english/admin/modulesadmin.php";
+ include_once '../modules/system/language/english/admin/modulesadmin.php';
}
require_once '../class/xoopsformloader.php';
require_once '../class/xoopslists.php';
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_tablescreate.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_tablescreate.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_tablescreate.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -34,7 +34,7 @@
$vars =& $_SESSION['settings'];
-include_once "../mainfile.php";
+include_once '../mainfile.php';
include_once './class/dbmanager.php';
$dbm = new db_manager();
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_tablesfill.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_tablesfill.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_tablesfill.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -34,7 +34,7 @@
$vars =& $_SESSION['settings'];
-include_once "../mainfile.php";
+include_once '../mainfile.php';
include_once './class/dbmanager.php';
$dbm = new db_manager();
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_theme.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_theme.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_theme.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -41,7 +41,7 @@
$pageHasHelp = false;
if (!@include_once "../modules/system/language/{$wizard->language}/admin/preferences.php") {
- include_once "../modules/system/language/english/admin/preferences.php";
+ include_once '../modules/system/language/english/admin/preferences.php';
}
$config_handler = xoops_gethandler('config');
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/header.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/header.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/header.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -17,7 +17,7 @@
* @version $Id$
*/
-require_once "../../../include/cp_header.php";
+require_once '../../../include/cp_header.php';
if (!isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl'])) {
include_once XOOPS_ROOT_PATH . '/class/template.php';
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/field.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/field.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/field.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -100,7 +100,7 @@
break;
case "new":
- include_once('../include/forms.php');
+ include_once '../include/forms.php';
$obj =& $profilefield_handler->create();
$form = profile_getFieldForm($obj);
$form->display();
@@ -111,7 +111,7 @@
if (!$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')) { //If no configs exist
redirect_header('field.php', 2, _PROFILE_AM_FIELDNOTCONFIGURABLE);
}
- include_once('../include/forms.php');
+ include_once '../include/forms.php';
$form = profile_getFieldForm($obj);
$form->display();
break;
@@ -191,7 +191,7 @@
if (!empty($_REQUEST['addOption'])) {
foreach ($_REQUEST['addOption'] as $option) {
- if (empty($option['value'])) continue;
+ if (empty($option['value'])) continue;
$options[$option['key']] = $option['value'];
$redirect_to_edit = true;
}
@@ -278,7 +278,7 @@
$url = $redirect_to_edit ? 'field.php?op=edit&id=' . $obj->getVar('field_id') : 'field.php';
redirect_header($url, 3, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_FIELD));
}
- include_once('../include/forms.php');
+ include_once '../include/forms.php';
echo $obj->getHtmlErrors();
$form = profile_getFieldForm($obj);
$form->display();
@@ -331,5 +331,4 @@
}
}
-
-include 'admin_footer.php';
\ No newline at end of file
+include 'admin_footer.php';
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/step.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/step.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/step.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -3,7 +3,7 @@
* Extended User Profile
*
* You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
+ * of supporting developers from this source code or any supporting source code
* which is considered copyrighted (c) material of the original comment or credit authors.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,13 +22,13 @@
$indexAdmin = new ModuleAdmin();
$indexAdmin->addItemButton(_ADD . ' ' . _PROFILE_AM_STEP, 'step.php?op=new', 'add', '');
-echo $indexAdmin->addNavigation('step.php');
+echo $indexAdmin->addNavigation('step.php');
echo $indexAdmin->renderButton('right', '');
$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : (isset($_REQUEST['id']) ? "edit" : 'list');
$handler =& xoops_getmodulehandler('regstep');
-switch ($op ) {
+switch ($op) {
case "list":
$GLOBALS['xoopsTpl']->assign('steps', $handler->getObjects(null, true, false) );
$template_main = "profile_admin_steplist.html";
@@ -36,14 +36,14 @@
case "new":
$obj =& $handler->create();
- include_once "../include/forms.php";
+ include_once '../include/forms.php';
$form = profile_getStepForm($obj);;
$form->display();
break;
case "edit":
$obj =& $handler->get($_REQUEST['id']);
- include_once "../include/forms.php";
+ include_once '../include/forms.php';
$form = profile_getStepForm($obj);;
$form->display();
break;
@@ -79,7 +79,6 @@
}
break;
-
case 'toggle':
if (isset($_GET['step_id'])) {
$field_id=intval($_GET['step_id']);
@@ -103,9 +102,9 @@
$obj->setVar('step_save', $step_save);
if ($handler->insert($obj,true)) {
redirect_header('step.php', 1, _PROFILE_AM_SAVESTEP_TOGGLE_SUCCESS);
- }else {
+ } else {
redirect_header('step.php', 1, _PROFILE_AM_SAVESTEP_TOGGLE_FAILED);
}
}
-include 'admin_footer.php';
\ No newline at end of file
+include 'admin_footer.php';
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/jquery.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/jquery.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/jquery.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -27,90 +27,90 @@
$GLOBALS['xoopsLogger']->activated = false;
if ( file_exists("./../../language/".$xoopsConfig['language']."/admin/tplsets.php") ) {
- include_once("./../../language/".$xoopsConfig['language']."/admin/tplsets.php");
+ include_once './../../language/'.$xoopsConfig['language']."/admin/tplsets.php");
} else {
- include_once("./../../language/english/admin/tplsets.php");
+ include_once './../../language/english/admin/tplsets.php';
}
if (isset($_REQUEST["op"])) {
- $op = $_REQUEST["op"];
+ $op = $_REQUEST["op"];
} else {
- @$op = "default";
+ @$op = "default";
}
$GLOBALS['xoopsLogger']->usePopup = true;
switch ($op) {
- // Display tree folder
- case "tpls_display_folder":
- $_REQUEST['dir'] = urldecode($_REQUEST['dir']);
- $root = XOOPS_THEME_PATH;
- if( file_exists($root . $_REQUEST['dir']) ) {
- $files = scandir($root . $_REQUEST['dir']);
- natcasesort($files);
- if( count($files) > 2 ) { /* The 2 accounts for . and .. */
- echo "<ul class=\"jqueryFileTree\" style=\"display: none;\">";
- // All dirs
- foreach( $files as $file ) {
+ // Display tree folder
+ case "tpls_display_folder":
+ $_REQUEST['dir'] = urldecode($_REQUEST['dir']);
+ $root = XOOPS_THEME_PATH;
+ if ( file_exists($root . $_REQUEST['dir']) ) {
+ $files = scandir($root . $_REQUEST['dir']);
+ natcasesort($files);
+ if ( count($files) > 2 ) { /* The 2 accounts for . and .. */
+ echo "<ul class=\"jqueryFileTree\" style=\"display: none;\">";
+ // All dirs
+ foreach ($files as $file) {
- if( file_exists($root . $_REQUEST['dir'] . $file) && $file != '.' && $file != '..' && is_dir($root . $_REQUEST['dir'] . $file) ) {
- //retirer .svn
- $file_no_valid = array('.svn', 'icons', 'img', 'images', 'language');
+ if ( file_exists($root . $_REQUEST['dir'] . $file) && $file != '.' && $file != '..' && is_dir($root . $_REQUEST['dir'] . $file) ) {
+ //retirer .svn
+ $file_no_valid = array('.svn', 'icons', 'img', 'images', 'language');
- if(!in_array($file, $file_no_valid))
- {
- echo "<li class=\"directory collapsed\"><a href=\"#\" rel=\"" . htmlentities($_REQUEST['dir'] . $file) . "/\">" . htmlentities($file) . "</a></li>";
- }
- }
- }
- // All files
- foreach( $files as $file )
- {
- if( file_exists($root . $_REQUEST['dir'] . $file) && $file != '.' && $file != '..' && !is_dir($root . $_REQUEST['dir'] . $file) && $file != 'index.html' ) {
- $ext = preg_replace('/^.*\./', '', $file);
+ if(!in_array($file, $file_no_valid))
+ {
+ echo "<li class=\"directory collapsed\"><a href=\"#\" rel=\"" . htmlentities($_REQUEST['dir'] . $file) . "/\">" . htmlentities($file) . "</a></li>";
+ }
+ }
+ }
+ // All files
+ foreach( $files as $file )
+ {
+ if ( file_exists($root . $_REQUEST['dir'] . $file) && $file != '.' && $file != '..' && !is_dir($root . $_REQUEST['dir'] . $file) && $file != 'index.html' ) {
+ $ext = preg_replace('/^.*\./', '', $file);
- $extensions = array('.html', '.htm', '.css');
- $extension_verif = strrchr($file, '.');
+ $extensions = array('.html', '.htm', '.css');
+ $extension_verif = strrchr($file, '.');
- if(in_array($extension_verif, $extensions)) {
- echo "<li class=\"file ext_$ext\"><a href=\"#\" onclick=\"tpls_edit_file('".htmlentities($_REQUEST['dir'].$file)."', '".htmlentities($_REQUEST['dir'])."', '".htmlentities($file)."', '".$ext."');\" rel=\"tpls_edit_file('".htmlentities($_REQUEST['dir'].$file)."', '".htmlentities($_REQUEST['dir'])."', '".htmlentities($file)."', '".$ext."');\">" . htmlentities($file) . "</a></li>";
- } else {
- //echo "<li class=\"file ext_$ext\">" . htmlentities($file) . "</li>";
- }
+ if (in_array($extension_verif, $extensions)) {
+ echo "<li class=\"file ext_$ext\"><a href=\"#\" onclick=\"tpls_edit_file('".htmlentities($_REQUEST['dir'].$file)."', '".htmlentities($_REQUEST['dir'])."', '".htmlentities($file)."', '".$ext."');\" rel=\"tpls_edit_file('".htmlentities($_REQUEST['dir'].$file)."', '".htmlentities($_REQUEST['dir'])."', '".htmlentities($file)."', '".$ext."');\">" . htmlentities($file) . "</a></li>";
+ } else {
+ //echo "<li class=\"file ext_$ext\">" . htmlentities($file) . "</li>";
+ }
- }
- }
- echo "</ul>";
- }
- }
- break;
+ }
+ }
+ echo "</ul>";
+ }
+ }
+ break;
// Edit File
- case 'tpls_edit_file':
- $path_file = realpath(XOOPS_ROOT_PATH.'/themes'.trim($_REQUEST['path_file']));
+ case 'tpls_edit_file':
+ $path_file = realpath(XOOPS_ROOT_PATH.'/themes'.trim($_REQUEST['path_file']));
$path_file = str_replace('\\','/',$path_file);
- //Button restore
- if(file_exists($path_file.'.back')){
- $restore = '<button class="ui-corner-all tooltip" type="button" onclick="tpls_restore(\''.$path_file.'\')" value="'._AM_SYSTEM_TEMPLATES_RESTORE.'" title="'._AM_SYSTEM_TEMPLATES_RESTORE.'">
+ //Button restore
+ if (file_exists($path_file.'.back')) {
+ $restore = '<button class="ui-corner-all tooltip" type="button" onclick="tpls_restore(\''.$path_file.'\')" value="'._AM_SYSTEM_TEMPLATES_RESTORE.'" title="'._AM_SYSTEM_TEMPLATES_RESTORE.'">
<img src="'.system_AdminIcons('revert.png').'" alt="'._AM_SYSTEM_TEMPLATES_RESTORE.'" />
</button>';
- }else{
- $restore = '';
- }
- xoops_load('XoopsFile');
+ } else {
+ $restore = '';
+ }
+ xoops_load('XoopsFile');
XoopsFile::load('file');
- $file = XoopsFile::getHandler('file', $path_file);
- $content = $file->read();
- if(empty($content)) {
- echo _AM_SYSTEM_TEMPLATES_EMPTY_FILE;
- }
- $ext = preg_replace('/^.*\./', '', $_REQUEST['path_file']);
+ $file = XoopsFile::getHandler('file', $path_file);
+ $content = $file->read();
+ if (empty($content)) {
+ echo _AM_SYSTEM_TEMPLATES_EMPTY_FILE;
+ }
+ $ext = preg_replace('/^.*\./', '', $_REQUEST['path_file']);
- echo '<form name="back" action="admin.php?fct=tplsets&op=tpls_save" method="POST">
- <table border="0">
- <tr>
- <td>
+ echo '<form name="back" action="admin.php?fct=tplsets&op=tpls_save" method="POST">
+ <table border="0">
+ <tr>
+ <td>
<div class="xo-btn-actions">
<div class="xo-buttons">
<button class="ui-corner-all tooltip" type="submit" value="'._AM_SYSTEM_TEMPLATES_SAVE.'" title="'._AM_SYSTEM_TEMPLATES_SAVE.'">
@@ -124,37 +124,37 @@
</div>
</div>
</td>
- </tr>
- <tr>
- <td><textarea id="code_mirror" name="templates" rows=24 cols=110>'.$content.'</textarea></td>
- </tr>
- </table>';
- echo '<input type="hidden" name="path_file" value="'.$path_file.'"><input type="hidden" name="file" value="'.trim($_REQUEST['file']).'"><input type="hidden" name="ext" value="'.$ext.'"></form>';
- break;
+ </tr>
+ <tr>
+ <td><textarea id="code_mirror" name="templates" rows=24 cols=110>'.$content.'</textarea></td>
+ </tr>
+ </table>';
+ echo '<input type="hidden" name="path_file" value="'.$path_file.'"><input type="hidden" name="file" value="'.trim($_REQUEST['file']).'"><input type="hidden" name="ext" value="'.$ext.'"></form>';
+ break;
- // Restore backup file
- case 'tpls_restore':
+ // Restore backup file
+ case 'tpls_restore':
$extensions = array('.html', '.htm', '.css');
//check if the file is inside themes directory
$valid_dir = stristr(realpath($_REQUEST['path_file']), realpath(XOOPS_ROOT_PATH . '/themes'));
- $old_file = $_REQUEST['path_file'].'.back';
- $new_file = $_REQUEST['path_file'];
+ $old_file = $_REQUEST['path_file'].'.back';
+ $new_file = $_REQUEST['path_file'];
$extension_verif = strrchr($new_file, '.');
- if($valid_dir && in_array($extension_verif, $extensions) && file_exists($old_file) && file_exists($new_file) )
- {
- if(unlink($new_file))
- {
- if(rename($old_file, $new_file))
- {
- xoops_result(_AM_SYSTEM_TEMPLATES_RESTORE_OK);
- exit();
- }
- }
- }
- xoops_error(_AM_SYSTEM_TEMPLATES_RESTORE_NOTOK);
+ if($valid_dir && in_array($extension_verif, $extensions) && file_exists($old_file) && file_exists($new_file) )
+ {
+ if(unlink($new_file))
+ {
+ if(rename($old_file, $new_file))
+ {
+ xoops_result(_AM_SYSTEM_TEMPLATES_RESTORE_OK);
+ exit();
+ }
+ }
+ }
+ xoops_error(_AM_SYSTEM_TEMPLATES_RESTORE_NOTOK);
break;
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/users/jquery.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/users/jquery.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/users/jquery.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -17,7 +17,7 @@
* @version $Id$
*/
-require('../../../../mainfile.php');
+require '../../../../mainfile.php';
require(XOOPS_ROOT_PATH.'/header.php');
if (!defined('XOOPS_ROOT_PATH')) { die('Error'); }
@@ -25,52 +25,52 @@
if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) exit( _NOPERM );
if (isset($_REQUEST["op"])) {
- $op = $_REQUEST["op"];
+ $op = $_REQUEST["op"];
} else {
- @$op = "default";
+ @$op = "default";
}
switch ($op) {
- // Display post
- case 'display_post':
- global $xoopsDB;
+ // Display post
+ case 'display_post':
+ global $xoopsDB;
$GLOBALS['xoopsLogger']->activated = false;
- include_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
- include_once XOOPS_ROOT_PATH . '/kernel/module.php';
+ include_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
+ include_once XOOPS_ROOT_PATH . '/kernel/module.php';
include_once XOOPS_ROOT_PATH . '/modules/system/include/functions.php';
- $tables = array();
- // Count comments (approved only: com_status == XOOPS_COMMENT_ACTIVE)
- $tables[] = array ('table_name' => 'xoopscomments', 'uid_column' => 'com_uid', 'criteria' => new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
- // Count forum posts
- if (XoopsModule::getByDirname("newbb")) {
- $tables[] = array ('table_name' => 'bb_posts', 'uid_column' => 'uid');
- }
- $uid = system_CleanVars($_REQUEST, 'uid', int);
- $total_posts = 0;
- foreach ($tables as $table)
- {
- $criteria = new CriteriaCompo();
- $criteria->add (new Criteria($table['uid_column'], $uid ));
- if (!empty($table['criteria'])) {
- $criteria->add ($table['criteria']);
- }
- $sql = "SELECT COUNT(*) AS total FROM ".$xoopsDB->prefix($table['table_name']) . ' ' . $criteria->renderWhere();
- if ( $result = $xoopsDB->query($sql) ) {
- if ($row = $xoopsDB->fetchArray($result)) {
- $total_posts = $total_posts + $row['total'];
- }
- }
- }
+ $tables = array();
+ // Count comments (approved only: com_status == XOOPS_COMMENT_ACTIVE)
+ $tables[] = array ('table_name' => 'xoopscomments', 'uid_column' => 'com_uid', 'criteria' => new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
+ // Count forum posts
+ if (XoopsModule::getByDirname("newbb")) {
+ $tables[] = array ('table_name' => 'bb_posts', 'uid_column' => 'uid');
+ }
+ $uid = system_CleanVars($_REQUEST, 'uid', int);
+ $total_posts = 0;
+ foreach ($tables as $table)
+ {
+ $criteria = new CriteriaCompo();
+ $criteria->add (new Criteria($table['uid_column'], $uid ));
+ if (!empty($table['criteria'])) {
+ $criteria->add ($table['criteria']);
+ }
+ $sql = "SELECT COUNT(*) AS total FROM ".$xoopsDB->prefix($table['table_name']) . ' ' . $criteria->renderWhere();
+ if ( $result = $xoopsDB->query($sql) ) {
+ if ($row = $xoopsDB->fetchArray($result)) {
+ $total_posts = $total_posts + $row['total'];
+ }
+ }
+ }
- $sql = "UPDATE ".$xoopsDB->prefix("users")." SET posts = '".$total_posts."' WHERE uid = '".$uid."'";
- if ( !$result = $xoopsDB->queryF($sql) ) {
- redirect_header("admin.php?fct=users",1,_AM_SYSTEM_USERS_CNUUSER);
- } else {
- echo $total_posts;
- }
- break;
+ $sql = "UPDATE ".$xoopsDB->prefix("users")." SET posts = '".$total_posts."' WHERE uid = '".$uid."'";
+ if ( !$result = $xoopsDB->queryF($sql) ) {
+ redirect_header("admin.php?fct=users",1,_AM_SYSTEM_USERS_CNUUSER);
+ } else {
+ echo $total_posts;
+ }
+ break;
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/admin/admin_header.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/admin/admin_header.php 2013-09-14 04:38:02 UTC (rev 12034)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/admin/admin_header.php 2013-09-14 04:49:34 UTC (rev 12035)
@@ -17,30 +17,27 @@
* @version $Id$
*/
-
//include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
include_once XOOPS_ROOT_PATH.'/mainfile.php';
//include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
-include("../../../include/cp_header.php");
+include '../../../include/cp_header.php';
//require_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname') . '/include/functions.php';
-if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
+if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))) {
include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
//return true;
- }else{
- redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
+ } else {
+ redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
//return false;
}
$myts =& MyTextSanitizer::getInstance();
-
+
$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
$pathIcon16 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
$pathIcon32 = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
-
-
if ($xoopsUser) {
$moduleperm_handler =& xoops_gethandler('groupperm');
if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar('mid'), $xoopsUser->getGroups())) {
@@ -57,7 +54,6 @@
$xoopsTpl = new XoopsTpl();
}
-
$xoopsTpl->assign('pathIcon16', $pathIcon16);
// Load language files
@@ -69,4 +65,4 @@
}
if (!@include_once(XOOPS_TRUST_PATH."/modules/".$xoopsModule->getVar("dirname")."/language/" . $xoopsConfig['langua...
[truncated message content] |
|
From: <be...@us...> - 2013-09-14 04:59:00
|
Revision: 12036
http://sourceforge.net/p/xoops/svn/12036
Author: beckmi
Date: 2013-09-14 04:58:55 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
standardizing braces
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/recaptcha/recaptchalib.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger/render.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/phpmailer/class.phpmailer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/phpmailer/class.pop3.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/phpmailer/class.smtp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/module.textsanitizer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Config_File.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty_Compiler.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.display_debug_console.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.rmdir.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.html_checkboxes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.html_options.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.html_radios.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/function.html_table.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/modifier.escape.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/plugins/outputfilter.trimwhitespace.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.foreachq.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/function.xoMemberInfo.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/snoopy.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/flash/flash.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/mp3/mp3.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/rtsp/rtsp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wiki/wiki.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wmp/wmp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/youtube/youtube.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/tree.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/xmlrpctag.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/saxparser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/dhtmltextarea/dhtmltextarea.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/form.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formbuttontray.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelementtray.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectuser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formtextdateselect.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopstopic.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/imagemanager.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.encoding.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.legacy.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/install_tpl.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/makedata.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_pathsettings.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/block.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/comment.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/configitem.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/user.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/misc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/banners/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/comments/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/groups/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/jquery.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/users/jquery.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/users/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/users/users.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/cookie.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/group.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/maintenance.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpThumb.config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpThumb.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.bmp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.filters.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.gif.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.ico.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.unsharp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/include/update.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/menu.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/zetadigme/zetadigme.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/readpmsg.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/suico/extras/function.xoMemberInfo.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/viewpmsg.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/class/ProtectorFilter.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/class/gtickets.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/class/protector.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/bruteforce_overrun_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/crawler_overrun_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/f5attack_overrun_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_deny_by_httpbl.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_deny_by_rbl.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_htmlpurify4everyone.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_htmlpurify4guest.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_need_multibyte.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_register_moratorium.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_register_insert_js_check.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/precommon_badip_errorlog.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/precommon_badip_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/precommon_badip_redirection.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/precommon_bwlimit_errorlog.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/precommon_bwlimit_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/prepurge_exit_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_disabled/spamcheck_overrun_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/filters_enabled/precommon_badip_message.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/include/install_extramodcheck.inc.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2013-09-14 04:49:34 UTC (rev 12035)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2013-09-14 04:58:55 UTC (rev 12036)
@@ -45,6 +45,7 @@
$infoArray['releasedate'] = $this->getReleaseDate();
$infoArray['methods'] = $this->getClassMethods();
}
+
return $infoArray;
}
@@ -59,6 +60,7 @@
*/
Include_once 'xoops_version.php';
$version = XOOPS_FRAMEWORKS_MODULEADMIN_VERSION;
+
return $version;
}
@@ -73,6 +75,7 @@
*/
Include_once 'xoops_version.php';
$releasedate = XOOPS_FRAMEWORKS_MODULEADMIN_RELEASEDATE;
+
return $releasedate;
}
@@ -84,6 +87,7 @@
function getClassMethods()
{
$myMethods = get_class_methods(__CLASS__);
+
return $myMethods;
}
@@ -92,14 +96,16 @@
//******************************************************************************************************************
// Loaf the language file.
//******************************************************************************************************************
- function loadLanguage() {
+ function loadLanguage()
+ {
$language = $GLOBALS['xoopsConfig']['language'];
- if ( !file_exists($fileinc = XOOPS_ROOT_PATH . "/Frameworks/moduleclasses/moduleadmin/language/{$language}/main.php" )){
- if ( !file_exists($fileinc = XOOPS_ROOT_PATH . "/Frameworks/moduleclasses/moduleadmin/language/english/main.php" )){
+ if ( !file_exists($fileinc = XOOPS_ROOT_PATH . "/Frameworks/moduleclasses/moduleadmin/language/{$language}/main.php" )) {
+ if ( !file_exists($fileinc = XOOPS_ROOT_PATH . "/Frameworks/moduleclasses/moduleadmin/language/english/main.php" )) {
return false;
}
}
$ret = include_once $fileinc;
+
return $ret;
}
//******************************************************************************************************************
@@ -114,7 +120,7 @@
$this->_obj->loadAdminMenu();
$ret = "<div class=\"rmmenuicon\">\n";
foreach (array_keys( $this->_obj->adminmenu) as $i) {
- if ($this->_obj->adminmenu[$i]['link'] != 'admin/index.php'){
+ 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 .= "<span>" . $this->_obj->adminmenu[$i]['title'] . "</span>";
@@ -122,7 +128,7 @@
}
}
if ($this->_obj->getInfo('help')) {
- if (substr(XOOPS_VERSION, 0, 9) >= 'XOOPS 2.5'){
+ if (substr(XOOPS_VERSION, 0, 9) >= 'XOOPS 2.5') {
$ret .= "<a href=\"" . $pathsystem . "help.php?mid=" . $this->_obj->getVar('mid', 's') . "&" . $this->_obj->getInfo('help') . "\" title=\"" . _AM_SYSTEM_HELP . "\">";
$ret .= "<img width=\"32px\" src=\"" . XOOPS_URL . "/Frameworks/moduleclasses/icons/32/help.png\" alt=\"" . _AM_SYSTEM_HELP . "\" /> ";
$ret .= "<span>" . _AM_SYSTEM_HELP . "</span>";
@@ -130,6 +136,7 @@
}
}
$ret .= "</div>\n<div style=\"clear: both;\"></div>\n";
+
return $ret;
}
//******************************************************************************************************************
@@ -140,8 +147,7 @@
function renderButton($position = "right", $delimeter = " ")
{
$path = XOOPS_URL . "/Frameworks/moduleclasses/icons/32/";
- switch ($position)
- {
+ switch ($position) {
default:
case "right":
$ret = "<div class=\"floatright\">\n";
@@ -163,6 +169,7 @@
}
$ret .= "</div>\n</div>\n";
$ret .= "<br /> <br /><br />";
+
return $ret;
}
@@ -173,6 +180,7 @@
$ret['icon'] = $icon . '.png';
$ret['extra'] = $extra;
$this -> _itemButton[] = $ret;
+
return true;
}
@@ -189,20 +197,19 @@
{
$line = "";
$path = XOOPS_URL . "/Frameworks/moduleclasses/icons/16/";
- switch ($type)
- {
+ switch ($type) {
default:
case "default":
$line .= "<span>" . $value . "</span>";
break;
case "folder":
- if (!is_dir($value)){
+ if (!is_dir($value)) {
$line .= "<span style='color : red; font-weight : bold;'>";
$line .= "<img src='" . $path . "off.png' >";
$line .= sprintf(_AM_MODULEADMIN_CONFIG_FOLDERKO, $value);
$line .= "</span>\n";
- }else{
+ } else {
$line .= "<span style='color : green;'>";
$line .= "<img src='" . $path . "on.png' >";
$line .= sprintf(_AM_MODULEADMIN_CONFIG_FOLDEROK, $value);
@@ -211,13 +218,13 @@
break;
case "chmod":
- if (is_dir($value[0])){
+ if (is_dir($value[0])) {
if (substr(decoct(fileperms($value[0])),2) != $value[1]) {
$line .= "<span style='color : red; font-weight : bold;'>";
$line .= "<img src='" . $path . "off.png' >";
$line .= sprintf(_AM_MODULEADMIN_CONFIG_CHMOD, $value[0], $value[1], substr(decoct(fileperms($value[0])),2));
$line .= "</span>\n";
- }else{
+ } else {
$line .= "<span style='color : green;'>";
$line .= "<img src='" . $path . "on.png' >";
$line .= sprintf(_AM_MODULEADMIN_CONFIG_CHMOD, $value[0], $value[1], substr(decoct(fileperms($value[0])),2));
@@ -227,6 +234,7 @@
break;
}
$this -> _itemConfigBoxLine[] = $line;
+
return true;
}
//******************************************************************************************************************
@@ -245,7 +253,7 @@
$ret .= "</td>\n";
$ret .= "</tr>\n";
// If you use a config label
- if ($this->_obj->getInfo('min_php') || $this->_obj->getInfo('min_xoops') || !empty($this -> _itemConfigBoxLine)){
+ if ($this->_obj->getInfo('min_php') || $this->_obj->getInfo('min_xoops') || !empty($this -> _itemConfigBoxLine)) {
$ret .= "<tr>\n";
$ret .= "<td colspan=\"2\">\n";
$ret .= "<fieldset><legend class=\"label\">";
@@ -254,10 +262,10 @@
// php version
$path = XOOPS_URL . "/Frameworks/moduleclasses/icons/16/";
- if ($this->_obj->getInfo('min_php')){
- if (phpversion() < $this->_obj->getInfo('min_php')){
+ if ($this->_obj->getInfo('min_php')) {
+ if (phpversion() < $this->_obj->getInfo('min_php')) {
$ret .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "off.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_PHP, $this->_obj->getInfo('min_php'), phpversion()) . "</span>\n";
- }else{
+ } else {
$ret .= "<span style='color : green;'><img src='" . $path . "on.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_PHP, $this->_obj->getInfo('min_php'), phpversion()) . "</span>\n";
}
$ret .= "<br />";
@@ -282,10 +290,10 @@
$dbCurrentVersion = '0';
break;
}
- $currentVerParts = explode('.', (string)$dbCurrentVersion);
+ $currentVerParts = explode('.', (string) $dbCurrentVersion);
$iCurrentVerParts = array_map('intval', $currentVerParts);
$dbRequiredVersion = $dbarray[XOOPS_DB_TYPE];
- $reqVerParts = explode('.', (string)$dbRequiredVersion);
+ $reqVerParts = explode('.', (string) $dbRequiredVersion);
$iReqVerParts = array_map('intval', $reqVerParts);
$icount = $j = count($iReqVerParts);
$reqVer = $curVer = 0;
@@ -306,25 +314,25 @@
}
// xoops version
- if ($this->_obj->getInfo('min_xoops')){
- if (substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION)-6) < $this->_obj->getInfo('min_xoops')){
+ if ($this->_obj->getInfo('min_xoops')) {
+ if (substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION)-6) < $this->_obj->getInfo('min_xoops')) {
$ret .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "off.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_XOOPS, $this->_obj->getInfo('min_xoops'), substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION)-6)) . "</span>\n";
- }else{
+ } else {
$ret .= "<span style='color : green;'><img src='" . $path . "on.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_XOOPS, $this->_obj->getInfo('min_xoops'), substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION)-6)) . "</span>\n";
}
$ret .= "<br />";
}
// ModuleAdmin version
- if ($this->_obj->getInfo('min_admin')){
- if ($this->getVersion() < $this->_obj->getInfo('min_admin')){
+ if ($this->_obj->getInfo('min_admin')) {
+ if ($this->getVersion() < $this->_obj->getInfo('min_admin')) {
$ret .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "off.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_ADMIN, $this->_obj->getInfo('min_admin'), $this->getVersion()) . "</span>\n";
- }else{
+ } else {
$ret .= "<span style='color : green;'><img src='" . $path . "on.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_ADMIN, $this->_obj->getInfo('min_admin'), $this->getVersion()) . "</span>\n";
}
$ret .= "<br />";
}
- if (!empty($this -> _itemConfigBoxLine)){
+ if (!empty($this -> _itemConfigBoxLine)) {
foreach (array_keys( $this -> _itemConfigBoxLine) as $i) {
$ret .= $this -> _itemConfigBoxLine[$i];
$ret .= "<br />";
@@ -335,6 +343,7 @@
$ret .= "</tr>\n";
}
$ret .= "</table>\n";
+
return $ret;
}
//******************************************************************************************************************
@@ -346,6 +355,7 @@
{
$ret['title'] = $title;
$this -> _itemInfoBox[] = $ret;
+
return true;
}
//******************************************************************************************************************
@@ -362,8 +372,7 @@
{
$ret['label'] = $label;
$line = "";
- switch ($type)
- {
+ switch ($type) {
default:
case "default":
$line .= sprintf($text, "<span style='color : " . $color . "; font-weight : bold;'>" . $value . "</span>");
@@ -375,6 +384,7 @@
}
$ret['line'] = $line;
$this -> _itemInfoBoxLine[] = $ret;
+
return true;
}
function renderInfoBox()
@@ -385,7 +395,7 @@
$ret .= $this -> _itemInfoBox[$i]['title'];
$ret .= "</legend>\n";
foreach (array_keys( $this -> _itemInfoBoxLine) as $k) {
- if ($this -> _itemInfoBoxLine[$k]['label'] == $this -> _itemInfoBox[$i]['title']){
+ if ($this -> _itemInfoBoxLine[$k]['label'] == $this -> _itemInfoBox[$i]['title']) {
$ret .= $this -> _itemInfoBoxLine[$k]['line'];
$ret .= "<br />";
}
@@ -393,10 +403,10 @@
$ret .= "</fieldset>\n";
$ret .= "<br/>\n";
}
+
return $ret;
}
-
function renderAbout($paypal = '', $logo_xoops = true)
{
$path = XOOPS_URL . "/Frameworks/moduleclasses/icons/32/";
@@ -425,7 +435,7 @@
$ret .= $author[$i];
if (isset($nickname[$i]) && $nickname[$i] !='') {
$ret .= " (" . $nickname[$i] . "), ";
- }else{
+ } else {
$ret .= ", ";
}
}
@@ -437,7 +447,7 @@
$ret .= "<a href=\"http://" . $this->_obj->getInfo('website') . "\" target=\"_blank\" >" . $this->_obj->getInfo('website') . "</a>\n";
$ret .= "<br />\n";
$ret .= "<br />\n";
- if ($paypal != ''){
+ if ($paypal != '') {
$ret .= '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
<input type="hidden" name="cmd" value="_s-xclick">
<input type="hidden" name="hosted_button_id" value="' . $paypal . '">
@@ -457,16 +467,16 @@
$ret .= "</legend><br/>\n";
$ret .= "<div class=\"txtchangelog\">\n";
$language = $GLOBALS['xoopsConfig']['language'];
- if ( !is_file( XOOPS_ROOT_PATH . "/modules/" . $this->_obj->getVar("dirname") . "/language/" . $language . "/changelog.txt" ) ){
+ if ( !is_file( XOOPS_ROOT_PATH . "/modules/" . $this->_obj->getVar("dirname") . "/language/" . $language . "/changelog.txt" ) ) {
$language = 'english';
}
$language = empty($language) ? $GLOBALS['xoopsConfig']['language'] : $language;
$file = XOOPS_ROOT_PATH. "/modules/" . $this->_obj->getVar("dirname") . "/language/" . $language . "/changelog.txt";
- if ( is_readable( $file ) ){
+ if ( is_readable( $file ) ) {
$ret .= utf8_encode(implode("<br />", file( $file ))) . "\n";
- }else{
+ } else {
$file = XOOPS_ROOT_PATH. "/modules/" . $this->_obj->getVar("dirname") . "/docs/changelog.txt";
- if ( is_readable( $file ) ){
+ if ( is_readable( $file ) ) {
$ret .= utf8_encode(implode("<br />", file( $file ))) . "\n";
}
}
@@ -475,11 +485,12 @@
$ret .= "</td>\n";
$ret .= "</tr>\n";
$ret .= "</table>\n";
- if ($logo_xoops == true){
+ if ($logo_xoops == true) {
$ret .= "<div align=\"center\">";
$ret .= "<a href=\"http://www.xoops.org\" target=\"_blank\"><img src=\"" . $path . "xoopsmicrobutton.gif\" alt=\"XOOPS\" title=\"XOOPS\"></a>";
$ret .= "</div>";
}
+
return $ret;
}
@@ -490,18 +501,19 @@
$path = XOOPS_URL . "/modules/" . $this->_obj->getVar('dirname') . "/";
$this->_obj->loadAdminMenu();
foreach (array_keys( $this->_obj->adminmenu) as $i) {
- if ($this->_obj->adminmenu[$i]['link'] == "admin/" . $menu){
+ if ($this->_obj->adminmenu[$i]['link'] == "admin/" . $menu) {
$navigation .= $this->_obj->adminmenu[$i]['title'] . " | ";
$ret = "<div class=\"CPbigTitle\" style=\"background-image: url(" . $path . $this->_obj->adminmenu[$i]['icon'] . "); background-repeat: no-repeat; background-position: left; padding-left: 50px;\">
<strong>" . $this->_obj->adminmenu[$i]['title'] . "</strong></div><br />";
- }else{
+ } else {
$navigation .= "<a href = '../" . $this->_obj->adminmenu[$i]['link'] . "'>" . $this->_obj->adminmenu[$i]['title'] . "</a> | ";
}
}
- if (substr(XOOPS_VERSION, 0, 9) < 'XOOPS 2.5'){
+ if (substr(XOOPS_VERSION, 0, 9) < 'XOOPS 2.5') {
$navigation .= "<a href = '../../system/admin.php?fct=preferences&op=showmod&mod=" . $this->_obj->getVar('mid') . "'>" . _MI_SYSTEM_ADMENU6 . "</a>";
$ret = $navigation . "<br /><br />" . $ret;
}
+
return $ret;
}
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/recaptcha/recaptchalib.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/recaptcha/recaptchalib.php 2013-09-14 04:49:34 UTC (rev 12035)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/recaptcha/recaptchalib.php 2013-09-14 04:58:55 UTC (rev 12036)
@@ -44,13 +44,15 @@
* @param $data - array of string elements to be encoded
* @return string - encoded request
*/
-function _recaptcha_qsencode ($data) {
+function _recaptcha_qsencode ($data)
+{
$req = "";
foreach ( $data as $key => $value )
$req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
// Cut the last '&'
$req=substr($req,0,strlen($req)-1);
+
return $req;
}
@@ -64,8 +66,8 @@
* @param int port
* @return array response
*/
-function _recaptcha_http_post($host, $path, $data, $port = 80) {
-
+function _recaptcha_http_post($host, $path, $data, $port = 80)
+{
$req = _recaptcha_qsencode ($data);
$http_request = "POST $path HTTP/1.0\r\n";
@@ -77,7 +79,7 @@
$http_request .= $req;
$response = '';
- if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
+ if ( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
die ('Could not open socket');
}
@@ -105,11 +107,11 @@
*/
function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
{
- if ($pubkey == null || $pubkey == '') {
- die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
- }
+ if ($pubkey == null || $pubkey == '') {
+ die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
+ }
- if ($use_ssl) {
+ if ($use_ssl) {
$server = RECAPTCHA_API_SECURE_SERVER;
} else {
$server = RECAPTCHA_API_SERVER;
@@ -119,27 +121,25 @@
if ($error) {
$errorpart = "&error=" . $error;
}
+
return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
- <noscript>
- <iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
- <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
- <input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
- </noscript>';
+ <noscript>
+ <iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
+ <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
+ <input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
+ </noscript>';
}
-
-
-
/**
* A ReCaptchaResponse is returned from recaptcha_check_answer()
*/
-class ReCaptchaResponse {
+class ReCaptchaResponse
+{
var $is_valid;
var $error;
}
-
/**
* Calls an HTTP POST function to verify if the user's guess was correct
* @param string $privkey
@@ -151,13 +151,13 @@
*/
function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array())
{
- if ($privkey == null || $privkey == '') {
- die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
- }
+ if ($privkey == null || $privkey == '') {
+ die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
+ }
- if ($remoteip == null || $remoteip == '') {
- die ("For security reasons, you must pass the remote ip to reCAPTCHA");
- }
+ if ($remoteip == null || $remoteip == '') {
+ die ("For security reasons, you must pass the remote ip to reCAPTCHA");
+ }
@@ -166,6 +166,7 @@
$recaptcha_response = new ReCaptchaResponse();
$recaptcha_response->is_valid = false;
$recaptcha_response->error = 'incorrect-captcha-sol';
+
return $recaptcha_response;
}
@@ -183,11 +184,11 @@
if (trim ($answers [0]) == 'true') {
$recaptcha_response->is_valid = true;
- }
- else {
+ } else {
$recaptcha_response->is_valid = false;
$recaptcha_response->error = $answers [1];
}
+
return $recaptcha_response;
}
@@ -199,45 +200,52 @@
* @param string $domain The domain where the page is hosted
* @param string $appname The name of your application
*/
-function recaptcha_get_signup_url ($domain = null, $appname = null) {
- return "https://www.google.com/recaptcha/admin/create?" . _rec...
[truncated message content] |
|
From: <be...@us...> - 2013-09-14 07:32:56
|
Revision: 12037
http://sourceforge.net/p/xoops/svn/12037
Author: beckmi
Date: 2013-09-14 07:32:51 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
standardizing HTMLPurifier and TinyMCE for consistency
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/editor_registry.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/formtinymce.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/settings.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.gif.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrCollections.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Background.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Border.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Color.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Composite.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Filter.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Font.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Ident.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Length.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Multiple.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Number.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/Percentage.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS/URI.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/CSS.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/Clone.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/Enum.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/Bool.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/Class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/Color.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/ID.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/Length.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/MultiLength.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/HTML/Pixels.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/Integer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/Lang.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/Switch.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/Text.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/URI/Email.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/URI/Host.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/URI/IPv4.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/URI/IPv6.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef/URI.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrDef.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Background.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/BdoDir.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/BgColor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/BoolToCSS.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Border.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/EnumToCSS.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/ImgRequired.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/ImgSpace.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Input.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Lang.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Length.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Name.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/NameSync.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Nofollow.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/SafeEmbed.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/SafeObject.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/SafeParam.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/ScriptRequired.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/TargetBlank.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform/Textarea.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTransform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrTypes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/AttrValidator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Bootstrap.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/CSSDefinition.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/Chameleon.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/Custom.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/Empty.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/List.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/Optional.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/Required.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/StrictBlockquote.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef/Table.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ChildDef.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/Builder/Xml.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/Interchange/Id.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/Interchange.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/Validator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ConfigSchema.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ContentSets.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Context.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Definition.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DefinitionCache/Decorator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DefinitionCache/Null.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DefinitionCache/Serializer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DefinitionCache.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DefinitionCacheFactory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/DoctypeRegistry.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ElementDef.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Encoder.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/EntityLookup.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/EntityParser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ErrorCollector.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/ErrorStruct.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Filter/ExtractStyleBlocks.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Filter/YouTube.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Filter.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Generator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLDefinition.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Bdo.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Edit.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Forms.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Hypertext.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Iframe.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Legacy.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/List.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Name.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Nofollow.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Object.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Presentation.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Proprietary.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Ruby.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/SafeEmbed.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/SafeObject.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/SafeScripting.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Scripting.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/StyleAttribute.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tables.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Target.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/TargetBlank.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Text.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tidy/Name.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tidy/Strict.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule/Tidy.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModule.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/HTMLModuleManager.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/IDAccumulator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/AutoParagraph.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/DisplayLinkURI.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/Linkify.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/PurifierLinkify.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/RemoveEmpty.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector/SafeObject.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Injector.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Language.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/LanguageFactory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Length.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Lexer/DOMLex.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Lexer/DirectLex.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Lexer/PH5P.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Lexer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/PercentEncoder.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Printer/CSSDefinition.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Printer/ConfigForm.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Printer/HTMLDefinition.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Printer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/PropertyList.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/PropertyListIterator.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/Composite.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/Core.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/FixNesting.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/MakeWellFormed.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/RemoveForeignElements.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Strategy/ValidateAttributes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/StringHash.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/StringHashParser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/TagTransform/Font.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/TagTransform/Simple.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/TagTransform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Token/Comment.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Token/Tag.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Token/Text.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/Token.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/TokenFactory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URI.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIDefinition.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/DisableExternal.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/DisableExternalResources.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/DisableResources.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/HostBlacklist.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/MakeAbsolute.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/Munge.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIFilter/SafeIframe.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIParser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/data.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/file.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/ftp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/http.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/https.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/mailto.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/news.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme/nntp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URIScheme.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/URISchemeRegistry.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/UnitConverter.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/VarParser/Flexible.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/VarParser/Native.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier/VarParser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.autoload.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.func.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.kses.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/library/HTMLPurifier.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/editor_registry.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/editor_registry.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/editor_registry.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -19,4 +19,3 @@
"order" => 5,
"nohtml" => 0
);
-?>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/formtinymce.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/formtinymce.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/formtinymce.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -33,12 +33,12 @@
/**
* Constructor
*
- * @param array $configs Editor Options
+ * @param array $configs Editor Options
*/
function __construct($configs)
{
$current_path = __FILE__;
- if ( DIRECTORY_SEPARATOR != "/" ) {
+ if (DIRECTORY_SEPARATOR != "/") {
$current_path = str_replace( strpos( $current_path, "\\\\", 2 ) ? "\\\\" : DIRECTORY_SEPARATOR, "/", $current_path);
}
@@ -66,7 +66,7 @@
* I'VE USED THIS EXAMPLE TO WRITE VALIDATION CODE
* http://tinymce.moxiecode.com/punbb/viewtopic.php?id=12616
*
- * @return string
+ * @return string
*/
function renderValidationJS()
{
@@ -78,15 +78,17 @@
$ret = "\n";
$ret.= "if ( tinyMCE.get('{$eltname}').getContent() == \"\" || tinyMCE.get('{$eltname}').getContent() == null) ";
$ret.= "{ window.alert(\"{$eltmsg}\"); tinyMCE.get('{$eltname}').focus(); return false; }";
+
return $ret;
}
+
return '';
}
/**
* get language
*
- * @return string
+ * @return string
*/
function getLanguage()
{
@@ -97,7 +99,7 @@
$this->language = strtolower(constant("_XOOPS_EDITOR_TINYMCE_LANGUAGE"));
} else {
$this->language = str_replace('_', '-', strtolower(_LANGCODE));
- if(strtolower(_CHARSET) == "utf-8") {
+ if (strtolower(_CHARSET) == "utf-8") {
$this->language .= "_utf8";
}
}
@@ -117,7 +119,7 @@
/**
* prepare HTML for output
*
- * @return sting HTML
+ * @return sting HTML
*/
function render()
{
@@ -137,4 +139,3 @@
return is_readable(XOOPS_ROOT_PATH . $this->rootPath . "/tinymce.php");
}
}
-?>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/settings.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/settings.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/settings.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -342,4 +342,3 @@
."|title]",
);
-?>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php 2013-09-14 04:58:55 UTC (rev 12036)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php 2013-09-14 07:32:51 UTC (rev 12037)
@@ -13,10 +13,9 @@
* @version $Id: xoopsemotions.php 8066 2011-11-06 05:09:33Z beckmi $
*/
-
// load mainfile.php - start
$current_path = dirname(__FILE__);
-if ( DIRECTORY_SEPARATOR != "/" ) {
+if (DIRECTORY_SEPARATOR != "/") {
$current_path = str_replace( DIRECTORY_SEPARATOR, "/", $current_path);
}
$xoops_root_path = substr($current_path, 0, strpos(strtolower($current_path), "/class/xoopseditor/tinymce/"));
@@ -49,7 +48,7 @@
$myts =& MyTextSanitizer::getInstance();
-if ( $admin && $op == 'SmilesAdd' ) {
+if ($admin && $op == 'SmilesAdd') {
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($current_file, 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
}
@@ -110,7 +109,7 @@
<body>
<?php
-if ( !$_SESSION['XoopsEmotions'] && !$admin) {
+if (!$_SESSION['XoopsEmotions'] && !$admin) {
echo "<div class='xoopsEmotions'>";
echo "<div>{#xoopsemotions_dlg.error_noemotions}</div>";
echo "</div>";
@@ -136,21 +135,21 @@
<div class="panel_wrapper">
<div id="emotionsbrowser_panel" class="panel current" style="overflow:auto;">
<?php
- if ( $smiles = $_SESSION['XoopsEmotions'] ) {
+ if ($smiles = $_SESSION['XoopsEmotions']) {
echo "<div><strong>" . _MSC_CLICKASMILIE . "</strong></div>";
echo "<div class='xoopsEmotions'>";
$count = count($smiles);
for ($i = 0; $i < $count; $i++) {
- if ( $op == '' ) {
- if ( $smiles[$i]['display'] ) {
+ if ($op == '') {
+ if ($smiles[$i]['display']) {
echo '<img class="xoopsEmotions" onclick="XoopsemotionsDialog.insert(this);" src="' . XOOPS_UPLOAD_URL . '/' . $smiles[$i]['smile_url'] . '" alt="' . $myts->htmlspecialchars($smiles[$i]['emotion']) . '" title="' . $myts->htmlspecialchars($smiles[$i]['e...
[truncated message content] |
|
From: <be...@us...> - 2013-09-14 12:49:33
|
Revision: 12038
http://sourceforge.net/p/xoops/svn/12038
Author: beckmi
Date: 2013-09-14 12:49:29 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
Adding missing "static" to some class methods
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_provisionning.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/authfactory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xoopscache.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/xoopscaptcha.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/commentrenderer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/xoopsmodel.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/module.errorhandler.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/utility/xoopsutility.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsblock.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopslocal.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/xoopslocal.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/module.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/user.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/cpanel.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/thumbs/phpthumb.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/class/ProtectorFilter.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_provisionning.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_provisionning.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_provisionning.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -38,12 +38,13 @@
* @param mixed $auth_instance
* @return
*/
- function &getInstance(&$auth_instance)
+ static function &getInstance(&$auth_instance)
{
static $provis_instance;
if (!isset($provis_instance)) {
$provis_instance = new XoopsAuthProvisionning($auth_instance);
}
+
return $provis_instance;
}
@@ -101,6 +102,7 @@
$xoopsUser = $this->change($xoopsUser, $datas, $uname, $pwd);
}
}
+
return $xoopsUser;
}
@@ -130,14 +132,16 @@
$newuser->setVar(trim($fields[0]), utf8_decode($datas[trim($fields[1])][0]));
}
if ($member_handler->insertUser($newuser)) {
- foreach($this->ldap_provisionning_group as $groupid) {
+ foreach ($this->ldap_provisionning_group as $groupid) {
$member_handler->addUserToGroup($groupid, $newuser->getVar('uid'));
}
$newuser->unsetNew();
+
return $newuser;
} else {
redirect_header(XOOPS_URL . '/user.php', 5, $newuser->getHtmlErrors());
}
+
return $ret;
}
@@ -163,6 +167,7 @@
} else {
redirect_header(XOOPS_URL . '/user.php', 5, $xoopsUser->getHtmlErrors());
}
+
return $ret;
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/authfactory.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/authfactory.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/authfactory.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -39,7 +39,7 @@
* @static
* @return object Reference to the only instance of authentication class
*/
- function &getAuthConnection($uname)
+ static function &getAuthConnection($uname)
{
static $auth_instance;
if (!isset($auth_instance)) {
@@ -66,6 +66,7 @@
$class = 'XoopsAuth' . ucfirst($xoops_auth_method);
if (!class_exists($class)) {
$GLOBALS['xoopsLogger']->triggerError($class, _XO_ER_CLASSNOTFOUND, __FILE__, __LINE__, E_USER_ERROR );
+
return false;
}
switch ($xoops_auth_method) {
@@ -81,6 +82,7 @@
}
$auth_instance = new $class($dao);
}
+
return $auth_instance;
}
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xoopscache.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xoopscache.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xoopscache.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -36,7 +36,6 @@
var $engine = null;
// static $engine = null;
-
/**
* Cache configuration stack
*
@@ -73,6 +72,7 @@
$class = __CLASS__;
$instance = new $class();
}
+
return $instance;
}
@@ -90,18 +90,20 @@
include $file;
} else {
trigger_error('File :' . $file . ' not found in file : ' . __FILE__ . ' at line: ' . __LINE__, E_USER_WARNING);
+
return false;
}
}
+
return true;
}
/**
* Set the cache configuration to use
*
- * @param string $name Name of the configuration
- * @param array $settings Optional associative array of settings passed to the engine
- * @return array (engine, settings) on success, false on failure
+ * @param string $name Name of the configuration
+ * @param array $settings Optional associative array of settings passed to the engine
+ * @return array (engine, settings) on success, false on failure
* @access public
*/
function config($name = 'default', $settings = array())
@@ -113,9 +115,9 @@
if (isset($_this->configs[$name])) {
$settings = array_merge($_this->configs[$name], $settings);
- } else if (!empty($settings)) {
+ } elseif (!empty($settings)) {
$_this->configs[$name] = $settings;
- } else if ($_this->configs !== null && isset($_this->configs[$_this->name])) {
+ } elseif ($_this->configs !== null && isset($_this->configs[$_this->name])) {
$name = $_this->name;
$settings = $_this->configs[$_this->name];
} else {
@@ -135,6 +137,7 @@
if ($name !== $_this->name) {
if ($_this->engine($engine, $settings) === false) {
trigger_error("Cache Engine {$engine} is not set", E_USER_WARNING);
+
return false;
}
$_this->name = $name;
@@ -142,14 +145,15 @@
}
$settings = $_this->configs[$name];
+
return compact('engine', 'settings');
}
/**
* Set the cache engine to use or modify settings for one instance
*
- * @param string $name Name of the engine (without 'Engine')
- * @param array $settings Optional associative array of settings passed to the engine
+ * @param string $name Name of the engine (without 'Engine')
+ * @param array $settings Optional associative array of settings passed to the engine
* @return boolean True on success, false on failure
* @access public
*/
@@ -164,6 +168,7 @@
if (!isset($_this->engine[$name])) {
if ($_this->loadEngine($name) === false) {
trigger_error("Cache Engine {$name} is not loaded", E_USER_WARNING);
+
return false;
}
$_this->engine[$name] = new $cacheClass();
@@ -173,10 +178,12 @@
if (time() % $_this->engine[$name]->settings['probability'] == 0) {
$_this->engine[$name]->gc();
}
+
return true;
}
$_this->engine[$name] = null;
trigger_error("Cache Engine {$name} is not initialized", E_USER_WARNING);
+
return false;
}
@@ -198,21 +205,21 @@
/**
* Write data for key into cache
*
- * @param string $key Identifier for the data
- * @param mixed $value Data to be cached - anything except a resource
- * @param mixed $duration Optional - string configuration name OR how long to cache the data, either in seconds or a
+ * @param string $key Identifier for the data
+ * @param mixed $value Data to be cached - anything except a resource
+ * @param mixed $duration Optional - string configuration name OR how long to cache the data, either in seconds or a
* string that can be parsed by the strtotime() function OR array('config' => 'default', 'duration' => '3600')
* @return boolean True if the data was successfully cached, false on failure
* @access public
*/
- function write($key, $value, $duration = null)
+ static function write($key, $value, $duration = null)
{
$key = substr(md5(XOOPS_URL), 0, 8) . '_' . $key;
$_this =& XoopsCache::getInstance();
$config = null;
if (is_array($duration)) {
extract($duration);
- } else if (isset($_this->configs[$duration])) {
+ } elseif (isset($_this->configs[$duration])) {
$config = $duration;
$duration = null;
}
@@ -225,6 +232,7 @@
if (!$_this->isInitialized($engine)) {
trigger_error('Cache write not initialized: ' . $engine);
+
return false;
}
@@ -246,15 +254,16 @@
}
$_this->engine[$engine]->init($settings);
$success = $_this->engine[$engine]->write($key, $value, $duration);
+
return $success;
}
/**
* Read a key from the cache
*
- * @param string $key Identifier for the data
- * @param string $config name of the configuration to use
- * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
+ * @param string $key Identifier for the data
+ * @param string $config name of the configuration to use
+ * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
* @access public
*/
static function read($key, $config = null)
@@ -277,18 +286,19 @@
}
$_this->engine[$engine]->init($settings);
$success = $_this->engine[$engine]->read($key);
+
return $success;
}
/**
* Delete a key from the cache
*
- * @param string $key Identifier for the data
- * @param string $config name of the configuration to use
+ * @param string $key Identifier for the data
+ * @param string $config name of the configuration to use
* @return boolean True if the value was succesfully deleted, false if it didn't exist or couldn't be removed
* @access public
*/
- function delete($key, $config = null)
+ static function delete($key, $config = null)
{
$key = substr(md5(XOOPS_URL), 0, 8) . '_' . $key;
$_this =& XoopsCache::getInstance();
@@ -306,14 +316,15 @@
$_this->engine[$engine]->init($settings);
$success = $_this->engine[$engine]->delete($key);
+
return $success;
}
/**
* Delete all keys from the cache
*
- * @param boolean $check if true will check expiration, otherwise delete all
- * @param string $config name of the configuration to use
+ * @param boolean $check if true will check expiration, otherwise delete all
+ * @param string $config name of the configuration to use
* @return boolean True if the cache was succesfully cleared, false otherwise
* @access public
*/
@@ -328,14 +339,15 @@
}
$success = $_this->engine[$engine]->clear($check);
$_this->engine[$engine]->init($settings);
+
return $success;
}
/**
* Check if Cache has initialized a working storage engine
*
- * @param string $engine Name of the engine
- * @param string $config Name of the configuration setting
+ * @param string $engine Name of the engine
+ * @param string $config Name of the configuration setting
* @return bool
* @access public
*/
@@ -352,8 +364,8 @@
/**
* Return the settings for current cache engine
*
- * @param string $engine Name of the engine
- * @return array list of settings for this engine
+ * @param string $engine Name of the engine
+ * @return array list of settings for this engine
* @access public
*/
function settings($engine = null)
@@ -365,14 +377,15 @@
if (isset($_this->engine[$engine]) && ! is_null($_this->engine[$engine])) {
return $_this->engine[$engine]->settings();
}
+
return array();
}
/**
* generates a safe key
*
- * @param string $key the key passed over
- * @return mixed string $key or false
+ * @param string $key the key passed over
+ * @return mixed string $key or false
* @access private
*/
function key($key)
@@ -381,6 +394,7 @@
return false;
}
$key = str_replace(array('/', '.'), '_', strval($key));
+
return $key;
}
}
@@ -406,7 +420,7 @@
*
* Called automatically by the cache frontend
*
- * @param array $params Associative array of parameters for the engine
+ * @param array $params Associative array of parameters for the engine
* @return boolean True if the engine has been succesfully initialized, false if not
* @access public
*/
@@ -415,6 +429,7 @@
$this->settings = array_merge(array(
'duration' => 31556926 ,
'probability' => 100), $settings);
+
return true;
}
@@ -432,9 +447,9 @@
/**
* Write value for a key into cache
*
- * @param string $key Identifier for the data
- * @param mixed $value Data to be cached
- * @param mixed $duration How long to cache the data, in seconds
+ * @param string $key Identifier for the data
+ * @param mixed $value Data to be cached
+ * @param mixed $duration How long to cache the data, in seconds
* @return boolean True if the data was succesfully cached, false on failure
* @access public
*/
@@ -446,8 +461,8 @@
/**
* Read a key from the cache
*
- * @param string $key Identifier for the data
- * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
+ * @param string $key Identifier for the data
+ * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
* @access public
*/
function read($key)
@@ -458,7 +473,7 @@
/**
* Delete a key from the cache
*
- * @param string $key Identifier for the data
+ * @param string $key Identifier for the data
* @return boolean True if the value was succesfully deleted, false if it didn't exist or couldn't be removed
* @access public
*/
@@ -469,7 +484,7 @@
/**
* Delete all keys from the cache
*
- * @param boolean $check if true will check expiration, otherwise delete all
+ * @param boolean $check if true will check expiration, otherwise delete all
* @return boolean True if the cache was succesfully cleared, false otherwise
* @access public
*/
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/xoopscaptcha.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/xoopscaptcha.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/xoopscaptcha.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -60,13 +60,14 @@
*
* @return Instance
*/
- function &getInstance()
+ static function &getInstance()
{
static $instance;
if (!isset($instance)) {
$class = __CLASS__;
$instance = new $class();
}
+
return $instance;
}
@@ -92,6 +93,7 @@
foreach ($config as $key => $val) {
$config[$key] = $val;
}
+
return $config;
}
@@ -107,16 +109,19 @@
}
if (!empty($this->config['disabled'])) {
$this->active = false;
+
return $this->active;
}
if (!empty($this->config['skipmember']) && is_object($GLOBALS['xoopsUser'])) {
$this->active = false;
+
return $this->active;
}
if (!isset($this->handler)) {
$this->loadHandler();
}
$this->active = isset($this->handler);
+
return $this->active;
}
@@ -151,6 +156,7 @@
$this->handler = $handler;
$this->handler->loadConfig($name);
}
+
return $this->handler;
}
@@ -165,6 +171,7 @@
foreach ($configs as $key => $val) {
$this->setConfig($key, $val);
}
+
return true;
}
@@ -182,6 +189,7 @@
} else {
$this->config[$name] = $val;
}
+
return true;
}
@@ -206,10 +214,10 @@
if (!$this->isActive()) {
$is_valid = true;
// Skip CAPTCHA for member if set
- } else if (is_object($GLOBALS['xoopsUser']) && ! empty($skipMember)) {
+ } elseif (is_object($GLOBALS['xoopsUser']) && ! empty($skipMember)) {
$is_valid = true;
// Kill too many attempts
- } else if (!empty($maxAttempts) && $attempt > $maxAttempts) {
+ } elseif (!empty($maxAttempts) && $attempt > $maxAttempts) {
$this->message[] = _CAPTCHA_TOOMANYATTEMPTS;
// Verify the code
} else {
@@ -226,6 +234,7 @@
$_SESSION["{$sessionName}_attempt"] = null;
}
$this->destroyGarbage(true);
+
return $is_valid;
}
@@ -294,6 +303,7 @@
} else {
$form = $this->loadForm();
}
+
return $form;
}
@@ -307,6 +317,7 @@
if (!$this->active || empty($this->config['name'])) {
return '';
}
+
return $this->handler->renderValidationJS();
}
@@ -321,8 +332,10 @@
$code = ($code === null) ? $this->handler->getCode() : $code;
if (!empty($code)) {
$_SESSION[$this->name . '_code'] = $code;
+
return true;
}
+
return false;
}
@@ -335,6 +348,7 @@
{
$form = $this->handler->render();
$this->setCode();
+
return $form;
}
}
@@ -432,6 +446,7 @@
$func = !empty($this->config['casesensitive']) ? 'strcmp' : 'strcasecmp';
$is_valid = !$func(trim(@$_POST[$sessionName]), $_SESSION["{$sessionName}_code"]);
}
+
return $is_valid;
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/commentrenderer.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/commentrenderer.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/commentrenderer.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -62,17 +62,18 @@
/**
* Access the only instance of this class
*
- * @param object $tpl reference to a {@link Smarty} object
+ * @param object $tpl reference to a {@link Smarty} object
* @param boolean $use_icons
* @param boolean $do_iconcheck
* @return
*/
- function &instance(&$tpl, $use_icons = true, $do_iconcheck = false)
+ static function &instance(&$tpl, $use_icons = true, $do_iconcheck = false)
{
static $instance;
if (!isset($instance)) {
$instance = new XoopsCommentRenderer($tpl, $use_icons, $do_iconcheck);
}
+
return $instance;
}
@@ -106,13 +107,13 @@
// Start edit by voltan
$poster = $this->_getPosterArray($this->_comments[$i]->getVar('com_uid'), $this->_comments[$i]->getVar('com_user'), $this->_comments[$i]->getVar('com_url'));
if (false != $admin_view) {
- $com_email = $this->_comments[$i]->getVar('com_email');
+ $com_email = $this->_comments[$i]->getVar('com_email');
$text = $this->_comments[$i]->getVar('com_text');
$text .= '<div style="text-align:right; margin-top: 2px; margin-bottom: 0px; margin-right: 2px;">';
$text .= _CM_STATUS . ': ' . $this->_statusText[$this->_comments[$i]->getVar('com_status')] . '<br />';
$text .= 'IP: <span style="font-weight: bold;">' . $this->_comments[$i]->getVar('com_ip') . '</span>';
- if(!empty($com_email)) {
- $text .= '<br />' . _CM_EMAIL . ' :<span style="font-weight: bold;"><a href="mailto:' . $com_email . '" title="' . $com_email . '">' . $com_email . '</a></span>';
+ if (!empty($com_email)) {
+ $text .= '<br />' . _CM_EMAIL . ' :<span style="font-weight: bold;"><a href="mailto:' . $com_email . '" title="' . $com_email . '">' . $com_email . '</a></span>';
}
$text .= '</div>';
} else {
@@ -163,8 +164,8 @@
$text .= '<div style="text-align:right; margin-top: 2px; margin-bottom: 0px; margin-right: 2px;">';
$text .= _CM_STATUS . ': ' . $this->_statusText[$tree[$comment_id]['obj']->getVar('com_status')] . '<br />';
$text .= 'IP: <span style="font-weight: bold;">' . $tree[$comment_id]['obj']->getVar('com_ip') . '</span>';
- if(!empty($com_email)) {
- $text .= '<br />' . _CM_EMAIL . ' :<span style="font-weight: bold;"><a href="mailto:' . $com_email . '" title="' . $com_email . '">' . $com_email . '</a></span>';
+ if (!empty($com_email)) {
+ $text .= '<br />' . _CM_EMAIL . ' :<span style="font-weight: bold;"><a href="mailto:' . $com_email . '" title="' . $com_email . '">' . $com_email . '</a></span>';
}
$text .= '</div>';
} else {
@@ -176,6 +177,7 @@
$this->renderThreadView($child_id, $admin_view, false);
}
}
+
return;
} else {
$text = $tree[$comment_id]['obj']->getVar('com_text');
@@ -193,12 +195,12 @@
* Render replies to a thread
*
* @param array $ &$thread
- * @param int $key
- * @param array $replies
- * @param string $prefix
- * @param bool $admin_view
+ * @param int $key
+ * @param array $replies
+ * @param string $prefix
+ * @param bool $admin_view
* @param integer $depth
- * @param string $current_prefix
+ * @param string $current_prefix
* @access private
*/
function _renderThreadReplies(&$thread, $key, &$replies, $prefix, $admin_view, $depth = 0, $current_prefix = '')
@@ -251,13 +253,13 @@
$title = $tree[$comment_id]['obj']->getVar('com_title');
}
if (false != $admin_view) {
- $com_email = $tree[$comment_id]['obj']->getVar('com_email');
+ $com_email = $tree[$comment_id]['obj']->getVar('com_email');
$text = $tree[$comment_id]['obj']->getVar('com_text');
$text .= '<div style="text-align:right; margin-top: 2px; margin-bottom: 0px; margin-right: 2px;">';
$text .= _CM_STATUS . ': ' . $this->_statusText[$tree[$comment_id]['obj']->getVar('com_status')] . '<br />';
$text .= 'IP: <span style="font-weight: bold;">' . $tree[$comment_id]['obj']->getVar('com_ip') . '</span>';
- if(!empty($com_email)) {
- $text .= '<br />' . _CM_EMAIL . ' :<span style="font-weight: bold;"><a href="mailto:' . $com_email . '" title="' . $com_email . '">' . $com_email . '</a></span>';
+ if (!empty($com_email)) {
+ $text .= '<br />' . _CM_EMAIL . ' :<span style="font-weight: bold;"><a href="mailto:' . $com_email . '" title="' . $com_email . '">' . $com_email . '</a></span>';
}
$text .= '</div>';
} else {
@@ -269,6 +271,7 @@
$this->renderNestView($child_id, $admin_view);
}
}
+
return;
} else {
$text = $tree[$comment_id]['obj']->getVar('com_text');
@@ -284,11 +287,11 @@
/**
* Render replies in nested view
*
- * @param array $thread
- * @param int $key
- * @param array $replies
- * @param string $prefix
- * @param bool $admin_view
+ * @param array $thread
+ * @param int $key
+ * @param array $replies
+ * @param string $prefix
+ * @param bool $admin_view
* @param integer $depth
* @access private
*/
@@ -326,7 +329,7 @@
/**
* Get the name of the poster
*
- * @param int $poster_id
+ * @param int $poster_id
* @return string
* @access private
*/
@@ -341,15 +344,15 @@
}
} elseif ($poster['id'] == 0 && $poster_user != '') {
- $poster['id'] = 0; // to cope with deleted user accounts
- if(!empty($poster_website)) {
- $poster['uname'] = '<a href="' . $poster_website . '">' . $poster_user . '</a>';
- } else {
- $poster['uname'] = $poster_user;
- }
+ $poster['id'] = 0; // to cope with deleted user accounts
+ if (!empty($poster_website)) {
+ $poster['uname'] = '<a href="' . $poster_website . '">' . $poster_user . '</a>';
+ } else {
+ $poster['uname'] = $poster_user;
+ }
} else {
- $poster['id'] = 0; // to cope with deleted user accounts
- $poster['uname'] = $GLOBALS['xoopsConfig']['anonymous'];
+ $poster['id'] = 0; // to cope with deleted user accounts
+ $poster['uname'] = $GLOBALS['xoopsConfig']['anonymous'];
}
return $poster;
@@ -359,7 +362,7 @@
/**
* Get an array with info about the poster
*
- * @param int $poster_id
+ * @param int $poster_id
* @return array
* @access private
*/
@@ -381,27 +384,27 @@
$poster['status'] = $com_poster->isOnline() ? _CM_ONLINE : '';
}
} elseif ($poster['id'] == 0 && $poster_user != '') {
- if(!empty($poster_website)) {
- $poster['uname'] = '<a href="' . $poster_website . '">' . $poster_user . '</a>';
- } else {
- $poster['uname'] = $poster_user;
- }
- $poster['id'] = 0; // to cope with deleted user accounts
- $poster['rank_title'] = '';
- $poster['avatar'] = 'blank.gif';
- $poster['regdate'] = '';
- $poster['from'] = '';
- $poster['postnum'] = 0;
- $poster['status'] = '';
+ if (!empty($poster_website)) {
+ $poster['uname'] = '<a href="' . $poster_website . '">' . $poster_user . '</a>';
+ } else {
+ $poster['uname'] = $poster_user;
+ }
+ $poster['id'] = 0; // to cope with deleted user accounts
+ $poster['rank_title'] = '';
+ $poster['avatar'] = 'blank.gif';
+ $poster['regdate'] = '';
+ $poster['from'] = '';
+ $poster['postnum'] = 0;
+ $poster['status'] = '';
} else {
- $poster['uname'] = $GLOBALS['xoopsConfig']['anonymous'];
- $poster['id'] = 0; // to cope with deleted user accounts
- $poster['rank_title'] = '';
- $poster['avatar'] = 'blank.gif';
- $poster['regdate'] = '';
- $poster['from'] = '';
- $poster['postnum'] = 0;
- $poster['status'] = '';
+ $poster['uname'] = $GLOBALS['xoopsConfig']['anonymous'];
+ $poster['id'] = 0; // to cope with deleted user accounts
+ $poster['rank_title'] = '';
+ $poster['avatar'] = 'blank.gif';
+ $poster['regdate'] = '';
+ $poster['from'] = '';
+ $poster['postnum'] = 0;
+ $poster['status'] = '';
}
return $poster;
@@ -411,7 +414,7 @@
/**
* Get the IMG tag for the title icon
*
- * @param string $icon_image
+ * @param string $icon_image
* @return string HTML IMG tag
* @access private
*/
@@ -429,6 +432,7 @@
return '<img src="' . XOOPS_URL . '/images/subject/' . $icon_image . '" alt="" />';
}
}
+
return '<img src="' . XOOPS_URL . '/images/icons/no_posticon.gif" alt="" />';
}
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php 2013-09-14 12:49:29 UTC (rev 12038)
@@ -40,7 +40,7 @@
* @return boolean always true
* @access public
*/
- function splitMySqlFile(&$ret, $sql)
+ static function splitMySqlFile(&$ret, $sql)
{
$sql = trim($sql);
$sql_len = strlen($sql);
@@ -152,7 +152,7 @@
* @param string $prefix prefix to add to all table names
* @return mixed FALSE on failure
*/
- function prefixQuery($query, $prefix)
+ static function prefixQuery($query, $prefix)
{
$pattern = "/^(INSERT[\s]+INTO|CREATE[\s]+TABLE|ALTER[\s]+TABLE|UPDATE)(\s)+([`]?)([^`\s]+)\\3(\s)+/siU";
$pattern2 = "/^(DROP TABLE)(\s)+([`]?)([^`\s]+)\\3(\s)?$/siU";
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/xoopsmodel.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/xoopsmodel.php 2013-09-14 07:32:51 UTC (rev 12037)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/xoopsmodel.php 2013-09-14 12:49:...
[truncated message content] |
|
From: <rgr...@us...> - 2013-09-22 21:44:53
|
Revision: 12083
http://sourceforge.net/p/xoops/svn/12083
Author: rgriffith
Date: 2013-09-22 21:44:50 +0000 (Sun, 22 Sep 2013)
Log Message:
-----------
Fixes for security issues reported by Mehdi Dadkhah
see: http://packetstormsecurity.com/files/123148
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/banners.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsload.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/checklogin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/register.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/user.php
Added Paths:
-----------
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsfilterinput.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/banners.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/banners.php 2013-09-22 15:55:58 UTC (rev 12082)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/banners.php 2013-09-22 21:44:50 UTC (rev 12083)
@@ -325,20 +325,59 @@
exit();
}
+XoopsLoad::load('XoopsFilterInput');
+$myts =& MyTextSanitizer::getInstance();
+
$op = '';
if (!empty($_POST['op'])) {
- $op = $_POST['op'];
-} else if (!empty($_GET['op'])) {
- $op = $_GET['op'];
+ // from $_POST we use keys: op, login, pass, url, pass, bid, cid
+ $op = trim(XoopsFilterInput::clean($_POST['op'], 'STRING'));
+
+ $clean_login='';
+ if (isset($_POST['login'])) {
+ $clean_login = trim(XoopsFilterInput::clean($myts->stripSlashesGPC($_POST['login']), 'STRING'));
+ }
+
+ $clean_pass='';
+ if (isset($_POST['pass'])) {
+ $clean_pass = trim(XoopsFilterInput::clean($myts->stripSlashesGPC($_POST['pass']), 'STRING'));
+ }
+
+ $clean_url='';
+ if (isset($_POST['url'])) {
+ $clean_url = trim(XoopsFilterInput::clean($myts->stripSlashesGPC($_POST['url']), 'WEBURL'));
+ }
+
+ $clean_bid=0;
+ if (isset($_POST['bid'])) {
+ $clean_bid = XoopsFilterInput::clean($_POST['bid'], 'INT');
+ }
+
+ $clean_cid=0;
+ if (isset($_POST['cid'])) {
+ $clean_cid = XoopsFilterInput::clean($_POST['cid'], 'INT');
+ }
+
+} elseif (!empty($_GET['op'])) {
+ // from $_POST we use keys: op, bid, cid
+ $op = trim(XoopsFilterInput::clean($_GET['op'], 'STRING'));
+
+ $clean_bid=0;
+ if (isset($_GET['bid'])) {
+ $clean_bid = XoopsFilterInput::clean($_GET['bid'], 'INT');
+ }
+
+ $clean_cid=0;
+ if (isset($_GET['cid'])) {
+ $clean_cid = XoopsFilterInput::clean($_GET['cid'], 'INT');
+ }
+
}
$myts =& MyTextSanitizer::getInstance();
switch ($op) {
case "click":
- $bid = 0;
- if (!empty($_GET['bid'])) {
- $bid = intval($_GET['bid']);
- }
+ $bid = $clean_bid;
clickbanner($bid);
break;
case "Ok":
@@ -348,8 +387,8 @@
exit();
}
- $_SESSION['banner_login'] = $myts->stripslashesGPC(trim($_POST['login']));
- $_SESSION['banner_pass'] = $myts->stripslashesGPC(trim($_POST['pass']));
+ $_SESSION['banner_login'] = $clean_login;
+ $_SESSION['banner_pass'] = $clean_pass;
}
bannerstats();
break;
@@ -358,26 +397,14 @@
redirect_header("banners.php", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
exit();
}
- $bid = $cid = 0;
- if (!empty($_POST['url'])) {
- $url = $myts->stripslashesGPC(trim($_POST['url']));
- }
- if (!empty($_POST['bid'])) {
- $bid = intval($_POST['bid']);
- }
- if (!empty($_POST['cid'])) {
- $cid = intval($_POST['cid']);
- }
+ $url = $clean_url;
+ $bid = $clean_bid;
+ $cid = $clean_cid;
change_banner_url_by_client($cid, $bid, $url);
break;
case "EmailStats":
- $bid = $cid = 0;
- if (!empty($_GET['bid'])) {
- $bid = intval($_GET['bid']);
- }
- if (!empty($_GET['cid'])) {
- $cid = intval($_GET['cid']);
- }
+ $bid = $clean_bid;
+ $cid = $clean_cid;
EmailStats($cid, $bid);
break;
case "login":
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsfilterinput.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsfilterinput.php (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsfilterinput.php 2013-09-22 21:44:50 UTC (rev 12083)
@@ -0,0 +1,433 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * Backport of Xmf\FilterInput, using Daniel Morris's original
+ * PHP INPUT FILTER for php4
+ *
+ * @class: XoopsFilterInput (PHP4 & PHP5, with comments)
+ * @project: PHP Input Filter
+ * @date: 10-05-2005
+ * @version: 1.2.2_php4/php5
+ * @author: Daniel Morris
+ * @contributors: Gianpaolo Racca, Ghislain Picard, Marco Wandschneider, Chris Tobin and Andrew Eddie.
+ * @author Louis Landry <lou...@jo...>
+ * @author Grégory Mage (Aka Mage)
+ * @author trabis <lus...@gm...>
+ * @author Richard Griffith <ri...@ge...>
+ * @copyright: Daniel Morris
+ * @email: da...@ro...
+ * @license: GNU General Public License (GPL)
+ */
+class XoopsFilterInput {
+ var $tagsArray; // default = empty array
+ var $attrArray; // default = empty array
+
+ var $tagsMethod; // default = 0
+ var $attrMethod; // default = 0
+
+ var $xssAuto; // default = 1
+ var $tagBlacklist = array('applet', 'body', 'bgsound', 'base', 'basefont', 'embed', 'frame', 'frameset', 'head', 'html', 'id', 'iframe', 'ilayer', 'layer', 'link', 'meta', 'name', 'object', 'script', 'style', 'title', 'xml');
+ var $attrBlacklist = array('action', 'background', 'codebase', 'dynsrc', 'lowsrc'); // also will strip ALL event handlers
+
+ /**
+ * Constructor for XoopsFilterInput class. Only first parameter is required.
+ * @access constructor
+ * @param Array $tagsArray - list of user-defined tags
+ * @param Array $attrArray - list of user-defined attributes
+ * @param int $tagsMethod - 0= allow just user-defined, 1= allow all but user-defined
+ * @param int $attrMethod - 0= allow just user-defined, 1= allow all but user-defined
+ * @param int $xssAuto - 0= only auto clean essentials, 1= allow clean blacklisted tags/attr
+ */
+ function XoopsFilterInput($tagsArray = array(), $attrArray = array(), $tagsMethod = 0, $attrMethod = 0, $xssAuto = 1) {
+ // make sure user defined arrays are in lowercase
+ for ($i = 0; $i < count($tagsArray); $i++) $tagsArray[$i] = strtolower($tagsArray[$i]);
+ for ($i = 0; $i < count($attrArray); $i++) $attrArray[$i] = strtolower($attrArray[$i]);
+ // assign to member vars
+ $this->tagsArray = (array) $tagsArray;
+ $this->attrArray = (array) $attrArray;
+ $this->tagsMethod = $tagsMethod;
+ $this->attrMethod = $attrMethod;
+ $this->xssAuto = $xssAuto;
+ }
+
+ /**
+ * Returns a reference to an input filter object, only creating it if it doesn't already exist.
+ *
+ * This method must be invoked as:
+ * <pre> $filter = & XoopsFilterInput::getInstance();</pre>
+ *
+ * @param array $tagsArray list of user-defined tags
+ * @param array $attrArray list of user-defined attributes
+ * @param int $tagsMethod WhiteList method = 0, BlackList method = 1
+ * @param int $attrMethod WhiteList method = 0, BlackList method = 1
+ * @param int $xssAuto Only auto clean essentials = 0,
+ * Allow clean blacklisted tags/attr = 1
+ *
+ * @return XoopsFilterInput object.
+ * @since 1.5
+ * @static
+ */
+ static function getInstance(
+ $tagsArray = array(),
+ $attrArray = array(),
+ $tagsMethod = 0,
+ $attrMethod = 0,
+ $xssAuto = 1
+ ) {
+ static $instances;
+
+ $sig = md5(serialize(array($tagsArray, $attrArray, $tagsMethod, $attrMethod, $xssAuto)));
+
+ if (!isset ($instances)) {
+ $instances = array();
+ }
+
+ if (empty ($instances[$sig])) {
+ $instances[$sig] = new XoopsFilterInput($tagsArray, $attrArray, $tagsMethod, $attrMethod, $xssAuto);
+ }
+
+ return $instances[$sig];
+ }
+
+ /**
+ * Method to be called by another php script. Processes for XSS and specified bad code.
+ * @access public
+ * @param Mixed $source - input string/array-of-string to be 'cleaned'
+ * @return String $source - 'cleaned' version of input parameter
+ */
+ function process($source) {
+ // clean all elements in this array
+ if (is_array($source)) {
+ foreach($source as $key => $value)
+ // filter element for XSS and other 'bad' code etc.
+ if (is_string($value)) $source[$key] = $this->remove($this->decode($value));
+ return $source;
+ // clean this string
+ } else if (is_string($source)) {
+ // filter source for XSS and other 'bad' code etc.
+ return $this->remove($this->decode($source));
+ // return parameter as given
+ } else return $source;
+ }
+
+ /**
+ * Method to be called by another php script. Processes for XSS and
+ * specified bad code.
+ *
+ * @param mixed $source Input string/array-of-string to be 'cleaned'
+ * @param string $type Return type for the variable (INT, FLOAT,
+ * BOOLEAN, WORD, ALNUM, CMD, BASE64, STRING,
+ * ARRAY, PATH, NONE)
+ *
+ * @return mixed 'Cleaned' version of input parameter
+ * @static
+ */
+ static function clean($source, $type = 'string')
+ {
+ // Handle the type constraint
+ switch (strtoupper($type)) {
+ case 'INT':
+ case 'INTEGER':
+ // Only use the first integer value
+ preg_match('/-?[0-9]+/', (string) $source, $matches);
+ $result = @ (int) $matches[0];
+ break;
+
+ case 'FLOAT':
+ case 'DOUBLE':
+ // Only use the first floating point value
+ preg_match('/-?[0-9]+(\.[0-9]+)?/', (string) $source, $matches);
+ $result = @ (float) $matches[0];
+ break;
+
+ case 'BOOL':
+ case 'BOOLEAN':
+ $result = (bool) $source;
+ break;
+
+ case 'WORD':
+ $result = (string) preg_replace('/[^A-Z_]/i', '', $source);
+ break;
+
+ case 'ALNUM':
+ $result = (string) preg_replace('/[^A-Z0-9]/i', '', $source);
+ break;
+
+ case 'CMD':
+ $result = (string) preg_replace('/[^A-Z0-9_\.-]/i', '', $source);
+ $result = ltrim($result, '.');
+ break;
+
+ case 'BASE64':
+ $result = (string) preg_replace('/[^A-Z0-9\/+=]/i', '', $source);
+ break;
+
+ case 'STRING':
+ // Check for static usage and assign $filter the proper variable
+ if (isset($this) && is_a($this, 'XoopsFilterInput')) {
+ $filter =& $this;
+ } else {
+ $filter = XoopsFilterInput::getInstance();
+ }
+ $result = (string) $filter->process($source);
+ break;
+
+ case 'ARRAY':
+ // Check for static usage and assign $filter the proper variable
+ if (isset($this) && is_a($this, 'XoopsFilterInput')) {
+ $filter =& $this;
+ } else {
+ $filter = XoopsFilterInput::getInstance();
+ }
+ $result = (array) $filter->process($source);
+ break;
+
+ case 'PATH':
+ $pattern = '/^[A-Za-z0-9_-]+[A-Za-z0-9_\.-]*([\\\\\/][A-Za-z0-9_-]+[A-Za-z0-9_\.-]*)*$/';
+ preg_match($pattern, (string) $source, $matches);
+ $result = @ (string) $matches[0];
+ break;
+
+ case 'USERNAME':
+ $result = (string) preg_replace('/[\x00-\x1F\x7F<>"\'%&]/', '', $source);
+ break;
+
+ case 'WEBURL':
+ // Check for static usage and assign $filter the proper variable
+ if (isset($this) && is_a($this, 'XoopsFilterInput')) {
+ $filter =& $this;
+ } else {
+ $filter = XoopsFilterInput::getInstance();
+ }
+ $result = (string) $filter->process($source);
+ // allow only relative, http or https
+ $urlparts=parse_url($result);
+ if (!empty($urlparts['scheme'])
+ && !($urlparts['scheme']=='http' || $urlparts['scheme']=='https')
+ ) {
+ $result='';
+ }
+ // do not allow quotes or tag brackets
+ if (!preg_match('#^[^"<>]+$#', $result)) {
+ $result='';
+ }
+ break;
+
+ default:
+ // Check for static usage and assign $filter the proper variable
+ if (isset($this) && is_a($this, 'XoopsFilterInput')) {
+ $filter =& $this;
+ } else {
+ $filter = XoopsFilterInput::getInstance();
+ }
+ $result = $filter->process($source);
+ break;
+ }
+
+ return $result;
+ }
+
+
+ /**
+ * Internal method to iteratively remove all unwanted tags and attributes
+ * @access protected
+ * @param String $source - input string to be 'cleaned'
+ * @return String $source - 'cleaned' version of input parameter
+ */
+ function remove($source) {
+ $loopCounter=0;
+ // provides nested-tag protection
+ while($source != $this->filterTags($source)) {
+ $source = $this->filterTags($source);
+ $loopCounter++;
+ }
+ return $source;
+ }
+
+ /**
+ * Internal method to strip a string of certain tags
+ * @access protected
+ * @param String $source - input string to be 'cleaned'
+ * @return String $source - 'cleaned' version of input parameter
+ */
+ function filterTags($source) {
+ // filter pass setup
+ $preTag = NULL;
+ $postTag = $source;
+ // find initial tag's position
+ $tagOpen_start = strpos($source, '<');
+ // interate through string until no tags left
+ while($tagOpen_start !== FALSE) {
+ // process tag interatively
+ $preTag .= substr($postTag, 0, $tagOpen_start);
+ $postTag = substr($postTag, $tagOpen_start);
+ $fromTagOpen = substr($postTag, 1);
+ // end of tag
+ $tagOpen_end = strpos($fromTagOpen, '>');
+ if ($tagOpen_end === false) break;
+ // next start of tag (for nested tag assessment)
+ $tagOpen_nested = strpos($fromTagOpen, '<');
+ if (($tagOpen_nested !== false) && ($tagOpen_nested < $tagOpen_end)) {
+ $preTag .= substr($postTag, 0, ($tagOpen_nested+1));
+ $postTag = substr($postTag, ($tagOpen_nested+1));
+ $tagOpen_start = strpos($postTag, '<');
+ continue;
+ }
+ $tagOpen_nested = (strpos($fromTagOpen, '<') + $tagOpen_start + 1);
+ $currentTag = substr($fromTagOpen, 0, $tagOpen_end);
+ $tagLength = strlen($currentTag);
+ if (!$tagOpen_end) {
+ $preTag .= $postTag;
+ $tagOpen_start = strpos($postTag, '<');
+ }
+ // iterate through tag finding attribute pairs - setup
+ $tagLeft = $currentTag;
+ $attrSet = array();
+ $currentSpace = strpos($tagLeft, ' ');
+ // is end tag
+ if (substr($currentTag, 0, 1) == "/") {
+ $isCloseTag = TRUE;
+ list($tagName) = explode(' ', $currentTag);
+ $tagName = substr($tagName, 1);
+ // is start tag
+ } else {
+ $isCloseTag = FALSE;
+ list($tagName) = explode(' ', $currentTag);
+ }
+ // excludes all "non-regular" tagnames OR no tagname OR remove if xssauto is on and tag is blacklisted
+ if ((!preg_match("/^[a-z][a-z0-9]*$/i",$tagName)) || (!$tagName) || ((in_array(strtolower($tagName), $this->tagBlacklist)) && ($this->xssAuto))) {
+ $postTag = substr($postTag, ($tagLength + 2));
+ $tagOpen_start = strpos($postTag, '<');
+ // don't append this tag
+ continue;
+ }
+ // this while is needed to support attribute values with spaces in!
+ while ($currentSpace !== FALSE) {
+ $fromSpace = substr($tagLeft, ($currentSpace+1));
+ $nextSpace = strpos($fromSpace, ' ');
+ $openQuotes = strpos($fromSpace, '"');
+ $closeQuotes = strpos(substr($fromSpace, ($openQuotes+1)), '"') + $openQuotes + 1;
+ // another equals exists
+ if (strpos($fromSpace, '=') !== FALSE) {
+ // opening and closing quotes exists
+ if (($openQuotes !== FALSE) && (strpos(substr($fromSpace, ($openQuotes+1)), '"') !== FALSE))
+ $attr = substr($fromSpace, 0, ($closeQuotes+1));
+ // one or neither exist
+ else $attr = substr($fromSpace, 0, $nextSpace);
+ // no more equals exist
+ } else $attr = substr($fromSpace, 0, $nextSpace);
+ // last attr pair
+ if (!$attr) $attr = $fromSpace;
+ // add to attribute pairs array
+ $attrSet[] = $attr;
+ // next inc
+ $tagLeft = substr($fromSpace, strlen($attr));
+ $currentSpace = strpos($tagLeft, ' ');
+ }
+ // appears in array specified by user
+ $tagFound = in_array(strtolower($tagName), $this->tagsArray);
+ // remove this tag on condition
+ if ((!$tagFound && $this->tagsMethod) || ($tagFound && !$this->tagsMethod)) {
+ // reconstruct tag with allowed attributes
+ if (!$isCloseTag) {
+ $attrSet = $this->filterAttr($attrSet);
+ $preTag .= '<' . $tagName;
+ for ($i = 0; $i < count($attrSet); $i++)
+ $preTag .= ' ' . $attrSet[$i];
+ // reformat single tags to XHTML
+ if (strpos($fromTagOpen, "</" . $tagName)) $preTag .= '>';
+ else $preTag .= ' />';
+ // just the tagname
+ } else $preTag .= '</' . $tagName . '>';
+ }
+ // find next tag's start
+ $postTag = substr($postTag, ($tagLength + 2));
+ $tagOpen_start = strpos($postTag, '<');
+ }
+ // append any code after end of tags
+ $preTag .= $postTag;
+ return $preTag;
+ }
+
+ /**
+ * Internal method to strip a tag of certain attributes
+ * @access protected
+ * @param Array $attrSet
+ * @return Array $newSet
+ */
+ function filterAttr($attrSet) {
+ $newSet = array();
+ // process attributes
+ for ($i = 0; $i <count($attrSet); $i++) {
+ // skip blank spaces in tag
+ if (!$attrSet[$i]) continue;
+ // split into attr name and value
+ $attrSubSet = explode('=', trim($attrSet[$i]));
+ list($attrSubSet[0]) = explode(' ', $attrSubSet[0]);
+ // removes all "non-regular" attr names AND also attr blacklisted
+ if ((!eregi("^[a-z]*$",$attrSubSet[0])) || (($this->xssAuto) && ((in_array(strtolower($attrSubSet[0]), $this->attrBlacklist)) || (substr($attrSubSet[0], 0, 2) == 'on'))))
+ continue;
+ // xss attr value filtering
+ if ($attrSubSet[1]) {
+ // strips unicode, hex, etc
+ $attrSubSet[1] = str_replace('&#', '', $attrSubSet[1]);
+ // strip normal newline within attr value
+ $attrSubSet[1] = preg_replace('/\s+/', '', $attrSubSet[1]);
+ // strip double quotes
+ $attrSubSet[1] = str_replace('"', '', $attrSubSet[1]);
+ // [requested feature] convert single quotes from either side to doubles (Single quotes shouldn't be used to pad attr value)
+ if ((substr($attrSubSet[1], 0, 1) == "'") && (substr($attrSubSet[1], (strlen($attrSubSet[1]) - 1), 1) == "'"))
+ $attrSubSet[1] = substr($attrSubSet[1], 1, (strlen($attrSubSet[1]) - 2));
+ // strip slashes
+ $attrSubSet[1] = stripslashes($attrSubSet[1]);
+ }
+ // auto strip attr's with "javascript:
+ if ( ((strpos(strtolower($attrSubSet[1]), 'expression') !== false) && (strtolower($attrSubSet[0]) == 'style')) ||
+ (strpos(strtolower($attrSubSet[1]), 'javascript:') !== false) ||
+ (strpos(strtolower($attrSubSet[1]), 'behaviour:') !== false) ||
+ (strpos(strtolower($attrSubSet[1]), 'vbscript:') !== false) ||
+ (strpos(strtolower($attrSubSet[1]), 'mocha:') !== false) ||
+ (strpos(strtolower($attrSubSet[1]), 'livescript:') !== false)
+ ) continue;
+
+ // if matches user defined array
+ $attrFound = in_array(strtolower($attrSubSet[0]), $this->attrArray);
+ // keep this attr on condition
+ if ((!$attrFound && $this->attrMethod) || ($attrFound && !$this->attrMethod)) {
+ // attr has value
+ if ($attrSubSet[1]) $newSet[] = $attrSubSet[0] . '="' . $attrSubSet[1] . '"';
+ // attr has decimal zero as value
+ else if ($attrSubSet[1] == "0") $newSet[] = $attrSubSet[0] . '="0"';
+ // reformat single attributes to XHTML
+ else $newSet[] = $attrSubSet[0] . '="' . $attrSubSet[0] . '"';
+ }
+ }
+ return $newSet;
+ }
+
+ /**
+ * Try to convert to plaintext
+ * @access protected
+ * @param String $source
+ * @return String $source
+ */
+ function decode($source) {
+ // url decode
+ $charset = defined('_CHARSET') ? constant('_CHARSET') : 'utf-8';
+ $source = html_entity_decode($source, ENT_QUOTES, $charset);
+ // convert decimal
+ $source = preg_replace('/&#(\d+);/me',"chr(\\1)", $source); // decimal notation
+ // convert hex
+ $source = preg_replace('/&#x([a-f0-9]+);/mei',"chr(0x\\1)", $source); // hex notation
+ return $source;
+ }
+}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsload.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsload.php 2013-09-22 15:55:58 UTC (rev 12082)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsload.php 2013-09-22 21:44:50 UTC (rev 12083)
@@ -204,6 +204,7 @@
'xoopsformeditor' => XOOPS_ROOT_PATH . '/class/xoopsform/formeditor.php',
'xoopsformselecteditor' => XOOPS_ROOT_PATH . '/class/xoopsform/formselecteditor.php',
'xoopsformcalendar' => XOOPS_ROOT_PATH . '/class/xoopsform/formcalendar.php',
+ 'xoopsfilterinput' => XOOPS_ROOT_PATH . '/class/xoopsfilterinput.php',
);
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/checklogin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/checklogin.php 2013-09-22 15:55:58 UTC (rev 12082)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/checklogin.php 2013-09-22 21:44:50 UTC (rev 12083)
@@ -20,8 +20,27 @@
xoops_loadLanguage('user');
-$uname = !isset($_POST['uname']) ? '' : trim($_POST['uname']);
-$pass = !isset($_POST['pass']) ? '' : trim($_POST['pass']);
+// from $_POST we use keys: uname, pass, rememberme, xoops_redirect
+XoopsLoad::load('XoopsFilterInput');
+$clean_uname = '';
+if (isset($_POST['uname'])) {
+ $clean_uname = trim(XoopsFilterInput::clean($_POST['uname'], 'STRING'));
+}
+$clean_pass = '';
+if (isset($_POST['pass'])) {
+ $clean_pass = trim(XoopsFilterInput::clean($_POST['pass'], 'STRING'));
+}
+$clean_rememberme = '';
+if (isset($_POST['rememberme'])) {
+ $clean_rememberme = trim(XoopsFilterInput::clean($_POST['rememberme'], 'STRING'));
+}
+$clean_redirect = '';
+if (isset($_POST['xoops_redirect'])) {
+ $clean_redirect = trim(XoopsFilterInput::clean($_POST['xoops_redirect'], 'WEBURL'));
+}
+
+$uname = $clean_uname;
+$pass = $clean_pass;
if ($uname == '' || $pass == '') {
redirect_header(XOOPS_URL.'/user.php', 1, _US_INCORRECTLOGIN);
exit();
@@ -70,15 +89,15 @@
// Set cookie for rememberme
if (!empty($xoopsConfig['usercookie'])) {
- if (!empty($_POST["rememberme"])) {
+ if (!empty($clean_rememberme)) {
setcookie($xoopsConfig['usercookie'], $_SESSION['xoopsUserId'] . '{-}' . md5($user->getVar('pass') . XOOPS_DB_NAME . XOOPS_DB_PASS . XOOPS_DB_PREFIX), time() + 31536000, '/', XOOPS_COOKIE_DOMAIN, 0);
} else {
setcookie($xoopsConfig['usercookie'], 0, -1, '/', XOOPS_COOKIE_DOMAIN, 0);
}
}
- if (!empty($_POST['xoops_redirect']) && !strpos($_POST['xoops_redirect'], 'register')) {
- $xoops_redirect = trim(rawurldecode($_POST['xoops_redirect']));
+ if (!empty($clean_redirect) && !strpos($clean_redirect, 'register')) {
+ $xoops_redirect = rawurldecode($clean_redirect);
$parsed = parse_url(XOOPS_URL);
$url = isset($parsed['scheme']) ? $parsed['scheme'].'://' : 'http://';
if (isset( $parsed['host'])) {
@@ -90,7 +109,7 @@
$url .= $_SERVER['HTTP_HOST'];
}
if (@$parsed['path']) {
- if (strncmp($parsed['path'], $xoops_redirect, strlen( $parsed['path']))) {
+ if (strncmp($parsed['path'], $xoops_redirect, strlen($parsed['path']))) {
$url .= $parsed['path'];
}
}
@@ -105,9 +124,9 @@
$notification_handler->doLoginMaintenance($user->getVar('uid'));
redirect_header($url, 1, sprintf(_US_LOGGINGU, $user->getVar('uname')), false);
-} else if (empty($_POST['xoops_redirect'])) {
+} else if (empty($clean_redirect)) {
redirect_header(XOOPS_URL . '/user.php', 5, $xoopsAuth->getHtmlErrors());
} else {
- redirect_header(XOOPS_URL . '/user.php?xoops_redirect=' . urlencode(trim($_POST['xoops_redirect'])), 5, $xoopsAuth->getHtmlErrors(), false);
+ redirect_header(XOOPS_URL . '/user.php?xoops_redirect=' . urlencode($clean_redirect), 5, $xoopsAuth->getHtmlErrors(), false);
}
exit();
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/register.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/register.php 2013-09-22 15:55:58 UTC (rev 12082)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/register.php 2013-09-22 21:44:50 UTC (rev 12083)
@@ -45,17 +45,72 @@
return XoopsUserUtility::validate($uname, $email, $pass, $vpass);
}
-$op = isset($_POST['op']) ? $_POST['op'] : (isset($_GET["op"]) ? $_GET["op"] : 'register');
-$uname = isset($_POST['uname']) ? $myts->stripSlashesGPC($_POST['uname']) : '';
-$email = isset($_POST['email']) ? trim($myts->stripSlashesGPC($_POST['email'])) : '';
-$url = isset($_POST['url']) ? trim($myts->stripSlashesGPC($_POST['url'])) : '';
-$pass = isset($_POST['pass']) ? $myts->stripSlashesGPC($_POST['pass']) : '';
-$vpass = isset($_POST['vpass']) ? $myts->stripSlashesGPC($_POST['vpass']) : '';
-$timezone_offset = isset($_POST['timezone_offset']) ? (float) $_POST['timezone_offset'] : $xoopsConfig['default_TZ'];
-$user_viewemail = (isset($_POST['user_viewemail']) && intval($_POST['user_viewemail'])) ? 1 : 0;
-$user_mailok = (isset($_POST['user_mailok']) && intval($_POST['user_mailok'])) ? 1 : 0;
-$agree_disc = (isset($_POST['agree_disc']) && intval($_POST['agree_disc'])) ? 1 : 0;
+XoopsLoad::load('XoopsFilterInput');
+// from $_POST we use keys: op, uname, email, url, pass, vpass, timezone_offset,
+// user_viewemail, user_mailok, agree_disc
+$op='register';
+if (isset($_POST['op'])) {
+ $op = trim(XoopsFilterInput::clean($_POST['op'], 'STRING'));
+}
+$uname='';
+if (isset($_POST['uname'])) {
+ $uname = trim(XoopsFilterInput::clean($myts->stripSlashesGPC($_POST['uname']), 'STRING'));
+}
+
+$email='';
+if (isset($_POST['email'])) {
+ $email = trim(XoopsFilterInput::clean($myts->stripSlashesGPC($_POST['email']), 'STRING'));
+}
+
+$url='';
+if (isset($_POST['url'])) {
+ $url = trim(XoopsFilterInput::clean($myts->stripSlashesGPC($_POST['url']), 'WEBURL'));
+}
+
+$pass='';
+if (isset($_POST['pass'])) {
+ $pass = trim(XoopsFilterInput::clean($myts->stripSlashesGPC($_POST['pass']), 'STRING'));
+}
+
+$vpass='';
+if (isset($_POST['vpass'])) {
+ $vpass = trim(XoopsFilterInput::clean($myts->stripSlashesGPC($_POST['vpass']), 'STRING'));
+}
+
+$timezone_offset=$xoopsConfig['default_TZ'];
+if (isset($_POST['timezone_offset'])) {
+ $timezone_offset = XoopsFilterInput::clean($_POST['timezone_offs...
[truncated message content] |
|
From: <luc...@us...> - 2013-09-30 17:38:08
|
Revision: 12112
http://sourceforge.net/p/xoops/svn/12112
Author: luciorota
Date: 2013-09-30 17:38:04 +0000 (Mon, 30 Sep 2013)
Log Message:
-----------
- added support to $mode parameter in XoopsFormEditor & XoopsFormSelectEditor objects
- fixed small bug in XoopsFormDateTime objcect
- added renderGetContentJS method to all form elements, now Xoops form can return all form elements values as javascript object, it's useful in ajax contests
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/sampleform.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/form.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcheckbox.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcolorpicker.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdhtmltextarea.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formeditor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelement.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formfile.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formradio.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselect.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecteditor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/site-closed.php
Added Paths:
-----------
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/json2.js
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php 2013-09-30 17:22:19 UTC (rev 12111)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php 2013-09-30 17:38:04 UTC (rev 12112)
@@ -304,6 +304,7 @@
}
// Load global javascript
$this->addScript('include/xoops.js');
+ $this->addScript('include/json2.js');
$this->loadLocalization();
if ($this->bufferOutput) {
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/sampleform.inc.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/sampleform.inc.php 2013-09-30 17:22:19 UTC (rev 12111)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/sampleform.inc.php 2013-09-30 17:38:04 UTC (rev 12112)
@@ -49,11 +49,12 @@
$options['cols'] = 60; // default value = 50
$options['width'] = '100%'; // default value = 100%
$options['height'] = '400px'; // default value = 400px
+ $options['mode'] = $mode; // for editors that support mode option
// "textarea": if the selected editor with name of $editor can not be created, the editor "textarea" will be used
// if no $onFailure is set, then the first available editor will be used
// If dohtml is disabled, set $noHtml to true
- $sample_form->addElement(new XoopsFormEditor(_MD_MESSAGEC, $options['name'], $options, $nohtml = false, $onfailure = 'textarea', $mode), true);
+ $sample_form->addElement(new XoopsFormEditor(_MD_MESSAGEC, $options['name'], $options, $nohtml = false, $onfailure = 'textarea'), true);
$sample_form->addElement(new XoopsFormText('SOME REQUIRED ELEMENTS', 'required_element2', 50, 255, $required_element2), true);
$sample_form->addElement(new XoopsFormButton('', 'save', _SUBMIT, 'submit'));
$sample_form->display();
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php 2013-09-30 17:22:19 UTC (rev 12111)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php 2013-09-30 17:38:04 UTC (rev 12112)
@@ -14,7 +14,7 @@
* Assocated with editor_registry.php
*/
// Name of the editor
-define('_XOOPS_EDITOR_TINYMCE',"TinyMCE");
+define('_XOOPS_EDITOR_TINYMCE',"TinyMCE v3.5.8");
// The value must be the same as /tinymce/jscripts/langs/your_language_code, for example, "en" for English, "fr" for French
// For details, check http://tinymce.moxiecode.com/download_i18n.php
define('_XOOPS_EDITOR_TINYMCE_LANGUAGE',"en");
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/form.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/form.php 2013-09-30 17:22:19 UTC (rev 12111)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/form.php 2013-09-30 17:38:04 UTC (rev 12112)
@@ -526,10 +526,10 @@
* A basic element validation method may contain something like this:
* <code>
* function renderValidationJS() {
- * $name = $this->getName();
- * return "if (myform.{$name}.value != 'valid') { " .
- * "myform.{$name}.focus(); window.alert( '$name is invalid' ); return false;" .
- * " }";
+ * $name = $this->getName();
+ * return "if (myform.{$name}.value != 'valid') { " .
+ * "myform.{$name}.focus(); window.alert( '$name is invalid' ); return false;" .
+ * " }";
* }
* </code>
*
@@ -558,6 +558,66 @@
}
/**
+ * Renders the Javascript function needed for client-side for get content
+ *
+ * Additionally, each element class may provide its own "renderGetContentJS" method
+ * that is supposed to return custom get content code for the element.
+ *
+ * The element get content code can assume that the JS "myform" variable points to the form.
+ * Exemple:
+ * <script type='text/javascript'>
+ * var content[];
+ * content = " . $form->renderGetContentJS(false) . "
+ * </script>
+ *
+ * A basic element get content method may contain something like this:
+ * <code>
+ * function renderGetContentJS() {
+ * $name = $this->getName();
+ * return "document.getElementById('{$name}');";
+ * }
+ * </code>
+ *
+ * @param boolean $withtags Include the < javascript > tags in the returned string
+ * @return string
+ */
+ function renderGetContentJS($withTags = false)
+ {
+ $formname = $this->getName();
+ $js = '';
+ if ($withTags) {
+ $js .= "\n<!-- Start Form GetContent JavaScript //-->\n<script type='text/javascript'>\n<!--//\n";
+ $js .= "function xoopsFormGetContent_{$formname}() {\n";
+ } else {
+ $js .= "(function() {\n";
+ }
+ //$js .= " var myform = window.document.{$formname};\n";
+ $js .= " var content = new Object();\n";
+ $elements = $this->getElements(true);
+ foreach($elements as $elt) {
+ if (method_exists($elt, 'renderGetContentJS') && ($elt->getName() != '')) {
+ $js .= " content['" . $elt->getName() . "'] = " . $elt->renderGetContentJS() . ";\n";
+ }
+ }
+ $js .= " Object.size = function(obj) {\n";
+ $js .= " var size = 0, key;\n";
+ $js .= " for (key in obj)\n";
+ $js .= " {if (obj.hasOwnProperty(key)) size++;}\n";
+ $js .= " return size;\n";
+ $js .= " };\n";
+ $js .= " return (Object.size(content) > 0) ? content : null;\n";
+
+ if ($withTags) {
+ $js .= "}\n";
+ $js .= "//--></script>\n<!-- End Form GetContent JavaScript //-->\n";
+ } else {
+ $js .= "})()\n";
+ }
+
+ return $js;
+ }
+
+ /**
* assign to smarty form template instead of displaying directly
*
* @param object $ &$tpl reference to a {@link Smarty} object
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcheckbox.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcheckbox.php 2013-09-30 17:22:19 UTC (rev 12111)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcheckbox.php 2013-09-30 17:38:04 UTC (rev 12112)
@@ -242,4 +242,32 @@
}
return '';
}
+
+ /**
+ * Render custom javascript get content code
+ *
+ * @seealso XoopsForm::renderGetContentJS
+ */
+ function renderGetContentJS()
+ {
+ // render custom validation code if any
+ if (! empty($this->customGetContentCode)) {
+ return implode(NWLINE, $this->customGetContentCode);
+ // generate get content code if required
+ } else {
+ $eltname = $this->getName();
+ return "(function(){
+ var checkboxesChecked = [];
+ var checkboxes = document.getElementsByName('{$eltname}[]');
+ if (checkboxes.length) {
+ for (var i = 0; i < checkboxes.length; i++) {
+ if (checkboxes[i].checked == true) {
+ checkboxesChecked.push(checkboxes[i].value);
+ }
+ }
+ }
+ return (checkboxesChecked.length > 0) ? checkboxesChecked : null;
+ })()";
+ }
+ }
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcolorpicker.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcolorpicker.php 2013-09-30 17:22:19 UTC (rev 12111)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcolorpicker.php 2013-09-30 17:38:04 UTC (rev 12112)
@@ -72,4 +72,17 @@
return "if ( !(new RegExp(\"^#[0-9a-fA-F]{6}\",\"i\").test(myform.{$eltname}.value)) ) { window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }";
}
+
+ /**
+ * Returns custom get content Javascript
+ *
+ * @return string Element get content Javascript
+ */
+ function renderGetContentJS()
+ {
+ $eltname = $this->getName();
+ return "(function(){
+ return ((new RegExp('^#[0-9a-fA-F]{6}','i').test(document.getElementById('{$eltname}').value))) ? document.getElementById('{$eltname}').value : null;
+ })()";
+ }
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php 2013-09-30 17:22:19 UTC (rev 12111)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php 2013-09-30 17:38:04 UTC (rev 12112)
@@ -38,13 +38,15 @@
* @param integer $value
* @param mixed $showtime
*/
- function XoopsFormDateTime($caption, $name, $size = 15, $value = 0, $showtime = true)
+ function __construct($caption, $name, $size = 15, $value = 0, $showtime = true)
{
- $this->XoopsFormElementTray($caption, ' ');
+ $this->XoopsFormElementTray($caption, ' ', $name);
$value = intval($value);
$value = ($value > 0) ? $value : time();
$datetime = getDate($value);
- $this->addElement(new XoopsFormTextDateSelect('', $name . '[date]', $size, $value, $showtime));
+ $dateselect = new XoopsFormTextDateSelect('', $name . '[date]', $size, $value, $showtime);
+ $this->addElement($dateselect);
+
$timearray = array();
for ($i = 0; $i < 24; $i ++) {
for ($j = 0; $j < 60; $j = $j + 10) {
@@ -53,9 +55,30 @@
}
}
ksort($timearray);
-
$timeselect = new XoopsFormSelect('', $name . '[time]', $datetime['hours'] * 3600 + 600 * ceil($datetime['minutes'] / 10));
$timeselect->addOptionArray($timearray);
$this->addElement($timeselect);
}
+
+ /**
+ * Render custom javascript get content code
+ *
+ * @seealso XoopsForm::renderGetContentJS
+ */
+ function renderGetContentJS()
+ {
+ $eltname = $this->getName();
+ // render custom validation code if any
+ if (! empty($this->customGetContentCode)) {
+ return implode(NWLINE, $this->customGetContentCode);
+ // generate get content code if required
+ } else {
+ return "(function(){
+ var dateTime = []
+ dateTime.push(document.getElementById('{$eltname}[date]').value);
+ dateTime.push(document.getElementById('{$eltname}[time]').value);
+ return (dateTime.length > 0) ? dateTime : null;
+ })()";
+ }
+ }
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdhtmltextarea.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdhtmltextarea.php 2013-09-30 17:22:19 UTC (rev 12111)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdhtmltextarea.php 2013-09-30 17:38:04 UTC (rev 12112)
@@ -265,4 +265,19 @@
}
return parent::renderValidationJS();
}
+
+ /**
+ * XoopsFormDhtmlTextArea::renderGetContentJS()
+ *
+ * @return
+ */
+ function renderGetContentJS()
+ {
+ if ($this->htmlEditor && is_object($this->htmlEditor) && method_exists($this->htmlEditor, 'renderGetContentJS')) {
+ if (! isset($this->htmlEditor->isEnabled) || $this->htmlEditor->isEnabled) {
+ return $this->htmlEditor->renderGetContentJS();
+ }
+ }
+ return parent::renderGetContentJS();
+ }
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formeditor.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formeditor.php 2013-09-30 17:22:19 UTC (rev 12111)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formeditor.php 2013-09-30 17:38:04 UTC (rev 12112)
@@ -38,7 +38,7 @@
* @param array $configs configures: editor - editor identifier; name - textarea field name; width, height - dimensions for textarea; value - text content
* @param bool $noHtml use non-WYSIWYG eitor onfailure
* @param string $OnFailure editor to be used if current one failed
- * @param string Requested mode, useful for syntax highlighting editors
+ * @param string Requested mode, useful for syntax highlighting editors*
*/
function XoopsFormEditor($caption, $name, $configs = null, $nohtml = false, $OnFailure = '', $mode = null)
{
@@ -50,6 +50,10 @@
} else {
$configs['name'] = $name;
}
+ if (empty($mode) && !empty($configs['mode'])) {
+ $mode = $configs['mode'];
+ $configs['mode'] = null;
+ }
$this->XoopsFormTextArea($caption, $name);
xoops_load('XoopsEditorHandler');
$editor_handler = XoopsEditorHandler::getInstance();
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelement.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelement.php 2013-09-30 17:22:19 UTC (rev 12111)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelement.php 2013-09-30 17:38:04 UTC (rev 12112)
@@ -434,6 +434,37 @@
}
/**
+ * Render custom javascript get content code
+ *
+ * @seealso XoopsForm::renderGetContentJS
+ */
+ function renderGetContentJS()
+ {
+ // render custom get content code if any
+ if (!empty($this->customGetContentCode)) {
+ return implode(NWLINE, $this->customGetContentCode);
+ // generate get content code if required
+ } else if ($eltname = $this->getName()) {
+ // $eltname = $this->getName();
+ $eltcaption = $this->getCaption();
+ $eltmsg = empty($eltcaption) ? sprintf(_FORM_ENTER, $eltname) : sprintf(_FORM_ENTER, $eltcaption);
+ $eltmsg = str_replace(array(':' , '?' , '%'), '', $eltmsg);
+ $eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
+ $eltmsg = strip_tags($eltmsg);
+ echo $this->getFormType();
+ switch ($this->getFormType()) {
+ case 'checkbox':
+ return "document.getElementById('{$eltname}').value";
+ break;
+ default:
+ return "document.getElementById('{$eltname}').value";
+ break;
+ } // switch
+ }
+ return false;
+ }
+
+ /**
* Generates output for the element.
*
* This method is abstract and must be overwritten by the child classes.
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formfile.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formfile.php 2013-09-30 17:22:19 UTC (rev 12111)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formfile.php 2013-09-30 17:38:04 UTC (rev 12112)
@@ -40,7 +40,7 @@
* @param string $name "name" attribute
* @param int $maxfilesize Maximum size for an uploaded file
*/
- function XoopsFormFile($caption, $name, $maxfilesize)
+ function __construct($caption, $name, $maxfilesize)
{
$this->setCaption($caption);
$this->setName($name);
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formradio.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formradio.php 2013-09-30 17:22:19 UTC (rev 12111)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formradio.php 2013-09-30 17:38:04 UTC (rev 12112)
@@ -197,4 +197,30 @@
}
return $ret;
}
+
+ /**
+ * Render custom javascript get content code
+ *
+ * @seealso XoopsForm::renderGetContentJS
+ */
+ function renderGetContentJS()
+ {
+ // render custom validation code if any
+ if (! empty($this->customGetContentCode)) {
+ return implode("\n", $this->customGetContentCode);
+ // generate validation code if required
+ } else {
+ $eltname = $this->getName();
+ return "(function(){
+ var radios = document.getElementsByName('{$eltname}');
+ for(var i = 0; i < radios.length; i++){
+ if(radios[i].checked){
+ return radios[i].value;
+ }
+ }
+ return null; // or undefined, or your preferred default for none checked
+ })()";
+ }
+ return '';
+ }
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselect.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselect.php 2013-09-30 17:22:19 UTC (rev 12111)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselect.php 2013-09-30 17:38:04 UTC (rev 12112)
@@ -238,4 +238,33 @@
}
return '';
}
+
+ /**
+ * Render custom javascript get content code
+ *
+ * @seealso XoopsForm::renderGetContentJS
+ */
+ function renderGetContentJS()
+ {
+ // render custom validation code if any
+ if (! empty($this->customGetContentCode)) {
+ return implode("\n", $this->customGetContentCode);
+ // generate validation code if required
+ } else {
+ $eltname = $this->getName();
+ return "(function(){
+ var selectSelected = [];
+ var options = document.getElementById('{$eltname}') && document.getElementById('{$eltname}').options;
+ var opt;
+ for (var i=0, iLen=options.length; i<iLen; i++) {
+ opt = options[i];
+ if (opt.selected) {
+ selectSelected.push(opt.value || opt.text);
+ }
+ }
+ return (selectSelected.length > 0) ? selectSelected : null;
+ })()";
+ }
+ return '';
+ }
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecteditor.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecteditor.php 2013-09-30 17:22:19 UTC (rev 12111)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecteditor.php 2013-09-30 17:38:04 UTC (rev 12112)
@@ -27,6 +27,7 @@
*/
class XoopsFormSelectEditor extends XoopsFormElementTray
{
+ var $modes = null;
var $allowed_editors = array();
var $form;
var $value;
@@ -40,10 +41,13 @@
* @param string $name editor name
* @param string $value Pre-selected text value
* @param bool $noHtml dohtml disabled
+ * @param array $allowed_editors
+ * @param mixed $modes Requested mode (or array of them)
*/
- function XoopsFormSelectEditor(&$form, $name = 'editor', $value = null, $nohtml = false, $allowed_editors = array())
+ function XoopsFormSelectEditor(&$form, $name = 'editor', $value = null, $nohtml = false, $allowed_editors = array(), $modes = null)
{
$this->XoopsFormElementTray(_SELECT);
+ $this->modes = $modes;
$this->allowed_editors = $allowed_editors;
$this->form = &$form;
$this->name = $name;
@@ -61,12 +65,13 @@
xoops_load('XoopsEditorHandler');
$editor_handler = XoopsEditorHandler::getInstance();
$editor_handler->allowed_editors = $this->allowed_editors;
+ $editor_handler->modes = $this->modes;
$option_select = new XoopsFormSelect("", $this->name, $this->value);
$extra = 'onchange="if(this.options[this.selectedIndex].value.length > 0 ){
window.document.forms.' . $this->form->getName() . '.submit();
}"';
$option_select->setExtra($extra);
- $option_select->addOptionArray($editor_handler->getList($this->nohtml));
+ $option_select->addOptionArray($editor_handler->getList($this->nohtml, $this->modes));
$this->addElement($option_select);
return parent::render();
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php 2013-09-30 17:22:19 UTC (rev 12111)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php 2013-09-30 17:38:04 UTC (rev 12112)
@@ -245,7 +245,8 @@
<meta name="copyright" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_copyright']) . '" />
<meta name="generator" content="XOOPS" />
<title>' . htmlspecialchars($xoopsConfig['sitename']) . '</title>
- <script type="text/javascript" src="' . XOOPS_URL . '/include/xoops.js"></script>';
+ <script type="text/javascript" src="' . XOOPS_URL . '/include/xoops.js"></script>
+ <script type="text/javascript" src="' . XOOPS_URL . '/include/json2.js"></script>';
$themecss = xoops_getcss($xoopsConfig['theme_set']);
echo '<link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/xoops.css" />';
$language = xoops_getConfigOption('language');
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/json2.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/json2.js (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/json2.js 2013-09-30 17:38:04 UTC (rev 12112)
@@ -0,0 +1,486 @@
+/*
+ json2.js
+ 2013-05-26
+
+ Public Domain.
+
+ NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
+
+ See http://www.JSON.org/js.html
+
+
+ This code should be minified before deployment.
+ See http://javascript.crockford.com/jsmin.html
+
+ USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
+ NOT CONTROL.
+
+
+ This file creates a global JSON object containing two methods: stringify
+ and parse.
+
+ JSON.stringify(value, replacer, space)
+ value any JavaScript value, usually an object or array.
+
+ replacer an optional parameter that determines how object
+ values are stringified for objects. It can be a
+ function or an array of strings.
+
+ space an optional parameter that specifies the indentation
+ of nested structures. If it is omitted, the text will
+ be packed without extra whitespace. If it is a number,
+ it will specify the number of spaces to indent at each
+ level. If it is a string (such as '\t' or ' '),
+ it contains the characters used to indent at each level.
+
+ This method produces a JSON text from a JavaScript value.
+
+ When an object value is found, if the object contains a toJSON
+ method, its toJSON method will be called and the result will be
+ stringified. A toJSON method does not serialize: it returns the
+ value represented by the name/value pair that should be serialized,
+ or undefined if nothing should be serialized. The toJSON method
+ will be passed the key associated with the value, and this will be
+ bound to the value
+
+ For example, this would serialize Dates as ISO strings.
+
+ Date.prototype.toJSON = function (key) {
+ function f(n) {
+ // Format integers to have at least two digits.
+ return n < 10 ? '0' + n : n;
+ }
+
+ return this.getUTCFullYear() + '-' +
+ f(this.getUTCMonth() + 1) + '-' +
+ f(this.getUTCDate()) + 'T' +
+ f(this.getUTCHours()) + ':' +
+ f(this.getUTCMinutes()) + ':' +
+ f(this.getUTCSeconds()) + 'Z';
+ };
+
+ You can provide an optional replacer method. It will be passed the
+ key and value of each member, with this bound to the containing
+ object. The value that is returned from your method will be
+ serialized. If your method returns undefined, then the member will
+ be excluded from the serialization.
+
+ If the replacer parameter is an array of strings, then it will be
+ used to select the members to be serialized. It filters the results
+ such that only members with keys listed in the replacer array are
+ stringified.
+
+ Values that do not have JSON representations, such as undefined or
+ functions, will not be serialized. Such values in objects will be
+ dropped; in arrays they will be replaced with null. You can use
+ a replacer function to replace those with JSON values.
+ JSON.stringify(undefined) returns undefined.
+
+ The optional space parameter produces a stringification of the
+ value that is filled with line breaks and indentation to make it
+ easier to read.
+
+ If the space parameter is a non-empty string, then that string will
+ be used for indentation. If the space parameter is a number, then
+ the indentation will be that many spaces.
+
+ Example:
+
+ text = JSON.stringify(['e', {pluribus: 'unum'}]);
+ // text is '["e",{"pluribus":"unum"}]'
+
+
+ text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
+ // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
+
+ text = JSON.stringify([new Date()], function (key, value) {
+ return this[key] instanceof Date ?
+ 'Date(' + this[key] + ')' : value;
+ });
+ // text is '["Date(---current time---)"]'
+
+
+ JSON.parse(text, reviver)
+ This method parses a JSON text to produce an object or array.
+ It can throw a SyntaxError exception.
+
+ The optional reviver parameter is a function that can filter and
+ transform the results. It receives each of the keys and values,
+ and its return value is used instead of the original value.
+ If it returns what it received, then the structure is not modified.
+ If it returns undefined then the member is deleted.
+
+ Example:
+
+ // Parse the text. Values that look like ISO date strings will
+ // be converted to Date objects.
+
+ myData = JSON.parse(text, function (key, value) {
+ var a;
+ if (typeof value === 'string') {
+ a =
+/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
+ if (a) {
+ return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
+ +a[5], +a[6]));
+ }
+ }
+ return value;
+ });
+
+ myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
+ var d;
+ if (typeof value === 'string' &&
+ value.slice(0, 5) === 'Date(' &&
+ value.slice(-1) === ')') {
+ d = new Date(value.slice(5, -1));
+ if (d) {
+ return d;
+ }
+ }
+ return value;
+ });
+
+
+ This is a reference implementation. You are free to copy, modify, or
+ redistribute.
+*/
+
+/*jslint evil: true, regexp: true */
+
+/*members "", "\b", "\t", "\n", "\f", "\r", "...
[truncated message content] |
|
From: <rgr...@us...> - 2013-10-06 23:36:47
|
Revision: 12154
http://sourceforge.net/p/xoops/svn/12154
Author: rgriffith
Date: 2013-10-06 23:36:44 +0000 (Sun, 06 Oct 2013)
Log Message:
-----------
Backing out r12096, r12101, r12102, r12112 for now
Revision Links:
--------------
http://sourceforge.net/p/xoops/svn/12096
http://sourceforge.net/p/xoops/svn/12101
http://sourceforge.net/p/xoops/svn/12102
http://sourceforge.net/p/xoops/svn/12112
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/sampleform.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/formtinymce.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/xoopseditor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/form.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcheckbox.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcolorpicker.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdhtmltextarea.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formeditor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelement.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formfile.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formradio.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselect.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecteditor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/site-closed.php
Removed Paths:
-------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/json2.js
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -304,7 +304,6 @@
}
// Load global javascript
$this->addScript('include/xoops.js');
- $this->addScript('include/json2.js');
$this->loadLocalization();
if ($this->bufferOutput) {
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/sampleform.inc.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/sampleform.inc.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/sampleform.inc.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -34,11 +34,8 @@
$editor = @ $xoopsUser->getVar('editor'); // Need set through user profile
}
// Add the editor selection box
- // If dohtml is disabled, set $noHtml = true; $mode not considered if $noHtml is false
- xoops_load('XoopsCache');
- XoopsCache::delete('editorlist');
- $mode = 'html'; // extension or mimetype
- $sample_form->addElement(new XoopsFormSelectEditor($sample_form, 'editor', $editor, $noHtml = false, $mode));
+ // If dohtml is disabled, set $noHtml = true
+ $sample_form->addElement(new XoopsFormSelectEditor($sample_form, 'editor', $editor, $noHtml = false));
// options for the editor
// required configs
$options['editor'] = $editor;
@@ -49,8 +46,8 @@
$options['cols'] = 60; // default value = 50
$options['width'] = '100%'; // default value = 100%
$options['height'] = '400px'; // default value = 400px
- $options['mode'] = $mode; // for editors that support mode option
+
// "textarea": if the selected editor with name of $editor can not be created, the editor "textarea" will be used
// if no $onFailure is set, then the first available editor will be used
// If dohtml is disabled, set $noHtml to true
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/formtinymce.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/formtinymce.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/formtinymce.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -35,7 +35,7 @@
*
* @param array $configs Editor Options
*/
- function __construct($configs, $mode)
+ function __construct($configs)
{
$current_path = __FILE__;
if (DIRECTORY_SEPARATOR != "/") {
@@ -86,23 +86,6 @@
}
/**
- * Renders the Javascript function needed for client-side for get content
- *
- * I'VE USED THIS EXAMPLE TO WRITE VALIDATION CODE
- * http://tinymce.moxiecode.com/punbb/viewtopic.php?id=12616
- *
- * @return string
- */
- function renderGetContentJS()
- {
- if ($eltname = $this->getName()) {
- $ret = "tinyMCE.get('{$eltname}').getContent()";
- return $ret;
- }
- return '';
- }
-
- /**
* get language
*
* @return string
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -14,7 +14,7 @@
* Assocated with editor_registry.php
*/
// Name of the editor
-define('_XOOPS_EDITOR_TINYMCE',"TinyMCE v3.5.8");
+define('_XOOPS_EDITOR_TINYMCE',"TinyMCE");
// The value must be the same as /tinymce/jscripts/langs/your_language_code, for example, "en" for English, "fr" for French
// For details, check http://tinymce.moxiecode.com/download_i18n.php
define('_XOOPS_EDITOR_TINYMCE_LANGUAGE',"en");
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -269,10 +269,11 @@
$this->init();
if (self::$LastOfElementsTinymce!=$this->setting["elements"]) {
$ret = "\n<!-- 'tiny_mce.js' SCRIPT NOT YET ".$this->setting["elements"]." -->\n"; //debug
+
return $ret;
- } else {
+ } else {
$this->setting["elements"]=implode(",",self::$ListOfElementsTinymce);
- }
+ }
if ( !empty($this->setting["callback"]) ) {
$callback = $this->setting["callback"];
unset($this->setting["callback"]);
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/xoopseditor.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/xoopseditor.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/xoopseditor.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -90,7 +90,6 @@
var $root_path = "";
var $nohtml = false;
var $allowed_editors = array();
- var $mode = null;
/**
* Enter description here...
*
@@ -126,16 +125,15 @@
*
* @param string $name Editor name which is actually the folder name
* @param array $options editor options: $key => $val
+ * @param string $OnFailure a pre-validated editor that will be used if the required editor is failed to create
* @param bool $noHtml dohtml disabled
- * @param string $OnFailure a pre-validated editor that will be used if the required editor is failed to create
- * @param string Requested mode (or array of them)
*/
- function get($name = '', $options = null, $noHtml = false, $OnFailure = '', $mode = null)
+ function get($name = '', $options = null, $noHtml = false, $OnFailure = '')
{
- if (array_key_exists($name, $this->getList($noHtml, $mode)) && $editor = $this->_loadEditor($name, $options, $mode)) {
+ if (array_key_exists($name, $this->getList($noHtml)) && $editor = $this->_loadEditor($name, $options)) {
return $editor;
}
- $list = array_keys($this->getList($noHtml, $mode));
+ $list = array_keys($this->getList($noHtml));
if (empty($OnFailure) || !in_array($OnFailure, $list)) {
$OnFailure = $list[0];
}
@@ -147,10 +145,9 @@
* XoopsEditorHandler::getList()
*
* @param mixed $noHtml
- * @param string $mode Requested mode (or array of them)
* @return
*/
- function getList($noHtml = false, $mode = null)
+ function getList($noHtml = false)
{
/*
Do NOT use this method statically, please use
@@ -180,17 +177,7 @@
if (empty($config['order']))
continue;
$order[] = $config['order'];
- if (!isset($config['modes'])) {
- $config['modes'] = null;
- }
- if ($config['nohtml'] == false) {
- $config['modes'] = array('htm', 'html', 'htmlmixed', 'text/html');
- }
- $list[$item] = array(
- 'title' => $config['title'] ,
- 'nohtml' => $config['nohtml'],
- 'modes' => $config['modes']
- );
+ $list[$item] = array('title' => $config['title'] , 'nohtml' => $config['nohtml']);
}
}
array_multisort($order, $list);
@@ -205,10 +192,6 @@
foreach ($editors as $name) {
if (!empty($noHtml) && empty($list[$name]['nohtml']))
continue;
- if (!empty($mode) && is_string($mode) && !empty($list[$name]['modes']) && !in_array(strtolower($mode), $list[$name]['modes']))
- continue;
- if (!empty($mode) && is_array($mode) && !empty($list[$name]['modes']) && (count(array_intersect($mode, $list[$name]['modes'])) == 0))
- continue;
$_list[$name] = $list[$name]['title'];
}
return $_list;
@@ -251,7 +234,7 @@
* @param mixed $options
* @return
*/
- function _loadEditor($name, $options = null, $mode = null)
+ function _loadEditor($name, $options = null)
{
$editor = null;
if (empty($name) || !array_key_exists($name, $this->getList())) {
@@ -272,7 +255,7 @@
return $editor;
}
include_once $config['file'];
- $editor = new $config['class']($options, $mode);
+ $editor = new $config['class']($options);
return $editor;
}
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/form.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/form.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/form.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -526,10 +526,10 @@
* A basic element validation method may contain something like this:
* <code>
* function renderValidationJS() {
- * $name = $this->getName();
- * return "if (myform.{$name}.value != 'valid') { " .
- * "myform.{$name}.focus(); window.alert( '$name is invalid' ); return false;" .
- * " }";
+ * $name = $this->getName();
+ * return "if (myform.{$name}.value != 'valid') { " .
+ * "myform.{$name}.focus(); window.alert( '$name is invalid' ); return false;" .
+ * " }";
* }
* </code>
*
@@ -558,66 +558,6 @@
}
/**
- * Renders the Javascript function needed for client-side for get content
- *
- * Additionally, each element class may provide its own "renderGetContentJS" method
- * that is supposed to return custom get content code for the element.
- *
- * The element get content code can assume that the JS "myform" variable points to the form.
- * Exemple:
- * <script type='text/javascript'>
- * var content[];
- * content = " . $form->renderGetContentJS(false) . "
- * </script>
- *
- * A basic element get content method may contain something like this:
- * <code>
- * function renderGetContentJS() {
- * $name = $this->getName();
- * return "document.getElementById('{$name}');";
- * }
- * </code>
- *
- * @param boolean $withtags Include the < javascript > tags in the returned string
- * @return string
- */
- function renderGetContentJS($withTags = false)
- {
- $formname = $this->getName();
- $js = '';
- if ($withTags) {
- $js .= "\n<!-- Start Form GetContent JavaScript //-->\n<script type='text/javascript'>\n<!--//\n";
- $js .= "function xoopsFormGetContent_{$formname}() {\n";
- } else {
- $js .= "(function() {\n";
- }
- //$js .= " var myform = window.document.{$formname};\n";
- $js .= " var content = new Object();\n";
- $elements = $this->getElements(true);
- foreach($elements as $elt) {
- if (method_exists($elt, 'renderGetContentJS') && ($elt->getName() != '')) {
- $js .= " content['" . $elt->getName() . "'] = " . $elt->renderGetContentJS() . ";\n";
- }
- }
- $js .= " Object.size = function(obj) {\n";
- $js .= " var size = 0, key;\n";
- $js .= " for (key in obj)\n";
- $js .= " {if (obj.hasOwnProperty(key)) size++;}\n";
- $js .= " return size;\n";
- $js .= " };\n";
- $js .= " return (Object.size(content) > 0) ? content : null;\n";
-
- if ($withTags) {
- $js .= "}\n";
- $js .= "//--></script>\n<!-- End Form GetContent JavaScript //-->\n";
- } else {
- $js .= "})()\n";
- }
-
- return $js;
- }
-
- /**
* assign to smarty form template instead of displaying directly
*
* @param object $ &$tpl reference to a {@link Smarty} object
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcheckbox.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcheckbox.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcheckbox.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -242,32 +242,4 @@
}
return '';
}
-
- /**
- * Render custom javascript get content code
- *
- * @seealso XoopsForm::renderGetContentJS
- */
- function renderGetContentJS()
- {
- // render custom validation code if any
- if (! empty($this->customGetContentCode)) {
- return implode(NWLINE, $this->customGetContentCode);
- // generate get content code if required
- } else {
- $eltname = $this->getName();
- return "(function(){
- var checkboxesChecked = [];
- var checkboxes = document.getElementsByName('{$eltname}[]');
- if (checkboxes.length) {
- for (var i = 0; i < checkboxes.length; i++) {
- if (checkboxes[i].checked == true) {
- checkboxesChecked.push(checkboxes[i].value);
- }
- }
- }
- return (checkboxesChecked.length > 0) ? checkboxesChecked : null;
- })()";
- }
- }
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcolorpicker.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcolorpicker.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcolorpicker.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -72,17 +72,4 @@
return "if ( !(new RegExp(\"^#[0-9a-fA-F]{6}\",\"i\").test(myform.{$eltname}.value)) ) { window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }";
}
-
- /**
- * Returns custom get content Javascript
- *
- * @return string Element get content Javascript
- */
- function renderGetContentJS()
- {
- $eltname = $this->getName();
- return "(function(){
- return ((new RegExp('^#[0-9a-fA-F]{6}','i').test(document.getElementById('{$eltname}').value))) ? document.getElementById('{$eltname}').value : null;
- })()";
- }
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -38,15 +38,13 @@
* @param integer $value
* @param mixed $showtime
*/
- function __construct($caption, $name, $size = 15, $value = 0, $showtime = true)
+ function XoopsFormDateTime($caption, $name, $size = 15, $value = 0, $showtime = true)
{
- $this->XoopsFormElementTray($caption, ' ', $name);
+ $this->XoopsFormElementTray($caption, ' ');
$value = intval($value);
$value = ($value > 0) ? $value : time();
$datetime = getDate($value);
- $dateselect = new XoopsFormTextDateSelect('', $name . '[date]', $size, $value, $showtime);
- $this->addElement($dateselect);
-
+ $this->addElement(new XoopsFormTextDateSelect('', $name . '[date]', $size, $value, $showtime));
$timearray = array();
for ($i = 0; $i < 24; $i ++) {
for ($j = 0; $j < 60; $j = $j + 10) {
@@ -55,30 +53,9 @@
}
}
ksort($timearray);
+
$timeselect = new XoopsFormSelect('', $name . '[time]', $datetime['hours'] * 3600 + 600 * ceil($datetime['minutes'] / 10));
$timeselect->addOptionArray($timearray);
$this->addElement($timeselect);
}
-
- /**
- * Render custom javascript get content code
- *
- * @seealso XoopsForm::renderGetContentJS
- */
- function renderGetContentJS()
- {
- $eltname = $this->getName();
- // render custom validation code if any
- if (! empty($this->customGetContentCode)) {
- return implode(NWLINE, $this->customGetContentCode);
- // generate get content code if required
- } else {
- return "(function(){
- var dateTime = []
- dateTime.push(document.getElementById('{$eltname}[date]').value);
- dateTime.push(document.getElementById('{$eltname}[time]').value);
- return (dateTime.length > 0) ? dateTime : null;
- })()";
- }
- }
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdhtmltextarea.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdhtmltextarea.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdhtmltextarea.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -265,19 +265,4 @@
}
return parent::renderValidationJS();
}
-
- /**
- * XoopsFormDhtmlTextArea::renderGetContentJS()
- *
- * @return
- */
- function renderGetContentJS()
- {
- if ($this->htmlEditor && is_object($this->htmlEditor) && method_exists($this->htmlEditor, 'renderGetContentJS')) {
- if (! isset($this->htmlEditor->isEnabled) || $this->htmlEditor->isEnabled) {
- return $this->htmlEditor->renderGetContentJS();
- }
- }
- return parent::renderGetContentJS();
- }
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formeditor.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formeditor.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formeditor.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -38,9 +38,8 @@
* @param array $configs configures: editor - editor identifier; name - textarea field name; width, height - dimensions for textarea; value - text content
* @param bool $noHtml use non-WYSIWYG eitor onfailure
* @param string $OnFailure editor to be used if current one failed
- * @param string Requested mode, useful for syntax highlighting editors*
*/
- function XoopsFormEditor($caption, $name, $configs = null, $nohtml = false, $OnFailure = '', $mode = null)
+ function XoopsFormEditor($caption, $name, $configs = null, $nohtml = false, $OnFailure = '')
{
// Backward compatibility: $name -> editor name; $configs['name'] -> textarea field name
if (! isset($configs['editor'])) {
@@ -50,19 +49,15 @@
} else {
$configs['name'] = $name;
}
- if (empty($mode) && !empty($configs['mode'])) {
- $mode = $configs['mode'];
- $configs['mode'] = null;
- }
$this->XoopsFormTextArea($caption, $name);
xoops_load('XoopsEditorHandler');
$editor_handler = XoopsEditorHandler::getInstance();
- $this->editor = $editor_handler->get($configs['editor'], $configs, $nohtml, $OnFailure, $mode);
+ $this->editor = $editor_handler->get($configs['editor'], $configs, $nohtml, $OnFailure);
}
/**
* renderValidationJS
- * override original renderValidationJS method
+ * TEMPORARY SOLUTION to 'override' original renderValidationJS method
* with custom XoopsEditor's renderValidationJS method
*/
function renderValidationJS()
@@ -82,27 +77,6 @@
}
/**
- * renderGetContentJS
- * 'override' original renderGetContentJS method
- * with custom XoopsEditor's renderGetContentJS method
- */
- function renderGetContentJS()
- {
- if (is_object($this->editor)) {
- if (method_exists($this->editor, 'renderGetContentJS')) {
- $this->editor->setName($this->getName());
- $this->editor->setCaption($this->getCaption());
- $this->editor->_required = $this->isRequired();
- $ret = $this->editor->renderGetContentJS();
- return $ret;
- } else {
- parent::renderGetContentJS();
- }
- }
- return false;
- }
-
- /**
* XoopsFormEditor::render()
*
* @return
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelement.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelement.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelement.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -434,37 +434,6 @@
}
/**
- * Render custom javascript get content code
- *
- * @seealso XoopsForm::renderGetContentJS
- */
- function renderGetContentJS()
- {
- // render custom get content code if any
- if (!empty($this->customGetContentCode)) {
- return implode(NWLINE, $this->customGetContentCode);
- // generate get content code if required
- } else if ($eltname = $this->getName()) {
- // $eltname = $this->getName();
- $eltcaption = $this->getCaption();
- $eltmsg = empty($eltcaption) ? sprintf(_FORM_ENTER, $eltname) : sprintf(_FORM_ENTER, $eltcaption);
- $eltmsg = str_replace(array(':' , '?' , '%'), '', $eltmsg);
- $eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
- $eltmsg = strip_tags($eltmsg);
- echo $this->getFormType();
- switch ($this->getFormType()) {
- case 'checkbox':
- return "document.getElementById('{$eltname}').value";
- break;
- default:
- return "document.getElementById('{$eltname}').value";
- break;
- } // switch
- }
- return false;
- }
-
- /**
* Generates output for the element.
*
* This method is abstract and must be overwritten by the child classes.
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formfile.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formfile.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formfile.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -40,7 +40,7 @@
* @param string $name "name" attribute
* @param int $maxfilesize Maximum size for an uploaded file
*/
- function __construct($caption, $name, $maxfilesize)
+ function XoopsFormFile($caption, $name, $maxfilesize)
{
$this->setCaption($caption);
$this->setName($name);
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formradio.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formradio.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formradio.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -197,30 +197,4 @@
}
return $ret;
}
-
- /**
- * Render custom javascript get content code
- *
- * @seealso XoopsForm::renderGetContentJS
- */
- function renderGetContentJS()
- {
- // render custom validation code if any
- if (! empty($this->customGetContentCode)) {
- return implode("\n", $this->customGetContentCode);
- // generate validation code if required
- } else {
- $eltname = $this->getName();
- return "(function(){
- var radios = document.getElementsByName('{$eltname}');
- for(var i = 0; i < radios.length; i++){
- if(radios[i].checked){
- return radios[i].value;
- }
- }
- return null; // or undefined, or your preferred default for none checked
- })()";
- }
- return '';
- }
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselect.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselect.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselect.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -238,33 +238,4 @@
}
return '';
}
-
- /**
- * Render custom javascript get content code
- *
- * @seealso XoopsForm::renderGetContentJS
- */
- function renderGetContentJS()
- {
- // render custom validation code if any
- if (! empty($this->customGetContentCode)) {
- return implode("\n", $this->customGetContentCode);
- // generate validation code if required
- } else {
- $eltname = $this->getName();
- return "(function(){
- var selectSelected = [];
- var options = document.getElementById('{$eltname}') && document.getElementById('{$eltname}').options;
- var opt;
- for (var i=0, iLen=options.length; i<iLen; i++) {
- opt = options[i];
- if (opt.selected) {
- selectSelected.push(opt.value || opt.text);
- }
- }
- return (selectSelected.length > 0) ? selectSelected : null;
- })()";
- }
- return '';
- }
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecteditor.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecteditor.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecteditor.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -27,7 +27,6 @@
*/
class XoopsFormSelectEditor extends XoopsFormElementTray
{
- var $modes = null;
var $allowed_editors = array();
var $form;
var $value;
@@ -41,13 +40,10 @@
* @param string $name editor name
* @param string $value Pre-selected text value
* @param bool $noHtml dohtml disabled
- * @param array $allowed_editors
- * @param mixed $modes Requested mode (or array of them)
*/
- function XoopsFormSelectEditor(&$form, $name = 'editor', $value = null, $nohtml = false, $allowed_editors = array(), $modes = null)
+ function XoopsFormSelectEditor(&$form, $name = 'editor', $value = null, $nohtml = false, $allowed_editors = array())
{
$this->XoopsFormElementTray(_SELECT);
- $this->modes = $modes;
$this->allowed_editors = $allowed_editors;
$this->form = &$form;
$this->name = $name;
@@ -65,13 +61,12 @@
xoops_load('XoopsEditorHandler');
$editor_handler = XoopsEditorHandler::getInstance();
$editor_handler->allowed_editors = $this->allowed_editors;
- $editor_handler->modes = $this->modes;
$option_select = new XoopsFormSelect("", $this->name, $this->value);
$extra = 'onchange="if(this.options[this.selectedIndex].value.length > 0 ){
window.document.forms.' . $thi...
[truncated message content] |
|
From: <rgr...@us...> - 2013-12-10 21:35:52
|
Revision: 12238
http://sourceforge.net/p/xoops/svn/12238
Author: rgriffith
Date: 2013-12-10 21:35:46 +0000 (Tue, 10 Dec 2013)
Log Message:
-----------
Fix potential security issues reported by Pedro Ribeiro of Agile Information Security.
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/viewpmsg.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/viewpmsg.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/class/protector.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/viewpmsg.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/viewpmsg.php 2013-12-09 21:08:35 UTC (rev 12237)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/viewpmsg.php 2013-12-10 21:35:46 UTC (rev 12238)
@@ -42,9 +42,12 @@
include $GLOBALS['xoops']->path('footer.php');
exit();
} else {
- $_POST['msg_id'] = unserialize($_REQUEST['msg_id']);
- $size = count($_POST['msg_id']);
- $msg = $_POST['msg_id'];
+ $clean_msg_id = json_decode($_POST['msg_id'], true, 2);
+ if (!empty($clean_msg_id)) {
+ $clean_msg_id = array_map("intval", $clean_msg_id);
+ }
+ $size = count($clean_msg_id);
+ $msg =& $clean_msg_id;
for ($i = 0; $i < $size; $i++) {
$pm =& $pm_handler->get($msg[$i]);
if ($pm->getVar('to_userid') == $GLOBALS['xoopsUser']->getVar('uid')) {
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/viewpmsg.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/viewpmsg.php 2013-12-09 21:08:35 UTC (rev 12237)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/viewpmsg.php 2013-12-10 21:35:46 UTC (rev 12238)
@@ -33,13 +33,16 @@
exit();
} elseif (empty($_REQUEST['ok'])) {
include $GLOBALS['xoops']->path('header.php');
- xoops_confirm(array('ok' => 1, 'delete_messages' => 1, 'msg_id'=> serialize(array_map("intval", $_POST['msg_id']))), $_SERVER['REQUEST_URI'], _PM_SURE_TO_DELETE);
+ 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);
include $GLOBALS['xoops']->path('footer.php');
exit();
}
- $_POST['msg_id'] = unserialize($_REQUEST['msg_id']);
- $size = count($_POST['msg_id']);
- $msg =& $_POST['msg_id'];
+ $clean_msg_id = json_decode($_POST['msg_id'], true, 2);
+ if (!empty($clean_msg_id)) {
+ $clean_msg_id = array_map("intval", $clean_msg_id);
+ }
+ $size = count($clean_msg_id);
+ $msg =& $clean_msg_id;
for ($i = 0; $i < $size; $i++) {
$pm =& $pm_handler->get(intval($msg[$i]));
if ($pm->getVar('to_userid') == $xoopsUser->getVar('uid')) {
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/class/protector.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/class/protector.php 2013-12-09 21:08:35 UTC (rev 12237)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/class/protector.php 2013-12-10 21:35:46 UTC (rev 12238)
@@ -215,7 +215,11 @@
}
}
- mysql_query( "INSERT INTO ".XOOPS_DB_PREFIX."_".$this->mydirname."_log SET ip='".addslashes($ip)."',agent='".addslashes($agent)."',type='".addslashes($type)."',description='".addslashes($this->message)."',uid='".intval($uid)."',timestamp=NOW()" , $this->_conn ) ;
+ mysql_query( "INSERT INTO ".XOOPS_DB_PREFIX."_".$this->mydirname."_log SET ip='"
+ . mysql_real_escape_string($ip)."',agent='"
+ . mysql_real_escape_string($agent)."',type='"
+ . mysql_real_escape_string($type)."',description='"
+ . mysql_real_escape_string($this->message)."',uid='".intval($uid)."',timestamp=NOW()" , $this->_conn ) ;
$this->_logged = true ;
return true ;
|
|
From: <rgr...@us...> - 2014-01-17 02:55:32
|
Revision: 12263
http://sourceforge.net/p/xoops/svn/12263
Author: rgriffith
Date: 2014-01-17 02:55:28 +0000 (Fri, 17 Jan 2014)
Log Message:
-----------
Correct method used to determine the current effective language.
Relates to bug #1220
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php 2014-01-16 01:40:42 UTC (rev 12262)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php 2014-01-17 02:55:28 UTC (rev 12263)
@@ -496,7 +496,7 @@
*/
function loadLocalization($type = "main")
{
- $language = xoops_getConfigOption('language');
+ $language = $GLOBALS['xoopsConfig']['language'];
// Load global localization stylesheet if available
if (file_exists($GLOBALS['xoops']->path('language/' . $language . '/style.css'))) {
$this->addStylesheet($GLOBALS['xoops']->url('language/' . $language . '/style.css'));
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php 2014-01-16 01:40:42 UTC (rev 12262)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php 2014-01-17 02:55:28 UTC (rev 12263)
@@ -248,7 +248,7 @@
<script type="text/javascript" src="' . XOOPS_URL . '/include/xoops.js"></script>';
$themecss = xoops_getcss($xoopsConfig['theme_set']);
echo '<link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/xoops.css" />';
- $language = xoops_getConfigOption('language');
+ $language = $GLOBALS['xoopsConfig']['language'];
if (file_exists($GLOBALS['xoops']->path('language/' . $language . '/style.css'))) {
echo '<link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/language/' . $language . '/style.css" />';
}
|
|
From: <rgr...@us...> - 2014-01-20 16:42:43
|
Revision: 12270
http://sourceforge.net/p/xoops/svn/12270
Author: rgriffith
Date: 2014-01-20 16:42:38 +0000 (Mon, 20 Jan 2014)
Log Message:
-----------
Fix #1271 - styles, scripts and images missing on last page of install
Move install cleanup from php shutdown function to end of page load using ajax call.
Disable previous button on last page of installer (code was no longer there!)
Also, add change from 2.6.0 to eliminate dummy mainfile.php in the distribution.
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/index.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/class/pathcontroller.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/install_tpl.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_end.php
Added Paths:
-----------
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/cleanup.php
Removed Paths:
-------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/mainfile.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/index.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/index.php 2014-01-17 19:53:51 UTC (rev 12269)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/index.php 2014-01-20 16:42:38 UTC (rev 12270)
@@ -19,7 +19,13 @@
* @version $Id$
*/
-include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php';
+$mainfile = dirname(__FILE__) . '/mainfile.php';
+if (file_exists($mainfile)) {
+ include $mainfile;
+} elseif (file_exists(dirname(__FILE__) . '/install/index.php')) {
+ header('Location: install/index.php');
+ exit;
+}
$xoopsPreload =& XoopsPreload::getInstance();
$xoopsPreload->triggerEvent('core.index.start');
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/class/pathcontroller.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/class/pathcontroller.php 2014-01-17 19:53:51 UTC (rev 12269)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/class/pathcontroller.php 2014-01-20 16:42:38 UTC (rev 12270)
@@ -72,7 +72,7 @@
if ( substr( $path, -1 ) == '/' ) {
$path = substr( $path, 0, -1 );
}
- if ( file_exists( "$path/mainfile.php" ) ) {
+ if ( file_exists( "$path/mainfile.dist.php" ) ) {
$this->xoopsPath['root'] = $path;
}
// Firstly, locate XOOPS lib folder out of XOOPS root folder
@@ -165,7 +165,7 @@
$path = 'root';
if ( is_dir( $this->xoopsPath[$path] ) && is_readable( $this->xoopsPath[$path] ) ) {
@include_once "{$this->xoopsPath[$path]}/include/version.php";
- if ( file_exists( "{$this->xoopsPath[$path]}/mainfile.php" ) && defined( 'XOOPS_VERSION' ) ) {
+ if ( file_exists( "{$this->xoopsPath[$path]}/mainfile.dist.php" ) && defined( 'XOOPS_VERSION' ) ) {
$this->validPath[$path] = 1;
}
}
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/cleanup.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/cleanup.php (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/cleanup.php 2014-01-20 16:42:38 UTC (rev 12270)
@@ -0,0 +1,38 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+/**
+ * Cleanup from install
+ *
+ * This is intended to be called using Ajax after the page_end.php script has loaded.
+ * This eliminates the problem of assets (.js, .css, .png, etc.) not being available
+ * because the install folder has been renamed. All assets should be loaded by this
+ * point, and no further installer action is expected.
+ *
+ * @copyright The XOOPS project http://www.xoops.org/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU General Public License (GPL)
+ * @package installer
+ * @since 2.5.7
+ * @author Richard Griffith <ri...@ge...>
+ * @version $Id: page_end.php 12051 2013-09-15 01:45:10Z beckmi $
+ */
+
+require_once './include/common.inc.php';
+defined('XOOPS_INSTALL') or die('XOOPS Installation wizard die');
+
+$install_rename_suffix = $_POST['instsuffix'];
+if (preg_match('/^[a-z0-9]{23}$/', $install_rename_suffix)) {
+ $installer_modified = "install_remove_" . $install_rename_suffix;
+ install_finalize($installer_modified);
+ echo "OK";
+} else {
+ echo "FAILED";
+}
+exit;
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/install_tpl.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/install_tpl.php 2014-01-17 19:53:51 UTC (rev 12269)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/install_tpl.php 2014-01-20 16:42:38 UTC (rev 12270)
@@ -132,7 +132,8 @@
</div>
<div id="buttons">
- <?php if ($wizard->pageIndex != 0) { ?>
+ <?php if ($wizard->pageIndex != 0
+ && $wizard->pageIndex != array_search('end', array_keys($wizard->pages))) { ?>
<button type="button" onclick="history.back()">
<?php echo BUTTON_PREVIOUS; ?>
</button>
@@ -154,48 +155,20 @@
</body>
</html>
<script type="text/javascript">
+ function ajaxCleanup()
+ {
+ new Ajax.Request(<?php echo "'".XOOPS_URL."/install/cleanup.php'"; ?>, {
+ method: 'post',
+ parameters: {instsuffix: <?php echo isset($install_rename_suffix)?"'".$install_rename_suffix."'":"''"; ?> }
+ });
+ }
+
/**
- * Checking url in browser
- * if page is install/page_end.php
- * use folder rename variables from
- * page_end.php to fetch js and css
+ * Check url in browser to see if it is for 'page_end.php'
+ * If it is, launch the cleanup via ajax.
**/
- var pathArray = window.location.pathname.split( '/' );
var filename = location.pathname.substring(location.pathname.lastIndexOf('/')+1);
- var chkUrl = pathArray[2]+"/"+filename;
- if (chkUrl === 'install/page_end.php') {
- //window.location = newinstallurl;
- loadjscssfile(newPro, 'js');
- loadjscssfile(newINST, 'js');
- loadjscssfile(newCSSDeflt, 'css');
- loadjscssfile(newCSS, 'css');
- } else {
- // Do nothing
+ if (filename === 'page_end.php') {
+ Event.observe(window,"load",ajaxCleanup);
}
-
-/**
- * Load js and css files to header
- *
- * @param filename Filename based on var using $installer_modified if folder is renamed
- *
- * @param filetype js=javascript css=cascading style sheat
- *
- * @return boolean always true
- */
-function loadjscssfile(filename, filetype)
-{
- if (filetype == "js") { //if filename is a external JavaScript file
- // alert('called');
- var fileref = document.createElement('script');
- fileref.setAttribute("type", "text/javascript");
- fileref.setAttribute("src", filename);
- } elseif (filetype == "css") { //if filename is an external CSS file
- var fileref = document.createElement("link");
- fileref.setAttribute("rel", "stylesheet");
- fileref.setAttribute("type", "text/css");
- fileref.setAttribute("href", filename);
- }
- if (typeof fileref != "undefined")
- document.getElementsByTagName("head")[0].appendChild(fileref);
- }
</script>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_end.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_end.php 2014-01-17 19:53:51 UTC (rev 12269)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_end.php 2014-01-20 16:42:38 UTC (rev 12270)
@@ -28,35 +28,13 @@
require_once './include/common.inc.php';
$_SESSION = array();
-setcookie( 'xo_install_user', '', null, null, null );
+setcookie('xo_install_user', '', null, null, null);
defined('XOOPS_INSTALL') or die('XOOPS Installation wizard die');
-$installer_modified = "install_remove_" . uniqid(mt_rand());
-register_shutdown_function('install_finalize', $installer_modified);
+$install_rename_suffix = uniqid(mt_rand());
+$installer_modified = "install_remove_" . $install_rename_suffix;
+//register_shutdown_function('install_finalize', $installer_modified);
-/**
- * Placing folder renamed in $_SESSION
- * and echoing to document for use in install_tpl.php
- **/
-
-$_SESSION['newinstallPRO'] = XOOPS_URL.'/'.$installer_modified.'/js/prototype-1.6.0.3.js';
-$_SESSION['newinstallINST'] = XOOPS_URL.'/'.$installer_modified.'/js/xo-installer.js';
-if (file_exists('language/' . $wizard->language . '/style.css')) {
-$_SESSION['newinstallCSSDeflt'] = XOOPS_URL.'/'.$installer_modified.'/css/style.css';
-$_SESSION['newinstallCSS'] = XOOPS_URL.'/'.$installer_modified.'/language/' . $wizard->language . '/style.css';
-} else {
-$_SESSION['newinstallCSSDeflt'] = XOOPS_URL.'/'.$installer_modified.'/css/style.css';
-$_SESSION['newinstallCSS'] = '';
-}
-
-$js = '<script type="text/javascript">';
-$js .= 'var newPro = '.json_encode($_SESSION["newinstallPRO"]).';';
-$js .= 'var newINST = '.json_encode($_SESSION["newinstallINST"]).';';
-$js .= 'var newCSS = '.json_encode($_SESSION["newinstallCSS"]).';';
-$js .= 'var newCSS = '.json_encode($_SESSION["newinstallCSSDeflt"]).';';
-$js .= '</script>';
-echo $js;
-
$pageHasForm = false;
$content = "";
Deleted: XoopsCore/branches/2.5.x/2.5.7/htdocs/mainfile.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/mainfile.php 2014-01-17 19:53:51 UTC (rev 12269)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/mainfile.php 2014-01-20 16:42:38 UTC (rev 12270)
@@ -1,19 +0,0 @@
-<?php
-/**
- * XOOPS main configuration file
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @version $Id$
- */
-
-if (! defined('XOOPS_INSTALL')) {
- header('Location: install/index.php');
-}
|
|
From: <rgr...@us...> - 2014-01-21 17:10:09
|
Revision: 12271
http://sourceforge.net/p/xoops/svn/12271
Author: rgriffith
Date: 2014-01-21 17:10:06 +0000 (Tue, 21 Jan 2014)
Log Message:
-----------
Cleanup for #1271 - fix some installer issues
Supress expected warnings for cleaner appearance
Optimize detection of install condition in /index.php (will generate warning when /mainfile.php is not found)
Protector icon date warning
Disparity in parameter expectation between page_end and cleanup
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/index.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/cleanup.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/common.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/install_tpl.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_end.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/module_icon.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/index.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/index.php 2014-01-20 16:42:38 UTC (rev 12270)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/index.php 2014-01-21 17:10:06 UTC (rev 12271)
@@ -19,12 +19,12 @@
* @version $Id$
*/
-$mainfile = dirname(__FILE__) . '/mainfile.php';
-if (file_exists($mainfile)) {
- include $mainfile;
-} elseif (file_exists(dirname(__FILE__) . '/install/index.php')) {
- header('Location: install/index.php');
- exit;
+include dirname(__FILE__) . '/mainfile.php';
+if (!defined('XOOPS_MAINFILE_INCLUDED')) {
+ if (file_exists(dirname(__FILE__) . '/install/index.php')) {
+ header('Location: install/index.php');
+ exit;
+ }
}
$xoopsPreload =& XoopsPreload::getInstance();
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/cleanup.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/cleanup.php 2014-01-20 16:42:38 UTC (rev 12270)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/cleanup.php 2014-01-21 17:10:06 UTC (rev 12271)
@@ -28,7 +28,7 @@
defined('XOOPS_INSTALL') or die('XOOPS Installation wizard die');
$install_rename_suffix = $_POST['instsuffix'];
-if (preg_match('/^[a-z0-9]{23}$/', $install_rename_suffix)) {
+if (preg_match('/^[a-f0-9]{23}$/', $install_rename_suffix)) {
$installer_modified = "install_remove_" . $install_rename_suffix;
install_finalize($installer_modified);
echo "OK";
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/common.inc.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/common.inc.php 2014-01-20 16:42:38 UTC (rev 12270)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/common.inc.php 2014-01-21 17:10:06 UTC (rev 12271)
@@ -39,7 +39,7 @@
$xoopsOption['nocommon'] = true;
session_start();
}
-include_once '../mainfile.php';
+@include '../mainfile.php';
if (!defined("XOOPS_ROOT_PATH")) {
define("XOOPS_ROOT_PATH", str_replace("\\", "/", realpath('../')));
}
@@ -52,6 +52,7 @@
$xoopsLogger->activated = true;
*/
+date_default_timezone_set(@date_default_timezone_get());
include './class/installwizard.php';
include_once '../include/version.php';
include_once './include/functions.php';
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/install_tpl.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/install_tpl.php 2014-01-20 16:42:38 UTC (rev 12270)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/install_tpl.php 2014-01-21 17:10:06 UTC (rev 12271)
@@ -157,7 +157,7 @@
<script type="text/javascript">
function ajaxCleanup()
{
- new Ajax.Request(<?php echo "'".XOOPS_URL."/install/cleanup.php'"; ?>, {
+ new Ajax.Request(<?php echo "'".@constant('XOOPS_URL')."/install/cleanup.php'"; ?>, {
method: 'post',
parameters: {instsuffix: <?php echo isset($install_rename_suffix)?"'".$install_rename_suffix."'":"''"; ?> }
});
@@ -169,6 +169,6 @@
**/
var filename = location.pathname.substring(location.pathname.lastIndexOf('/')+1);
if (filename === 'page_end.php') {
- Event.observe(window,"load",ajaxCleanup);
+ Event.observe(window, 'load', ajaxCleanup);
}
</script>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_end.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_end.php 2014-01-20 16:42:38 UTC (rev 12270)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/page_end.php 2014-01-21 17:10:06 UTC (rev 12271)
@@ -31,9 +31,8 @@
setcookie('xo_install_user', '', null, null, null);
defined('XOOPS_INSTALL') or die('XOOPS Installation wizard die');
-$install_rename_suffix = uniqid(mt_rand());
+$install_rename_suffix = uniqid(substr(md5($x = mt_rand()) . $x, -10));
$installer_modified = "install_remove_" . $install_rename_suffix;
-//register_shutdown_function('install_finalize', $installer_modified);
$pageHasForm = false;
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/module_icon.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/module_icon.php 2014-01-20 16:42:38 UTC (rev 12270)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/module_icon.php 2014-01-21 17:10:06 UTC (rev 12271)
@@ -7,6 +7,7 @@
$mydirpath = $registry->getEntry('mydirpath');
$language = $registry->getEntry('language');
// end hack by Trabis
+date_default_timezone_set(@date_default_timezone_get());
$icon_cache_limit = 3600 ; // default 3600sec == 1hour
|
|
From: <be...@us...> - 2014-02-05 10:01:49
|
Revision: 12288
http://sourceforge.net/p/xoops/svn/12288
Author: beckmi
Date: 2014-02-05 10:01:46 +0000 (Wed, 05 Feb 2014)
Log Message:
-----------
Updating required PHP and XOOPS versions, module versions (cesag/mamba)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/include/version.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/xoops_version.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/xoops_version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/xoops_version.php 2014-02-04 21:19:00 UTC (rev 12287)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/xoops_version.php 2014-02-05 10:01:46 UTC (rev 12288)
@@ -26,7 +26,7 @@
$modversion = array();
$modversion['name'] = _PM_MI_NAME;
-$modversion['version'] = 1.09;
+$modversion['version'] = 1.10;
$modversion['description'] = _PM_MI_DESC;
$modversion['author'] = "Jan Pedersen, Taiwen Jiang";
$modversion['credits'] = "The XOOPS Project, Wanikoo";
@@ -40,12 +40,12 @@
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2012/07/30';
+$modversion['release_date'] = '2014/02/05';
$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "RC";
-$modversion['min_php'] = '5.2';
-$modversion['min_xoops'] = "2.5.5";
+$modversion["module_status"] = "Beta 1";
+$modversion['min_php'] = '5.3.7';
+$modversion['min_xoops'] = "2.5.7";
$modversion['min_admin'] = '1.1';
$modversion['min_db'] = array(
'mysql' => '5.0.7',
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/xoops_version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/xoops_version.php 2014-02-04 21:19:00 UTC (rev 12287)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/xoops_version.php 2014-02-05 10:01:46 UTC (rev 12288)
@@ -25,7 +25,7 @@
*/
$modversion = array();
$modversion['name'] = _PROFILE_MI_NAME;
-$modversion['version'] = 1.85;
+$modversion['version'] = 1.86;
$modversion['description'] = _PROFILE_MI_DESC;
$modversion['author'] = "Jan Pedersen, Taiwen Jiang, alfred, Wishcraft";
$modversion['credits'] = "Ackbarr, mboyden, marco, mamba, trabis, etc.";
@@ -39,12 +39,12 @@
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2012/07/30';
+$modversion['release_date'] = '2014/02/05';
$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "Final";
-$modversion['min_php'] = '5.2';
-$modversion['min_xoops'] = "2.5.5";
+$modversion["module_status"] = "Beta 1";
+$modversion['min_php'] = '5.3.7';
+$modversion['min_xoops'] = "2.5.7";
$modversion['min_admin'] = '1.1';
$modversion['min_db'] = array(
'mysql' => '5.0.7',
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/include/version.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/include/version.txt 2014-02-04 21:19:00 UTC (rev 12287)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/include/version.txt 2014-02-05 10:01:46 UTC (rev 12288)
@@ -1 +1 @@
-3.51
\ No newline at end of file
+3.52
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/xoops_version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/xoops_version.php 2014-02-04 21:19:00 UTC (rev 12287)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/xoops_version.php 2014-02-05 10:01:46 UTC (rev 12288)
@@ -34,12 +34,12 @@
$modversion['icons32'] = 'Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2011/10/08';
+$modversion['release_date'] = '2014/02/05';
$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "Final";
-$modversion['min_php']='5.2';
-$modversion['min_xoops']="2.5";
+$modversion["module_status"] = "Beta 1";
+$modversion['min_php']='5.3.7';
+$modversion['min_xoops']="2.5.7";
// start hack by Mage
// Admin menu
// Set to 1 if you want to display menu generated by system module
|
|
From: <be...@us...> - 2014-02-28 10:31:40
|
Revision: 12335
http://sourceforge.net/p/xoops/svn/12335
Author: beckmi
Date: 2014-02-28 10:31:35 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
Adding images for release
Added Paths:
-----------
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/error.png
XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/warning.png
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/img/xoops_2.5.7-Beta1.png
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/img/xoops_2.5.7-RC1.png
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/img/xoops_2.5.7.png
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/error.png
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/error.png
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/error.png 2014-02-27 08:02:54 UTC (rev 12334)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/error.png 2014-02-28 10:31:35 UTC (rev 12335)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/error.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.7/htdocs/Frameworks/moduleclasses/icons/16/warning.png
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/warning.png
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/warning.png 2014-02-27 08:02:54 UTC (rev 12334)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/warning.png 2014-02-28 10:31:35 UTC (rev 12335)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/Frameworks/moduleclasses/icons/16/warning.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.7/htdocs/install/img/xoops_2.5.7-Beta1.png
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/img/xoops_2.5.7-Beta1.png
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/img/xoops_2.5.7-Beta1.png 2014-02-27 08:02:54 UTC (rev 12334)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/img/xoops_2.5.7-Beta1.png 2014-02-28 10:31:35 UTC (rev 12335)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/img/xoops_2.5.7-Beta1.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.7/htdocs/install/img/xoops_2.5.7-RC1.png
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/img/xoops_2.5.7-RC1.png
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/img/xoops_2.5.7-RC1.png 2014-02-27 08:02:54 UTC (rev 12334)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/img/xoops_2.5.7-RC1.png 2014-02-28 10:31:35 UTC (rev 12335)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/img/xoops_2.5.7-RC1.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.7/htdocs/install/img/xoops_2.5.7.png
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/img/xoops_2.5.7.png
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/install/img/xoops_2.5.7.png 2014-02-27 08:02:54 UTC (rev 12334)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/install/img/xoops_2.5.7.png 2014-02-28 10:31:35 UTC (rev 12335)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/install/img/xoops_2.5.7.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
|
|
From: <be...@us...> - 2014-03-08 10:39:13
|
Revision: 12363
http://sourceforge.net/p/xoops/svn/12363
Author: beckmi
Date: 2014-03-08 10:39:06 +0000 (Sat, 08 Mar 2014)
Log Message:
-----------
Cosmetic code changes related to PSR-2
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/file.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/color-picker.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/admin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/auth.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/backend.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/banners.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/calendar.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/captcha.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/comment.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/countries.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/errors.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/findusers.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/formdhtmltextarea.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/locale.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/logger.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/mail.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/misc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/notification.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/pmsg.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/search.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/timezone.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/uploader.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/user.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/about.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/admin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/admin_footer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/menu.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/admin/prune.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/language/english/admin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/language/english/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/language/english/modinfo.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/about.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/admin_footer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/admin_header.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/category.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/index.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/menu.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/permissions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/user.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/admin/visibility.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/language/english/admin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/language/english/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/language/english/modinfo.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/avatars.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/banners.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/blocksadmin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/comments.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/groups.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/images.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/mailusers.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/maintenance.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/preferences.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/smilies.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/tplsets.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/userrank.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/users.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/blocks.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/cpanel.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/modinfo.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/admin/about.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/admin/admin_footer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/admin/index.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/language/english/admin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/language/english/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/language/english/modinfo.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/public_check.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/file.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/file.php 2014-03-08 10:10:21 UTC (rev 12362)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/file.php 2014-03-08 10:39:06 UTC (rev 12363)
@@ -99,7 +99,7 @@
*
* @param array $settings array of setting for the engine
* @return boolean True if the engine has been successfully initialized, false if not
- * @access public
+ * @access public
*/
function init($settings = array())
{
@@ -114,6 +114,7 @@
if (empty($this->settings['path'])) {
return false;
}
+
return $this->active();
}
@@ -131,9 +132,9 @@
/**
* Write data for key into cache
*
- * @param string $key Identifier for the data
- * @param mixed $data Data to be cached
- * @param mixed $duration How long to cache the data, in seconds
+ * @param string $key Identifier for the data
+ * @param mixed $data Data to be cached
+ * @param mixed $duration How long to cache the data, in seconds
* @return boolean True if the data was succesfully cached, false on failure
* @access public
*/
@@ -174,14 +175,15 @@
}
$success = $this->file->write($contents);
$this->file->close();
+
return $success;
}
/**
* Read a key from the cache
*
- * @param string $key Identifier for the data
- * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
+ * @param string $key Identifier for the data
+ * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
* @access public
*/
function read($key)
@@ -197,6 +199,7 @@
if ($cachetime !== false && intval($cachetime) < time()) {
$this->file->close();
$this->file->delete();
+
return false;
}
@@ -213,13 +216,14 @@
$data = eval($data);
}
$this->file->close();
+
return $data;
}
/**
* Delete a key from the cache
*
- * @param string $key Identifier for the data
+ * @param string $key Identifier for the data
* @return boolean True if the value was successfully deleted, false if it didn't exist or couldn't be removed
* @access public
*/
@@ -228,13 +232,14 @@
if ($this->setKey($key) === false || ! $this->init) {
return false;
}
+
return $this->file->delete();
}
/**
* Delete all values from the cache
*
- * @param boolean $check Optional - only delete expired cache items
+ * @param boolean $check Optional - only delete expired cache items
* @return boolean True if the cache was succesfully cleared, false otherwise
* @access public
*/
@@ -269,14 +274,15 @@
$this->file->delete();
}
$dir->close();
+
return true;
}
/**
* Get absolute file for a given key
*
- * @param string $key The key
- * @return mixed Absolute cache file for the given key or false if erroneous
+ * @param string $key The key
+ * @return mixed Absolute cache file for the given key or false if erroneous
* @access private
*/
function setKey($key)
@@ -303,6 +309,7 @@
} else {
$this->active = true;
}
+
return true;
}
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php 2014-03-08 10:10:21 UTC (rev 12362)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php 2014-03-08 10:39:06 UTC (rev 12363)
@@ -1,198 +1,197 @@
-<?php
-/**
- * Xoopsemotions plugin for tinymce
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package class / xoopseditor
- * @subpackage tinymce / xoops plugins
- * @since 2.3.0
- * @author ralf57
- * @author luciorota <luc...@gm...>
- * @author Laurent JEN <du...@fr...>
- * @version $Id: xoopsemotions.php 11937 2013-08-18 02:25:16Z beckmi $
- */
-
-
-// load mainfile.php - start
-$current_path = dirname(__FILE__);
-if ( DIRECTORY_SEPARATOR != "/" ) {
- $current_path = str_replace( DIRECTORY_SEPARATOR, "/", $current_path);
-}
-$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"); }
-// load mainfile.php - end
-
-// get current filename
-$current_file = basename(__FILE__);
-
-// load language definitions
-xoops_loadLanguage("admin", "system");
-xoops_loadLanguage("admin/smilies", "system");
-xoops_loadLanguage("misc");
-
-// include system category definitions - start
-include_once XOOPS_ROOT_PATH."/modules/system/constants.php";
-
-// check user/group
-$groups = is_object( $GLOBALS["xoopsUser"] ) ? $GLOBALS["xoopsUser"]->getGroups() : array( XOOPS_GROUP_ANONYMOUS );
-$gperm_handler =& xoops_gethandler('groupperm');
-$admin = $gperm_handler->checkRight( 'system_admin', XOOPS_SYSTEM_SMILE, $groups );
-
-$op = '';
-if (!empty($_GET['op'])) {
- $op = trim( $_GET['op'] );
-} elseif (!empty($_POST['op'])) {
- $op = trim( $_POST['op'] );
-}
-
-$myts =& MyTextSanitizer::getInstance();
-
-if ( $admin && $op == 'SmilesAdd' ) {
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header($current_file, 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
- }
- $db =& XoopsDatabaseFactory::getDatabaseConnection();
- include_once XOOPS_ROOT_PATH.'/class/uploader.php';
- $uploader = new XoopsMediaUploader(XOOPS_UPLOAD_PATH, array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png'), 100000, 120, 120);
- $uploader->setPrefix('smil');
- if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
- if (!$uploader->upload()) {
- $err = $uploader->getErrors();
- } else {
- $smile_url = $uploader->getSavedFileName();
- $smile_code = $myts->stripSlashesGPC($_POST['smile_code']);
- $smile_desc = $myts->stripSlashesGPC($_POST['smile_desc']);
- $smile_display = intval($_POST['smile_display']) > 0 ? 1 : 0;
- $newid = $db->genId($db->prefix('smilies')."_id_seq");
- $sql = sprintf("INSERT INTO %s (id, code, smile_url, emotion, display) VALUES (%d, %s, %s, %s, %d)", $db->prefix('smiles'), $newid, $db->quoteString($smile_code), $db->quoteString($smile_url), $db->quoteString($smile_desc), $smile_display);
- if (!$db->query($sql)) {
- $err = 'Failed storing smiley data into the database';
- }
- }
- } else {
- $err = $uploader->getErrors();
- }
- if (!isset($err)) {
- unset($_SESSION['XoopsEmotions']);
- unset($_SESSION['XoopsEmotions_expire']);
- redirect_header($current_file,2,_AM_DBUPDATED);
- } else {
- redirect_header($current_file, 3, xoops_error($err) );
- }
-}
-
-$time = time();
-if ( !isset( $_SESSION['XoopsEmotions'] ) && @$_SESSION['XoopsEmotions_expire'] < $time ) {
- $_SESSION['XoopsEmotions'] = $myts->getSmileys();
- $_SESSION['XoopsEmotions_expire'] = $time + 300;
-}
-
-//xoops_header(false);
-echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
-echo '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="' . _LANGCODE . '" lang="' . _LANGCODE . '">';
-echo '<head>';
-echo '<meta http-equiv="content-type" content="text/html; charset=' . _CHARSET . '" />';
-echo '<meta http-equiv="content-language" content="' . _LANGCODE . '" />';
-?>
-<head>
- <title>{#xoopsemotions_dlg.title}</title>
- <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
- <script type="text/javascript" src="../../utils/mctabs.js"></script>
- <script type="text/javascript" src="../../utils/form_utils.js"></script>
- <script type="text/javascript" src="../../utils/validate.js"></script>
- <script type="text/javascript" src="js/xoopsemotions.js"></script>
- <link href="<?php echo xoops_getcss($xoopsConfig['theme_set']); ?>" rel="stylesheet" type="text/css" />
- <link href="css/xoopsemotions.css" rel="stylesheet" type="text/css" />
- <base target="_self" />
-</head>
-<body>
-
-<?php
-if ( !$_SESSION['XoopsEmotions'] && !$admin) {
- echo "<div class='xoopsEmotions'>";
- echo "<div>{#xoopsemotions_dlg.error_noemotions}</div>";
- echo "</div>";
- echo "<div class='mceActionPanel floatright'>";
- echo "<input type='button' id='cancel' name='cancel' value='{#cancel}' onclick='tinyMCEPopup.close();' />";
- echo "</div>";
- xoops_footer();
- exit();
-}
-?>
-
-<div class="tabs">
- <ul>
- <li id="tab_emotionsbrowser" class="current"><span><a href="javascript:mcTabs.displayTab('tab_emotionsbrowser','emotionsbrowser_panel');" onmousedown="return false;">{#xoopsemotions_dlg.tab_emotionsbrowser}</a></span></li>
- <?php
- if ($admin) {
- echo '<li id="tab_emotionsadmin"><span><a href="javascript:mcTabs.displayTab(\'tab_emotionsadmin\',\'emotionsadmin_panel\');" onmousedown="return false;">{#xoopsemotions_dlg.tab_emotionsadmin}</a></span></li>';
- }
- ?>
- </ul>
-</div>
-
-<div class="panel_wrapper">
- <div id="emotionsbrowser_panel" class="panel current" style="overflow:auto;">
- <?php
- if ( $smiles = $_SESSION['XoopsEmotions'] ) {
- echo "<div><strong>" . _MSC_CLICKASMILIE . "</strong></div>";
- echo "<div class='xoopsEmotions'>";
- $count = count($smiles);
-
- for ($i = 0; $i < $count; $i++) {
- if ( $op == '' ) {
- if ( $smiles[$i]['display'] ) {
- echo '<img class="xoopsEmotions" onclick="XoopsemotionsDialog.insert(this);" src="' . XOOPS_UPLOAD_URL . '/' . $smiles[$i]['smile_url'] . '" alt="' . $myts->htmlspecialchars($smiles[$i]['emotion']) . '" title="' . $myts->htmlspecialchars($smiles[$i]['emotion']) . '" />';
- }
- } else {
- echo '<img class="xoopsEmotions" onclick="XoopsemotionsDialog.insert(this);" src="' . XOOPS_UPLOAD_URL . '/' . $smiles[$i]['smile_url'] . '" alt="' . $myts->htmlspecialchars($smiles[$i]['emotion']) . '" title="' . $myts->htmlspecialchars($smiles[$i]['emotion']) . '" />';
- }
- }
- if ( $op == '' ) {
- echo '<div class="xoopsEmotions">';
- echo '<a class="xoopsEmotions" href="' . $current_file . '?op=' . _MORE . '">' . _MORE . '</a>';
- echo '</div>';
- }
- echo "</div>";
- } else {
- echo "<div>{#xoopsemotions_dlg.error_noemotions}</div>";
- }
- ?>
- <div class="mceActionPanel floatright">
- <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
- </div>
- </div>
-
- <div id="emotionsadmin_panel" class="panel" style="overflow:auto;">
- <?php
- if ($admin) {
- include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
-
- $smile_form = new XoopsThemeForm(_AM_ADDSMILE, 'smileform', $current_file, 'post', true);
- $smile_form->setExtra('enctype="multipart/form-data"');
- $smile_form->addElement(new XoopsFormText(_AM_SMILECODE, 'smile_code', 26, 25, ''), true);
- $smile_form->addElement(new XoopsFormText(_AM_SMILEEMOTION, 'smile_desc', 26, 25, ''), true);
- $smile_select = new XoopsFormFile('', 'smile_url', 5000000);
- $smile_label = new XoopsFormLabel('', '<img src="'.XOOPS_UPLOAD_URL.'/blank.gif" alt="" />');
- $smile_tray = new XoopsFormElementTray(_IMAGEFILE.':', ' ');
- $smile_tray->addElement($smile_select);
- $smile_tray->addElement($smile_label);
- $smile_form->addElement($smile_tray);
- $smile_form->addElement(new XoopsFormRadioYN(_AM_DISPLAYF, 'smile_display', 1));
- $smile_form->addElement(new XoopsFormHidden('id', ''));
- $smile_form->addElement(new XoopsFormHidden('op', 'SmilesAdd'));
- $smile_form->addElement(new XoopsFormHidden('fct', 'smilies'));
- $smile_form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-
- $smile_form->display();
- }
- ?>
- <div class="mceActionPanel floatright">
- <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
- </div>
- </div>
-
-</div>
-<?php xoops_footer(); ?>
\ No newline at end of file
+<?php
+/**
+ * Xoopsemotions plugin for tinymce
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package class / xoopseditor
+ * @subpackage tinymce / xoops plugins
+ * @since 2.3.0
+ * @author ralf57
+ * @author luciorota <luc...@gm...>
+ * @author Laurent JEN <du...@fr...>
+ * @version $Id: xoopsemotions.php 11937 2013-08-18 02:25:16Z beckmi $
+ */
+
+// load mainfile.php - start
+$current_path = dirname(__FILE__);
+if (DIRECTORY_SEPARATOR != "/") {
+ $current_path = str_replace( DIRECTORY_SEPARATOR, "/", $current_path);
+}
+$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"); }
+// load mainfile.php - end
+
+// get current filename
+$current_file = basename(__FILE__);
+
+// load language definitions
+xoops_loadLanguage("admin", "system");
+xoops_loadLanguage("admin/smilies", "system");
+xoops_loadLanguage("misc");
+
+// include system category definitions - start
+include_once XOOPS_ROOT_PATH."/modules/system/constants.php";
+
+// check user/group
+$groups = is_object( $GLOBALS["xoopsUser"] ) ? $GLOBALS["xoopsUser"]->getGroups() : array( XOOPS_GROUP_ANONYMOUS );
+$gperm_handler =& xoops_gethandler('groupperm');
+$admin = $gperm_handler->checkRight( 'system_admin', XOOPS_SYSTEM_SMILE, $groups );
+
+$op = '';
+if (!empty($_GET['op'])) {
+ $op = trim( $_GET['op'] );
+} elseif (!empty($_POST['op'])) {
+ $op = trim( $_POST['op'] );
+}
+
+$myts =& MyTextSanitizer::getInstance();
+
+if ($admin && $op == 'SmilesAdd') {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($current_file, 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ $db =& XoopsDatabaseFactory::getDatabaseConnection();
+ include_once XOOPS_ROOT_PATH.'/class/uploader.php';
+ $uploader = new XoopsMediaUploader(XOOPS_UPLOAD_PATH, array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png'), 100000, 120, 120);
+ $uploader->setPrefix('smil');
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+ if (!$uploader->upload()) {
+ $err = $uploader->getErrors();
+ } else {
+ $smile_url = $uploader->getSavedFileName();
+ $smile_code = $myts->stripSlashesGPC($_POST['smile_code']);
+ $smile_desc = $myts->stripSlashesGPC($_POST['smile_desc']);
+ $smile_display = intval($_POST['smile_display']) > 0 ? 1 : 0;
+ $newid = $db->genId($db->prefix('smilies')."_id_seq");
+ $sql = sprintf("INSERT INTO %s (id, code, smile_url, emotion, display) VALUES (%d, %s, %s, %s, %d)", $db->prefix('smiles'), $newid, $db->quoteString($smile_code), $db->quoteString($smile_url), $db->quoteString($smile_desc), $smile_display);
+ if (!$db->query($sql)) {
+ $err = 'Failed storing smiley data into the database';
+ }
+ }
+ } else {
+ $err = $uploader->getErrors();
+ }
+ if (!isset($err)) {
+ unset($_SESSION['XoopsEmotions']);
+ unset($_SESSION['XoopsEmotions_expire']);
+ redirect_header($current_file,2,_AM_DBUPDATED);
+ } else {
+ redirect_header($current_file, 3, xoops_error($err) );
+ }
+}
+
+$time = time();
+if ( !isset( $_SESSION['XoopsEmotions'] ) && @$_SESSION['XoopsEmotions_expire'] < $time ) {
+ $_SESSION['XoopsEmotions'] = $myts->getSmileys();
+ $_SESSION['XoopsEmotions_expire'] = $time + 300;
+}
+
+//xoops_header(false);
+echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
+echo '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="' . _LANGCODE . '" lang="' . _LANGCODE . '">';
+echo '<head>';
+echo '<meta http-equiv="content-type" content="text/html; charset=' . _CHARSET . '" />';
+echo '<meta http-equiv="content-language" content="' . _LANGCODE . '" />';
+?>
+<head>
+ <title>{#xoopsemotions_dlg.title}</title>
+ <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+ <script type="text/javascript" src="../../utils/mctabs.js"></script>
+ <script type="text/javascript" src="../../utils/form_utils.js"></script>
+ <script type="text/javascript" src="../../utils/validate.js"></script>
+ <script type="text/javascript" src="js/xoopsemotions.js"></script>
+ <link href="<?php echo xoops_getcss($xoopsConfig['theme_set']); ?>" rel="stylesheet" type="text/css" />
+ <link href="css/xoopsemotions.css" rel="stylesheet" type="text/css" />
+ <base target="_self" />
+</head>
+<body>
+
+<?php
+if (!$_SESSION['XoopsEmotions'] && !$admin) {
+ echo "<div class='xoopsEmotions'>";
+ echo "<div>{#xoopsemotions_dlg.error_noemotions}</div>";
+ echo "</div>";
+ echo "<div class='mceActionPanel floatright'>";
+ echo "<input type='button' id='cancel' name='cancel' value='{#cancel}' onclick='tinyMCEPopup.close();' />";
+ echo "</div>";
+ xoops_footer();
+ exit();
+}
+?>
+
+<div class="tabs">
+ <ul>
+ <li id="tab_emotionsbrowser" class="current"><span><a href="javascript:mcTabs.displayTab('tab_emotionsbrowser','emotionsbrowser_panel');" onmousedown="return false;">{#xoopsemotions_dlg.tab_emotionsbrowser}</a></span></li>
+ <?php
+ if ($admin) {
+ echo '<li id="tab_emotionsadmin"><span><a href="javascript:mcTabs.displayTab(\'tab_emotionsadmin\',\'emotionsadmin_panel\');" onmousedown="return false;">{#xoopsemotions_dlg.tab_emotionsadmin}</a></span></li>';
+ }
+ ?>
+ </ul>
+</div>
+
+<div class="panel_wrapper">
+ <div id="emotionsbrowser_panel" class="panel current" style="overflow:auto;">
+ <?php
+ if ($smiles = $_SESSION['XoopsEmotions']) {
+ echo "<div><strong>" . _MSC_CLICKASMILIE . "</strong></div>";
+ echo "<div class='xoopsEmotions'>";
+ $count = count($smiles);
+
+ for ($i = 0; $i < $count; $i++) {
+ if ($op == '') {
+ if ($smiles[$i]['display']) {
+ echo '<img class="xoopsEmotions" onclick="XoopsemotionsDialog.insert(this);" src="' . XOOPS_UPLOAD_URL . '/' . $smiles[$i]['smile_url'] . '" alt="' . $myts->htmlspecialchars($smiles[$i]['emotion']) . '" title="' . $myts->htmlspecialchars($smiles[$i]['emotion']) . '" />';
+ }
+ } else {
+ echo '<img class="xoopsEmotions" onclick="XoopsemotionsDialog.insert(this);" src="' . XOOPS_UPLOAD_URL . '/' . $smiles[$i]['smile_url'] . '" alt="' . $myts->htmlspecialchars($smiles[$i]['emotion']) . '" title="' . $myts->htmlspecialchars($smiles[$i]['emotion']) . '" />';
+ }
+ }
+ if ($op == '') {
+ echo '<div class="xoopsEmotions">';
+ echo '<a class="xoopsEmotions" href="' . $current_file . '?op=' . _MORE . '">' . _MORE . '</a>';
+ echo '</div>';
+ }
+ echo "</div>";
+ } else {
+ echo "<div>{#xoopsemotions_dlg.error_noemotions}</div>";
+ }
+ ?>
+ <div class="mceActionPanel floatright">
+ <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+ </div>
+ </div>
+
+ <div id="emotionsadmin_panel" class="panel" style="overflow:auto;">
+ <?php
+ if ($admin) {
+ include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+
+ $smile_form = new XoopsThemeForm(_AM_ADDSMILE, 'smileform', $current_file, 'post', true);
+ $smile_form->setExtra('enctype="multipart/form-data"');
+ $smile_form->addElement(new XoopsFormText(_AM_SMILECODE, 'smile_code', 26, 25, ''), true);
+ $smile_form->addElement(new XoopsFormText(_AM_SMILEEMOTION, 'smile_desc', 26, 25, ''), true);
+ $smile_select = new XoopsFormFile('', 'smile_url', 5000000);
+ $smile_label = new XoopsFormLabel('', '<img src="'.XOOPS_UPLOAD_URL.'/blank.gif" alt="" />');
+ $smile_tray = new XoopsFormElementTray(_IMAGEFILE.':', ' ');
+ $smile_tray->addElement($smile_select);
+ $smile_tray->addElement($smile_label);
+ $smile_form->addElement($smile_tray);
+ $smile_form->addElement(new XoopsFormRadioYN(_AM_DISPLAYF, 'smile_display', 1));
+ $smile_form->addElement(new XoopsFormHidden('id', ''));
+ $smile_form->addElement(new XoopsFormHidden('op', 'SmilesAdd'));
+ $smile_form->addElement(new XoopsFormHidden('fct', 'smilies'));
+ $smile_form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+
+ $smile_form->display();
+ }
+ ?>
+ <div class="mceActionPanel floatright">
+ <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+ </div>
+ </div>
+
+</div>
+<?php xoops_footer(); ?>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php 2014-03-08 10:10:21 UTC (rev 12362)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php 2014-03-08 10:39:06 UTC (rev 12363)
@@ -1,637 +1,631 @@
-<?php
-/**
- * Xoopsemotions plugin for tinymce
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package class / xoopseditor
- * @subpackage tinymce / xoops plugins
- * @since 2.3.0
- * @author ralf57
- * @author luciorota <luc...@gm...>
- * @author Laurent JEN <du...@fr...>
- * @version $Id: xoopsimagebrowser.php 11937 2013-08-18 02:25:16Z beckmi $
- */
-
-// load mainfile.php
-$current_path = dirname(__FILE__);
-if ( DIRECTORY_SEPARATOR != "/" ) {
- $current_path = str_replace( DIRECTORY_SEPARATOR, "/", $current_path);
-}
-$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();
-
-/**
- * This code was mov...
[truncated message content] |
|
From: <be...@us...> - 2014-04-07 03:51:21
|
Revision: 12430
http://sourceforge.net/p/xoops/svn/12430
Author: beckmi
Date: 2014-04-07 03:51:17 +0000 (Mon, 07 Apr 2014)
Log Message:
-----------
Getting module versions in sync with XOOPS Release version
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/xoops_version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/xoops_version.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/xoops_version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/xoops_version.php 2014-04-07 02:59:35 UTC (rev 12429)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/xoops_version.php 2014-04-07 03:51:17 UTC (rev 12430)
@@ -43,7 +43,7 @@
$modversion['release_date'] = '2014/02/05';
$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "Beta 1";
+$modversion["module_status"] = "RC 2";
$modversion['min_php'] = '5.3.7';
$modversion['min_xoops'] = "2.5.7";
$modversion['min_admin'] = '1.1';
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/xoops_version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/xoops_version.php 2014-04-07 02:59:35 UTC (rev 12429)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/xoops_version.php 2014-04-07 03:51:17 UTC (rev 12430)
@@ -42,7 +42,7 @@
$modversion['release_date'] = '2014/02/05';
$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "Beta 1";
+$modversion["module_status"] = "RC 2";
$modversion['min_php'] = '5.3.7';
$modversion['min_xoops'] = "2.5.7";
$modversion['min_admin'] = '1.1';
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/xoops_version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/xoops_version.php 2014-04-07 02:59:35 UTC (rev 12429)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/xoops_version.php 2014-04-07 03:51:17 UTC (rev 12430)
@@ -37,7 +37,7 @@
$modversion['release_date'] = '2014/02/05';
$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "Beta 1";
+$modversion["module_status"] = "RC 2";
$modversion['min_php']='5.3.7';
$modversion['min_xoops']="2.5.7";
// start hack by Mage
|
|
From: <be...@us...> - 2014-05-19 14:19:40
|
Revision: 12537
http://sourceforge.net/p/xoops/svn/12537
Author: beckmi
Date: 2014-05-19 14:19:33 +0000 (Mon, 19 May 2014)
Log Message:
-----------
Few code cosmetic changes
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ads.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ldap.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_provisionning.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_xoops.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/authfactory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/apc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/file.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/memcache.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/model.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xcache.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xoopscache.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.recaptcha.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.text.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/recaptcha.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/text.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/xoopscaptcha.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/commentrenderer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/criteria.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/database.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/databasefactory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/mysqldatabase.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/downloader.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/errorhandler.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/file/file.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/file/xoopsfile.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger/render.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger/xoopslogger.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/logger_render.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mail/xoopsmultimailer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/mimetypes.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/joint.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/read.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/stats.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/sync.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/write.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/model/xoopsmodel.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/module.errorhandler.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/pagenav.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/preload.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/internals/core.rm_auto.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/tardownloader.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/template.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/censor/censor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/censor/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/config.custom.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/flash/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/flash/flash.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/iframe/iframe.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/image/image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/li/li.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/mms/mms.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/mp3/mp3.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/rtsp/rtsp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/syntaxhighlight/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/textfilter/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/textfilter/textfilter.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/ul/ul.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wiki/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wiki/wiki.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/textsanitizer/wmp/wmp.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme_blocks.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/tree.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/uploader.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/userutility.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/utility/xoopsutility.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/bloggerapi.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/metaweblogapi.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/movabletypeapi.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/xmlrpcparser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rpc/xoopsapi.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/rss/xmlrss2parser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xml/themesetparser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsblock.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopscomments.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/sampleform.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/xoopseditor.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/xoopseditor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/form.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formbutton.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formbuttontray.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcaptcha.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcheckbox.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcolorpicker.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdhtmltextarea.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formeditor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelement.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelementtray.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formfile.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formhidden.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formhiddentoken.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formlabel.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formpassword.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formradioyn.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselect.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectcheckgroup.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectcountry.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecteditor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectgroup.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectlang.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectmatchoption.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecttheme.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecttimezone.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselectuser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formtext.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formtextarea.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formtextdateselect.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/grouppermform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/simpleform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/tableform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/themeform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopskernel.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsload.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopslocal.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsmailer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsmodule.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsobject.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopssecurity.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopstree.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsuser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/zipdownloader.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/footer.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/header.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/checklogin.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_constants.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_new.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_post.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/comment_reply.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/commentform.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/defines.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.encoding.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.legacy.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/license.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/mimetypes.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/notification_constants.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/notification_functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/notification_select.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/old_functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/registerform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/searchform.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/site-closed.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/version.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/xoops13_header.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/xoopscodes.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/xoopslocal.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/install/include/license.dist.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/avatar.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/block.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/blockinstance.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/comment.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/config.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/configcategory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/configitem.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/configoption.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/group.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/groupperm.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/handlerregistry.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/image.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/imagecategory.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/imageset.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/imagesetimg.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/member.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/module.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/notification.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/object.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/online.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/privmessage.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/session.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/tplfile.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/tplset.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/user.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/formdhtmltextarea.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/locale.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/logger.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/language/english/xoopsmailerlocal.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/core.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/preloads/system.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/preloads/core.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/protector/preloads/core.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/tplsets/jquery.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/users/jquery.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/avatar.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/banner.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/bannerclient.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/bannerfinish.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/block.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/blocklinkmodule.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/group.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/maintenance.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/menu.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/smilies.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/userrank.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/users.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/menu.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/preloads/core.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/xoops_and_module_changes/class/pagenav.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
/**
*
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ads.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ads.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ads.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
/**
*
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ldap.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ldap.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_ldap.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
* @author Pierre-Eric MENUET <pe...@fr...>
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
/**
*
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_provisionning.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_provisionning.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_provisionning.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
* @author Pierre-Eric MENUET <pe...@fr...>
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
/**
*
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_xoops.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_xoops.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/auth_xoops.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
/**
*
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/authfactory.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/authfactory.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/auth/authfactory.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
/**
*
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/apc.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/apc.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/apc.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -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');
/**
* APC storage engine for cache.
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/file.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/file.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/file.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -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');
/**
* File Storage engine for cache
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/memcache.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/memcache.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/memcache.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
/**
* Memcache storage engine for cache
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/model.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/model.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/model.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -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');
/**
* Database Storage engine for cache
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xcache.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xcache.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xcache.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -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');
/**
* Xcache storage engine for cache.
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xoopscache.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xoopscache.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/cache/xoopscache.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -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');
/**
* Caching for CakePHP.
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.image.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.image.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.image.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -20,7 +20,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
return $config = array(
'num_chars' => 6, // Maximum characters
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
/**
* This keeping config in files has really got to stop. If we can't actually put these into
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.recaptcha.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.recaptcha.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.recaptcha.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
return $config = array(
'private_key' => 'YourPrivateApiKey',
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.text.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.text.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/config.text.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
return $config = array(
'num_chars' => 6, // Maximum characters
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/image.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/image.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/image.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -19,7 +19,7 @@
* @author Taiwen Jiang <ph...@us...>
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
/**
* Class XoopsCaptchaImage
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/recaptcha.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/recaptcha.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/recaptcha.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
/**
* Class XoopsCaptchaRecaptcha
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/text.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/text.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/text.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -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');
/**
* Class XoopsCaptchaText
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/xoopscaptcha.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/xoopscaptcha.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/captcha/xoopscaptcha.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -19,7 +19,7 @@
* @author Taiwen Jiang <ph...@us...>
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
/**
* Class XoopsCaptcha
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/commentrenderer.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/commentrenderer.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/commentrenderer.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
/**
* Display comments
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/criteria.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/criteria.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/criteria.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -19,7 +19,7 @@
* @author Taiwen Jiang <ph...@us...>
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
/**
* A criteria (grammar?) for a database query.
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/database.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/database.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/database.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -18,7 +18,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
/**
* make sure this is only included once!
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/databasefactory.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/databasefactory.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/databasefactory.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -15,7 +15,7 @@
* @subpackage database
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
/**
* XoopsDatabaseFactory
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/mysqldatabase.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/mysqldatabase.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/mysqldatabase.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
* @author Kazumi Ono <on...@xo...>
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
/**
*
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/database/sqlutility.php 2014-05-19 14:19:33 UTC (rev 12537)
@@ -17,7 +17,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+defined('XOOPS_ROOT_PATH') || die('Restricted access');
/**
* provide some utility methods for databases
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/downloader.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/downloader.php 2014-05-19 07:28:51 UTC (rev 12536)
+++ XoopsCore/branches/2.5.x/2.5.7/...
[truncated message content] |
|
From: <be...@us...> - 2014-06-15 03:39:14
|
Revision: 12599
http://sourceforge.net/p/xoops/svn/12599
Author: beckmi
Date: 2014-06-15 03:39:07 +0000 (Sun, 15 Jun 2014)
Log Message:
-----------
removing white spaces, updating to UTF-8
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopscode/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/js/xoopsimagemanager.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsquote/editor_plugin.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/form.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelement.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelementtray.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_results.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_userinfo.tpl
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/docs/changelog.txt
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js 2014-06-15 03:34:59 UTC (rev 12598)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js 2014-06-15 03:39:07 UTC (rev 12599)
@@ -1 +1 @@
-(function(){var a=tinymce.util.JSONRequest,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.SpellcheckerPlugin",{getInfo:function(){return{longname:"Spellchecker",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker",version:tinymce.majorVersion+"."+tinymce.minorVersion}},init:function(e,f){var g=this,d;g.url=f;g.editor=e;g.rpcUrl=e.getParam("spellchecker_rpc_url","{backend}");if(g.rpcUrl=="{backend}"){if(tinymce.isIE){return}g.hasSupport=true;e.onContextMenu.addToTop(function(h,i){if(g.active){return false}})}e.addCommand("mceSpellCheck",function(){if(g.rpcUrl=="{backend}"){g.editor.getBody().spellcheck=g.active=!g.active;return}if(!g.active){e.setProgressState(1);g._sendRPC("checkWords",[g.selectedLang,g._getWords()],function(h){if(h.length>0){g.active=1;g._markWords(h);e.setProgressState(0);e.nodeChanged()}else{e.setProgressState(0);if(e.getParam("spellchecker_report_no_misspellings",true)){e.windowManager.alert("spellchecker.no_mpell")}}})}else{g._done()}});if(e.settings.content_css!==false){e.contentCSS.push(f+"/css/content.css")}e.onClick.add(g._showMenu,g);e.onContextMenu.add(g._showMenu,g);e.onBeforeGetContent.add(function(){if(g.active){g._removeWords()}});e.onNodeChange.add(function(i,h){h.setActive("spellchecker",g.active)});e.onSetContent.add(function(){g._done()});e.onBeforeGetContent.add(function(){g._done()});e.onBeforeExecCommand.add(function(h,i){if(i=="mceFullScreen"){g._done()}});g.languages={};c(e.getParam("spellchecker_languages","+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv","hash"),function(i,h){if(h.indexOf("+")===0){h=h.substring(1);g.selectedLang=i}g.languages[h]=i})},createControl:function(h,d){var f=this,g,e=f.editor;if(h=="spellchecker"){if(f.rpcUrl=="{backend}"){if(f.hasSupport){g=d.createButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f})}return g}g=d.createSplitButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f});g.onRenderMenu.add(function(j,i){i.add({title:"spellchecker.langs","class":"mceMenuItemTitle"}).setDisabled(1);f.menuItems={};c(f.languages,function(n,m){var p={icon:1},l;p.onclick=function(){if(n==f.selectedLang){return}f._updateMenu(l);f.selectedLang=n};p.title=m;l=i.add(p);l.setSelected(n==f.selectedLang);f.menuItems[n]=l;if(n==f.selectedLang){f.selectedItem=l}})});return g}},setLanguage:function(e){var d=this;if(e==d.selectedLang){return}if(tinymce.grep(d.languages,function(f){return f===e}).length===0){throw"Unknown language: "+e}d.selectedLang=e;if(d.menuItems){d._updateMenu(d.menuItems[e])}if(d.active){d._done()}},_updateMenu:function(d){d.setSelected(1);this.selectedItem.setSelected(0);this.selectedItem=d},_walk:function(i,g){var h=this.editor.getDoc(),e;if(h.createTreeWalker){e=h.createTreeWalker(i,NodeFilter.SHOW_TEXT,null,false);while((i=e.nextNode())!=null){g.call(this,i)}}else{tinymce.walk(i,g,"childNodes")}},_getSeparators:function(){var e="",d,f=this.editor.getParam("spellchecker_word_separator_chars",'\\s!"#$%&()*+,-./:;<=>?@[]^_{|}\xA7\xA9\xAB\xAE\xB1\xB6\xB7\xB8\xBB\xBC\xBD\xBE\xBF\xD7\xF7\xA4\u201d\u201c');for(d=0;d<f.length;d++){e+="\\"+f.charAt(d)}return e},_getWords:function(){var e=this.editor,g=[],d="",f={},h=[];this._walk(e.getBody(),function(i){if(i.nodeType==3){d+=i.nodeValue+" "}});if(e.getParam("spellchecker_word_pattern")){h=d.match("("+e.getParam("spellchecker_word_pattern")+")","gi")}else{d=d.replace(new RegExp("([0-9]|["+this._getSeparators()+"])","g")," ");d=tinymce.trim(d.replace(/(\s+)/g," "));h=d.split(" ")}c(h,function(i){if(!f[i]){g.push(i);f[i]=1}});return g},_removeWords:function(d){var e=this.editor,h=e.dom,g=e.selection,f=g.getRng(true);c(h.select("span").reverse(),function(i){if(i&&(h.hasClass(i,"mceItemHiddenSpellWord")||h.hasClass(i,"mceItemHidden"))){if(!d||h.decode(i.innerHTML)==d){h.remove(i,1)}}});g.setRng(f)},_markWords:function(l){var h=this.editor,g=h.dom,j=h.getDoc(),i=h.selection,d=i.getRng(true),e=[],k=l.join("|"),m=this._getSeparators(),f=new RegExp("(^|["+m+"])("+k+")(?=["+m+"]|$)","g");this._walk(h.getBody(),function(o){if(o.nodeType==3){e.push(o)}});c(e,function(t){var r,q,o,s,p=t.nodeValue;f.lastIndex=0;if(f.test(p)){p=g.encode(p);q=g.create("span",{"class":"mceItemHidden"});if(tinymce.isIE){p=p.replace(f,"$1<mcespell>$2</mcespell>");while((s=p.indexOf("<mcespell>"))!=-1){o=p.substring(0,s);if(o.length){r=j.createTextNode(g.decode(o));q.appendChild(r)}p=p.substring(s+10);s=p.indexOf("</mcespell>");o=p.substring(0,s);p=p.substring(s+11);q.appendChild(g.create("span",{"class":"mceItemHiddenSpellWord"},o))}if(p.length){r=j.createTextNode(g.decode(p));q.appendChild(r)}}else{q.innerHTML=p.replace(f,'$1<span class="mceItemHiddenSpellWord">$2</span>')}g.replace(q,t)}});i.setRng(d)},_showMenu:function(h,j){var i=this,h=i.editor,d=i._menu,l,k=h.dom,g=k.getViewPort(h.getWin()),f=j.target;j=0;if(!d){d=h.controlManager.createDropMenu("spellcheckermenu",{"class":"mceNoIcons"});i._menu=d}if(k.hasClass(f,"mceItemHiddenSpellWord")){d.removeAll();d.add({title:"spellchecker.wait","class":"mceMenuItemTitle"}).setDisabled(1);i._sendRPC("getSuggestions",[i.selectedLang,k.decode(f.innerHTML)],function(m){var e;d.removeAll();if(m.length>0){d.add({title:"spellchecker.sug","class":"mceMenuItemTitle"}).setDisabled(1);c(m,function(n){d.add({title:n,onclick:function(){k.replace(h.getDoc().createTextNode(n),f);i._checkDone()}})});d.addSeparator()}else{d.add({title:"spellchecker.no_sug","class":"mceMenuItemTitle"}).setDisabled(1)}if(h.getParam("show_ignore_words",true)){e=i.editor.getParam("spellchecker_enable_ignore_rpc","");d.add({title:"spellchecker.ignore_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}}});d.add({title:"spellchecker.ignore_words",onclick:function(){var n=f.innerHTML;i._removeWords(k.decode(n));i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWords",[i.selectedLang,n],function(o){h.setProgressState(0)})}}})}if(i.editor.getParam("spellchecker_enable_learn_rpc")){d.add({title:"spellchecker.learn_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();h.setProgressState(1);i._sendRPC("learnWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}})}d.update()});l=b.getPos(h.getContentAreaContainer());d.settings.offset_x=l.x;d.settings.offset_y=l.y;h.selection.select(f);l=k.getPos(f);d.showMenu(l.x,l.y+f.offsetHeight-g.y);return tinymce.dom.Event.cancel(j)}else{d.hideMenu()}},_checkDone:function(){var e=this,d=e.editor,g=d.dom,f;c(g.select("span"),function(h){if(h&&g.hasClass(h,"mceItemHiddenSpellWord")){f=true;return false}});if(!f){e._done()}},_done:function(){var d=this,e=d.active;if(d.active){d.active=0;d._removeWords();if(d._menu){d._menu.hideMenu()}if(e){d.editor.nodeChanged()}}},_sendRPC:function(e,g,d){var f=this;a.sendRPC({url:f.rpcUrl,method:e,params:g,success:d,error:function(i,h){f.editor.setProgressState(0);f.editor.windowManager.alert(i.errstr||("Error response: "+h.responseText))}})}});tinymce.PluginManager.add("spellchecker",tinymce.plugins.SpellcheckerPlugin)})();
\ No newline at end of file
+(function(){var a=tinymce.util.JSONRequest,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.SpellcheckerPlugin",{getInfo:function(){return{longname:"Spellchecker",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker",version:tinymce.majorVersion+"."+tinymce.minorVersion}},init:function(e,f){var g=this,d;g.url=f;g.editor=e;g.rpcUrl=e.getParam("spellchecker_rpc_url","{backend}");if(g.rpcUrl=="{backend}"){if(tinymce.isIE){return}g.hasSupport=true;e.onContextMenu.addToTop(function(h,i){if(g.active){return false}})}e.addCommand("mceSpellCheck",function(){if(g.rpcUrl=="{backend}"){g.editor.getBody().spellcheck=g.active=!g.active;return}if(!g.active){e.setProgressState(1);g._sendRPC("checkWords",[g.selectedLang,g._getWords()],function(h){if(h.length>0){g.active=1;g._markWords(h);e.setProgressState(0);e.nodeChanged()}else{e.setProgressState(0);if(e.getParam("spellchecker_report_no_misspellings",true)){e.windowManager.alert("spellchecker.no_mpell")}}})}else{g._done()}});if(e.settings.content_css!==false){e.contentCSS.push(f+"/css/content.css")}e.onClick.add(g._showMenu,g);e.onContextMenu.add(g._showMenu,g);e.onBeforeGetContent.add(function(){if(g.active){g._removeWords()}});e.onNodeChange.add(function(i,h){h.setActive("spellchecker",g.active)});e.onSetContent.add(function(){g._done()});e.onBeforeGetContent.add(function(){g._done()});e.onBeforeExecCommand.add(function(h,i){if(i=="mceFullScreen"){g._done()}});g.languages={};c(e.getParam("spellchecker_languages","+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv","hash"),function(i,h){if(h.indexOf("+")===0){h=h.substring(1);g.selectedLang=i}g.languages[h]=i})},createControl:function(h,d){var f=this,g,e=f.editor;if(h=="spellchecker"){if(f.rpcUrl=="{backend}"){if(f.hasSupport){g=d.createButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f})}return g}g=d.createSplitButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f});g.onRenderMenu.add(function(j,i){i.add({title:"spellchecker.langs","class":"mceMenuItemTitle"}).setDisabled(1);f.menuItems={};c(f.languages,function(n,m){var p={icon:1},l;p.onclick=function(){if(n==f.selectedLang){return}f._updateMenu(l);f.selectedLang=n};p.title=m;l=i.add(p);l.setSelected(n==f.selectedLang);f.menuItems[n]=l;if(n==f.selectedLang){f.selectedItem=l}})});return g}},setLanguage:function(e){var d=this;if(e==d.selectedLang){return}if(tinymce.grep(d.languages,function(f){return f===e}).length===0){throw"Unknown language: "+e}d.selectedLang=e;if(d.menuItems){d._updateMenu(d.menuItems[e])}if(d.active){d._done()}},_updateMenu:function(d){d.setSelected(1);this.selectedItem.setSelected(0);this.selectedItem=d},_walk:function(i,g){var h=this.editor.getDoc(),e;if(h.createTreeWalker){e=h.createTreeWalker(i,NodeFilter.SHOW_TEXT,null,false);while((i=e.nextNode())!=null){g.call(this,i)}}else{tinymce.walk(i,g,"childNodes")}},_getSeparators:function(){var e="",d,f=this.editor.getParam("spellchecker_word_separator_chars",'\\s!"#$%&()*+,-./:;<=>?@[]^_{|}§©«®±¶·¸»¼½¾¿×÷¤\u201d\u201c');for(d=0;d<f.length;d++){e+="\\"+f.charAt(d)}return e},_getWords:function(){var e=this.editor,g=[],d="",f={},h=[];this._walk(e.getBody(),function(i){if(i.nodeType==3){d+=i.nodeValue+" "}});if(e.getParam("spellchecker_word_pattern")){h=d.match("("+e.getParam("spellchecker_word_pattern")+")","gi")}else{d=d.replace(new RegExp("([0-9]|["+this._getSeparators()+"])","g")," ");d=tinymce.trim(d.replace(/(\s+)/g," "));h=d.split(" ")}c(h,function(i){if(!f[i]){g.push(i);f[i]=1}});return g},_removeWords:function(d){var e=this.editor,h=e.dom,g=e.selection,f=g.getRng(true);c(h.select("span").reverse(),function(i){if(i&&(h.hasClass(i,"mceItemHiddenSpellWord")||h.hasClass(i,"mceItemHidden"))){if(!d||h.decode(i.innerHTML)==d){h.remove(i,1)}}});g.setRng(f)},_markWords:function(l){var h=this.editor,g=h.dom,j=h.getDoc(),i=h.selection,d=i.getRng(true),e=[],k=l.join("|"),m=this._getSeparators(),f=new RegExp("(^|["+m+"])("+k+")(?=["+m+"]|$)","g");this._walk(h.getBody(),function(o){if(o.nodeType==3){e.push(o)}});c(e,function(t){var r,q,o,s,p=t.nodeValue;f.lastIndex=0;if(f.test(p)){p=g.encode(p);q=g.create("span",{"class":"mceItemHidden"});if(tinymce.isIE){p=p.replace(f,"$1<mcespell>$2</mcespell>");while((s=p.indexOf("<mcespell>"))!=-1){o=p.substring(0,s);if(o.length){r=j.createTextNode(g.decode(o));q.appendChild(r)}p=p.substring(s+10);s=p.indexOf("</mcespell>");o=p.substring(0,s);p=p.substring(s+11);q.appendChild(g.create("span",{"class":"mceItemHiddenSpellWord"},o))}if(p.length){r=j.createTextNode(g.decode(p));q.appendChild(r)}}else{q.innerHTML=p.replace(f,'$1<span class="mceItemHiddenSpellWord">$2</span>')}g.replace(q,t)}});i.setRng(d)},_showMenu:function(h,j){var i=this,h=i.editor,d=i._menu,l,k=h.dom,g=k.getViewPort(h.getWin()),f=j.target;j=0;if(!d){d=h.controlManager.createDropMenu("spellcheckermenu",{"class":"mceNoIcons"});i._menu=d}if(k.hasClass(f,"mceItemHiddenSpellWord")){d.removeAll();d.add({title:"spellchecker.wait","class":"mceMenuItemTitle"}).setDisabled(1);i._sendRPC("getSuggestions",[i.selectedLang,k.decode(f.innerHTML)],function(m){var e;d.removeAll();if(m.length>0){d.add({title:"spellchecker.sug","class":"mceMenuItemTitle"}).setDisabled(1);c(m,function(n){d.add({title:n,onclick:function(){k.replace(h.getDoc().createTextNode(n),f);i._checkDone()}})});d.addSeparator()}else{d.add({title:"spellchecker.no_sug","class":"mceMenuItemTitle"}).setDisabled(1)}if(h.getParam("show_ignore_words",true)){e=i.editor.getParam("spellchecker_enable_ignore_rpc","");d.add({title:"spellchecker.ignore_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}}});d.add({title:"spellchecker.ignore_words",onclick:function(){var n=f.innerHTML;i._removeWords(k.decode(n));i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWords",[i.selectedLang,n],function(o){h.setProgressState(0)})}}})}if(i.editor.getParam("spellchecker_enable_learn_rpc")){d.add({title:"spellchecker.learn_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();h.setProgressState(1);i._sendRPC("learnWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}})}d.update()});l=b.getPos(h.getContentAreaContainer());d.settings.offset_x=l.x;d.settings.offset_y=l.y;h.selection.select(f);l=k.getPos(f);d.showMenu(l.x,l.y+f.offsetHeight-g.y);return tinymce.dom.Event.cancel(j)}else{d.hideMenu()}},_checkDone:function(){var e=this,d=e.editor,g=d.dom,f;c(g.select("span"),function(h){if(h&&g.hasClass(h,"mceItemHiddenSpellWord")){f=true;return false}});if(!f){e._done()}},_done:function(){var d=this,e=d.active;if(d.active){d.active=0;d._removeWords();if(d._menu){d._menu.hideMenu()}if(e){d.editor.nodeChanged()}}},_sendRPC:function(e,g,d){var f=this;a.sendRPC({url:f.rpcUrl,method:e,params:g,success:d,error:function(i,h){f.editor.setProgressState(0);f.editor.windowManager.alert(i.errstr||("Error response: "+h.responseText))}})}});tinymce.PluginManager.add("spellchecker",tinymce.plugins.SpellcheckerPlugin)})();
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopscode/editor_plugin.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopscode/editor_plugin.js 2014-06-15 03:34:59 UTC (rev 12598)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopscode/editor_plugin.js 2014-06-15 03:39:07 UTC (rev 12599)
@@ -2,7 +2,7 @@
* $Id: editor_plugin.js 11937 2013-08-18 02:25:16Z beckmi $
*
* @author Moxiecode
- * @copyright Copyright \xA9 2004-2008, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
*/
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/js/xoopsimagemanager.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/js/xoopsimagemanager.js 2014-06-15 03:34:59 UTC (rev 12598)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/js/xoopsimagemanager.js 2014-06-15 03:39:07 UTC (rev 12599)
@@ -1,6 +1,6 @@
/**
* @author Moxiecode
- * @copyright Copyright \xA9 2004-2008, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
*
* @author ralf57
* @author luciorota (luc...@gm...)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php 2014-06-15 03:34:59 UTC (rev 12598)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php 2014-06-15 03:39:07 UTC (rev 12599)
@@ -177,7 +177,7 @@
}
// Add new image - end
- // Add new cat\xE9gorie - start
+ // Add new catégorie - start
if ( !empty($_POST["op"]) && $op == "addcat" ) {
if (!$GLOBALS["xoopsSecurity"]->check()) {
redirect_header($current_file . "?target=" . $target, 3, implode("<br />", $GLOBALS["xoopsSecurity"]->getErrors()));
@@ -230,7 +230,7 @@
}
redirect_header($current_file . "?target=" . $target, 3,_MD_AM_DBUPDATED);
}
- // Add new cat\xE9gorie - end
+ // Add new catégorie - end
// Update categorie - start
if ( !empty($_POST["op"]) && $op == "updatecat" ) {
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsquote/editor_plugin.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsquote/editor_plugin.js 2014-06-15 03:34:59 UTC (rev 12598)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsquote/editor_plugin.js 2014-06-15 03:39:07 UTC (rev 12599)
@@ -2,7 +2,7 @@
* $Id: editor_plugin.js 11937 2013-08-18 02:25:16Z beckmi $
*
* @author Moxiecode
- * @copyright Copyright \xA9 2004-2008, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
*/
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/form.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/form.php 2014-06-15 03:34:59 UTC (rev 12598)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/form.php 2014-06-15 03:39:07 UTC (rev 12599)
@@ -271,7 +271,7 @@
*
* @param object $formElement reference to a {@link XoopsFormElement}
* @param bool $required is this a "required" element?
- *
+ *
*/
function addElement(&$formElement, $required = false)
{
@@ -298,7 +298,7 @@
* get an array of forms elements
*
* @param bool $recurse get elements recursively?
- *
+ *
* @return array array of {@link XoopsFormElement}s
*/
function &getElements($recurse = false)
@@ -452,7 +452,7 @@
/**
* set the summary tag for the <form> tag
*
- * @param string $summary
+ * @param string $summary
*/
function setSummary($summary)
{
@@ -476,7 +476,7 @@
/**
* make an element "required"
*
- * @param object $formElement reference to a {@link XoopsFormElement}
+ * @param object $formElement reference to a {@link XoopsFormElement}
*/
function setRequired(&$formElement)
{
@@ -573,7 +573,7 @@
/**
* assign to smarty form template instead of displaying directly
*
- * @param object $tpl reference to a {@link Smarty} object object
+ * @param object $tpl reference to a {@link Smarty} object object
* @see Smarty
*/
function assign(&$tpl)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php 2014-06-15 03:34:59 UTC (rev 12598)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php 2014-06-15 03:39:07 UTC (rev 12599)
@@ -47,18 +47,18 @@
$this->addElement(new XoopsFormTextDateSelect('', $name . '[date]', $size, $value, $showtime));
if ($showtime) {
- $timearray = array();
- for ($i = 0; $i < 24; $i++) {
- for ($j = 0; $j < 60; $j = $j + 10) {
- $key = ($i * 3600) + ($j * 60);
- $timearray[$key] = ($j != 0) ? $i . ':' . $j : $i . ':0' . $j;
- }
+ $timearray = array();
+ for ($i = 0; $i < 24; ++$i) {
+ for ($j = 0; $j < 60; $j = $j + 10) {
+ $key = ($i * 3600) + ($j * 60);
+ $timearray[$key] = ($j != 0) ? $i . ':' . $j : $i . ':0' . $j;
}
- ksort($timearray);
+ }
+ ksort($timearray);
- $timeselect = new XoopsFormSelect('', $name . '[time]', $datetime['hours'] * 3600 + 600 * ceil($datetime['minutes'] / 10));
- $timeselect->addOptionArray($timearray);
- $this->addElement($timeselect);
+ $timeselect = new XoopsFormSelect('', $name . '[time]', $datetime['hours'] * 3600 + 600 * ceil($datetime['minutes'] / 10));
+ $timeselect->addOptionArray($timearray);
+ $this->addElement($timeselect);
} else {
$this->addElement(new XoopsFormHidden($name . '[time]', 0));
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelement.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelement.php 2014-06-15 03:34:59 UTC (rev 12598)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelement.php 2014-06-15 03:39:07 UTC (rev 12599)
@@ -201,7 +201,7 @@
/**
* set the "class" attribute for the element
*
- * @param string $class
+ * @param string $class
*/
function setClass($class)
{
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelementtray.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelementtray.php 2014-06-15 03:34:59 UTC (rev 12598)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelementtray.php 2014-06-15 03:39:07 UTC (rev 12599)
@@ -88,7 +88,7 @@
*
* @param object $formElement {@link XoopsFormElement} to add
* @param bool $required
- *
+ *
*/
function addElement( &$formElement, $required = false )
{
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_results.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_results.tpl 2014-06-15 03:34:59 UTC (rev 12598)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_results.tpl 2014-06-15 03:39:07 UTC (rev 12599)
@@ -15,7 +15,7 @@
</tr>
<{/foreach}>
</table>
-
+
<{$nav}>
<{else}>
<div class="errorMsg">
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_userinfo.tpl
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_userinfo.tpl 2014-06-15 03:34:59 UTC (rev 12598)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/templates/profile_userinfo.tpl 2014-06-15 03:39:07 UTC (rev 12599)
@@ -15,7 +15,7 @@
<form name="usernav" action="user.php" method="post">
<input type="button" value="<{$smarty.const._PROFILE_MA_SENDPM}>" onclick="javascript:openWithSelfMain('<{$xoops_url}>/pmlite.php?send2=1&to_userid=<{$user_uid}>', 'pmlite', 450, 380);" />
</form>
- <{/if}>
+ <{/if}>
</div>
</div>
<br class="clear"/>
@@ -99,5 +99,5 @@
<{/foreach}>
<!-- end module search results loop -->
-</div>
+</div>
<{/if}>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php 2014-06-15 03:34:59 UTC (rev 12598)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php 2014-06-15 03:39:07 UTC (rev 12599)
@@ -578,7 +578,7 @@
$criteria->add(new Criteria("tpl_type", $type), "AND");
$tplfiles = $tplfile_handler->getObjects($criteria);
- $tpldata =& xoops_module_gettemplate($dirname, $tpl['file'], $type);
+ $tpldata =& xoops_module_gettemplate($dirname, $tpl['file'], $type);
$tplfile = empty($tplfiles) ? $tplfile_handler->create() : $tplfiles[0];
// END irmtfan solve templates duplicate issue
$tplfile->setVar('tpl_refid', $newmid);
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/docs/changelog.txt 2014-06-15 03:34:59 UTC (rev 12598)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/xoops_lib/modules/protector/docs/changelog.txt 2014-06-15 03:39:07 UTC (rev 12599)
@@ -1,5 +1,5 @@
[xlang:en]
-= CHANGES =
+= CHANGES =
CHANGES are moved into README after 2.57
|
|
From: <be...@us...> - 2014-06-16 06:30:03
|
Revision: 12609
http://sourceforge.net/p/xoops/svn/12609
Author: beckmi
Date: 2014-06-16 06:30:00 +0000 (Mon, 16 Jun 2014)
Log Message:
-----------
Updating help text
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/default/language/english/admin.php
Removed Paths:
-------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xbootstrap/modules/extgallery/extgallery_public-photo.html.bak
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/default/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/default/language/english/admin.php 2014-06-16 05:16:47 UTC (rev 12608)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/default/language/english/admin.php 2014-06-16 06:30:00 UTC (rev 12609)
@@ -46,8 +46,8 @@
define('_OXYGEN_ADMINISTRATION',"XOOPS Administration");
define('_OXYGEN_UPTOP',"Up Top");
//Add help
-define('_OXYGEN_HELP_1',"How can I make content?");
-define('_OXYGEN_HELP_DESC_1','To make content you must first install some module, like the <a href="http://xoops.svn.sourceforge.net/viewvc/xoops/XoopsModules/fmcontent/trunk/?view=tar" rel="external">fmContent</a> or the <a href="https://sourceforge.net/projects/xoops/files/XOOPS%20Module%20Repository/XOOPS2/Content/XOOPS2.5_mod_content_1.4_kerkyra.zip/download" rel="external">Content</a> module. To learn more about modules <a href="modules/system/help.php?mid=1&page=modulesadmin">click here</a>' );
+define('_OXYGEN_HELP_1',"How can I create content with XOOPS?");
+define('_OXYGEN_HELP_DESC_1','To create content, you must first install a content module, like the <a href="https://sourceforge.net/p/xoops/svn/HEAD/tree/XoopsModules/publisher/trunk/" rel="external">Publisher</a> or the <a href="https://sourceforge.net/p/xoops/svn/HEAD/tree/XoopsModules/news/trunk/" rel="external">News</a> module. To learn more about XOOPS modules <a href="modules/system/help.php?mid=1&page=modulesadmin">click here</a>' );
define('_OXYGEN_HELP_2',"What is the Block?");
define('_OXYGEN_HELP_DESC_2','Blocks can provide additional/specific content from the installed modules. There can be and custom blocks which can contain text, JS Code, HTML formatted text, pictures, etc. The content in these blocks may be formatted individually or can inherit formatting from the Website. (<a href="modules/system/help.php?mid=1&page=blocksadmin">more ...</a>)');
define('_OXYGEN_HELP_3',"How I can find more help?");
Deleted: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xbootstrap/modules/extgallery/extgallery_public-photo.html.bak
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xbootstrap/modules/extgallery/extgallery_public-photo.html.bak 2014-06-16 05:16:47 UTC (rev 12608)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xbootstrap/modules/extgallery/extgallery_public-photo.html.bak 2014-06-16 06:30:00 UTC (rev 12609)
@@ -1,163 +0,0 @@
-<div class="row extGalleryAlbum">
-<div class="col-md-12">
- <ul class="breadcrumb">
- <li><a title="<{$extgalleryName}>" href="<{xoAppUrl modules/extgallery/}>"><{$extgalleryName}></a></li>
-
- <{foreachq item=node from=$catPath name=breadcrumb}>
- <li><a href="<{xoAppUrl modules/extgallery/}>public-<{if $node.cat_isalbum}><{$display_type}><{else}>categories<{/if}>.php?id=<{$node.cat_id}>" title="<{$node.cat_name}>"><{$node.cat_name}></a></li>
- <{/foreach}>
- <li><{$photo.photo_title}></li>
- </ul>
-</div>
-
-<div class="col-md-12 aligncenter gallery-single-photo">
- <!-- Start Admin link -->
- <div class="row photo-nav-controls">
- <div class="col-xs-6 col-sm-6 col-md-6">
- <{if $xoops_isadmin}>
- <div class="pull-left">
- <a title="edit" class="btn btn-success btn-xs" href="<{xoAppUrl modules/extgallery/}>public-modify.php?op=edit&id=<{$photo.photo_id}>"><span class="glyphicon glyphicon-edit"></span></a>
- <a title="delete" class="btn btn-danger btn-xs" href="<{xoAppUrl modules/extgallery/}>public-modify.php?op=delete&id=<{$photo.photo_id}>"><span class="glyphicon glyphicon-trash"></span></a>
- </div>
- <{/if}>
- </div>
-
- <div class="col-xs-6 col-sm-6 col-md-6">
- <ul class="pull-right list-unstyled">
- <{if $prevId != 0}><li class="nav-btn"><a href="<{xoAppUrl modules/extgallery/}>public-photo.php?photoId=<{$prevId}>"><span class="glyphicon glyphicon-circle-arrow-left"></span></a><{else}></li><{/if}>
- <li class="small"><{$currentPhoto}></li>
- <li class="small"><{$lang.of}></li>
- <li class="small"><{$totalPhoto}></li>
- <{if $nextId != 0}><li class="nav-btn"><a href="<{xoAppUrl modules/extgallery/}>public-photo.php?photoId=<{$nextId}>"><span class="glyphicon glyphicon-circle-arrow-right"></span></a><{else}></li><{/if}>
- </ul>
- </div>
- </div><!-- .row || .photo-nav-controls -->
-
- <{if $photo.photo_serveur}>
- <img src="<{$photo.photo_serveur}><{$photo.photo_name}>" alt="<{$photo.photo_desc}>" class="img-thumbnail">
- <{else}>
- <img src="<{$xoops_url}>/uploads/extgallery/public-photo/medium/<{$photo.photo_name}>" alt="<{$photo.photo_title}>" class="img-thumbnail">
- <{/if}>
-</div><!-- .gallery-single-photo -->
-
-<div class="row gallery-image-details">
- <{if $disp_ph_title == 1 }>
- <!-- Start Photo Title -->
- <div class="col-md-12">
- <h3 class="gallerytitle"><{$photo.photo_title}></h3>
- </div>
- <{/if}>
-
- <!-- Start Photo desc -->
- <div class="col-md-12">
- <{$photo.photo_desc}>
- </div>
-
- <{if $enableExtra}>
- <!-- Start extra field -->
- <div class="col-md-12">
- <{$photo.photo_extra}>
- </div>
- <{/if}>
-
- <{foreachq item=pluginLink from=$pluginPhotoAlbumLink}>
- <a href="<{$pluginLink.link}><{$photo.photo_id}>" title="<{$pluginLink.name}>"><{$pluginLink.name}></a>
- <{/foreach}>
- <{foreachq item=pluginLink from=$photo.link}>
- <a href="<{$pluginLink.link}><{$photo.photo_id}>" title="<{$pluginLink.name}>"><{$pluginLink.name}></a>
- <{/foreach}>
-
- <!-- Start XOOPS Tag -->
- <{if $tags}>
- <div class="col-md-12">
- <{include file="db:tag_bar.html"}>
- </div>
- <{/if}>
-
- <!-- Start social network and bookmarks -->
- <div class="col-md-12 aligncenter">
- <div class='shareaholic-canvas' data-app='share_buttons' data-app-id='482507'></div>
- </div>
-</div><!-- .gallery-image-details -->
-
-<!-- Start Rating part -->
-<{if $canRate}>
- <div class="col-md-12">
- <h3 class="gallerytitle"><{$lang.voteFor}></h3>
- <div class="aligncenter">
- <a title="<{$lang.voteFor}> : 1" href="<{xoAppUrl modules/extgallery/}>public-rating.php?id=<{$photo.photo_id}>&rate=1"><img src="images/rating_1.gif" alt="<{$lang.voteFor}> : 1"></a>
- <a title="<{$lang.voteFor}> : 2" href="<{xoAppUrl modules/extgallery/}>public-rating.php?id=<{$photo.photo_id}>&rate=2"><img src="images/rating_2.gif" alt="<{$lang.voteFor}> : 2"></a>
- <a title="<{$lang.voteFor}> : 3" href="<{xoAppUrl modules/extgallery/}>public-rating.php?id=<{$photo.photo_id}>&rate=3"><img src="images/rating_3.gif" alt="<{$lang.voteFor}> : 3"></a>
- <a title="<{$lang.voteFor}> : 4" href="<{xoAppUrl modules/extgallery/}>public-rating.php?id=<{$photo.photo_id}>&rate=4"><img src="images/rating_4.gif" alt="<{$lang.voteFor}> : 4"></a>
- <a title="<{$lang.voteFor}> : 5" href="<{xoAppUrl modules/extgallery/}>public-rating.php?id=<{$photo.photo_id}>&rate=5"><img src="images/rating_5.gif" alt="<{$lang.voteFor}> : 5"></a>
- </div>
- </div>
-<{/if}>
-
-<!-- Start Photo Information -->
-<{if $enable_info }>
-
-<a href="#gallery-info" data-toggle="collapse" class="gallery-info-collapse" title="Info"><span class="glyphicon glyphicon-info-sign"></span></a>
-
-<div class="panel-collapse collapse" id="gallery-info">
-
- <h3 class="gallerytitle aligncenter"><{$lang.photoInfo}></h3>
- <ul class="list-unstyled photo-info">
- <{if $enable_submitter_lnk}>
- <li><{$lang.submitter}> : <a title="<{$photo.user.uname}>" href="<{$xoops_url}>/userinfo.php?uid=<{$photo.user.uid}>"><{$photo.user.uname}></a>
- <a title="<{$lang.allPhotoBy}> <{$photo.user.uname}>" href="<{xoAppUrl modules/extgallery/}>public-useralbum.php?id=<{$photo.user.uid}>">
- <{$lang.allPhotoBy}> <{$photo.user.uname}>
- </a>
- </li>
- <{/if}>
-
- <{if $enable_photo_hits}>
- <li><{$lang.view}> : <{$photo.photo_hits}> <{$lang.hits}></li>
- <{/if}>
-
- <{if $enable_resolution}>
- <li><{$lang.resolution}> : <{$photo.photo_res_x}> x <{$photo.photo_res_y}> <{$lang.pixels}> | <{$lang.fileSize}> : <{$photo.photo_size}> Kb</li>
- <{/if}>
-
- <{if $enable_date}>
- <li><{$lang.added}> : <{$photo.photo_date}></li>
- <{/if}>
-
- <{if $canRate}>
- <li><{$lang.score}> : <img src="images/rating_<{$rating}>.gif" alt="rating"> | <{$photo.photo_nbrating}> <{$lang.votes}></li>
- <{/if}>
-
- <{if $canDownload && $enable_download}>
- <li><a title="<{$lang.downloadOrig}>" href="<{xoAppUrl modules/extgallery/}>public-download.php?id=<{$photo.photo_id}>"><{$lang.downloadOrig}><img src="images/download.gif" alt="<{$lang.downloadOrig}>"></a> | <{$photo.photo_download}> <{$lang.donwloads}></li>
- <{/if}>
-
- <{if $canSendEcard && $enable_ecards}>
- <li><a title="<{$lang.sendEcard}>" href="<{xoAppUrl modules/extgallery/}>public-sendecard.php?id=<{$photo.photo_id}>"><{$lang.sendEcard}> <img src="images/ecard.gif" alt="<{$lang.sendEcard}>"></a> | <{$photo.photo_ecard}> <{$lang.sends}></li>
- <{/if}>
- </ul>
-</div>
-<{/if}>
-
- <{if $show_rss}>
- <div id="rss">
- <a href="<{xoAppUrl modules/extgallery/public-rss.php}>" title="<{$smarty.const._MD_EXTGALLERY_RSS}>">
- <img src="<{xoAppUrl modules/extgallery/images/feed.png}>" alt="<{$smarty.const._MD_EXTGALLERY_RSS}>" />
- </a>
- </div>
- <{/if}>
-
-</div><!-- .row || .extGalleryAlbum -->
-
-<{$commentsnav}>
-
-<{$lang_notice}>
-
-<{if $comment_mode == "flat"}>
- <{include file="db:system_comments_flat.html"}>
-<{elseif $comment_mode == "thread"}>
- <{include file="db:system_comments_thread.html"}>
-<{elseif $comment_mode == "nest"}>
- <{include file="db:system_comments_nest.html"}>
-<{/if}>
-
-<{include file='db:system_notification_select.html'}>
\ No newline at end of file
|
|
From: <rgr...@us...> - 2014-07-08 23:09:20
|
Revision: 12688
http://sourceforge.net/p/xoops/svn/12688
Author: rgriffith
Date: 2014-07-08 23:09:11 +0000 (Tue, 08 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.7/htdocs/modules/pm/viewpmsg.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/viewpmsg.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/viewpmsg.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/viewpmsg.php 2014-07-08 19:32:05 UTC (rev 12687)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/pm/viewpmsg.php 2014-07-08 23:09:11 UTC (rev 12688)
@@ -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.7/htdocs/viewpmsg.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/viewpmsg.php 2014-07-08 19:32:05 UTC (rev 12687)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/viewpmsg.php 2014-07-08 23:09:11 UTC (rev 12688)
@@ -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);
}
|