Forráskód Böngészése

Preparing for the integration of the version 2.0 of the setup.
Some changes to the application layout: logs now go to the ./log folder ./data should be used to store application's data.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@2189 a333f486-631f-4898-b8df-5754b55c2be0

dflaven 12 éve
szülő
commit
b5fd94cc0e

+ 17 - 3
core/cmdbsource.class.inc.php

@@ -57,7 +57,7 @@ class CMDBSource
 		self::$m_sDBUser = $sUser;
 		self::$m_sDBPwd = $sPwd;
 		self::$m_sDBName = $sSource;
-		if (!self::$m_resDBLink = mysqli_connect($sServer, $sUser, $sPwd))
+		if (!self::$m_resDBLink = @mysqli_connect($sServer, $sUser, $sPwd))
 		{
 			throw new MySQLException('Could not connect to the DB server', array('host'=>$sServer, 'user'=>$sUser));
 		}
@@ -174,12 +174,26 @@ class CMDBSource
 
 	public static function GetErrNo()
 	{
-		return mysqli_errno(self::$m_resDBLink);
+		if (self::$m_resDBLink)
+		{
+			return mysqli_errno(self::$m_resDBLink);
+		}
+		else
+		{
+			return mysqli_connect_errno();
+		}
 	}
 
 	public static function GetError()
 	{
-		return mysqli_error(self::$m_resDBLink);
+		if (self::$m_resDBLink)
+		{
+			return mysqli_error(self::$m_resDBLink);
+		}
+		else
+		{
+			return mysqli_connect_error();
+		}
 	}
 
 	public static function DBHost() {return self::$m_sDBHost;}

+ 126 - 0
datamodel/installation.xml

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<installation>
+<steps type="array">
+	<step>
+		<title>Configuration Management options</title>
+		<description><![CDATA[<h2>The options below allow you to configure the type of elements that are to be managed inside iTop.</h2>]]></description>
+		<banner>/images/modules.png</banner>
+		<options type="array">
+			<choice>
+				<title>Configuration Management Base</title>
+				<description>This module is always installed, it contains all the base objects that are mandatory in the iTop CMDB: Organizations, Locations, Teams, Persons, etc.</description>
+				<modules type="array">
+					<module>itop-config-mgmt</module>
+					<module>itop-profiles</module>
+					<module>itop-welcome-itil</module>
+				</modules>
+				<mandatory>true</mandatory>
+			</choice>
+			<choice>
+				<title>End-User Devices</title>
+				<description>This optional module manages end-user devices like Phones, Printers, Desktop PCs.</description>
+				<modules type="array">
+					<module>cmdb-end-user</module>
+				</modules>
+			</choice>
+			<choice>
+				<title>Data Center Management</title>
+				<description>This optional modules manages data center devices like Power Supplies, Racks, Enclosures.</description>
+				<default>true</default>
+				<modules type="array">
+					<module>cmdb-datacenter</module>
+				</modules>
+			</choice>
+		</options>
+	</step>
+	<step>
+		<title>Service Management options</title>
+		<description><![CDATA[<h2>Select the choice that best describes the relationships between the services and the IT infrastructure in your IT environment.</h2>]]></description>
+		<banner>./wizard_icons/service.png</banner>
+		<alternatives type="array">
+			<choice>
+				<title>Service Management for Enterprises</title>
+				<description>Select this option if the IT delivers services based on a shared infrastructure. For example if different organizations within your company subscribe to services (like Mail and Print services) delivered by a single shared backend.</description>
+				<modules type="array">
+					<module>itop-service-mgmt-enterprise</module>
+				</modules>
+				<default>true</default>
+			</choice>
+			<choice>
+				<title>Service Management for Service Providers</title>
+				<description>Select this option if the IT manages the infrastructure of independent customers. This is the most flexible model, since the services can be delivered with a mix of shared and customer specific infrastructure devices.</description>
+				<modules type="array">
+					<module>itop-service-mgmt-provider</module>
+				</modules>
+			</choice>
+		</alternatives>
+	</step>
+	<step>
+		<title>Incident Management options</title>
+		<description>Select the type of tickets you want to use in order to respond to user requests and incidents.</description>
+		<banner></banner>
+		<alternatives type="array">
+			<choice>
+				<title>Simple Ticket Management</title>
+				<description>Select this option to use one single type of tickets for all kind of requests.</description>
+				<modules type="array">
+					<module>itop-simple-tickets</module>
+				</modules>
+				<default>true</default>
+			</choice>
+			<choice>
+				<title>ITIL Compliant Tickets Management</title>
+				<description>Select this option to have different types of ticket for managing user requests and incidents.</description>
+				<modules type="array">
+					<module>itop-itil-tickets</module>
+				</modules>
+				<sub_options>
+					<options type="array">
+						<choice>
+							<title>Problem Management</title>
+							<description>Manage problem ticket to solve recurring incidents.</description>
+							<modules type="array">
+								<module>itop-problem-management</module>
+							</modules>
+						</choice>
+						<choice>
+							<title>Known Error Database</title>
+							<description>Manage Known Error tickets to document the possible root causes of incidents.</description>
+							<modules type="array">
+								<module>itop-kedb-management</module>
+							</modules>
+						</choice>
+					</options>
+				</sub_options>
+			</choice>
+			<choice>
+				<title>None</title>
+				<description>Don't manage incidents in iTop</description>
+				<modules type="array">
+				</modules>
+			</choice>
+		</alternatives>
+	</step>
+	<step>
+		<title>Change Management options</title>
+		<description><![CDATA[<h2>Select the type of tickets you want to use in order to manage changes to the IT infrastructure.</h2>]]></description>
+		<banner>./itop-change-mgmt-1.0.0/images/change.png</banner>
+		<alternatives type="array">
+			<choice>
+				<title>ITIL Change Management</title>
+				<description>Select this option to use Normal/Routine/Emergency change tickets.</description>
+				<modules type="array">
+					<module>itop-change-mgmt</module>
+				</modules>
+				<default>true</default>
+			</choice>
+			<choice>
+				<title>None</title>
+				<description>Don't manage changes in iTop</description>
+				<modules type="array">
+				</modules>
+			</choice>
+		</alternatives>
+	</step>
+</steps>
+</installation>

BIN
datamodel/wizard_icons/service.png


BIN
images/modules.png


+ 3 - 1
setup/ajax.dataloader.php

@@ -121,7 +121,6 @@ require_once(APPROOT.'/core/kpi.class.inc.php');
 require_once(APPROOT.'/core/cmdbsource.class.inc.php');
 require_once('./xmldataloader.class.inc.php');
 require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');
-require_once(APPROOT.'/setup/wizardcontroller.class.inc.php');
 
 
 // Never cache this page
@@ -137,6 +136,9 @@ try
 	switch($sOperation)
 	{
 		case 'async_action':
+		require_once(APPROOT.'/setup/wizardcontroller.class.inc.php');
+		require_once(APPROOT.'/setup/wizardsteps.class.inc.php');
+		
 		$sClass = utils::ReadParam('step_class', '');
 		$sState = utils::ReadParam('step_state', '');
 		$sActionCode = utils::ReadParam('code', '');

+ 13 - 3
setup/applicationinstaller.class.inc.php

@@ -42,6 +42,7 @@ class ApplicationInstaller
 	const INFO = 4;
 	
 	protected $oParams;
+	protected static $bMetaModelStarted = false;
 	
 	public function __construct($oParams)
 	{
@@ -260,6 +261,7 @@ class ApplicationInstaller
 				$sDBPwd = $aDBParams['pwd'];
 				$sDBName = $aDBParams['name'];
 				$sDBPrefix = $aDBParams['prefix'];
+				$aFiles = $this->oParams->Get('files', array());
 				
 				self::DoLoadFiles($aSelectedModules, $sTargetDir, $sDBServer, $sDBUser, $sDBPwd, $sDBName, $sDBPrefix, $sTargetEnvironment);
 				
@@ -466,6 +468,7 @@ class ApplicationInstaller
 
 		$oProductionEnv = new RunTimeEnvironment($sTargetEnvironment);
 		$oProductionEnv->InitDataModel($oConfig, false);  // load data model and connect to the database
+		self::$bMetaModelStarted = true; // No need to reload the final MetaModel in case the installer runs synchronously 
 		
 		// Perform here additional DB setup... profiles, etc...
 		//
@@ -578,15 +581,21 @@ class ApplicationInstaller
 			'db_user' => $sDBUser,
 			'db_pwd' => $sDBPwd,
 			'db_name' => $sDBName,
+			'new_db_name' => $sDBName,
 			'db_prefix' => $sDBPrefix,
 		);
 		$oConfig = new Config();
 
 		$oConfig->UpdateFromParams($aParamValues, $sModulesDir);
 
-		//TODO: load the MetaModel if needed (async mode)
-		//$oProductionEnv = new RunTimeEnvironment($sTargetEnvironment);
-		//$oProductionEnv->InitDataModel($oConfig, false);  // load data model and connect to the database
+		//Load the MetaModel if needed (asynchronous mode)
+		if (!self::$bMetaModelStarted)
+		{
+			$oProductionEnv = new RunTimeEnvironment($sTargetEnvironment);
+			$oProductionEnv->InitDataModel($oConfig, false);  // load data model and connect to the database
+			self::$bMetaModelStarted = true; // No need to reload the final MetaModel in case the installer runs synchronously
+		} 
+		
 		
 		$oDataLoader = new XMLDataLoader(); 
 		$oChange = MetaModel::NewObject("CMDBChange");
@@ -639,6 +648,7 @@ class ApplicationInstaller
 			'db_user' => $sDBUser,
 			'db_pwd' => $sDBPwd,
 			'db_name' => $sDBName,
+			'new_db_name' => $sDBName,
 			'db_prefix' => $sDBPrefix,
 			'application_path' => $sUrl,
 			'mode' => $sMode,

+ 34 - 0
setup/index-new.php

@@ -0,0 +1,34 @@
+<?php
+// Copyright (C) 2010 Combodo SARL
+//
+//   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; version 3 of the License.
+//
+//   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+/**
+ * Wizard to configure and initialize the iTop application
+ *
+ * @author      Erwan Taloc <erwan.taloc@combodo.com>
+ * @author      Romain Quetiez <romain.quetiez@combodo.com>
+ * @author      Denis Flaven <denis.flaven@combodo.com>
+ * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
+require_once('../approot.inc.php');
+require_once(APPROOT.'/application/utils.inc.php');
+require_once(APPROOT.'/core/config.class.inc.php');
+require_once(APPROOT.'/setup/setuppage.class.inc.php');
+require_once(APPROOT.'/setup/wizardcontroller.class.inc.php');
+require_once(APPROOT.'/setup/wizardsteps.class.inc.php');
+
+$oWizard = new WizardController('WizStepWelcome');
+$oWizard->Run();

+ 925 - 0
setup/licenses/community-licences.xml

@@ -0,0 +1,925 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<licenses>
+	<license>
+		<product>iTop</product>
+		<author>Combodo SARL</author>
+		<license_type>GPL v3</license_type>
+		<text><![CDATA[<h3 style="text-align: center;">GNU GENERAL PUBLIC LICENSE</h3>
+<p style="text-align: center;">Version 3, 29 June 2007</p>
+
+<p>Copyright &copy; 2007 Free Software Foundation, Inc.
+ &lt;<a href="http://fsf.org/">http://fsf.org/</a>&gt;</p><p>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.</p>
+
+<h3><a name="preamble"></a>Preamble</h3>
+
+<p>The GNU General Public License is a free, copyleft license for
+software and other kinds of works.</p>
+
+<p>The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.</p>
+
+<p>When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.</p>
+
+<p>To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.</p>
+
+<p>For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.</p>
+
+<p>Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.</p>
+
+<p>For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.</p>
+
+<p>Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.</p>
+
+<p>Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.</p>
+
+<p>The precise terms and conditions for copying, distribution and
+modification follow.</p>
+
+<h3><a name="terms"></a>TERMS AND CONDITIONS</h3>
+
+<h4><a name="section0"></a>0. Definitions.</h4>
+
+<p>&ldquo;This License&rdquo; refers to version 3 of the GNU General Public License.</p>
+
+<p>&ldquo;Copyright&rdquo; also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.</p>
+ 
+<p>&ldquo;The Program&rdquo; refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as &ldquo;you&rdquo;.  &ldquo;Licensees&rdquo; and
+&ldquo;recipients&rdquo; may be individuals or organizations.</p>
+
+<p>To &ldquo;modify&rdquo; a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a &ldquo;modified version&rdquo; of the
+earlier work or a work &ldquo;based on&rdquo; the earlier work.</p>
+
+<p>A &ldquo;covered work&rdquo; means either the unmodified Program or a work based
+on the Program.</p>
+
+<p>To &ldquo;propagate&rdquo; a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.</p>
+
+<p>To &ldquo;convey&rdquo; a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.</p>
+
+<p>An interactive user interface displays &ldquo;Appropriate Legal Notices&rdquo;
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.</p>
+
+<h4><a name="section1"></a>1. Source Code.</h4>
+
+<p>The &ldquo;source code&rdquo; for a work means the preferred form of the work
+for making modifications to it.  &ldquo;Object code&rdquo; means any non-source
+form of a work.</p>
+
+<p>A &ldquo;Standard Interface&rdquo; means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.</p>
+
+<p>The &ldquo;System Libraries&rdquo; of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+&ldquo;Major Component&rdquo;, in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.</p>
+
+<p>The &ldquo;Corresponding Source&rdquo; for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.</p>
+
+<p>The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.</p>
+
+<p>The Corresponding Source for a work in source code form is that
+same work.</p>
+
+<h4><a name="section2"></a>2. Basic Permissions.</h4>
+
+<p>All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.</p>
+
+<p>You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.</p>
+
+<p>Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.</p>
+
+<h4><a name="section3"></a>3. Protecting Users' Legal Rights From Anti-Circumvention Law.</h4>
+
+<p>No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.</p>
+
+<p>When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.</p>
+
+<h4><a name="section4"></a>4. Conveying Verbatim Copies.</h4>
+
+<p>You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.</p>
+
+<p>You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.</p>
+
+<h4><a name="section5"></a>5. Conveying Modified Source Versions.</h4>
+
+<p>You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:</p>
+
+<ul>
+<li>a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.</li>
+
+<li>b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    &ldquo;keep intact all notices&rdquo;.</li>
+
+<li>c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.</li>
+
+<li>d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.</li>
+</ul>
+
+<p>A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+&ldquo;aggregate&rdquo; if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.</p>
+
+<h4><a name="section6"></a>6. Conveying Non-Source Forms.</h4>
+
+<p>You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:</p>
+
+<ul>
+<li>a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.</li>
+
+<li>b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.</li>
+
+<li>c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.</li>
+
+<li>d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.</li>
+
+<li>e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.</li>
+</ul>
+
+<p>A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.</p>
+
+<p>A &ldquo;User Product&rdquo; is either (1) a &ldquo;consumer product&rdquo;, which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, &ldquo;normally used&rdquo; refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.</p>
+
+<p>&ldquo;Installation Information&rdquo; for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.</p>
+
+<p>If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).</p>
+
+<p>The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.</p>
+
+<p>Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.</p>
+
+<h4><a name="section7"></a>7. Additional Terms.</h4>
+
+<p>&ldquo;Additional permissions&rdquo; are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.</p>
+
+<p>When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.</p>
+
+<p>Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:</p>
+
+<ul>
+<li>a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or</li>
+
+<li>b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or</li>
+
+<li>c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or</li>
+
+<li>d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or</li>
+
+<li>e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or</li>
+
+<li>f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.</li>
+</ul>
+
+<p>All other non-permissive additional terms are considered &ldquo;further
+restrictions&rdquo; within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.</p>
+
+<p>If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.</p>
+
+<p>Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.</p>
+
+<h4><a name="section8"></a>8. Termination.</h4>
+
+<p>You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).</p>
+
+<p>However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.</p>
+
+<p>Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.</p>
+
+<p>Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.</p>
+
+<h4><a name="section9"></a>9. Acceptance Not Required for Having Copies.</h4>
+
+<p>You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.</p>
+
+<h4><a name="section10"></a>10. Automatic Licensing of Downstream Recipients.</h4>
+
+<p>Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.</p>
+
+<p>An &ldquo;entity transaction&rdquo; is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.</p>
+
+<p>You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.</p>
+
+<h4><a name="section11"></a>11. Patents.</h4>
+
+<p>A &ldquo;contributor&rdquo; is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's &ldquo;contributor version&rdquo;.</p>
+
+<p>A contributor's &ldquo;essential patent claims&rdquo; are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, &ldquo;control&rdquo; includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.</p>
+
+<p>Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.</p>
+
+<p>In the following three paragraphs, a &ldquo;patent license&rdquo; is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To &ldquo;grant&rdquo; such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.</p>
+
+<p>If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  &ldquo;Knowingly relying&rdquo; means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.</p>
+  
+<p>If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.</p>
+
+<p>A patent license is &ldquo;discriminatory&rdquo; if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.</p>
+
+<p>Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.</p>
+
+<h4><a name="section12"></a>12. No Surrender of Others' Freedom.</h4>
+
+<p>If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.</p>
+
+<h4><a name="section13"></a>13. Use with the GNU Affero General Public License.</h4>
+
+<p>Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.</p>
+
+<h4><a name="section14"></a>14. Revised Versions of this License.</h4>
+
+<p>The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.</p>
+
+<p>Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License &ldquo;or any later version&rdquo; applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.</p>
+
+<p>If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.</p>
+
+<p>Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.</p>
+
+<h4><a name="section15"></a>15. Disclaimer of Warranty.</h4>
+
+<p>THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &ldquo;AS IS&rdquo; WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</p>
+
+<h4><a name="section16"></a>16. Limitation of Liability.</h4>
+
+<p>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.</p>
+
+<h4><a name="section17"></a>17. Interpretation of Sections 15 and 16.</h4>
+
+<p>If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.</p>
+
+<p>END OF TERMS AND CONDITIONS</p>
+
+<h3><a name="howto"></a>How to Apply These Terms to Your New Programs</h3>
+
+<p>If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.</p>
+
+<p>To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the &ldquo;copyright&rdquo; line and a pointer to where the full notice is found.</p>
+
+<pre>    &lt;one line to give the program's name and a brief idea of what it does.&gt;
+    Copyright (C) &lt;year&gt;  &lt;name of author&gt;
+
+    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 3 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, see &lt;http://www.gnu.org/licenses/&gt;.
+</pre>
+
+<p>Also add information on how to contact you by electronic and paper mail.</p>
+
+<p>If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:</p>
+
+<pre>    &lt;program&gt;  Copyright (C) &lt;year&gt;  &lt;name of author&gt;
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+</pre>
+
+<p>The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an &ldquo;about box&rdquo;.</p>
+
+<p>You should also get your employer (if you work as a programmer) or school,
+if any, to sign a &ldquo;copyright disclaimer&rdquo; for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+&lt;<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>&gt;.</p>
+
+<p>The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+&lt;<a href="http://www.gnu.org/philosophy/why-not-lgpl.html">http://www.gnu.org/philosophy/why-not-lgpl.html</a>&gt;.</p>]]></text>
+	</license>
+	<license>
+		<product>jQuery, jQuery UI</product>
+		<author>the jQuery Foundation</author>
+		<license_type>MIT</license_type>
+		<text><![CDATA[<pre>Copyright 2012 jQuery Foundation and other contributors
+http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</pre>]]></text>
+	</license>
+	<license>
+		<product>The jQuery tooltip plugin</product>
+		<author>Craig Thompson</author>
+		<license_type>MIT</license_type>
+		<text><![CDATA[<pre>Copyright 2011 Craig Thomson
+		
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</pre>]]></text>
+	</license>
+	<license>
+		<product>Swift Mailer</product>
+		<author>Chris Corbyn</author>
+		<license_type>LGPL v3</license_type>
+		<text><![CDATA[
+<h3 style="text-align: center;">GNU LESSER GENERAL PUBLIC LICENSE</h3>
+<p style="text-align: center;">Version 3, 29 June 2007</p>
+
+<p>Copyright &copy; 2007 Free Software Foundation, Inc.
+ &lt;<a href="http://fsf.org/">http://fsf.org/</a>&gt;</p><p>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.</p>
+
+<p>This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.</p>
+
+<h4><a name="section0"></a>0. Additional Definitions.</h4>
+
+<p>As used herein, &ldquo;this License&rdquo; refers to version 3 of the GNU Lesser
+General Public License, and the &ldquo;GNU GPL&rdquo; refers to version 3 of the GNU
+General Public License.</p>
+
+<p>&ldquo;The Library&rdquo; refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.</p>
+
+<p>An &ldquo;Application&rdquo; is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.</p>
+
+<p>A &ldquo;Combined Work&rdquo; is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the &ldquo;Linked
+Version&rdquo;.</p>
+
+<p>The &ldquo;Minimal Corresponding Source&rdquo; for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.</p>
+
+<p>The &ldquo;Corresponding Application Code&rdquo; for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.</p>
+
+<h4><a name="section1"></a>1. Exception to Section 3 of the GNU GPL.</h4>
+
+<p>You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.</p>
+
+<h4><a name="section2"></a>2. Conveying Modified Versions.</h4>
+
+<p>If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:</p>
+
+<ul>
+<li>a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or</li>
+
+<li>b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.</li>
+</ul>
+
+<h4><a name="section3"></a>3. Object Code Incorporating Material from Library Header Files.</h4>
+
+<p>The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:</p>
+
+<ul>
+<li>a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.</li>
+
+<li>b) Accompany the object code with a copy of the GNU GPL and this license
+   document.</li>
+</ul>
+
+<h4><a name="section4"></a>4. Combined Works.</h4>
+
+<p>You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:</p>
+
+<ul>
+<li>a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.</li>
+
+<li>b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.</li>
+
+<li>c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.</li>
+
+<li>d) Do one of the following:
+
+<ul>
+<li>0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.</li>
+
+<li>1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.</li>
+</ul></li>
+
+<li>e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)</li>
+</ul>
+
+<h4><a name="section5"></a>5. Combined Libraries.</h4>
+
+<p>You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:</p>
+
+<ul>
+<li>a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.</li>
+
+<li>b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.</li>
+</ul>
+
+<h4><a name="section6"></a>6. Revised Versions of the GNU Lesser General Public License.</h4>
+
+<p>The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.</p>
+
+<p>Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License &ldquo;or any later version&rdquo;
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.</p>
+
+<p>If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.</p>
+		]]></text>
+	</license>
+</licenses>
+

+ 18 - 13
setup/parameters.class.inc.php

@@ -6,17 +6,12 @@ class InvalidParameterException extends Exception
 abstract class Parameters
 {
 	protected $aData = null;
-	protected $sParametersFile = null;
 	
-	public function __construct($sParametersFile)
+	public function __construct()
 	{
 		$this->aData = null;
-		$this->sParametersFile = $sParametersFile;
-		$this->Load($sParametersFile);
 	}
 
-	abstract public function Load($sParametersFile);
-
 	public function Get($sCode, $default = '')
 	{
 		if (array_key_exists($sCode, $this->aData))
@@ -29,7 +24,12 @@ abstract class Parameters
 
 class PHPParameters extends Parameters
 {
-	public function Load($sParametersFile)
+	public function LoadFromHash($aData)
+	{
+		$this->aData = $aData;
+	}
+	
+	public function LoadFromFile($sParametersFile)
 	{
 		if ($this->aData == null)
 		{
@@ -41,14 +41,21 @@ class PHPParameters extends Parameters
 
 class XMLParameters extends Parameters
 {
-	protected $aData = null;
-
-	public function Load($sParametersFile)
+	protected $sParametersFile;
+	
+	public function __construct($sParametersFile)
+	{
+		parent::__construct();
+		$this->LoadFromFile($sParametersFile);
+	}
+	
+	public function LoadFromFile($sParametersFile)
 	{
+		$this->sParametersFile = $sParametersFile;
 		if ($this->aData == null)
 		{
 			libxml_use_internal_errors(true);
-			$oXML = @simplexml_load_file($sParametersFile);
+			$oXML = @simplexml_load_file($this->sParametersFile);
 			if (!$oXML)
 			{
 				$aMessage = array();
@@ -134,5 +141,3 @@ class XMLParameters extends Parameters
 		return $sRet;
 	}
 }
-
-

+ 1 - 0
setup/runtimeenv.class.inc.php

@@ -159,6 +159,7 @@ class RunTimeEnvironment
 	
 		try
 		{
+			require_once(APPROOT.'/core/cmdbsource.class.inc.php');
 			CMDBSource::Init($oConfig->GetDBHost(), $oConfig->GetDBUser(), $oConfig->GetDBPwd(), $oConfig->GetDBName());
 			$aSelectInstall = CMDBSource::QueryToArray("SELECT * FROM ".$oConfig->GetDBSubname()."priv_module_install");
 		}

+ 40 - 1
setup/setup.js

@@ -337,14 +337,53 @@ function GetSelectedModules()
 	return aModules.join(',');
 }
 
-function WizardAsyncAction(sActionCode, oParams)
+function WizardAsyncAction(sActionCode, oParams, OnErrorFunction)
 {
 	var sStepClass = $('#_class').val();
 	var sStepState = $('#_state').val();
 	
 	var oMap = { operation: 'async_action', step_class: sStepClass, step_state: sStepState, code: sActionCode, params: oParams };
 	
+	var ErrorFn = OnErrorFunction;
+	$(document).ajaxError(function(event, request, settings) {
+		$('#async_action').html('<pre>'+request.responseText+'</pre>').show();
+		if (ErrorFn)
+		{
+			ErrorFn();
+		}
+	});
+	
 	$.post(GetAbsoluteUrlAppRoot()+'setup/ajax.dataloader.php', oMap, function(data) {
 		$('#async_action').html(data);
 	});
 }
+
+function WizardUpdateButtons()
+{
+	if (CanMoveForward())
+	{
+		$("#btn_next").removeAttr("disabled");
+	}
+	else
+	{
+		$("#btn_next").attr("disabled", "disabled");		
+	}
+
+	if (CanMoveBackward())
+	{
+		$("#btn_back").removeAttr("disabled");
+	}
+	else
+	{
+		$("#btn_back").attr("disabled", "disabled");		
+	}
+}
+
+function ExecuteStep(sStep)
+{
+	var oParams = { installer_step: sStep, installer_config: $('#installer_parameters').val() };
+	WizardAsyncAction('execute_step', oParams, function() {
+		$('#wiz_form').data('installation_status', 'error');
+		WizardUpdateButtons();
+	} );
+}

+ 1 - 1
setup/setuppage.class.inc.php

@@ -27,7 +27,7 @@ require_once(APPROOT."/application/nicewebpage.class.inc.php");
 require_once(APPROOT."setup/modulediscovery.class.inc.php");
 require_once(APPROOT."setup/runtimeenv.class.inc.php");
 
-define('INSTALL_LOG_FILE', APPROOT.'/setup.log');
+define('INSTALL_LOG_FILE', APPROOT.'/log/setup.log');
 
 date_default_timezone_set('Europe/Paris');
 class SetupPage extends NiceWebPage

+ 498 - 98
setup/setuputils.class.inc.php

@@ -28,11 +28,11 @@ class CheckResult
 	const ERROR = 0;
 	const WARNING = 1;
 	const INFO = 2;
-	
+
 	public $iSeverity;
 	public $sLabel;
 	public $sDescription;
-	
+
 	public function __construct($iSeverity, $sLabel, $sDescription = '')
 	{
 		$this->iSeverity = $iSeverity;
@@ -56,7 +56,7 @@ class SetupUtils
 	const MYSQL_MIN_VERSION = '5.0.0';
 	const MIN_MEMORY_LIMIT = 33554432; // = 32*1024*1024 Beware: Computations are not allowed in defining constants
 	const SUHOSIN_GET_MAX_VALUE_LENGTH = 2048;
-	
+
 	/**
 	 * Check the version of PHP, the needed PHP extension and a number
 	 * of configuration parameters (memory_limit, max_upload_file_size, etc...)
@@ -66,18 +66,15 @@ class SetupUtils
 	static function CheckPHPVersion()
 	{
 		$aResult = array();
-		$aErrors = array();
-		$aWarnings = array();
-		$aOk = array();
-		
+
 		SetupPage::log('Info - CheckPHPVersion');
 		if (version_compare(phpversion(), self::PHP_MIN_VERSION, '>='))
 		{
-			$aResult[] = new CheckResult(CheckResult::INFO, "The current PHP Version (".phpversion().") is greater than the minimum required version (".self::PHP_MIN_VERSION.")");
+			$aResult[] = new CheckResult(CheckResult::INFO, "The current PHP Version (".phpversion().") is greater than the minimum version required to run ".ITOP_APPLICATION.", which is (".self::PHP_MIN_VERSION.")");
 		}
 		else
 		{
-			$aResult[] = new CheckResult(CheckResult::ERROR, "Error: The current PHP Version (".phpversion().") is lower than the minimum required version (".self::PHP_MIN_VERSION.")");
+			$aResult[] = new CheckResult(CheckResult::ERROR, "Error: The current PHP Version (".phpversion().") is lower than the minimum version required to run ".ITOP_APPLICATION.", which is (".self::PHP_MIN_VERSION.")");
 		}
 		$aMandatoryExtensions = array('mysqli', 'iconv', 'simplexml', 'soap', 'hash', 'json', 'session', 'pcre', 'dom');
 		$aOptionalExtensions = array('mcrypt' => 'Strong encryption will not be used.',
@@ -140,15 +137,15 @@ class SetupUtils
 			// Other included/scanned files
 			if ($sFileList = php_ini_scanned_files())
 			{
-			    if (strlen($sFileList) > 0)
-			    {
-			        $aFiles = explode(',', $sFileList);
-			
-			        foreach ($aFiles as $sFile)
-			        {
-			            $sPhpIniFile .= ', '.trim($sFile);
-			        }
-			    }
+				if (strlen($sFileList) > 0)
+				{
+					$aFiles = explode(',', $sFileList);
+
+					foreach ($aFiles as $sFile)
+					{
+						$sPhpIniFile .= ', '.trim($sFile);
+					}
+				}
 			}
 			SetupPage::log("Info - php.ini file(s): '$sPhpIniFile'");
 		}
@@ -156,26 +153,26 @@ class SetupUtils
 		{
 			$sPhpIniFile = 'php.ini';
 		}
-	  	if (!ini_get('file_uploads'))
-	  	{
+		if (!ini_get('file_uploads'))
+		{
 			$aResult[] = new CheckResult(CheckResult::ERROR, "Files upload is not allowed on this server (file_uploads = ".ini_get('file_uploads').").");
 		}
-	
+
 		$sUploadTmpDir = self::GetUploadTmpDir();
 		if (empty($sUploadTmpDir))
 		{
-	      $sUploadTmpDir = '/tmp';
+			$sUploadTmpDir = '/tmp';
 			$aResult[] = new CheckResult(CheckResult::WARNING, "Temporary directory for files upload is not defined (upload_tmp_dir), assuming that $sUploadTmpDir is used.");
 		}
 		// check that the upload directory is indeed writable from PHP
-	  	if (!empty($sUploadTmpDir))
-	  	{
-	  		if (!file_exists($sUploadTmpDir))
-	  		{
+		if (!empty($sUploadTmpDir))
+		{
+			if (!file_exists($sUploadTmpDir))
+			{
 				$aResult[] = new CheckResult(CheckResult::ERROR, "Temporary directory for files upload ($sUploadTmpDir) does not exist or cannot be read by PHP.");
 			}
-	  		else if (!is_writable($sUploadTmpDir))
-	  		{
+			else if (!is_writable($sUploadTmpDir))
+			{
 				$aResult[] = new CheckResult(CheckResult::ERROR, "Temporary directory for files upload ($sUploadTmpDir) is not writable.");
 			}
 			else
@@ -183,49 +180,49 @@ class SetupUtils
 				SetupPage::log("Info - Temporary directory for files upload ($sUploadTmpDir) is writable.");
 			}
 		}
-		
-	
-	  	if (!ini_get('upload_max_filesize'))
-	  	{
+
+
+		if (!ini_get('upload_max_filesize'))
+		{
 			$aResult[] = new CheckResult(CheckResult::ERROR, "File upload is not allowed on this server (upload_max_filesize = ".ini_get('upload_max_filesize').").");
-	  	}
-	
+		}
+
 		$iMaxFileUploads = ini_get('max_file_uploads');
-	  	if (!empty($iMaxFileUploads) && ($iMaxFileUploads < 1))
-	  	{
+		if (!empty($iMaxFileUploads) && ($iMaxFileUploads < 1))
+		{
 			$aResult[] = new CheckResult(CheckResult::ERROR, "File upload is not allowed on this server (max_file_uploads = ".ini_get('max_file_uploads').").");
 		}
-		
+
 		$iMaxUploadSize = utils::ConvertToBytes(ini_get('upload_max_filesize'));
 		$iMaxPostSize = utils::ConvertToBytes(ini_get('post_max_size'));
-	
+
 		if ($iMaxPostSize <= $iMaxUploadSize)
 		{
-			$aResult[] = new CheckResult(CheckResult::WARNING, "post_max_size (".ini_get('post_max_size').") must be bigger than upload_max_filesize (".ini_get('upload_max_filesize')."). You may want to check the PHP configuration file(s): '$sPhpIniFile'. Be aware that this setting can also be overridden in the apache configuration.");
+			$aResult[] = new CheckResult(CheckResult::WARNING, "post_max_size (".ini_get('post_max_size').") in php.ini should be bigger than upload_max_filesize (".ini_get('upload_max_filesize').") otherwise you cannot upload files of the maximun size.");
 		}
-	
-	
+
+
 		SetupPage::log("Info - upload_max_filesize: ".ini_get('upload_max_filesize'));
 		SetupPage::log("Info - post_max_size: ".ini_get('post_max_size'));
 		SetupPage::log("Info - max_file_uploads: ".ini_get('max_file_uploads'));
-	
+
 		// Check some more ini settings here, needed for file upload
 		if (function_exists('get_magic_quotes_gpc'))
 		{
-		  	if (@get_magic_quotes_gpc())
-		  	{
-				$aResult[] = new CheckResult(CheckResult::ERROR, "'magic_quotes_gpc' is set to On. Please turn it Off before continuing. You may want to check the PHP configuration file(s): '$sPhpIniFile'. Be aware that this setting can also be overridden in the apache configuration.");
+			if (@get_magic_quotes_gpc())
+			{
+				$aResult[] = new CheckResult(CheckResult::ERROR, "'magic_quotes_gpc' is set to On. Please turn it Off in php.ini before continuing.");
 			}
 		}
 		if (function_exists('magic_quotes_runtime'))
 		{
-		  	if (@magic_quotes_runtime())
-		  	{
-				$aResult[] = new CheckResult(CheckResult::ERROR, "'magic_quotes_runtime' is set to On. Please turn it Off before continuing. You may want to check the PHP configuration file(s): '$sPhpIniFile'. Be aware that this setting can also be overridden in the apache configuration.");
+			if (@magic_quotes_runtime())
+			{
+				$aResult[] = new CheckResult(CheckResult::ERROR, "'magic_quotes_runtime' is set to On. Please turn it Off in php.ini before continuing.");
 			}
 		}
-	
-		
+
+
 		$sMemoryLimit = trim(ini_get('memory_limit'));
 		if (empty($sMemoryLimit))
 		{
@@ -240,40 +237,58 @@ class SetupUtils
 			//
 			$iMemoryLimit = utils::ConvertToBytes($sMemoryLimit);
 			if ($iMemoryLimit < self::MIN_MEMORY_LIMIT)
-			{		
+			{
 				$aResult[] = new CheckResult(CheckResult::ERROR, "memory_limit ($iMemoryLimit) is too small, the minimum value to run the application is ".self::MIN_MEMORY_LIMIT.".");
 			}
 			else
 			{
-				SetupPage::log("Info - memory_limit is $iMemoryLimit, ok.");		
+				SetupPage::log("Info - memory_limit is $iMemoryLimit, ok.");
 			}
 		}
-		
+
 		// Special case for APC
 		if (extension_loaded('apc'))
 		{
 			$sAPCVersion = phpversion('apc');
-			$aResult[] = new CheckResult(CheckResult::INFO, "APC detected (version $sAPCVersion). The APC cache will be used to speed-up the application.");
+			$aResult[] = new CheckResult(CheckResult::INFO, "APC detected (version $sAPCVersion). The APC cache will be used to speed-up ".ITOP_APPLICATION.".");
 		}
-	
+
 		// Special case Suhosin extension
 		if (extension_loaded('suhosin'))
 		{
 			$sSuhosinVersion = phpversion('suhosin');
 			$aOk[] = "Suhosin extension detected (version $sSuhosinVersion).";
-			
+
 			$iGetMaxValueLength = ini_get('suhosin.get.max_value_length');
 			if ($iGetMaxValueLength < self::SUHOSIN_GET_MAX_VALUE_LENGTH)
-			{	
-				$aResult[] = new CheckResult(CheckResult::INFO,  "suhosin.get.max_value_length ($iGetMaxValueLength) is too small, the minimum value to run the application is ".self::SUHOSIN_GET_MAX_VALUE_LENGTH.". This value is set by the PHP configuration file(s): '$sPhpIniFile'. Be aware that this setting can also be overridden in the apache configuration.");
+			{
+				$aResult[] = new CheckResult(CheckResult::WARNING,  "suhosin.get.max_value_length ($iGetMaxValueLength) is too small, the minimum value recommended to run the application is ".self::SUHOSIN_GET_MAX_VALUE_LENGTH.".");
 			}
 			else
 			{
-				SetupPage::log("Info - suhosin.get.max_value_length = $iGetMaxValueLength, ok.");		
+				SetupPage::log("Info - suhosin.get.max_value_length = $iGetMaxValueLength, ok.");
 			}
 		}
 
-		return $aResult;		
+		if (function_exists('php_ini_loaded_file')) // PHP >= 5.2.4
+		{
+			$sPhpIniFile = php_ini_loaded_file();
+			// Other included/scanned files
+			if ($sFileList = php_ini_scanned_files())
+			{
+				if (strlen($sFileList) > 0)
+				{
+					$aFiles = explode(',', $sFileList);
+
+					foreach ($aFiles as $sFile)
+					{
+						$sPhpIniFile .= ', '.trim($sFile);
+					}
+				}
+			}
+			$aResult[] = new CheckResult(CheckResult::INFO,  "Loaded php.ini files: $sPhpIniFile");
+		}
+		return $aResult;
 	}
 
 	/**
@@ -293,7 +308,7 @@ class SetupUtils
 			$sMissingExtensionLink = "<a href=\"http://www.php.net/manual/en/book.zip.php\" target=\"_blank\">zip</a>";
 			$aResult[] = new CheckResult(CheckResult::ERROR, "Missing PHP extension: zip", $sMissingExtensionLink);
 		}
-		
+
 		// availability of exec()
 		//
 		$aDisabled = explode(', ', ini_get('disable_functions'));
@@ -342,55 +357,55 @@ class SetupUtils
 		// Example of query (DB without a suffix)
 		//$sDBSize = "SELECT SUM(ROUND(DATA_LENGTH/1024/1024, 2)) AS size_mb FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = `$sDBName`";
 
-		return $aResult;		
+		return $aResult;
 	}
-	
+
 	/**
 	 * Helper function to retrieve the system's temporary directory
-	 * Emulates sys_get_temp_dir if neeed (PHP < 5.2.1) 
-	 * @return string Path to the system's temp directory 
+	 * Emulates sys_get_temp_dir if neeed (PHP < 5.2.1)
+	 * @return string Path to the system's temp directory
 	 */
 	static function GetTmpDir()
 	{
-	    // try to figure out what is the temporary directory
-	    // prior to PHP 5.2.1 the function sys_get_temp_dir
-	    // did not exist
-	    if ( !function_exists('sys_get_temp_dir'))
-	    {
-	        if( $temp=getenv('TMP') ) return realpath($temp);
-	        if( $temp=getenv('TEMP') ) return realpath($temp);
-	        if( $temp=getenv('TMPDIR') ) return realpath($temp);
-	        $temp=tempnam(__FILE__,'');
-	        if (file_exists($temp))
-	        {
-	            unlink($temp);
-	            return realpath(dirname($temp));
-	        }
-	        return null;
-	    }
-	    else
-	    {
-	        return realpath(sys_get_temp_dir());
-	    }
+		// try to figure out what is the temporary directory
+		// prior to PHP 5.2.1 the function sys_get_temp_dir
+		// did not exist
+		if ( !function_exists('sys_get_temp_dir'))
+		{
+			if( $temp=getenv('TMP') ) return realpath($temp);
+			if( $temp=getenv('TEMP') ) return realpath($temp);
+			if( $temp=getenv('TMPDIR') ) return realpath($temp);
+			$temp=tempnam(__FILE__,'');
+			if (file_exists($temp))
+			{
+				unlink($temp);
+				return realpath(dirname($temp));
+			}
+			return null;
+		}
+		else
+		{
+			return realpath(sys_get_temp_dir());
+		}
 	}
-	
+
 	/**
 	 * Helper function to retrieve the directory where files are to be uploaded
-	 * @return string Path to the temp directory used for uploading files 
+	 * @return string Path to the temp directory used for uploading files
 	 */
 	static function GetUploadTmpDir()
 	{
-	    $sPath = ini_get('upload_tmp_dir');
-	    if (empty($sPath))
-	    {
-	        $sPath = self::GetTmpDir();   
-	    }    
-	    return $sPath;
+		$sPath = ini_get('upload_tmp_dir');
+		if (empty($sPath))
+		{
+			$sPath = self::GetTmpDir();
+		}
+		return $sPath;
 	}
 
 	/**
 	 * Helper to recursively remove a directory
-	 */	 	
+	 */
 	public static function rrmdir($dir)
 	{
 		if ((strlen(trim($dir)) == 0) || ($dir == '/') || ($dir == '\\'))
@@ -403,7 +418,7 @@ class SetupUtils
 
 	/**
 	 * Helper to recursively cleanup a directory
-	 */	 	
+	 */
 	public static function tidydir($dir)
 	{
 		if ((strlen(trim($dir)) == 0) || ($dir == '/') || ($dir == '\\'))
@@ -427,7 +442,7 @@ class SetupUtils
 
 	/**
 	 * Helper to build the full path of a new directory
-	 */	 	
+	 */
 	public static function builddir($dir)
 	{
 		$parent = dirname($dir);
@@ -444,7 +459,7 @@ class SetupUtils
 	/**
 	 * Helper to copy a directory to a target directory, skipping .SVN files (for developer's comfort!)
 	 * Returns true if successfull
-	 */ 
+	 */
 	public static function copydir($sSource, $sDest)
 	{
 		if (is_dir($sSource))
@@ -463,7 +478,7 @@ class SetupUtils
 						// Skip
 						continue;
 					}
-	
+
 					if (is_dir($sSource.'/'.$sFile))
 					{
 						// Recurse
@@ -486,4 +501,389 @@ class SetupUtils
 			return false;
 		}
 	}
+	static function GetPreviousInstance($sDir)
+	{
+		$bFound = false;
+		$sSourceDir = '';
+		$sSourceEnvironement = '';
+		$sConfigFile = '';
+		$aResult = array(
+			'found' => false,
+		);
+		
+		if (file_exists($sDir.'/config-itop.php'))
+		{
+			$sSourceDir = $sDir;
+			$sSourceEnvironment = '';
+			$sConfigFile = $sDir.'/config-itop.php';
+			$aResult['found'] = true;
+		}
+		else if (file_exists($sDir.'/conf/production/config-itop.php'))
+		{
+			$sSourceDir = $sDir;
+			$sSourceEnvironment = 'production';
+			$sConfigFile = $sDir.'/conf/production/config-itop.php';
+			$aResult['found'] = true;
+		}
+		
+		if ($aResult['found'])
+		{
+			$oPrevConf = new Config($sConfigFile);
+			$aResult = array(
+				'found' => true,
+				'source_dir' => $sSourceDir,
+				'source_environment' => $sSourceEnvironment,
+				'configuration_file' => $sConfigFile,
+				'db_server' => $oPrevConf->GetDBHost(),
+				'db_user' => $oPrevConf->GetDBUser(),
+				'db_pwd' => $oPrevConf->GetDBPwd(),
+				'db_name' => $oPrevConf->GetDBName(),
+				'db_prefix' => $oPrevConf->GetDBSubname(),
+			);
+		}
+		
+		return $aResult;
+	}
+	
+	static function CheckDiskSpace($sDir)
+	{
+		while(($f = @disk_free_space($sDir)) == false)
+		{
+			if ($sDir == dirname($sDir)) break;
+			if ($sDir == '.') break;
+			$sDir = dirname($sDir);
+		}
+		
+		return $f;
+	}
+	
+	static function HumanReadableSize($fBytes)
+	{
+		$aSizes = array('bytes', 'Kb', 'Mb', 'Gb', 'Tb', 'Pb', 'Hb');
+		$index = 0;
+		while (($fBytes > 1000) && ($index < count($aSizes)))
+		{
+			$index++;
+			$fBytes = $fBytes / 1000;
+		}
+		
+		return sprintf('%.2f %s', $fBytes, $aSizes[$index]);
+	}
+	
+	static function DisplayDBParameters($oPage, $bAllowDBCreation, $sDBServer, $sDBUser, $sDBPwd, $sDBName, $sDBPrefix, $sNewDBName = '')
+	{
+		$oPage->add('<tr><td colspan="2">');
+		$oPage->add('<fieldset><legend>Database Server Connection</legend>');
+		$oPage->add('<table>');
+		$oPage->add('<tr><td>Server Name:</td><td><input id="db_server" type="text" name="db_server" value="'.htmlentities($sDBServer, ENT_QUOTES, 'UTF-8').'" size="15"/></td><td>E.g. "localhost", "dbserver.mycompany.com" or "192.142.10.23"</td></tr>');
+		$oPage->add('<tr><td>Login:</td><td><input id="db_user" type="text" name="db_user" value="'.htmlentities($sDBUser, ENT_QUOTES, 'UTF-8').'" size="15"/></td><td rowspan="2" style="vertical-align:top">The account must have the following privileges on the database: SELECT, INSERT, UPDATE, DELETE, CREATE, ALTER, CREATE VIEW, SUPER, TRIGGER</td></tr>');
+		$oPage->add('<tr><td>Password:</td><td><input id="db_pwd" type="password" name="db_pwd" value="'.htmlentities($sDBPwd, ENT_QUOTES, 'UTF-8').'" size="15"/></td></tr>');
+		$oPage->add('</table>');
+		$oPage->add('</fieldset>');
+		$oPage->add('</td></tr>');
+		
+		$oPage->add('<tr><td colspan="2"><span id="db_info"></span></td></tr>');
+		
+		$oPage->add('<tr><td colspan="2">');
+		$oPage->add('<fieldset><legend>Database</legend>');
+		$oPage->add('<table>');
+		if ($bAllowDBCreation)
+		{
+			$oPage->add('<tr><td><input type="radio" id="existing_db" name="create_db" value="no"/><label for="existing_db">&nbsp;Use the existing database:</label></td>');
+			$oPage->add('<td id="db_name_container"><input id="db_name" name="db_name" size="15" maxlen="32" value="'.htmlentities($sDBName, ENT_QUOTES, 'UTF-8').'"/><span style="width:20px;" id="v_db_name"></span></td></tr>');
+			$oPage->add('<tr><td><input type="radio" id="create_db" name="create_db" value="yes"/><label for="create_db">&nbsp;Create a new database:</label></td>');
+			$oPage->add('<td><input id="db_new_name" type="text" name="db_new_name" value="'.htmlentities($sNewDBName, ENT_QUOTES, 'UTF-8').'" size="15" maxlength="32"/><span style="width:20px;" id="v_db_new_name"></span></td></tr>');
+			$oPage->add('<tr><td>Use a prefix for the tables:</td><td><input id="db_prefix" type="text" name="db_prefix" value="'.htmlentities($sDBPrefix, ENT_QUOTES, 'UTF-8').'" size="15" maxlength="32"/><span style="width:20px;" id="v_db_prefix"></span></td></tr>');
+		}
+		else
+		{
+			$oPage->add('<tr><td>Database Name:</td><td id="db_name_container"><input id="db_name" name="db_name" size="15" maxlen="32" value="'.htmlentities($sDBName, ENT_QUOTES, 'UTF-8').'"/><span style="width:20px;" id="v_db_name"></span></td></tr>');
+			$oPage->add('<tr><td>Use a prefix for the tables:</td><td><input id="db_prefix" type="text" name="db_prefix" value="'.htmlentities($sDBPrefix, ENT_QUOTES, 'UTF-8').'" size="15"/><span style="width:20px;" id="v_db_prefix"></span></td></tr>');
+		}
+		$oPage->add('</table>');
+		$oPage->add('</fieldset>');
+		$oPage->add('<tr><td colspan="2"><span id="table_info">&nbsp;</span></td></tr>');
+		$oPage->add('</td></tr>');
+		$oPage->add_script(
+<<<EOF
+var iCheckDBTimer = null;
+var oXHRCheckDB = null;
+
+function CheckDBConnection()
+{
+	// Don't call the server too often...
+	if (iCheckDBTimer !== null)
+	{
+		clearTimeout(iCheckDBTimer);
+		iCheckDBTimer = null;
+	}
+	iCheckDBTimer = setTimeout(DoCheckDBConnection, 500);
+}
+
+function DoCheckDBConnection()
+{
+	iCheckDBTimer = null;
+	var oParams = {
+		'db_server': $("#db_server").val(),
+		'db_user': $("#db_user").val(),
+		'db_pwd': $("#db_pwd").val(),
+		'db_name': $("#db_name").val()
+	}
+	if (oXHRCheckDB !== null)
+	{
+		oXHRCheckDB.abort();
+		oXHRCheckDB = null;
+	}
+	oXHRCheckDB = WizardAsyncAction("check_db", oParams);
+}
+
+function ValidateField(sFieldId, bUsed)
+{
+	var sValue = new String($("#"+sFieldId).val());
+	var bMandatory = false;
+
+	if (bUsed)
+	{
+		if (sFieldId == 'db_name')
+		{
+			bUsed = ($("#existing_db").attr("checked") == "checked");
+			bMandatory = true;
+		}
+		if (sFieldId == 'db_new_name')
+		{
+			bUsed = ($("#create_db").attr("checked") == "checked");
+			bMandatory = true;
+		}
+	}
+		
+	if (!bUsed)
+	{
+		$("#v_"+sFieldId).html("");
+		return true;
+	}
+	else
+	{
+		if (sValue != "")
+		{
+			if (sValue.match(/^[A-Za-z][A-Za-z0-9_]*$/))
+			{
+				$("#v_"+sFieldId).html("");
+				return true;
+			}
+			else
+			{
+				$("#v_"+sFieldId).html('<img src="../images/validation_error.png" title="Only the characters [A-Za-z0-9_] are allowed"/>');
+				return false;
+			}
+		}
+		else if (bMandatory)
+		{
+			$("#v_"+sFieldId).html('<img src="../images/validation_error.png" title="This field cannot be empty"/>');
+			return false;
+		}
+		else
+		{
+			$("#v_"+sFieldId).html("");
+			return true;
+		}
+	}
+}
+EOF
+		);
+		$oPage->add_ready_script(
+<<<EOF
+DoCheckDBConnection(); // Validate the initial values immediately
+
+$("#db_server").bind("keyup change", function() { CheckDBConnection(); });
+$("#db_user").bind("keyup change", function() { CheckDBConnection(); });
+$("#db_pwd").bind("keyup change", function() { CheckDBConnection(); });
+$("#db_new_name").bind("click", function() { $("#create_db").attr("checked", "checked"); });
+$("#db_new_name").bind("keyup change", function() { WizardUpdateButtons(); });
+$("#db_name").bind("keyup change", function() { WizardUpdateButtons(); });
+$("#db_prefix").bind("keyup change", function() { WizardUpdateButtons(); });
+$("#db_name").bind("click", function() { $("#existing_db").attr("checked", "checked"); WizardUpdateButtons(); });
+$("#existing_db").bind("click change", function() { WizardUpdateButtons(); });
+$("#create_db").bind("click change", function() { WizardUpdateButtons(); });
+EOF
+		);
+		
+	}
+
+	/**
+	 * Helper function check the connection to the database, verify a few conditions (minimum version, etc...) and (if connected)
+	 * enumerate the existing databases (if possible)
+	 * @return mixed false if the connection failed or array('checks' => Array of CheckResult, 'databases' => Array of database names (as strings) or null if not allowed)
+	 */
+	static function CheckServerConnection($sDBServer, $sDBUser, $sDBPwd)
+	{
+		$aResult = array('checks' => array(), 'databases' => null);
+		try
+		{
+			$oDBSource = new CMDBSource;
+			$oDBSource->Init($sDBServer, $sDBUser, $sDBPwd);
+			$aResult['checks'][] = new CheckResult(CheckResult::INFO, "Connection to '$sDBServer' as '$sDBUser' successful.");
+			$aResult['checks'][] = new CheckResult(CheckResult::INFO, "Info - User privileges: ".($oDBSource->GetRawPrivileges()));
+
+			$sDBVersion = $oDBSource->GetDBVersion();
+			if (version_compare($sDBVersion, self::MYSQL_MIN_VERSION, '>='))
+			{
+				$aResult['checks'][] = new CheckResult(CheckResult::INFO, "Current MySQL version ($sDBVersion), greater than minimum required version (".self::MYSQL_MIN_VERSION.")");
+				// Check some server variables
+				$iMaxAllowedPacket = $oDBSource->GetServerVariable('max_allowed_packet');
+				$iMaxUploadSize = utils::ConvertToBytes(ini_get('upload_max_filesize'));
+				if ($iMaxAllowedPacket >= (500 + $iMaxUploadSize)) // Allow some space for the query + the file to upload
+				{
+					$aResult['checks'][] = new CheckResult(CheckResult::INFO, "MySQL server's max_allowed_packet ($iMaxAllowedPacket) is big enough compared to upload_max_filesize ($iMaxUploadSize).");
+				}
+				else if($iMaxAllowedPacket < $iMaxUploadSize)
+				{
+					$aResult['checks'][] = new CheckResult(CheckResult::WARNING, "MySQL server's max_allowed_packet ($iMaxAllowedPacket) is not big enough. Please, consider setting it to at least ".(500 + $iMaxUploadSize).".");
+				}
+				$iMaxConnections = $oDBSource->GetServerVariable('max_connections');
+				if ($iMaxConnections < 5)
+				{
+					$aResult['checks'][] = new CheckResult(CheckResult::WARNING, "MySQL server's max_connections ($iMaxConnections) is not enough. Please, consider setting it to at least 5.");
+				}
+				else
+				{
+					$aResult['checks'][] = new CheckResult(CheckResult::INFO, "MySQL server's max_connections is set to $iMaxConnections.");
+				}
+			}
+			else
+			{
+				$aResult['checks'][] = new CheckResult(CheckResult::ERROR, "Error: Current MySQL version is ($sDBVersion), minimum required version (".self::MYSQL_MIN_VERSION.")");
+			}
+			try
+			{
+				$aResult['databases'] = $oDBSource->ListDB();
+			}
+			catch(Exception $e)
+			{
+				$aResult['databases'] = null;
+			}
+		}
+		catch(Exception $e)
+		{
+			return false;
+		}
+		return $aResult;
+	}
+	
+	static public function AsyncCheckDB($oPage, $aParameters)
+	{
+		$sDBServer = $aParameters['db_server'];
+		$sDBUser = $aParameters['db_user'];
+		$sDBPwd = $aParameters['db_pwd'];
+		$sDBName = $aParameters['db_name'];
+
+		$oPage->add_ready_script('oXHRCheckDB = null;'); 	
+
+		$checks = SetupUtils::CheckServerConnection($sDBServer, $sDBUser, $sDBPwd);
+		if ($checks === false)
+		{
+			// Connection failed, disable the "Next" button
+			$oPage->add_ready_script('$("#wiz_form").data("db_connection", "error");');
+			$oPage->add_ready_script('$("#db_info").html("No connection to the database...");');
+		}
+		else
+		{
+			$aErrors = array();
+			$aWarnings = array();
+			foreach($checks['checks'] as $oCheck)
+			{
+				if ($oCheck->iSeverity == CheckResult::ERROR)
+				{
+					$aErrors[] = $oCheck->sLabel;
+				}
+				else if ($oCheck->iSeverity == CheckResult::WARNING)
+				{
+					$aWarnings[] = $oCheck->sLabel;
+				}
+								}
+			if (count($aErrors) > 0)
+			{
+				$oPage->add_ready_script('$("#wiz_form").data("db_connection", "error");');
+				$oPage->add_ready_script('$("#db_info").html(\'<img src="../images/validation_error.png"/>&nbsp;<b>Error:</b> '.htmlentities(implode('<br/>', $aErrors), ENT_QUOTES, 'UTF-8').'\');');
+			}
+			else if (count($aWarnings) > 0)
+			{
+				$oPage->add_ready_script('$("#wiz_form").data("db_connection", "");');
+				$oPage->add_ready_script('$("#db_info").html(\'<img src="../images/error.png"/>&nbsp;<b>Warning:</b> '.htmlentities(implode('<br/>', $aWarnings), ENT_QUOTES, 'UTF-8').'\');');
+			}
+			else
+			{
+				$oPage->add_ready_script('$("#wiz_form").data("db_connection", "");');
+				$oPage->add_ready_script('$("#db_info").html(\'<img src="../images/validation_ok.png"/>&nbsp;Database server connection Ok.\');');
+			}
+			
+			if ($checks['databases'] == null)
+			{
+				$sDBNameInput = '<input id="db_name" name="db_name" size="15" maxlen="32" value="'.htmlentities($sDBName, ENT_QUOTES, 'UTF-8').'"/><span style="width:20px;" id="v_db_name"></span>';
+				$oPage->add_ready_script('$("#table_info").html(\'<img src="../images/error.png"/>&nbsp;Not enough rights to enumerate the databases\');');
+			}
+			else
+			{
+				$sDBNameInput = '<select id="db_name" name="db_name">';				
+				foreach($checks['databases'] as $sDatabaseName)
+				{
+					if ($sDatabaseName != 'information_schema')
+					{
+						$sEncodedName = htmlentities($sDatabaseName, ENT_QUOTES, 'UTF-8');
+						$sSelected = ($sDatabaseName == $sDBName) ? ' selected ' : '';
+						$sDBNameInput .= '<option value="'.$sEncodedName.'"'.$sSelected.'>'.$sEncodedName.'</option>';
+					}
+				}
+				$sDBNameInput .= '</select>';
+			}
+			$oPage->add_ready_script('$("#db_name_container").html("'.addslashes($sDBNameInput).'");');
+			$oPage->add_ready_script('$("#db_name").bind("click", function() { $("#existing_db").attr("checked", "checked"); WizardUpdateButtons(); });');
+			$oPage->add_ready_script('$("#db_name").bind("keyup change", function() { WizardUpdateButtons(); });');
+			
+		}
+		$oPage->add_ready_script('WizardUpdateButtons();');
+	}
+	
+	/**
+	 * Helper function to get the available languages from the given directory
+	 * @param $sDir Path to the dictionary
+	 * @return an array of language code => description
+	 */    
+	static public function GetAvailableLanguages($sDir)
+	{
+		require_once(APPROOT.'/core/coreexception.class.inc.php');
+		require_once(APPROOT.'/core/dict.class.inc.php');
+	
+		$aFiles = scandir($sDir);
+		foreach($aFiles as $sFile)
+		{
+			if ($sFile == '.' || $sFile == '..' || $sFile == '.svn')
+			{
+				// Skip
+				continue;
+			}
+	
+			$sFilePath = $sDir.'/'.$sFile;
+			if (is_file($sFilePath) && preg_match('/^.+\.dict.*\.php$/i', $sFilePath, $aMatches))
+			{
+				require_once($sFilePath);
+			}
+		}
+	
+		return Dict::GetLanguages();
+	}
+	
+	static public function GetLanguageSelect($sSourceDir, $sInputName, $sDefaultLanguageCode)
+	{
+		$sHtml = '<select  id="'.$sInputName.'" name="'.$sInputName.'">';		
+		$sSourceDir = APPROOT.'dictionaries/';
+		$aLanguages = SetupUtils::GetAvailableLanguages($sSourceDir);
+		foreach($aLanguages as $sCode => $aInfo)
+		{
+			$sSelected = ($sCode == $sDefaultLanguageCode) ? ' selected ' : '';
+			$sHtml .= '<option value="'.$sCode.'"'.$sSelected.'>'.htmlentities($aInfo['description'], ENT_QUOTES, 'UTF-8').' ('.htmlentities($aInfo['localized_description'], ENT_QUOTES, 'UTF-8').')</option>';
+		}
+		$sHtml .= '</select></td></tr>';
+		
+		return $sHtml;
+	}
 }

+ 92 - 6
setup/wizardcontroller.class.inc.php

@@ -91,6 +91,18 @@ class WizardController
 	}
 	
 	/**
+	 * Stores the value of the page's parameter in a "persistent" parameter in the wizard's context
+	 * @param string $sParamCode The code identifying this parameter
+	 * @param mixed $defaultValue The default value for the parameter
+	 * @param string $sSanitizationFilter A 'sanitization' fitler. Default is 'raw_data', which means no filtering
+	 */
+	public function SaveParameter($sParamCode, $defaultValue, $sSanitizationFilter = 'raw_data')
+	{
+		$value = utils::ReadParam($sParamCode, $defaultValue, false, $sSanitizationFilter);
+		$this->aParameters[$sParamCode] = $value;
+	}
+	
+	/**
 	 * Starts the wizard by displaying it in its initial state
 	 */
 	protected function Start()
@@ -153,7 +165,9 @@ class WizardController
 	{
 		$oPage = new SetupPage($oStep->GetTitle());
 		$oPage->add_linked_script('../setup/setup.js');
-		$oPage->add('<form method="post">');
+		$oPage->add_script("function CanMoveForward()\n{\n".$oStep->JSCanMoveForward()."\n}\n");
+		$oPage->add_script("function CanMoveBackward()\n{\n".$oStep->JSCanMoveBackward()."\n}\n");
+		$oPage->add('<form id="wiz_form" method="post">');
 		$oStep->Display($oPage);
 		
 		// Add the back / next buttons and the hidden form
@@ -166,20 +180,56 @@ class WizardController
 		}
 
 		$oPage->add('<input type="hidden" name="_steps" value="'.htmlentities(json_encode($this->aSteps), ENT_QUOTES, 'UTF-8').'"/>');
-		if (count($this->aSteps) > 0)
+		$oPage->add('<table style="width:100%;"><tr>');
+		if ((count($this->aSteps) > 0) && ($oStep->CanMoveBackward()))
 		{
-			$oPage->add('<input type="submit" name="operation" value="back"/>');
+			$oPage->add('<td style="text-align: left"><button id="btn_back" type="submit" name="operation" value="back"> &lt;&lt; Back </button></td>');
 		}
 		if ($oStep->CanMoveForward())
 		{
-			$oPage->add('<input type="submit" name="operation" value="next"/>');
+			$oPage->add('<td style="text-align:right;"><button id="btn_next" class="default" type="submit" name="operation" value="next">'.htmlentities($oStep->GetNextButtonLabel(), ENT_QUOTES, 'UTF-8').'</button></td>');
 		}
+		$oPage->add('</tr></table>');
 		$oPage->add("</form>");
-		$oPage->add('<div id="async_action" style="display:none"></div>');
+		$oPage->add('<div id="async_action" style="display:none;overflow:auto;max-height:100px;color:#F00;font-size:small;"></div>'); // The div may become visible in case of error
+
+		// Hack to have the "Next >>" button, be the default button, since the first submit button in the form is the default one
+		$oPage->add_ready_script(
+<<<EOF
+
+$('form').each(function () {
+	var thisform = $(this);
+		thisform.prepend(thisform.find('button.default').clone().removeAttr('id').removeAttr('disabled').css({
+		position: 'absolute',
+		left: '-999px',
+		top: '-999px',
+		height: 0,
+		width: 0
+	}));
+});
+$('#btn_back').click(function() { $('#wiz_form').data('back', true); });
+
+$('#wiz_form').submit(function() {
+	if ($(this).data('back'))
+	{
+		return CanMoveBackward();
+	}
+	else
+	{
+		return CanMoveForward();
+	} 
+});
+
+$('#wiz_form').data('back', false);
+WizardUpdateButtons();
+
+EOF
+		);
 		$oPage->output();
 	}
 	/**
-	 * Make the wizard run: Start, Next or Back depending on the page's parameters
+	 * Make the wizard run: Start, Next or Back depending WizardUpdateButtons();
+on the page's parameters
 	 */
 	public function Run()
 	{
@@ -347,6 +397,42 @@ abstract class WizardStep
 	}
 	
 	/**
+	 * Tells whether the "Next" button should be enabled interactively
+	 * @return string A piece of javascript code returning either true or false
+	 */
+	public function JSCanMoveForward()
+	{
+		return 'return true;';
+	}
+	
+	/**
+	 * Returns the label for the " Next >> " button
+	 * @return string The label for the button
+	 */
+	public function GetNextButtonLabel()
+	{
+		return ' Next >> ';
+	}
+	
+	/**
+	 * Tells whether this step/state allows to go back or not
+	 * @return boolean True if the '<< Back' button should be displayed
+	 */
+	public function CanMoveBackward()
+	{
+		return true;
+	}
+	
+	/**
+	 * Tells whether the "Back" button should be enabled interactively
+	 * @return string A piece of javascript code returning either true or false
+	 */
+	public function JSCanMoveBackward()
+	{
+		return 'return true;';
+	}
+
+	/**
 	 * Overload this function to implement asynchronous action(s) (AJAX)
 	 * @param string $sCode The code of the action (if several actions need to be distinguished)
 	 * @param hash $aParameters The action's parameters name => value

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 908 - 19
setup/wizardsteps.class.inc.php


Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott