Fixed #91, Fixed #92

Contao3-Ninja · May 31, 2014 · d137ca7 · d137ca7
1 parent 2ea6bbc
commit d137ca7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 Contao Module Visitors
 ======================
+[![Latest Stable Version](https://poser.pugx.org/bugbuster/visitors/v/stable.svg)](https://packagist.org/packages/bugbuster/visitors) [![Total Downloads](https://poser.pugx.org/bugbuster/visitors/downloads.svg)](https://packagist.org/packages/bugbuster/visitors) [![Latest Unstable Version](https://poser.pugx.org/bugbuster/visitors/v/unstable.svg)](https://packagist.org/packages/bugbuster/visitors) [![License](https://poser.pugx.org/bugbuster/visitors/license.svg)](https://packagist.org/packages/bugbuster/visitors)
 
 ## About
 

diff --git a/classes/ModuleVisitorChecks.php b/classes/ModuleVisitorChecks.php
@@ -145,10 +145,7 @@ public function isDomain($host)
 	    $dnsResult = false;
 	    //$this->_vhost :  Host.TLD
 	    //idn_to_ascii
-	    require_once TL_ROOT . '/system/modules/core/vendor/idna/idna_convert.class.php';
-	    $objIdn    = new \idna_convert();
-
-	    $dnsResult = dns_get_record( $objIdn->encode( $host ), DNS_ANY );
+	    $dnsResult = dns_get_record( \Idna::encode( $host ), DNS_ANY );
 	    if ( $dnsResult )
 	    {
 	        //log_message('isDomain True','debug.log');

diff --git a/config/autoload.ini b/config/autoload.ini
@@ -9,3 +9,11 @@ requires[] = "core"
 register_namespaces = true
 register_classes    = true
 register_templates  = true
+
+;;
+; Override the default configuration for certain sub directories
+;;
+[runonce/*]
+register_namespaces = false
+register_classes    = false
+register_templates  = false
diff --git a/public/ModuleVisitorReferrerDetails.php b/public/ModuleVisitorReferrerDetails.php
@@ -88,7 +88,7 @@ public function run()
 <body id="top">
 <div id="main">
 	<br />
-	<h1 class="main_headline">'.$GLOBALS['TL_LANG']['tl_visitors_referrer']['details_for'].': '.str_rot13($this->Input->get('tl_referrer',true)).'</h1>
+	<h1 class="main_headline">'.$GLOBALS['TL_LANG']['tl_visitors_referrer']['details_for'].': '.\Idna::decode(str_rot13($this->Input->get('tl_referrer',true))).'</h1>
 	<br /><br />
 	<div class="tl_formbody_edit">
 		<table cellpadding="0" cellspacing="0" summary="Table lists records" class="mod_visitors_be_table_max">
@@ -122,7 +122,7 @@ public function run()
 	        {
 				echo '
 			<tr>
-				<td class="tl_file_list" style="padding-left: 2px; text-align: left;">'.rawurldecode(htmlspecialchars($objDetails->visitors_referrer_full)).'</td>
+				<td class="tl_file_list" style="padding-left: 2px; text-align: left;">'.rawurldecode(htmlspecialchars(\Idna::decode($objDetails->visitors_referrer_full))).'</td>
 				<td class="tl_file_list" style="padding-left: 2px; text-align: left;">'.date($GLOBALS['TL_CONFIG']['datimFormat'],$objDetails->maxtstamp).'</td>
 				<td class="tl_file_list" style="text-align: center;">'.$objDetails->ANZ.'</td>
 			</tr>';

diff --git a/templates/mod_visitors_be_stat.html5 b/templates/mod_visitors_be_stat.html5
@@ -606,7 +606,7 @@ o.open = function(url,type){
 <?php if ($this->visitorsstatReferrer !== false) : ?>
 	<?php foreach ($this->visitorsstatReferrer[$vcid] AS $Referrer) : ?>
 			<tr>
-			    <td style="padding-left: 2px; text-align: left;" class="tl_file_list"><?php echo (isset($Referrer[0]) ? $Referrer[0] : ''); ?></td>
+			    <td style="padding-left: 2px; text-align: left;" class="tl_file_list"><?php echo (isset($Referrer[0]) ? \Idna::decode($Referrer[0]) : ''); ?></td>
 			    <td style="padding-left: 2px; text-align: center;" class="tl_file_list"><?php echo (isset($Referrer[1]) ? $Referrer[1] : ''); ?></td>
    			    <td style="text-align: center;" class="tl_file_list"><?php if ($Referrer[2]) : ?><a onclick="Backend.openModalIframe({'width':780,'height':600,'title':'Details','url':this.href});return false" title="Details" href="<?php echo $this->visitors_base; ?>system/modules/visitors/public/ModuleVisitorReferrerDetails.php?tl_referrer=<?php echo str_rot13($Referrer[0]); ?>&amp;tl_vid=<?php echo $Referrer[2]; ?>"><img width="16" height="16" alt="Details" src="system/themes/<?php echo $this->theme; ?>/images/show.gif"></a><?php endif; ?></td>
 			</tr>