changes until now.

Dieser Commit ist enthalten in:
Oldperl 2017-06-08 19:43:21 +00:00
Ursprung 642f0ffe29
Commit 08deaab62d
2 geänderte Dateien mit 33 neuen und 22 gelöschten Zeilen

Datei anzeigen

@ -112,30 +112,30 @@ while (($data = fgetcsv($file, 4000, ';')) !== false) {
$pluginChunks = array();
$baseChunks = explode("\n", file_get_contents('data/base.txt'));
$baseChunks = txtFileToArray('data/base.txt');
$clientChunks = explode("\n", file_get_contents('data/client.txt'));
$clientChunks = txtFileToArray('data/client.txt');
$clientNoContentChunks = explode("\n", file_get_contents('data/client_no_content.txt'));
$clientNoContentChunks = txtFileToArray('data/client_no_content.txt');
$moduleChunks = explode("\n", file_get_contents('data/standard.txt'));
$moduleChunks = txtFileToArray('data/standard.txt');
$contentChunks = explode("\n", file_get_contents('data/examples.txt'));
$contentChunks = txtFileToArray('data/examples.txt');
$sysadminChunk = explode("\n", file_get_contents('data/sysadmin.txt'));
$sysadminChunk = txtFileToArray('data/sysadmin.txt');
if ($_SESSION['plugin_newsletter'] == 'true') {
$newsletter = explode("\n", file_get_contents('data/plugin_newsletter.txt'));
$newsletter = txtFileToArray('data/plugin_newsletter.txt');
$pluginChunks = array_merge($pluginChunks, $newsletter);
}
if ($_SESSION['plugin_content_allocation'] == 'true') {
$content_allocation = explode("\n", file_get_contents('data/plugin_content_allocation.txt'));
$content_allocation = txtFileToArray('data/plugin_content_allocation.txt');
$pluginChunks = array_merge($pluginChunks, $content_allocation);
}
if ($_SESSION['plugin_mod_rewrite'] == 'true') {
$mod_rewrite = explode("\n", file_get_contents('data/plugin_mod_rewrite.txt'));
$mod_rewrite = txtFileToArray('data/plugin_mod_rewrite.txt');
$pluginChunks = array_merge($pluginChunks, $mod_rewrite);
}
@ -259,4 +259,12 @@ if ($currentstep < $totalsteps) {
printf('<script type="text/javascript">parent.document.getElementById("installing").style.visibility="hidden";parent.document.getElementById("installingdone").style.visibility="visible";</script>');
printf('<script type="text/javascript">parent.document.getElementById("next").style.visibility="visible"; window.setTimeout("nextStep()", 10); function nextStep () { window.location.href=\'makeconfig.php\'; }</script>');
}
function txtFileToArray($sFile) {
$aFileArray = array();
if(file_exists($sFile) && is_readable($sFile)) {
$aFileArray = explode("\n", file_get_contents($sFile));
}
return $aFileArray;
}
?>

Datei anzeigen

@ -458,19 +458,7 @@ class cSetupSystemtest extends cSetupMask {
$this->logFilePrediction("data/logs/errorlog.txt");
$this->logFilePrediction("data/logs/setuplog.txt");
}
// cronjobs
$this->logFilePrediction("conlite/cronjobs/pseudo-cron.log");
$this->logFilePrediction("conlite/cronjobs/session_cleanup.php.job");
$this->logFilePrediction("conlite/cronjobs/send_reminder.php.job");
$this->logFilePrediction("conlite/cronjobs/optimize_database.php.job");
$this->logFilePrediction("conlite/cronjobs/move_old_stats.php.job");
$this->logFilePrediction("conlite/cronjobs/move_articles.php.job");
$this->logFilePrediction("conlite/cronjobs/linkchecker.php.job");
$this->logFilePrediction("conlite/cronjobs/run_newsletter_job.php.job");
$this->logFilePrediction("conlite/cronjobs/setfrontenduserstate.php.job");
$this->logFilePrediction("conlite/cronjobs/advance_workflow.php.job");
// new folders in data-folder
$this->logFilePrediction("data/cache/");
$this->logFilePrediction("data/temp/");
@ -478,6 +466,21 @@ class cSetupSystemtest extends cSetupMask {
$this->logFilePrediction("data/logs/");
$this->logFilePrediction("data/backup/");
// cronjobs
$sFolder = 'data/cronlog/';
$this->logFilePrediction($sFolder."pseudo-cron.log");
$this->logFilePrediction($sFolder."session_cleanup.php.job");
$this->logFilePrediction($sFolder."send_reminder.php.job");
$this->logFilePrediction($sFolder."optimize_database.php.job");
$this->logFilePrediction($sFolder."move_old_stats.php.job");
$this->logFilePrediction($sFolder."move_articles.php.job");
$this->logFilePrediction($sFolder."linkchecker.php.job");
$this->logFilePrediction($sFolder."run_newsletter_job.php.job");
$this->logFilePrediction($sFolder."setfrontenduserstate.php.job");
$this->logFilePrediction($sFolder."advance_workflow.php.job");
if ($_SESSION["setuptype"] == "setup" || ($_SESSION["setuptype"] == "migration" && is_dir("../cms/"))) {
$this->logFilePrediction("cms/cache/");
$this->logFilePrediction("cms/css/");