Ignore:
Timestamp:
2007/07/18 10:17:57 (17 years ago)
Author:
adati
Message:

relブランチのマージ(r12156-r15055)

Location:
branches/beta/data/class
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/beta/data/class/SC_CartSession.php

    r14730 r15056  
    344344    } 
    345345     
    346  
    347346} 
    348347?> 
  • branches/beta/data/class/SC_CheckError.php

    r12037 r15056  
    812812            $this->arrErr[$value[1]] = "¢¨ " . $value[0] . "¤Ï·ÈÂÓÅÅÏäΤâ¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£<br />"; 
    813813        } 
    814     }        
     814    } 
     815    /** 
     816     * ¶Ø»ßʸ»úÎó¤Î¥Á¥§¥Ã¥¯ 
     817     * value[0] = ¹àÌÜ̾ value[1] = ȽÄêÂоÝʸ»úÎó 
     818     * value[2] = ÆþÎϤò¶Ø»ß¤¹¤ëʸ»úÎó(ÇÛÎó) 
     819     *  
     820     * @example $objErr->doFunc(array("URL", "contents", $arrReviewDenyURL), array("PROHIBITED_STR_CHECK")); 
     821     */  
     822    function PROHIBITED_STR_CHECK( $value ) { 
     823        if( isset($this->arrErr[$value[1]]) || empty($this->arrParam[$value[1]]) ) { 
     824            return; 
     825        } 
     826         
     827        $targetStr     = $this->arrParam[$value[1]]; 
     828        $prohibitedStr = str_replace(array('|', '/'), array('\|', '\/'), $value[2]); 
     829         
     830        $pattern = '/' . join('|', $prohibitedStr) . '/i'; 
     831        if(preg_match_all($pattern, $this->arrParam[$value[1]], $matches)) { 
     832            $this->arrErr[$value[1]] = "¢¨ " . $value[0] . "¤ÏÆþÎϤǤ­¤Þ¤»¤ó¡£<br />"; 
     833        } 
     834    } 
    815835} 
    816836?> 
  • branches/beta/data/class/SC_Session.php

    r17 r15056  
    1313    var $sid;           // ¥»¥Ã¥·¥ç¥óID 
    1414    var $member_id;     // ¥í¥°¥¤¥ó¥æ¡¼¥¶¤Î¼ç¥­¡¼ 
    15  
     15    var $uniqid;         // ¥Ú¡¼¥¸Á«°Ü¤ÎÀµÅöÀ­¥Á¥§¥Ã¥¯¤Ë»ÈÍÑ 
     16     
    1617    /* ¥³¥ó¥¹¥È¥é¥¯¥¿ */ 
    1718    function SC_Session() { 
     
    2324            $this->sid = session_id(); 
    2425            $this->cert = $_SESSION['cert']; 
    25             $this->login_id = $_SESSION['login_id']; 
     26            $this->login_id  = $_SESSION['login_id']; 
    2627            $this->authority = $_SESSION['authority'];  // ´ÉÍý¼Ô:0, °ìÈÌ:1, ±ÜÍ÷:2 
    2728            $this->member_id = $_SESSION['member_id']; 
     29            $this->uniqid    = $_SESSION['uniq_id']; 
     30             
    2831            // ¥í¥°¤Ëµ­Ï¿¤¹¤ë 
    2932            gfPrintLog("access : user=".$this->login_id." auth=".$this->authority." sid=".$this->sid); 
     
    6467    } 
    6568     
     69    /** ¥æ¥Ë¡¼¥¯ID¤Î¼èÆÀ **/  
     70    function getUniqId() { 
     71        // ¥æ¥Ë¡¼¥¯ID¤¬¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¥»¥Ã¥È¤¹¤ë¡£ 
     72        if( empty($_SESSION['uniqid']) ) { 
     73            $this->setUniqId(); 
     74        } 
     75        return $this->GetSession('uniqid'); 
     76    } 
     77     
     78    /** ¥æ¥Ë¡¼¥¯ID¤Î¥»¥Ã¥È **/  
     79    function setUniqId() { 
     80        // ͽ¬¤µ¤ì¤Ê¤¤¤è¤¦¤Ë¥é¥ó¥À¥àʸ»úÎó¤òÉÕÍ¿¤¹¤ë¡£ 
     81        $this->SetSession('uniqid', sfGetUniqRandomId()); 
     82    } 
     83     
    6684    /* ¥»¥Ã¥·¥ç¥ó¤ÎÇË´þ */ 
    6785    function EndSession() { 
     
    87105        unset($_SESSION['authority']); 
    88106        unset($_SESSION['member_id']); 
     107        unset($_SESSION['uniqid']); 
    89108        // ¥í¥°¤Ëµ­Ï¿¤¹¤ë 
    90109        gfPrintLog("logout : user=".$this->login_id." auth=".$this->authority." sid=".$this->sid); 
  • branches/beta/data/class/SC_View.php

    r14676 r15056  
    4444        $this->_smarty->register_function("sfPrintEbisTag","sfPrintEbisTag"); 
    4545        $this->_smarty->register_function("sfPrintAffTag","sfPrintAffTag"); 
    46         $this->_smarty->default_modifiers = array('script_escape'); 
     46        $this->_smarty->register_function("sfIsHTTPS","sfIsHTTPS"); 
     47        $this->_smarty->default_modifiers = array('script_escape'); 
    4748         
    4849        if(ADMIN_MODE == '1') {      
Note: See TracChangeset for help on using the changeset viewer.