Changeset 6537

Timestamp:

08/08/08 00:01:01 (5 months ago)

Author:

inureyes

Message:

refs #824

• 세션 관련 컴포넌트 정리 작업 중.
  

Location:

trunk/library

Files:

• auth.php (modified) (2 diffs)
• components/Textcube.Control.Openid.php (modified) (1 diff)
• components/Textcube.Model.Session.php (modified) (13 diffs)
• initialize.php (modified) (1 diff)
• view/ownerView.php (modified) (1 diff)

trunk/library/auth.php

@@ -21 +21 @@
 
     if( in_array( "group.writers", Acl::getCurrentPrivilege() ) ) {
-        Session::authorizeSession($blogid, $userid);
+        Session::authorize($blogid, $userid);
     }
     return true;
@@ -116 +116 @@
 
 function requirePrivilege($AC) {
-    requireComponent('Textcube.Control.Auth');
     if(Acl::check($AC)) return true;
     else header('HTTP/1.1 404 Not found');

trunk/library/components/Textcube.Control.Openid.php

@@ -457 +457 @@
 
         if( !empty($userid) && in_array( "group.writers", Acl::getCurrentPrivilege() ) ) {
-            authorizeSession($blogid, $userid);
-        } else {
-            authorizeSession($blogid, SESSION_OPENID_USERID );
+            Session::authorize($blogid, $userid);
+        } else {
+            Session::authorize($blogid, SESSION_OPENID_USERID );
         }
     }

trunk/library/components/Textcube.Model.Session.php

@@ -14 +14 @@
     }
     
-    public static function openSession($savePath, $sessionName) {
+    public static function open($savePath, $sessionName) {
         return true;
     }
     
-    public static function closeSession() {
+    public static function close() {
         return true;
     }
     
-    public static function getSessionName() {
+    public static function getName() {
         global $service;
         if( self::$sessionName == null ) { 
@@ -35 +35 @@
     }
     
-    public static function readSession($id) {
+    public static function read($id) {
         global $database, $service;
-        if ($result = self::sessionQuery("SELECT data FROM {$database['prefix']}Sessions 
+        if ($result = self::query("SELECT data FROM {$database['prefix']}Sessions 
             WHERE id = '$id' AND address = '{$_SERVER['REMOTE_ADDR']}' AND updated >= (UNIX_TIMESTAMP() - {$service['timeout']})")) {
             return $result;
@@ -44 +44 @@
     }
     
-    public static function writeSession($id, $data) {
+    public static function write($id, $data) {
         global $database;
         if (strlen($id) < 32)
@@ -66 +66 @@
     }
     
-    public static function destroySession($id, $setCookie = false) {
+    public static function destroy($id, $setCookie = false) {
         global $database;
         @POD::query("DELETE FROM {$database['prefix']}Sessions 
             WHERE id = '$id' AND address = '{$_SERVER['REMOTE_ADDR']}'");
-        self::gcSession();
-    }
-    
-    public static function gcSession($maxLifeTime = false) {
+        self::getCurrent();
+    }
+    
+    public static function getCurrent($maxLifeTime = false) {
         global $database, $service;
         @POD::query("DELETE FROM {$database['prefix']}Sessions 
             WHERE updated < (UNIX_TIMESTAMP() - {$service['timeout']})");
-        $result = @self::sessionQueryAll("SELECT DISTINCT v.id, v.address 
+        $result = @self::queryAll("SELECT DISTINCT v.id, v.address 
             FROM {$database['prefix']}SessionVisits v 
             LEFT JOIN {$database['prefix']}Sessions s ON v.id = s.id AND v.address = s.address 
@@ -91 +91 @@
     }
     
-    public static function getAnonymousSession() {
-        global $database;
-        $result = self::sessionQuery("SELECT id FROM {$database['prefix']}Sessions WHERE address = '{$_SERVER['REMOTE_ADDR']}' AND userid IS NULL AND preexistence IS NULL");
+    private static function getAnonymousSession() {
+        global $database;
+        $result = self::query("SELECT id FROM {$database['prefix']}Sessions WHERE address = '{$_SERVER['REMOTE_ADDR']}' AND userid IS NULL AND preexistence IS NULL");
         if ($result)
             return $result;
@@ -99 +99 @@
     }
     
-    public static function newAnonymousSession() {
+    private static function newAnonymousSession() {
         global $database;
         for ($i = 0; $i < 100; $i++) {
@@ -127 +127 @@
     }
     
-    public static function isSessionAuthorized($id) {
+    public static function isAuthorized($id) {
         /* OpenID and Admin sessions are treated as authorized ones*/
         global $database;
@@ -151 +151 @@
     }
     
-    public static function setSession() {
+    public static function set() {
         self::$sessionMicrotime = Timer::getMicroTime();
         if( !empty($_GET['TSSESSION']) ) {
@@ -161 +161 @@
             $id = '';
         }
-        if ((strlen($id) < 32) || !self::isSessionAuthorized($id)) {
+        if ((strlen($id) < 32) || !self::isAuthorized($id)) {
             self::setSessionAnonymous($id);
         }
     }
     
-    public static function authorizeSession($blogid, $userid) {
+    public static function authorize($blogid, $userid) {
         global $database, $service;
         $session_cookie_path = "/";
@@ -185 +185 @@
             }
         }
-        if (self::isSessionAuthorized(session_id()))
+        if (self::isAuthorized(session_id()))
             return true;
         for ($i = 0; $i < 100; $i++) {
@@ -195 +195 @@
                 @session_id($id);
                 //$service['domain'] = $service['domain'].':8888';
-                setcookie( self::getSessionName(), $id, 0, $session_cookie_path, $service['session_cookie_domain']);
+                setcookie( self::getName(), $id, 0, $session_cookie_path, $service['session_cookie_domain']);
                 return true;
             }
@@ -202 +202 @@
     }
     
-    public static function sessionQuery($sql) {
+    public static function query($sql) {
         global $database, $sessionDBRepair;
         $result = POD::queryCell($sql);
@@ -215 +215 @@
     }
     
-    public static function sessionQueryAll($sql) {
+    public static function queryAll($sql) {
         global $database, $sessionDBRepair;
         $result = POD::queryAll($sql);

trunk/library/initialize.php

@@ -25 +25 @@
 /* Session initializing */
 if (!defined('NO_SESSION')) {
-    session_name(Session::getSessionName());
-    Session::setSession();
-    session_set_save_handler('Session::openSession', 'Session::closeSession', 'Session::readSession', 'Session::writeSession', 'Session::destroySession', 'Session::gcSession');
+    session_name(Session::getName());
+    Session::set();
+    session_set_save_handler('Session::open', 'Session::close', 'Session::read', 'Session::write', 'Session::destroy', 'Session::getCurrent');
     session_cache_expire(1);
     session_set_cookie_params(0, '/', $service['domain']);

trunk/library/view/ownerView.php

@@ -797 +797 @@
                                                             + '&labelingPath=<?php echo $param['labelingPath'];?>'
                                                             + entryManager.entryId
-                                                            + '&maxSize=<?php echo $maxSize;?>&sessionName=TSSESSION&sessionValue=<?php echo $_COOKIE[getSessionName()];?>" />'
+                                                            + '&maxSize=<?php echo $maxSize;?>&sessionName=TSSESSION&sessionValue=<?php echo $_COOKIE[Session::getName()];?>" />'
                                                             + '<embed id="uploader2" src="<?php echo $service['path'];?>/resources/script/uploader/uploader.swf" flashvars="uploadPath=<?php echo $param['uploadPath'];?>'
                                                             + entryManager.entryId
                                                             + '&labelingPath=<?php echo $param['labelingPath'];?>'
                                                             + entryManager.entryId
-                                                            + '&maxSize=<?php echo $maxSize;?>&sessionName=TSSESSION&sessionValue=<?php echo $_COOKIE[getSessionName()];?>" width="1" height="1" align="middle" wmode="transparent" quality="high" bgcolor="#ffffff" scale="noScale" allowscriptaccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" /><\/embed><\/object>';
+                                                            + '&maxSize=<?php echo $maxSize;?>&sessionName=TSSESSION&sessionValue=<?php echo $_COOKIE[Session::getName()];?>" width="1" height="1" align="middle" wmode="transparent" quality="high" bgcolor="#ffffff" scale="noScale" allowscriptaccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" /><\/embed><\/object>';
                                                         if (hasRightVersion && (isMoz || isIE)) {
                                                             if(<?php echo (isset($service['flashuploader']) && $service['flashuploader'] === false) ? 'false' : 'true';?>) { writeCode(uploaderStr,'uploaderNest'); }