From a0e03718129693f6f694ca57c8eb34eada05e4e0 Mon Sep 17 00:00:00 2001 From: Romain Quetiez Date: Mon, 24 May 2010 09:24:35 +0000 Subject: [PATCH] #19 - Reviewed the licensing information and started to align the comments in the code SVN:trunk[422] --- .../userrights/userrightsmatrix.class.inc.php | 29 ++-- .../userrights/userrightsnull.class.inc.php | 26 +++- .../userrightsprofile.class.inc.php | 26 +++- application/ajaxwebpage.class.inc.php | 27 +++- application/application.inc.php | 25 ++- application/applicationcontext.class.inc.php | 24 +++ application/audit.category.class.inc.php | 23 ++- application/audit.rule.class.inc.php | 23 ++- application/cmdbabstract.class.inc.php | 32 +++- application/csvpage.class.inc.php | 26 +++- application/displayblock.class.inc.php | 24 +++ application/iotask.class.inc.php | 24 +++ application/itopwebpage.class.inc.php | 24 +++ application/itopwizardwebpage.class.inc.php | 24 +++ application/loginwebpage.class.inc.php | 24 +++ application/menunode.class.inc.php | 24 +++ application/nicewebpage.class.inc.php | 24 +++ application/startup.inc.php | 24 +++ application/template.class.inc.php | 24 +++ application/ui.linkswidget.class.inc.php | 24 +++ application/uilinkswizard.class.inc.php | 24 +++ application/uiwizard.class.inc.php | 26 +++- application/usercontext.class.inc.php | 24 +++ application/utils.inc.php | 40 ++++- application/webpage.class.inc.php | 24 +++ application/wizardhelper.class.inc.php | 24 +++ application/xmlpage.class.inc.php | 24 +++ business/ChangeMgmt.business.php | 24 +++ business/KEDB.business.php | 24 +++ business/ServiceDesk.business.php | 28 ++-- business/ServiceMgmt.business.php | 23 +++ business/ServiceRequest.business.php | 23 ++- business/data.samples.inc.php | 28 ++-- business/incidentMgmt.business.php | 28 ++-- business/itop.business.class.inc.php | 61 +++----- business/test_farm.class.inc.php | 29 ++-- core/MyHelpers.class.inc.php | 33 +++- core/action.class.inc.php | 44 +++--- core/archive.class.inc.php | 29 ++-- core/attributedef.class.inc.php | 145 +++--------------- core/bulkchange.class.inc.php | 51 +++--- core/cmdbchange.class.inc.php | 30 +++- core/cmdbchangeop.class.inc.php | 60 +++----- core/cmdbobject.class.inc.php | 48 +++--- core/cmdbsource.class.inc.php | 34 ++-- core/config.class.inc.php | 39 +++-- core/coreexception.class.inc.php | 24 +++ core/csvparser.class.inc.php | 37 +++-- core/data.generator.class.inc.php | 25 ++- core/dbobject.class.php | 34 ++-- core/dbobjectsearch.class.php | 38 +++-- core/dbobjectset.class.php | 31 +++- core/dict.class.inc.php | 35 +++-- core/email.class.inc.php | 26 +++- core/event.class.inc.php | 30 +++- core/expression.class.inc.php | 25 ++- core/filterdef.class.inc.php | 41 +++-- core/log.class.inc.php | 29 ++-- core/metamodel.class.php | 30 +++- core/oql/oql-lexer.plex | 24 +++ core/oql/oqlexception.class.inc.php | 24 +++ core/oql/oqlinterpreter.class.inc.php | 24 +++ core/oql/oqlquery.class.inc.php | 23 +++ core/ormdocument.class.inc.php | 32 +++- core/sqlquery.class.inc.php | 31 +++- core/stimulus.class.inc.php | 30 +++- core/test.class.inc.php | 81 +++------- core/trigger.class.inc.php | 31 +++- core/userrights.class.inc.php | 39 ++--- core/valuesetdef.class.inc.php | 54 +++---- dictionaries/dictionary.itop.core.php | 24 +++ dictionaries/dictionary.itop.model.php | 24 +++ dictionaries/dictionary.itop.ui.php | 24 +++ dictionaries/fr.dictionary.itop.ui.php | 24 +++ pages/ITopConsultant.php | 29 +++- pages/UI.php | 24 +++ pages/UniversalSearch.php | 24 +++ pages/ajax.csvimport.php | 24 +++ pages/ajax.render.php | 24 +++ pages/audit.php | 24 +++ pages/csvimport.php | 21 ++- pages/graphviz.php | 24 +++ pages/opensearch.xml.php | 24 +++ pages/run_query.php | 24 +++ pages/schema.php | 24 +++ pages/test.php | 24 +++ pages/testlist.inc.php | 24 +++ pages/usermanagement_classproj.php | 25 +++ pages/usermanagement_profileproj.php | 25 +++ pages/usermanagement_userstatus.php | 25 +++ setup/ajax.dataloader.php | 24 +++ setup/email.test.php | 24 +++ setup/index.php | 21 +++ setup/setuppage.class.inc.php | 25 ++- setup/xmldataloader.class.inc.php | 24 +++ webservices/export.php | 24 +++ webservices/import.php | 26 +++- webservices/itop.wsdl.php | 24 +++ webservices/itopsoap.examples.php | 24 +++ webservices/itopsoaptypes.class.inc.php | 24 +++ webservices/soapserver.php | 27 +++- webservices/webservices.class.inc.php | 44 ++++-- 102 files changed, 2375 insertions(+), 687 deletions(-) diff --git a/addons/userrights/userrightsmatrix.class.inc.php b/addons/userrights/userrightsmatrix.class.inc.php index 09d78cb00..fa78641ef 100644 --- a/addons/userrights/userrightsmatrix.class.inc.php +++ b/addons/userrights/userrightsmatrix.class.inc.php @@ -1,19 +1,28 @@ - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ - class UserRightsMatrixUsers extends DBObject { public static function Init() diff --git a/addons/userrights/userrightsnull.class.inc.php b/addons/userrights/userrightsnull.class.inc.php index bf43fdebe..82d6a00d8 100644 --- a/addons/userrights/userrightsnull.class.inc.php +++ b/addons/userrights/userrightsnull.class.inc.php @@ -1,19 +1,29 @@ - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ - class UserRightsNull extends UserRightsAddOnAPI { // Installation: create the very first user diff --git a/addons/userrights/userrightsprofile.class.inc.php b/addons/userrights/userrightsprofile.class.inc.php index fb827dd54..21434c26b 100644 --- a/addons/userrights/userrightsprofile.class.inc.php +++ b/addons/userrights/userrightsprofile.class.inc.php @@ -1,19 +1,29 @@ - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ - define('ADMIN_PROFILE_ID', 1); class UserRightsBaseClass extends cmdbAbstractObject diff --git a/application/ajaxwebpage.class.inc.php b/application/ajaxwebpage.class.inc.php index 18f00f72e..5866c5673 100644 --- a/application/ajaxwebpage.class.inc.php +++ b/application/ajaxwebpage.class.inc.php @@ -1,15 +1,30 @@ - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ + +require_once("../application/webpage.class.inc.php"); class ajax_page extends WebPage { diff --git a/application/application.inc.php b/application/application.inc.php index f613ff1e6..962b88e71 100644 --- a/application/application.inc.php +++ b/application/application.inc.php @@ -1,5 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../application/applicationcontext.class.inc.php'); require_once('../application/usercontext.class.inc.php'); require_once('../application/cmdbabstract.class.inc.php'); diff --git a/application/applicationcontext.class.inc.php b/application/applicationcontext.class.inc.php index e23ddd390..85f9daab9 100644 --- a/application/applicationcontext.class.inc.php +++ b/application/applicationcontext.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once("../application/utils.inc.php"); /** * Helper class to store and manipulate the parameters that make the application's context diff --git a/application/audit.category.class.inc.php b/application/audit.category.class.inc.php index 14e04b590..83b6bce90 100644 --- a/application/audit.category.class.inc.php +++ b/application/audit.category.class.inc.php @@ -1,11 +1,32 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ + +require_once('../application/cmdbabstract.class.inc.php'); + class AuditCategory extends cmdbAbstractObject { public static function Init() diff --git a/application/audit.rule.class.inc.php b/application/audit.rule.class.inc.php index d34345177..614a5e154 100644 --- a/application/audit.rule.class.inc.php +++ b/application/audit.rule.class.inc.php @@ -1,12 +1,33 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ + +require_once('../application/audit.category.class.inc.php'); + class AuditRule extends cmdbAbstractObject { public static function Init() diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index a1bd816de..9e7c8b9fe 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -1,14 +1,34 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../core/cmdbobject.class.inc.php'); require_once('../application/utils.inc.php'); require_once('../application/applicationcontext.class.inc.php'); require_once('../application/ui.linkswidget.class.inc.php'); -//////////////////////////////////////////////////////////////////////////////////// -/** -* Abstract class that implements some common and useful methods for displaying -* the objects -*/ -//////////////////////////////////////////////////////////////////////////////////// + abstract class cmdbAbstractObject extends CMDBObject { diff --git a/application/csvpage.class.inc.php b/application/csvpage.class.inc.php index 2912f62a8..f4746d56f 100644 --- a/application/csvpage.class.inc.php +++ b/application/csvpage.class.inc.php @@ -1,9 +1,31 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ + +require_once("../application/webpage.class.inc.php"); + class CSVPage extends WebPage { function __construct($s_title) @@ -32,4 +54,4 @@ class CSVPage extends WebPage } } -?> \ No newline at end of file +?> diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php index e6e8d3aea..a161d31b2 100644 --- a/application/displayblock.class.inc.php +++ b/application/displayblock.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../application/webpage.class.inc.php'); require_once('../application/utils.inc.php'); require_once('../core/userrights.class.inc.php'); diff --git a/application/iotask.class.inc.php b/application/iotask.class.inc.php index 06a9c0022..33310ee0b 100644 --- a/application/iotask.class.inc.php +++ b/application/iotask.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../application/cmdbabstract.class.inc.php'); /** diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php index a4e64148f..9d933fbc5 100644 --- a/application/itopwebpage.class.inc.php +++ b/application/itopwebpage.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once("../application/nicewebpage.class.inc.php"); require_once("../application/usercontext.class.inc.php"); require_once("../application/applicationcontext.class.inc.php"); diff --git a/application/itopwizardwebpage.class.inc.php b/application/itopwizardwebpage.class.inc.php index ba5655ae2..3b03af1b6 100644 --- a/application/itopwizardwebpage.class.inc.php +++ b/application/itopwizardwebpage.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('itopwebpage.class.inc.php'); /** * Web page to display a wizard in the iTop framework diff --git a/application/loginwebpage.class.inc.php b/application/loginwebpage.class.inc.php index 9f5b68d37..1fdfb1329 100644 --- a/application/loginwebpage.class.inc.php +++ b/application/loginwebpage.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once("../application/nicewebpage.class.inc.php"); /** * Web page used for displaying the login form diff --git a/application/menunode.class.inc.php b/application/menunode.class.inc.php index 71a9d85b7..a29f8b817 100644 --- a/application/menunode.class.inc.php +++ b/application/menunode.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../core/attributedef.class.inc.php'); require_once('../core/filterdef.class.inc.php'); require_once('../core/stimulus.class.inc.php'); diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php index 26e729e93..a9dfbc5f6 100644 --- a/application/nicewebpage.class.inc.php +++ b/application/nicewebpage.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once("../application/webpage.class.inc.php"); /** * Web page with some associated CSS and scripts (jquery) for a fancier display diff --git a/application/startup.inc.php b/application/startup.inc.php index d7a3854cb..0ccf697e9 100644 --- a/application/startup.inc.php +++ b/application/startup.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + define('ITOP_VERSION', '0.9'); define('ITOP_REVISION', '$WCREV$'); define('ITOP_BUILD_DATE', '$WCNOW$'); diff --git a/application/template.class.inc.php b/application/template.class.inc.php index 5fb74476f..3b09ee333 100644 --- a/application/template.class.inc.php +++ b/application/template.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../application/displayblock.class.inc.php'); /** * This class manages the special template format used internally to build the iTop web pages diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php index a841cd695..67ff3ea1c 100644 --- a/application/ui.linkswidget.class.inc.php +++ b/application/ui.linkswidget.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../application/webpage.class.inc.php'); require_once('../application/displayblock.class.inc.php'); diff --git a/application/uilinkswizard.class.inc.php b/application/uilinkswizard.class.inc.php index b58dca947..0006641ca 100644 --- a/application/uilinkswizard.class.inc.php +++ b/application/uilinkswizard.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + class UILinksWizard { protected $m_sClass; diff --git a/application/uiwizard.class.inc.php b/application/uiwizard.class.inc.php index f1bf81256..257cbcc57 100644 --- a/application/uiwizard.class.inc.php +++ b/application/uiwizard.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + class UIWizard { protected $m_oPage; @@ -153,7 +177,7 @@ $sJSHandlerCode foreach(MetaModel::GetAttributesList($this->m_sClass) as $sAttCode) { $oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode); - if (!$oAttDef->IsExternalField() && !$oAttDef->IsNullAllowed() && + if (!$oAttDef->IsExternalField() && !$oAttDef->IsNullAllowed() && $oAttDef->IsWritable() && ($sAttCode != $sStateAttCode) ) { $aMandatoryAttributes[$sAttCode] = OPT_ATT_MANDATORY; diff --git a/application/usercontext.class.inc.php b/application/usercontext.class.inc.php index 89b89b93d..e9ea9d8e4 100644 --- a/application/usercontext.class.inc.php +++ b/application/usercontext.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../core/cmdbobject.class.inc.php'); require_once('../core/userrights.class.inc.php'); /** diff --git a/application/utils.inc.php b/application/utils.inc.php index 21833f5f5..490db8459 100644 --- a/application/utils.inc.php +++ b/application/utils.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../core/config.class.inc.php'); define('ITOP_CONFIG_FILE', '../config-itop.php'); @@ -156,15 +180,15 @@ class utils static public function GetAbsoluteUrl($bQueryString = true, $bForceHTTPS = false) { // Build an absolute URL to this page on this server/port - $sServerName = $_SERVER['SERVER_NAME']; - if ($bForceHTTPS) - { - $sProtocol = 'https'; - $sPort = ''; + $sServerName = $_SERVER['SERVER_NAME']; + if ($bForceHTTPS) + { + $sProtocol = 'https'; + $sPort = ''; } - else - { - $sProtocol = isset($_SERVER['HTTPS']) ? 'https' : 'http'; + else + { + $sProtocol = isset($_SERVER['HTTPS']) ? 'https' : 'http'; if ($sProtocol == 'http') { $sPort = ($_SERVER['SERVER_PORT'] == 80) ? '' : ':'.$_SERVER['SERVER_PORT']; diff --git a/application/webpage.class.inc.php b/application/webpage.class.inc.php index 0ffc9584f..6d0cec375 100644 --- a/application/webpage.class.inc.php +++ b/application/webpage.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + /** * Simple helper class to ease the production of HTML pages * diff --git a/application/wizardhelper.class.inc.php b/application/wizardhelper.class.inc.php index 14e61ea5c..9dccd4e80 100644 --- a/application/wizardhelper.class.inc.php +++ b/application/wizardhelper.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../application/uiwizard.class.inc.php'); class WizardHelper diff --git a/application/xmlpage.class.inc.php b/application/xmlpage.class.inc.php index 24a81c562..2d0d92553 100644 --- a/application/xmlpage.class.inc.php +++ b/application/xmlpage.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once("../application/webpage.class.inc.php"); /** * Simple web page with no includes or fancy formatting, useful to generateXML documents diff --git a/business/ChangeMgmt.business.php b/business/ChangeMgmt.business.php index 45914799c..852c976d5 100644 --- a/business/ChangeMgmt.business.php +++ b/business/ChangeMgmt.business.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + //////////////////////////////////////////////////////////////////////////////////// /** * A Change Ticket diff --git a/business/KEDB.business.php b/business/KEDB.business.php index 8a04bc432..0b5860f2e 100644 --- a/business/KEDB.business.php +++ b/business/KEDB.business.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + //////////////////////////////////////////////////////////////////////////////////// /** diff --git a/business/ServiceDesk.business.php b/business/ServiceDesk.business.php index 23b94e048..efeff71f4 100644 --- a/business/ServiceDesk.business.php +++ b/business/ServiceDesk.business.php @@ -1,16 +1,26 @@ - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ //////////////////////////////////////////////////////////////////////////////////// diff --git a/business/ServiceMgmt.business.php b/business/ServiceMgmt.business.php index 05fe1998b..9f4830d7b 100644 --- a/business/ServiceMgmt.business.php +++ b/business/ServiceMgmt.business.php @@ -1,4 +1,27 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ //////////////////////////////////////////////////////////////////////////////////// /** diff --git a/business/ServiceRequest.business.php b/business/ServiceRequest.business.php index cd9ae5512..a45d00ac6 100644 --- a/business/ServiceRequest.business.php +++ b/business/ServiceRequest.business.php @@ -1,6 +1,27 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ //////////////////////////////////////////////////////////////////////////////////// /** diff --git a/business/data.samples.inc.php b/business/data.samples.inc.php index 8f76a3bd1..f3c63056b 100644 --- a/business/data.samples.inc.php +++ b/business/data.samples.inc.php @@ -1,16 +1,26 @@ - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ $aCompanies = array(); diff --git a/business/incidentMgmt.business.php b/business/incidentMgmt.business.php index 54bbb6623..af55e1cc5 100644 --- a/business/incidentMgmt.business.php +++ b/business/incidentMgmt.business.php @@ -1,16 +1,26 @@ - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ //////////////////////////////////////////////////////////////////////////////////// diff --git a/business/itop.business.class.inc.php b/business/itop.business.class.inc.php index c7b559ad4..497a49aae 100644 --- a/business/itop.business.class.inc.php +++ b/business/itop.business.class.inc.php @@ -1,21 +1,32 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../application/cmdbabstract.class.inc.php'); require_once('../application/template.class.inc.php'); -/** - * itop.business.class.inc.php - * User defined objects, implements the business need - * - * @package iTopBizModelSamples - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ - */ - /** * Possible values for the statuses of objects */ @@ -37,18 +48,6 @@ MetaModel::RegisterRelation("impacts", array("description"=>"objects being funct * Organization ownership might be used to manage the R/W access to the object */ //////////////////////////////////////////////////////////////////////////////////// -/** - * itop.business.class.inc.php - * User defined objects, implements the business need - * - * @package iTopBizModelSamples - * @author Erwan Taloc - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ - */ class bizOrganization extends cmdbAbstractObject { public static function Init() @@ -104,18 +103,6 @@ class bizOrganization extends cmdbAbstractObject * can be documented by Documents */ //////////////////////////////////////////////////////////////////////////////////// -/** - * itop.business.class.inc.php - * User defined objects, implements the business need - * - * @package iTopBizModelSamples - * @author Erwan Taloc - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ - */ class logRealObject extends cmdbAbstractObject { public static function Init() diff --git a/business/test_farm.class.inc.php b/business/test_farm.class.inc.php index dcc524fa6..4b3cefd5f 100644 --- a/business/test_farm.class.inc.php +++ b/business/test_farm.class.inc.php @@ -1,17 +1,26 @@ - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ /////////////////////////////////////////////////////////////////////////////// diff --git a/core/MyHelpers.class.inc.php b/core/MyHelpers.class.inc.php index fded6913a..606be3547 100644 --- a/core/MyHelpers.class.inc.php +++ b/core/MyHelpers.class.inc.php @@ -1,18 +1,35 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + /** * MyHelpers - * various dev/debug helpers, to cleanup or at least re-organize * * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ */ - class MyHelpers { public static function CheckValueInArray($sDescription, $value, $aData) diff --git a/core/action.class.inc.php b/core/action.class.inc.php index 399c10405..429d100de 100644 --- a/core/action.class.inc.php +++ b/core/action.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../core/email.class.inc.php'); @@ -6,12 +30,6 @@ require_once('../core/email.class.inc.php'); * A user defined action, to customize the application * * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ */ abstract class Action extends cmdbAbstractObject { @@ -77,12 +95,6 @@ abstract class Action extends cmdbAbstractObject * A notification * * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ */ abstract class ActionNotification extends Action { @@ -117,12 +129,6 @@ abstract class ActionNotification extends Action * An email notification * * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ */ class ActionEmail extends ActionNotification { @@ -233,7 +239,7 @@ class ActionEmail extends ActionNotification $sSubject = MetaModel::ApplyParams($this->Get('subject'), $aContextArgs); $sBody = MetaModel::ApplyParams($this->Get('body'), $aContextArgs); - $oEmail = new Email(); + $oEmail = new EMail(); if ($this->IsBeingTested()) { diff --git a/core/archive.class.inc.php b/core/archive.class.inc.php index 6403fffca..082cd989a 100644 --- a/core/archive.class.inc.php +++ b/core/archive.class.inc.php @@ -1,18 +1,29 @@ - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ + /** * iTopArchive a class to manipulate (read/write) iTop archives with their catalog * Each iTop archive is a zip file that contains (at the root of the archive) diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php index 1e97abdb1..1d6bf5269 100644 --- a/core/attributedef.class.inc.php +++ b/core/attributedef.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('MyHelpers.class.inc.php'); require_once('ormdocument.class.inc.php'); @@ -44,12 +68,6 @@ define('DEL_AUTO', 2); * Attribute definition API, implemented in and many flavours (Int, String, Enum, etc.) * * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ */ abstract class AttributeDefinition { @@ -235,11 +253,6 @@ abstract class AttributeDefinition * Set of objects directly linked to an object, and being part of its definition * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributeLinkedSet extends AttributeDefinition { @@ -301,11 +314,6 @@ class AttributeLinkedSet extends AttributeDefinition * Set of objects linked to an object (n-n), and being part of its definition * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributeLinkedSetIndirect extends AttributeLinkedSet { @@ -320,11 +328,6 @@ class AttributeLinkedSetIndirect extends AttributeLinkedSet * Abstract class implementing default filters for a DB column * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributeDBFieldVoid extends AttributeDefinition { @@ -412,11 +415,6 @@ class AttributeDBFieldVoid extends AttributeDefinition * Base class for all kind of DB attributes, with the exception of external keys * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributeDBField extends AttributeDBFieldVoid { @@ -432,11 +430,6 @@ class AttributeDBField extends AttributeDBFieldVoid * Map an integer column to an attribute * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributeInteger extends AttributeDBField { @@ -521,11 +514,6 @@ class AttributeInteger extends AttributeDBField * Map a boolean column to an attribute * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributeBoolean extends AttributeInteger { @@ -557,11 +545,6 @@ class AttributeBoolean extends AttributeInteger * Map a varchar column (size < ?) to an attribute * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributeString extends AttributeDBField { @@ -658,11 +641,6 @@ class AttributeString extends AttributeDBField * An attibute that matches an object class * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributeClass extends AttributeString { @@ -693,11 +671,6 @@ class AttributeClass extends AttributeString * The attribute dedicated to the finalclass automatic attribute * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributeFinalClass extends AttributeString { @@ -739,11 +712,6 @@ class AttributeFinalClass extends AttributeString * Map a varchar column (size < ?) to an attribute that must never be shown to the user * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributePassword extends AttributeString { @@ -767,11 +735,6 @@ class AttributePassword extends AttributeString * Map a text column (size > ?) to an attribute * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributeText extends AttributeString { @@ -795,11 +758,6 @@ class AttributeText extends AttributeString * Specialization of a string: email * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributeEmailAddress extends AttributeString { @@ -815,11 +773,6 @@ class AttributeEmailAddress extends AttributeString * Specialization of a string: IP address * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributeIPAddress extends AttributeString { @@ -836,11 +789,6 @@ class AttributeIPAddress extends AttributeString * Specialization of a string: OQL expression * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributeOQL extends AttributeString { @@ -851,11 +799,6 @@ class AttributeOQL extends AttributeString * Specialization of a string: template * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributeTemplateString extends AttributeString { @@ -866,11 +809,6 @@ class AttributeTemplateString extends AttributeString * Specialization of a text: template * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributeTemplateText extends AttributeText { @@ -881,11 +819,6 @@ class AttributeTemplateText extends AttributeText * Map a enum column to an attribute * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributeEnum extends AttributeString { @@ -971,11 +904,6 @@ class AttributeEnum extends AttributeString * Map a date+time column to an attribute * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributeDate extends AttributeDBField { @@ -1128,11 +1056,6 @@ AttributeDate::InitStatics(); * Map a date+time column to an attribute * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributeDateTime extends AttributeDBField { @@ -1301,11 +1224,6 @@ AttributeDateTime::InitStatics(); * where an AttributeExternalField corresponds to a column into another table (class) * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributeExternalKey extends AttributeDBFieldVoid { @@ -1389,11 +1307,6 @@ class AttributeExternalKey extends AttributeDBFieldVoid * An attribute which corresponds to an external key (direct or indirect) * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributeExternalField extends AttributeDefinition { @@ -1561,11 +1474,6 @@ class AttributeExternalField extends AttributeDefinition * Map a varchar column to an URL (formats the ouput in HMTL) * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributeURL extends AttributeString { @@ -1602,11 +1510,6 @@ class AttributeURL extends AttributeString * A blob is an ormDocument, it is stored as several columns in the database * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class AttributeBlob extends AttributeDefinition { diff --git a/core/bulkchange.class.inc.php b/core/bulkchange.class.inc.php index 7b001124a..16b0cb18f 100644 --- a/core/bulkchange.class.inc.php +++ b/core/bulkchange.class.inc.php @@ -1,16 +1,34 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + /** * BulkChange * Interpret a given data set and update the DB accordingly (fake mode avail.) * * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ */ class BulkChangeException extends CoreException @@ -22,11 +40,6 @@ class BulkChangeException extends CoreException * A series of classes, keeping the information about a given cell: could it be changed or not (and why)? * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ abstract class CellChangeSpec { @@ -138,11 +151,6 @@ class CellStatus_Ambiguous extends CellStatus_Issue * A series of classes, keeping the information about a given row: could it be changed or not (and why)? * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ abstract class RowStatus { @@ -201,13 +209,10 @@ class RowStatus_Issue extends RowStatus /** - ** BulkChange * - ** @package iTopORM - ** @author Romain Quetiez - ** @license http://www.opensource.org/licenses/lgpl-license.php LGPL - ** @link www.itop.com - ** @since 1.0 - ** @version $itopversion$ */ + * BulkChange + * + * @package iTopORM + */ class BulkChange { protected $m_sClass; diff --git a/core/cmdbchange.class.inc.php b/core/cmdbchange.class.inc.php index dcfe6da95..a4bc1d8c5 100644 --- a/core/cmdbchange.class.inc.php +++ b/core/cmdbchange.class.inc.php @@ -1,15 +1,33 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + /** * A change as requested/validated at once by user, may groups many atomic changes * * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ */ class CMDBChange extends DBObject { diff --git a/core/cmdbchangeop.class.inc.php b/core/cmdbchangeop.class.inc.php index f347c2f17..a8e6f8c81 100644 --- a/core/cmdbchangeop.class.inc.php +++ b/core/cmdbchangeop.class.inc.php @@ -1,15 +1,33 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + /** * Various atomic change operations, to be tracked * * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ */ class CMDBChangeOp extends DBObject @@ -54,11 +72,6 @@ class CMDBChangeOp extends DBObject * Record the creation of an object * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class CMDBChangeOpCreate extends CMDBChangeOp { @@ -94,11 +107,6 @@ class CMDBChangeOpCreate extends CMDBChangeOp * Record the deletion of an object * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class CMDBChangeOpDelete extends CMDBChangeOp { @@ -133,11 +141,6 @@ class CMDBChangeOpDelete extends CMDBChangeOp * Record the modification of an attribute (abstract) * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class CMDBChangeOpSetAttribute extends CMDBChangeOp { @@ -169,11 +172,6 @@ class CMDBChangeOpSetAttribute extends CMDBChangeOp * Record the modification of a scalar attribute * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute { @@ -265,11 +263,6 @@ class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute * Record the modification of a blob * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class CMDBChangeOpSetAttributeBlob extends CMDBChangeOpSetAttribute { @@ -331,11 +324,6 @@ class CMDBChangeOpSetAttributeBlob extends CMDBChangeOpSetAttribute * Record the modification of a multiline string (text) * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class CMDBChangeOpSetAttributeText extends CMDBChangeOpSetAttribute { diff --git a/core/cmdbobject.class.inc.php b/core/cmdbobject.class.inc.php index c82c536c4..6b36dd009 100644 --- a/core/cmdbobject.class.inc.php +++ b/core/cmdbobject.class.inc.php @@ -1,16 +1,34 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + /** * cmdbObjectClass * the file to include, then the core is yours * * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ */ require_once('coreexception.class.inc.php'); @@ -137,12 +155,6 @@ error_reporting(E_ALL | E_STRICT); * A persistent object, which changes are accurately recorded * * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ */ abstract class CMDBObject extends DBObject { @@ -453,12 +465,6 @@ abstract class CMDBObject extends DBObject * TODO: investigate how to get rid of this class that was made to workaround some language limitation... or a poor design! * * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ */ class CMDBObjectSet extends DBObjectSet { @@ -513,12 +519,6 @@ class CMDBObjectSet extends DBObjectSet * TODO: investigate how to get rid of this class that was made to workaround some language limitation... or a poor design! * * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ */ class CMDBSearchFilter extends DBObjectSearch { diff --git a/core/cmdbsource.class.inc.php b/core/cmdbsource.class.inc.php index e21368fe2..f50f021b7 100644 --- a/core/cmdbsource.class.inc.php +++ b/core/cmdbsource.class.inc.php @@ -1,16 +1,26 @@ - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ require_once('MyHelpers.class.inc.php'); @@ -26,6 +36,12 @@ class MySQLException extends CoreException } +/** + * CMDBSource + * database access wrapper + * + * @package iTopORM + */ class CMDBSource { protected static $m_sDBHost; diff --git a/core/config.class.inc.php b/core/config.class.inc.php index be3438777..bf9b6934d 100644 --- a/core/config.class.inc.php +++ b/core/config.class.inc.php @@ -1,17 +1,30 @@ - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ + +require_once('coreexception.class.inc.php'); + class ConfigException extends CoreException { } @@ -27,6 +40,12 @@ define ('DEFAULT_STANDARD_RELOAD_INTERVAL', 5*60); define ('DEFAULT_FAST_RELOAD_INTERVAL', 1*60); define ('DEFAULT_SECURE_CONNECTION_REQUIRED', false); +/** + * Config + * configuration data (this class cannot not be localized, because it is responsible for loading the dictionaries) + * + * @package iTopORM + */ class Config { //protected $m_bIsLoaded = false; diff --git a/core/coreexception.class.inc.php b/core/coreexception.class.inc.php index 7d1b6a3de..da1094b81 100644 --- a/core/coreexception.class.inc.php +++ b/core/coreexception.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + class SecurityException extends CoreException diff --git a/core/csvparser.class.inc.php b/core/csvparser.class.inc.php index fe0662b61..9c64cd3f4 100644 --- a/core/csvparser.class.inc.php +++ b/core/csvparser.class.inc.php @@ -1,23 +1,33 @@ - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ + class CSVParserException extends CoreException { } - - define('stSTARTING', 1); //grey zone: the type is undetermined define('stRAW', 2); //building a non-qualified string define('stQUALIFIED', 3); //building qualified string @@ -33,11 +43,6 @@ define('evOTHERCHAR', 4); * CSVParser * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class CSVParser { diff --git a/core/data.generator.class.inc.php b/core/data.generator.class.inc.php index f113a89e3..417ba58aa 100644 --- a/core/data.generator.class.inc.php +++ b/core/data.generator.class.inc.php @@ -1,16 +1,27 @@ - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ /** diff --git a/core/dbobject.class.php b/core/dbobject.class.php index e726a4751..d892065c4 100644 --- a/core/dbobject.class.php +++ b/core/dbobject.class.php @@ -1,30 +1,34 @@ - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ require_once('metamodel.class.php'); - /** * A persistent object, as defined by the metamodel * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ abstract class DBObject { diff --git a/core/dbobjectsearch.class.php b/core/dbobjectsearch.class.php index 4d7c3ed21..09309b771 100644 --- a/core/dbobjectsearch.class.php +++ b/core/dbobjectsearch.class.php @@ -1,30 +1,28 @@ - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ - -/** - * Define filters for a given class of objects (formerly named "filter") - * - * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @mytagrom youpi - * @since 1.0 - * @version 1.1.1.1 $ - */ class DBObjectSearch { private $m_aClasses; // queried classes (alias => class name), the first item is the class corresponding to this filter (the rest is coming from subfilters) diff --git a/core/dbobjectset.class.php b/core/dbobjectset.class.php index 14ac3fbff..5b9c0c481 100644 --- a/core/dbobjectset.class.php +++ b/core/dbobjectset.class.php @@ -1,17 +1,34 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + /** * A set of persistent objects, could be heterogeneous * * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ */ - class DBObjectSet { private $m_oFilter; diff --git a/core/dict.class.inc.php b/core/dict.class.inc.php index 83f187e3b..8c7845672 100644 --- a/core/dict.class.inc.php +++ b/core/dict.class.inc.php @@ -1,17 +1,28 @@ - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ - */ +// 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 +/** + * Class Dict + * Management of localizable strings + * + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ class DictException extends CoreException { diff --git a/core/email.class.inc.php b/core/email.class.inc.php index 136c6e585..110301163 100644 --- a/core/email.class.inc.php +++ b/core/email.class.inc.php @@ -1,17 +1,29 @@ - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ + class EMail { protected $m_sBody; diff --git a/core/event.class.inc.php b/core/event.class.inc.php index 5a396be62..0b4099a7b 100644 --- a/core/event.class.inc.php +++ b/core/event.class.inc.php @@ -1,16 +1,30 @@ - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ + class Event extends cmdbAbstractObject { public static function Init() diff --git a/core/expression.class.inc.php b/core/expression.class.inc.php index 82b3e61b3..2cb0f2513 100644 --- a/core/expression.class.inc.php +++ b/core/expression.class.inc.php @@ -1,15 +1,26 @@ - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ class MissingQueryArgument extends CoreException diff --git a/core/filterdef.class.inc.php b/core/filterdef.class.inc.php index 25e816089..fc3c03eb9 100644 --- a/core/filterdef.class.inc.php +++ b/core/filterdef.class.inc.php @@ -1,4 +1,29 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('MyHelpers.class.inc.php'); @@ -8,12 +33,6 @@ require_once('MyHelpers.class.inc.php'); * Definition of a filter (could be made out of an existing attribute, or from an expression) * * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ */ abstract class FilterDefinition { @@ -96,11 +115,6 @@ abstract class FilterDefinition * Match against the object unique identifier * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class FilterPrivateKey extends FilterDefinition { @@ -148,11 +162,6 @@ class FilterPrivateKey extends FilterDefinition * Match against an existing attribute (the attribute type will determine the available operators) * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class FilterFromAttribute extends FilterDefinition { diff --git a/core/log.class.inc.php b/core/log.class.inc.php index 0f5838d6a..80e2635c0 100644 --- a/core/log.class.inc.php +++ b/core/log.class.inc.php @@ -1,15 +1,26 @@ - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ class FileLog diff --git a/core/metamodel.class.php b/core/metamodel.class.php index 678fd643a..a306a09e1 100644 --- a/core/metamodel.class.php +++ b/core/metamodel.class.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + // #@# todo: change into class const (see Doctrine) @@ -62,12 +86,6 @@ define('OPT_ATT_MUSTPROMPT', 16); * (API) The objects definitions as well as their mapping to the database * * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ */ abstract class MetaModel { diff --git a/core/oql/oql-lexer.plex b/core/oql/oql-lexer.plex index 6814886db..1191b6c37 100644 --- a/core/oql/oql-lexer.plex +++ b/core/oql/oql-lexer.plex @@ -1,5 +1,29 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + // Notes (from the source file: oql-lexer.plex) - Romain // // The strval rule is a little bit cryptic. diff --git a/core/oql/oqlexception.class.inc.php b/core/oql/oqlexception.class.inc.php index 512a3077f..952a15bf2 100644 --- a/core/oql/oqlexception.class.inc.php +++ b/core/oql/oqlexception.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + class OQLException extends CoreException { diff --git a/core/oql/oqlinterpreter.class.inc.php b/core/oql/oqlinterpreter.class.inc.php index 90fd60c1f..bd249307d 100644 --- a/core/oql/oqlinterpreter.class.inc.php +++ b/core/oql/oqlinterpreter.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + class OqlNormalizeException extends OQLException { diff --git a/core/oql/oqlquery.class.inc.php b/core/oql/oqlquery.class.inc.php index 1979cdac5..159636f38 100644 --- a/core/oql/oqlquery.class.inc.php +++ b/core/oql/oqlquery.class.inc.php @@ -1,4 +1,27 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ // Position a string within an OQL query // This is a must if we want to be able to pinpoint an error at any stage of the query interpretation diff --git a/core/ormdocument.class.inc.php b/core/ormdocument.class.inc.php index 4ffb3ace4..e5c9ef204 100644 --- a/core/ormdocument.class.inc.php +++ b/core/ormdocument.class.inc.php @@ -1,15 +1,35 @@ - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + + +/** + * ormDocument + * encapsulate the behavior of a binary data set that will be stored an attribute of class AttributeBlob + * + * @package itopORM */ class ormDocument diff --git a/core/sqlquery.class.inc.php b/core/sqlquery.class.inc.php index 700d0b33b..a4a1a994e 100644 --- a/core/sqlquery.class.inc.php +++ b/core/sqlquery.class.inc.php @@ -1,16 +1,35 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + /** * SQLQuery * build an mySQL compatible SQL query * * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ */ require_once('cmdbsource.class.inc.php'); diff --git a/core/stimulus.class.inc.php b/core/stimulus.class.inc.php index 1d27bd080..e1595e641 100644 --- a/core/stimulus.class.inc.php +++ b/core/stimulus.class.inc.php @@ -1,15 +1,33 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + /** * A stimulus is the trigger that makes the lifecycle go ahead (state machine) * * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ */ // #@# Really dirty !!! diff --git a/core/test.class.inc.php b/core/test.class.inc.php index 1c0f2b0e2..b6a654c43 100644 --- a/core/test.class.inc.php +++ b/core/test.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('coreexception.class.inc.php'); require_once('attributedef.class.inc.php'); @@ -30,12 +54,6 @@ class UnitTestException extends Exception * Improved display of the backtrace * * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ */ class ExceptionFromError extends Exception { @@ -52,12 +70,6 @@ class ExceptionFromError extends Exception * Test handler API and basic helpers * * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ */ abstract class TestHandler { @@ -177,11 +189,6 @@ abstract class TestHandler * Test to execute a piece of code (checks if an error occurs) * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ abstract class TestFunction extends TestHandler { @@ -193,11 +200,6 @@ abstract class TestFunction extends TestHandler * Test to execute a piece of code (checks if an error occurs) * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ abstract class TestWebServices extends TestHandler { @@ -255,11 +257,6 @@ abstract class TestWebServices extends TestHandler * Test to execute a piece of code (checks if an error occurs) * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ abstract class TestSoapWebService extends TestHandler { @@ -275,11 +272,6 @@ abstract class TestSoapWebService extends TestHandler * Test to check that a function outputs some values depending on its input * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ abstract class TestFunctionInOut extends TestFunction { @@ -318,11 +310,6 @@ abstract class TestFunctionInOut extends TestFunction * Test to check an URL (Searches for Error/Warning/Etc keywords) * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ abstract class TestUrl extends TestHandler { @@ -341,11 +328,6 @@ abstract class TestUrl extends TestHandler * Test to check a user management module * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ abstract class TestUserRights extends TestHandler { @@ -360,11 +342,6 @@ abstract class TestUserRights extends TestHandler * Test to execute a scenario on a given DB * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ abstract class TestScenarioOnDB extends TestHandler { @@ -399,11 +376,6 @@ abstract class TestScenarioOnDB extends TestHandler * Test to use a business model on a given DB * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ abstract class TestBizModel extends TestHandler { @@ -507,11 +479,6 @@ abstract class TestBizModel extends TestHandler * Test to execute a scenario common to any business model (tries to build all the possible queries, etc.) * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ abstract class TestBizModelGeneric extends TestBizModel { diff --git a/core/trigger.class.inc.php b/core/trigger.class.inc.php index 608ccafdc..03d61c18f 100644 --- a/core/trigger.class.inc.php +++ b/core/trigger.class.inc.php @@ -1,16 +1,35 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + /** * A user defined trigger, to customize the application * A trigger will activate an action * * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ */ class Trigger extends cmdbAbstractObject { diff --git a/core/userrights.class.inc.php b/core/userrights.class.inc.php index 6078fa61b..d19a338fe 100644 --- a/core/userrights.class.inc.php +++ b/core/userrights.class.inc.php @@ -1,18 +1,29 @@ - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ + class UserRightException extends CoreException { } @@ -36,11 +47,6 @@ define('UR_ACTION_APPLICATION_DEFINED', 10000); // Application specific actions * User management module API * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ abstract class UserRightsAddOnAPI { @@ -66,11 +72,6 @@ abstract class UserRightsAddOnAPI * User management core API * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class UserRights { diff --git a/core/valuesetdef.class.inc.php b/core/valuesetdef.class.inc.php index 1d7868763..223e34502 100644 --- a/core/valuesetdef.class.inc.php +++ b/core/valuesetdef.class.inc.php @@ -1,20 +1,36 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + +require_once('MyHelpers.class.inc.php'); /** * ValueSetDefinition * value sets API and implementations * * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ */ - -require_once('MyHelpers.class.inc.php'); - abstract class ValueSetDefinition { protected $m_bIsLoaded = false; @@ -70,11 +86,6 @@ abstract class ValueSetDefinition * Set of existing values for an attribute, given a search filter * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class ValueSetObjects extends ValueSetDefinition { @@ -122,11 +133,6 @@ class ValueSetObjects extends ValueSetDefinition * Set of existing values for a link set attribute, given a relation code * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class ValueSetRelatedObjectsFromLinkSet extends ValueSetDefinition { @@ -201,11 +207,6 @@ class ValueSetRelatedObjectsFromLinkSet extends ValueSetDefinition * Fixed set values (could be hardcoded in the business model) * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class ValueSetEnum extends ValueSetDefinition { @@ -242,11 +243,6 @@ class ValueSetEnum extends ValueSetDefinition * Data model classes * * @package iTopORM - * @author Romain Quetiez - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version $itopversion$ */ class ValueSetEnumClasses extends ValueSetEnum { diff --git a/dictionaries/dictionary.itop.core.php b/dictionaries/dictionary.itop.core.php index 4ee8ac798..6f57a300e 100644 --- a/dictionaries/dictionary.itop.core.php +++ b/dictionaries/dictionary.itop.core.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + ////////////////////////////////////////////////////////////////////// // Classes in 'core/cmdb' diff --git a/dictionaries/dictionary.itop.model.php b/dictionaries/dictionary.itop.model.php index ca4594ca9..840286d03 100644 --- a/dictionaries/dictionary.itop.model.php +++ b/dictionaries/dictionary.itop.model.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + // Dictionnay conventions // Class: diff --git a/dictionaries/dictionary.itop.ui.php b/dictionaries/dictionary.itop.ui.php index d7c71c4cf..47202e765 100644 --- a/dictionaries/dictionary.itop.ui.php +++ b/dictionaries/dictionary.itop.ui.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + ////////////////////////////////////////////////////////////////////// // Classes in 'gui' diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php index 287dc5fdc..872600b57 100644 --- a/dictionaries/fr.dictionary.itop.ui.php +++ b/dictionaries/fr.dictionary.itop.ui.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + ////////////////////////////////////////////////////////////////////// // Classes in 'gui' diff --git a/pages/ITopConsultant.php b/pages/ITopConsultant.php index a14a05847..7c918c717 100644 --- a/pages/ITopConsultant.php +++ b/pages/ITopConsultant.php @@ -1,13 +1,30 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ function sexyclass($sClass, $sBaseArgs) { diff --git a/pages/UI.php b/pages/UI.php index 65f548750..08de50806 100644 --- a/pages/UI.php +++ b/pages/UI.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + /** * Perform all the needed checks to delete one (or more) objects */ diff --git a/pages/UniversalSearch.php b/pages/UniversalSearch.php index 556157156..5b19d3107 100644 --- a/pages/UniversalSearch.php +++ b/pages/UniversalSearch.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../application/application.inc.php'); require_once('../application/itopwebpage.class.inc.php'); require_once('../application/applicationcontext.class.inc.php'); diff --git a/pages/ajax.csvimport.php b/pages/ajax.csvimport.php index bc69ee94b..491e3f8df 100644 --- a/pages/ajax.csvimport.php +++ b/pages/ajax.csvimport.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../application/application.inc.php'); require_once('../application/webpage.class.inc.php'); require_once('../application/ajaxwebpage.class.inc.php'); diff --git a/pages/ajax.render.php b/pages/ajax.render.php index 58380c3ad..fb71b3726 100644 --- a/pages/ajax.render.php +++ b/pages/ajax.render.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../application/application.inc.php'); require_once('../application/webpage.class.inc.php'); require_once('../application/ajaxwebpage.class.inc.php'); diff --git a/pages/audit.php b/pages/audit.php index 03aaf5710..a7fd54ff0 100644 --- a/pages/audit.php +++ b/pages/audit.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../application/application.inc.php'); require_once('../application/itopwebpage.class.inc.php'); diff --git a/pages/csvimport.php b/pages/csvimport.php index 8ed3600b0..e77793edf 100644 --- a/pages/csvimport.php +++ b/pages/csvimport.php @@ -1,14 +1,29 @@ * @author Romain Quetiez * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-3.0.html LGPL - * @link http://www.combodo.com/itop iTop + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ + ini_set('memory_limit', '256M'); require_once('../application/application.inc.php'); require_once('../application/itopwebpage.class.inc.php'); diff --git a/pages/graphviz.php b/pages/graphviz.php index b3d5874db..89e067b58 100644 --- a/pages/graphviz.php +++ b/pages/graphviz.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../application/application.inc.php'); require_once('../application/itopwebpage.class.inc.php'); diff --git a/pages/opensearch.xml.php b/pages/opensearch.xml.php index 6d57a98db..68c7393db 100644 --- a/pages/opensearch.xml.php +++ b/pages/opensearch.xml.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + $sFullUrl = 'http'.(empty($_SERVER['HTTPS']) ? '' : 's').'://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].dirname($_SERVER['SCRIPT_NAME']).'/UI.php'; $sICOFullUrl = 'http'.(empty($_SERVER['HTTPS']) ? '' : 's').'://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].dirname($_SERVER['SCRIPT_NAME']).'/../images/iTop-icon.ico'; $sPNGFullUrl = 'http'.(empty($_SERVER['HTTPS']) ? '' : 's').'://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].dirname($_SERVER['SCRIPT_NAME']).'/../images/iTop-icon.png'; diff --git a/pages/run_query.php b/pages/run_query.php index 65a221da7..74e2497a1 100644 --- a/pages/run_query.php +++ b/pages/run_query.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../application/application.inc.php'); require_once('../application/itopwebpage.class.inc.php'); diff --git a/pages/schema.php b/pages/schema.php index b77703847..3f92140ba 100644 --- a/pages/schema.php +++ b/pages/schema.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../application/application.inc.php'); require_once('../application/itopwebpage.class.inc.php'); diff --git a/pages/test.php b/pages/test.php index e9e9bbea4..cf6f31042 100644 --- a/pages/test.php +++ b/pages/test.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + /////////////////////////////////////////////////////////////////////////////// diff --git a/pages/testlist.inc.php b/pages/testlist.inc.php index 1298a5213..82e31b7c6 100644 --- a/pages/testlist.inc.php +++ b/pages/testlist.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + class TestSQLQuery extends TestScenarioOnDB { diff --git a/pages/usermanagement_classproj.php b/pages/usermanagement_classproj.php index 28a8e1036..22db2525a 100644 --- a/pages/usermanagement_classproj.php +++ b/pages/usermanagement_classproj.php @@ -1,4 +1,29 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../application/application.inc.php'); require_once('../application/itopwebpage.class.inc.php'); diff --git a/pages/usermanagement_profileproj.php b/pages/usermanagement_profileproj.php index a9475330e..ef42dd1cc 100644 --- a/pages/usermanagement_profileproj.php +++ b/pages/usermanagement_profileproj.php @@ -1,4 +1,29 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../application/application.inc.php'); require_once('../application/itopwebpage.class.inc.php'); diff --git a/pages/usermanagement_userstatus.php b/pages/usermanagement_userstatus.php index d5a17a892..5a175aca3 100644 --- a/pages/usermanagement_userstatus.php +++ b/pages/usermanagement_userstatus.php @@ -1,4 +1,29 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../application/application.inc.php'); require_once('../application/itopwebpage.class.inc.php'); diff --git a/setup/ajax.dataloader.php b/setup/ajax.dataloader.php index b01beb76e..1ddd98a82 100644 --- a/setup/ajax.dataloader.php +++ b/setup/ajax.dataloader.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + /** * This page is called to load "asynchronously" some xml file into the database * parameters diff --git a/setup/email.test.php b/setup/email.test.php index bcf7935d8..66fd3b8d6 100644 --- a/setup/email.test.php +++ b/setup/email.test.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + /** * Wizard to configure and initialize the iTop application */ diff --git a/setup/index.php b/setup/index.php index 8f2065320..2c66c5f4c 100644 --- a/setup/index.php +++ b/setup/index.php @@ -1,7 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ + require_once('../application/utils.inc.php'); require_once('../core/config.class.inc.php'); require_once('../core/log.class.inc.php'); diff --git a/setup/setuppage.class.inc.php b/setup/setuppage.class.inc.php index 37785327f..8d6533f76 100644 --- a/setup/setuppage.class.inc.php +++ b/setup/setuppage.class.inc.php @@ -1,10 +1,31 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ + +require_once("../application/nicewebpage.class.inc.php"); +define('INSTALL_LOG_FILE', '../setup.log'); + class SetupWebPage extends NiceWebPage { public function __construct($sTitle) diff --git a/setup/xmldataloader.class.inc.php b/setup/xmldataloader.class.inc.php index 6879efb45..e706d1a52 100644 --- a/setup/xmldataloader.class.inc.php +++ b/setup/xmldataloader.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + define ('KEYS_CACHE_FILE', '../keyscache.tmp'); /** * Class to load sets of objects from XML files into the database diff --git a/webservices/export.php b/webservices/export.php index e4a003bdb..94aa77ef3 100644 --- a/webservices/export.php +++ b/webservices/export.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../application/application.inc.php'); require_once('../application/nicewebpage.class.inc.php'); require_once('../application/csvpage.class.inc.php'); diff --git a/webservices/import.php b/webservices/import.php index ddf4b0deb..b78d2a92c 100644 --- a/webservices/import.php +++ b/webservices/import.php @@ -1,21 +1,31 @@ - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ // // Known limitations // - output still in html, because the errors are not displayed in xml -// - only external fields attributes could be used as reconciliation keys for external keys // - reconciliation is made on the first column // - no option to force 'always create' or 'never create' // - text qualifier hardcoded to " diff --git a/webservices/itop.wsdl.php b/webservices/itop.wsdl.php index db107fae2..5590e0d2d 100644 --- a/webservices/itop.wsdl.php +++ b/webservices/itop.wsdl.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + // This is to make sure that the client will accept it.... // header('Content-Type: application/xml; charset=UTF-8'); diff --git a/webservices/itopsoap.examples.php b/webservices/itopsoap.examples.php index c93be4333..755d05e92 100644 --- a/webservices/itopsoap.examples.php +++ b/webservices/itopsoap.examples.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('itopsoaptypes.class.inc.php'); diff --git a/webservices/itopsoaptypes.class.inc.php b/webservices/itopsoaptypes.class.inc.php index 3e8f6f7ba..c024e0133 100644 --- a/webservices/itopsoaptypes.class.inc.php +++ b/webservices/itopsoaptypes.class.inc.php @@ -1,4 +1,28 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + // Note: the attributes must have the same names (case sensitive) as in the WSDL specification // diff --git a/webservices/soapserver.php b/webservices/soapserver.php index bd263bc21..077fc25cc 100644 --- a/webservices/soapserver.php +++ b/webservices/soapserver.php @@ -1,15 +1,26 @@ - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ + * @author Erwan Taloc + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ // Important note: if some required includes are missing, this might result diff --git a/webservices/webservices.class.inc.php b/webservices/webservices.class.inc.php index c4c27b4ad..ccbb8da77 100644 --- a/webservices/webservices.class.inc.php +++ b/webservices/webservices.class.inc.php @@ -1,20 +1,36 @@ + * @author Romain Quetiez + * @author Denis Flaven + * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL + */ + require_once('../webservices/itopsoaptypes.class.inc.php'); /** - * Create Ticket web service - * Web Service API wrapper + * Generic response of iTop SOAP services * * @package iTopORM - * @author Romain Quetiez - * @author Denis Flaven - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link www.itop.com - * @since 1.0 - * @version 1.1.1.1 $ */ - class WebServiceResult { @@ -201,6 +217,11 @@ class WebServiceResult } +/** + * Generic response of iTop SOAP services - failed login + * + * @package iTopORM + */ class WebServiceResultFailedLogin extends WebServiceResult { public function __construct($sLogin) @@ -210,6 +231,11 @@ class WebServiceResultFailedLogin extends WebServiceResult } } +/** + * Implementation of the Services + * + * @package iTopORM + */ class WebServices { /**