friendica 8 years ago
parent
commit
0433263866
22 changed files with 9836 additions and 9774 deletions
  1. +6
    -1
      include/enotify.php
  2. +1
    -0
      include/onepoll.php
  3. +3
    -0
      include/ostatus_conversation.php
  4. +7
    -2
      mod/admin.php
  5. +1
    -0
      view/admin_site.tpl
  6. +1
    -1
      view/admin_users.tpl
  7. +7785
    -7767
      view/de/messages.po
  8. +2000
    -1995
      view/de/strings.php
  9. +3
    -0
      view/email_notify_html.tpl
  10. +5
    -2
      view/email_notify_text.tpl
  11. +3
    -2
      view/smarty3/admin_site.tpl
  12. +1
    -1
      view/smarty3/admin_users.tpl
  13. +3
    -0
      view/smarty3/email_notify_html.tpl
  14. +5
    -2
      view/smarty3/email_notify_text.tpl
  15. +1
    -0
      view/theme/decaf-mobile/admin_site.tpl
  16. +1
    -0
      view/theme/decaf-mobile/smarty3/admin_site.tpl
  17. +1
    -0
      view/theme/frost-mobile/admin_site.tpl
  18. +1
    -0
      view/theme/frost-mobile/smarty3/admin_site.tpl
  19. +1
    -0
      view/theme/frost/admin_site.tpl
  20. +1
    -0
      view/theme/frost/smarty3/admin_site.tpl
  21. +5
    -0
      view/theme/quattro/smarty3/prv_message.tpl
  22. +1
    -1
      view/theme/vier/smarty3/profile_vcard.tpl

+ 6
- 1
include/enotify.php View File

@ -415,6 +415,9 @@ intval($params['uid']), LOGGER_DEBUG);
call_hooks('enotify_mail', $datarray);
// check whether sending post content in email notifications is allowed
$content_allowed = !get_config('system','enotify_no_content');
// load the template for private message notifications
$tpl = get_markup_template('email_notify_html.tpl');
$email_html_body = replace_macros($tpl,array(
@ -432,7 +435,8 @@ intval($params['uid']), LOGGER_DEBUG);
'$thanks' => $datarray['thanks'],
'$site_admin' => $datarray['site_admin'],
'$title' => $datarray['title'],
'$htmlversion' => $datarray['htmlversion'],
'$htmlversion' => $datarray['htmlversion'],
'$content_allowed' => $content_allowed,
));
// load the template for private message notifications
@ -453,6 +457,7 @@ intval($params['uid']), LOGGER_DEBUG);
'$site_admin' => $datarray['site_admin'],
'$title' => $datarray['title'],
'$textversion' => $datarray['textversion'],
'$content_allowed' => $content_allowed,
));
// logger('text: ' . $email_text_body);


+ 1
- 0
include/onepoll.php View File

@ -426,6 +426,7 @@ function onepoll_run(&$argv, &$argc){
continue;
}
$datarray['body'] = escape_tags($r['body']);
$datarray['body'] = limit_body_size($datarray['body']);
logger("Mail: Importing ".$msg_uid." for ".$mailconf[0]['user']);


+ 3
- 0
include/ostatus_conversation.php View File

@ -75,6 +75,9 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
$conv_as = json_decode($conv_as);
$first_id = "";
if (!is_array($conv_as->items))
return;
$items = array_reverse($conv_as->items);
foreach ($items as $single_conv) {


+ 7
- 2
mod/admin.php View File

@ -255,6 +255,8 @@ function admin_page_site_post(&$a){
$global_directory = ((x($_POST,'directory_submit_url')) ? notags(trim($_POST['directory_submit_url'])) : '');
$thread_allow = ((x($_POST,'thread_allow')) ? True : False);
$newuser_private = ((x($_POST,'newuser_private')) ? True : False);
$enotify_no_content = ((x($_POST,'enotify_no_content')) ? True : False);
$no_multi_reg = ((x($_POST,'no_multi_reg')) ? True : False);
$no_openid = !((x($_POST,'no_openid')) ? True : False);
$no_regfullname = !((x($_POST,'no_regfullname')) ? True : False);
@ -371,6 +373,7 @@ function admin_page_site_post(&$a){
}
set_config('system','thread_allow', $thread_allow);
set_config('system','newuser_private', $newuser_private);
set_config('system','enotify_no_content', $enotify_no_content);
set_config('system','block_extended_register', $no_multi_reg);
set_config('system','no_openid', $no_openid);
@ -505,6 +508,7 @@ function admin_page_site(&$a) {
'$global_directory' => array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), t("URL to update the global directory. If this is not set, the global directory is completely unavailable to the application.")),
'$thread_allow' => array('thread_allow', t("Allow threaded items"), get_config('system','thread_allow'), t("Allow infinite level threading for items on this site.")),
'$newuser_private' => array('newuser_private', t("Private posts by default for new users"), get_config('system','newuser_private'), t("Set default post permissions for all new members to the default privacy group rather than public.")),
'$enotify_no_content' => array('enotify_no_content', t("Don't include post content in email notifications"), get_config('system','enotify_no_content'), t("Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure.")),
'$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")),
'$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")),
@ -690,7 +694,7 @@ function admin_page_users(&$a){
}
$users = q("SELECT `user` . * , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date`
$users = q("SELECT `user` . * , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date`, `user`.`account_expired`
FROM
(SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid`
FROM `item`
@ -714,7 +718,7 @@ function admin_page_users(&$a){
t('Normal Account'),
t('Soapbox Account'),
t('Community/Celebrity Account'),
t('Automatic Friend Account')
t('Automatic Friend Account')
);
$e['page-flags'] = $accounts[$e['page-flags']];
$e['register_date'] = relative_date($e['register_date']);
@ -752,6 +756,7 @@ function admin_page_users(&$a){
'$block' => t('Block'),
'$unblock' => t('Unblock'),
'$siteadmin' => t('Site admin'),
'$accountexpired' => t('Account expired'),
'$h_users' => t('Users'),
'$th_users' => array( t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'), t('Account') ),


+ 1
- 0
view/admin_site.tpl View File

@ -84,6 +84,7 @@
{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$enotify_no_content }}{{ endinc }}
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>


+ 1
- 1
view/admin_users.tpl View File

@ -70,7 +70,7 @@
<td class='register_date'>$u.register_date</td>
<td class='login_date'>$u.login_date</td>
<td class='lastitem_date'>$u.lastitem_date</td>
<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }}</td>
<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }} {{ if $u.account_expired }}($accountexpired){{ endif }}</td>
<td class="checkbox">
{{ if $u.is_admin }}
&nbsp;


+ 7785
- 7767
view/de/messages.po
File diff suppressed because it is too large
View File


+ 2000
- 1995
view/de/strings.php
File diff suppressed because it is too large
View File


+ 3
- 0
view/email_notify_html.tpl View File

@ -13,10 +13,12 @@
<tr><td style="padding-top:22px;" colspan="2">$preamble</td></tr>
{{ if $content_allowed }}
<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$source_link"><img style="border:0px;width:48px;height:48px;" src="$source_photo"></a></td>
<td style="padding-top:22px;"><a href="$source_link">$source_name</a></td></tr>
<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
<tr><td style="padding-right:22px;">$htmlversion</td></tr>
{{ endif }}
<tr><td style="padding-top:11px;" colspan="2">$hsitelink</td></tr>
<tr><td style="padding-bottom:11px;" colspan="2">$hitemlink</td></tr>
<tr><td></td><td>$thanks</td></tr>
@ -25,3 +27,4 @@
</table>
</body>
</html>

+ 5
- 2
view/email_notify_text.tpl View File

@ -1,13 +1,16 @@
$preamble
{{ if $content_allowed }}
$title
$textversion
{{ endif }}
$tsitelink
$titemlink
$thanks
$site_admin

+ 3
- 2
view/smarty3/admin_site.tpl View File

@ -52,12 +52,12 @@
{{include file="field_input.tpl" field=$sitename}}
{{include file="field_textarea.tpl" field=$banner}}
{{include file="field_select.tpl" field=$language}}
{{include file="field_select.tpl" field=$theme}}
{{include file="field_select.tpl" field=$theme}}
{{include file="field_select.tpl" field=$theme_mobile}}
{{include file="field_select.tpl" field=$ssl_policy}}
{{include file="field_checkbox.tpl" field=$new_share}}
{{include file="field_checkbox.tpl" field=$hide_help}}
{{include file="field_select.tpl" field=$singleuser}}
{{include file="field_select.tpl" field=$singleuser}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
@ -89,6 +89,7 @@
{{include file="field_input.tpl" field=$global_directory}}
{{include file="field_checkbox.tpl" field=$thread_allow}}
{{include file="field_checkbox.tpl" field=$newuser_private}}
{{include file="field_checkbox.tpl" field=$enotify_no_content}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>


+ 1
- 1
view/smarty3/admin_users.tpl View File

@ -75,7 +75,7 @@
<td class='register_date'>{{$u.register_date}}</td>
<td class='login_date'>{{$u.login_date}}</td>
<td class='lastitem_date'>{{$u.lastitem_date}}</td>
<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}}</td>
<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.accountexpired}}{{$account_expired}}{{/if}}</td>
<td class="checkbox">
{{if $u.is_admin}}
&nbsp;


+ 3
- 0
view/smarty3/email_notify_html.tpl View File

@ -18,10 +18,12 @@
<tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr>
{{if $content_allowed}}
<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="{{$source_link}}"><img style="border:0px;width:48px;height:48px;" src="{{$source_photo}}"></a></td>
<td style="padding-top:22px;"><a href="{{$source_link}}">{{$source_name}}</a></td></tr>
<tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr>
<tr><td style="padding-right:22px;">{{$htmlversion}}</td></tr>
{{/if}}
<tr><td style="padding-top:11px;" colspan="2">{{$hsitelink}}</td></tr>
<tr><td style="padding-bottom:11px;" colspan="2">{{$hitemlink}}</td></tr>
<tr><td></td><td>{{$thanks}}</td></tr>
@ -30,3 +32,4 @@
</table>
</body>
</html>

+ 5
- 2
view/smarty3/email_notify_text.tpl View File

@ -5,14 +5,17 @@
*}}
{{$preamble}}
{{if $content_allowed}}
{{$title}}
{{$textversion}}
{{/if}}
{{$tsitelink}}
{{$titemlink}}
{{$thanks}}
{{$site_admin}}

+ 1
- 0
view/theme/decaf-mobile/admin_site.tpl View File

@ -41,6 +41,7 @@
{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$enotify_no_content }}{{ endinc }}
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>


+ 1
- 0
view/theme/decaf-mobile/smarty3/admin_site.tpl View File

@ -46,6 +46,7 @@
{{include file="field_input.tpl" field=$global_directory}}
{{include file="field_checkbox.tpl" field=$thread_allow}}
{{include file="field_checkbox.tpl" field=$newuser_private}}
{{include file="field_checkbox.tpl" field=$enotify_no_content}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>


+ 1
- 0
view/theme/frost-mobile/admin_site.tpl View File

@ -41,6 +41,7 @@
{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$enotify_no_content }}{{ endinc }}
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>


+ 1
- 0
view/theme/frost-mobile/smarty3/admin_site.tpl View File

@ -46,6 +46,7 @@
{{include file="field_input.tpl" field=$global_directory}}
{{include file="field_checkbox.tpl" field=$thread_allow}}
{{include file="field_checkbox.tpl" field=$newuser_private}}
{{include file="field_checkbox.tpl" field=$enotify_no_content}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>


+ 1
- 0
view/theme/frost/admin_site.tpl View File

@ -43,6 +43,7 @@
{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$enotify_no_content }}{{ endinc }}
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>


+ 1
- 0
view/theme/frost/smarty3/admin_site.tpl View File

@ -48,6 +48,7 @@
{{include file="field_input.tpl" field=$global_directory}}
{{include file="field_checkbox.tpl" field=$thread_allow}}
{{include file="field_checkbox.tpl" field=$newuser_private}}
{{include file="field_checkbox.tpl" field=$enotify_no_content}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>


+ 5
- 0
view/theme/quattro/smarty3/prv_message.tpl View File

@ -12,7 +12,12 @@
{{$parent}}
<div id="prvmail-to-label">{{$to}}</div>
{{if $showinputs}}
<input type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
{{else}}
{{$select}}
{{/if}}
<div id="prvmail-subject-label">{{$subject}}</div>
<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />


+ 1
- 1
view/theme/vier/smarty3/profile_vcard.tpl View File

@ -23,7 +23,7 @@
</ul>
</div>
{{else}}
<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles/{{$profid}}" ></a></div>
<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles" ></a></div>
{{/if}}
</div>


Loading…
Cancel
Save