Merge pull request #405 from fermionic/support-for-mobile-themes
changes to support a mobile theme
This commit is contained in:
friendica
commit
aa5e60248a
12 changed files with 260 additions and 40 deletions
21
boot.php
21
boot.php
|
|
@ -8,6 +8,7 @@ require_once('include/datetime.php');
|
||||||
require_once('include/pgettext.php');
|
require_once('include/pgettext.php');
|
||||||
require_once('include/nav.php');
|
require_once('include/nav.php');
|
||||||
require_once('include/cache.php');
|
require_once('include/cache.php');
|
||||||
|
require_once('library/Mobile_Detect/Mobile_Detect.php');
|
||||||
|
|
||||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||||
define ( 'FRIENDICA_VERSION', '3.0.1413' );
|
define ( 'FRIENDICA_VERSION', '3.0.1413' );
|
||||||
|
|
@ -559,7 +560,7 @@ if(! class_exists('App')) {
|
||||||
$interval = 40000;
|
$interval = 40000;
|
||||||
|
|
||||||
$this->page['title'] = $this->config['sitename'];
|
$this->page['title'] = $this->config['sitename'];
|
||||||
$tpl = file_get_contents('view/head.tpl');
|
$tpl = get_markup_template('head.tpl');
|
||||||
$this->page['htmlhead'] = replace_macros($tpl,array(
|
$this->page['htmlhead'] = replace_macros($tpl,array(
|
||||||
'$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
|
'$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
|
||||||
'$local_user' => local_user(),
|
'$local_user' => local_user(),
|
||||||
|
|
@ -1443,8 +1444,17 @@ if(! function_exists('current_theme')) {
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
$system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
|
$mobile_detect = new Mobile_Detect();
|
||||||
$theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
|
$is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
|
||||||
|
|
||||||
|
if($is_mobile) {
|
||||||
|
$system_theme = ((isset($a->config['system']['mobile-theme'])) ? $a->config['system']['mobile-theme'] : '');
|
||||||
|
$theme_name = ((isset($_SESSION) && x($_SESSION,'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
|
||||||
|
$theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
|
||||||
|
}
|
||||||
|
|
||||||
if($theme_name &&
|
if($theme_name &&
|
||||||
(file_exists('view/theme/' . $theme_name . '/style.css') ||
|
(file_exists('view/theme/' . $theme_name . '/style.css') ||
|
||||||
|
|
@ -1581,18 +1591,21 @@ if(! function_exists('profile_tabs')){
|
||||||
'url' => $url,
|
'url' => $url,
|
||||||
'sel' => ((!isset($tab)&&$a->argv[0]=='profile')?'active':''),
|
'sel' => ((!isset($tab)&&$a->argv[0]=='profile')?'active':''),
|
||||||
'title' => t('Status Messages and Posts'),
|
'title' => t('Status Messages and Posts'),
|
||||||
|
'id' => 'status-tab',
|
||||||
),
|
),
|
||||||
array(
|
array(
|
||||||
'label' => t('Profile'),
|
'label' => t('Profile'),
|
||||||
'url' => $url.'/?tab=profile',
|
'url' => $url.'/?tab=profile',
|
||||||
'sel' => ((isset($tab) && $tab=='profile')?'active':''),
|
'sel' => ((isset($tab) && $tab=='profile')?'active':''),
|
||||||
'title' => t('Profile Details'),
|
'title' => t('Profile Details'),
|
||||||
|
'id' => 'profile-tab',
|
||||||
),
|
),
|
||||||
array(
|
array(
|
||||||
'label' => t('Photos'),
|
'label' => t('Photos'),
|
||||||
'url' => $a->get_baseurl() . '/photos/' . $nickname,
|
'url' => $a->get_baseurl() . '/photos/' . $nickname,
|
||||||
'sel' => ((!isset($tab)&&$a->argv[0]=='photos')?'active':''),
|
'sel' => ((!isset($tab)&&$a->argv[0]=='photos')?'active':''),
|
||||||
'title' => t('Photo Albums'),
|
'title' => t('Photo Albums'),
|
||||||
|
'id' => 'photo-tab',
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -1602,12 +1615,14 @@ if(! function_exists('profile_tabs')){
|
||||||
'url' => $a->get_baseurl() . '/events',
|
'url' => $a->get_baseurl() . '/events',
|
||||||
'sel' =>((!isset($tab)&&$a->argv[0]=='events')?'active':''),
|
'sel' =>((!isset($tab)&&$a->argv[0]=='events')?'active':''),
|
||||||
'title' => t('Events and Calendar'),
|
'title' => t('Events and Calendar'),
|
||||||
|
'id' => 'events-tab',
|
||||||
);
|
);
|
||||||
$tabs[] = array(
|
$tabs[] = array(
|
||||||
'label' => t('Personal Notes'),
|
'label' => t('Personal Notes'),
|
||||||
'url' => $a->get_baseurl() . '/notes',
|
'url' => $a->get_baseurl() . '/notes',
|
||||||
'sel' =>((!isset($tab)&&$a->argv[0]=='notes')?'active':''),
|
'sel' =>((!isset($tab)&&$a->argv[0]=='notes')?'active':''),
|
||||||
'title' => t('Only You Can See This'),
|
'title' => t('Only You Can See This'),
|
||||||
|
'id' => 'notes-tab',
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -256,6 +256,7 @@ function get_theme_info($theme){
|
||||||
'author' => array(),
|
'author' => array(),
|
||||||
'maintainer' => array(),
|
'maintainer' => array(),
|
||||||
'version' => "",
|
'version' => "",
|
||||||
|
'credits' => "",
|
||||||
'experimental' => false,
|
'experimental' => false,
|
||||||
'unsupported' => false
|
'unsupported' => false
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -403,7 +403,7 @@ function load_view_file($s) {
|
||||||
return file_get_contents("$d/$lang/$b");
|
return file_get_contents("$d/$lang/$b");
|
||||||
|
|
||||||
$theme = current_theme();
|
$theme = current_theme();
|
||||||
|
|
||||||
if(file_exists("$d/theme/$theme/$b"))
|
if(file_exists("$d/theme/$theme/$b"))
|
||||||
return file_get_contents("$d/theme/$theme/$b");
|
return file_get_contents("$d/theme/$theme/$b");
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -641,7 +641,7 @@ Array.prototype.remove = function(item) {
|
||||||
function previewTheme(elm) {
|
function previewTheme(elm) {
|
||||||
theme = $(elm).val();
|
theme = $(elm).val();
|
||||||
$.getJSON('pretheme?f=&theme=' + theme,function(data) {
|
$.getJSON('pretheme?f=&theme=' + theme,function(data) {
|
||||||
$('#theme-preview').html('<div id="theme-desc">' + data.desc + '</div><a href="' + data.img + '"><img src="' + data.img + '" width="320" height="240" alt="' + theme + '" /></a>');
|
$('#theme-preview').html('<div id="theme-desc">' + data.desc + '</div><div id="theme-version">' + data.version + '</div><div id="theme-credits">' + data.credits + '</div><a href="' + data.img + '"><img src="' + data.img + '" width="320" height="240" alt="' + theme + '" /></a>');
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
221
library/Mobile_Detect/Mobile_Detect.php
Normal file
221
library/Mobile_Detect/Mobile_Detect.php
Normal file
|
|
@ -0,0 +1,221 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Mobile Detect
|
||||||
|
* $Id: Mobile_Detect.php 49 2012-06-06 20:46:30Z serbanghita@gmail.com $
|
||||||
|
*
|
||||||
|
* @usage require_once 'Mobile_Detect.php';
|
||||||
|
* $detect = new Mobile_Detect();
|
||||||
|
* $detect->isMobile() or $detect->isTablet()
|
||||||
|
*
|
||||||
|
* For more specific usage see the documentation navigate to:
|
||||||
|
* http://code.google.com/p/php-mobile-detect/wiki/Mobile_Detect
|
||||||
|
*
|
||||||
|
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
|
||||||
|
*/
|
||||||
|
|
||||||
|
class Mobile_Detect {
|
||||||
|
|
||||||
|
protected $detectionRules;
|
||||||
|
protected $userAgent = null;
|
||||||
|
protected $accept = null;
|
||||||
|
// Assume the visitor has a desktop environment.
|
||||||
|
protected $isMobile = false;
|
||||||
|
protected $isTablet = false;
|
||||||
|
protected $phoneDeviceName = null;
|
||||||
|
protected $tabletDevicename = null;
|
||||||
|
protected $operatingSystemName = null;
|
||||||
|
protected $userAgentName = null;
|
||||||
|
// List of mobile devices (phones)
|
||||||
|
protected $phoneDevices = array(
|
||||||
|
'iPhone' => '(iPhone.*Mobile|iPod|iTunes)',
|
||||||
|
'BlackBerry' => 'BlackBerry|rim[0-9]+',
|
||||||
|
'HTC' => 'HTC|HTC.*(6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT',
|
||||||
|
'Nexus' => 'Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus',
|
||||||
|
'Dell' => 'Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35',
|
||||||
|
'Motorola' => '\bDroid\b.*Build|DROIDX|HRI39|MOT\-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT909|XT910|XT912|XT928',
|
||||||
|
'Samsung' => 'Samsung|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9300 |GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-P6810|GT-P7100|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100',
|
||||||
|
'Sony' => 'E10i|SonyEricsson|SonyEricssonLT15iv',
|
||||||
|
'Asus' => 'Asus.*Galaxy',
|
||||||
|
'Palm' => 'PalmSource|Palm', // avantgo|blazer|elaine|hiptop|plucker|xiino ; @todo - complete the regex.
|
||||||
|
'Vertu' => 'Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature', // Just for fun ;)
|
||||||
|
'GenericPhone' => '(mmp|pocket|psp|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|wap|nokia|Series40|Series60|S60|SonyEricsson|N900|PPC;|MAUI.*WAP.*Browser|LG-P500)'
|
||||||
|
);
|
||||||
|
// List of tablet devices.
|
||||||
|
protected $tabletDevices = array(
|
||||||
|
'BlackBerryTablet' => 'PlayBook|RIM Tablet',
|
||||||
|
'iPad' => 'iPad|iPad.*Mobile', // @todo: check for mobile friendly emails topic.
|
||||||
|
'Kindle' => 'Kindle|Silk.*Accelerated',
|
||||||
|
'SamsungTablet' => 'SAMSUNG.*Tablet|Galaxy.*Tab|GT-P1000|GT-P1010|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P1000|GT-P3100|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7300|GT-P7320|GT-P7500|GT-P7510|GT-P7511',
|
||||||
|
'HTCtablet' => 'HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200',
|
||||||
|
'MotorolaTablet' => 'xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617',
|
||||||
|
'AsusTablet' => 'Transformer|TF101',
|
||||||
|
'NookTablet' => 'NookColor|nook browser|BNTV250A|LogicPD Zoom2',
|
||||||
|
'AcerTablet' => 'Android.*\b(A100|A101|A200|A500|A501|A510|W500|W500P|W501|W501P)\b',
|
||||||
|
'YarvikTablet' => 'Android.*(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468)',
|
||||||
|
'GenericTablet' => 'Tablet(?!.*PC)|ViewPad7|LG-V909|MID7015|BNTV250A|LogicPD Zoom2|\bA7EB\b|CatNova8|A1_07|CT704|CT1002|\bM721\b',
|
||||||
|
);
|
||||||
|
// List of mobile Operating Systems.
|
||||||
|
protected $operatingSystems = array(
|
||||||
|
'AndroidOS' => '(android.*mobile|android(?!.*mobile))',
|
||||||
|
'BlackBerryOS' => '(blackberry|rim tablet os)',
|
||||||
|
'PalmOS' => '(avantgo|blazer|elaine|hiptop|palm|plucker|xiino)',
|
||||||
|
'SymbianOS' => 'Symbian|SymbOS|Series60|Series40|\bS60\b',
|
||||||
|
'WindowsMobileOS' => 'IEMobile|Windows Phone|Windows CE.*(PPC|Smartphone)|MSIEMobile|Window Mobile|XBLWP7',
|
||||||
|
'iOS' => '(iphone|ipod|ipad)',
|
||||||
|
'FlashLiteOS' => '',
|
||||||
|
'JavaOS' => '',
|
||||||
|
'NokiaOS' => '',
|
||||||
|
'webOS' => '',
|
||||||
|
'badaOS' => '\bBada\b',
|
||||||
|
'BREWOS' => '',
|
||||||
|
);
|
||||||
|
// List of mobile User Agents.
|
||||||
|
protected $userAgents = array(
|
||||||
|
'Chrome' => '\bCrMo\b|Chrome\/[.0-9]* Mobile',
|
||||||
|
'Dolfin' => '\bDolfin\b',
|
||||||
|
'Opera' => 'Opera.*Mini|Opera.*Mobi|Android.*Opera',
|
||||||
|
'Skyfire' => 'skyfire',
|
||||||
|
'IE' => 'IEMobile|MSIEMobile',
|
||||||
|
'Firefox' => 'fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile',
|
||||||
|
'Bolt' => 'bolt',
|
||||||
|
'TeaShark' => 'teashark',
|
||||||
|
'Blazer' => 'Blazer',
|
||||||
|
'Safari' => 'Mobile.*Safari|Safari.*Mobile',
|
||||||
|
'Midori' => 'midori',
|
||||||
|
'GenericBrowser' => 'NokiaBrowser|OviBrowser|SEMC.*Browser'
|
||||||
|
);
|
||||||
|
|
||||||
|
function __construct(){
|
||||||
|
|
||||||
|
// Merge all rules together.
|
||||||
|
$this->detectionRules = array_merge(
|
||||||
|
$this->phoneDevices,
|
||||||
|
$this->tabletDevices,
|
||||||
|
$this->operatingSystems,
|
||||||
|
$this->userAgents
|
||||||
|
);
|
||||||
|
$this->userAgent = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
|
||||||
|
$this->accept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
|
||||||
|
|
||||||
|
if (
|
||||||
|
isset($_SERVER['HTTP_X_WAP_PROFILE']) ||
|
||||||
|
isset($_SERVER['HTTP_X_WAP_CLIENTID']) ||
|
||||||
|
isset($_SERVER['HTTP_WAP_CONNECTION']) ||
|
||||||
|
isset($_SERVER['HTTP_PROFILE']) ||
|
||||||
|
isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA']) || // Reported by Nokia devices (eg. C3)
|
||||||
|
isset($_SERVER['HTTP_X_NOKIA_IPADDRESS']) ||
|
||||||
|
isset($_SERVER['HTTP_X_NOKIA_GATEWAY_ID']) ||
|
||||||
|
isset($_SERVER['HTTP_X_ORANGE_ID']) ||
|
||||||
|
isset($_SERVER['HTTP_X_VODAFONE_3GPDPCONTEXT']) ||
|
||||||
|
isset($_SERVER['HTTP_X_HUAWEI_USERID']) ||
|
||||||
|
isset($_SERVER['HTTP_UA_OS']) || // Reported by Windows Smartphones
|
||||||
|
(isset($_SERVER['HTTP_UA_CPU']) && $_SERVER['HTTP_UA_CPU'] == 'ARM') // Seen this on a HTC
|
||||||
|
) {
|
||||||
|
$this->isMobile = true;
|
||||||
|
} elseif (!empty($this->accept) && (strpos($this->accept, 'text/vnd.wap.wml') !== false || strpos($this->accept, 'application/vnd.wap.xhtml+xml') !== false)) {
|
||||||
|
$this->isMobile = true;
|
||||||
|
} else {
|
||||||
|
$this->_detect();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getRules()
|
||||||
|
{
|
||||||
|
return $this->detectionRules;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Magic overloading method.
|
||||||
|
*
|
||||||
|
* @method boolean is[...]()
|
||||||
|
* @param string $name
|
||||||
|
* @param array $arguments
|
||||||
|
* @return mixed
|
||||||
|
*/
|
||||||
|
public function __call($name, $arguments)
|
||||||
|
{
|
||||||
|
|
||||||
|
$key = substr($name, 2);
|
||||||
|
return $this->_detect($key);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Private method that does the detection of the
|
||||||
|
* mobile devices.
|
||||||
|
*
|
||||||
|
* @param string $key
|
||||||
|
* @return boolean|null
|
||||||
|
*/
|
||||||
|
private function _detect($key='')
|
||||||
|
{
|
||||||
|
|
||||||
|
if(empty($key)){
|
||||||
|
|
||||||
|
// Begin general search.
|
||||||
|
foreach($this->detectionRules as $_regex){
|
||||||
|
if(empty($_regex)){ continue; }
|
||||||
|
if(preg_match('/'.$_regex.'/is', $this->userAgent)){
|
||||||
|
$this->isMobile = true;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
// Search for a certain key.
|
||||||
|
// Make the keys lowecase so we can match: isIphone(), isiPhone(), isiphone(), etc.
|
||||||
|
$key = strtolower($key);
|
||||||
|
$_rules = array_change_key_case($this->detectionRules);
|
||||||
|
|
||||||
|
if(array_key_exists($key, $_rules)){
|
||||||
|
if(empty($_rules[$key])){ return null; }
|
||||||
|
if(preg_match('/'.$_rules[$key].'/is', $this->userAgent)){
|
||||||
|
$this->isMobile = true;
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
trigger_error("Method $key is not defined", E_USER_WARNING);
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if the device is mobile.
|
||||||
|
* Returns true if any type of mobile device detected, including special ones
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function isMobile()
|
||||||
|
{
|
||||||
|
return $this->isMobile;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if the device is a tablet.
|
||||||
|
* Return true if any type of tablet device is detected.
|
||||||
|
* @return boolean
|
||||||
|
*/
|
||||||
|
public function isTablet()
|
||||||
|
{
|
||||||
|
|
||||||
|
foreach($this->tabletDevices as $_regex){
|
||||||
|
if(preg_match('/'.$_regex.'/is', $this->userAgent)){
|
||||||
|
$this->isTablet = true;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -988,7 +988,7 @@ function photos_content(&$a) {
|
||||||
|
|
||||||
call_hooks('photo_upload_form',$ret);
|
call_hooks('photo_upload_form',$ret);
|
||||||
|
|
||||||
$default_upload = '<input type="file" name="userfile" /> <div class="photos-upload-submit-wrapper" >
|
$default_upload = '<input id="photos-upload-choose" type="file" name="userfile" /> <div class="photos-upload-submit-wrapper" >
|
||||||
<input type="submit" name="submit" value="' . t('Submit') . '" id="photos-upload-submit" /> </div>';
|
<input type="submit" name="submit" value="' . t('Submit') . '" id="photos-upload-submit" /> </div>';
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,10 +7,16 @@ function pretheme_init(&$a) {
|
||||||
$info = get_theme_info($theme);
|
$info = get_theme_info($theme);
|
||||||
if($info) {
|
if($info) {
|
||||||
// unfortunately there will be no translation for this string
|
// unfortunately there will be no translation for this string
|
||||||
$desc = $info['description'] . ' ' . $info['version'];
|
$desc = $info['description'];
|
||||||
|
$version = $info['version'];
|
||||||
|
$credits = $info['credits'];
|
||||||
}
|
}
|
||||||
else $desc = '';
|
else {
|
||||||
echo json_encode(array('img' => get_theme_screenshot($theme), 'desc' => $desc));
|
$desc = '';
|
||||||
|
$version = '';
|
||||||
|
$credits = '';
|
||||||
|
}
|
||||||
|
echo json_encode(array('img' => get_theme_screenshot($theme), 'desc' => $desc, 'version' => $version, 'credits' => $credits));
|
||||||
}
|
}
|
||||||
killme();
|
killme();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<ul class="tabs">
|
<ul class="tabs">
|
||||||
{{ for $tabs as $tab }}
|
{{ for $tabs as $tab }}
|
||||||
<li><a href="$tab.url" class="tab button $tab.sel"{{ if $tab.title }} title="$tab.title"{{ endif }}>$tab.label</a></li>
|
<li id="$tab.id"><a href="$tab.url" class="tab button $tab.sel"{{ if $tab.title }} title="$tab.title"{{ endif }}>$tab.label</a></li>
|
||||||
{{ endfor }}
|
{{ endfor }}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
||||||
|
|
@ -283,9 +283,9 @@ function enableOnUser(){
|
||||||
if(reply && reply.length) {
|
if(reply && reply.length) {
|
||||||
commentBusy = true;
|
commentBusy = true;
|
||||||
$('body').css('cursor', 'wait');
|
$('body').css('cursor', 'wait');
|
||||||
$.get('filer/' + id + '?term=' + reply);
|
$.get('filer/' + id + '?term=' + reply, NavUpdate);
|
||||||
if(timer) clearTimeout(timer);
|
// if(timer) clearTimeout(timer);
|
||||||
timer = setTimeout(NavUpdate,3000);
|
// timer = setTimeout(NavUpdate,3000);
|
||||||
liking = 1;
|
liking = 1;
|
||||||
$.fancybox.close();
|
$.fancybox.close();
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
<div id="photo-edit-rotate-end"></div>
|
<div id="photo-edit-rotate-end"></div>
|
||||||
|
|
||||||
<div id="photo-edit-perms" class="photo-edit-perms" >
|
<div id="photo-edit-perms" class="photo-edit-perms" >
|
||||||
<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button" title="$permissions"/>
|
<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button popupbox" title="$permissions"/>
|
||||||
<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
|
<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
|
||||||
</a>
|
</a>
|
||||||
<div id="photo-edit-perms-menu-end"></div>
|
<div id="photo-edit-perms-menu-end"></div>
|
||||||
|
|
@ -47,9 +47,4 @@
|
||||||
<div id="photo-edit-end"></div>
|
<div id="photo-edit-end"></div>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<script>
|
|
||||||
$("a#photo-edit-perms-menu").fancybox({
|
|
||||||
'transitionIn' : 'none',
|
|
||||||
'transitionOut' : 'none'
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
|
|
||||||
|
|
||||||
<div id="photos-upload-perms" class="photos-upload-perms" >
|
<div id="photos-upload-perms" class="photos-upload-perms" >
|
||||||
<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button" />
|
<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
|
||||||
<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
|
<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
|
||||||
</a>
|
</a>
|
||||||
<div id="photos-upload-perms-end"></div>
|
<div id="photos-upload-perms-end"></div>
|
||||||
|
|
@ -43,9 +43,3 @@
|
||||||
<div class="photos-upload-end" ></div>
|
<div class="photos-upload-end" ></div>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<script>
|
|
||||||
$("a#photos-upload-perms-menu").fancybox({
|
|
||||||
'transitionIn' : 'none',
|
|
||||||
'transitionOut' : 'none'
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
|
||||||
|
|
@ -172,7 +172,6 @@ $lbl_about
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div id="about-jot-end"></div>
|
<div id="about-jot-end"></div>
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<div id="interest-jot-wrapper" >
|
<div id="interest-jot-wrapper" >
|
||||||
|
|
@ -184,7 +183,6 @@ $lbl_hobbies
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div id="interest-jot-end"></div>
|
<div id="interest-jot-end"></div>
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<div id="likes-jot-wrapper" >
|
<div id="likes-jot-wrapper" >
|
||||||
|
|
@ -196,7 +194,6 @@ $lbl_likes
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div id="likes-jot-end"></div>
|
<div id="likes-jot-end"></div>
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<div id="dislikes-jot-wrapper" >
|
<div id="dislikes-jot-wrapper" >
|
||||||
|
|
@ -208,7 +205,6 @@ $lbl_dislikes
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div id="dislikes-jot-end"></div>
|
<div id="dislikes-jot-end"></div>
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<div id="contact-jot-wrapper" >
|
<div id="contact-jot-wrapper" >
|
||||||
|
|
@ -220,7 +216,6 @@ $lbl_social
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div id="contact-jot-end"></div>
|
<div id="contact-jot-end"></div>
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<div class="profile-edit-submit-wrapper" >
|
<div class="profile-edit-submit-wrapper" >
|
||||||
|
|
@ -238,7 +233,6 @@ $lbl_music
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div id="music-jot-end"></div>
|
<div id="music-jot-end"></div>
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="book-jot-wrapper" >
|
<div id="book-jot-wrapper" >
|
||||||
<p id="book-jot-desc" >
|
<p id="book-jot-desc" >
|
||||||
|
|
@ -249,7 +243,6 @@ $lbl_book
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div id="book-jot-end"></div>
|
<div id="book-jot-end"></div>
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -262,7 +255,6 @@ $lbl_tv
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div id="tv-jot-end"></div>
|
<div id="tv-jot-end"></div>
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -275,7 +267,6 @@ $lbl_film
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div id="film-jot-end"></div>
|
<div id="film-jot-end"></div>
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<div class="profile-edit-submit-wrapper" >
|
<div class="profile-edit-submit-wrapper" >
|
||||||
|
|
@ -293,7 +284,6 @@ $lbl_love
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div id="romance-jot-end"></div>
|
<div id="romance-jot-end"></div>
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -306,7 +296,6 @@ $lbl_work
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div id="work-jot-end"></div>
|
<div id="work-jot-end"></div>
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -319,7 +308,6 @@ $lbl_school
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div id="education-jot-end"></div>
|
<div id="education-jot-end"></div>
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -331,4 +319,4 @@ $lbl_school
|
||||||
|
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<script type="text/javascript">Fill_Country('$country_name');Fill_States('$region');</script>
|
<script type="text/javascript">Fill_Country('$country_name');Fill_States('$region');</script>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue