Plugin Directory

Changeset 2181413


Ignore:
Timestamp:
10/28/2019 11:14:13 AM (6 years ago)
Author:
clickervolt
Message:

1.143

  • Fixed issue with Cheetah Browser wrongly detected as Liebao
Location:
clickervolt/trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • clickervolt/trunk/clickervolt.php

    r2178096 r2181413  
    55 * Plugin URI:  https://clickervolt.com/
    66 * Description: Advanced click tracking, link cloaking and affiliate campaigns management made easy.
    7  * Version:     1.142
     7 * Version:     1.143
    88 * Author:      ClickerVolt.com
    99 * License:     GPLv3
  • clickervolt/trunk/db/db.php

    r2178096 r2181413  
    1111class DB
    1212{
    13     const VERSION = 1.142;
     13    const VERSION = 1.143;
    1414
    1515    const OPTION_VERSION = 'clickervolt-version';
  • clickervolt/trunk/db/tableDevices.php

    r2165181 r2181413  
    114114    public function insert($devices)
    115115    {
    116 
    117116        $mapper = [
    118117            'deviceHash' => ['type' => '%s', 'filter' => function ($data) {
     
    157156        ];
    158157
    159         parent::insertBulk($devices, $mapper, ['insertModifiers' => ['ignore']]);
     158        $updateKeys = [
     159            'deviceType' => 'values(deviceType)',
     160            'deviceBrand' => 'values(deviceBrand)',
     161            'deviceName' => 'values(deviceName)',
     162            'deviceOs' => 'values(deviceOs)',
     163            'deviceOsVersion' => 'values(deviceOsVersion)',
     164            'deviceBrowser' => 'values(deviceBrowser)',
     165            'deviceBrowserVersion' => 'values(deviceBrowserVersion)',
     166            'deviceLanguage' => 'values(deviceLanguage)',
     167        ];
     168
     169        parent::insertBulk($devices, $mapper, ['insertModifiers' => ['ignore'], 'onDuplicateKeyUpdate' => $updateKeys]);
    160170    }
    161171
  • clickervolt/trunk/others/device-detector/DeviceDetector.php

    r2165181 r2181413  
    5151     * Current version number of DeviceDetector
    5252     */
    53     const VERSION = '3.12.0';
     53    const VERSION = '3.12.1';
    5454
    5555    /**
  • clickervolt/trunk/others/device-detector/Parser/Device/DeviceParserAbstract.php

    r2178096 r2181413  
    3434    const DEVICE_TYPE_PORTABLE_MEDIA_PAYER = 9;
    3535    const DEVICE_TYPE_PHABLET              = 10;
     36    const DEVICE_TYPE_SMART_SPEAKER        = 11;
    3637
    3738    /**
     
    5152        'camera'                => self::DEVICE_TYPE_CAMERA,
    5253        'portable media player' => self::DEVICE_TYPE_PORTABLE_MEDIA_PAYER,
    53         'phablet'               => self::DEVICE_TYPE_PHABLET
     54        'phablet'               => self::DEVICE_TYPE_PHABLET,
     55        'smart speaker'         => self::DEVICE_TYPE_SMART_SPEAKER,
    5456    );
    5557
  • clickervolt/trunk/others/device-detector/README.md

    r2178096 r2181413  
    192192- **Crystal** https://github.com/creadone/device_detector
    193193- **Elixir** https://github.com/elixir-inspector/ua_inspector
     194- **Go** https://github.com/gamebtc/devicedetector
    194195
    195196
     
    198199The lists below are auto generated and updated from time to time. Some of them might not be complete.
    199200
    200 *Last update: 2019/10/03*
     201*Last update: 2019/10/24*
    201202
    202203### List of detected operating systems:
     
    206207### List of detected browsers:
    207208
    208 2345 Browser, 360 Phone Browser, 360 Browser, Avant Browser, ABrowse, ANT Fresco, ANTGalio, Aloha Browser, Amaya, Amigo, Android Browser, AOL Shield, Arora, Amiga Voyager, Amiga Aweb, Atomic Web Browser, Avast Secure Browser, Beaker Browser, BlackBerry Browser, Baidu Browser, Baidu Spark, Beonex, Bunjalloo, B-Line, Brave, BriskBard, BrowseX, Camino, Coc Coc, Comodo Dragon, Coast, Charon, CM Browser, Chrome Frame, Headless Chrome, Chrome, Chrome Mobile iOS, Conkeror, Chrome Mobile, CoolNovo, CometBird, Cheetah Browser, ChromePlus, Chromium, Cyberfox, Cheshire, Cunaguaro, Chrome Webview, dbrowser, Deepnet Explorer, Dolphin, Dorado, Dooble, Dillo, DuckDuckGo Privacy Browser, Ecosia, Epic, Elinks, Element Browser, GNOME Web, Espial TV Browser, Firefox Mobile iOS, Firebird, Fluid, Fennec, Firefox, Firefox Focus, Firefox Rocket, Flock, Firefox Mobile, Fireweb, Fireweb Navigator, Galeon, Google Earth, HotJava, IBrowse, iCab, iCab Mobile, Iridium, Iron Mobile, IceCat, IceDragon, Isivioo, Iceweasel, Internet Explorer, IE Mobile, Iron, Jasmine, Jig Browser, Kindle Browser, K-meleon, Konqueror, Kapiko, Kiwi, Kylo, Kazehakase, LieBaoFast, LG Browser, Links, LuaKit, Lunascape, Lynx, MicroB, NCSA Mosaic, Mercury, Mobile Safari, Midori, Mobicip, MIUI Browser, Mobile Silk, Mint Browser, Maxthon, Nokia Browser, Nokia OSS Browser, Nokia Ovi Browser, NetSurf, NetFront, NetFront Life, NetPositive, Netscape, NTENT Browser, Opera Mini iOS, Obigo, Odyssey Web Browser, Off By One, ONE Browser, Opera Neon, Opera Devices, Opera Mini, Opera Mobile, Opera, Opera Next, Opera Touch, Oregano, Openwave Mobile Browser, OmniWeb, Otter Browser, Palm Blazer, Pale Moon, Oppo Browser, Palm Pre, Puffin, Palm WebPro, Palmscape, Phoenix, Polaris, Polarity, Microsoft Edge, QQ Browser Mini, QQ Browser, Qutebrowser, QupZilla, Qwant Mobile, QtWebEngine, Rekonq, RockMelt, Samsung Browser, Sailfish Browser, SEMC-Browser, Sogou Explorer, Safari, Shiira, Skyfire, Seraphic Sraf, Sleipnir, Snowshoe, Sogou Mobile Browser, Sunrise, SuperBird, Streamy, Swiftfox, Seznam Browser, TenFourFox, Tenta Browser, Tizen Browser, TweakStyle, UC Browser, UC Browser Mini, Vivaldi, Vision Mobile Browser, Web Explorer, WebPositive, Waterfox, Whale Browser, wOSBrowser, WeTab Browser, Yandex Browser, Xiino
     2092345 Browser, 360 Phone Browser, 360 Browser, Avant Browser, ABrowse, ANT Fresco, ANTGalio, Aloha Browser, Amaya, Amigo, Android Browser, AOL Shield, Arora, Amiga Voyager, Amiga Aweb, Atomic Web Browser, Avast Secure Browser, Beaker Browser, BlackBerry Browser, Baidu Browser, Baidu Spark, Basilisk, Beonex, Bunjalloo, B-Line, Brave, BriskBard, BrowseX, Camino, Coc Coc, Comodo Dragon, Coast, Charon, CM Browser, Chrome Frame, Headless Chrome, Chrome, Chrome Mobile iOS, Conkeror, Chrome Mobile, CoolNovo, CometBird, ChromePlus, Chromium, Cyberfox, Cheshire, Cunaguaro, Chrome Webview, dbrowser, Deepnet Explorer, Dolphin, Dorado, Dooble, Dillo, DuckDuckGo Privacy Browser, Ecosia, Epic, Elinks, Element Browser, GNOME Web, Espial TV Browser, Firefox Mobile iOS, Firebird, Fluid, Fennec, Firefox, Firefox Focus, Firefox Rocket, Flock, Firefox Mobile, Fireweb, Fireweb Navigator, FreeU, Galeon, Google Earth, Hawk Turbo Browser, hola! Browser, HotJava, Huawei Browser, IBrowse, iCab, iCab Mobile, Iridium, Iron Mobile, IceCat, IceDragon, Isivioo, Iceweasel, Internet Explorer, IE Mobile, Iron, Jasmine, Jig Browser, Jio Browser, K.Browser, Kindle Browser, K-meleon, Konqueror, Kapiko, Kiwi, Kylo, Kazehakase, Cheetah Browser, LieBaoFast, LG Browser, Links, LuaKit, Lunascape, Lynx, MicroB, NCSA Mosaic, Mercury, Mobile Safari, Midori, Mobicip, MIUI Browser, Mobile Silk, Mint Browser, Maxthon, Nokia Browser, Nokia OSS Browser, Nokia Ovi Browser, Nox Browser, NetSurf, NetFront, NetFront Life, NetPositive, Netscape, NTENT Browser, Oculus Browser, Opera Mini iOS, Obigo, Odyssey Web Browser, Off By One, ONE Browser, Opera Neon, Opera Devices, Opera Mini, Opera Mobile, Opera, Opera Next, Opera Touch, Oregano, Openwave Mobile Browser, OmniWeb, Otter Browser, Palm Blazer, Pale Moon, Oppo Browser, Palm Pre, Puffin, Palm WebPro, Palmscape, Phoenix, Polaris, Polarity, Microsoft Edge, QQ Browser Mini, QQ Browser, Qutebrowser, QupZilla, Qwant Mobile, QtWebEngine, Realme Browser, Rekonq, RockMelt, Samsung Browser, Sailfish Browser, SEMC-Browser, Sogou Explorer, Safari, Shiira, Skyfire, Seraphic Sraf, Sleipnir, Snowshoe, Sogou Mobile Browser, Sputnik Browser, Sunrise, SuperBird, Streamy, Swiftfox, Seznam Browser, TenFourFox, Tenta Browser, Tizen Browser, TweakStyle, UC Browser, UC Browser Mini, Vivaldi, vivo Browser, Vision Mobile Browser, Web Explorer, WebPositive, Waterfox, Whale Browser, wOSBrowser, WeTab Browser, Yandex Browser, Xiino
    209210
    210211### List of detected browser engines:
     
    234235### List of brands with detected devices:
    235236
    236 3Q, 4Good, Acer, Advan, Advance, AGM, Ainol, Airness, Airties, Aiwa, Akai, Alcatel, AllCall, Allview, Altech UEC, altron, Amazon, AMGOO, Amoi, ANS, Apple, Archos, Arian Space, Ark, Arnova, ARRIS, Ask, Assistant, Asus, Audiovox, AVH, Avvio, Axxion, Azumi Mobile, BangOlufsen, Barnes & Noble, BBK, Becker, Beeline, Beetel, BenQ, BenQ-Siemens, BGH, Bird, Bitel, Black Fox, Blackview, Blaupunkt, Blu, Bluboo, Bluegood, Bmobile, bogo, Boway, bq, Bravis, Brondi, Bush, CAGI, Capitel, Captiva, Carrefour, Casio, Cat, Celkon, Changhong, Cherry Mobile, China Mobile, CnM, Coby Kyros, Comio, Compal, Compaq, ComTrade Tesla, Concord, ConCorde, Condor, Coolpad, Cowon, CreNova, Crescent, Cricket, Crius Mea, Crosscall, Cube, CUBOT, Cyrus, Danew, Datang, Datsun, Dbtel, Dell, Denver, Desay, DEXP, Dialog, Dicam, Digi, Digicel, Digiland, Digma, DMM, DNS, DoCoMo, Doogee, Doov, Dopod, Doro, Dune HD, E-Boda, E-tel, Easypix, EBEST, Echo Mobiles, ECS, EE, EKO, Eks Mobility, Elenberg, Elephone, Energizer, Energy Sistem, Ergo, Ericsson, Ericy, Essential, Essentielb, Eton, eTouch, Etuline, Eurostar, Evercoss, Evertek, Evolio, Evolveo, EvroMedia, Explay, Extrem, Ezio, Ezze, Fairphone, Fengxiang, FiGO, FinePower, Fly, FNB, Fondi, Forstar, Foxconn, Freetel, Fujitsu, G-TiDE, Garmin-Asus, Gateway, Gemini, Geotel, Ghia, Gigabyte, Gigaset, Ginzzu, Gionee, GOCLEVER, Goly, GoMobile, Google, Gradiente, Grape, Grundig, Hafury, Haier, HannSpree, Hasee, Hi-Level, Hisense, Hoffmann, Homtom, Hoozo, Hosin, HP, HTC, Huawei, Humax, Hyrican, Hyundai, i-Joy, i-mate, i-mobile, iBall, iBerry, IconBIT, iHunt, Ikea, iKoMo, iLA, IMO Mobile, Impression, iNew, Infinix, InFocus, Inkti, InnJoo, Innostream, Inoi, INQ, Intek, Intex, Inverto, iOcean, iPro, Irbis, iRola, iTel, iView, JAY-Tech, Jiayu, Jolla, Just5, K-Touch, Kaan, Kalley, Karbonn, Kazam, KDDI, Kempler & Strauss, Keneksi, Kiano, Kingsun, Kocaso, Kodak, Kogan, Komu, Konka, Konrow, Koobee, KOPO, Koridy, KRONO, Krüger&Matz, KT-Tech, Kumai, Kyocera, LAIQ, Land Rover, Landvo, Lanix, Lark, Lava, LCT, Leagoo, Ledstar, LeEco, Lemhoov, Lenco, Lenovo, Leotec, Le Pan, Lephone, Lexand, Lexibook, LG, Lingwin, Loewe, Logicom, Lumus, LYF, M.T.T., M4tel, Majestic, Manta Multimedia, Maxwest, Maze, Mecer, Mecool, Mediacom, MediaTek, Medion, MEEG, MegaFon, Meizu, Memup, Metz, MEU, MicroMax, Microsoft, Mio, Miray, Mitsubishi, MIXC, MLLED, Mobiistar, Mobiola, Mobistel, Modecom, Mofut, Motorola, Movic, Mpman, MSI, MTC, MTN, MYFON, MyPhone, Myria, MyWigo, Navon, NEC, Neffos, Netgear, NeuImage, Newgen, NEXBOX, Nexian, Nextbit, NextBook, NGM, Nikon, Nintendo, NOA, Noain, Noblex, Nokia, Nomi, Nous, NUU Mobile, Nvidia, NYX Mobile, O+, O2, Obi, Odys, Onda, OnePlus, OPPO, Opsson, Orange, Ouki, OUYA, Overmax, Oysters, Palm, Panacom, Panasonic, Pantech, PCBOX, PCD, PCD Argentina, PEAQ, Pentagram, Philips, phoneOne, Pioneer, Pixus, Ployer, Plum, Point of View, Polaroid, PolyPad, Polytron, Pomp, Positivo, PPTV, Prestigio, Primepad, ProScan, PULID, Q-Touch, Qilive, QMobile, Qtek, Quantum, Quechua, R-TV, Ramos, RCA Tablets, Readboy, Rikomagic, RIM, Riviera, Rokit, Roku, Rombica, Rover, RT Project, Safaricom, Sagem, Samsung, Sanei, Santin BiTBiZ, Sanyo, Savio, Sega, Selevision, Selfix, Sencor, Sendo, Senseit, Senwa, SFR, Sharp, Shuttle, Siemens, Sigma, Silent Circle, Simbans, Sky, Skyworth, Smart, Smartfren, Smartisan, Softbank, Sonim, Sony, Sony Ericsson, Spice, Star, Starway, STF Mobile, STK, Stonex, Storex, Sumvision, SunVan, SuperSonic, Supra, SWISSMOBILITY, Symphony, Syrox, T-Mobile, TB Touch, TCL, TechniSat, TechnoTrend, TechPad, Teclast, Tecno Mobile, Telefunken, Telego, Telenor, Telit, Tesco, Tesla, teXet, ThL, Thomson, TIANYU, Timovi, TiPhone, Tolino, Tooky, Top House, Toplux, Toshiba, Touchmate, TrekStor, Trevi, True, Tunisie Telecom, Turbo-X, TVC, U.S. Cellular, Uhappy, Ulefone, UMIDIGI, Unimax, Uniscope, Unknown, Unnecto, Unonu, Unowhy, UTStarcom, Vastking, Venso, Verizon, Vernee, Vertex, Vertu, Verykool, Vestel, Videocon, Videoweb, ViewSonic, Vinsoc, Vitelcom, Vivax, Vivo, Vizio, VK Mobile, Vodafone, Vonino, Vorago, Voto, Voxtel, Vulcan, Walton, Web TV, Weimei, WellcoM, Wexler, Wiko, Wileyfox, Wink, Wolder, Wolfgang, Wonu, Woo, Woxter, X-TIGI, X-View, Xiaolajiao, Xiaomi, Xion, Xolo, Yandex, Yarvik, Yes, Yezz, Ytone, Yu, Yuandao, Yusun, Zeemi, Zen, Zenek, Zonda, Zopo, ZTE, Zuum, Zync, ZYQ, öwn
     2373Q, 4Good, Acer, Advan, Advance, AGM, Ainol, Airness, Airties, Aiwa, Akai, Alcatel, AllCall, Allview, Allwinner, Altech UEC, altron, Amazon, AMGOO, Amoi, ANS, Apple, Archos, Arian Space, Ark, Arnova, ARRIS, Ask, Assistant, Asus, Audiovox, AVH, Avvio, Axxion, Azumi Mobile, BangOlufsen, Barnes & Noble, BBK, Becker, Beeline, Beetel, BenQ, BenQ-Siemens, BGH, Bird, Bitel, Black Fox, Blackview, Blaupunkt, Blu, Bluboo, Bluegood, Bmobile, bogo, Boway, bq, Bravis, Brondi, Bush, CAGI, Capitel, Captiva, Carrefour, Casio, Casper, Cat, Celkon, Changhong, Cherry Mobile, China Mobile, Clarmin, CnM, Coby Kyros, Comio, Compal, Compaq, ComTrade Tesla, Concord, ConCorde, Condor, Coolpad, Cowon, CreNova, Crescent, Cricket, Crius Mea, Crosscall, Cube, CUBOT, Cyrus, Danew, Datang, Datsun, Dbtel, Dell, Denver, Desay, DEXP, Dialog, Dicam, Digi, Digicel, Digiland, Digma, DMM, DNS, DoCoMo, Doogee, Doov, Dopod, Doro, Dune HD, E-Boda, E-tel, Easypix, EBEST, Echo Mobiles, ECS, EE, EKO, Eks Mobility, Elenberg, Elephone, Energizer, Energy Sistem, Ergo, Ericsson, Ericy, Essential, Essentielb, Eton, eTouch, Etuline, Eurostar, Evercoss, Evertek, Evolio, Evolveo, EvroMedia, Explay, Extrem, Ezio, Ezze, Fairphone, Famoco, Fengxiang, FiGO, FinePower, Fly, FNB, Fondi, FORME, Forstar, Foxconn, Freetel, Fujitsu, G-TiDE, Garmin-Asus, Gateway, Gemini, Geotel, Ghia, Gigabyte, Gigaset, Ginzzu, Gionee, GOCLEVER, Goly, GoMobile, Google, Gradiente, Grape, Grundig, Hafury, Haier, HannSpree, Hasee, Hi-Level, Hisense, Hoffmann, Homtom, Hoozo, Hosin, HP, HTC, Huawei, Humax, Hyrican, Hyundai, i-Joy, i-mate, i-mobile, iBall, iBerry, IconBIT, iHunt, Ikea, iKoMo, iLA, IMO Mobile, Impression, iNew, Infinix, InFocus, Inkti, InnJoo, Innostream, Inoi, INQ, Intek, Intex, Inverto, iOcean, iPro, Irbis, iRola, iTel, iView, JAY-Tech, Jiayu, Jolla, Just5, K-Touch, Kaan, Kalley, Karbonn, Kazam, KDDI, Kempler & Strauss, Keneksi, Kiano, Kingsun, Kocaso, Kodak, Kogan, Komu, Konka, Konrow, Koobee, KOPO, Koridy, KRONO, Krüger&Matz, KT-Tech, Kumai, Kyocera, LAIQ, Land Rover, Landvo, Lanix, Lark, Lava, LCT, Leagoo, Ledstar, LeEco, Lemhoov, Lenco, Lenovo, Leotec, Le Pan, Lephone, Lexand, Lexibook, LG, Lingwin, Loewe, Logicom, Lumus, LYF, M.T.T., M4tel, Majestic, Manta Multimedia, Masstel, Maxwest, Maze, Mecer, Mecool, Mediacom, MediaTek, Medion, MEEG, MegaFon, Meizu, Memup, Metz, MEU, MicroMax, Microsoft, Mio, Miray, Mitsubishi, MIXC, MLLED, Mobiistar, Mobiola, Mobistel, Modecom, Mofut, Motorola, Movic, Mpman, MSI, MTC, MTN, MYFON, MyPhone, Myria, MyWigo, Navon, NEC, Neffos, Netgear, NeuImage, Newgen, NEXBOX, Nexian, Nextbit, NextBook, NGM, Nikon, Nintendo, NOA, Noain, Nobby, Noblex, Nokia, Nomi, Nous, NUU Mobile, Nvidia, NYX Mobile, O+, O2, Obi, Odys, Onda, OnePlus, OPPO, Opsson, Orange, Ouki, OUYA, Overmax, Oysters, Palm, Panacom, Panasonic, Pantech, PCBOX, PCD, PCD Argentina, PEAQ, Pentagram, Philips, phoneOne, Pioneer, Pixus, Ployer, Plum, Point of View, Polaroid, PolyPad, Polytron, Pomp, Positivo, PPTV, Prestigio, Primepad, ProScan, PULID, Q-Touch, Qilive, QMobile, Qtek, Quantum, Quechua, R-TV, Ramos, RCA Tablets, Readboy, Rikomagic, RIM, Rinno, Riviera, Rokit, Roku, Rombica, Rover, RT Project, Safaricom, Sagem, Samsung, Sanei, Santin BiTBiZ, Sanyo, Savio, Sega, Selevision, Selfix, Sencor, Sendo, Senseit, Senwa, SFR, Sharp, Shuttle, Siemens, Sigma, Silent Circle, Simbans, Sky, Skyworth, Smart, Smartfren, Smartisan, Softbank, Sonim, Sony, Sony Ericsson, Spice, Star, Starway, STF Mobile, STK, Stonex, Storex, Sumvision, SunVan, SuperSonic, Supra, SWISSMOBILITY, Symphony, Syrox, T-Mobile, TB Touch, TCL, TechniSat, TechnoTrend, TechPad, Teclast, Tecno Mobile, Telefunken, Telego, Telenor, Telit, Tesco, Tesla, teXet, ThL, Thomson, TIANYU, Timovi, TiPhone, Tolino, Tooky, Top House, Toplux, Toshiba, Touchmate, TrekStor, Trevi, True, Tunisie Telecom, Turbo-X, TVC, U.S. Cellular, Uhappy, Ulefone, UMIDIGI, Unimax, Uniscope, Unknown, Unnecto, Unonu, Unowhy, UTOK, UTStarcom, Vastking, Venso, Verizon, Vernee, Vertex, Vertu, Verykool, Vestel, VGO TEL, Videocon, Videoweb, ViewSonic, Vinsoc, Vitelcom, Vivax, Vivo, Vizio, VK Mobile, Vodafone, Vonino, Vorago, Voto, Voxtel, Vulcan, Walton, Web TV, Weimei, WellcoM, Wexler, Wiko, Wileyfox, Wink, Wolder, Wolfgang, Wonu, Woo, Woxter, X-TIGI, X-View, Xiaolajiao, Xiaomi, Xion, Xolo, Yandex, Yarvik, Yes, Yezz, Ytone, Yu, Yuandao, Yusun, Zeemi, Zen, Zenek, Zonda, Zopo, ZTE, Zuum, Zync, ZYQ, öwn
    237238
    238239### List of detected bots:
  • clickervolt/trunk/others/device-detector/device-brands.txt

    r2178096 r2181413  
    77ainol
    88airness
     9ais
    910aiwa
    1011akai
  • clickervolt/trunk/others/device-detector/device-names.txt

    r2178096 r2181413  
    884good people
    994good t700i 3g
     10acer betouch e100
     11acer betouch e210
    1012acer da220hql
    1113acer da241hl
     
    1921acer iconia tab 10
    2022acer iconia talk 7
     23acer iconia talk s
    2124acer liquid e1 duo
    2225acer liquid e2 duo
    2326acer liquid e700
    2427acer liquid express
     28acer liquid jade
    2529acer liquid jade z
     30acer liquid m220
     31acer liquid m330
    2632acer liquid mini
    2733acer liquid s1
     
    3642acer liquid zest 4g
    3743acer liquid zest plus
     44acer neotouch p300
     45acer neotouch p400
     46acer neotouch s200
     47acer one 7
    3848acer picasso
    3949acer picasso e
     50acer predator 8
     51acer td600
    4052acer vangogh
    4153advan i lite i7u
     
    4456advance hollogram hl6246
    4557advance intro
     58ainol novo 7 numy ax1 3g
     59ainol numy 3g talos 2
     60ainol numy ax3 sword
     61ais lava pro 4.5
    4662aiwa aw790
    4763aiwa m300
     
    7187alcatel a50
    7288alcatel a7
     89alcatel big easy plus
     90alcatel cingular flip 2
     91alcatel go flip
     92alcatel island
    7393alcatel one touch 5033d
     94alcatel one touch 585
     95alcatel one touch 813
     96alcatel one touch 813d
     97alcatel one touch 838
     98alcatel one touch 871a
    7499alcatel one touch dawn
    75100alcatel one touch fierce 2
     
    151176alcatel one touch pop star
    152177alcatel one touch pop up
     178alcatel one touch tribe
    153179alcatel pulsemix
     180alcatel quick flip
    154181alcatel revvl
    155182alcatel shine lite
     
    164191alcatel u5 plus
    165192alcatel u50
     193alcatel wave
    166194allcall rio
    167195allcall rio pro
     
    176204allview a5 smiley
    177205allview a6 duo
     206allview alldro
    178207allview alldro 2 speed duo
    179208allview alldro 3 speed quad
     209allview alldro p4
    180210allview ax2 frenzy
    181211allview ax4 nano
     
    187217allview e3 sign
    188218allview e4 lite
     219allview impera s
    189220allview m9 connect
    190221allview p10 style
     
    198229allview p9 energy lite (2017)
    199230allview p9 energy s
     231allview speed
     232allview speed i
     233allview tx1 quasar
    200234allview v1 viper i
    201235allview v2 viper x plus
     
    248282ans ul40
    249283apple apple tv
     284apple apple tv 2
     285apple apple tv 3
     286apple apple tv 4
     287apple apple tv 4k
     288apple homepod
    250289apple ipad
    251290apple ipad 2
    252291apple ipad 3
    253292apple ipad 4
    254 apple ipad 5
    255 apple ipad 6
     293apple ipad 5 9.7
     294apple ipad 6 9.7
     295apple ipad 7 10.2
    256296apple ipad air
    257297apple ipad air 2
     
    263303apple ipad pro 12.9
    264304apple ipad pro 2 12.9
     305apple ipad pro 3 11.0
     306apple ipad pro 3 12.9
    265307apple ipad pro 9.7
    266308apple iphone
     309apple iphone 11
     310apple iphone 11 pro
     311apple iphone 11 pro max
    267312apple iphone 3g
    268313apple iphone 3gs
     
    282327apple iphone se
    283328apple iphone x
     329apple iphone xr
     330apple iphone xs
     331apple iphone xs max
    284332archos 5
    285333arian space 100
  • clickervolt/trunk/others/device-detector/regexes/device/mobiles.yml

    r2178096 r2181413  
    321321# Apple
    322322Apple:
    323   regex: '(?:iTunes-)?Apple[ _]?TV|(?:Apple-|iTunes-)?(?:iPad|iPhone)|iPh[0-9],[0-9]|CFNetwork'
     323  regex: '(?:iTunes-)?Apple[ _]?TV|(?:Apple-|iTunes-)?(?<!like )(?:iPad|iPhone)|iPh[0-9],[0-9]|CFNetwork'
    324324  models:
    325325    # specific smartphone devices
    326     - regex: '(?:Apple-)?iPh(?:one)?1[C,]1'
     326    - regex: '(?:Apple-)?iPh(?:one)?1[C,_]1'
    327327      model: 'iPhone'
    328328      device: 'smartphone'
    329     - regex: '(?:Apple-)?iPh(?:one)?1[C,]2'
     329    - regex: '(?:Apple-)?iPh(?:one)?1[C,_]2'
    330330      model: 'iPhone 3G'
    331331      device: 'smartphone'
    332     - regex: '(?:Apple-)?iPh(?:one)?2[C,]1'
     332    - regex: '(?:Apple-)?iPh(?:one)?2[C,_]1'
    333333      model: 'iPhone 3GS'
    334334      device: 'smartphone'
    335     - regex: '(?:Apple-)?iPh(?:one)?3[C,][123]'
     335    - regex: '(?:Apple-)?iPh(?:one)?3[C,_][123]'
    336336      model: 'iPhone 4'
    337337      device: 'smartphone'
    338     - regex: '(?:Apple-)?iPh(?:one)?4[C,]1'
     338    - regex: '(?:Apple-)?iPh(?:one)?4[C,_]1|1C2%254enohPi'
    339339      model: 'iPhone 4S'
    340340      device: 'smartphone'
    341     - regex: '(?:Apple-)?iPh(?:one)?5[C,][12]'
     341    - regex: '(?:Apple-)?iPh(?:one)?5[C,_][12]'
    342342      model: 'iPhone 5'
    343343      device: 'smartphone'
    344     - regex: '(?:Apple-)?iPh(?:one)?5[C,][34]'
     344    - regex: '(?:Apple-)?iPh(?:one)?5[C,_][34]'
    345345      model: 'iPhone 5C'
    346346      device: 'smartphone'
    347     - regex: '(?:Apple-)?iPh(?:one)?6[C,][12]'
     347    - regex: '(?:Apple-)?iPh(?:one)?6[C,_][12]'
    348348      model: 'iPhone 5S'
    349349      device: 'smartphone'
    350     - regex: '(?:Apple-)?iPh(?:one)?7[C,]1'
     350    - regex: '(?:Apple-)?iPh(?:one)?7[C,_]1|1C2%257enohPi'
    351351      model: 'iPhone 6 Plus'
    352352      device: 'phablet'
    353     - regex: '(?:Apple-)?iPh(?:one)?7[C,]2'
     353    - regex: '(?:Apple-)?iPh(?:one)?7[C,_]2'
    354354      model: 'iPhone 6'
    355355      device: 'smartphone'
    356     - regex: '(?:Apple-)?iPh(?:one)?8[C,]1'
     356    - regex: '(?:Apple-)?iPh(?:one)?8[C,_]2'
     357      model: 'iPhone 6s Plus'
     358      device: 'phablet'
     359    - regex: '(?:Apple-)?iPh(?:one)?8[C,_]1|iPhone 6s'
    357360      model: 'iPhone 6s'
    358361      device: 'smartphone'
    359     - regex: '(?:Apple-)?iPh(?:one)?8[C,]2'
    360       model: 'iPhone 6s Plus'
    361       device: 'phablet'
    362     - regex: '(?:Apple-)?iPh(?:one)?8[C,]4'
     362    - regex: '(?:Apple-)?iPh(?:one)?8[C,_]4'
    363363      model: 'iPhone SE'
    364364      device: 'smartphone'
    365     - regex: '(?:Apple-)?iPh(?:one)?9[C,][13]'
     365    - regex: '(?:Apple-)?iPh(?:one)?9[C,_][13]'
    366366      model: 'iPhone 7'
    367367      device: 'smartphone'
    368     - regex: '(?:Apple-)?iPh(?:one)?9[C,][24]'
     368    - regex: '(?:Apple-)?iPh(?:one)?9[C,_][24]'
    369369      model: 'iPhone 7 Plus'
    370370      device: 'phablet'
    371     - regex: '(?:Apple-)?iPh(?:one)?10[C,][14]'
     371    - regex: '(?:Apple-)?iPh(?:one)?10[C,_][14]'
    372372      model: 'iPhone 8'
    373373      device: 'smartphone'
    374     - regex: '(?:Apple-)?iPh(?:one)?10[C,][25]'
     374    - regex: '(?:Apple-)?iPh(?:one)?10[C,_][25]'
    375375      model: 'iPhone 8 Plus'
    376376      device: 'phablet'
    377     - regex: '(?:Apple-)?iPh(?:one)?10[C,][36]'
     377    - regex: '(?:Apple-)?iPh(?:one)?10[C,_][36]|iPhone X'
    378378      model: 'iPhone X'
    379379      device: 'phablet'
     380    - regex: '(?:Apple-)?iPh(?:one)?11[C,_][2]'
     381      model: 'iPhone XS'
     382      device: 'smartphone'
     383    - regex: '(?:Apple-)?iPh(?:one)?11[C,_][46]'
     384      model: 'iPhone XS Max'
     385      device: 'phablet'
     386    - regex: '(?:Apple-)?iPh(?:one)?11[C,_][8]'
     387      model: 'iPhone XR'
     388      device: 'smartphone'
     389    - regex: '(?:Apple-)?iPh(?:one)?12[C,_][1]'
     390      model: 'iPhone 11'
     391      device: 'smartphone'
     392    - regex: '(?:Apple-)?iPh(?:one)?12[C,_][3]'
     393      model: 'iPhone 11 Pro'
     394      device: 'phablet'
     395    - regex: '(?:Apple-)?iPh(?:one)?12[C,_][5]'
     396      model: 'iPhone 11 Pro Max'
     397      device: 'phablet'
    380398
    381399    # specific tablet devices
    382     - regex: '(?:Apple-)?iPad1[C,]1'
     400    - regex: '(?:Apple-)?iPad1[C,_]1'
    383401      model: 'iPad'
    384402      device: 'tablet'
    385     - regex: '(?:Apple-)?iPad2[C,][1234]'
     403    - regex: '(?:Apple-)?iPad2[C,_][1234]'
    386404      model: 'iPad 2'
    387405      device: 'tablet'
    388     - regex: '(?:Apple-)?iPad2[C,][567]'
     406    - regex: '(?:Apple-)?iPad2[C,_][567]'
    389407      model: 'iPad Mini'
    390408      device: 'tablet'
    391     - regex: '(?:Apple-)?iPad3[C,][123]'
     409    - regex: '(?:Apple-)?iPad3[C,_][123]'
    392410      model: 'iPad 3'
    393411      device: 'tablet'
    394     - regex: '(?:Apple-)?iPad3[C,][456]'
     412    - regex: '(?:Apple-)?iPad3[C,_][456]'
    395413      model: 'iPad 4'
    396414      device: 'tablet'
    397     - regex: '(?:Apple-)?iPad4[C,][123]'
     415    - regex: '(?:Apple-)?iPad4[C,_][123]'
    398416      model: 'iPad Air'
    399417      device: 'tablet'
    400     - regex: '(?:Apple-)?iPad4[C,][456]'
     418    - regex: '(?:Apple-)?iPad4[C,_][456]'
    401419      model: 'iPad Mini 2'
    402420      device: 'tablet'
    403     - regex: '(?:Apple-)?iPad4[C,][789]'
     421    - regex: '(?:Apple-)?iPad4[C,_][789]'
    404422      model: 'iPad Mini 3'
    405423      device: 'tablet'
    406     - regex: '(?:Apple-)?iPad5[C,][12]'
     424    - regex: '(?:Apple-)?iPad5[C,_][12]'
    407425      model: 'iPad Mini 4'
    408426      device: 'tablet'
    409     - regex: '(?:Apple-)?iPad5[C,][34]'
     427    - regex: '(?:Apple-)?iPad5[C,_][34]'
    410428      model: 'iPad Air 2'
    411429      device: 'tablet'
    412     - regex: '(?:Apple-)?iPad6[C,][34]'
     430    - regex: '(?:Apple-)?iPad6[C,_][34]'
    413431      model: 'iPad Pro 9.7'
    414432      device: 'tablet'
    415     - regex: '(?:Apple-)?iPad6[C,][78]'
     433    - regex: '(?:Apple-)?iPad6[C,_][78]'
    416434      model: 'iPad Pro 12.9'
    417435      device: 'tablet'
    418     - regex: '(?:Apple-)?iPad6[C,](?:11|12)'
    419       model: 'iPad 5'
    420       device: 'tablet'
    421     - regex: '(?:Apple-)?iPad7[C,][12]'
     436    - regex: '(?:Apple-)?iPad6[C,_](?:11|12)'
     437      model: 'iPad 5 9.7'
     438      device: 'tablet'
     439    - regex: '(?:Apple-)?iPad7[C,_][12]'
    422440      model: 'iPad Pro 2 12.9'
    423441      device: 'tablet'
    424     - regex: '(?:Apple-)?iPad7[C,][34]'
     442    - regex: '(?:Apple-)?iPad7[C,_][34]'
    425443      model: 'iPad Pro 10.5'
    426444      device: 'tablet'
    427     - regex: '(?:Apple-)?iPad7[C,][56]'
    428       model: 'iPad 6'
    429       device: 'tablet'
     445    - regex: '(?:Apple-)?iPad7[C,_][56]'
     446      model: 'iPad 6 9.7'
     447      device: 'tablet'
     448    - regex: '(?:Apple-)?iPad7[C,_](?:11|12)'
     449      model: 'iPad 7 10.2'
     450      device: 'tablet'
     451    - regex: '(?:Apple-)?iPad8[C,_][1-4]'
     452      model: 'iPad Pro 3 11.0'
     453      device: 'tablet'
     454    - regex: '(?:Apple-)?iPad8[C,_][5-8]'
     455      model: 'iPad Pro 3 12.9'
     456      device: 'tablet'
     457
     458    - regex: 'Apple-?TV2[C,_]1'
     459      model: 'Apple TV 2'
     460      device: 'tv'
     461    - regex: 'Apple-?TV3[C,_][12]'
     462      model: 'Apple TV 3'
     463      device: 'tv'
     464    - regex: 'Apple-?TV5[C,_]3'
     465      model: 'Apple TV 4'
     466      device: 'tv'
     467    - regex: 'Apple-?TV6[C,_]2'
     468      model: 'Apple TV 4K'
     469      device: 'tv'
    430470
    431471    - regex: '(?:iTunes-)?Apple[ _]?TV'
    432472      model: 'Apple TV'
    433473      device: 'tv'
     474    - regex: 'HomePod'
     475      model: 'HomePod'
     476      device: 'smart speaker'
    434477    - regex: 'iTunes-iPad/[0-9]+(?:\.[0-9]+)* \(([^;]+);'
    435478      model: 'iPad $1'
     
    478521    - regex: 'MT0724B|LC0901D|LC0816C|LC0810C|LC0809B|LC0808B|LC0804B|LC0725B|LC0723B'
    479522      model: 'Qoo! P-Pad'
    480     - regex: 'VM1017A|TS1013B|TS0807B|RC9731C|RC9730C|RC9727F|RC9726C|RC9724C|RC9717B|RC9716B|RC9712C|RC9711B|RC1301C|RC1025F|RC1019G|RC0817C|RC0813C|RC0743H|RC0734H|RC0726B|RC0722C|RC0721B|RC0719H|RC0718C|RC0710B|RC0709B|QS9715F|QS1023H|QS0815C|QS0730C|QS0728C|QS0717D|QS0716D|QS0715C|MT0811B|MT0739D|MT0729[BD]|LC1016C|LC0720C|BC9710AM|AC1024C|AC0731B'
     523    - regex: 'VM1017A|TS1013B|TS0807B|RC9731C|RC9730C|RC9727F|RC9726C|RC9724C|RC9717B|RC9716B|RC9712C|RC9711B|RC1301C|RC1025F|RC1019G|RC1018C|RC0817C|RC0813C|RC0743H|RC0734H|RC0726B|RC0722C|RC0721B|RC0719H|RC0718C|RC0710B|RC0709B|QS9715F|QS1023H|QS0815C|QS0730C|QS0728C|QS0717D|QS0716D|QS0715C|MT0811B|MT0739D|MT0729[BD]|LC1016C|LC0720C|BC9710AM|AC1024C|AC0731B'
    481524      model: 'Qoo! Q-Pad'
    482525    - regex: 'MT7801C|QS9718C|QS9719D|VM0711A|OC1020A'
     
    490533    - regex: 'EL72B|(?:3Q_)?ER71B'
    491534      model: 'Qoo! Q-Book'
    492     - regex: '(RC1018C)'
    493       model: '$1'
    494535
    495536# 4Good
     
    571612# Acer
    572613Acer:
    573   regex: 'acer|(?<!ZTE BLADE |ImSmart |ERGO |X-Style Tab )a(?:101|110|2[10]0|211|50[10]|51[10]|70[10])[);/ ]|Android.*V3[67]0[);/ ]|Android.*Z1[23456]0 Build|Android.*Z5\d{2} Build|Android.*T0[234678] Build|A1-830|A1-81[01]|A3-A[1234][01]|B1-7[1235678][01]|B1-7[23]3|B1-8[1235]0|B1-A71|B3-A[12]0|B3-A3[02]|E39[);/ ]|S5[12]0 Build|DA[0-9]+HQ?L[);/ ]'
     614  regex: 'acer|(?<!ZTE BLADE |ImSmart |ERGO |X-Style Tab )a(?:101|110|2[10]0|211|50[10]|51[10]|70[10])[);/ ]|Android.*V3[67]0[);/ ]|Android.*Z1[23456]0 Build|Android.*Z5\d{2} Build|Android.*T0[234678] Build|Android.*S55[);/ ]|A1-830|A1-81[01]|A1-7[23]4|A3-A[1234][01]|B1-7[1235678][01]|B1-7[23]3|B1-8[1235]0|B1-A71|B3-A[12]0|B3-A3[02]|E39[);/ ]|S5[12]0 Build|DA[0-9]+HQ?L[);/ ]|Aspire V5-121|Predator G9-793|GT-810'
    574615  device: 'smartphone'
    575616  models:
     
    592633      model: 'Iconia A1'
    593634      device: 'tablet'
     635    - regex: 'A1-7[23]4'
     636      model: 'Iconia Talk S'
     637      device: 'tablet'
    594638    - regex: 'A3-A[12][01]'
    595639      model: 'Iconia A3'
     
    621665    - regex: 'A50[01]'
    622666      model: 'Picasso'
     667      device: 'tablet'
     668    - regex: 'Acer One 7'
     669      model: 'One 7'
     670      device: 'tablet'
     671    - regex: 'GT-810'
     672      model: 'Predator 8'
    623673      device: 'tablet'
    624674
     
    630680    - regex: 'E320(?:-orange)?[);/ ]'
    631681      model: 'Liquid Express'
     682    - regex: 'E310[);/ ]'
     683      model: 'beTouch E210'
    632684    - regex: 'Android.*V360[);/ ]'
    633685      model: 'Liquid E1 Duo'
     
    638690    - regex: 'S520[);/ ]'
    639691      model: 'Liquid S2'
     692    - regex: '(?:Acer_)?P400[);/ ]'
     693      model: 'neoTouch P400'
     694    - regex: '(?:Acer_)?P300[);/ ]'
     695      model: 'neoTouch P300'
     696    - regex: '(?:Acer_)?S200[);/ ]'
     697      model: 'neoTouch S200'
     698    - regex: '(?:Acer_)?E100[);/ ]'
     699      model: 'beTouch E100'
    640700    - regex: 'Android.*Z1([234])0[);/ ]'
    641701      model: 'Liquid Z$1'
     
    662722    - regex: 'Android.*T08[);/ ]'
    663723      model: 'Liquid Zest Plus'
    664     - regex: 'Acer; ?([^;\)]+)'
    665       model: '$1'
    666     - regex: 'Acer[ _\-]?([^;\)]+)[);/ ]'
     724    - regex: 'TM01[);/ ]'
     725      model: 'Liquid M330'
     726    - regex: 'M220[);/ ]'
     727      model: 'Liquid M220'
     728    - regex: 'AcerTD600'
     729      model: 'TD600'
     730    - regex: 'Android.*S55[);/ ]'
     731      model: 'Liquid Jade'
     732
     733    # desktop models
     734    - regex: '(?:Acer )?(Chromebook R1[13])'
     735      model: '$1'
     736      device: 'desktop'
     737    - regex: '(?:Acer )?(Chromebook 14)'
     738      model: '$1'
     739      device: 'desktop'
     740    - regex: '(Aspire V5-121)'
     741      model: '$1'
     742      device: 'desktop'
     743    - regex: '(Predator G9-793)'
     744      model: '$1'
     745      device: 'desktop'
     746
     747    - regex: 'Acer; ?([^;\(\)/]+)'
     748      model: '$1'
     749    - regex: 'Acer(?! ?inc)[ _\-]?([^;\(\)/]+)[();/ ]'
    667750      model: '$1'
    668751    - regex: 'acer[\-_]([a-z0-9]+)'
     
    765848# Alcatel
    766849Alcatel:
    767   regex: 'Alcatel|Alc[a-z0-9]+|One[ _]?Touch|idol3|(?:4003[AJ]|4009[ADEFIKMSX]|4013[DEJKMX]|4014[ADEKMX]|4015[ADNTX]|4016[ADX]|4017[ADEFSX]|4018[ADEFMX]|4024[EDX]|4027[ADNX]|4028[AEJS]|4032[ADEX]|4034[ADEFGX]|4035[ADXY]|4045[ADEX]|4047[ADFGNX]|4049[DEGMX]|4060[SW]|4114E|5009[AD]|5010[DEGSUX]|5011A|5012[DFG]|5015[ADEX]|5016[AXJ]|5017[ABDEOX]|5019D|5022[EDX]|5023[EF]|5024A|5025[DEG]|5026[AD]|5027B|5033[AX]|5033D[ _]RU|5034D|5038[ADEX]|5041C|5042[ADEFGWX]|5044[ADGIKOPSTY]|5045[ADFGIJTXY]|5046[ADGIJSTUY]|5047[DIUY]|5049[EGSWZ]|5050[ASXY]|5051[ADEJMTWX]|5052[AD]|5054[ADNSTWX]|5056[ADEGIJMNTUWX]|5057M|5058[AIY]|5059[ADXYZ]|5065[ADNWX]|5070D|5080[ADFQUX]|5085[ABCDGHIJNOQY]|5086[ADY]|5090[AIY]|5095[IKY]|5098[OS]|5099[ADYUI]|5116J|5145A|6016[ADEX]|6036[AXY]|6037[BKY]|6039[AHJKY]|6043[AD]|6044D|6045[BFIKOY]|6050[AFY]|6055[ABDHIKPUYZ]|6058[ADX]|6060S|6062W|6070K|7040[ADEFKRT]|7041[DX]|7043[AEKY]|7044[AX]|7045Y|7048[ASWX]|7055A|7070X|8030Y|8050[DEGX]|8063|9001[DIX]|9002X|9003[AX]|9024O|9005X|9007[ATX]|9008[ADIJNTUX]|9010X|9022X|9203A|A570BL|I213|I216X)[);/ ]|TIMXL'
     850  regex: 'Alcatel|Alc(?!or )[a-z0-9]+|One[ _]?Touch|idol3|(?:4003[AJ]|4009[ADEFIKMSX]|4013[DEJKMX]|4014[ADEKMX]|4015[ADNTX]|4016[ADX]|4017[ADEFSX]|4018[ADEFMX]|4024[EDX]|4027[ADNX]|4028[AEJS]|4032[ADEX]|4034[ADEFGX]|4035[ADXY]|4045[ADEX]|4047[ADFGNX]|4049[DEGMX]|4060[SW]|4114E|5009[AD]|5010[DEGSUX]|5011A|5012[DFG]|5015[ADEX]|5016[AXJ]|5017[ABDEOX]|5019D|5022[EDX]|5023[EF]|5024A|5025[DEG]|5026[AD]|5027B|5033[AX]|5033D[ _]RU|5034D|5038[ADEX]|5041C|5042[ADEFGWX]|5044[ADGIKOPSTY]|5045[ADFGIJTXY]|5046[ADGIJSTUY]|5047[DIUY]|5049[EGSWZ]|5050[ASXY]|5051[ADEJMTWX]|5052[AD]|5054[ADNSTWX]|5056[ADEGIJMNTUWX]|5057M|5058[AIY]|5059[ADXYZ]|5065[ADNWX]|5070D|5080[ADFQUX]|5085[ABCDGHIJNOQY]|5086[ADY]|5090[AIY]|5095[IKY]|5098[OS]|5099[ADYUI]|5116J|5145A|6016[ADEX]|6036[AXY]|6037[BKY]|6039[AHJKY]|6043[AD]|6044D|6045[BFIKOY]|6050[AFY]|6055[ABDHIKPUYZ]|6058[ADX]|6060S|6062W|6070K|7040[ADEFKRT]|7041[DX]|7043[AEKY]|7044[AX]|7045Y|7048[ASWX]|7055A|7070X|8030Y|8050[DEGX]|8063|9001[DIX]|9002X|9003[AX]|9024O|9005X|9007[ATX]|9008[ADIJNTUX]|9010X|9022X|9203A|A570BL|I213|I216X)[);/ ]|TIMXL'
    768851  device: 'smartphone'
    769852  models:
     
    9781061    - regex: '7048[ASWX][);/ ]'
    9791062      model: 'One Touch Go Play'
     1063    - regex: '(?:Alcatel-)?OT-802[);/ ]'
     1064      model: 'Wave'
     1065    - regex: 'ALCATEL_ONE_TOUCH_768T[);/ ]'
     1066      model: 'Island'
     1067    - regex: '(?:TRIBE_)?3075A[);/ ]'
     1068      model: 'One Touch Tribe'
     1069    - regex: 'ALCATEL_one_touch_585[);/ ]'
     1070      model: 'One Touch 585'
     1071    - regex: 'ALCATEL_ONE_TOUCH_838[);/ ]'
     1072      model: 'One Touch 838'
     1073    - regex: 'ALCATEL_one_touch_813d[);/ ]'
     1074      model: 'One Touch 813D'
     1075    - regex: 'ALCATEL_one_touch_813[);/ ]'
     1076      model: 'One Touch 813'
     1077    - regex: 'OT871A'
     1078      model: 'One Touch 871A'
    9801079    - regex: '(?:Alcatel[ _])?One[ _]?Touch[ _]((?:T[0-9]+|TAB[^/;]+|EVO[78](?:HD)?)) Build'
    9811080      device: 'tablet'
     
    10031102    - regex: '4047A[);/ ]'
    10041103      model: 'U5 Plus'
     1104    - regex: '4044[CV][);/ ]'
     1105      model: 'Quick Flip'
     1106    - regex: '4044O[);/ ]'
     1107      model: 'Cingular Flip 2'
     1108    - regex: '4044[MNT][);/ ]'
     1109      model: 'Go Flip'
    10051110    - regex: '5044[GS][);/ ]'
    10061111      model: 'U50'
     
    10251130    - regex: 'Alcatel UP'
    10261131      model: ''
     1132    - regex: '(?:ALCATEL_)?A383G[);/ ]'
     1133      model: 'Big Easy Plus'
    10271134    - regex: '5041C'
    10281135      model: 'TETRA'
     
    11431250    - regex: 'A6_Duo'
    11441251      model: 'A6 Duo'
    1145     - regex: 'Allview[ _-]([^;/]+) Build'
    1146       model: '$1'
    1147     - regex: 'Allview[ _-]([^;/]+)[;/)]'
    1148       model: '$1'
     1252    - regex: 'Impera S'
     1253      model: 'Impera S'
     1254    - regex: 'ALLVIEW P4i'
     1255      model: 'AllDro P4'
     1256    - regex: 'Allview_P2'
     1257      model: 'AllDro'
    11491258
    11501259    # explicit tablet models
     
    11671276      device: 'tablet'
    11681277      model: 'Viva H801'
     1278    - regex: 'ALLVIEW ?SPEEDI'
     1279      device: 'tablet'
     1280      model: 'Speed I'
     1281    - regex: 'ALLVIEW ?SPEED'
     1282      device: 'tablet'
     1283      model: 'Speed'
     1284    - regex: 'ALLVIEWSPEED'
     1285      device: 'tablet'
     1286      model: 'Speed'
     1287    - regex: 'AX4Nano'
     1288      device: 'tablet'
     1289      model: 'AX4 Nano'
     1290    - regex: 'ALLVIEW_TX1_Quasar'
     1291      device: 'tablet'
     1292      model: 'TX1 Quasar'
     1293
     1294    - regex: 'Allview[ _-]([^;/]+) Build'
     1295      model: '$1'
     1296    - regex: 'Allview[ _-]([^;/]+)[;/)]'
     1297      model: '$1'
    11691298
    11701299# Allwinner
     
    12391368  device: 'tablet'
    12401369  models:
     1370    - regex: 'Numy 3G AX1'
     1371      model: 'Novo 7 Numy AX1 3G'
     1372    - regex: 'Numy_3G_AX3'
     1373      model: 'Numy AX3 Sword'
     1374    - regex: 'Numy_3G_BW1'
     1375      model: 'Numy 3G Talos 2'
     1376
    12411377    - regex: 'Numy[ _]([^;/]+) Build'
    12421378      model: 'Numy $1'
     
    59356071      model: '$1'
    59366072
     6073# AIS
     6074AIS:
     6075  regex: 'iris708'
     6076  device: 'smartphone'
     6077  models:
     6078    - regex: 'iris708'
     6079      model: 'LAVA PRO 4.5'
     6080
     6081
    59376082# Lava
    59386083Lava:
     
    72307375# motorola
    72317376Motorola:
    7232   regex: 'MOT|(?<!AN)DROID ?(?:Build|[a-z0-9]+)|portalmmm/2.0 (?:E378i|L6|L7|v3)|XOOM [^;/]*Build|XT1021|(?:XT|MZ|MB|ME)[0-9]{3,4}[a-z]?(?:\(Defy\)|-0[1-5])?(?: Build|\))'
     7377  regex: 'MOT(?!TO)|(?<!AN)DROID ?(?:Build|[a-z0-9]+)|portalmmm/2.0 (?:E378i|L6|L7|v3)|XOOM [^;/]*Build|XT1021|(?:XT|MZ|MB|ME)[0-9]{3,4}[a-z]?(?:\(Defy\)|-0[1-5])?(?: Build|\))'
    72337378  device: 'smartphone'
    72347379  models:
     
    84788623    - regex: 'SIE(?:MENS )?[\-]?([a-z0-9]+)'
    84798624      model: '$1'
    8480     - regex: '(S55|SL45i)'
     8625    - regex: '(?:SIE-)?(S55|SL45i)'
    84818626      model: '$1'
    84828627    - regex: 'portalmmm/2.0 (SI[a-z0-9]+)'
  • clickervolt/trunk/readme.txt

    r2178096 r2181413  
    272272
    273273== Changelog ==
     274= 1.143 =
     275* Fixed issue with Cheetah Browser wrongly detected as Liebao
     276
    274277= 1.142 =
    275278* Fixed issue with URL distributions where URLs with a weight of 0 could still be selected
Note: See TracChangeset for help on using the changeset viewer.