svnno****@sourc*****
svnno****@sourc*****
2009年 5月 9日 (土) 12:42:30 JST
Revision: 72 http://svn.sourceforge.jp/view?root=frameworkspider&view=rev&rev=72 Author: m_nakashima Date: 2009-05-09 12:42:30 +0900 (Sat, 09 May 2009) Log Message: ----------- Modified Paths: -------------- current/DATA/lib/spider/HttpRequest.class.php current/DATA/lib/spider/tags/TagBase.class.php current/DATA/lib/spider/tags/Widget.class.php current/DATA/lib/util/CharUtility.class.php current/DATA/lib/util/GetHTTPResponse.class.php -------------- next part -------------- Modified: current/DATA/lib/spider/HttpRequest.class.php =================================================================== --- current/DATA/lib/spider/HttpRequest.class.php 2009-04-22 08:06:38 UTC (rev 71) +++ current/DATA/lib/spider/HttpRequest.class.php 2009-05-09 03:42:30 UTC (rev 72) @@ -55,8 +55,8 @@ $caller_class = preg_replace('/^_/','',str_replace('.class.php','',str_replace(DIRECTORY_SEPARATOR,'_',$lib_uri))); $caller_prefix = str_replace('_','.',$caller_class); $package_prefix = preg_replace('/\\.[^\\.]+$/','',$caller_prefix); - if( preg_match('/^'.CharUtility::escape_regx_str($caller_prefix).'/',$key) == 0 - && preg_match('/^'.CharUtility::escape_regx_str($package_prefix).'/',$key) == 0 + if( preg_match('/^'.util_CharUtility::escape_regx_str($caller_prefix).'/',$key) == 0 + && preg_match('/^'.util_CharUtility::escape_regx_str($package_prefix).'/',$key) == 0 ) { // パッケージ名もクラス名も属性名に含まれないならクラスプレフィックスつけて登録 $reg_key = $caller_prefix.'.'.$reg_key; @@ -224,7 +224,7 @@ $current_scope = dirname( $_SERVER['PHP_SELF'] ); foreach( $_SESSION as $key => $value ) { if( strlen($key) > 0 && preg_match('/^spider\\_GLOBAL\\./',$key) == 0 - && preg_match('/^'.CharUtility::escape_regx_str($current_scope).'/',$key) == 0 ) { + && preg_match('/^'.util_CharUtility::escape_regx_str($current_scope).'/',$key) == 0 ) { unset( $_SESSION[$key] ); } } Modified: current/DATA/lib/spider/tags/TagBase.class.php =================================================================== --- current/DATA/lib/spider/tags/TagBase.class.php 2009-04-22 08:06:38 UTC (rev 71) +++ current/DATA/lib/spider/tags/TagBase.class.php 2009-05-09 03:42:30 UTC (rev 72) @@ -42,7 +42,7 @@ if( is_null($this->tag_name) || strlen($this->tag_name) == 0 ) { return; } - $tag_regx = CharUtility::escape_regx_str('{'.$this->tag_name); + $tag_regx = util_CharUtility::escape_regx_str('{'.$this->tag_name); $tag_search_regx = $tag_regx.'[^\\}]*?\\}'; $tag_strings_array = array(); $valiable_counter = 0; Modified: current/DATA/lib/spider/tags/Widget.class.php =================================================================== (Binary files differ) Modified: current/DATA/lib/util/CharUtility.class.php =================================================================== --- current/DATA/lib/util/CharUtility.class.php 2009-04-22 08:06:38 UTC (rev 71) +++ current/DATA/lib/util/CharUtility.class.php 2009-05-09 03:42:30 UTC (rev 72) @@ -6,8 +6,8 @@ * @author Multimedia Digital Contents Systems.Co.,Ltd. m.nakashima <m_nakas****@md-sy*****> * @since PHP 4.3 */ -class CharUtility { - function CharUtility() { +class util_CharUtility { + function util_CharUtility() { } /** * 渡された文字列を指定されたキーでMD5暗号化して返します。 @@ -17,7 +17,7 @@ $n = strlen($plain_text); if ($n % 16) $plain_text .= str_repeat("\0", 16 - ($n % 16)); $i = 0; - $enc_text = CharUtility::get_rnd_iv($iv_len); + $enc_text = util_CharUtility::get_rnd_iv($iv_len); $iv = substr($password ^ $enc_text, 0, 512); while ($i < $n) { $block = substr($plain_text, $i, 16) ^ pack('H*', md5($iv)); Modified: current/DATA/lib/util/GetHTTPResponse.class.php =================================================================== --- current/DATA/lib/util/GetHTTPResponse.class.php 2009-04-22 08:06:38 UTC (rev 71) +++ current/DATA/lib/util/GetHTTPResponse.class.php 2009-05-09 03:42:30 UTC (rev 72) @@ -8,13 +8,13 @@ * @author Multimedia Digital Contents Systems.Co.,Ltd. m.nakashima <m_nakas****@md-sy*****> * @since PHP 4.3 */ -class GetHTTPResponse { +class util_GetHTTPResponse { var $protocol = ""; var $status_code = ""; var $status_string = ""; var $response_headers = array(); var $response_body = null; - function GetHTTPResponse(){ + function util_GetHTTPResponse(){ } function get($url,$header_params=array()){ list( $pr, $blank, $domain ) = explode('/',$url ); @@ -94,7 +94,7 @@ } } } -//$obj = new GetHTTPResponse(); +//$obj = new util_GetHTTPResponse(); //if( $obj->get('http://www.md-systems.net/images/button/concept_button_01.jpg') ){ //// foreach( $obj->response_headers as $key => $value ) { //// header($key.': '.$value);