1. Use __XE__ instead of __ZBXE__

2. Reformat indentations


git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9722 201d5d3c-b55e-5fd7-737f-ddc643e51545

addons/adminlogging/adminlogging.addon.php

@@ -1,17 +1,17 @@
 <?php
-    if(!defined("__ZBXE__")) exit();
+if(!defined('__XE__')) exit();
 
-    /**
+/**
  * @file adminlogging.addon.php
  * @author NHN (developers@xpressengine.com)
  * @brief Automatic link add-on
  **/
-	$logged_info = Context::get('logged_info');
+$logged_info = Context::get('logged_info');
-	$act = Context::get('act');
+$act  = Context::get('act');
-	$kind = strpos(strtolower($act),'admin')!==false?'admin':'';
+$kind = strpos(strtolower($act),'admin')!==false?'admin':'';
 
-    if($called_position == 'before_module_proc' && $kind == 'admin' && $logged_info->is_admin == 'Y') {
+if($called_position == 'before_module_proc' && $kind == 'admin' && $logged_info->is_admin == 'Y') {
 	$oAdminloggingController = &getController('adminlogging');
 	$oAdminloggingController->insertLog($this->module, $this->act);
-    }
+}
 ?>

addons/autolink/autolink.addon.php

@@ -1,12 +1,12 @@
 <?php
-    if(!defined("__ZBXE__")) exit();
+if(!defined('__XE__')) exit();
 
-    /**
+/**
  * @file autolink.addon.php
  * @author NHN (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()!="XMLRPC") {
 	Context::loadFile(array('./addons/autolink/autolink.js', 'body', '', null), true);
-    }
+}
 ?>

addons/blogapi/blogapi.addon.php

@@ -1,7 +1,7 @@
 <?php
-    if(!defined("__ZBXE__")) exit();
+if(!defined('__XE__')) exit();
 
-    /**
+/**
  * @file blogapicounter.addon.php
  * @author NHN (developers@xpressengine.com)
  * @brief Add blogAPI
@@ -9,37 +9,37 @@
  * It enables to write a post by using an external tool such as ms live writer, firefox performancing, zoundry and so on.
  * It should be called before executing the module(before_module_proc). If not, it is forced to shut down.
  **/
-    // Insert a rsd tag when called_position is after_module_proc
+// Insert a rsd tag when called_position is after_module_proc
-    if($called_position == 'after_module_proc') {
+if($called_position == 'after_module_proc') {
 	// Create rsd address of the current module
 	$site_module_info = Context::get('site_module_info');
 	$rsd_url = getFullSiteUrl($site_module_info->domain, '', 'mid',$site_module_info->mid, 'act','api');
 	// Insert rsd tag into the header
 	Context::addHtmlHeader("    ".'<link rel="EditURI" type="application/rsd+xml" title="RSD" href="'.$rsd_url.'" />');
-    }
+}
-    // If act isnot api, just return
+// If act isnot api, just return
-    if($_REQUEST['act']!='api') return;
+if($_REQUEST['act']!='api') return;
-    // Read func file
+// Read func file
-    require_once('./addons/blogapi/blogapi.func.php');
+require_once('./addons/blogapi/blogapi.func.php');
-    // xmlprc parsing
+// xmlprc parsing
-    // Parse the requested xmlrpc
+// Parse the requested xmlrpc
-    $oXmlParser = new XmlParser();
+$oXmlParser = new XmlParser();
-    $xmlDoc = $oXmlParser->parse();
+$xmlDoc = $oXmlParser->parse();
 
-    $method_name = $xmlDoc->methodcall->methodname->body;
+$method_name = $xmlDoc->methodcall->methodname->body;
-    $params = $xmlDoc->methodcall->params->param;
+$params = $xmlDoc->methodcall->params->param;
-    if($params && !is_array($params)) $params = array($params);
+if($params && !is_array($params)) $params = array($params);
-    // Compatible with some of methodname
+// Compatible with some of methodname
-    if(in_array($method_name, array('metaWeblog.deletePost', 'metaWeblog.getUsersBlogs', 'metaWeblog.getUserInfo'))) {
+if(in_array($method_name, array('metaWeblog.deletePost', 'metaWeblog.getUsersBlogs', 'metaWeblog.getUserInfo'))) {
 	$method_name = str_replace('metaWeblog.', 'blogger.', $method_name);
-    }
+}
-    // Delete the first argument if it is blogger.deletePost
+// Delete the first argument if it is blogger.deletePost
-    if($method_name == 'blogger.deletePost') array_shift($params);
+if($method_name == 'blogger.deletePost') array_shift($params);
-    // Get user_id, password and attempt log-in
+// Get user_id, password and attempt log-in
-    $user_id = trim($params[1]->value->string->body);
+$user_id = trim($params[1]->value->string->body);
-    $password = trim($params[2]->value->string->body);
+$password = trim($params[2]->value->string->body);
-    // Before executing the module, authentication is processed.
+// Before executing the module, authentication is processed.
-    if($called_position == 'before_module_init') {
+if($called_position == 'before_module_init') {
 	// Attempt log-in by using member controller
 	if($user_id && $password) {
 		$oMemberController = &getController('member');
@@ -53,9 +53,9 @@
 		$content = getXmlRpcFailure(1, 'not logged');
 		printContent($content);
 	}
-    }
+}
-    // Before module processing, handle requests from blogapi tool and then terminate.
+// Before module processing, handle requests from blogapi tool and then terminate.
-    if($called_position == 'before_module_proc') {
+if($called_position == 'before_module_proc') {
 	// Check writing permission 
 	if(!$this->grant->write_document) {
 		printContent( getXmlRpcFailure(1, 'no permission') );
@@ -412,7 +412,6 @@
 			break;
 		// Display RSD if there is no request
 		default :
-
 				$homepagelink = getUrl('','mid',$this->mid);
 				$site_module_info = Context::get('site_module_info');
 				$api_url = getFullSiteUrl($site_module_info->domain, '', 'mid',$site_module_info->mid, 'act','api');
@@ -432,5 +431,5 @@ RSDContent;
 				printContent($content);
 			break;
 	}
-    }
+}
 ?>

addons/blogapi/blogapi.func.php

@@ -1,5 +1,5 @@
 <?php
-    if(!defined("__ZBXE__")) exit();
+    if(!defined('__XE__')) exit();
 
     /**
      * @file ./addons/blogapi/blogapi.func.php

addons/counter/counter.addon.php

@@ -1,14 +1,14 @@
 <?php
-    if(!defined("__ZBXE__")) exit();
+if(!defined('__XE__')) exit();
 
-    /**
+/**
  * @file counter.addon.php
  * @author NHN (developers@xpressengine.com)
  * @brief Counter add-on
  **/
-    // Execute if called_position is before_display_content
+// Execute if called_position is before_display_content
-    if(Context::isInstalled() && $called_position == 'before_module_init' && Context::get('module')!='admin' && Context::getResponseMethod() == 'HTML') {
+if(Context::isInstalled() && $called_position == 'before_module_init' && Context::get('module')!='admin' && Context::getResponseMethod() == 'HTML') {
 	$oCounterController = &getController('counter');
 	$oCounterController->counterExecute();
-    }
+}
 ?>

addons/member_communication/member_communication.addon.php

@@ -1,7 +1,7 @@
 <?php
-    if(!defined("__ZBXE__")) exit();
+if(!defined('__XE__')) exit();
 
-    /**
+/**
  * @file member_communication.addon.php
  * @author NHN (developers@xpressengine.com)
  * @brief Promote user communication 
@@ -10,14 +10,14 @@
  * - When calling MemberModel::getMemberMenu, feature to send a message is added
  * - When caliing MemberModel::getMemberMenu, feature to add a friend is added
  **/
-    // Stop if non-logged-in user is
+// Stop if non-logged-in user is
-    $logged_info = Context::get('logged_info');
+$logged_info = Context::get('logged_info');
-    if(!$logged_info) return;
+if(!$logged_info) return;
 
-    /**
+/**
  * Message/Friend munus are added on the pop-up window and member profile. Check if a new message is received
  **/
-    if($called_position == 'before_module_init' && $this->module != 'member') {
+if($called_position == 'before_module_init' && $this->module != 'member') {
 	// Load a language file from the communication module
 	Context::loadLang('./modules/communication/lang');
 	// Add menus on the member login information
@@ -40,8 +40,7 @@
 
 		Context::addHtmlFooter($script);
 	}
-    } elseif($called_position == 'before_module_proc' && $this->act == 'getMemberMenu') {
+} elseif($called_position == 'before_module_proc' && $this->act == 'getMemberMenu') {
-
 	$oMemberController = &getController('member');
 	$member_srl = Context::get('target_srl');
 	$mid = Context::get('cur_mid');
@@ -68,5 +67,5 @@
 		if(!$oCommunicationModel->isAddedFriend($member_srl))
 			$oMemberController->addMemberPopupMenu(getUrl('','module','communication','act','dispCommunicationAddFriend','target_srl',$member_srl), 'cmd_add_friend', '', 'popup');
 	}
-    }
+}
 ?>

addons/member_extra_info/member_extra_info.addon.php

@@ -1,21 +1,21 @@
 <?php
-    if(!defined("__ZBXE__")) exit();
+if(!defined('__XE__')) exit();
 
-    /**
+/**
  * @file image_name.addon.php
  * @author NHN (developers@xpressengine.com)
  * @brief Display user image name/image mark
  *
-     * Find member_srl in the part with <div class="member_회원번호"> .... </div>
+ * Find member_srl in the part with <div class="member_MemberSerialNumber"> .... </div>
  * Check if ther is image name and image mark. Then change it.
  **/
 
-    /**
+/**
  * Just before displaying, change image name/ image mark
  **/
-    if($called_position != "before_display_content" || Context::get('act')=='dispPageAdminContentModify') return;
+if($called_position != "before_display_content" || Context::get('act')=='dispPageAdminContentModify') return;
-    // Include a file having functions to replace member image name/mark
+// Include a file having functions to replace member image name/mark
-    require_once('./addons/member_extra_info/member_extra_info.lib.php');
+require_once('./addons/member_extra_info/member_extra_info.lib.php');
-    // 1. Find a part <div class="member_번호"> content </div> in the output document, change it to image name/mark by using MemberController::transImageName()
+// 1. Find a part <div class="member_MemberSerialNumber"> content </div> in the output document, change it to image name/mark by using MemberController::transImageName()
-    $output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', 'memberTransImageName', $output);
+$output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', 'memberTransImageName', $output);
 ?>

addons/mobile/mobile.addon.php

@@ -1,7 +1,7 @@
 <?php
-    if(!defined("__ZBXE__")) exit();
+if(!defined('__XE__')) exit();
 
-    /**
+/**
  * @file mobile.addon.php
  * @author NHN (developers@xpressengine.com)
  * @brief Mobile XE add-on
@@ -15,24 +15,24 @@
  * after_module_proc > display mobile content
  * Condition
  **/
-    // Ignore admin page
+// Ignore admin page
-    if(Context::get('module')=='admin') return;
+if(Context::get('module')=='admin') return;
-    // Manage when to call it
+// Manage when to call it
-    if($called_position != 'before_module_proc' && $called_position != 'after_module_proc' ) return;
+if($called_position != 'before_module_proc' && $called_position != 'after_module_proc' ) return;
-    // Ignore if not mobile browser
+// Ignore if not mobile browser
-    require_once(_XE_PATH_.'addons/mobile/classes/mobile.class.php');
+require_once(_XE_PATH_.'addons/mobile/classes/mobile.class.php');
-    if(!mobileXE::getBrowserType()) return;
+if(!mobileXE::getBrowserType()) return;
-    // Generate mobile instance
+// Generate mobile instance
-    $oMobile = &mobileXE::getInstance();
+$oMobile = &mobileXE::getInstance();
-    if(!$oMobile) return;
+if(!$oMobile) return;
-    // Specify charset on the add-on settings 
+// Specify charset on the add-on settings 
-    $oMobile->setCharSet($addon_info->charset);
+$oMobile->setCharSet($addon_info->charset);
-    // Set module information
+// Set module information
-    $oMobile->setModuleInfo($this->module_info);
+$oMobile->setModuleInfo($this->module_info);
-    // Register the current module object
+// Register the current module object
-    $oMobile->setModuleInstance($this);
+$oMobile->setModuleInstance($this);
-    // Extract content and display/exit if navigate mode is or if WAP class exists
+// Extract content and display/exit if navigate mode is or if WAP class exists
-    if($called_position == 'before_module_proc') {
+if($called_position == 'before_module_proc') {
 
 	if($oMobile->isLangChange()) {
 		$oMobile->setLangType();
@@ -42,9 +42,9 @@
 	if($oMobile->isNavigationMode()) $oMobile->displayNavigationContent();
 	// If you have a WAP class content output via WAP class
 	else $oMobile->displayModuleContent();
-    // If neither navigation mode nor WAP class is, display the module's result
+// If neither navigation mode nor WAP class is, display the module's result
-    } else if($called_position == 'after_module_proc')  {
+} else if($called_position == 'after_module_proc')  {
 	// Display
 	$oMobile->displayContent();
-    }
+}
 ?>

addons/openid_delegation_id/openid_delegation_id.addon.php

@@ -1,7 +1,7 @@
 <?php
-    if(!defined("__ZBXE__")) exit();
+if(!defined('__XE__')) exit();
 
-    /**
+/**
  * @file openid_delegation_id.addon.php
  * @author NHN (developers@xpressengine.com)
  * @brief OpenID Delegation ID Add-on
@@ -9,19 +9,19 @@
  * This enables to use openID as user's homepage or blog url.
  * Enter your open ID service information on the configuration.
  **/
-    // Execute only wen called_position is before_module_init
+// Execute only wen called_position is before_module_init
-    if($called_position != 'before_module_init') return;
+if($called_position != 'before_module_init') return;
-    // Get add-on settings(openid_delegation_id)
+// Get add-on settings(openid_delegation_id)
-    if(!$addon_info->server||!$addon_info->delegate||!$addon_info->xrds) return;
+if(!$addon_info->server||!$addon_info->delegate||!$addon_info->xrds) return;
 
-    $header_script = sprintf(
+$header_script = sprintf(
 	'<link rel="openid.server" href="%s" />'."\n".
 	'<link rel="openid.delegate" href="%s" />'."\n".
 	'<meta http-equiv="X-XRDS-Location" content="%s" />',
 	$addon_info->server,
 	$addon_info->delegate,
 	$addon_info->xrds
-    );
+);
 
-    Context::addHtmlHeader($header_script);
+Context::addHtmlHeader($header_script);
 ?>

addons/point_level_icon/point_level_icon.addon.php

@@ -1,18 +1,18 @@
 <?php
-    if(!defined("__ZBXE__")) exit();
+if(!defined('__XE__')) exit();
 
-    /**
+/**
  * @file point.addon.php
  * @author NHN (developers@xpressengine.com)
  * @brief Icon-on-point level
  *
  * Display point level icon before user name when point system is enabled.
  **/
-    // return unless before_display_content
+// return unless before_display_content
-    if($called_position != "before_display_content" || Context::get('act')=='dispPageAdminContentModify') return;
+if($called_position != "before_display_content" || Context::get('act')=='dispPageAdminContentModify') return;
 
-    require_once('./addons/point_level_icon/point_level_icon.lib.php');
+require_once('./addons/point_level_icon/point_level_icon.lib.php');
 
-    $oPointController = &getController('point');
+$oPointController = &getController('point');
-    $output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9\-]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', 'pointLevelIconTrans', $output);
+$output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9\-]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', 'pointLevelIconTrans', $output);
 ?>

addons/point_level_icon/point_level_icon.lib.php

@@ -1,8 +1,8 @@
 <?php
-    /**
+/**
  * @brief Function to change point icon.
  **/
-    function pointLevelIconTrans($matches) {
+function pointLevelIconTrans($matches) {
 	$member_srl = $matches[3];
 	if($member_srl<1) return $matches[0];
 
@@ -48,5 +48,5 @@
 	$text = $GLOBALS['_pointLevelIcon'][$member_srl];
 
 	return $orig_text.$text.$matches[5].'</'.$matches[6].'>';
-    }
+}
 ?>

addons/resize_image/resize_image.addon.php

@@ -1,18 +1,18 @@
 <?php
-    if(!defined("__ZBXE__")) exit();
+if(!defined('__XE__')) exit();
 
-    /**
+/**
  * @file resize_image.addon.php
  * @author NHN (developers@xpressengine.com)
  * @brief Add-on to resize images in the body
  **/
 
-    if($called_position == 'after_module_proc' && Context::getResponseMethod()=="HTML") {
+if($called_position == 'after_module_proc' && Context::getResponseMethod()=="HTML") {
 	if(Mobile::isFromMobilePhone()) {
 		Context::loadFile('./addons/resize_image/css/resize_image.mobile.css', true);
 	} else {
 		Context::loadJavascriptPlugin('ui');
 		Context::loadFile(array('./addons/resize_image/js/resize_image.min.js', 'body', '', null), true);
 	}
-    }
+}
 ?>