v 0.2.2 r4

strict 모드 호환화
rocker76 · Jul 21, 2013 · 9abaaa2 · 9abaaa2
1 parent e0df90c
commit 9abaaa2
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 15 deletions.
diff --git a/config/database.php b/config/database.php
@@ -2,7 +2,9 @@
 
 	function getDBInfo() {
 		$dt = debug_backtrace();
-		if ((ROOT_DIR . DIRECTORY_SEPARATOR . 'index.php' != $dt[0]['file']) && (SSO_DIR . DIRECTORY_SEPARATOR . 'conf.database.php' != $dt[0]['file']) ) {
+		$allow = (defined('ROOT_DIR') && ROOT_DIR . DIRECTORY_SEPARATOR . 'index.php' == $dt[0]['file']) ||
+					(defined('SSO_DIR') && SSO_DIR . DIRECTORY_SEPARATOR . 'conf.database.php' == $dt[0]['file']);
+		if (!$allow) {		
 			if (class_exists(Context))
 				Context::printWarning('SandBox error : call getDBInfo in other file');
 			else

diff --git a/lib/classes/Context.class.php b/lib/classes/Context.class.php
@@ -208,14 +208,16 @@ static function getMenu($level) {
 			}
 
 			static $topMenus;
-			if ($selectedMenuData->level == 1) $topMenus = array($selectedMenuData->id);
-			else if (!$topMenus) $topMenus = explode(',', self::getParentMenus($selectedMenuData->id));
+			if ($selectedMenuData !== false) {
+				if ($selectedMenuData->level == 1) $topMenus = array($selectedMenuData->id);
+				else if (!$topMenus) $topMenus = explode(',', self::getParentMenus($selectedMenuData->id));
+			}
 
 			for ($i=0; $i<count($arr); $i++) {
 				$arr[$i] = $arr[$i]->getData();
 				$arr[$i]->className = 'pmc-menu' . $level . '-' . $arr[$i]->title;
 
-				if (array_search($arr[$i]->id, $topMenus) !== false) {
+				if (isset($topMenus) && array_search($arr[$i]->id, $topMenus) !== false) {
 					$arr[$i]->selected = true;
 					$arr[$i]->className .= ' pmc-menu' . $level . '-selected';
 				}
@@ -461,7 +463,6 @@ public function checkSSO() {
 				}
 
 				$ssoData = json_decode($urlData);
-
 				if (!$ssoData || $ssoData->result === 'fail') {
 					Context::printErrorPage(array(
 						'en' => 'fail loading sso data',

diff --git a/modules/page/PageView.class.php b/modules/page/PageView.class.php
@@ -10,12 +10,7 @@ public function dispDefault() {
 		}
 
 		private function loadPage($page) {
-			CacheHandler::execTemplate(
-				(substr($templateName, 0, 1) == '/') ?
-					ROOT_DIR . $templateName :
-					$this->model->getPagePath($page)
-			, $this->module);
-
+			CacheHandler::execTemplate($this->model->getPagePath($page), $this->module);
 		}
 
 	}
diff --git a/modules/page/pages/about/about.html b/modules/page/pages/about/about.html
@@ -1,7 +1,7 @@
 <ul>
 	{@ foreach(Context::getMenu(2) as $key => $menu): }
 	<li class="{$menu->className}">
-		<condition do="$menu->selected">*</condition>
+		<condition do="isset($menu->selected)">*</condition>
 		<a href="/{@ if (!USE_SHORT_URL) echo '?menu='; }{$menu->title}" class="no-deco">{$menu->title_locale}</a>
 	</li>
 	{@ endforeach; }

diff --git a/modules/page/pages/counter/counter.html b/modules/page/pages/counter/counter.html
@@ -1,7 +1,7 @@
 <ul>
 	{@ foreach(Context::getMenu(2) as $key => $menu): }
 	<li class="{$menu->className}">
-		<condition do="$menu->selected">*</condition>
+		<condition do="isset($menu->selected)">*</condition>
 		<a href="/{@ if (!USE_SHORT_URL) echo '?menu='; }{$menu->title}" class="no-deco">{$menu->title_locale}</a>
 	</li>
 	{@ endforeach; }

diff --git a/modules/page/pages/others/others.html b/modules/page/pages/others/others.html
@@ -1,7 +1,7 @@
 <ul>
 	{@ foreach(Context::getMenu(2) as $key => $menu): }
 	<li class="{$menu->className}">
-		<condition do="$menu->selected">*</condition>
+		<condition do="isset($menu->selected)">*</condition>
 		<a href="/{@ if (!USE_SHORT_URL) echo '?menu='; }{$menu->title}" class="no-deco">{$menu->title_locale}</a>
 	</li>
 	{@ endforeach; }

diff --git a/sso-server/conf.functions.php b/sso-server/conf.functions.php
@@ -26,7 +26,7 @@ function execQuery($query) {
 	}
 
 	function execQueryOne($query) {
-		$result = execQuery($query, $fetchType);
+		$result = execQuery($query);
 		if (is_array($result) && count($result) !== 0)
 			return $result[0];
 		else