fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-11 04:52:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

NOISSUE, trivial code change

Browse source
This commit is contained in:
ngleader 2013-11-30 07:06:08 +09:00
parent ffcf599e68
commit 4c1ba64d25
4 changed files with 59 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

7
classes/display/JSCallbackDisplayHandler.php
View file

@ -15,8 +15,11 @@ class JSCallbackDisplayHandler
$variables['error'] = $oModule->getError(); $variables['error'] = $oModule->getError();
$variables['message'] = $oModule->getMessage(); $variables['message'] = $oModule->getMessage();
$json = str_replace(array("\r\n", "\n", "\t"), array('\n', '\n', '\t'), json_encode2($variables)); $json = str_replace(array("\r\n", "\n", "\t"), array('\n', '\n', '\t'), json_encode2($variables));
$output = sprintf('<script>%s(%s);</script>', Context::getJSCallbackFunc(), $json); return sprintf('<script type="text/javascript">
return $output; //<![CDATA[
%s(%s);
//]]>
</script>', Context::getJSCallbackFunc(), $json);
} }
} }

14
classes/display/VirtualXMLDisplayHandler.php
View file

@ -44,19 +44,23 @@ class VirtualXMLDisplayHandler
} }
} }
$html = '<script>' . "\n"; $html = array();
$html[] = '<script type="text/javascript">';
$html[] = '//<![CDATA[';
if($output->message) if($output->message)
{ {
$html .= 'alert("' . $output->message . '");' . "\n"; $html[] = 'alert("' . $output->message . '");';
} }
if($output->url) if($output->url)
{ {
$url = preg_replace('/#(.+)$/i', '', $output->url); $url = preg_replace('/#(.+)$/i', '', $output->url);
$html .= 'self.location.href = "' . $request_url . 'common/tpl/redirect.html?redirect_url=' . urlencode($url) . '";' . "\n"; $html[] = 'self.location.href = "' . $request_url . 'common/tpl/redirect.html?redirect_url=' . urlencode($url) . '";';
} }
$html .= '</script>' . "\n"; $html[] = '//]]>';
return $html; $html[] = '</script>';
return join(PHP_EOL, $html);
} }
} }

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

@ -366,10 +366,9 @@ class ExtraItem
break; break;
// Phone Number // Phone Number
case 'tel' : case 'tel' :
$buff[] = $buff[] = '<input type="text" name="' . $column_name . '[]" value="' . $value[0] . '" size="4" maxlength="4" class="tel" />';
'<input type="text" name="' . $column_name . '[]" value="' . $value[0] . '" size="4" maxlength="4" class="tel" />' . $buff[] = '<input type="text" name="' . $column_name . '[]" value="' . $value[1] . '" size="4" maxlength="4" class="tel" />';
'<input type="text" name="' . $column_name . '[]" value="' . $value[1] . '" size="4" maxlength="4" class="tel" />' . $buff[] = '<input type="text" name="' . $column_name . '[]" value="' . $value[2] . '" size="4" maxlength="4" class="tel" />';
'<input type="text" name="' . $column_name . '[]" value="' . $value[2] . '" size="4" maxlength="4" class="tel" />';
break; break;
// textarea // textarea
case 'textarea' : case 'textarea' :
@ -380,19 +379,16 @@ class ExtraItem
$buff[] = '<ul>'; $buff[] = '<ul>';
foreach($default as $v) foreach($default as $v)
{ {
$checked = '';
if($value && in_array(trim($v), $value)) if($value && in_array(trim($v), $value))
{ {
$checked = ' checked="checked"'; $checked = ' checked="checked"';
} }
else
{
$checked = '';
}
// Temporary ID for labeling // Temporary ID for labeling
$tmp_id = $column_name . '-' . $id_num++; $tmp_id = $column_name . '-' . $id_num++;
$buff[] ='<li><input type="checkbox" name="' . $column_name . '[]" id="' . $tmp_id . '" value="' . htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . '" ' . $checked . ' /><label for="' . $tmp_id . '">' . $v . '</label></li>'; $buff[] =' <li><input type="checkbox" name="' . $column_name . '[]" id="' . $tmp_id . '" value="' . htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . '" ' . $checked . ' /><label for="' . $tmp_id . '">' . $v . '</label></li>';
} }
$buff[] = '</ul>'; $buff[] = '</ul>';
break; break;
@ -401,15 +397,12 @@ class ExtraItem
$buff[] = '<select name="' . $column_name . '" class="select">'; $buff[] = '<select name="' . $column_name . '" class="select">';
foreach($default as $v) foreach($default as $v)
{ {
$selected = '';
if($value && in_array(trim($v), $value)) if($value && in_array(trim($v), $value))
{ {
$selected = ' selected="selected"'; $selected = ' selected="selected"';
} }
else $buff[] = ' <option value="' . $v . '" ' . $selected . '>' . $v . '</option>';
{
$selected = '';
}
$buff[] = '<option value="' . $v . '" ' . $selected . '>' . $v . '</option>';
} }
$buff[] = '</select>'; $buff[] = '</select>';
break; break;
@ -418,14 +411,11 @@ class ExtraItem
$buff[] = '<ul>'; $buff[] = '<ul>';
foreach($default as $v) foreach($default as $v)
{ {
$checked = '';
if($value && in_array(trim($v), $value)) if($value && in_array(trim($v), $value))
{ {
$checked = ' checked="checked"'; $checked = ' checked="checked"';
} }
else
{
$checked = '';
}
// Temporary ID for labeling // Temporary ID for labeling
$tmp_id = $column_name . '-' . $id_num++; $tmp_id = $column_name . '-' . $id_num++;
@ -439,29 +429,29 @@ class ExtraItem
// datepicker javascript plugin load // datepicker javascript plugin load
Context::loadJavascriptPlugin('ui.datepicker'); Context::loadJavascriptPlugin('ui.datepicker');
$buff[] = $buff[] = '<input type="hidden" name="' . $column_name . '" value="' . $value . '" />';
'<input type="hidden" name="' . $column_name . '" value="' . $value . '" />' . $buff[] = '<input type="text" id="date_' . $column_name . '" value="' . zdate($value, 'Y-m-d') . '" class="date" /> <input type="button" value="' . Context::getLang('cmd_delete') . '" id="dateRemover_' . $column_name . '" />';
'<input type="text" id="date_' . $column_name . '" value="' . zdate($value, 'Y-m-d') . '" class="date" /> <input type="button" value="' . Context::getLang('cmd_delete') . '" id="dateRemover_' . $column_name . '" />' . "\n" . $buff[] = '<script type="text/javascript">';
'<script>' . "\n" . $buff[] = '//<![CDATA[';
'(function($){' . "\n" . $buff[] = '(function($){';
' $(function(){' . "\n" . $buff[] = '$(function(){';
' var option = { dateFormat: "yy-mm-dd", changeMonth:true, changeYear:true, gotoCurrent: false,yearRange:\'-100:+10\', onSelect:function(){' . "\n" . $buff[] = ' var option = { dateFormat: "yy-mm-dd", changeMonth:true, changeYear:true, gotoCurrent:false, yearRange:\'-100:+10\', onSelect:function(){';
' $(this).prev(\'input[type="hidden"]\').val(this.value.replace(/-/g,""))}' . "\n" . $buff[] = ' $(this).prev(\'input[type="hidden"]\').val(this.value.replace(/-/g,""))}';
' };' . "\n" . $buff[] = ' };';
' $.extend(option,$.datepicker.regional[\'' . Context::getLangType() . '\']);' . "\n" . $buff[] = ' $.extend(option,$.datepicker.regional[\'' . Context::getLangType() . '\']);';
' $("#date_' . $column_name . '").datepicker(option);' . "\n" . $buff[] = ' $("#date_' . $column_name . '").datepicker(option);';
' $("#dateRemover_' . $column_name . '").click(function(){' . "\n" . $buff[] = ' $("#dateRemover_' . $column_name . '").click(function(){';
' $(this).siblings("input").val("");' . "\n" . $buff[] = ' $(this).siblings("input").val("");';
' return false;' . "\n" . $buff[] = ' return false;';
' })' . "\n" . $buff[] = ' })';
' });' . "\n" . $buff[] = '});';
'})(jQuery);' . "\n" . $buff[] = '})(jQuery);';
'</script>'; $buff[] = '//]]>';
$buff[] = '</script>';
break; break;
// address // address
case "kr_zip" : case "kr_zip" :
$krzipModel = &getModel('krzip'); if(($oKrzipModel = &getModel('krzip')) && method_exists($oKrzipModel , 'getKrzipCodeSearchHtml' ))
if($krzipModel && method_exists($krzipModel , 'getKrzipCodeSearchHtml' ))
{ {
$buff[] = $krzipModel->getKrzipCodeSearchHtml($column_name, $value); $buff[] = $krzipModel->getKrzipCodeSearchHtml($column_name, $value);
} }
@ -469,7 +459,6 @@ class ExtraItem
// General text // General text
default : default :
$buff[] =' <input type="text" name="' . $column_name . '" value="' . ($value ? $value : $default) . '" class="text" />'; $buff[] =' <input type="text" name="' . $column_name . '" value="' . ($value ? $value : $default) . '" class="text" />';
break;
} }
if($this->desc) if($this->desc)
{ {

24
config/func.inc.php
View file

@ -1477,14 +1477,12 @@ function changeValueInUrl($key, $requestKey, $dbKey, $urlName = 'success_return_
*/ */
function htmlHeader() function htmlHeader()
{ {
echo <<<HTMLHEADER echo '<!DOCTYPE html>
<!DOCTYPE html>
<html lang="ko"> <html lang="ko">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
</head> </head>
<body> <body>';
HTMLHEADER;
} }
/** /**
@ -1510,7 +1508,11 @@ function alertScript($msg)
return; return;
} }
echo '<script>alert("' . $msg . '");</script>'; echo '<script type="text/javascript">
//<![CDATA[
alert("' . $msg . '");
//]]>
</script>';
} }
/** /**
@ -1520,7 +1522,11 @@ function alertScript($msg)
*/ */
function closePopupScript() function closePopupScript()
{ {
echo '<script>window.close();</script>'; echo '<script type="text/javascript">
//<![CDATA[
window.close();
//]]>
</script>';
} }
/** /**
@ -1533,7 +1539,11 @@ function reload($isOpener = FALSE)
{ {
$reloadScript = $isOpener ? 'window.opener.location.reload()' : 'document.location.reload()'; $reloadScript = $isOpener ? 'window.opener.location.reload()' : 'document.location.reload()';
echo '<script>' . $reloadScript . '</script>'; echo '<script type="text/javascript">
//<![CDATA[
' . $reloadScript . '
//]]>
</script>';
} }
/* End of file func.inc.php */ /* End of file func.inc.php */