diff options
31 files changed, 46 insertions, 426 deletions
@@ -787,7 +787,7 @@ if(! class_exists('App')) { */ $tpl = get_markup_template('head.tpl'); $this->page['htmlhead'] = replace_macros($tpl, array( - '$baseurl' => $a->get_baseurl(), + '$baseurl' => $this->get_baseurl(), '$local_user' => local_user(), '$generator' => FRIENDICA_PLATFORM . ' ' . FRIENDICA_VERSION, '$update_interval' => $interval, diff --git a/include/ItemObject.php b/include/ItemObject.php index 8ae13e0d8..cb79c180c 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -204,7 +204,7 @@ class Item extends BaseObject { $body = prepare_body($item,true); - if($a->theme['template_engine'] === 'internal') { + if($a->get_template_engine() === 'internal') { $body_e = template_escape($body); $name_e = template_escape($profile_name); $title_e = template_escape($item['title']); diff --git a/include/friendica_smarty.php b/include/friendica_smarty.php index b3f0d18a0..2f4694c58 100644 --- a/include/friendica_smarty.php +++ b/include/friendica_smarty.php @@ -14,15 +14,15 @@ class FriendicaSmarty extends Smarty { // setTemplateDir can be set to an array, which Smarty will parse in order. // The order is thus very important here - $template_dirs = array('theme' => "view/theme/$theme/smarty3/"); + $template_dirs = array('theme' => "view/theme/$theme/tpl/smarty3/"); if( x($a->theme_info,"extends") ) - $template_dirs = $template_dirs + array('extends' => "view/theme/".$a->theme_info["extends"]."/smarty3/"); - $template_dirs = $template_dirs + array('base' => 'view/smarty3/'); + $template_dirs = $template_dirs + array('extends' => "view/theme/".$a->theme_info["extends"]."/tpl/smarty3/"); + $template_dirs = $template_dirs + array('base' => 'view/tpl/smarty3/'); $this->setTemplateDir($template_dirs); - $this->setCompileDir('view/smarty3/compiled/'); - $this->setConfigDir('view/smarty3/config/'); - $this->setCacheDir('view/smarty3/cache/'); + $this->setCompileDir('view/tpl/smarty3/compiled/'); + $this->setConfigDir('view/tpl/smarty3/config/'); + $this->setCacheDir('view/tpl/smarty3/cache/'); $this->left_delimiter = $a->get_template_ldelim('smarty3'); $this->right_delimiter = $a->get_template_rdelim('smarty3'); diff --git a/include/plugin.php b/include/plugin.php index be238b78c..0395c1a8e 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -1,5 +1,6 @@ <?php +require_once("include/friendica_smarty.php"); // install and uninstall plugin if (! function_exists('uninstall_plugin')){ diff --git a/mod/events.php b/mod/events.php index e6ee19c47..7886f27c0 100755 --- a/mod/events.php +++ b/mod/events.php @@ -261,7 +261,7 @@ function events_content(&$a) { $links = array(); - if(count($r)) { + if($r) { $r = sort_by_date($r); foreach($r as $rr) { $j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j')); @@ -276,7 +276,7 @@ function events_content(&$a) { $last_date = ''; $fmt = t('l, F j'); - if(count($r)) { + if($r) { $r = sort_by_date($r); foreach($r as $rr) { diff --git a/mod/fbrowser.php b/mod/fbrowser.php index 81f47e39d..d10d8021b 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -56,7 +56,7 @@ function fbrowser_content($a){ $types = Photo::supportedTypes(); $ext = $types[$rr['type']]; - if($a->theme['template_engine'] === 'internal') { + if($a->get_template_engine() === 'internal') { $filename_e = template_escape($rr['filename']); } else { @@ -93,7 +93,7 @@ function fbrowser_content($a){ list($m1,$m2) = explode("/",$rr['filetype']); $filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip"); - if($a->theme['template_engine'] === 'internal') { + if($a->get_template_engine() === 'internal') { $filename_e = template_escape($rr['filename']); } else { diff --git a/mod/message.php b/mod/message.php index 1a1ce4813..9e5e09e99 100644 --- a/mod/message.php +++ b/mod/message.php @@ -362,7 +362,7 @@ function message_content(&$a) { $rr['to'] = find_xchan_in_array($rr['to_xchan'],$c); $rr['seen'] = (($rr['mail_flags'] & MAIL_SEEN) ? 1 : ""); - if($a->theme['template_engine'] === 'internal') { + if($a->get_template_engine() === 'internal') { $from_name_e = template_escape($rr['from']['xchan_name']); $subject_e = template_escape((($rr['seen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>')); $body_e = template_escape($rr['body']); @@ -449,7 +449,7 @@ function message_content(&$a) { $a->page['htmlhead'] .= replace_macros($tpl, array( '$nickname' => $channel['channel_addr'], - '$baseurl' => $a->get_baseurl(true) + '$baseurl' => $a->get_baseurl(true), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), '$linkurl' => t('Please enter a link URL:') )); @@ -470,7 +470,7 @@ logger('message: ' . print_r($message,true)); // if($extracted['images']) // $message['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $message['contact-id']); - if($a->theme['template_engine'] === 'internal') { + if($a->get_template_engine() === 'internal') { $from_name_e = template_escape($message['from']['xchan_name']); $subject_e = template_escape($message['title']); $body_e = template_escape(smilies(bbcode($message['body']))); @@ -508,7 +508,7 @@ logger('message: ' . print_r($message,true)); $select = $message[$recp]['xchan_name'] . '<input type="hidden" name="messageto" value="' . $message[$recp]['xchan_hash'] . '" />'; $parent = '<input type="hidden" name="replyto" value="' . $message['parent_uri'] . '" />'; - if($a->theme['template_engine'] === 'internal') { + if($a->get_template_engine() === 'internal') { $subjtxt_e = template_escape($message['title']); } else { diff --git a/mod/photos.php b/mod/photos.php index 2cd2646d5..90f436699 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1063,7 +1063,7 @@ function photos_content(&$a) { } - if($a->theme['template_engine'] === 'internal') { + if($a->get_template_engine() === 'internal') { $albumselect_e = template_escape($albumselect); $aclselect_e = (($visitor) ? '' : template_escape(populate_acl($a->user, $celeb))); } @@ -1125,7 +1125,7 @@ function photos_content(&$a) { if($cmd === 'edit') { if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) { if($can_post) { - if($a->theme['template_engine'] === 'internal') { + if($a->get_template_engine() === 'internal') { $album_e = template_escape($album); } else { @@ -1176,7 +1176,7 @@ function photos_content(&$a) { $ext = $phototypes[$rr['type']]; - if($a->theme['template_engine'] === 'internal') { + if($a->get_template_engine() === 'internal') { $imgalt_e = template_escape($rr['filename']); $desc_e = template_escape($rr['desc']); } @@ -1390,7 +1390,7 @@ function photos_content(&$a) { $edit = Null; if(($cmd === 'edit') && ($can_post)) { - if($a->theme['template_engine'] === 'internal') { + if($a->get_template_engine() === 'internal') { $album_e = template_escape($ph[0]['album']); $caption_e = template_escape($ph[0]['desc']); $aclselect_e = template_escape(populate_acl($ph[0])); @@ -1552,7 +1552,7 @@ function photos_content(&$a) { $drop = replace_macros(get_markup_template('photo_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete'))); - if($a->theme['template_engine'] === 'internal') { + if($a->get_template_engine() === 'internal') { $name_e = template_escape($profile_name); $title_e = template_escape($item['title']); $body_e = template_escape(bbcode($item['body'])); @@ -1582,7 +1582,7 @@ function photos_content(&$a) { $paginate = paginate($a); } - if($a->theme['template_engine'] === 'internal') { + if($a->get_template_engine() === 'internal') { $album_e = array($album_link,template_escape($ph[0]['album'])); $tags_e = template_escape($tags); $like_e = template_escape($like); @@ -1653,7 +1653,7 @@ function photos_content(&$a) { $twist = 'rotright'; $ext = $phototypes[$rr['type']]; - if($a->theme['template_engine'] === 'internal') { + if($a->get_template_engine() === 'internal') { $alt_e = template_escape($rr['filename']); $name_e = template_escape($rr['album']); } diff --git a/mod/setup.php b/mod/setup.php index b3649ca40..4fa5152ea 100755 --- a/mod/setup.php +++ b/mod/setup.php @@ -183,6 +183,8 @@ function setup_content(&$a) { check_htconfig($checks); + check_smarty3($checks); + check_keys($checks); if(x($_POST,'phpath')) @@ -439,6 +441,22 @@ function check_htconfig(&$checks) { } +function check_smarty3(&$checks) { + $status = true; + $help = ""; + if( !is_writable('view/tpl/smarty3') ) { + + $status=false; + $help = t('Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') .EOL; + $help .= t('In order to store these compiled templates, the web server needs to have write access to the directory view/tpl/smarty3/ under the Friendica top level folder.').EOL; + $help .= t('Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.').EOL; + $help .= t('Note: as a security measure, you should give the web server write access to view/tpl/smarty3/ only--not the template files (.tpl) that it contains.').EOL; + } + + check_add($checks, t('view/tpl/smarty3 is writable'), $status, true, $help); + +} + function check_htaccess(&$checks) { $a = get_app(); $status = true; diff --git a/view/theme/redbasic/tpl/smarty3/lang_selector.tpl b/view/theme/redbasic/tpl/smarty3/lang_selector.tpl deleted file mode 100644 index 945cbf51e..000000000 --- a/view/theme/redbasic/tpl/smarty3/lang_selector.tpl +++ /dev/null @@ -1,10 +0,0 @@ -<div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div> -<div id="language-selector" style="display: none;" > - <form action="#" method="post" > - <select name="system_language" onchange="this.form.submit();" > - {{foreach $langs.0 as $v=>$l}} - <option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option> - {{/foreach}} - </select> - </form> -</div> diff --git a/view/theme/redbasic/tpl/smarty3/moderated_comment.tpl b/view/theme/redbasic/tpl/smarty3/moderated_comment.tpl deleted file mode 100644 index 8fbdf4bc4..000000000 --- a/view/theme/redbasic/tpl/smarty3/moderated_comment.tpl +++ /dev/null @@ -1,61 +0,0 @@ - <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;"> - <form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;"> - <input type="hidden" name="type" value="{{$type}}" /> - <input type="hidden" name="profile_uid" value="{{$profile_uid}}" /> - <input type="hidden" name="parent" value="{{$parent}}" /> - <input type="hidden" name="return" value="{{$return_path}}" /> - <input type="hidden" name="jsreload" value="{{$jsreload}}" /> - <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" /> - - <div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" > - <a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a> - </div> - <div class="comment-edit-photo-end"></div> - <div id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none"> - <div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div> - <input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" /> - <div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div> - <input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" /> - <div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div> - <input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" /> - </div> - <ul class="comment-edit-bb-{{$id}}"> - <li><a class="editicon boldbb shadow" - style="cursor: pointer;" title="{{$edbold}}" - onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li> - <li><a class="editicon italicbb shadow" - style="cursor: pointer;" title="{{$editalic}}" - onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li> - <li><a class="editicon underlinebb shadow" - style="cursor: pointer;" title="{{$eduline}}" - onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li> - <li><a class="editicon quotebb shadow" - style="cursor: pointer;" title="{{$edquote}}" - onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li> - <li><a class="editicon codebb shadow" - style="cursor: pointer;" title="{{$edcode}}" - onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li> - <li><a class="editicon imagebb shadow" - style="cursor: pointer;" title="{{$edimg}}" - onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li> - <li><a class="editicon urlbb shadow" - style="cursor: pointer;" title="{{$edurl}}" - onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li> - <li><a class="editicon videobb shadow" - style="cursor: pointer;" title="{{$edvideo}}" - onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li> - </ul> - <div class="comment-edit-bb-end"></div> - <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea> - - <div class="comment-edit-text-end"></div> - <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" > - <input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" /> - <span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span> - <div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div> - </div> - - <div class="comment-edit-end"></div> - </form> - - </div> diff --git a/view/theme/redbasic/tpl/smarty3/profile_vcard.tpl b/view/theme/redbasic/tpl/smarty3/profile_vcard.tpl deleted file mode 100644 index 048c461f4..000000000 --- a/view/theme/redbasic/tpl/smarty3/profile_vcard.tpl +++ /dev/null @@ -1,51 +0,0 @@ -<div class="vcard"> - - <div class="fn label">{{$profile.name}}</div> - - - - {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} - <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> - - - - {{if $location}} - <dl class="location"><dt class="location-label">{{$location}}</dt> - <dd class="adr"> - {{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}} - <span class="city-state-zip"> - <span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}} - <span class="region">{{$profile.region}}</span> - <span class="postal-code">{{$profile.postal-code}}</span> - </span> - {{if $profile.country-name}}<span class="country-name">{{$profile.country-name}}</span>{{/if}} - </dd> - </dl> - {{/if}} - - {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}} - - {{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}} - - {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">♥</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}} - - {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" >{{$profile.homepage}}</a></dd></dl>{{/if}} - - {{include file="diaspora_vcard.tpl"}} - - <div id="profile-vcard-break"></div> - <div id="profile-extra-links"> - <ul> - {{if $connect}} - <li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li> - {{/if}} - {{if $wallmessage}} - <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li> - {{/if}} - </ul> - </div> -</div> - -{{$contact_block}} - - diff --git a/view/theme/redbasic/tpl/smarty3/prv_message.tpl b/view/theme/redbasic/tpl/smarty3/prv_message.tpl deleted file mode 100644 index 9023540c4..000000000 --- a/view/theme/redbasic/tpl/smarty3/prv_message.tpl +++ /dev/null @@ -1,39 +0,0 @@ - -<h3>{{$header}}</h3> - -<div id="prvmail-wrapper" > -<form id="prvmail-form" action="message" method="post" > - -{{$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" /> - -<div id="prvmail-message-label">{{$yourmessage}}</div> -<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea> - - -<div id="prvmail-submit-wrapper" > - <input type="submit" id="prvmail-submit" name="submit" value="Submit" tabindex="13" /> - <div id="prvmail-upload-wrapper" > - <div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div> - </div> - <div id="prvmail-link-wrapper" > - <div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div> - </div> - <div id="prvmail-rotator-wrapper" > - <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /> - </div> -</div> -<div id="prvmail-end"></div> -</form> -</div> diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 66fb499a6..0c0553639 100644 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -101,8 +101,8 @@ <div class="wall-item-outside-wrapper-end $item.indent" ></div> </div> {{ if $item.toplevel }} -{{ for $item.children as $item }} - {{ inc $item.template }}{{ endinc }} +{{ for $item.children as $child }} + {{ inc $child.template with $item=$child }}{{ endinc }} {{ endfor }} {{ endif }} diff --git a/view/tpl/smarty3/conv_item.tpl b/view/tpl/smarty3/conv_item.tpl index a3e1ba7db..f69166f63 100644 --- a/view/tpl/smarty3/conv_item.tpl +++ b/view/tpl/smarty3/conv_item.tpl @@ -101,8 +101,8 @@ <div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div> </div> {{if $item.toplevel}} -{{foreach $item.children as $item}} - {{include file="{{$item.template}}"}} +{{foreach $item.children as $child}} + {{include file="{{$child.template}}" item=$child}} {{/foreach}} {{/if}} diff --git a/view/tpl/smarty3/diaspora_comment.tpl b/view/tpl/smarty3/diaspora_comment.tpl deleted file mode 100644 index 27ec3dffc..000000000 --- a/view/tpl/smarty3/diaspora_comment.tpl +++ /dev/null @@ -1,11 +0,0 @@ -<XML> - <post> - <comment> - <guid>{{$guid}}</guid> - <parent_guid>{{$parent_guid}}</parent_guid> - <author_signature>{{$authorsig}}</author_signature> - <text>{{$body}}</text> - <diaspora_handle>{{$handle}}</diaspora_handle> - </comment> - </post> -</XML>
\ No newline at end of file diff --git a/view/tpl/smarty3/diaspora_comment_relay.tpl b/view/tpl/smarty3/diaspora_comment_relay.tpl deleted file mode 100644 index 37a9e88b3..000000000 --- a/view/tpl/smarty3/diaspora_comment_relay.tpl +++ /dev/null @@ -1,12 +0,0 @@ -<XML> - <post> - <comment> - <guid>{{$guid}}</guid> - <parent_guid>{{$parent_guid}}</parent_guid> - <parent_author_signature>{{$parentsig}}</parent_author_signature> - <author_signature>{{$authorsig}}</author_signature> - <text>{{$body}}</text> - <diaspora_handle>{{$handle}}</diaspora_handle> - </comment> - </post> -</XML>
\ No newline at end of file diff --git a/view/tpl/smarty3/diaspora_conversation.tpl b/view/tpl/smarty3/diaspora_conversation.tpl deleted file mode 100644 index dc4482e4b..000000000 --- a/view/tpl/smarty3/diaspora_conversation.tpl +++ /dev/null @@ -1,29 +0,0 @@ -<XML> - <post> - <conversation> - <guid>{{$conv.guid}}</guid> - <subject>{{$conv.subject}}</subject> - <created_at>{{$conv.created_at}}</created_at> - - {{foreach $conv.messages as $msg}} - - <message> - <guid>{{$msg.guid}}</guid> - <parent_guid>{{$msg.parent_guid}}</parent_guid> - {{if $msg.parent_author_signature}} - <parent_author_signature>{{$msg.parent_author_signature}}</parent_author_signature> - {{/if}} - <author_signature>{{$msg.author_signature}}</author_signature> - <text>{{$msg.text}}</text> - <created_at>{{$msg.created_at}}</created_at> - <diaspora_handle>{{$msg.diaspora_handle}}</diaspora_handle> - <conversation_guid>{{$msg.conversation_guid}}</conversation_guid> - </message> - - {{/foreach}} - - <diaspora_handle>{{$conv.diaspora_handle}}</diaspora_handle> - <participant_handles>{{$conv.participant_handles}}</participant_handles> - </conversation> - </post> -</XML> diff --git a/view/tpl/smarty3/diaspora_like.tpl b/view/tpl/smarty3/diaspora_like.tpl deleted file mode 100644 index b03aef37a..000000000 --- a/view/tpl/smarty3/diaspora_like.tpl +++ /dev/null @@ -1,12 +0,0 @@ -<XML> - <post> - <like> - <target_type>{{$target_type}}</target_type> - <guid>{{$guid}}</guid> - <parent_guid>{{$parent_guid}}</parent_guid> - <author_signature>{{$authorsig}}</author_signature> - <positive>{{$positive}}</positive> - <diaspora_handle>{{$handle}}</diaspora_handle> - </like> - </post> -</XML> diff --git a/view/tpl/smarty3/diaspora_like_relay.tpl b/view/tpl/smarty3/diaspora_like_relay.tpl deleted file mode 100644 index 30df4cac6..000000000 --- a/view/tpl/smarty3/diaspora_like_relay.tpl +++ /dev/null @@ -1,13 +0,0 @@ -<XML> - <post> - <like> - <guid>{{$guid}}</guid> - <target_type>{{$target_type}}</target_type> - <parent_guid>{{$parent_guid}}</parent_guid> - <parent_author_signature>{{$parentsig}}</parent_author_signature> - <author_signature>{{$authorsig}}</author_signature> - <positive>{{$positive}}</positive> - <diaspora_handle>{{$handle}}</diaspora_handle> - </like> - </post> -</XML> diff --git a/view/tpl/smarty3/diaspora_message.tpl b/view/tpl/smarty3/diaspora_message.tpl deleted file mode 100644 index 3413d79b0..000000000 --- a/view/tpl/smarty3/diaspora_message.tpl +++ /dev/null @@ -1,13 +0,0 @@ -<XML> - <post> - <message> - <guid>{{$msg.guid}}</guid> - <parent_guid>{{$msg.parent_guid}}</parent_guid> - <author_signature>{{$msg.author_signature}}</author_signature> - <text>{{$msg.text}}</text> - <created_at>{{$msg.created_at}}</created_at> - <diaspora_handle>{{$msg.diaspora_handle}}</diaspora_handle> - <conversation_guid>{{$msg.conversation_guid}}</conversation_guid> - </message> - </post> -</XML> diff --git a/view/tpl/smarty3/diaspora_photo.tpl b/view/tpl/smarty3/diaspora_photo.tpl deleted file mode 100644 index cd7ef5802..000000000 --- a/view/tpl/smarty3/diaspora_photo.tpl +++ /dev/null @@ -1,13 +0,0 @@ -<XML> - <post> - <photo> - <remote_photo_path>{{$path}}</remote_photo_path> - <remote_photo_name>{{$filename}}</remote_photo_name> - <status_message_guid>{{$msg_guid}}</status_message_guid> - <guid>{{$guid}}</guid> - <diaspora_handle>{{$handle}}</diaspora_handle> - <public>{{$public}}</public> - <created_at>{{$created_at}}</created_at> - </photo> - </post> -</XML>
\ No newline at end of file diff --git a/view/tpl/smarty3/diaspora_post.tpl b/view/tpl/smarty3/diaspora_post.tpl deleted file mode 100644 index abbcc4c61..000000000 --- a/view/tpl/smarty3/diaspora_post.tpl +++ /dev/null @@ -1,11 +0,0 @@ -<XML> - <post> - <status_message> - <raw_message>{{$body}}</raw_message> - <guid>{{$guid}}</guid> - <diaspora_handle>{{$handle}}</diaspora_handle> - <public>{{$public}}</public> - <created_at>{{$created}}</created_at> - </status_message> - </post> -</XML>
\ No newline at end of file diff --git a/view/tpl/smarty3/diaspora_profile.tpl b/view/tpl/smarty3/diaspora_profile.tpl deleted file mode 100644 index 04f2e2948..000000000 --- a/view/tpl/smarty3/diaspora_profile.tpl +++ /dev/null @@ -1,16 +0,0 @@ -<XML> - <post><profile> - <diaspora_handle>{{$handle}}</diaspora_handle> - <first_name>{{$first}}</first_name> - <last_name>{{$last}}</last_name> - <image_url>{{$large}}</image_url> - <image_url_small>{{$small}}</image_url_small> - <image_url_medium>{{$medium}}</image_url_medium> - <birthday>{{$dob}}</birthday> - <gender>{{$gender}}</gender> - <bio>{{$about}}</bio> - <location>{{$location}}</location> - <searchable>{{$searchable}}</searchable> - <tag_string>{{$tags}}</tag_string> -</profile></post> - </XML> diff --git a/view/tpl/smarty3/diaspora_relay_retraction.tpl b/view/tpl/smarty3/diaspora_relay_retraction.tpl deleted file mode 100644 index 5e7aed41f..000000000 --- a/view/tpl/smarty3/diaspora_relay_retraction.tpl +++ /dev/null @@ -1,10 +0,0 @@ -<XML> - <post> - <relayable_retraction> - <target_type>{{$type}}</target_type> - <target_guid>{{$guid}}</target_guid> - <target_author_signature>{{$signature}}</target_author_signature> - <sender_handle>{{$handle}}</sender_handle> - </relayable_retraction> - </post> -</XML> diff --git a/view/tpl/smarty3/diaspora_relayable_retraction.tpl b/view/tpl/smarty3/diaspora_relayable_retraction.tpl deleted file mode 100644 index 927e394f3..000000000 --- a/view/tpl/smarty3/diaspora_relayable_retraction.tpl +++ /dev/null @@ -1,11 +0,0 @@ -<XML> - <post> - <relayable_retraction> - <target_type>{{$target_type}}</target_type> - <target_guid>{{$guid}}</target_guid> - <parent_author_signature>{{$parentsig}}</parent_author_signature> - <target_author_signature>{{$authorsig}}</target_author_signature> - <sender_handle>{{$handle}}</sender_handle> - </relayable_retraction> - </post> -</XML> diff --git a/view/tpl/smarty3/diaspora_retract.tpl b/view/tpl/smarty3/diaspora_retract.tpl deleted file mode 100644 index 26e2cb94e..000000000 --- a/view/tpl/smarty3/diaspora_retract.tpl +++ /dev/null @@ -1,9 +0,0 @@ -<XML> - <post> - <retraction> - <post_guid>{{$guid}}</post_guid> - <type>{{$type}}</type> - <diaspora_handle>{{$handle}}</diaspora_handle> - </retraction> - </post> -</XML>
\ No newline at end of file diff --git a/view/tpl/smarty3/diaspora_share.tpl b/view/tpl/smarty3/diaspora_share.tpl deleted file mode 100644 index 59eb06124..000000000 --- a/view/tpl/smarty3/diaspora_share.tpl +++ /dev/null @@ -1,8 +0,0 @@ -<XML> - <post> - <request> - <sender_handle>{{$sender}}</sender_handle> - <recipient_handle>{{$recipient}}</recipient_handle> - </request> - </post> -</XML>
\ No newline at end of file diff --git a/view/tpl/smarty3/diaspora_signed_retract.tpl b/view/tpl/smarty3/diaspora_signed_retract.tpl deleted file mode 100644 index f0f346da8..000000000 --- a/view/tpl/smarty3/diaspora_signed_retract.tpl +++ /dev/null @@ -1,10 +0,0 @@ -<XML> - <post> - <signed_retraction> - <target_guid>{{$guid}}</target_guid> - <target_type>{{$type}}</target_type> - <sender_handle>{{$handle}}</sender_handle> - <target_author_signature>{{$signature}}</target_author_signature> - </signed_retraction> - </post> -</XML> diff --git a/view/tpl/smarty3/diaspora_vcard.tpl b/view/tpl/smarty3/diaspora_vcard.tpl deleted file mode 100644 index 0ab6879f9..000000000 --- a/view/tpl/smarty3/diaspora_vcard.tpl +++ /dev/null @@ -1,57 +0,0 @@ -<div style="display:none;"> - <dl class='channel_nickname'> - <dt>Nickname</dt> - <dd> - <a class="nickname url uid" href="{{$diaspora.podloc}}/" rel="me">{{$diaspora.nickname}}</a> - </dd> - </dl> - <dl class='channel_fn'> - <dt>Full name</dt> - <dd> - <span class='fn'>{{$diaspora.fullname}}</span> - </dd> - </dl> - - <dl class='channel_given_name'> - <dt>First name</dt> - <dd> - <span class='given_name'>{{$diaspora.firstname}}</span> - </dd> - </dl> - <dl class='channel_family_name'> - <dt>Family name</dt> - <dd> - <span class='family_name'>{{$diaspora.lastname}}</span> - </dd> - </dl> - <dl class="channel_url"> - <dt>URL</dt> - <dd> - <a class="url" href="{{$diaspora.podloc}}/" id="pod_location" rel="me">{{$diaspora.podloc}}/</a> - </dd> - </dl> - <dl class="channel_photo"> - <dt>Photo</dt> - <dd> - <img class="photo avatar" height="300" width="300" src="{{$diaspora.photo300}}"> - </dd> - </dl> - <dl class="channel_photo_medium"> - <dt>Photo</dt> - <dd> - <img class="photo avatar" height="100" width="100" src="{{$diaspora.photo100}}"> - </dd> - </dl> - <dl class="channel_photo_small"> - <dt>Photo</dt> - <dd> - <img class="photo avatar" height="50" width="50" src="{{$diaspora.photo50}}"> - </dd> - </dl> - <dl class="channel_searchable"> - <dt>Searchable</dt> - <dd> - <span class="searchable">{{$diaspora.searchable}}</span> - </dd> - </dl> -</div> diff --git a/view/tpl/smarty3/xrd_diaspora.tpl b/view/tpl/smarty3/xrd_diaspora.tpl deleted file mode 100644 index aa0d8c740..000000000 --- a/view/tpl/smarty3/xrd_diaspora.tpl +++ /dev/null @@ -1,3 +0,0 @@ - <Link rel="http://joindiaspora.com/seed_location" type="text/html" href="{{$baseurl}}/" /> - <Link rel="http://joindiaspora.com/guid" type="text/html" href="{{$dspr_guid}}" /> - <Link rel="diaspora-public-key" type="RSA" href="{{$dspr_key}}" /> |