March 2010 - Userbase-programmers - mailman3.cels.anl.gov

r1362 - branches/1.2.2-alcf/pkgs
by tstacey＠mcs.anl.gov 22 Mar '10

22 Mar '10

Author: tstacey Date: 2010-03-22 13:51:15 -0500 (Mon, 22 Mar 2010) New Revision: 1362 Modified: branches/1.2.2-alcf/pkgs/alcf-pages-ChangeLog branches/1.2.2-alcf/pkgs/alcf-pages-version Log: Get rid of remaining lcrc/qbank cruft (hopefully) Modified: branches/1.2.2-alcf/pkgs/alcf-pages-ChangeLog =================================================================== --- branches/1.2.2-alcf/pkgs/alcf-pages-ChangeLog 2010-03-22 18:51:13 UTC (rev 1361) +++ branches/1.2.2-alcf/pkgs/alcf-pages-ChangeLog 2010-03-22 18:51:15 UTC (rev 1362) @@ -1,3 +1,10 @@ +Version 15 +----------- + +Date: Mon Mar 22 13:51:15 CDT 2010 +User: tstacey +Changes: Get rid of remaining lcrc/qbank cruft (hopefully) + Version 14 ----------- Modified: branches/1.2.2-alcf/pkgs/alcf-pages-version =================================================================== --- branches/1.2.2-alcf/pkgs/alcf-pages-version 2010-03-22 18:51:13 UTC (rev 1361) +++ branches/1.2.2-alcf/pkgs/alcf-pages-version 2010-03-22 18:51:15 UTC (rev 1362) @@ -1,2 +1,2 @@ # Do not edit this file by hand. -14 +15

1 0

r1361 - branches/1.2.2-alcf/www
by tstacey＠mcs.anl.gov 22 Mar '10

22 Mar '10

Author: tstacey Date: 2010-03-22 13:51:13 -0500 (Mon, 22 Mar 2010) New Revision: 1361 Modified: branches/1.2.2-alcf/www/proj-admin.php branches/1.2.2-alcf/www/projects.php Log: Get rid of remaining lcrc/qbank cruft (hopefully) Modified: branches/1.2.2-alcf/www/proj-admin.php =================================================================== --- branches/1.2.2-alcf/www/proj-admin.php 2010-03-17 21:31:53 UTC (rev 1360) +++ branches/1.2.2-alcf/www/proj-admin.php 2010-03-22 18:51:13 UTC (rev 1361) @@ -346,7 +346,7 @@ ); # FIXME: An 'add_to_project' email should be specified here -# send_accounts_email($username, 'lcrc_add_to_project', $vars); + send_accounts_email($username, 'add_to_project', $vars); add_message('You have added '.$username.' to this project.'); @@ -381,25 +381,25 @@ $user = new user($username); $real_name = $user->Get('preferred_name'); - if ($GLOBALS[dbconfig]->Get('no_commands') == 'N') { + # if ($GLOBALS[dbconfig]->Get('no_commands') == 'N') { + # + # $command = $GLOBALS[dbconfig]->Get('qbank_remove_user'); + # $command = str_replace('%proj%', $projectname, $command); + # $command = str_replace('%user%', $username, $command); + # + # if( exec( $command, $output ) ) { + # } else { + # add_error('The user '.$username.' was not removed because '.$command." failed" ); + # return; + # } + # } - $command = $GLOBALS[dbconfig]->Get('qbank_remove_user'); - $command = str_replace('%proj%', $projectname, $command); - $command = str_replace('%user%', $username, $command); - - if( exec( $command, $output ) ) { - } else { - add_error('The user '.$username.' was not removed because '.$command." failed" ); - return; - } - } - $vars = array( 'real_name' => $real_name, 'project_name' => $projectname, ); - send_accounts_email($username, 'lcrc_remove_from_project', $vars); + send_accounts_email($username, 'remove_from_project', $vars); add_message('You have removed '.$username.' from this project.'); @@ -496,25 +496,25 @@ $user = new user($username); $real_name = $user->Get('preferred_name'); - if ($GLOBALS[dbconfig]->Get('no_commands') == 'N') { + # if ($GLOBALS[dbconfig]->Get('no_commands') == 'N') { + # + # $command = $GLOBALS[dbconfig]->Get('qbank_remove_pi'); + # $command = str_replace('%proj%', $projectname, $command); + # $command = str_replace('%user%', $username, $command); + # + # if( exec( $command, $output ) ) { + # } else { + # add_error('The user '.$username.' was not removed as a PI because '.$command." failed" ); + # return; + # } + # } - $command = $GLOBALS[dbconfig]->Get('qbank_remove_pi'); - $command = str_replace('%proj%', $projectname, $command); - $command = str_replace('%user%', $username, $command); - - if( exec( $command, $output ) ) { - } else { - add_error('The user '.$username.' was not removed as a PI because '.$command." failed" ); - return; - } - } - $vars= array( 'real_name' => $real_name, 'project_name' => $projectname, ); - send_accounts_email($username, 'lcrc_remove_pi', $vars); + send_accounts_email($username, 'remove_pi', $vars); add_message('You have removed '.$username.' from being a principal investigator.'); Modified: branches/1.2.2-alcf/www/projects.php =================================================================== --- branches/1.2.2-alcf/www/projects.php 2010-03-17 21:31:53 UTC (rev 1360) +++ branches/1.2.2-alcf/www/projects.php 2010-03-22 18:51:13 UTC (rev 1361) @@ -322,7 +322,7 @@ 'project_name' => $projectname, ); - send_accounts_email($username, 'lcrc_remove_from_project', $vars); + send_accounts_email($username, 'remove_from_project', $vars); add_message('You have removed '.$username.' from this project.'); @@ -362,18 +362,18 @@ $user = new user($username); $real_name = $user->Get('preferred_name'); - if ($GLOBALS[dbconfig]->Get('no_commands') == 'N') { + # if ($GLOBALS[dbconfig]->Get('no_commands') == 'N') { - $command = $GLOBALS[dbconfig]->Get('qbank_make_pi'); - $command = str_replace('%proj%', $projectname, $command); - $command = str_replace('%user%', $username, $command); + # $command = $GLOBALS[dbconfig]->Get('qbank_make_pi'); + # $command = str_replace('%proj%', $projectname, $command); + # $command = str_replace('%user%', $username, $command); - if( exec( $command, $output ) ) { - } else { - add_error('The user '.$username.' was not added as a PI because '.$command." failed" ); - return; - } - } + # if( exec( $command, $output ) ) { + # } else { + # add_error('The user '.$username.' was not added as a PI because '.$command." failed" ); + # return; + # } + # } $vars= array( 'real_name' => $real_name, @@ -419,25 +419,25 @@ $user = new user($username); $real_name = $user->Get('preferred_name'); - if ($GLOBALS[dbconfig]->Get('no_commands') == 'N') { +# if ($GLOBALS[dbconfig]->Get('no_commands') == 'N') { + # + # $command = $GLOBALS[dbconfig]->Get('qbank_remove_pi'); + # $command = str_replace('%proj%', $projectname, $command); + # $command = str_replace('%user%', $username, $command); - $command = $GLOBALS[dbconfig]->Get('qbank_remove_pi'); - $command = str_replace('%proj%', $projectname, $command); - $command = str_replace('%user%', $username, $command); + # if( exec( $command, $output ) ) { + # } else { + # add_error('The user '.$username.' was not removed as a PI because '.$command." failed" ); + # return; + # } + # } - if( exec( $command, $output ) ) { - } else { - add_error('The user '.$username.' was not removed as a PI because '.$command." failed" ); - return; - } - } - $vars= array( 'real_name' => $real_name, 'project_name' => $projectname, ); - send_accounts_email($username, 'lcrc_remove_pi', $vars); + send_accounts_email($username, 'remove_pi', $vars); add_message('You have removed '.$username.' from being a principal investigator.');

1 0

r1360 - branches/1.2.2-alcf/pkgs
by tstacey＠mcs.anl.gov 17 Mar '10

17 Mar '10

Author: tstacey Date: 2010-03-17 16:31:53 -0500 (Wed, 17 Mar 2010) New Revision: 1360 Modified: branches/1.2.2-alcf/pkgs/alcf-pages-ChangeLog branches/1.2.2-alcf/pkgs/alcf-pages-version Log: Account request info page changes (adding Magellan stuff) Modified: branches/1.2.2-alcf/pkgs/alcf-pages-ChangeLog =================================================================== --- branches/1.2.2-alcf/pkgs/alcf-pages-ChangeLog 2010-03-17 21:31:52 UTC (rev 1359) +++ branches/1.2.2-alcf/pkgs/alcf-pages-ChangeLog 2010-03-17 21:31:53 UTC (rev 1360) @@ -1,3 +1,10 @@ +Version 14 +----------- + +Date: Wed Mar 17 16:31:53 CDT 2010 +User: tstacey +Changes: Account request info page changes (adding Magellan stuff) + Version 13 ----------- Modified: branches/1.2.2-alcf/pkgs/alcf-pages-version =================================================================== --- branches/1.2.2-alcf/pkgs/alcf-pages-version 2010-03-17 21:31:52 UTC (rev 1359) +++ branches/1.2.2-alcf/pkgs/alcf-pages-version 2010-03-17 21:31:53 UTC (rev 1360) @@ -1,2 +1,2 @@ # Do not edit this file by hand. -13 +14

1 0

r1359 - branches/1.2.2-alcf/etc
by tstacey＠mcs.anl.gov 17 Mar '10

17 Mar '10

Author: tstacey Date: 2010-03-17 16:31:52 -0500 (Wed, 17 Mar 2010) New Revision: 1359 Modified: branches/1.2.2-alcf/etc/first_page.php Log: Account request info page changes (adding Magellan stuff) Modified: branches/1.2.2-alcf/etc/first_page.php =================================================================== --- branches/1.2.2-alcf/etc/first_page.php 2010-03-17 19:49:15 UTC (rev 1358) +++ branches/1.2.2-alcf/etc/first_page.php 2010-03-17 21:31:52 UTC (rev 1359) @@ -4,8 +4,7 @@ a list of the information you'll need to provide.</p> <ul> - <li>Your contact information, including mailing address, phone number, -and e-mail address</li> + <li>Your contact information, including mailing address, phone number, and e-mail address</li> <li>Your project information. If you do not belong to an ALCF or Magellan project with an active allocation, please skip the account request and proceed to the section at the bottom of the page titled "Requesting a Project"</li> @@ -14,8 +13,7 @@ <li>A security question and answer: these may be used by our Help Desk to verify your identity if you contact us about account issues; therefore, please phrase it in the form of a question whose answer you will remember, that someone else won't be able to guess, and that we can read back to you for your answer.</li> </ul> -<p>If you are not a U.S. citizen, ANL policies require that we collect -additional information from you:</p> +<p>If you are not a U.S. citizen, ANL policies require that we collect additional information from you:</p> <ul> <li>Your city of birth and country (or countries) of citizenship</li>

1 0

r1358 - branches/1.2.2-alcf/etc
by tstacey＠mcs.anl.gov 17 Mar '10

17 Mar '10

Author: tstacey Date: 2010-03-17 14:49:15 -0500 (Wed, 17 Mar 2010) New Revision: 1358 Modified: branches/1.2.2-alcf/etc/first_page.php Log: Textual changes for Magellan stuff Modified: branches/1.2.2-alcf/etc/first_page.php =================================================================== --- branches/1.2.2-alcf/etc/first_page.php 2010-03-02 19:13:32 UTC (rev 1357) +++ branches/1.2.2-alcf/etc/first_page.php 2010-03-17 19:49:15 UTC (rev 1358) @@ -1,4 +1,4 @@ - <h2>Requesting an ALCF BG/P Account</h2> + <h2>Requesting an ALCF BG/P or Argonne Magellan Cloud Account</h2> <p>In order to make the account request process a little easier, here is a list of the information you'll need to provide.</p> @@ -7,15 +7,11 @@ <li>Your contact information, including mailing address, phone number, and e-mail address</li> - <li>Your project information. If you do not belong to an ALCF project with an active allocation, please skip the account request and proceed to the section at the bottom of the page titled "Requesting an ALCF Project"</li> + <li>Your project information. If you do not belong to an ALCF or Magellan project with an active allocation, please skip the account request and proceed to the section at the bottom of the page titled "Requesting a Project"</li> - <li>Your sponsor's full name and e-mail address -- your project's PI (Principal Investigator) -will serve as your sponsor (if you are the PI, your primary ALCF contact -should be your sponsor)</li> + <li>Your sponsor's full name and e-mail address -- your project's PI (Principal Investigator) will serve as your sponsor (if you are the PI, your primary ALCF contact should be your sponsor)</li> - <li>A security question and answer: these may be used by our Help -Desk to verify your identity if you contact us about account issues; -therefore, please phrase it in the form of a question whose answer you will remember, that someone else won't be able to guess, and that we can read back to you for your answer.</li> + <li>A security question and answer: these may be used by our Help Desk to verify your identity if you contact us about account issues; therefore, please phrase it in the form of a question whose answer you will remember, that someone else won't be able to guess, and that we can read back to you for your answer.</li> </ul> <p>If you are not a U.S. citizen, ANL policies require that we collect @@ -34,30 +30,28 @@ <li>Your visa information (if applicable).</li> </ul> -<p>If you don't provide complete information, or if your INS documentation -has expired, there may be significant delays in processing your account -request.</p> +<p>If you don't provide complete information, or if your INS documentation has expired, there may be significant delays in processing your account request.</p> -<p>If you have any questions or concerns, please contact us at -support(a)alcf.anl.gov.</p> +<p>If you have any questions or concerns, please contact us at support(a)alcf.anl.gov.</p> <p> <input type="submit" value="Proceed with account request"> -<h2> Requesting an ALCF Project </h2> +<h2> Requesting a Project </h2> -<p>If you do not have an ALCF project, the project's PI (Principal Investigator) should complete a new project request for the computing resource(s) you wish to use:</p> +<p>If you do not have an ALCF or Magellan project, the project's PI (Principal Investigator) should complete a new project request for the computing resource(s) you wish to use:</p> <p><a href="https://accounts.alcf.anl.gov/accounts/projects/surveyor.htm">Surveyor Project Request<br> <a href="https://accounts.alcf.anl.gov/accounts/projects/intrepid.htm">Intrepid -Project Request</a></p> +Project Request</a></br> +<a href="http://www.alcf.anl.gov/support/magellan.htm">Magellan Project Request</a></p> -<p>The Allocation Committee will contact the requester with its decision. -If your project is approved, at that point, please request a new -account.</p> +<p>The Allocation Committee will contact the requester with its decision. If your project is approved, at that point, please request a new account.</p> <p>For more information about ALCF allocations, please see the -<a href="http://www.alcf.anl.gov/support/usingALCF/docs/discretionary_allocations.php">Discretionary Allocations policy page</a>.</p> +<a href="http://www.alcf.anl.gov/support/usingALCF/docs/discretionary_allocations.php">Discretionary Allocations policy page</a>.</br> + +For more information about Magellan allocations, please see the <a href="http://magellan.alcf.anl.gov/user-support/">Magellan User Support page</a>.</p>

1 0

r1357 - branches/1.2.2-alcf/pkgs
by lueningh＠mcs.anl.gov 02 Mar '10

02 Mar '10

Author: lueningh Date: 2010-03-02 13:13:32 -0600 (Tue, 02 Mar 2010) New Revision: 1357 Modified: branches/1.2.2-alcf/pkgs/alcf-pages-ChangeLog branches/1.2.2-alcf/pkgs/alcf-pages-version Log: Slight bugfix Modified: branches/1.2.2-alcf/pkgs/alcf-pages-ChangeLog =================================================================== --- branches/1.2.2-alcf/pkgs/alcf-pages-ChangeLog 2010-03-02 19:13:27 UTC (rev 1356) +++ branches/1.2.2-alcf/pkgs/alcf-pages-ChangeLog 2010-03-02 19:13:32 UTC (rev 1357) @@ -1,3 +1,10 @@ +Version 13 +----------- + +Date: Tue Mar 2 13:13:29 CST 2010 +User: lueningh +Changes: Slight bugfix + Version 12 ----------- Modified: branches/1.2.2-alcf/pkgs/alcf-pages-version =================================================================== --- branches/1.2.2-alcf/pkgs/alcf-pages-version 2010-03-02 19:13:27 UTC (rev 1356) +++ branches/1.2.2-alcf/pkgs/alcf-pages-version 2010-03-02 19:13:32 UTC (rev 1357) @@ -1,2 +1,2 @@ # Do not edit this file by hand. -12 +13

1 0

r1356 - branches/1.2.2-alcf/etc
by lueningh＠mcs.anl.gov 02 Mar '10

02 Mar '10

Author: lueningh Date: 2010-03-02 13:13:27 -0600 (Tue, 02 Mar 2010) New Revision: 1356 Modified: branches/1.2.2-alcf/etc/admin-edit.php Log: Slight bugfix Modified: branches/1.2.2-alcf/etc/admin-edit.php =================================================================== --- branches/1.2.2-alcf/etc/admin-edit.php 2010-03-01 15:52:04 UTC (rev 1355) +++ branches/1.2.2-alcf/etc/admin-edit.php 2010-03-02 19:13:27 UTC (rev 1356) @@ -348,8 +348,9 @@ section_header("Sponsorship Information"); $sponsorships = $request->Sponsors(); $arr = $sponsorships->Arr(); - show_generic_section($arr[0], 'user', 'sponsor', 'sponsor_'); - + if(isset($arr[0])){ + show_generic_section($arr[0], 'user', 'sponsor', 'sponsor_'); + } section_header("External Sponsorship Information"); show_generic_section($request->ExternalSponsor(), 'user', 'external', 'user_'); }

1 0

r1355 - branches/1.2.2-alcf/pkgs
by lueningh＠mcs.anl.gov 01 Mar '10

01 Mar '10

Author: lueningh Date: 2010-03-01 09:52:04 -0600 (Mon, 01 Mar 2010) New Revision: 1355 Modified: branches/1.2.2-alcf/pkgs/alcf-pages-ChangeLog branches/1.2.2-alcf/pkgs/alcf-pages-version Log: Added sponsor field to admin pages Modified: branches/1.2.2-alcf/pkgs/alcf-pages-ChangeLog =================================================================== --- branches/1.2.2-alcf/pkgs/alcf-pages-ChangeLog 2010-03-01 15:51:58 UTC (rev 1354) +++ branches/1.2.2-alcf/pkgs/alcf-pages-ChangeLog 2010-03-01 15:52:04 UTC (rev 1355) @@ -1,3 +1,10 @@ +Version 12 +----------- + +Date: Mon Mar 1 09:52:01 CST 2010 +User: lueningh +Changes: Added sponsor field to admin pages + Version 11 ----------- Modified: branches/1.2.2-alcf/pkgs/alcf-pages-version =================================================================== --- branches/1.2.2-alcf/pkgs/alcf-pages-version 2010-03-01 15:51:58 UTC (rev 1354) +++ branches/1.2.2-alcf/pkgs/alcf-pages-version 2010-03-01 15:52:04 UTC (rev 1355) @@ -1,2 +1,2 @@ # Do not edit this file by hand. -11 +12

1 0

r1354 - in branches/1.2.2-alcf: etc lib www
by lueningh＠mcs.anl.gov 01 Mar '10

01 Mar '10

Author: lueningh Date: 2010-03-01 09:51:58 -0600 (Mon, 01 Mar 2010) New Revision: 1354 Modified: branches/1.2.2-alcf/etc/admin-config.php branches/1.2.2-alcf/etc/admin-edit.php branches/1.2.2-alcf/lib/userbase.php branches/1.2.2-alcf/www/admin.php Log: Added sponsor field to admin pages Modified: branches/1.2.2-alcf/etc/admin-config.php =================================================================== --- branches/1.2.2-alcf/etc/admin-config.php 2010-02-15 19:09:03 UTC (rev 1353) +++ branches/1.2.2-alcf/etc/admin-config.php 2010-03-01 15:51:58 UTC (rev 1354) @@ -303,6 +303,14 @@ 'noedit' => array( ), ), + 'sponsor' => array( + 'shown'=> array( + 'sponsor_name' => 'Sponsor Username', + ), + 'noedit' => array( + 'sponsor_name', + ), + ), ), 'react' => array( Modified: branches/1.2.2-alcf/etc/admin-edit.php =================================================================== --- branches/1.2.2-alcf/etc/admin-edit.php 2010-02-15 19:09:03 UTC (rev 1353) +++ branches/1.2.2-alcf/etc/admin-edit.php 2010-03-01 15:51:58 UTC (rev 1354) @@ -343,6 +343,13 @@ show_generic_section($request->ForeignInfo(), 'user', 'foreign', 'user_'); } + + + section_header("Sponsorship Information"); + $sponsorships = $request->Sponsors(); + $arr = $sponsorships->Arr(); + show_generic_section($arr[0], 'user', 'sponsor', 'sponsor_'); + section_header("External Sponsorship Information"); show_generic_section($request->ExternalSponsor(), 'user', 'external', 'user_'); } Modified: branches/1.2.2-alcf/lib/userbase.php =================================================================== --- branches/1.2.2-alcf/lib/userbase.php 2010-02-15 19:09:03 UTC (rev 1353) +++ branches/1.2.2-alcf/lib/userbase.php 2010-03-01 15:51:58 UTC (rev 1354) @@ -891,6 +891,10 @@ return(new user_foreign(array('userbase_id' => $this->Get('userbase_id')))); } + function Sponsor () { + return(new sponsorship(array('sponsored' => $this->Get('userbase_id')))); + } + function ExternalSponsor () { return(new external_sponsorship(array('sponsored' => $this->Get('userbase_id')))); } Modified: branches/1.2.2-alcf/www/admin.php =================================================================== --- branches/1.2.2-alcf/www/admin.php 2010-02-15 19:09:03 UTC (rev 1353) +++ branches/1.2.2-alcf/www/admin.php 2010-03-01 15:51:58 UTC (rev 1354) @@ -2024,6 +2024,11 @@ save_section_data($foreign_info, $form_data, $info, 'user_'); } + + # Save the sponsorship stuff + $sponsorship_info = $request->Sponsors(); + $info = $sections['sponsor']; + save_section_data($sponsorship_info, $form_data, $info, 'sponsor_'); # Save the external sponsorship stuff $externalsponsorship_info = $request->ExternalSponsor();

1 0