friendica
/
friendica
mirror of https://github.com/friendica/friendica.git
5
7
Fork 5
Code Issues Releases 16 Wiki Activity
Browse Source

simplify by making Smarty include directives behave like Friendica native ones

pull/561/head
Zach Prezkuta 10 years ago
parent
6603758a5e
commit
11c06e21b7
73 changed files with 379 additions and 590 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      boot.php
  2. 20
      include/friendica_smarty.php
  3. 16
      include/text.php
  4. 29
      mod/admin.php
  5. 15
      mod/contacts.php
  6. 9
      mod/filer.php
  7. 8
      mod/group.php
  8. 35
      mod/install.php
  9. 8
      mod/message.php
  10. 8
      mod/nogroup.php
  11. 49
      mod/notifications.php
  12. 7
      mod/notify.php
  13. 8
      mod/photos.php
  14. 8
      mod/poco.php
  15. 65
      mod/settings.php
  16. 8
      mod/uimport.php
  17. 8
      mod/viewcontacts.php
  18. 6
      view/admin_logs.tpl
  19. 8
      view/admin_remoteupdate.tpl
  20. 84
      view/admin_site.tpl
  21. 2
      view/api_friends_xml.tpl
  22. 2
      view/api_timeline_xml.tpl
  23. 2
      view/contact_edit.tpl
  24. 2
      view/contacts-template.tpl
  25. 2
      view/field.tpl
  26. 2
      view/filer_dialog.tpl
  27. 4
      view/group_edit.tpl
  28. 8
      view/install_db.tpl
  29. 2
      view/install_settings.tpl
  30. 4
      view/intros.tpl
  31. 8
      view/login.tpl
  32. 4
      view/mail_display.tpl
  33. 2
      view/nogroup-template.tpl
  34. 2
      view/notifications.tpl
  35. 10
      view/pagetypes.tpl
  36. 2
      view/photos_recent.tpl
  37. 2
      view/poco_xml.tpl
  38. 2
      view/profile_vcard.tpl
  39. 52
      view/settings.tpl
  40. 20
      view/settings_connectors.tpl
  41. 10
      view/settings_display.tpl
  42. 2
      view/settings_features.tpl
  43. 10
      view/settings_oauth_edit.tpl
  44. 2
      view/suggestions.tpl
  45. 9
      view/theme/cleanzero/config.php
  46. 8
      view/theme/cleanzero/theme_settings.tpl
  47. 28
      view/theme/diabook/communityhome.tpl
  48. 10
      view/theme/diabook/config.php
  49. 6
      view/theme/diabook/login.tpl
  50. 4
      view/theme/diabook/mail_display.tpl
  51. 2
      view/theme/diabook/profile_vcard.tpl
  52. 21
      view/theme/diabook/theme.php
  53. 42
      view/theme/diabook/theme_settings.tpl
  54. 8
      view/theme/dispy/config.php
  55. 2
      view/theme/dispy/profile_vcard.tpl
  56. 2
      view/theme/duepuntozero/profile_vcard.tpl
  57. 2
      view/theme/facepark/profile_vcard.tpl
  58. 68
      view/theme/frost-mobile/admin_site.tpl
  59. 2
      view/theme/frost-mobile/contacts-template.tpl
  60. 8
      view/theme/frost-mobile/login.tpl
  61. 2
      view/theme/frost-mobile/profile_vcard.tpl
  62. 50
      view/theme/frost-mobile/settings.tpl
  63. 81
      view/theme/frost/admin_site.tpl
  64. 2
      view/theme/frost/contacts-template.tpl
  65. 8
      view/theme/frost/login.tpl
  66. 2
      view/theme/frost/profile_vcard.tpl
  67. 8
      view/theme/quattro/config.php
  68. 4
      view/theme/quattro/mail_display.tpl
  69. 2
      view/theme/quattro/profile_vcard.tpl
  70. 6
      view/theme/smoothly/login.tpl
  71. 2
      view/theme/testbubble/profile_vcard.tpl
  72. 2
      view/uimport.tpl
  73. 2
      view/viewcontact_template.tpl

19
boot.php
Unescape View File

@ -969,16 +969,7 @@ if(! function_exists('login')) {
$a->module = 'login';
}
$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(
$o .= replace_macros($tpl, array(
'$dest_url' => $dest_url,
'$logout' => t('Logout'),
@ -997,6 +988,7 @@ if(! function_exists('login')) {
'$lostpass' => t('Forgot your password?'),
'$lostlink' => t('Password Reset'),
));
call_hooks('login_hook',$o);
@ -1348,15 +1340,10 @@ if(! function_exists('profile_sidebar')) {
$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')
$location = template_escape($location);
$o .= replace_macros($tpl, $includes + array(
$o .= replace_macros($tpl, array(
'$profile' => $profile,
'$connect' => $connect,
'$wallmessage' => $wallmessage,

20
include/friendica_smarty.php
Unescape View File

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

16
include/text.php
Unescape View File

@ -477,6 +477,7 @@ function get_markup_template($s, $root = '') {
// $tt = microtime() - $ts;
// $a->page['debug'] .= "$tt <br>\n";
// return $file_contents;
// logger($template_file);
return file_get_contents($template_file);
}
}}
@ -499,21 +500,6 @@ function get_template_file($a, $filename, $root = '') {
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
Unescape View File

@ -455,16 +455,7 @@ function admin_page_site(&$a) {
);
$t = get_markup_template("admin_site.tpl");
$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(
return replace_macros($t, array(
'$title' => t('Administration'),
'$page' => t('Site'),
'$submit' => t('Submit'),
@ -1144,14 +1135,7 @@ readable.");
}
}
$includes = 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(
return replace_macros($t, array(
'$title' => t('Administration'),
'$page' => t('Logs'),
'$submit' => t('Submit'),
@ -1210,14 +1194,7 @@ function admin_page_remoteupdate(&$a) {
}
$tpl = get_markup_template("admin_remoteupdate.tpl");
$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(
return replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(true),
'$submit' => t("Update now"),
'$close' => t("Close"),

15
mod/contacts.php
Unescape 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!') : '');
$includes = array(
'$field_checkbox' => 'field_checkbox.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($tpl,$includes + array(
$o .= replace_macros($tpl, array(
'$header' => t('Contact Editor'),
'$tab_str' => $tab_str,
'$submit' => t('Submit'),
@ -576,13 +571,7 @@ function contacts_content(&$a) {
}
$tpl = get_markup_template("contacts-template.tpl");
$includes = array(
'$contact_template' => 'contact_template.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($tpl,$includes + array(
$o .= replace_macros($tpl, array(
'$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''),
'$tabs' => $t,
'$total' => $total,

9
mod/filer.php
Unescape View File

@ -24,14 +24,9 @@ function filer_content(&$a) {
$filetags = get_pconfig(local_user(),'system','filetags');
$filetags = file_tag_file_to_list($filetags,'file');
$filetags = explode(",", $filetags);
$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,$includes + array(
$tpl = get_markup_template("filer_dialog.tpl");
$o = replace_macros($tpl, array(
'$field' => array('term', t("Save to Folder:"), '', '', $filetags, t('- select -')),
'$submit' => t('Save'),
));

8
mod/group.php
Unescape View File

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

35
mod/install.php
Unescape View File

@ -177,6 +177,8 @@ function install_content(&$a) {
check_htconfig($checks);
check_smarty3($checks);
check_keys($checks);
if(x($_POST,'phpath'))
@ -220,14 +222,7 @@ function install_content(&$a) {
$tpl = get_markup_template('install_db.tpl');
$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(
$o .= replace_macros($tpl, array(
'$title' => $install_title,
'$pass' => t('Database connection'),
'$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');
$tpl = get_markup_template('install_settings.tpl');
$includes = array(
'$field_input' => 'field_input.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o .= replace_macros($tpl, $includes + array(
$o .= replace_macros($tpl, array(
'$title' => $install_title,
'$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) {
$a = get_app();
$status = true;

8
mod/message.php
Unescape View File

@ -497,12 +497,6 @@ function message_content(&$a) {
$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') {
$subjtxt_e = template_escape($message['title']);
}
@ -510,7 +504,7 @@ function message_content(&$a) {
$subjtxt_e = $message['title'];
}
$o = replace_macros($tpl, $includes + array(
$o = replace_macros($tpl, array(
'$thread_id' => $a->argv[1],
'$thread_subject' => $message['title'],
'$thread_seen' => $seen,

8
mod/nogroup.php
Unescape View File

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

49
mod/notifications.php
Unescape View File

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

7
mod/notify.php
Unescape View File

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

8
mod/photos.php
Unescape View File

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

8
mod/poco.php
Unescape View File

@ -147,13 +147,7 @@ function poco_init(&$a) {
if($format === 'xml') {
header('Content-type: text/xml');
$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)));
echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify(array('$response' => $ret)));
http_status_exit(500);
}
if($format === 'json') {

65
mod/settings.php
Unescape View File

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

8
mod/uimport.php
Unescape View File

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

8
mod/viewcontacts.php
Unescape View File

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

6
view/admin_logs.tpl
Unescape View File

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

8
view/admin_remoteupdate.tpl
Unescape View File

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

84
view/admin_site.tpl
Unescape View File

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

2
view/api_friends_xml.tpl
Unescape View File

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

2
view/api_timeline_xml.tpl
Unescape View File

@ -10,7 +10,7 @@
<in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name>
<geo>$status.geo</geo>
<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>
<url>$status.url</url>
<coordinates>$status.coordinates</coordinates>

2
view/contact_edit.tpl
Unescape View File

@ -65,7 +65,7 @@
{{ endif }}
<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">
<h4>$lbl_info1</h4>

2
view/contacts-template.tpl
Unescape View File

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

2
view/field.tpl
Unescape View File

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

2
view/filer_dialog.tpl
Unescape View File

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

4
view/group_edit.tpl
Unescape View File

@ -5,7 +5,7 @@
<form action="group/$gid" id="group-edit-form" method="post" >
<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 }}
<div id="group-edit-submit-wrapper" >
<input type="submit" name="submit" value="$submit" >
@ -17,7 +17,7 @@
{{ if $groupedit_info }}
<div id="group-update-wrapper">
{{ inc $groupeditortpl with $groupeditor=$groupedit_info }}{{ endinc }}
{{ inc groupeditor.tpl with $groupeditor=$groupedit_info }}{{ endinc }}
</div>
{{ endif }}
{{ if $desc }}<div id="group-edit-desc">$desc</div>{{ endif }}

8
view/install_db.tpl
Unescape View File

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

2
view/install_settings.tpl
Unescape View File

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

4
view/intros.tpl
Unescape View File

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

8
view/login.tpl
Unescape View File

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

4
view/mail_display.tpl
Unescape View File

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

2
view/nogroup-template.tpl
Unescape View File

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

2
view/notifications.tpl
Unescape View File

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

10
view/pagetypes.tpl
Unescape View File

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

2
view/photos_recent.tpl
Unescape View File

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

2
view/poco_xml.tpl
Unescape View File

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

2
view/profile_vcard.tpl
Unescape 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 }}
{{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }}
{{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }}
<div id="profile-extra-links">
<ul>

52
view/settings.tpl
Unescape View File

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

20
view/settings_connectors.tpl
Unescape View File

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

10
view/settings_display.tpl
Unescape View File

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

2
view/settings_features.tpl
Unescape View File

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

<