- $name $to $owner_name $vwall
+ $name $to $owner_name $vwall

$ago

-- cgit v1.2.3 From ebb9af8946b68a545d9a7b5a6763721627a981f7 Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 9 Sep 2011 17:35:26 -0700 Subject: One day we'll have ignored all purely numeric hashtags like #33. Found yet another edge case. --- include/text.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/include/text.php b/include/text.php index 536c998de..33add768f 100644 --- a/include/text.php +++ b/include/text.php @@ -482,13 +482,12 @@ function get_tags($s) { // we might be inside a bbcode color tag - leave it alone continue; } + if(substr($mtch,-1,1) === '.') + $mtch = substr($mtch,0,-1); // ignore strictly numeric tags like #1 if((strpos($mtch,'#') === 0) && ctype_digit(substr($mtch,1))) continue; - if(substr($mtch,-1,1) === '.') - $ret[] = substr($mtch,0,-1); - else - $ret[] = $mtch; + $ret[] = $mtch; } } return $ret; -- cgit v1.2.3 From 0c0a60439648c1ab0980cb309a73a3dd7e96eeb9 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 10 Sep 2011 03:14:00 -0700 Subject: block imap function from spitting out errors to the page --- include/email.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/email.php b/include/email.php index 1f485e430..a36d9adab 100644 --- a/include/email.php +++ b/include/email.php @@ -4,7 +4,7 @@ function email_connect($mailbox,$username,$password) { if(! function_exists('imap_open')) return false; - $mbox = imap_open($mailbox,$username,$password); + $mbox = @imap_open($mailbox,$username,$password); return $mbox; } @@ -14,19 +14,19 @@ function email_poll($mbox,$email_addr) { if(! ($mbox && $email_addr)) return array(); - $search1 = imap_search($mbox,'FROM "' . $email_addr . '"', SE_UID); + $search1 = @imap_search($mbox,'FROM "' . $email_addr . '"', SE_UID); if(! $search1) $search1 = array(); - $search2 = imap_search($mbox,'TO "' . $email_addr . '"', SE_UID); + $search2 = @imap_search($mbox,'TO "' . $email_addr . '"', SE_UID); if(! $search2) $search2 = array(); - $search3 = imap_search($mbox,'CC "' . $email_addr . '"', SE_UID); + $search3 = @imap_search($mbox,'CC "' . $email_addr . '"', SE_UID); if(! $search3) $search3 = array(); - $search4 = imap_search($mbox,'BCC "' . $email_addr . '"', SE_UID); + $search4 = @imap_search($mbox,'BCC "' . $email_addr . '"', SE_UID); if(! $search4) $search4 = array(); @@ -45,12 +45,12 @@ function construct_mailbox_name($mailacct) { function email_msg_meta($mbox,$uid) { - $ret = (($mbox && $uid) ? imap_fetch_overview($mbox,$uid,FT_UID) : array(array())); + $ret = (($mbox && $uid) ? @imap_fetch_overview($mbox,$uid,FT_UID) : array(array())); return ((count($ret)) ? $ret[0] : array()); } function email_msg_headers($mbox,$uid) { - $raw_header = (($mbox && $uid) ? imap_fetchheader($mbox,$uid,FT_UID) : ''); + $raw_header = (($mbox && $uid) ? @imap_fetchheader($mbox,$uid,FT_UID) : ''); $raw_header = str_replace("\r",'',$raw_header); $ret = array(); $h = split("\n",$raw_header); @@ -74,7 +74,7 @@ function email_msg_headers($mbox,$uid) { function email_get_msg($mbox,$uid) { $ret = array(); - $struc = (($mbox && $uid) ? imap_fetchstructure($mbox,$uid,FT_UID) : null); + $struc = (($mbox && $uid) ? @imap_fetchstructure($mbox,$uid,FT_UID) : null); if(! $struc) return $ret; @@ -103,8 +103,8 @@ function email_get_part($mbox,$uid,$p,$partno) { // DECODE DATA $data = ($partno) - ? imap_fetchbody($mbox,$uid,$partno, FT_UID|FT_PEEK) - : imap_body($mbox,$uid,FT_UID|FT_PEEK); + ? @imap_fetchbody($mbox,$uid,$partno, FT_UID|FT_PEEK) + : @imap_body($mbox,$uid,FT_UID|FT_PEEK); // Any part may be encoded, even plain text messages, so check everything. if ($p->encoding==4) -- cgit v1.2.3 From 0e441fe19618ab40722e79dfe531ae5a181fc990 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 11 Sep 2011 15:09:57 -0700 Subject: bug #147 comments not working on private notes page --- boot.php | 2 +- include/conversation.php | 2 +- include/main.js | 1 + mod/notes.php | 42 ++++++++++++++++++--------------- mod/update_notes.php | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 87 insertions(+), 20 deletions(-) create mode 100644 mod/update_notes.php diff --git a/boot.php b/boot.php index b159ef073..47af7ae44 100644 --- 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.1098' ); +define ( 'FRIENDIKA_VERSION', '2.2.1100' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1087 ); diff --git a/include/conversation.php b/include/conversation.php index 8ff8c9743..6aad2485a 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -111,7 +111,7 @@ function conversation(&$a, $items, $mode, $update) { } if($mode === 'notes') { - $profile_owner = $a->profile['profile_uid']; + $profile_owner = local_user(); $page_writeable = true; } diff --git a/include/main.js b/include/main.js index d59c99223..9929c336f 100644 --- a/include/main.js +++ b/include/main.js @@ -116,6 +116,7 @@ if($('#live-network').length) { src = 'network'; liveUpdate(); } if($('#live-profile').length) { src = 'profile'; liveUpdate(); } if($('#live-community').length) { src = 'community'; liveUpdate(); } + if($('#live-notes').length) { src = 'notes'; liveUpdate(); } if($('#live-display').length) { if(liking) { liking = 0; diff --git a/mod/notes.php b/mod/notes.php index 9f1a4662d..061f5838c 100644 --- a/mod/notes.php +++ b/mod/notes.php @@ -14,7 +14,7 @@ function notes_init(&$a) { } -function notes_content(&$a) { +function notes_content(&$a,$update) { if(! local_user()) { notice( t('Permission denied.') . EOL); @@ -52,31 +52,37 @@ function notes_content(&$a) { )); - $o .= '

' . t('Personal Notes') . '

'; + if(! $update) { + $o .= '

' . t('Personal Notes') . '

'; - $commpage = false; - $commvisitor = false; + $commpage = false; + $commvisitor = false; - $celeb = false; + $celeb = false; - $x = array( - 'is_owner' => $is_owner, - 'allow_location' => (($a->user['allow_location']) ? true : false), - 'default_location' => $a->user['default-location'], - 'nickname' => $a->user['nickname'], - 'lockstate' => 'lock', - 'acl' => '', - 'bang' => '', - 'visitor' => 'block', - 'profile_uid' => local_user(), - 'button' => t('Save') + $x = array( + 'is_owner' => $is_owner, + 'allow_location' => (($a->user['allow_location']) ? true : false), + 'default_location' => $a->user['default-location'], + 'nickname' => $a->user['nickname'], + 'lockstate' => 'lock', + 'acl' => '', + 'bang' => '', + 'visitor' => 'block', + 'profile_uid' => local_user(), + 'button' => t('Save') - ); + ); - $o .= status_editor($a,$x,$a->contact['id']); + $o .= status_editor($a,$x,$a->contact['id']); + $o .= '

' . "\r\n"; + $o .= "\r\n"; + + } // Construct permissions diff --git a/mod/update_notes.php b/mod/update_notes.php new file mode 100644 index 000000000..90cc5bc69 --- /dev/null +++ b/mod/update_notes.php @@ -0,0 +1,60 @@ +\r\n"; + + /** + * We can remove this hack once Internet Explorer recognises HTML5 natively + */ + + echo (($_GET['msie'] == 1) ? '

' : '

'); + + /** + * + * Grab the page inner contents by calling the content function from the profile module directly, + * but move any image src attributes to another attribute name. This is because + * some browsers will prefetch all the images for the page even if we don't need them. + * The only ones we need to fetch are those for new page additions, which we'll discover + * on the client side and then swap the image back. + * + */ + + $text = notes_content($a,$profile_uid); + + $pattern = "/]*) src=\"([^\"]*)\"/"; + $replace = "'; + $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; + $text = preg_replace($pattern, $replace, $text); + $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i"; + $text = preg_replace($pattern, $replace, $text); + $pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i"; + $text = preg_replace($pattern, $replace, $text); + $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; + $text = preg_replace($pattern, $replace, $text); + + /** + * reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well + */ + + echo str_replace("\t",' ',$text); + echo (($_GET['msie'] == 1) ? '

' : ''); + echo "\r\n"; + killme(); + +} \ No newline at end of file -- cgit v1.2.3 From 7a06c7c3bfcf4f496930efc8cef92f7dbe6f54a2 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 11 Sep 2011 15:44:07 -0700 Subject: bug #146 - br HTML tags showing up in events --- include/bbcode.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index 86b7fdb4b..af6c10c44 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -15,6 +15,13 @@ function stripcode_br_cb($s) { function bbcode($Text,$preserve_nl = false) { + // If we find any event code, turn it into an event. + // After we're finished processing the bbcode we'll + // replace all of the event code with a reformatted version. + + $ev = bbtoevent($Text); + + // Replace any html brackets with HTML Entities to prevent executing HTML or script // Don't use strip_tags here because it breaks [url] search by replacing & with amp @@ -27,11 +34,6 @@ function bbcode($Text,$preserve_nl = false) { if($preserve_nl) $Text = str_replace(array("\n","\r"), array('',''),$Text); - // If we find any event code, turn it into an event. - // After we're finished processing the bbcode we'll - // replace all of the event code with a reformatted version. - - $ev = bbtoevent($Text); // Set up the parameters for a URL search string $URLSearchString = "^\[\]"; -- cgit v1.2.3 From 17b081f9f79c30fb792912a884fd65984eb7c391 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 11 Sep 2011 21:52:50 -0700 Subject: allow html post to api --- include/api.php | 28 +++++++++++++++++++++++++++- mod/item.php | 13 ++++--------- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/include/api.php b/include/api.php index 1f58a6baa..5d008c290 100644 --- a/include/api.php +++ b/include/api.php @@ -466,6 +466,7 @@ } return null; } + // TODO - media uploads function api_statuses_update(&$a, $type) { if (local_user()===false) return false; @@ -475,7 +476,32 @@ // logger('api_post: ' . print_r($_POST,true)); - $_POST['body'] = urldecode(requestdata('status')); + if(requestdata('htmlstatus')) { + require_once('library/HTMLPurifier.auto.php'); + require_once('include/html2bbcode.php'); + + $txt = requestdata('htmlstatus'); + if((strpos($txt,'<') !== false) || (strpos($txt,'>') !== false)) { + + $txt = preg_replace('#]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?#s', + '[youtube]$1[/youtube]', $txt); + + $txt = preg_replace('#].+?' . 'http://www.youtube.com/embed/([A-Za-z0-9\-_=]+).+?#s', + '[youtube]$1[/youtube]', $txt); + + $config = HTMLPurifier_Config::createDefault(); + $config->set('Cache.DefinitionImpl', null); + + + $purifier = new HTMLPurifier($config); + $txt = $purifier->purify($txt); + + $_POST['body'] = html2bbcode($txt); + } + + } + else + $_POST['body'] = urldecode(requestdata('status')); $parent = requestdata('in_reply_to_status_id'); if(ctype_digit($parent)) diff --git a/mod/item.php b/mod/item.php index b4ec7666f..e6ce1ea6f 100644 --- a/mod/item.php +++ b/mod/item.php @@ -38,6 +38,7 @@ function item_post(&$a) { call_hooks('post_local_start', $_POST); $api_source = ((x($_POST,'api_source') && $_POST['api_source']) ? true : false); + $return_path = ((x($_POST,'return')) ? $_POST['return'] : ''); /** * Is this a reply to something? @@ -834,12 +835,6 @@ function item_post(&$a) { } } - - - - - - logger('post_complete'); // figure out how to return, depending on from whence we came @@ -847,10 +842,10 @@ function item_post(&$a) { if($api_source) return; - if((x($_POST,'return')) && strlen($_POST['return'])) { - logger('return: ' . $_POST['return']); - goaway($a->get_baseurl() . "/" . $_POST['return'] ); + if($return_path) { + goaway($a->get_baseurl() . "/" . $return_path); } + $json = array('success' => 1); if(x($_POST,'jsreload') && strlen($_POST['jsreload'])) $json['reload'] = $a->get_baseurl() . '/' . $_POST['jsreload']; -- cgit v1.2.3 From 57d631b47a0604ac4a50fb9294db1cea35c0944a Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 11 Sep 2011 22:57:12 -0700 Subject: supply default value for update --- mod/notes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/notes.php b/mod/notes.php index 061f5838c..369f120a7 100644 --- a/mod/notes.php +++ b/mod/notes.php @@ -14,7 +14,7 @@ function notes_init(&$a) { } -function notes_content(&$a,$update) { +function notes_content(&$a,$update = false) { if(! local_user()) { notice( t('Permission denied.') . EOL); -- cgit v1.2.3 From ff572487a38f9d703bf4ad37f3f8a9a499326a81 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 12 Sep 2011 03:21:39 -0700 Subject: smilie hook --- include/text.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/text.php b/include/text.php index 33add768f..2d65b681d 100644 --- a/include/text.php +++ b/include/text.php @@ -656,7 +656,7 @@ if(! function_exists('smilies')) { function smilies($s) { $a = get_app(); - return str_replace( + $s = str_replace( array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '~friendika', 'Diaspora*' ), array( @@ -680,6 +680,10 @@ function smilies($s) { 'Diaspora

', ), $s); + + call_hooks('smilie', $s); + return $s; + }} -- cgit v1.2.3 From 4f24494b0baca1d991cbc74bf3929631c657b676 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 12 Sep 2011 19:42:10 -0700 Subject: Dreamhost's unreliable process model is really getting irritating --- boot.php | 2 +- mod/item.php | 26 ++++++++++++++++++-------- mod/network.php | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 9 deletions(-) diff --git a/boot.php b/boot.php index 47af7ae44..19c8a86c6 100644 --- 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.1100' ); +define ( 'FRIENDIKA_VERSION', '2.2.1101' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1087 ); diff --git a/mod/item.php b/mod/item.php index e6ce1ea6f..025a12a32 100644 --- a/mod/item.php +++ b/mod/item.php @@ -83,7 +83,7 @@ function item_post(&$a) { if(($r === false) || (! count($r))) { notice( t('Unable to locate original post.') . EOL); if(x($_POST,'return')) - goaway($a->get_baseurl() . "/" . $_POST['return'] ); + goaway($a->get_baseurl() . "/" . $return_path ); killme(); } $parent_item = $r[0]; @@ -112,7 +112,7 @@ function item_post(&$a) { if(! can_write_wall($a,$profile_uid)) { notice( t('Permission denied.') . EOL) ; if(x($_POST,'return')) - goaway($a->get_baseurl() . "/" . $_POST['return'] ); + goaway($a->get_baseurl() . "/" . $return_path ); killme(); } @@ -198,7 +198,7 @@ function item_post(&$a) { if(! strlen($body)) { info( t('Empty post discarded.') . EOL ); if(x($_POST,'return')) - goaway($a->get_baseurl() . "/" . $_POST['return'] ); + goaway($a->get_baseurl() . "/" . $return_path ); killme(); } } @@ -550,9 +550,9 @@ function item_post(&$a) { ); proc_run('php', "include/notifier.php", 'edit_post', "$post_id"); - if((x($_POST,'return')) && strlen($_POST['return'])) { - logger('return: ' . $_POST['return']); - goaway($a->get_baseurl() . "/" . $_POST['return'] ); + if((x($_POST,'return')) && strlen($return_path)) { + logger('return: ' . $return_path); + goaway($a->get_baseurl() . "/" . $return_path ); } killme(); } @@ -799,11 +799,10 @@ function item_post(&$a) { else { logger('mod_item: unable to retrieve post that was just stored.'); notify( t('System error. Post not saved.')); - goaway($a->get_baseurl() . "/" . $_POST['return'] ); + goaway($a->get_baseurl() . "/" . $return_path ); // NOTREACHED } - proc_run('php', "include/notifier.php", $notify_type, "$post_id"); $datarray['id'] = $post_id; $datarray['plink'] = $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id; @@ -835,6 +834,17 @@ function item_post(&$a) { } } + // This is a real juggling act on shared hosting services which kill your processes + // e.g. dreamhost. We used to start delivery to our native delivery agents in the background + // and then run our plugin delivery from the foreground. We're now doing plugin delivery first, + // because as soon as you start loading up a bunch of remote delivey processes, *this* page is + // likely to get killed off. If you end up looking at an /item URL and a blank page, + // it's very likely the delivery got killed before all your friends could be notified. + // Currently the only realistic fixes are to use a reliable server - which precludes shared hosting, + // or cut back on plugins which do remote deliveries. + + proc_run('php', "include/notifier.php", $notify_type, "$post_id"); + logger('post_complete'); // figure out how to return, depending on from whence we came diff --git a/mod/network.php b/mod/network.php index 6684889e3..072b20b92 100644 --- a/mod/network.php +++ b/mod/network.php @@ -313,6 +313,23 @@ function network_content(&$a, $update = 0) { // Normal conversation view // Show conversation by activity date +/* created date order +$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid` +FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` +WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 +AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 +AND `item`.`parent` = `item`.`id` +$sql_extra +ORDER BY `item`.`created` DESC LIMIT %d ,%d ", +intval(local_user()), +intval($a->pager['start']), +intval($a->pager['itemspage']) +); +*/ + + + + // First fetch a known number of parent items @@ -344,6 +361,24 @@ function network_content(&$a, $update = 0) { $parents_arr[] = $rr['item_id']; $parents_str = implode(', ', $parents_arr); +/* created order +$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, +`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`, +`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, +`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` +FROM `item`, (SELECT `p`.`id`,`p`.`created` FROM `item` AS `p` WHERE `p`.`parent`=`p`.`id`) as `parentitem`, `contact` +WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 +AND `contact`.`id` = `item`.`contact-id` +AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 +AND `item`.`parent` = `parentitem`.`id` AND `item`.`parent` IN ( %s ) +$sql_extra +ORDER BY `parentitem`.`created` DESC, `item`.`gravity` ASC, `item`.`created` ASC ", +intval(local_user()), +dbesc($parents_str) +*/ + + + $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`, `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, @@ -364,6 +399,9 @@ function network_content(&$a, $update = 0) { intval(local_user()), dbesc($parents_str) ); + + + } } -- cgit v1.2.3 From 08fc3e91b6084c71e502e6e7915ac566ea21e9ee Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 12 Sep 2011 22:24:36 -0700 Subject: bug #148 email subscription issue --- include/Scrape.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/include/Scrape.php b/include/Scrape.php index b80f24c22..58468a40d 100644 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -430,7 +430,8 @@ function probe_url($url, $mode = PROBE_NORMAL) { $addr = $orig_url; $network = NETWORK_MAIL; $name = substr($url,0,strpos($url,'@')); - $profile = 'http://' . substr($url,strpos($url,'@')+1); + $phost = substr($url,strpos($url,'@')+1); + $profile = 'http://' . $phost; // fix nick character range $vcard = array('fn' => $name, 'nick' => $name, 'photo' => gravatar_img($url)); $notify = 'smtp ' . random_string(); @@ -441,8 +442,15 @@ function probe_url($url, $mode = PROBE_NORMAL) { $adr = imap_rfc822_parse_adrlist($x->from,''); elseif(stristr($x->to,$orig_url)) $adr = imap_rfc822_parse_adrlist($x->to,''); - if(isset($adr) && strlen($adr[0]->personal)) - $vcard['fn'] = notags($adr[0]->personal); + if(isset($adr)) { + foreach($adr as $feadr) { + if((strcasecmp($feadr->mailbox,$name) == 0) + &&(strcasecmp($feadr->host,$phost) == 0) + && (strlen($feadr->personal))) { + $vcard['fn'] = notags($feadr->personal); + } + } + } } imap_close($mbox); } -- cgit v1.2.3 From 43da1429cc85beee5b02e63635757700171e602e Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 13 Sep 2011 04:53:17 -0700 Subject: import image sizes from html source --- include/html2bbcode.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/html2bbcode.php b/include/html2bbcode.php index d4e8cce66..8025c336b 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -24,6 +24,10 @@ function html2bbcode($s) { '/\(.*?)\<\/u\>/is', '/\(.*?)\<\/ul\>/is', '/\(.*?)\<\/li\>/is', + '/\/is', + '/\/is', + '/\/is', + '/\/is', '/\/is', '/\(.*?)\<\/div\>/is', '/\/is', @@ -50,6 +54,10 @@ function html2bbcode($s) { '[u]$1[/u]', '[list]$1[/list]', '[*]$1', + '[img=$2x$4]$6[/img]', + '[img=$4x$2]$6[/img]', + '[img=$4x$6]$2[/img]', + '[img=$6x$4]$2[/img]', '[img]$2[/img]', '$2', "\n", -- cgit v1.2.3 From 21d35e52dd4a83635127e1a68f6a478cf3289b1b Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 13 Sep 2011 05:13:01 -0700 Subject: provide option for viewing by parent created order --- mod/network.php | 152 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/mod/network.php b/mod/network.php index 072b20b92..ef97fb895 100644 --- a/mod/network.php +++ b/mod/network.php @@ -131,6 +131,8 @@ function network_content(&$a, $update = 0) { $star = ((x($_GET['star'])) ? intval($_GET['star']) : 0); $bmark = ((x($_GET['bmark'])) ? intval($_GET['bmark']) : 0); + $order = 'comment'; + if(($a->argc > 2) && $a->argv[2] === 'new') $nouveau = true; @@ -312,96 +314,94 @@ function network_content(&$a, $update = 0) { // Normal conversation view // Show conversation by activity date - -/* created date order -$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid` -FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` -WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 -AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 -AND `item`.`parent` = `item`.`id` -$sql_extra -ORDER BY `item`.`created` DESC LIMIT %d ,%d ", -intval(local_user()), -intval($a->pager['start']), -intval($a->pager['itemspage']) -); -*/ - + if($order === 'post') { + $r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid` + FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` + WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + AND `item`.`parent` = `item`.`id` + $sql_extra + ORDER BY `item`.`created` DESC LIMIT %d ,%d ", + intval(local_user()), + intval($a->pager['start']), + intval($a->pager['itemspage']) + ); + } + else { + // $order === 'comment' + // First fetch a known number of parent items - - // First fetch a known number of parent items - - $r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid` - FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - , (SELECT `_com`.`parent`,max(`_com`.`created`) as `created` - FROM `item` AS `_com` - WHERE `_com`.`uid`=%d AND - (`_com`.`parent`!=`_com`.`id` OR `_com`.`id` NOT IN (SELECT `__com`.`parent` FROM `item` as `__com` WHERE `__com`.`parent`!=`__com`.`id`)) - GROUP BY `_com`.`parent` ORDER BY `created` DESC) AS `com` - WHERE `item`.`id`=`com`.`parent` AND - `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - - $sql_extra - ORDER BY `com`.`created` DESC LIMIT %d ,%d ", - intval(local_user()), - intval(local_user()), - intval($a->pager['start']), - intval($a->pager['itemspage']) - ); - // Then fetch all the children of the parents that are on this page - - $parents_arr = array(); - $parents_str = ''; - - if(count($r)) { - foreach($r as $rr) - $parents_arr[] = $rr['item_id']; - $parents_str = implode(', ', $parents_arr); - -/* created order -$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, -`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`, -`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, -`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` -FROM `item`, (SELECT `p`.`id`,`p`.`created` FROM `item` AS `p` WHERE `p`.`parent`=`p`.`id`) as `parentitem`, `contact` -WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 -AND `contact`.`id` = `item`.`contact-id` -AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 -AND `item`.`parent` = `parentitem`.`id` AND `item`.`parent` IN ( %s ) -$sql_extra -ORDER BY `parentitem`.`created` DESC, `item`.`gravity` ASC, `item`.`created` ASC ", -intval(local_user()), -dbesc($parents_str) -*/ - - - - $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, - `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`, - `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, - `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` - FROM `item`, `contact`, - (SELECT `_com`.`parent`,max(`_com`.`created`) as `created` + $r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid` + FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` + , (SELECT `_com`.`parent`,max(`_com`.`created`) as `created` FROM `item` AS `_com` WHERE `_com`.`uid`=%d AND (`_com`.`parent`!=`_com`.`id` OR `_com`.`id` NOT IN (SELECT `__com`.`parent` FROM `item` as `__com` WHERE `__com`.`parent`!=`__com`.`id`)) GROUP BY `_com`.`parent` ORDER BY `created` DESC) AS `com` - WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 - AND `contact`.`id` = `item`.`contact-id` - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - AND `item`.`parent` = `com`.`parent` AND `item`.`parent` IN ( %s ) + WHERE `item`.`id`=`com`.`parent` AND + `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 $sql_extra - ORDER BY `com`.`created` DESC, `item`.`gravity` ASC, `item`.`created` ASC ", + ORDER BY `com`.`created` DESC LIMIT %d ,%d ", intval(local_user()), intval(local_user()), - dbesc($parents_str) + intval($a->pager['start']), + intval($a->pager['itemspage']) ); + } + // Then fetch all the children of the parents that are on this page + $parents_arr = array(); + $parents_str = ''; + if(count($r)) { + foreach($r as $rr) + $parents_arr[] = $rr['item_id']; + $parents_str = implode(', ', $parents_arr); + if($order === 'post') { + // parent created order + $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, + `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`, + `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, + `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` + FROM `item`, (SELECT `p`.`id`,`p`.`created` FROM `item` AS `p` WHERE `p`.`parent`=`p`.`id`) as `parentitem`, `contact` + WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 + AND `contact`.`id` = `item`.`contact-id` + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + AND `item`.`parent` = `parentitem`.`id` AND `item`.`parent` IN ( %s ) + $sql_extra + ORDER BY `parentitem`.`created` DESC, `item`.`gravity` ASC, `item`.`created` ASC ", + intval(local_user()), + dbesc($parents_str) + ); + } + else { + // $order === 'comment' + + $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, + `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`, + `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, + `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` + FROM `item`, `contact`, + (SELECT `_com`.`parent`,max(`_com`.`created`) as `created` + FROM `item` AS `_com` + WHERE `_com`.`uid`=%d AND + (`_com`.`parent`!=`_com`.`id` OR `_com`.`id` NOT IN (SELECT `__com`.`parent` FROM `item` as `__com` WHERE `__com`.`parent`!=`__com`.`id`)) + GROUP BY `_com`.`parent` ORDER BY `created` DESC) AS `com` + WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 + AND `contact`.`id` = `item`.`contact-id` + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + AND `item`.`parent` = `com`.`parent` AND `item`.`parent` IN ( %s ) + $sql_extra + ORDER BY `com`.`created` DESC, `item`.`gravity` ASC, `item`.`created` ASC ", + intval(local_user()), + intval(local_user()), + dbesc($parents_str) + ); + } } } -- cgit v1.2.3 From 1248a561e13ebd0a612b7e6b0630c1aa89f0556e Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 13 Sep 2011 15:26:47 -0700 Subject: group_public_members sql query typo --- boot.php | 2 +- include/group.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 19c8a86c6..c369696f1 100644 --- 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.1101' ); +define ( 'FRIENDIKA_VERSION', '2.2.1102' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1087 ); diff --git a/include/group.php b/include/group.php index 309949680..d92e24e20 100644 --- a/include/group.php +++ b/include/group.php @@ -124,7 +124,7 @@ function group_public_members($gid) { $r = q("SELECT `contact`.`id` AS `contact-id` FROM `group_member` LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id` WHERE `gid` = %d AND `group_member`.`uid` = %d - AND `contact`.`network` = '%s' AND `contact`.`notify` != '' )", + AND `contact`.`network` = '%s' AND `contact`.`notify` != '' ", intval($gid), intval(local_user()), dbesc(NETWORK_OSTATUS) -- cgit v1.2.3 From 12fec754892b29ab9c07b20b1d6b322f6724aae8 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 13 Sep 2011 18:40:15 -0700 Subject: ability to re-order network page (no UI yet) --- mod/network.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mod/network.php b/mod/network.php index ef97fb895..438b3417d 100644 --- a/mod/network.php +++ b/mod/network.php @@ -20,6 +20,7 @@ function network_init(&$a) { $srchurl = '/network' . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') . ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '') + . ((x($_GET,'order')) ? '?order=' . $_GET['order'] : '') . ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : ''); if(x($_GET,'save')) { @@ -127,11 +128,11 @@ function network_content(&$a, $update = 0) { $nouveau = false; require_once('include/acl_selectors.php'); - $cid = ((x($_GET['cid'])) ? intval($_GET['cid']) : 0); - $star = ((x($_GET['star'])) ? intval($_GET['star']) : 0); - $bmark = ((x($_GET['bmark'])) ? intval($_GET['bmark']) : 0); + $cid = ((x($_GET,'cid')) ? intval($_GET['cid']) : 0); + $star = ((x($_GET,'star')) ? intval($_GET['star']) : 0); + $bmark = ((x($_GET,'bmark')) ? intval($_GET['bmark']) : 0); + $order = ((x($_GET,'order')) ? notags($_GET['order']) : 'comment'); - $order = 'comment'; if(($a->argc > 2) && $a->argv[2] === 'new') $nouveau = true; @@ -192,6 +193,7 @@ function network_content(&$a, $update = 0) { . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . ((x($_GET,'search')) ? '&search=' . $_GET['search'] : '') . ((x($_GET,'star')) ? '&star=' . $_GET['star'] : '') + . ((x($_GET,'order')) ? '&order=' . $_GET['order'] : '') . ((x($_GET,'bmark')) ? '&bmark=' . $_GET['bmark'] : '') . "'; var profile_page = " . $a->pager['page'] . "; \r\n"; -- cgit v1.2.3 From 44d70a238fed787d1c762a19507b19d8a3a8d8cd Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 14 Sep 2011 01:21:03 -0700 Subject: quotes not working on statusnet plugin posts --- addon/statusnet/statusnet.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addon/statusnet/statusnet.php b/addon/statusnet/statusnet.php index f1b35d6c0..0c0f4ced7 100644 --- a/addon/statusnet/statusnet.php +++ b/addon/statusnet/statusnet.php @@ -385,6 +385,8 @@ function statusnet_post_hook(&$a,&$b) { $dent = new StatusNetOAuth($api,$ckey,$csecret,$otoken,$osecret); $max_char = $dent->get_maxlength(); // max. length for a dent $msg = strip_tags(bbcode($b['body'])); + // quotes not working - let's try this + $msg = html_entity_decode($msg); if ( strlen($msg) > $max_char) { $shortlink = ""; require_once('library/slinky.php'); -- cgit v1.2.3 From 93c235a912aa4d413dd00e636c211fe53b5c1553 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 14 Sep 2011 15:30:05 -0700 Subject: capitalise Link --- boot.php | 2 +- zot.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index c369696f1..a9cfb7cac 100644 --- 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.1102' ); +define ( 'FRIENDIKA_VERSION', '2.2.1103' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1087 ); diff --git a/zot.txt b/zot.txt index 7269e4dd8..300b695ff 100644 --- a/zot.txt +++ b/zot.txt @@ -1,7 +1,7 @@ This is the Zot! social communications protocol. Specification revision: 1 -02 September 2011 +15 September 2011 Mike Macgirvin This specification is public domain. @@ -181,7 +181,7 @@ delivery method for non-encrypted (e.g. public) messages. Discover of the zot endpoint is based on webfinger XRD: - -- cgit v1.2.3 From 58b2bb58486a79e6725db8ed6153d8f4ab08cf21 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 14 Sep 2011 19:53:13 -0700 Subject: localtime cleanup --- mod/localtime.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mod/localtime.php b/mod/localtime.php index f5ecf3a96..c03eae1b0 100644 --- a/mod/localtime.php +++ b/mod/localtime.php @@ -26,16 +26,21 @@ function localtime_content(&$a) { $o .= '

' . t('Friendika provides this service for sharing events with other networks and friends in unknown timezones.') . '

'; + + $o .= '

' . sprintf( t('UTC time: %s'), $t) . '

'; + + if($_REQUEST['timezone']) + $o .= '

' . sprintf( t('Current timezone: %s'), $_REQUEST['timezone']) . '

'; + if(x($a->data,'mod-localtime')) $o .= '

' . sprintf( t('Converted localtime: %s'),$a->data['mod-localtime']) . '

'; - $o .= '

' . sprintf( t('UTC time: %s'), $t) . '

'; $o .= ''; -- cgit v1.2.3 From 1778e4a315dd386911d12513d6aa7dc569782f13 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 14 Sep 2011 20:47:49 -0700 Subject: bloody ampersands --- include/bbcode.php | 5 +++-- include/text.php | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index af6c10c44..3886af37d 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -43,7 +43,7 @@ function bbcode($Text,$preserve_nl = false) { // Perform URL Search - $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\%\$\!\+\,]+)/", '$1$2', $Text); + $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/", '$1$2', $Text); $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/m", '$1', $Text); $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/m", '$2', $Text); @@ -159,7 +159,8 @@ function bbcode($Text,$preserve_nl = false) { $Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/ism",'',$Text); } - + // fix any escaped ampersands that may have been converted into links + $Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text); call_hooks('bbcode',$Text); diff --git a/include/text.php b/include/text.php index 2d65b681d..501121c80 100644 --- a/include/text.php +++ b/include/text.php @@ -635,7 +635,8 @@ function valid_email($x){ if(! function_exists('linkify')) { function linkify($s) { - $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%\$\!\+]*)/", ' $1', $s); + $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\'\%\$\!\+]*)/", ' $1', $s); + $s = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$s); return($s); }} -- cgit v1.2.3 From cdf2fe859f439a9d3689ea946e23d9aef1fb6cac Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 14 Sep 2011 21:35:13 -0700 Subject: don't escape underscore within links going to diaspora --- include/bb2diaspora.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 591aaf7fa..5b240bdd2 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -42,6 +42,8 @@ function stripdcode_br_cb($s) { function bb2diaspora($Text,$preserve_nl = false) { + $ev = bbtoevent($Text); + // Replace any html brackets with HTML Entities to prevent executing HTML or script // Don't use strip_tags here because it breaks [url] search by replacing & with amp @@ -52,7 +54,6 @@ function bb2diaspora($Text,$preserve_nl = false) { // After we're finished processing the bbcode we'll // replace all of the event code with a reformatted version. - $ev = bbtoevent($Text); if($preserve_nl) $Text = str_replace(array("\n","\r"), array('',''),$Text); @@ -185,7 +186,10 @@ function bb2diaspora($Text,$preserve_nl = false) { $Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",'',$Text); } + $Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text); + $Text = preg_replace('/\[(.*?)\\\\_(.*?)\]$(.*?)$/ism','[$1_$2]($3)',$Text); + $Text = preg_replace('/\[(.*?)\\\\\*(.*?)\]$(.*?)$/ism','[$1*$2]($3)',$Text); call_hooks('bb2diaspora',$Text); -- cgit v1.2.3 From 46b220518c0a95d394398998711088ac1268c343 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 14 Sep 2011 23:09:09 -0700 Subject: don't allow events to finish before they begin --- mod/events.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mod/events.php b/mod/events.php index 27ca69830..5bc9807ed 100644 --- a/mod/events.php +++ b/mod/events.php @@ -45,13 +45,20 @@ function events_post(&$a) { $finish = datetime_convert('UTC','UTC',$finish); } + // Don't allow the event to finish before it begins. + // It won't hurt anything, but somebody will file a bug report + // and we'll waste a bunch of time responding to it. Time that + // could've been spent doing something else. + + if(strcmp($finish,$start) < 0) + $finish = $start; $desc = escape_tags(trim($_POST['desc'])); $location = escape_tags(trim($_POST['location'])); $type = 'event'; if((! $desc) || (! $start)) { - notice('Event description and start time are required.'); + notice( t('Event description and start time are required.') . EOL); goaway($a->get_baseurl() . '/events/new'); } -- cgit v1.2.3 From d9bce6b85210a67053b9682609ce7bcad0098d84 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Thu, 15 Sep 2011 11:05:09 +0200 Subject: Fix issue 151 --- include/acl.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/include/acl.js b/include/acl.js index 82b631ee9..ba6c6af73 100644 --- a/include/acl.js +++ b/include/acl.js @@ -58,7 +58,9 @@ ACL.prototype.on_search = function(event){ } ACL.prototype.on_showall = function(event){ + event.preventDefault() event.stopPropagation(); + if (that.showall.hasClass("selected")){ return false; } @@ -69,12 +71,14 @@ ACL.prototype.on_showall = function(event){ that.deny_cid = []; that.deny_gid = []; - that.updateview(); + that.update_view(); return false; } ACL.prototype.on_button_show = function(event){ + event.preventDefault() + event.stopImmediatePropagation() event.stopPropagation(); /*that.showall.removeClass("selected"); @@ -86,6 +90,8 @@ ACL.prototype.on_button_show = function(event){ return false; } ACL.prototype.on_button_hide = function(event){ + event.preventDefault() + event.stopImmediatePropagation() event.stopPropagation(); /*that.showall.removeClass("selected"); @@ -118,7 +124,7 @@ ACL.prototype.set_allow = function(itemid){ if (that.deny_cid.indexOf(id)>=0) that.deny_cid.remove(id); break; } - that.updateview(); + that.update_view(); } ACL.prototype.set_deny = function(itemid){ @@ -142,10 +148,10 @@ ACL.prototype.set_deny = function(itemid){ if (that.allow_cid.indexOf(id)>=0) that.allow_cid.remove(id); break; } - that.updateview(); + that.update_view(); } -ACL.prototype.updateview = function(){ +ACL.prototype.update_view = function(){ if (that.allow_gid.length==0 && that.allow_cid.length==0 && that.deny_gid.length==0 && that.deny_cid.length==0){ that.showall.addClass("selected"); @@ -153,7 +159,7 @@ ACL.prototype.updateview = function(){ $('#jot-perms-icon').removeClass('lock').addClass('unlock'); $('#jot-public').show(); $('.profile-jot-net input').attr('disabled', false); - if(editor != false) { + if(typeof editor != 'undefined' && editor != false) { $('#profile-jot-desc').html(ispublic); } @@ -235,6 +241,6 @@ ACL.prototype.populate = function(data){ //console.log(html); that.list_content.append(html); }); - that.updateview(); + that.update_view(); } -- cgit v1.2.3 From 8f1e2efd5bf2266fd9603676a08ce0120c3e69ac Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 15 Sep 2011 03:06:43 -0700 Subject: if photo is uploaded to "profile photos" album it could not be made into profile photo. --- mod/profile_photo.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mod/profile_photo.php b/mod/profile_photo.php index 8dc896653..4de3aaa3e 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -155,9 +155,15 @@ function profile_photo_content(&$a) { notice( t('Permission denied.') . EOL ); return; } + $havescale = false; + foreach($r as $rr) { + if($rr['scale'] == 5) + $havescale = true; + } + // set an already uloaded photo as profile photo // if photo is in 'Profile Photos', change it in db - if ($r[0]['album']== t('Profile Photos')){ + if (($r[0]['album']== t('Profile Photos')) && ($havescale)){ $r=q("UPDATE `photo` SET `profile`=0 WHERE `profile`=1 AND `uid`=%d", intval(local_user())); -- cgit v1.2.3 From 2e43b291e73f6d7c36a9d8743fc2635dc3444841 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 15 Sep 2011 20:15:26 -0700 Subject: Facebook wall privacy switch --- addon/facebook/facebook.php | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php index 10f6b1399..fe348f689 100644 --- a/addon/facebook/facebook.php +++ b/addon/facebook/facebook.php @@ -111,7 +111,8 @@ function facebook_init(&$a) { $token = substr($token,0,strpos($token,'&')); set_pconfig($uid,'facebook','access_token',$token); set_pconfig($uid,'facebook','post','1'); - set_pconfig($uid,'facebook','no_linking',1); + if(get_pconfig($uid,'facebook','no_linking') === false) + set_pconfig($uid,'facebook','no_linking',1); fb_get_self($uid); fb_get_friends($uid); fb_consume_all($uid); @@ -275,6 +276,9 @@ function facebook_post(&$a) { $no_wall = ((x($_POST,'facebook_no_wall')) ? intval($_POST['facebook_no_wall']) : 0); set_pconfig($uid,'facebook','no_wall',$no_wall); + + $private_wall = ((x($_POST,'facebook_private_wall')) ? intval($_POST['facebook_private_wall']) : 0); + set_pconfig($uid,'facebook','private_wall',$private_wall); $linkvalue = ((x($_POST,'facebook_linking')) ? intval($_POST['facebook_linking']) : 0); @@ -352,6 +356,12 @@ function facebook_content(&$a) { $o .= '

'; $o .= '' . t('Remove Facebook connector') . '

'; + + $o .= '

'; + + $o .= '' . t('Re-authenticate [This is necessary whenever your Facebook password is changed.]') . ''; + $o .= '

'; $o .= '

'; @@ -361,12 +371,22 @@ function facebook_content(&$a) { $no_linking = get_pconfig(local_user(),'facebook','no_linking'); $checked = (($no_linking) ? '' : ' checked="checked" '); - $o .= '' . ' ' . t('Link all your Facebook friends and conversations') . EOL ; + $o .= '' . ' ' . t('Link all your Facebook friends and conversations on this website') . EOL ; + + $o .= '

' . t('Facebook conversations consist of your profile wall and your friend stream.'); + $o .= ' ' . t('On this website, your Facebook friend stream is only visible to you.'); + $o .= ' ' . t('The following settings determine the privacy of your Facebook profile wall on this website.') . '

'; + + $private_wall = get_pconfig(local_user(),'facebook','private_wall'); + $checked = (($private_wall) ? ' checked="checked" ' : ''); + $o .= '' . ' ' . t('On this website your Facebook profile wall conversations will only be visible to you') . EOL ; + $no_wall = get_pconfig(local_user(),'facebook','no_wall'); $checked = (($no_wall) ? ' checked="checked" ' : ''); - $o .= '' . ' ' . t('Do not link your Facebook profile wall posts - as these could be visible to people that would not be able to see them on Facebook.') . EOL ; + $o .= '' . ' ' . t('Do not import your Facebook profile wall conversations') . EOL ; + $o .= '

' . t('If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations.') . '

'; $o .= '

'; } @@ -770,11 +790,12 @@ function fb_consume_all($uid) { return; if(! get_pconfig($uid,'facebook','no_wall')) { + $private_wall = intval(get_pconfig($uid,'facebook','private_wall')); $s = fetch_url('https://graph.facebook.com/me/feed?access_token=' . $access_token); if($s) { $j = json_decode($s); logger('fb_consume_stream: wall: ' . print_r($j,true), LOGGER_DATA); - fb_consume_stream($uid,$j,true); + fb_consume_stream($uid,$j,($private_wall) ? false : true); } } $s = fetch_url('https://graph.facebook.com/me/home?access_token=' . $access_token); -- cgit v1.2.3