complete refactoring

compatible with Typo3 7.6
BE-Modules not yet working


git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/wec_map/trunk@90686 735d13b6-9817-0410-8766-e36946ffe9aa

Author: jbartels

CHANGELOG

@@ -4,6 +4,8 @@
 [FIX] French translation updated. Thanks to S�bastien Convers.
 [FIX] Load Order of extensions. Thanks to Thorsten Krieger and Stefan Wobbe. (issue #62582)
 [FIX] HTML5 Markup Error on URL for Google APIs. Thanks to  DMK E-BUSINESS GmbH. (issue #62496)
+[NEW] pi2-TypoScript-options: table.additionalWhere, table.orderBy, table.limit
+[FIX] Use Configuration/TCA/override to extend 3rd-party tables (issue #64171)
 
 3.1.1
 [FIX] addressForm for radius-search is not displayed. Please check your TypoScript setup. (issue #60419)

geocode_service/class.tx_wecmap_geocode_google.php renamed to Classes/GeocodeService/Google.php

@@ -4,7 +4,7 @@
 *
 * (c) 2005-2009 Christian Technology Ministries International Inc.
 * All rights reserved
-* (c) 2011-2013 Jan Bartels, j.bartels@arcor.de, Google API V3
+* (c) 2011-2015 Jan Bartels, j.bartels@arcor.de, Google API V3
 *
 * parts from static_info_tables:
 *  (c) 2013 Stanislas Rolland <typo3(arobas)sjbr.ca>
@@ -36,9 +36,7 @@
  * @author	j.bartels
  */
 
-
-#require_once(PATH_t3lib.'class.t3lib_svbase.php');
-#require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('wec_map').'class.tx_wecmap_domainmgr.php');
+namespace JBartels\WecMap\GeocodeService;
 
 /**
  * Service providing lat/long lookup via the Google Maps web service.
@@ -47,10 +45,8 @@
  * @package TYPO3
  * @subpackage tx_wecmap
  */
-class tx_wecmap_geocode_google extends t3lib_svbase {
-	var $prefixId = 'tx_wecmap_geocode_google';		// Same as class name
-	var $scriptRelPath = 'geocode_service/class.tx_wecmap_geocode_google.php';	// Path to this script relative to the extension dir.
-	var $extKey = 'wec_map';	// The extension key.
+class Google extends \TYPO3\CMS\Core\Service\AbstractService {
+	var $prefixId = 'WecMapGeocodeGoogle';		// for temporary files
 
 	/**
 	 * Returns the type of an iso code: nr, 2, 3
@@ -137,9 +133,6 @@ function lookup($street, $city, $state, $zip, $country, $key='')	{
 		{
 			// format address for Google search based on local address-format for given $country
 
-			// load and init Static Info Tables
-			#require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('static_info_tables').'class.tx_staticinfotables_div.php');
-
 			// convert $country to ISO3
 			$countryCodeType = self::isoCodeType($country);
 			if       ($countryCodeType == 'nr') {
@@ -198,9 +191,6 @@ function lookup($street, $city, $state, $zip, $country, $key='')	{
 
 		// build URL
 		$lookupstr = trim( $addressString );
-	  	# Google requires utf-8; convert query if neccessary
-//	  	if ( $GLOBALS['TSFE']->renderCharset != 'utf-8' )
-//    		$lookupstr = utf8_encode( $lookupstr );
 
 		$url = 'http://maps.googleapis.com/maps/api/geocode/json?sensor=false&address=' . urlencode( $lookupstr );
 		if ( $region )
@@ -299,57 +289,20 @@ function lookup($street, $city, $state, $zip, $country, $key='')	{
 	 * @return	string		The formated address using the country address format (cn_address_format)
 	 */
 	function formatAddress ($delim, $streetAddress, $city, $zip, $subdivisionCode='', $countryCode='')	{
-
-		if(TYPO3_MODE == 'FE')
-		{
-			#require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('static_info_tables').'pi1/class.tx_staticinfotables_pi1.php');
-			$staticInfoObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('SJBR\\StaticInfoTables\\PiBaseApi');
-			if ($staticInfoObj->needsInit()) {
+		/** @var \SJBR\StaticInfoTables\PiBaseApi $staticInfoObj */
+		$staticInfoObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\SJBR\StaticInfoTables\PiBaseApi::class);
+		if ($staticInfoObj->needsInit()) {
+			if(TYPO3_MODE == 'FE')
+			{
 				$staticInfoObj->init();
 			}
-			return $staticInfoObj->formatAddress($delim, $streetAddress, $city, $zip, $subdivisionCode, $countryCode);
-		}
-
-		$conf = $this->loadTypoScriptForBEModule('tx_staticinfotables_pi1');
-
-		global $TYPO3_DB;
-
-		$formatedAddress = '';
-		$countryCode = ($countryCode ? trim($countryCode) : $this->defaultCountry);
-		$subdivisionCode = ($subdivisionCode ? trim($subdivisionCode) : ($countryCode == $this->defaultCountry ? $this->defaultCountryZone : ''));
-
-		// Get country name
-//		$countryName = $this->getStaticInfoName('COUNTRIES', $countryCode);
-		$countryName = tx_staticinfotables_div::getTitleFromIsoCode('static_countries', $countryCode, '', FALSE);
-		if (!$countryName) {
-			return $formatedAddress;
+			else
+			{
+				$conf = $this->loadTypoScriptForBEModule('tx_staticinfotables_pi1');
+				$staticInfoObj->init( $conf );
+			}
 		}
-
-			// Get address format
-		$res = $TYPO3_DB->exec_SELECTquery(
-			'cn_address_format',
-			'static_countries',
-			'cn_iso_3='.$TYPO3_DB->fullQuoteStr($countryCode,'static_countries')
-		);
-		$row = $TYPO3_DB->sql_fetch_assoc($res);
-		$TYPO3_DB->sql_free_result($res);
-		$addressFormat = $row['cn_address_format'];
-
-			// Get country subdivision name
-//		$countrySubdivisionName = $this->getStaticInfoName('SUBDIVISIONS', $subdivisionCode, $countryCode);
-//		$countrySubdivisionName = tx_staticinfotables_div::getTitleFromIsoCode('static_country_zones', $subdivisionCode, $countryCode, FALSE);
-
-		// Format the address
-		$formatedAddress = $conf['addressFormat.'][$addressFormat];
-		$formatedAddress = str_replace('%street', $streetAddress, $formatedAddress);
-		$formatedAddress = str_replace('%city', $city, $formatedAddress);
-		$formatedAddress = str_replace('%zip', $zip, $formatedAddress);
-		$formatedAddress = str_replace('%countrySubdivisionCode', $subdivisionCode, $formatedAddress);
-		$formatedAddress = str_replace('%countrySubdivisionName', $subdivisionCode, $formatedAddress);
-		$formatedAddress = str_replace('%countryName', strtoupper($countryName), $formatedAddress);
-		$formatedAddress = implode($delim, \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(';', $formatedAddress, 1));
-
-		return $formatedAddress;
+		return $staticInfoObj->formatAddress($delim, $streetAddress, $city, $zip, $subdivisionCode, $countryCode);
 	}
 
 
@@ -360,14 +313,13 @@ function formatAddress ($delim, $streetAddress, $city, $zip, $subdivisionCode=''
 	 * @return array
 	 */
 	function loadTypoScriptForBEModule($extKey) {
-		#require_once(PATH_t3lib . 'class.t3lib_page.php');
-		#require_once(PATH_t3lib . 'class.t3lib_tstemplate.php');
-		#require_once(PATH_t3lib . 'class.t3lib_tsparser_ext.php');
 		list($page) = \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordsByField('pages', 'pid', 0);
 		$pageUid = intval($page['uid']);
-		$sysPageObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('t3lib_pageSelect');
+		/** @var \TYPO3\CMS\Frontend\Page\PageRepository $sysPageObj */
+		$sysPageObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\Page\PageRepository::class);
 		$rootLine = $sysPageObj->getRootLine($pageUid);
-		$TSObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('t3lib_tsparser_ext');
+		/** @var \TYPO3\CMS\Core\TypoScript\ExtendedTemplateService $TSObj */
+		$TSObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\TypoScript\ExtendedTemplateService::class);
 		$TSObj->tt_track = 0;
 		$TSObj->init();
 		$TSObj->runThroughTemplates($rootLine);