harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add timezone convert module, several other minor or in progress fixes

Browse Source
This commit is contained in:
Friendika
2011-09-04 00:48:45 -07:00
parent 59a6a04e26
commit 9ff1a3444e
6 changed files with 56 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@@ -7,7 +7,7 @@ require_once('include/text.php');
require_once("include/pgettext.php");
define ( 'FRIENDIKA_VERSION', '2.2.1091' );
define ( 'FRIENDIKA_VERSION', '2.2.1092' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1085 );

8
include/bb2diaspora.php
View File

@@ -62,9 +62,9 @@ function bb2diaspora($Text,$preserve_nl = false) {
// [img]pathtoimage[/img]
$Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '[$1]($1)', $Text);
$Text = preg_replace("/\#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/", '[#$2]($1)', $Text);
$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/", '[$2]($1)', $Text);
$Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '[$1]($1)', $Text);
$Text = preg_replace("/\#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[#$2]($1)', $Text);
$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[$2]($1)', $Text);
// $Text = preg_replace("/\[img\](.*?)\[\/img\]/", t('Image/photo: ') . '$1', $Text);
// $Text = preg_replace("/\[img\](.*?)\[\/img\]/", t('image/photo'), $Text);
@@ -189,8 +189,6 @@ function bb2diaspora($Text,$preserve_nl = false) {
function format_event_diaspora($ev) {
// require_once('include/bbcode.php');
if(! ((is_array($ev)) && count($ev)))
return '';

2
include/delivery.php
View File

@@ -140,6 +140,8 @@ function delivery_run($argv, $argc){
$owner = $r[0];
$walltowall = ((($top_level) && ($owner['id'] != $items[0]['contact-id'])) ? true : false);
$public_message = true;
// fill this in with a single salmon slap if applicable

3
include/notifier.php
View File

@@ -129,6 +129,7 @@ function notifier_run($argv, $argc){
logger('notifier: top level post');
$top_level = true;
}
}
$r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
@@ -144,6 +145,8 @@ function notifier_run($argv, $argc){
$owner = $r[0];
$walltowall = ((($top_level) && ($owner['id'] != $items[0]['contact-id'])) ? true : false);
$hub = get_config('system','huburl');
// If this is a public conversation, notify the feed hub

44
mod/localtime.php Normal file
View File

@@ -0,0 +1,44 @@
<?php
require_once('include/datetime.php');
function localtime_post(&$a) {
$t = $_REQUEST['time'];
if(! $t)
$t = 'now';
$bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM
if($_POST['timezone'])
$a->data['mod-localtime'] = datetime_convert('UTC',$_POST['timezone'],$t,$bd_format);
}
function localtime_content(&$a) {
$t = $_REQUEST['time'];
if(! $t)
$t = 'now';
$o .= '<h3>' . t('Time Conversion') . '</h3>';
$o .= '<p>' . t('Friendika provides this service for sharing events with other networks and friends in unknown timezones.') . '</p>';
if(x($a->data,'mod-localtime'))
$o .= '<p>' . sprintf( t('Converted localtime: %s'),$a->data['mod-localtime']) . '</p>';
$o .= '<p>' . sprintf( t('UTC time: %s'), $t) . '</p>';
$o .= '<form action ="' . $a->get_baseurl() . '/localtime?f=&time=' . $t . '" method="post" >';
$o .= '<p>' . t('Please select your timezone:') . '</p>';
$o .= select_timezone();
$o .= '<input type="submit" name="submit" value="' . t('Submit') . '" /></form>';
return $o;
}

2
mod/parse_url.php
View File

@@ -119,6 +119,8 @@ function parse_url_content(&$a) {
$text = '<br /><br /><blockquote>' . $text . '</blockquote><br />';
}
$title = str_replace("\n",'',$title);
echo sprintf($template,$url,($title) ? $title : $url,$text);
killme();
}