Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 21:35:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

basic email invitations - and doc update

Browse source
This commit is contained in:
friendica 2013-08-02 03:45:40 -07:00
parent ae5cd53e1e
commit 1d816ba90a
26 changed files with 393 additions and 378 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
boot.php
View file

@ -785,8 +785,8 @@ class App {
return $this->path;
}
function set_account($aid) {
$this->account = $aid;
function set_account($acct) {
$this->account = $acct;
}
function get_account() {

22
doc/html/boot_8php.html
View file

File diff suppressed because one or more lines are too long

2
doc/html/classphoto__imagick.html
View file

@ -252,7 +252,7 @@ Additional Inherited Members</h2></td></tr>
</tr>
</table>
</div><div class="memdoc">
<p>We need to remove the canva, or the image is not resized to the crop: <a href="http://php.net/manual/en/imagick.cropimage.php#97232">http://php.net/manual/en/imagick.cropimage.php#97232</a></p>
<p>We need to remove the canvas, or the image is not resized to the crop: <a href="http://php.net/manual/en/imagick.cropimage.php#97232">http://php.net/manual/en/imagick.cropimage.php#97232</a></p>
</div>
</div>

2
doc/html/conversation_8php.html
View file

@ -226,7 +226,7 @@ Functions</h2></td></tr>
</table>
</div><div class="memdoc">
<p>Referenced by <a class="el" href="channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1">channel_content()</a>, <a class="el" href="display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0">display_content()</a>, <a class="el" href="items_8php.html#a756738301f2ed96be50232500677d58a">items_fetch()</a>, <a class="el" href="mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4">network_content()</a>, and <a class="el" href="search_8php.html#ab2568591359edde5b483a6cd9a24b2cc">search_content()</a>.</p>
<p>Referenced by <a class="el" href="channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1">channel_content()</a>, <a class="el" href="display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0">display_content()</a>, <a class="el" href="items_8php.html#a756738301f2ed96be50232500677d58a">items_fetch()</a>, <a class="el" href="mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4">network_content()</a>, <a class="el" href="search_8php.html#ab2568591359edde5b483a6cd9a24b2cc">search_content()</a>, and <a class="el" href="items_8php.html#a004e89d86b0f29b2c4da20108ecc4091">zot_feed()</a>.</p>
</div>
</div>

4
doc/html/crypto_8php.html
View file

@ -224,7 +224,7 @@ Functions</h2></td></tr>
</table>
</div><div class="memdoc">
<p>Referenced by <a class="el" href="post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75">post_post()</a>, <a class="el" href="zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0">zfinger_init()</a>, <a class="el" href="zot_8php.html#a3862b3161b2c8557dc1a95020179bd81">zot_build_packet()</a>, and <a class="el" href="zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea">zot_fetch()</a>.</p>
<p>Referenced by <a class="el" href="items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361">get_item_elements()</a>, <a class="el" href="items_8php.html#a94ddb1d6c8fa21dd7433677e85168037">get_mail_elements()</a>, <a class="el" href="item_8php.html#a693cd09805755ab85bbb5ecae69a48c3">item_post()</a>, <a class="el" href="items_8php.html#a8ef003b2bc2dc4816bdcf5800aec1049">item_store()</a>, <a class="el" href="post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75">post_post()</a>, <a class="el" href="include_2message_8php.html#ac382fdcdf990dcfa8f6528ab8fd280bd">send_message()</a>, <a class="el" href="zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0">zfinger_init()</a>, <a class="el" href="zot_8php.html#a3862b3161b2c8557dc1a95020179bd81">zot_build_packet()</a>, and <a class="el" href="zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea">zot_fetch()</a>.</p>
</div>
</div>
@ -252,7 +252,7 @@ Functions</h2></td></tr>
</table>
</div><div class="memdoc">
<p>Referenced by <a class="el" href="mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718">message_post()</a>, <a class="el" href="include_2follow_8php.html#a6553a7650fae55f95660510d90983144">new_contact()</a>, <a class="el" href="post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75">post_post()</a>, <a class="el" href="probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99">probe_content()</a>, <a class="el" href="zot_8php.html#a22e3f9b97b7969ddbe43ccf0db93a19c">zot_import()</a>, and <a class="el" href="zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d">zot_refresh()</a>.</p>
<p>Referenced by <a class="el" href="editpost_8php.html#a34011690864d122680c802e9e748ccfb">editpost_content()</a>, <a class="el" href="items_8php.html#a82955cc578f0fa600acec84475026194">encode_item()</a>, <a class="el" href="items_8php.html#a2d840c74ed23d1b6c7daee05cf89dda7">encode_mail()</a>, <a class="el" href="mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718">message_post()</a>, <a class="el" href="include_2follow_8php.html#a6553a7650fae55f95660510d90983144">new_contact()</a>, <a class="el" href="post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75">post_post()</a>, <a class="el" href="text_8php.html#ae4df74296fbe55051ed3c035e55205e5">prepare_body()</a>, <a class="el" href="include_2message_8php.html#a5f8de9847e203329e317ac38dc646898">private_messages_fetch_conversation()</a>, <a class="el" href="include_2message_8php.html#a254a756031e4d5e94f85e2939bdb5091">private_messages_fetch_message()</a>, <a class="el" href="include_2message_8php.html#a652973ce47a262f2d238c2fd6233d97e">private_messages_list()</a>, <a class="el" href="probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99">probe_content()</a>, <a class="el" href="zot_8php.html#a22e3f9b97b7969ddbe43ccf0db93a19c">zot_import()</a>, and <a class="el" href="zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d">zot_refresh()</a>.</p>
</div>
</div>

4
doc/html/dba__driver_8php.html
View file

File diff suppressed because one or more lines are too long

4
doc/html/extract_8php.html
View file

File diff suppressed because one or more lines are too long

2
doc/html/globals_0x70.html
View file

@ -372,7 +372,7 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
: <a class="el" href="text_8php.html#ac19d2b33a58372a357a43d51eed19162">text.php</a>
</li>
<li>prepare_body()
: <a class="el" href="text_8php.html#af3a7139d40ea758f315c2acf2ccc1b1c">text.php</a>
: <a class="el" href="text_8php.html#ae4df74296fbe55051ed3c035e55205e5">text.php</a>
</li>
<li>prepare_page()
: <a class="el" href="conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c">conversation.php</a>

2
doc/html/globals_func_0x70.html
View file

@ -270,7 +270,7 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
: <a class="el" href="text_8php.html#ac19d2b33a58372a357a43d51eed19162">text.php</a>
</li>
<li>prepare_body()
: <a class="el" href="text_8php.html#af3a7139d40ea758f315c2acf2ccc1b1c">text.php</a>
: <a class="el" href="text_8php.html#ae4df74296fbe55051ed3c035e55205e5">text.php</a>
</li>
<li>prepare_page()
: <a class="el" href="conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c">conversation.php</a>

2
doc/html/hostxrd_8php.html
View file

@ -130,8 +130,6 @@ Functions</h2></td></tr>
</table>
</div><div class="memdoc">
<p>Referenced by <a class="el" href="__well__known_8php.html#a6ebfa937a2024f0b5dab53f0ac90fed0">_well_known_init()</a>.</p>
</div>
</div>
</div><!-- contents -->

2
doc/html/include_2config_8php.html
View file

File diff suppressed because one or more lines are too long

2
doc/html/language_8php.html
View file

File diff suppressed because one or more lines are too long

2
doc/html/nav_8php.html
View file

@ -158,7 +158,7 @@ Functions</h2></td></tr>
</table>
</div><div class="memdoc">
<p>Referenced by <a class="el" href="channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1">channel_content()</a>, <a class="el" href="community_8php.html#a1197aafd6a6b540dbb4a0c04ade3a25a">community_content()</a>, <a class="el" href="connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c">connections_content()</a>, <a class="el" href="mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44">directory_content()</a>, <a class="el" href="help_8php.html#af055e15f600ffa6fbca9386fdf715224">help_content()</a>, <a class="el" href="mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79">message_content()</a>, <a class="el" href="mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4">network_content()</a>, <a class="el" href="notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62">notifications_content()</a>, <a class="el" href="profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e">profiles_init()</a>, and <a class="el" href="search_8php.html#ab2568591359edde5b483a6cd9a24b2cc">search_content()</a>.</p>
<p>Referenced by <a class="el" href="channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1">channel_content()</a>, <a class="el" href="community_8php.html#a1197aafd6a6b540dbb4a0c04ade3a25a">community_content()</a>, <a class="el" href="connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c">connections_content()</a>, <a class="el" href="mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44">directory_content()</a>, <a class="el" href="events_8php.html#a1d293fb217ae6bc9e3858c4b32e363ec">events_content()</a>, <a class="el" href="help_8php.html#af055e15f600ffa6fbca9386fdf715224">help_content()</a>, <a class="el" href="mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79">message_content()</a>, <a class="el" href="mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4">network_content()</a>, <a class="el" href="notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62">notifications_content()</a>, <a class="el" href="profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e">profiles_init()</a>, and <a class="el" href="search_8php.html#ab2568591359edde5b483a6cd9a24b2cc">search_content()</a>.</p>
</div>
</div>

2
doc/html/navtreeindex6.js
View file

@ -146,8 +146,8 @@ var NAVTREEINDEX6 =
"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[5,0,0,63,34],
"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[5,0,0,63,59],
"text_8php.html#ae4282a39492caa23ccbc2ce98e54f110":[5,0,0,63,17],
"text_8php.html#ae4df74296fbe55051ed3c035e55205e5":[5,0,0,63,50],
"text_8php.html#ae4f6881d7e13623f8eded6277595112a":[5,0,0,63,22],
"text_8php.html#af3a7139d40ea758f315c2acf2ccc1b1c":[5,0,0,63,50],
"text_8php.html#af8a3e3a66a7b862d4510f145d2e13186":[5,0,0,63,0],
"text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[5,0,0,63,55],
"text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28":[5,0,0,63,21],

2
doc/html/permissions_8php.html
View file

@ -195,7 +195,7 @@ Functions</h2></td></tr>
</dl>
<dl class="section return"><dt>Returns</dt><dd>: array of all permissions, key is permission name, value is true or false </dd></dl>
<p>Referenced by <a class="el" href="security_8php.html#a8d23d2597aae380a3341872fe9513380">change_channel()</a>, <a class="el" href="channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1">channel_content()</a>, <a class="el" href="connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c">connections_content()</a>, <a class="el" href="page_8php.html#a91a5f649f68406149108bded1dc90b22">page_content()</a>, <a class="el" href="mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014">photos_init()</a>, and <a class="el" href="zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0">zfinger_init()</a>.</p>
<p>Referenced by <a class="el" href="security_8php.html#a8d23d2597aae380a3341872fe9513380">change_channel()</a>, <a class="el" href="channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1">channel_content()</a>, <a class="el" href="connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c">connections_content()</a>, <a class="el" href="editwebpage_8php.html#a375e945255fad79a71036528f7480650">editwebpage_content()</a>, <a class="el" href="page_8php.html#a91a5f649f68406149108bded1dc90b22">page_content()</a>, <a class="el" href="mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014">photos_init()</a>, and <a class="el" href="zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0">zfinger_init()</a>.</p>
</div>
</div>

2
doc/html/plugin_8php.html
View file

File diff suppressed because one or more lines are too long

2
doc/html/redbasic_2php_2style_8php.html
View file

File diff suppressed because one or more lines are too long

2
doc/html/search/all_70.js
View file

@ -99,7 +99,7 @@ var searchData=
['posted_5fdate_5fwidget',['posted_date_widget',['../items_8php.html#abe695dd89e1e10ed042c26b80114f0ed',1,'items.php']]],
['posted_5fdates',['posted_dates',['../items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0',1,'items.php']]],
['preg_5fheart',['preg_heart',['../text_8php.html#ac19d2b33a58372a357a43d51eed19162',1,'text.php']]],
['prepare_5fbody',['prepare_body',['../text_8php.html#af3a7139d40ea758f315c2acf2ccc1b1c',1,'text.php']]],
['prepare_5fbody',['prepare_body',['../text_8php.html#ae4df74296fbe55051ed3c035e55205e5',1,'text.php']]],
['prepare_5fpage',['prepare_page',['../conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c',1,'conversation.php']]],
['prepare_5ftext',['prepare_text',['../text_8php.html#afe54312607d92f7ce9593f5760831f80',1,'text.php']]],
['pretheme_2ephp',['pretheme.php',['../pretheme_8php.html',1,'']]],

2
doc/html/search/functions_70.js
View file

@ -43,7 +43,7 @@ var searchData=
['posted_5fdate_5fwidget',['posted_date_widget',['../items_8php.html#abe695dd89e1e10ed042c26b80114f0ed',1,'items.php']]],
['posted_5fdates',['posted_dates',['../items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0',1,'items.php']]],
['preg_5fheart',['preg_heart',['../text_8php.html#ac19d2b33a58372a357a43d51eed19162',1,'text.php']]],
['prepare_5fbody',['prepare_body',['../text_8php.html#af3a7139d40ea758f315c2acf2ccc1b1c',1,'text.php']]],
['prepare_5fbody',['prepare_body',['../text_8php.html#ae4df74296fbe55051ed3c035e55205e5',1,'text.php']]],
['prepare_5fpage',['prepare_page',['../conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c',1,'conversation.php']]],
['prepare_5ftext',['prepare_text',['../text_8php.html#afe54312607d92f7ce9593f5760831f80',1,'text.php']]],
['pretheme_5finit',['pretheme_init',['../pretheme_8php.html#af5660943ee99db5fd75182316522eafe',1,'pretheme.php']]],

2
doc/html/taxonomy_8php.html
View file

@ -246,7 +246,7 @@ Functions</h2></td></tr>
</table>
</div><div class="memdoc">
<p>Referenced by <a class="el" href="conversation_8php.html#a1e97305a441dc143edbe09e17d1ceda1">conversation()</a>, <a class="el" href="items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7">item_getfeedtags()</a>, <a class="el" href="text_8php.html#af3a7139d40ea758f315c2acf2ccc1b1c">prepare_body()</a>, <a class="el" href="items_8php.html#ab1bce4261bcf75ad62753b498a144d17">tag_deliver()</a>, and <a class="el" href="items_8php.html#a88c6cf7649ac836fbbed82a7a0315110">tgroup_check()</a>.</p>
<p>Referenced by <a class="el" href="conversation_8php.html#a1e97305a441dc143edbe09e17d1ceda1">conversation()</a>, <a class="el" href="items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7">item_getfeedtags()</a>, <a class="el" href="text_8php.html#ae4df74296fbe55051ed3c035e55205e5">prepare_body()</a>, <a class="el" href="items_8php.html#ab1bce4261bcf75ad62753b498a144d17">tag_deliver()</a>, and <a class="el" href="items_8php.html#a88c6cf7649ac836fbbed82a7a0315110">tgroup_check()</a>.</p>
</div>
</div>

20
doc/html/text_8php.html
View file

File diff suppressed because one or more lines are too long

2
doc/html/text_8php.js
View file

@ -50,7 +50,7 @@ var text_8php =
[ "perms2str", "text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee", null ],
[ "photo_new_resource", "text_8php.html#aa5528f41533927e1bd2da3618a74a6d7", null ],
[ "preg_heart", "text_8php.html#ac19d2b33a58372a357a43d51eed19162", null ],
[ "prepare_body", "text_8php.html#af3a7139d40ea758f315c2acf2ccc1b1c", null ],
[ "prepare_body", "text_8php.html#ae4df74296fbe55051ed3c035e55205e5", null ],
[ "prepare_text", "text_8php.html#afe54312607d92f7ce9593f5760831f80", null ],
[ "profiler", "text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6", null ],
[ "protect_sprintf", "text_8php.html#a4e7698aca48982512594b274543c3b9b", null ],

2
doc/html/typo_8php.html
View file

File diff suppressed because one or more lines are too long

47
mod/invite.php
View file

@ -68,9 +68,12 @@ function invite_post(&$a) {
else
$nmessage = $message;
$account = $a->get_account();
$res = mail($recip, sprintf( t('Please join us on Red'), $a->config['sitename']),
$nmessage,
"From: " . $a->user['email'] . "\n"
"From: " . $account['account_email'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' );
@ -112,29 +115,41 @@ 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.');
// $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)
return $o;
}
$channel = $a->get_channel();
$o = replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("send_invite"),
'$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 other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
'$default_message' => t('You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralised social and information tool.') . "\r\n" . "\r\n"
. $linktxt
. "\r\n" . "\r\n" . (($invonly) ? t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .t('Once you have registered, please connect with me via my profile page at:')
. "\r\n" . "\r\n" . $a->get_baseurl() . '/channel/' . $a->user['nickname']
. "\r\n" . "\r\n" . t('For more information about the Friendica project and why we feel it is important, please visit http://friendica.com') . "\r\n" . "\r\n" ,
. (($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')
. "\r\n" . "\r\n"
. z_root() . "/channel/" . $channel['channel_address']
. "\r\n" . "\r\n"
. t('Once you have registered, please connect with my Red Matrix channel address:')
. "\r\n" . "\r\n" . $ob['xchan_addr']
. "\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" ,
'$submit' => t('Submit')
));

630
util/messages.po
View file

File diff suppressed because it is too large Load diff

2
version.inc
View file

@ -1 +1 @@
2013-08-01.392
2013-08-02.393