[Fusionforge-commits] r8515 - in trunk/gforge: . cronjobs www www/admin

Alain Peyrat aljeux at libremir.placard.fr.eu.org
Fri Dec 11 12:13:28 CET 2009


Author: aljeux
Date: 2009-12-11 12:13:27 +0100 (Fri, 11 Dec 2009)
New Revision: 8515

Modified:
   trunk/gforge/AUTHORS
   trunk/gforge/cronjobs/README.root
   trunk/gforge/cronjobs/auth_unix.php
   trunk/gforge/cronjobs/create_home_dirs.php
   trunk/gforge/www/admin/configman.php
   trunk/gforge/www/env.inc.php
Log:
Fixes provided by olenz mostly on text and cronjobs

Modified: trunk/gforge/AUTHORS
===================================================================
--- trunk/gforge/AUTHORS	2009-12-10 20:49:59 UTC (rev 8514)
+++ trunk/gforge/AUTHORS	2009-12-11 11:13:27 UTC (rev 8515)
@@ -1,11 +1,12 @@
 #
-# GForge
-# Copyright 2002-2005 (c) GForge
-# http://gforge.org
+# FusionForge
+# Copyright 2008-2009 (c) FusionForge
+# Copyright 2002-2008 (c) GForge
+# http://fusionforge.org
 #
 
 ----------------------------------------------------------------------------
-The GForge Team
+The FusionForge Team
 ----------------------------------------------------------------------------
 
 Tim Perdue			<tim at gforge.org>

Modified: trunk/gforge/cronjobs/README.root
===================================================================
--- trunk/gforge/cronjobs/README.root	2009-12-10 20:49:59 UTC (rev 8514)
+++ trunk/gforge/cronjobs/README.root	2009-12-11 11:13:27 UTC (rev 8515)
@@ -1,7 +1,7 @@
-Several scripts in cvs-cron/ will allow you to automate the process of adding
-users, groups, and cvs trees to your unix machine. These scripts build 
-the /etc/passwd /etc/shadow and /etc/group files based on the contents of your 
-gforge database.
+Several scripts in this directory will allow you to automate the
+process of adding users, groups, cvs trees etc. to your machine. These
+scripts build the /etc/passwd /etc/shadow and /etc/group files based
+on the contents of your gforge database.
 
 WARNING: There are potential security risks. Any gforge project admin could 
 add a user to a project, who would then have unix-level access to your 

Modified: trunk/gforge/cronjobs/auth_unix.php
===================================================================
--- trunk/gforge/cronjobs/auth_unix.php	2009-12-10 20:49:59 UTC (rev 8514)
+++ trunk/gforge/cronjobs/auth_unix.php	2009-12-11 11:13:27 UTC (rev 8515)
@@ -1,13 +1,15 @@
 <?php
 /*
  *
+ * Script for creating unix users and group permissions that
+ * correspond to the FusionForge users and groups
+ *
  * Novaforge is a registered trade mark from Bull S.A.S
  * Copyright (C) 2007 Bull S.A.S.
  * 
  * http://novaforge.org/
  *
- *
- * This file has been developped within the Novaforge(TM) project from Bull S.A.S
+ * This file has been developed within the Novaforge(TM) project from Bull S.A.S
  * and contributed back to GForge community.
  *
  * GForge is free software; you can redistribute it and/or modify
@@ -23,27 +25,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this file; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-?>
-<?php
-/**
- * Script for creating user and group permissions
  *
- * Based on cronjobs/cvs-cron/usergroup.php from GForge 4.5.11
- *
- * GForge 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.
- *
- * GForge 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 GForge; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /*
@@ -51,8 +33,9 @@
  * the /etc/passwd, /etc/shadow and /etc/group files
  */
 
-require_once('squal_pre.php');
-require ('common/include/cron_utils.php');
+require (dirname(__FILE__).'/../www/env.inc.php');
+require_once $gfwww.'include/squal_pre.php';
+require $gfcommon.'/include/cron_utils.php';
 
 // Default shell
 $default_shell = "/bin/bash";

Modified: trunk/gforge/cronjobs/create_home_dirs.php
===================================================================
--- trunk/gforge/cronjobs/create_home_dirs.php	2009-12-10 20:49:59 UTC (rev 8514)
+++ trunk/gforge/cronjobs/create_home_dirs.php	2009-12-11 11:13:27 UTC (rev 8515)
@@ -32,8 +32,9 @@
 
 */
 
-require_once('squal_pre.php');
-require ('common/include/cron_utils.php');
+require (dirname(__FILE__).'/../www/env.inc.php');
+require_once $gfwww.'include/squal_pre.php';
+require $gfcommon.'/include/cron_utils.php';
 
 //
 //	Default values for the script

Modified: trunk/gforge/www/admin/configman.php
===================================================================
--- trunk/gforge/www/admin/configman.php	2009-12-10 20:49:59 UTC (rev 8514)
+++ trunk/gforge/www/admin/configman.php	2009-12-11 11:13:27 UTC (rev 8515)
@@ -56,14 +56,14 @@
 	if (! $handle) { 
 		// Open readonly but tell you can't write
 		$handle = fopen($gfcgfile,'r');
-		$feedback .= _('Could not open local.inc file for read/write. Check the permissions for apache').'<br />';
+		$feedback .= sprintf(_('Could not open %s file for read/write. Check the permissions for apache.'), $gfcgfile).'<br />';
 	}
 	if ($handle) {
 		$config_files['local.inc'] = $gfcgfile;
 		fclose($handle);
 	} else {
 		// say we couldn't open local.inc
-		$feedback .= _('Could not open local.inc file for read. Check the permissions for apache').'<br />';
+		$feedback .= sprintf(_('Could not open %s for read. Check the permissions for apache.'), $gfcgfile).'<br />';
 	}
 
 	//get the directories from the plugins dir
@@ -146,14 +146,14 @@
 	if (@$handle = fopen($filepath,'w')) {
 		if (fwrite($handle,$filedata)) {
 			// say wrote ok
-			$feedback .= _('File wrote successfully.').'<br />';
+			$feedback .= sprintf(_('File %s wrote successfully.'), $filepath).'<br />';
 		} else {
 			// say some problem
-			$feedback .= _('File wasn\'t written or is empty.').'<br />';
+			$feedback .= sprintf(_('File %s wasn\'t written or is empty.'), $filepath).'<br />';
 		}
 	} else {
 		// say couldn't open
-		$feedback .= _('Could not open the file for write. Check the permissions for apache').'<br />';
+		$feedback .= sprintf(_("Could not open %s for write. Check the permissions for apache."), $filepath).'<br />';
 	}
 }
 
@@ -181,7 +181,7 @@
 			// Open readonly but tell you can't write
 			$handle = fopen($filepath,'r');
 			$has_write = false;
-			$feedback .= _('Could not open the file for read/write. Check the permissions for apache').'<br />';
+                        $feedback .= sprintf(_("Could not open %s file for read/write. Check the permissions for apache."), $filepath).'<br />';
 		}
 		if ($handle){
 			fclose($handle); // we had to open it in r+ because we need to check we'll be able to save it later
@@ -249,7 +249,7 @@
 			}
 		} else {
 			// say we couldn't open the file
-			$feedback .= _('Could not open the file for read. Check the permissions for apache').'<br />';
+			$feedback .= sprintf(_("Could not open %s for read. Check the permissions for apache."), $filepath).'<br />';
 		}
 	} elseif (getStringFromRequest('doedit')) {
 		updateVars(getArrayFromRequest('attributes'),$gfcgfile); // perhaps later we'll update something else, for now it's local.inc

Modified: trunk/gforge/www/env.inc.php
===================================================================
--- trunk/gforge/www/env.inc.php	2009-12-10 20:49:59 UTC (rev 8514)
+++ trunk/gforge/www/env.inc.php	2009-12-11 11:13:27 UTC (rev 8515)
@@ -1,6 +1,6 @@
 <?php
 /*
- * Sets the default required environnement for FusionForge
+ * Sets the default required environement for FusionForge
  *
  * Some of the settings made here can be overwrite in the
  * configuration file if needed.




More information about the Fusionforge-commits mailing list