Version 3.2.3
This commit is contained in:
1 parent
ae5c01cc78
commit
78706903a2
2641 files changed
+228363
-201264
No files matched your search
@@ -3,20 +3,20 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.1.4
|
||||
* IP.Board v3.2.3
|
||||
* Generic Mapping Class
|
||||
* Owner: Matt Mecham
|
||||
* Last Updated: $Date: 2010-08-03 17:20:16 +0100 (Tue, 03 Aug 2010) $
|
||||
* Last Updated: $Date: 2011-03-10 16:00:38 -0500 (Thu, 10 Mar 2011) $
|
||||
*
|
||||
* @example
|
||||
*
|
||||
* @author $Author: matt $
|
||||
* @author $Author: bfarber $
|
||||
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/community/board/license.html
|
||||
* @license This is NULLED!
|
||||
* @package IP.Board
|
||||
* @link http://www.invisionpower.com
|
||||
* @link http://hatynka.in
|
||||
* @since 9th March 2005 11:03
|
||||
* @version $Revision: 6725 $
|
||||
* @version $Revision: 8021 $
|
||||
*/
|
||||
|
||||
/**
|
||||
@@ -31,7 +31,7 @@ class classes_mapping
|
||||
* App object
|
||||
* @var object
|
||||
*/
|
||||
static private $_app;
|
||||
static protected $_app;
|
||||
|
||||
/**
|
||||
* Construct
|
||||
@@ -45,15 +45,14 @@ class classes_mapping
|
||||
|
||||
/* Pointless comment! */
|
||||
$_file = IPS_ROOT_PATH . 'sources/classes/mapping/engines/' . $engine . '.php';
|
||||
$_class = 'classes_mapping_' . $engine;
|
||||
|
||||
if ( file_exists( $_file ) )
|
||||
if ( is_file( $_file ) )
|
||||
{
|
||||
require_once( $_file );
|
||||
|
||||
if ( class_exists( $_class ) )
|
||||
{
|
||||
self::$_app = new $_class();
|
||||
$classToLoad = IPSLib::loadLibrary( $_file, 'classes_mapping_' . $engine );
|
||||
|
||||
if ( class_exists( $classToLoad ) )
|
||||
{
|
||||
self::$_app = new $classToLoad();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -217,7 +216,7 @@ abstract class classes_mapping_composite
|
||||
$file_0 = md5( $lat . ',' . $lon . ',' . $size ) . '_0.png';
|
||||
$file_1 = md5( $lat . ',' . $lon . ',' . $size ) . '_1.png';
|
||||
|
||||
if ( file_exists( $this->_getCachePath() . '/' . $file_0 ) && file_exists( $this->_getCachePath() . '/' . $file_1 ) )
|
||||
if ( is_file( $this->_getCachePath() . '/' . $file_0 ) && is_file( $this->_getCachePath() . '/' . $file_1 ) )
|
||||
{
|
||||
return array( $this->_getCacheUrl() . '/' . $file_0, $this->_getCacheUrl() . '/' . $file_1 );
|
||||
}
|
||||
@@ -237,8 +236,8 @@ abstract class classes_mapping_composite
|
||||
{
|
||||
if ( ! is_dir( $this->settings['upload_dir'] . '/maps' ) )
|
||||
{
|
||||
@mkdir( $this->settings['upload_dir'] . '/maps', 0777 );
|
||||
@chmod( $this->settings['upload_dir'] . '/maps', 0777 );
|
||||
@mkdir( $this->settings['upload_dir'] . '/maps', IPS_FOLDER_PERMISSION );
|
||||
@chmod( $this->settings['upload_dir'] . '/maps', IPS_FOLDER_PERMISSION );
|
||||
}
|
||||
|
||||
$filename = md5( $lat . ',' . $lon . ',' . $size ) . '_' . $key;
|
||||
@@ -302,19 +301,17 @@ abstract class classes_mapping_composite
|
||||
* Returns cache path
|
||||
* @return string
|
||||
*/
|
||||
private function _getCachePath()
|
||||
protected function _getCachePath()
|
||||
{
|
||||
return ( is_dir( $this->settings['upload_dir'] . '/maps' ) ) ? $this->settings['upload_dir'] . '/maps' : $this->settings['upload_dir'];
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* Returns cache path
|
||||
* @return string
|
||||
*/
|
||||
private function _getCacheUrl()
|
||||
protected function _getCacheUrl()
|
||||
{
|
||||
return ( is_dir( $this->settings['upload_dir'] . '/maps' ) ) ? $this->settings['upload_url'] . '/maps' : $this->settings['upload_url'];
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -3,20 +3,20 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.1.4
|
||||
* IP.Board v3.2.3
|
||||
* Bing mapping class
|
||||
* Owner: Matt Mecham
|
||||
* Last Updated: $Date: 2010-08-03 17:20:16 +0100 (Tue, 03 Aug 2010) $
|
||||
* Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
|
||||
*
|
||||
* @example
|
||||
*
|
||||
* @author $Author: matt $
|
||||
* @author $Author: ips_terabyte $
|
||||
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/community/board/license.html
|
||||
* @license This is NULLED!
|
||||
* @package IP.Board
|
||||
* @link http://www.invisionpower.com
|
||||
* @link http://hatynka.in
|
||||
* @since 9th March 2005 11:03
|
||||
* @version $Revision: 6725 $
|
||||
* @version $Revision: 8644 $
|
||||
*/
|
||||
|
||||
class classes_mapping_bing extends classes_mapping_composite
|
||||
@@ -68,6 +68,7 @@ class classes_mapping_bing extends classes_mapping_composite
|
||||
* @var object
|
||||
*/
|
||||
protected $member;
|
||||
protected $memberData;
|
||||
|
||||
/**
|
||||
* Cache object
|
||||
@@ -76,11 +77,12 @@ class classes_mapping_bing extends classes_mapping_composite
|
||||
* @var object
|
||||
*/
|
||||
protected $cache;
|
||||
protected $caches;
|
||||
|
||||
/**
|
||||
* Method constructor
|
||||
*
|
||||
* @return void
|
||||
* @return @e void
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
@@ -93,8 +95,6 @@ class classes_mapping_bing extends classes_mapping_composite
|
||||
$this->memberData =& $this->registry->member()->fetchMemberData();
|
||||
$this->cache = $this->registry->cache();
|
||||
$this->caches =& $this->registry->cache()->fetchCaches();
|
||||
|
||||
define( 'BING_API_KEY', 'AvxfFpDbujzwr7Taq2i0enES55OfCrRviwA17gJAGXkhLwAZKV4eNUdglFMQzlz6' );
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -103,7 +103,7 @@ class classes_mapping_bing extends classes_mapping_composite
|
||||
*/
|
||||
public function fetchApiKey()
|
||||
{
|
||||
return BING_API_KEY;
|
||||
return defined( 'BING_API_KEY' ) ? BING_API_KEY : false;
|
||||
}
|
||||
|
||||
//$result = $file->getFileContents( "http://where.yahooapis.com/geocode?appid=" . $this->getYahooAppId() . "&location=" . $lat . "," . $lon . "&flags=J&gflags=R&locale=" . YAHOO_LOCALE );
|
||||
@@ -125,8 +125,8 @@ class classes_mapping_bing extends classes_mapping_composite
|
||||
}
|
||||
|
||||
/* Lets do it. */
|
||||
require_once( IPS_KERNEL_PATH . 'classFileManagement.php' );
|
||||
$file = new classFileManagement();
|
||||
$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
|
||||
$file = new $classToLoad();
|
||||
|
||||
/* fetch */
|
||||
$json = $file->getFileContents( "http://dev.virtualearth.net/REST/v1/Locations/" . $lat . "," . $lon . "?&key=" . BING_API_KEY );
|
||||
@@ -235,7 +235,7 @@ class classes_mapping_bing extends classes_mapping_composite
|
||||
* @param array $return
|
||||
* @return string
|
||||
*/
|
||||
private function _getShort( $return )
|
||||
protected function _getShort( $return )
|
||||
{
|
||||
if ( $return['locality'] != $return['district2'] )
|
||||
{
|
||||
|
||||
@@ -3,20 +3,20 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.1.4
|
||||
* IP.Board v3.2.3
|
||||
* Bing mapping class
|
||||
* Owner: Matt Mecham
|
||||
* Last Updated: $Date: 2010-08-03 17:20:16 +0100 (Tue, 03 Aug 2010) $
|
||||
* Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
|
||||
*
|
||||
* @example
|
||||
*
|
||||
* @author $Author: matt $
|
||||
* @author $Author: ips_terabyte $
|
||||
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/community/board/license.html
|
||||
* @license This is NULLED!
|
||||
* @package IP.Board
|
||||
* @link http://www.invisionpower.com
|
||||
* @link http://hatynka.in
|
||||
* @since 9th March 2005 11:03
|
||||
* @version $Revision: 6725 $
|
||||
* @version $Revision: 8644 $
|
||||
*/
|
||||
|
||||
class classes_mapping_google extends classes_mapping_composite
|
||||
@@ -68,6 +68,7 @@ class classes_mapping_google extends classes_mapping_composite
|
||||
* @var object
|
||||
*/
|
||||
protected $member;
|
||||
protected $memberData;
|
||||
|
||||
/**
|
||||
* Cache object
|
||||
@@ -76,11 +77,12 @@ class classes_mapping_google extends classes_mapping_composite
|
||||
* @var object
|
||||
*/
|
||||
protected $cache;
|
||||
protected $caches;
|
||||
|
||||
/**
|
||||
* Method constructor
|
||||
*
|
||||
* @return void
|
||||
* @return @e void
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
@@ -121,8 +123,8 @@ class classes_mapping_google extends classes_mapping_composite
|
||||
}
|
||||
|
||||
/* Lets do it. */
|
||||
require_once( IPS_KERNEL_PATH . 'classFileManagement.php' );
|
||||
$file = new classFileManagement();
|
||||
$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
|
||||
$file = new $classToLoad();
|
||||
|
||||
/* fetch */
|
||||
$json = $file->getFileContents( "http://maps.googleapis.com/maps/api/geocode/json?latlng=" . $lat . ',' . $lon . '&sensor=false' );
|
||||
@@ -225,7 +227,7 @@ class classes_mapping_google extends classes_mapping_composite
|
||||
* @param array $return
|
||||
* @return string
|
||||
*/
|
||||
private function _getShort( $return )
|
||||
protected function _getShort( $return )
|
||||
{
|
||||
if ( $return['locality'] != $return['district2'] )
|
||||
{
|
||||
|
||||
@@ -5,6 +5,6 @@
|
||||
<hr>
|
||||
You have reached this page in error, please use your back button to return to the forum.
|
||||
<hr>
|
||||
<a href="http://www.invisionboard.com/">IP.Board</a>
|
||||
<a href="http://www.invisionpower.com">IP.Board</a>
|
||||
</body>
|
||||
</html>
|
||||
@@ -5,6 +5,6 @@
|
||||
<hr>
|
||||
You have reached this page in error, please use your back button to return to the forum.
|
||||
<hr>
|
||||
<a href="http://www.invisionboard.com/">IP.Board</a>
|
||||
<a href="http://www.invisionpower.com">IP.Board</a>
|
||||
</body>
|
||||
</html>
|
||||
Reference in new issue
Block a user