[Fusionforge-commits] r10847 - in trunk/src/www: project project/admin project/report search search/include/engines search/include/renderers
Alain Peyrat
aljeux at libremir.placard.fr.eu.org
Mon Oct 4 19:24:02 CEST 2010
Author: aljeux
Date: 2010-10-04 19:24:02 +0200 (Mon, 04 Oct 2010)
New Revision: 10847
Modified:
trunk/src/www/project/admin/project_admin_utils.php
trunk/src/www/project/admin/users.php
trunk/src/www/project/report/index.php
trunk/src/www/project/showfiles.php
trunk/src/www/search/advanced_search.php
trunk/src/www/search/include/engines/GroupSearchEngine.class.php
trunk/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
trunk/src/www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php
Log:
Minor: indent changes.
Modified: trunk/src/www/project/admin/project_admin_utils.php
===================================================================
--- trunk/src/www/project/admin/project_admin_utils.php 2010-10-04 17:23:56 UTC (rev 10846)
+++ trunk/src/www/project/admin/project_admin_utils.php 2010-10-04 17:24:02 UTC (rev 10847)
@@ -120,12 +120,12 @@
FROM group_history,users
WHERE group_history.mod_by=users.user_id
AND group_id=$1 ORDER BY group_history.adddate DESC", array($group_id));
-}
-
+}
+
function group_add_history ($field_name,$old_value,$group_id) {
$group=group_get_object($group_id);
$group->addHistory($field_name,$old_value);
-}
+}
/*
Modified: trunk/src/www/project/admin/users.php
===================================================================
--- trunk/src/www/project/admin/users.php 2010-10-04 17:23:56 UTC (rev 10846)
+++ trunk/src/www/project/admin/users.php 2010-10-04 17:24:02 UTC (rev 10847)
@@ -38,6 +38,7 @@
$feedback = htmlspecialchars(getStringFromRequest('feedback'));
$warnig_msg = htmlspecialchars(getStringFromRequest('warnig_msg'));
$error_msg = htmlspecialchars(getStringFromRequest('error_msg'));
+
session_require_perm ('project_admin', $group_id) ;
// get current information
@@ -113,7 +114,7 @@
//we should remove him from the request list
//since it has already been added
$gjr=new GroupJoinRequest($group,$user_id);
- if (($gjr || is_object($gjr)) && (!$gjr->isError())) {
+ if ($gjr || is_object($gjr) || !$gjr->isError()) {
$gjr->delete(true);
}
}
Modified: trunk/src/www/project/report/index.php
===================================================================
--- trunk/src/www/project/report/index.php 2010-10-04 17:23:56 UTC (rev 10846)
+++ trunk/src/www/project/report/index.php 2010-10-04 17:24:02 UTC (rev 10847)
@@ -140,7 +140,6 @@
$title_arr[]=_('Last Modified');
echo $GLOBALS['HTML']->listTableTop ($title_arr);
-
// list members
$res_memb = db_query_params("SELECT users.*,user_group.admin_flags,people_job_category.name AS role
FROM users,user_group
Modified: trunk/src/www/project/showfiles.php
===================================================================
--- trunk/src/www/project/showfiles.php 2010-10-04 17:23:56 UTC (rev 10846)
+++ trunk/src/www/project/showfiles.php 2010-10-04 17:24:02 UTC (rev 10847)
@@ -14,6 +14,6 @@
} else {
session_redirect('/frs/?group_id='.$group_id); }
} else {
- session_redirect('/');
+ session_redirect('/');
}
?>
Modified: trunk/src/www/search/advanced_search.php
===================================================================
--- trunk/src/www/search/advanced_search.php 2010-10-04 17:23:56 UTC (rev 10846)
+++ trunk/src/www/search/advanced_search.php 2010-10-04 17:24:02 UTC (rev 10847)
@@ -22,7 +22,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
require_once('../env.inc.php');
require_once $gfcommon.'include/pre.php';
require_once $gfcommon.'include/escapingUtils.php';
Modified: trunk/src/www/search/include/engines/GroupSearchEngine.class.php
===================================================================
--- trunk/src/www/search/include/engines/GroupSearchEngine.class.php 2010-10-04 17:23:56 UTC (rev 10846)
+++ trunk/src/www/search/include/engines/GroupSearchEngine.class.php 2010-10-04 17:24:02 UTC (rev 10847)
@@ -22,7 +22,6 @@
* USA
*/
-
require_once $gfwww.'search/include/engines/SearchEngine.class.php';
class GroupSearchEngine extends GFSearchEngine {
Modified: trunk/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
===================================================================
--- trunk/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php 2010-10-04 17:23:56 UTC (rev 10846)
+++ trunk/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php 2010-10-04 17:24:02 UTC (rev 10847)
@@ -22,7 +22,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
require_once $gfcommon.'include/pre.php';
require_once $gfwww.'search/include/renderers/HtmlGroupSearchRenderer.class.php';
Modified: trunk/src/www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php
===================================================================
--- trunk/src/www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php 2010-10-04 17:23:56 UTC (rev 10846)
+++ trunk/src/www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php 2010-10-04 17:24:02 UTC (rev 10847)
@@ -23,7 +23,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
require_once $gfwww.'search/include/renderers/HtmlGroupSearchRenderer.class.php';
require_once $gfcommon.'search/ArtifactSearchQuery.class.php';
More information about the Fusionforge-commits
mailing list