bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #320 from fabrixxm/master

Browse source 
Fix bug 436, fix small typo, and incomplete feature removal
This commit is contained in:
friendica 2012-06-01 02:53:42 -07:00
parent 93bc29a711 1d1c50f6e3
commit 974935e921
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/admin.php
View file

@ -98,7 +98,7 @@ function admin_content(&$a) {
'plugins'=> Array($a->get_baseurl(true)."/admin/plugins/", t("Plugins") , "plugins"), 'plugins'=> Array($a->get_baseurl(true)."/admin/plugins/", t("Plugins") , "plugins"),
'themes' => Array($a->get_baseurl(true)."/admin/themes/", t("Themes") , "themes"), 'themes' => Array($a->get_baseurl(true)."/admin/themes/", t("Themes") , "themes"),
'dbsync' => Array($a->get_baseurl(true)."/admin/dbsync/", t('DB updates'), "dbsync"), 'dbsync' => Array($a->get_baseurl(true)."/admin/dbsync/", t('DB updates'), "dbsync"),
'update' => Array($a->get_baseurl(true)."/admin/update/", t("Software Update") , "update") //'update' => Array($a->get_baseurl(true)."/admin/update/", t("Software Update") , "update")
); );
/* get plugins admin page */ /* get plugins admin page */

9
mod/install.php Normal file → Executable file
View file

@ -194,6 +194,7 @@ function install_content(&$a) {
$checkspassed = array_reduce($checks, "check_passed", true); $checkspassed = array_reduce($checks, "check_passed", true);
$tpl = get_markup_template('install_checks.tpl'); $tpl = get_markup_template('install_checks.tpl');
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
'$title' => $install_title, '$title' => $install_title,
@ -381,6 +382,7 @@ function check_funcs(&$checks) {
check_add($ck_funcs, t('Apache mod_rewrite module'), true, true, ""); check_add($ck_funcs, t('Apache mod_rewrite module'), true, true, "");
} }
} }
if(! function_exists('curl_init')){ if(! function_exists('curl_init')){
$ck_funcs[0]['status']= false; $ck_funcs[0]['status']= false;
$ck_funcs[0]['help']= t('Error: libCURL PHP module required but not installed.'); $ck_funcs[0]['help']= t('Error: libCURL PHP module required but not installed.');
@ -430,12 +432,17 @@ function check_htaccess(&$checks) {
$a = get_app(); $a = get_app();
$status = true; $status = true;
$help = ""; $help = "";
if (function_exists('curl_init')){
$test = fetch_url($a->get_baseurl()."/install/testrewrite"); $test = fetch_url($a->get_baseurl()."/install/testrewrite");
if ($test!="ok") { if ($test!="ok") {
$status = false; $status = false;
$help = t('Url rewrite in .htconfig is not working. Check your server configuration.'); $help = t('Url rewrite in .htaccess is not working. Check your server configuration.');
} }
check_add($checks, t('Url rewrite is working'), $status, true, $help); check_add($checks, t('Url rewrite is working'), $status, true, $help);
} else {
// cannot check modrewrite if libcurl is not installed
}
} }