Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10909] XoopsCore/branches/2.6.x/2.6.0
|
From: <tr...@us...> - 2013-01-26 18:59:25
|
Revision: 10909
http://sourceforge.net/p/xoops/svn/10909
Author: trabis
Date: 2013-01-26 18:59:04 +0000 (Sat, 26 Jan 2013)
Log Message:
-----------
More language updates...
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/extras/login.php
XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php
XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/mail/xoopsmultimailer.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/module.textsanitizer.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/template.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/textsanitizer/image/image.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/sampleform.inc.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/formtinymce.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_code/xoops_code.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_quote/xoops_quote.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/form.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formbuttontray.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcheckbox.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcolorpicker.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdhtmltextarea.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formelement.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formmail.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formradioyn.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselect.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselecteditor.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselectmatchoption.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formtextdateselect.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formurl.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/grouppermform.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsmailer.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/imagemanager.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/calendarjs.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/checklogin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/cp_header.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/findusers.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/registerform.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/site-closed.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/createconfigform.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_extensioninstaller.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_moduleinstaller.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/global.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/xoopsmailerlocal.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/en_US/en_US.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/misc.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/class/avatar.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/class/form/avatar.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/avatars/templates/avatars_popup.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/banner.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/class/form/bannerclient.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/banners/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/form-tab.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/form.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/codex/request.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/admin/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/class/form/comment.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/class/helper.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/templates/admin/comments.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/comments/templates/comments.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/admin/header.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/class/form/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/class/form/image.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/class/form/image_imagemanager.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/templates/admin/images_admin_categories.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/templates/admin/images_admin_images.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/images/templates/images_tinymce.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/logger/plugins/legacy/render.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/mailusers/admin/send_mails.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/maintenance/admin/dump.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/maintenance/class/form/maintenance.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/class/form/menus_menu.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/class/form/menus_menus.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/templates/admin/menus_admin_menu.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/menus/templates/admin/menus_admin_menus.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/notifications/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/notifications/update.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/blocks/page_blocks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form/page_content.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form/page_related.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/pdf.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/print.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/rating.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/viewpage.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pdf/class/pdf.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/class/message.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/pmlite.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/readpmsg.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/viewpmsg.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/activate.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/visibility.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changemail.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changepass.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/field.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/field.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/form/regstep.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/install.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/register.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/search.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/categorylist.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/fieldlist.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/steplist.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/admin/visibility.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/userinfo.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/center.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/class/form/center.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/filters_disabled/postcommon_post_htmlpurify4everyone.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/filters_disabled/postcommon_post_htmlpurify4guest.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/templates/admin/protector_center.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/clone.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/mimetypes.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/admin/pw_delete_file.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/backend.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/blocks/items_new.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/blocks/latest_news.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/blocks/search.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/form/item.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/item.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/class/utils.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/file.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/include/ajax_rating.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/item.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/makepdf.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/print.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/rate.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/search.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/submit.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/blocks/publisher_search_block.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/templates/publisher_search.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/visit.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/class/form/smilies.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/popup.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/smilies_smiley.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/smilies/templates/smilies_tinymce.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/blocksadmin/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groupperm.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/groups/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/jquery.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/jquery.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/users.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/login.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/online.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/themes.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/block.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/group.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preferences.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/users.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/header.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_blocks_item.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_extensions.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_modules.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_confirm.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_misc_friend.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_misc_online.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userconfigs/class/form/configs.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userconfigs/class/form/modules.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/class/form/ranks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/captcha.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/image.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/recaptcha.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xcaptcha/class/form/text.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/class/form/language.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/class/form/tinymce.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/include/functions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xlanguage/templates/admin/xlanguage_admin_list.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/pmlite.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/userinfo.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Auth.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Locale/Abstract.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Object/Dtype/Email.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Object/Dtype/Textarea.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Object/Dtype/Textbox.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Object/Dtype/Url.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/function.translate.php
XoopsCore/branches/2.6.x/2.6.0/upgrade/login.php
XoopsCore/branches/2.6.x/2.6.0/upgrade/upd-2.0.18-to-2.3.0/settings_db.php
XoopsCore/branches/2.6.x/2.6.0/upgrade/upd-2.0.18-to-2.3.0/settings_path.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/_mail.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/_misc.php
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/mail.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/misc.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/pt_BR/
Modified: XoopsCore/branches/2.6.x/2.6.0/extras/login.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/extras/login.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/extras/login.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -2,35 +2,36 @@
// This script displays a login screen in a popupbox when SSL is enabled in the preferences. You should use this script only when your server supports SSL. Place this file under your SSL directory
// path to your xoops main directory
+//todo, check this file
$path = '/path/to/xoops/directory';
-include $path.'/mainfile.php';
+include $path . '/mainfile.php';
if (!defined('XOOPS_ROOT_PATH')) {
- exit();
+ exit();
}
-include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/user.php';
+include_once XOOPS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/user.php';
$op = (isset($_POST['op']) && $_POST['op'] == 'dologin') ? 'dologin' : 'login';
$username = isset($_POST['username']) ? trim($_POST['username']) : '';
$password = isset($_POST['userpass']) ? trim($_POST['userpass']) : '';
if ($username == '' || $password == '') {
- $op ='login';
+ $op = 'login';
}
echo '
<html>
<head>
- <meta http-equiv="content-type" content="text/html; charset='._CHARSET.'" />
- <meta http-equiv="content-language" content="'._LANGCODE.'" />
- <title>'.$xoopsConfig['sitename'].'</title>
- <link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/xoops.css" />
+ <meta http-equiv="content-type" content="text/html; charset=' . XoopsLocale::getCharset() . '" />
+ <meta http-equiv="content-language" content="' . _LANGCODE . '" />
+ <title>' . $xoopsConfig['sitename'] . '</title>
+ <link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/xoops.css" />
';
$style = xoops_getcss($xoopsConfig['theme_set']);
if ($style == '') {
- $style = xoops_getcss($xoopsConfig['theme_set']);
+ $style = xoops_getcss($xoopsConfig['theme_set']);
}
if ($style != '') {
- echo '<link rel="stylesheet" type="text/css" media="all" href="'.$style.'" />';
+ echo '<link rel="stylesheet" type="text/css" media="all" href="' . $style . '" />';
}
echo '
</head>
@@ -40,58 +41,58 @@
if ($op == 'dologin') {
$member_handler = xoops_gethandler('member');
$myts = MyTextsanitizer::getInstance();
- $user = $member_handler->loginUser(addslashes($myts->stripSlashesGPC($username)), addslashes($myts->stripSlashesGPC($password)));
+ $user = $member_handler->loginUser(addslashes($myts->stripSlashesGPC($username)), addslashes($myts->stripSlashesGPC($password)));
if (is_object($user)) {
- if (0 == $user->getVar('level')) {
- redirect_header(XOOPS_URL.'/index.php', 5, _US_NOACTTPADM);
- exit();
- }
- if ($xoopsConfig['closesite'] == 1) {
- $allowed = false;
- foreach ($user->getGroups() as $group) {
- if (in_array($group, $xoopsConfig['closesite_okgrp']) || XOOPS_GROUP_ADMIN == $group) {
- $allowed = true;
- break;
- }
- }
- if (!$allowed) {
- redirect_header(XOOPS_URL.'/index.php', 1, _NOPERM);
- exit();
- }
- }
- $user->setVar('last_login', time());
- if (!$member_handler->insertUser($user)) {
- }
- $_SESSION = array();
- $_SESSION['xoopsUserId'] = $user->getVar('uid');
- $_SESSION['xoopsUserGroups'] = $user->getGroups();
- if (!empty($xoopsConfig['use_ssl'])) {
- xoops_confirm(array($xoopsConfig['sslpost_name'] => session_id()), XOOPS_URL.'/misc.php?action=showpopups&type=ssllogin', _US_PRESSLOGIN, _LOGIN);
- } else {
- echo sprintf(_US_LOGGINGU, $user->getVar('uname'));
- echo '<div style="text-align:center;"><input value="'._CLOSE.'" type="button" onclick="document.window.opener.location.reload();document.window.close();" /></div>';
- }
+ if (0 == $user->getVar('level')) {
+ redirect_header(XOOPS_URL . '/index.php', 5, _US_NOACTTPADM);
+ exit();
+ }
+ if ($xoopsConfig['closesite'] == 1) {
+ $allowed = false;
+ foreach ($user->getGroups() as $group) {
+ if (in_array($group, $xoopsConfig['closesite_okgrp']) || XOOPS_GROUP_ADMIN == $group) {
+ $allowed = true;
+ break;
+ }
+ }
+ if (!$allowed) {
+ redirect_header(XOOPS_URL . '/index.php', 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
+ exit();
+ }
+ }
+ $user->setVar('last_login', time());
+ if (!$member_handler->insertUser($user)) {
+ }
+ $_SESSION = array();
+ $_SESSION['xoopsUserId'] = $user->getVar('uid');
+ $_SESSION['xoopsUserGroups'] = $user->getGroups();
+ if (!empty($xoopsConfig['use_ssl'])) {
+ xoops_confirm(array($xoopsConfig['sslpost_name'] => session_id()), XOOPS_URL . '/misc.php?action=showpopups&type=ssllogin', _US_PRESSLOGIN, XoopsLocale::A_LOGIN);
+ } else {
+ echo sprintf(_US_LOGGINGU, $user->getVar('uname'));
+ echo '<div style="text-align:center;"><input value="' . XoopsLocale::A_CLOSE . '" type="button" onclick="document.window.opener.location.reload();document.window.close();" /></div>';
+ }
} else {
- xoops_error(_US_INCORRECTLOGIN.'<br /><a href="login.php">'._BACK.'</a>');
+ xoops_error(_US_INCORRECTLOGIN . '<br /><a href="login.php">' . XoopsLocale::GO_BACK . '</a>');
}
}
if ($op == 'login') {
- echo '
+ echo '
<div style="text-align: center; padding: 5; margin: 0">
<form action="login.php" method="post">
<table class="outer" width="95%">
<tr>
- <td class="head">'._USERNAME.'</td>
+ <td class="head">' . XoopsLocale::C_USERNAME . '</td>
<td class="even"><input type="text" name="username" value="" /></td>
</tr>
<tr>
- <td class="head">'._PASSWORD.'</td>
+ <td class="head">' . XoopsLocale::C_PASSWORD . '</td>
<td class="even"><input type="password" name="userpass" value="" /></td>
</tr>
<tr>
<td class="head"> </td>
- <td class="even"><input type="hidden" name="op" value="dologin" /><input type="submit" name="submit" value="'._LOGIN.'" /></td>
+ <td class="even"><input type="hidden" name="op" value="dologin" /><input type="submit" name="submit" value="' . XoopsLocale::A_LOGIN . '" /></td>
</tr>
</table>
</form>
Modified: XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/jquery.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -363,7 +363,7 @@
$form->addElement(new XoopsFormFile(_AM_SYSTEM_FILEMANAGER_UPLOAD_CHOOSE, 'upload_file', 500000), false);
$form->addElement(new XoopsFormHidden('op', 'filemanager_upload_save'));
$form->addElement(new XoopsFormHidden('path', $path));
- $form->addElement(new XoopsFormButton('', 'up_button', _SUBMIT, 'submit'));
+ $form->addElement(new XoopsFormButton('', 'up_button', XoopsLocale::A_SUBMIT, 'submit'));
echo $form->render();
break;
@@ -379,7 +379,7 @@
$form->addElement(new XoopsFormText(_AM_SYSTEM_FILEMANAGER_ADDDIR_NAME, 'dir_name', 50, 255), true);
$form->addElement(new XoopsFormHidden('op', 'filemanager_add_dir_save'));
$form->addElement(new XoopsFormHidden('path', $path));
- $form->addElement(new XoopsFormButton('', 'dir_button', _SUBMIT, 'submit'));
+ $form->addElement(new XoopsFormButton('', 'dir_button', XoopsLocale::A_SUBMIT, 'submit'));
echo $form->render();
break;
@@ -435,7 +435,7 @@
$form->addElement(new XoopsFormText(_AM_SYSTEM_FILEMANAGER_ADDFILE, 'file_name', 50, 255), true);
$form->addElement(new XoopsFormHidden('op', 'filemanager_add_file_save'));
$form->addElement(new XoopsFormHidden('path', $path));
- $form->addElement(new XoopsFormButton('', 'dir_button', _SUBMIT, 'submit'));
+ $form->addElement(new XoopsFormButton('', 'dir_button', XoopsLocale::A_SUBMIT, 'submit'));
echo $form->render();
break;
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/main.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/extras/modules/system/admin/filemanager/main.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -28,7 +28,7 @@
// Check users rights
if (!$xoops->isUser() || !$xoops->isModule() || !$xoops->user->isAdmin($xoops->module->mid())) {
- exit(_NOPERM);
+ exit(XoopsLocale::E_NO_ACCESS_PERMISSION);
}
// Check is active
if (!$xoops->getModuleConfig('active_filemanager', 'system')) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.admin.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/art/functions.admin.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -70,8 +70,9 @@
$adminmenu_text .= (($currentoption == $key) ? '<li class="current">' : '<li>')
. '<a href="' . $module_link . $adminmenu[$key]["link"] . '"><span>' . $adminmenu[$key]["title"] . '</span></a></li>';
}
+ //todo, check this dependencies
if ($xoops->module->getVar("hasconfig") || $xoops->module->getVar("hascomments") || $xoops->module->getVar("hasnotification")) {
- $adminmenu_text .= '<li><a href="' . XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $xoops->module->getVar("mid") . '"><span>' . _PREFERENCES . '</span></a></li>';
+ $adminmenu_text .= '<li><a href="' . XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $xoops->module->getVar("mid") . '"><span>' . XoopsLocale::PREFERENCES . '</span></a></li>';
}
$adminmenu_text .= '
</ul>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/admin.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/admin.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -95,7 +95,7 @@
$_items = $rss2parser->getItems();
$count = count($_items);
for ($i = 0; $i < $count; $i++) {
- $_items[$i]['title'] = XoopsLocale::convert_encoding($_items[$i]['title'], _CHARSET, 'UTF-8');
+ $_items[$i]['title'] = XoopsLocale::convert_encoding($_items[$i]['title'], XoopsLocale::getCharset(), 'UTF-8');
$_items[$i]['description'] = XoopsLocale::convert_encoding($_items[$i]['description'], _CHARSET, 'UTF-8');
$items[strval(strtotime($_items[$i]['pubdate'])) . "-" . strval(++$cnt)] = $_items[$i];
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/mail/xoopsmultimailer.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/mail/xoopsmultimailer.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/mail/xoopsmultimailer.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -138,7 +138,7 @@
$this->Sendmail = $xoopsMailerConfig['sendmailpath'];
$this->Host = implode(';', $xoopsMailerConfig['smtphost']);
}
- $this->CharSet = strtolower(_CHARSET);
+ $this->CharSet = strtolower(XoopsLocale::getCharset());
$xoopsLanguage = preg_replace('/[^a-zA-Z0-9_-]/', '', $xoops->getConfig('language'));
if (XoopsLoad::fileExists(XOOPS_ROOT_PATH . '/language/' . $xoopsLanguage . '/phpmailer.php')) {
include XOOPS_ROOT_PATH . '/language/' . $xoopsLanguage . '/phpmailer.php';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/module.textsanitizer.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/module.textsanitizer.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/module.textsanitizer.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -392,7 +392,7 @@
{
//look for both open and closing tags in the correct order
$pattern = "/\[quote](.*)\[\/quote\]/sU";
- $replacement = _QUOTEC . '<div class="xoopsQuote"><blockquote>\\1</blockquote></div>';
+ $replacement = XoopsLocale::C_QUOTE . '<div class="xoopsQuote"><blockquote>\\1</blockquote></div>';
$text = preg_replace($pattern, $replacement, $text, -1, $count);
//no more matches, return now
@@ -478,7 +478,7 @@
public function htmlSpecialChars($text, $quote_style = ENT_QUOTES, $charset = null, $double_encode = true)
{
if (version_compare(phpversion(), '5.2.3', '>=')) {
- $text = htmlspecialchars($text, $quote_style, $charset ? $charset : (defined('_CHARSET') ? _CHARSET : 'UTF-8'), $double_encode);
+ $text = htmlspecialchars($text, $quote_style, $charset ? $charset : XoopsLocale::getCharset(), $double_encode);
} else {
$text = htmlspecialchars($text, $quote_style);
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/template.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/template.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/template.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -54,7 +54,7 @@
$this->Smarty();
$this->setCompileId();
$this->assign(
- array('xoops_url' => XOOPS_URL, 'xoops_rootpath' => XOOPS_ROOT_PATH, 'xoops_langcode' => _LANGCODE, 'xoops_charset' => _CHARSET, 'xoops_version' => XOOPS_VERSION, 'xoops_upload_url' => XOOPS_UPLOAD_URL)
+ array('xoops_url' => XOOPS_URL, 'xoops_rootpath' => XOOPS_ROOT_PATH, 'xoops_langcode' => _LANGCODE, 'xoops_charset' => XoopsLocale::getCharset(), 'xoops_version' => XOOPS_VERSION, 'xoops_upload_url' => XOOPS_UPLOAD_URL)
);
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/textsanitizer/image/image.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/textsanitizer/image/image.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/textsanitizer/image/image.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -34,7 +34,6 @@
static $jsLoaded;
$xoops = Xoops::getInstance();
- $xoops->loadLanguage('misc');
$config = $this->loadConfig(dirname(__FILE__));
$ts->patterns[] = "/\[img align=(['\"]?)(left|center|right)\\1 width=(['\"]?)([0-9]*)\\3]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
$ts->patterns[] = "/\[img align=(['\"]?)(left|center|right)\\1]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
@@ -61,11 +60,12 @@
'type' => 'text/javascript'
));
}
- $ts->replacements[] = "<img src='\\5' class='\\2' alt='" . _MSC_RESIZED_IMAGE . "' border='0' onload=\"JavaScript:if(this.width>\\4)this.width=\\4\" />";
- $ts->replacements[] = "<img src='\\3' class='\\2' alt='" . _MSC_RESIZED_IMAGE . "' border='0'" . ($config['resize']
+ $resizedStr = XoopsLocale::RESIZED_IMAGE;
+ $ts->replacements[] = "<img src='\\5' class='\\2' alt='" . $resizedStr . "' border='0' onload=\"JavaScript:if(this.width>\\4)this.width=\\4\" />";
+ $ts->replacements[] = "<img src='\\3' class='\\2' alt='" . $resizedStr . "' border='0'" . ($config['resize']
? "onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/>";
- $ts->replacements[] = "<img src='\\3' alt='" . _MSC_RESIZED_IMAGE . "' border='0' onload=\"JavaScript:if(this.width>\\2)this.width=\\2\" /><br />";
- $ts->replacements[] = "<img src='\\1' alt='" . _MSC_RESIZED_IMAGE . "' border='0'" . ($config['resize']
+ $ts->replacements[] = "<img src='\\3' alt='" . $resizedStr . "' border='0' onload=\"JavaScript:if(this.width>\\2)this.width=\\2\" /><br />";
+ $ts->replacements[] = "<img src='\\1' alt='" . $resizedStr . "' border='0'" . ($config['resize']
? " onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/>";
} else {
@@ -76,18 +76,20 @@
'type' => 'text/javascript'
));
}
- $ts->replacements[] = "<a href='javascript:CaricaFoto(\"\\5\");'><img src='\\5' class='\\2' alt='" . _MSC_CLICK_TO_OPEN_IMAGE . "' border='0' onload=\"JavaScript:if(this.width>\\4)this.width=\\4\" /></a>";
- $ts->replacements[] = "<a href='javascript:CaricaFoto(\"\\3\");'><img src='\\3' class='\\2' alt='" . _MSC_CLICK_TO_OPEN_IMAGE . "' border='0' " . ($config['resize']
+ $openImageStr = XoopsLocale::CLICK_TO_SEE_ORIGINAL_IMAGE_IN_NEW_WINDOW;
+ $ts->replacements[] = "<a href='javascript:CaricaFoto(\"\\5\");'><img src='\\5' class='\\2' alt='" . $openImageStr . "' border='0' onload=\"JavaScript:if(this.width>\\4)this.width=\\4\" /></a>";
+ $ts->replacements[] = "<a href='javascript:CaricaFoto(\"\\3\");'><img src='\\3' class='\\2' alt='" . $openImageStr . "' border='0' " . ($config['resize']
? "onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/></a>";
- $ts->replacements[] = "<a href='javascript:CaricaFoto(\"\\3\");'><img src='\\3' alt='" . _MSC_CLICK_TO_OPEN_IMAGE . "' border='0' onload=\"JavaScript:if(this.width>\\2)this.width=\\2\" /></a><br />";
- $ts->replacements[] = "<a href='javascript:CaricaFoto(\"\\1\");'><img src='\\1' alt='" . _MSC_CLICK_TO_OPEN_IMAGE . "' border='0' title='" . _MSC_CLICK_TO_OPEN_IMAGE . "'" . ($config['resize']
+ $ts->replacements[] = "<a href='javascript:CaricaFoto(\"\\3\");'><img src='\\3' alt='" . $openImageStr . "' border='0' onload=\"JavaScript:if(this.width>\\2)this.width=\\2\" /></a><br />";
+ $ts->replacements[] = "<a href='javascript:CaricaFoto(\"\\1\");'><img src='\\1' alt='" . $openImageStr . "' border='0' title='" . $openImageStr . "'" . ($config['resize']
? " onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/></a>";
} else {
- $ts->replacements[] = "<img src='\\5' class='\\2' border='0' alt='" . _MSC_ORIGINAL_IMAGE . "' onload=\"JavaScript:if(this.width>\\4) this.width=\\4\" />";
- $ts->replacements[] = "<img src='\\3' class='\\2' border='0' alt='" . _MSC_ORIGINAL_IMAGE . "' " . ($config['resize']
+ $originalStr = XoopsLocale::ORIGINAL_IMAGE;
+ $ts->replacements[] = "<img src='\\5' class='\\2' border='0' alt='" . $originalStr . "' onload=\"JavaScript:if(this.width>\\4) this.width=\\4\" />";
+ $ts->replacements[] = "<img src='\\3' class='\\2' border='0' alt='" . $originalStr . "' " . ($config['resize']
? "onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/>";
- $ts->replacements[] = "<img src='\\3' border='0' alt='" . _MSC_ORIGINAL_IMAGE . "' onload=\"JavaScript:if(this.width>\\2) this.width=\\2\" />";
- $ts->replacements[] = "<img src='\\1' border='0' alt='" . _MSC_ORIGINAL_IMAGE . "' " . ($config['resize']
+ $ts->replacements[] = "<img src='\\3' border='0' alt='" . $originalStr . "' onload=\"JavaScript:if(this.width>\\2) this.width=\\2\" />";
+ $ts->replacements[] = "<img src='\\1' border='0' alt='" . $originalStr . "' " . ($config['resize']
? " onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/>";
}
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -118,7 +118,7 @@
$geshi->set_header_type(GESHI_HEADER_NONE);
// Sets the proper encoding charset other than "ISO-8859-1"
- $geshi->set_encoding(_CHARSET);
+ $geshi->set_encoding(XoopsLocale::getCharset());
$geshi->set_link_target("_blank");
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/sampleform.inc.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/sampleform.inc.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/sampleform.inc.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -58,6 +58,6 @@
// If dohtml is disabled, set $noHtml to true
$sample_form->addElement(new XoopsFormEditor('Your message', $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->addElement(new XoopsFormButton('', 'save', XoopsLocale::A_SUBMIT, 'submit'));
$sample_form->display();
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/formtinymce.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/formtinymce.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/formtinymce.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -28,8 +28,8 @@
var $language;
var $width = "100%";
var $height = "500px";
+ var $editor;
- var $editor;
/**
* Constructor
*
@@ -38,8 +38,8 @@
function __construct($configs)
{
$current_path = __FILE__;
- if ( DIRECTORY_SEPARATOR != "/" ) {
- $current_path = str_replace( strpos( $current_path, "\\\\", 2 ) ? "\\\\" : DIRECTORY_SEPARATOR, "/", $current_path);
+ if (DIRECTORY_SEPARATOR != "/") {
+ $current_path = str_replace(strpos($current_path, "\\\\", 2) ? "\\\\" : DIRECTORY_SEPARATOR, "/", $current_path);
}
$this->rootPath = "/class/xoopseditor/tinymce";
@@ -63,7 +63,6 @@
/**
* Renders the Javascript function needed for client-side for validation
- *
* I'VE USED THIS EXAMPLE TO WRITE VALIDATION CODE
* http://tinymce.moxiecode.com/punbb/viewtopic.php?id=12616
*
@@ -74,11 +73,11 @@
if ($this->isRequired() && $eltname = $this->getName()) {
//$eltname = $this->getName();
$eltcaption = $this->getCaption();
- $eltmsg = empty($eltcaption) ? sprintf( _FORM_ENTER, $eltname ) : sprintf( _FORM_ENTER, $eltcaption );
- $eltmsg = str_replace('"', '\"', stripslashes( $eltmsg ) );
+ $eltmsg = empty($eltcaption) ? sprintf(XoopsLocale::F_ENTER, $eltname) : sprintf(XoopsLocale::F_ENTER, $eltcaption);
+ $eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
$ret = "\n";
- $ret.= "if ( tinyMCE.get('{$eltname}').getContent() == \"\" || tinyMCE.get('{$eltname}').getContent() == null) ";
- $ret.= "{ window.alert(\"{$eltmsg}\"); tinyMCE.get('{$eltname}').focus(); return false; }";
+ $ret .= "if ( tinyMCE.get('{$eltname}').getContent() == \"\" || tinyMCE.get('{$eltname}').getContent() == null) ";
+ $ret .= "{ window.alert(\"{$eltmsg}\"); tinyMCE.get('{$eltname}').focus(); return false; }";
return $ret;
}
return '';
@@ -98,7 +97,7 @@
$this->language = strtolower(constant("_XOOPS_EDITOR_TINYMCE_LANGUAGE"));
} else {
$this->language = str_replace('_', '-', strtolower(_LANGCODE));
- if(strtolower(_CHARSET) == "utf-8") {
+ if (strtolower(XoopsLocale::getCharset()) == "utf-8") {
$this->language .= "_utf8";
}
}
@@ -109,7 +108,7 @@
function getFonts()
{
if (empty($this->config["fonts"]) && defined("_XOOPS_EDITOR_TINYMCE_FONTS")) {
- $this->config["fonts"] = constant("_XOOPS_EDITOR_TINYMCE_FONTS");
+ $this->config["fonts"] = constant("_XOOPS_EDITOR_TINYMCE_FONTS");
}
return @$this->config["fonts"];
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_code/xoops_code.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_code/xoops_code.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_code/xoops_code.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -17,28 +17,27 @@
$xoops = Xoops::getInstance();
$xoops->disableErrorReporting();
-$xoops->loadLanguage('misc');
$xoops->simpleHeader(true);
$form = new XoopsThemeForm('', 'imagecat_form', '#', false, 'vertical');
-$form->addElement( new XoopsFormTextArea(_MSC_TINYMCE_CODE_TITLE, 'text_id', '', 9, 7) );
+$form->addElement( new XoopsFormTextArea(XoopsLocale::PASTE_THE_CODE_YOU_WANT_TO_INSERT, 'text_id', '', 9, 7) );
/**
* Buttons
*/
$button_tray = new XoopsFormElementTray('', '');
$button_tray->addElement(new XoopsFormHidden('op', 'save'));
-$button = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+$button = new XoopsFormButton('', 'submit', XoopsLocale::A_SUBMIT, 'submit');
$button->setExtra('onclick="Xoops_codeDialog.insert();"');
$button->setClass('btn btn-success');
$button_tray->addElement($button);
-$button_2 = new XoopsFormButton('', 'reset', _RESET, 'reset');
+$button_2 = new XoopsFormButton('', 'reset', XoopsLocale::A_RESET, 'reset');
$button_2->setClass('btn btn-warning');
$button_tray->addElement($button_2);
-$button_3 = new XoopsFormButton('', 'button', _CLOSE, 'button');
+$button_3 = new XoopsFormButton('', 'button', XoopsLocale::A_CLOSE, 'button');
$button_3->setExtra('onclick="tinyMCEPopup.close();"');
$button_3->setClass('btn btn-danger');
$button_tray->addElement($button_3);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_quote/xoops_quote.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_quote/xoops_quote.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_quote/xoops_quote.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -17,28 +17,27 @@
$xoops = Xoops::getInstance();
$xoops->disableErrorReporting();
-$xoops->loadLanguage('misc');
$xoops->simpleHeader(true);
$form = new XoopsThemeForm('', 'imagecat_form', '#', false, 'vertical');
-$form->addElement( new XoopsFormTextArea(_MSC_TINYMCE_QUOTE_TITLE, 'text_id', '', 9, 7) );
+$form->addElement( new XoopsFormTextArea(XoopsLocale::PASTE_THE_QUOTE_YOU_WANT_TO_INSERT, 'text_id', '', 9, 7) );
/**
* Buttons
*/
$button_tray = new XoopsFormElementTray('', '');
$button_tray->addElement(new XoopsFormHidden('op', 'save'));
-$button = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+$button = new XoopsFormButton('', 'submit', XoopsLocale::A_SUBMIT, 'submit');
$button->setExtra('onclick="Xoops_quoteDialog.insert();"');
$button->setClass('btn btn-success');
$button_tray->addElement($button);
-$button_2 = new XoopsFormButton('', 'reset', _RESET, 'reset');
+$button_2 = new XoopsFormButton('', 'reset', XoopsLocale::A_RESET, 'reset');
$button_2->setClass('btn btn-warning');
$button_tray->addElement($button_2);
-$button_3 = new XoopsFormButton('', 'button', _CLOSE, 'button');
+$button_3 = new XoopsFormButton('', 'button', XoopsLocale::A_CLOSE, 'button');
$button_3->setExtra('onclick="tinyMCEPopup.close();"');
$button_3->setClass('btn btn-danger');
$button_tray->addElement($button_3);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/form.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/form.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/form.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -474,7 +474,7 @@
$i = -1;
$elements = array();
if (count($this->getRequired()) > 0) {
- $this->_elements[] = new XoopsFormRaw("<tr class='foot'><td colspan='2'>* = " . _REQUIRED . "</td></tr>");
+ $this->_elements[] = new XoopsFormRaw("<tr class='foot'><td colspan='2'>* = " . XoopsLocale::REQUIRED . "</td></tr>");
}
foreach ($this->getElements() as $ele) {
++$i;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formbuttontray.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formbuttontray.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formbuttontray.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -72,9 +72,9 @@
$class = ($this->getClass() != '' ? " class='" . $this->getClass() . "'" : " class='btn'");
$extra = ($this->getExtra() != '' ? " " . $this->getExtra() : '');
if ($this->_showDelete) {
- $ret .= '<input type="submit"' . $class . ' name="delete" id="delete" value="' . _DELETE . '" onclick="this.form.elements.op.value=\'delete\'"> ';
+ $ret .= '<input type="submit"' . $class . ' name="delete" id="delete" value="' . XoopsLocale::A_DELETE . '" onclick="this.form.elements.op.value=\'delete\'"> ';
}
- $ret .= '<input type="button" ' . $class . ' value="' . _CANCEL . '" onClick="history.go(-1);return true;" /> <input type="reset"' . $class . ' name="reset" id="reset" value="' . _RESET . '" /> <input type="' . $this->getType() . '"' . $class . ' name="' . $this->getName() . '" id="' . $this->getName() . '" value="' . $this->getValue() . '"' . $extra . '/>';
+ $ret .= '<input type="button" ' . $class . ' value="' . XoopsLocale::A_CANCEL . '" onClick="history.go(-1);return true;" /> <input type="reset"' . $class . ' name="reset" id="reset" value="' . XoopsLocale::A_RESET . '" /> <input type="' . $this->getType() . '"' . $class . ' name="' . $this->getName() . '" id="' . $this->getName() . '" value="' . $this->getValue() . '"' . $extra . '/>';
return $ret;
}
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcheckbox.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcheckbox.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcheckbox.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -183,7 +183,7 @@
} elseif ($this->isRequired()) {
$eltname = $this->getName();
$eltcaption = $this->getCaption();
- $eltmsg = empty($eltcaption) ? sprintf(_FORM_ENTER, $eltname) : sprintf(_FORM_ENTER, $eltcaption);
+ $eltmsg = empty($eltcaption) ? sprintf(XoopsLocale::F_ENTER, $eltname) : sprintf(XoopsLocale::F_ENTER, $eltcaption);
$eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
return NWLINE . "var hasChecked = false; var checkBox = myform.elements['{$eltname}']; if (checkBox.length) {for (var i = 0; i < checkBox.length; i++) {if (checkBox[i].checked == true) {hasChecked = true; break;}}}else{if (checkBox.checked == true) {hasChecked = true;}}if (!hasChecked) {window.alert(\"{$eltmsg}\");if (checkBox.length) {checkBox[0].focus();}else{checkBox.focus();}return false;}";
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcolorpicker.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcolorpicker.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formcolorpicker.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -61,7 +61,7 @@
{
$eltname = $this->getName();
$eltcaption = $this->getCaption();
- $eltmsg = empty($eltcaption) ? sprintf(_FORM_ENTER, $eltname) : sprintf(_FORM_ENTER, $eltcaption);
+ $eltmsg = empty($eltcaption) ? sprintf(XoopsLocale::F_ENTER, $eltname) : sprintf(XoopsLocale::F_ENTER, $eltcaption);
return "if ( !(new RegExp(\"^#[0-9a-fA-F]{6}\",\"i\").test(myform.{$eltname}.value)) ) { window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }";
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdhtmltextarea.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdhtmltextarea.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formdhtmltextarea.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -191,7 +191,7 @@
} else {
$xoops->theme()->addScript('/class/textsanitizer/image/image.js', array('type' => 'text/javascript'));
}
- $button = "<input id='" . $this->getName() . "_preview_button' " . "type='button' " . "class='btn' value='" . _PREVIEW . "' " . "onclick=\"form_instantPreview('" . XOOPS_URL . "', '" . $this->getName() . "','" . XOOPS_URL . "/images', " . intval($this->doHtml) . ", '" . $xoops->security()->createToken() . "')\"" . " />";
+ $button = "<input id='" . $this->getName() . "_preview_button' " . "type='button' " . "class='btn' value='" . XoopsLocale::A_PREVIEW . "' " . "onclick=\"form_instantPreview('" . XOOPS_URL . "', '" . $this->getName() . "','" . XOOPS_URL . "/images', " . intval($this->doHtml) . ", '" . $xoops->security()->createToken() . "')\"" . " />";
$ret .= "<br />" . "<div id='" . $this->getName() . "_hidden' style='display: block;'> " . "<fieldset>" . "<legend>" . $button . "</legend>" . "<div id='" . $this->getName() . "_hidden_data'>" . XoopsLocale::CLICK_PREVIEW_TO_SEE_CONTENT . "</div>" . "</fieldset>" . "</div>";
}
// Load javascript
@@ -214,9 +214,9 @@
{
$textarea_id = $this->getName();
$code = "<a name='moresmiley'></a>";
- $code .= "<img src='" . XOOPS_URL . "/images/url.gif' alt='" . XoopsLocale::URL . "' title='" . XoopsLocale::URL . "' onclick='xoopsCodeUrl(\"{$textarea_id}\", \"" . htmlspecialchars(_ENTERURL, ENT_QUOTES) . "\", \"" . htmlspecialchars(_ENTERWEBTITLE, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> ";
- $code .= "<img src='" . XOOPS_URL . "/images/email.gif' alt='" . XoopsLocale::EMAIL . "' title='" . XoopsLocale::EMAIL . "' onclick='xoopsCodeEmail(\"{$textarea_id}\", \"" . htmlspecialchars(_ENTEREMAIL, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> ";
- $code .= "<img src='" . XOOPS_URL . "/images/imgsrc.gif' alt='" . XoopsLocale::IMAGES . "' title='" . XoopsLocale::IMAGES . "' onclick='xoopsCodeImg(\"{$textarea_id}\", \"" . htmlspecialchars(_ENTERIMGURL, ENT_QUOTES) . "\", \"" . htmlspecialchars(_ENTERIMGPOS, ENT_QUOTES) . "\", \"" . htmlspecialchars(_IMGPOSRORL, ENT_QUOTES) . "\", \"" . htmlspecialchars(_ERRORIMGPOS, ENT_QUOTES) . "\", \"" . htmlspecialchars(XoopsLocale::WIDTH, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> ";
+ $code .= "<img src='" . XOOPS_URL . "/images/url.gif' alt='" . XoopsLocale::URL . "' title='" . XoopsLocale::URL . "' onclick='xoopsCodeUrl(\"{$textarea_id}\", \"" . htmlspecialchars(XoopsLocale::ENTER_LINK_URL, ENT_QUOTES) . "\", \"" . htmlspecialchars(XoopsLocale::ENTER_WEBSITE_TITLE, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> ";
+ $code .= "<img src='" . XOOPS_URL . "/images/email.gif' alt='" . XoopsLocale::EMAIL . "' title='" . XoopsLocale::EMAIL . "' onclick='xoopsCodeEmail(\"{$textarea_id}\", \"" . htmlspecialchars(XoopsLocale::ENTER_EMAIL, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> ";
+ $code .= "<img src='" . XOOPS_URL . "/images/imgsrc.gif' alt='" . XoopsLocale::IMAGES . "' title='" . XoopsLocale::IMAGES . "' onclick='xoopsCodeImg(\"{$textarea_id}\", \"" . htmlspecialchars(XoopsLocale::ENTER_IMAGE_URL, ENT_QUOTES) . "\", \"" . htmlspecialchars(XoopsLocale::ENTER_IMAGE_POSITION, ENT_QUOTES) . "\", \"" . htmlspecialchars(XoopsLocale::IMAGE_POSITION_DESCRIPTION, ENT_QUOTES) . "\", \"" . htmlspecialchars(XoopsLocale::E_ENTER_IMAGE_POSITION, ENT_QUOTES) . "\", \"" . htmlspecialchars(XoopsLocale::WIDTH, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> ";
$myts = MyTextSanitizer::getInstance();
$extensions = array_filter($myts->config['extensions']);
@@ -231,8 +231,8 @@
$this->js .= $js;
}
}
- $code .= "<img src='" . XOOPS_URL . "/images/code.gif' alt='" . XoopsLocale::SOURCE_CODE . "' title='" . XoopsLocale::SOURCE_CODE . "' onclick='xoopsCodeCode(\"{$textarea_id}\", \"" . htmlspecialchars(_ENTERCODE, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> ";
- $code .= "<img src='" . XOOPS_URL . "/images/quote.gif' alt='" . XoopsLocale::QUOTE . "' title='" . XoopsLocale::QUOTE . "' onclick='xoopsCodeQuote(\"{$textarea_id}\", \"" . htmlspecialchars(_ENTERQUOTE, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> ";
+ $code .= "<img src='" . XOOPS_URL . "/images/code.gif' alt='" . XoopsLocale::SOURCE_CODE . "' title='" . XoopsLocale::SOURCE_CODE . "' onclick='xoopsCodeCode(\"{$textarea_id}\", \"" . htmlspecialchars(XoopsLocale::ENTER_CODE, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> ";
+ $code .= "<img src='" . XOOPS_URL . "/images/quote.gif' alt='" . XoopsLocale::QUOTE . "' title='" . XoopsLocale::QUOTE . "' onclick='xoopsCodeQuote(\"{$textarea_id}\", \"" . htmlspecialchars(XoopsLocale::ENTER_QUOTE, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> ";
XoopsPreload::getInstance()->triggerEvent('core.class.xoopsform.formdhtmltextarea.codeicon', array(&$code, $this));
return $code;
@@ -248,14 +248,14 @@
$fontStr = "<script type=\"text/javascript\" language=\"JavaScript\">";
$fontStr .= "var _editor_dialog = ''" . "+ '<select class=\"span2\" id=\'{$textarea_id}Size\' onchange=\'xoopsSetElementAttribute(\"size\", this.options[this.selectedIndex].value, \"{$textarea_id}\", \"{$hiddentext}\");\'>'";
- $fontStr .= "+ '<option value=\'SIZE\'>" . _SIZE . "</option>'";
+ $fontStr .= "+ '<option value=\'SIZE\'>" . XoopsLocale::SIZE . "</option>'";
$localeFontSizes = XoopsLocale::getFontSizes();
foreach ($localeFontSizes as $_val => $_name) {
$fontStr .= " + '<option value=\'{$_val}\'>{$_name}</option>'";
}
$fontStr .= " + '</select> '";
$fontStr .= "+ '<select class=\"span2\" id=\'{$textarea_id}Font\' onchange=\'xoopsSetElementAttribute(\"font\", this.options[this.selectedIndex].value, \"{$textarea_id}\", \"{$hiddentext}\");\'>'";
- $fontStr .= "+ '<option value=\'FONT\'>" . _FONT . "</option>'";
+ $fontStr .= "+ '<option value=\'FONT\'>" . XoopsLocale::FONT . "</option>'";
$localeFonts = XoopsLocale::getFonts();
$fontarray = !empty($localeFonts) ? $localeFonts :
array("Arial", "Courier", "Georgia", "Helvetica", "Impact", "Verdana", "Haettenschweiler");
@@ -264,7 +264,7 @@
}
$fontStr .= " + '</select> '";
$fontStr .= "+ '<select class=\"span2\" id=\'{$textarea_id}Color\' onchange=\'xoopsSetElementAttribute(\"color\", this.options[this.selectedIndex].value, \"{$textarea_id}\", \"{$hiddentext}\");\'>'";
- $fontStr .= "+ '<option value=\'COLOR\'>" . _COLOR . "</option>';";
+ $fontStr .= "+ '<option value=\'COLOR\'>" . XoopsLocale::COLOR . "</option>';";
$fontStr .= "var _color_array = new Array('00', '33', '66', '99', 'CC', 'FF');
for(var i = 0; i < _color_array.length; i ++) {
for(var j = 0; j < _color_array.length; j ++) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formelement.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formelement.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formelement.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -516,7 +516,7 @@
if ($this->isRequired() && $eltname = $this->getName()) {
// $eltname = $this->getName();
$eltcaption = $this->getCaption();
- $eltmsg = empty($eltcaption) ? sprintf(_FORM_ENTER, $eltname) : sprintf(_FORM_ENTER, $eltcaption);
+ $eltmsg = empty($eltcaption) ? sprintf(XoopsLocale::F_ENTER, $eltname) : sprintf(XoopsLocale::F_ENTER, $eltcaption);
$eltmsg = str_replace(array(':', '?', '%'), '', $eltmsg);
$eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
$eltmsg = strip_tags($eltmsg);
@@ -525,7 +525,7 @@
}
return false;
}
-
+
/**
* get the maximum columns for a field
*
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formmail.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formmail.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formmail.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -39,9 +39,9 @@
* @param string $placeholder placeholder for this element.
*/
public function __construct($caption, $name, $size, $maxlength, $value = '', $placeholder = '')
- {
+ {
parent::__construct($caption, $name, $size, $maxlength, $value, $placeholder);
- $this->setPattern('[^@]+@[^@]+\.[a-zA-Z]{2,6}', _FORM_VALID_MAIL);
+ $this->setPattern('[^@]+@[^@]+\.[a-zA-Z]{2,6}', XoopsLocale::ENTER_VALID_EMAIL);
}
/**
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formradioyn.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formradioyn.php 2013-01-26 17:08:43 UTC (rev 10908)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formradioyn.php 2013-01-26 18:59:04 UTC (rev 10909)
@@ -35,11 +35,11 @@
*
* @param string $caption
* @param string $name
- * @param string $value Pre-selected value, can be "0" (No) or "1" (Yes)
+ * @param string|null $value Pre-selected value, can be "0" (No) or "1" (Yes)
* @param string $yes String for "Yes"
* @param string $no String for "No"
*/
- public function __construct($caption, $name, $value = null, $yes = _YES, $no = _NO)
+ public function __construct($caption, $name, $value = null, $yes = XoopsLocale::YES, $no = XoopsLocale::NO)
{
parent::__construct($caption, $name, $value, true);
$this->addOption(1, $yes);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/formselect.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoo...
[truncated message content] |
