Merge branch 'master' of git://github.com/friendika/friendika
This commit is contained in:
commit
e036434b8a
|
@ -640,7 +640,7 @@ function facebook_post_hook(&$a,&$b) {
|
|||
if(! $likes) {
|
||||
$s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $postvars));
|
||||
q("INSERT INTO `queue` ( `network`, `cid`, `created`, `last`, `content`)
|
||||
VALUES ( '%s', '%s', '%s', '%s') ",
|
||||
VALUES ( '%s', %d, '%s', '%s', '%s') ",
|
||||
dbesc(NETWORK_FACEBOOK),
|
||||
intval($a->contact),
|
||||
dbesc(datetime_convert()),
|
||||
|
@ -662,12 +662,20 @@ function facebook_post_hook(&$a,&$b) {
|
|||
|
||||
function fb_queue_hook(&$a,&$b) {
|
||||
|
||||
require_once('include/queue_fn.php');
|
||||
if((! is_array($b)) || (! count($b)))
|
||||
$qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
|
||||
dbesc(NETWORK_FACEBOOK)
|
||||
);
|
||||
if(! count($qi))
|
||||
return;
|
||||
foreach($b as $x) {
|
||||
if($b['network'] !== NETWORK_FACEBOOK)
|
||||
|
||||
require_once('include/queue_fn.php');
|
||||
|
||||
foreach($qi as $x) {
|
||||
if($x['network'] !== NETWORK_FACEBOOK)
|
||||
continue;
|
||||
|
||||
logger('facebook_queue: run');
|
||||
|
||||
$r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid`
|
||||
WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
|
||||
intval($x['cid'])
|
||||
|
@ -698,7 +706,7 @@ function fb_queue_hook(&$a,&$b) {
|
|||
dbesc('fb::' . $retj->id),
|
||||
intval($item)
|
||||
);
|
||||
logger('facebook queue: success: ' . $j);
|
||||
logger('facebook_queue: success: ' . $j);
|
||||
remove_queue_item($x['id']);
|
||||
}
|
||||
else {
|
||||
|
|
20
boot.php
20
boot.php
|
@ -4,9 +4,9 @@ set_time_limit(0);
|
|||
ini_set('pcre.backtrack_limit', 250000);
|
||||
|
||||
|
||||
define ( 'FRIENDIKA_VERSION', '2.2.1001' );
|
||||
define ( 'FRIENDIKA_VERSION', '2.2.1003' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
|
||||
define ( 'DB_UPDATE_VERSION', 1060 );
|
||||
define ( 'DB_UPDATE_VERSION', 1061 );
|
||||
|
||||
define ( 'EOL', "<br />\r\n" );
|
||||
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
|
||||
|
@ -527,8 +527,20 @@ function check_config(&$a) {
|
|||
$plugins = get_config('system','addon');
|
||||
$plugins_arr = array();
|
||||
|
||||
if($plugins)
|
||||
if($plugins) {
|
||||
$plugins_arr = explode(',',str_replace(' ', '',$plugins));
|
||||
if(get_config('system','strict_privacy')) {
|
||||
unset($a->config['system']['huburl']);
|
||||
for($x = 0; $x < count($plugins_arr); $x ++) {
|
||||
if( $plugins_arr[$x] === 'facebook'
|
||||
|| $plugins_arr[$x] === 'twitter'
|
||||
|| $plugins_arr[$x] === 'statusnet') {
|
||||
unset($plugins_arr[$x]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$a->plugins = $plugins_arr;
|
||||
|
||||
|
@ -2766,12 +2778,14 @@ function unamp($s) {
|
|||
if(! function_exists('lang_selector')) {
|
||||
function lang_selector() {
|
||||
global $lang;
|
||||
$o .= '<div id="lang-select-icon" class="icon language" title="' . t('Select an alternate language') . '" onclick="openClose(\'language-selector\');" ></div>';
|
||||
$o .= '<div id="language-selector" style="display: none;" >';
|
||||
$o .= '<form action="" method="post" ><select name="system_language" onchange="this.form.submit();" >';
|
||||
$langs = glob('view/*/strings.php');
|
||||
if(is_array($langs) && count($langs)) {
|
||||
if(! in_array('view/en/strings.php',$langs))
|
||||
$langs[] = 'view/en/';
|
||||
asort($langs);
|
||||
foreach($langs as $l) {
|
||||
$ll = substr($l,5);
|
||||
$ll = substr($ll,0,strrpos($ll,'/'));
|
||||
|
|
|
@ -476,6 +476,7 @@ CREATE TABLE IF NOT EXISTS `event` (
|
|||
`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
|
||||
`uid` INT NOT NULL ,
|
||||
`cid` INT NOT NULL ,
|
||||
`uri` CHAR( 255 ) NOT NULL,
|
||||
`created` DATETIME NOT NULL ,
|
||||
`edited` DATETIME NOT NULL ,
|
||||
`start` DATETIME NOT NULL ,
|
||||
|
|
BIN
images/icons.png
BIN
images/icons.png
Binary file not shown.
Before Width: | Height: | Size: 8.7 KiB After Width: | Height: | Size: 9.2 KiB |
|
@ -108,20 +108,28 @@ function datesel($pre,$ymin,$ymax,$allow_blank,$y,$m,$d) {
|
|||
$o .= "<option value=\"0000\" $sel ></option>";
|
||||
}
|
||||
|
||||
for($x = $ymax; $x >= $ymin; $x --) {
|
||||
$sel = (($x == $y) ? " selected=\"selected\" " : "");
|
||||
$o .= "<option value=\"$x\" $sel>$x</option>";
|
||||
if($ymax > $ymin) {
|
||||
for($x = $ymax; $x >= $ymin; $x --) {
|
||||
$sel = (($x == $y) ? " selected=\"selected\" " : "");
|
||||
$o .= "<option value=\"$x\" $sel>$x</option>";
|
||||
}
|
||||
}
|
||||
else {
|
||||
for($x = $ymax; $x <= $ymin; $x ++) {
|
||||
$sel = (($x == $y) ? " selected=\"selected\" " : "");
|
||||
$o .= "<option value=\"$x\" $sel>$x</option>";
|
||||
}
|
||||
}
|
||||
|
||||
$o .= "</select> <select name=\"{$pre}month\" class=\"{$pre}month\" size=\"1\">";
|
||||
for($x = 0; $x <= 12; $x ++) {
|
||||
for($x = (($allow_blank) ? 0 : 1); $x <= 12; $x ++) {
|
||||
$sel = (($x == $m) ? " selected=\"selected\" " : "");
|
||||
$y = (($x) ? $x : '');
|
||||
$o .= "<option value=\"$x\" $sel>$y</option>";
|
||||
}
|
||||
|
||||
$o .= "</select> <select name=\"{$pre}day\" class=\"{$pre}day\" size=\"1\">";
|
||||
for($x = 0; $x <= 31; $x ++) {
|
||||
for($x = (($allow_blank) ? 0 : 1); $x <= 31; $x ++) {
|
||||
$sel = (($x == $d) ? " selected=\"selected\" " : "");
|
||||
$y = (($x) ? $x : '');
|
||||
$o .= "<option value=\"$x\" $sel>$y</option>";
|
||||
|
@ -131,6 +139,32 @@ function datesel($pre,$ymin,$ymax,$allow_blank,$y,$m,$d) {
|
|||
return $o;
|
||||
}}
|
||||
|
||||
if(! function_exists('timesel')) {
|
||||
function timesel($pre,$h,$m) {
|
||||
|
||||
$o = '';
|
||||
$o .= "<select name=\"{$pre}hour\" class=\"{$pre}hour\" size=\"1\">";
|
||||
for($x = 0; $x < 24; $x ++) {
|
||||
$sel = (($x == $h) ? " selected=\"selected\" " : "");
|
||||
$o .= "<option value=\"$x\" $sel>$x</option>";
|
||||
}
|
||||
$o .= "</select> : <select name=\"{$pre}minute\" class=\"{$pre}minute\" size=\"1\">";
|
||||
for($x = 0; $x < 60; $x ++) {
|
||||
$sel = (($x == $m) ? " selected=\"selected\" " : "");
|
||||
$o .= "<option value=\"$x\" $sel>$x</option>";
|
||||
}
|
||||
|
||||
$o .= "</select>";
|
||||
return $o;
|
||||
}}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// implements "3 seconds ago" etc.
|
||||
// based on $posted_date, (UTC).
|
||||
// Results relative to current timezone
|
||||
|
@ -242,7 +276,7 @@ function get_first_dim($y,$m) {
|
|||
|
||||
|
||||
if(! function_exists('cal')) {
|
||||
function cal($y = 0,$m = 0, $links = false) {
|
||||
function cal($y = 0,$m = 0, $links = false, $class='') {
|
||||
|
||||
|
||||
// month table - start at 1 to match human usage.
|
||||
|
@ -272,7 +306,7 @@ function cal($y = 0,$m = 0, $links = false) {
|
|||
$tddate = intval(datetime_convert('UTC',date_default_timezone_get(),'now','j'));
|
||||
|
||||
$str_month = day_translate($mtab[$m]);
|
||||
$o = '<table class="calendar">';
|
||||
$o = '<table class="calendar' . $class . '">';
|
||||
$o .= "<caption>$str_month $y</caption><tr>";
|
||||
for($a = 0; $a < 7; $a ++)
|
||||
$o .= '<th>' . mb_substr(day_translate($dn[$a]),0,3,'UTF-8') . '</th>';
|
||||
|
|
|
@ -3,32 +3,41 @@
|
|||
|
||||
function format_event_html($ev) {
|
||||
|
||||
require_once('include/bbcode.php');
|
||||
|
||||
if(! ((is_array($ev)) && count($ev)))
|
||||
return '';
|
||||
|
||||
$o = '<div class="vevent">';
|
||||
|
||||
$o .= '<p class="description">' . $ev['desc'] . '</p>';
|
||||
$o .= '<p class="description">' . bbcode($ev['desc']) . '</p>';
|
||||
|
||||
$o .= '<p>' . t('Starts: ') . '<abbr class="dtstart" title="'
|
||||
. datetime_convert('UTC','UTC',$ev['start'], ATOM_TIME)
|
||||
. '" >'
|
||||
. datetime_convert('UTC', date_default_timezone_get(),
|
||||
$ev['start'] /*, format */ )
|
||||
. (($ev['adjust']) ? datetime_convert('UTC', date_default_timezone_get(),
|
||||
$ev['start'] /*, format */ )
|
||||
: datetime_convert('UTC', 'UTC',
|
||||
$ev['start'] /*, format */ ))
|
||||
. '</abbr></p>';
|
||||
|
||||
$o .= '<p>' . t('Ends: ') . '<abbr class="dtend" title="'
|
||||
. datetime_convert('UTC','UTC',$ev['finish'], ATOM_TIME)
|
||||
. '" >'
|
||||
. datetime_convert('UTC', date_default_timezone_get(),
|
||||
$ev['finish'] /*, format */ )
|
||||
. (($ev['adjust']) ? datetime_convert('UTC', date_default_timezone_get(),
|
||||
$ev['finish'] /*, format */ )
|
||||
: datetime_convert('UTC', 'UTC',
|
||||
$ev['finish'] /*, format */ ))
|
||||
. '</abbr></p>';
|
||||
|
||||
$o .= '<p> ' . t('Location:') . '<span class="location">'
|
||||
. $ev['location']
|
||||
. bbcode($ev['location'])
|
||||
. '</span></p>';
|
||||
|
||||
$o .= '</div>';
|
||||
|
||||
return $o;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -47,18 +47,18 @@
|
|||
$('#pause').html('');
|
||||
}
|
||||
}
|
||||
// F8 - show/hide language selector
|
||||
if(event.keyCode == '119') {
|
||||
if(langSelect) {
|
||||
langSelect = false;
|
||||
$('#language-selector').hide();
|
||||
}
|
||||
else {
|
||||
langSelect = true;
|
||||
$('#language-selector').show();
|
||||
}
|
||||
}
|
||||
|
||||
// // F8 - show/hide language selector
|
||||
// if(event.keyCode == '119') {
|
||||
// if(langSelect) {
|
||||
// langSelect = false;
|
||||
// $('#language-selector').hide();
|
||||
// }
|
||||
// else {
|
||||
// langSelect = true;
|
||||
// $('#language-selector').show();
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// this is shift-home on FF, but $ on IE, disabling until I figure out why the diff.
|
||||
// update: incompatible usage of onKeyDown vs onKeyPress
|
||||
// if(event.keyCode == '36' && event.shiftKey == true) {
|
||||
|
|
|
@ -27,6 +27,8 @@ function notifier_run($argv, $argc){
|
|||
|
||||
$a->set_baseurl(get_config('system','url'));
|
||||
|
||||
$prv = get_config('system','strict_privacy');
|
||||
|
||||
logger('notifier: invoked: ' . print_r($argv,true));
|
||||
|
||||
$cmd = $argv[1];
|
||||
|
@ -329,6 +331,10 @@ function notifier_run($argv, $argc){
|
|||
}
|
||||
break;
|
||||
case 'stat':
|
||||
|
||||
if($prv)
|
||||
break;
|
||||
|
||||
if($followup && $contact['notify']) {
|
||||
logger('notifier: slapdelivery: ' . $contact['name']);
|
||||
$deliver_status = slapper($owner,$contact['notify'],$slap);
|
||||
|
@ -373,7 +379,7 @@ function notifier_run($argv, $argc){
|
|||
}
|
||||
break;
|
||||
case 'mail':
|
||||
|
||||
|
||||
// WARNING: does not currently convert to RFC2047 header encodings, etc.
|
||||
|
||||
$addr = $contact['addr'];
|
||||
|
@ -459,7 +465,7 @@ function notifier_run($argv, $argc){
|
|||
|
||||
if($slap && count($url_recipients) && $followup && $notify_hub && (! $expire)) {
|
||||
foreach($url_recipients as $url) {
|
||||
if($url) {
|
||||
if($url && (! $prv)) {
|
||||
logger('notifier: urldelivery: ' . $url);
|
||||
$deliver_status = slapper($owner,$url,$slap);
|
||||
// TODO: redeliver/queue these items on failure, though there is no contact record
|
||||
|
|
|
@ -24,6 +24,8 @@ function queue_run($argv, $argc){
|
|||
|
||||
$a->set_baseurl(get_config('system','url'));
|
||||
|
||||
load_hooks();
|
||||
|
||||
$deadguys = array();
|
||||
|
||||
logger('queue: start');
|
||||
|
@ -53,7 +55,11 @@ function queue_run($argv, $argc){
|
|||
require_once('include/salmon.php');
|
||||
|
||||
foreach($r as $q_item) {
|
||||
$qi = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
|
||||
|
||||
// queue_predeliver hooks may have changed the queue db details,
|
||||
// so check again if this entry still needs processing
|
||||
|
||||
$qi = q("SELECT * FROM `queue` WHERE `id` = %d AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ",
|
||||
intval($q_item['id'])
|
||||
);
|
||||
if(! count($qi))
|
||||
|
|
|
@ -626,19 +626,21 @@ function dfrn_request_content(&$a) {
|
|||
else
|
||||
$tpl = get_markup_template('auto_request.tpl');
|
||||
|
||||
$prv = get_config('system','strict_privacy');
|
||||
|
||||
$o .= replace_macros($tpl,array(
|
||||
'$header' => t('Friend/Connection Request'),
|
||||
'$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca'),
|
||||
'$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo') . (($prv) ? ', testuser@identi.ca' : ''),
|
||||
'$pls_answer' => t('Please answer the following:'),
|
||||
'$does_know' => t('Does $name know you?'),
|
||||
'$does_know' => sprintf( t('Does %s know you?'),$a->profile['name']),
|
||||
'$yes' => t('Yes'),
|
||||
'$no' => t('No'),
|
||||
'$add_note' => t('Add a personal note:'),
|
||||
'$page_desc' => t("Please enter your 'Identity Address' from one of the following supported social networks:"),
|
||||
'$friendika' => t('Friendika'),
|
||||
'$statusnet' => t('StatusNet/Federated Social Web'),
|
||||
'$statusnet' => (($prv) ? t('StatusNet/Federated Social Web') : ''),
|
||||
'$private_net' => t("Private \x28secure\x29 network"),
|
||||
'$public_net' => t("Public \x28insecure\x29 network"),
|
||||
'$public_net' => (($prv) ? t("Public \x28insecure\x29 network") : ''),
|
||||
'$your_address' => t('Your Identity Address:'),
|
||||
'$submit' => t('Submit Request'),
|
||||
'$cancel' => t('Cancel'),
|
||||
|
|
216
mod/events.php
Normal file
216
mod/events.php
Normal file
|
@ -0,0 +1,216 @@
|
|||
<?php
|
||||
|
||||
require_once('include/datetime.php');
|
||||
require_once('include/event.php');
|
||||
|
||||
function events_post(&$a) {
|
||||
|
||||
if(! local_user())
|
||||
return;
|
||||
|
||||
$event_id = ((x($_POST,'event_id')) ? intval($_POST['event_id']) : 0);
|
||||
$uid = local_user();
|
||||
$startyear = intval($_POST['startyear']);
|
||||
$startmonth = intval($_POST['startmonth']);
|
||||
$startday = intval($_POST['startday']);
|
||||
$starthour = intval($_POST['starthour']);
|
||||
$startminute = intval($_POST['startminute']);
|
||||
|
||||
$finishyear = intval($_POST['finishyear']);
|
||||
$finishmonth = intval($_POST['finishmonth']);
|
||||
$finishday = intval($_POST['finishday']);
|
||||
$finishhour = intval($_POST['finishhour']);
|
||||
$finishminute = intval($_POST['finishminute']);
|
||||
|
||||
$adjust = intval($_POST['adjust']);
|
||||
|
||||
|
||||
$start = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute);
|
||||
$finish = sprintf('%d-%d-%d %d:%d:0',$finishyear,$finishmonth,$finishday,$finishhour,$finishminute);
|
||||
|
||||
if($adjust) {
|
||||
$start = datetime_convert(date_default_timezone_get(),'UTC',$start);
|
||||
$finish = datetime_convert(date_default_timezone_get(),'UTC',$finish);
|
||||
}
|
||||
else {
|
||||
$start = datetime_convert('UTC','UTC',$start);
|
||||
$finish = datetime_convert('UTC','UTC',$finish);
|
||||
}
|
||||
|
||||
|
||||
$desc = escape_tags($_POST['desc']);
|
||||
$location = escape_tags($_POST['location']);
|
||||
$type = 'event';
|
||||
|
||||
$str_group_allow = perms2str($_POST['group_allow']);
|
||||
$str_contact_allow = perms2str($_POST['contact_allow']);
|
||||
$str_group_deny = perms2str($_POST['group_deny']);
|
||||
$str_contact_deny = perms2str($_POST['contact_deny']);
|
||||
|
||||
dbg(1);
|
||||
if($event_id) {
|
||||
$r = q("UPDATE `event` SET
|
||||
`edited` = '%s',
|
||||
`start` = '%s',
|
||||
`finish` = '%s',
|
||||
`desc` = '%s',
|
||||
`location` = '%s',
|
||||
`type` = '%s',
|
||||
`adjust` = %d,
|
||||
`allow_cid` = '%s',
|
||||
`allow_gid` = '%s',
|
||||
`deny_cid` = '%s',
|
||||
`deny_gid` = '%s'
|
||||
WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
|
||||
dbesc(datetime_convert()),
|
||||
dbesc($start),
|
||||
dbesc($finish),
|
||||
dbesc($desc),
|
||||
dbesc($location),
|
||||
dbesc($type),
|
||||
intval($adjust),
|
||||
dbesc($str_contact_allow),
|
||||
dbesc($str_group_allow),
|
||||
dbesc($str_contact_deny),
|
||||
dbesc($str_group_deny),
|
||||
intval($event_id),
|
||||
intval($local_user())
|
||||
);
|
||||
|
||||
}
|
||||
else {
|
||||
|
||||
$uri = item_new_uri($a->get_hostname(),local_user());
|
||||
|
||||
$r = q("INSERT INTO `event` ( `uid`,`uri`,`created`,`edited`,`start`,`finish`,`desc`,`location`,`type`,
|
||||
`adjust`,`allow_cid`,`allow_gid`,`deny_cid`,`deny_gid`)
|
||||
VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s' ) ",
|
||||
intval(local_user()),
|
||||
dbesc($uri),
|
||||
dbesc(datetime_convert()),
|
||||
dbesc(datetime_convert()),
|
||||
dbesc($start),
|
||||
dbesc($finish),
|
||||
dbesc($desc),
|
||||
dbesc($location),
|
||||
dbesc($type),
|
||||
intval($adjust),
|
||||
dbesc($str_contact_allow),
|
||||
dbesc($str_group_allow),
|
||||
dbesc($str_contact_deny),
|
||||
dbesc($str_group_deny)
|
||||
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
function events_content(&$a) {
|
||||
|
||||
if(! local_user()) {
|
||||
notice( t('Permission denied.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
$o .= '<h2>' . t('Events') . '</h2>';
|
||||
|
||||
$mode = 'view';
|
||||
$y = 0;
|
||||
$m = 0;
|
||||
|
||||
if($a->argc > 1) {
|
||||
if($a->argc > 2 && $a->argv[1] == 'event') {
|
||||
$mode = 'edit';
|
||||
$event_id = intval($a->argv[2]);
|
||||
}
|
||||
if($a->argv[1] === 'new') {
|
||||
$mode = 'new';
|
||||
$event_id = 0;
|
||||
}
|
||||
if($a->argc > 2 && intval($a->argv[1]) && intval($a->argv[2])) {
|
||||
$mode = 'view';
|
||||
$y = intval($a->argv[1]);
|
||||
$m = intval($a->argv[2]);
|
||||
}
|
||||
}
|
||||
|
||||
if($mode == 'view') {
|
||||
$thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y');
|
||||
$thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m');
|
||||
if(! $y)
|
||||
$y = intval($thisyear);
|
||||
if(! $m)
|
||||
$m = intval($thismonth);
|
||||
|
||||
$nextyear = $y;
|
||||
$nextmonth = $m + 1;
|
||||
if($nextmonth > 12) {
|
||||
$nextmonth = 1;
|
||||
$nextyear ++;
|
||||
}
|
||||
|
||||
$prevyear = $y;
|
||||
if($m > 1)
|
||||
$prevmonth = $m - 1;
|
||||
else {
|
||||
$prevmonth = 12;
|
||||
$prevyear --;
|
||||
}
|
||||
|
||||
|
||||
$o .= '<a href="' . $a->get_baseurl() . '/events/' . $prevyear . '/' . $prevmonth . '" class="prevcal">' . t('<< Previous') . '</a> | <a href="' . $a->get_baseurl() . '/events/' . $nextyear . '/' . $nextmonth . '" class="nextcal">' . t('Next >>') . '</a>';
|
||||
$o .= cal($y,$m,false, ' eventcal');
|
||||
|
||||
$dim = get_dim($y,$m);
|
||||
$start = sprintf('%d-%d-%d %d:%d:%d',$y,$m,1,0,0,0);
|
||||
$finish = sprintf('%d-%d-%d %d:%d:%d',$y,$m,$dim,23,59,59);
|
||||
|
||||
|
||||
$r = q("SELECT * FROM `event` WHERE `start` >= '%s' AND `finish` <= '%s' AND `uid` = %d ",
|
||||
dbesc($start),
|
||||
dbesc($finish),
|
||||
intval(local_user())
|
||||
);
|
||||
|
||||
if(count($r))
|
||||
foreach($r as $rr)
|
||||
$o .= format_event_html($rr);
|
||||
|
||||
return $o;
|
||||
}
|
||||
|
||||
if($mode === 'edit' || $mode === 'new') {
|
||||
$htpl = get_markup_template('profed_head.tpl');
|
||||
$a->page['htmlhead'] .= replace_macros($htpl,array('$baseurl' => $a->get_baseurl()));
|
||||
|
||||
$tpl = get_markup_template('event_form.tpl');
|
||||
|
||||
$year = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y');
|
||||
$month = datetime_convert('UTC', date_default_timezone_get(), 'now', 'm');
|
||||
$day = datetime_convert('UTC', date_default_timezone_get(), 'now', 'd');
|
||||
|
||||
$o .= replace_macros($tpl,array(
|
||||
'$post' => $a->get_baseurl() . '/events',
|
||||
'$e_text' => t('Event details'),
|
||||
'$s_text' => t('Start: year-month-day hour:minute'),
|
||||
'$s_dsel' => datesel('start',$year+5,$year,false,$year,$month,$day),
|
||||
'$s_tsel' => timesel('start',0,0),
|
||||
'$f_text' => t('Finish: year-month-day hour:minute'),
|
||||
'$f_dsel' => datesel('finish',$year+5,$year,false,$year,$month,$day),
|
||||
'$f_tsel' => timesel('finish',0,0),
|
||||
'$a_text' => t('Adjust for viewer timezone'),
|
||||
'$a_checked' => '',
|
||||
'$d_text' => t('Description:'),
|
||||
'$d_orig' => '',
|
||||
'$l_text' => t('Location:'),
|
||||
'$l_orig' => '',
|
||||
'$submit' => t('Submit')
|
||||
|
||||
));
|
||||
|
||||
return $o;
|
||||
}
|
||||
}
|
|
@ -22,10 +22,8 @@ function follow_post(&$a) {
|
|||
// NOTREACHED
|
||||
}
|
||||
|
||||
|
||||
$ret = probe_url($url);
|
||||
|
||||
|
||||
if($ret['network'] === NETWORK_DFRN) {
|
||||
if(strlen($a->path))
|
||||
$myaddr = bin2hex($a->get_baseurl() . '/profile/' . $a->user['nickname']);
|
||||
|
@ -36,6 +34,9 @@ function follow_post(&$a) {
|
|||
|
||||
// NOTREACHED
|
||||
}
|
||||
elseif(get_config('system','strict_privacy')) {
|
||||
unset($ret['notify']);
|
||||
}
|
||||
|
||||
// do we have enough information?
|
||||
|
||||
|
|
|
@ -194,7 +194,10 @@ function check_funcs() {
|
|||
if(! function_exists('openssl_public_encrypt'))
|
||||
notice( t('Error: openssl PHP module required but not installed.') . EOL);
|
||||
if(! function_exists('mysqli_connect'))
|
||||
notice( t('Error: mysqli PHP module required but not installed.') . EOL);
|
||||
notice( t('Error: mysqli PHP module required but not installed.') . EOL);
|
||||
if(! function_exists('mb_strlen'))
|
||||
notice( t('Error: mb_string PHP module required but not installed.') . EOL);
|
||||
|
||||
if((x($_SESSION,'sysmsg')) && strlen($_SESSION['sysmsg']))
|
||||
notice( t('Please see the file "INSTALL.txt".') . EOL);
|
||||
}
|
||||
|
|
|
@ -192,6 +192,11 @@ function salmon_post(&$a) {
|
|||
// NOTREACHED
|
||||
}
|
||||
|
||||
// Check if we're allowed to talk to insecure networks
|
||||
|
||||
if(get_config('system','strict_privacy'))
|
||||
salmon_return(400);
|
||||
|
||||
require_once('include/items.php');
|
||||
|
||||
// Placeholder for hub discovery. We shouldn't find any hubs
|
||||
|
|
|
@ -431,7 +431,8 @@ function settings_content(&$a) {
|
|||
$f = basename($file);
|
||||
$selected = (($f == $_SESSION['theme']) || ($f === $default_theme && (! x($_SESSION,'theme')))
|
||||
? ' selected="selected" ' : '' );
|
||||
$theme_selector .= '<option val="' . basename($file) . '"' . $selected . '>' . basename($file) . '</option>';
|
||||
$theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f);
|
||||
$theme_selector .= '<option value="' . $f . '"' . $selected . '>' . $theme_name . '</option>';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -47,13 +47,22 @@ function viewcontacts_content(&$a) {
|
|||
if($rr['self'])
|
||||
continue;
|
||||
|
||||
$url = $rr['url'];
|
||||
|
||||
// route DFRN profiles through the redirect
|
||||
|
||||
$is_owner = ((local_user() && ($a->profile['profile_uid'] == local_user())) ? true : false);
|
||||
|
||||
if($is_owner && ($rr['network'] === NETWORK_DFRN) && ($rr['rel']))
|
||||
$url = 'redir/' . $rr['id'];
|
||||
|
||||
$o .= replace_macros($tpl, array(
|
||||
'$id' => $rr['id'],
|
||||
'$alt_text' => t('Visit $username\'s profile'),
|
||||
'$alt_text' => sprintf( t('Visit %s\'s profile [%s]'), $rr['name'], $rr['url']),
|
||||
'$thumb' => $rr['thumb'],
|
||||
'$name' => substr($rr['name'],0,20),
|
||||
'$username' => $rr['name'],
|
||||
'$url' => $rr['url']
|
||||
'$url' => $url
|
||||
));
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
define( 'UPDATE_VERSION' , 1060 );
|
||||
define( 'UPDATE_VERSION' , 1061 );
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -506,3 +506,7 @@ function update_1059() {
|
|||
q("ALTER TABLE `queue` ADD `network` CHAR( 32 ) NOT NULL AFTER `cid` ");
|
||||
}
|
||||
|
||||
function update_1060() {
|
||||
q("ALTER TABLE `event` ADD `uri` CHAR( 255 ) NOT NULL AFTER `cid` ");
|
||||
}
|
||||
|
||||
|
|
0
view/theme/dispy/experimental
Normal file
0
view/theme/dispy/experimental
Normal file
Binary file not shown.
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 17 KiB |
|
@ -81,6 +81,17 @@ tinyMCE.init({
|
|||
}
|
||||
}
|
||||
);
|
||||
var file_uploader = new window.AjaxUpload(
|
||||
'wall-file-upload',
|
||||
{ action: 'wall_attach/$nickname',
|
||||
name: 'userfile',
|
||||
onSubmit: function(file,ext) { $('#profile-rotator').show(); },
|
||||
onComplete: function(file,response) {
|
||||
tinyMCE.execCommand('mceInsertRawHTML',false,response);
|
||||
$('#profile-rotator').hide();
|
||||
}
|
||||
}
|
||||
);
|
||||
$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
|
||||
var selstr;
|
||||
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
|
||||
|
|
|
@ -26,8 +26,11 @@
|
|||
</div>
|
||||
|
||||
<div id="profile-upload-wrapper" class="jot-tool" style="display: $visitor;" >
|
||||
<div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="$upload"></a></div>
|
||||
</div>
|
||||
<div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="$upload"></a></div>
|
||||
</div>
|
||||
<div id="profile-attach-wrapper" class="jot-tool" style="display: $visitor;" >
|
||||
<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon border attach" title="$attach"></a></div>
|
||||
</div>
|
||||
<div id="profile-link-wrapper" class="jot-tool" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
|
||||
<a id="profile-link" class="icon border link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
|
||||
</div>
|
||||
|
|
|
@ -170,6 +170,20 @@ nav .nav-link {
|
|||
#notify-update { background-position: -60px 0px; }
|
||||
#home-update { background-position: -90px 0px; }
|
||||
|
||||
#lang-select-icon {
|
||||
cursor: pointer;
|
||||
position: absolute;
|
||||
left: 0px;
|
||||
top: 0px;
|
||||
}
|
||||
|
||||
#language-selector {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 16px;
|
||||
}
|
||||
|
||||
|
||||
/** sysmsg **/
|
||||
#sysmsg_info{
|
||||
position:fixed;
|
||||
|
@ -776,6 +790,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
|
|||
border-bottom: 0px;
|
||||
}*/
|
||||
|
||||
|
||||
.border {
|
||||
border: 1px solid #babdb6;
|
||||
-webkit-border-radius: 3px;
|
||||
|
@ -800,9 +815,9 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
|
|||
.pause { background-position: -110px -20px;}
|
||||
.play { background-position: -130px -20px;}
|
||||
.pencil { background-position: -150px -20px;}
|
||||
.small-pencil{ background-position: -170px -20px;}
|
||||
.small-pencil { background-position: -170px -20px;}
|
||||
.recycle { background-position: -190px -20px;}
|
||||
.remote-link{ background-position: -210px -20px;}
|
||||
.remote-link { background-position: -210px -20px;}
|
||||
.share { background-position: -230px -20px;}
|
||||
|
||||
.tools { background-position: -50px -40px;}
|
||||
|
@ -810,7 +825,9 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
|
|||
.unlock { background-position: -90px -40px;}
|
||||
.video { background-position: -110px -40px;}
|
||||
.youtube { background-position: -130px -40px;}
|
||||
|
||||
|
||||
.attach { background-position: -190px -40px;}
|
||||
.language { background-position: -210px -40px;}
|
||||
|
||||
.attachtype {
|
||||
display: block; width: 20px; height: 23px;
|
||||
|
|
|
@ -2223,6 +2223,9 @@ a.mail-list-link {
|
|||
cursor: pointer;
|
||||
}
|
||||
|
||||
.eventcal {
|
||||
font-size: 24px;
|
||||
}
|
||||
|
||||
.calendar {
|
||||
font-family: Courier, monospace;
|
||||
|
@ -2298,8 +2301,8 @@ a.mail-list-link {
|
|||
|
||||
#language-selector {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
top: 0px;
|
||||
left: 16px;
|
||||
}
|
||||
|
||||
#group-members {
|
||||
|
@ -2403,6 +2406,13 @@ a.mail-list-link {
|
|||
margin: 5px 0px 0px 0px;
|
||||
}
|
||||
|
||||
#lang-select-icon {
|
||||
cursor: pointer;
|
||||
position: absolute;
|
||||
left: 0px;
|
||||
top: 0px;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* ICONS
|
||||
|
@ -2439,6 +2449,7 @@ a.mail-list-link {
|
|||
.video { background-position: -48px -32px;}
|
||||
.youtube { background-position: -64px -32px;}
|
||||
.attach { background-position: -80px -32px; }
|
||||
.language { background-position: -96px -32px; }
|
||||
|
||||
|
||||
.attachtype {
|
||||
|
|
|
@ -2319,7 +2319,7 @@ a.mail-list-link {
|
|||
#language-selector {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
left: 16px;
|
||||
}
|
||||
|
||||
|
||||
|
@ -2419,6 +2419,13 @@ a.mail-list-link {
|
|||
margin: 5px 0px 0px 0px;
|
||||
}
|
||||
|
||||
#lang-select-icon {
|
||||
cursor: pointer;
|
||||
position: absolute;
|
||||
left: 0px;
|
||||
top: 0px;
|
||||
}
|
||||
|
||||
/**
|
||||
* ICONS
|
||||
*/
|
||||
|
@ -2454,6 +2461,7 @@ a.mail-list-link {
|
|||
.video { background-position: -48px -32px;}
|
||||
.youtube { background-position: -64px -32px;}
|
||||
.attach { background-position: -80px -32px; }
|
||||
.language { background-position: -96px -32px; }
|
||||
|
||||
.attachtype {
|
||||
display: block; width: 20px; height: 23px;
|
||||
|
|
Loading…
Reference in a new issue