]> git.mxchange.org Git - mailer.git/commitdiff
Non-AJAX installation rewritten to use single includes instead of switch()
authorRoland Häder <roland@mxchange.org>
Wed, 3 Oct 2012 14:02:07 +0000 (14:02 +0000)
committerRoland Häder <roland@mxchange.org>
Wed, 3 Oct 2012 14:02:07 +0000 (14:02 +0000)
.gitattributes
inc/install-inc.php
inc/install/install_page_1.php [new file with mode: 0644]
inc/install/install_page_2.php [new file with mode: 0644]
inc/install/install_page_3.php [new file with mode: 0644]
inc/install/install_page_5.php [new file with mode: 0644]
inc/install/install_page_finalize.php [new file with mode: 0644]
inc/install/install_page_finished.php [new file with mode: 0644]
inc/install/install_page_welcome.php [new file with mode: 0644]
inc/language/active_en.php
inc/language/de.php

index 879c7390543eebe4a0b5a235cfabad912ef71335..ebe31109b091687b13b20d7df2bffd24e888795b 100644 (file)
@@ -268,6 +268,13 @@ inc/install-inc.php svneol=native#text/plain
 inc/install/.htaccess svneol=native#text/plain
 inc/install/install-inc_ svneol=native#text/plain
 inc/install/install_page_ svneol=native#text/plain
+inc/install/install_page_1.php svneol=native#text/plain
+inc/install/install_page_2.php svneol=native#text/plain
+inc/install/install_page_3.php svneol=native#text/plain
+inc/install/install_page_5.php svneol=native#text/plain
+inc/install/install_page_finalize.php svneol=native#text/plain
+inc/install/install_page_finished.php svneol=native#text/plain
+inc/install/install_page_welcome.php svneol=native#text/plain
 inc/js/.htaccess svneol=native#text/plain
 inc/js/js- svneol=native#text/plain
 inc/js/js-admin_ajax.php svneol=native#text/plain
index c9ed06d1d671dda501ffdf07c457ca130e6ca14b..fccd20eacab3777e1b2d295222d45d4f70255802 100644 (file)
@@ -86,234 +86,18 @@ if ((isGetRequestElementSet('install_page') && (getRequestElement('install_page'
 
 // Is the mailer installed or no admin registered so far?
 if ((!isInstalled()) || (!isAdminRegistered())) {
-       // Output page for entered value
-       switch (getRequestElement('install_page')) {
-               case 'welcome': // Welcome to the installation!
-                       addTemplateToInstallContent('install_welcome');
-                       break;
-
-               case '1': // Server path, base URL
-                       // Load template
-                       addTemplateToInstallContent('install_page1');
-                       break;
-
-               case '2': // Database login data
-                       if (empty($GLOBALS['install_mysql']['dbase']))  $GLOBALS['install_mysql']['dbase']  = 'your_database';
-                       if (empty($GLOBALS['install_mysql']['login']))  $GLOBALS['install_mysql']['login']  = 'your_login';
-                       if (empty($GLOBALS['install_mysql']['host']))   $GLOBALS['install_mysql']['host']   = 'localhost';
-                       if (empty($GLOBALS['install_mysql']['prefix'])) $GLOBALS['install_mysql']['prefix'] = 'mailer';
-                       if (empty($GLOBALS['install_mysql']['type']))   $GLOBALS['install_mysql']['type']   = 'MyISAM';
-                       if (ifFatalErrorsDetected()) {
-                               addToInstallContent('<div class="install_fatal"><ul>');
-                               foreach (getFatalArray() as $key => $err) {
-                                       addToInstallContent('<li> {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '</li>');
-                               } // END - foreach
-                               addToInstallContent('</ol></div>');
-                       } // END - if
-
-                       $content['mysql_host']   = $GLOBALS['install_mysql']['host'];
-                       $content['mysql_dbase']  = $GLOBALS['install_mysql']['dbase'];
-                       $content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix'];
-                       $content['mysql_login']  = $GLOBALS['install_mysql']['login'];
-                       $content['table_type']   = $GLOBALS['install_mysql']['type'];
-                       $content['spath']        = postRequestElement('spath');
-                       $content['burl']         = postRequestElement('burl');
-                       $content['title']        = postRequestElement('title');
-                       $content['slogan']       = postRequestElement('slogan');
-                       $content['email']        = postRequestElement('email');
-
-                       // Load template
-                       addTemplateToInstallContent('install_page2', $content);
-                       break;
-
-               case '3':
-                       // Set more values
-                       $content['spath']      = postRequestElement('spath');
-                       $content['burl']       = postRequestElement('burl');
-                       $content['title']      = postRequestElement('title');
-                       $content['slogan']     = postRequestElement('slogan');
-                       $content['email']      = postRequestElement('email');
-
-                       // Use default SMTP data
-                       $smtpHost  = '{?SMTP_HOSTNAME?}';
-                       $smtpUser  = '{?SMTP_USER?}';
-                       $smtpPass1 = '{?SMTP_PASSWORD?}';
-                       $smtpPass2 = '{?SMTP_PASSWORD?}';
-
-                       // Overwrite it with the data from sent (failed) form
-                       if (isPostRequestElementSet('smtp_host')) $smtpHost = postRequestElement('smtp_host');
-                       if (isPostRequestElementSet('smtp_user')) $smtpUser = postRequestElement('smtp_user');
-                       if (isPostRequestElementSet('smtp_pass')) {
-                               $smtpPass1 = postRequestElement('smtp_pass');
-                               $smtpPass2 = postRequestElement('smtp_pass');
-                       } // END - if
-
-                       // Database login data
-                       $content['mysql_host']   = $GLOBALS['install_mysql']['host'];
-                       $content['mysql_dbase']  = $GLOBALS['install_mysql']['dbase'];
-                       $content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix'];
-                       $content['table_type']   = $GLOBALS['install_mysql']['type'];
-                       $content['mysql_login']  = $GLOBALS['install_mysql']['login'];
-                       $content['mysql_pass1']  = $GLOBALS['install_mysql']['pass1'];
-                       $content['mysql_pass2']  = $GLOBALS['install_mysql']['pass2'];
-
-                       // Set constants for SMTP data
-                       $content['smtp_host']  = $smtpHost;
-                       $content['smtp_user']  = $smtpUser;
-                       $content['smtp_pass1'] = $smtpPass1;
-                       $content['smtp_pass2'] = $smtpPass2;
-
-                       // Load template
-                       addTemplateToInstallContent('install_page3', $content);
-                       break;
-
-               case '5': // Misc settings
-                       // General settings
-                       $content['spath']  = postRequestElement('spath');
-                       $content['burl']   = postRequestElement('burl');
-                       $content['title']  = postRequestElement('title');
-                       $content['slogan'] = postRequestElement('slogan');
-                       $content['email']  = postRequestElement('email');
-
-                       // SMTP settings
-                       $content['smtp_host'] = postRequestElement('smtp_host');
-                       $content['smtp_user'] = postRequestElement('smtp_user');
-                       $content['smtp_pass'] = postRequestElement('smtp_pass1');
-
-                       // Database login data
-                       $OUT = '';
-                       foreach ($GLOBALS['install_mysql'] as $key => $value) {
-                               $OUT .= '    <input type="hidden" name="mysql[' . $key . ']" value="' . $value . '" />';
-                       } // END - foreach
-                       $content['mysql_hidden'] = $OUT;
-
-                       // Load template
-                       addTemplateToInstallContent('install_page5', $content);
-                       break;
-
-               case 'finalize': // Write captured data to files
-                       if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
-                               // You have submitted data then we have to reset the SQLs
-                               initSqls();
-
-                               /*
-                                * Restore PHPs error handler to prevent ours to handle errors,
-                                * e.g. failed connection attempts. We want to handle them on
-                                * our own.
-                                */
-                               restore_error_handler();
-
-                               // Connect to database server
-                               SQL_CONNECT($GLOBALS['install_mysql']['host'], $GLOBALS['install_mysql']['login'], $GLOBALS['install_mysql']['pass1'], __FILE__, __LINE__);
-
-                               // Is the link up?
-                               if (SQL_IS_LINK_UP()) {
-                                       // Seems to work, also right database?
-                                       if (SQL_SELECT_DB($GLOBALS['install_mysql']['dbase'], __FILE__, __LINE__) === true) {
-                                               // Check for dumps
-                                               if ((!isFileReadable(postRequestElement('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestElement('spath') . 'install/menu-'.getLanguage().'.sql'))) {
-                                                       // Installation area not found
-                                                       reportBug(__FILE__, __LINE__, 'SQL dumps not found. Please extract ALL files from the archive or checkout all files out from SVN.');
-                                                       return;
-                                               } // END - if
-
-                                               // Any errors detected?
-                                               if (!ifFatalErrorsDetected()) {
-                                                       // Set type, prefix from POST data and database name for later queries
-                                                       setConfigEntry('_TABLE_TYPE'  , postRequestElement('mysql', 'type'));
-                                                       setConfigEntry('_MYSQL_PREFIX', postRequestElement('mysql', 'prefix'));
-                                                       setConfigEntry('__DB_NAME'    , $GLOBALS['install_mysql']['dbase']);
-
-                                                       // Both exists so import them
-                                                       foreach (array('tables', 'menu-'.getLanguage()) as $dump) {
-                                                               // Should be save here because file_exists() is there but we check it again. :)
-                                                               $FQFN = postRequestElement('spath') . 'install/' . $dump . '.sql';
-
-                                                               // Is the file readable?
-                                                               if (isFileReadable($FQFN)) {
-                                                                       // Read the file
-                                                                       $fileContent = readSqlDump($FQFN);
-
-                                                                       // Split it up against ";\n" and merge it into existing SQLs
-                                                                       mergeSqls(explode(";\n", $fileContent), 'install');
-                                                               } else {
-                                                                       // Not readable!
-                                                                       reportBug(__FILE__, __LINE__, sprintf("SQL dump %s is not readable.", $dump));
-                                                               }
-                                                       } // END - foreach
-                                                       //* DEBUG: */ die(__FUNCTION__.'['.__LINE__.']:'<pre>'.print_r(getSqls(), true).'</pre>');
-
-                                                       // Are some SQLs found?
-                                                       if (countSqls() == 0) {
-                                                               // Abort here
-                                                               addFatalMessage(__FILE__, __LINE__, '{--INSTALLER_SQL_IMPORT_FAILED--}');
-                                                               return;
-                                                       } // END - if
-
-                                                       // Now run all queries through
-                                                       runFilterChain('run_sqls');
-
-                                                       // Copy the config template and verify it
-                                                       doInstallWriteLocalConfigurationFile(postRequestElement('spath'));
-                                               } // END - if
-                                       } // END - if
-                               } // END - if
-
-                               // Are some fatal errors there?
-                               if (ifFatalErrorsDetected()) {
-                                       $OUT = '';
-                                       foreach (getFatalArray() as $value) {
-                                               $OUT .= '    <li>' . $value . '</li>';
-                                       } // END foreach
-                                       $content['fatal_errors'] = $OUT;
-                                       $OUT = '';
-                                       foreach ($GLOBALS['install_mysql'] as $key => $value) {
-                                               $OUT .= '    <input type="hidden" name="mysql[' . $key . ']" value="' . $value . '" />';
-                                       } // END foreach
-                                       $content['mysql_hidden'] = $OUT;
-                                       $content['spath']      = postRequestElement('spath');
-                                       $content['burl']       = postRequestElement('burl');
-                                       $content['title']      = postRequestElement('title');
-                                       $content['smtp_host']  = postRequestElement('smtp_host');
-                                       $content['smtp_user']  = postRequestElement('smtp_user');
-                                       $content['smtp_pass']  = postRequestElement('smtp_pass1');
-
-                                       // Load template
-                                       addTemplateToInstallContent('install_fatal_errors', $content);
-
-                                       // We have handled all fatal errors here
-                                       initFatalMessages();
-                               } else {
-                                       // Register ext-sql_patches and ext-task
-                                       if ((registerExtension('sql_patches', NULL)) && (registerExtension('task', NULL))) {
-                                               // Installation is done!
-                                               redirectToUrl('install.php?install_page=finished');
-                                       } else {
-                                               // Something goes wrong on registration of ext-sql_patches
-                                               addFatalMessage(__FILE__, __LINE__, '{--INSTALLER_FINALIZER_CANNOT_REGISTER_SQL_PATCHES--}');
-                                       }
-                               }
-                       } else {
-                               // Something goes wrong during installation! :-(
-                               addFatalMessage(__FILE__, __LINE__, '{--INSTALLER_FINALIZER_FAILED--}');
-                       }
-                       break;
-
-               case 'finished':
-                       if (isInstalled()) {
-                               // Load template that we are finished
-                               addTemplateToInstallContent('install_finished');
-                       } else {
-                               // Not finished
-                               redirectToUrl('install.php');
-                       }
-                       break;
-
-               default:
-                       logDebugMessage(__FILE__, __LINE__, sprintf("Wrong install_page=%s detected", getRequestElement('install_page')));
-                       addTemplateToInstallContent('admin_settings_unsaved', '{--WRONG_PAGE--}');
-                       break;
-       } // END - switch
+       // Construct include file name
+       $inc = 'inc/install/install_page_' . getRequestElement('install_page');
+
+       // Is the include file there?
+       if (isIncludeReadable($inc)) {
+               // Then load it
+               loadIncludeOnce($inc);
+       } else {
+               // Not found, may be invalid page
+               logDebugMessage(__FILE__, __LINE__, sprintf("Wrong install_page=%s detected", getRequestElement('install_page')));
+               addTemplateToInstallContent('admin_settings_unsaved', '{--WRONG_PAGE--}');
+       }
 } else {
        // Already installed!
        addFatalMessage(__FILE__, __LINE__, '{--ALREADY_INSTALLED--}');
diff --git a/inc/install/install_page_1.php b/inc/install/install_page_1.php
new file mode 100644 (file)
index 0000000..3fc9df1
--- /dev/null
@@ -0,0 +1,47 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 10/02/2012 *
+ * ===================                          Last change: 10/02/2012 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : install-page_1.php                               *
+ * -------------------------------------------------------------------- *
+ * Short description : Installation page include file                   *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Include-Datei fuer Installationsseite            *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if ((!defined('__SECURITY')) || (!isInstallationPhase())) {
+       die();
+} // END - if
+
+// Load template content
+addTemplateToInstallContent('install_page1');
+
+// [EOF]
+?>
diff --git a/inc/install/install_page_2.php b/inc/install/install_page_2.php
new file mode 100644 (file)
index 0000000..e14e211
--- /dev/null
@@ -0,0 +1,78 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 10/02/2012 *
+ * ===================                          Last change: 10/02/2012 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : install-page_2.php                               *
+ * -------------------------------------------------------------------- *
+ * Short description : Installation page include file                   *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Include-Datei fuer Installationsseite            *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if ((!defined('__SECURITY')) || (!isInstallationPhase())) {
+       die();
+} // END - if
+
+// Prepare emissing elements
+if (empty($GLOBALS['install_mysql']['dbase']))  $GLOBALS['install_mysql']['dbase']  = 'your_database';
+if (empty($GLOBALS['install_mysql']['login']))  $GLOBALS['install_mysql']['login']  = 'your_login';
+if (empty($GLOBALS['install_mysql']['host']))   $GLOBALS['install_mysql']['host']   = 'localhost';
+if (empty($GLOBALS['install_mysql']['prefix'])) $GLOBALS['install_mysql']['prefix'] = 'mailer';
+if (empty($GLOBALS['install_mysql']['type']))   $GLOBALS['install_mysql']['type']   = 'MyISAM';
+
+// Are there errors?
+if (ifFatalErrorsDetected()) {
+       // Then list all
+       addToInstallContent('<div class="install_fatal"><ul>');
+       foreach (getFatalArray() as $key => $err) {
+               addToInstallContent('<li> {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '</li>');
+       } // END - foreach
+       addToInstallContent('</ol></div>');
+} // END - if
+
+// Prepare content array
+$content = array(
+       'mysql_host'   => $GLOBALS['install_mysql'['host',
+
+// [EOF]
+?>
+       'mysql_dbase'  => $GLOBALS['install_mysql'['dbase',
+       'mysql_prefix' => $GLOBALS['install_mysql'['prefix',
+       'mysql_login'  => $GLOBALS['install_mysql'['login',
+       'table_type'   => $GLOBALS['install_mysql'['type',
+       'spath'        => postRequestElement('spath'),
+       'burl'         => postRequestElement('burl'),
+       'title'        => postRequestElement('title'),
+       'slogan'       => postRequestElement('slogan'),
+       'email'        => postRequestElement('email')
+);
+
+// Load template
+addTemplateToInstallContent('install_page2', $content);
diff --git a/inc/install/install_page_3.php b/inc/install/install_page_3.php
new file mode 100644 (file)
index 0000000..2bdfb00
--- /dev/null
@@ -0,0 +1,83 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 10/02/2012 *
+ * ===================                          Last change: 10/02/2012 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : install-page_3.php                               *
+ * -------------------------------------------------------------------- *
+ * Short description : Installation page include file                   *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Include-Datei fuer Installationsseite            *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if ((!defined('__SECURITY')) || (!isInstallationPhase())) {
+       die();
+} // END - if
+
+// Set more values
+$content['spath']      = postRequestElement('spath');
+$content['burl']       = postRequestElement('burl');
+$content['title']      = postRequestElement('title');
+$content['slogan']     = postRequestElement('slogan');
+$content['email']      = postRequestElement('email');
+
+// Use default SMTP data
+$smtpHost  = '{?SMTP_HOSTNAME?}';
+$smtpUser  = '{?SMTP_USER?}';
+$smtpPass1 = '{?SMTP_PASSWORD?}';
+$smtpPass2 = '{?SMTP_PASSWORD?}';
+
+// Overwrite it with the data from sent (failed) form
+if (isPostRequestElementSet('smtp_host')) $smtpHost = postRequestElement('smtp_host');
+if (isPostRequestElementSet('smtp_user')) $smtpUser = postRequestElement('smtp_user');
+if (isPostRequestElementSet('smtp_pass')) {
+       $smtpPass1 = postRequestElement('smtp_pass');
+       $smtpPass2 = postRequestElement('smtp_pass');
+} // END - if
+
+// Database login data
+$content['mysql_host']   = $GLOBALS['install_mysql']['host'];
+$content['mysql_dbase']  = $GLOBALS['install_mysql']['dbase'];
+$content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix'];
+$content['table_type']   = $GLOBALS['install_mysql']['type'];
+$content['mysql_login']  = $GLOBALS['install_mysql']['login'];
+$content['mysql_pass1']  = $GLOBALS['install_mysql']['pass1'];
+$content['mysql_pass2']  = $GLOBALS['install_mysql']['pass2'];
+
+// Set constants for SMTP data
+$content['smtp_host']  = $smtpHost;
+$content['smtp_user']  = $smtpUser;
+$content['smtp_pass1'] = $smtpPass1;
+$content['smtp_pass2'] = $smtpPass2;
+
+// Load template
+addTemplateToInstallContent('install_page3', $content);
+
+// [EOF]
+?>
diff --git a/inc/install/install_page_5.php b/inc/install/install_page_5.php
new file mode 100644 (file)
index 0000000..d3aa53b
--- /dev/null
@@ -0,0 +1,66 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 10/02/2012 *
+ * ===================                          Last change: 10/02/2012 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : install-page_5.php                               *
+ * -------------------------------------------------------------------- *
+ * Short description : Installation page include file                   *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Include-Datei fuer Installationsseite            *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if ((!defined('__SECURITY')) || (!isInstallationPhase())) {
+       die();
+} // END - if
+
+// General settings
+$content['spath']  = postRequestElement('spath');
+$content['burl']   = postRequestElement('burl');
+$content['title']  = postRequestElement('title');
+$content['slogan'] = postRequestElement('slogan');
+$content['email']  = postRequestElement('email');
+
+// SMTP settings
+$content['smtp_host'] = postRequestElement('smtp_host');
+$content['smtp_user'] = postRequestElement('smtp_user');
+$content['smtp_pass'] = postRequestElement('smtp_pass1');
+
+// Database login data
+$OUT = '';
+foreach ($GLOBALS['install_mysql'] as $key => $value) {
+       $OUT .= '    <input type="hidden" name="mysql[' . $key . ']" value="' . $value . '" />';
+} // END - foreach
+$content['mysql_hidden'] = $OUT;
+
+// Load template
+addTemplateToInstallContent('install_page5', $content);
+
+// [EOF]
+?>
diff --git a/inc/install/install_page_finalize.php b/inc/install/install_page_finalize.php
new file mode 100644 (file)
index 0000000..5c1e09e
--- /dev/null
@@ -0,0 +1,151 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 10/02/2012 *
+ * ===================                          Last change: 10/02/2012 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : install-page_finalize.php                        *
+ * -------------------------------------------------------------------- *
+ * Short description : Installation page include file                   *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Include-Datei fuer Installationsseite            *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if ((!defined('__SECURITY')) || (!isInstallationPhase())) {
+       die();
+} // END - if
+
+// Check pre-conditions
+if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
+       // You have submitted data then we have to reset the SQLs
+       initSqls();
+
+       /*
+        * Restore PHPs error handler to prevent ours to handle errors,
+        * e.g. failed connection attempts. We want to handle them on
+        * our own.
+        */
+       restore_error_handler();
+
+       // Connect to database server
+       SQL_CONNECT($GLOBALS['install_mysql']['host'], $GLOBALS['install_mysql']['login'], $GLOBALS['install_mysql']['pass1'], __FILE__, __LINE__);
+
+       // Is the link up?
+       if (SQL_IS_LINK_UP()) {
+               // Seems to work, also right database?
+               if (SQL_SELECT_DB($GLOBALS['install_mysql']['dbase'], __FILE__, __LINE__) === true) {
+                       // Check for dumps
+                       if ((!isFileReadable(postRequestElement('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestElement('spath') . 'install/menu-'.getLanguage().'.sql'))) {
+                               // Installation area not found
+                               reportBug(__FILE__, __LINE__, 'SQL dumps not found. Please extract ALL files from the archive or checkout all files out from SVN.');
+                               return;
+                       } // END - if
+
+                       // Any errors detected?
+                       if (!ifFatalErrorsDetected()) {
+                               // Set type, prefix from POST data and database name for later queries
+                               setConfigEntry('_TABLE_TYPE'  , postRequestElement('mysql', 'type'));
+                               setConfigEntry('_MYSQL_PREFIX', postRequestElement('mysql', 'prefix'));
+                               setConfigEntry('__DB_NAME'    , $GLOBALS['install_mysql']['dbase']);
+
+                               // Both exists so import them
+                               foreach (array('tables', 'menu-'.getLanguage()) as $dump) {
+                                       // Should be save here because file_exists() is there but we check it again. :)
+                                       $FQFN = postRequestElement('spath') . 'install/' . $dump . '.sql';
+
+                                       // Is the file readable?
+                                       if (isFileReadable($FQFN)) {
+                                               // Read the file
+                                               $fileContent = readSqlDump($FQFN);
+
+                                               // Split it up against ";\n" and merge it into existing SQLs
+                                               mergeSqls(explode(";\n", $fileContent), 'install');
+                                       } else {
+                                               // Not readable!
+                                               reportBug(__FILE__, __LINE__, sprintf("SQL dump %s is not readable.", $dump));
+                                       }
+                               } // END - foreach
+                               //* DEBUG: */ die(__FUNCTION__.'['.__LINE__.']:'<pre>'.print_r(getSqls(), true).'</pre>');
+
+                               // Are some SQLs found?
+                               if (countSqls() == 0) {
+                                       // Abort here
+                                       addFatalMessage(__FILE__, __LINE__, '{--INSTALLER_SQL_IMPORT_FAILED--}');
+                                       return;
+                               } // END - if
+
+                               // Now run all queries through
+                               runFilterChain('run_sqls');
+
+                               // Copy the config template and verify it
+                               doInstallWriteLocalConfigurationFile(postRequestElement('spath'));
+                       } // END - if
+               } // END - if
+       } // END - if
+
+       // Are some fatal errors there?
+       if (ifFatalErrorsDetected()) {
+               $OUT = '';
+               foreach (getFatalArray() as $value) {
+                       $OUT .= '    <li>' . $value . '</li>';
+               } // END foreach
+               $content['fatal_errors'] = $OUT;
+               $OUT = '';
+               foreach ($GLOBALS['install_mysql'] as $key => $value) {
+                       $OUT .= '    <input type="hidden" name="mysql[' . $key . ']" value="' . $value . '" />';
+               } // END foreach
+               $content['mysql_hidden'] = $OUT;
+               $content['spath']      = postRequestElement('spath');
+               $content['burl']       = postRequestElement('burl');
+               $content['title']      = postRequestElement('title');
+               $content['smtp_host']  = postRequestElement('smtp_host');
+               $content['smtp_user']  = postRequestElement('smtp_user');
+               $content['smtp_pass']  = postRequestElement('smtp_pass1');
+
+               // Load template
+               addTemplateToInstallContent('install_fatal_errors', $content);
+
+               // We have handled all fatal errors here
+               initFatalMessages();
+       } else {
+               // Register ext-sql_patches and ext-task
+               if ((registerExtension('sql_patches', NULL)) && (registerExtension('task', NULL))) {
+                       // Installation is done!
+                       redirectToUrl('install.php?install_page=finished');
+               } else {
+                       // Something goes wrong on registration of ext-sql_patches
+                       addFatalMessage(__FILE__, __LINE__, '{--INSTALLER_FINALIZER_CANNOT_REGISTER_SQL_PATCHES--}');
+               }
+       }
+} else {
+       // Something goes wrong during installation! :-(
+       addFatalMessage(__FILE__, __LINE__, '{--INSTALLER_FINALIZER_FAILED--}');
+}
+
+// [EOF]
+?>
diff --git a/inc/install/install_page_finished.php b/inc/install/install_page_finished.php
new file mode 100644 (file)
index 0000000..518160d
--- /dev/null
@@ -0,0 +1,53 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 10/02/2012 *
+ * ===================                          Last change: 10/02/2012 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : install-page_finished.php                        *
+ * -------------------------------------------------------------------- *
+ * Short description : Installation page include file                   *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Include-Datei fuer Installationsseite            *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if ((!defined('__SECURITY')) || (!isInstallationPhase())) {
+       die();
+} // END - if
+
+// Is it finally installed?
+if (isInstalled()) {
+       // Load template that we are finished
+       addTemplateToInstallContent('install_finished');
+} else {
+       // Not finished
+       redirectToUrl('install.php');
+}
+
+// [EOF]
+?>
diff --git a/inc/install/install_page_welcome.php b/inc/install/install_page_welcome.php
new file mode 100644 (file)
index 0000000..a8defff
--- /dev/null
@@ -0,0 +1,47 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 10/02/2012 *
+ * ===================                          Last change: 10/02/2012 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : install-page_welcome.php                         *
+ * -------------------------------------------------------------------- *
+ * Short description : Installation page include file                   *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Include-Datei fuer Installationsseite            *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if ((!defined('__SECURITY')) || (!isInstallationPhase())) {
+       die();
+} // END - if
+
+// Add template content to output
+addTemplateToInstallContent('install_welcome');
+
+// [EOF]
+?>
index f5cde475e377dcee7fa52bd2edb0e2bcb75983c0..367dd7d49d4924f4012db42173982c061960123d 100644 (file)
@@ -42,7 +42,7 @@ if (!defined('__SECURITY')) {
 
 // Language definitions
 addMessages(array(
-       'GUEST_ACTIVE_LINK' => "Online Today",
+       'GUEST_ACTIVE_LINK' => "Online today",
        'GUEST_ACTIVE_NO_MEMER_ONLINE_TODAY' => "Today no member was online.",
        'GUEST_ACTIVE_HEADER' => "We were online today.",
        'GUEST_ACTIVE_FOOTER' => "These members were logged in at <strong>{?MAIN_TITLE?}</strong> today.",
index 76517e878ae3ad823cf96eca61ce17338b2be53b..47198036b3a42d15233f1b1e5da4505150a7711f 100644 (file)
@@ -205,7 +205,7 @@ addMessages(array(
        'FATAL_CANNOT_LOAD_CONFIG' => "Kann die Konfigurationsdaten nicht laden! Vermutlich richtet der Webmaster diesen {?mt_word?} gerade das Script erst ein! Bitte schauen Sie sp&auml;ter noch einmal vorbei.",
        'ADMIN_ACTION_INVALID' => "Die action/what-Kombination <span class=\"data\">%s</span> ist ung&uuml;ltig.",
        'GUEST_SHORT_PASS' => "Das eingegebene Passwort ist nach unseren Sicherheitseinstellungen zu kurz. Mindestl&auml;nge ist",
-       'GUEST_EMPTY_PASSWORD_HINT' => "Lassen Sie beide Passw&ouml;rter leer, so wird Ihnen eines per Zufall generiert.",
+       'GUEST_EMPTY_PASSWORD_HINT' => "Lassen Sie beide Passw&ouml;rter leer, so wird Ihnen eines generiert.",
        'ADMIN_CONFIG_POINTS_SETTINGS_TITLE' => "&Auml;ndern der Willkommensgutschrift und anderer {?POINTS?}",
        'ADMIN_ENTER_POINTS_REGISTER' => "Willkommensgutschrift",
        'ADMIN_ENTER_POINTS_REFERRAL' => "Einmalige Referral-Gutschrift",
@@ -881,7 +881,7 @@ addMessages(array(
        'ADMIN_LOGOUT_QUESTION' => "Wollen Sie sich jetzt ausloggen?",
        'ADMIN_LA_MODE' => "Men&uuml;typ",
        'ADMIN_ACCOUNT_NOREFS_404' => "Es wurden keine Mitgliederaccounts ohne Werber gefunden, oder ver&auml;ndern Sie die Aussortierung.",
-       'ADMIN_CONFIG_SALT_LENGTH' => "L&auml;nge des Zufallshashes f&uuml;r alle Passw&ouml;rter",
+       'ADMIN_CONFIG_SALT_LENGTH' => "L&auml;nge des &quot;Salz-Hhashes&quot; f&uuml;r alle Passw&ouml;rter",
        'MEMBER_PASS_SALTED' => "Passwort wegen Update ge&auml;ndert",
        'MEMBER_PASSWORD_ERROR' => "Fehler beim Abgleichen der Passw&ouml;rter.",
        'ADMIN_PASS_SALTED' => "Admin-Password wegen Update ge&auml;ndert",
@@ -1090,7 +1090,7 @@ addMessages(array(
        'ADMIN_CONFIG_RANDOM_REFID_ENABLED' => "Mitglieder per Zufall w&auml;hlen",
        'ADMIN_CONFIG_RANDOM_REFID_DISABLED' => "Voreingestellte Referral-Id setzen",
        'ADMIN_CONFIG_RANDOM_MIN_CONFIRMED' => "Wie viele Mails muss ein Mitglied mindestens best&auml;tigt haben, um per Zufall ausgew&auml;hlt zu werden?",
-       'ADMIN_CONFIG_REFID_NOTICE' => "Sobald ein Mitglied ausgew&auml;hlt wurde, werden die Z&auml;hler aller Mitglieder auf Null gesetzt. Dies soll Chancengleichheit bringen und dass die Mitglieder mehr Mails abklicken. Ist <strong>{--ADMIN_CONFIG_RANDOM_REFID_ENABLED--}</strong> ausgew&auml;hlt, wird die Einstellung <strong>Standard-Referral Id</strong> ignoriert.",
+       'ADMIN_CONFIG_REFID_NOTICE' => "Sobald ein Mitglied per (Pseudo-)Zufall ausgew&auml;hlt wurde, werden die Z&auml;hler aller Mitglieder auf Null gesetzt. Dies soll Chancengleichheit bringen und dass die Mitglieder mehr Mails abklicken. Ist <strong>{--ADMIN_CONFIG_RANDOM_REFID_ENABLED--}</strong> ausgew&auml;hlt, wird die Einstellung <strong>Standard-Referral Id</strong> ignoriert.",
 
        // Member mails: bonus/normal (click)
        'MEMBER_MAIL_BONUS_CONFIRMED_ON' => "Sie haben diese Bonusmail am|um <span class=\"data\">%s</span> best&auml;tigt.",