#19 - Reviewed the licensing information and started to align the comments in the code

SVN:trunk[422]
This commit is contained in:
Romain Quetiez
2010-05-24 09:24:35 +00:00
parent 2b365dca75
commit a0e0371812
102 changed files with 2375 additions and 687 deletions

View File

@@ -1,4 +1,28 @@
<?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
/**
* Static class utils
*
* @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('../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'];