friendica 8 years ago
parent
commit
449b44fe4c
681 changed files with 3503 additions and 149 deletions
  1. +3
    -4
      boot.php
  2. +14
    -0
      database.sql
  3. +4
    -0
      include/attach.php
  4. +8
    -13
      include/conversation.php
  5. +26
    -13
      include/diaspora.php
  6. +50
    -0
      include/dsprphotoq.php
  7. +1
    -1
      include/html2plain.php
  8. +2
    -2
      include/items.php
  9. +4
    -0
      include/notifier.php
  10. +4
    -0
      include/poller.php
  11. +7
    -7
      include/text.php
  12. +1
    -1
      js/acl.js
  13. +1
    -1
      js/acl.min.js
  14. +4
    -2
      mod/attach.php
  15. +14
    -10
      mod/babel.php
  16. +5
    -2
      mod/display.php
  17. +1
    -2
      mod/group.php
  18. +1
    -1
      mod/message.php
  19. +0
    -2
      mod/parse_url.php
  20. +5
    -2
      mod/profiles.php
  21. +6
    -1
      mod/wall_upload.php
  22. +41
    -2
      mods/friendica-to-smarty-tpl.py
  23. +64
    -0
      mods/updatetpl.py
  24. +1
    -7
      object/Item.php
  25. +18
    -1
      update.php
  26. +5
    -0
      view/ca/smarty3/cmnt_received_eml.tpl
  27. +5
    -0
      view/ca/smarty3/follow_notify_eml.tpl
  28. +5
    -0
      view/ca/smarty3/friend_complete_eml.tpl
  29. +5
    -0
      view/ca/smarty3/htconfig.tpl
  30. +5
    -0
      view/ca/smarty3/intro_complete_eml.tpl
  31. +5
    -0
      view/ca/smarty3/lostpass_eml.tpl
  32. +5
    -0
      view/ca/smarty3/mail_received_html_body_eml.tpl
  33. +5
    -0
      view/ca/smarty3/mail_received_text_body_eml.tpl
  34. +5
    -0
      view/ca/smarty3/passchanged_eml.tpl
  35. +5
    -0
      view/ca/smarty3/register_open_eml.tpl
  36. +5
    -0
      view/ca/smarty3/register_verify_eml.tpl
  37. +5
    -0
      view/ca/smarty3/request_notify_eml.tpl
  38. +5
    -0
      view/ca/smarty3/wall_received_eml.tpl
  39. +2
    -2
      view/contacts-template.tpl
  40. +5
    -0
      view/cs/smarty3/cmnt_received_eml.tpl
  41. +5
    -0
      view/cs/smarty3/cmnt_received_html_body_eml.tpl
  42. +5
    -0
      view/cs/smarty3/cmnt_received_text_body_eml.tpl
  43. +5
    -0
      view/cs/smarty3/follow_notify_eml.tpl
  44. +5
    -0
      view/cs/smarty3/friend_complete_eml.tpl
  45. +5
    -0
      view/cs/smarty3/htconfig.tpl
  46. +5
    -0
      view/cs/smarty3/intro_complete_eml.tpl
  47. +5
    -0
      view/cs/smarty3/lostpass_eml.tpl
  48. +5
    -0
      view/cs/smarty3/mail_received_html_body_eml.tpl
  49. +5
    -0
      view/cs/smarty3/mail_received_text_body_eml.tpl
  50. +5
    -0
      view/cs/smarty3/passchanged_eml.tpl
  51. +5
    -0
      view/cs/smarty3/register_open_eml.tpl
  52. +5
    -0
      view/cs/smarty3/register_verify_eml.tpl
  53. +5
    -0
      view/cs/smarty3/request_notify_eml.tpl
  54. +5
    -0
      view/cs/smarty3/wall_received_eml.tpl
  55. +5
    -0
      view/cs/smarty3/wall_received_html_body_eml.tpl
  56. +5
    -0
      view/cs/smarty3/wall_received_text_body_eml.tpl
  57. +5
    -0
      view/de/smarty3/cmnt_received_eml.tpl
  58. +5
    -0
      view/de/smarty3/cmnt_received_html_body_eml.tpl
  59. +5
    -0
      view/de/smarty3/cmnt_received_text_body_eml.tpl
  60. +5
    -0
      view/de/smarty3/follow_notify_eml.tpl
  61. +5
    -0
      view/de/smarty3/friend_complete_eml.tpl
  62. +5
    -0
      view/de/smarty3/htconfig.tpl
  63. +5
    -0
      view/de/smarty3/intro_complete_eml.tpl
  64. +5
    -0
      view/de/smarty3/lostpass_eml.tpl
  65. +5
    -0
      view/de/smarty3/mail_received_html_body_eml.tpl
  66. +5
    -0
      view/de/smarty3/mail_received_text_body_eml.tpl
  67. +5
    -0
      view/de/smarty3/passchanged_eml.tpl
  68. +5
    -0
      view/de/smarty3/register_open_eml.tpl
  69. +5
    -0
      view/de/smarty3/register_verify_eml.tpl
  70. +6
    -1
      view/de/smarty3/request_notify_eml.tpl
  71. +5
    -0
      view/de/smarty3/update_fail_eml.tpl
  72. +5
    -0
      view/de/smarty3/wall_received_eml.tpl
  73. +5
    -0
      view/de/smarty3/wall_received_html_body_eml.tpl
  74. +5
    -0
      view/de/smarty3/wall_received_text_body_eml.tpl
  75. +5
    -0
      view/en/smarty3/follow_notify_eml.tpl
  76. +5
    -0
      view/en/smarty3/friend_complete_eml.tpl
  77. +5
    -0
      view/en/smarty3/htconfig.tpl
  78. +5
    -0
      view/en/smarty3/intro_complete_eml.tpl
  79. +5
    -0
      view/en/smarty3/lostpass_eml.tpl
  80. +5
    -0
      view/en/smarty3/passchanged_eml.tpl
  81. +5
    -0
      view/en/smarty3/register_open_eml.tpl
  82. +5
    -0
      view/en/smarty3/register_verify_eml.tpl
  83. +5
    -0
      view/en/smarty3/request_notify_eml.tpl
  84. +5
    -0
      view/en/smarty3/update_fail_eml.tpl
  85. +5
    -0
      view/eo/smarty3/follow_notify_eml.tpl
  86. +5
    -0
      view/eo/smarty3/friend_complete_eml.tpl
  87. +5
    -0
      view/eo/smarty3/intro_complete_eml.tpl
  88. +5
    -0
      view/eo/smarty3/lostpass_eml.tpl
  89. +5
    -0
      view/eo/smarty3/passchanged_eml.tpl
  90. +5
    -0
      view/eo/smarty3/register_open_eml.tpl
  91. +5
    -0
      view/eo/smarty3/register_verify_eml.tpl
  92. +5
    -0
      view/eo/smarty3/request_notify_eml.tpl
  93. +5
    -0
      view/eo/smarty3/update_fail_eml.tpl
  94. +5
    -0
      view/es/smarty3/cmnt_received_eml.tpl
  95. +5
    -0
      view/es/smarty3/follow_notify_eml.tpl
  96. +5
    -0
      view/es/smarty3/friend_complete_eml.tpl
  97. +5
    -0
      view/es/smarty3/htconfig.tpl
  98. +5
    -0
      view/es/smarty3/intro_complete_eml.tpl
  99. +5
    -0
      view/es/smarty3/lostpass_eml.tpl
  100. +5
    -0
      view/es/smarty3/mail_received_html_body_eml.tpl

+ 3
- 4
boot.php View File

@ -14,7 +14,7 @@ require_once('include/features.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.1.1586' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1157 );
define ( 'DB_UPDATE_VERSION', 1158 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
@ -622,7 +622,6 @@ if(! class_exists('App')) {
*/
if(!isset($this->page['htmlhead']))
$this->page['htmlhead'] = '';
$tpl = get_markup_template('head.tpl');
// If we're using Smarty, then doing replace_macros() will replace
// any unrecognized variables with a blank string. Since we delay
@ -633,6 +632,7 @@ if(! class_exists('App')) {
else
$stylesheet = '$stylesheet';
$tpl = get_markup_template('head.tpl');
$this->page['htmlhead'] = replace_macros($tpl,array(
'$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
'$local_user' => local_user(),
@ -1381,8 +1381,6 @@ if(! function_exists('profile_sidebar')) {
}
$tpl = get_markup_template('profile_vcard.tpl');
$p = array();
foreach($profile as $k => $v) {
$k = str_replace('-','_',$k);
@ -1392,6 +1390,7 @@ if(! function_exists('profile_sidebar')) {
if($a->theme['template_engine'] === 'internal')
$location = template_escape($location);
$tpl = get_markup_template('profile_vcard.tpl');
$o .= replace_macros($tpl, array(
'$profile' => $p,
'$connect' => $connect,


+ 14
- 0
database.sql View File

@ -241,6 +241,20 @@ CREATE TABLE IF NOT EXISTS `deliverq` (
-- --------------------------------------------------------
--
-- Table structure for table `dsprphotoq`
--
CREATE TABLE `dsprphotoq` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`uid` int(11) NOT NULL,
`msg` mediumtext NOT NULL,
`attempt` tinyint(4) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- --------------------------------------------------------
--
-- Table structure for table `event`
--


+ 4
- 0
include/attach.php View File

@ -42,6 +42,10 @@ function z_mime_content_type($filename) {
'qt' => 'video/quicktime',
'mov' => 'video/quicktime',
'ogg' => 'application/ogg',
'mp4' => 'video/mp4',
'avi' => 'video/x-msvideo',
'wmv' => 'video/x-ms-wmv',
'wma' => 'audio/x-ms-wma',
// adobe
'pdf' => 'application/pdf',


+ 8
- 13
include/conversation.php View File

@ -877,26 +877,21 @@ function format_like($cnt,$arr,$type,$id) {
if($cnt == 1)
$o .= (($type === 'like') ? sprintf( t('%s likes this.'), $arr[0]) : sprintf( t('%s doesn\'t like this.'), $arr[0])) . EOL ;
else {
//$spanatts = 'class="fakelink" onclick="openClose(\'' . $type . 'list-' . $id . '\');"';
$spanatts = "class=\"fakelink\" onclick=\"openClose('{$type}list-$id');\"";
switch($type) {
case 'like':
// $phrase = sprintf( t('<span %1$s>%2$d people</span> like this.'), $spanatts, $cnt);
$mood = t('like this');
$phrase = sprintf( t('<span %1$s>%2$d people</span> like this'), $spanatts, $cnt);
break;
case 'dislike':
// $phrase = sprintf( t('<span %1$s>%2$d people</span> don\'t like this.'), $spanatts, $cnt);
$mood = t('don\'t like this');
$phrase = sprintf( t('<span %1$s>%2$d people</span> don\'t like this'), $spanatts, $cnt);
break;
}
$tpl = get_markup_template("voting_fakelink.tpl");
$phrase = replace_macros($tpl, array(
'$vote_id' => $type . 'list-' . $id,
'$count' => $cnt,
'$people' => t('people'),
'$vote_mood' => $mood
$phrase .= EOL ;
$o .= replace_macros(get_markup_template('voting_fakelink.tpl'), array(
'$phrase' => $phrase,
'$type' => $type,
'$id' => $id
));
$o .= $phrase;
// $o .= EOL ;
$total = count($arr);
if($total >= MAX_LIKERS)


+ 26
- 13
include/diaspora.php View File

@ -16,7 +16,9 @@ function diaspora_dispatch_public($msg) {
return;
}
$r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN ( SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s' ) AND `account_expired` = 0 AND `account_removed` = 0 ",
$r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN
( SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s' )
AND `account_expired` = 0 AND `account_removed` = 0 ",
dbesc(NETWORK_DIASPORA),
dbesc($msg['author'])
);
@ -32,7 +34,7 @@ function diaspora_dispatch_public($msg) {
function diaspora_dispatch($importer,$msg) {
function diaspora_dispatch($importer,$msg,$attempt=1) {
$ret = 0;
@ -88,7 +90,7 @@ function diaspora_dispatch($importer,$msg) {
$ret = diaspora_signed_retraction($importer,$xmlbase->relayable_retraction,$msg);
}
elseif($xmlbase->photo) {
$ret = diaspora_photo($importer,$xmlbase->photo,$msg);
$ret = diaspora_photo($importer,$xmlbase->photo,$msg,$attempt);
}
elseif($xmlbase->conversation) {
$ret = diaspora_conversation($importer,$xmlbase->conversation,$msg);
@ -1655,7 +1657,7 @@ function diaspora_message($importer,$xml,$msg) {
}
function diaspora_photo($importer,$xml,$msg) {
function diaspora_photo($importer,$xml,$msg,$attempt=1) {
$a = get_app();
@ -1693,7 +1695,14 @@ function diaspora_photo($importer,$xml,$msg) {
dbesc($status_message_guid)
);
if(! count($r)) {
logger('diaspora_photo: parent item not found: parent: ' . $parent_guid . ' item: ' . $guid);
if($attempt <= 3) {
q("INSERT INTO dsprphotoq (uid, msg, attempt) VALUES (%d, '%s', %d)",
intval($importer['uid']),
dbesc(serialize($msg)),
intval($attempt + 1)
);
}
logger('diaspora_photo: attempt = ' . $attempt . '; status message not found: ' . $status_message_guid . ' for photo: ' . $guid);
return;
}
@ -2319,13 +2328,15 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) {
$myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
// $theiraddr = $contact['addr'];
// Diaspora doesn't support threaded comments
/*if($item['thr-parent']) {
// Diaspora doesn't support threaded comments, but some
// versions of Diaspora (i.e. Diaspora-pistos) support
// likes on comments
if($item['verb'] === ACTIVITY_LIKE && $item['thr-parent']) {
$p = q("select guid, type, uri, `parent-uri` from item where uri = '%s' limit 1",
dbesc($item['thr-parent'])
);
}
else {*/
else {
// The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
// return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent.
// The only item with `parent` and `id` as the parent id is the parent item.
@ -2333,7 +2344,7 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) {
intval($item['parent']),
intval($item['parent'])
);
//}
}
if(count($p))
$parent = $p[0];
else
@ -2395,13 +2406,15 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
$body = $item['body'];
$text = html_entity_decode(bb2diaspora($body));
// Diaspora doesn't support threaded comments
/*if($item['thr-parent']) {
// Diaspora doesn't support threaded comments, but some
// versions of Diaspora (i.e. Diaspora-pistos) support
// likes on comments
if($item['verb'] === ACTIVITY_LIKE && $item['thr-parent']) {
$p = q("select guid, type, uri, `parent-uri` from item where uri = '%s' limit 1",
dbesc($item['thr-parent'])
);
}
else {*/
else {
// The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
// return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent.
// The only item with `parent` and `id` as the parent id is the parent item.
@ -2409,7 +2422,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
intval($item['parent']),
intval($item['parent'])
);
//}
}
if(count($p))
$parent = $p[0];
else


+ 50
- 0
include/dsprphotoq.php View File

@ -0,0 +1,50 @@
<?php
require_once("boot.php");
require_once('include/diaspora.php');
function dsprphotoq_run($argv, $argc){
global $a, $db;
if(is_null($a)){
$a = new App;
}
if(is_null($db)){
@include(".htconfig.php");
require_once("include/dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
};
logger("diaspora photo queue: running", LOGGER_DEBUG);
$r = q("SELECT * FROM dsprphotoq");
if(!$r)
return;
$dphotos = $r;
logger("diaspora photo queue: processing " . count($dphotos) . " photos");
foreach($dphotos as $dphoto) {
$r = q("SELECT * FROM user WHERE uid = %d",
intval($dphoto['uid'])
);
if(!$r) {
logger("diaspora photo queue: user " . $dphoto['uid'] . " not found");
return;
}
$ret = diaspora_dispatch($r[0],unserialize($dphoto['msg']),$dphoto['attempt']);
q("DELETE FROM dsprphotoq WHERE id = %d",
intval($dphoto['id'])
);
}
}
if (array_search(__file__,get_included_files())===0){
dsprphotoq_run($argv,$argc);
killme();
}

+ 1
- 1
include/html2plain.php View File

@ -209,7 +209,7 @@ function html2plain($html, $wraplength = 75, $compact = false)
if (!$compact) {
$counter = 1;
foreach ($urls as $id=>$url)
if (strpos($message, $url) == false)
if (strpos($message, $url) === false)
$message .= "\n".$url." ";
//$message .= "\n[".($counter++)."] ".$url;
}


+ 2
- 2
include/items.php View File

@ -3732,11 +3732,11 @@ function item_getfeedtags($item) {
function item_getfeedattach($item) {
$ret = '';
$arr = explode(',',$item['attach']);
$arr = explode('[/attach],',$item['attach']);
if(count($arr)) {
foreach($arr as $r) {
$matches = false;
$cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches);
$cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches);
if($cnt) {
$ret .= '<link rel="enclosure" href="' . xmlify($matches[1]) . '" type="' . xmlify($matches[3]) . '" ';
if(intval($matches[2]))


+ 4
- 0
include/notifier.php View File

@ -37,6 +37,7 @@ require_once('include/html2plain.php');
* tag (in photos.php, poke.php, tagger.php)
* tgroup (in items.php)
* wall-new (in photos.php, item.php)
* removeme (in Contact.php)
*
* and ITEM_ID is the id of the item in the database that needs to be sent to others.
*/
@ -138,14 +139,17 @@ function notifier_run(&$argv, &$argc){
$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($item_id));
if (! $r)
return;
$user = $r[0];
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", intval($item_id));
if (! $r)
return;
$self = $r[0];
$r = q("SELECT * FROM `contact` WHERE `self` = 0 AND `uid` = %d", intval($item_id));
if(! $r)
return;
require_once('include/Contact.php');
foreach($r as $contact) {
terminate_friendship($user, $self, $contact);


+ 4
- 0
include/poller.php View File

@ -62,6 +62,10 @@ function poller_run(&$argv, &$argc){
proc_run('php',"include/queue.php");
// run diaspora photo queue process in the background
proc_run('php',"include/dsprphotoq.php");
// expire any expired accounts
q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0


+ 7
- 7
include/text.php View File

@ -489,12 +489,12 @@ function get_template_file($a, $filename, $root = '') {
if($root !== '' && $root[strlen($root)-1] !== '/')
$root = $root . '/';
if(file_exists($root . "view/theme/$theme/$filename"))
$template_file = $root . "view/theme/$theme/$filename";
elseif (x($a->theme_info,"extends") && file_exists($root . "view/theme/".$a->theme_info["extends"]."/$filename"))
$template_file = $root . "view/theme/".$a->theme_info["extends"]."/$filename";
if(file_exists("{$root}view/theme/$theme/$filename"))
$template_file = "{$root}view/theme/$theme/$filename";
elseif (x($a->theme_info,"extends") && file_exists("{$root}view/theme/{$a->theme_info["extends"]}/$filename"))
$template_file = "{$root}view/theme/{$a->theme_info["extends"]}/$filename";
else
$template_file = $root . "view/$filename";
$template_file = "{$root}view/$filename";
return $template_file;
}}
@ -1041,13 +1041,13 @@ function prepare_body($item,$attach = false) {
return $s;
}
$arr = explode(',',$item['attach']);
$arr = explode('[/attach],',$item['attach']);
if(count($arr)) {
$s .= '<div class="body-attach">';
foreach($arr as $r) {
$matches = false;
$icon = '';
$cnt = preg_match_all('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches, PREG_SET_ORDER);
$cnt = preg_match_all('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches, PREG_SET_ORDER);
if($cnt) {
foreach($matches as $mtch) {
$icontype = strtolower(substr($mtch[3],0,strpos($mtch[3],'/')));


+ 1
- 1
js/acl.js View File

@ -253,7 +253,7 @@ ACL.prototype.populate = function(data){
//console.log(html);
that.list_content.append(html);
});
$(".acl-list-item[rel!=acl-template] img[data-src]").each(function(i, el){
$(".acl-list-item img[data-src]", that.list_content).each(function(i, el){
// Add src attribute for images with a data-src attribute
$(el).attr('src', $(el).data("src"));
});


+ 1
- 1
js/acl.min.js
File diff suppressed because it is too large
View File


+ 4
- 2
mod/attach.php View File

@ -34,9 +34,11 @@ function attach_init(&$a) {
return;
}
// Use quotes around the filename to prevent a "multiple Content-Disposition"
// error in Chrome for filenames with commas in them
header('Content-type: ' . $r[0]['filetype']);
header('Content-disposition: attachment; filename=' . $r[0]['filename']);
header('Content-disposition: attachment; filename="' . $r[0]['filename'] . '"');
echo $r[0]['data'];
killme();
// NOTREACHED
}
}

+ 14
- 10
mod/babel.php View File

@ -11,7 +11,7 @@ function visible_lf($s) {
function babel_content(&$a) {
$o .= '<h3>Babel Diagnostic</h3>';
$o .= '<h1>Babel Diagnostic</h1>';
$o .= '<form action="babel" method="post">';
$o .= t('Source (bbcode) text:') . EOL . '<textarea name="text" >' . htmlspecialchars($_REQUEST['text']) .'</textarea>' . EOL;
@ -28,31 +28,35 @@ function babel_content(&$a) {
if(x($_REQUEST,'text')) {
$text = trim($_REQUEST['text']);
$o .= t("Source input: ") . EOL. EOL;
$o .= "<h2>" . t("Source input: ") . "</h2>" . EOL. EOL;
$o .= visible_lf($text) . EOL. EOL;
$html = bbcode($text);
$o .= t("bb2html: ") . EOL. EOL;
$o .= "<h2>" . t("bb2html (raw HTML): ") . "</h2>" . EOL. EOL;
$o .= htmlspecialchars($html). EOL. EOL;
//$html = bbcode($text);
$o .= "<h2>" . t("bb2html: ") . "</h2>" . EOL. EOL;
$o .= $html. EOL. EOL;
$bbcode = html2bbcode($html);
$o .= t("bb2html2bb: ") . EOL. EOL;
$o .= "<h2>" . t("bb2html2bb: ") . "</h2>" . EOL. EOL;
$o .= visible_lf($bbcode) . EOL. EOL;
$diaspora = bb2diaspora($text);
$o .= t("bb2md: ") . EOL. EOL;
$o .= "<h2>" . t("bb2md: ") . "</h2>" . EOL. EOL;
$o .= visible_lf($diaspora) . EOL. EOL;
$html = Markdown($diaspora);
$o .= t("bb2md2html: ") . EOL. EOL;
$o .= "<h2>" . t("bb2md2html: ") . "</h2>" . EOL. EOL;
$o .= $html. EOL. EOL;
$bbcode = diaspora2bb($diaspora);
$o .= t("bb2dia2bb: ") . EOL. EOL;
$o .= "<h2>" . t("bb2dia2bb: ") . "</h2>" . EOL. EOL;
$o .= visible_lf($bbcode) . EOL. EOL;
$bbcode = html2bbcode($html);
$o .= t("bb2md2html2bb: ") . EOL. EOL;
$o .= "<h2>" . t("bb2md2html2bb: ") . "</h2>" . EOL. EOL;
$o .= visible_lf($bbcode) . EOL. EOL;
@ -62,12 +66,12 @@ function babel_content(&$a) {
if(x($_REQUEST,'d2bbtext')) {
$d2bbtext = trim($_REQUEST['d2bbtext']);
$o .= t("Source input (Diaspora format): ") . EOL. EOL;
$o .= "<h2>" . t("Source input (Diaspora format): ") . "</h2>" . EOL. EOL;
$o .= visible_lf($d2bbtext) . EOL. EOL;
$bb = diaspora2bb($d2bbtext);
$o .= t("diaspora2bb: ") . EOL. EOL;
$o .= "<h2>" . t("diaspora2bb: ") . "</h2>" . EOL. EOL;
$o .= visible_lf($bb) . EOL. EOL;
}


+ 5
- 2
mod/display.php View File

@ -4,8 +4,6 @@
function display_init(&$a) {
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
notice( t('Public access denied.') . EOL);
killme();
return;
}
@ -17,6 +15,11 @@ function display_init(&$a) {
function display_content(&$a, $update = 0) {
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
notice( t('Public access denied.') . EOL);
return;
}
require_once("include/bbcode.php");
require_once('include/security.php');
require_once('include/conversation.php');


+ 1
- 2
mod/group.php View File

@ -220,16 +220,15 @@ function group_content(&$a) {
}
}
$context['$groupeditor'] = $groupeditor;
$context['$desc'] = t('Click on a contact to add or remove.');
if($change) {
$context['$groupeditor'] = $groupeditor;
$tpl = get_markup_template('groupeditor.tpl');
echo replace_macros($tpl, $context);
killme();
}
$context['$groupedit_info'] = $groupeditor;
return replace_macros($tpl, $context);
}


+ 1
- 1
mod/message.php View File

@ -516,7 +516,7 @@ function message_content(&$a) {
'$to' => t('To:'),
'$showinputs' => '',
'$subject' => t('Subject:'),
'$subjtxt' => template_escape($message['title']),
'$subjtxt' => $subjtxt_e,
'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
'$yourmessage' => t('Your message:'),
'$text' => '',


+ 0
- 2
mod/parse_url.php View File

@ -236,8 +236,6 @@ function parse_url_content(&$a) {
$str_tags = '';
$textmode = false;
if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
$textmode = true;
if(local_user() && (! feature_enabled(local_user(),'richtext')))
$textmode = true;


+ 5
- 2
mod/profiles.php View File

@ -6,8 +6,6 @@ function profiles_init(&$a) {
nav_set_selected('profiles');
if(! local_user()) {
notice( t('Permission denied.') . EOL);
killme();
return;
}
@ -565,6 +563,11 @@ function profile_activity($changed, $value) {
function profiles_content(&$a) {
if(! local_user()) {
notice( t('Permission denied.') . EOL);
return;
}
$o = '';
if(($a->argc > 1) && (intval($a->argv[1]))) {


+ 6
- 1
mod/wall_upload.php View File

@ -160,7 +160,12 @@ function wall_upload_post(&$a) {
//if we get the signal then return the image url info in BBCODE, otherwise this outputs the info and bails (for the ajax image uploader on wall post)
if ($_REQUEST['hush']!='yeah') {
echo "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n";
if(local_user() && (! feature_enabled(local_user(),'richtext') || x($_REQUEST['nomce'])) ) {
echo "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n";
}
else {
echo '<br /><br /><a href="' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '" ><img src="' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."\" alt=\"$basename\" /></a><br /><br />";
}
}
else {
$m = '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]";


+ 41
- 2
mods/friendica-to-smarty-tpl.py View File

@ -1,14 +1,17 @@
#!/usr/bin/python
#
# Script to convert Friendica internal template files into Smarty template files
# Copyright 2012 Zach Prezkuta
# Copyright 2013 Zach Prezkuta
# Licensed under GPL v3
import os, re, string
import sys, getopt
ldelim = '{{'
rdelim = '}}'
addheader = True
def fToSmarty(matches):
match = matches.group(0)
if match == '$j':
@ -93,6 +96,10 @@ def fix_element(element):
def convert(filename, tofilename, php_tpl):
if addheader:
header = ldelim + "*\n *\tAUTOMATICALLY GENERATED TEMPLATE\n *\tDO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN\n *\n *" + rdelim + "\n"
tofilename.write(header)
for line in filename:
newline = ''
st_pos = 0
@ -170,7 +177,39 @@ def convert(filename, tofilename, php_tpl):
tofilename.write(newline)
path = raw_input('Path to template folder to convert: ')
def help(pname):
print "\nUsage:"
print "\t" + pname + " -h\n\n\t\t\tShow this help screen\n"
print "\t" + pname + " -p directory\n\n\t\t\tConvert all .tpl files in directory to\n\t\t\tSmarty templates in directory/smarty3/\n"
print "\t" + pname + "\n\n\t\t\tInteractive mode\n"
#
# Main script
#
path = ''
try:
opts, args = getopt.getopt(sys.argv[1:], "hp:", ['no-header'])
for opt, arg in opts:
if opt == '-h':
help(sys.argv[0])
sys.exit()
elif opt == '-p':
path = arg
elif opt == '--no-header':
addheader = False
except getopt.GetoptError:
help(sys.argv[0])
sys.exit(2)
if path == '':
path = raw_input('Path to template folder to convert: ')
if path[-1:] != '/':
path = path + '/'


+ 64
- 0
mods/updatetpl.py View File

@ -0,0 +1,64 @@
#!/usr/bin/python
#
# Script to update Smarty template files from all internal templates
# Copyright 2013 Zach Prezkuta
# Licensed under GPL v3
import os
import sys, getopt
import subprocess
def help(pname):
print "\nUsage:"
print "\t" + pname + " -h\n\n\t\t\tShow this help screen\n"
print "\t" + pname + " -p directory\n\n\t\t\tConvert all .tpl files in top-level\n\t\t\tFriendica directory to Smarty templates\n"
print "\t" + pname + "\n\n\t\t\tInteractive mode\n"
#
# Main script
#
path = ''
try:
opts, args = getopt.getopt(sys.argv[1:], "hp:")
for opt, arg in opts:
if opt == '-h':
help(sys.argv[0])
sys.exit()
elif opt == '-p':
path = arg
except getopt.GetoptError:
help(sys.argv[0])
sys.exit(2)
if path == '':
path = raw_input('Path to top-level Friendica directory: ')
if path[-1:] != '/':
path = path + '/'
tplpaths = ['view/']
names = os.listdir(path + 'view/')
for name in names:
if os.path.isdir(path + 'view/' + name):
if name != 'smarty3' and name != 'theme':
tplpaths.append('view/' + name + '/')
names = os.listdir(path + 'view/theme/')
for name in names:
if os.path.isdir(path + 'view/theme/' + name):
tplpaths.append('view/theme/' + name + '/')
fnull = open(os.devnull, "w")
for tplpath in tplpaths:
print "Converting " + path + tplpath
subprocess.call(['python', path + 'mods/friendica-to-smarty-tpl.py', '-p', path + tplpath], stdout = fnull)
fnull.close()

+ 1
- 7
object/Item.php View File

@ -497,13 +497,7 @@ class Item extends BaseObject {
return false;
}
if($a->theme['template_engine'] === 'smarty3') {
$template_file = get_template_file($a, 'smarty3/' . $this->available_templates[$name]);
}
else {
$template_file = $this->available_templates[$name];
}
$this->template = $template_file;
$this->template = $this->available_templates[$name];
}
/**


+ 18
- 1
update.php View File

@ -1,6 +1,6 @@
<?php
define( 'UPDATE_VERSION' , 1157 );
define( 'UPDATE_VERSION' , 1158 );
/**
*
@ -1369,3 +1369,20 @@ ADD INDEX ( `datasize` ) ");
if(!$r) return UPDATE_FAILED;
return UPDATE_SUCCESS;
}
function update_1157() {
$r = q("CREATE TABLE IF NOT EXISTS `dsprphotoq` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`uid` int(11) NOT NULL,
`msg` mediumtext NOT NULL,
`attempt` tinyint(4) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8"
);
if($r)
return UPDATE_SUCCESS;
return UPDATE_FAILED;
}

+ 5
- 0
view/ca/smarty3/cmnt_received_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Apreciat/da {{$username}},


+ 5
- 0
view/ca/smarty3/follow_notify_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Apreciat/da {{$myname}},


+ 5
- 0
view/ca/smarty3/friend_complete_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Apreciat/da {{$username}},


+ 5
- 0
view/ca/smarty3/htconfig.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<?php
// Set the following for your MySQL installation


+ 5
- 0
view/ca/smarty3/intro_complete_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Apreciat/da {{$username}},


+ 5
- 0
view/ca/smarty3/lostpass_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Apreciat/da {{$username}},


+ 5
- 0
view/ca/smarty3/mail_received_html_body_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>


+ 5
- 0
view/ca/smarty3/mail_received_text_body_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Has rebut un nou missatge privat de '{{$from}}' en {{$siteName}}.
{{$title}}


+ 5
- 0
view/ca/smarty3/passchanged_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Apreciat/da {{$username}},


+ 5
- 0
view/ca/smarty3/register_open_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Apreciat/da {{$username}},


+ 5
- 0
view/ca/smarty3/register_verify_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
S'ha rebut la sol·licitud de registre d'un nou usuari en
{{$sitename}} que requereix la teva aprovació.


+ 5
- 0
view/ca/smarty3/request_notify_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Apreciat/da {{$myname}},


+ 5
- 0
view/ca/smarty3/wall_received_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Apreciat/da {{$username}},


+ 2
- 2
view/contacts-template.tpl View File

@ -14,8 +14,8 @@
$tabs
{{ for $contacts as $c }}
{{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
{{ for $contacts as $contact }}
{{ inc contact_template.tpl }}{{ endinc }}
{{ endfor }}
<div id="contact-edit-end"></div>


+ 5
- 0
view/cs/smarty3/cmnt_received_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Milý/Milá {{$username}},
'{{$from}}' okommentoval položku/konverzaci, kterou následujete.


+ 5
- 0
view/cs/smarty3/cmnt_received_html_body_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>


+ 5
- 0
view/cs/smarty3/cmnt_received_text_body_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Milý/Milá {{$username}},
'{{$from}}' okommentoval položku/konverzaci, kterou následujete.


+ 5
- 0
view/cs/smarty3/follow_notify_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Milý/Milá {{$username}},


+ 5
- 0
view/cs/smarty3/friend_complete_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Milý/Milá {{$username}},


+ 5
- 0
view/cs/smarty3/htconfig.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<?php
// Nastavte následující pro Vaši instalaci MySQL


+ 5
- 0
view/cs/smarty3/intro_complete_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Milý/Milá {{$username}},


+ 5
- 0
view/cs/smarty3/lostpass_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Milý/Milá {{$username}},
Na webu {{$sitename}} byl zaregistrován požadavek na znovunastavení hesla k Vašemu účtu. Pro potvrzení této žádosti prosím klikněte na potvrzovací odkaz níže, nebo si tento odkaz zkopírujte do adresního řádku prohlížeče.


+ 5
- 0
view/cs/smarty3/mail_received_html_body_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>


+ 5
- 0
view/cs/smarty3/mail_received_text_body_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
{{$from}} Vám poslal(a) novou soukromou zprávu na {{$siteName}}.
{{$title}}


+ 5
- 0
view/cs/smarty3/passchanged_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Milý/Milá {{$username}},
Vaše heslo bylo na Vaši žádost změněno. Prosím zaznamenejte si tuto informaci (nebo si Vaše heslo změňte na nějaké, které si budete pamatovat).


+ 5
- 0
view/cs/smarty3/register_open_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Milý/milá {{$username}},
Díky za registraci na {{$sitename}}. Váš účet byl vytvořen.
Vaše přihlašovací údaje jsou tato:


+ 5
- 0
view/cs/smarty3/register_verify_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Na webu {{$sitename}} byla vytvořena nová uživatelská registrace, která vyžaduje Vaše schválení.


+ 5
- 0
view/cs/smarty3/request_notify_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Milý/Milá {{$username}},


+ 5
- 0
view/cs/smarty3/wall_received_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Milý/Milá {{$username}},
'{{$from}}' obohatil Vaši profilovou zeď.


+ 5
- 0
view/cs/smarty3/wall_received_html_body_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>


+ 5
- 0
view/cs/smarty3/wall_received_text_body_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Milý/Milá {{$username}},
'{{$from}}' obohatil Vaši profilovou zeď.


+ 5
- 0
view/de/smarty3/cmnt_received_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Hallo {{$username}},


+ 5
- 0
view/de/smarty3/cmnt_received_html_body_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>


+ 5
- 0
view/de/smarty3/cmnt_received_text_body_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Hallo {{$username}},
'{{$from}}' hat einen Pinnwandeintrag kommentiert dem du auch folgst.


+ 5
- 0
view/de/smarty3/follow_notify_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Hallo {{$myname}},


+ 5
- 0
view/de/smarty3/friend_complete_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Hallo {{$username}},


+ 5
- 0
view/de/smarty3/htconfig.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<?php
// Set the following for your MySQL installation


+ 5
- 0
view/de/smarty3/intro_complete_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Hallo {{$username}},


+ 5
- 0
view/de/smarty3/lostpass_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Hallo {{$username}},
Auf {{$sitename}} wurde eine Anfrage zum Zurücksetzen deines


+ 5
- 0
view/de/smarty3/mail_received_html_body_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>


+ 5
- 0
view/de/smarty3/mail_received_text_body_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Du hast eine neue private Nachricht von '{{$from}}' auf '{{$siteName}}' erhhalten.
{{$title}}


+ 5
- 0
view/de/smarty3/passchanged_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Hallo {{$username}},
Dein Passwort wurde wie gewünscht geändert. Bitte bewahre diese


+ 5
- 0
view/de/smarty3/register_open_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Hallo {{$username}},
Danke für deine Anmeldung auf {{$sitename}}. Dein Account wurde angelegt.


+ 5
- 0
view/de/smarty3/register_verify_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Eine Neuanmeldung auf {{$sitename}} benötigt
deine Aufmerksamkeit.


+ 6
- 1
view/de/smarty3/request_notify_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Hallo {{$myname}},
@ -7,7 +12,7 @@ erhalten.
Du kannst sein/ihr Profil unter {{$url}} finden.
Bitte melde dich an um die komplette Vorstellung einzusehen
Bitte melde dich an um die komplette Anfrage einzusehen
und die Anfrage zu bestätigen oder zu ignorieren oder abzulehnen.
{{$siteurl}}


+ 5
- 0
view/de/smarty3/update_fail_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Hi,
ich bin {{$sitename}}.
Die friendica Entwickler haben jüngst Update {{$update}} veröffentlicht,


+ 5
- 0
view/de/smarty3/wall_received_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Hallo {{$username}},


+ 5
- 0
view/de/smarty3/wall_received_html_body_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>


+ 5
- 0
view/de/smarty3/wall_received_text_body_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Hallo {{$username}},


+ 5
- 0
view/en/smarty3/follow_notify_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Dear {{$myname}},


+ 5
- 0
view/en/smarty3/friend_complete_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Dear {{$username}},


+ 5
- 0
view/en/smarty3/htconfig.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<?php
// Set the following for your MySQL installation


+ 5
- 0
view/en/smarty3/intro_complete_eml.tpl View File

@ -1,3 +1,8 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
Dear {{$username}},