gforge-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gforge-commits] gforge/www/admin add_language.php, 1.3, NONE admin_tabl


From: tperdue
Subject: [Gforge-commits] gforge/www/admin add_language.php, 1.3, NONE admin_table.php, 1.8, 1.9 admin_utils.php, 1.4, 1.5 admintabfiles.php, 1.7, 1.8 approve-pending.php, 1.15, 1.16 cronman.php, 1.3, 1.4 database.php, 1.10, 1.11 edit_frs_filetype.php, 1.2, 1.3 edit_frs_processor.php, 1.2, 1.3 edit_frs_theme.php, 1.1, NONE edit_theme.php, NONE, 1.1 groupedit.php, 1.9, 1.10 grouplist.php, 1.15, 1.16 index.php, 1.21, 1.22 loadtabfiles.php, 1.11, 1.12 massmail.php, 1.8, 1.9 responses_admin.php, 1.5, 1.6 search.php, 1.10, 1.11 unsubscribe.php, 1.8, 1.9 useredit.php, 1.7, 1.8 userlist.php, 1.16, 1.17 vhost.php, 1.8, 1.9
Date: Fri, 27 Aug 2004 14:02:21 -0500

Update of /cvsroot/gforge/gforge/www/admin
In directory db.perdue.net:/home/tperdue/share/dev.gforge.org/www/admin

Modified Files:
        admin_table.php admin_utils.php admintabfiles.php 
        approve-pending.php cronman.php database.php 
        edit_frs_filetype.php edit_frs_processor.php groupedit.php 
        grouplist.php index.php loadtabfiles.php massmail.php 
        responses_admin.php search.php unsubscribe.php useredit.php 
        userlist.php vhost.php 
Added Files:
        edit_theme.php 
Removed Files:
        add_language.php edit_frs_theme.php 
Log Message:
fixing titles, licenses, exit_assert calls

--- add_language.php DELETED ---

Index: admin_table.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/admin_table.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- admin_table.php     22 Jul 2004 20:34:14 -0000      1.8
+++ admin_table.php     27 Aug 2004 19:02:18 -0000      1.9
@@ -1,15 +1,27 @@
 <?php
 /**
-  *
-  * Module to render generic HTML tables for Site Admin
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  * @version   $Id$
-  *
-  */
+ * Module to render generic HTML tables for Site Admin
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version   $Id$
+ *
+ * This file is part of GForge.
+ *
+ * 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
+ */
 
 
 /**

Index: admin_utils.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/admin_utils.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- admin_utils.php     18 Feb 2004 09:18:25 -0000      1.4
+++ admin_utils.php     27 Aug 2004 19:02:18 -0000      1.5
@@ -1,17 +1,31 @@
 <?php
 /**
-  * Module of support routines for Site Admin
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  * @version   $Id$
-  */
-
+ * Module of support routines for Site Admin
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version   $Id$
+ *
+ * This file is part of GForge.
+ *
+ * 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
+ */
 
 function site_admin_header($params) {
        global $feedback,$HTML;
+       session_require(array('group'=>'1','admin_flags'=>'A'));
        $HTML->header($params);
        echo html_feedback_top($feedback);
 }

Index: admintabfiles.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/admintabfiles.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- admintabfiles.php   3 Apr 2003 22:06:59 -0000       1.7
+++ admintabfiles.php   27 Aug 2004 19:02:18 -0000      1.8
@@ -1,15 +1,27 @@
 <?php
 /**
-  *
-  * Module to render generic HTML tables for Site Admin
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  * @version   $Id$
-  *
-  */
+ * Module to render generic HTML tables for Site Admin
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version   $Id$
+ *
+ * This file is part of GForge.
+ *
+ * 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
+ */
 
 
 /**

Index: approve-pending.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/approve-pending.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- approve-pending.php 6 Aug 2004 07:52:57 -0000       1.15
+++ approve-pending.php 27 Aug 2004 19:02:18 -0000      1.16
@@ -1,15 +1,27 @@
 <?php
 /**
-  *
-  * Site Admin page for approving/rejecting new projects
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  * @version   $Id$
-  *
-  */
+ * Site Admin page for approving/rejecting new projects
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version   $Id$
+ *
+ * This file is part of GForge.
+ *
+ * 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
+ */
 
 
 // Show no more pending projects per page than specified here

Index: cronman.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/cronman.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cronman.php 15 Jan 2004 11:13:00 -0000      1.3
+++ cronman.php 27 Aug 2004 19:02:18 -0000      1.4
@@ -6,14 +6,28 @@
  * http://gforge.org/
  *
  * @version   $Id$
+ *
+ * This file is part of GForge.
+ *
+ * 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
  */
 
 
 require_once('pre.php');
 require_once('www/admin/admin_utils.php');
-require ('common/include/cron_utils.php');
-
-session_require(array('group'=>'1','admin_flags'=>'A'));
+require_once ('common/include/cron_utils.php');
 
 site_admin_header(array('title'=>$Language->getText('admin_index','title')));
 

Index: database.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/database.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- database.php        25 Mar 2004 19:35:45 -0000      1.10
+++ database.php        27 Aug 2004 19:02:18 -0000      1.11
@@ -1,22 +1,34 @@
 <?php
 /**
-  *
-  * Site Admin page for maintaining groups'databases
-  *
-  * This page allows to:
-  *   - browse aggregate numbers of databases of specific type (active,
-  *     deleted, etc.)
-  *   - list all databases of given type
-  *   - edit some database (by going to group's DB Admin page)
-  *   - register existing database in system
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  * @version   $Id$
-  *
-  */
+ * Site Admin page for maintaining groups'databases
+ *
+ * This page allows to:
+ *   - browse aggregate numbers of databases of specific type (active,
+ *      deleted, etc.)
+ *   - list all databases of given type
+ *   - edit some database (by going to group's DB Admin page)
+ *   - register existing database in system
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version   $Id$
+ *
+ * This file is part of GForge.
+ *
+ * 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
+ */
 
 
 require_once('pre.php');
@@ -28,16 +40,25 @@
 
 session_require(array('group'=>'1','admin_flags'=>'A'));
 
-
 if ($submit) {
 
        if ($group_id) {
 
                $group =& group_get_object_by_name($groupname);
-               exit_assert_object($group, 'Group');
+               if (!$group || !is_object($group)) {
+                       exit_error('Error','Could Not Get Group');
+               } elseif ($group->isError()) {
+                       exit_error('Error',$group->getErrorMessage());
+               }
+
 
                $user =& session_get_user();
-               exit_assert_object($user, 'User');
+               if (!$u || !is_object($u)) {
+                       exit_error('Error','Could Not Get User');
+               } elseif ($u->isError()) {
+                       exit_error('Error',$u->getErrorMessage());
+               }
+
 
                $res = db_query("
                        INSERT INTO prdb_dbs(group_id, dbname, dbusername, 
dbuserpass, requestdate, dbtype, created_by, state)
@@ -58,7 +79,6 @@
 
 }
 
-
 
site_admin_header(array('title'=>$Language->getText('admin_database','site_admin_groups_maintance')));
 
 $res_db = db_query("

Index: edit_frs_filetype.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/edit_frs_filetype.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- edit_frs_filetype.php       18 Feb 2004 09:18:25 -0000      1.2
+++ edit_frs_filetype.php       27 Aug 2004 19:02:18 -0000      1.3
@@ -1,15 +1,27 @@
 <?php
 /**
-  *
-  * Site Admin page to edit File Release System file types
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  * @version   $Id$
-  *
-  */
+ * Site Admin page to edit File Release System file types
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version   $Id$
+ *
+ * This file is part of GForge.
+ *
+ * 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
+ */
 
 
 $unit        = 'file type';

Index: edit_frs_processor.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/edit_frs_processor.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- edit_frs_processor.php      18 Feb 2004 09:18:25 -0000      1.2
+++ edit_frs_processor.php      27 Aug 2004 19:02:18 -0000      1.3
@@ -1,15 +1,27 @@
 <?php
 /**
-  *
-  * Site Admin page to edit File Release System processor types
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  * @version   $Id$
-  *
-  */
+ * Site Admin page to edit File Release System processor types
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version   $Id$
+ *
+ * This file is part of GForge.
+ *
+ * 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
+ */
 
 
 $unit        = 'processor';

--- edit_frs_theme.php DELETED ---

--- NEW FILE: edit_theme.php ---
<?php
/**
 * Site Admin page to edit themes.
 *
 * Copyright 1999-2001 (c) VA Linux Systems
 *
 * @version   $Id: edit_theme.php,v 1.1 2004/08/27 19:02:18 tperdue Exp $
 *
 * This file is part of GForge.
 *
 * 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
 */


$unit        = 'theme';
$table       = 'themes';
$primary_key = 'theme_id';

include_once('admin_table.php');

?>

Index: groupedit.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/groupedit.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- groupedit.php       4 Aug 2004 16:18:37 -0000       1.9
+++ groupedit.php       27 Aug 2004 19:02:18 -0000      1.10
@@ -2,12 +2,25 @@
 /**
  * Site Admin group properties editing page
  *
- * SourceForge: Breaking Down the Barriers to Open Source Development
  * Copyright 1999-2001 (c) VA Linux Systems
- * http://sourceforge.net
  *
  * @version   $Id$
- * @version   $Id$
+ *
+ * This file is part of GForge.
+ *
+ * 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
  */
 
 require_once('pre.php');
@@ -18,19 +31,10 @@
 session_require(array('group'=>'1','admin_flags'=>'A'));
 
 $group =& group_get_object($group_id);
-
 if (!$group || !is_object($group)) {
-        exit_error(
-               $Language->getText('admin_groupedit','error'),
-                
$Language->getText('admin_groupedit','error_creating_group_object')
-        );
-}
-
-if ($group->isError()) {
-       // If group object was created, but has error condition,
-       // don't treat this as fatal - this page is supposed to be
-       // "repair" page for such circumstances.
-       $feedback .= $group->getErrorMessage().'<br /> ';
+       exit_error('Error','Could Not Get Group');
+} elseif ($group->isError()) {
+       exit_error('Error',$group->getErrorMessage());
 }
 
 // This function performs very update
@@ -41,17 +45,17 @@
 
        db_begin();
 
-        if (!$group->setStatus(session_get_user(), $status)) {
+       if (!$group->setStatus(session_get_user(), $status)) {
                $feedback .= $group->getErrorMessage();
                db_rollback();
                return false;
        }
 
-        if (!$group->updateAdmin(session_get_user(), $is_public, $license, 
$group_type, $unix_box, $http_domain)) {
+       if (!$group->updateAdmin(session_get_user(), $is_public, $license, 
$group_type, $unix_box, $http_domain)) {
                $feedback .= $group->getErrorMessage();
                db_rollback();
                return false;
-        }
+       }
 
        if(!$group->setSCMBox($scm_box) && $GLOBALS['sys_scm_single_host'] != 
'1' && $scm_box!=NULL) {
                $feedback .= $group->getErrorMessage();
@@ -191,7 +195,7 @@
 <?php
 }
 if ($group->usesSCM() && $GLOBALS['sys_scm_single_host'] != '1' ) {
-?>      <tr>
+?>       <tr>
        <td><?php echo $Language->getText('admin','scm_box'); ?>
        </td>
        <td>

Index: grouplist.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/grouplist.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- grouplist.php       3 Jun 2004 19:37:27 -0000       1.15
+++ grouplist.php       27 Aug 2004 19:02:18 -0000      1.16
@@ -1,17 +1,32 @@
 <?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id$
+/**
+ * List of all groups in the system. 
+ *
+ * Copyright 1999-2000 (c) The SourceForge Crew
+ *
+ * $Id$
+ *
+ * This file is part of GForge.
+ *
+ * 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
+ */
 
 require_once('pre.php');
 require_once('www/admin/admin_utils.php');
 
-session_require(array('group'=>'1','admin_flags'=>'A'));
-
-site_admin_header(array('title'=>$GLOBALS['system_name'].$Language->getText('admin_grouplist','group_list')));
+site_admin_header(array('title'=>$Language->getText('admin_grouplist','group_list')));
 
 // start from root if root not passed in
 if (!$form_catroot) {
@@ -20,7 +35,7 @@
 
 //CB removed from 2.6 and 2.5 was link to a page saying to use new project
 //echo "<br /><a href=\"groupedit-add.php\">[Add Group]</a>";
-echo 
"<p>".$GLOBALS['system_name'].$Language->getText('admin_grouplist','group_list_for_category');
+echo "<p>".$Language->getText('admin_grouplist','group_list_for_category');
 
 $sortorder = $_GET['sortorder'];
 if (!isset($sortorder) || empty($sortorder)) {

Index: index.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/index.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- index.php   2 Aug 2004 20:09:33 -0000       1.21
+++ index.php   27 Aug 2004 19:02:18 -0000      1.22
@@ -1,25 +1,37 @@
 <?php
 /**
-  * SourceForge Site Admin main page
-  *
-  * This pages lists all global administration facilities for the
-  * site, including user/group properties editing, maintanance of
-  * site meta-information (Trove maps, metadata for file releases),
-  * etc.
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  * @version   $Id$
-  */
+ * GForge Site Admin main page
+ *
+ * This pages lists all global administration facilities for the
+ * site, including user/group properties editing, maintanance of
+ * site meta-information (Trove maps, metadata for file releases),
+ * etc.
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version   $Id$
+ *
+ * This file is part of GForge.
+ *
+ * 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
+ */
 
 
 require_once('pre.php');
 require_once('www/admin/admin_utils.php');
 
-session_require(array('group'=>'1','admin_flags'=>'A'));
-
 site_admin_header(array('title'=>$Language->getText('admin_index','title')));
 
 $abc_array = 
array('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z','0','1','2','3','4','5','6','7','8','9');
@@ -139,7 +151,7 @@
        <li><a href="edit_supported_languages.php"><?php echo 
$Language->getText('admin_index','add_delete_edit_laguage'); ?></a></li>
        <li><a href="edit_frs_filetype.php"><?php echo 
$Language->getText('admin_index','add_delete_edit_file_types'); ?></a></li>
        <li><a href="edit_frs_processor.php"><?php echo 
$Language->getText('admin_index','add_edit_delete_processors'); ?></a></li>
-       <li><a href="edit_frs_theme.php"><?php echo 
$Language->getText('admin_index','add_edit_delete_themes'); ?></a></li>
+       <li><a href="edit_theme.php"><?php echo 
$Language->getText('admin_index','add_edit_delete_themes'); ?></a></li>
        <li><a href="edit_licenses.php"><?php echo 
$Language->getText('admin_index','add_edit_delete_licenses'); ?></a></li>
        <li><a href="loadtabfiles.php"><?php echo 
$Language->getText('admin_index','translation_file_tool'); ?></a></li>
        <li><a href="/stats/lastlogins.php"><?php echo 
$Language->getText('admin_index','recent_logins'); ?></a></li>

Index: loadtabfiles.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/loadtabfiles.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- loadtabfiles.php    3 Apr 2003 22:06:59 -0000       1.11
+++ loadtabfiles.php    27 Aug 2004 19:02:18 -0000      1.12
@@ -1,9 +1,25 @@
 <?php
 /**
-  *
-  * @version   $Id$
-  *
-  */
+ * //TODO DESCRIPTION
+ *
+ * @version   $Id$
+ *
+ * This file is part of GForge.
+ *
+ * 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
+ */
 
 
 require_once('pre.php');

Index: massmail.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/massmail.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- massmail.php        18 Feb 2004 09:18:25 -0000      1.8
+++ massmail.php        27 Aug 2004 19:02:18 -0000      1.9
@@ -1,19 +1,31 @@
 <?php
 /**
-  *
-  * Site Admin page for setting up massmailings.
-  *
-  * This is frontend of SF massmail facility, which allows to prepare
-  * messages for delivery to target categories of site users. very
-  * delivery is performed via cronjob.
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  * @version   $Id$
-  *
-  */
+ * Site Admin page for setting up massmailings.
+ *
+ * This is frontend of SF massmail facility, which allows to prepare
+ * messages for delivery to target categories of site users. very
+ * delivery is performed via cronjob.
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version   $Id$
+ *
+ * This file is part of GForge.
+ *
+ * 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
+ */
 
 require_once('pre.php');
 require_once('www/admin/admin_utils.php');

Index: responses_admin.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/responses_admin.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- responses_admin.php 4 Aug 2004 16:18:37 -0000       1.5
+++ responses_admin.php 27 Aug 2004 19:02:18 -0000      1.6
@@ -1,18 +1,29 @@
 <?php
 /**
-  *
-  * Site Admin page to edit canned responces for project rejection
-  *
-  * This page is linked from approve-pending.php
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  * @version   $Id$
-  *
-  */
-
+ * Site Admin page to edit canned responces for project rejection
+ *
+ * This page is linked from approve-pending.php
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version   $Id$
+ *
+ * This file is part of GForge.
+ *
+ * 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
+ */
 
 require_once('pre.php');
 require_once('common/include/account.php');
@@ -21,12 +32,9 @@
 require_once('www/admin/admin_utils.php');
 require_once('www/project/admin/project_admin_utils.php');
 
-session_require(array('group'=>'1','admin_flags'=>'A'));
-
 
site_admin_header(array('title'=>$Language->getText('admin_responses','title')));
 
-function check_select_value($value, $type)
-{
+function check_select_value($value, $type) {
        global $Language;
        if( $value == "100" ) {
                print("<span 
style=\"color:red\"><strong>".$Language->getText('admin_responses','you_cant',array($GLOBALS['type']))."</strong></span><br
 />\n");

Index: search.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/search.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- search.php  24 Mar 2004 13:36:05 -0000      1.10
+++ search.php  27 Aug 2004 19:02:18 -0000      1.11
@@ -1,28 +1,38 @@
 <?php
 /**
-  *
-  * Site Admin generic user/group search page
-  *
-  * This is the single page for searching/selection of users/groups for
-  * Site Admin. Currently, it supports querying by (sub)string match in
-  * string user/group properties (names, fullnames, email) and status.
-  * If new search criteria will be required, they should be added here,
-  * not any other (new) page.
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  * @version   $Id$
-  *
-  */
+ * Site Admin generic user/group search page
+ *
+ * This is the single page for searching/selection of users/groups for
+ * Site Admin. Currently, it supports querying by (sub)string match in
+ * string user/group properties (names, fullnames, email) and status.
+ * If new search criteria will be required, they should be added here,
+ * not any other (new) page.
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version   $Id$
+ *
+ * This file is part of GForge.
+ *
+ * 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
+ */
 
 
 require_once('pre.php');
 require_once('www/admin/admin_utils.php');
 
-session_require(array('group'=>'1','admin_flags'=>'A'));
-
 if(!isset($search) || empty($search)) {
        exit_error($Language->getText('general','error'), 
$Language->getText('admin_search','refusing_to_display_whole_db'));
 }
@@ -69,9 +79,10 @@
              .db_numrows($result) .' '. 
$Language->getText('admin_search','matches').'</strong></p>';
 
        if (db_numrows($result) < 1) {
+
                echo db_error();
-       } else {
 
+       } else {
 
                $title=array();
                $title[]=$Language->getText('admin_search','id');

Index: unsubscribe.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/unsubscribe.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- unsubscribe.php     18 Feb 2004 09:18:25 -0000      1.8
+++ unsubscribe.php     27 Aug 2004 19:02:18 -0000      1.9
@@ -1,18 +1,30 @@
 <?php
 /**
-  *
-  * Site Mailings Subscription Maintenance page
-  *
-  * This page is used to maintain site mailings (currently, just
-  * unsubscribe specific user).
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  * @version   $Id$
-  *
-  */
+ * Site Mailings Subscription Maintenance page
+ *
+ * This page is used to maintain site mailings (currently, just
+ * unsubscribe specific user).
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version   $Id$
+ *
+ * This file is part of GForge.
+ *
+ * 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
+ */
 
 
 require_once('pre.php');
@@ -23,11 +35,11 @@
 
        if (!$type) {
 
-               /*
-                       Show form for unsubscription type selection
+               /*
+                               Show form for unsubscription type selection
                */
 
-                
site_admin_header(array('title'=>$Language->getText('admin_unsubscribe','title')));
+               
site_admin_header(array('title'=>$Language->getText('admin_unsubscribe','title')));
                ?>
 
                <h4><?php echo 
$Language->getText('admin_unsubscribe','unsubscribe_user'); ?> <?php echo 
$user_name; ?></h4>
@@ -49,12 +61,17 @@
                exit();
        } else {
 
-               /*
-                       Perform unsubscription
+               /*
+                       Perform unsubscription
                */
 
                $u =& user_get_object_by_name($user_name);
-               exit_assert_object($u, 'User');
+               if (!$u || !is_object($u)) {
+                       exit_error('Error','Could Not Get User');
+               } elseif ($u->isError()) {
+                       exit_error('Error',$u->getErrorMessage());
+               }
+
                if (!$u->unsubscribeFromMailings($type=='ALL' ? 1 : 0)) {
                        exit_error(
                                
$Language->getText('admin_unsubscribe','error_unsubscribe_user') 
.$u->getErrorMessage()

Index: useredit.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/useredit.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- useredit.php        4 Aug 2004 16:18:37 -0000       1.7
+++ useredit.php        27 Aug 2004 19:02:18 -0000      1.8
@@ -1,15 +1,27 @@
 <?php
 /**
-  *
-  * Site Admin user properties editing page
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  * @version   $Id$
-  *
-  */
+ * Site Admin user properties editing page
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version   $Id$
+ *
+ * This file is part of GForge.
+ *
+ * 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
+ */
 
 require_once('pre.php');
 require_once('common/include/account.php');
@@ -24,13 +36,17 @@
 );
 
 $u =& user_get_object($user_id);
-exit_assert_object($u, 'User');
+if (!$u || !is_object($u)) {
+       exit_error('Error','Could Not Get User');
+} elseif ($u->isError()) {
+       exit_error('Error',$u->getErrorMessage());
+}
 
 if ($action == "update_user") {
 
        if (!$u->setEmail($email)
-           || !$u->setShell($shell)
-           || !$u->setStatus($status)) {
+               || !$u->setShell($shell)
+               || !$u->setStatus($status)) {
                exit_error(
                        
$Language->getText('admin_useredit','could_not_complete_operation'),
                        $u->getErrorMessage()

Index: userlist.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/userlist.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- userlist.php        4 Aug 2004 01:51:20 -0000       1.16
+++ userlist.php        27 Aug 2004 19:02:18 -0000      1.17
@@ -1,13 +1,29 @@
 <?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id$
+/**
+ *
+ *
+ * Copyright 1999-2000 (c) The SourceForge Crew
+ *
+ * $Id$
+ *
+ * This file is part of GForge.
+ *
+ * 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
+ */
 
-require "pre.php";
-session_require(array('group'=>'1','admin_flags'=>'A'));
+require_once('pre.php');
 
$HTML->header(array('title'=>$GLOBALS['system_name'].$Language->getText('admin_userlist','userlist')));
 
 /**

Index: vhost.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/admin/vhost.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- vhost.php   25 Mar 2004 19:35:45 -0000      1.8
+++ vhost.php   27 Aug 2004 19:02:18 -0000      1.9
@@ -1,22 +1,33 @@
 <?php
 /**
-  *
-  * Site Admin page for maintaining groups' Virtual Hosts
-  *
-  * This page allows to:
-  *   - add a VHOST entry for group
-  *   - query properties of VHOST entry
-  *   - edit some database (by going to group's DB Admin page)
-  *   - register existing database in system
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  * @version   $Id$
-  *
-  */
-
+ * Site Admin page for maintaining groups' Virtual Hosts
+ *
+ * This page allows to:
+ *   - add a VHOST entry for group
+ *   - query properties of VHOST entry
+ *   - edit some database (by going to group's DB Admin page)
+ *   - register existing database in system
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ *
+ * @version   $Id$
+ *
+ * This file is part of GForge.
+ *
+ * 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
+ */
 
 require_once('pre.php');
 require_once('common/include/account.php');
@@ -33,7 +44,11 @@
        if ($group_id) {
 
                $group = &group_get_object_by_name($groupname);
-               exit_assert_object($group, 'Group');
+               if (!$group || !is_object($group)) {
+                       exit_error('Error','Could Not Get Group');
+               } elseif ($group->isError()) {
+                       exit_error('Error',$group->getErrorMessage());
+               }
 
                if (valid_hostname($vhost_name)) {
 





reply via email to

[Prev in Thread] Current Thread [Next in Thread]