Changeset 63 for branches

Timestamp:

03/01/09 10:16:43 (3 years ago)

Author:

daris

Message:

user agent: added stats page + other minor changes

Location:

branches/user_agent

Files:

• functions.php (modified) (5 diffs)
• img/browser/internetexplorer.png (added)
• img/browser/internetexplorer7.png (added)
• stats.php (added)

branches/user_agent/functions.php

@@ -4 +4 @@
 function ua_get_filename($name, $folder)
 {
-        global $ext_info;
+        global $base_url;
         
         $name = strtolower($name);
@@ -10 +10 @@
         $name = preg_replace('[^a-z0-9_]', '', $name); // remove special characters
         $name = forum_htmlencode($name);
-        $name = $ext_info['url'].'/img/'.$folder.'/'.$name.'.png';
+        $name = $base_url.'/extensions/user_agent/img/'.$folder.'/'.$name.'.png';
         return $name;
 }
@@ -34 +34 @@
 }
 
-function get_useragent_icons($useragent)
+function get_useragent_names($useragent)
 {
         if (!$useragent)
                 return;
-                
-        $org_useragent = $useragent;
+        
+        $browser_img = '';
+        $browser_version = '';
+        
         $useragent = strtolower($useragent);
         
-        $result = $browser = $system = '';
-
         // Browser detection
-        $browsers = array('AWeb', 'Camino', 'Epiphany', 'Galeon', 'HotJava', 'iCab', 'Safari', 'Konqueror', 'Flock', 'Iceweasel', 'SeaMonkey', 'Firefox', 'Firebird', 'Netscape', 'Mozilla', 'Opera', 'Maxthon', 'PhaseOut', 'SlimBrowser', 'MSIE');
+        $browsers = array('AWeb', 'Camino', 'Epiphany', 'Galeon', 'HotJava', 'iCab', 'MSIE', 'Safari', 'Konqueror', 'Flock', 'Iceweasel', 'SeaMonkey', 'Firefox', 'Firebird', 'Netscape', 'Mozilla', 'Opera', 'Maxthon', 'PhaseOut', 'SlimBrowser');
         
         $browser = ua_search_for_item($browsers, $useragent);
 
+        $browser_version = substr($useragent, strpos($useragent, strtolower($browser)) + strlen($browser) + 1);
+        preg_match('#([\.0-9]*)#', $browser_version, $matches);
+        $browser_version = $matches[1];
+
         if ($browser == 'MSIE')
         {
-                $ie_version = intval(substr($ua, strpos($ua, 'msie')+5));
-                if ($ie_version > 6)
-                        $browser = 'MSIE7';
+                if (intval($browser_version) > 6)
+                        $browser_img = 'Internet Explorer 7';
+                $browser = 'Internet Explorer';
         }
         
@@ -90 +94 @@
                 $browser = 'Unknown';
 
-        
-        $result = '<img src="'.ua_get_filename($system, 'system').'" title="'.forum_htmlencode($system).'" alt="'.forum_htmlencode($system).'" style="margin-right: 1px"/>';
-        $result .= '<img src="'.ua_get_filename($browser, 'browser').'" title="'.forum_htmlencode($org_useragent).'" alt="'.forum_htmlencode($browser).'" style="margin-left: 1px"/>';
+        if (!$browser_img)
+                $browser_img = $browser;
+
+        $result = array(
+                'system'                        => $system,
+                'browser_img'           => $browser_img,
+                'browser_version'       => $browser_version,
+                'browser_name'          => $browser.' '.$browser_version
+        );
+
+        return $result;
+}
+
+
+function get_useragent_icons($useragent)
+{
+        $agent = get_useragent_names($useragent);
+
+        $result = '<img src="'.ua_get_filename($agent['system'], 'system').'" title="'.forum_htmlencode($agent['system']).'" alt="'.forum_htmlencode($agent['system']).'" style="margin-right: 1px"/>';
+        $result .= '<img src="'.ua_get_filename($agent['browser_img'], 'browser').'" title="'.forum_htmlencode($agent['browser_name']).'" alt="'.forum_htmlencode($agent['browser_name']).'" style="margin-left: 1px"/>';
 
         // addslashes is needed for javascript
-        $description = addslashes($org_useragent) . '\n\nSystem:\t\t' . addslashes($system) .'\nPrzeglądarka:\t' . addslashes($browser) . '\n\t';
+        $description = addslashes($useragent) . '\n\nSystem:\t\t' . addslashes($agent['system']) .'\nPrzeglądarka:\t' . addslashes($agent['browser_name']) . '\n\t';
 
         $result = '<span style="cursor: pointer" onclick="alert(\'' . forum_htmlencode($description) . '\')">' . $result . '</span>';
@@ -101 +122 @@
         return $result;
 }
-?>
+
+
+
+function ua_chart($value, $max)
+{
+        $width = $value * 100 / $max;
+
+        return '<div style="float: left; width: 70%; border: 1px solid #aaa; margin-right: 1%; padding: 0;"><div style="width: '.$width.'%; padding: 0; background: #ddd; border-right: 1px solid #aaa;">&nbsp;</div></div>';
+}