This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via d270ad5a2eb2ac318ce57b0dd75292a6a87788ae (commit)
from 56eb6c877652845cfde3f33b756876eb34700b1d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=d270ad5a2eb2ac318ce57b0dd75292a6a87788ae
commit d270ad5a2eb2ac318ce57b0dd75292a6a87788ae
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri Jun 3 15:09:18 2016 +0200
Whitespace
diff --git a/src/www/account/change_email.php b/src/www/account/change_email.php
index 1bb3e30..db87c85 100644
--- a/src/www/account/change_email.php
+++ b/src/www/account/change_email.php
@@ -44,8 +44,8 @@ if (getStringFromRequest('submit')) {
$u = user_get_object(user_getid());
if (!$u || !is_object($u)) {
- form_release_key(getStringFromRequest('form_key'));
- exit_error(_('Could Not Get User'),'my');
+ form_release_key(getStringFromRequest('form_key'));
+ exit_error(_('Could Not Get User'),'my');
} elseif ($u->isError()) {
form_release_key(getStringFromRequest('form_key'));
exit_error($u->getErrorMessage(),'my');
@@ -58,11 +58,11 @@ if (getStringFromRequest('submit')) {
$message = sprintf(_('You have requested a change of email address on
%s.'), forge_get_config('forge_name'))
. "\n\n"
- . _('Please visit the following URL to complete the
email change:')
+ . _('Please visit the following URL to complete the
email change:')
. "\n\n"
.
util_make_url('/account/change_email-complete.php?ch='.$confirm_hash)
. "\n\n"
- . sprintf(_('-- the %s staff'),
forge_get_config('forge_name'));
+ . sprintf(_('-- the %s staff'),
forge_get_config('forge_name'));
util_send_message($newemail,sprintf(_('%s Verification'),
forge_get_config ('forge_name')),$message);
diff --git a/src/www/account/index.php b/src/www/account/index.php
index 9da23c3..e96d665 100644
--- a/src/www/account/index.php
+++ b/src/www/account/index.php
@@ -101,6 +101,7 @@ if (getStringFromRequest('submit')) {
}
$hookParams['user'] = user_get_object(user_getid());
+
if (getStringFromRequest('submit')) {//if this is set, then the user has
issued an Update
plugin_hook("userisactivecheckboxpost", $hookParams);
}
@@ -124,113 +125,113 @@ echo $HTML->listTableTop(array(), array(), 'infotable');
?>
<tr class="top">
-<td><?php echo _('Member since')._(':'); ?></td>
-<td><?php print date(_('Y-m-d H:i'),$u->getAddDate()); ?></td>
+ <td><?php echo _('Member since')._(':'); ?></td>
+ <td><?php print date(_('Y-m-d H:i'),$u->getAddDate()); ?></td>
</tr>
<tr class="top">
-<td><?php echo _('User Id')._(':'); ?></td>
-<td><?php print $u->getID(); ?></td>
+ <td><?php echo _('User Id')._(':'); ?></td>
+ <td><?php print $u->getID(); ?></td>
</tr>
<tr class="top">
-<td><?php echo _('Login Name')._(':'); ?></td>
-<td><?php print $u->getUnixName(); ?>
-<br /><a href="change_pw.php"><?php echo _('Change Password'); ?></a>
-</td>
+ <td><?php echo _('Login Name')._(':'); ?></td>
+ <td><?php print $u->getUnixName(); ?>
+ <br /><a href="change_pw.php"><?php echo _('Change Password'); ?></a>
+ </td>
</tr>
<tr>
-<td><?php echo _('First Name').utils_requiredField()._(':'); ?></td>
-<td>
- <label for="firstname">
- <input id="firstname" required="required" type="text" name="firstname"
value="<?php print $u->getFirstName(); ?>"/>
- </label>
-</td>
+ <td><?php echo _('First Name').utils_requiredField()._(':'); ?></td>
+ <td>
+ <label for="firstname">
+ <input id="firstname" required="required" type="text"
name="firstname" value="<?php print $u->getFirstName(); ?>"/>
+ </label>
+ </td>
</tr>
<tr>
-<td><?php echo _('Last Name').utils_requiredField()._(':'); ?></td>
-<td>
- <label for="lastname">
- <input id="lastname" required="required" type="text" name="lastname"
value="<?php print $u->getLastName(); ?>"/>
- </label>
-</td>
+ <td><?php echo _('Last Name').utils_requiredField()._(':'); ?></td>
+ <td>
+ <label for="lastname">
+ <input id="lastname" required="required" type="text" name="lastname"
value="<?php print $u->getLastName(); ?>"/>
+ </label>
+ </td>
</tr>
<tr>
-<td><?php echo _('Language')._(':'); ?></td>
-<td><?php echo html_get_language_popup ('language',$u->getLanguage()); ?>
-</td>
+ <td><?php echo _('Language')._(':'); ?></td>
+ <td><?php echo html_get_language_popup ('language',$u->getLanguage());
?>
+ </td>
</tr>
<tr>
-<td><?php echo _('Timezone:'); ?></td>
-<td><?php echo html_get_timezone_popup('timezone', $u->getTimeZone()); ?>
-</td>
+ <td><?php echo _('Timezone:'); ?></td>
+ <td><?php echo html_get_timezone_popup('timezone', $u->getTimeZone());
?>
+ </td>
</tr>
<tr>
-<td><?php echo _('Theme')._(':'); ?></td>
-<td><?php echo html_get_theme_popup('theme_id', $u->getThemeID()); ?>
-</td>
+ <td><?php echo _('Theme')._(':'); ?></td>
+ <td><?php echo html_get_theme_popup('theme_id', $u->getThemeID()); ?>
+ </td>
</tr>
<tr>
-<td><?php echo _('Country:'); ?></td>
-<td><?php echo html_get_ccode_popup('ccode', $u->getCountryCode()); ?>
-</td>
+ <td><?php echo _('Country:'); ?></td>
+ <td><?php echo html_get_ccode_popup('ccode', $u->getCountryCode()); ?>
+ </td>
</tr>
<tr>
-<td><?php echo _('Email Address')._(': '); ?></td>
-<td><?php print $u->getEmail(); ?>
-<br /><a href="change_email.php">[<?php echo _('Change Email Address'); ?>]</a>
-</td>
+ <td><?php echo _('Email Address')._(': '); ?></td>
+ <td><?php print $u->getEmail(); ?>
+ <br /><a href="change_email.php">[<?php echo _('Change Email Address');
?>]</a>
+ </td>
</tr>
<tr>
-<td><?php echo _('Address')._(':'); ?></td>
-<td>
- <label for="address">
- <input id="address" type="text" name="address" value="<?php echo
$u->getAddress(); ?>" size="80"/>
- </label>
-</td>
+ <td><?php echo _('Address')._(':'); ?></td>
+ <td>
+ <label for="address">
+ <input id="address" type="text" name="address" value="<?php echo
$u->getAddress(); ?>" size="80"/>
+ </label>
+ </td>
</tr>
<tr>
-<td><?php echo _('Address (continued)')._(':'); ?></td>
-<td>
- <label for="address2">
- <input id="address2" type="text" name="address2" value="<?php echo
$u->getAddress2(); ?>" size="80"/>
- </label>
-</td>
+ <td><?php echo _('Address (continued)')._(':'); ?></td>
+ <td>
+ <label for="address2">
+ <input id="address2" type="text" name="address2" value="<?php
echo $u->getAddress2(); ?>" size="80"/>
+ </label>
+ </td>
</tr>
<tr>
-<td><?php echo _('Phone')._(':'); ?></td>
-<td>
- <label for="phone">
- <input id="phone" type="text" name="phone" value="<?php echo
$u->getPhone(); ?>" size="20"/>
- </label>
-</td>
+ <td><?php echo _('Phone')._(':'); ?></td>
+ <td>
+ <label for="phone">
+ <input id="phone" type="text" name="phone" value="<?php echo
$u->getPhone(); ?>" size="20"/>
+ </label>
+ </td>
</tr>
<tr>
-<td><?php echo _('Fax')._(':'); ?></td>
-<td>
- <label for="fax">
- <input id="fax" type="text" name="fax" value="<?php echo $u->getFax();
?>" size="20"/>
- </label>
-</td>
+ <td><?php echo _('Fax')._(':'); ?></td>
+ <td>
+ <label for="fax">
+ <input id="fax" type="text" name="fax" value="<?php echo
$u->getFax(); ?>" size="20"/>
+ </label>
+ </td>
</tr>
<tr>
-<td><?php echo _('Title')._(':'); ?></td>
-<td>
- <label for="title">
- <input id="title" type="text" name="title" value="<?php echo
$u->getTitle(); ?>" size="10"/>
- </label>
-</td>
+ <td><?php echo _('Title')._(':'); ?></td>
+ <td>
+ <label for="title">
+ <input id="title" type="text" name="title" value="<?php echo
$u->getTitle(); ?>" size="10"/>
+ </label>
+ </td>
</tr>
<?php
echo $HTML->listTableBottom();
diff --git a/src/www/docman/view.php b/src/www/docman/view.php
index ea79de0..5ef138e 100644
--- a/src/www/docman/view.php
+++ b/src/www/docman/view.php
@@ -42,7 +42,6 @@ $group_id = (int) $arr[3];
$docid = isset($arr[4])? $arr[4]: '';
$g = group_get_object($group_id);
-
if (!$g || !is_object($g)) {
exit_no_group();
} elseif ($g->isError()) {
diff --git a/src/www/include/html.php b/src/www/include/html.php
index 9559194..10cdbd2 100644
--- a/src/www/include/html.php
+++ b/src/www/include/html.php
@@ -241,16 +241,16 @@ function html_get_timezone_popup($title = 'timezone',
$selected = 'xzxz') {
/**
* html_build_select_box_from_assoc() - Takes one assoc array and returns a
pop-up box.
*
- * @param array $arr An array of items to
use.
+ * @param array $arr An array of items to use.
* @param string $select_name The name you want assigned to
this form element.
* @param string $checked_val The value of the item that
should be checked.
- * @param bool $swap Whether we should swap
the keys / names.
- * @param bool $show_100 Whether or not to show
the '100 row'.
- * @param string $text_100 What to call the '100
row' defaults to none.
- * @param bool $show_any Whether or not to show
the 'Any row'.
- * @param string $text_any What to call the 'Any
row' defaults to any.
- * @param bool|array $allowed Array of all allowed
values from the full list.
- * @param array $attrs Array of other
attributes for this select element.
+ * @param bool $swap Whether we should swap the keys
/ names.
+ * @param bool $show_100 Whether or not to show the '100
row'.
+ * @param string $text_100 What to call the '100 row'
defaults to none.
+ * @param bool $show_any Whether or not to show the 'Any
row'.
+ * @param string $text_any What to call the 'Any row'
defaults to any.
+ * @param bool|array $allowed Array of all allowed values
from the full list.
+ * @param array $attrs Array of other attributes for
this select element.
* @return string
*/
function html_build_select_box_from_assoc($arr, $select_name, $checked_val =
'xzxz', $swap = false, $show_100 = false, $text_100 = 'None', $show_any =
false, $text_any = 'any', $allowed = false, $attrs = array()) {
@@ -268,11 +268,11 @@ function html_build_select_box_from_assoc($arr,
$select_name, $checked_val = 'xz
* html_build_select_box_from_array() - Takes one array, with the first array
being the "id"
* or value and the array being the text you want displayed.
*
- * @param array $vals An array of items to use.
+ * @param array $vals An array of items to use.
* @param string $select_name The name you want assigned to this form
element.
* @param string $checked_val The value of the item that should be
checked.
- * @param int $samevals
- * @param array $attrs Array of other attributes for
this select element.
+ * @param int $samevals
+ * @param array $attrs Array of other attributes for this
select element.
* @return string
*/
function html_build_select_box_from_array($vals, $select_name, $checked_val =
'xzxz', $samevals = 0, $attrs = array()) {
diff --git a/src/www/include/note.php b/src/www/include/note.php
index 61fd81d..452c3cf 100644
--- a/src/www/include/note.php
+++ b/src/www/include/note.php
@@ -47,7 +47,7 @@ function notepad_button($form) {
}
function notepad_anchor($str, $form) {
- return notepad_button_raw($str, $form, "SOFT", "45", "80");
+ return notepad_button_raw($str, $form, "SOFT", "45", "80");
}
function notepad_func() {
diff --git a/src/www/include/user_home.php b/src/www/include/user_home.php
index e4e3b1d..4ec4e06 100644
--- a/src/www/include/user_home.php
+++ b/src/www/include/user_home.php
@@ -81,7 +81,7 @@ if (forge_get_config('use_diary')) {
echo $HTML->boxMiddle(_('Project Information'), _('Project Information'));
-$projects = $user->getGroups () ;
+$projects = $user->getGroups();
sortProjectList ($projects) ;
$roles = RBACEngine::getInstance()->getAvailableRolesForUser ($user) ;
sortRoleList ($roles) ;
diff --git a/src/www/people/editprofile.php b/src/www/people/editprofile.php
index b41eb55..2d78eaf 100644
--- a/src/www/people/editprofile.php
+++ b/src/www/people/editprofile.php
@@ -272,7 +272,7 @@ if (session_loggedin()) {
echo _('You can enter new skills you have acquired here. Please
enter the start and finish dates as accurately as possible.').'<br />'.
'<span class="required-field">'._('All fields are
required!').'</span>';
echo '<form action="'.getStringFromServer('PHP_SELF').'"
method="post">';
- echo' <input type="hidden" name="form_key"
value="'.form_generate_key().'">';
+ echo' <input type="hidden" name="form_key"
value="'.form_generate_key().'">';
$cell_data = array();
$cell_data[] = array(_('Type'));
$cell_data[] = array(_('Start Date'));
diff --git a/src/www/project/admin/roleedit.php
b/src/www/project/admin/roleedit.php
index 2c1102d..f5ab943 100644
--- a/src/www/project/admin/roleedit.php
+++ b/src/www/project/admin/roleedit.php
@@ -110,9 +110,9 @@ if (getStringFromRequest('submit')) {
}
if (!$role_id) {
- $title= _('New Role');
+ $title = _('New Role');
} else {
- $title= _('Edit Role');
+ $title = _('Edit Role');
}
$msg = _('Use this page to edit the permissions attached to each role. Note
that each role has at least as much access as the Anonymous and LoggedIn roles.
For example, if the Anonymous role has read access to a forum, all other roles
will have it too.');
diff --git a/src/www/reporting/timeadd.php b/src/www/reporting/timeadd.php
index d5121f4..06541fa 100644
--- a/src/www/reporting/timeadd.php
+++ b/src/www/reporting/timeadd.php
@@ -109,7 +109,7 @@ if ($week) {
$project_ids[] = $p->getID() ;
}
- $respm = db_query_params ('SELECT
pgl.group_project_id,g.group_name || $1 || pgl.project_name
+ $respm = db_query_params('SELECT
pgl.group_project_id,g.group_name || $1 || pgl.project_name
FROM groups g, project_group_list pgl
WHERE g.group_id=ANY($2)
AND g.group_id=pgl.group_id
diff --git a/src/www/tracker/admin/index.php b/src/www/tracker/admin/index.php
index 63addd6..5edc409 100644
--- a/src/www/tracker/admin/index.php
+++ b/src/www/tracker/admin/index.php
@@ -25,8 +25,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
-
require_once '../../env.inc.php';
require_once $gfcommon.'include/pre.php';
require_once $gfcommon.'tracker/Artifact.class.php';
diff --git a/src/www/tracker/roadmap.php b/src/www/tracker/roadmap.php
index dcde05d..aa5e5a4 100644
--- a/src/www/tracker/roadmap.php
+++ b/src/www/tracker/roadmap.php
@@ -602,7 +602,6 @@ if (!$at_arr || count($at_arr) < 1) {
jQuery('#nb_release').change(function() {
updatePage();
});
-
<?php
}
-----------------------------------------------------------------------
Summary of changes:
src/www/account/change_email.php | 8 +--
src/www/account/index.php | 133 +++++++++++++++++++------------------
src/www/docman/view.php | 1 -
src/www/include/html.php | 22 +++---
src/www/include/note.php | 2 +-
src/www/include/user_home.php | 2 +-
src/www/people/editprofile.php | 2 +-
src/www/project/admin/roleedit.php | 4 +-
src/www/reporting/timeadd.php | 2 +-
src/www/tracker/admin/index.php | 2 -
src/www/tracker/roadmap.php | 1 -
11 files changed, 88 insertions(+), 91 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
