From 2fe479034cec335079d802eb70f41e4737858b2b Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 19 Feb 2012 14:37:01 -0800 Subject: [PATCH 01/48] revup --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 0c79b6e549..5c72af156e 100755 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1255' ); +define ( 'FRIENDICA_VERSION', '2.3.1257' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1122 ); From 15e9933ddf72e969481ddf474cacdf812de61af5 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 19 Feb 2012 20:27:32 -0800 Subject: [PATCH 02/48] include item links in web notification messages --- include/enotify.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/include/enotify.php b/include/enotify.php index a8e6e3de6d..b0967cff1b 100755 --- a/include/enotify.php +++ b/include/enotify.php @@ -28,7 +28,7 @@ function notification($params) { $subject = sprintf( t('New mail received at %s'),$sitename); $preamble = sprintf( t('%s sent you a new private message at %s.'),$params['source_name'],$sitename); - $epreamble = sprintf( t('%s sent you a private message.'),'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); + $epreamble = sprintf( t('%s sent you %s.'),'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=' . $siteurl . '/message]' . t('a private message') . '[/url]'); $sitelink = t('Please visit %s to view and/or reply to your private messages.'); $tsitelink = sprintf( $sitelink, $siteurl . '/message' ); $hsitelink = sprintf( $sitelink, '' . $sitename . ''); @@ -39,7 +39,7 @@ function notification($params) { $subject = sprintf( t('%s commented on an item at %s'), $params['source_name'], $sitename); $preamble = sprintf( t('%s commented on an item/conversation you have been following.'), $params['source_name']); - $epreamble = sprintf( t('%s commented on an item/conversation you have been following.'), '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); + $epreamble = sprintf( t('%s commented on %s you have been following.'), '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=' . $params['link'] . ']' . t('an item/conversation') . '[/url]'); $sitelink = t('Please visit %s to view and/or reply to the conversation.'); $tsitelink = sprintf( $sitelink, $siteurl ); @@ -49,7 +49,7 @@ function notification($params) { if($params['type'] == NOTIFY_WALL) { $preamble = $subject = sprintf( t('%s posted to your profile wall at %s') , $params['source_name'], $sitename); - $epreamble = sprintf( t('%s posted to your profile wall') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); + $epreamble = sprintf( t('%s posted to %s') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=' . $params['link'] . ']' . t('your profile wall.') . '[/url]'); $sitelink = t('Please visit %s to view and/or reply to the conversation.'); $tsitelink = sprintf( $sitelink, $siteurl ); @@ -59,7 +59,7 @@ function notification($params) { if($params['type'] == NOTIFY_TAGSELF) { $preamble = $subject = sprintf( t('%s tagged you at %s') , $params['source_name'], $sitename); - $epreamble = sprintf( t('%s tagged you') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); + $epreamble = sprintf( t('%s %s.') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=' . $params['link'] . ']' . t('tagged you') . '[/url]'); $sitelink = t('Please visit %s to view and/or reply to the conversation.'); $tsitelink = sprintf( $sitelink, $siteurl ); @@ -69,7 +69,7 @@ function notification($params) { if($params['type'] == NOTIFY_TAGSHARE) { $preamble = $subject = sprintf( t('%s tagged your post at %s') , $params['source_name'], $sitename); - $epreamble = sprintf( t('%s tagged your post') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); + $epreamble = sprintf( t('%s tagged %s') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=' . $params['link'] . ']' . t('your post') . '[/url]' ); $sitelink = t('Please visit %s to view and/or reply to the conversation.'); $tsitelink = sprintf( $sitelink, $siteurl ); @@ -80,7 +80,7 @@ function notification($params) { if($params['type'] == NOTIFY_INTRO) { $subject = sprintf( t('Introduction received at %s'), $sitename); $preamble = sprintf( t('You\'ve received an introduction from \'%s\' at %s'), $params['source_name'], $sitename); - $epreamble = sprintf( t('You\'ve received an introduction from %s'), '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); + $epreamble = sprintf( t('You\'ve received %s from %s.'), '[url=' . $params['link'] . ']' . t('an introduction') . '[/url]' , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); $body = sprintf( t('You may visit their profile at %s'),$params['source_link']); $sitelink = t('Please visit %s to approve or reject the introduction.'); @@ -92,7 +92,8 @@ function notification($params) { if($params['type'] == NOTIFY_SUGGEST) { $subject = sprintf( t('Friend suggestion received at %s'), $sitename); $preamble = sprintf( t('You\'ve received a friend suggestion from \'%s\' at %s'), $params['source_name'], $sitename); - $epreamble = sprintf( t('You\'ve received a friend suggestion for %s from %s'), + $epreamble = sprintf( t('You\'ve received %s for %s from %s.'), + '[url=' . $params['link'] . ']' . t('a friend suggestion') . '[/url]', '[url=' . $params['item']['url'] . ']' . $params['item']['name'] . '[/url]', '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); $body = t('Name:') . ' ' . $params['item']['name'] . "\n"; From edac27c791046cabcfcd2d33fa9dc696f04e4269 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 20 Feb 2012 20:21:34 +0100 Subject: [PATCH 03/48] ping: return all introductions detail when there are more than one --- mod/ping.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) mode change 100755 => 100644 mod/ping.php diff --git a/mod/ping.php b/mod/ping.php old mode 100755 new mode 100644 index db68332bd0..9c2e385d66 --- a/mod/ping.php +++ b/mod/ping.php @@ -5,6 +5,7 @@ require_once("include/datetime.php"); function ping_init(&$a) { header("Content-type: text/xml"); + echo " "; @@ -90,22 +91,20 @@ function ping_init(&$a) { } - $intros1 = q("SELECT COUNT(`intro`.`id`) AS `total`, `intro`.`id`, `intro`.`datetime`, + $intros1 = q("SELECT `intro`.`id`, `intro`.`datetime`, `fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo` FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id` WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid`!=0", intval(local_user()) ); - $intros2 = q("SELECT COUNT(`intro`.`id`) AS `total`, `intro`.`id`, `intro`.`datetime`, + $intros2 = q("SELECT `intro`.`id`, `intro`.`datetime`, `contact`.`name`, `contact`.`url`, `contact`.`photo` FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id` WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id`!=0", intval(local_user()) ); - $intro = $intros1[0]['total'] + $intros2[0]['total']; - if ($intros1[0]['total']==0) $intros1=Array(); - if ($intros2[0]['total']==0) $intros2=Array(); + $intro = count($intros1) + count($intros2); $intros = $intros1+$intros2; From dd09c2d125a109de6089a2122faa4e9c2ecd8f5d Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 20 Feb 2012 20:39:19 +0100 Subject: [PATCH 04/48] use info() for successfull dfrn confirmation instead of notice() --- mod/dfrn_confirm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 mod/dfrn_confirm.php diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php old mode 100755 new mode 100644 index abacd9906c..5a24f00893 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -252,7 +252,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $message = unxmlify($xml->message); // human readable text of what may have gone wrong. switch($status) { case 0: - notice( t("Confirmation completed successfully.") . EOL); + info( t("Confirmation completed successfully.") . EOL); if(strlen($message)) notice( t('Remote site reported: ') . $message . EOL); break; From 4fbd93f7e7237530cf291ca473591dea1f680270 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 20 Feb 2012 13:29:46 -0800 Subject: [PATCH 05/48] revup --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 5c72af156e..2c9bb68d19 100755 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1257' ); +define ( 'FRIENDICA_VERSION', '2.3.1258' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1122 ); From 2219c1b581b86e022109576711f86fe0f8626411 Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 19 Feb 2012 15:27:12 -0300 Subject: [PATCH 06/48] friendica.svg - Friendika -> Friendica --- images/friendica.svg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/friendica.svg b/images/friendica.svg index 2155d0b006..2105ef3175 100755 --- a/images/friendica.svg +++ b/images/friendica.svg @@ -15,8 +15,8 @@ id="svg2" version="1.1" inkscape:version="0.48.0 r9654" - sodipodi:docname="friendika.svg" - inkscape:export-filename="/home/meta/Documents/My random images/friendika.png" + sodipodi:docname="friendica.svg" + inkscape:export-filename="/home/meta/Documents/My random images/friendica.png" inkscape:export-xdpi="80.552788" inkscape:export-ydpi="80.552788"> Date: Sun, 19 Feb 2012 15:27:54 -0300 Subject: [PATCH 07/48] Scrape.php - Friendika -> Friendica --- include/Scrape.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/Scrape.php b/include/Scrape.php index e42d22afc6..52405ae2dd 100755 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -314,7 +314,7 @@ function scrape_feed($url) { * * PROBE_DIASPORA has a bias towards returning Diaspora information * while PROBE_NORMAL has a bias towards dfrn/zot - in the case where - * an address (such as a Friendika address) supports more than one type + * an address (such as a Friendica address) supports more than one type * of network. * */ From 03834b24332966239e207f86643adb633b8809b9 Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 19 Feb 2012 15:30:32 -0300 Subject: [PATCH 08/48] text.php - Friendika -> Friendica (just to prepare for deprecate the friendika.png at the future) --- include/text.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/text.php b/include/text.php index b9813cfa9f..044ee4e085 100755 --- a/include/text.php +++ b/include/text.php @@ -759,7 +759,7 @@ function smilies($s, $sample = false) { ':facepalm', ':headdesk', '~friendika ~friendika', - '~friendica ~friendica', + '~friendica ~friendica', 'DiasporaDiaspora*', ); From 7ed1e3f1776e858189a1b15eafa6bc323dc702dc Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 19 Feb 2012 15:31:34 -0300 Subject: [PATCH 09/48] acl_selectors.php - Friendika -> Friendica --- include/acl_selectors.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/acl_selectors.php b/include/acl_selectors.php index d8f530daf6..6070b7db21 100755 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -157,7 +157,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p $o = ''; - // When used for private messages, we limit correspondence to mutual DFRN/Friendika friends and the selector + // When used for private messages, we limit correspondence to mutual DFRN/Friendica friends and the selector // to one recipient. By default our selector allows multiple selects amongst all contacts. $sql_extra = ''; From 19fea9c2ceef879648fcf7514c31b0bce47cefd9 Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 19 Feb 2012 15:32:22 -0300 Subject: [PATCH 10/48] poller.php - Friendika -> Friendica --- include/poller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/poller.php b/include/poller.php index 7d42c63b5f..3e10533b33 100755 --- a/include/poller.php +++ b/include/poller.php @@ -349,7 +349,7 @@ function poller_run($argv, $argc){ || ($contact['network'] === NETWORK_DIASPORA) || ($contact['network'] === NETWORK_FEED) ) { - // Upgrading DB fields from an older Friendika version + // Upgrading DB fields from an older Friendica version // Will only do this once per notify-enabled OStatus contact // or if relationship changes From fed6330ea62ce4b87de6a1bd9e16cd68f09e10d7 Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 19 Feb 2012 15:34:48 -0300 Subject: [PATCH 11/48] include/api.php - Friendika -> Friendica --- include/api.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/api.php b/include/api.php index 7b8709659e..04f95ebd91 100755 --- a/include/api.php +++ b/include/api.php @@ -179,7 +179,7 @@ 'updated' => api_date(null), 'atom_updated' => datetime_convert('UTC','UTC','now',ATOM_TIME), 'language' => $user_info['language'], - 'logo' => $a->get_baseurl()."/images/friendika-32.png", + 'logo' => $a->get_baseurl()."/images/friendica-32.png", ); return $arr; @@ -739,7 +739,7 @@ if (local_user()===false) return false; $user_info = api_get_user($a); - // in friendika starred item are private + // in friendica starred item are private // return favorites only for self logger('api_favorites: self:' . $user_info['self']); @@ -912,7 +912,7 @@ function api_statusnet_config(&$a,$type) { $name = $a->config['sitename']; $server = $a->get_hostname(); - $logo = $a->get_baseurl() . '/images/friendika-64.png'; + $logo = $a->get_baseurl() . '/images/friendica-64.png'; $email = $a->config['admin_email']; $closed = (($a->config['register_policy'] == REGISTER_CLOSED) ? 'true' : 'false'); $private = (($a->config['system']['block_public']) ? 'true' : 'false'); From 3ef6344d4172c8aef7c4f895d4c1122f676bbece Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 19 Feb 2012 15:35:34 -0300 Subject: [PATCH 12/48] include/nav.php - Friendika -> Friendica --- include/nav.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/nav.php b/include/nav.php index 95dd37ba6c..c8a44af80b 100755 --- a/include/nav.php +++ b/include/nav.php @@ -148,7 +148,7 @@ function nav(&$a) { $banner = get_config('system','banner'); if($banner === false) - $banner .= 'logoFriendica'; + $banner .= 'logoFriendica'; $tpl = get_markup_template('nav.tpl'); From 70dedefde32ec528bc203850e777e1611cb6fd4a Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 19 Feb 2012 15:36:44 -0300 Subject: [PATCH 13/48] INSTALL.txt - Friendika -> Friendica --- INSTALL.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/INSTALL.txt b/INSTALL.txt index fdd54b765f..574e90975b 100755 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -1,14 +1,14 @@ -Friendika Installation +Friendica Installation -We've tried very hard to ensure that Friendika will run on commodity hosting +We've tried very hard to ensure that Friendica will run on commodity hosting platforms - such as those used to host Wordpress blogs and Drupal websites. -But be aware that Friendika is more than a simple web application. It is a +But be aware that Friendica is more than a simple web application. It is a complex communications system which more closely resembles an email server than a web server. For reliability and performance, messages are delivered in the background and are queued for later delivery when sites are down. This kind of functionality requires a bit more of the host system than the typical -blog. Not every PHP/MySQL hosting provider will be able to support Friendika. +blog. Not every PHP/MySQL hosting provider will be able to support Friendica. Many will. But please review the requirements and confirm these with your hosting provider prior to installation. @@ -21,9 +21,9 @@ impact the installation requirements. Decide if you will use SSL and obtain an SSL cert. Communications with the Diaspora network MAY require both SSL AND an SSL cert signed by a CA which is -recognised by the major browsers. Friendika will work with self-signed certs +recognised by the major browsers. Friendica will work with self-signed certs but Diaspora communication may not. For best results, install your cert PRIOR -to installing Friendika and when visiting your site for the initial +to installing Friendica and when visiting your site for the initial installation in step 5, please use the https: link. (Use the http: or non-SSL link if your cert is self-signed). @@ -51,7 +51,7 @@ php.ini file [or see 'poormancron' in section 8] directory/path component in the URL) is preferred. This is REQUIRED if you wish to communicate with the Diaspora network. -2. Unpack the Friendika files into the root of your web server document area. +2. Unpack the Friendica files into the root of your web server document area. - If you copy the directory tree to your webserver, make sure that you also copy .htaccess - as "dot" files are often hidden @@ -106,7 +106,7 @@ one shown, substituting for your unique paths and settings: You can generally find the location of PHP by executing "which php". If you have troubles with this section please contact your hosting provider for -assistance. Friendika will not work correctly if you cannot perform this step. +assistance. Friendica will not work correctly if you cannot perform this step. You should also be sure that $a->config['php_path'] is set correctly, it should look like (changing it to the correct PHP location) @@ -114,7 +114,7 @@ look like (changing it to the correct PHP location) $a->config['php_path'] = '/usr/local/php53/bin/php' Alternative: You may be able to use the 'poormancron' plugin to perform this -step if you are using a recent Friendika release. 'poormancron' may result in +step if you are using a recent Friendica release. 'poormancron' may result in perfomance and memory issues and is only suitable for small sites with one or two users and a handful of contacts. To do this, edit the file ".htconfig.php" and look for a line describing your plugins. On a fresh @@ -173,7 +173,7 @@ generally be world-readable. Ensure that mod-rewite is installed and working, and that your .htaccess file is being used. To verify the latter, create a file test.out -containing the word "test" in the top directory of Friendika, make it world +containing the word "test" in the top directory of Friendica, make it world readable and point your web browser to http://yoursitenamehere.com/test.out From cec0542cdd18360bbaa6b3cf7e8282a1af0c50bb Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 19 Feb 2012 15:37:13 -0300 Subject: [PATCH 14/48] js/fk.autocomplete.js - Friendika -> Friendica --- js/fk.autocomplete.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js index 85b51baeb3..509466bd98 100755 --- a/js/fk.autocomplete.js +++ b/js/fk.autocomplete.js @@ -1,5 +1,5 @@ /** - * Friendika people autocomplete + * Friendica people autocomplete * * require jQuery, jquery.textareas */ From 6e2ae7bf1e5af56d96aad745f30eceb2c1a9de74 Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 19 Feb 2012 15:37:53 -0300 Subject: [PATCH 15/48] library/OAuth1 - Friendika -> Friendica --- library/OAuth1.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/OAuth1.php b/library/OAuth1.php index 3b211b146e..0db6fabcbe 100755 --- a/library/OAuth1.php +++ b/library/OAuth1.php @@ -289,7 +289,7 @@ class OAuthRequest { } } - // fix for friendika redirect system + // fix for friendica redirect system $http_url = substr($http_url, 0, strpos($http_url,$parameters['q'])+strlen($parameters['q'])); unset( $parameters['q'] ); From 12a87968546a08956ec610d911fb3b6520c5daec Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 19 Feb 2012 15:44:30 -0300 Subject: [PATCH 16/48] mod/dfrn_request.php and templates - Friendika -> Friendica --- mod/dfrn_request.php | 2 +- view/auto_request.tpl | 2 +- view/dfrn_request.tpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index ceec83e90b..bc159137df 100755 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -677,7 +677,7 @@ function dfrn_request_content(&$a) { '$no' => t('No'), '$add_note' => t('Add a personal note:'), '$page_desc' => $page_desc, - '$friendika' => t('Friendica'), + '$friendica' => t('Friendica'), '$statusnet' => t('StatusNet/Federated Social Web'), '$diaspora' => t('Diaspora'), '$diasnote' => t('- please share from your own site as noted above'), diff --git a/view/auto_request.tpl b/view/auto_request.tpl index 377da25c53..204fcf2475 100755 --- a/view/auto_request.tpl +++ b/view/auto_request.tpl @@ -4,7 +4,7 @@

$page_desc

diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl index 3f4300da6b..cd98a4daab 100755 --- a/view/dfrn_request.tpl +++ b/view/dfrn_request.tpl @@ -4,7 +4,7 @@

$page_desc

From 6797485f6eea4700d5801afdf7ed7567e4e3fdf1 Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 19 Feb 2012 15:45:08 -0300 Subject: [PATCH 17/48] mod/dirfind.php - Friendika -> Friendica --- mod/dirfind.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/dirfind.php b/mod/dirfind.php index 8010182766..75b1c49767 100755 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -27,7 +27,7 @@ function dirfind_content(&$a) { $p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : ''); if(strlen(get_config('system','directory_submit_url'))) - $x = fetch_url('http://dir.friendika.com/lsearch?f=' . $p . '&search=' . urlencode($search)); + $x = fetch_url('http://dir.friendica.com/lsearch?f=' . $p . '&search=' . urlencode($search)); //TODO fallback local search if global dir not available. // else From 9b2171ecee362ca46cd7207c1eb4d01589542083 Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 19 Feb 2012 16:10:48 -0300 Subject: [PATCH 18/48] mod/match.php - Friendika -> Friendica --- mod/match.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/match.php b/mod/match.php index 3645a419da..1ae7848a63 100755 --- a/mod/match.php +++ b/mod/match.php @@ -31,7 +31,7 @@ function match_content(&$a) { $params['p'] = $a->pager['page']; if(strlen(get_config('system','directory_submit_url'))) - $x = post_url('http://dir.friendika.com/msearch', $params); + $x = post_url('http://dir.friendica.com/msearch', $params); else $x = post_url($a->get_baseurl() . '/msearch', $params); From d89a0449d0eeb6bca8ca5c43d6f3cc302d1030fc Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 19 Feb 2012 16:11:18 -0300 Subject: [PATCH 19/48] htconfig.tpl - Friendika -> Friendica --- htconfig.php | 2 +- view/cs/htconfig.tpl | 4 ++-- view/de/htconfig.tpl | 4 ++-- view/en/htconfig.tpl | 4 ++-- view/es/htconfig.tpl | 4 ++-- view/fr/htconfig.tpl | 4 ++-- view/it/htconfig.tpl | 4 ++-- view/sv/htconfig.tpl | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/htconfig.php b/htconfig.php index 4698e9a94b..cb6e7b7840 100755 --- a/htconfig.php +++ b/htconfig.php @@ -23,7 +23,7 @@ $default_timezone = 'America/Los_Angeles'; // What is your site name? -$a->config['sitename'] = "Friendika Social Network"; +$a->config['sitename'] = "Friendica Social Network"; // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. // Be certain to create your own personal account before setting diff --git a/view/cs/htconfig.tpl b/view/cs/htconfig.tpl index 87ded77fd8..5d116dd995 100755 --- a/view/cs/htconfig.tpl +++ b/view/cs/htconfig.tpl @@ -53,8 +53,8 @@ $a->config['php_path'] = '$phpath'; // URL adresy globálního adresáře. -$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit'; -$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search='; +$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; +$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; // PuSH - také zvaný jako pubsubhubbub URL. Tímto zajistíte doručování veřejných přízpěvků stejně rychle jako těch soukromých diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl index c535cefa68..76709ea752 100755 --- a/view/de/htconfig.tpl +++ b/view/de/htconfig.tpl @@ -49,8 +49,8 @@ $a->config['php_path'] = '$phpath'; // Location of global directory submission page. -$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit'; -$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search='; +$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; +$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index 3eb2da0704..9e39eeb59c 100755 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -49,8 +49,8 @@ $a->config['php_path'] = '$phpath'; // Location of global directory submission page. -$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit'; -$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search='; +$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; +$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts diff --git a/view/es/htconfig.tpl b/view/es/htconfig.tpl index 9f6e282aba..6158f6a33d 100755 --- a/view/es/htconfig.tpl +++ b/view/es/htconfig.tpl @@ -49,8 +49,8 @@ $a->config['php_path'] = '$phpath'; // Location of global directory submission page. -$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit'; -$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search='; +$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; +$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl index c535cefa68..76709ea752 100755 --- a/view/fr/htconfig.tpl +++ b/view/fr/htconfig.tpl @@ -49,8 +49,8 @@ $a->config['php_path'] = '$phpath'; // Location of global directory submission page. -$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit'; -$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search='; +$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; +$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl index 9f6e282aba..6158f6a33d 100755 --- a/view/it/htconfig.tpl +++ b/view/it/htconfig.tpl @@ -49,8 +49,8 @@ $a->config['php_path'] = '$phpath'; // Location of global directory submission page. -$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit'; -$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search='; +$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; +$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl index c535cefa68..76709ea752 100755 --- a/view/sv/htconfig.tpl +++ b/view/sv/htconfig.tpl @@ -49,8 +49,8 @@ $a->config['php_path'] = '$phpath'; // Location of global directory submission page. -$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit'; -$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search='; +$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; +$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts From 7404d76126ed7b3f3e7fbe023ff316863c01e79e Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 19 Feb 2012 16:12:49 -0300 Subject: [PATCH 20/48] util/README - Friendika -> Friendica --- util/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/README b/util/README index b8fd7c9ee7..aceade3e23 100755 --- a/util/README +++ b/util/README @@ -115,7 +115,7 @@ When strings are added or modified in source, you could run to extract strings from source files and join them with the existing .po file: new strings are added, the existing are not overwritten. -If you already translated Friendika using strings.php, you could import your old +If you already translated Friendica using strings.php, you could import your old translation to messages.po. Run: $ php util/php2po.php view//strings.php From 914169472e063de7d5b3cd5a35f9ce750512c943 Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Mon, 20 Feb 2012 12:37:01 -0300 Subject: [PATCH 21/48] view/admin_remoteupdate.tpl - Friendika -> Friendica --- view/admin_remoteupdate.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/admin_remoteupdate.tpl b/view/admin_remoteupdate.tpl index 41ecfaf85c..874c6e6267 100755 --- a/view/admin_remoteupdate.tpl +++ b/view/admin_remoteupdate.tpl @@ -62,7 +62,7 @@
-

Friendika Update

+

Friendica Update

@@ -81,7 +81,7 @@ {{ if $canwrite }}
{{ else }} -

Your friendika installation is not writable by web server.

+

Your friendica installation is not writable by web server.

{{ if $canftp }}

You can try to update via FTP

{{ inc field_input.tpl with $field=$ftphost }}{{ endinc }} From 11871195be019bb05c7c41dbb4a980fffce41697 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 20 Feb 2012 18:06:43 -0800 Subject: [PATCH 22/48] fix twitter title showing up occasionally --- include/items.php | 4 ++-- include/text.php | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/items.php b/include/items.php index f4837449d7..f87a92334c 100755 --- a/include/items.php +++ b/include/items.php @@ -1700,7 +1700,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) if(! is_array($contact)) return; - if($contact['network'] === NETWORK_OSTATUS || stristr($permalink,'twitter.com')) { + if($contact['network'] === NETWORK_OSTATUS || stristr($contact['url'],'twitter.com')) { if(strlen($datarray['title'])) unset($datarray['title']); $datarray['last-child'] = 1; @@ -2074,7 +2074,7 @@ function local_delivery($importer,$data) { $datarray = get_atom_elements($feed,$item); - // TODO: make this next part work against both delivery threads of a community post + // TODO: make this next part work against both delivery threads of a community post // if((! link_compare($datarray['author-link'],$importer['url'])) && (! $community)) { // logger('local_delivery: received relay claiming to be from ' . $importer['url'] . ' however comment author url is ' . $datarray['author-link'] ); diff --git a/include/text.php b/include/text.php index b9813cfa9f..b2c7862ce1 100755 --- a/include/text.php +++ b/include/text.php @@ -776,13 +776,11 @@ function smilies($s, $sample = false) { else { $s = str_replace($params['texts'],$params['icons'],$params['string']); } - + return $s; }} - - if(! function_exists('day_translate')) { function day_translate($s) { $ret = str_replace(array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'), From b821399f001cd4082707ba9fb6df9c419e0b8e5e Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 20 Feb 2012 19:50:05 -0800 Subject: [PATCH 23/48] email notify now redirected through mod_notify, weirdness in local deliver caused by community page changes --- boot.php | 2 +- database.sql | 2 ++ include/enotify.php | 28 ++++++++++++++++++++++++++-- include/items.php | 12 +++++++++--- mod/notify.php | 29 +++++++++++++++++++++++++++++ update.php | 6 +++++- 6 files changed, 72 insertions(+), 7 deletions(-) create mode 100644 mod/notify.php diff --git a/boot.php b/boot.php index 2c9bb68d19..a988e826dd 100755 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_VERSION', '2.3.1258' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); -define ( 'DB_UPDATE_VERSION', 1122 ); +define ( 'DB_UPDATE_VERSION', 1123 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/database.sql b/database.sql index 32d7cf40b4..e051cdaac5 100755 --- a/database.sql +++ b/database.sql @@ -741,6 +741,7 @@ CREATE TABLE IF NOT EXISTS `conv` ( CREATE TABLE IF NOT EXISTS `notify` ( `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY , +`hash` CHAR( 64 ) NOT NULL, `type` INT( 11 ) NOT NULL , `name` CHAR( 255 ) NOT NULL , `url` CHAR( 255 ) NOT NULL , @@ -752,6 +753,7 @@ CREATE TABLE IF NOT EXISTS `notify` ( `seen` TINYINT( 1 ) NOT NULL DEFAULT '0', `verb` CHAR( 255 ) NOT NULL, `otype` CHAR( 16 ) NOT NULL, +INDEX ( `hash` ), INDEX ( `type` ), INDEX ( `uid` ), INDEX ( `seen` ), diff --git a/include/enotify.php b/include/enotify.php index b0967cff1b..c19cc3a9c8 100755 --- a/include/enotify.php +++ b/include/enotify.php @@ -116,10 +116,23 @@ function notification($params) { require_once('include/html2bbcode.php'); + do { + $dups = false; + $hash = random_string(); + $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1", + dbesc($hash)); + if(count($r)) + $dups = true; + } while($dups == true); + + + + // create notification entry in DB - $r = q("insert into notify (name,url,photo,date,msg,uid,link,type,verb,otype) - values('%s','%s','%s','%s','%s',%d,'%s',%d,'%s','%s')", + $r = q("insert into notify (hash,name,url,photo,date,msg,uid,link,type,verb,otype) + values('%s','%s','%s','%s','%s','%s',%d,'%s',%d,'%s','%s')", + dbesc($hash), dbesc($params['source_name']), dbesc($params['source_link']), dbesc($params['source_photo']), @@ -132,6 +145,17 @@ function notification($params) { dbesc($params['otype']) ); + $r = q("select id from notify where hash = '%s' and uid = %d limit 1", + dbesc($hash), + intval($params['uid']) + ); + if($r) + $notify_id = $r[0]['id']; + else + return; + + $itemlink = $a->get_baseurl() . '/notify/view/' . $notify_id; + // send email notification if notification preferences permit require_once('bbcode.php'); diff --git a/include/items.php b/include/items.php index f87a92334c..5beccfbe7b 100755 --- a/include/items.php +++ b/include/items.php @@ -2040,7 +2040,6 @@ function local_delivery($importer,$data) { } if($is_reply) { - $community = false; if($importer['page-flags'] == PAGE_COMMUNITY) { @@ -2054,7 +2053,9 @@ function local_delivery($importer,$data) { // was the top-level post for this reply written by somebody on this site? // Specifically, the recipient? - $r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, + $is_a_remote_comment = false; + + $r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, `item`.`forum_mode`,`item`.`origin`, `contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uri` = '%s' AND `item`.`parent-uri` = '%s' @@ -2065,9 +2066,13 @@ function local_delivery($importer,$data) { dbesc($parent_uri), intval($importer['importer_uid']) ); + if($r && count($r)) + $is_a_remote_comment = true; - if($r && count($r)) { + if(($community) && (! $r[0]['forum_mode'])) + $is_a_remote_comment = false; + if($is_a_remote_comment) { logger('local_delivery: received remote comment'); $is_like = false; // remote reply to our post. Import and then notify everybody else. @@ -2188,6 +2193,7 @@ function local_delivery($importer,$data) { } } + return 0; // NOTREACHED } diff --git a/mod/notify.php b/mod/notify.php new file mode 100644 index 0000000000..d1e5022bcb --- /dev/null +++ b/mod/notify.php @@ -0,0 +1,29 @@ +argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) { + $r = q("select * from notify where id = %d and uid = %d limit 1", + intval($a->argv[2]), + intval(local_user()) + ); + if(count($r)) { + q("update notify set seen = 1 where id = %d and uid = %d limit 1", + intval($a->argv[2]), + intval(local_user()) + ); + goaway($r[0]['link']); + } + + goaway($a->get_baseurl()); + } +} + + +function notify_content(&$a) { + if(! local_user()) + return login(); +} \ No newline at end of file diff --git a/update.php b/update.php index 24138450aa..16c1d78488 100755 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ Date: Mon, 20 Feb 2012 21:07:40 -0800 Subject: [PATCH 24/48] more cleanup of community followup detection. Remote worked well but local didn't. --- include/items.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/include/items.php b/include/items.php index 5beccfbe7b..3db56da5f6 100755 --- a/include/items.php +++ b/include/items.php @@ -2045,7 +2045,7 @@ function local_delivery($importer,$data) { if($importer['page-flags'] == PAGE_COMMUNITY) { $sql_extra = ''; $community = true; - logger('local_delivery: community reply'); + logger('local_delivery: possible community reply'); } else $sql_extra = " and contact.self = 1 and item.wall = 1 "; @@ -2055,7 +2055,7 @@ function local_delivery($importer,$data) { $is_a_remote_comment = false; - $r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, `item`.`forum_mode`,`item`.`origin`, + $r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, `item`.`forum_mode`,`item`.`origin`,`item`.`wall`, `contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uri` = '%s' AND `item`.`parent-uri` = '%s' @@ -2069,8 +2069,17 @@ function local_delivery($importer,$data) { if($r && count($r)) $is_a_remote_comment = true; - if(($community) && (! $r[0]['forum_mode'])) - $is_a_remote_comment = false; + // Does this have the characteristics of a community comment? + // If it's a reply to a wall post on a community page it's a + // valid community comment. Also forum_mode makes it valid for sure. + // If neither, it's not. + + if($is_a_remote_comment && $community) { + if((! $r[0]['forum_mode']) && (! $r[0]['wall'])) { + $is_a_remote_comment = false; + logger('local_delivery: not a community reply'); + } + } if($is_a_remote_comment) { logger('local_delivery: received remote comment'); From 5910fbf42023f36e69068c4ec09c772d997bbb72 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 21 Feb 2012 00:02:42 -0800 Subject: [PATCH 25/48] fill in notify msg with redirect link after we get the id --- include/enotify.php | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/include/enotify.php b/include/enotify.php index c19cc3a9c8..7fa83cfa41 100755 --- a/include/enotify.php +++ b/include/enotify.php @@ -28,7 +28,7 @@ function notification($params) { $subject = sprintf( t('New mail received at %s'),$sitename); $preamble = sprintf( t('%s sent you a new private message at %s.'),$params['source_name'],$sitename); - $epreamble = sprintf( t('%s sent you %s.'),'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=' . $siteurl . '/message]' . t('a private message') . '[/url]'); + $epreamble = sprintf( t('%s sent you %s.'),'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=$itemlink]' . t('a private message') . '[/url]'); $sitelink = t('Please visit %s to view and/or reply to your private messages.'); $tsitelink = sprintf( $sitelink, $siteurl . '/message' ); $hsitelink = sprintf( $sitelink, '' . $sitename . ''); @@ -39,7 +39,7 @@ function notification($params) { $subject = sprintf( t('%s commented on an item at %s'), $params['source_name'], $sitename); $preamble = sprintf( t('%s commented on an item/conversation you have been following.'), $params['source_name']); - $epreamble = sprintf( t('%s commented on %s you have been following.'), '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=' . $params['link'] . ']' . t('an item/conversation') . '[/url]'); + $epreamble = sprintf( t('%s commented on %s you have been following.'), '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=$itemlink]' . t('an item/conversation') . '[/url]'); $sitelink = t('Please visit %s to view and/or reply to the conversation.'); $tsitelink = sprintf( $sitelink, $siteurl ); @@ -49,7 +49,7 @@ function notification($params) { if($params['type'] == NOTIFY_WALL) { $preamble = $subject = sprintf( t('%s posted to your profile wall at %s') , $params['source_name'], $sitename); - $epreamble = sprintf( t('%s posted to %s') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=' . $params['link'] . ']' . t('your profile wall.') . '[/url]'); + $epreamble = sprintf( t('%s posted to %s') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=$itemlink]' . t('your profile wall.') . '[/url]'); $sitelink = t('Please visit %s to view and/or reply to the conversation.'); $tsitelink = sprintf( $sitelink, $siteurl ); @@ -69,7 +69,7 @@ function notification($params) { if($params['type'] == NOTIFY_TAGSHARE) { $preamble = $subject = sprintf( t('%s tagged your post at %s') , $params['source_name'], $sitename); - $epreamble = sprintf( t('%s tagged %s') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=' . $params['link'] . ']' . t('your post') . '[/url]' ); + $epreamble = sprintf( t('%s tagged %s') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=$itemlink]' . t('your post') . '[/url]' ); $sitelink = t('Please visit %s to view and/or reply to the conversation.'); $tsitelink = sprintf( $sitelink, $siteurl ); @@ -80,7 +80,7 @@ function notification($params) { if($params['type'] == NOTIFY_INTRO) { $subject = sprintf( t('Introduction received at %s'), $sitename); $preamble = sprintf( t('You\'ve received an introduction from \'%s\' at %s'), $params['source_name'], $sitename); - $epreamble = sprintf( t('You\'ve received %s from %s.'), '[url=' . $params['link'] . ']' . t('an introduction') . '[/url]' , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); + $epreamble = sprintf( t('You\'ve received %s from %s.'), '[url=$itemlink]' . t('an introduction') . '[/url]' , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); $body = sprintf( t('You may visit their profile at %s'),$params['source_link']); $sitelink = t('Please visit %s to approve or reject the introduction.'); @@ -93,7 +93,7 @@ function notification($params) { $subject = sprintf( t('Friend suggestion received at %s'), $sitename); $preamble = sprintf( t('You\'ve received a friend suggestion from \'%s\' at %s'), $params['source_name'], $sitename); $epreamble = sprintf( t('You\'ve received %s for %s from %s.'), - '[url=' . $params['link'] . ']' . t('a friend suggestion') . '[/url]', + '[url=$itemlink]' . t('a friend suggestion') . '[/url]', '[url=' . $params['item']['url'] . ']' . $params['item']['name'] . '[/url]', '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); $body = t('Name:') . ' ' . $params['item']['name'] . "\n"; @@ -130,14 +130,13 @@ function notification($params) { // create notification entry in DB - $r = q("insert into notify (hash,name,url,photo,date,msg,uid,link,type,verb,otype) - values('%s','%s','%s','%s','%s','%s',%d,'%s',%d,'%s','%s')", + $r = q("insert into notify (hash,name,url,photo,date,uid,link,type,verb,otype) + values('%s','%s','%s','%s','%s',%d,'%s',%d,'%s','%s')", dbesc($hash), dbesc($params['source_name']), dbesc($params['source_link']), dbesc($params['source_photo']), dbesc(datetime_convert()), - dbesc($epreamble), intval($params['uid']), dbesc($itemlink), intval($params['type']), @@ -155,6 +154,14 @@ function notification($params) { return; $itemlink = $a->get_baseurl() . '/notify/view/' . $notify_id; + $msg = replace_macros($epreamble,array('$itemlink' => $itemlink)); + $r = q("update notify set msg = '%s' where id = %d and uid = %d limit 1", + dbesc($msg), + intval($notify_id), + intval($params['uid']) + ); + + // send email notification if notification preferences permit From 01a2791e3a83fba4da878cb094855819821a23d1 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Tue, 21 Feb 2012 11:25:22 +0100 Subject: [PATCH 26/48] template: add support for variable filters --- include/template_processor.php | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/include/template_processor.php b/include/template_processor.php index 25f7703a21..0d476f0e6e 100755 --- a/include/template_processor.php +++ b/include/template_processor.php @@ -10,7 +10,7 @@ var $done = false; var $d = false; var $lang = null; - + var $debug=false; private function _preg_error(){ switch(preg_last_error()){ @@ -160,6 +160,30 @@ return $s; } + private function _str_replace($str){ + #$this->search,$this->replace, + $searchs = $this->search; + foreach($searchs as $search){ + $search = "|".preg_quote($search)."(\|[a-zA-Z0-9_]*)*|"; + $m = array(); + if (preg_match_all($search, $str,$m)){ + foreach ($m[0] as $match){ + $toks = explode("|",$match); + $val = $this->_get_var($toks[0]); + for($k=1; $k1){ + $str = str_replace( $match, $val, $str); + } + } + } + + } + return str_replace($this->search,$this->replace, $str); + } + public function replace($s, $r) { $this->r = $r; @@ -180,7 +204,7 @@ $os = ""; $count=0; while($os!=$s && $count<10){ $os=$s; $count++; - $s = str_replace($this->search,$this->replace, $s); + $s = $this->_str_replace($s); } return template_unescape($s); } From a97cb88b658978f2172ec60a7d9a8661b230dfd0 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 21 Feb 2012 14:15:10 -0800 Subject: [PATCH 27/48] logger_debug was used as string instead of constant --- boot.php | 2 +- mod/photos.php | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/boot.php b/boot.php index a988e826dd..79a925961b 100755 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1258' ); +define ( 'FRIENDICA_VERSION', '2.3.1259' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1123 ); diff --git a/mod/photos.php b/mod/photos.php index 466fe44d3e..e40ae0d74a 100755 --- a/mod/photos.php +++ b/mod/photos.php @@ -98,7 +98,7 @@ EOT; function photos_post(&$a) { - logger('mod-photos: photos_post: begin' , 'LOGGER_DEBUG'); + logger('mod-photos: photos_post: begin' , LOGGER_DEBUG); logger('mod_photos: REQUEST ' . print_r($_REQUEST,true), LOGGER_DATA); @@ -571,7 +571,7 @@ function photos_post(&$a) { $album = notags(trim($_REQUEST['album'])); $newalbum = notags(trim($_REQUEST['newalbum'])); - logger('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , 'LOGGER_DEBUG'); + logger('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , LOGGER_DEBUG); if(! strlen($album)) { if(strlen($newalbum)) @@ -643,13 +643,13 @@ function photos_post(&$a) { return; } - logger('mod/photos.php: photos_post(): loading the contents of ' . $src , 'LOGGER_DEBUG'); + logger('mod/photos.php: photos_post(): loading the contents of ' . $src , LOGGER_DEBUG); $imagedata = @file_get_contents($src); $ph = new Photo($imagedata); if(! $ph->is_valid()) { - logger('mod/photos.php: photos_post(): unable to process image' , 'LOGGER_DEBUG'); + logger('mod/photos.php: photos_post(): unable to process image' , LOGGER_DEBUG); notice( t('Unable to process image.') . EOL ); @unlink($src); $foo = 0; @@ -669,7 +669,7 @@ function photos_post(&$a) { $r = $ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny); if(! $r) { - logger('mod/photos.php: photos_post(): image store failed' , 'LOGGER_DEBUG'); + logger('mod/photos.php: photos_post(): image store failed' , LOGGER_DEBUG); notice( t('Image upload failed.') . EOL ); killme(); } From f03aaf554e32fa528b0f1b1068db0824efb77e07 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 21 Feb 2012 16:59:57 -0800 Subject: [PATCH 28/48] mark all notifications read --- include/items.php | 5 +++-- mod/group.php | 2 +- mod/notify.php | 10 ++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/include/items.php b/include/items.php index 3db56da5f6..347826042e 100755 --- a/include/items.php +++ b/include/items.php @@ -1551,8 +1551,9 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) } $force_parent = false; - if($contact['network'] === NETWORK_OSTATUS) { - $force_parent = true; + if($contact['network'] === NETWORK_OSTATUS || stristr($contact['url'],'twitter.com')) { + if($contact['network'] === NETWORK_OSTATUS) + $force_parent = true; if(strlen($datarray['title'])) unset($datarray['title']); $r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d", diff --git a/mod/group.php b/mod/group.php index ca163902ca..c896362ca2 100755 --- a/mod/group.php +++ b/mod/group.php @@ -68,7 +68,7 @@ function group_content(&$a) { return; } - // Switch to text mod interface if we have more than 'n' contacts or group members + // Switch to text mode interface if we have more than 'n' contacts or group members $switchtotext = get_pconfig(local_user(),'system','groupedit_image_limit'); if($switchtotext === false) diff --git a/mod/notify.php b/mod/notify.php index d1e5022bcb..229020f4a7 100644 --- a/mod/notify.php +++ b/mod/notify.php @@ -20,6 +20,16 @@ function notify_init(&$a) { goaway($a->get_baseurl()); } + + if($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all' ) { + $r = q("update notify set seen = 1 where uid = %d", + intval(local_user()) + ); + $j = json_encode(array('result' => ($r) ? 'success' : 'fail')); + echo $j; + killme(); + } + } From 3f2497ad20f5829b9e473cffbf1e635dae3f9dc9 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 21 Feb 2012 18:10:15 -0800 Subject: [PATCH 29/48] add full email link to notification --- include/enotify.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/enotify.php b/include/enotify.php index 7fa83cfa41..6af2243f0d 100755 --- a/include/enotify.php +++ b/include/enotify.php @@ -30,9 +30,9 @@ function notification($params) { $preamble = sprintf( t('%s sent you a new private message at %s.'),$params['source_name'],$sitename); $epreamble = sprintf( t('%s sent you %s.'),'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=$itemlink]' . t('a private message') . '[/url]'); $sitelink = t('Please visit %s to view and/or reply to your private messages.'); - $tsitelink = sprintf( $sitelink, $siteurl . '/message' ); - $hsitelink = sprintf( $sitelink, '' . $sitename . ''); - $itemlink = $siteurl . '/message'; + $tsitelink = sprintf( $sitelink, $siteurl . '/message/' . $params['item']['id'] ); + $hsitelink = sprintf( $sitelink, '' . $sitename . ''); + $itemlink = $siteurl . '/message/' . $params['item']['id']; } if($params['type'] == NOTIFY_COMMENT) { From 53d3ee8852d7e825443c58121e63cf13c120c40e Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 21 Feb 2012 19:03:55 -0800 Subject: [PATCH 30/48] new notifications --- mod/ping.php | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/mod/ping.php b/mod/ping.php index 9c2e385d66..2898042a3d 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -12,6 +12,13 @@ function ping_init(&$a) { $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; if(local_user()){ + $z = q("select * from notify where seen = 0 and uid = %d + order by date desc", + intval(local_user()) + ); + + + $tags = array(); $comments = array(); $likes = array(); @@ -142,6 +149,22 @@ function ping_init(&$a) { $tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags); echo ' '; + + require_once('include/bbcode.php'); + + if(count($z)) { + foreach($z as $zz) { + echo xmlize($a->get_baseurl() . '/notify/' . $zz['id'], $zz['name'],$zz['url'],$zz['photo'],relative_date($zz['date']), bbcode($zz['msg'])); + + } + } + + + + + +/* + if ($intro>0){ foreach ($intros as $i) { echo xmlize( $a->get_baseurl().'/notifications/intros/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend") ); @@ -195,6 +218,8 @@ function ping_init(&$a) { }; } +*/ + echo " "; } echo " "; From 9fe12d1724acf819f2cbc88bf6647e0adee0b5ea Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 21 Feb 2012 20:22:09 -0800 Subject: [PATCH 31/48] some cleanup of tb notifications --- view/theme/testbubble/nav.tpl | 3 ++- view/theme/testbubble/style.css | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl index acbea5bf84..9051fcb06a 100755 --- a/view/theme/testbubble/nav.tpl +++ b/view/theme/testbubble/nav.tpl @@ -6,7 +6,8 @@
{{ if $nav.network }}{{ endif }} {{ if $nav.home }}{{ endif }} - {{ if $nav.notifications }}{{ endif }} + + {{ if $nav.introductions }}{{ endif }} {{ if $nav.messages }}{{ endif }}
+ +
diff --git a/view/theme/dispy/contact_template.tpl b/view/theme/dispy/contact_template.tpl new file mode 100755 index 0000000000..48930b48ab --- /dev/null +++ b/view/theme/dispy/contact_template.tpl @@ -0,0 +1,25 @@ + +
+
+
+ + $contact.name + + {{ if $contact.photo_menu }} + menu +
+
    + $contact.photo_menu +
+
+ {{ endif }} +
+ +
+
+
$contact.name
+ +
+
diff --git a/view/theme/duepuntozero/contact_template.tpl b/view/theme/duepuntozero/contact_template.tpl new file mode 100755 index 0000000000..48930b48ab --- /dev/null +++ b/view/theme/duepuntozero/contact_template.tpl @@ -0,0 +1,25 @@ + +
+
+
+ + $contact.name + + {{ if $contact.photo_menu }} + menu +
+
    + $contact.photo_menu +
+
+ {{ endif }} +
+ +
+
+
$contact.name
+ +
+
diff --git a/view/theme/loozah/contact_template.tpl b/view/theme/loozah/contact_template.tpl new file mode 100755 index 0000000000..48930b48ab --- /dev/null +++ b/view/theme/loozah/contact_template.tpl @@ -0,0 +1,25 @@ + +
+
+
+ + $contact.name + + {{ if $contact.photo_menu }} + menu +
+
    + $contact.photo_menu +
+
+ {{ endif }} +
+ +
+
+
$contact.name
+ +
+
diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less index 5314b52843..18d0fc620d 100755 --- a/view/theme/quattro/colors.less +++ b/view/theme/quattro/colors.less @@ -1,6 +1,7 @@ // Quattro Theme LESS file // "Echo" palette from Inkscape +@Yellow1 : #fce94f; @Blue1:rgb(25,174,255); @Blue2:rgb(0,132,200); @Blue3:rgb(0,92,148); @@ -71,6 +72,7 @@ @NoticeBackgroundColor: #511919; @ThreadBackgroundColor: #f6f7f8; +@ShinyBorderColor: @Yellow1; @CommentBoxEmptyColor: @Grey3; @CommentBoxEmptyBorderColor: @Grey3; @@ -91,4 +93,4 @@ @JotPermissionUnlockBackgroundColor: @Grey2; @JotPermissionLockBackgroundColor: @Grey4; @JotLoadingBackgroundColor: @Grey1; - +@JotPreviewBackgroundColor: @Yellow1; diff --git a/view/theme/quattro/contact_template.tpl b/view/theme/quattro/contact_template.tpl deleted file mode 100755 index f2749656a2..0000000000 --- a/view/theme/quattro/contact_template.tpl +++ /dev/null @@ -1,21 +0,0 @@ - -
-
-
- - $name - - menu - - -
- -
-
$name
- - -
- diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index f834f2e777..1c14177c67 100755 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -309,12 +309,13 @@ aside { .allcontact-link { float: right; margin: 5px 0px; } .contact-block-content { clear: both; - overflow: auto; height: auto; + overflow: idden; height: auto; } + /*.contact-block-div { width:60px; height: 60px; }*/ .contact-block-link { float: left; margin: 0px 2px 2px 0px; - img { widht: 48px; height: 58px; } + img { widht: 48px; height: 48px; } } } /* mail view */ @@ -373,6 +374,7 @@ aside { top: -50px; } } +/* #group-members { margin-top: 20px; padding: 10px; @@ -395,9 +397,10 @@ aside { } .contact-block-div { float: left; - width: 52px; - height: 52px; -} + width: 60px; + height: 60px; +}*/ + /* widget */ .widget { margin-bottom: 2em; @@ -551,6 +554,8 @@ section { } +.shiny { border-right:10px solid @ShinyBorderColor; } +#jot-preview-content .tread-wrapper { background-color: @JotPreviewBackgroundColor; } .wall-item-tags { padding-top: 5px; } @@ -589,7 +594,7 @@ section { right: 5px; } -/* contacts menu */ + .contact-photo-wrapper { position: relative; } .contact-photo { width: 48px; height: 48px; @@ -606,9 +611,14 @@ section { .contact-wrapper { float: left; - width: 90px; + width: 300px; height: 90px; - margin-bottom: 15px; + padding-right: 10px; + margin: 0 10px 10px 0px; + .contact-photo-wrapper { + float: left; + margin-right: 10px; + } .contact-photo { width: 80px; height: 80px; img { width: 80px; height: 80px; } @@ -627,8 +637,13 @@ section { img { width: 175px; height: 175px; } } } -.contact-name { text-align: center; font-weight: bold; } -.contact-details { color: @Grey3;} +.contact-name { font-weight: bold; padding-top: 15px; } +.contact-details { + color: @Grey3; white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + /* editor */ .jothidden { display: none; } #jot { diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index ed2baee7ad..2a912ccba9 100755 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -602,6 +602,8 @@ aside #profiles-menu { #contact-block { overflow: auto; height: auto; + /*.contact-block-div { width:60px; height: 60px; }*/ + } #contact-block .contact-block-h4 { float: left; @@ -613,7 +615,7 @@ aside #profiles-menu { } #contact-block .contact-block-content { clear: both; - overflow: auto; + overflow: idden; height: auto; } #contact-block .contact-block-link { @@ -622,7 +624,7 @@ aside #profiles-menu { } #contact-block .contact-block-link img { widht: 48px; - height: 58px; + height: 48px; } /* mail view */ .mail-conv-sender, .mail-conv-detail { @@ -675,31 +677,32 @@ aside #profiles-menu { position: relative; top: -50px; } +/* #group-members { - margin-top: 20px; - padding: 10px; - height: 250px; - overflow: auto; - border: 1px solid #ddd; + margin-top: 20px; + padding: 10px; + height: 250px; + overflow: auto; + border: 1px solid #ddd; } #group-members-end { - clear: both; + clear: both; } #group-all-contacts { - padding: 10px; - height: 450px; - overflow: auto; - border: 1px solid #ddd; + padding: 10px; + height: 450px; + overflow: auto; + border: 1px solid #ddd; } #group-all-contacts-end { - clear: both; - margin-bottom: 10px; + clear: both; + margin-bottom: 10px; } .contact-block-div { - float: left; - width: 52px; - height: 52px; -} + float: left; + width: 60px; + height: 60px; +}*/ /* widget */ .widget { margin-bottom: 2em; @@ -946,6 +949,12 @@ section { padding: 0; margin: 10px 0; } +.shiny { + border-right: 10px solid #fce94f; +} +#jot-preview-content .tread-wrapper { + background-color: #fce94f; +} .wall-item-tags { padding-top: 5px; } @@ -985,7 +994,6 @@ section { bottom: 5px; right: 5px; } -/* contacts menu */ .contact-photo-wrapper { position: relative; } @@ -1007,9 +1015,14 @@ section { } .contact-wrapper { float: left; - width: 90px; + width: 300px; height: 90px; - margin-bottom: 15px; + padding-right: 10px; + margin: 0 10px 10px 0px; +} +.contact-wrapper .contact-photo-wrapper { + float: left; + margin-right: 10px; } .contact-wrapper .contact-photo { width: 80px; @@ -1037,11 +1050,14 @@ section { height: 175px; } .contact-name { - text-align: center; font-weight: bold; + padding-top: 15px; } .contact-details { color: #999999; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } /* editor */ .jothidden { diff --git a/view/theme/testbubble/contact_template.tpl b/view/theme/testbubble/contact_template.tpl new file mode 100755 index 0000000000..48930b48ab --- /dev/null +++ b/view/theme/testbubble/contact_template.tpl @@ -0,0 +1,25 @@ + +
+
+
+ + $contact.name + + {{ if $contact.photo_menu }} + menu +
+
    + $contact.photo_menu +
+
+ {{ endif }} +
+ +
+
+
$contact.name
+ +
+
diff --git a/view/theme/vier/contact_template.tpl b/view/theme/vier/contact_template.tpl old mode 100644 new mode 100755 index f2749656a2..48930b48ab --- a/view/theme/vier/contact_template.tpl +++ b/view/theme/vier/contact_template.tpl @@ -1,21 +1,25 @@ -
-
-
+
+
+
- $name - - menu - + $contact.name + {{ if $contact.photo_menu }} + menu +
+
    + $contact.photo_menu +
+
+ {{ endif }}
-
$name
- +
+
$contact.name
+
- diff --git a/view/viewcontact_template.tpl b/view/viewcontact_template.tpl index c61544f9f8..d6f01643ea 100755 --- a/view/viewcontact_template.tpl +++ b/view/viewcontact_template.tpl @@ -1,9 +1,9 @@ +

$title

-
-
-
- $name -
-
-
$name
-
+{{ for $contacts as $contact }} + {{ inc contact_template.tpl }}{{ endinc }} +{{ endfor }} + +
+ +$paginate From c03b5b62c041d0bfa357c1caeaf5accccf4474c1 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 23 Feb 2012 12:54:14 +0100 Subject: [PATCH 46/48] green-quattro: applied a color for shiny class and preview --- view/theme/quattro-green/colors.less | 4 ++ view/theme/quattro-green/style.css | 60 ++++++++++++++++++---------- 2 files changed, 42 insertions(+), 22 deletions(-) diff --git a/view/theme/quattro-green/colors.less b/view/theme/quattro-green/colors.less index fd32b10431..57fd2ef60b 100755 --- a/view/theme/quattro-green/colors.less +++ b/view/theme/quattro-green/colors.less @@ -1,6 +1,7 @@ // Quattro Theme LESS file // "Echo" palette from Inkscape +@Yellow1 : #fce94f; @Blue1:rgb(25,174,255); @Blue2:rgb(0,132,200); @Blue3:rgb(0,92,148); @@ -16,6 +17,7 @@ @Green1:rgb(204,255,66); @Green2:rgb(154,222,0); @Green3:rgb(0,145,0); +@Green4:rgb(221,255,221); @Purple1:rgb(241,202,255); @Purple2:rgb(215,108,255); @Purple3:rgb(186,0,255); @@ -71,6 +73,7 @@ @NoticeBackgroundColor: #511919; @ThreadBackgroundColor: #f6f7f8; +@ShinyBorderColor: @Green4; @CommentBoxEmptyColor: @Grey3; @CommentBoxEmptyBorderColor: @Grey3; @@ -91,4 +94,5 @@ @JotPermissionUnlockBackgroundColor: @Grey2; @JotPermissionLockBackgroundColor: @Grey4; @JotLoadingBackgroundColor: @Grey1; +@JotPreviewBackgroundColor: @Green4; diff --git a/view/theme/quattro-green/style.css b/view/theme/quattro-green/style.css index ab1083e75c..301477679a 100755 --- a/view/theme/quattro-green/style.css +++ b/view/theme/quattro-green/style.css @@ -602,6 +602,8 @@ aside #profiles-menu { #contact-block { overflow: auto; height: auto; + /*.contact-block-div { width:60px; height: 60px; }*/ + } #contact-block .contact-block-h4 { float: left; @@ -613,7 +615,7 @@ aside #profiles-menu { } #contact-block .contact-block-content { clear: both; - overflow: auto; + overflow: idden; height: auto; } #contact-block .contact-block-link { @@ -622,7 +624,7 @@ aside #profiles-menu { } #contact-block .contact-block-link img { widht: 48px; - height: 58px; + height: 48px; } /* mail view */ .mail-conv-sender, .mail-conv-detail { @@ -675,31 +677,32 @@ aside #profiles-menu { position: relative; top: -50px; } +/* #group-members { - margin-top: 20px; - padding: 10px; - height: 250px; - overflow: auto; - border: 1px solid #ddd; + margin-top: 20px; + padding: 10px; + height: 250px; + overflow: auto; + border: 1px solid #ddd; } #group-members-end { - clear: both; + clear: both; } #group-all-contacts { - padding: 10px; - height: 450px; - overflow: auto; - border: 1px solid #ddd; + padding: 10px; + height: 450px; + overflow: auto; + border: 1px solid #ddd; } #group-all-contacts-end { - clear: both; - margin-bottom: 10px; + clear: both; + margin-bottom: 10px; } .contact-block-div { - float: left; - width: 52px; - height: 52px; -} + float: left; + width: 60px; + height: 60px; +}*/ /* widget */ .widget { margin-bottom: 2em; @@ -946,6 +949,12 @@ section { padding: 0; margin: 10px 0; } +.shiny { + border-right: 10px solid #ddffdd; +} +#jot-preview-content .tread-wrapper { + background-color: #ddffdd; +} .wall-item-tags { padding-top: 5px; } @@ -985,7 +994,6 @@ section { bottom: 5px; right: 5px; } -/* contacts menu */ .contact-photo-wrapper { position: relative; } @@ -1007,9 +1015,14 @@ section { } .contact-wrapper { float: left; - width: 90px; + width: 300px; height: 90px; - margin-bottom: 15px; + padding-right: 10px; + margin: 0 10px 10px 0px; +} +.contact-wrapper .contact-photo-wrapper { + float: left; + margin-right: 10px; } .contact-wrapper .contact-photo { width: 80px; @@ -1037,11 +1050,14 @@ section { height: 175px; } .contact-name { - text-align: center; font-weight: bold; + padding-top: 15px; } .contact-details { color: #999999; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } /* editor */ .jothidden { From edd946bcadf132e33cfa88ba11c88f2914275253 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Thu, 23 Feb 2012 14:10:23 +0100 Subject: [PATCH 47/48] quattro: fix typos --- view/theme/quattro/quattro.less | 5 +++-- view/theme/quattro/style.css | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 1c14177c67..9d26082616 100755 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -309,13 +309,14 @@ aside { .allcontact-link { float: right; margin: 5px 0px; } .contact-block-content { clear: both; - overflow: idden; height: auto; + overflow: hidden; + height: auto; } /*.contact-block-div { width:60px; height: 60px; }*/ .contact-block-link { float: left; margin: 0px 2px 2px 0px; - img { widht: 48px; height: 48px; } + img { width: 48px; height: 48px; } } } /* mail view */ diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index 2a912ccba9..b728023c9f 100755 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -615,7 +615,7 @@ aside #profiles-menu { } #contact-block .contact-block-content { clear: both; - overflow: idden; + overflow: hidden; height: auto; } #contact-block .contact-block-link { @@ -623,7 +623,7 @@ aside #profiles-menu { margin: 0px 2px 2px 0px; } #contact-block .contact-block-link img { - widht: 48px; + width: 48px; height: 48px; } /* mail view */ From 1dacb2e57018ae210dad6f9992ec3d75d4b53138 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 23 Feb 2012 14:16:20 +0100 Subject: [PATCH 48/48] quattro-green: removed contact_template.tpl --- view/theme/quattro-green/contact_template.tpl | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100755 view/theme/quattro-green/contact_template.tpl diff --git a/view/theme/quattro-green/contact_template.tpl b/view/theme/quattro-green/contact_template.tpl deleted file mode 100755 index f2749656a2..0000000000 --- a/view/theme/quattro-green/contact_template.tpl +++ /dev/null @@ -1,21 +0,0 @@ - -
-
-
- - $name - - menu - - -
- -
-
$name
- - -
-