Permalink
Browse files

refactor done

  • Loading branch information...
1 parent 64e3213 commit 384e4a9a2c6dc497a3c17529a81ed4cd85594d62 @nocive committed Aug 3, 2012
View
@@ -35,10 +35,10 @@ public function __construct( $config )
*/
public function log( $str, $level = Log::LEVEL_DEBUG, $logfile = null )
{
- $cfgClass = $this->_config;
- $logfile = $logfile !== null ? $this->_config->get( $cfgClass::LOGFILE ) : $logfile;
+ $config = $this->_config;
+ $logfile = $logfile === null ? $config->get( $config::LOGFILE ) : $logfile;
- if ($this->_config->get( $cfgClass::LOG ) && ! empty( $logfile )) {
+ if ($config->get( $config::LOG ) && ! empty( $logfile )) {
return Log::write( $logfile, $str, $level );
}
return false;
@@ -24,7 +24,16 @@ class Bootstrap
'Base' => 'Base/Base',
'Config' => 'Config/Config',
'Object' => 'Object/Object',
- 'Util' => 'Util/Util'
+ 'Url' => 'Object/Url/Url',
+ 'Text' => 'Object/Text/Text',
+ 'Image' => 'Object/Image/Image',
+ 'Util' => 'Util/Util',
+ 'Log' => 'Log/Log',
+ 'Exception' => 'Exception/Exception',
+ 'CommunicationException' => 'Exception/Exception',
+ 'FileReadWriteException' => 'Exception/Exception',
+ 'InvalidImageFileException' => 'Exception/Exception',
+ 'FatalException' => 'Exception/Exception'
);
/**
@@ -43,7 +52,7 @@ class Bootstrap
* @access public
*/
protected static $_dependencies = array(
- 'Externals/Mimex/Mimex.php'
+ 'Externals/Mimex/mimex.php'
);
/**
View
@@ -75,10 +75,10 @@ class Config
self::ENCODING => 'UTF-8',
self::FETCHER_PROXY => '',
- self::FETCHER_TIMEOUT => 60,
+ self::FETCHER_TIMEOUT => 20,
self::FETCHER_FOLLOW_LOCATION => true,
self::FETCHER_MAX_REDIRS => 2,
- self::FETCHER_USER_AGENT => 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.71 Safari/534.24',
+ self::FETCHER_USER_AGENT => 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.1 (KHTML, like Gecko) Chrome/21.0.1180.57 Safari/537.1',
self::FETCHER_FAKE_REFERER => true,
self::TITLE_SEARCH_TAGS => array(
@@ -173,7 +173,7 @@ public function __construct( $cfg = null )
/**
* Retrieve configuration parameters
*
- * @param string $var1, $var2, $varX
+ * @param string $var, $varX
* @return mixed
*/
public function get()
Oops, something went wrong.

0 comments on commit 384e4a9

Please sign in to comment.