Changeset 772574

Timestamp:

09/15/2013 07:40:53 AM (12 years ago)

Author:

federico_jacobi

Message:

Updated browsers regEx

Location:

theme-to-browser-t2b-control/trunk

Files:

• readme.txt (modified) (2 diffs)
• t2b.php (modified) (5 diffs)

theme-to-browser-t2b-control/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 2.0.2
 Tested up to: 3.2.1
-Stable tag: 0.3
+Stable tag: 0.4
 
 Displays different themes based on the browser used.
@@ -15 +15 @@
 PLEASE vote and/or rate if it works for you or let me know if there's a fix needed at web[at]federicojacobi.com.
 
-Supported browsers for now: Internet Explorer, FireFox, Opera, iPad/iPhone/iPod, Safari, Playstation 3, BlackBerry8310 specifically, and other BlackBerry models (non-specific). All of them modern versions, however, version specific detection will come in future upgrades of the plugin.
+Supported browsers for now: Internet Explorer, FireFox, Chrome, Opera, iPad/iPhone/iPod, Safari, Playstation 3, BlackBerry8310 specifically, and other BlackBerry models (non-specific). All of them modern versions, however, version specific detection will come in future upgrades of the plugin.
 
 Thanks to Drazen Mokic, Nicholas McQuillin and Paul Gregory for their help and suggestions.

theme-to-browser-t2b-control/trunk/t2b.php

@@ -4 +4 @@
 Plugin URI: http://www.federicojacobi.com/wp/work/t2b-control/
 Description: Display a different theme depending on the users browser. It is perfect for a quick way out of CSS annoyances and also for customization on mobile devices. Supports: Internet Explorer, FireFox, Opera, iPhone/iPod, iPad, Safari, BlackBerries, Playstation 3
-Version: 0.3
+Version: 0.4
 Author: Federico Jacobi
 Author URI: http://www.federicojacobi.com
@@ -10 +10 @@
 
 $supported_browsers = array (
-    '|MSIE ([0-9].[0-9]{1,2})|' => array('ie','Internet Explorer'),
+    '|MSIE ([0-9]?.[0-9]{1,2})|' => array('ie','Internet Explorer'),
     '|Firefox/([0-9\.]+)|' => array('firefox','FireFox'),
-    '|Opera/([0-9].[0-9]{1,2})|' => array('opera','Opera'),
+    '/Opera|OPR\/(.[0-9]){1,5}/' => array('opera','Opera'),
+
+    '|Chrome/[0-9]{1,3}(.[0-9]{1,3}){1,5}|' => array('chrome','Chrome'),
+
     '/\(iPhone|iPod/' => array('iphone','iPhone, iPod'),
     '/\(iPad/' => array('ipad','iPad'),
-    '|Safari/([0-9\.]+)|' => array('safari','Safari'),
+    '|Safari|' => array('safari','Safari'), 
+    
     '/BlackBerry8310/' => array('blackberry8310','BlackBerry 8310'),
     '/BlackBerry/' => array('blackberry','All BlackBerry'),
     '/PLAYSTATION 3|PS3/' => array('ps3','Playstation 3')
 );
-$lzt_version = '0.3';
+$lzt_version = '0.4';
 $useragent = $_SERVER['HTTP_USER_AGENT'];
 $browser_version = 0;
@@ -34 +38 @@
 
 $lzt_theme = get_option('lzt_'.$lzt_browser);
-
-if ($lzt_theme != "t2b_default") {
-    // Check for a valid theme directory, and set the template and stylesheet directory
-    if($lzt_theme && file_exists(get_theme_root() . "/$lzt_theme")) {
-    
-        $theme_data = get_theme_data(get_theme_root()."/$lzt_theme/style.css");
-        if ($theme_data['Template'] == '') {
-            $theme_parent = $lzt_theme;
-        } else {
-            $theme_parent = $theme_data['Template'];
+if (! is_admin() ) {
+    if ($lzt_theme != "t2b_default") {
+        // Check for a valid theme directory, and set the template and stylesheet directory
+        if($lzt_theme && file_exists(get_theme_root() . "/$lzt_theme")) {
+        
+            $theme_data = get_theme_data(get_theme_root()."/$lzt_theme/style.css");
+            if ($theme_data['Template'] == '') {
+                $theme_parent = $lzt_theme;
+            } else {
+                $theme_parent = $theme_data['Template'];
+            }
+            add_filter('template','lzt_set_theme');
+            add_filter('stylesheet','lzt_set_css');
         }
-        add_filter('template','lzt_set_theme');
-        add_filter('stylesheet','lzt_set_css');
-    //  add_action('wp_footer','echoresult');   // Triggers debug at the footer
     }
+    //add_action('wp_footer','echoresult'); // Triggers debug at the footer
 }
-
 // Debug function ... just to make sure the right stuff is loaded
 function echoresult() {
     global $theme_parent, $lzt_theme;
     global $theme_data;
+    global $useragent;
+    echo "<div>";
+    get_template();
+    echo '|';
     echo "ThemeParent:".$theme_parent."<br>";
-    echo "ThemeCss:".$lzt_theme;    
+    echo "ThemeCss:".$lzt_theme."<br>";
+    echo "Useragent:". $useragent."<br>";
+    print_r($theme_data);
+    echo "</div>";
 }
 
@@ -73 +84 @@
     ?>
     <div class="wrap">
-    <h2>Theme to Browser Control a.k.a. T2B (v.<?php echo $lzt_version ?>)</h2>
+    <div id="icon-options-general" class="icon32"></div> <h2>Theme to Browser Control a.k.a. T2B (v.<?php echo $lzt_version ?>)</h2>
     <?php
     if ($_REQUEST['submit']) {
@@ -112 +123 @@
                     foreach ($supported_browsers as $browser_regex => $browser_name) {
                 ?>
-            <div class="postbox" style="width:200px; float:left; display: inline-block; margin: 5px;">
-                <h3 class="hndle"><span><?php echo $browser_name[1] ?></span></h3>
+            <div style="width:200px; float:left; display: inline-block; margin: 5px; background-color:#F1F1F1; border:1px solid #E3E3E3; padding:5px;">
+                <h3><?php echo $browser_name[1] ?></h4>
                 <div class="inside"><p><ul>
                 <?php