[Savannah-hackers-public] /usr/src/savane on frontend stale

[Karl Berry]

I believe the active checkout of the savane-cleanup git repo for
savannah is /usr/src/savane on frontend.  I just made a tiny tweak to
frontend/php/my/groups.php.  I was scared to blindly run git pull, so
Jim M (hi Jim) kindly provided this recipe to see what would be changed:

  git fetch
  git diff master origin/master

I'll append the output, plus the git status output for good measure.
(Looks like a couple files should be checked in.)

And indeed, there are a few changes besides mine, notably one that
looks, well, crucial -- admin password setting.  (I've replaced the
actual hash values with obvious placeholders.)

The other non-me changes don't look problematic to my uneducated eye,
but I have no clue what to do about the adminpw thing.

Michael, Jim, anyone, help?

Thanks,
Karl


diff --git a/db/mysql/bootstrap.sql b/db/mysql/bootstrap.sql
index 639099b..9f50191 100644
--- a/db/mysql/bootstrap.sql
+++ b/db/mysql/bootstrap.sql
@@ -6,7 +6,7 @@
 -- user 'admin', password 'admin'
 -- (account/register.php)
 INSERT INTO user (user_name, user_pw, add_date, status, realname)
-VALUES ('admin', 'SHORT-HEX-PW', UNIX_TIMESTAMP(NOW()), 'A', 'Administrator');
+VALUES ('admin', 'LONG-MD5-PW', UNIX_TIMESTAMP(NOW()), 'A', 'Administrator');
 
 -- siteadmin project
 -- (register/*)
diff --git a/frontend/php/include/init.php b/frontend/php/include/init.php
index eba72dc..4c3b70b 100644
--- a/frontend/php/include/init.php
+++ b/frontend/php/include/init.php
@@ -226,6 +226,8 @@ if ($sys_debug_on == true) {
     case E_USER_NOTICE:       print "User Notice";            break;
     case E_STRICT:            print "Strict Notice";          break;
     case E_RECOVERABLE_ERROR: print "Recoverable Error";      break;
+    /* E_DEPRECATED - PHP >= 5.3 : */
+    case 8192:                return false; // too much noise
     default:                  print "Unknown error ($errno)"; break;
     }
     print '</strong>';
@@ -413,7 +415,7 @@ user_guess();
 
 # if we got an item_id and no group_id we need to get the appropriate
 # group_id
-if (!isset($group_id) && !isset($group) && isset($item_id))
+if (!isset($group_id) && !isset($group) && isset($item_id) && 
in_array(ARTIFACT, array('bugs', 'patch', 'task', 'cookbook', 'support')))
 {
   $result = db_execute("SELECT group_id FROM ".ARTIFACT." WHERE bug_id=?", 
array($item_id));
   if (db_numrows($result))
diff --git a/frontend/php/my/groups.php b/frontend/php/my/groups.php
index f7f6009..ab293e7 100644
--- a/frontend/php/my/groups.php
+++ b/frontend/php/my/groups.php
@@ -294,7 +294,7 @@ print $HTML->box_top(_("Request for Inclusion"),'',1);
 print '<div class="boxitem">'."\n";
   print '<p>';
 #print _("If there is a project - or several - you would like to be member of, 
to be able to fully contribute, it is possible to search for the names in the 
whole group database with the following search tool. A list of groups will be 
generated, depending on the word(s) typed in this form.")."\n";
-print _("Type below the name of the project you want to contribute to.  
Joining a project means getting write access to the code repositories and 
involves responsibilities.  Usually you will first contact the project 
developers (e.g. using the project mailing list) before requesting formal 
inclusion using this form.")."\n";
+print _("Type below the name of the project you want to contribute to. Joining 
a project means getting write access to the project repositories and trackers, 
and involves responsibilities.  Therefore, usually you would first contact the 
project developers (e.g., using a project mailing list) before requesting 
formal inclusion using this form.")."\n";
 print '</p>';
 
 print '
@@ -525,4 +525,4 @@ print html_splitpage(3);
 
 $HTML->footer(array());
 
-?>
\ No newline at end of file
+?>

 ----------------------------------------------------------------------------

# On branch master
# Your branch and 'origin/master' have diverged,
# and have 35 and 3 different commit(s) each, respectively.
#
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   frontend/php/account/lostpw.php
#       modified:   frontend/php/include/trackers_run/index.php
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       curpatch
#       diff
#       frontend/php/register2.bak/
no changes added to commit (use "git add" and/or "git commit -a")