Merge branch 'master' of git://github.com/gallery/gallery3

3 files changed, 129 insertions, 1 deletions

diff --git a/modules/gallery/config/user_agents.php b/modules/gallery/config/user_agents.php
new file mode 100644
index 00000000..24720046
--- /dev/null
+++ b/modules/gallery/config/user_agents.php
@@ -0,0 +1,122 @@
+<?php defined('SYSPATH') OR die('No direct access allowed.');
+/**
+ * This file contains four arrays of user agent data.  It is used by the
+ * User Agent library to help identify browser, platform, robot, and
+ * mobile device data. The array keys are used to identify the device
+ * and the array values are used to set the actual name of the item.
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+
+$config['platform'] = array
+(
+	'windows nt 6.0' => 'Windows Vista',
+	'windows nt 5.2' => 'Windows 2003',
+	'windows nt 5.0' => 'Windows 2000',
+	'windows nt 5.1' => 'Windows XP',
+	'windows nt 4.0' => 'Windows NT',
+	'winnt4.0'       => 'Windows NT',
+	'winnt 4.0'      => 'Windows NT',
+	'winnt'          => 'Windows NT',
+	'windows 98'     => 'Windows 98',
+	'win98'          => 'Windows 98',
+	'windows 95'     => 'Windows 95',
+	'win95'          => 'Windows 95',
+	'windows'        => 'Unknown Windows OS',
+	'os x'           => 'Mac OS X',
+	'intel mac'      => 'Intel Mac',
+	'ppc mac'        => 'PowerPC Mac',
+	'powerpc'        => 'PowerPC',
+	'ppc'            => 'PowerPC',
+	'cygwin'         => 'Cygwin',
+	'linux'          => 'Linux',
+	'debian'         => 'Debian',
+	'openvms'        => 'OpenVMS',
+	'sunos'          => 'Sun Solaris',
+	'amiga'          => 'Amiga',
+	'beos'           => 'BeOS',
+	'apachebench'    => 'ApacheBench',
+	'freebsd'        => 'FreeBSD',
+	'netbsd'         => 'NetBSD',
+	'bsdi'           => 'BSDi',
+	'openbsd'        => 'OpenBSD',
+	'os/2'           => 'OS/2',
+	'warp'           => 'OS/2',
+	'aix'            => 'AIX',
+	'irix'           => 'Irix',
+	'osf'            => 'DEC OSF',
+	'hp-ux'          => 'HP-UX',
+	'hurd'           => 'GNU/Hurd',
+	'unix'           => 'Unknown Unix OS',
+);
+
+/**
+ * The order of this array should NOT be changed. Many browsers return
+ * multiple browser types so we want to identify the sub-type first.
+ */
+$config['browser'] = array
+(
+	'Opera'             => 'Opera',
+	'MSIE'              => 'Internet Explorer',
+	'Internet Explorer' => 'Internet Explorer',
+	'Shiira'            => 'Shiira',
+	'Firefox'           => 'Firefox',
+	'Chimera'           => 'Chimera',
+	'Phoenix'           => 'Phoenix',
+	'Firebird'          => 'Firebird',
+	'Camino'            => 'Camino',
+	'Netscape'          => 'Netscape',
+	'OmniWeb'           => 'OmniWeb',
+	'Chrome'            => 'Chrome',
+	'Safari'            => 'Safari',
+	'Konqueror'         => 'Konqueror',
+	'Epiphany'          => 'Epiphany',
+	'Galeon'            => 'Galeon',
+	'Mozilla'           => 'Mozilla',
+	'icab'              => 'iCab',
+	'lynx'              => 'Lynx',
+	'links'             => 'Links',
+	'hotjava'           => 'HotJava',
+	'amaya'             => 'Amaya',
+	'IBrowse'           => 'IBrowse',
+);
+
+$config['mobile'] = array
+(
+	'mobileexplorer' => 'Mobile Explorer',
+	'openwave'       => 'Open Wave',
+	'opera mini'     => 'Opera Mini',
+	'operamini'      => 'Opera Mini',
+	'elaine'         => 'Palm',
+	'palmsource'     => 'Palm',
+	'digital paths'  => 'Palm',
+	'avantgo'        => 'Avantgo',
+	'xiino'          => 'Xiino',
+	'palmscape'      => 'Palmscape',
+	'nokia'          => 'Nokia',
+	'ericsson'       => 'Ericsson',
+	'blackBerry'     => 'BlackBerry',
+	'motorola'       => 'Motorola',
+	'iphone'         => 'iPhone',
+	'android'        => 'Android',
+);
+
+/**
+ * There are hundreds of bots but these are the most common.
+ */
+$config['robot'] = array
+(
+	'googlebot'     => 'Googlebot',
+	'msnbot'        => 'MSNBot',
+	'slurp'         => 'Inktomi Slurp',
+	'yahoo'         => 'Yahoo',
+	'askjeeves'     => 'AskJeeves',
+	'fastcrawler'   => 'FastCrawler',
+	'infoseek'      => 'InfoSeek Robot 1.0',
+	'lycos'         => 'Lycos',
+        'mj12bot'       => 'MJ12bot',
+        'speedy spider' => 'Speedy Spider',
+);
\ No newline at end of file
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index b016f436..ac51e2a6 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class gallery_Core {
-  const VERSION = "3.0 (Santa Fe)";
+  const VERSION = "3.0+ (git)";
 
   /**
    * If Gallery is in maintenance mode, then force all non-admins to get routed to a "This site is
@@ -74,6 +74,11 @@ class gallery_Core {
    * request should implement the <module>_event::gallery_ready() handler.
    */
   static function ready() {
+    // Don't keep a session for robots; it's a waste of database space.
+    if (request::user_agent("robot")) {
+      Session::instance()->abort_save();
+    }
+
     module::event("gallery_ready");
   }
 
diff --git a/system/helpers/request.php b/system/helpers/request.php
index 2cc59b20..c04a2fa2 100644
--- a/system/helpers/request.php
+++ b/system/helpers/request.php
@@ -123,6 +123,7 @@ class request_Core {
 
 		if ( ! is_array(request::$user_agent))
 		{
+			request::$user_agent = array();
 			request::$user_agent['agent'] = isset($_SERVER['HTTP_USER_AGENT']) ? trim($_SERVER['HTTP_USER_AGENT']) : '';
 
 			// Parse the user agent and extract basic information