X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Finstall-functions.php;h=6d682005e17de0d31b656338f471775677541883;hb=37a43f2538a0555c2e3dd35b3582d339bc284420;hp=9cabd5ce8ae9dbbee53cf31dcde3f3904cb20e6d;hpb=ffe213c8e3f85119ddd5544214d0de9ecb833d98;p=mailer.git diff --git a/inc/install-functions.php b/inc/install-functions.php index 9cabd5ce8a..6d682005e1 100644 --- a/inc/install-functions.php +++ b/inc/install-functions.php @@ -14,8 +14,6 @@ * $Date:: $ * * $Tag:: 0.2.1-FINAL $ * * $Author:: $ * - * Needs to be in all Files and every File needs "svn propset * - * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * * Copyright (c) 2009, 2010 by Mailer Developer Team * @@ -37,10 +35,6 @@ * MA 02110-1301 USA * ************************************************************************/ -/************************************************************************ - * YOU MAY ALSO WANT TO REMOVE THIS FILE AFTER INSTALLTION! * - ************************************************************************/ - // Some security stuff... if (!defined('__SECURITY')) { die(); @@ -102,14 +96,23 @@ function addToInstallContent ($out) { } // END - if } +// Somewhat getter for installer content +function getInstallerContent () { + // Is it here? + if (isset($GLOBAS['install_content'])) { + // Yes, then use it + $content = $GLOBALS['install_content']; + } else { + // Nothing found, this needs fixing + $content = loadTemplate('admin_settings_saved', false, '{--INSTALLER_CONTENT_404--}'); + } + + // Return content + return $content; +} + // Read a given SQL dump function readSqlDump ($FQFN) { - // Sanity-check if file is there (should be there, but just to make it sure) - if (!isFileReadable($FQFN)) { - // This should not happen - debug_report_bug(__FUNCTION__.': File ' . basename($FQFN) . ' is not readable!'); - } // END - if - // Load the file $content = readFromFile($FQFN);