require_once('library/Mobile_Detect/Mobile_Detect.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '3.0.1449' );
+define ( 'FRIENDICA_VERSION', '3.0.1492' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
-define ( 'DB_UPDATE_VERSION', 1154 );
+define ( 'DB_UPDATE_VERSION', 1156 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
public $plugins;
public $apps = array();
public $identities;
+ public $is_mobile;
+ public $is_tablet;
public $nav_sel;
if($this->pager['start'] < 0)
$this->pager['start'] = 0;
$this->pager['total'] = 0;
+
+ /**
+ * Detect mobile devices
+ */
+
+ $mobile_detect = new Mobile_Detect();
+ $this->is_mobile = $mobile_detect->isMobile();
+ $this->is_tablet = $mobile_detect->isTablet();
}
function get_baseurl($ssl = false) {
if(! function_exists('profile_load')) {
function profile_load(&$a, $nickname, $profile = 0) {
- if(remote_user()) {
- $r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1",
- intval($_SESSION['visitor_id']));
- if(count($r))
- $profile = $r[0]['profile-id'];
+
+ $user = q("select uid from user where nickname = '%s' limit 1",
+ dbesc($nickname)
+ );
+
+ if(! ($user && count($user))) {
+ logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
+ notice( t('Requested account is not available.') . EOL );
+ $a->error = 404;
+ return;
+ }
+
+ if(remote_user() && count($_SESSION['remote'])) {
+ foreach($_SESSION['remote'] as $visitor) {
+ if($visitor['uid'] == $user[0]['uid']) {
+ $r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1",
+ intval($visitor['cid'])
+ );
+ if(count($r))
+ $profile = $r[0]['profile-id'];
+ break;
+ }
+ }
}
$r = null;
$a->profile = $r[0];
+ $a->profile['mobile-theme'] = get_pconfig($profile_uid, 'system', 'mobile_theme');
+
$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
$_SESSION['theme'] = $a->profile['theme'];
+ $_SESSION['mobile-theme'] = $a->profile['mobile-theme'];
/**
* load/reload current theme info
// don't show connect link to authenticated visitors either
- if((remote_user()) && ($_SESSION['visitor_visiting'] == $profile['uid']))
- $connect = False;
+ if(remote_user() && count($_SESSION['remote'])) {
+ foreach($_SESSION['remote'] as $visitor) {
+ if($visitor['uid'] == $profile['uid']) {
+ $connect = false;
+ break;
+ }
+ }
+ }
if(get_my_url() && $profile['unkmail'])
$wallmessage = t('Message');
$a = get_app();
$o = '';
- if(! local_user())
+ if(! local_user() || $a->is_mobile || $a->is_tablet)
return $o;
- $mobile_detect = new Mobile_Detect();
- $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
+// $mobile_detect = new Mobile_Detect();
+// $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
- if($is_mobile)
- return $o;
+// if($is_mobile)
+// return $o;
$bd_format = t('g A l F d') ; // 8 AM Friday January 18
$bd_short = t('F d');
$a = get_app();
- if(! local_user())
+ if(! local_user() || $a->is_mobile || $a->is_tablet)
return $o;
- $mobile_detect = new Mobile_Detect();
- $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
+// $mobile_detect = new Mobile_Detect();
+// $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
- if($is_mobile)
- return $o;
+// if($is_mobile)
+// return $o;
$bd_format = t('g A l F d') ; // 8 AM Friday January 18
$bd_short = t('F d');
$cmdline = implode($args," ");
if(get_config('system','proc_windows'))
- proc_close(proc_open('start /b ' . $cmdline,array(),$foo));
+ proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo));
else
proc_close(proc_open($cmdline." &",array(),$foo));
}
$a = get_app();
- $mobile_detect = new Mobile_Detect();
- $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
+// $mobile_detect = new Mobile_Detect();
+// $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
+ $is_mobile = $a->is_mobile || $a->is_tablet;
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);
+ if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
+ $system_theme = '';
+ $theme_name = '';
+ }
+ else {
+ $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);
+
+ if($theme_name === '---') {
+ // user has selected to have the mobile theme be the same as the normal one
+ $system_theme = '';
+ $theme_name = '';
+ }
+ }
}
if(!$is_mobile || ($system_theme === '' && $theme_name === '')) {
$system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
}
return $ret;
}
+
+/**
+* Returns the complete URL of the current page, e.g.: http(s)://something.com/network
+*
+* Taken from http://webcheatsheet.com/php/get_current_page_url.php
+*/
+function curPageURL() {
+ $pageURL = 'http';
+ if ($_SERVER["HTTPS"] == "on") {$pageURL .= "s";}
+ $pageURL .= "://";
+ if ($_SERVER["SERVER_PORT"] != "80" && $_SERVER["SERVER_PORT"] != "443") {
+ $pageURL .= $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"].$_SERVER["REQUEST_URI"];
+ } else {
+ $pageURL .= $_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"];
+ }
+ return $pageURL;
+}