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

diff --git a/boot.php b/boot.php
index ef191dedcd05b66bc6c719d6e8894d157a1aadb9..f3b6af34eaa51c79e586e6bd31a2ef2776959130 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -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      );
 

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index c779b6aafd2326710a210552ff8c9abc7e81c388..f9e3b3f28205683bf64d573f9706d86a07796979 100644 (file)
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -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);
@@ -165,7 +165,7 @@ function bb2diaspora($Text,$preserve_nl = false) {
 
 
        // oembed tag
-//     $Text = oembed_bbcode2html($Text);
+       //      $Text = oembed_bbcode2html($Text);
 
        // If we found an event earlier, strip out all the event code and replace with a reformatted version.
 
@@ -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 '';
 

diff --git a/include/delivery.php b/include/delivery.php
index 5d81228ee47a9c26ba91beba1c92a101ca780b61..7f45fb2fa71ab977d2ae08679731c6235a24ff6a 100644 (file)
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -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

diff --git a/include/notifier.php b/include/notifier.php
index 8d2aa961cf2fb41330a26fc2b392bde53be68fb4..0bb82b7bf802015401567c74d5faae102cd035bd 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -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

diff --git a/mod/localtime.php b/mod/localtime.php
new file mode 100644 (file)
index 0000000..f5ecf3a
--- /dev/null
+++ b/mod/localtime.php
@@ -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;
+
+}
\ No newline at end of file

diff --git a/mod/parse_url.php b/mod/parse_url.php
index 9bb0bc46408e76f3a090d512c3d01fc63bc2bafa..b10d11c4bdc44ca686229f64a59bc6a20ad19940 100644 (file)
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -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();
 }