fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 03:01:43 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #338 from conory/pr/add_function

Browse source 
lang() 함수 추가
This commit is contained in:
CONORY 2016-03-06 17:09:30 +09:00
commit cf26f20461
84 changed files with 285 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

14
addons/captcha/captcha.addon.php
View file

@ -62,7 +62,7 @@ if(!class_exists('AddonCaptcha', false))
{
Context::loadLang(_XE_PATH_ . 'addons/captcha/lang');
$_SESSION['XE_VALIDATOR_ERROR'] = -1;
$_SESSION['XE_VALIDATOR_MESSAGE'] = Context::getLang('captcha_denied');
$_SESSION['XE_VALIDATOR_MESSAGE'] = lang('captcha_denied');
$_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] = 'error';
$_SESSION['XE_VALIDATOR_RETURN_URL'] = Context::get('error_return_url');
$ModuleHandler->_setInputValueToSession();
@ -113,7 +113,7 @@ if(!class_exists('AddonCaptcha', false))
// Generate keywords
$this->createKeyword();
$target = Context::getLang('target_captcha');
$target = lang('target_captcha');
header("Content-Type: text/xml; charset=UTF-8");
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
@ -121,11 +121,11 @@ if(!class_exists('AddonCaptcha', false))
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
printf("<response>\r\n <error>0</error>\r\n <message>success</message>\r\n <about_captcha><![CDATA[%s]]></about_captcha>\r\n <captcha_reload><![CDATA[%s]]></captcha_reload>\r\n <captcha_play><![CDATA[%s]]></captcha_play>\r\n <cmd_input><![CDATA[%s]]></cmd_input>\r\n <cmd_cancel><![CDATA[%s]]></cmd_cancel>\r\n </response>"
, Context::getLang('about_captcha')
, Context::getLang('captcha_reload')
, Context::getLang('captcha_play')
, Context::getLang('cmd_input')
, Context::getLang('cmd_cancel')
, lang('about_captcha')
, lang('captcha_reload')
, lang('captcha_play')
, lang('cmd_input')
, lang('cmd_cancel')
);
Context::close();
exit();

14
addons/captcha_member/captcha_member.addon.php
View file

@ -73,7 +73,7 @@ if(!class_exists('AddonMemberCaptcha', false))
{
Context::loadLang(_XE_PATH_ . 'addons/captcha_member/lang');
$_SESSION['XE_VALIDATOR_ERROR'] = -1;
$_SESSION['XE_VALIDATOR_MESSAGE'] = Context::getLang('captcha_denied');
$_SESSION['XE_VALIDATOR_MESSAGE'] = lang('captcha_denied');
$_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] = 'error';
$_SESSION['XE_VALIDATOR_RETURN_URL'] = Context::get('error_return_url');
$ModuleHandler->_setInputValueToSession();
@ -124,7 +124,7 @@ if(!class_exists('AddonMemberCaptcha', false))
// Generate keywords
$this->createKeyword();
$target = Context::getLang('target_captcha');
$target = lang('target_captcha');
header("Content-Type: text/xml; charset=UTF-8");
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
@ -132,11 +132,11 @@ if(!class_exists('AddonMemberCaptcha', false))
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
printf("<response>\r\n <error>0</error>\r\n <message>success</message>\r\n <about_captcha><![CDATA[%s]]></about_captcha>\r\n <captcha_reload><![CDATA[%s]]></captcha_reload>\r\n <captcha_play><![CDATA[%s]]></captcha_play>\r\n <cmd_input><![CDATA[%s]]></cmd_input>\r\n <cmd_cancel><![CDATA[%s]]></cmd_cancel>\r\n </response>"
, Context::getLang('about_captcha')
, Context::getLang('captcha_reload')
, Context::getLang('captcha_play')
, Context::getLang('cmd_input')
, Context::getLang('cmd_cancel')
, lang('about_captcha')
, lang('captcha_reload')
, lang('captcha_play')
, lang('cmd_input')
, lang('cmd_cancel')
);
Context::close();
exit();

2
addons/mobile/classes/hdml.class.php
View file

@ -55,7 +55,7 @@ class wap extends mobileXE {
foreach($this->getChilds() as $key => $val)
{
if(!$val['link']) continue;
printf('<ce task=go label="%s" dest="%s">%s%s',Context::getLang('cmd_select'), $val['href'], $val['text'], "\n");
printf('<ce task=go label="%s" dest="%s">%s%s',lang('cmd_select'), $val['href'], $val['text'], "\n");
}
}
else

4
addons/mobile/classes/mhtml.class.php
View file

@ -71,11 +71,11 @@ class wap extends mobileXE
if(!parent::isLangChange())
{
$url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
printf('<a href="%s">%s</a><br>%s', $url, 'Language : '.Context::getLang('select_lang'), "\n");
printf('<a href="%s">%s</a><br>%s', $url, 'Language : '.lang('select_lang'), "\n");
}
else
{
printf('<a href="%s">%s</a><br>%s', Context::get('return_uri'), Context::getLang('lang_return'), "\n");
printf('<a href="%s">%s</a><br>%s', Context::get('return_uri'), lang('lang_return'), "\n");
}
if($this->upperUrl)
{

18
addons/mobile/classes/mobile.class.php
View file

@ -168,12 +168,12 @@ class mobileXE
if($parent_srl && $listed_items[$parent_srl])
{
$parent_item = $listed_items[$parent_srl];
if($parent_item) $this->setUpperUrl(getUrl('','mid',$parent_item['mid']), Context::getLang('cmd_go_upper'));
if($parent_item) $this->setUpperUrl(getUrl('','mid',$parent_item['mid']), lang('cmd_go_upper'));
}
}
elseif (!$this->isNavigationMode())
{
$this->setUpperUrl(getUrl('','mid',$this->index_mid,'nm','1','cmid',0), Context::getLang('cmd_view_sitemap'));
$this->setUpperUrl(getUrl('','mid',$this->index_mid,'nm','1','cmid',0), lang('cmd_view_sitemap'));
}
}
@ -247,14 +247,14 @@ class mobileXE
if($this->mobilePage>1)
{
$url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage-1);
$text = sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $this->mobilePage-1, $this->totalPage);
$text = sprintf('%s (%d/%d)', lang('cmd_prev'), $this->mobilePage-1, $this->totalPage);
$this->setPrevUrl($url, $text);
}
if($this->mobilePage<$this->totalPage)
{
$url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage+1);
$text = sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $this->mobilePage+1, $this->totalPage);
$text = sprintf('%s (%d/%d)', lang('cmd_next'), $this->mobilePage+1, $this->totalPage);
$this->setNextUrl($url, $text);
}
}
@ -353,14 +353,14 @@ class mobileXE
if($this->mobilePage>1)
{
$url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage-1);
$text = sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $this->mobilePage-1, $this->totalPage);
$text = sprintf('%s (%d/%d)', lang('cmd_prev'), $this->mobilePage-1, $this->totalPage);
$this->setPrevUrl($url, $text);
}
if($this->mobilePage<$this->totalPage)
{
$url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage+1);
$text = sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $this->mobilePage+1, $this->totalPage);
$text = sprintf('%s (%d/%d)', lang('cmd_next'), $this->mobilePage+1, $this->totalPage);
$this->setNextUrl($url, $text);
}
@ -442,7 +442,7 @@ class mobileXE
function display()
{
// Home button assignments
$this->setHomeUrl(getUrl(), Context::getLang('cmd_go_home'));
$this->setHomeUrl(getUrl(), lang('cmd_go_home'));
// Specify the title
if(!$this->title) $this->setTitle(Context::getBrowserTitle());
@ -520,7 +520,7 @@ class mobileXE
$cur_item = $this->listed_items[$this->cmid];
$upper_srl = $cur_item['parent_srl'];;
$list = $cur_item['list'];;
$this->setUpperUrl(getUrl('cmid',$upper_srl), Context::getLang('cmd_go_upper'));
$this->setUpperUrl(getUrl('cmid',$upper_srl), lang('cmd_go_upper'));
if(preg_match('/^([a-zA-Z0-9\_\-]+)$/', $cur_item['url']))
{
$obj = array();
@ -575,7 +575,7 @@ class mobileXE
$lang_supported = Context::get('lang_supported');
$lang_type = Context::getLangType();
$obj = array();
$obj['link'] = $obj['text'] = Context::getLang('president_lang').' : '.$lang_supported[$lang_type];
$obj['link'] = $obj['text'] = lang('president_lang').' : '.$lang_supported[$lang_type];
$obj['href'] = getUrl('sel_lang',$lang_type);
$childs[] = $obj;

4
addons/mobile/classes/wml.class.php
View file

@ -87,11 +87,11 @@ class wap extends mobileXE
if(!parent::isLangChange())
{
$url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', 'Language : '.Context::getLang('select_lang'), $url, "\n");
printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', 'Language : '.lang('select_lang'), $url, "\n");
}
else
{
printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', Context::getLang('lang_return'), Context::get('return_uri'), "\n");
printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', lang('lang_return'), Context::get('return_uri'), "\n");
}
if($this->homeUrl)
{

4
addons/point_level_icon/point_level_icon.lib.php
View file

@ -70,8 +70,8 @@ function pointLevelIconTrans($matches, $addon_info)
}
}
$title = sprintf('%s:%s%s%s, %s:%s/%s', Context::getLang('point'), $point, $config->point_name, $per ? ' (' . $per . ')' : '', Context::getLang('level'), $level, $config->max_level);
$alt = sprintf('[%s:%s]', Context::getLang('level'), $level);
$title = sprintf('%s:%s%s%s, %s:%s/%s', lang('point'), $point, $config->point_name, $per ? ' (' . $per . ')' : '', lang('level'), $level, $config->max_level);
$alt = sprintf('[%s:%s]', lang('level'), $level);
$GLOBALS['_pointLevelIcon'][$member_srl] = sprintf('<img src="%s" alt="%s" title="%s" class="xe_point_level_icon" style="vertical-align:middle;margin-right:3px;" />', $level_icon, $alt, $title);
}

2
classes/extravar/Extravar.class.php
View file

@ -445,7 +445,7 @@ class ExtraItem
$buff[] = '<input type="hidden" name="' . $column_name . '" value="' . $value . '" />';
$buff[] = '<input type="text" id="date_' . $column_name . '" value="' . zdate($value, 'Y-m-d') . '" class="date" />';
$buff[] = '<input type="button" value="' . Context::getLang('cmd_delete') . '" class="btn" id="dateRemover_' . $column_name . '" />';
$buff[] = '<input type="button" value="' . lang('cmd_delete') . '" class="btn" id="dateRemover_' . $column_name . '" />';
$buff[] = '<script type="text/javascript">';
$buff[] = '//<![CDATA[';
$buff[] = '(function($){';

2
classes/module/ModuleHandler.class.php
View file

@ -86,7 +86,7 @@ class ModuleHandler extends Handler
if($isInvalid)
{
htmlHeader();
echo Context::getLang("msg_invalid_request");
echo lang("msg_invalid_request");
htmlFooter();
Context::close();
exit;

2
classes/object/Object.class.php
View file

@ -96,7 +96,7 @@ class Object
*/
function setMessage($message = 'success', $type = NULL)
{
if($str = Context::getLang($message))
if($str = lang($message))
{
$this->message = $str;
}

4
classes/validator/Validator.class.php
View file

@ -467,7 +467,7 @@ class Validator
}
else
{
$lang_filter = Context::getLang('filter');
$lang_filter = lang('filter');
$msg = isset($lang_filter->{$msg}) ? $lang_filter->{$msg} : $lang_filter->invalid;
}
@ -477,7 +477,7 @@ class Validator
}
else
{
$fieldName = Context::getLang($field);
$fieldName = lang($field);
}
$msg = sprintf($msg, $fieldName);

4
common/framework/debug.php
View file

@ -404,14 +404,14 @@ class Debug
}
// Localize the error title.
$title = \Context::getLang('msg_server_error');
$title = lang('msg_server_error');
if ($title === 'msg_server_error')
{
$message = 'Server Error';
}
// Localize the error message.
$message = ini_get('display_errors') ? $message : \Context::getLang('msg_server_error_see_log');
$message = ini_get('display_errors') ? $message : lang('msg_server_error_see_log');
if ($message === 'msg_server_error_see_log')
{
$message = 'Your server is configured to hide error messages. Please see your server\'s error log for details.';

22
common/framework/lang.php
View file

@ -50,6 +50,16 @@ class Lang
$this->_loaded_plugins['_custom_'] = new \stdClass();
}
/**
* Return language type.
*
* @return string
*/
public function langType()
{
return $this->_language;
}
/**
* Load translations from a plugin (module, addon).
*
@ -187,6 +197,18 @@ class Lang
return $this->__call($key, $args);
}
/**
* Generic setter.
*
* @param string $key
* @param string $value
* @return void
*/
public function set($key, $value)
{
$this->__set($key, $value);
}
/**
* Magic method for translations without arguments.
*

29
common/functions.php
View file

@ -25,6 +25,35 @@ function config($key, $value = null)
}
}
/**
* Get or set lang variable.
*
* @param string $code Lang variable name
* @param string $value `$code`s value
* @return mixed
*/
function lang($code = null, $value = null)
{
if (!$GLOBALS['lang'] instanceof Rhymix\Framework\Lang)
{
$GLOBALS['lang'] = Rhymix\Framework\Lang::getInstance(Context::getLangType() ?: config('locale.default_lang') ?: 'ko');
$GLOBALS['lang']->loadDirectory(RX_BASEDIR . 'common/lang', 'common');
}
if ($code !== null && $value === null)
{
return $GLOBALS['lang']->get($code);
}
else if ($code !== null && $value !== null)
{
$GLOBALS['lang']->set($code, $value);
}
else
{
return $GLOBALS['lang']->langType();
}
}
/**
* Get the first value of an array.
*

8
common/legacy.php
View file

@ -594,8 +594,8 @@ function zdate($str, $format = 'Y-m-d H:i:s', $conversion = false)
// change day and am/pm for each language
if(preg_match('/[MFAa]/', $format))
{
$unit_week = (Array)Context::getLang('unit_week');
$unit_meridiem = (Array)Context::getLang('unit_meridiem');
$unit_week = (Array)lang('unit_week');
$unit_meridiem = (Array)lang('unit_meridiem');
$result = str_replace(array('Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'), $unit_week, $result);
$result = str_replace(array('am', 'pm', 'AM', 'PM'), $unit_meridiem, $result);
}
@ -639,7 +639,7 @@ function getTimeGap($date, $format = 'Y.m.d')
{
$gap = RX_TIME - ztime($date);
$lang_time_gap = Context::getLang('time_gap');
$lang_time_gap = lang('time_gap');
if($gap < 60 * 1.5)
{
$buff = sprintf($lang_time_gap['min'], round($gap / 60));
@ -1157,7 +1157,7 @@ function stripEmbedTagForAdmin(&$content, $writer_member_srl)
return;
}
}
$security_msg = "<div style='border: 1px solid #DDD; background: #FAFAFA; text-align:center; margin: 1em 0;'><p style='margin: 1em;'>" . Context::getLang('security_warning_embed') . "</p></div>";
$security_msg = "<div style='border: 1px solid #DDD; background: #FAFAFA; text-align:center; margin: 1em 0;'><p style='margin: 1em;'>" . lang('security_warning_embed') . "</p></div>";
$content = preg_replace('/<object[^>]+>(.*?<\/object>)?/is', $security_msg, $content);
$content = preg_replace('/<embed[^>]+>(\s*<\/embed>)?/is', $security_msg, $content);
$content = preg_replace('/<img[^>]+editor_component="multimedia_link"[^>]*>(\s*<\/img>)?/is', $security_msg, $content);

2
layouts/xedition/layout.html
View file

@ -228,7 +228,7 @@
</a>
<div class="ly ly_login">
<ul>
<li loop="$logged_info->menu_list => $key, $val"><a href="{getUrl('act', $key, 'member_srl', '', 'page', '')}">{Context::getLang($val)}</a></li>
<li loop="$logged_info->menu_list => $key, $val"><a href="{getUrl('act', $key, 'member_srl', '', 'page', '')}">{lang($val)}</a></li>
<li><a href="{getUrl('act', 'dispMemberLogout')}">{$lang->cmd_logout}</a></li>
</ul>
<span class="edge"></span>

10
modules/admin/admin.admin.controller.php
View file

@ -909,7 +909,7 @@ class adminAdminController extends admin
else
{
$name = $tmpFileName = '';
Context::set('msg', Context::getLang('msg_invalid_format'));
Context::set('msg', lang('msg_invalid_format'));
}
Context::set('name', $name);
@ -936,7 +936,7 @@ class adminAdminController extends admin
if ($iconname == 'favicon.ico')
{
if(!preg_match('/^.*(x-icon|\.icon)$/i',$type)) {
Context::set('msg', '*.ico '.Context::getLang('msg_possible_only_file'));
Context::set('msg', '*.ico '.lang('msg_possible_only_file'));
return;
}
}
@ -944,18 +944,18 @@ class adminAdminController extends admin
{
if (!preg_match('/^.*(png).*$/',$type))
{
Context::set('msg', '*.png '.Context::getLang('msg_possible_only_file'));
Context::set('msg', '*.png '.lang('msg_possible_only_file'));
return;
}
if (!(($height == '57' && $width == '57') || ($height == '114' && $width == '114')))
{
Context::set('msg', Context::getLang('msg_invalid_format').' (size : 57x57, 114x114)');
Context::set('msg', lang('msg_invalid_format').' (size : 57x57, 114x114)');
return;
}
}
else
{
Context::set('msg', Context::getLang('msg_invalid_format'));
Context::set('msg', lang('msg_invalid_format'));
return;
}

4
modules/admin/admin.admin.model.php
View file

@ -112,7 +112,7 @@ class adminAdminModel extends admin
$connection = ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
if(!$connection)
{
return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_host));
return new Object(-1, sprintf(lang('msg_ftp_not_connected'), $ftp_host));
}
$login_result = @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password);
@ -216,7 +216,7 @@ class adminAdminModel extends admin
$oFTP = new ftp();
if(!$oFTP->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
{
return new Object(1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_info->ftp_host));
return new Object(1, sprintf(lang('msg_ftp_not_connected'), $ftp_info->ftp_host));
}
if(!$oFTP->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))

14
modules/autoinstall/autoinstall.lib.php
View file

@ -411,7 +411,7 @@ class SFTPModuleInstaller extends ModuleInstaller
if(!@ssh2_sftp_unlink($this->sftp, $target_path))
{
return new Object(-1, sprintf(Context::getLang('msg_delete_file_failed'), $path));
return new Object(-1, sprintf(lang('msg_delete_file_failed'), $path));
}
return new Object();
}
@ -432,7 +432,7 @@ class SFTPModuleInstaller extends ModuleInstaller
if(!@ssh2_sftp_rmdir($this->sftp, $target_path))
{
return new Object(-1, sprintf(Context::getLang('msg_delete_dir_failed'), $path));
return new Object(-1, sprintf(lang('msg_delete_dir_failed'), $path));
}
return new Object();
}
@ -532,7 +532,7 @@ class PHPFTPModuleInstaller extends ModuleInstaller
$this->connection = ftp_connect($ftp_host, $this->ftp_info->ftp_port);
if(!$this->connection)
{
return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_host));
return new Object(-1, sprintf(lang('msg_ftp_not_connected'), $ftp_host));
}
$login_result = @ftp_login($this->connection, $this->ftp_info->ftp_user, $this->ftp_password);
@ -745,7 +745,7 @@ class FTPModuleInstaller extends ModuleInstaller
$this->oFtp = new ftp();
if(!$this->oFtp->ftp_connect($ftp_host, $this->ftp_info->ftp_port))
{
return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_host));
return new Object(-1, sprintf(lang('msg_ftp_not_connected'), $ftp_host));
}
if(!$this->oFtp->ftp_login($this->ftp_info->ftp_user, $this->ftp_password))
{
@ -772,7 +772,7 @@ class FTPModuleInstaller extends ModuleInstaller
if(!$this->oFtp->ftp_delete($target_path))
{
return new Object(-1, sprintf(Context::getLang('msg_delete_file_failed'), $path));
return new Object(-1, sprintf(lang('msg_delete_file_failed'), $path));
}
return new Object();
}
@ -792,7 +792,7 @@ class FTPModuleInstaller extends ModuleInstaller
if(!$this->oFtp->ftp_rmdir($target_path))
{
return new Object(-1, sprintf(Context::getLang('msg_delete_dir_failed'), $path));
return new Object(-1, sprintf(lang('msg_delete_dir_failed'), $path));
}
return new Object();
}
@ -911,7 +911,7 @@ class DirectModuleInstaller extends ModuleInstaller
if(!FileHandler::removeFile($target_path))
{
return new Object(-1, sprintf(Context::getLang('msg_delete_file_failed'), $path));
return new Object(-1, sprintf(lang('msg_delete_file_failed'), $path));
}
return new Object();
}

6
modules/board/board.admin.model.php
View file

@ -48,10 +48,10 @@ class boardAdminModel extends board
// set order target list
foreach($this->order_target AS $key)
{
$order_target[$key] = Context::getLang($key);
$order_target[$key] = lang($key);
}
$order_target['list_order'] = Context::getLang('document_srl');
$order_target['update_order'] = Context::getLang('last_update');
$order_target['list_order'] = lang('document_srl');
$order_target['update_order'] = lang('last_update');
Context::set('order_target', $order_target);
// for advanced language & url

8
modules/board/board.admin.view.php
View file

@ -54,9 +54,9 @@ class boardAdminView extends board {
$this->setTemplatePath($template_path);
// install order (sorting) options
foreach($this->order_target as $key) $order_target[$key] = Context::getLang($key);
$order_target['list_order'] = Context::getLang('document_srl');
$order_target['update_order'] = Context::getLang('last_update');
foreach($this->order_target as $key) $order_target[$key] = lang($key);
$order_target['list_order'] = lang('document_srl');
$order_target['update_order'] = lang('last_update');
Context::set('order_target', $order_target);
}
@ -295,7 +295,7 @@ class boardAdminView extends board {
* @brief board module message
**/
function alertMessage($message) {
$script = sprintf('<script> xAddEventListener(window,"load", function() { alert("%s"); } );</script>', Context::getLang($message));
$script = sprintf('<script> xAddEventListener(window,"load", function() { alert("%s"); } );</script>', lang($message));
Context::addHtmlHeader( $script );
}
}

8
modules/board/board.controller.php
View file

@ -131,7 +131,7 @@ class boardController extends board
{
if($oDocument->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
{
$format = Context::getLang('msg_protect_regdate_document');
$format = lang('msg_protect_regdate_document');
$massage = sprintf($format, $this->module_info->protect_document_regdate);
return new Object(-1, $massage);
}
@ -234,7 +234,7 @@ class boardController extends board
{
if($oDocument->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
{
$format = Context::getLang('msg_protect_regdate_document');
$format = lang('msg_protect_regdate_document');
$massage = sprintf($format, $this->module_info->protect_document_regdate);
return new Object(-1, $massage);
}
@ -385,7 +385,7 @@ class boardController extends board
{
if($comment->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
{
$format = Context::getLang('msg_protect_regdate_comment');
$format = lang('msg_protect_regdate_comment');
$massage = sprintf($format, $this->module_info->protect_document_regdate);
return new Object(-1, $massage);
}
@ -438,7 +438,7 @@ class boardController extends board
{
if($comment->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
{
$format = Context::getLang('msg_protect_regdate_comment');
$format = lang('msg_protect_regdate_comment');
$massage = sprintf($format, $this->module_info->protect_document_regdate);
return new Object(-1, $massage);
}

2
modules/board/board.mobile.php
View file

@ -105,7 +105,7 @@ class boardMobile extends boardView
function dispBoardMessage($msg_code)
{
$msg = Context::getLang($msg_code);
$msg = lang($msg_code);
$oMessageObject = &ModuleHandler::getModuleInstance('message','mobile');
$oMessageObject->setError(-1);
$oMessageObject->setMessage($msg);

4
modules/board/board.model.php
View file

@ -48,7 +48,7 @@ class boardModel extends module
}
else
{
$output[$key] = new ExtraItem($module_srl, -1, Context::getLang($key), $key, 'N', 'N', 'N', null);
$output[$key] = new ExtraItem($module_srl, -1, lang($key), $key, 'N', 'N', 'N', null);
}
}
return $output;
@ -64,7 +64,7 @@ class boardModel extends module
'user_id', 'user_name', 'readed_count', 'voted_count', 'blamed_count', 'thumbnail', 'summary', 'comment_status');
foreach($virtual_vars as $key)
{
$extra_vars[$key] = new ExtraItem($module_srl, -1, Context::getLang($key), $key, 'N', 'N', 'N', null);
$extra_vars[$key] = new ExtraItem($module_srl, -1, lang($key), $key, 'N', 'N', 'N', null);
}
// get the extra variables from the document model

18
modules/board/board.view.php
View file

@ -160,7 +160,7 @@ class boardView extends board
* add extra vaiables to the search options
**/
// use search options on the template (the search options key has been declared, based on the language selected)
foreach($this->search_option as $opt) $search_option[$opt] = Context::getLang($opt);
foreach($this->search_option as $opt) $search_option[$opt] = lang($opt);
$extra_keys = Context::get('extra_keys');
if($extra_keys)
{
@ -328,7 +328,7 @@ class boardView extends board
// disappear the document if it is secret
if($oDocument->isSecret() && !$oDocument->isGranted())
{
$oDocument->add('content',Context::getLang('thisissecret'));
$oDocument->add('content',lang('thisissecret'));
}
}
}
@ -432,7 +432,7 @@ class boardView extends board
{
if(!$val->isAccessible())
{
$val->add('content',Context::getLang('thisissecret'));
$val->add('content',lang('thisissecret'));
}
}
}
@ -700,7 +700,7 @@ class boardView extends board
{
if($oDocument->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
{
$format = Context::getLang('msg_protect_regdate_document');
$format = lang('msg_protect_regdate_document');
$massage = sprintf($format, $this->module_info->protect_document_regdate);
return new Object(-1, $massage);
}
@ -827,7 +827,7 @@ class boardView extends board
{
if($oDocument->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
{
$format = Context::getLang('msg_protect_regdate_document');
$format = lang('msg_protect_regdate_document');
$massage = sprintf($format, $this->module_info->protect_document_regdate);
return new Object(-1, $massage);
}
@ -989,7 +989,7 @@ class boardView extends board
{
if($oComment->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
{
$format = Context::getLang('msg_protect_regdate_comment');
$format = lang('msg_protect_regdate_comment');
$massage = sprintf($format, $this->module_info->protect_document_regdate);
return new Object(-1, $massage);
}
@ -1057,7 +1057,7 @@ class boardView extends board
{
if($oComment->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
{
$format = Context::getLang('msg_protect_regdate_comment');
$format = lang('msg_protect_regdate_comment');
$massage = sprintf($format, $this->module_info->protect_document_regdate);
return new Object(-1, $massage);
}
@ -1136,7 +1136,7 @@ class boardView extends board
**/
function dispBoardMessage($msg_code)
{
$msg = Context::getLang($msg_code);
$msg = lang($msg_code);
if(!$msg) $msg = $msg_code;
Context::set('message', $msg);
$this->setTemplateFile('message');
@ -1186,7 +1186,7 @@ class boardView extends board
**/
function alertMessage($message)
{
$script = sprintf('<script> jQuery(function(){ alert("%s"); } );</script>', Context::getLang($message));
$script = sprintf('<script> jQuery(function(){ alert("%s"); } );</script>', lang($message));
Context::addHtmlFooter( $script );
}

14
modules/board/board.wap.php
View file

@ -17,7 +17,7 @@ class boardWAP extends board
// check grant
if(!$this->grant->list || $this->module_info->consultation == 'Y')
{
return $oMobile->setContent(Context::getLang('msg_not_permitted'));
return $oMobile->setContent(lang('msg_not_permitted'));
}
// generate document model object
@ -33,7 +33,7 @@ class boardWAP extends board
// check the grant
if(!$this->grant->view)
{
return $oMobile->setContent(Context::getLang('msg_not_permitted'));
return $oMobile->setContent(lang('msg_not_permitted'));
}
// setup the browser title
@ -64,7 +64,7 @@ class boardWAP extends board
$oMobile->setContent( $content );
// setup upper URL
$oMobile->setUpperUrl( getUrl('act',''), Context::getLang('cmd_go_upper') );
$oMobile->setUpperUrl( getUrl('act',''), lang('cmd_go_upper') );
// display the document if the act is not display the comment list
} else {
@ -74,14 +74,14 @@ class boardWAP extends board
// setup content information(include the comments link)
$content = Context::getLang('replies').' : <a href="'.getUrl('act','dispBoardContentCommentList').'">'.$oDocument->getCommentCount().'</a><br>'."\r\n".$content;
$content = lang('replies').' : <a href="'.getUrl('act','dispBoardContentCommentList').'">'.$oDocument->getCommentCount().'</a><br>'."\r\n".$content;
$content = '<b>'.$oDocument->getNickName().'</b> ('.$oDocument->getRegdate("Y-m-d").")<br>\r\n".$content;
// setup mobile contents
$oMobile->setContent( $content );
// setup upper URL
$oMobile->setUpperUrl( getUrl('document_srl',''), Context::getLang('cmd_list') );
$oMobile->setUpperUrl( getUrl('document_srl',''), lang('cmd_list') );
}
@ -124,12 +124,12 @@ class boardWAP extends board
// next/prevUrl specification
if($page > 1)
{
$oMobile->setPrevUrl(getUrl('mid',$_GET['mid'],'page',$page-1), sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $page-1, $totalPage));
$oMobile->setPrevUrl(getUrl('mid',$_GET['mid'],'page',$page-1), sprintf('%s (%d/%d)', lang('cmd_prev'), $page-1, $totalPage));
}
if($page < $totalPage)
{
$oMobile->setNextUrl(getUrl('mid',$_GET['mid'],'page',$page+1), sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $page+1, $totalPage));
$oMobile->setNextUrl(getUrl('mid',$_GET['mid'],'page',$page+1), sprintf('%s (%d/%d)', lang('cmd_next'), $page+1, $totalPage));
}
$oMobile->mobilePage = $page;

2
modules/comment/comment.admin.controller.php
View file

@ -267,7 +267,7 @@ class commentAdminController extends comment
{
$msgCode = 'success_deleted';
}
//$this->setMessage( sprintf(Context::getLang('msg_checked_comment_is_deleted'), $deleted_count) );
//$this->setMessage( sprintf(lang('msg_checked_comment_is_deleted'), $deleted_count) );
$this->setMessage($msgCode, 'info');
//set url params

6
modules/comment/comment.controller.php
View file

@ -207,7 +207,7 @@ class commentController extends comment
// if an user select message from options, message would be the option.
$message_option = strval(Context::get('message_option'));
$improper_comment_reasons = Context::getLang('improper_comment_reasons');
$improper_comment_reasons = lang('improper_comment_reasons');
$declare_message = ($message_option !== 'others' && isset($improper_comment_reasons[$message_option]))?
$improper_comment_reasons[$message_option] : trim(Context::get('declare_message'));
@ -594,7 +594,7 @@ class commentController extends comment
if(!$manual_inserted)
{
// send a message if notify_message option in enabled in the original article
$oDocument->notify(Context::getLang('comment'), $obj->content);
$oDocument->notify(lang('comment'), $obj->content);
// send a message if notify_message option in enabled in the original comment
if($obj->parent_srl)
@ -602,7 +602,7 @@ class commentController extends comment
$oParent = $oCommentModel->getComment($obj->parent_srl);
if($oParent->get('member_srl') != $oDocument->get('member_srl'))
{
$oParent->notify(Context::getLang('comment'), $obj->content);
$oParent->notify(lang('comment'), $obj->content);
}
}
}

6
modules/comment/comment.item.php
View file

@ -312,7 +312,7 @@ class commentItem extends Object
{
if($this->isSecret() && !$this->isAccessible())
{
return Context::getLang('msg_is_secret');
return lang('msg_is_secret');
}
$content = $this->get('content');
@ -333,7 +333,7 @@ class commentItem extends Object
{
if($this->isSecret() && !$this->isAccessible())
{
return Context::getLang('msg_is_secret');
return lang('msg_is_secret');
}
$content = $this->get('content');
@ -343,7 +343,7 @@ class commentItem extends Object
if($add_popup_menu && Context::get('is_logged'))
{
$content = sprintf(
'%s<div class="comment_popup_menu"><a href="#popup_menu_area" class="comment_%d" onclick="return false">%s</a></div>', $content, $this->comment_srl, Context::getLang('cmd_comment_do')
'%s<div class="comment_popup_menu"><a href="#popup_menu_area" class="comment_%d" onclick="return false">%s</a></div>', $content, $this->comment_srl, lang('cmd_comment_do')
);
}

4
modules/comment/comment.model.php
View file

@ -77,7 +77,7 @@ class commentModel extends comment
ModuleHandler::triggerCall('comment.getCommentMenu', 'after', $menu_list);
if($this->grant->manager){
$str_confirm = Context::getLang('confirm_move');
$str_confirm = lang('confirm_move');
$url = sprintf("if(!confirm('%s')) return; var params = new Array(); params['comment_srl']='%s'; params['mid']=current_mid;params['cur_url']=current_url; exec_xml('comment', 'procCommentAdminMoveToTrash', params)", $str_confirm, $comment_srl);
$oCommentController->addCommentPopupMenu($url,'cmd_trash','','javascript');
@ -106,7 +106,7 @@ class commentModel extends comment
for($i = 0; $i < $menus_count; $i++)
{
$menus[$i]->str = Context::getLang($menus[$i]->str);
$menus[$i]->str = lang($menus[$i]->str);
}
// get a list of final organized pop-up menus

2
modules/communication/communication.controller.php
View file

@ -808,7 +808,7 @@ class communicationController extends communication
if($new_message_count > 0)
{
Context::loadFile('./modules/communication/tpl/js/member_communication.js');
$text = preg_replace('@\r?\n@', '\\n', addslashes(Context::getLang('alert_new_message_arrived')));
$text = preg_replace('@\r?\n@', '\\n', addslashes(lang('alert_new_message_arrived')));
Context::addHtmlHeader("<script type=\"text/javascript\">jQuery(function(){ xeNotifyMessage('{$text}','{$new_message_count}'); });</script>");
}

2
modules/communication/skins/default/common_header.html
View file

@ -3,6 +3,6 @@
<section class="xc">
<ul class="nav nav-tabs" cond="$is_logged && $logged_info->menu_list && (!$member_srl || $member_srl == $logged_info->member_srl)">
<li loop="$logged_info->menu_list => $key,$val" class="active"|cond="$key==$act">
<a href="{getUrl('act',$key)}">{Context::getLang($val)}</a>
<a href="{getUrl('act',$key)}">{lang($val)}</a>
</li>
</ul>

2
modules/document/document.admin.controller.php
View file

@ -41,7 +41,7 @@ class documentAdminController extends document
$oDocumentController->deleteDocument($document_srl, true);
}
$this->setMessage(sprintf(Context::getLang('msg_checked_document_is_deleted'), $document_count) );
$this->setMessage(sprintf(lang('msg_checked_document_is_deleted'), $document_count) );
}
/**

2
modules/document/document.admin.view.php
View file

@ -68,7 +68,7 @@ class documentAdminView extends document
$count_search_option = count($this->search_option);
for($i=0;$i<$count_search_option;$i++)
{
$search_option[$this->search_option[$i]] = Context::getLang($this->search_option[$i]);
$search_option[$this->search_option[$i]] = lang($this->search_option[$i]);
}
Context::set('search_option', $search_option);

12
modules/document/document.controller.php
View file

@ -205,7 +205,7 @@ class documentController extends document
// if an user select message from options, message would be the option.
$message_option = strval(Context::get('message_option'));
$improper_document_reasons = Context::getLang('improper_document_reasons');
$improper_document_reasons = lang('improper_document_reasons');
$declare_message = ($message_option !== 'others' && isset($improper_document_reasons[$message_option]))?
$improper_document_reasons[$message_option] : trim(Context::get('declare_message'));
@ -1814,9 +1814,9 @@ class documentController extends document
$prev_category = $val;
}
// Return if the previous category doesn't exist
if(!$prev_category) return new Object(-1,Context::getLang('msg_category_not_moved'));
if(!$prev_category) return new Object(-1,lang('msg_category_not_moved'));
// Return if the selected category is the top level
if($category_srl_list[0]==$category_srl) return new Object(-1,Context::getLang('msg_category_not_moved'));
if($category_srl_list[0]==$category_srl) return new Object(-1,lang('msg_category_not_moved'));
// Information of the selected category
$cur_args = new stdClass;
$cur_args->category_srl = $category_srl;
@ -1860,7 +1860,7 @@ class documentController extends document
}
$next_category_srl = $category_srl_list[$i+1];
if(!$category_list[$next_category_srl]) return new Object(-1,Context::getLang('msg_category_not_moved'));
if(!$category_list[$next_category_srl]) return new Object(-1,lang('msg_category_not_moved'));
$next_category = $category_list[$next_category_srl];
// Information of the selected category
$cur_args = new stdClass;
@ -2529,10 +2529,10 @@ class documentController extends document
{
$logged_info = Context::get('logged_info');
$message_content = '';
$default_message_verbs = Context::getLang('default_message_verbs');
$default_message_verbs = lang('default_message_verbs');
if(isset($default_message_verbs[$type]) && is_string($default_message_verbs[$type]))
{
$message_content = sprintf(Context::getLang('default_message_format'), $logged_info->nick_name, $default_message_verbs[$type]);
$message_content = sprintf(lang('default_message_format'), $logged_info->nick_name, $default_message_verbs[$type]);
}
}
else

6
modules/document/document.item.php
View file

@ -411,7 +411,7 @@ class documentItem extends Object
{
if(!$this->document_srl) return;
if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return lang('msg_is_secret');
$result = $this->_checkAccessibleFromStatus();
if($result && Context::getSessionStatus())
@ -475,7 +475,7 @@ class documentItem extends Object
{
if(!$this->document_srl) return;
if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return lang('msg_is_secret');
$result = $this->_checkAccessibleFromStatus();
if($result && Context::getSessionStatus())
@ -498,7 +498,7 @@ class documentItem extends Object
$content = sprintf(
'%s<div class="document_popup_menu"><a href="#popup_menu_area" class="document_%d" onclick="return false">%s</a></div>',
$content,
$this->document_srl, Context::getLang('cmd_document_do')
$this->document_srl, lang('cmd_document_do')
);
}
// If additional content information is set

4
modules/document/document.model.php
View file

@ -528,7 +528,7 @@ class documentModel extends document
ModuleHandler::triggerCall('document.getDocumentMenu', 'after', $menu_list);
if($this->grant->manager)
{
$str_confirm = Context::getLang('confirm_move');
$str_confirm = lang('confirm_move');
$url = sprintf("if(!confirm('%s')) return; var params = new Array(); params['document_srl']='%s'; params['mid']=current_mid;params['cur_url']=current_url; exec_xml('document', 'procDocumentAdminMoveToTrash', params)", $str_confirm, $document_srl);
$oDocumentController->addDocumentPopupMenu($url,'cmd_trash','','javascript');
}
@ -554,7 +554,7 @@ class documentModel extends document
$menus_count = count($menus);
for($i=0;$i<$menus_count;$i++)
{
$menus[$i]->str = Context::getLang($menus[$i]->str);
$menus[$i]->str = lang($menus[$i]->str);
}
// Wanted to finally clean pop-up menu list
$this->add('menus', $menus);

4
modules/editor/editor.controller.php
View file

@ -47,13 +47,13 @@ class editorController extends editor
{
$component = Context::get('component');
$method = Context::get('method');
if(!$component) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
if(!$component) return new Object(-1, sprintf(lang('msg_component_is_not_founded'), $component));
$oEditorModel = getModel('editor');
$oComponent = &$oEditorModel->getComponentObject($component);
if(!$oComponent->toBool()) return $oComponent;
if(!method_exists($oComponent, $method)) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
if(!method_exists($oComponent, $method)) return new Object(-1, sprintf(lang('msg_component_is_not_founded'), $component));
//$output = call_user_method($method, $oComponent);
//$output = call_user_func(array($oComponent, $method));

4
modules/editor/editor.model.php
View file

@ -547,11 +547,11 @@ class editorModel extends editor
// Create an object of the component and execute
$class_path = sprintf('%scomponents/%s/', $this->module_path, $component);
$class_file = sprintf('%s%s.class.php', $class_path, $component);
if(!file_exists($class_file)) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
if(!file_exists($class_file)) return new Object(-1, sprintf(lang('msg_component_is_not_founded'), $component));
// Create an object after loading the class file
require_once($class_file);
$oComponent = new $component($editor_sequence, $class_path);
if(!$oComponent) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
if(!$oComponent) return new Object(-1, sprintf(lang('msg_component_is_not_founded'), $component));
// Add configuration information
$component_info = $this->getComponent($component, $site_srl);
$oComponent->setInfo($component_info);

2
modules/editor/editor.view.php
View file

@ -33,7 +33,7 @@ class editorView extends editor
$oComponent = &$oEditorModel->getComponentObject($component, $editor_sequence, $site_srl);
if(!$oComponent->toBool())
{
Context::set('message', sprintf(Context::getLang('msg_component_is_not_founded'), $component));
Context::set('message', sprintf(lang('msg_component_is_not_founded'), $component));
$this->setTemplatePath($this->module_path.'tpl');
$this->setTemplateFile('component_not_founded');
}

2
modules/file/file.admin.controller.php
View file

@ -78,7 +78,7 @@ class fileAdminController extends file
$oFileController->deleteFile($file_srl);
}
$this->setMessage( sprintf(Context::getLang('msg_checked_file_is_deleted'), $file_count) );
$this->setMessage( sprintf(lang('msg_checked_file_is_deleted'), $file_count) );
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispFileAdminList');
$this->setRedirectUrl($returnUrl);

6
modules/file/file.model.php
View file

@ -271,12 +271,12 @@ class fileModel extends file
// Display upload status
$upload_status = sprintf(
'%s : %s/ %s<br /> %s : %s (%s : %s)',
Context::getLang('allowed_attach_size'),
lang('allowed_attach_size'),
FileHandler::filesize($attached_size),
FileHandler::filesize($file_config->allowed_attach_size*1024*1024),
Context::getLang('allowed_filesize'),
lang('allowed_filesize'),
FileHandler::filesize($file_config->allowed_filesize*1024*1024),
Context::getLang('allowed_filetypes'),
lang('allowed_filetypes'),
$file_config->allowed_filetypes
);
return $upload_status;

4
modules/importer/importer.admin.controller.php
View file

@ -328,10 +328,10 @@ class importerAdminController extends importer
// When completing, success message appears and remove the cache files
if($total <= $cur)
{
$this->setMessage( sprintf(Context::getLang('msg_import_finished'), $cur, $total) );
$this->setMessage( sprintf(lang('msg_import_finished'), $cur, $total) );
FileHandler::removeDir('./files/cache/importer/'.$key);
}
else $this->setMessage( sprintf(Context::getLang('msg_importing'), $total, $cur) );
else $this->setMessage( sprintf(lang('msg_importing'), $total, $cur) );
}
/**

4
modules/install/install.controller.php
View file

@ -284,7 +284,7 @@ class installController extends install
if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new Object(-1,'msg_safe_mode_ftp_needed');
$oFtp = new ftp();
if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_info->ftp_host));
if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new Object(-1, sprintf(lang('msg_ftp_not_connected'), $ftp_info->ftp_host));
if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
{
@ -342,7 +342,7 @@ class installController extends install
else
{
$oFtp = new ftp();
if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new Object(-1, sprintf(lang('msg_ftp_not_connected'), 'localhost'));
if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
{

2
modules/install/install.model.php
View file

@ -54,7 +54,7 @@ class installModel extends install
if(function_exists('ftp_connect'))
{
$connection = ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
if(!$connection) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_info->ftp_host));
if(!$connection) return new Object(-1, sprintf(lang('msg_ftp_not_connected'), $ftp_info->ftp_host));
if(! @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
{
ftp_close($connection);

2
modules/install/install.view.php
View file

@ -23,7 +23,7 @@ class installView extends install
}
// Set the browser title.
Context::setBrowserTitle(Context::getLang('introduce_title'));
Context::setBrowserTitle(lang('introduce_title'));
// Specify the template path.
$this->setTemplatePath($this->module_path.'tpl');

10
modules/layout/layout.admin.controller.php
View file

@ -927,13 +927,13 @@ class layoutAdminController extends layout
if(!$img['tmp_name'] || !is_uploaded_file($img['tmp_name']) || !checkUploadedFile($img['tmp_name']))
{
Context::set('msg', Context::getLang('upload failed'));
Context::set('msg', lang('upload failed'));
return;
}
if(!preg_match('/\.(jpg|jpeg|gif|png|swf)$/i', $img['name']))
{
Context::set('msg', Context::getLang('msg_layout_image_target'));
Context::set('msg', lang('msg_layout_image_target'));
return;
}
@ -941,7 +941,7 @@ class layoutAdminController extends layout
$tmpPath = $path . 'tmp/';
if(!FileHandler::makeDir($tmpPath))
{
Context::set('msg', Context::getLang('make directory failed'));
Context::set('msg', lang('make directory failed'));
return;
}
@ -952,7 +952,7 @@ class layoutAdminController extends layout
if(!move_uploaded_file($img['tmp_name'], $tmpFileName))
{
Context::set('msg', Context::getLang('move file failed'));
Context::set('msg', lang('move file failed'));
return;
}
@ -990,7 +990,7 @@ class layoutAdminController extends layout
$output = $this->updateLayout($args);
if(!$output->toBool())
{
Context::set('msg', Context::getLang($output->getMessage()));
Context::set('msg', lang($output->getMessage()));
return $output;
}

2
modules/layout/layout.admin.view.php
View file

@ -324,7 +324,7 @@ class layoutAdminView extends layout
}
Context::set('layout_info', $layout_info);
Context::set('content', Context::getLang('layout_preview_content'));
Context::set('content', lang('layout_preview_content'));
// Temporary save the codes
$edited_layout_file = sprintf('./files/cache/layout/tmp.tpl');
FileHandler::writeFile($edited_layout_file, $code);

4
modules/layout/layout.model.php
View file

@ -58,7 +58,7 @@ class layoutModel extends layout
$siteDefaultLayoutInfo = $this->getlayout($siteDefaultLayoutSrl);
$newLayout = sprintf('%s, %s', $siteDefaultLayoutInfo->title, $siteDefaultLayoutInfo->layout);
$siteDefaultLayoutInfo->layout_srl = -1;
$siteDefaultLayoutInfo->title = Context::getLang('use_site_default_layout');
$siteDefaultLayoutInfo->title = lang('use_site_default_layout');
$siteDefaultLayoutInfo->layout = $newLayout;
array_unshift($output->data, $siteDefaultLayoutInfo);
@ -1030,7 +1030,7 @@ class layoutModel extends layout
// Display edit button for faceoff layout
if(Context::get('module')!='admin' && strpos(Context::get('act'),'Admin')===false && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin))
{
Context::addHtmlFooter('<div class="faceOffManager" style="height: 23px; position: fixed; right: 3px; top: 3px;"><a href="'.getUrl('','mid',Context::get('mid'),'act','dispLayoutAdminLayoutModify','delete_tmp','Y').'">'.Context::getLang('cmd_layout_edit').'</a></div>');
Context::addHtmlFooter('<div class="faceOffManager" style="height: 23px; position: fixed; right: 3px; top: 3px;"><a href="'.getUrl('','mid',Context::get('mid'),'act','dispLayoutAdminLayoutModify','delete_tmp','Y').'">'.lang('cmd_layout_edit').'</a></div>');
}
// Display menu when editing the faceOff page
if(Context::get('act')=='dispLayoutAdminLayoutModify' && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin))

12
modules/layout/layout.view.php
View file

@ -55,7 +55,7 @@ class layoutView extends layout
$logged_info = Context::get('logged_info');
if($logged_info->is_admin != 'Y')
{
throw new Exception(Context::getLang('msg_invalid_request'));
throw new Exception(lang('msg_invalid_request'));
}
// if module is 'ARTiCLE' and from site design setting, make content directly
@ -64,7 +64,7 @@ class layoutView extends layout
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument(0, true);
$t = Context::getLang('article_preview_title');
$t = lang('article_preview_title');
$c = '';
for($i = 0; $i < 4; $i++)
@ -72,7 +72,7 @@ class layoutView extends layout
$c .= '<p>';
for($j = 0; $j < 20; $j++)
{
$c .= Context::getLang('article_preview_content') . ' ';
$c .= lang('article_preview_content') . ' ';
}
$c .= '</p>';
}
@ -259,7 +259,7 @@ class layoutView extends layout
// if there is no module instance, error...
if(!$output->data)
{
throw new Exception(Context::getLang('msg_unabled_preview'));
throw new Exception(lang('msg_unabled_preview'));
}
$mid = current($output->data)->mid;
@ -301,7 +301,7 @@ class layoutView extends layout
$oModule = $oModuleHandler->procModule();
if(!$oModule->toBool())
{
throw new Exception(Context::getLang('not_support_layout_preview'));
throw new Exception(lang('not_support_layout_preview'));
}
// get module html
@ -361,7 +361,7 @@ class layoutView extends layout
}
Context::set('layout_info', $layout_info);
Context::set('content', Context::getLang('layout_preview_content'));
Context::set('content', lang('layout_preview_content'));
// Temporary save the codes
$edited_layout_file = _XE_PATH_ . 'files/cache/layout/tmp.tpl';
FileHandler::writeFile($edited_layout_file, $code);

2
modules/member/m.skins/default/common_header.html
View file

@ -3,7 +3,7 @@
<div class="mtab" cond="$is_logged && $logged_info->menu_list && (!$member_srl || $member_srl == $logged_info->member_srl)">
<ul class="mtab">
<li loop="$logged_info->menu_list=>$key,$val" class="active"|cond="$key==$act">
<a href="{getUrl('', 'act',$key, 'mid', $mid, 'vid', $vid)}"><span>{Context::getLang($val)}</span></a>
<a href="{getUrl('', 'act',$key, 'mid', $mid, 'vid', $vid)}"><span>{lang($val)}</span></a>
</li>
</ul>
</div>

2
modules/member/m.skins/default/leave_form.html
View file

@ -12,7 +12,7 @@
<input type="hidden" name="xe_validator_id" value="modules/member/m.skin/default/leave_form/1" />
<ul>
<li>
<label for="identifier">{Context::getLang($identifier)}</label>
<label for="identifier">{lang($identifier)}</label>
<p id="identifier">{$formValue}</p>
</li>
<li>

2
modules/member/m.skins/default/modify_password.html
View file

@ -14,7 +14,7 @@
<ul>
<li>
<label for="uid">{Context::getLang($identifier)}</label>
<label for="uid">{lang($identifier)}</label>
<input type="text" disabled="disabled" value="{$formValue}" id="uid" />
</li>
<li>

2
modules/member/member.admin.controller.php
View file

@ -1296,7 +1296,7 @@ class memberAdminController extends member
$default_args->group_srl = $defaultGroupSrl;
$output = $this->updateGroup($default_args);
$this->setMessage(Context::getLang('success_updated').' ('.Context::getLang('msg_insert_group_name_detail').')');
$this->setMessage(lang('success_updated').' ('.lang('msg_insert_group_name_detail').')');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList');
$this->setRedirectUrl($returnUrl);

2
modules/member/member.admin.view.php
View file

@ -506,7 +506,7 @@ class memberAdminView extends member
$val);
}
$inputTag = sprintf($inputTag, implode('', $optionTag));
$inputTag .= '<input type="text" name="find_account_answer" id="find_account_answer" title="'.Context::getLang('find_account_answer').'" value="'.$memberInfo['find_account_answer'].'" />';
$inputTag .= '<input type="text" name="find_account_answer" id="find_account_answer" title="'.lang('find_account_answer').'" value="'.$memberInfo['find_account_answer'].'" />';
}
else if($formInfo->name == 'email_address')
{

10
modules/member/member.class.php
View file

@ -110,19 +110,19 @@ class member extends ModuleObject {
{
// Set an administrator, regular member(group1), and associate member(group2)
$group_args = new stdClass;
$group_args->title = Context::getLang('admin_group');
$group_args->title = lang('admin_group');
$group_args->is_default = 'N';
$group_args->is_admin = 'Y';
$output = $oMemberAdminController->insertGroup($group_args);
$group_args = new stdClass;
$group_args->title = Context::getLang('default_group_1');
$group_args->title = lang('default_group_1');
$group_args->is_default = 'Y';
$group_args->is_admin = 'N';
$output = $oMemberAdminController->insertGroup($group_args);
$group_args = new stdClass;
$group_args->title = Context::getLang('default_group_2');
$group_args->title = lang('default_group_2');
$group_args->is_default = 'N';
$group_args->is_admin = 'N';
$oMemberAdminController->insertGroup($group_args);
@ -455,14 +455,14 @@ class member extends ModuleObject {
{
//update
$content = unserialize($output->data->content);
$content[] = array($_SERVER['REMOTE_ADDR'],Context::getLang($message),$_SERVER['REQUEST_TIME']);
$content[] = array($_SERVER['REMOTE_ADDR'],lang($message),$_SERVER['REQUEST_TIME']);
$args->content = serialize($content);
$output = executeQuery('member.updateLoginCountHistoryByMemberSrl', $args);
}
else
{
//insert
$content[0] = array($_SERVER['REMOTE_ADDR'],Context::getLang($message),$_SERVER['REQUEST_TIME']);
$content[0] = array($_SERVER['REMOTE_ADDR'],lang($message),$_SERVER['REQUEST_TIME']);
$args->content = serialize($content);
$output = executeQuery('member.insertLoginCountHistoryByMemberSrl', $args);
}

60
modules/member/member.controller.php
View file

@ -67,7 +67,7 @@ class memberController extends member
$oMemberModel = getModel('member');
if($this->memberInfo->change_password_date < date ('YmdHis', strtotime ('-' . $limit_date . ' day')))
{
$msg = sprintf(Context::getLang('msg_change_password_date'), $limit_date);
$msg = sprintf(lang('msg_change_password_date'), $limit_date);
return $this->setRedirectUrl(getNotEncodedUrl('','vid',Context::get('vid'),'mid',Context::get('mid'),'act','dispMemberModifyPassword'), new Object(-1, $msg));
}
}
@ -245,7 +245,7 @@ class memberController extends member
$config = $oMemberModel->getMemberConfig();
$emailhost_check = $config->emailhost_check;
$managed_email_host = Context::getLang('managed_email_host');
$managed_email_host = lang('managed_email_host');
$email_hosts = $oMemberModel->getManagedEmailHosts();
foreach ($email_hosts as $host)
@ -313,7 +313,7 @@ class memberController extends member
// check password strength
if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
{
$message = Context::getLang('about_password_strength');
$message = lang('about_password_strength');
return new Object(-1, $message[$config->password_strength]);
}
@ -412,7 +412,7 @@ class memberController extends member
if($config->redirect_url) $this->add('redirect_url', $config->redirect_url);
if($config->enable_confirm == 'Y')
{
$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address);
$msg = sprintf(lang('msg_confirm_mail_sent'), $args->email_address);
$this->setMessage($msg);
return $this->setRedirectUrl(getUrl('', 'act', 'dispMemberLoginForm'), new Object(-12, $msg));
}
@ -1048,13 +1048,13 @@ class memberController extends member
$member_config = $oModuleModel->getModuleConfig('member');
// Send a mail
$oMail = new Mail();
$oMail->setTitle( Context::getLang('msg_find_account_title') );
$oMail->setTitle( lang('msg_find_account_title') );
$oMail->setContent($content);
$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
$oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
$oMail->send();
// Return message
$msg = sprintf(Context::getLang('msg_auth_mail_sent'), $member_info->email_address);
$msg = sprintf(lang('msg_auth_mail_sent'), $member_info->email_address);
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
{
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberFindAccount');
@ -1273,13 +1273,13 @@ class memberController extends member
$content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
// Send a mail
$oMail = new Mail();
$oMail->setTitle( Context::getLang('msg_confirm_account_title') );
$oMail->setTitle( lang('msg_confirm_account_title') );
$oMail->setContent($content);
$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
$oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
$oMail->send();
$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address);
$msg = sprintf(lang('msg_confirm_mail_sent'), $args->email_address);
$this->setMessage($msg);
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
@ -1349,7 +1349,7 @@ class memberController extends member
// resend auth mail.
$this->_sendAuthMail($auth_args, $memberInfo);
$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $memberInfo->email_address);
$msg = sprintf(lang('msg_confirm_mail_sent'), $memberInfo->email_address);
$this->setMessage($msg);
$returnUrl = getUrl('');
@ -1401,7 +1401,7 @@ class memberController extends member
$content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
// Send a mail
$oMail = new Mail();
$oMail->setTitle( Context::getLang('msg_confirm_account_title') );
$oMail->setTitle( lang('msg_confirm_account_title') );
$oMail->setContent($content);
$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
$oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
@ -1720,12 +1720,12 @@ class memberController extends member
if($term < $config->max_error_count_time)
{
$term = $config->max_error_count_time - $term;
if($term < 60) $term = intval($term).Context::getLang('unit_sec');
elseif(60 <= $term && $term < 3600) $term = intval($term/60).Context::getLang('unit_min');
elseif(3600 <= $term && $term < 86400) $term = intval($term/3600).Context::getLang('unit_hour');
else $term = intval($term/86400).Context::getLang('unit_day');
if($term < 60) $term = intval($term).lang('unit_sec');
elseif(60 <= $term && $term < 3600) $term = intval($term/60).lang('unit_min');
elseif(3600 <= $term && $term < 86400) $term = intval($term/3600).lang('unit_hour');
else $term = intval($term/86400).lang('unit_day');
return new Object(-1, sprintf(Context::getLang('excess_ip_access_count'),$term));
return new Object(-1, sprintf(lang('excess_ip_access_count'),$term));
}
else
{
@ -1751,13 +1751,13 @@ class memberController extends member
$redirectUrl = getUrl('', 'act', 'dispMemberResendAuthMail');
return $this->setRedirectUrl($redirectUrl, new Object(-1,'msg_user_not_confirmed'));
}
return new Object(-1, ($this->memberInfo->refused_reason)? Context::getLang('msg_user_denied') . "\n" . $this->memberInfo->refused_reason : 'msg_user_denied');
return new Object(-1, ($this->memberInfo->refused_reason)? lang('msg_user_denied') . "\n" . $this->memberInfo->refused_reason : 'msg_user_denied');
}
// Notify if user is limited
if($this->memberInfo->limit_date && substr($this->memberInfo->limit_date,0,8) >= date("Ymd"))
{
return new Object(-9,sprintf(Context::getLang('msg_user_limited'),zdate($this->memberInfo->limit_date,"Y-m-d")));
return new Object(-9,sprintf(lang('msg_user_limited'),zdate($this->memberInfo->limit_date,"Y-m-d")));
}
// Do not allow login as admin if not in allowed IP list
@ -1785,17 +1785,17 @@ class memberController extends member
$output = executeQuery('member.getLoginCountHistoryByMemberSrl', $args);
if($output->data && $output->data->content)
{
$title = Context::getLang('login_fail_report');
$title = lang('login_fail_report');
$message = '<ul>';
$content = unserialize($output->data->content);
if(count($content) > $config->max_error_count)
{
foreach($content as $val)
{
$message .= '<li>'.Context::getLang('regdate').': '.date('Y-m-d h:i:sa',$val[2]).'<ul><li>'.Context::getLang('ipaddress').': '.$val[0].'</li><li>'.Context::getLang('message').': '.$val[1].'</li></ul></li>';
$message .= '<li>'.lang('regdate').': '.date('Y-m-d h:i:sa',$val[2]).'<ul><li>'.lang('ipaddress').': '.$val[0].'</li><li>'.lang('message').': '.$val[1].'</li></ul></li>';
}
$message .= '</ul>';
$content = sprintf(Context::getLang('login_fail_report_contents'),$message,date('Y-m-d h:i:sa'));
$content = sprintf(lang('login_fail_report_contents'),$message,date('Y-m-d h:i:sa'));
//send message
$oCommunicationController = getController('communication');
@ -1906,7 +1906,7 @@ class memberController extends member
{
$logged_info = Context::get('logged_info');
$logged_info->menu_list[$act] = Context::getLang($str);
$logged_info->menu_list[$act] = lang($str);
Context::set('logged_info', $logged_info);
}
@ -1988,7 +1988,7 @@ class memberController extends member
{
if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
{
$message = Context::getLang('about_password_strength');
$message = lang('about_password_strength');
return new Object(-1, $message[$config->password_strength]);
}
$args->password = $oMemberModel->hashPassword($args->password);
@ -2030,7 +2030,7 @@ class memberController extends member
$config = $oMemberModel->getMemberConfig();
$emailhost_check = $config->emailhost_check;
$managed_email_host = Context::getLang('managed_email_host');
$managed_email_host = lang('managed_email_host');
$email_hosts = $oMemberModel->getManagedEmailHosts();
foreach ($email_hosts as $host)
{
@ -2191,7 +2191,7 @@ class memberController extends member
$config = $oMemberModel->getMemberConfig();
$emailhost_check = $config->emailhost_check;
$managed_email_host = Context::getLang('managed_email_host');
$managed_email_host = lang('managed_email_host');
$email_hosts = $oMemberModel->getManagedEmailHosts();
foreach ($email_hosts as $host)
{
@ -2261,7 +2261,7 @@ class memberController extends member
{
if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
{
$message = Context::getLang('about_password_strength');
$message = lang('about_password_strength');
return new Object(-1, $message[$config->password_strength]);
}
$args->password = $oMemberModel->hashPassword($args->password);
@ -2364,7 +2364,7 @@ class memberController extends member
if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
{
$message = Context::getLang('about_password_strength');
$message = lang('about_password_strength');
return new Object(-1, $message[$config->password_strength]);
}
@ -2542,7 +2542,7 @@ class memberController extends member
$config = $oMemberModel->getMemberConfig();
$emailhost_check = $config->emailhost_check;
$managed_email_host = Context::getLang('managed_email_host');
$managed_email_host = lang('managed_email_host');
$email_hosts = $oMemberModel->getManagedEmailHosts();
foreach ($email_hosts as $host)
{
@ -2601,13 +2601,13 @@ class memberController extends member
$content = $oTemplate->compile($tpl_path, 'confirm_member_new_email');
$oMail = new Mail();
$oMail->setTitle( Context::getLang('title_modify_email_address') );
$oMail->setTitle( lang('title_modify_email_address') );
$oMail->setContent($content);
$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
$oMail->setReceiptor( $member_info->nick_name, $newEmail );
$result = $oMail->send();
$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $newEmail);
$msg = sprintf(lang('msg_confirm_mail_sent'), $newEmail);
$this->setMessage($msg);
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
@ -2803,7 +2803,7 @@ class memberController extends member
$args->description = trim( $member_info->description );
if( $args->description != "" ) $args->description .= "\n"; // add new line
$args->description .= Context::getLang('cmd_spammer') . "[" . date("Y-m-d H:i:s") . " from:" . $logged_info->user_id . " info:" . $spam_description . " docuemnts count:" . $total_count . "]";
$args->description .= lang('cmd_spammer') . "[" . date("Y-m-d H:i:s") . " from:" . $logged_info->user_id . " info:" . $spam_description . " docuemnts count:" . $total_count . "]";
$output = $this->updateMember($args, true);

4
modules/member/member.model.php
View file

@ -44,7 +44,7 @@ class memberModel extends member
//for multi language
foreach($config->signupForm AS $key=>$value)
{
$config->signupForm[$key]->title = ($value->isDefaultForm) ? Context::getLang($value->name) : $value->title;
$config->signupForm[$key]->title = ($value->isDefaultForm) ? lang($value->name) : $value->title;
if($config->signupForm[$key]->isPublic != 'N') $config->signupForm[$key]->isPublic = 'Y';
if($value->name == 'find_account_question') $config->signupForm[$key]->isPublic = 'N';
}
@ -186,7 +186,7 @@ class memberModel extends member
$menus_count = count($menus);
for($i=0;$i<$menus_count;$i++)
{
$menus[$i]->str = Context::getLang($menus[$i]->str);
$menus[$i]->str = lang($menus[$i]->str);
}
// Get a list of finalized pop-up menu
$this->add('menus', $menus);

6
modules/member/member.view.php
View file

@ -128,7 +128,7 @@ class memberView extends member
if($formInfo->isDefaultForm)
{
$item->title = Context::getLang($formInfo->name);
$item->title = lang($formInfo->name);
$item->value = $memberInfo->{$formInfo->name};
if($formInfo->name == 'profile_image' && $memberInfo->profile_image)
@ -265,12 +265,12 @@ class memberView extends member
if ($this->member_config->identifier == 'email_address')
{
Context::set('identifierTitle', Context::getLang('email_address'));
Context::set('identifierTitle', lang('email_address'));
Context::set('identifierValue', $logged_info->email_address);
}
else
{
Context::set('identifierTitle', Context::getLang('user_id'));
Context::set('identifierTitle', lang('user_id'));
Context::set('identifierValue', $logged_info->user_id);
}

2
modules/member/skins/default/common_header.html
View file

@ -4,6 +4,6 @@
<section class="xm">
<ul class="nav nav-tabs" cond="$is_logged && $logged_info->menu_list && (!$member_srl || $member_srl == $logged_info->member_srl)">
<li loop="$logged_info->menu_list=>$key,$val" class="active"|cond="$key==$act">
<a href="{getUrl('', 'act',$key, 'mid', $mid, 'vid', $vid)}">{Context::getLang($val)}</a>
<a href="{getUrl('', 'act',$key, 'mid', $mid, 'vid', $vid)}">{lang($val)}</a>
</li>
</ul>

2
modules/member/skins/default/leave_form.html
View file

@ -11,7 +11,7 @@
<input type="hidden" name="page" value="{$page}" />
<input type="hidden" name="xe_validator_id" value="modules/member/skin/default/1" />
<div>
<input type="email" value="{$formValue}" readonly title="{Context::getLang($identifier)}" />
<input type="email" value="{$formValue}" readonly title="{lang($identifier)}" />
</div>
<div>
<span class="input-append">

2
modules/member/skins/default/modify_password.html
View file

@ -12,7 +12,7 @@
<input type="hidden" name="xe_validator_id" value="modules/member/skins/default/1" />
<input type="hidden" name="success_return_url" value="{getUrl('act','dispMemberInfo')}" />
<div>
<input type="email" disabled="disabled" value="{$formValue}" id="uid" placeholder="{Context::getLang($identifier)}" title="{Context::getLang($identifier)}" />
<input type="email" disabled="disabled" value="{$formValue}" id="uid" placeholder="{lang($identifier)}" title="{lang($identifier)}" />
</div>
<div>
<input type="password" name="current_password" id="cpw" required placeholder="{$lang->current_password}" title="{$lang->current_password}" />

4
modules/menu/menu.admin.controller.php
View file

@ -1517,12 +1517,12 @@ class menuAdminController extends menu
// Error occurs when the target is neither a uploaded file nor a valid file
if(!$menu_srl || !$menu_item_srl)
{
Context::set('error_messge', Context::getLang('msg_invalid_request'));
Context::set('error_messge', lang('msg_invalid_request'));
}
else if(!$target_file || !is_uploaded_file($target_file['tmp_name']) || !preg_match('/\.(gif|jpeg|jpg|png)$/i',$target_file['name']) || !checkUploadedFile($target_file['tmp_name']))
{
Context::set('error_messge', Context::getLang('msg_invalid_request'));
Context::set('error_messge', lang('msg_invalid_request'));
}
// Move the file to a specific director if the uploaded file meets requirement

4
modules/menu/menu.admin.model.php
View file

@ -366,7 +366,7 @@ class menuAdminModel extends menu
if($module_name == 'page')
{
$pageTypeName = Context::getLang('page_type_name');
$pageTypeName = lang('page_type_name');
$module->title = $pageTypeName['ARTICLE'];
$allModules['ARTICLE'] = $module;
$wModuleInfo = clone $module;
@ -451,7 +451,7 @@ class menuAdminModel extends menu
if($value == 'page')
{
$pageTypeName = Context::getLang('page_type_name');
$pageTypeName = lang('page_type_name');
$moduleInfo->title = $pageTypeName['ARTICLE'];
$moduleInfoList['ARTICLE'] = $moduleInfo;
$wModuleInfo = clone $moduleInfo;

2
modules/module/module.admin.controller.php
View file

@ -826,7 +826,7 @@ class moduleAdminController extends module
}
else
{
$mid_list[$module]->list[$key]->module_category_srl = Context::getLang('none_category');
$mid_list[$module]->list[$key]->module_category_srl = lang('none_category');
}
}
}

12
modules/module/module.admin.model.php
View file

@ -90,7 +90,7 @@ class moduleAdminModel extends module
$grantList =new stdClass();
}
$grantList->access = new stdClass();
$grantList->access->title = Context::getLang('grant_access');
$grantList->access->title = lang('grant_access');
$grantList->access->default = 'guest';
if(count($grantList))
{
@ -102,7 +102,7 @@ class moduleAdminModel extends module
}
}
$grant_list->manager = new stdClass();
$grant_list->manager->title = Context::getLang('grant_manager');
$grant_list->manager->title = lang('grant_manager');
$grant_list->manager->default = 'manager';
Context::set('grant_list', $grant_list);
@ -152,7 +152,7 @@ class moduleAdminModel extends module
// Grant virtual permission for access and manager
$grant_list = new stdClass();
$grant_list->access = new stdClass();
$grant_list->access->title = Context::getLang('grant_access');
$grant_list->access->title = lang('grant_access');
$grant_list->access->default = 'guest';
if(count($source_grant_list))
{
@ -164,7 +164,7 @@ class moduleAdminModel extends module
}
}
$grant_list->manager = new stdClass();
$grant_list->manager->title = Context::getLang('grant_manager');
$grant_list->manager->title = lang('grant_manager');
$grant_list->manager->default = 'manager';
Context::set('grant_list', $grant_list);
// Get a permission group granted to the current module
@ -229,7 +229,7 @@ class moduleAdminModel extends module
// Grant virtual permission for access and manager
$grantList = new stdClass();
$grantList->access = new stdClass();
$grantList->access->title = Context::getLang('grant_access');
$grantList->access->title = lang('grant_access');
$grantList->access->default = 'guest';
if(count($xmlInfo->grant))
{
@ -241,7 +241,7 @@ class moduleAdminModel extends module
}
}
$grantList->manager = new stdClass();
$grantList->manager->title = Context::getLang('grant_manager');
$grantList->manager->title = lang('grant_manager');
$grantList->manager->default = 'manager';
// Get a permission group granted to the current module

4
modules/module/module.admin.view.php
View file

@ -232,7 +232,7 @@ class moduleAdminView extends module
$xml_info = $oModuleModel->getModuleActionXml($module_info->module);
$source_grant_list = $xml_info->grant;
// Grant virtual permissions for access and manager
$grant_list->access->title = Context::getLang('grant_access');
$grant_list->access->title = lang('grant_access');
$grant_list->access->default = 'guest';
if(count($source_grant_list))
{
@ -243,7 +243,7 @@ class moduleAdminView extends module
$grant_list->{$key} = $val;
}
}
$grant_list->manager->title = Context::getLang('grant_manager');
$grant_list->manager->title = lang('grant_manager');
$grant_list->manager->default = 'manager';
Context::set('grant_list', $grant_list);
// Get a list of groups

2
modules/module/module.model.php
View file

@ -1129,7 +1129,7 @@ class moduleModel extends module
$defaultSkinInfo = $this->loadSkinInfo($path, $defaultSkinName, $dir);
$useDefault = new stdClass();
$useDefault->title = Context::getLang('use_site_default_skin') . ' (' . $defaultSkinInfo->title . ')';
$useDefault->title = lang('use_site_default_skin') . ' (' . $defaultSkinInfo->title . ')';
$useDefaultList['/USE_DEFAULT/'] = $useDefault;

2
modules/page/page.wap.php
View file

@ -15,7 +15,7 @@ class pageWap extends page
function procWAP(&$oMobile)
{
// Check permissions
if(!$this->grant->access) return $oMobile->setContent(Context::getLang('msg_not_permitted'));
if(!$this->grant->access) return $oMobile->setContent(lang('msg_not_permitted'));
// The contents of the widget chuchulham
$oWidgetController = getController('widget');
$content = $oWidgetController->transWidgetCode($this->module_info->content);

4
modules/point/point.admin.controller.php
View file

@ -332,7 +332,7 @@ class pointAdminController extends point
$this->add('total', count($member));
$this->add('position', 0);
$this->setMessage( sprintf(Context::getLang('point_recal_message'), 0, $this->get('total')) );
$this->setMessage( sprintf(lang('point_recal_message'), 0, $this->get('total')) );
}
/**
@ -376,7 +376,7 @@ class pointAdminController extends point
$this->add('total', $total);
$this->add('position', $idx);
$this->setMessage(sprintf(Context::getLang('point_recal_message'), $idx, $total));
$this->setMessage(sprintf(lang('point_recal_message'), $idx, $total));
}

2
modules/point/point.controller.php
View file

@ -436,7 +436,7 @@ class pointController extends point
$_SESSION['banned_document'][$obj->document_srl] = false;
if($config->disable_read_document == 'Y' && $point < 0 && abs($point)>$cur_point)
{
$message = sprintf(Context::getLang('msg_disallow_by_point'), abs($point), $cur_point);
$message = sprintf(lang('msg_disallow_by_point'), abs($point), $cur_point);
$obj->add('content', $message);
$_SESSION['banned_document'][$obj->document_srl] = true;
return new Object(-1, $message);

6
modules/point/tpl/member_list.html
View file

@ -22,7 +22,7 @@
<option loop="$group_list => $key,$val" value="{$val->group_srl}" selected="selected"|cond="$selected_group_srl==$val->group_srl">{$val->title}</option>
</select>
<select name="search_target" style="width:auto;margin:0" title="{$lang->search_target}">
<option value="{$identifier}" selected="selected"|cond="$search_target == $identifier">{Context::getLang($identifier)}</option>
<option value="{$identifier}" selected="selected"|cond="$search_target == $identifier">{lang($identifier)}</option>
<option loop="$lang->search_target_list => $key,$val" value="{$key}" selected="selected"|cond="$search_target==$key">{$val}</option>
</select>
<span class="x_input-append">
@ -36,7 +36,7 @@
<thead>
<tr>
<th scope="col">{$lang->no}</th>
<th scope="col">{Context::getLang($identifier)}</th>
<th scope="col">{lang($identifier)}</th>
<th scope="col">{$lang->nick_name}</th>
<th scope="col">{$lang->point}</th>
<th scope="col">{$lang->level}</th>
@ -125,7 +125,7 @@
<option loop="$group_list => $key,$val" value="{$val->group_srl}" selected="selected"|cond="$selected_group_srl==$val->group_srl">{$val->title}</option>
</select>
<select name="search_target" style="width:auto;margin:0" title="{$lang->search_target}">
<option value="{$identifier}" selected="selected"|cond="$search_target == $identifier">{Context::getLang($identifier)}</option>
<option value="{$identifier}" selected="selected"|cond="$search_target == $identifier">{lang($identifier)}</option>
<option loop="$lang->search_target_list => $key,$val" value="{$key}" selected="selected"|cond="$search_target==$key">{$val}</option>
</select>
<span class="x_input-append">

2
modules/poll/poll.admin.controller.php
View file

@ -55,7 +55,7 @@ class pollAdminController extends poll
if(!$output->toBool()) return $output;
}
$this->setMessage( sprintf(Context::getLang('msg_checked_poll_is_deleted'), $poll_count) );
$this->setMessage( sprintf(lang('msg_checked_poll_is_deleted'), $poll_count) );
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPollAdminList');
$this->setRedirectUrl($returnUrl);

4
modules/poll/poll.model.php
View file

@ -139,7 +139,7 @@ class pollModel extends poll
$ip = md5($value->ip_address);
$poll->member[$ip] = new stdClass();
$poll->member[$ip]->member_srl = 0;
$poll->member[$ip]->nick_name = Context::getLang("anonymous") . ' IP: ' . $value->ip_address;
$poll->member[$ip]->nick_name = lang("anonymous") . ' IP: ' . $value->ip_address;
$poll->member[$ip]->profile_image = "";
}
else
@ -147,7 +147,7 @@ class pollModel extends poll
$ip = md5($value->ip_address);
$poll->member[$ip] = new stdClass();
$poll->member[$ip]->member_srl = 0;
$poll->member[$ip]->nick_name = Context::getLang("anonymous");
$poll->member[$ip]->nick_name = lang("anonymous");
$poll->member[$ip]->profile_image = "";
}
}

2
modules/rss/rss.admin.controller.php
View file

@ -76,7 +76,7 @@ class rssAdminController extends rss
if(!$alt_message) $alt_message = 'success_updated';
$alt_message = Context::getLang($alt_message);
$alt_message = lang($alt_message);
$this->setMessage($alt_message, 'info');
//$this->setLayoutPath('./common/tpl');

2
modules/rss/rss.view.php
View file

@ -227,7 +227,7 @@ class rssView extends rss
function dispError()
{
// Prepare the output message
$this->rss(null, null, Context::getLang('msg_rss_is_disabled') );
$this->rss(null, null, lang('msg_rss_is_disabled') );
}
/**

2
modules/session/session.admin.controller.php
View file

@ -22,7 +22,7 @@ class sessionAdminController extends session
$oSessionController = getController('session');
$oSessionController->gc(0);
$this->add('result',Context::getLang('session_cleared'));
$this->add('result',lang('session_cleared'));
}
}
/* End of file session.admin.controller.php */

12
modules/spamfilter/spamfilter.admin.controller.php
View file

@ -41,8 +41,8 @@ class spamfilterAdminController extends spamfilter
$output = $oSpamfilterController->insertIP($ipaddress_list);
if(!$output->toBool() && !$output->get('fail_list')) return $output;
if($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
$this->setMessage(Context::getLang('success_registed').$message_fail);
if($output->get('fail_list')) $message_fail = '<em>'.sprintf(lang('msg_faillist'),$output->get('fail_list')).'</em>';
$this->setMessage(lang('success_registed').$message_fail);
}
@ -59,8 +59,8 @@ class spamfilterAdminController extends spamfilter
$output = $this->insertWord($word_list);
if(!$output->toBool() && !$output->get('fail_list')) return $output;
if($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
$this->setMessage(Context::getLang('success_registed').$message_fail);
if($output->get('fail_list')) $message_fail = '<em>'.sprintf(lang('msg_faillist'),$output->get('fail_list')).'</em>';
$this->setMessage(lang('success_registed').$message_fail);
}
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminDeniedWordList');
@ -75,7 +75,7 @@ class spamfilterAdminController extends spamfilter
$ipAddressList = Context::get('ipaddress');
if($ipAddressList) $this->deleteIP($ipAddressList);
$this->setMessage(Context::getLang('success_deleted'));
$this->setMessage(lang('success_deleted'));
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminDeniedIPList');
return $this->setRedirectUrl($returnUrl);
@ -89,7 +89,7 @@ class spamfilterAdminController extends spamfilter
$wordList = Context::get('word');
$this->deleteWord($wordList);
$this->setMessage(Context::getLang('success_deleted'));
$this->setMessage(lang('success_deleted'));
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminDeniedWordList','active','word');
return $this->setRedirectUrl($returnUrl);

6
modules/spamfilter/spamfilter.model.php
View file

@ -87,7 +87,7 @@ class spamfilterModel extends spamfilter
{
$args->word = $word;
$output = executeQuery('spamfilter.updateDeniedWordHit', $args);
return new Object(-1,sprintf(Context::getLang('msg_alert_denied_word'), $word));
return new Object(-1,sprintf(lang('msg_alert_denied_word'), $word));
}
}
@ -120,11 +120,11 @@ class spamfilterModel extends spamfilter
{
if($isMessage)
{
$message = sprintf(Context::getLang('msg_alert_limited_message_by_config'), $interval);
$message = sprintf(lang('msg_alert_limited_message_by_config'), $interval);
}
else
{
$message = sprintf(Context::getLang('msg_alert_limited_by_config'), $interval);
$message = sprintf(lang('msg_alert_limited_by_config'), $interval);
}
$oSpamFilterController = getController('spamfilter');

14
modules/widget/widget.controller.php
View file

@ -51,7 +51,7 @@ class widgetController extends widget
{
$widget = Context::get('selected_widget');
if(!$widget) return new Object(-1,'msg_invalid_request');
if(!Context::get('skin')) return new Object(-1,Context::getLang('msg_widget_skin_is_null'));
if(!Context::get('skin')) return new Object(-1,lang('msg_widget_skin_is_null'));
$attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
@ -68,7 +68,7 @@ class widgetController extends widget
$widget = Context::get('selected_widget');
if(!$widget) return new Object(-1,'msg_invalid_request');
if(!in_array($widget,array('widgetBox','widgetContent')) && !Context::get('skin')) return new Object(-1,Context::getLang('msg_widget_skin_is_null'));
if(!in_array($widget,array('widgetBox','widgetContent')) && !Context::get('skin')) return new Object(-1,lang('msg_widget_skin_is_null'));
$attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
// Wanted results
@ -660,7 +660,7 @@ class widgetController extends widget
{
if(!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $widget))
{
return Context::getLang('msg_invalid_request');
return lang('msg_invalid_request');
}
if(!$GLOBALS['_xe_loaded_widgets_'][$widget])
@ -670,20 +670,20 @@ class widgetController extends widget
$path = $oWidgetModel->getWidgetPath($widget);
// If you do not find the class file error output widget (html output)
$class_file = sprintf('%s%s.class.php', $path, $widget);
if(!file_exists($class_file)) return sprintf(Context::getLang('msg_widget_is_not_exists'), $widget);
if(!file_exists($class_file)) return sprintf(lang('msg_widget_is_not_exists'), $widget);
// Widget classes include
require_once($class_file);
// Creating Objects
if(!class_exists($widget, false))
{
return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
return sprintf(lang('msg_widget_object_is_null'), $widget);
}
$oWidget = new $widget();
if(!is_object($oWidget)) return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
if(!is_object($oWidget)) return sprintf(lang('msg_widget_object_is_null'), $widget);
if(!method_exists($oWidget, 'proc')) return sprintf(Context::getLang('msg_widget_proc_is_null'), $widget);
if(!method_exists($oWidget, 'proc')) return sprintf(lang('msg_widget_proc_is_null'), $widget);
$oWidget->widget_path = $path;

2
widgets/login_info/skins/xe_global/login_info.html
View file

@ -19,7 +19,7 @@
</div>
<ul class="userMenu">
<!--@foreach($logged_info->menu_list as $key => $val)-->
<li><a href="{getUrl('act',$key,'member_srl','','page','')}">{Context::getLang($val)}</a></li>
<li><a href="{getUrl('act',$key,'member_srl','','page','')}">{lang($val)}</a></li>
<!--@end-->
<!--@if($logged_info->is_admin=="Y" && !$site_module_info->site_srl)-->

2
widgets/login_info/skins/xe_globalTwo/login_info.html
View file

@ -19,7 +19,7 @@
</div>
<ul class="userMenu">
<!--@foreach($logged_info->menu_list as $key => $val)-->
<li><a href="{getUrl('act',$key,'member_srl','','page','')}">{Context::getLang($val)}</a></li>
<li><a href="{getUrl('act',$key,'member_srl','','page','')}">{lang($val)}</a></li>
<!--@end-->
<!--@if($logged_info->is_admin=="Y" && !$site_module_info->site_srl)-->

2
widgets/login_info/skins/xe_official/login_info.html
View file

@ -10,7 +10,7 @@
<p class="latestLogin">{$lang->last_login}: {zDate($logged_info->last_login, "Y-m-d")}</p>
</div>
<ul class="userMenu">
<li loop="$logged_info->menu_list => $key,$val"><a href="{getUrl('', 'act',$key, 'mid', $mid, 'vid', $vid)}">{Context::getLang($val)}</a></li>
<li loop="$logged_info->menu_list => $key,$val"><a href="{getUrl('', 'act',$key, 'mid', $mid, 'vid', $vid)}">{lang($val)}</a></li>
<li cond="$logged_info->is_admin=='Y' && !$site_module_info->site_srl"><a href="{getUrl('','module','admin')}">{$lang->cmd_management}</a></li>
</ul>
</fieldset>

2
widgets/login_info/skins/xe_solid_enterprise_login/login_info.html
View file

@ -15,7 +15,7 @@
<!--@foreach($logged_info->menu_list as $key => $val)-->
<li class="i{$i}">
<a href="{getUrl('act',$key,'member_srl','','page','')}">{Context::getLang($val)}</a></li>
<a href="{getUrl('act',$key,'member_srl','','page','')}">{lang($val)}</a></li>
{@ $i++;}
<!--@end-->
<li class="i7"><a href="{getUrl('','module','admin')}" onclick="window.open(this.href);return false;">{$lang->cmd_management}</a></li>