aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-08-11 19:38:04 -0700
committerfriendica <info@friendica.com>2014-08-11 19:38:04 -0700
commit94ed44e76ebb6e1ed197411be16aa4d85f454b0a (patch)
treeb68cdc2b3b45dd5ab201b5f1a71ba75b8c011fb9
parent6d8fe28e79c4234bfb720ee133fe2c09cdba2f8a (diff)
downloadvolse-hubzilla-94ed44e76ebb6e1ed197411be16aa4d85f454b0a.tar.gz
volse-hubzilla-94ed44e76ebb6e1ed197411be16aa4d85f454b0a.tar.bz2
volse-hubzilla-94ed44e76ebb6e1ed197411be16aa4d85f454b0a.zip
change default invitation message
-rw-r--r--mod/hcard.php54
-rw-r--r--mod/invite.php30
-rw-r--r--mod/receive.php2
-rw-r--r--version.inc2
4 files changed, 64 insertions, 24 deletions
diff --git a/mod/hcard.php b/mod/hcard.php
new file mode 100644
index 000000000..3cb2fa01e
--- /dev/null
+++ b/mod/hcard.php
@@ -0,0 +1,54 @@
+<?php
+
+function hcard_init(&$a) {
+
+ if(argc() > 1)
+ $which = argv(1);
+ else {
+ notice( t('Requested profile is not available.') . EOL );
+ $a->error = 404;
+ return;
+ }
+
+ $profile = '';
+ $channel = $a->get_channel();
+
+ if((local_user()) && (argc() > 2) && (argv(2) === 'view')) {
+ $which = $channel['channel_address'];
+ $profile = argv(1);
+ $r = q("select profile_guid from profile where id = %d and uid = %d limit 1",
+ intval($profile),
+ intval(local_user())
+ );
+ if(! $r)
+ $profile = '';
+ $profile = $r[0]['profile_guid'];
+ }
+
+ $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $a->get_baseurl() . '/feed/' . $which .'" />' . "\r\n" ;
+
+ if(! $profile) {
+ $x = q("select channel_id as profile_uid from channel where channel_address = '%s' limit 1",
+ dbesc(argv(1))
+ );
+ if($x) {
+ $a->profile = $x[0];
+ }
+ }
+
+ profile_load($a,$which,$profile);
+
+
+}
+
+
+function hcard_content(&$a) {
+
+ require_once('include/widgets.php');
+ return widget_profile(array());
+
+
+
+}
+
+
diff --git a/mod/invite.php b/mod/invite.php
index 84c17948a..12080c4d9 100644
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -117,18 +117,6 @@ function invite_content(&$a) {
}
}
-// $dirloc = get_config('system','directory_submit_url');
-// if(strlen($dirloc)) {
-// if($a->config['system']['register_policy'] == REGISTER_CLOSED)
-// $linktxt = sprintf( t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), dirname($dirloc) . '/siteinfo');
-// elseif($a->config['system']['register_policy'] != REGISTER_CLOSED)
-// $linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), $a->get_baseurl())
-// . "\r\n" . "\r\n" . sprintf( t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.'),dirname($dirloc) . '/siteinfo');
-// }
-// else {
-// $o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
-// return $o;
-// }
$ob = $a->get_observer();
if(! $ob)
@@ -141,18 +129,16 @@ function invite_content(&$a) {
'$invite' => t('Send invitations'),
'$addr_text' => t('Enter email addresses, one per line:'),
'$msg_text' => t('Your message:'),
- '$default_message' => t('You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralized communication and information tool.') . "\r\n" . "\r\n"
+ '$default_message' => t('Please join my community on RedMatrix.') . "\r\n" . "\r\n"
. $linktxt
- . (($invonly) ? "\r\n" . "\r\n" . t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '')
- . t('Please visit my channel at')
+ . (($invonly) ? "\r\n" . "\r\n" . t('You will need to supply this invitation code: ') . $invite_code . "\r\n" . "\r\n" : '')
+ . t('1. Register at any RedMatrix location (they are all inter-connected)')
+ . "\r\n" . "\r\n" . z_root() . '/register'
+ . "\r\n" . "\r\n" . t('2. Enter my RedMatrix network address into the site searchbar.')
+ . "\r\n" . "\r\n" . $ob['xchan_addr'] . ' (' . t('or visit ') . z_root() . '/channel/' . $channel['channel_address'] . ')'
. "\r\n" . "\r\n"
- . z_root() . "/channel/" . $channel['channel_address']
- . "\r\n" . "\r\n"
- . t('Once you have registered (on ANY Red Matrix site - they are all inter-connected), please connect with my Red Matrix channel address:')
- . "\r\n" . "\r\n" . $ob['xchan_addr']
- . "\r\n" . "\r\n" . t('Click the [Register] link on the following page to join.') . "\r\n" . "\r\n" . z_root()
-
- . "\r\n" . "\r\n" . t('For more information about the Red Matrix Project and why it has the potential to change the internet as we know it, please visit http://getzot.com') . "\r\n" . "\r\n" ,
+ . t('3. Click [Connect]')
+ . "\r\n" . "\r\n" ,
'$submit' => t('Submit')
));
diff --git a/mod/receive.php b/mod/receive.php
index fd47b5530..c5a2dc4e0 100644
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -34,7 +34,7 @@ function receive_post(&$a) {
$r = q("SELECT * FROM channel left join account on account_id = channel_account_id WHERE channel_guid = '%s' AND account_flags = 0 LIMIT 1",
dbesc($guid)
);
- if(! count($r))
+ if(! $r)
http_status_exit(500);
$importer = $r[0];
diff --git a/version.inc b/version.inc
index 92c65613c..11d8e067e 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-08-10.763
+2014-08-11.764