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 01/16] 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 02/16] 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 03/16] 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 04/16] 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 05/16] 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 06/16] 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 07/16] 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 08/16] 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 09/16] 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 10/16] 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 11/16] 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 12/16] 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 13/16] 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 14/16] 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 15/16] 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 16/16] 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 }}