interakting
2010-09-17 09:48:29 UTC
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22955] standard/incubator: </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22955</dd>
<dt>Author</dt> <dd>interakting</dd>
<dt>Date</dt> <dd>2010-09-17 02:48:21 -0700 (Fri, 17 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#standardincubatorlibraryZendHttpUserAgentAbstractUserAgentphp">standard/incubator/library/Zend/Http/UserAgent/AbstractUserAgent.php</a></li>
<li><a href="#standardincubatorlibraryZendHttpUserAgentphp">standard/incubator/library/Zend/Http/UserAgent.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#standardincubatortestsZendHttpindexphp">standard/incubator/tests/Zend/Http/index.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardincubatorlibraryZendHttpUserAgentAbstractUserAgentphp"></a>
<div class="modfile"><h4>Modified: standard/incubator/library/Zend/Http/UserAgent/AbstractUserAgent.php (22954 => 22955)</h4>
<pre class="diff"><span>
<span class="info">--- standard/incubator/library/Zend/Http/UserAgent/AbstractUserAgent.php 2010-09-16 20:22:53 UTC (rev 22954)
+++ standard/incubator/library/Zend/Http/UserAgent/AbstractUserAgent.php 2010-09-17 09:48:21 UTC (rev 22955) </span><span class="lines">@@ -235,7 +235,6 @@ </span><span class="cx"> } else { </span><span class="cx"> $uaExtract = self::extractFromUserAgentLight($this->userAgent); </span><span class="cx"> } </span><del>- directdebug($uaExtract); </del><span class="cx"> if (is_array($uaExtract)) { </span><span class="cx"> foreach ($uaExtract as $key => $info) { </span><span class="cx"> $this->setFeature($key, $info, 'product_info');
</span><span class="lines">@@ -304,7 +303,7 @@
</span><span class="cx"> $server['OS'] = 'linux';
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- } elseif (strspos($_SERVER['SERVER_SOFTWARE'], 'Win') !== falseF) {
</del><ins>+ } elseif (strpos($_SERVER['SERVER_SOFTWARE'], 'Win') !== falseF) {
</ins><span class="cx"> $server['OS'] = 'windows';
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="standardincubatorlibraryZendHttpUserAgentphp"></a>
<div class="modfile"><h4>Modified: standard/incubator/library/Zend/Http/UserAgent.php (22954 => 22955)</h4>
<pre class="diff"><span>
<span class="info">--- standard/incubator/library/Zend/Http/UserAgent.php 2010-09-16 20:22:53 UTC (rev 22954)
+++ standard/incubator/library/Zend/Http/UserAgent.php 2010-09-17 09:48:21 UTC (rev 22955)
</span><span class="lines">@@ -412,7 +412,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (! is_null($userAgent)) {
</span><span class="cx"> self::setUserAgent($userAgent);
</span><del>- } elseif (! isset($_SERVER['HTTP_USER_AGENT']) or is_null($_SERVER['HTTP_USER_AGENT'])) {
</del><ins>+ } elseif (empty($_SERVER['HTTP_USER_AGENT']) or is_null($_SERVER['HTTP_USER_AGENT'])) {
</ins><span class="cx"> self::setUserAgent(self::DEFAULT_USER_AGENT);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="standardincubatortestsZendHttpindexphp"></a>
<div class="addfile"><h4>Added: standard/incubator/tests/Zend/Http/index.php (0 => 22955)</h4>
<pre class="diff"><span>
<span class="info">--- standard/incubator/tests/Zend/Http/index.php (rev 0)
+++ standard/incubator/tests/Zend/Http/index.php 2010-09-17 09:48:21 UTC (rev 22955)
</span><span class="lines">@@ -0,0 +1,78 @@
</span><ins>+<?php
+require_once 'Zend/Loader/Autoloader.php';
+Zend_Loader_Autoloader::getInstance();
+$autoloader = Zend_Loader_Autoloader::getInstance();
+
+if (isset($_GET['userAgent'])) {
+ $_SERVER['HTTP_USER_AGENT'] = $_GET['userAgent'];
+}
+
+error_reporting(E_ALL ^ E_NOTICE);
+
+$config['wurflapi']['wurfl_lib_dir'] = dirname(__FILE__) . '/_files/Wurfl/1.1/';
+$config['wurflapi']['wurfl_config_file'] = dirname(__FILE__) . '/_files/Wurfl/resources/wurfl-config.php';
+
+if ($_GET['sequence']) {
+ $config['identification_sequence'] = $_GET['sequence'];
+}
+Zend_Http_UserAgent::setConfig($config);
+$oUserAgent = Zend_Http_UserAgent::getInstance();
+
+function printBrowserDetails ($browser)
+{
+ $device = $browser->device;
+ if (isset($device)) {
+ print "<b>Summary</b>";
+ print "<ul>";
+ print "<li>Browser Type: " . $browser->getType() . "</li>";
+ print "<li>Browser Name: " . $device->getFeature('browser_name') . "</li>";
+ print "<li>Browser Version: " . $device->getFeature('browser_version') . "</li>";
+ print "</ul>";
+ print "<b>WURFL capabilities (if mobile) :</b>";
+ print "<ul>";
+ print "<li>WURFL ID: $device->id</li>";
+ print "<li>Mobile browser: " . $device->getFeature("mobile_browser") . "</li>";
+ print "<li>Mobile browser version: " . $device->getFeature("mobile_browser_version") . "</li>";
+ print "<li>Device Brand Name: " . $device->getFeature("brand_name") . "</li>";
+ print "<li>Device Model Name: " . $device->getFeature('model_name') . "</li>";
+ print "<li>Device OS: " . $device->getFeature('device_os') . "</li>";
+ print "<li>Xhtml Preferred Markup:" . $device->getFeature('preferred_markup') . "</li>";
+ print "<li>Resolution Width:" . $device->getFeature('resolution_width') . "</li>";
+ print "<li>Resolution Height:" . $device->getFeature('resolution_height') . "</li>";
+ print "<li>MP3:" . $device->getFeature('mp3') . "</li>";
+ print "</ul>";
+ print "<b>Full</b>";
+ var_dump($device->getAllFeatures());
+ }
+
+}
+
+?>
+
+<div id="content">
+
+<p><b>Query by providing the user agent:</b></p>
+<p>look at <a target="_blank"
+ href="http://www.useragentstring.com/layout/useragentstring.php">http://www.useragentstring.com/layout/useragentstring.php</a></p>
+<p>For mobile, look at <a target="_blank"
+ href="http://www.mobilemultimedia.be/">http://www.mobilemultimedia.be/</a></p>
+<fieldset>
+<form method="get">
+<div>Sequence : <select name="sequence">
+ <option value="">(standard)</option>
+ <option value="mobile, text, desktop">mobile, text, desktop</option>
+ <option value="bot, validator, checker, console, offline, email, text">bot,
+ validator, checker, console, offline, email, text</option>
+</select> (DON'T FORGET TO CLEAN SESSION COOKIE)<br />
+User Agent : <input type="text" name="userAgent" size="40"
</ins><span class="lines">@@ Diff output truncated at 4096 characters. @@
</span></span></pre>
</div>
</div>
</body>
</html>
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22955] standard/incubator: </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22955</dd>
<dt>Author</dt> <dd>interakting</dd>
<dt>Date</dt> <dd>2010-09-17 02:48:21 -0700 (Fri, 17 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#standardincubatorlibraryZendHttpUserAgentAbstractUserAgentphp">standard/incubator/library/Zend/Http/UserAgent/AbstractUserAgent.php</a></li>
<li><a href="#standardincubatorlibraryZendHttpUserAgentphp">standard/incubator/library/Zend/Http/UserAgent.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#standardincubatortestsZendHttpindexphp">standard/incubator/tests/Zend/Http/index.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardincubatorlibraryZendHttpUserAgentAbstractUserAgentphp"></a>
<div class="modfile"><h4>Modified: standard/incubator/library/Zend/Http/UserAgent/AbstractUserAgent.php (22954 => 22955)</h4>
<pre class="diff"><span>
<span class="info">--- standard/incubator/library/Zend/Http/UserAgent/AbstractUserAgent.php 2010-09-16 20:22:53 UTC (rev 22954)
+++ standard/incubator/library/Zend/Http/UserAgent/AbstractUserAgent.php 2010-09-17 09:48:21 UTC (rev 22955) </span><span class="lines">@@ -235,7 +235,6 @@ </span><span class="cx"> } else { </span><span class="cx"> $uaExtract = self::extractFromUserAgentLight($this->userAgent); </span><span class="cx"> } </span><del>- directdebug($uaExtract); </del><span class="cx"> if (is_array($uaExtract)) { </span><span class="cx"> foreach ($uaExtract as $key => $info) { </span><span class="cx"> $this->setFeature($key, $info, 'product_info');
</span><span class="lines">@@ -304,7 +303,7 @@
</span><span class="cx"> $server['OS'] = 'linux';
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- } elseif (strspos($_SERVER['SERVER_SOFTWARE'], 'Win') !== falseF) {
</del><ins>+ } elseif (strpos($_SERVER['SERVER_SOFTWARE'], 'Win') !== falseF) {
</ins><span class="cx"> $server['OS'] = 'windows';
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="standardincubatorlibraryZendHttpUserAgentphp"></a>
<div class="modfile"><h4>Modified: standard/incubator/library/Zend/Http/UserAgent.php (22954 => 22955)</h4>
<pre class="diff"><span>
<span class="info">--- standard/incubator/library/Zend/Http/UserAgent.php 2010-09-16 20:22:53 UTC (rev 22954)
+++ standard/incubator/library/Zend/Http/UserAgent.php 2010-09-17 09:48:21 UTC (rev 22955)
</span><span class="lines">@@ -412,7 +412,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (! is_null($userAgent)) {
</span><span class="cx"> self::setUserAgent($userAgent);
</span><del>- } elseif (! isset($_SERVER['HTTP_USER_AGENT']) or is_null($_SERVER['HTTP_USER_AGENT'])) {
</del><ins>+ } elseif (empty($_SERVER['HTTP_USER_AGENT']) or is_null($_SERVER['HTTP_USER_AGENT'])) {
</ins><span class="cx"> self::setUserAgent(self::DEFAULT_USER_AGENT);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="standardincubatortestsZendHttpindexphp"></a>
<div class="addfile"><h4>Added: standard/incubator/tests/Zend/Http/index.php (0 => 22955)</h4>
<pre class="diff"><span>
<span class="info">--- standard/incubator/tests/Zend/Http/index.php (rev 0)
+++ standard/incubator/tests/Zend/Http/index.php 2010-09-17 09:48:21 UTC (rev 22955)
</span><span class="lines">@@ -0,0 +1,78 @@
</span><ins>+<?php
+require_once 'Zend/Loader/Autoloader.php';
+Zend_Loader_Autoloader::getInstance();
+$autoloader = Zend_Loader_Autoloader::getInstance();
+
+if (isset($_GET['userAgent'])) {
+ $_SERVER['HTTP_USER_AGENT'] = $_GET['userAgent'];
+}
+
+error_reporting(E_ALL ^ E_NOTICE);
+
+$config['wurflapi']['wurfl_lib_dir'] = dirname(__FILE__) . '/_files/Wurfl/1.1/';
+$config['wurflapi']['wurfl_config_file'] = dirname(__FILE__) . '/_files/Wurfl/resources/wurfl-config.php';
+
+if ($_GET['sequence']) {
+ $config['identification_sequence'] = $_GET['sequence'];
+}
+Zend_Http_UserAgent::setConfig($config);
+$oUserAgent = Zend_Http_UserAgent::getInstance();
+
+function printBrowserDetails ($browser)
+{
+ $device = $browser->device;
+ if (isset($device)) {
+ print "<b>Summary</b>";
+ print "<ul>";
+ print "<li>Browser Type: " . $browser->getType() . "</li>";
+ print "<li>Browser Name: " . $device->getFeature('browser_name') . "</li>";
+ print "<li>Browser Version: " . $device->getFeature('browser_version') . "</li>";
+ print "</ul>";
+ print "<b>WURFL capabilities (if mobile) :</b>";
+ print "<ul>";
+ print "<li>WURFL ID: $device->id</li>";
+ print "<li>Mobile browser: " . $device->getFeature("mobile_browser") . "</li>";
+ print "<li>Mobile browser version: " . $device->getFeature("mobile_browser_version") . "</li>";
+ print "<li>Device Brand Name: " . $device->getFeature("brand_name") . "</li>";
+ print "<li>Device Model Name: " . $device->getFeature('model_name') . "</li>";
+ print "<li>Device OS: " . $device->getFeature('device_os') . "</li>";
+ print "<li>Xhtml Preferred Markup:" . $device->getFeature('preferred_markup') . "</li>";
+ print "<li>Resolution Width:" . $device->getFeature('resolution_width') . "</li>";
+ print "<li>Resolution Height:" . $device->getFeature('resolution_height') . "</li>";
+ print "<li>MP3:" . $device->getFeature('mp3') . "</li>";
+ print "</ul>";
+ print "<b>Full</b>";
+ var_dump($device->getAllFeatures());
+ }
+
+}
+
+?>
+
+<div id="content">
+
+<p><b>Query by providing the user agent:</b></p>
+<p>look at <a target="_blank"
+ href="http://www.useragentstring.com/layout/useragentstring.php">http://www.useragentstring.com/layout/useragentstring.php</a></p>
+<p>For mobile, look at <a target="_blank"
+ href="http://www.mobilemultimedia.be/">http://www.mobilemultimedia.be/</a></p>
+<fieldset>
+<form method="get">
+<div>Sequence : <select name="sequence">
+ <option value="">(standard)</option>
+ <option value="mobile, text, desktop">mobile, text, desktop</option>
+ <option value="bot, validator, checker, console, offline, email, text">bot,
+ validator, checker, console, offline, email, text</option>
+</select> (DON'T FORGET TO CLEAN SESSION COOKIE)<br />
+User Agent : <input type="text" name="userAgent" size="40"
</ins><span class="lines">@@ Diff output truncated at 4096 characters. @@
</span></span></pre>
</div>
</div>
</body>
</html>