Index: /branches/feature-templates/data/class/SC_Session.php
===================================================================
--- /branches/feature-templates/data/class/SC_Session.php	(revision 15056)
+++ /branches/feature-templates/data/class/SC_Session.php	(revision 15751)
@@ -8,64 +8,64 @@
 /* ¥»¥Ã¥·¥ç¥ó´ÉÍý¥¯¥é¥¹ */
 class SC_Session {
-	var $login_id;		// ¥í¥°¥¤¥ó¥æ¡¼¥¶Ì¾
-	var $authority;		// ¥æ¡¼¥¶¸¢¸Â
-	var $cert;			// ǧ¾Úʸ»úÎó(ǧ¾ÚÀ®¸ù¤ÎȽÄê¤Ë»ÈÍÑ)
-	var $sid;			// ¥»¥Ã¥·¥ç¥óID
-	var $member_id;		// ¥í¥°¥¤¥ó¥æ¡¼¥¶¤Î¼ç¥­¡¼
+    var $login_id;		// ¥í¥°¥¤¥ó¥æ¡¼¥¶Ì¾
+    var $authority;		// ¥æ¡¼¥¶¸¢¸Â
+    var $cert;			// ǧ¾Úʸ»úÎó(ǧ¾ÚÀ®¸ù¤ÎȽÄê¤Ë»ÈÍÑ)
+    var $sid;			// ¥»¥Ã¥·¥ç¥óID
+    var $member_id;		// ¥í¥°¥¤¥ó¥æ¡¼¥¶¤Î¼ç¥­¡¼
     var $uniqid;         // ¥Ú¡¼¥¸Á«°Ü¤ÎÀµÅöÀ­¥Á¥§¥Ã¥¯¤Ë»ÈÍÑ
-    
-	/* ¥³¥ó¥¹¥È¥é¥¯¥¿ */
-	function SC_Session() {
-		// ¥»¥Ã¥·¥ç¥ó³«»Ï
-		sfDomainSessionStart();
 
-		// ¥»¥Ã¥·¥ç¥ó¾ðÊó¤ÎÊݸ
-		if(isset($_SESSION['cert'])) {
-			$this->sid = session_id();
-			$this->cert = $_SESSION['cert'];
-			$this->login_id  = $_SESSION['login_id'];
-			$this->authority = $_SESSION['authority'];	// ´ÉÍý¼Ô:0, °ìÈÌ:1, ±ÜÍ÷:2
-			$this->member_id = $_SESSION['member_id'];
-            $this->uniqid    = $_SESSION['uniq_id'];
-            
-			// ¥í¥°¤Ëµ­Ï¿¤¹¤ë
-			gfPrintLog("access : user=".$this->login_id." auth=".$this->authority." sid=".$this->sid);
-		} else {
-			// ¥í¥°¤Ëµ­Ï¿¤¹¤ë
-			gfPrintLog("access error.");
-		}
-	}
-	/* ǧ¾ÚÀ®¸ù¤ÎȽÄê */
-	function IsSuccess() {
-		global $arrPERMISSION;
-		if($this->cert == CERT_STRING) {
-			if(isset($arrPERMISSION[$_SERVER['PHP_SELF']])) {
-				// ¿ôÃͤ¬¼«Ê¬¤Î¸¢¸Â°Ê¾å¤Î¤â¤Î¤Ç¤Ê¤¤¤È¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤¤¡£
-				if($arrPERMISSION[$_SERVER['PHP_SELF']] < $this->authority) {			
-					return AUTH_ERROR;
-				} 
-			}
-			return SUCCESS;
-		}
-		
-		return ACCESS_ERROR;
-	}
-	
-	/* ¥»¥Ã¥·¥ç¥ó¤Î½ñ¤­¹þ¤ß */
-	function SetSession($key, $val) {
-		$_SESSION[$key] = $val;
-	}
-	
-	/* ¥»¥Ã¥·¥ç¥ó¤ÎÆɤ߹þ¤ß */
-	function GetSession($key) {
-		return $_SESSION[$key];
-	}
-	
-	/* ¥»¥Ã¥·¥ç¥óID¤Î¼èÆÀ */
-	function GetSID() {
-		return $this->sid;
-	}
-	
-    /** ¥æ¥Ë¡¼¥¯ID¤Î¼èÆÀ **/ 
+    /* ¥³¥ó¥¹¥È¥é¥¯¥¿ */
+    function SC_Session() {
+        // ¥»¥Ã¥·¥ç¥ó³«»Ï
+        sfDomainSessionStart();
+
+        // ¥»¥Ã¥·¥ç¥ó¾ðÊó¤ÎÊݸ
+        if(isset($_SESSION['cert'])) {
+            $this->sid = session_id();
+            $this->cert = $_SESSION['cert'];
+            $this->login_id  = $_SESSION['login_id'];
+            $this->authority = $_SESSION['authority'];	// ´ÉÍý¼Ô:0, °ìÈÌ:1, ±ÜÍ÷:2
+            $this->member_id = $_SESSION['member_id'];
+            $this->uniqid    = isset($_SESSION['uniq_id']) ? $_SESSION['uniq_id'] : '';
+
+            // ¥í¥°¤Ëµ­Ï¿¤¹¤ë
+            gfPrintLog("access : user=".$this->login_id." auth=".$this->authority." sid=".$this->sid);
+        } else {
+            // ¥í¥°¤Ëµ­Ï¿¤¹¤ë
+            gfPrintLog("access error.");
+        }
+    }
+    /* ǧ¾ÚÀ®¸ù¤ÎȽÄê */
+    function IsSuccess() {
+        global $arrPERMISSION;
+        if($this->cert == CERT_STRING) {
+            if(isset($arrPERMISSION[$_SERVER['PHP_SELF']])) {
+                // ¿ôÃͤ¬¼«Ê¬¤Î¸¢¸Â°Ê¾å¤Î¤â¤Î¤Ç¤Ê¤¤¤È¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤¤¡£
+                if($arrPERMISSION[$_SERVER['PHP_SELF']] < $this->authority) {
+                    return AUTH_ERROR;
+                }
+            }
+            return SUCCESS;
+        }
+
+        return ACCESS_ERROR;
+    }
+
+    /* ¥»¥Ã¥·¥ç¥ó¤Î½ñ¤­¹þ¤ß */
+    function SetSession($key, $val) {
+        $_SESSION[$key] = $val;
+    }
+
+    /* ¥»¥Ã¥·¥ç¥ó¤ÎÆɤ߹þ¤ß */
+    function GetSession($key) {
+        return $_SESSION[$key];
+    }
+
+    /* ¥»¥Ã¥·¥ç¥óID¤Î¼èÆÀ */
+    function GetSID() {
+        return $this->sid;
+    }
+
+    /** ¥æ¥Ë¡¼¥¯ID¤Î¼èÆÀ **/
     function getUniqId() {
         // ¥æ¥Ë¡¼¥¯ID¤¬¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¥»¥Ã¥È¤¹¤ë¡£
@@ -75,38 +75,38 @@
         return $this->GetSession('uniqid');
     }
-    
-    /** ¥æ¥Ë¡¼¥¯ID¤Î¥»¥Ã¥È **/ 
+
+    /** ¥æ¥Ë¡¼¥¯ID¤Î¥»¥Ã¥È **/
     function setUniqId() {
         // ͽ¬¤µ¤ì¤Ê¤¤¤è¤¦¤Ë¥é¥ó¥À¥àʸ»úÎó¤òÉÕÍ¿¤¹¤ë¡£
         $this->SetSession('uniqid', sfGetUniqRandomId());
     }
-    
-	/* ¥»¥Ã¥·¥ç¥ó¤ÎÇË´þ */
-	function EndSession() {
-		// ¥Ç¥Õ¥©¥ë¥È¤Ï¡¢¡ÖPHPSESSID¡×
-		$sname = session_name();
-		// ¥»¥Ã¥·¥ç¥óÊÑ¿ô¤òÁ´¤Æ²ò½ü¤¹¤ë
-		$_SESSION = array();
-		// ¥»¥Ã¥·¥ç¥ó¤òÀÚÃǤ¹¤ë¤Ë¤Ï¥»¥Ã¥·¥ç¥ó¥¯¥Ã¥­¡¼¤âºï½ü¤¹¤ë¡£
-		// Note: ¥»¥Ã¥·¥ç¥ó¾ðÊó¤À¤±¤Ç¤Ê¤¯¥»¥Ã¥·¥ç¥ó¤òÇ˲õ¤¹¤ë¡£
-		if (isset($_COOKIE[$sname])) {
-			setcookie($sname, '', time()-42000, '/');
-		}
-		// ºÇ½ªÅª¤Ë¡¢¥»¥Ã¥·¥ç¥ó¤òÇ˲õ¤¹¤ë
-		session_destroy();
-		// ¥í¥°¤Ëµ­Ï¿¤¹¤ë
-		gfPrintLog("logout : user=".$this->login_id." auth=".$this->authority." sid=".$this->sid);
-	}
-	
-	// ´ØÏ¢¥»¥Ã¥·¥ç¥ó¤Î¤ßÇË´þ¤¹¤ë¡£
-	function logout() {
-		unset($_SESSION['cert']);
-		unset($_SESSION['login_id']);
-		unset($_SESSION['authority']);
-		unset($_SESSION['member_id']);
+
+    /* ¥»¥Ã¥·¥ç¥ó¤ÎÇË´þ */
+    function EndSession() {
+        // ¥Ç¥Õ¥©¥ë¥È¤Ï¡¢¡ÖPHPSESSID¡×
+        $sname = session_name();
+        // ¥»¥Ã¥·¥ç¥óÊÑ¿ô¤òÁ´¤Æ²ò½ü¤¹¤ë
+        $_SESSION = array();
+        // ¥»¥Ã¥·¥ç¥ó¤òÀÚÃǤ¹¤ë¤Ë¤Ï¥»¥Ã¥·¥ç¥ó¥¯¥Ã¥­¡¼¤âºï½ü¤¹¤ë¡£
+        // Note: ¥»¥Ã¥·¥ç¥ó¾ðÊó¤À¤±¤Ç¤Ê¤¯¥»¥Ã¥·¥ç¥ó¤òÇ˲õ¤¹¤ë¡£
+        if (isset($_COOKIE[$sname])) {
+            setcookie($sname, '', time()-42000, '/');
+        }
+        // ºÇ½ªÅª¤Ë¡¢¥»¥Ã¥·¥ç¥ó¤òÇ˲õ¤¹¤ë
+        session_destroy();
+        // ¥í¥°¤Ëµ­Ï¿¤¹¤ë
+        gfPrintLog("logout : user=".$this->login_id." auth=".$this->authority." sid=".$this->sid);
+    }
+
+    // ´ØÏ¢¥»¥Ã¥·¥ç¥ó¤Î¤ßÇË´þ¤¹¤ë¡£
+    function logout() {
+        unset($_SESSION['cert']);
+        unset($_SESSION['login_id']);
+        unset($_SESSION['authority']);
+        unset($_SESSION['member_id']);
         unset($_SESSION['uniqid']);
-		// ¥í¥°¤Ëµ­Ï¿¤¹¤ë
-		gfPrintLog("logout : user=".$this->login_id." auth=".$this->authority." sid=".$this->sid);
-	}
+        // ¥í¥°¤Ëµ­Ï¿¤¹¤ë
+        gfPrintLog("logout : user=".$this->login_id." auth=".$this->authority." sid=".$this->sid);
+    }
 }
 ?>