Amend db00958cee5e7373cf4bc439d65e687e7ef2d985 by extending the system

user_agents.php instead of replacing it.  This lets us avoid having to
reformat the file to get File_Structure_Test to pass and will let us
take advantage of further improvements ot the Kohana version of the file.
Additional fix for #1436.

1 files changed, 19 insertions, 119 deletions

diff --git a/modules/gallery/config/user_agents.php b/modules/gallery/config/user_agents.php
index 24720046..4e82e7d4 100644
--- a/modules/gallery/config/user_agents.php
+++ b/modules/gallery/config/user_agents.php
@@ -1,122 +1,22 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
+<?php defined("SYSPATH") or die("No direct script access.");
 /**
- * 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.
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 Bharat Mediratta
  *
- * @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.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-$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
+include(SYSPATH . "config/user_agents.php");
+$config["robot"]["mj12bot"] = "MJ12bot";
+$config["robot"]["speedy spider"] = "Speedy Spider";