aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/Doxyfile2
-rw-r--r--util/README2
-rw-r--r--util/messages.po24
-rwxr-xr-xutil/run_xgettext.sh2
-rwxr-xr-xutil/shredder/ShredOAuth.sh28
-rwxr-xr-xutil/shredder/shredder2
-rw-r--r--util/strings.php6
-rw-r--r--util/zotsh/README.txt2
8 files changed, 34 insertions, 34 deletions
diff --git a/util/Doxyfile b/util/Doxyfile
index f700c2abe..55acd46eb 100644
--- a/util/Doxyfile
+++ b/util/Doxyfile
@@ -1,6 +1,6 @@
INPUT = README.md index.php boot.php mod/ include/ util/ view/ version.inc
RECURSIVE = YES
-PROJECT_NAME = "The RedMatrix"
+PROJECT_NAME = "The Hubzilla"
PROJECT_LOGO = images/rm-64.png
EXCLUDE = .htconfig.php library/ doc/ vendor/ .git/ util/zotsh/easywebdav/
EXCLUDE_PATTERNS = *smarty3* *strings.php *.out *test*
diff --git a/util/README b/util/README
index 9d8fe299c..991a3fe51 100644
--- 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 the RedMatrix using strings.php, you could import your old
+If you already translated the Hubzilla using strings.php, you could import your old
translation to messages.po. Run:
$ php util/php2po.php view/<language>/strings.php
diff --git a/util/messages.po b/util/messages.po
index 883ef4a5f..22247177f 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -1111,7 +1111,7 @@ msgid "Red Matrix Notification"
msgstr ""
#: ../../include/enotify.php:59
-msgid "redmatrix"
+msgid "hubzilla"
msgstr ""
#: ../../include/enotify.php:61
@@ -1674,7 +1674,7 @@ msgid "Attachments:"
msgstr ""
#: ../../include/bb2diaspora.php:453
-msgid "Redmatrix event notification:"
+msgid "Hubzilla event notification:"
msgstr ""
#: ../../include/text.php:329
@@ -4746,8 +4746,8 @@ msgstr ""
#: ../../mod/like.php:21
msgid ""
-"Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a href="
-"\"register\">register as a new RedMatrix member</a> to continue."
+"Please <a href=\"rmagic\">login with your Hubzilla ID</a> or <a href="
+"\"register\">register as a new Redmatrix.member</a> to continue."
msgstr ""
#: ../../mod/like.php:101 ../../mod/like.php:128 ../../mod/like.php:166
@@ -4957,7 +4957,7 @@ msgid "Edit post"
msgstr ""
#: ../../mod/dav.php:121
-msgid "RedMatrix channel"
+msgid "Hubzilla channel"
msgstr ""
#: ../../mod/group.php:20
@@ -5027,7 +5027,7 @@ msgstr ""
#: ../../mod/siteinfo.php:156
msgid ""
-"This is a hub of redmatrix - a global cooperative network of decentralized "
+"This is a hub of hubzilla - a global cooperative network of decentralized "
"privacy enhanced websites."
msgstr ""
@@ -5055,7 +5055,7 @@ msgstr ""
#: ../../mod/siteinfo.php:168
msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"
+"Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot com"
msgstr ""
#: ../../mod/siteinfo.php:170
@@ -5585,7 +5585,7 @@ msgid "%1$s tagged %2$s's %3$s with %4$s"
msgstr ""
#: ../../mod/cloud.php:120
-msgid "RedMatrix - Guests: Username: {your email address}, Password: +++"
+msgid "Hubzilla - Guests: Username: {your email address}, Password: +++"
msgstr ""
#: ../../mod/photos.php:77
@@ -6141,7 +6141,7 @@ msgid "Your message:"
msgstr ""
#: ../../mod/invite.php:132
-msgid "Please join my community on RedMatrix."
+msgid "Please join my community on Hubzilla."
msgstr ""
#: ../../mod/invite.php:134
@@ -6149,11 +6149,11 @@ msgid "You will need to supply this invitation code: "
msgstr ""
#: ../../mod/invite.php:135
-msgid "1. Register at any RedMatrix location (they are all inter-connected)"
+msgid "1. Register at any Hubzilla location (they are all inter-connected)"
msgstr ""
#: ../../mod/invite.php:137
-msgid "2. Enter my RedMatrix network address into the site searchbar."
+msgid "2. Enter my Hubzilla network address into the site searchbar."
msgstr ""
#: ../../mod/invite.php:138
@@ -6762,7 +6762,7 @@ msgid "Link Target"
msgstr ""
#: ../../mod/mitem.php:156 ../../mod/mitem.php:226
-msgid "Use RedMatrix magic-auth if available"
+msgid "Use Hubzilla magic-auth if available"
msgstr ""
#: ../../mod/mitem.php:157 ../../mod/mitem.php:227
diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh
index 3eca8a8b3..a2d8c35b3 100755
--- a/util/run_xgettext.sh
+++ b/util/run_xgettext.sh
@@ -65,7 +65,7 @@ then
sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER//g" "$OUTFILE"
sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.//g" "$OUTFILE"
sed -i "s/PACKAGE VERSION//g" "$OUTFILE"
- sed -i "s/PACKAGE/RedMatrix $ADDONNAME addon/g" "$OUTFILE"
+ sed -i "s/PACKAGE/Hubzilla $ADDONNAME addon/g" "$OUTFILE"
sed -i "s/CHARSET/UTF-8/g" "$OUTFILE"
sed -i '/^\"Plural-Forms/d' "$OUTFILE"
else
diff --git a/util/shredder/ShredOAuth.sh b/util/shredder/ShredOAuth.sh
index 9828124c7..c119132cd 100755
--- a/util/shredder/ShredOAuth.sh
+++ b/util/shredder/ShredOAuth.sh
@@ -27,13 +27,13 @@ F_API_VERSION="1"
# Friendica API endpoints
-F_ACCOUNF_UPDATE_PROFILE_IMAGE="${redmatrix_url}/api/account/update_profile_image"
-F_STATUSES_UPDATE="${redmatrix_url}/api/statuses/update"
-F_STATUSES_HOME_TIMELINE="${redmatrix_url}/api/statuses/home_timeline"
+F_ACCOUNF_UPDATE_PROFILE_IMAGE="${hubzilla_url}/api/account/update_profile_image"
+F_STATUSES_UPDATE="${hubzilla_url}/api/statuses/update"
+F_STATUSES_HOME_TIMELINE="${hubzilla_url}/api/statuses/home_timeline"
-F_REQUESF_TOKEN=${redmatrix_url}'/api/oauth/request_token'
-F_ACCESS_TOKEN=${redmatrix_url}'/api/oauth/access_token'
-F_AUTHORIZE_TOKEN=${redmatrix_url}'/api/oauth/authorize'
+F_REQUESF_TOKEN=${hubzilla_url}'/api/oauth/request_token'
+F_ACCESS_TOKEN=${hubzilla_url}'/api/oauth/access_token'
+F_AUTHORIZE_TOKEN=${hubzilla_url}'/api/oauth/authorize'
# Source OAuth.sh
@@ -76,7 +76,7 @@ FO_access_token_helper () {
# Request Token
- local auth_header="$(_OAuth_authorization_header 'Authorization' "$redmatrix_url/" "$oauth_consumer_key" "$oauth_consumer_secret" '' '' "$oauth_signature_method" "$oauth_version" "$(OAuth_nonce)" "$(OAuth_timestamp)" 'POST' "$F_REQUESF_TOKEN" "$(OAuth_param 'oauth_callback' 'oob')"), $(OAuth_param_quote 'oauth_callback' 'oob')"
+ local auth_header="$(_OAuth_authorization_header 'Authorization' "$hubzilla_url/" "$oauth_consumer_key" "$oauth_consumer_secret" '' '' "$oauth_signature_method" "$oauth_version" "$(OAuth_nonce)" "$(OAuth_timestamp)" 'POST' "$F_REQUESF_TOKEN" "$(OAuth_param 'oauth_callback' 'oob')"), $(OAuth_param_quote 'oauth_callback' 'oob')"
# echo $auth_header
# echo $F_REQUESF_TOKEN
@@ -95,7 +95,7 @@ FO_access_token_helper () {
# Access Token
- local auth_header="$(_OAuth_authorization_header 'Authorization' "$redmatrix_url/" "$oauth_consumer_key" "$oauth_consumer_secret" "$_oauth_token" "$_oauth_token_secret" "$oauth_signature_method" "$oauth_version" "$(OAuth_nonce)" "$(OAuth_timestamp)" 'POST' "$F_ACCESS_TOKEN" "$(OAuth_param 'oauth_verifier' "$PIN")"), $(OAuth_param_quote 'oauth_verifier' "$PIN")"
+ local auth_header="$(_OAuth_authorization_header 'Authorization' "$hubzilla_url/" "$oauth_consumer_key" "$oauth_consumer_secret" "$_oauth_token" "$_oauth_token_secret" "$oauth_signature_method" "$oauth_version" "$(OAuth_nonce)" "$(OAuth_timestamp)" 'POST' "$F_ACCESS_TOKEN" "$(OAuth_param 'oauth_verifier' "$PIN")"), $(OAuth_param_quote 'oauth_verifier' "$PIN")"
resp=$(curl -s -d "" -H "$auth_header" "$F_ACCESS_TOKEN")
FO_rval=$?
@@ -133,7 +133,7 @@ FO_statuses_update () {
[[ "$3" != "" ]] && params[${#params[@]}]=$(OAuth_param 'in_reply_to_status_id' "$3") && local in_reply_to_status_id=( '--data-urlencode' "in_reply_to_status_id=$3" )
- local auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'POST' "$F_STATUSES_UPDATE.$format" ${params[@]})
+ local auth_header=$(OAuth_authorization_header 'Authorization' "$hubzilla_url" '' '' 'POST' "$F_STATUSES_UPDATE.$format" ${params[@]})
FO_ret=$(curl -s -H "$auth_header" --data-urlencode "status=$2" --data-urlencode "source=shred" ${in_reply_to_status_id[@]} "$F_STATUSES_UPDATE.$format")
@@ -163,7 +163,7 @@ FO_statuses_home_timeline () {
$(OAuth_param 'count' $count)
)
- local auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'GET' "$F_STATUSES_HOME_TIMELINE.$format" ${params[@]})
+ local auth_header=$(OAuth_authorization_header 'Authorization' "$hubzilla_url" '' '' 'GET' "$F_STATUSES_HOME_TIMELINE.$format" ${params[@]})
convscreen=$(OAuth_PE "$screen_name");
FO_ret=$(curl -s --get "${F_STATUSES_HOME_TIMELINE}.${format}" --data "screen_name=${convscreen}&count=${count}" --header "${auth_header}")
@@ -204,12 +204,12 @@ FO_command () {
local auth_header='';
if [ "$post" == '1' ]; then
- auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'POST' "${redmatrix_url}/api/${command}.json" ${params[@]})
- FO_ret=$(curl -s "${redmatrix_url}/api/${command}.json" --data-urlencode "${data}" --header "${auth_header}")
+ auth_header=$(OAuth_authorization_header 'Authorization' "$hubzilla_url" '' '' 'POST' "${hubzilla_url}/api/${command}.json" ${params[@]})
+ FO_ret=$(curl -s "${hubzilla_url}/api/${command}.json" --data-urlencode "${data}" --header "${auth_header}")
else
- auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'GET' "${redmatrix_url}/api/${command}.json" ${params[@]})
- FO_ret=$(curl -s --get "${redmatrix_url}/api/${command}.json" --data "${data}" --header "${auth_header}")
+ auth_header=$(OAuth_authorization_header 'Authorization' "$hubzilla_url" '' '' 'GET' "${hubzilla_url}/api/${command}.json" ${params[@]})
+ FO_ret=$(curl -s --get "${hubzilla_url}/api/${command}.json" --data "${data}" --header "${auth_header}")
fi
diff --git a/util/shredder/shredder b/util/shredder/shredder
index ac84f0541..61e6b1fd4 100755
--- a/util/shredder/shredder
+++ b/util/shredder/shredder
@@ -45,7 +45,7 @@ Use -h -c command to get options for the command.
show_config_help () {
echo "Please create $FCLI_RC with:
-redmatrix_url=YOR_SERVER_URL (no trailing /)
+hubzilla_url=YOR_SERVER_URL (no trailing /)
oauth_consumer_key=YOUR_CONSUMER_KEY
oauth_consumer_secret=YOUR_CONSUMER_SECRET
diff --git a/util/strings.php b/util/strings.php
index cfd6538e0..8f9735ee9 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -308,7 +308,7 @@ $a->strings["Enable Safe Search"] = "";
$a->strings["Disable Safe Search"] = "";
$a->strings["Safe Mode"] = "";
$a->strings["Red Matrix Notification"] = "";
-$a->strings["redmatrix"] = "";
+$a->strings["hubzilla"] = "";
$a->strings["Thank You,"] = "";
$a->strings["%s Administrator"] = "";
$a->strings["%s <!item_type!>"] = "";
@@ -1368,7 +1368,7 @@ $a->strings["This is a hub of the Red Matrix - a global cooperative network of d
$a->strings["Running at web location"] = "";
$a->strings["Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more about the Red Matrix."] = "";
$a->strings["Bug reports and issues: please visit"] = "";
-$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "";
+$a->strings["Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot com"] = "";
$a->strings["Site Administrators"] = "";
$a->strings["Page owner information could not be retrieved."] = "";
$a->strings["Album not found."] = "";
@@ -1671,7 +1671,7 @@ $a->strings["Help with this feature"] = "";
$a->strings["Layout Name"] = "";
$a->strings["Like/Dislike"] = "";
$a->strings["This action is restricted to members."] = "";
-$a->strings["Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a href=\"register\">register as a new RedMatrix member</a> to continue."] = "";
+$a->strings["Please <a href=\"rmagic\">login with your Hubzilla ID</a> or <a href=\"register\">register as a new Redmatrix.member</a> to continue."] = "";
$a->strings["Invalid request."] = "";
$a->strings["thing"] = "";
$a->strings["Channel unavailable."] = "";
diff --git a/util/zotsh/README.txt b/util/zotsh/README.txt
index 5d03aec2c..3f31bba7f 100644
--- a/util/zotsh/README.txt
+++ b/util/zotsh/README.txt
@@ -14,7 +14,7 @@ Extract somewere and launch zotsh.py
Description
-----------
-ZotSH is a command line WebDAV client for RedMatrix.
+ZotSH is a command line WebDAV client for Hubzilla.
It knows how to magic-auth to remote hubs using Zot.
ZotSH uses 'easywebdav' library (0) with small modifications