Merge branch 'insight' into dev

Contao3-Ninja · May 16, 2015 · 414f45e · 414f45e
2 parents e219397 + f82ced2
commit 414f45e
Show file tree

Hide file tree

Showing 31 changed files with 288 additions and 367 deletions.
diff --git a/assets/.htaccess b/assets/.htaccess
@@ -4,4 +4,4 @@
 </IfModule>
 <IfModule mod_authz_core.c>
   Require all granted
-</IfModule>
+</IfModule>
diff --git a/classes/DCA_module_visitors.php → classes/DcaModuleVisitors.php b/classes/DCA_module_visitors.php → classes/DcaModuleVisitors.php
@@ -3,7 +3,7 @@
 /**
  * Contao Open Source CMS, Copyright (C) 2005-2014 Leo Feyer
  *
- * Contao Module "Visitors" - DCA Helper Class DCA_module_visitors
+ * Contao Module "Visitors" - DCA Helper Class DcaModuleVisitors
  *
  * @copyright  Glen Langer 2012..2014 <http://www.contao.glen-langer.de>
  * @author     Glen Langer (BugBuster)
@@ -19,17 +19,17 @@
 namespace BugBuster\Visitors;
 
 /**
- * DCA Helper Class DCA_module_visitors
+ * DCA Helper Class DcaModuleVisitors
  *
  * @copyright  Glen Langer 2012..2014 <http://www.contao.glen-langer.de>
  * @author     Glen Langer (BugBuster)
  * @package    GLVisitors
  *
  */
-class DCA_module_visitors extends \Backend 
+class DcaModuleVisitors extends \Backend 
 {
 	public function getVisitorsTemplates($dc)
 	{
 	    return $this->getTemplateGroup('mod_visitors_fe_', $dc->activeRecord->pid);
 	}  
-}
+}
diff --git a/classes/DCA_visitors.php → classes/DcaVisitors.php b/classes/DCA_visitors.php → classes/DcaVisitors.php
@@ -3,7 +3,7 @@
 /**
  * Contao Open Source CMS, Copyright (C) 2005-2014 Leo Feyer
  *
- * Contao Module "Visitors" - DCA Helper Class DCA_visitors
+ * Contao Module "Visitors" - DCA Helper Class DcaVisitors
  *
  * @copyright  Glen Langer 2012..2014 <http://www.contao.glen-langer.de>
  * @author     Glen Langer (BugBuster)
@@ -19,14 +19,14 @@
 namespace BugBuster\Visitors;
 
 /**
- * DCA Helper Class DCA_visitors
+ * DCA Helper Class DcaVisitors
  *
  * @copyright  Glen Langer 2012..2014 <http://www.contao.glen-langer.de>
  * @author     Glen Langer (BugBuster)
  * @package    GLVisitors
  *
  */
-class DCA_visitors extends \Backend 
+class DcaVisitors extends \Backend 
 {
     /**
      * Import the back end user object
@@ -47,7 +47,7 @@ public function listVisitors($arrRow)
         }
         $output = '<div class="cte_type ' . $key . '"><strong>' . $arrRow['visitors_name'] . '</strong></div>' ;
         $output.= '<div>'.$GLOBALS['TL_LANG']['tl_visitors']['visitors_startdate'][0].': ' . $startdate . '</div>';
-        //$output.= '<div>'.print_r($arrRow,true).'</div>';
+        //Debug $output.= '<div>'.print_r($arrRow,true).'</div>';
         return $output;
     }
 
@@ -108,4 +108,4 @@ public function toggleVisibility($intId, $blnVisible)
                                                id=?")
                                 ->execute($intId);
     }
-}
+}
diff --git a/classes/DCA_visitors_category.php → classes/DcaVisitorsCategory.php b/classes/DCA_visitors_category.php → classes/DcaVisitorsCategory.php
@@ -3,7 +3,7 @@
 /**
  * Contao Open Source CMS, Copyright (C) 2005-2014 Leo Feyer
  *
- * Contao Module "Visitors" - DCA Helper Class DCA_visitors_category
+ * Contao Module "Visitors" - DCA Helper Class DcaVisitorsCategory
  *
  * @copyright  Glen Langer 2012..2014 <http://www.contao.glen-langer.de>
  * @author     Glen Langer (BugBuster)
@@ -19,14 +19,14 @@
 namespace BugBuster\Visitors;
 
 /**
- * DCA Helper Class DCA_visitors_category
+ * DCA Helper Class DcaVisitorsCategory
  *
  * @copyright  Glen Langer 2012..2014 <http://www.contao.glen-langer.de>
  * @author     Glen Langer (BugBuster)
  * @package    GLVisitors
  *
  */
-class DCA_visitors_category extends \Backend 
+class DcaVisitorsCategory extends \Backend 
 {
     public function labelCallback($arrRow)
 	{
@@ -45,4 +45,4 @@ public function getAdminCheckbox($varValue)
 	{
         return '1';
 	}
-}
+}
diff --git a/classes/ModuleVisitorBrowser3.php b/classes/ModuleVisitorBrowser3.php
@@ -29,7 +29,7 @@ class ModuleVisitorBrowser3
 	private $_version = '';
 	private $_platform = '';
 
-	private $_os = '';
+	//#130 private $_os = '';
 	private $_is_aol = false;
 	private $_is_mobile = false;
 	private $_is_robot = false;
@@ -78,17 +78,17 @@ class ModuleVisitorBrowser3
 	const BROWSER_GALAXY_TAB      = 'Galaxy Tab';
 	const BROWSER_SAMSUNG_GALAXY_NEXUS = 'Galaxy Nexus';      // Google Phone Android 4, add BugBuster
 	const BROWSER_SAMSUNG_NEXUS_S = 'Nexus S';                // Google Phone, add BugBuster
-	const BROWSER_HTC_Desire_HD   = 'HTC Desire HD';
-	const BROWSER_HTC_Desire_Z    = 'HTC Desire Z';
-	const BROWSER_HTC_Desire_S    = 'HTC Desire S';
-	const BROWSER_HTC_Desire      = 'HTC Desire';
+	const BROWSER_HTC_DESIRE_HD   = 'HTC Desire HD';
+	const BROWSER_HTC_DESIRE_Z    = 'HTC Desire Z';
+	const BROWSER_HTC_DESIRE_S    = 'HTC Desire S';
+	const BROWSER_HTC_DESIRE      = 'HTC Desire';
 	const BROWSER_HTC_MAGIC       = 'HTC Magic';
 	const BROWSER_HTC_NEXUS_ONE   = 'HTC Nexus One'; 			  // Google Phone, add BugBuster
 	const BROWSER_HTC_SENSATION       = 'HTC Sensation';
 	const BROWSER_HTC_SENSATION_XE    = 'HTC Sensation XE';
 	const BROWSER_HTC_SENSATION_XL    = 'HTC Sensation XL';
 	const BROWSER_HTC_SENSATION_Z710  = 'HTC Sensation Z710';
-	const BROWSER_HTC_WILDFIRES_A510e = 'HTC WildfireS A510e';
+	const BROWSER_HTC_WILDFIRES_A510E = 'HTC WildfireS A510e';
 	const BROWSER_ACER_A501  = 'Acer A501 Tab';				  // (Android 3.x Tab), add BugBuster
 	const BROWSER_ACER_A500  = 'Acer A500 Tab';				  // (Android 3.x Tab), add BugBuster
 	const BROWSER_LENOVO_THINKPAD_TABLET = 'ThinkPad Tab'; 	  // (Android 3.x Tab), add BugBuster
@@ -181,7 +181,7 @@ public function reset() {
 		$this->_browser_name = self::BROWSER_UNKNOWN;
 		$this->_version = self::VERSION_UNKNOWN;
 		$this->_platform = self::PLATFORM_UNKNOWN;
-		$this->_os = self::OPERATING_SYSTEM_UNKNOWN;
+		//#130 $this->_os = self::OPERATING_SYSTEM_UNKNOWN;
 		$this->_is_aol = false;
 		$this->_is_mobile = false;
 		$this->_is_robot = false;
@@ -934,8 +934,6 @@ protected function checkBrowserMozilla() {
      */
     protected function checkBrowserTOnline() {
 	    if( stripos($this->_agent,'T-Online Browser') !== false ) {
-		    //$aversion = explode('/',stristr($this->_agent,'T-Online Browser'));
-		    //$this->setVersion($aversion[1]);
 		    $this->setBrowser(self::BROWSER_TONLINE);
 			return true;
 	    }
@@ -1181,21 +1179,21 @@ protected function checkBrowserAndroidHTCDesire()
             {
                 $this->setVersion(self::VERSION_UNKNOWN);
                 $this->setMobile(true);
-                $this->setBrowser(self::BROWSER_HTC_Desire_HD);
+                $this->setBrowser(self::BROWSER_HTC_DESIRE_HD);
                 return true;
             }
             if( stripos($this->_agent,'HTC Desire Z') !== false )
             {
                 $this->setVersion(self::VERSION_UNKNOWN);
                 $this->setMobile(true);
-                $this->setBrowser(self::BROWSER_HTC_Desire_Z);
+                $this->setBrowser(self::BROWSER_HTC_DESIRE_Z);
                 return true;
             }
             if( stripos($this->_agent,'HTC_DesireS') !== false )
             {
                 $this->setVersion(self::VERSION_UNKNOWN);
                 $this->setMobile(true);
-                $this->setBrowser(self::BROWSER_HTC_Desire_S);
+                $this->setBrowser(self::BROWSER_HTC_DESIRE_S);
                 return true;
             }
             if( stripos($this->_agent,'HTC_Desire')   !== false ||
@@ -1204,7 +1202,7 @@ protected function checkBrowserAndroidHTCDesire()
             {
                 $this->setVersion(self::VERSION_UNKNOWN);
                 $this->setMobile(true);
-                $this->setBrowser(self::BROWSER_HTC_Desire);
+                $this->setBrowser(self::BROWSER_HTC_DESIRE);
                 return true;
             }
         }
@@ -1280,7 +1278,7 @@ protected function checkBrowserAndroidHTCWildfire()
             {
                 $this->setVersion(self::VERSION_UNKNOWN);
                 $this->setMobile(true);
-                $this->setBrowser(self::BROWSER_HTC_WILDFIRES_A510e);
+                $this->setBrowser(self::BROWSER_HTC_WILDFIRES_A510E);
                 return true;
             }
         }
@@ -1384,7 +1382,6 @@ protected function checkBrowserMaxthon() {
     protected function checkBrowserHTTPRequest2() {
 	    if( stripos($this->_agent,'HTTP_Request2') !== false ) {
 		    $aversion = explode('/',stristr($this->_agent,'HTTP_Request2'));
-		    //$aversion = explode(' ',$aresult[1]);
 		    $this->setVersion($aversion[1]);
 		    $this->setBrowser(self::BROWSER_HTTP_REQUEST2);
 		    return true;
@@ -1695,9 +1692,12 @@ protected function checkPlatformVersion()
      * @access protected
      * 
      */
-    protected function setLang() {
+    protected function setLang() 
+    {
         $array = explode(",", $this->_accept_language);
-        for($i = 0; $i < count($array); $i++) {
+        $ca = count($array);
+        for($i = 0; $i < $ca; $i++) 
+        {
             //Konqueror
             $array[$i] = str_replace(" ", null, $array[$i]);
             $array[$i] = substr($array[$i], 0, 2);