NOISSUE, trivial code change

This commit is contained in:
ngleader 2013-11-25 21:26:40 +09:00
parent f8af9ef6ce
commit 34c7b68c89
7 changed files with 8 additions and 13 deletions

View file

@ -7,13 +7,10 @@ if(!defined('__XE__'))
/**
* @file adminlogging.addon.php
* @author NAVER (developers@xpressengine.com)
* @brief Automatic link add-on
* @brief admin log
*/
$logged_info = Context::get('logged_info');
$act = Context::get('act');
$kind = stripos($act, 'admin') !== false ? 'admin' : '';
if($called_position == 'before_module_proc' && $kind == 'admin' && $logged_info->is_admin == 'Y')
if($logged_info && $logged_info->is_admin == 'Y' && stripos(Context::get('act'), 'admin') !== false && $called_position == 'before_module_proc')
{
$oAdminloggingController = getController('adminlogging');
$oAdminloggingController->insertLog($this->module, $this->act);

View file

@ -9,7 +9,7 @@ if(!defined('__XE__'))
* @author NAVER (developers@xpressengine.com)
* @brief Automatic link add-on
*/
if($called_position == 'after_module_proc' && Context::getResponseMethod() != "XMLRPC")
if($called_position == 'after_module_proc' && Context::getResponseMethod() == "HTML")
{
if(Mobile::isFromMobilePhone())
{

View file

@ -210,7 +210,7 @@ if(!class_exists('AddonCaptcha'))
}
// Combine images of each character
for($i = 1; $i < count($im); $i++)
for($i = 1, $c = count($im); $i<$c; $i++)
{
imagecopy($im[0], $im[$i], (($w + 2) * ($i - 1)), 0, 0, 0, $w, $h);
imagedestroy($im[$i]);

View file

@ -10,7 +10,7 @@ if(!defined('__XE__'))
* @brief Counter add-on
*/
// Execute if called_position is before_display_content
if(Context::isInstalled() && $called_position == 'before_module_init' && Context::get('module') != 'admin' && Context::getResponseMethod() == 'HTML')
if($called_position == 'before_module_init' && Context::get('module') != 'admin' && Context::getResponseMethod() == 'HTML' && Context::isInstalled())
{
$oCounterController = getController('counter');
$oCounterController->counterExecute();

View file

@ -15,7 +15,7 @@ if(!defined('__XE__'))
/**
* Just before displaying, change image name/ image mark
*/
if($called_position != "before_display_content" || Context::get('act') == 'dispPageAdminContentModify')
if(Context::get('act') == 'dispPageAdminContentModify' || $called_position != "before_display_content");
{
return;
}

View file

@ -82,9 +82,7 @@ function memberTransImageName($matches)
$nick_name = sprintf('<img src="%s" style="border:0;max-height:16px;vertical-align:middle;margin-right:3px" alt="%s" title="%s" />%s', $group_image->src, $group_image->title, $group_image->description, $nick_name);
}
$orig_text = preg_replace('/' . preg_quote($matches[5], '/') . '<\/' . $matches[6] . '>$/', '', $matches[0]);
return $orig_text . $nick_name . '</' . $matches[6] . '>';
return preg_replace('/' . preg_quote($matches[5], '/') . '<\/' . $matches[6] . '>$/', '', $matches[0]) . $nick_name . '</' . $matches[6] . '>';
}
/* End of file member_extra_info.lib.php */

View file

@ -12,7 +12,7 @@ if(!defined('__XE__'))
* Display point level icon before user name when point system is enabled.
* */
// return unless before_display_content
if($called_position != "before_display_content" || Context::getResponseMethod() != 'HTML' || Context::get('act') == 'dispPageAdminContentModify')
if(Context::get('act') == 'dispPageAdminContentModify' || $called_position != "before_display_content" || Context::getResponseMethod() != 'HTML')
{
return;
}