[Fusionforge-commits] r10583 - in trunk/src/www: frs frs/admin frs/include frs/reporting help include
Franck VILLAUME
nerville at libremir.placard.fr.eu.org
Tue Sep 21 12:30:37 CEST 2010
Author: nerville
Date: 2010-09-21 12:30:36 +0200 (Tue, 21 Sep 2010)
New Revision: 10583
Modified:
trunk/src/www/frs/admin/deletepackage.php
trunk/src/www/frs/admin/deleterelease.php
trunk/src/www/frs/admin/editrelease.php
trunk/src/www/frs/admin/index.php
trunk/src/www/frs/download.php
trunk/src/www/frs/include/frs_utils.php
trunk/src/www/frs/reporting/downloads.php
trunk/src/www/help/index.php
trunk/src/www/help/tracker.php
trunk/src/www/help/trove_cat.php
trunk/src/www/include/bookmarks.php
trunk/src/www/include/browser.php
trunk/src/www/include/canned_responses.php
Log:
exit functions migration
Modified: trunk/src/www/frs/admin/deletepackage.php
===================================================================
--- trunk/src/www/frs/admin/deletepackage.php 2010-09-21 10:06:11 UTC (rev 10582)
+++ trunk/src/www/frs/admin/deletepackage.php 2010-09-21 10:30:36 UTC (rev 10583)
@@ -4,23 +4,23 @@
* Project Admin: Edit Packages
*
* Copyright 1999-2001 (c) VA Linux Systems
- * The rest Copyright 2002-2004 (c) GForge Team
- * http://gforge.org/
+ * Copyright 2002-2004 (c) GForge Team
+ * http://fusionforge.org/
*
- * This file is part of GForge.
+ * This file is part of FusionForge.
*
- * GForge is free software; you can redistribute it and/or modify
+ * FusionForge 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,
+ * FusionForge 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
+ * along with FusionForge; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
@@ -39,16 +39,16 @@
if (!$project || !is_object($project)) {
exit_no_group();
} elseif ($project->isError()) {
- exit_error('Error',$project->getErrorMessage());
+ exit_error($project->getErrorMessage(),'frs');
}
session_require_perm ('frs', $group_id, 'write') ;
$frsp = new FRSPackage($project,$package_id);
if (!$frsp || !is_object($frsp)) {
- exit_error('Error','Could Not Get FRS Package');
+ exit_error(_('Could Not Get FRS Package'),'frs');
} elseif ($frsp->isError()) {
- exit_error('Error',$frsp->getErrorMessage());
+ exit_error($frsp->getErrorMessage(),'frs');
}
/*
Modified: trunk/src/www/frs/admin/deleterelease.php
===================================================================
--- trunk/src/www/frs/admin/deleterelease.php 2010-09-21 10:06:11 UTC (rev 10582)
+++ trunk/src/www/frs/admin/deleterelease.php 2010-09-21 10:30:36 UTC (rev 10583)
@@ -3,23 +3,23 @@
* Project Admin: Edit Packages
*
* Copyright 1999-2001 (c) VA Linux Systems
- * The rest Copyright 2002-2004 (c) GForge Team
- * http://gforge.org/
+ * Copyright 2002-2004 (c) GForge Team
+ * http://fusionforge.org/
*
- * This file is part of GForge.
+ * This file is part of FusionForge.
*
- * GForge is free software; you can redistribute it and/or modify
+ * FusionForge 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,
+ * FusionForge 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
+ * along with FusionForge; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
@@ -41,30 +41,28 @@
if (!$project || !is_object($project)) {
exit_no_group();
} elseif ($project->isError()) {
- exit_error('Error',$project->getErrorMessage());
+ exit_error($project->getErrorMessage(),'frs');
}
session_require_perm ('frs', $group_id, 'write') ;
$frsp = new FRSPackage($project,$package_id);
if (!$frsp || !is_object($frsp)) {
- exit_error('Error','Could Not Get FRS Package');
+ exit_error(_('Could Not Get FRS Package'),'frs');
} elseif ($frsp->isError()) {
- exit_error('Error',$frsp->getErrorMessage());
+ exit_error($frsp->getErrorMessage(),'frs');
}
$frsr = new FRSRelease($frsp,$release_id);
if (!$frsr || !is_object($frsr)) {
- exit_error('Error','Could Not Get FRS Release');
+ exit_error(_('Could Not Get FRS Release'),'frs');
} elseif ($frsr->isError()) {
- exit_error('Error',$frsr->getErrorMessage());
+ exit_error($frsr->getErrorMessage(),'frs');
}
/*
-
Relatively simple form to delete packages of releases
-
*/
frs_admin_header(array('title'=>_('Release Edit/File Releases'),'group'=>$group_id));
Modified: trunk/src/www/frs/admin/editrelease.php
===================================================================
--- trunk/src/www/frs/admin/editrelease.php 2010-09-21 10:06:11 UTC (rev 10582)
+++ trunk/src/www/frs/admin/editrelease.php 2010-09-21 10:30:36 UTC (rev 10583)
@@ -3,23 +3,23 @@
* Project Admin: Edit Releases of Packages
*
* Copyright 1999-2001 (c) VA Linux Systems
- * The rest Copyright 2002-2004 (c) GForge Team
- * http://gforge.org/
+ * Copyright 2002-2004 (c) GForge Team
+ * http://fusionforge.org/
*
- * This file is part of GForge.
+ * This file is part of FusionForge.
*
- * GForge is free software; you can redistribute it and/or modify
+ * FusionForge 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,
+ * FusionForge 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
+ * along with FusionForge; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
Modified: trunk/src/www/frs/admin/index.php
===================================================================
--- trunk/src/www/frs/admin/index.php 2010-09-21 10:06:11 UTC (rev 10582)
+++ trunk/src/www/frs/admin/index.php 2010-09-21 10:30:36 UTC (rev 10583)
@@ -4,23 +4,24 @@
* Project Admin: Edit Packages
*
* Copyright 1999-2001 (c) VA Linux Systems
- * The rest Copyright 2002-2004 (c) GForge Team
- * http://gforge.org/
+ * Copyright 2002-2004 (c) GForge Team
+ * Copyright 2010 (c) Franck Villaume - Capgemini
+ * http://fusionforge.org/
*
- * This file is part of GForge.
+ * This file is part of FusionForge.
*
- * GForge is free software; you can redistribute it and/or modify
+ * FusionForge 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,
+ * FusionForge 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
+ * along with FusionForge; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
@@ -40,15 +41,13 @@
if (!$project || !is_object($project)) {
exit_no_group();
} elseif ($project->isError()) {
- exit_error('Error',$project->getErrorMessage());
+ exit_error($project->getErrorMessage(),'frs');
}
session_require_perm ('frs', $group_id, 'write') ;
/*
-
Relatively simple form to edit/add packages of releases
-
*/
// only admin can modify packages (vs modifying releases of packages)
@@ -60,21 +59,19 @@
$is_public = getStringFromRequest('is_public');
/*
-
make updates to the database
-
*/
if ($func=='add_package' && $package_name) {
//create a new package
$frsp = new FRSPackage($project);
if (!$frsp || !is_object($frsp)) {
- exit_error('Error','Could Not Get FRS Package');
+ exit_error(_('Could Not Get FRS Package'),'frs');
} elseif ($frsp->isError()) {
- exit_error('Error',$frsp->getErrorMessage());
+ exit_error($frsp->getErrorMessage(),'frs');
}
if (!$frsp->create($package_name,$is_public)) {
- exit_error('Error',$frsp->getErrorMessage());
+ exit_error($frsp->getErrorMessage(),'frs');
} else {
$feedback .=_('Added Package');
}
@@ -84,15 +81,15 @@
//delete a package
$frsp = new FRSPackage($project,$package_id);
if (!$frsp || !is_object($frsp)) {
- exit_error('Error','Could Not Get FRS Package');
+ exit_error(_('Could Not Get FRS Package'),'frs');
} elseif ($frsp->isError()) {
- exit_error('Error',$frsp->getErrorMessage());
+ exit_error($frsp->getErrorMessage(),'frs');
}
$sure = getIntFromRequest("sure");
$really_sure = getIntFromRequest("really_sure");
if (!$frsp->delete($sure,$really_sure)) {
- exit_error('Error',$frsp->getErrorMessage());
+ exit_error($frsp->getErrorMessage(),'frs');
} else {
$feedback .=_('Deleted');
}
@@ -100,18 +97,16 @@
} else if ($func=='update_package' && $package_id && $package_name && $status_id) {
$frsp = new FRSPackage($project,$package_id);
if (!$frsp || !is_object($frsp)) {
- exit_error('Error','Could Not Get FRS Package');
+ exit_error(_('Could Not Get FRS Package'),'frs');
} elseif ($frsp->isError()) {
- exit_error('Error',$frsp->getErrorMessage());
+ exit_error($frsp->getErrorMessage(),'frs');
}
if (!$frsp->update($package_name,$status_id)) {
- exit_error('Error',$frsp->getErrorMessage());
+ exit_error($frsp->getErrorMessage(),'frs');
} else {
$feedback .= _('Updated Package');
}
-
}
-
}
@@ -146,15 +141,13 @@
<?php
/*
-
Show a list of existing packages
for this project so they can
be edited
-
*/
if (!$res || $rows < 1) {
- echo '<p><strong>'._('You Have No Packages Defined').'</strong></p>';
+ echo '<div class="warning">'._('You Have No Packages Defined').'</div>';
} else {
$title_arr=array();
$title_arr[]=_('Releases');
@@ -197,9 +190,7 @@
}
/*
-
form to create a new package
-
*/
?>
Modified: trunk/src/www/frs/download.php
===================================================================
--- trunk/src/www/frs/download.php 2010-09-21 10:06:11 UTC (rev 10582)
+++ trunk/src/www/frs/download.php 2010-09-21 10:30:36 UTC (rev 10583)
@@ -1,25 +1,26 @@
<?php
/**
- * GForge FRS Facility
+ * FRS Facility
*
* Copyright 1999-2001 (c) VA Linux Systems
- * The rest Copyright 2002-2004 (c) GForge Team
- * http://gforge.org/
+ * Copyright 2002-2004 (c) GForge Team
+ * Copyright 2010 (c) FusionForge Team
+ * http://fusionforge.org/
*
- * This file is part of GForge.
+ * This file is part of FusionForge.
*
- * GForge is free software; you can redistribute it and/or modify
+ * FusionForge 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,
+ * FusionForge 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
+ * along with FusionForge; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
@@ -59,20 +60,20 @@
$Package = new FRSPackage($Group,$package_id);
if (!$Package || !is_object($Package)) {
- exit_error('Error','Error Getting Package');
+ exit_error(_('Error Getting Package'),'frs');
} else if ($Package->isError()) {
- exit_error('Error', $Package->getErrorMessage());
+ exit_error($Package->getErrorMessage(),'frs');
}
$is_public = $Package->isPublic();
$Release = new FRSRelease($Package,$release_id);
if (!$Release || !is_object($Release) || $Release->isError()) {
- exit_error('Error','Error Getting Release');
+ exit_error(_('Error Getting Release'),'frs');
}
$File = new FRSFile($Release,$file_id);
if (!$File || !is_object($File) || $File->isError()) {
- exit_error('Error','Error Getting File');
+ exit_error(_('Error Getting File'),'frs');
}
$filename = $File->getName();
Modified: trunk/src/www/frs/include/frs_utils.php
===================================================================
--- trunk/src/www/frs/include/frs_utils.php 2010-09-21 10:06:11 UTC (rev 10582)
+++ trunk/src/www/frs/include/frs_utils.php 2010-09-21 10:30:36 UTC (rev 10583)
@@ -3,30 +3,28 @@
* FRS HTML Utilities
*
* Copyright 1999-2001 (c) VA Linux Systems
- * The rest Copyright 2002-2004 (c) GForge Team
- * http://gforge.org/
+ * Copyright 2002-2004 (c) GForge Team
+ * http://fusionforge.org/
*
- * This file is part of GForge.
+ * This file is part of FusionForge.
*
- * GForge is free software; you can redistribute it and/or modify
+ * FusionForge 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,
+ * FusionForge 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
+ * along with FusionForge; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/*
-
Standard header to be used on all /project/admin/* pages
-
*/
function frs_admin_header($params) {
@@ -60,7 +58,7 @@
Does this site use FRS?
*/
if (!forge_get_config('use_frs')) {
- exit_disabled();
+ exit_disabled('home');
}
$project =& group_get_object($group_id);
@@ -94,18 +92,12 @@
/*
-
-
The following functions are for the FRS (File Release System)
-
-
*/
/*
-
pop-up box of supported frs statuses
-
*/
function frs_show_status_popup ($name='status_id', $checked_val="xzxz") {
@@ -121,9 +113,7 @@
}
/*
-
pop-up box of supported frs filetypes
-
*/
function frs_show_filetype_popup ($name='type_id', $checked_val="xzxz") {
@@ -139,9 +129,7 @@
}
/*
-
pop-up box of supported frs processor options
-
*/
function frs_show_processor_popup ($name='processor_id', $checked_val="xzxz") {
@@ -157,9 +145,7 @@
}
/*
-
pop-up box of packages:releases for this group
-
*/
@@ -184,9 +170,7 @@
}
/*
-
pop-up box of packages for this group
-
*/
function frs_show_package_popup ($group_id, $name='package_id', $checked_val="xzxz") {
@@ -256,13 +240,13 @@
}
$frsf = new FRSFile($release);
if (!$frsf || !is_object($frsf)) {
- exit_error('Error','Could Not Get FRSFile');
+ exit_error(_('Could Not Get FRSFile'),'frs');
} elseif ($frsf->isError()) {
- exit_error('Error',$frsf->getErrorMessage());
+ exit_error($frsf->getErrorMessage(),'frs');
} else {
if (!$frsf->create($fname,$infile,$type_id,$processor_id,$release_date)) {
db_rollback();
- exit_error('Error',$frsf->getErrorMessage());
+ exit_error($frsf->getErrorMessage(),'frs');
}
return true ;
}
@@ -271,7 +255,6 @@
}
}
-
// Local Variables:
// mode: php
// c-file-style: "bsd"
Modified: trunk/src/www/frs/reporting/downloads.php
===================================================================
--- trunk/src/www/frs/reporting/downloads.php 2010-09-21 10:06:11 UTC (rev 10582)
+++ trunk/src/www/frs/reporting/downloads.php 2010-09-21 10:30:36 UTC (rev 10583)
@@ -1,6 +1,7 @@
<?php
/*
* Copyright (C) 2009 Alain Peyrat, Alcatel-Lucent
+ * http://fusionforge.org
*
* This file is part of FusionForge.
*
@@ -59,13 +60,13 @@
$g =& group_get_object($group_id);
if (!$g || $g->isError()) {
- exit_error('Error',$g->getErrorMessage());
+ exit_error($g->getErrorMessage(),'frs');
}
session_require_perm ('frs', $group_id, 'write') ;
$report=new Report();
if ($report->isError()) {
- exit_error($report->getErrorMessage());
+ exit_error($report->getErrorMessage(),'frs');
}
// Fix: Add current month to the reports.
Modified: trunk/src/www/help/index.php
===================================================================
--- trunk/src/www/help/index.php 2010-09-21 10:06:11 UTC (rev 10582)
+++ trunk/src/www/help/index.php 2010-09-21 10:30:36 UTC (rev 10583)
@@ -1,25 +1,25 @@
<?php
/**
- * GForge Help Facility
+ * Help Facility
*
* Copyright 1999-2001 (c) VA Linux Systems
- * The rest Copyright 2002-2004 (c) GForge Team
- * http://gforge.org/
+ * Copyright 2002-2004 (c) GForge Team
+ * http://fusionforge.org/
*
- * This file is part of GForge.
+ * This file is part of FusionForge.
*
- * GForge is free software; you can redistribute it and/or modify
+ * FusionForge 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,
+ * FusionForge 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
+ * along with FusionForge; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
Modified: trunk/src/www/help/tracker.php
===================================================================
--- trunk/src/www/help/tracker.php 2010-09-21 10:06:11 UTC (rev 10582)
+++ trunk/src/www/help/tracker.php 2010-09-21 10:30:36 UTC (rev 10583)
@@ -1,25 +1,25 @@
<?php
/**
- * GForge Help Facility
+ * Help Facility
*
* Copyright 1999-2001 (c) VA Linux Systems
- * The rest Copyright 2002-2004 (c) GForge Team
- * http://gforge.org/
+ * Copyright 2002-2004 (c) GForge Team
+ * http://fusionforge.org/
*
- * This file is part of GForge.
+ * This file is part of FusionForge.
*
- * GForge is free software; you can redistribute it and/or modify
+ * FusionForge 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,
+ * FusionForge 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
+ * along with FusionForge; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
Modified: trunk/src/www/help/trove_cat.php
===================================================================
--- trunk/src/www/help/trove_cat.php 2010-09-21 10:06:11 UTC (rev 10582)
+++ trunk/src/www/help/trove_cat.php 2010-09-21 10:30:36 UTC (rev 10583)
@@ -1,25 +1,25 @@
<?php
/**
- * GForge Help Facility
+ * Help Facility
*
* Copyright 1999-2001 (c) VA Linux Systems
- * The rest Copyright 2002-2004 (c) GForge Team
- * http://gforge.org/
+ * Copyright 2002-2004 (c) GForge Team
+ * http://fusionforge.org/
*
- * This file is part of GForge.
+ * This file is part of FusionForge.
*
- * GForge is free software; you can redistribute it and/or modify
+ * FusionForge 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,
+ * FusionForge 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
+ * along with FusionForge; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
Modified: trunk/src/www/include/bookmarks.php
===================================================================
--- trunk/src/www/include/bookmarks.php 2010-09-21 10:06:11 UTC (rev 10582)
+++ trunk/src/www/include/bookmarks.php 2010-09-21 10:30:36 UTC (rev 10583)
@@ -2,10 +2,24 @@
/**
* Bookmarks functions library.
*
- * SourceForge: Breaking Down the Barriers to Open Source Development
* Copyright 1999-2001 (c) VA Linux Systems
- * http://sourceforge.net
+ * http://fusionforge.org
*
+ * This file is part of FusionForge.
+ *
+ * FusionForge 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.
+ *
+ * FusionForge 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 FusionForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/**
Modified: trunk/src/www/include/browser.php
===================================================================
--- trunk/src/www/include/browser.php 2010-09-21 10:06:11 UTC (rev 10582)
+++ trunk/src/www/include/browser.php 2010-09-21 10:30:36 UTC (rev 10583)
@@ -1,8 +1,24 @@
<?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
+/**
+ * Copyright 1999-2001 (c) VA Linux Systems
+ * http://fusionforge.org
+ *
+ * This file is part of FusionForge.
+ *
+ * FusionForge 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.
+ *
+ * FusionForge 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 FusionForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
unset ($BROWSER_AGENT);
unset ($BROWSER_VER);
Modified: trunk/src/www/include/canned_responses.php
===================================================================
--- trunk/src/www/include/canned_responses.php 2010-09-21 10:06:11 UTC (rev 10582)
+++ trunk/src/www/include/canned_responses.php 2010-09-21 10:30:36 UTC (rev 10583)
@@ -2,10 +2,24 @@
/**
* Canned Responses functions library.
*
- * SourceForge: Breaking Down the Barriers to Open Source Development
* Copyright 1999-2001 (c) VA Linux Systems
- * http://sourceforge.net
+ * http://fusionforge.org
*
+ * This file is part of FusionForge.
+ *
+ * FusionForge 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.
+ *
+ * FusionForge 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 FusionForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/**
@@ -16,11 +30,11 @@
*/
function add_canned_response($title, $text)
{
- global $feedback;
+ global $error_msg;
if( !db_query_params ('INSERT INTO canned_responses (response_title, response_text) VALUES($1,$2)',
array($title,
$text)) ) {
- $feedback .= db_error();
+ $error_msg .= db_error();
}
}
More information about the Fusionforge-commits
mailing list