bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-06-12 23:37:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

google fixes

Browse Source
This commit is contained in:
SJ
2014-01-16 23:02:23 +01:00
parent 2c7e4ac3eb
commit 18dff068df
5 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
webui/model/user/google.php
View File

@ -12,14 +12,6 @@ class ModelUserGoogle extends Model {
$user = $query->row;
}
else {
/*
[id] => 11731982531819289345
[email] => bela@bacsi.hu
[verified_email] => 1
[name] => Bela Bacsi
[given_name] => Bela
[family_name] => Bacsi
*/
$d = explode('@', $google_account['email']);
@ -57,8 +49,8 @@ class ModelUserGoogle extends Model {
}
public function update_tokens($email = '', $id = 0, $token = array()) {
if($email == '') { return 0; }
public function update_tokens($email = '', $id = '', $token = array()) {
if($email == '' || $id == '') { return 0; }
$query = $this->db->query("SELECT email FROM " . TABLE_GOOGLE . " WHERE email=?", array($email));
@ -70,16 +62,6 @@ class ModelUserGoogle extends Model {
}
return $this->db->countAffected();
/*
[access_token] => ya29.AHES6ZSavh4CnWXyfAYRNwqqZ3FmZ-bHPZkWIEPlutG6K_E
[token_type] => Bearer
[expires_in] => 3600
[refresh_token] => 1/J7bwdfCfQkjCu3Q51ypdJeGOzOtw6F1uyg1vaAwOZ2Q
[created] => 1348415267
*/
}

2
webui/system/helper/detectmobilebrowser.php
View File

@ -2,7 +2,7 @@
function is_mobile_device() {
if(!isset($_SERVER['HTTP_USER_AGENT'])) { return 0; }
if(!isset($_SERVER['HTTP_USER_AGENT'])) { define('OUTLOOK', 0); return 0; }
if(strstr($_SERVER['HTTP_USER_AGENT'], "Microsoft Outlook")) { define('OUTLOOK', 1); } else { define('OUTLOOK', 0); }