[evolvis-commits] r17461: Merged from upstream 5.1
mirabilos at evolvis.org
mirabilos at evolvis.org
Tue Aug 2 11:07:44 CEST 2011
Author: mirabilos
Date: 2011-08-02 11:07:43 +0200 (Tue, 02 Aug 2011)
New Revision: 17461
Added:
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/lists-vhost-plugin-mailman.inc
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/lists-vhost-plugin-mailman.inc
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/lists-vhost-plugin-mailman.inc
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/lists-vhost-plugin-mailman.inc
Removed:
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/plugin-mailman.inc
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/plugin-mailman.inc
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/plugin-mailman.inc
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/plugin-mailman.inc
Modified:
trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php
trunk/gforge_base/evolvisforge-5.1/src/common/include/Navigation.class.php
trunk/gforge_base/evolvisforge-5.1/src/common/search/SearchQuery.class.php
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/02-config-main.conf
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/20-vhosts-lists.conf
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/plugin-mediawiki.inc
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/ssl-on.inc
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/vhost-projects.inc
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/02-config-main.conf
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/10-vhosts-main.conf
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/20-vhosts-lists.conf
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/plugin-mediawiki.inc
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/ssl-on.inc
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/vhost-projects.inc
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/02-config-main.conf
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/20-vhosts-lists.conf
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/plugin-mediawiki.inc
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/ssl-on.inc
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/vhost-projects.inc
trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/20-vhosts-lists.conf
trunk/gforge_base/evolvisforge-5.1/tests/func/Site/projectsTest.php
Log:
Merged from upstream 5.1
Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php 2011-08-02 09:07:39 UTC (rev 17460)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php 2011-08-02 09:07:43 UTC (rev 17461)
@@ -2150,7 +2150,7 @@
global $SYS;
if ($user_id != user_getid()
- || !forge_check_perm ('project_admin', $this->getID())) {
+ && !forge_check_perm ('project_admin', $this->getID())) {
$this->setPermissionDeniedError();
return false;
}
Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/Navigation.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/Navigation.class.php 2011-08-02 09:07:39 UTC (rev 17460)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/Navigation.class.php 2011-08-02 09:07:43 UTC (rev 17461)
@@ -201,7 +201,7 @@
if (!forge_get_config ('user_registration_restricted')) {
$res['titles'][] = _('New Account');
- $res['urls'][] = util_make_url('/account/register.php');
+ $res['urls'][] = util_make_uri('/account/register.php');
}
}
return $res;
@@ -280,7 +280,7 @@
if (forge_check_global_perm ('forge_admin')) {
$user_is_super = true;
$menu['titles'][] = _('Site Admin');
- $menu['urls'][] = util_make_url('/admin/') ;
+ $menu['urls'][] = util_make_uri('/admin/') ;
if (strstr($request_uri, util_make_uri('/admin/'))) {
$selected=count($menu['urls'])-1;
}
@@ -403,7 +403,7 @@
$menu['titles'][] = _('Forums');
$menu['urls'][] = util_make_uri('/forum/?group_id=' . $group_id);
if (forge_check_perm ('forum_admin', $group_id)) {
- $menu['adminurls'][] = util_make_url('/forum/admin/?group_id='.$group_id);
+ $menu['adminurls'][] = util_make_uri('/forum/admin/?group_id='.$group_id);
} else {
$menu['adminurls'][] = false;
}
@@ -417,7 +417,7 @@
$menu['titles'][] = _('Tracker');
$menu['urls'][] = util_make_uri('/tracker/?group_id=' . $group_id);
if (forge_check_perm ('tracker_admin', $group_id)) {
- $menu['adminurls'][] = util_make_url('/tracker/admin/?group_id='.$group_id);
+ $menu['adminurls'][] = util_make_uri('/tracker/admin/?group_id='.$group_id);
} else {
$menu['adminurls'][] = false;
}
@@ -434,7 +434,7 @@
$menu['titles'][] = _('Lists');
$menu['urls'][] = util_make_uri('/mail/?group_id=' . $group_id);
if (forge_check_perm ('project_admin', $group_id)) {
- $menu['adminurls'][] = util_make_url('/mail/admin/?group_id='.$group_id);
+ $menu['adminurls'][] = util_make_uri('/mail/admin/?group_id='.$group_id);
} else {
$menu['adminurls'][] = false;
}
@@ -596,7 +596,7 @@
*/
function getShowSource($asHTML=true) {
if (forge_get_config('show_source')) {
- $res['url'] = util_make_url('/source.php?file='.getStringFromServer('SCRIPT_NAME'));
+ $res['url'] = util_make_uri('/source.php?file='.getStringFromServer('SCRIPT_NAME'));
$res['title'] = _('Show source');
} else {
return ($asHTML ? "" : NULL);
Modified: trunk/gforge_base/evolvisforge-5.1/src/common/search/SearchQuery.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/search/SearchQuery.class.php 2011-08-02 09:07:39 UTC (rev 17460)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/search/SearchQuery.class.php 2011-08-02 09:07:43 UTC (rev 17461)
@@ -177,8 +177,9 @@
}
if (forge_get_config('use_fti')) {
- db_query_params ('select set_curcfg($1)',
- array ('default'));
+ db_query_params ('SELECT set_config($1, $2, false)',
+ array('default_text_search_config',
+ 'simple'));
}
$this->result = db_query_qpa (
$qpa,
Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/20-vhosts-lists.conf
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/20-vhosts-lists.conf 2011-08-02 09:07:39 UTC (rev 17460)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/20-vhosts-lists.conf 2011-08-02 09:07:43 UTC (rev 17461)
@@ -3,7 +3,7 @@
#
<VirtualHost {core/web_ip}:80>
Include {core/config_path}/httpd.conf.d/vhost-list.inc
- Include {core/config_path}/httpd.conf.d/plugin-mailman.inc
+ Include {core/config_path}/httpd.conf.d/lists-vhost-plugin-*.inc
RewriteEngine on
RewriteRule ^/$ http://%{HTTP_HOST}/cgi-bin/mailman/listinfo [R=301]
@@ -14,7 +14,7 @@
</VirtualHost>
<VirtualHost {core/web_ip}:443>
Include {core/config_path}/httpd.conf.d/vhost-list.inc
- Include {core/config_path}/httpd.conf.d/plugin-mailman.inc
+ Include {core/config_path}/httpd.conf.d/lists-vhost-plugin-*.inc
RewriteEngine on
RewriteRule ^/$ https://%{HTTP_HOST}/cgi-bin/mailman/listinfo [R=301]
Copied: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/lists-vhost-plugin-mailman.inc (from rev 17460, trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/plugin-mailman.inc)
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/lists-vhost-plugin-mailman.inc (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/lists-vhost-plugin-mailman.inc 2011-08-02 09:07:43 UTC (rev 17461)
@@ -0,0 +1,12 @@
+AddHandler cgi-script .cgi
+
+ScriptAlias /cgi-bin/mailman/ /var/lib/mailman/cgi-bin/
+ScriptAlias /mailman/ /var/lib/mailman/cgi-bin/
+
+Alias /pipermail /var/lib/mailman/archives/public
+<Directory /var/lib/mailman/archives/public>
+ AllowOverride Options
+ Options FollowSymLinks
+</Directory>
+
+Alias /images/mailman /usr/share/images/mailman
Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/20-vhosts-lists.conf
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/20-vhosts-lists.conf 2011-08-02 09:07:39 UTC (rev 17460)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/20-vhosts-lists.conf 2011-08-02 09:07:43 UTC (rev 17461)
@@ -3,7 +3,7 @@
#
<VirtualHost *:80>
Include /etc/gforge/httpd.conf.d/vhost-list.inc
- Include /etc/gforge/httpd.conf.d/plugin-mailman.inc
+ Include /etc/gforge/httpd.conf.d/lists-vhost-plugin-*.inc
RewriteEngine on
RewriteRule ^/$ http://%{HTTP_HOST}/cgi-bin/mailman/listinfo [R=301]
@@ -14,7 +14,7 @@
</VirtualHost>
<VirtualHost *:443>
Include /etc/gforge/httpd.conf.d/vhost-list.inc
- Include /etc/gforge/httpd.conf.d/plugin-mailman.inc
+ Include /etc/gforge/httpd.conf.d/lists-vhost-plugin-*.inc
RewriteEngine on
RewriteRule ^/$ https://%{HTTP_HOST}/cgi-bin/mailman/listinfo [R=301]
Copied: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/lists-vhost-plugin-mailman.inc (from rev 17460, trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/plugin-mailman.inc)
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/lists-vhost-plugin-mailman.inc (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/lists-vhost-plugin-mailman.inc 2011-08-02 09:07:43 UTC (rev 17461)
@@ -0,0 +1,16 @@
+AddHandler cgi-script .cgi
+
+ScriptAlias /cgi-bin/mailman/ /var/lib/mailman/cgi-bin/
+ScriptAlias /mailman/ /var/lib/mailman/cgi-bin/
+
+Alias /pipermail /var/lib/mailman/archives/public
+<Directory /var/lib/mailman/archives/public>
+ AllowOverride Options
+ Options FollowSymLinks
+</Directory>
+
+Alias /images/mailman /usr/share/images/mailman
+<Location /images/mailman>
+ order allow,deny
+ allow from all
+</Location>
Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/20-vhosts-lists.conf
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/20-vhosts-lists.conf 2011-08-02 09:07:39 UTC (rev 17460)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/20-vhosts-lists.conf 2011-08-02 09:07:43 UTC (rev 17461)
@@ -3,7 +3,7 @@
#
<VirtualHost *:80>
Include /etc/gforge/httpd.conf.d/vhost-list.inc
- Include /etc/gforge/httpd.conf.d/plugin-mailman.inc
+ Include /etc/gforge/httpd.conf.d/lists-vhost-plugin-*.inc
RewriteEngine on
RewriteRule ^/$ http://%{HTTP_HOST}/cgi-bin/mailman/listinfo [R=301]
@@ -14,7 +14,7 @@
</VirtualHost>
<VirtualHost *:443>
Include /etc/gforge/httpd.conf.d/vhost-list.inc
- Include /etc/gforge/httpd.conf.d/plugin-mailman.inc
+ Include /etc/gforge/httpd.conf.d/lists-vhost-plugin-*.inc
RewriteEngine on
RewriteRule ^/$ https://%{HTTP_HOST}/cgi-bin/mailman/listinfo [R=301]
Copied: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/lists-vhost-plugin-mailman.inc (from rev 17460, trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/plugin-mailman.inc)
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/lists-vhost-plugin-mailman.inc (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/lists-vhost-plugin-mailman.inc 2011-08-02 09:07:43 UTC (rev 17461)
@@ -0,0 +1,16 @@
+AddHandler cgi-script .cgi
+
+ScriptAlias /cgi-bin/mailman/ /var/lib/mailman/cgi-bin/
+ScriptAlias /mailman/ /var/lib/mailman/cgi-bin/
+
+Alias /pipermail /var/lib/mailman/archives/public
+<Directory /var/lib/mailman/archives/public>
+ AllowOverride Options
+ Options FollowSymLinks
+</Directory>
+
+Alias /images/mailman /usr/share/images/mailman
+<Location /images/mailman>
+ order allow,deny
+ allow from all
+</Location>
Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/20-vhosts-lists.conf
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/20-vhosts-lists.conf 2011-08-02 09:07:39 UTC (rev 17460)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/20-vhosts-lists.conf 2011-08-02 09:07:43 UTC (rev 17461)
@@ -3,7 +3,7 @@
#
<VirtualHost *:80>
Include /etc/gforge/httpd.conf.d/vhost-list.inc
- Include /etc/gforge/httpd.conf.d/plugin-mailman.inc
+ Include /etc/gforge/httpd.conf.d/lists-vhost-plugin-*.inc
RewriteEngine on
RewriteRule ^/$ http://%{HTTP_HOST}/cgi-bin/mailman/listinfo [R=301]
@@ -14,7 +14,7 @@
</VirtualHost>
<VirtualHost *:443>
Include /etc/gforge/httpd.conf.d/vhost-list.inc
- Include /etc/gforge/httpd.conf.d/plugin-mailman.inc
+ Include /etc/gforge/httpd.conf.d/lists-vhost-plugin-*.inc
RewriteEngine on
RewriteRule ^/$ https://%{HTTP_HOST}/cgi-bin/mailman/listinfo [R=301]
Copied: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/lists-vhost-plugin-mailman.inc (from rev 17460, trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/plugin-mailman.inc)
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/lists-vhost-plugin-mailman.inc (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/lists-vhost-plugin-mailman.inc 2011-08-02 09:07:43 UTC (rev 17461)
@@ -0,0 +1,16 @@
+AddHandler cgi-script .cgi
+
+ScriptAlias /cgi-bin/mailman/ /var/lib/mailman/cgi-bin/
+ScriptAlias /mailman/ /var/lib/mailman/cgi-bin/
+
+Alias /pipermail /var/lib/mailman/archives/public
+<Directory /var/lib/mailman/archives/public>
+ AllowOverride Options
+ Options FollowSymLinks
+</Directory>
+
+Alias /images/mailman /usr/share/images/mailman
+<Location /images/mailman>
+ order allow,deny
+ allow from all
+</Location>
Modified: trunk/gforge_base/evolvisforge-5.1/tests/func/Site/projectsTest.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/tests/func/Site/projectsTest.php 2011-08-02 09:07:39 UTC (rev 17460)
+++ trunk/gforge_base/evolvisforge-5.1/tests/func/Site/projectsTest.php 2011-08-02 09:07:43 UTC (rev 17461)
@@ -223,13 +223,29 @@
}
// Test removal of project.
- // TODO: Test not finished as removal does not work.
function testRemoveProject()
{
- $this->createProject('testal1');
+ $this->login('admin');
+ // Create project as a different user
+ // Non-regression test for Adacore ticket K720-005
+ $this->createUser('toto');
+
$this->click("link=Site Admin");
$this->waitForPageToLoad("30000");
+ $this->select ("//form[contains(@action,'globalroleedit.php')]//select[@name='role_id']", "label=Forge administrators") ;
+ $this->click ("//form[contains(@action,'globalroleedit.php')]//input[@value='Edit Role']") ;
+ $this->waitForPageToLoad("30000");
+ $this->type ("//form[contains(@action,'globalroleedit.php')]//input[@name='form_unix_name']", "toto") ;
+ $this->click ("//input[@value='Add User']") ;
+ $this->waitForPageToLoad("30000");
+ $this->assertTrue($this->isTextPresent("toto Lastname"));
+
+ $this->registerProject('testal1','toto');
+ $this->approveProject('testal1','admin');
+
+ $this->click("link=Site Admin");
+ $this->waitForPageToLoad("30000");
$this->click("link=Display Full Project List/Edit Projects");
$this->waitForPageToLoad("30000");
$this->click("link=testal1");
@@ -240,6 +256,10 @@
$this->click("reallysure");
$this->click("reallyreallysure");
$this->click("submit");
+ $this->waitForPageToLoad("30000");
+ $this->click("link=Home");
+ $this->waitForPageToLoad("30000");
+ $this->assertFalse($this->isTextPresent("testal1"));
}
}
More information about the evolvis-commits
mailing list