friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

simplify by making Smarty include directives behave like Friendica native ones

Browse source
This commit is contained in:
Zach Prezkuta 2012-12-25 11:48:02 -07:00
commit 11c06e21b7
73 changed files with 376 additions and 587 deletions
Download patch file Download diff file Expand all files Collapse all files

35
mod/install.php
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;