friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge https://github.com/friendica/friendica into pull

This commit is contained in:
friendica 2012-12-26 13:09:20 -08:00
parent 2684981941 e935fa78c6
commit f519b90737
189 changed files with 1664 additions and 1404 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
boot.php
View File

@ -969,16 +969,7 @@ if(! function_exists('login')) {
$a->module = 'login'; $a->module = 'login';
} }
$o .= replace_macros($tpl, array(
$includes = array(
'$field_input' => 'field_input.tpl',
'$field_password' => 'field_password.tpl',
'$field_openid' => 'field_openid.tpl',
'$field_checkbox' => 'field_checkbox.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($tpl,$includes + array(
'$dest_url' => $dest_url, '$dest_url' => $dest_url,
'$logout' => t('Logout'), '$logout' => t('Logout'),
@ -997,6 +988,13 @@ if(! function_exists('login')) {
'$lostpass' => t('Forgot your password?'), '$lostpass' => t('Forgot your password?'),
'$lostlink' => t('Password Reset'), '$lostlink' => t('Password Reset'),
'$tostitle' => t('Website Terms of Service'),
'$toslink' => t('terms of service'),
'$privacytitle' => t('Website Privacy Policy'),
'$privacylink' => t('privacy policy'),
)); ));
call_hooks('login_hook',$o); call_hooks('login_hook',$o);
@ -1348,15 +1346,10 @@ if(! function_exists('profile_sidebar')) {
$tpl = get_markup_template('profile_vcard.tpl'); $tpl = get_markup_template('profile_vcard.tpl');
$includes = array(
'$diaspora_vcard' => 'diaspora_vcard.tpl'
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
if($a->theme['template_engine'] === 'internal') if($a->theme['template_engine'] === 'internal')
$location = template_escape($location); $location = template_escape($location);
$o .= replace_macros($tpl, $includes + array( $o .= replace_macros($tpl, array(
'$profile' => $profile, '$profile' => $profile,
'$connect' => $connect, '$connect' => $connect,
'$wallmessage' => $wallmessage, '$wallmessage' => $wallmessage,
@ -1365,7 +1358,7 @@ if(! function_exists('profile_sidebar')) {
'$pdesc' => $pdesc, '$pdesc' => $pdesc,
'$marital' => $marital, '$marital' => $marital,
'$homepage' => $homepage, '$homepage' => $homepage,
'$diaspora_info' => $diaspora, '$diaspora' => $diaspora,
'$contact_block' => $contact_block, '$contact_block' => $contact_block,
)); ));
@ -1946,3 +1939,18 @@ function clear_cache($basepath = "", $path = "") {
closedir($dh); closedir($dh);
} }
} }
function set_template_engine(&$a, $engine = 'internal') {
$a->theme['template_engine'] = 'internal';
if(is_writable('view/smarty3/')) {
switch($engine) {
case 'smarty3':
$a->theme['template_engine'] = 'smarty3';
break;
default:
break;
}
}
}

20
include/auth.php
View File

@ -5,6 +5,8 @@ require_once('include/security.php');
require_once('include/datetime.php'); require_once('include/datetime.php');
function nuke_session() { function nuke_session() {
new_cookie(0); // make sure cookie is deleted on browser close, as a security measure
unset($_SESSION['authenticated']); unset($_SESSION['authenticated']);
unset($_SESSION['uid']); unset($_SESSION['uid']);
unset($_SESSION['visitor_id']); unset($_SESSION['visitor_id']);
@ -187,18 +189,10 @@ else {
// (i.e. expire when the browser is closed), even when there's a time expiration // (i.e. expire when the browser is closed), even when there's a time expiration
// on the cookie // on the cookie
if($_POST['remember']) { if($_POST['remember']) {
$old_sid = session_id(); new_cookie(31449600); // one year
session_set_cookie_params('31449600'); // one year
session_regenerate_id(false);
q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid));
} }
else { else {
$old_sid = session_id(); new_cookie(0); // 0 means delete on browser exit
session_set_cookie_params('0');
session_regenerate_id(false);
q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid));
} }
// if we haven't failed up this point, log them in. // if we haven't failed up this point, log them in.
@ -208,4 +202,10 @@ else {
} }
} }
function new_cookie($time) {
$old_sid = session_id();
session_set_cookie_params("$time");
session_regenerate_id(false);
q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid));
}

3
include/conversation.php
View File

@ -703,6 +703,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
$o = replace_macros($page_template, array( $o = replace_macros($page_template, array(
'$baseurl' => $a->get_baseurl($ssl_state), '$baseurl' => $a->get_baseurl($ssl_state),
'$live_update' => $live_update_div, '$live_update' => $live_update_div,
'$remove' => t('remove'),
'$mode' => $mode, '$mode' => $mode,
'$user' => $a->user, '$user' => $a->user,
'$threads' => $threads, '$threads' => $threads,
@ -920,7 +921,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
$o = ''; $o = '';
$geotag = (($x['allow_location']) ? get_markup_template('jot_geotag.tpl') : ''); $geotag = (($x['allow_location']) ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : '');
/* $plaintext = false; /* $plaintext = false;
if( local_user() && (intval(get_pconfig(local_user(),'system','plaintext')) || !feature_enabled(local_user(),'richtext')) ) if( local_user() && (intval(get_pconfig(local_user(),'system','plaintext')) || !feature_enabled(local_user(),'richtext')) )

20
include/friendica_smarty.php
View File

@ -5,20 +5,24 @@ require_once("library/Smarty/libs/Smarty.class.php");
class FriendicaSmarty extends Smarty { class FriendicaSmarty extends Smarty {
public $filename; public $filename;
public $root;
function __construct() { function __construct() {
parent::__construct(); parent::__construct();
$a = get_app(); $a = get_app();
$theme = current_theme();
//$this->root = $_SERVER['DOCUMENT_ROOT'] . '/'; // setTemplateDir can be set to an array, which Smarty will parse in order.
$this->root = ''; // The order is thus very important here
$template_dirs = array('theme' => "view/theme/$theme/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/');
$this->setTemplateDir($template_dirs);
$this->setTemplateDir($this->root . 'view/smarty3/'); $this->setCompileDir('view/smarty3/compiled/');
$this->setCompileDir($this->root . 'view/smarty3/compiled/'); $this->setConfigDir('view/smarty3/config/');
$this->setConfigDir($this->root . 'view/smarty3/config/'); $this->setCacheDir('view/smarty3/cache/');
$this->setCacheDir($this->root . 'view/smarty3/cache/');
$this->left_delimiter = $a->smarty3_ldelim; $this->left_delimiter = $a->smarty3_ldelim;
$this->right_delimiter = $a->smarty3_rdelim; $this->right_delimiter = $a->smarty3_rdelim;
@ -28,7 +32,7 @@ class FriendicaSmarty extends Smarty {
if($template) { if($template) {
return $this->fetch('string:' . $template); return $this->fetch('string:' . $template);
} }
return $this->fetch('file:' . $this->root . $this->filename); return $this->fetch('file:' . $this->filename);
} }
} }

15
include/text.php
View File

@ -499,21 +499,6 @@ function get_template_file($a, $filename, $root = '') {
return $template_file; return $template_file;
}} }}
if(! function_exists("set_template_includes")) {
function set_template_includes($engine, $includes) {
if($engine === 'smarty3') {
$a = get_app();
foreach($includes as $name=>$path) {
// $sm_includes[$name] = $_SERVER['DOCUMENT_ROOT'] . '/' . get_template_file($a, 'smarty3/' . $path);
$sm_includes[$name] = get_template_file($a, 'smarty3/' . $path);
}
return $sm_includes;
}
else {
return $includes;
}
}}

29
mod/admin.php
View File

@ -455,16 +455,7 @@ function admin_page_site(&$a) {
); );
$t = get_markup_template("admin_site.tpl"); $t = get_markup_template("admin_site.tpl");
return replace_macros($t, array(
$includes = array(
'$field_checkbox' => 'field_checkbox.tpl',
'$field_input' => 'field_input.tpl',
'$field_select' => 'field_select.tpl',
'$field_textarea' => 'field_textarea.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
return replace_macros($t, $includes + array(
'$title' => t('Administration'), '$title' => t('Administration'),
'$page' => t('Site'), '$page' => t('Site'),
'$submit' => t('Submit'), '$submit' => t('Submit'),
@ -1144,14 +1135,7 @@ readable.");
} }
} }
$includes = array( return replace_macros($t, array(
'$field_checkbox' => 'field_checkbox.tpl',
'$field_input' => 'field_input.tpl',
'$field_select' => 'field_select.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
return replace_macros($t, $includes + array(
'$title' => t('Administration'), '$title' => t('Administration'),
'$page' => t('Logs'), '$page' => t('Logs'),
'$submit' => t('Submit'), '$submit' => t('Submit'),
@ -1210,14 +1194,7 @@ function admin_page_remoteupdate(&$a) {
} }
$tpl = get_markup_template("admin_remoteupdate.tpl"); $tpl = get_markup_template("admin_remoteupdate.tpl");
return replace_macros($tpl, array(
$includes = array(
'$field_input' => 'field_input.tpl',
'$field_password' => 'field_password.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
return replace_macros($tpl, $includes + array(
'$baseurl' => $a->get_baseurl(true), '$baseurl' => $a->get_baseurl(true),
'$submit' => t("Update now"), '$submit' => t("Update now"),
'$close' => t("Close"), '$close' => t("Close"),

15
mod/contacts.php
View File

@ -346,12 +346,7 @@ function contacts_content(&$a) {
$lost_contact = (($contact['archive'] && $contact['term-date'] != '0000-00-00 00:00:00' && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : ''); $lost_contact = (($contact['archive'] && $contact['term-date'] != '0000-00-00 00:00:00' && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : '');
$includes = array( $o .= replace_macros($tpl, array(
'$field_checkbox' => 'field_checkbox.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($tpl,$includes + array(
'$header' => t('Contact Editor'), '$header' => t('Contact Editor'),
'$tab_str' => $tab_str, '$tab_str' => $tab_str,
'$submit' => t('Submit'), '$submit' => t('Submit'),
@ -576,13 +571,7 @@ function contacts_content(&$a) {
} }
$tpl = get_markup_template("contacts-template.tpl"); $tpl = get_markup_template("contacts-template.tpl");
$o .= replace_macros($tpl, array(
$includes = array(
'$contact_template' => 'contact_template.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($tpl,$includes + array(
'$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''), '$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''),
'$tabs' => $t, '$tabs' => $t,
'$total' => $total, '$total' => $total,

2
mod/fbrowser.php
View File

@ -78,6 +78,7 @@ function fbrowser_content($a){
'$path' => $path, '$path' => $path,
'$folders' => $albums, '$folders' => $albums,
'$files' =>$files, '$files' =>$files,
'$cancel' => t('Cancel'),
)); ));
@ -112,6 +113,7 @@ function fbrowser_content($a){
'$path' => array( array($a->get_baseurl()."/fbrowser/image/", t("Files")) ), '$path' => array( array($a->get_baseurl()."/fbrowser/image/", t("Files")) ),
'$folders' => false, '$folders' => false,
'$files' =>$files, '$files' =>$files,
'$cancel' => t('Cancel'),
)); ));
} }

7
mod/filer.php
View File

@ -24,13 +24,8 @@ function filer_content(&$a) {
$filetags = get_pconfig(local_user(),'system','filetags'); $filetags = get_pconfig(local_user(),'system','filetags');
$filetags = file_tag_file_to_list($filetags,'file'); $filetags = file_tag_file_to_list($filetags,'file');
$filetags = explode(",", $filetags); $filetags = explode(",", $filetags);
$tpl = get_markup_template("filer_dialog.tpl"); $tpl = get_markup_template("filer_dialog.tpl");
$includes = array(
'$field_combobox' => 'field_combobox.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o = replace_macros($tpl, array( $o = replace_macros($tpl, array(
'$field' => array('term', t("Save to Folder:"), '', '', $filetags, t('- select -')), '$field' => array('term', t("Save to Folder:"), '', '', $filetags, t('- select -')),
'$submit' => t('Save'), '$submit' => t('Save'),

8
mod/group.php
View File

@ -83,13 +83,7 @@ function group_content(&$a) {
$tpl = get_markup_template('group_edit.tpl'); $tpl = get_markup_template('group_edit.tpl');
$includes = array( $context = array(
'$field_input' => 'field_input.tpl',
'$groupeditortpl' => 'groupeditor.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$context = $includes + array(
'$submit' => t('Submit'), '$submit' => t('Submit'),
); );

35
mod/install.php
View File

@ -177,6 +177,8 @@ function install_content(&$a) {
check_htconfig($checks); check_htconfig($checks);
check_smarty3($checks);
check_keys($checks); check_keys($checks);
if(x($_POST,'phpath')) if(x($_POST,'phpath'))
@ -220,14 +222,7 @@ function install_content(&$a) {
$tpl = get_markup_template('install_db.tpl'); $tpl = get_markup_template('install_db.tpl');
$o .= replace_macros($tpl, array(
$includes = array(
'$field_input' => 'field_input.tpl',
'$field_password' => 'field_password.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($tpl,$includes + array(
'$title' => $install_title, '$title' => $install_title,
'$pass' => t('Database connection'), '$pass' => t('Database connection'),
'$info_01' => t('In order to install Friendica we need to know how to connect to your database.'), '$info_01' => t('In order to install Friendica we need to know how to connect to your database.'),
@ -267,13 +262,7 @@ function install_content(&$a) {
$timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles'); $timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
$tpl = get_markup_template('install_settings.tpl'); $tpl = get_markup_template('install_settings.tpl');
$o .= replace_macros($tpl, array(
$includes = array(
'$field_input' => 'field_input.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($tpl, $includes + array(
'$title' => $install_title, '$title' => $install_title,
'$pass' => t('Site settings'), '$pass' => t('Site settings'),
@ -441,6 +430,22 @@ function check_htconfig(&$checks) {
} }
function check_smarty3(&$checks) {
$status = true;
$help = "";
if( !is_writable('view/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/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/smarty3/ only--not the template files (.tpl) that it contains.').EOL;
}
check_add($checks, t('view/smarty3 is writable'), $status, true, $help);
}
function check_htaccess(&$checks) { function check_htaccess(&$checks) {
$a = get_app(); $a = get_app();
$status = true; $status = true;

74
mod/message.php
View File

@ -282,25 +282,23 @@ function message_content(&$a) {
$tpl = get_markup_template('prv_message.tpl'); $tpl = get_markup_template('prv_message.tpl');
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$reply' => array( '$header' => t('Send Private Message'),
'header' => t('Send Private Message'), '$to' => t('To:'),
'to' => t('To:'), '$showinputs' => 'true',
'showinputs' => 'true', '$prefill' => $prefill,
'prefill' => $prefill, '$autocomp' => $autocomp,
'autocomp' => $autocomp, '$preid' => $preid,
'preid' => $preid, '$subject' => t('Subject:'),
'subject' => t('Subject:'), '$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
'subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''), '$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
'text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''), '$readonly' => '',
'readonly' => '', '$yourmessage' => t('Your message:'),
'yourmessage' => t('Your message:'), '$select' => $select,
'select' => $select, '$parent' => '',
'parent' => '', '$upload' => t('Upload photo'),
'upload' => t('Upload photo'), '$insert' => t('Insert web link'),
'insert' => t('Insert web link'), '$wait' => t('Please wait'),
'wait' => t('Please wait'), '$submit' => t('Submit')
'submit' => t('Submit')
)
)); ));
return $o; return $o;
@ -497,12 +495,6 @@ function message_content(&$a) {
$tpl = get_markup_template('mail_display.tpl'); $tpl = get_markup_template('mail_display.tpl');
$includes = array(
'$mail_conv' => 'mail_conv.tpl',
'$prv_message' => 'prv_message.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
if($a->theme['template_engine'] === 'internal') { if($a->theme['template_engine'] === 'internal') {
$subjtxt_e = template_escape($message['title']); $subjtxt_e = template_escape($message['title']);
} }
@ -510,7 +502,7 @@ function message_content(&$a) {
$subjtxt_e = $message['title']; $subjtxt_e = $message['title'];
} }
$o = replace_macros($tpl, $includes + array( $o = replace_macros($tpl, array(
'$thread_id' => $a->argv[1], '$thread_id' => $a->argv[1],
'$thread_subject' => $message['title'], '$thread_subject' => $message['title'],
'$thread_seen' => $seen, '$thread_seen' => $seen,
@ -520,22 +512,20 @@ function message_content(&$a) {
'$mails' => $mails, '$mails' => $mails,
// reply // reply
'$reply_info' => array( '$header' => t('Send Reply'),
'header' => t('Send Reply'), '$to' => t('To:'),
'to' => t('To:'), '$showinputs' => '',
'showinputs' => '', '$subject' => t('Subject:'),
'subject' => t('Subject:'), '$subjtxt' => template_escape($message['title']),
'subjtxt' => $subjtxt_e, '$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
'readonly' => ' readonly="readonly" style="background: #BBBBBB;" ', '$yourmessage' => t('Your message:'),
'yourmessage' => t('Your message:'), '$text' => '',
'text' => '', '$select' => $select,
'select' => $select, '$parent' => $parent,
'parent' => $parent, '$upload' => t('Upload photo'),
'upload' => t('Upload photo'), '$insert' => t('Insert web link'),
'insert' => t('Insert web link'), '$submit' => t('Submit'),
'submit' => t('Submit'), '$wait' => t('Please wait')
'wait' => t('Please wait'),
),
)); ));

8
mod/nogroup.php
View File

@ -55,13 +55,7 @@ function nogroup_content(&$a) {
} }
$tpl = get_markup_template("nogroup-template.tpl"); $tpl = get_markup_template("nogroup-template.tpl");
$o .= replace_macros($tpl, array(
$includes = array(
'$contact_template' => 'contact_template.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($tpl,$includes + array(
'$header' => t('Contacts who are not members of a group'), '$header' => t('Contacts who are not members of a group'),
'$contacts' => $contacts, '$contacts' => $contacts,
'$paginate' => paginate($a), '$paginate' => paginate($a),

59
mod/notifications.php
View File

@ -145,12 +145,7 @@ function notifications_content(&$a) {
$return_addr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : '')); $return_addr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
$includes = array( $notif_content .= replace_macros($sugg, array(
'$field_checkbox' => 'field_checkbox.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$notif_content .= replace_macros($sugg,$includes + array(
'$str_notifytype' => t('Notification type: '), '$str_notifytype' => t('Notification type: '),
'$notify_type' => t('Friend Suggestion'), '$notify_type' => t('Friend Suggestion'),
'$intro_id' => $rr['intro_id'], '$intro_id' => $rr['intro_id'],
@ -196,12 +191,7 @@ function notifications_content(&$a) {
)); ));
} }
$includes = array( $notif_content .= replace_macros($tpl, array(
'$field_checkbox' => 'field_checkbox.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$notif_content .= replace_macros($tpl,$includes + array(
'$str_notifytype' => t('Notification type: '), '$str_notifytype' => t('Notification type: '),
'$notify_type' => (($rr['network'] !== NETWORK_OSTATUS) ? t('Friend/Connect Request') : t('New Follower')), '$notify_type' => (($rr['network'] !== NETWORK_OSTATUS) ? t('Friend/Connect Request') : t('New Follower')),
'$dfrn_text' => $dfrn_text, '$dfrn_text' => $dfrn_text,
@ -226,14 +216,9 @@ function notifications_content(&$a) {
else else
info( t('No introductions.') . EOL); info( t('No introductions.') . EOL);
$includes = array( $o .= replace_macros($notif_tpl, array(
'$common_tabs' => 'common_tabs.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($notif_tpl,$includes + array(
'$notif_header' => t('Notifications'), '$notif_header' => t('Notifications'),
'$tabs_data' => $tabs, '$tabs' => $tabs,
'$notif_content' => $notif_content, '$notif_content' => $notif_content,
)); ));
@ -317,14 +302,9 @@ function notifications_content(&$a) {
$notif_content = t('No more network notifications.'); $notif_content = t('No more network notifications.');
} }
$includes = array( $o .= replace_macros($notif_tpl, array(
'$common_tabs' => 'common_tabs.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($notif_tpl,$includes + array(
'$notif_header' => t('Network Notifications'), '$notif_header' => t('Network Notifications'),
'$tabs_data' => $tabs, '$tabs' => $tabs,
'$notif_content' => $notif_content, '$notif_content' => $notif_content,
)); ));
@ -352,14 +332,9 @@ function notifications_content(&$a) {
$notif_content .= t('No more system notifications.'); $notif_content .= t('No more system notifications.');
} }
$includes = array( $o .= replace_macros($notif_tpl, array(
'$common_tabs' => 'common_tabs.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($notif_tpl,$includes + array(
'$notif_header' => t('System Notifications'), '$notif_header' => t('System Notifications'),
'$tabs_data' => $tabs, '$tabs' => $tabs,
'$notif_content' => $notif_content, '$notif_content' => $notif_content,
)); ));
@ -452,14 +427,9 @@ function notifications_content(&$a) {
$notif_content = t('No more personal notifications.'); $notif_content = t('No more personal notifications.');
} }
$includes = array( $o .= replace_macros($notif_tpl, array(
'$common_tabs' => 'common_tabs.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($notif_tpl,$includes + array(
'$notif_header' => t('Personal Notifications'), '$notif_header' => t('Personal Notifications'),
'$tabs_data' => $tabs, '$tabs' => $tabs,
'$notif_content' => $notif_content, '$notif_content' => $notif_content,
)); ));
@ -538,14 +508,9 @@ function notifications_content(&$a) {
$notif_content = t('No more home notifications.'); $notif_content = t('No more home notifications.');
} }
$includes = array( $o .= replace_macros($notif_tpl, array(
'$common_tabs' => 'common_tabs.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($notif_tpl,$includes + array(
'$notif_header' => t('Home Notifications'), '$notif_header' => t('Home Notifications'),
'$tabs_data' => $tabs, '$tabs' => $tabs,
'$notif_content' => $notif_content, '$notif_content' => $notif_content,
)); ));
} }

9
mod/notify.php
View File

@ -61,14 +61,9 @@ function notify_content(&$a) {
$notif_content .= t('No more system notifications.'); $notif_content .= t('No more system notifications.');
} }
$includes = array( $o .= replace_macros($notif_tpl, array(
'$common_tabs' => 'common_tabs.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($notif_tpl,$includes + array(
'$notif_header' => t('System Notifications'), '$notif_header' => t('System Notifications'),
'$tabs_data' => '', // $tabs, '$tabs' => '', // $tabs,
'$notif_content' => $notif_content, '$notif_content' => $notif_content,
)); ));

8
mod/photos.php
View File

@ -1679,13 +1679,7 @@ function photos_content(&$a) {
} }
$tpl = get_markup_template('photos_recent.tpl'); $tpl = get_markup_template('photos_recent.tpl');
$o .= replace_macros($tpl, array(
$includes = array(
'$photo_top' => 'photo_top.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($tpl,$includes + array(
'$title' => t('Recent Photos'), '$title' => t('Recent Photos'),
'$can_post' => $can_post, '$can_post' => $can_post,
'$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['user']['nickname'].'/upload'), '$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['user']['nickname'].'/upload'),

8
mod/poco.php
View File

@ -147,13 +147,7 @@ function poco_init(&$a) {
if($format === 'xml') { if($format === 'xml') {
header('Content-type: text/xml'); header('Content-type: text/xml');
echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify(array('$response' => $ret)));
$includes = array(
'$poco_entry_xml' => 'poco_entry_xml.tpl'
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify($includes + array('$response' => $ret)));
http_status_exit(500); http_status_exit(500);
} }
if($format === 'json') { if($format === 'json') {

2
mod/profile.php
View File

@ -33,7 +33,7 @@ function profile_init(&$a) {
auto_redir($a, $which); auto_redir($a, $which);
} }
$a->theme["template_engine"] = 'internal'; // reset the template engine to the default in case the user's theme doesn't specify one set_template_engine($a); // reset the template engine to the default in case the user's theme doesn't specify one
profile_load($a,$which,$profile); profile_load($a,$which,$profile);
$blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false); $blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);

65
mod/settings.php
View File

@ -554,13 +554,7 @@ function settings_content(&$a) {
if(($a->argc > 2) && ($a->argv[2] === 'add')) { if(($a->argc > 2) && ($a->argv[2] === 'add')) {
$tpl = get_markup_template("settings_oauth_edit.tpl"); $tpl = get_markup_template("settings_oauth_edit.tpl");
$o .= replace_macros($tpl, array(
$includes = array(
'$field_input' => 'field_input.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($tpl, $includes + array(
'$form_security_token' => get_form_security_token("settings_oauth"), '$form_security_token' => get_form_security_token("settings_oauth"),
'$title' => t('Add application'), '$title' => t('Add application'),
'$submit' => t('Submit'), '$submit' => t('Submit'),
@ -586,13 +580,7 @@ function settings_content(&$a) {
$app = $r[0]; $app = $r[0];
$tpl = get_markup_template("settings_oauth_edit.tpl"); $tpl = get_markup_template("settings_oauth_edit.tpl");
$o .= replace_macros($tpl, array(
$includes = array(
'$field_input' => 'field_input.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($tpl, $includes + array(
'$form_security_token' => get_form_security_token("settings_oauth"), '$form_security_token' => get_form_security_token("settings_oauth"),
'$title' => t('Add application'), '$title' => t('Add application'),
'$submit' => t('Update'), '$submit' => t('Update'),
@ -675,13 +663,7 @@ function settings_content(&$a) {
$tpl = get_markup_template("settings_features.tpl"); $tpl = get_markup_template("settings_features.tpl");
$o .= replace_macros($tpl, array(
$includes = array(
'$field_yesno' => 'field_yesno.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($tpl, $includes + array(
'$form_security_token' => get_form_security_token("settings_features"), '$form_security_token' => get_form_security_token("settings_features"),
'$title' => t('Additional Features'), '$title' => t('Additional Features'),
'$features' => $arr, '$features' => $arr,
@ -733,16 +715,7 @@ function settings_content(&$a) {
} }
$includes = array( $o .= replace_macros($tpl, array(
'$field_checkbox' => 'field_checkbox.tpl',
'$field_input' => 'field_input.tpl',
'$field_select' => 'field_select.tpl',
'$field_custom' => 'field_custom.tpl',
'$field_password' => 'field_password.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($tpl, $includes + array(
'$form_security_token' => get_form_security_token("settings_connectors"), '$form_security_token' => get_form_security_token("settings_connectors"),
'$title' => t('Connector Settings'), '$title' => t('Connector Settings'),
@ -832,15 +805,7 @@ function settings_content(&$a) {
} }
$tpl = get_markup_template("settings_display.tpl"); $tpl = get_markup_template("settings_display.tpl");
$o = replace_macros($tpl, array(
$includes = array(
'$field_themeselect' => 'field_themeselect.tpl',
'$field_checkbox' => 'field_checkbox.tpl',
'$field_input' => 'field_input.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o = replace_macros($tpl, $includes + array(
'$ptitle' => t('Display Settings'), '$ptitle' => t('Display Settings'),
'$form_security_token' => get_form_security_token("settings_display"), '$form_security_token' => get_form_security_token("settings_display"),
'$submit' => t('Submit'), '$submit' => t('Submit'),
@ -926,13 +891,7 @@ function settings_content(&$a) {
$pageset_tpl = get_markup_template('pagetypes.tpl'); $pageset_tpl = get_markup_template('pagetypes.tpl');
$pagetype = replace_macros($pageset_tpl, array(
$includes = array(
'$field_radio' => 'field_radio.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$pagetype = replace_macros($pageset_tpl,$includes + array(
'$page_normal' => array('page-flags', t('Normal Account Page'), PAGE_NORMAL, '$page_normal' => array('page-flags', t('Normal Account Page'), PAGE_NORMAL,
t('This account is a normal personal profile'), t('This account is a normal personal profile'),
($a->user['page-flags'] == PAGE_NORMAL)), ($a->user['page-flags'] == PAGE_NORMAL)),
@ -1053,17 +1012,7 @@ function settings_content(&$a) {
require_once('include/group.php'); require_once('include/group.php');
$group_select = mini_group_select(local_user(),$a->user['def_gid']); $group_select = mini_group_select(local_user(),$a->user['def_gid']);
$includes = array( $o .= replace_macros($stpl, array(
'$field_password' => 'field_password.tpl',
'$field_input' => 'field_input.tpl',
'$field_custom' => 'field_custom.tpl',
'$field_checkbox' => 'field_checkbox.tpl',
'$field_yesno' => 'field_yesno.tpl',
'$field_intcheckbox' => 'field_intcheckbox.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($stpl,$includes + array(
'$ptitle' => t('Account Settings'), '$ptitle' => t('Account Settings'),
'$submit' => t('Submit'), '$submit' => t('Submit'),

8
mod/uimport.php
View File

@ -60,13 +60,7 @@ function uimport_content(&$a) {
$tpl = get_markup_template("uimport.tpl"); $tpl = get_markup_template("uimport.tpl");
return replace_macros($tpl, array(
$includes = array(
'$field_custom' => 'field_custom.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
return replace_macros($tpl, $includes + array(
'$regbutt' => t('Import'), '$regbutt' => t('Import'),
'$import' => array( '$import' => array(
'title' => t("Move account"), 'title' => t("Move account"),

8
mod/viewcontacts.php
View File

@ -72,13 +72,7 @@ function viewcontacts_content(&$a) {
$tpl = get_markup_template("viewcontact_template.tpl"); $tpl = get_markup_template("viewcontact_template.tpl");
$o .= replace_macros($tpl, array(
$includes = array(
'$contact_template' => 'contact_template.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($tpl, $includes + array(
'$title' => t('View Contacts'), '$title' => t('View Contacts'),
'$contacts' => $contacts, '$contacts' => $contacts,
'$paginate' => paginate($a), '$paginate' => paginate($a),

1
object/Item.php
View File

@ -285,7 +285,6 @@ class Item extends BaseObject {
'comment' => $this->get_comment_box($indent), 'comment' => $this->get_comment_box($indent),
'previewing' => ($conv->is_preview() ? ' preview ' : ''), 'previewing' => ($conv->is_preview() ? ' preview ' : ''),
'wait' => t('Please wait'), 'wait' => t('Please wait'),
'remove' => t('remove'),
'thread_level' => $thread_level 'thread_level' => $thread_level
); );

6
view/admin_logs.tpl
View File

@ -4,9 +4,9 @@
<form action="$baseurl/admin/logs" method="post"> <form action="$baseurl/admin/logs" method="post">
<input type='hidden' name='form_security_token' value='$form_security_token'> <input type='hidden' name='form_security_token' value='$form_security_token'>
{{ inc $field_checkbox with $field=$debugging }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$debugging }}{{ endinc }}
{{ inc $field_input with $field=$logfile }}{{ endinc }} {{ inc field_input.tpl with $field=$logfile }}{{ endinc }}
{{ inc $field_select with $field=$loglevel }}{{ endinc }} {{ inc field_select.tpl with $field=$loglevel }}{{ endinc }}
<div class="submit"><input type="submit" name="page_logs" value="$submit" /></div> <div class="submit"><input type="submit" name="page_logs" value="$submit" /></div>

8
view/admin_remoteupdate.tpl
View File

@ -84,10 +84,10 @@
<h3>Your friendica installation is not writable by web server.</h3> <h3>Your friendica installation is not writable by web server.</h3>
{{ if $canftp }} {{ if $canftp }}
<p>You can try to update via FTP</p> <p>You can try to update via FTP</p>
{{ inc $field_input with $field=$ftphost }}{{ endinc }} {{ inc field_input.tpl with $field=$ftphost }}{{ endinc }}
{{ inc $field_input with $field=$ftppath }}{{ endinc }} {{ inc field_input.tpl with $field=$ftppath }}{{ endinc }}
{{ inc $field_input with $field=$ftpuser }}{{ endinc }} {{ inc field_input.tpl with $field=$ftpuser }}{{ endinc }}
{{ inc $field_password with $field=$ftppwd }}{{ endinc }} {{ inc field_password.tpl with $field=$ftppwd }}{{ endinc }}
<div class="submit"><input type="submit" name="remoteupdate" value="$submit" /></div> <div class="submit"><input type="submit" name="remoteupdate" value="$submit" /></div>
{{ endif }} {{ endif }}
{{ endif }} {{ endif }}

40
view/admin_site.tpl
View File

@ -53,32 +53,32 @@
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div> <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
<h3>$registration</h3> <h3>$registration</h3>
{{ inc $field_input with $field=$register_text }}{{ endinc }} {{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
{{ inc $field_select with $field=$register_policy }}{{ endinc }} {{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
{{ inc $field_input with $field=$daily_registrations }}{{ endinc }} {{ inc field_input.tpl with $field=$daily_registrations }}{{ endinc }}
{{ inc $field_checkbox with $field=$no_multi_reg }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
{{ inc $field_checkbox with $field=$no_openid }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
{{ inc $field_checkbox with $field=$no_regfullname }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div> <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
<h3>$upload</h3> <h3>$upload</h3>
{{ inc $field_input with $field=$maximagesize }}{{ endinc }} {{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
{{ inc $field_input with $field=$maximagelength }}{{ endinc }} {{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }}
{{ inc $field_input with $field=$jpegimagequality }}{{ endinc }} {{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}
<h3>$corporate</h3> <h3>$corporate</h3>
{{ inc $field_input with $field=$allowed_sites }}{{ endinc }} {{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
{{ inc $field_input with $field=$allowed_email }}{{ endinc }} {{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
{{ inc $field_checkbox with $field=$block_public }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
{{ inc $field_checkbox with $field=$force_publish }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
{{ inc $field_checkbox with $field=$no_community_page }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
{{ inc $field_checkbox with $field=$ostatus_disabled }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
{{ inc $field_checkbox with $field=$diaspora_enabled }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
{{ inc $field_checkbox with $field=$dfrn_only }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
{{ inc $field_input with $field=$global_directory }}{{ endinc }} {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
{{ inc $field_checkbox with $field=$thread_allow }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
{{ inc $field_checkbox with $field=$newuser_private }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div> <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

2
view/api_friends_xml.tpl
View File

@ -2,6 +2,6 @@
<users type="array"> <users type="array">
{{for $users as $u }} {{for $users as $u }}
{{inc $api_user_xml with $user=$u }}{{endinc}} {{inc api_user_xml.tpl with $user=$u }}{{endinc}}
{{endfor}} {{endfor}}
</users> </users>

2
view/api_timeline_xml.tpl
View File

@ -10,7 +10,7 @@
<in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name> <in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name>
<geo>$status.geo</geo> <geo>$status.geo</geo>
<favorited>$status.favorited</favorited> <favorited>$status.favorited</favorited>
{{ inc $api_user_xml with $user=$status.user }}{{ endinc }} <statusnet:html>$status.statusnet_html</statusnet:html> {{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }} <statusnet:html>$status.statusnet_html</statusnet:html>
<statusnet:conversation_id>$status.statusnet_conversation_id</statusnet:conversation_id> <statusnet:conversation_id>$status.statusnet_conversation_id</statusnet:conversation_id>
<url>$status.url</url> <url>$status.url</url>
<coordinates>$status.coordinates</coordinates> <coordinates>$status.coordinates</coordinates>

2
view/contact_edit.tpl
View File

@ -65,7 +65,7 @@
{{ endif }} {{ endif }}
<div id="contact-edit-end" ></div> <div id="contact-edit-end" ></div>
{{inc $field_checkbox with $field=$hidden }}{{endinc}} {{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
<div id="contact-edit-info-wrapper"> <div id="contact-edit-info-wrapper">
<h4>$lbl_info1</h4> <h4>$lbl_info1</h4>

2
view/contacts-template.tpl
View File

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

459
view/de/messages.po
View File

File diff suppressed because it is too large Load Diff

2
view/de/strings.php
View File

@ -1863,6 +1863,7 @@ $a->strings["Inbox"] = "Eingang";
$a->strings["Outbox"] = "Ausgang"; $a->strings["Outbox"] = "Ausgang";
$a->strings["Manage"] = "Verwalten"; $a->strings["Manage"] = "Verwalten";
$a->strings["Manage other pages"] = "Andere Seiten verwalten"; $a->strings["Manage other pages"] = "Andere Seiten verwalten";
$a->strings["Delegations"] = "Delegierungen";
$a->strings["Profiles"] = "Profile"; $a->strings["Profiles"] = "Profile";
$a->strings["Manage/Edit Profiles"] = "Profile Verwalten/Editieren"; $a->strings["Manage/Edit Profiles"] = "Profile Verwalten/Editieren";
$a->strings["Manage/edit friends and contacts"] = "Freunde und Kontakte verwalten/editieren"; $a->strings["Manage/edit friends and contacts"] = "Freunde und Kontakte verwalten/editieren";
@ -1906,6 +1907,7 @@ $a->strings["%s's birthday"] = "%ss Geburtstag";
$a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s"; $a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s";
$a->strings["From: "] = "Von: "; $a->strings["From: "] = "Von: ";
$a->strings["Image/photo"] = "Bild/Foto"; $a->strings["Image/photo"] = "Bild/Foto";
$a->strings["<span><a href=\"%s\">%s</a> wrote the following <a href=\"%s\">post</a>:</span>"] = "<span><a href=\"%s\">%s</a> schrieb den folgenden <a href=\"%s\">Beitrag</a>:</span>";
$a->strings["$1 wrote:"] = "$1 hat geschrieben:"; $a->strings["$1 wrote:"] = "$1 hat geschrieben:";
$a->strings["Encrypted content"] = "Verschlüsselter Inhalt"; $a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
$a->strings["General Features"] = "Allgemeine Features"; $a->strings["General Features"] = "Allgemeine Features";

2
view/field.tpl
View File

@ -1,4 +1,4 @@
{{ if $field.0==select }} {{ if $field.0==select }}
{{ inc $field_select }}{{ endinc }} {{ inc field_select.tpl }}{{ endinc }}
{{ endif }} {{ endif }}

2
view/filebrowser.tpl
View File

@ -77,7 +77,7 @@
</div> </div>
</div> </div>
<div class="mceActionPanel"> <div class="mceActionPanel">
<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" /> <input type="button" id="cancel" name="cancel" value="$cancel" onclick="tinyMCEPopup.close();" />
</div> </div>
</body> </body>

2
view/filer_dialog.tpl
View File

@ -1,4 +1,4 @@
{{ inc $field_combobox }}{{ endinc }} {{ inc field_combobox.tpl }}{{ endinc }}
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input id="filer_save" type="button" class="settings-submit" value="$submit" /> <input id="filer_save" type="button" class="settings-submit" value="$submit" />
</div> </div>

4
view/group_edit.tpl
View File

@ -5,7 +5,7 @@
<form action="group/$gid" id="group-edit-form" method="post" > <form action="group/$gid" id="group-edit-form" method="post" >
<input type='hidden' name='form_security_token' value='$form_security_token'> <input type='hidden' name='form_security_token' value='$form_security_token'>
{{ inc $field_input with $field=$gname }}{{ endinc }} {{ inc field_input.tpl with $field=$gname }}{{ endinc }}
{{ if $drop }}$drop{{ endif }} {{ if $drop }}$drop{{ endif }}
<div id="group-edit-submit-wrapper" > <div id="group-edit-submit-wrapper" >
<input type="submit" name="submit" value="$submit" > <input type="submit" name="submit" value="$submit" >
@ -17,7 +17,7 @@
{{ if $groupedit_info }} {{ if $groupedit_info }}
<div id="group-update-wrapper"> <div id="group-update-wrapper">
{{ inc $groupeditortpl with $groupeditor=$groupedit_info }}{{ endinc }} {{ inc groupeditor.tpl with $groupeditor=$groupedit_info }}{{ endinc }}
</div> </div>
{{ endif }} {{ endif }}
{{ if $desc }}<div id="group-edit-desc">$desc</div>{{ endif }} {{ if $desc }}<div id="group-edit-desc">$desc</div>{{ endif }}

8
view/install_db.tpl
View File

@ -18,10 +18,10 @@ $info_03
<input type="hidden" name="phpath" value="$phpath" /> <input type="hidden" name="phpath" value="$phpath" />
<input type="hidden" name="pass" value="3" /> <input type="hidden" name="pass" value="3" />
{{ inc $field_input with $field=$dbhost }}{{endinc}} {{ inc field_input.tpl with $field=$dbhost }}{{endinc}}
{{ inc $field_input with $field=$dbuser }}{{endinc}} {{ inc field_input.tpl with $field=$dbuser }}{{endinc}}
{{ inc $field_password with $field=$dbpass }}{{endinc}} {{ inc field_password.tpl with $field=$dbpass }}{{endinc}}
{{ inc $field_input with $field=$dbdata }}{{endinc}} {{ inc field_input.tpl with $field=$dbdata }}{{endinc}}
<input id="install-submit" type="submit" name="submit" value="$submit" /> <input id="install-submit" type="submit" name="submit" value="$submit" />

2
view/install_settings.tpl
View File

@ -16,7 +16,7 @@
<input type="hidden" name="dbdata" value="$dbdata" /> <input type="hidden" name="dbdata" value="$dbdata" />
<input type="hidden" name="pass" value="4" /> <input type="hidden" name="pass" value="4" />
{{ inc $field_input with $field=$adminmail }}{{endinc}} {{ inc field_input.tpl with $field=$adminmail }}{{endinc}}
$timezone $timezone
<input id="install-submit" type="submit" name="submit" value="$submit" /> <input id="install-submit" type="submit" name="submit" value="$submit" />

4
view/intros.tpl
View File

@ -14,8 +14,8 @@
<div class="intro-form-end"></div> <div class="intro-form-end"></div>
<form class="intro-approve-form" action="dfrn_confirm" method="post"> <form class="intro-approve-form" action="dfrn_confirm" method="post">
{{inc $field_checkbox with $field=$hidden }}{{endinc}} {{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
{{inc $field_checkbox with $field=$activity }}{{endinc}} {{inc field_checkbox.tpl with $field=$activity }}{{endinc}}
<input type="hidden" name="dfrn_id" value="$dfrn_id" > <input type="hidden" name="dfrn_id" value="$dfrn_id" >
<input type="hidden" name="intro_id" value="$intro_id" > <input type="hidden" name="intro_id" value="$intro_id" >
<input type="hidden" name="contact_id" value="$contact_id" > <input type="hidden" name="contact_id" value="$contact_id" >

8
view/login.tpl
View File

@ -3,17 +3,17 @@
<input type="hidden" name="auth-params" value="login" /> <input type="hidden" name="auth-params" value="login" />
<div id="login_standard"> <div id="login_standard">
{{ inc $field_input with $field=$lname }}{{ endinc }} {{ inc field_input.tpl with $field=$lname }}{{ endinc }}
{{ inc $field_password with $field=$lpassword }}{{ endinc }} {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
</div> </div>
{{ if $openid }} {{ if $openid }}
<div id="login_openid"> <div id="login_openid">
{{ inc $field_openid with $field=$lopenid }}{{ endinc }} {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
</div> </div>
{{ endif }} {{ endif }}
{{ inc $field_checkbox with $field=$lremember }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }}
<div id="login-extra-links"> <div id="login-extra-links">
{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }} {{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}

4
view/mail_display.tpl
View File

@ -1,10 +1,10 @@
{{ for $mails as $mail_item }} {{ for $mails as $mail_item }}
{{ inc $mail_conv with $mail=$mail_item }}{{endinc}} {{ inc mail_conv.tpl with $mail=$mail_item }}{{endinc}}
{{ endfor }} {{ endfor }}
{{ if $canreply }} {{ if $canreply }}
{{ inc $prv_message with $reply=$reply_info }}{{ endinc }} {{ inc prv_message.tpl }}{{ endinc }}
{{ else }} {{ else }}
$unknown_text $unknown_text
{{endif }} {{endif }}

2
view/nogroup-template.tpl
View File

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

2
view/notifications.tpl
View File

@ -1,7 +1,7 @@
<h1>$notif_header</h1> <h1>$notif_header</h1>
{{ inc $common_tabs with $tabs=$tabs_data }}{{ endinc }} {{ inc common_tabs.tpl }}{{ endinc }}
<div class="notif-network-wrapper"> <div class="notif-network-wrapper">
$notif_content $notif_content

4
view/notifications_network_item.tpl
View File

@ -1,3 +1,3 @@
<div class="notif-item"> <div class="notif-item">
<a href="{$item_link}" target="friendica-notifications"><img src="{$item_image}" class="notif-image">{$item_text} <span class="notif-when">{$item_when}</span></a> <a href="$item_link" target="friendica-notifications"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
</div> </div>

10
view/pagetypes.tpl
View File

@ -1,5 +1,5 @@
{{inc $field_radio with $field=$page_normal }}{{endinc}} {{inc field_radio.tpl with $field=$page_normal }}{{endinc}}
{{inc $field_radio with $field=$page_community }}{{endinc}} {{inc field_radio.tpl with $field=$page_community }}{{endinc}}
{{inc $field_radio with $field=$page_prvgroup }}{{endinc}} {{inc field_radio.tpl with $field=$page_prvgroup }}{{endinc}}
{{inc $field_radio with $field=$page_soapbox }}{{endinc}} {{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}}
{{inc $field_radio with $field=$page_freelove }}{{endinc}} {{inc field_radio.tpl with $field=$page_freelove }}{{endinc}}

2
view/photos_recent.tpl
View File

@ -5,7 +5,7 @@
<div class="photos"> <div class="photos">
{{ for $photos as $ph }} {{ for $photos as $ph }}
{{ inc $photo_top with $photo=$ph }}{{ endinc }} {{ inc photo_top.tpl with $photo=$ph }}{{ endinc }}
{{ endfor }} {{ endfor }}
</div> </div>
<div class="photos-end"></div> <div class="photos-end"></div>

2
view/poco_xml.tpl
View File

@ -10,7 +10,7 @@
{{ if $response.totalResults }} {{ if $response.totalResults }}
{{ for $response.entry as $ent }} {{ for $response.entry as $ent }}
{{ inc $poco_entry_xml with $entry=$ent }}{{ endinc }} {{ inc poco_entry_xml.tpl with $entry=$ent }}{{ endinc }}
{{ endfor }} {{ endfor }}
{{ else }} {{ else }}
<entry></entry> <entry></entry>

2
view/profile_vcard.tpl
View File

@ -31,7 +31,7 @@
{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }} {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
{{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }} {{ inc diaspora_vcard.tpl }}{{ endinc }}
<div id="profile-extra-links"> <div id="profile-extra-links">
<ul> <ul>

24
view/prv_message.tpl
View File

@ -1,31 +1,31 @@
<h3>$reply.header</h3> <h3>$header</h3>
<div id="prvmail-wrapper" > <div id="prvmail-wrapper" >
<form id="prvmail-form" action="message" method="post" > <form id="prvmail-form" action="message" method="post" >
$reply.parent $parent
<div id="prvmail-to-label">$reply.to</div> <div id="prvmail-to-label">$to</div>
$reply.select $select
<div id="prvmail-subject-label">$reply.subject</div> <div id="prvmail-subject-label">$subject</div>
<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$reply.subjtxt" $reply.readonly tabindex="11" /> <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
<div id="prvmail-message-label">$reply.yourmessage</div> <div id="prvmail-message-label">$yourmessage</div>
<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$reply.text</textarea> <textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
<div id="prvmail-submit-wrapper" > <div id="prvmail-submit-wrapper" >
<input type="submit" id="prvmail-submit" name="submit" value="$reply.submit" tabindex="13" /> <input type="submit" id="prvmail-submit" name="submit" value="$submit" tabindex="13" />
<div id="prvmail-upload-wrapper" > <div id="prvmail-upload-wrapper" >
<div id="prvmail-upload" class="icon border camera" title="$reply.upload" ></div> <div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
</div> </div>
<div id="prvmail-link-wrapper" > <div id="prvmail-link-wrapper" >
<div id="prvmail-link" class="icon border link" title="$reply.insert" onclick="jotGetLink();" ></div> <div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
</div> </div>
<div id="prvmail-rotator-wrapper" > <div id="prvmail-rotator-wrapper" >
<img id="prvmail-rotator" src="images/rotator.gif" alt="$reply.wait" title="$reply.wait" style="display: none;" /> <img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div> </div>
</div> </div>
<div id="prvmail-end"></div> <div id="prvmail-end"></div>

52
view/settings.tpl
View File

@ -7,11 +7,11 @@ $nickname_block
<h3 class="settings-heading">$h_pass</h3> <h3 class="settings-heading">$h_pass</h3>
{{inc $field_password with $field=$password1 }}{{endinc}} {{inc field_password.tpl with $field=$password1 }}{{endinc}}
{{inc $field_password with $field=$password2 }}{{endinc}} {{inc field_password.tpl with $field=$password2 }}{{endinc}}
{{ if $oid_enable }} {{ if $oid_enable }}
{{inc $field_input with $field=$openid }}{{endinc}} {{inc field_input.tpl with $field=$openid }}{{endinc}}
{{ endif }} {{ endif }}
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
@ -21,11 +21,11 @@ $nickname_block
<h3 class="settings-heading">$h_basic</h3> <h3 class="settings-heading">$h_basic</h3>
{{inc $field_input with $field=$username }}{{endinc}} {{inc field_input.tpl with $field=$username }}{{endinc}}
{{inc $field_input with $field=$email }}{{endinc}} {{inc field_input.tpl with $field=$email }}{{endinc}}
{{inc $field_custom with $field=$timezone }}{{endinc}} {{inc field_custom.tpl with $field=$timezone }}{{endinc}}
{{inc $field_input with $field=$defloc }}{{endinc}} {{inc field_input.tpl with $field=$defloc }}{{endinc}}
{{inc $field_checkbox with $field=$allowloc }}{{endinc}} {{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
@ -38,7 +38,7 @@ $nickname_block
<input type="hidden" name="visibility" value="$visibility" /> <input type="hidden" name="visibility" value="$visibility" />
{{inc $field_input with $field=$maxreq }}{{endinc}} {{inc field_input.tpl with $field=$maxreq }}{{endinc}}
$profile_in_dir $profile_in_dir
@ -57,9 +57,9 @@ $suggestme
$unkmail $unkmail
{{inc $field_input with $field=$cntunkmail }}{{endinc}} {{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
{{inc $field_input with $field=$expire.days }}{{endinc}} {{inc field_input.tpl with $field=$expire.days }}{{endinc}}
<div class="field input"> <div class="field input">
@ -67,10 +67,10 @@ $unkmail
<div style="display: none;"> <div style="display: none;">
<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;"> <div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
<h3>$expire.advanced</h3> <h3>$expire.advanced</h3>
{{ inc $field_yesno with $field=$expire.items }}{{endinc}} {{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
{{ inc $field_yesno with $field=$expire.notes }}{{endinc}} {{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
{{ inc $field_yesno with $field=$expire.starred }}{{endinc}} {{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
{{ inc $field_yesno with $field=$expire.network_only }}{{endinc}} {{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
</div> </div>
</div> </div>
@ -108,22 +108,22 @@ $group_select
<div id="settings-activity-desc">$activity_options</div> <div id="settings-activity-desc">$activity_options</div>
{{inc $field_checkbox with $field=$post_newfriend }}{{endinc}} {{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
{{inc $field_checkbox with $field=$post_joingroup }}{{endinc}} {{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
{{inc $field_checkbox with $field=$post_profilechange }}{{endinc}} {{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
<div id="settings-notify-desc">$lbl_not</div> <div id="settings-notify-desc">$lbl_not</div>
<div class="group"> <div class="group">
{{inc $field_intcheckbox with $field=$notify1 }}{{endinc}} {{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
{{inc $field_intcheckbox with $field=$notify2 }}{{endinc}} {{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
{{inc $field_intcheckbox with $field=$notify3 }}{{endinc}} {{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
{{inc $field_intcheckbox with $field=$notify4 }}{{endinc}} {{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
{{inc $field_intcheckbox with $field=$notify5 }}{{endinc}} {{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
{{inc $field_intcheckbox with $field=$notify6 }}{{endinc}} {{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
{{inc $field_intcheckbox with $field=$notify7 }}{{endinc}} {{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
{{inc $field_intcheckbox with $field=$notify8 }}{{endinc}} {{inc field_intcheckbox.tpl with $field=$notify8 }}{{endinc}}
</div> </div>
</div> </div>

20
view/settings_connectors.tpl
View File

@ -14,16 +14,16 @@ $settings_connectors
<div class="settings-block"> <div class="settings-block">
<h3 class="settings-heading">$h_imap</h3> <h3 class="settings-heading">$h_imap</h3>
<p>$imap_desc</p> <p>$imap_desc</p>
{{inc $field_custom with $field=$imap_lastcheck }}{{endinc}} {{inc field_custom.tpl with $field=$imap_lastcheck }}{{endinc}}
{{inc $field_input with $field=$mail_server }}{{endinc}} {{inc field_input.tpl with $field=$mail_server }}{{endinc}}
{{inc $field_input with $field=$mail_port }}{{endinc}} {{inc field_input.tpl with $field=$mail_port }}{{endinc}}
{{inc $field_select with $field=$mail_ssl }}{{endinc}} {{inc field_select.tpl with $field=$mail_ssl }}{{endinc}}
{{inc $field_input with $field=$mail_user }}{{endinc}} {{inc field_input.tpl with $field=$mail_user }}{{endinc}}
{{inc $field_password with $field=$mail_pass }}{{endinc}} {{inc field_password.tpl with $field=$mail_pass }}{{endinc}}
{{inc $field_input with $field=$mail_replyto }}{{endinc}} {{inc field_input.tpl with $field=$mail_replyto }}{{endinc}}
{{inc $field_checkbox with $field=$mail_pubmail }}{{endinc}} {{inc field_checkbox.tpl with $field=$mail_pubmail }}{{endinc}}
{{inc $field_select with $field=$mail_action }}{{endinc}} {{inc field_select.tpl with $field=$mail_action }}{{endinc}}
{{inc $field_input with $field=$mail_movetofolder }}{{endinc}} {{inc field_input.tpl with $field=$mail_movetofolder }}{{endinc}}
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="$submit" /> <input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="$submit" />

10
view/settings_display.tpl
View File

@ -3,11 +3,11 @@
<form action="settings/display" id="settings-form" method="post" autocomplete="off" > <form action="settings/display" id="settings-form" method="post" autocomplete="off" >
<input type='hidden' name='form_security_token' value='$form_security_token'> <input type='hidden' name='form_security_token' value='$form_security_token'>
{{inc $field_themeselect with $field=$theme }}{{endinc}} {{inc field_themeselect.tpl with $field=$theme }}{{endinc}}
{{inc $field_themeselect with $field=$mobile_theme }}{{endinc}} {{inc field_themeselect.tpl with $field=$mobile_theme }}{{endinc}}
{{inc $field_input with $field=$ajaxint }}{{endinc}} {{inc field_input.tpl with $field=$ajaxint }}{{endinc}}
{{inc $field_input with $field=$itemspage_network }}{{endinc}} {{inc field_input.tpl with $field=$itemspage_network }}{{endinc}}
{{inc $field_checkbox with $field=$nosmile}}{{endinc}} {{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}}
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >

2
view/settings_features.tpl
View File

@ -8,7 +8,7 @@
<h3 class="settings-heading">$f.0</h3> <h3 class="settings-heading">$f.0</h3>
{{ for $f.1 as $fcat }} {{ for $f.1 as $fcat }}
{{ inc $field_yesno with $field=$fcat }}{{endinc}} {{ inc field_yesno.tpl with $field=$fcat }}{{endinc}}
{{ endfor }} {{ endfor }}
{{ endfor }} {{ endfor }}

10
view/settings_oauth_edit.tpl
View File

@ -3,11 +3,11 @@
<form method="POST"> <form method="POST">
<input type='hidden' name='form_security_token' value='$form_security_token'> <input type='hidden' name='form_security_token' value='$form_security_token'>
{{ inc $field_input with $field=$name }}{{ endinc }} {{ inc field_input.tpl with $field=$name }}{{ endinc }}
{{ inc $field_input with $field=$key }}{{ endinc }} {{ inc field_input.tpl with $field=$key }}{{ endinc }}
{{ inc $field_input with $field=$secret }}{{ endinc }} {{ inc field_input.tpl with $field=$secret }}{{ endinc }}
{{ inc $field_input with $field=$redirect }}{{ endinc }} {{ inc field_input.tpl with $field=$redirect }}{{ endinc }}
{{ inc $field_input with $field=$icon }}{{ endinc }} {{ inc field_input.tpl with $field=$icon }}{{ endinc }}
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="$submit" /> <input type="submit" name="submit" class="settings-submit" value="$submit" />

6
view/smarty3/admin_logs.tpl
View File

@ -4,9 +4,9 @@
<form action="{{$baseurl}}/admin/logs" method="post"> <form action="{{$baseurl}}/admin/logs" method="post">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
{{include file="file:{{$field_checkbox}}" field=$debugging}} {{include file="field_checkbox.tpl" field=$debugging}}
{{include file="file:{{$field_input}}" field=$logfile}} {{include file="field_input.tpl" field=$logfile}}
{{include file="file:{{$field_select}}" field=$loglevel}} {{include file="field_select.tpl" field=$loglevel}}
<div class="submit"><input type="submit" name="page_logs" value="{{$submit}}" /></div> <div class="submit"><input type="submit" name="page_logs" value="{{$submit}}" /></div>

8
view/smarty3/admin_remoteupdate.tpl
View File

@ -84,10 +84,10 @@
<h3>Your friendica installation is not writable by web server.</h3> <h3>Your friendica installation is not writable by web server.</h3>
{{if $canftp}} {{if $canftp}}
<p>You can try to update via FTP</p> <p>You can try to update via FTP</p>
{{include file="file:{{$field_input}}" field=$ftphost}} {{include file="field_input.tpl" field=$ftphost}}
{{include file="file:{{$field_input}}" field=$ftppath}} {{include file="field_input.tpl" field=$ftppath}}
{{include file="file:{{$field_input}}" field=$ftpuser}} {{include file="field_input.tpl" field=$ftpuser}}
{{include file="file:{{$field_password}}" field=$ftppwd}} {{include file="field_password.tpl" field=$ftppwd}}
<div class="submit"><input type="submit" name="remoteupdate" value="{{$submit}}" /></div> <div class="submit"><input type="submit" name="remoteupdate" value="{{$submit}}" /></div>
{{/if}} {{/if}}
{{/if}} {{/if}}

81
view/smarty3/admin_site.tpl
View File

@ -41,55 +41,66 @@
<form action="{{$baseurl}}/admin/site" method="post"> <form action="{{$baseurl}}/admin/site" method="post">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
{{include file="file:{{$field_input}}" field=$sitename}} {{include file="field_input.tpl" field=$sitename}}
{{include file="file:{{$field_textarea}}" field=$banner}} {{include file="field_textarea.tpl" field=$banner}}
{{include file="file:{{$field_select}}" field=$language}} {{include file="field_select.tpl" field=$language}}
{{include file="file:{{$field_select}}" field=$theme}} {{include file="field_select.tpl" field=$theme}}
{{include file="file:{{$field_select}}" field=$theme_mobile}} {{include file="field_select.tpl" field=$theme_mobile}}
{{include file="file:{{$field_select}}" field=$ssl_policy}} {{include file="field_select.tpl" field=$ssl_policy}}
{{include file="field_checkbox.tpl" field=$new_share}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
<h3>{{$registration}}</h3> <h3>{{$registration}}</h3>
{{include file="file:{{$field_input}}" field=$register_text}} {{include file="field_input.tpl" field=$register_text}}
{{include file="file:{{$field_select}}" field=$register_policy}} {{include file="field_select.tpl" field=$register_policy}}
{{include file="file:{{$field_input}}" field=$daily_registrations}} {{include file="field_input.tpl" field=$daily_registrations}}
{{include file="file:{{$field_checkbox}}" field=$no_multi_reg}} {{include file="field_checkbox.tpl" field=$no_multi_reg}}
{{include file="file:{{$field_checkbox}}" field=$no_openid}} {{include file="field_checkbox.tpl" field=$no_openid}}
{{include file="file:{{$field_checkbox}}" field=$no_regfullname}} {{include file="field_checkbox.tpl" field=$no_regfullname}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
<h3>{{$upload}}</h3> <h3>{{$upload}}</h3>
{{include file="file:{{$field_input}}" field=$maximagesize}} {{include file="field_input.tpl" field=$maximagesize}}
{{include file="file:{{$field_input}}" field=$maximagelength}} {{include file="field_input.tpl" field=$maximagelength}}
{{include file="file:{{$field_input}}" field=$jpegimagequality}} {{include file="field_input.tpl" field=$jpegimagequality}}
<h3>{{$corporate}}</h3> <h3>{{$corporate}}</h3>
{{include file="file:{{$field_input}}" field=$allowed_sites}} {{include file="field_input.tpl" field=$allowed_sites}}
{{include file="file:{{$field_input}}" field=$allowed_email}} {{include file="field_input.tpl" field=$allowed_email}}
{{include file="file:{{$field_checkbox}}" field=$block_public}} {{include file="field_checkbox.tpl" field=$block_public}}
{{include file="file:{{$field_checkbox}}" field=$force_publish}} {{include file="field_checkbox.tpl" field=$force_publish}}
{{include file="file:{{$field_checkbox}}" field=$no_community_page}} {{include file="field_checkbox.tpl" field=$no_community_page}}
{{include file="file:{{$field_checkbox}}" field=$ostatus_disabled}} {{include file="field_checkbox.tpl" field=$ostatus_disabled}}
{{include file="file:{{$field_checkbox}}" field=$diaspora_enabled}} {{include file="field_checkbox.tpl" field=$diaspora_enabled}}
{{include file="file:{{$field_checkbox}}" field=$dfrn_only}} {{include file="field_checkbox.tpl" field=$dfrn_only}}
{{include file="file:{{$field_input}}" field=$global_directory}} {{include file="field_input.tpl" field=$global_directory}}
{{include file="file:{{$field_checkbox}}" field=$thread_allow}} {{include file="field_checkbox.tpl" field=$thread_allow}}
{{include file="file:{{$field_checkbox}}" field=$newuser_private}} {{include file="field_checkbox.tpl" field=$newuser_private}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
<h3>{{$advanced}}</h3> <h3>{{$advanced}}</h3>
{{include file="file:{{$field_checkbox}}" field=$no_utf}} {{include file="field_checkbox.tpl" field=$no_utf}}
{{include file="file:{{$field_checkbox}}" field=$verifyssl}} {{include file="field_checkbox.tpl" field=$verifyssl}}
{{include file="file:{{$field_input}}" field=$proxy}} {{include file="field_input.tpl" field=$proxy}}
{{include file="file:{{$field_input}}" field=$proxyuser}} {{include file="field_input.tpl" field=$proxyuser}}
{{include file="file:{{$field_input}}" field=$timeout}} {{include file="field_input.tpl" field=$timeout}}
{{include file="file:{{$field_input}}" field=$delivery_interval}} {{include file="field_input.tpl" field=$delivery_interval}}
{{include file="file:{{$field_input}}" field=$poll_interval}} {{include file="field_input.tpl" field=$poll_interval}}
{{include file="file:{{$field_input}}" field=$maxloadavg}} {{include file="field_input.tpl" field=$maxloadavg}}
{{include file="file:{{$field_input}}" field=$abandon_days}} {{include file="field_input.tpl" field=$abandon_days}}
{{include file="field_input.tpl" field=$lockpath}}
{{include file="field_input.tpl" field=$temppath}}
{{include file="field_input.tpl" field=$basepath}}
<h3>{{$performance}}</h3>
{{include file="field_checkbox.tpl" field=$use_fulltext_engine}}
{{include file="field_input.tpl" field=$itemcache}}
{{include file="field_input.tpl" field=$itemcache_duration}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>

2
view/smarty3/api_friends_xml.tpl
View File

@ -2,6 +2,6 @@
<users type="array"> <users type="array">
{{foreach $users as $u}} {{foreach $users as $u}}
{{include file="file:{{$api_user_xml}}" user=$u}} {{include file="api_user_xml.tpl" user=$u}}
{{/foreach}} {{/foreach}}
</users> </users>

2
view/smarty3/api_timeline_xml.tpl
View File

@ -10,7 +10,7 @@
<in_reply_to_screen_name>{{$status.in_reply_to_screen_name}}</in_reply_to_screen_name> <in_reply_to_screen_name>{{$status.in_reply_to_screen_name}}</in_reply_to_screen_name>
<geo>{{$status.geo}}</geo> <geo>{{$status.geo}}</geo>
<favorited>{{$status.favorited}}</favorited> <favorited>{{$status.favorited}}</favorited>
{{include file="file:{{$api_user_xml}}" user=$status.user}} <statusnet:html>{{$status.statusnet_html}}</statusnet:html> {{include file="api_user_xml.tpl" user=$status.user}} <statusnet:html>{{$status.statusnet_html}}</statusnet:html>
<statusnet:conversation_id>{{$status.statusnet_conversation_id}}</statusnet:conversation_id> <statusnet:conversation_id>{{$status.statusnet_conversation_id}}</statusnet:conversation_id>
<url>{{$status.url}}</url> <url>{{$status.url}}</url>
<coordinates>{{$status.coordinates}}</coordinates> <coordinates>{{$status.coordinates}}</coordinates>

2
view/smarty3/contact_edit.tpl
View File

@ -65,7 +65,7 @@
{{/if}} {{/if}}
<div id="contact-edit-end" ></div> <div id="contact-edit-end" ></div>
{{include file="file:{{$field_checkbox}}" field=$hidden}} {{include file="field_checkbox.tpl" field=$hidden}}
<div id="contact-edit-info-wrapper"> <div id="contact-edit-info-wrapper">
<h4>{{$lbl_info1}}</h4> <h4>{{$lbl_info1}}</h4>

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

@ -15,7 +15,7 @@
{{foreach $contacts as $c}} {{foreach $contacts as $c}}
{{include file="file:{{$contact_template}}" contact=$c}} {{include file="contact_template.tpl" contact=$c}}
{{/foreach}} {{/foreach}}
<div id="contact-edit-end"></div> <div id="contact-edit-end"></div>

2
view/smarty3/field.tpl
View File

@ -1,4 +1,4 @@
{{if $field.0==select}} {{if $field.0==select}}
{{include file="file:{{$field_select}}"}} {{include file="field_select.tpl"}}
{{/if}} {{/if}}

2
view/smarty3/filebrowser.tpl
View File

@ -77,7 +77,7 @@
</div> </div>
</div> </div>
<div class="mceActionPanel"> <div class="mceActionPanel">
<input type="button" id="cancel" name="cancel" value="{{*cancel}" onclick="tinyMCEPopup.close();" /> <input type="button" id="cancel" name="cancel" value="{{$cancel}}" onclick="tinyMCEPopup.close();" />
</div> </div>
</body> </body>

2
view/smarty3/filer_dialog.tpl
View File

@ -1,4 +1,4 @@
{{include file="file:{{$field_combobox}}"}} {{include file="field_combobox.tpl"}}
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input id="filer_save" type="button" class="settings-submit" value="{{$submit}}" /> <input id="filer_save" type="button" class="settings-submit" value="{{$submit}}" />
</div> </div>

4
view/smarty3/group_edit.tpl
View File

@ -5,7 +5,7 @@
<form action="group/{{$gid}}" id="group-edit-form" method="post" > <form action="group/{{$gid}}" id="group-edit-form" method="post" >
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
{{include file="file:{{$field_input}}" field=$gname}} {{include file="field_input.tpl" field=$gname}}
{{if $drop}}{{$drop}}{{/if}} {{if $drop}}{{$drop}}{{/if}}
<div id="group-edit-submit-wrapper" > <div id="group-edit-submit-wrapper" >
<input type="submit" name="submit" value="{{$submit}}" > <input type="submit" name="submit" value="{{$submit}}" >
@ -17,7 +17,7 @@
{{if $groupedit_info}} {{if $groupedit_info}}
<div id="group-update-wrapper"> <div id="group-update-wrapper">
{{include file="file:{{$groupeditortpl}}" groupeditor=$groupedit_info}} {{include file="groupeditor.tpl" groupeditor=$groupedit_info}}
</div> </div>
{{/if}} {{/if}}
{{if $desc}}<div id="group-edit-desc">{{$desc}}</div>{{/if}} {{if $desc}}<div id="group-edit-desc">{{$desc}}</div>{{/if}}

8
view/smarty3/install_db.tpl
View File

@ -18,10 +18,10 @@
<input type="hidden" name="phpath" value="{{$phpath}}" /> <input type="hidden" name="phpath" value="{{$phpath}}" />
<input type="hidden" name="pass" value="3" /> <input type="hidden" name="pass" value="3" />
{{include file="file:{{$field_input}}" field=$dbhost}} {{include file="field_input.tpl" field=$dbhost}}
{{include file="file:{{$field_input}}" field=$dbuser}} {{include file="field_input.tpl" field=$dbuser}}
{{include file="file:{{$field_password}}" field=$dbpass}} {{include file="field_password.tpl" field=$dbpass}}
{{include file="file:{{$field_input}}" field=$dbdata}} {{include file="field_input.tpl" field=$dbdata}}
<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> <input id="install-submit" type="submit" name="submit" value="{{$submit}}" />

2
view/smarty3/install_settings.tpl
View File

@ -16,7 +16,7 @@
<input type="hidden" name="dbdata" value="{{$dbdata}}" /> <input type="hidden" name="dbdata" value="{{$dbdata}}" />
<input type="hidden" name="pass" value="4" /> <input type="hidden" name="pass" value="4" />
{{include file="file:{{$field_input}}" field=$adminmail}} {{include file="field_input.tpl" field=$adminmail}}
{{$timezone}} {{$timezone}}
<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> <input id="install-submit" type="submit" name="submit" value="{{$submit}}" />

4
view/smarty3/intros.tpl
View File

@ -14,8 +14,8 @@
<div class="intro-form-end"></div> <div class="intro-form-end"></div>
<form class="intro-approve-form" action="dfrn_confirm" method="post"> <form class="intro-approve-form" action="dfrn_confirm" method="post">
{{include file="file:{{$field_checkbox}}" field=$hidden}} {{include file="field_checkbox.tpl" field=$hidden}}
{{include file="file:{{$field_checkbox}}" field=$activity}} {{include file="field_checkbox.tpl" field=$activity}}
<input type="hidden" name="dfrn_id" value="{{$dfrn_id}}" > <input type="hidden" name="dfrn_id" value="{{$dfrn_id}}" >
<input type="hidden" name="intro_id" value="{{$intro_id}}" > <input type="hidden" name="intro_id" value="{{$intro_id}}" >
<input type="hidden" name="contact_id" value="{{$contact_id}}" > <input type="hidden" name="contact_id" value="{{$contact_id}}" >

8
view/smarty3/login.tpl
View File

@ -3,17 +3,17 @@
<input type="hidden" name="auth-params" value="login" /> <input type="hidden" name="auth-params" value="login" />
<div id="login_standard"> <div id="login_standard">
{{include file="file:{{$field_input}}" field=$lname}} {{include file="field_input.tpl" field=$lname}}
{{include file="file:{{$field_password}}" field=$lpassword}} {{include file="field_password.tpl" field=$lpassword}}
</div> </div>
{{if $openid}} {{if $openid}}
<div id="login_openid"> <div id="login_openid">
{{include file="file:{{$field_openid}}" field=$lopenid}} {{include file="field_openid.tpl" field=$lopenid}}
</div> </div>
{{/if}} {{/if}}
{{include file="file:{{$field_checkbox}}" field=$lremember}} {{include file="field_checkbox.tpl" field=$lremember}}
<div id="login-extra-links"> <div id="login-extra-links">
{{if $register}}<a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}} {{if $register}}<a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}}

4
view/smarty3/mail_display.tpl
View File

@ -1,10 +1,10 @@
{{foreach $mails as $mail_item}} {{foreach $mails as $mail_item}}
{{include file="file:{{$mail_conv}}" mail=$mail_item}} {{include file="mail_conv.tpl" mail=$mail_item}}
{{/foreach}} {{/foreach}}
{{if $canreply}} {{if $canreply}}
{{include file="file:{{$prv_message}}" reply=$reply_info}} {{include file="prv_message.tpl"}}
{{else}} {{else}}
{{$unknown_text}} {{$unknown_text}}
{{/if}} {{/if}}

2
view/smarty3/nogroup-template.tpl
View File

@ -1,7 +1,7 @@
<h1>{{$header}}</h1> <h1>{{$header}}</h1>
{{foreach $contacts as $c}} {{foreach $contacts as $c}}
{{include file="file:{{$contact_template}}" contact=$c}} {{include file="contact_template.tpl" contact=$c}}
{{/foreach}} {{/foreach}}
<div id="contact-edit-end"></div> <div id="contact-edit-end"></div>

2
view/smarty3/notifications.tpl
View File

@ -1,7 +1,7 @@
<h1>{{$notif_header}}</h1> <h1>{{$notif_header}}</h1>
{{include file="file:{{$common_tabs}}" tabs=$tabs_data}} {{include file="common_tabs.tpl"}}
<div class="notif-network-wrapper"> <div class="notif-network-wrapper">
{{$notif_content}} {{$notif_content}}

4
view/smarty3/notifications_network_item.tpl
View File

@ -1,3 +1,3 @@
<div class="notif-item"> <div class="notif-item">
<a href="{{{$item_link}}}" target="friendica-notifications"><img src="{{{$item_image}}}" class="notif-image">{{{$item_text}}} <span class="notif-when">{{{$item_when}}}</span></a> <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
</div> </div>

10
view/smarty3/pagetypes.tpl
View File

@ -1,5 +1,5 @@
{{include file="file:{{$field_radio}}" field=$page_normal}} {{include file="field_radio.tpl" field=$page_normal}}
{{include file="file:{{$field_radio}}" field=$page_community}} {{include file="field_radio.tpl" field=$page_community}}
{{include file="file:{{$field_radio}}" field=$page_prvgroup}} {{include file="field_radio.tpl" field=$page_prvgroup}}
{{include file="file:{{$field_radio}}" field=$page_soapbox}} {{include file="field_radio.tpl" field=$page_soapbox}}
{{include file="file:{{$field_radio}}" field=$page_freelove}} {{include file="field_radio.tpl" field=$page_freelove}}

2
view/smarty3/photos_recent.tpl
View File

@ -5,7 +5,7 @@
<div class="photos"> <div class="photos">
{{foreach $photos as $ph}} {{foreach $photos as $ph}}
{{include file="file:{{$photo_top}}" photo=$ph}} {{include file="photo_top.tpl" photo=$ph}}
{{/foreach}} {{/foreach}}
</div> </div>
<div class="photos-end"></div> <div class="photos-end"></div>

2
view/smarty3/poco_xml.tpl
View File

@ -10,7 +10,7 @@
{{if $response.totalResults}} {{if $response.totalResults}}
{{foreach $response.entry as $ent}} {{foreach $response.entry as $ent}}
{{include file="file:{{$poco_entry_xml}}" entry=$ent}} {{include file="poco_entry_xml.tpl" entry=$ent}}
{{/foreach}} {{/foreach}}
{{else}} {{else}}
<entry></entry> <entry></entry>

2
view/smarty3/profile_vcard.tpl
View File

@ -31,7 +31,7 @@
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}} {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
{{include file="file:{{$diaspora_vcard}}" diaspora=$diaspora_info}} {{include file="diaspora_vcard.tpl"}}
<div id="profile-extra-links"> <div id="profile-extra-links">
<ul> <ul>

24
view/smarty3/prv_message.tpl
View File

@ -1,31 +1,31 @@
<h3>{{$reply.header}}</h3> <h3>{{$header}}</h3>
<div id="prvmail-wrapper" > <div id="prvmail-wrapper" >
<form id="prvmail-form" action="message" method="post" > <form id="prvmail-form" action="message" method="post" >
{{$reply.parent}} {{$parent}}
<div id="prvmail-to-label">{{$reply.to}}</div> <div id="prvmail-to-label">{{$to}}</div>
{{$reply.select}} {{$select}}
<div id="prvmail-subject-label">{{$reply.subject}}</div> <div id="prvmail-subject-label">{{$subject}}</div>
<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$reply.subjtxt}}" {{$reply.readonly}} tabindex="11" /> <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
<div id="prvmail-message-label">{{$reply.yourmessage}}</div> <div id="prvmail-message-label">{{$yourmessage}}</div>
<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$reply.text}}</textarea> <textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
<div id="prvmail-submit-wrapper" > <div id="prvmail-submit-wrapper" >
<input type="submit" id="prvmail-submit" name="submit" value="{{$reply.submit}}" tabindex="13" /> <input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
<div id="prvmail-upload-wrapper" > <div id="prvmail-upload-wrapper" >
<div id="prvmail-upload" class="icon border camera" title="{{$reply.upload}}" ></div> <div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
</div> </div>
<div id="prvmail-link-wrapper" > <div id="prvmail-link-wrapper" >
<div id="prvmail-link" class="icon border link" title="{{$reply.insert}}" onclick="jotGetLink();" ></div> <div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
</div> </div>
<div id="prvmail-rotator-wrapper" > <div id="prvmail-rotator-wrapper" >
<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$reply.wait}}" title="{{$reply.wait}}" style="display: none;" /> <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
</div> </div>
</div> </div>
<div id="prvmail-end"></div> <div id="prvmail-end"></div>

52
view/smarty3/settings.tpl
View File

@ -7,11 +7,11 @@
<h3 class="settings-heading">{{$h_pass}}</h3> <h3 class="settings-heading">{{$h_pass}}</h3>
{{include file="file:{{$field_password}}" field=$password1}} {{include file="field_password.tpl" field=$password1}}
{{include file="file:{{$field_password}}" field=$password2}} {{include file="field_password.tpl" field=$password2}}
{{if $oid_enable}} {{if $oid_enable}}
{{include file="file:{{$field_input}}" field=$openid}} {{include file="field_input.tpl" field=$openid}}
{{/if}} {{/if}}
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
@ -21,11 +21,11 @@
<h3 class="settings-heading">{{$h_basic}}</h3> <h3 class="settings-heading">{{$h_basic}}</h3>
{{include file="file:{{$field_input}}" field=$username}} {{include file="field_input.tpl" field=$username}}
{{include file="file:{{$field_input}}" field=$email}} {{include file="field_input.tpl" field=$email}}
{{include file="file:{{$field_custom}}" field=$timezone}} {{include file="field_custom.tpl" field=$timezone}}
{{include file="file:{{$field_input}}" field=$defloc}} {{include file="field_input.tpl" field=$defloc}}
{{include file="file:{{$field_checkbox}}" field=$allowloc}} {{include file="field_checkbox.tpl" field=$allowloc}}
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
@ -38,7 +38,7 @@
<input type="hidden" name="visibility" value="{{$visibility}}" /> <input type="hidden" name="visibility" value="{{$visibility}}" />
{{include file="file:{{$field_input}}" field=$maxreq}} {{include file="field_input.tpl" field=$maxreq}}
{{$profile_in_dir}} {{$profile_in_dir}}
@ -57,9 +57,9 @@
{{$unkmail}} {{$unkmail}}
{{include file="file:{{$field_input}}" field=$cntunkmail}} {{include file="field_input.tpl" field=$cntunkmail}}
{{include file="file:{{$field_input}}" field=$expire.days}} {{include file="field_input.tpl" field=$expire.days}}
<div class="field input"> <div class="field input">
@ -67,10 +67,10 @@
<div style="display: none;"> <div style="display: none;">
<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;"> <div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
<h3>{{$expire.advanced}}</h3> <h3>{{$expire.advanced}}</h3>
{{include file="file:{{$field_yesno}}" field=$expire.items}} {{include file="field_yesno.tpl" field=$expire.items}}
{{include file="file:{{$field_yesno}}" field=$expire.notes}} {{include file="field_yesno.tpl" field=$expire.notes}}
{{include file="file:{{$field_yesno}}" field=$expire.starred}} {{include file="field_yesno.tpl" field=$expire.starred}}
{{include file="file:{{$field_yesno}}" field=$expire.network_only}} {{include file="field_yesno.tpl" field=$expire.network_only}}
</div> </div>
</div> </div>
@ -108,22 +108,22 @@
<div id="settings-activity-desc">{{$activity_options}}</div> <div id="settings-activity-desc">{{$activity_options}}</div>
{{include file="file:{{$field_checkbox}}" field=$post_newfriend}} {{include file="field_checkbox.tpl" field=$post_newfriend}}
{{include file="file:{{$field_checkbox}}" field=$post_joingroup}} {{include file="field_checkbox.tpl" field=$post_joingroup}}
{{include file="file:{{$field_checkbox}}" field=$post_profilechange}} {{include file="field_checkbox.tpl" field=$post_profilechange}}
<div id="settings-notify-desc">{{$lbl_not}}</div> <div id="settings-notify-desc">{{$lbl_not}}</div>
<div class="group"> <div class="group">
{{include file="file:{{$field_intcheckbox}}" field=$notify1}} {{include file="field_intcheckbox.tpl" field=$notify1}}
{{include file="file:{{$field_intcheckbox}}" field=$notify2}} {{include file="field_intcheckbox.tpl" field=$notify2}}
{{include file="file:{{$field_intcheckbox}}" field=$notify3}} {{include file="field_intcheckbox.tpl" field=$notify3}}
{{include file="file:{{$field_intcheckbox}}" field=$notify4}} {{include file="field_intcheckbox.tpl" field=$notify4}}
{{include file="file:{{$field_intcheckbox}}" field=$notify5}} {{include file="field_intcheckbox.tpl" field=$notify5}}
{{include file="file:{{$field_intcheckbox}}" field=$notify6}} {{include file="field_intcheckbox.tpl" field=$notify6}}
{{include file="file:{{$field_intcheckbox}}" field=$notify7}} {{include file="field_intcheckbox.tpl" field=$notify7}}
{{include file="file:{{$field_intcheckbox}}" field=$notify8}} {{include file="field_intcheckbox.tpl" field=$notify8}}
</div> </div>
</div> </div>

20
view/smarty3/settings_connectors.tpl
View File

@ -14,16 +14,16 @@
<div class="settings-block"> <div class="settings-block">
<h3 class="settings-heading">{{$h_imap}}</h3> <h3 class="settings-heading">{{$h_imap}}</h3>
<p>{{$imap_desc}}</p> <p>{{$imap_desc}}</p>
{{include file="file:{{$field_custom}}" field=$imap_lastcheck}} {{include file="field_custom.tpl" field=$imap_lastcheck}}
{{include file="file:{{$field_input}}" field=$mail_server}} {{include file="field_input.tpl" field=$mail_server}}
{{include file="file:{{$field_input}}" field=$mail_port}} {{include file="field_input.tpl" field=$mail_port}}
{{include file="file:{{$field_select}}" field=$mail_ssl}} {{include file="field_select.tpl" field=$mail_ssl}}
{{include file="file:{{$field_input}}" field=$mail_user}} {{include file="field_input.tpl" field=$mail_user}}
{{include file="file:{{$field_password}}" field=$mail_pass}} {{include file="field_password.tpl" field=$mail_pass}}
{{include file="file:{{$field_input}}" field=$mail_replyto}} {{include file="field_input.tpl" field=$mail_replyto}}
{{include file="file:{{$field_checkbox}}" field=$mail_pubmail}} {{include file="field_checkbox.tpl" field=$mail_pubmail}}
{{include file="file:{{$field_select}}" field=$mail_action}} {{include file="field_select.tpl" field=$mail_action}}
{{include file="file:{{$field_input}}" field=$mail_movetofolder}} {{include file="field_input.tpl" field=$mail_movetofolder}}
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="{{$submit}}" /> <input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="{{$submit}}" />

10
view/smarty3/settings_display.tpl
View File

@ -3,11 +3,11 @@
<form action="settings/display" id="settings-form" method="post" autocomplete="off" > <form action="settings/display" id="settings-form" method="post" autocomplete="off" >
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
{{include file="file:{{$field_themeselect}}" field=$theme}} {{include file="field_themeselect.tpl" field=$theme}}
{{include file="file:{{$field_themeselect}}" field=$mobile_theme}} {{include file="field_themeselect.tpl" field=$mobile_theme}}
{{include file="file:{{$field_input}}" field=$ajaxint}} {{include file="field_input.tpl" field=$ajaxint}}
{{include file="file:{{$field_input}}" field=$itemspage_network}} {{include file="field_input.tpl" field=$itemspage_network}}
{{include file="file:{{$field_checkbox}}" field=$nosmile}} {{include file="field_checkbox.tpl" field=$nosmile}}
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >

2
view/smarty3/settings_features.tpl
View File

@ -8,7 +8,7 @@
<h3 class="settings-heading">{{$f.0}}</h3> <h3 class="settings-heading">{{$f.0}}</h3>
{{foreach $f.1 as $fcat}} {{foreach $f.1 as $fcat}}
{{include file="file:{{$field_yesno}}" field=$fcat}} {{include file="field_yesno.tpl" field=$fcat}}
{{/foreach}} {{/foreach}}
{{/foreach}} {{/foreach}}

10
view/smarty3/settings_oauth_edit.tpl
View File

@ -3,11 +3,11 @@
<form method="POST"> <form method="POST">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
{{include file="file:{{$field_input}}" field=$name}} {{include file="field_input.tpl" field=$name}}
{{include file="file:{{$field_input}}" field=$key}} {{include file="field_input.tpl" field=$key}}
{{include file="file:{{$field_input}}" field=$secret}} {{include file="field_input.tpl" field=$secret}}
{{include file="file:{{$field_input}}" field=$redirect}} {{include file="field_input.tpl" field=$redirect}}
{{include file="file:{{$field_input}}" field=$icon}} {{include file="field_input.tpl" field=$icon}}
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />

2
view/smarty3/suggestions.tpl
View File

@ -14,7 +14,7 @@
<div class="intro-form-end"></div> <div class="intro-form-end"></div>
<form class="intro-approve-form" action="{{$request}}" method="get"> <form class="intro-approve-form" action="{{$request}}" method="get">
{{include file="file:{{$field_checkbox}}" field=$hidden}} {{include file="field_checkbox.tpl" field=$hidden}}
<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" /> <input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" />
</form> </form>
</div> </div>

2
view/smarty3/uimport.tpl
View File

@ -3,7 +3,7 @@
<p>{{$import.intro}}</p> <p>{{$import.intro}}</p>
<p>{{$import.instruct}}</p> <p>{{$import.instruct}}</p>
<p><b>{{$import.warn}}</b></p> <p><b>{{$import.warn}}</b></p>
{{include file="file:{{$field_custom}}" field=$import.field}} {{include file="field_custom.tpl" field=$import.field}}
<div id="register-submit-wrapper"> <div id="register-submit-wrapper">

2
view/smarty3/viewcontact_template.tpl
View File

@ -1,7 +1,7 @@
<h3>{{$title}}</h3> <h3>{{$title}}</h3>
{{foreach $contacts as $c}} {{foreach $contacts as $c}}
{{include file="file:{{$contact_template}}" contact=$c}} {{include file="contact_template.tpl" contact=$c}}
{{/foreach}} {{/foreach}}
<div id="view-contact-end"></div> <div id="view-contact-end"></div>

4
view/smarty3/wall_thread.tpl
View File

@ -50,12 +50,12 @@
{{/foreach}} {{/foreach}}
</div> </div>
{{if $item.has_cats}} {{if $item.has_cats}}
<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$item.remove}}">[{{$item.remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}} <div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
</div> </div>
{{/if}} {{/if}}
{{if $item.has_folders}} {{if $item.has_folders}}
<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$item.remove}}">[{{$item.remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}} <div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
</div> </div>
{{/if}} {{/if}}
</div> </div>

2
view/suggestions.tpl
View File

@ -14,7 +14,7 @@
<div class="intro-form-end"></div> <div class="intro-form-end"></div>
<form class="intro-approve-form" action="$request" method="get"> <form class="intro-approve-form" action="$request" method="get">
{{inc $field_checkbox with $field=$hidden }}{{endinc}} {{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
<input class="intro-submit-approve" type="submit" name="submit" value="$approve" /> <input class="intro-submit-approve" type="submit" name="submit" value="$approve" />
</form> </form>
</div> </div>

9
view/theme/cleanzero/config.php
View File

@ -75,15 +75,8 @@ function cleanzero_form(&$a, $color,$font_size,$resize,$theme_width){
"wide"=>"wide", "wide"=>"wide",
); );
// $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
$t = get_markup_template("theme_settings.tpl" ); $t = get_markup_template("theme_settings.tpl" );
$o .= replace_macros($t, array(
$includes = array(
'$field_select' => 'field_select.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($t, $includes + array(
'$submit' => t('Submit'), '$submit' => t('Submit'),
'$baseurl' => $a->get_baseurl(), '$baseurl' => $a->get_baseurl(),
'$title' => t("Theme settings"), '$title' => t("Theme settings"),

8
view/theme/cleanzero/smarty3/theme_settings.tpl
View File

@ -1,7 +1,7 @@
{{include file="file:{{$field_select}}" field=$color}} {{include file="field_select.tpl" field=$color}}
{{include file="file:{{$field_select}}" field=$font_size}} {{include file="field_select.tpl" field=$font_size}}
{{include file="file:{{$field_select}}" field=$resize}} {{include file="field_select.tpl" field=$resize}}
{{include file="file:{{$field_select}}" field=$theme_width}} {{include file="field_select.tpl" field=$theme_width}}
<div class="settings-submit-wrapper"> <div class="settings-submit-wrapper">

2
view/theme/cleanzero/theme.php
View File

@ -8,7 +8,7 @@
$a->theme_info = array( $a->theme_info = array(
'extends' => 'duepuntozero', 'extends' => 'duepuntozero',
); );
$a->theme['template_engine'] = 'smarty3'; set_template_engine($a, 'smarty3');
function cleanzero_init(&$a) { function cleanzero_init(&$a) {
$a->page['htmlhead'] .= <<< EOT $a->page['htmlhead'] .= <<< EOT

8
view/theme/cleanzero/theme_settings.tpl
View File

@ -1,7 +1,7 @@
{{inc $field_select with $field=$color}}{{endinc}} {{inc field_select.tpl with $field=$color}}{{endinc}}
{{inc $field_select with $field=$font_size}}{{endinc}} {{inc field_select.tpl with $field=$font_size}}{{endinc}}
{{inc $field_select with $field=$resize}}{{endinc}} {{inc field_select.tpl with $field=$resize}}{{endinc}}
{{inc $field_select with $field=$theme_width}}{{endinc}} {{inc field_select.tpl with $field=$theme_width}}{{endinc}}
<div class="settings-submit-wrapper"> <div class="settings-submit-wrapper">

2
view/theme/comix-plain/theme.php
View File

@ -11,7 +11,7 @@
$a->theme_info = array( $a->theme_info = array(
'extends' => 'duepuntozero', 'extends' => 'duepuntozero',
); );
$a->theme['template_engine'] = 'smarty3'; set_template_engine($a, 'smarty3');
$a->page['htmlhead'] .= <<< EOT $a->page['htmlhead'] .= <<< EOT
<script> <script>

2
view/theme/comix/theme.php
View File

@ -11,7 +11,7 @@
$a->theme_info = array( $a->theme_info = array(
'extends' => 'duepuntozero', 'extends' => 'duepuntozero',
); );
$a->theme['template_engine'] = 'smarty3'; set_template_engine($a, 'smarty3');
$a->page['htmlhead'] .= <<< EOT $a->page['htmlhead'] .= <<< EOT
<script> <script>

2
view/theme/darkbubble/theme.php
View File

@ -10,7 +10,7 @@
$a->theme_info = array( $a->theme_info = array(
'extends' => 'testbubble', 'extends' => 'testbubble',
); );
$a->theme['template_engine'] = 'smarty3'; set_template_engine($a, 'smarty3');
$a->page['htmlhead'] .= <<< EOT $a->page['htmlhead'] .= <<< EOT

2
view/theme/darkzero/theme.php
View File

@ -11,7 +11,7 @@
$a->theme_info = array( $a->theme_info = array(
'extends' => 'duepuntozero', 'extends' => 'duepuntozero',
); );
$a->theme['template_engine'] = 'smarty3'; set_template_engine($a, 'smarty3');
function darkzero_init(&$a) { function darkzero_init(&$a) {
$a->page['htmlhead'] .= <<< EOT $a->page['htmlhead'] .= <<< EOT

28
view/theme/diabook/communityhome.tpl
View File

@ -1,7 +1,7 @@
<div id="twittersettings" style="display:none"> <div id="twittersettings" style="display:none">
<form id="twittersettingsform" action="network" method="post" > <form id="twittersettingsform" action="network" method="post" >
{{inc $field_input with $field=$TSearchTerm}}{{endinc}} {{inc field_input.tpl with $field=$TSearchTerm}}{{endinc}}
<div class="settings-submit-wrapper"> <div class="settings-submit-wrapper">
<input id="twittersub" type="submit" value="$sub" class="settings-submit" name="diabook-settings-sub"></input> <input id="twittersub" type="submit" value="$sub" class="settings-submit" name="diabook-settings-sub"></input>
</div> </div>
@ -13,9 +13,9 @@
<div id="layermanager" style="width: 350px;position: relative;float: right;right:20px;height: 300px;"></div> <div id="layermanager" style="width: 350px;position: relative;float: right;right:20px;height: 300px;"></div>
<div id="map2" style="height:350px;width:350px;"></div> <div id="map2" style="height:350px;width:350px;"></div>
<div id="mouseposition" style="width: 350px;"></div> <div id="mouseposition" style="width: 350px;"></div>
{{inc $field_input with $field=$ELZoom}}{{endinc}} {{inc field_input.tpl with $field=$ELZoom}}{{endinc}}
{{inc $field_input with $field=$ELPosX}}{{endinc}} {{inc field_input.tpl with $field=$ELPosX}}{{endinc}}
{{inc $field_input with $field=$ELPosY}}{{endinc}} {{inc field_input.tpl with $field=$ELPosY}}{{endinc}}
<div class="settings-submit-wrapper"> <div class="settings-submit-wrapper">
<input id="mapsub" type="submit" value="$sub" class="settings-submit" name="diabook-settings-map-sub"></input> <input id="mapsub" type="submit" value="$sub" class="settings-submit" name="diabook-settings-map-sub"></input>
</div> </div>
@ -35,16 +35,16 @@ just contact me, if you are intesrested in joining</p>
<div id="boxsettings" style="display:none"> <div id="boxsettings" style="display:none">
<form id="boxsettingsform" action="network" method="post" > <form id="boxsettingsform" action="network" method="post" >
<fieldset><legend>$boxsettings.title.1</legend> <fieldset><legend>$boxsettings.title.1</legend>
{{inc $field_select with $field=$close_pages}}{{endinc}} {{inc field_select.tpl with $field=$close_pages}}{{endinc}}
{{inc $field_select with $field=$close_profiles}}{{endinc}} {{inc field_select.tpl with $field=$close_profiles}}{{endinc}}
{{inc $field_select with $field=$close_helpers}}{{endinc}} {{inc field_select.tpl with $field=$close_helpers}}{{endinc}}
{{inc $field_select with $field=$close_services}}{{endinc}} {{inc field_select.tpl with $field=$close_services}}{{endinc}}
{{inc $field_select with $field=$close_friends}}{{endinc}} {{inc field_select.tpl with $field=$close_friends}}{{endinc}}
{{inc $field_select with $field=$close_lastusers}}{{endinc}} {{inc field_select.tpl with $field=$close_lastusers}}{{endinc}}
{{inc $field_select with $field=$close_lastphotos}}{{endinc}} {{inc field_select.tpl with $field=$close_lastphotos}}{{endinc}}
{{inc $field_select with $field=$close_lastlikes}}{{endinc}} {{inc field_select.tpl with $field=$close_lastlikes}}{{endinc}}
{{inc $field_select with $field=$close_twitter}}{{endinc}} {{inc field_select.tpl with $field=$close_twitter}}{{endinc}}
{{inc $field_select with $field=$close_mapquery}}{{endinc}} {{inc field_select.tpl with $field=$close_mapquery}}{{endinc}}
<div class="settings-submit-wrapper"> <div class="settings-submit-wrapper">
<input id="boxsub" type="submit" value="$sub" class="settings-submit" name="diabook-settings-box-sub"></input> <input id="boxsub" type="submit" value="$sub" class="settings-submit" name="diabook-settings-box-sub"></input>
</div> </div>

10
view/theme/diabook/config.php
View File

@ -147,16 +147,8 @@ function diabook_form(&$a, $font_size, $line_height, $resolution, $color, $TSear
// $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
$t = get_markup_template("theme_settings.tpl" ); $t = get_markup_template("theme_settings.tpl" );
$o .= replace_macros($t, array(
$includes = array(
'$field_select' => 'field_select.tpl',
'$field_input' => 'field_input.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($t, $includes + array(
'$submit' => t('Submit'), '$submit' => t('Submit'),
'$baseurl' => $a->get_baseurl(), '$baseurl' => $a->get_baseurl(),
'$title' => t("Theme settings"), '$title' => t("Theme settings"),

6
view/theme/diabook/login.tpl
View File

@ -3,13 +3,13 @@
<input type="hidden" name="auth-params" value="login" /> <input type="hidden" name="auth-params" value="login" />
<div id="login_standard"> <div id="login_standard">
{{ inc $field_input with $field=$lname }}{{ endinc }} {{ inc field_input.tpl with $field=$lname }}{{ endinc }}
{{ inc $field_password with $field=$lpassword }}{{ endinc }} {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
</div> </div>
{{ if $openid }} {{ if $openid }}
<div id="login_openid"> <div id="login_openid">
{{ inc $field_openid with $field=$lopenid }}{{ endinc }} {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
</div> </div>
{{ endif }} {{ endif }}

4
view/theme/diabook/mail_display.tpl
View File

@ -5,8 +5,8 @@
{{ for $mails as $mail_item }} {{ for $mails as $mail_item }}
<div id="tread-wrapper-$mail_item.id" class="tread-wrapper"> <div id="tread-wrapper-$mail_item.id" class="tread-wrapper">
{{ inc $mail_conv with $mail=$mail_item }}{{endinc}} {{ inc mail_conv.tpl with $mail=$mail_item }}{{endinc}}
</div> </div>
{{ endfor }} {{ endfor }}
{{ inc $prv_message with $reply=$reply_info }}{{ endinc }} {{ inc prv_message.tpl }}{{ endinc }}

2
view/theme/diabook/profile_vcard.tpl
View File

@ -48,7 +48,7 @@
{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }} {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
{{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }} {{ inc diaspora_vcard.tpl }}{{ endinc }}
<div id="profile-extra-links"> <div id="profile-extra-links">
<ul> <ul>

Some files were not shown because too many files have changed in this diff Show More