Changeset 713

Timestamp:

Nov 14, 2006, 2:16:56 PM (16 years ago)

Author:

takanashi

Message:

r703,r707,r708,r709マージ

Location:

OpenPNE/trunk/webapp

Files:

• init.inc (modified) (1 diff)
• lib/smarty_plugins/function.t_img_url.php (modified) (1 diff)
• lib/smarty_plugins/function.t_img_url_skin.php (modified) (1 diff)
• modules/admin/lib/etc_admin.php (modified) (1 diff)
• modules/pc/do/o_public_invite.php (modified) (1 diff)
• modules/pc/do/o_regist_prof.php (modified) (3 diffs)
• modules/pc/page/o_regist_prof.php (modified) (1 diff)
• modules/pc/page/o_regist_prof_confirm.php (modified) (1 diff)

OpenPNE/trunk/webapp/init.inc

@@ -98 +98 @@
 ini_set('session.use_only_cookies', '1');
 
+$url = parse_url(OPENPNE_URL);
+if (substr($url['path'], -1) != '/') {
+    $url['path'] .= '/';
+}
+ini_set('session.cookie_path', $url['path']);
+
 // セッション情報をDBに保存
 OpenPNE_Auth::set_session_save_handler();

OpenPNE/trunk/webapp/lib/smarty_plugins/function.t_img_url.php

@@ -22 +22 @@
         $url = OPENPNE_IMG_URL;
     } else {
-        $url = OPENPNE_URL;
+        if (OPENPNE_USE_PARTIAL_SSL && is_ssl()) {
+            $url = OPENPNE_SSL_URL;
+        } else {
+            $url = OPENPNE_URL;
+        }
     }
 

OpenPNE/trunk/webapp/lib/smarty_plugins/function.t_img_url_skin.php

@@ -12 +12 @@
         $url = OPENPNE_IMG_URL;
     } else {
-        $url = OPENPNE_URL;
+        if (OPENPNE_USE_PARTIAL_SSL && is_ssl()) {
+            $url = OPENPNE_SSL_URL;
+        } else {
+            $url = OPENPNE_URL;
+        }
     }
 

OpenPNE/trunk/webapp/modules/admin/lib/etc_admin.php

@@ -79 +79 @@
 function admin_client_redirect($p, $msg = '', $tail = '')
 {
+    if (OPENPNE_ADMIN_URL) {
+        $url = OPENPNE_ADMIN_URL;
+    } else {
+        $url = openpne_gen_url_head('admin', 'page_' . $p, true);
+    }
+    if (need_ssl_param('admin', 'page_' . $p)) {
+        $tail .= 'ssl_param=1';
+    }
+
     $hash_tbl =& AdminHashTable::singleton();
 
     $m = ADMIN_MODULE_NAME;
     $p = $hash_tbl->hash($p);
-
-    if (OPENPNE_ADMIN_URL) {
-        $url = OPENPNE_ADMIN_URL;
-    } else {
-        $url = OPENPNE_URL;
-    }
 
     $url .= "?m=$m&a=page_$p";

OpenPNE/trunk/webapp/modules/pc/do/o_public_invite.php

@@ -72 +72 @@
         do_h_invite_insert_c_invite_mail_send($c_member_id_invite, $session, '', $pc_address);
 
+        // delete cookie
+        setcookie(session_name(), '', time() - 3600, ini_get('session.cookie_path'));
+
         openpne_redirect('pc', 'page_o_public_invite_end');
     }

OpenPNE/trunk/webapp/modules/pc/do/o_regist_prof.php

@@ -32 +32 @@
         $validator = new OpenPNE_Validator();
         if ($mode == 'register') {
+            session_name('OpenPNEpcregist');
             @session_start();
             $validator->addRequests($_SESSION['prof']);
@@ -113 +114 @@
             $prof['profile'] = $c_member_profile_list;
 
+            session_name('OpenPNEpcregist');
             @session_start();
             $_SESSION['prof'] = $_REQUEST;
@@ -120 +122 @@
             exit;
         case 'register':
+            // delete cookie
+            setcookie(session_name(), '', time() - 3600, ini_get('session.cookie_path'));
+
             $pre = do_common_c_member_pre4sid($sid);
 

OpenPNE/trunk/webapp/modules/pc/page/o_regist_prof.php

@@ -33 +33 @@
         $this->set('err_msg', $err_msg);
 
+        session_name('OpenPNEpcregist');
         @session_start();
         $this->set('profs', $_SESSION['prof']);

OpenPNE/trunk/webapp/modules/pc/page/o_regist_prof_confirm.php

@@ -35 +35 @@
 
         $this->set('sid', $sid);
+        session_name('OpenPNEpcregist');
         @session_start();
         $this->set('prof', $_REQUEST['prof']);