$tpl = Renderer::getMarkupTemplate('auto_request.tpl');
}
- $page_desc = DI::l10n()->t("Please enter your 'Identity Address' from one of the following supported communications networks:");
-
- $invite_desc = DI::l10n()->t('If you are not yet a member of the free social web, <a href="%s">follow this link to find a public Friendica site and join us today</a>.', Search::getGlobalDirectory() . '/servers');
-
$o = Renderer::replaceMacros($tpl, [
- '$header' => DI::l10n()->t('Friend/Connection Request'),
- '$desc' => DI::l10n()->t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de'),
- '$pls_answer' => DI::l10n()->t('Please answer the following:'),
- '$does_know_you' => ['knowyou', DI::l10n()->t('Does %s know you?', $a->profile['name'])],
- '$add_note' => DI::l10n()->t('Add a personal note:'),
- '$page_desc' => $page_desc,
- '$friendica' => DI::l10n()->t('Friendica'),
- '$statusnet' => DI::l10n()->t("GNU Social \x28Pleroma, Mastodon\x29"),
- '$diaspora' => DI::l10n()->t("Diaspora \x28Socialhome, Hubzilla\x29"),
- '$diasnote' => DI::l10n()->t(' - please do not use this form. Instead, enter %s into your Diaspora search bar.', $target_addr),
- '$your_address' => DI::l10n()->t('Your Identity Address:'),
- '$invite_desc' => $invite_desc,
- '$submit' => DI::l10n()->t('Submit Request'),
- '$cancel' => DI::l10n()->t('Cancel'),
- '$nickname' => $a->argv[1],
- '$name' => $a->profile['name'],
- '$myaddr' => $myaddr
+ '$header' => DI::l10n()->t('Friend/Connection Request'),
+ '$page_desc' => DI::l10n()->t('Enter your Webfinger address (user@domain.tld) or profile URL here. If this isn\'t supported by your system (for example it doesn\'t work with Diaspora), you have to subscribe to <strong>%s</strong> directly on your system', $target_addr),
+ '$invite_desc' => DI::l10n()->t('If you are not yet a member of the free social web, <a href="%s">follow this link to find a public Friendica node and join us today</a>.', Search::getGlobalDirectory() . '/servers'),
+ '$your_address' => DI::l10n()->t('Your Webfinger address or profile URL:'),
+ '$pls_answer' => DI::l10n()->t('Please answer the following:'),
+ '$submit' => DI::l10n()->t('Submit Request'),
+ '$cancel' => DI::l10n()->t('Cancel'),
+
+ '$request' => 'dfrn_request/' . $a->argv[1],
+ '$name' => $a->profile['name'],
+ '$myaddr' => $myaddr,
+
+ '$does_know_you' => ['knowyou', DI::l10n()->t('%s knows me', $a->profile['name'])],
+ '$addnote_field' => ['dfrn-request-message', DI::l10n()->t('Add a personal note:')],
]);
return $o;
}
$o = Renderer::replaceMacros($tpl, [
'$header' => DI::l10n()->t('Connect/Follow'),
- '$desc' => '',
'$pls_answer' => DI::l10n()->t('Please answer the following:'),
- '$does_know_you' => ['knowyou', DI::l10n()->t('Does %s know you?', $ret['name'])],
- '$add_note' => DI::l10n()->t('Add a personal note:'),
- '$page_desc' => '',
- '$friendica' => '',
- '$statusnet' => '',
- '$diaspora' => '',
- '$diasnote' => '',
'$your_address' => DI::l10n()->t('Your Identity Address:'),
- '$invite_desc' => '',
- '$emailnet' => '',
+ '$url_label' => DI::l10n()->t('Profile URL'),
+ '$keywords_label'=> DI::l10n()->t('Tags:'),
'$submit' => $submit,
'$cancel' => DI::l10n()->t('Cancel'),
- '$nickname' => '',
+
+ '$request' => $request,
'$name' => $ret['name'],
'$url' => $ret['url'],
'$zrl' => Profile::zrl($ret['url']),
- '$url_label' => DI::l10n()->t('Profile URL'),
'$myaddr' => $myaddr,
- '$request' => $request,
'$keywords' => $r[0]['keywords'],
- '$keywords_label'=> DI::l10n()->t('Tags:')
+
+ '$does_know_you' => ['knowyou', DI::l10n()->t('Does %s know you?', $ret['name'])],
+ '$addnote_field' => ['dfrn-request-message', DI::l10n()->t('Add a personal note:')],
]);
DI::page()['aside'] = '';
Worker::add(PRIORITY_LOW, 'AddContact', $_SESSION['uid'], $csvRow[0]);
}
}
+
info(DI::l10n()->t('Importing Contacts done'));
// delete temp file
- unlink($filename);
+ unlink($_FILES['importcontact-filename']['tmp_name']);
}
}
}
Hook::callAll('connector_settings', $settings_connectors);
if (is_site_admin()) {
- $diasp_enabled = DI::l10n()->t('Built-in support for %s connectivity is %s', DI::l10n()->t('Diaspora'), ((DI::config()->get('system', 'diaspora_enabled')) ? DI::l10n()->t('enabled') : DI::l10n()->t('disabled')));
- $ostat_enabled = DI::l10n()->t('Built-in support for %s connectivity is %s', DI::l10n()->t("GNU Social \x28OStatus\x29"), ((DI::config()->get('system', 'ostatus_disabled')) ? DI::l10n()->t('disabled') : DI::l10n()->t('enabled')));
+ $diasp_enabled = DI::l10n()->t('Built-in support for %s connectivity is %s', DI::l10n()->t('Diaspora (Socialhome, Hubzilla)'), ((DI::config()->get('system', 'diaspora_enabled')) ? DI::l10n()->t('enabled') : DI::l10n()->t('disabled')));
+ $ostat_enabled = DI::l10n()->t('Built-in support for %s connectivity is %s', DI::l10n()->t('OStatus (GNU Social)'), ((DI::config()->get('system', 'ostatus_disabled')) ? DI::l10n()->t('disabled') : DI::l10n()->t('enabled')));
} else {
$diasp_enabled = "";
$ostat_enabled = "";
<h1>{{$header}}</h1>
-{{if $myaddr == ""}}
-<p id="dfrn-request-intro">
-{{$page_desc}}<br />
-<ul id="dfrn-request-networks">
-<li><a href="http://friendi.ca" title="{{$friendica}}">{{$friendica}}</a></li>
-<li><a href="https://diasporafoundation.org" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
-<li><a href="https://gnu.io/social/" title="{{$statusnet}}" >{{$statusnet}}</a></li>
-</ul>
-</p>
-<p>
-{{$invite_desc nofilter}}
-</p>
-<p>
-{{$desc nofilter}}
-</p>
+<form action="{{$request}}" method="post">
+ <dl>
+ <dt>{{$url_label}}</dt>
+ <dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd>
+{{if $keywords}}
+ <dt>{{$keywords_label}}</dt>
+ <dd>{{$keywords}}</dd>
{{/if}}
-
-{{if $request}}
-<form action="{{$request}}" method="post" />
-{{else}}
-<form action="dfrn_request/{{$nickname}}" method="post" />
-{{/if}}
-
-{{if $photo}}
-<img src="{{$photo}}" alt="" id="dfrn-request-photo">
-{{/if}}
-
-{{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}}
-{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
-{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
-{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about nofilter}}</dd></dl>{{/if}}
-
-<div id="dfrn-request-url-wrapper" >
- <label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
- {{if $myaddr}}
- {{$myaddr}}
- <input type="hidden" name="dfrn_url" id="dfrn-url" value="{{$myaddr}}" />
- {{else}}
- <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
- {{/if}}
- {{if $url}}
- <input type="hidden" name="url" id="url" value="{{$url}}" />
- {{/if}}
- <div id="dfrn-request-url-end"></div>
-</div>
-
-
-<div id="dfrn-request-info-wrapper" >
-
-</div>
+ </dl>
+
+ <div id="dfrn-request-url-wrapper">
+ <label id="dfrn-url-label" for="dfrn-url">{{$your_address}}</label>
+ {{$myaddr}}
+ <input type="hidden" name="dfrn_url" id="dfrn-url" value="{{$myaddr}}">
+ <input type="hidden" name="url" id="url" value="{{$url}}">
+ <div id="dfrn-request-url-end"></div>
+ </div>
<div id="dfrn-request-submit-wrapper">
- {{if $submit}}
- <input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
- {{/if}}
- <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
+{{if $submit}}
+ <input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}">
+{{/if}}
+ <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}">
</div>
</form>
<h1>{{$header}}</h1>
-{{if $myaddr}}
-{{else}}
+{{if !$myaddr}}
<p id="dfrn-request-intro">
-{{$page_desc}}<br />
-<ul id="dfrn-request-networks">
-<li><a href="http://friendi.ca" title="{{$friendica}}">{{$friendica}}</a></li>
-<li><a href="https://diasporafoundation.org" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
-<li><a href="https://gnu.io/social/" title="{{$statusnet}}" >{{$statusnet}}</a></li>
-</ul>
-{{$invite_desc nofilter}}
+ {{$page_desc nofilter}}
</p>
<p>
-{{$desc nofilter}}
+ {{$invite_desc nofilter}}
</p>
{{/if}}
-{{if $request}}
<form action="{{$request}}" method="post">
+ <div id="dfrn-request-url-wrapper">
+ <label id="dfrn-url-label" for="dfrn-url">{{$your_address}}</label>
+{{if $myaddr}}
+ {{$myaddr}}
+ <input type="hidden" name="dfrn_url" id="dfrn-url" value="{{$myaddr}}">
{{else}}
-<form action="dfrn_request/{{$nickname}}" method="post">
-{{/if}}
-
-{{if $photo}}
-<img src="{{$photo}}" alt="" id="dfrn-request-photo" />
+ <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}">
{{/if}}
+ <div id="dfrn-request-url-end"></div>
+ </div>
-{{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}}
-{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
-{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
-{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about nofilter}}</dd></dl>{{/if}}
-
-<div id="dfrn-request-url-wrapper" >
- <label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
- {{if $myaddr}}
- {{$myaddr}}
- <input type="hidden" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
- {{else}}
- <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
- {{/if}}
- {{if $url}}
- <input type="hidden" name="url" id="url" value="{{$url}}" />
- {{/if}}
- <div id="dfrn-request-url-end"></div>
-</div>
-
-<p id="dfrn-request-options">
-{{$pls_answer}}
-</p>
-
-<div id="dfrn-request-info-wrapper" >
-
-{{include file="field_checkbox.tpl" field=$does_know_you}}
-<!--
-<p id="doiknowyou">
-{{$does_know}}
-</p>
-
- <div id="dfrn-request-know-yes-wrapper">
- <label id="dfrn-request-knowyou-yes-label" for="dfrn-request-knowyouyes">{{$yes}}</label>
- <input type="radio" name="knowyou" id="knowyouyes" value="1" />
-
- <div id="dfrn-request-knowyou-break" ></div>
- </div>
- <div id="dfrn-request-know-no-wrapper">
- <label id="dfrn-request-knowyou-no-label" for="dfrn-request-knowyouno">{{$no}}</label>
- <input type="radio" name="knowyou" id="knowyouno" value="0" checked="checked" />
+ <p id="dfrn-request-options">
+ {{$pls_answer}}
+ </p>
- <div id="dfrn-request-knowyou-end"></div>
- </div>
--->
+ <div id="dfrn-request-info-wrapper">
+ {{include file="field_checkbox.tpl" field=$does_know_you}}
-<p id="dfrn-request-message-desc">
-{{$add_note}}
-</p>
- <div id="dfrn-request-message-wrapper">
- <textarea name="dfrn-request-message" rows="4" cols="64" ></textarea>
+ {{include file="field_textarea.tpl" field=$addnote_field}}
</div>
-
-</div>
-
<div id="dfrn-request-submit-wrapper">
- {{if $submit}}
- <input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
- {{/if}}
- <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
+ <input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}">
+ <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}">
</div>
</form>
<div class="generic-page-wrapper">
-<h1>{{$header}}</h1>
-
-{{if $myaddr == ""}}
-<p id="dfrn-request-intro">
-{{$page_desc}}<br />
-<ul id="dfrn-request-networks">
-<li><a href="http://friendi.ca" title="{{$friendica}}">{{$friendica}}</a></li>
-<li><a href="https://diasporafoundation.org" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
-<li><a href="https://gnu.io/social/" title="{{$statusnet}}" >{{$statusnet}}</a></li>
-</ul>
-</p>
-<p>
-{{$invite_desc nofilter}}
-</p>
-<p>
-{{$desc}}
-</p>
-{{/if}}
-
-{{if $request}}
-<form action="{{$request}}" method="post" />
-{{else}}
-<form action="dfrn_request/{{$nickname}}" method="post" />
+ <h1>{{$header}}</h1>
+
+ <form action="{{$request}}" method="post">
+ <dl>
+ <dt>{{$url_label}}</dt>
+ <dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd>
+{{if $keywords}}
+ <dt>{{$keywords_label}}</dt>
+ <dd>{{$keywords}}</dd>
{{/if}}
-
-{{if $photo}}
-<img src="{{$photo}}" alt="" id="dfrn-request-photo">
+ </dl>
+
+ <div id="dfrn-request-url-wrapper">
+ <label id="dfrn-url-label" for="dfrn-url">{{$your_address}}</label>
+ {{$myaddr}}
+ <input type="hidden" name="dfrn_url" id="dfrn-url" value="{{$myaddr}}">
+ <input type="hidden" name="url" id="url" value="{{$url}}">
+ <div id="dfrn-request-url-end"></div>
+ </div>
+
+ <div id="dfrn-request-submit-wrapper">
+{{if $submit}}
+ <input class="btn btn-primary" type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}">
{{/if}}
-
-{{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}}
-{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
-
-{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
-{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}}
-
-<div id="dfrn-request-url-wrapper" >
- <label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
- {{if $myaddr}}
- {{$myaddr}}
- <input type="hidden" name="dfrn_url" id="dfrn-url" value="{{$myaddr}}" />
- {{else}}
- <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
- {{/if}}
- {{if $url}}
- <input type="hidden" name="url" id="url" value="{{$url}}" />
- {{/if}}
- <div id="dfrn-request-url-end"></div>
-</div>
-
-
-<div id="dfrn-request-info-wrapper" >
-
-</div>
-
- <div id="dfrn-request-submit-wrapper">
- {{if $submit}}
- <input class="btn btn-primary" type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
- {{/if}}
- <input class="btn btn-primary" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
- </div>
-</form>
+ <input class="btn btn-default" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}">
+ </div>
+ </form>
</div>
<div class="generic-page-wrapper">
-<h1>{{$header}}</h1>
-
-{{if $myaddr}}
-{{else}}
-<p id="dfrn-request-intro">
-{{$page_desc}}<br />
-<ul id="dfrn-request-networks">
-<li><a href="http://friendi.ca" title="{{$friendica}}">{{$friendica}}</a></li>
-<li><a href="https://diasporafoundation.org" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
-<li><a href="https://gnu.io/social/" title="{{$statusnet}}" >{{$statusnet}}</a></li>
-</ul>
-{{$invite_desc nofilter}}
-</p>
-<p>
-{{$desc}}
-</p>
+ <h1>{{$header}}</h1>
+
+{{if !$myaddr}}
+ <p id="dfrn-request-intro">
+ {{$page_desc nofilter}}
+ </p>
+ <p>
+ {{$invite_desc nofilter}}
+ </p>
{{/if}}
-{{if $request}}
-<form action="{{$request}}" method="post">
+ <form action="{{$request}}" method="post">
+ <div id="dfrn-request-url-wrapper">
+ <label id="dfrn-url-label" for="dfrn-url">{{$your_address}}</label>
+{{if $myaddr}}
+ {{$myaddr}}
+ <input type="hidden" name="dfrn_url" id="dfrn-url" value="{{$myaddr}}">
{{else}}
-<form action="dfrn_request/{{$nickname}}" method="post">
+ <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}">
{{/if}}
+ <div id="dfrn-request-url-end"></div>
+ </div>
-{{if $photo}}
-<img src="{{$photo}}" alt="" id="dfrn-request-photo" />
-{{/if}}
-
-{{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}}
-{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
-{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
-{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}}
-
-<div id="dfrn-request-url-wrapper" >
- <label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
- {{if $myaddr}}
- {{$myaddr}}
- <input type="hidden" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
- {{else}}
- <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
- {{/if}}
- {{if $url}}
- <input type="hidden" name="url" id="url" value="{{$url}}" />
- {{/if}}
- <div id="dfrn-request-url-end"></div>
-</div>
-
-<p id="dfrn-request-options">
-{{$pls_answer}}
-</p>
-
-<div id="dfrn-request-info-wrapper" >
-
-{{include file="field_checkbox.tpl" field=$does_know_you}}
-<!--
-<p id="doiknowyou">
-{{$does_know}}
-</p>
+ <p id="dfrn-request-options">
+ {{$pls_answer}}
+ </p>
- <div id="dfrn-request-know-yes-wrapper">
- <label id="dfrn-request-knowyou-yes-label" for="dfrn-request-knowyouyes">{{$yes}}</label>
- <input type="radio" name="knowyou" id="knowyouyes" value="1" />
+ <div id="dfrn-request-info-wrapper">
+ {{include file="field_checkbox.tpl" field=$does_know_you}}
- <div id="dfrn-request-knowyou-break" ></div>
+ {{include file="field_textarea.tpl" field=$addnote_field}}
</div>
- <div id="dfrn-request-know-no-wrapper">
- <label id="dfrn-request-knowyou-no-label" for="dfrn-request-knowyouno">{{$no}}</label>
- <input type="radio" name="knowyou" id="knowyouno" value="0" checked="checked" />
- <div id="dfrn-request-knowyou-end"></div>
+ <div id="dfrn-request-submit-wrapper">
+ <input class="btn btn-primary" type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}">
+ <input class="btn btn-default" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}">
</div>
--->
-
-<p id="dfrn-request-message-desc">
-{{$add_note}}
-</p>
- <div id="dfrn-request-message-wrapper">
- <textarea name="dfrn-request-message" rows="4" cols="64" ></textarea>
- </div>
-
-
-</div>
-
- <div id="dfrn-request-submit-wrapper">
- {{if $submit}}
- <input class="btn btn-primary" type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
- {{/if}}
- <input class="btn btn-primary" type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
- </div>
-</form>
+ </form>
</div>
projects / friendica.git / commitdiff