[Gforge-commits] gforge/www/my bookmark_add.php, 1.4, 1.5 bookmark_delete.php, 1.4, 1.5 bookmark_edit.php, 1.4, 1.5 diary.php, 1.11, 1.12 index.php, 1.29, 1.30 rmproject.php, 1.4, 1.5

[tperdue]

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

Modified Files:
        bookmark_add.php bookmark_delete.php bookmark_edit.php 
        diary.php index.php rmproject.php 
Log Message:
Cleanup of page titles, licensing, and exit_assert removals

Index: bookmark_add.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/my/bookmark_add.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- bookmark_add.php    2 Mar 2003 04:53:50 -0000       1.4
+++ bookmark_add.php    27 Aug 2004 16:32:30 -0000      1.5
@@ -1,28 +1,42 @@
 <?php
 /**
-  *
-  * SourceForge User's Personal Page
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  * @version   $Id$
-  *
-  */
+ * SourceForge User's bookmark 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('bookmarks.php');
 
-site_user_header(array("title"=>$Language->getText('my_bookmark_add','section'),'pagename'=>'my_bookmark_add'));
+site_user_header(array("title"=>$Language->getText('my_bookmark_add','section')));
 
 if ($bookmark_url) {
+
        print $Language->getText('my_bookmark_add','added_bookmark', 
array($bookmark_url,$bookmark_title)).".<p>&nbsp;</p>";
 
        bookmark_add ($bookmark_url, $bookmark_title);
        print "<a 
href=\"$bookmark_url\">".$Language->getText('my_bookmark_add','visit_page')."</a>
 - ";
        print "<a 
href=\"/my/\">".$Language->getText('my_bookmark_add','back')."</a>";
+
 } else {
        ?>
        <form action="<?php echo $PHP_SELF; ?>" method="post">

Index: bookmark_delete.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/my/bookmark_delete.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- bookmark_delete.php 2 Mar 2003 04:53:50 -0000       1.4
+++ bookmark_delete.php 27 Aug 2004 16:32:30 -0000      1.5
@@ -1,15 +1,27 @@
 <?php
 /**
-  *
-  * SourceForge User's Personal Page
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  * @version   $Id$
-  *
-  */
+ * SourceForge User's bookmark delete 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');

Index: bookmark_edit.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/my/bookmark_edit.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- bookmark_edit.php   2 Mar 2003 04:53:50 -0000       1.4
+++ bookmark_edit.php   27 Aug 2004 16:32:31 -0000      1.5
@@ -1,15 +1,27 @@
 <?php
 /**
-  *
-  * SourceForge User's Personal Page
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  * @version   $Id$
-  *
-  */
+ * SourceForge User's bookmark 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');
@@ -23,7 +35,11 @@
        }
 }
 
-site_user_header(array(title=>$Language->getText('my_bookmark_edit','title'),'pagename'=>'my_bookmark_edit'));
+if (!$bookmark_id) {
+       exit_missing_param();
+}
+
+site_user_header(array(title=>$Language->getText('my_bookmark_edit','title')));
 
 $result = db_query("SELECT * from user_bookmarks where "
        . "bookmark_id='".$bookmark_id."' and user_id='".user_getid()."'");

Index: diary.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/my/diary.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- diary.php   2 Mar 2003 04:53:50 -0000       1.11
+++ diary.php   27 Aug 2004 16:32:31 -0000      1.12
@@ -1,21 +1,37 @@
 <?php
 /**
-  *
-  * SourceForge User's Personal Page
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  * @version   $Id$
-  *
-  */
+ * GForge User's Diary 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('vote_function.php');
 
-if (session_loggedin()) {
+if (!session_loggedin()) {
+
+       exit_not_logged_in();
+
+} else {
 
        $u =& session_get_user();
 
@@ -166,10 +182,6 @@
 
        echo site_user_footer(array());
 
-} else {
-
-       exit_not_logged_in();
-
 }
 
 ?>

Index: index.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/my/index.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- index.php   4 May 2004 15:04:45 -0000       1.29
+++ index.php   27 Aug 2004 16:32:31 -0000      1.30
@@ -1,16 +1,29 @@
 <?php
 /**
-  *
-  * SourceForge User's Personal Page
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  * @version   $Id$
-  *
-  */
-
+ * SourceForge User's Personal Page
+ *
+ * SourceForge: Breaking Down the Barriers to Open Source Development
+ * Copyright 1999-2001 (c) VA Linux Systems
+ * http://sourceforge.net
+ *
+ * @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  US
+ */
 
 require_once('pre.php');
 require_once('vote_function.php');
@@ -18,9 +31,12 @@
 require_once('common/forum/ForumsForUser.class');
 require_once('common/pm/ProjectTasksForUser.class');
 
-global $G_SESSION;
+if (!session_loggedin()) { // || $sf_user_hash) {
+
+       exit_not_logged_in();
+
+} else {
 
-if (session_loggedin()) { // || $sf_user_hash) {
 
        /*
 //needs security audit
@@ -39,10 +55,10 @@
                        exit_not_logged_in();
                }
                $user_id=db_result($result,0,'user_id');
-               $G_SESSION=user_get_object($user_id,$result);
+               session_get_user()=user_get_object($user_id,$result);
        }
 */
-       echo 
site_user_header(array('title'=>$Language->getText('my','title',user_getname()),'pagename'=>'my','titlevals'=>array(user_getname())));
+       echo 
site_user_header(array('title'=>$Language->getText('my','title',user_getname())));
        ?>
 
        <p>
@@ -120,7 +136,7 @@
        */
        $last_group=0;
        echo $HTML->boxMiddle($Language->getText('my', 
'monitoredforum'),false,false);
-       $forumsForUser = new ForumsForUser($G_SESSION);
+       $forumsForUser = new ForumsForUser(session_get_user());
        $forums =& $forumsForUser->getMonitoredForums();
        if (count($forums) < 1) {
                echo '<strong>'.$Language->getText('my', 
'no_monitored_forums').'</strong>'.$Language->getText('my', 
'no_monitored_forums_details');
@@ -195,7 +211,7 @@
        */
        $last_group=0;
        echo $HTML->boxTop($Language->getText('my', 'tasks'));
-       $projectTasksForUser = new ProjectTasksForUser($G_SESSION);
+       $projectTasksForUser = new ProjectTasksForUser(session_get_user());
        $userTasks =& $projectTasksForUser->getTasksByGroupProjectName();
 
        if (count($userTasks) > 0) {
@@ -391,10 +407,6 @@
 
        echo site_user_footer(array());
 
-} else {
-
-       exit_not_logged_in();
-
 }
 
 ?>

Index: rmproject.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/my/rmproject.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rmproject.php       21 Jan 2003 08:45:10 -0000      1.4
+++ rmproject.php       27 Aug 2004 16:32:31 -0000      1.5
@@ -1,17 +1,29 @@
 <?php
 /**
-  *
-  * SourceForge User's Personal Page
-  *
-  * Confirmation page for users' removing themselves from project.
-  *
-  * SourceForge: Breaking Down the Barriers to Open Source Development
-  * Copyright 1999-2001 (c) VA Linux Systems
-  * http://sourceforge.net
-  *
-  * @version   $Id$
-  *
-  */
+ * SourceForge User's Self-removal Page
+ *
+ * Confirmation page for users' removing themselves from project.
+ *
+ * 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');
@@ -21,7 +33,11 @@
 }
 
 $group =& group_get_object($group_id);
-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 ($confirm) {
 
@@ -45,7 +61,7 @@
        exit_error(
                
$Language->getText('my_rmproject','operation_not_permitted_title'),
                
$Language->getText('my_rmproject','operation_not_permitted_text')
-               );
+       );
 }
 
 echo 
site_user_header(array('title'=>$Language->getText('my_rmproject','title')));