From d99eab6cb8af69304fdd29550ca9a131927354c2 Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Fri, 11 Mar 2011 00:23:50 +0100
Subject: [PATCH] changing gosa.js to fusiondirectory.js adding correct
copyright
---
html/include/{gosa.js => fusiondirectory.js} | 37 ++++++++++----------
ihtml/themes/default/headers.tpl | 2 +-
ihtml/themes/default/password.tpl | 2 +-
ihtml/themes/default/setup_headers.tpl | 2 +-
setup/class_setupStep_Checks.inc | 4 +--
setup/class_setupStep_Welcome.inc | 4 +--
setup/setup_welcome.tpl | 2 +-
7 files changed, 26 insertions(+), 27 deletions(-)
rename html/include/{gosa.js => fusiondirectory.js} (94%)
diff --git a/html/include/gosa.js b/html/include/fusiondirectory.js
similarity index 94%
rename from html/include/gosa.js
rename to html/include/fusiondirectory.js
index b614b56a2..78919ab73 100644
--- a/html/include/gosa.js
+++ b/html/include/fusiondirectory.js
@@ -1,23 +1,22 @@
/*
- * This code is part of GOsa (http://www.gosa-project.org)
- * Copyright (C) 2003-2010 GONICUS GmbH
- *
- * ID: $$Id: index.php 15301 2010-01-26 09:40:08Z cajus $$
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+ This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+ Copyright (C) 2003-2010 Cajus Pollmeier
+ Copyright (C) 2011 FusionDirectory
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
/* Install event handlers */
Event.observe(window, 'resize', resizeHandler);
diff --git a/ihtml/themes/default/headers.tpl b/ihtml/themes/default/headers.tpl
index 8edfd2159..43add0c81 100644
--- a/ihtml/themes/default/headers.tpl
+++ b/ihtml/themes/default/headers.tpl
@@ -31,7 +31,7 @@
<script language="javascript" src="include/png.js" type="text/javascript"></script>
{/if}
<script language="javascript" src="include/prototype.js" type="text/javascript"></script>
- <script language="javascript" src="include/gosa.js" type="text/javascript"></script>
+ <script language="javascript" src="include/fusiondirectory.js" type="text/javascript"></script>
{if $usePrototype == 'true'}
<script language="javascript" src="include/scriptaculous.js" type="text/javascript"></script>
<script language="javascript" src="include/effects.js" type="text/javascript"></script>
diff --git a/ihtml/themes/default/password.tpl b/ihtml/themes/default/password.tpl
index 0dfc2f5fb..529a6a04b 100644
--- a/ihtml/themes/default/password.tpl
+++ b/ihtml/themes/default/password.tpl
@@ -22,7 +22,7 @@
{if isset($ieworkaround)}<script language="javascript"src="include/png.js" type="text/javascript"></script>{/if}
<script language="javascript" src="include/prototype.js" type="text/javascript"></script>
- <script language="javascript" src="include/gosa.js" type="text/javascript"></script>
+ <script language="javascript" src="include/fusiondirectory.js" type="text/javascript"></script>
<script language="javascript" src="include/pwdStrength.js" type="text/javascript"></script>
</head>
diff --git a/ihtml/themes/default/setup_headers.tpl b/ihtml/themes/default/setup_headers.tpl
index 25c0f38ba..260079437 100644
--- a/ihtml/themes/default/setup_headers.tpl
+++ b/ihtml/themes/default/setup_headers.tpl
@@ -20,5 +20,5 @@
<script language="javascript" src="include/png.js" type="text/javascript"></script>
<script language="javascript" src="include/prototype.js" type="text/javascript"></script>
- <script language="javascript" src="include/gosa.js" type="text/javascript"></script>
+ <script language="javascript" src="include/fusiondirectory.js" type="text/javascript"></script>
</head>
diff --git a/setup/class_setupStep_Checks.inc b/setup/class_setupStep_Checks.inc
index 4981f99de..74c0f29e2 100644
--- a/setup/class_setupStep_Checks.inc
+++ b/setup/class_setupStep_Checks.inc
@@ -125,7 +125,7 @@ class Step_Checks extends setup_step
$this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M );
/* Checking generate LM/NT password hashes */
- #TODO: either this, or gosa-si will do the hash generation
+ #TODO: either this, or goto-si will do the hash generation
$query= "mkntpwd 2>&1";
$output= shell_exec ($query);
$have_mkntpwd= preg_match("/^Usage: mkntpwd /", $output);
@@ -137,7 +137,7 @@ class Step_Checks extends setup_step
$N = msgPool::checkingFor(_("samba hash generator"));
$D = _("GOsa requires this command to synchronize POSIX and samba passwords.");
- $S = _("Deploy a gosa-si installation or install the perl Crypt::SmbHash modules.");
+ $S = _("Deploy a goto-si installation or install the perl Crypt::SmbHash modules.");
$R = $have_mkntpwd;
$M = TRUE;
$this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M );
diff --git a/setup/class_setupStep_Welcome.inc b/setup/class_setupStep_Welcome.inc
index 9f53abd67..81ef43c2d 100644
--- a/setup/class_setupStep_Welcome.inc
+++ b/setup/class_setupStep_Welcome.inc
@@ -45,7 +45,7 @@ class Step_Welcome extends setup_step
$smarty = get_smarty();
$smarty->assign('auth_id', session_id());
- $smarty->assign("path",'/tmp/gosa.auth');
+ $smarty->assign("path",'/tmp/fusiondirectory.auth');
return($smarty->fetch(get_template_path("setup_welcome.tpl",TRUE,dirname(__FILE__))));
}
@@ -54,7 +54,7 @@ class Step_Welcome extends setup_step
$id = "";
/* Get auth ID from file */
- $path = '/tmp/gosa.auth';
+ $path = '/tmp/fusiondirectory.auth';
if (file_exists($path) && is_readable($path)){
$contents= file($path);
$id= chop($contents[0]);
diff --git a/setup/setup_welcome.tpl b/setup/setup_welcome.tpl
index 5333adeab..d040ef08f 100644
--- a/setup/setup_welcome.tpl
+++ b/setup/setup_welcome.tpl
@@ -25,7 +25,7 @@
<b>{t}To continue...{/t}</b>
</p>
<p>
- {t}For security reasons you need to authenticate for the installation by creating the file '/tmp/gosa.auth', containing the current session ID on the servers local filesystem. This can be done by executing the following command:{/t}
+ {t}For security reasons you need to authenticate for the installation by creating the file '/tmp/fusiondirectory.auth', containing the current session ID on the servers local filesystem. This can be done by executing the following command:{/t}
</p>
<tt>
echo -n <b>{$auth_id}</b> > {$path}
--
GitLab