made exceptions from the db optional
set address for updae mails correctly
This commit is contained in:
Alexander Kampmann
parent
0d60dbef31
commit
7ac4b83c39
3 changed files with 930 additions and 884 deletions
1677
boot.php
1677
boot.php
|
|
@ -111,23 +111,23 @@ define ( 'NETWORK_GPLUS', 'goog'); // Google+
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* These numbers are used in stored permissions
|
* These numbers are used in stored permissions
|
||||||
* and existing allocations MUST NEVER BE CHANGED
|
* and existing allocations MUST NEVER BE CHANGED
|
||||||
* OR RE-ASSIGNED! You may only add to them.
|
* OR RE-ASSIGNED! You may only add to them.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$netgroup_ids = array(
|
$netgroup_ids = array(
|
||||||
NETWORK_DFRN => (-1),
|
NETWORK_DFRN => (-1),
|
||||||
NETWORK_ZOT => (-2),
|
NETWORK_ZOT => (-2),
|
||||||
NETWORK_OSTATUS => (-3),
|
NETWORK_OSTATUS => (-3),
|
||||||
NETWORK_FEED => (-4),
|
NETWORK_FEED => (-4),
|
||||||
NETWORK_DIASPORA => (-5),
|
NETWORK_DIASPORA => (-5),
|
||||||
NETWORK_MAIL => (-6),
|
NETWORK_MAIL => (-6),
|
||||||
NETWORK_MAIL2 => (-7),
|
NETWORK_MAIL2 => (-7),
|
||||||
NETWORK_FACEBOOK => (-8),
|
NETWORK_FACEBOOK => (-8),
|
||||||
NETWORK_LINKEDIN => (-9),
|
NETWORK_LINKEDIN => (-9),
|
||||||
NETWORK_XMPP => (-10),
|
NETWORK_XMPP => (-10),
|
||||||
NETWORK_MYSPACE => (-11),
|
NETWORK_MYSPACE => (-11),
|
||||||
NETWORK_GPLUS => (-12),
|
NETWORK_GPLUS => (-12),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -232,19 +232,19 @@ function startup() {
|
||||||
|
|
||||||
|
|
||||||
if (get_magic_quotes_gpc()) {
|
if (get_magic_quotes_gpc()) {
|
||||||
$process = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST);
|
$process = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST);
|
||||||
while (list($key, $val) = each($process)) {
|
while (list($key, $val) = each($process)) {
|
||||||
foreach ($val as $k => $v) {
|
foreach ($val as $k => $v) {
|
||||||
unset($process[$key][$k]);
|
unset($process[$key][$k]);
|
||||||
if (is_array($v)) {
|
if (is_array($v)) {
|
||||||
$process[$key][stripslashes($k)] = $v;
|
$process[$key][stripslashes($k)] = $v;
|
||||||
$process[] = &$process[$key][stripslashes($k)];
|
$process[] = &$process[$key][stripslashes($k)];
|
||||||
} else {
|
} else {
|
||||||
$process[$key][stripslashes($k)] = stripslashes($v);
|
$process[$key][stripslashes($k)] = stripslashes($v);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
unset($process);
|
unset($process);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -263,178 +263,178 @@ function startup() {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if(! class_exists('App')) {
|
if(! class_exists('App')) {
|
||||||
class App {
|
class App {
|
||||||
|
|
||||||
public $module_loaded = false;
|
public $module_loaded = false;
|
||||||
public $query_string;
|
public $query_string;
|
||||||
public $config;
|
public $config;
|
||||||
public $page;
|
public $page;
|
||||||
public $profile;
|
public $profile;
|
||||||
public $user;
|
public $user;
|
||||||
public $cid;
|
public $cid;
|
||||||
public $contact;
|
public $contact;
|
||||||
public $contacts;
|
public $contacts;
|
||||||
public $page_contact;
|
public $page_contact;
|
||||||
public $content;
|
public $content;
|
||||||
public $data = array();
|
public $data = array();
|
||||||
public $error = false;
|
public $error = false;
|
||||||
public $cmd;
|
public $cmd;
|
||||||
public $argv;
|
public $argv;
|
||||||
public $argc;
|
public $argc;
|
||||||
public $module;
|
public $module;
|
||||||
public $pager;
|
public $pager;
|
||||||
public $strings;
|
public $strings;
|
||||||
public $path;
|
public $path;
|
||||||
public $hooks;
|
public $hooks;
|
||||||
public $timezone;
|
public $timezone;
|
||||||
public $interactive = true;
|
public $interactive = true;
|
||||||
public $plugins;
|
public $plugins;
|
||||||
public $apps = array();
|
public $apps = array();
|
||||||
public $identities;
|
public $identities;
|
||||||
|
|
||||||
public $nav_sel;
|
public $nav_sel;
|
||||||
|
|
||||||
public $category;
|
public $category;
|
||||||
|
|
||||||
private $scheme;
|
private $scheme;
|
||||||
private $hostname;
|
private $hostname;
|
||||||
private $baseurl;
|
private $baseurl;
|
||||||
private $db;
|
private $db;
|
||||||
|
|
||||||
private $curl_code;
|
private $curl_code;
|
||||||
private $curl_headers;
|
private $curl_headers;
|
||||||
|
|
||||||
function __construct() {
|
function __construct() {
|
||||||
|
|
||||||
$this->config = array();
|
$this->config = array();
|
||||||
$this->page = array();
|
$this->page = array();
|
||||||
$this->pager= array();
|
$this->pager= array();
|
||||||
|
|
||||||
$this->query_string = '';
|
$this->query_string = '';
|
||||||
|
|
||||||
startup();
|
startup();
|
||||||
|
|
||||||
$this->scheme = 'http';
|
$this->scheme = 'http';
|
||||||
if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS'])
|
if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS'])
|
||||||
$this->scheme = 'https';
|
$this->scheme = 'https';
|
||||||
elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443))
|
elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443))
|
||||||
$this->scheme = 'https';
|
$this->scheme = 'https';
|
||||||
|
|
||||||
|
|
||||||
if(x($_SERVER,'SERVER_NAME')) {
|
if(x($_SERVER,'SERVER_NAME')) {
|
||||||
$this->hostname = $_SERVER['SERVER_NAME'];
|
$this->hostname = $_SERVER['SERVER_NAME'];
|
||||||
if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
|
if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
|
||||||
$this->hostname .= ':' . $_SERVER['SERVER_PORT'];
|
$this->hostname .= ':' . $_SERVER['SERVER_PORT'];
|
||||||
|
/**
|
||||||
|
* Figure out if we are running at the top of a domain
|
||||||
|
* or in a sub-directory and adjust accordingly
|
||||||
|
*/
|
||||||
|
|
||||||
|
$path = trim(dirname($_SERVER['SCRIPT_NAME']),'/\\');
|
||||||
|
if(isset($path) && strlen($path) && ($path != $this->path))
|
||||||
|
$this->path = $path;
|
||||||
|
}
|
||||||
|
|
||||||
|
set_include_path(
|
||||||
|
"include/$this->hostname" . PATH_SEPARATOR
|
||||||
|
. 'include' . PATH_SEPARATOR
|
||||||
|
. 'library' . PATH_SEPARATOR
|
||||||
|
. 'library/phpsec' . PATH_SEPARATOR
|
||||||
|
. '.' );
|
||||||
|
|
||||||
|
if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=") {
|
||||||
|
$this->query_string = substr($_SERVER['QUERY_STRING'],2);
|
||||||
|
// removing trailing / - maybe a nginx problem
|
||||||
|
if (substr($this->query_string, 0, 1) == "/")
|
||||||
|
$this->query_string = substr($this->query_string, 1);
|
||||||
|
}
|
||||||
|
if(x($_GET,'q'))
|
||||||
|
$this->cmd = trim($_GET['q'],'/\\');
|
||||||
|
|
||||||
|
// unix style "homedir"
|
||||||
|
|
||||||
|
if(substr($this->cmd,0,1) === '~')
|
||||||
|
$this->cmd = 'profile/' . substr($this->cmd,1);
|
||||||
|
|
||||||
|
// Diaspora style profile url
|
||||||
|
|
||||||
|
if(substr($this->cmd,0,2) === 'u/')
|
||||||
|
$this->cmd = 'profile/' . substr($this->cmd,2);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Figure out if we are running at the top of a domain
|
*
|
||||||
* or in a sub-directory and adjust accordingly
|
* Break the URL path into C style argc/argv style arguments for our
|
||||||
|
* modules. Given "http://example.com/module/arg1/arg2", $this->argc
|
||||||
|
* will be 3 (integer) and $this->argv will contain:
|
||||||
|
* [0] => 'module'
|
||||||
|
* [1] => 'arg1'
|
||||||
|
* [2] => 'arg2'
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* There will always be one argument. If provided a naked domain
|
||||||
|
* URL, $this->argv[0] is set to "home".
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$path = trim(dirname($_SERVER['SCRIPT_NAME']),'/\\');
|
$this->argv = explode('/',$this->cmd);
|
||||||
if(isset($path) && strlen($path) && ($path != $this->path))
|
$this->argc = count($this->argv);
|
||||||
$this->path = $path;
|
if((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) {
|
||||||
}
|
$this->module = str_replace(".", "_", $this->argv[0]);
|
||||||
|
if(array_key_exists('2',$this->argv)) {
|
||||||
set_include_path(
|
$this->category = $this->argv[2];
|
||||||
"include/$this->hostname" . PATH_SEPARATOR
|
}
|
||||||
. 'include' . PATH_SEPARATOR
|
|
||||||
. 'library' . PATH_SEPARATOR
|
|
||||||
. 'library/phpsec' . PATH_SEPARATOR
|
|
||||||
. '.' );
|
|
||||||
|
|
||||||
if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=") {
|
|
||||||
$this->query_string = substr($_SERVER['QUERY_STRING'],2);
|
|
||||||
// removing trailing / - maybe a nginx problem
|
|
||||||
if (substr($this->query_string, 0, 1) == "/")
|
|
||||||
$this->query_string = substr($this->query_string, 1);
|
|
||||||
}
|
|
||||||
if(x($_GET,'q'))
|
|
||||||
$this->cmd = trim($_GET['q'],'/\\');
|
|
||||||
|
|
||||||
// unix style "homedir"
|
|
||||||
|
|
||||||
if(substr($this->cmd,0,1) === '~')
|
|
||||||
$this->cmd = 'profile/' . substr($this->cmd,1);
|
|
||||||
|
|
||||||
// Diaspora style profile url
|
|
||||||
|
|
||||||
if(substr($this->cmd,0,2) === 'u/')
|
|
||||||
$this->cmd = 'profile/' . substr($this->cmd,2);
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* Break the URL path into C style argc/argv style arguments for our
|
|
||||||
* modules. Given "http://example.com/module/arg1/arg2", $this->argc
|
|
||||||
* will be 3 (integer) and $this->argv will contain:
|
|
||||||
* [0] => 'module'
|
|
||||||
* [1] => 'arg1'
|
|
||||||
* [2] => 'arg2'
|
|
||||||
*
|
|
||||||
*
|
|
||||||
* There will always be one argument. If provided a naked domain
|
|
||||||
* URL, $this->argv[0] is set to "home".
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
$this->argv = explode('/',$this->cmd);
|
|
||||||
$this->argc = count($this->argv);
|
|
||||||
if((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) {
|
|
||||||
$this->module = str_replace(".", "_", $this->argv[0]);
|
|
||||||
if(array_key_exists('2',$this->argv)) {
|
|
||||||
$this->category = $this->argv[2];
|
|
||||||
}
|
}
|
||||||
}
|
else {
|
||||||
else {
|
$this->argc = 1;
|
||||||
$this->argc = 1;
|
$this->argv = array('home');
|
||||||
$this->argv = array('home');
|
$this->module = 'home';
|
||||||
$this->module = 'home';
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Special handling for the webfinger/lrdd host XRD file
|
||||||
|
*/
|
||||||
|
|
||||||
|
if($this->cmd === '.well-known/host-meta') {
|
||||||
|
$this->argc = 1;
|
||||||
|
$this->argv = array('hostxrd');
|
||||||
|
$this->module = 'hostxrd';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* See if there is any page number information, and initialise
|
||||||
|
* pagination
|
||||||
|
*/
|
||||||
|
|
||||||
|
$this->pager['page'] = ((x($_GET,'page')) ? $_GET['page'] : 1);
|
||||||
|
$this->pager['itemspage'] = 50;
|
||||||
|
$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
|
||||||
|
$this->pager['total'] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
function get_baseurl($ssl = false) {
|
||||||
* Special handling for the webfinger/lrdd host XRD file
|
|
||||||
*/
|
|
||||||
|
|
||||||
if($this->cmd === '.well-known/host-meta') {
|
$scheme = $this->scheme;
|
||||||
$this->argc = 1;
|
|
||||||
$this->argv = array('hostxrd');
|
|
||||||
$this->module = 'hostxrd';
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) {
|
||||||
* See if there is any page number information, and initialise
|
if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL))
|
||||||
* pagination
|
$scheme = 'https';
|
||||||
*/
|
|
||||||
|
|
||||||
$this->pager['page'] = ((x($_GET,'page')) ? $_GET['page'] : 1);
|
// We need to populate the $ssl flag across the entire program before turning this on.
|
||||||
$this->pager['itemspage'] = 50;
|
// Basically, we'll have $ssl = true on any links which can only be seen by a logged in user
|
||||||
$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
|
// (and also the login link). Anything seen by an outsider will have it turned off.
|
||||||
$this->pager['total'] = 0;
|
// At present, setting SSL_POLICY_SELFSIGN will only force remote contacts to update their
|
||||||
}
|
// contact links to this site with "http:" if they are currently using "https:"
|
||||||
|
|
||||||
function get_baseurl($ssl = false) {
|
// if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
|
||||||
|
// if($ssl)
|
||||||
|
// $scheme = 'https';
|
||||||
|
// else
|
||||||
|
// $scheme = 'http';
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|
||||||
$scheme = $this->scheme;
|
$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
|
||||||
|
return $this->baseurl;
|
||||||
if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) {
|
|
||||||
if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL))
|
|
||||||
$scheme = 'https';
|
|
||||||
|
|
||||||
// We need to populate the $ssl flag across the entire program before turning this on.
|
|
||||||
// Basically, we'll have $ssl = true on any links which can only be seen by a logged in user
|
|
||||||
// (and also the login link). Anything seen by an outsider will have it turned off.
|
|
||||||
// At present, setting SSL_POLICY_SELFSIGN will only force remote contacts to update their
|
|
||||||
// contact links to this site with "http:" if they are currently using "https:"
|
|
||||||
|
|
||||||
// if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
|
|
||||||
// if($ssl)
|
|
||||||
// $scheme = 'https';
|
|
||||||
// else
|
|
||||||
// $scheme = 'http';
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
|
|
||||||
return $this->baseurl;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function set_baseurl($url) {
|
function set_baseurl($url) {
|
||||||
|
|
@ -488,13 +488,13 @@ class App {
|
||||||
$this->page['title'] = $this->config['sitename'];
|
$this->page['title'] = $this->config['sitename'];
|
||||||
$tpl = file_get_contents('view/head.tpl');
|
$tpl = file_get_contents('view/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!!!!
|
||||||
'$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION,
|
'$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION,
|
||||||
'$delitem' => t('Delete this item?'),
|
'$delitem' => t('Delete this item?'),
|
||||||
'$comment' => t('Comment'),
|
'$comment' => t('Comment'),
|
||||||
'$showmore' => t('show more'),
|
'$showmore' => t('show more'),
|
||||||
'$showfewer' => t('show fewer'),
|
'$showfewer' => t('show fewer'),
|
||||||
'$update_interval' => $interval
|
'$update_interval' => $interval
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -515,16 +515,18 @@ class App {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// retrieve the App structure
|
// retrieve the App structure
|
||||||
// useful in functions which require it but don't get it passed to them
|
// useful in functions which require it but don't get it passed to them
|
||||||
|
|
||||||
if(! function_exists('get_app')) {
|
if(! function_exists('get_app')) {
|
||||||
function get_app() {
|
function get_app() {
|
||||||
global $a;
|
global $a;
|
||||||
return $a;
|
return $a;
|
||||||
}};
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
// Multi-purpose function to check variable state.
|
// Multi-purpose function to check variable state.
|
||||||
|
|
@ -534,42 +536,44 @@ function get_app() {
|
||||||
// e.g. x('') or x(0) returns 0;
|
// e.g. x('') or x(0) returns 0;
|
||||||
|
|
||||||
if(! function_exists('x')) {
|
if(! function_exists('x')) {
|
||||||
function x($s,$k = NULL) {
|
function x($s,$k = NULL) {
|
||||||
if($k != NULL) {
|
if($k != NULL) {
|
||||||
if((is_array($s)) && (array_key_exists($k,$s))) {
|
if((is_array($s)) && (array_key_exists($k,$s))) {
|
||||||
if($s[$k])
|
if($s[$k])
|
||||||
return (int) 1;
|
return (int) 1;
|
||||||
return (int) 0;
|
return (int) 0;
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if(isset($s)) {
|
|
||||||
if($s) {
|
|
||||||
return (int) 1;
|
|
||||||
}
|
}
|
||||||
return (int) 0;
|
return false;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if(isset($s)) {
|
||||||
|
if($s) {
|
||||||
|
return (int) 1;
|
||||||
|
}
|
||||||
|
return (int) 0;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
}}
|
}
|
||||||
|
|
||||||
// called from db initialisation if db is dead.
|
// called from db initialisation if db is dead.
|
||||||
|
|
||||||
if(! function_exists('system_unavailable')) {
|
if(! function_exists('system_unavailable')) {
|
||||||
function system_unavailable() {
|
function system_unavailable() {
|
||||||
include('system_unavailable.php');
|
include('system_unavailable.php');
|
||||||
system_down();
|
system_down();
|
||||||
killme();
|
killme();
|
||||||
}}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function clean_urls() {
|
function clean_urls() {
|
||||||
global $a;
|
global $a;
|
||||||
// if($a->config['system']['clean_urls'])
|
// if($a->config['system']['clean_urls'])
|
||||||
return true;
|
return true;
|
||||||
// return false;
|
// return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
function z_path() {
|
function z_path() {
|
||||||
|
|
@ -602,142 +606,144 @@ function is_ajax() {
|
||||||
|
|
||||||
|
|
||||||
if(! function_exists('check_config')) {
|
if(! function_exists('check_config')) {
|
||||||
function check_config(&$a) {
|
function check_config(&$a) {
|
||||||
|
|
||||||
$build = get_config('system','build');
|
$build = get_config('system','build');
|
||||||
if(! x($build))
|
if(! x($build))
|
||||||
$build = set_config('system','build',DB_UPDATE_VERSION);
|
$build = set_config('system','build',DB_UPDATE_VERSION);
|
||||||
|
|
||||||
$url = get_config('system','url');
|
$url = get_config('system','url');
|
||||||
|
|
||||||
// if the url isn't set or the stored url is radically different
|
// if the url isn't set or the stored url is radically different
|
||||||
// than the currently visited url, store the current value accordingly.
|
// than the currently visited url, store the current value accordingly.
|
||||||
// "Radically different" ignores common variations such as http vs https
|
// "Radically different" ignores common variations such as http vs https
|
||||||
// and www.example.com vs example.com.
|
// and www.example.com vs example.com.
|
||||||
|
|
||||||
if((! x($url)) || (! link_compare($url,$a->get_baseurl())))
|
if((! x($url)) || (! link_compare($url,$a->get_baseurl())))
|
||||||
$url = set_config('system','url',$a->get_baseurl());
|
$url = set_config('system','url',$a->get_baseurl());
|
||||||
|
|
||||||
if($build != DB_UPDATE_VERSION) {
|
if($build != DB_UPDATE_VERSION) {
|
||||||
$stored = intval($build);
|
$stored = intval($build);
|
||||||
$current = intval(DB_UPDATE_VERSION);
|
$current = intval(DB_UPDATE_VERSION);
|
||||||
if(($stored < $current) && file_exists('update.php')) {
|
if(($stored < $current) && file_exists('update.php')) {
|
||||||
|
|
||||||
load_config('database');
|
load_config('database');
|
||||||
|
|
||||||
// We're reporting a different version than what is currently installed.
|
// We're reporting a different version than what is currently installed.
|
||||||
// Run any existing update scripts to bring the database up to current.
|
// Run any existing update scripts to bring the database up to current.
|
||||||
|
|
||||||
require_once('update.php');
|
require_once('update.php');
|
||||||
|
|
||||||
// make sure that boot.php and update.php are the same release, we might be
|
// make sure that boot.php and update.php are the same release, we might be
|
||||||
// updating right this very second and the correct version of the update.php
|
// updating right this very second and the correct version of the update.php
|
||||||
// file may not be here yet. This can happen on a very busy site.
|
// file may not be here yet. This can happen on a very busy site.
|
||||||
|
|
||||||
if(DB_UPDATE_VERSION == UPDATE_VERSION) {
|
if(DB_UPDATE_VERSION == UPDATE_VERSION) {
|
||||||
|
|
||||||
for($x = $stored; $x < $current; $x ++) {
|
for($x = $stored; $x < $current; $x ++) {
|
||||||
if(function_exists('update_' . $x)) {
|
if(function_exists('update_' . $x)) {
|
||||||
|
|
||||||
// There could be a lot of processes running or about to run.
|
// There could be a lot of processes running or about to run.
|
||||||
// We want exactly one process to run the update command.
|
// We want exactly one process to run the update command.
|
||||||
// So store the fact that we're taking responsibility
|
// So store the fact that we're taking responsibility
|
||||||
// after first checking to see if somebody else already has.
|
// after first checking to see if somebody else already has.
|
||||||
|
|
||||||
// If the update fails or times-out completely you may need to
|
// If the update fails or times-out completely you may need to
|
||||||
// delete the config entry to try again.
|
// delete the config entry to try again.
|
||||||
|
|
||||||
if(get_config('database','update_' . $x))
|
if(get_config('database','update_' . $x))
|
||||||
break;
|
break;
|
||||||
set_config('database','update_' . $x, '1');
|
set_config('database','update_' . $x, '1');
|
||||||
|
|
||||||
// call the specific update
|
// call the specific update
|
||||||
|
|
||||||
global $db;
|
global $db;
|
||||||
try {
|
$db->excep(TRUE);
|
||||||
$db->beginTransaction();
|
try {
|
||||||
$func = 'update_' . $x;
|
$db->beginTransaction();
|
||||||
$func($a);
|
$func = 'update_' . $x;
|
||||||
$db->commit();
|
$func($a);
|
||||||
} catch(Exception $ex) {
|
$db->commit();
|
||||||
$db->rollback();
|
} catch(Exception $ex) {
|
||||||
//send the administrator an e-mail
|
$db->rollback();
|
||||||
$email_tpl = get_intltext_template("update_fail_eml.tpl");
|
//send the administrator an e-mail
|
||||||
$email_tpl = replace_macros($email_tpl, array(
|
$email_tpl = get_intltext_template("update_fail_eml.tpl");
|
||||||
'$sitename' => $a->config['sitename'],
|
$email_tpl = replace_macros($email_tpl, array(
|
||||||
'$siteurl' => $a->get_baseurl(),
|
'$sitename' => $a->config['sitename'],
|
||||||
'$update' => $x,
|
'$siteurl' => $a->get_baseurl(),
|
||||||
'$error' => $ex->getMessage());
|
'$update' => $x,
|
||||||
$subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
|
'$error' => $ex->getMessage());
|
||||||
|
$subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
|
||||||
|
|
||||||
mail($email, $subject, $text,
|
mail($a->config['admin_email'], $subject, $text,
|
||||||
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
|
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
|
||||||
. 'Content-type: text/plain; charset=UTF-8' . "\n"
|
. 'Content-type: text/plain; charset=UTF-8' . "\n"
|
||||||
. 'Content-transfer-encoding: 8bit' );
|
. 'Content-transfer-encoding: 8bit' );
|
||||||
//try the logger
|
//try the logger
|
||||||
logger('update failed: '.$ex->getMessage().EOL);
|
logger('update failed: '.$ex->getMessage().EOL);
|
||||||
|
}
|
||||||
|
$db->excep(FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
set_config('system','build', DB_UPDATE_VERSION);
|
||||||
}
|
}
|
||||||
set_config('system','build', DB_UPDATE_VERSION);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* Synchronise plugins:
|
* Synchronise plugins:
|
||||||
*
|
*
|
||||||
* $a->config['system']['addon'] contains a comma-separated list of names
|
* $a->config['system']['addon'] contains a comma-separated list of names
|
||||||
* of plugins/addons which are used on this system.
|
* of plugins/addons which are used on this system.
|
||||||
* Go through the database list of already installed addons, and if we have
|
* Go through the database list of already installed addons, and if we have
|
||||||
* an entry, but it isn't in the config list, call the uninstall procedure
|
* an entry, but it isn't in the config list, call the uninstall procedure
|
||||||
* and mark it uninstalled in the database (for now we'll remove it).
|
* and mark it uninstalled in the database (for now we'll remove it).
|
||||||
* Then go through the config list and if we have a plugin that isn't installed,
|
* Then go through the config list and if we have a plugin that isn't installed,
|
||||||
* call the install procedure and add it to the database.
|
* call the install procedure and add it to the database.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
|
$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
|
||||||
if(count($r))
|
if(count($r))
|
||||||
$installed = $r;
|
$installed = $r;
|
||||||
else
|
else
|
||||||
$installed = array();
|
$installed = array();
|
||||||
|
|
||||||
$plugins = get_config('system','addon');
|
$plugins = get_config('system','addon');
|
||||||
$plugins_arr = array();
|
$plugins_arr = array();
|
||||||
|
|
||||||
if($plugins)
|
if($plugins)
|
||||||
$plugins_arr = explode(',',str_replace(' ', '',$plugins));
|
$plugins_arr = explode(',',str_replace(' ', '',$plugins));
|
||||||
|
|
||||||
$a->plugins = $plugins_arr;
|
$a->plugins = $plugins_arr;
|
||||||
|
|
||||||
$installed_arr = array();
|
$installed_arr = array();
|
||||||
|
|
||||||
if(count($installed)) {
|
if(count($installed)) {
|
||||||
foreach($installed as $i) {
|
foreach($installed as $i) {
|
||||||
if(! in_array($i['name'],$plugins_arr)) {
|
if(! in_array($i['name'],$plugins_arr)) {
|
||||||
uninstall_plugin($i['name']);
|
uninstall_plugin($i['name']);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
$installed_arr[] = $i['name'];
|
$installed_arr[] = $i['name'];
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(count($plugins_arr)) {
|
|
||||||
foreach($plugins_arr as $p) {
|
|
||||||
if(! in_array($p,$installed_arr)) {
|
|
||||||
install_plugin($p);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(count($plugins_arr)) {
|
||||||
|
foreach($plugins_arr as $p) {
|
||||||
|
if(! in_array($p,$installed_arr)) {
|
||||||
|
install_plugin($p);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
load_hooks();
|
||||||
|
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
load_hooks();
|
|
||||||
|
|
||||||
return;
|
|
||||||
}}
|
|
||||||
|
|
||||||
|
|
||||||
function get_guid($size=16) {
|
function get_guid($size=16) {
|
||||||
|
|
@ -758,116 +764,124 @@ function get_guid($size=16) {
|
||||||
// returns the complete html for inserting into the page
|
// returns the complete html for inserting into the page
|
||||||
|
|
||||||
if(! function_exists('login')) {
|
if(! function_exists('login')) {
|
||||||
function login($register = false, $hiddens=false) {
|
function login($register = false, $hiddens=false) {
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
$o = "";
|
$o = "";
|
||||||
$reg = false;
|
$reg = false;
|
||||||
if ($register) {
|
if ($register) {
|
||||||
$reg = array(
|
$reg = array(
|
||||||
'title' => t('Create a New Account'),
|
'title' => t('Create a New Account'),
|
||||||
'desc' => t('Register')
|
'desc' => t('Register')
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
$noid = get_config('system','no_openid');
|
||||||
|
|
||||||
|
$dest_url = $a->get_baseurl(true) . '/' . $a->query_string;
|
||||||
|
|
||||||
|
if(local_user()) {
|
||||||
|
$tpl = get_markup_template("logout.tpl");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$tpl = get_markup_template("login.tpl");
|
||||||
|
$_SESSION['return_url'] = $a->query_string;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$o .= replace_macros($tpl,array(
|
||||||
|
|
||||||
|
'$dest_url' => $dest_url,
|
||||||
|
'$logout' => t('Logout'),
|
||||||
|
'$login' => t('Login'),
|
||||||
|
|
||||||
|
'$lname' => array('username', t('Nickname or Email address: ') , '', ''),
|
||||||
|
'$lpassword' => array('password', t('Password: '), '', ''),
|
||||||
|
|
||||||
|
'$openid' => !$noid,
|
||||||
|
'$lopenid' => array('openid_url', t('Or login using OpenID: '),'',''),
|
||||||
|
|
||||||
|
'$hiddens' => $hiddens,
|
||||||
|
|
||||||
|
'$register' => $reg,
|
||||||
|
|
||||||
|
'$lostpass' => t('Forgot your password?'),
|
||||||
|
'$lostlink' => t('Password Reset'),
|
||||||
|
));
|
||||||
|
|
||||||
|
call_hooks('login_hook',$o);
|
||||||
|
|
||||||
|
return $o;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
$noid = get_config('system','no_openid');
|
|
||||||
|
|
||||||
$dest_url = $a->get_baseurl(true) . '/' . $a->query_string;
|
|
||||||
|
|
||||||
if(local_user()) {
|
|
||||||
$tpl = get_markup_template("logout.tpl");
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$tpl = get_markup_template("login.tpl");
|
|
||||||
$_SESSION['return_url'] = $a->query_string;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
$o .= replace_macros($tpl,array(
|
|
||||||
|
|
||||||
'$dest_url' => $dest_url,
|
|
||||||
'$logout' => t('Logout'),
|
|
||||||
'$login' => t('Login'),
|
|
||||||
|
|
||||||
'$lname' => array('username', t('Nickname or Email address: ') , '', ''),
|
|
||||||
'$lpassword' => array('password', t('Password: '), '', ''),
|
|
||||||
|
|
||||||
'$openid' => !$noid,
|
|
||||||
'$lopenid' => array('openid_url', t('Or login using OpenID: '),'',''),
|
|
||||||
|
|
||||||
'$hiddens' => $hiddens,
|
|
||||||
|
|
||||||
'$register' => $reg,
|
|
||||||
|
|
||||||
'$lostpass' => t('Forgot your password?'),
|
|
||||||
'$lostlink' => t('Password Reset'),
|
|
||||||
));
|
|
||||||
|
|
||||||
call_hooks('login_hook',$o);
|
|
||||||
|
|
||||||
return $o;
|
|
||||||
}}
|
|
||||||
|
|
||||||
// Used to end the current process, after saving session state.
|
// Used to end the current process, after saving session state.
|
||||||
|
|
||||||
if(! function_exists('killme')) {
|
if(! function_exists('killme')) {
|
||||||
function killme() {
|
function killme() {
|
||||||
session_write_close();
|
session_write_close();
|
||||||
exit;
|
exit;
|
||||||
}}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// redirect to another URL and terminate this process.
|
// redirect to another URL and terminate this process.
|
||||||
|
|
||||||
if(! function_exists('goaway')) {
|
if(! function_exists('goaway')) {
|
||||||
function goaway($s) {
|
function goaway($s) {
|
||||||
header("Location: $s");
|
header("Location: $s");
|
||||||
killme();
|
killme();
|
||||||
}}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Returns the uid of locally logged in user or false.
|
// Returns the uid of locally logged in user or false.
|
||||||
|
|
||||||
if(! function_exists('local_user')) {
|
if(! function_exists('local_user')) {
|
||||||
function local_user() {
|
function local_user() {
|
||||||
if((x($_SESSION,'authenticated')) && (x($_SESSION,'uid')))
|
if((x($_SESSION,'authenticated')) && (x($_SESSION,'uid')))
|
||||||
return intval($_SESSION['uid']);
|
return intval($_SESSION['uid']);
|
||||||
return false;
|
return false;
|
||||||
}}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Returns contact id of authenticated site visitor or false
|
// Returns contact id of authenticated site visitor or false
|
||||||
|
|
||||||
if(! function_exists('remote_user')) {
|
if(! function_exists('remote_user')) {
|
||||||
function remote_user() {
|
function remote_user() {
|
||||||
if((x($_SESSION,'authenticated')) && (x($_SESSION,'visitor_id')))
|
if((x($_SESSION,'authenticated')) && (x($_SESSION,'visitor_id')))
|
||||||
return intval($_SESSION['visitor_id']);
|
return intval($_SESSION['visitor_id']);
|
||||||
return false;
|
return false;
|
||||||
}}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// contents of $s are displayed prominently on the page the next time
|
// contents of $s are displayed prominently on the page the next time
|
||||||
// a page is loaded. Usually used for errors or alerts.
|
// a page is loaded. Usually used for errors or alerts.
|
||||||
|
|
||||||
if(! function_exists('notice')) {
|
if(! function_exists('notice')) {
|
||||||
function notice($s) {
|
function notice($s) {
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
if(! x($_SESSION,'sysmsg')) $_SESSION['sysmsg'] = array();
|
if(! x($_SESSION,'sysmsg')) $_SESSION['sysmsg'] = array();
|
||||||
if($a->interactive)
|
if($a->interactive)
|
||||||
$_SESSION['sysmsg'][] = $s;
|
$_SESSION['sysmsg'][] = $s;
|
||||||
}}
|
}
|
||||||
|
}
|
||||||
if(! function_exists('info')) {
|
if(! function_exists('info')) {
|
||||||
function info($s) {
|
function info($s) {
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array();
|
if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array();
|
||||||
if($a->interactive)
|
if($a->interactive)
|
||||||
$_SESSION['sysmsg_info'][] = $s;
|
$_SESSION['sysmsg_info'][] = $s;
|
||||||
}}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// wrapper around config to limit the text length of an incoming message
|
// wrapper around config to limit the text length of an incoming message
|
||||||
|
|
||||||
if(! function_exists('get_max_import_size')) {
|
if(! function_exists('get_max_import_size')) {
|
||||||
function get_max_import_size() {
|
function get_max_import_size() {
|
||||||
global $a;
|
global $a;
|
||||||
return ((x($a->config,'max_import_size')) ? $a->config['max_import_size'] : 0 );
|
return ((x($a->config,'max_import_size')) ? $a->config['max_import_size'] : 0 );
|
||||||
}}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -893,83 +907,84 @@ function get_max_import_size() {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if(! function_exists('profile_load')) {
|
if(! function_exists('profile_load')) {
|
||||||
function profile_load(&$a, $nickname, $profile = 0) {
|
function profile_load(&$a, $nickname, $profile = 0) {
|
||||||
if(remote_user()) {
|
if(remote_user()) {
|
||||||
$r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1",
|
$r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1",
|
||||||
intval($_SESSION['visitor_id']));
|
intval($_SESSION['visitor_id']));
|
||||||
if(count($r))
|
if(count($r))
|
||||||
$profile = $r[0]['profile-id'];
|
$profile = $r[0]['profile-id'];
|
||||||
}
|
}
|
||||||
|
|
||||||
$r = null;
|
$r = null;
|
||||||
|
|
||||||
if($profile) {
|
if($profile) {
|
||||||
$profile_int = intval($profile);
|
$profile_int = intval($profile);
|
||||||
$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
|
$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
|
||||||
left join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
|
left join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
|
||||||
WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d and `contact`.`self` = 1 LIMIT 1",
|
WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d and `contact`.`self` = 1 LIMIT 1",
|
||||||
dbesc($nickname),
|
dbesc($nickname),
|
||||||
intval($profile_int)
|
intval($profile_int)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if((! $r) && (! count($r))) {
|
if((! $r) && (! count($r))) {
|
||||||
$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
|
$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
|
||||||
left join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
|
left join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
|
||||||
WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 and `contact`.`self` = 1 LIMIT 1",
|
WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 and `contact`.`self` = 1 LIMIT 1",
|
||||||
dbesc($nickname)
|
dbesc($nickname)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(($r === false) || (! count($r))) {
|
||||||
|
notice( t('Requested profile is not available.') . EOL );
|
||||||
|
$a->error = 404;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// fetch user tags if this isn't the default profile
|
||||||
|
|
||||||
|
if(! $r[0]['is-default']) {
|
||||||
|
$x = q("select `pub_keywords` from `profile` where uid = %d and `is-default` = 1 limit 1",
|
||||||
|
intval($profile_uid)
|
||||||
|
);
|
||||||
|
if($x && count($x))
|
||||||
|
$r[0]['pub_keywords'] = $x[0]['pub_keywords'];
|
||||||
|
}
|
||||||
|
|
||||||
|
$a->profile = $r[0];
|
||||||
|
|
||||||
|
|
||||||
|
$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
|
||||||
|
$_SESSION['theme'] = $a->profile['theme'];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* load/reload current theme info
|
||||||
|
*/
|
||||||
|
|
||||||
|
$theme_info_file = "view/theme/".current_theme()."/theme.php";
|
||||||
|
if (file_exists($theme_info_file)){
|
||||||
|
require_once($theme_info_file);
|
||||||
|
}
|
||||||
|
|
||||||
|
if(! (x($a->page,'aside')))
|
||||||
|
$a->page['aside'] = '';
|
||||||
|
|
||||||
|
if(local_user() && local_user() == $a->profile['uid']) {
|
||||||
|
$a->page['aside'] .= replace_macros(get_markup_template('profile_edlink.tpl'),array(
|
||||||
|
'$editprofile' => t('Edit profile'),
|
||||||
|
'$profid' => $a->profile['id']
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
$block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
|
||||||
|
|
||||||
|
$a->page['aside'] .= profile_sidebar($a->profile, $block);
|
||||||
|
|
||||||
|
/*if(! $block)
|
||||||
|
$a->page['aside'] .= contact_block();*/
|
||||||
|
|
||||||
if(($r === false) || (! count($r))) {
|
|
||||||
notice( t('Requested profile is not available.') . EOL );
|
|
||||||
$a->error = 404;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// fetch user tags if this isn't the default profile
|
|
||||||
|
|
||||||
if(! $r[0]['is-default']) {
|
|
||||||
$x = q("select `pub_keywords` from `profile` where uid = %d and `is-default` = 1 limit 1",
|
|
||||||
intval($profile_uid)
|
|
||||||
);
|
|
||||||
if($x && count($x))
|
|
||||||
$r[0]['pub_keywords'] = $x[0]['pub_keywords'];
|
|
||||||
}
|
|
||||||
|
|
||||||
$a->profile = $r[0];
|
|
||||||
|
|
||||||
|
|
||||||
$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
|
|
||||||
$_SESSION['theme'] = $a->profile['theme'];
|
|
||||||
|
|
||||||
/**
|
|
||||||
* load/reload current theme info
|
|
||||||
*/
|
|
||||||
|
|
||||||
$theme_info_file = "view/theme/".current_theme()."/theme.php";
|
|
||||||
if (file_exists($theme_info_file)){
|
|
||||||
require_once($theme_info_file);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(! (x($a->page,'aside')))
|
|
||||||
$a->page['aside'] = '';
|
|
||||||
|
|
||||||
if(local_user() && local_user() == $a->profile['uid']) {
|
|
||||||
$a->page['aside'] .= replace_macros(get_markup_template('profile_edlink.tpl'),array(
|
|
||||||
'$editprofile' => t('Edit profile'),
|
|
||||||
'$profid' => $a->profile['id']
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
$block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
|
|
||||||
|
|
||||||
$a->page['aside'] .= profile_sidebar($a->profile, $block);
|
|
||||||
|
|
||||||
/*if(! $block)
|
|
||||||
$a->page['aside'] .= contact_block();*/
|
|
||||||
|
|
||||||
return;
|
|
||||||
}}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -989,269 +1004,272 @@ function profile_load(&$a, $nickname, $profile = 0) {
|
||||||
|
|
||||||
|
|
||||||
if(! function_exists('profile_sidebar')) {
|
if(! function_exists('profile_sidebar')) {
|
||||||
function profile_sidebar($profile, $block = 0) {
|
function profile_sidebar($profile, $block = 0) {
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
$o = '';
|
$o = '';
|
||||||
$location = false;
|
$location = false;
|
||||||
$address = false;
|
$address = false;
|
||||||
$pdesc = true;
|
$pdesc = true;
|
||||||
|
|
||||||
if((! is_array($profile)) && (! count($profile)))
|
if((! is_array($profile)) && (! count($profile)))
|
||||||
return $o;
|
return $o;
|
||||||
|
|
||||||
$profile['picdate'] = urlencode($profile['picdate']);
|
$profile['picdate'] = urlencode($profile['picdate']);
|
||||||
|
|
||||||
call_hooks('profile_sidebar_enter', $profile);
|
call_hooks('profile_sidebar_enter', $profile);
|
||||||
|
|
||||||
|
|
||||||
// don't show connect link to yourself
|
// don't show connect link to yourself
|
||||||
$connect = (($profile['uid'] != local_user()) ? t('Connect') : False);
|
$connect = (($profile['uid'] != local_user()) ? t('Connect') : False);
|
||||||
|
|
||||||
// don't show connect link to authenticated visitors either
|
// don't show connect link to authenticated visitors either
|
||||||
|
|
||||||
if((remote_user()) && ($_SESSION['visitor_visiting'] == $profile['uid']))
|
if((remote_user()) && ($_SESSION['visitor_visiting'] == $profile['uid']))
|
||||||
$connect = False;
|
$connect = False;
|
||||||
|
|
||||||
if(get_my_url() && $profile['unkmail'])
|
if(get_my_url() && $profile['unkmail'])
|
||||||
$wallmessage = t('Message');
|
$wallmessage = t('Message');
|
||||||
else
|
else
|
||||||
$wallmessage = false;
|
$wallmessage = false;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// show edit profile to yourself
|
// show edit profile to yourself
|
||||||
if ($profile['uid'] == local_user()) {
|
if ($profile['uid'] == local_user()) {
|
||||||
$profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
|
$profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
|
||||||
|
|
||||||
$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
|
$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
|
||||||
local_user());
|
local_user());
|
||||||
|
|
||||||
$profile['menu'] = array(
|
$profile['menu'] = array(
|
||||||
'chg_photo' => t('Change profile photo'),
|
'chg_photo' => t('Change profile photo'),
|
||||||
'cr_new' => t('Create New Profile'),
|
'cr_new' => t('Create New Profile'),
|
||||||
'entries' => array(),
|
'entries' => array(),
|
||||||
);
|
);
|
||||||
|
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
|
|
||||||
|
foreach($r as $rr) {
|
||||||
|
$profile['menu']['entries'][] = array(
|
||||||
|
'photo' => $rr['thumb'],
|
||||||
|
'id' => $rr['id'],
|
||||||
|
'alt' => t('Profile Image'),
|
||||||
|
'profile_name' => $rr['profile-name'],
|
||||||
|
'isdefault' => $rr['is-default'],
|
||||||
|
'visibile_to_everybody' => t('visible to everybody'),
|
||||||
|
'edit_visibility' => t('Edit visibility'),
|
||||||
|
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
foreach($r as $rr) {
|
|
||||||
$profile['menu']['entries'][] = array(
|
|
||||||
'photo' => $rr['thumb'],
|
|
||||||
'id' => $rr['id'],
|
|
||||||
'alt' => t('Profile Image'),
|
|
||||||
'profile_name' => $rr['profile-name'],
|
|
||||||
'isdefault' => $rr['is-default'],
|
|
||||||
'visibile_to_everybody' => t('visible to everybody'),
|
|
||||||
'edit_visibility' => t('Edit visibility'),
|
|
||||||
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if((x($profile,'address') == 1)
|
||||||
|
|| (x($profile,'locality') == 1)
|
||||||
|
|| (x($profile,'region') == 1)
|
||||||
|
|| (x($profile,'postal-code') == 1)
|
||||||
|
|| (x($profile,'country-name') == 1))
|
||||||
|
$location = t('Location:');
|
||||||
|
|
||||||
|
$gender = ((x($profile,'gender') == 1) ? t('Gender:') : False);
|
||||||
|
|
||||||
|
|
||||||
|
$marital = ((x($profile,'marital') == 1) ? t('Status:') : False);
|
||||||
|
|
||||||
|
$homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False);
|
||||||
|
|
||||||
|
if(($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
|
||||||
|
$location = $pdesc = $gender = $marital = $homepage = False;
|
||||||
|
}
|
||||||
|
|
||||||
|
$firstname = ((strpos($profile['name'],' '))
|
||||||
|
? trim(substr($profile['name'],0,strpos($profile['name'],' '))) : $profile['name']);
|
||||||
|
$lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'],strlen($firstname))));
|
||||||
|
|
||||||
|
$diaspora = array(
|
||||||
|
'podloc' => $a->get_baseurl(),
|
||||||
|
'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
|
||||||
|
'nickname' => $profile['nickname'],
|
||||||
|
'fullname' => $profile['name'],
|
||||||
|
'firstname' => $firstname,
|
||||||
|
'lastname' => $lastname,
|
||||||
|
'photo300' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
|
||||||
|
'photo100' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
|
||||||
|
'photo50' => $a->get_baseurl() . '/photo/custom/50/' . $profile['uid'] . '.jpg',
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!$block){
|
||||||
|
$contact_block = contact_block();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$tpl = get_markup_template('profile_vcard.tpl');
|
||||||
|
|
||||||
|
$o .= replace_macros($tpl, array(
|
||||||
|
'$profile' => $profile,
|
||||||
|
'$connect' => $connect,
|
||||||
|
'$wallmessage' => $wallmessage,
|
||||||
|
'$location' => template_escape($location),
|
||||||
|
'$gender' => $gender,
|
||||||
|
'$pdesc' => $pdesc,
|
||||||
|
'$marital' => $marital,
|
||||||
|
'$homepage' => $homepage,
|
||||||
|
'$diaspora' => $diaspora,
|
||||||
|
'$contact_block' => $contact_block,
|
||||||
|
));
|
||||||
|
|
||||||
|
|
||||||
|
$arr = array('profile' => &$profile, 'entry' => &$o);
|
||||||
|
|
||||||
|
call_hooks('profile_sidebar', $arr);
|
||||||
|
|
||||||
|
return $o;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if((x($profile,'address') == 1)
|
|
||||||
|| (x($profile,'locality') == 1)
|
|
||||||
|| (x($profile,'region') == 1)
|
|
||||||
|| (x($profile,'postal-code') == 1)
|
|
||||||
|| (x($profile,'country-name') == 1))
|
|
||||||
$location = t('Location:');
|
|
||||||
|
|
||||||
$gender = ((x($profile,'gender') == 1) ? t('Gender:') : False);
|
|
||||||
|
|
||||||
|
|
||||||
$marital = ((x($profile,'marital') == 1) ? t('Status:') : False);
|
|
||||||
|
|
||||||
$homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False);
|
|
||||||
|
|
||||||
if(($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
|
|
||||||
$location = $pdesc = $gender = $marital = $homepage = False;
|
|
||||||
}
|
|
||||||
|
|
||||||
$firstname = ((strpos($profile['name'],' '))
|
|
||||||
? trim(substr($profile['name'],0,strpos($profile['name'],' '))) : $profile['name']);
|
|
||||||
$lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'],strlen($firstname))));
|
|
||||||
|
|
||||||
$diaspora = array(
|
|
||||||
'podloc' => $a->get_baseurl(),
|
|
||||||
'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
|
|
||||||
'nickname' => $profile['nickname'],
|
|
||||||
'fullname' => $profile['name'],
|
|
||||||
'firstname' => $firstname,
|
|
||||||
'lastname' => $lastname,
|
|
||||||
'photo300' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
|
|
||||||
'photo100' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
|
|
||||||
'photo50' => $a->get_baseurl() . '/photo/custom/50/' . $profile['uid'] . '.jpg',
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!$block){
|
|
||||||
$contact_block = contact_block();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
$tpl = get_markup_template('profile_vcard.tpl');
|
|
||||||
|
|
||||||
$o .= replace_macros($tpl, array(
|
|
||||||
'$profile' => $profile,
|
|
||||||
'$connect' => $connect,
|
|
||||||
'$wallmessage' => $wallmessage,
|
|
||||||
'$location' => template_escape($location),
|
|
||||||
'$gender' => $gender,
|
|
||||||
'$pdesc' => $pdesc,
|
|
||||||
'$marital' => $marital,
|
|
||||||
'$homepage' => $homepage,
|
|
||||||
'$diaspora' => $diaspora,
|
|
||||||
'$contact_block' => $contact_block,
|
|
||||||
));
|
|
||||||
|
|
||||||
|
|
||||||
$arr = array('profile' => &$profile, 'entry' => &$o);
|
|
||||||
|
|
||||||
call_hooks('profile_sidebar', $arr);
|
|
||||||
|
|
||||||
return $o;
|
|
||||||
}}
|
|
||||||
|
|
||||||
|
|
||||||
if(! function_exists('get_birthdays')) {
|
if(! function_exists('get_birthdays')) {
|
||||||
function get_birthdays() {
|
function get_birthdays() {
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
$o = '';
|
$o = '';
|
||||||
|
|
||||||
if(! local_user())
|
if(! local_user())
|
||||||
return $o;
|
return $o;
|
||||||
|
|
||||||
$bd_format = t('g A l F d') ; // 8 AM Friday January 18
|
$bd_format = t('g A l F d') ; // 8 AM Friday January 18
|
||||||
$bd_short = t('F d');
|
$bd_short = t('F d');
|
||||||
|
|
||||||
$r = q("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
|
$r = q("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
|
||||||
LEFT JOIN `contact` ON `contact`.`id` = `event`.`cid`
|
LEFT JOIN `contact` ON `contact`.`id` = `event`.`cid`
|
||||||
WHERE `event`.`uid` = %d AND `type` = 'birthday' AND `start` < '%s' AND `finish` > '%s'
|
WHERE `event`.`uid` = %d AND `type` = 'birthday' AND `start` < '%s' AND `finish` > '%s'
|
||||||
ORDER BY `start` ASC ",
|
ORDER BY `start` ASC ",
|
||||||
intval(local_user()),
|
intval(local_user()),
|
||||||
dbesc(datetime_convert('UTC','UTC','now + 6 days')),
|
dbesc(datetime_convert('UTC','UTC','now + 6 days')),
|
||||||
dbesc(datetime_convert('UTC','UTC','now'))
|
dbesc(datetime_convert('UTC','UTC','now'))
|
||||||
);
|
);
|
||||||
|
|
||||||
if($r && count($r)) {
|
if($r && count($r)) {
|
||||||
$total = 0;
|
$total = 0;
|
||||||
$now = strtotime('now');
|
$now = strtotime('now');
|
||||||
$cids = array();
|
$cids = array();
|
||||||
|
|
||||||
$istoday = false;
|
$istoday = false;
|
||||||
foreach($r as $rr) {
|
foreach($r as $rr) {
|
||||||
if(strlen($rr['name']))
|
if(strlen($rr['name']))
|
||||||
$total ++;
|
$total ++;
|
||||||
if((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now))
|
if((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now))
|
||||||
$istoday = true;
|
$istoday = true;
|
||||||
|
}
|
||||||
|
$classtoday = $istoday ? ' birthday-today ' : '';
|
||||||
|
if($total) {
|
||||||
|
$o .= '<div id="birthday-notice" class="birthday-notice fakelink' . $classtoday . '" onclick=openClose(\'birthday-wrapper\'); >' . t('Birthday Reminders') . ' ' . '(' . $total . ')' . '</div>';
|
||||||
|
$o .= '<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">' . t('Birthdays this week:') . '</div>';
|
||||||
|
$o .= '<div id="birthday-title-end"></div>';
|
||||||
|
|
||||||
|
foreach($r as $rr) {
|
||||||
|
if(! strlen($rr['name']))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
// avoid duplicates
|
||||||
|
|
||||||
|
if(in_array($rr['cid'],$cids))
|
||||||
|
continue;
|
||||||
|
$cids[] = $rr['cid'];
|
||||||
|
|
||||||
|
$today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false);
|
||||||
|
$sparkle = '';
|
||||||
|
$url = $rr['url'];
|
||||||
|
if($rr['network'] === NETWORK_DFRN) {
|
||||||
|
$sparkle = " sparkle";
|
||||||
|
$url = $a->get_baseurl() . '/redir/' . $rr['cid'];
|
||||||
|
}
|
||||||
|
|
||||||
|
$o .= '<div class="birthday-list" id="birthday-' . $rr['eid'] . '"><a class="birthday-link$sparkle" target="redir" href="'
|
||||||
|
. $url . '">' . $rr['name'] . '</a> '
|
||||||
|
. day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . t('[today]') : '')
|
||||||
|
. '</div>' ;
|
||||||
|
}
|
||||||
|
$o .= '</div></div>';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
$classtoday = $istoday ? ' birthday-today ' : '';
|
return $o;
|
||||||
if($total) {
|
}
|
||||||
$o .= '<div id="birthday-notice" class="birthday-notice fakelink' . $classtoday . '" onclick=openClose(\'birthday-wrapper\'); >' . t('Birthday Reminders') . ' ' . '(' . $total . ')' . '</div>';
|
}
|
||||||
$o .= '<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">' . t('Birthdays this week:') . '</div>';
|
|
||||||
$o .= '<div id="birthday-title-end"></div>';
|
|
||||||
|
if(! function_exists('get_events')) {
|
||||||
|
function get_events() {
|
||||||
|
|
||||||
|
require_once('include/bbcode.php');
|
||||||
|
|
||||||
|
$a = get_app();
|
||||||
|
$o = '';
|
||||||
|
|
||||||
|
if(! local_user())
|
||||||
|
return $o;
|
||||||
|
|
||||||
|
$bd_format = t('g A l F d') ; // 8 AM Friday January 18
|
||||||
|
$bd_short = t('F d');
|
||||||
|
|
||||||
|
$r = q("SELECT `event`.* FROM `event`
|
||||||
|
WHERE `event`.`uid` = %d AND `type` != 'birthday' AND `start` < '%s' AND `start` > '%s'
|
||||||
|
ORDER BY `start` ASC ",
|
||||||
|
intval(local_user()),
|
||||||
|
dbesc(datetime_convert('UTC','UTC','now + 6 days')),
|
||||||
|
dbesc(datetime_convert('UTC','UTC','now - 1 days'))
|
||||||
|
);
|
||||||
|
|
||||||
|
if($r && count($r)) {
|
||||||
|
$now = strtotime('now');
|
||||||
|
$istoday = false;
|
||||||
|
foreach($r as $rr) {
|
||||||
|
if(strlen($rr['name']))
|
||||||
|
$total ++;
|
||||||
|
|
||||||
|
$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start'],'Y-m-d');
|
||||||
|
if($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d'))
|
||||||
|
$istoday = true;
|
||||||
|
}
|
||||||
|
$classtoday = (($istoday) ? ' event-today ' : '');
|
||||||
|
|
||||||
|
$o .= '<div id="event-notice" class="birthday-notice fakelink' . $classtoday . '" onclick=openClose(\'event-wrapper\'); >' . t('Event Reminders') . ' ' . '(' . count($r) . ')' . '</div>';
|
||||||
|
$o .= '<div id="event-wrapper" style="display: none;" ><div id="event-title">' . t('Events this week:') . '</div>';
|
||||||
|
$o .= '<div id="event-title-end"></div>';
|
||||||
|
|
||||||
foreach($r as $rr) {
|
foreach($r as $rr) {
|
||||||
if(! strlen($rr['name']))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
// avoid duplicates
|
if($rr['adjust'])
|
||||||
|
$md = datetime_convert('UTC',$a->timezone,$rr['start'],'Y/m\#\l\i\n\k\-j');
|
||||||
|
else
|
||||||
|
$md = datetime_convert('UTC','UTC',$rr['start'],'Y/m\#\l\i\n\k\-j');
|
||||||
|
|
||||||
if(in_array($rr['cid'],$cids))
|
$title = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
|
||||||
continue;
|
if(! $title)
|
||||||
$cids[] = $rr['cid'];
|
$title = t('[No description]');
|
||||||
|
|
||||||
$today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false);
|
$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
|
||||||
$sparkle = '';
|
$today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false);
|
||||||
$url = $rr['url'];
|
|
||||||
if($rr['network'] === NETWORK_DFRN) {
|
|
||||||
$sparkle = " sparkle";
|
|
||||||
$url = $a->get_baseurl() . '/redir/' . $rr['cid'];
|
|
||||||
}
|
|
||||||
|
|
||||||
$o .= '<div class="birthday-list" id="birthday-' . $rr['eid'] . '"><a class="birthday-link$sparkle" target="redir" href="'
|
$o .= '<div class="event-list" id="event-' . $rr['eid'] . '"></a> <a href="events/' . $md . '">' . $title . '</a>'
|
||||||
. $url . '">' . $rr['name'] . '</a> '
|
. day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ? ' ' . t('[today]') : '')
|
||||||
. day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . t('[today]') : '')
|
|
||||||
. '</div>' ;
|
. '</div>' ;
|
||||||
}
|
}
|
||||||
$o .= '</div></div>';
|
$o .= '</div></div>';
|
||||||
}
|
}
|
||||||
}
|
|
||||||
return $o;
|
|
||||||
}}
|
|
||||||
|
|
||||||
|
|
||||||
if(! function_exists('get_events')) {
|
|
||||||
function get_events() {
|
|
||||||
|
|
||||||
require_once('include/bbcode.php');
|
|
||||||
|
|
||||||
$a = get_app();
|
|
||||||
$o = '';
|
|
||||||
|
|
||||||
if(! local_user())
|
|
||||||
return $o;
|
return $o;
|
||||||
|
|
||||||
$bd_format = t('g A l F d') ; // 8 AM Friday January 18
|
|
||||||
$bd_short = t('F d');
|
|
||||||
|
|
||||||
$r = q("SELECT `event`.* FROM `event`
|
|
||||||
WHERE `event`.`uid` = %d AND `type` != 'birthday' AND `start` < '%s' AND `start` > '%s'
|
|
||||||
ORDER BY `start` ASC ",
|
|
||||||
intval(local_user()),
|
|
||||||
dbesc(datetime_convert('UTC','UTC','now + 6 days')),
|
|
||||||
dbesc(datetime_convert('UTC','UTC','now - 1 days'))
|
|
||||||
);
|
|
||||||
|
|
||||||
if($r && count($r)) {
|
|
||||||
$now = strtotime('now');
|
|
||||||
$istoday = false;
|
|
||||||
foreach($r as $rr) {
|
|
||||||
if(strlen($rr['name']))
|
|
||||||
$total ++;
|
|
||||||
|
|
||||||
$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start'],'Y-m-d');
|
|
||||||
if($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d'))
|
|
||||||
$istoday = true;
|
|
||||||
}
|
|
||||||
$classtoday = (($istoday) ? ' event-today ' : '');
|
|
||||||
|
|
||||||
$o .= '<div id="event-notice" class="birthday-notice fakelink' . $classtoday . '" onclick=openClose(\'event-wrapper\'); >' . t('Event Reminders') . ' ' . '(' . count($r) . ')' . '</div>';
|
|
||||||
$o .= '<div id="event-wrapper" style="display: none;" ><div id="event-title">' . t('Events this week:') . '</div>';
|
|
||||||
$o .= '<div id="event-title-end"></div>';
|
|
||||||
|
|
||||||
foreach($r as $rr) {
|
|
||||||
|
|
||||||
if($rr['adjust'])
|
|
||||||
$md = datetime_convert('UTC',$a->timezone,$rr['start'],'Y/m\#\l\i\n\k\-j');
|
|
||||||
else
|
|
||||||
$md = datetime_convert('UTC','UTC',$rr['start'],'Y/m\#\l\i\n\k\-j');
|
|
||||||
|
|
||||||
$title = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
|
|
||||||
if(! $title)
|
|
||||||
$title = t('[No description]');
|
|
||||||
|
|
||||||
$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
|
|
||||||
$today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false);
|
|
||||||
|
|
||||||
$o .= '<div class="event-list" id="event-' . $rr['eid'] . '"></a> <a href="events/' . $md . '">' . $title . '</a>'
|
|
||||||
. day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ? ' ' . t('[today]') : '')
|
|
||||||
. '</div>' ;
|
|
||||||
}
|
|
||||||
$o .= '</div></div>';
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return $o;
|
|
||||||
}}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1269,198 +1287,205 @@ function get_events() {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if(! function_exists('proc_run')) {
|
if(! function_exists('proc_run')) {
|
||||||
function proc_run($cmd){
|
function proc_run($cmd){
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
$args = func_get_args();
|
$args = func_get_args();
|
||||||
$arr = array('args' => $args, 'run_cmd' => true);
|
$arr = array('args' => $args, 'run_cmd' => true);
|
||||||
|
|
||||||
call_hooks("proc_run", $arr);
|
call_hooks("proc_run", $arr);
|
||||||
if(! $arr['run_cmd'])
|
if(! $arr['run_cmd'])
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if(count($args) && $args[0] === 'php')
|
if(count($args) && $args[0] === 'php')
|
||||||
$args[0] = ((x($a->config,'php_path')) && (strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
|
$args[0] = ((x($a->config,'php_path')) && (strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
|
||||||
foreach ($args as $arg){
|
foreach ($args as $arg){
|
||||||
$arg = escapeshellarg($arg);
|
$arg = escapeshellarg($arg);
|
||||||
|
}
|
||||||
|
$cmdline = implode($args," ");
|
||||||
|
proc_close(proc_open($cmdline." &",array(),$foo));
|
||||||
}
|
}
|
||||||
$cmdline = implode($args," ");
|
}
|
||||||
proc_close(proc_open($cmdline." &",array(),$foo));
|
|
||||||
}}
|
|
||||||
|
|
||||||
if(! function_exists('current_theme')) {
|
if(! function_exists('current_theme')) {
|
||||||
function current_theme(){
|
function current_theme(){
|
||||||
$app_base_themes = array('duepuntozero', 'loozah');
|
$app_base_themes = array('duepuntozero', 'loozah');
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
$system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
|
$system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
|
||||||
$theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $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') ||
|
||||||
file_exists('view/theme/' . $theme_name . '/style.php')))
|
file_exists('view/theme/' . $theme_name . '/style.php')))
|
||||||
return($theme_name);
|
return($theme_name);
|
||||||
|
|
||||||
foreach($app_base_themes as $t) {
|
foreach($app_base_themes as $t) {
|
||||||
if(file_exists('view/theme/' . $t . '/style.css')||
|
if(file_exists('view/theme/' . $t . '/style.css')||
|
||||||
file_exists('view/theme/' . $t . '/style.php'))
|
file_exists('view/theme/' . $t . '/style.php'))
|
||||||
return($t);
|
return($t);
|
||||||
|
}
|
||||||
|
|
||||||
|
$fallback = glob('view/theme/*/style.[css|php]');
|
||||||
|
if(count($fallback))
|
||||||
|
return (str_replace('view/theme/','', substr($fallback[0],0,-10)));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
$fallback = glob('view/theme/*/style.[css|php]');
|
|
||||||
if(count($fallback))
|
|
||||||
return (str_replace('view/theme/','', substr($fallback[0],0,-10)));
|
|
||||||
|
|
||||||
}}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Return full URL to theme which is currently in effect.
|
* Return full URL to theme which is currently in effect.
|
||||||
* Provide a sane default if nothing is chosen or the specified theme does not exist.
|
* Provide a sane default if nothing is chosen or the specified theme does not exist.
|
||||||
*/
|
*/
|
||||||
if(! function_exists('current_theme_url')) {
|
if(! function_exists('current_theme_url')) {
|
||||||
function current_theme_url() {
|
function current_theme_url() {
|
||||||
global $a;
|
global $a;
|
||||||
$t = current_theme();
|
$t = current_theme();
|
||||||
if (file_exists('view/theme/' . $t . '/style.php'))
|
if (file_exists('view/theme/' . $t . '/style.php'))
|
||||||
return($a->get_baseurl() . '/view/theme/' . $t . '/style.pcss');
|
return($a->get_baseurl() . '/view/theme/' . $t . '/style.pcss');
|
||||||
return($a->get_baseurl() . '/view/theme/' . $t . '/style.css');
|
return($a->get_baseurl() . '/view/theme/' . $t . '/style.css');
|
||||||
}}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(! function_exists('feed_birthday')) {
|
if(! function_exists('feed_birthday')) {
|
||||||
function feed_birthday($uid,$tz) {
|
function feed_birthday($uid,$tz) {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* Determine the next birthday, but only if the birthday is published
|
* Determine the next birthday, but only if the birthday is published
|
||||||
* in the default profile. We _could_ also look for a private profile that the
|
* in the default profile. We _could_ also look for a private profile that the
|
||||||
* recipient can see, but somebody could get mad at us if they start getting
|
* recipient can see, but somebody could get mad at us if they start getting
|
||||||
* public birthday greetings when they haven't made this info public.
|
* public birthday greetings when they haven't made this info public.
|
||||||
*
|
*
|
||||||
* Assuming we are able to publish this info, we are then going to convert
|
* Assuming we are able to publish this info, we are then going to convert
|
||||||
* the start time from the owner's timezone to UTC.
|
* the start time from the owner's timezone to UTC.
|
||||||
*
|
*
|
||||||
* This will potentially solve the problem found with some social networks
|
* This will potentially solve the problem found with some social networks
|
||||||
* where birthdays are converted to the viewer's timezone and salutations from
|
* where birthdays are converted to the viewer's timezone and salutations from
|
||||||
* elsewhere in the world show up on the wrong day. We will convert it to the
|
* elsewhere in the world show up on the wrong day. We will convert it to the
|
||||||
* viewer's timezone also, but first we are going to convert it from the birthday
|
* viewer's timezone also, but first we are going to convert it from the birthday
|
||||||
* person's timezone to GMT - so the viewer may find the birthday starting at
|
* person's timezone to GMT - so the viewer may find the birthday starting at
|
||||||
* 6:00PM the day before, but that will correspond to midnight to the birthday person.
|
* 6:00PM the day before, but that will correspond to midnight to the birthday person.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
$birthday = '';
|
$birthday = '';
|
||||||
|
|
||||||
if(! strlen($tz))
|
if(! strlen($tz))
|
||||||
$tz = 'UTC';
|
$tz = 'UTC';
|
||||||
|
|
||||||
$p = q("SELECT `dob` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
|
$p = q("SELECT `dob` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
|
|
||||||
if($p && count($p)) {
|
if($p && count($p)) {
|
||||||
$tmp_dob = substr($p[0]['dob'],5);
|
$tmp_dob = substr($p[0]['dob'],5);
|
||||||
if(intval($tmp_dob)) {
|
if(intval($tmp_dob)) {
|
||||||
$y = datetime_convert($tz,$tz,'now','Y');
|
$y = datetime_convert($tz,$tz,'now','Y');
|
||||||
$bd = $y . '-' . $tmp_dob . ' 00:00';
|
$bd = $y . '-' . $tmp_dob . ' 00:00';
|
||||||
$t_dob = strtotime($bd);
|
$t_dob = strtotime($bd);
|
||||||
$now = strtotime(datetime_convert($tz,$tz,'now'));
|
$now = strtotime(datetime_convert($tz,$tz,'now'));
|
||||||
if($t_dob < $now)
|
if($t_dob < $now)
|
||||||
$bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
|
$bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
|
||||||
$birthday = datetime_convert($tz,'UTC',$bd,ATOM_TIME);
|
$birthday = datetime_convert($tz,'UTC',$bd,ATOM_TIME);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return $birthday;
|
return $birthday;
|
||||||
}}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(! function_exists('is_site_admin')) {
|
if(! function_exists('is_site_admin')) {
|
||||||
function is_site_admin() {
|
function is_site_admin() {
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email']))
|
if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email']))
|
||||||
return true;
|
return true;
|
||||||
return false;
|
return false;
|
||||||
}}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if(! function_exists('load_contact_links')) {
|
if(! function_exists('load_contact_links')) {
|
||||||
function load_contact_links($uid) {
|
function load_contact_links($uid) {
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
$ret = array();
|
$ret = array();
|
||||||
|
|
||||||
if(! $uid || x($a->contacts,'empty'))
|
if(! $uid || x($a->contacts,'empty'))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
$r = q("SELECT `id`,`network`,`url`,`thumb` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 ",
|
$r = q("SELECT `id`,`network`,`url`,`thumb` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 ",
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
foreach($r as $rr){
|
foreach($r as $rr){
|
||||||
$url = normalise_link($rr['url']);
|
$url = normalise_link($rr['url']);
|
||||||
$ret[$url] = $rr;
|
$ret[$url] = $rr;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
$ret['empty'] = true;
|
||||||
|
$a->contacts = $ret;
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
else
|
}
|
||||||
$ret['empty'] = true;
|
|
||||||
$a->contacts = $ret;
|
|
||||||
return;
|
|
||||||
}}
|
|
||||||
|
|
||||||
if(! function_exists('profile_tabs')){
|
if(! function_exists('profile_tabs')){
|
||||||
function profile_tabs($a, $is_owner=False, $nickname=Null){
|
function profile_tabs($a, $is_owner=False, $nickname=Null){
|
||||||
//echo "<pre>"; var_dump($a->user); killme();
|
//echo "<pre>"; var_dump($a->user); killme();
|
||||||
|
|
||||||
if (is_null($nickname))
|
if (is_null($nickname))
|
||||||
$nickname = $a->user['nickname'];
|
$nickname = $a->user['nickname'];
|
||||||
|
|
||||||
if(x($_GET,'tab'))
|
if(x($_GET,'tab'))
|
||||||
$tab = notags(trim($_GET['tab']));
|
$tab = notags(trim($_GET['tab']));
|
||||||
|
|
||||||
$url = $a->get_baseurl() . '/profile/' . $nickname;
|
$url = $a->get_baseurl() . '/profile/' . $nickname;
|
||||||
|
|
||||||
$tabs = array(
|
$tabs = array(
|
||||||
array(
|
array(
|
||||||
'label'=>t('Status'),
|
'label'=>t('Status'),
|
||||||
'url' => $url,
|
'url' => $url,
|
||||||
'sel' => ((!isset($tab)&&$a->argv[0]=='profile')?'active':''),
|
'sel' => ((!isset($tab)&&$a->argv[0]=='profile')?'active':''),
|
||||||
),
|
),
|
||||||
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':''),
|
||||||
),
|
),
|
||||||
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':''),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($is_owner){
|
if ($is_owner){
|
||||||
$tabs[] = array(
|
$tabs[] = array(
|
||||||
'label' => t('Events'),
|
'label' => t('Events'),
|
||||||
'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':''),
|
||||||
);
|
);
|
||||||
$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':''),
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
|
||||||
|
call_hooks('profile_tabs', $arr);
|
||||||
|
|
||||||
|
$tpl = get_markup_template('common_tabs.tpl');
|
||||||
|
|
||||||
|
return replace_macros($tpl,array('$tabs' => $arr['tabs']));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
|
|
||||||
call_hooks('profile_tabs', $arr);
|
|
||||||
|
|
||||||
$tpl = get_markup_template('common_tabs.tpl');
|
|
||||||
|
|
||||||
return replace_macros($tpl,array('$tabs' => $arr['tabs']));
|
|
||||||
}}
|
|
||||||
|
|
||||||
function get_my_url() {
|
function get_my_url() {
|
||||||
if(x($_SESSION,'my_url'))
|
if(x($_SESSION,'my_url'))
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,8 @@ if(! class_exists('dba')) {
|
||||||
|
|
||||||
private $debug = 0;
|
private $debug = 0;
|
||||||
private $db;
|
private $db;
|
||||||
|
private $exceptions;
|
||||||
|
|
||||||
public $mysqli = true;
|
public $mysqli = true;
|
||||||
public $connected = false;
|
public $connected = false;
|
||||||
public $error = false;
|
public $error = false;
|
||||||
|
|
@ -68,6 +70,10 @@ if(! class_exists('dba')) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function excep($excep) {
|
||||||
|
$this->exceptions=$excep;
|
||||||
|
}
|
||||||
|
|
||||||
public function getdb() {
|
public function getdb() {
|
||||||
return $this->db;
|
return $this->db;
|
||||||
}
|
}
|
||||||
|
|
@ -75,7 +81,8 @@ if(! class_exists('dba')) {
|
||||||
public function q($sql) {
|
public function q($sql) {
|
||||||
|
|
||||||
if((! $this->db) || (! $this->connected)) {
|
if((! $this->db) || (! $this->connected)) {
|
||||||
throw new RuntimeException(t("There is no db connection. "));
|
throwOrLog(new RuntimeException(t("There is no db connection. ")));
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($this->mysqli) {
|
if($this->mysqli) {
|
||||||
|
|
@ -114,7 +121,8 @@ if(! class_exists('dba')) {
|
||||||
}
|
}
|
||||||
logger('dba: ' . $str );
|
logger('dba: ' . $str );
|
||||||
if(FALSE===$result) {
|
if(FALSE===$result) {
|
||||||
throw new RuntimeException('dba: ' . $str);
|
throwOrLog(new RuntimeException('dba: ' . $str));
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -155,6 +163,19 @@ if(! class_exists('dba')) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function throwOrLog(Exception $ex) {
|
||||||
|
if($this->exceptions) {
|
||||||
|
throw $ex;
|
||||||
|
} else {
|
||||||
|
logger('dba: '.$ex->getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* starts a transaction. Transactions need to be finished with
|
||||||
|
* commit() or rollback(). Please mind that the db table engine may
|
||||||
|
* not support this.
|
||||||
|
*/
|
||||||
public function beginTransaction() {
|
public function beginTransaction() {
|
||||||
if($this->mysqli) {
|
if($this->mysqli) {
|
||||||
return $this->db->autocommit(false);
|
return $this->db->autocommit(false);
|
||||||
|
|
@ -164,6 +185,10 @@ if(! class_exists('dba')) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* rollback a transaction. So, rollback anything that was done since the last call
|
||||||
|
* to beginTransaction().
|
||||||
|
*/
|
||||||
public function rollback() {
|
public function rollback() {
|
||||||
if($this->mysqli) {
|
if($this->mysqli) {
|
||||||
return $this->db->rollback();
|
return $this->db->rollback();
|
||||||
|
|
@ -174,6 +199,9 @@ if(! class_exists('dba')) {
|
||||||
$this->stopTransaction();
|
$this->stopTransaction();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* commit a transaction. So, write any query to the database.
|
||||||
|
*/
|
||||||
public function commit() {
|
public function commit() {
|
||||||
if($this->mysqli) {
|
if($this->mysqli) {
|
||||||
return $this->db->commit();
|
return $this->db->commit();
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,6 @@
|
||||||
* bootstrap the application
|
* bootstrap the application
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
try {
|
|
||||||
|
|
||||||
require_once('boot.php');
|
require_once('boot.php');
|
||||||
|
|
||||||
|
|
@ -371,9 +370,3 @@ else
|
||||||
|
|
||||||
session_write_close();
|
session_write_close();
|
||||||
exit;
|
exit;
|
||||||
} catch(Exception $ex) {
|
|
||||||
// it may fail because logger uses the db,
|
|
||||||
// but give it a try:
|
|
||||||
logger('exception caught at index.php: '.$ex->getMessage());
|
|
||||||
system_unavailable();
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue