src/etc/httpd.conf.d/auth-main.inc -text
src/etc/httpd.conf.d/auth-projects.inc -text
src/etc/httpd.conf.d/block-trace.inc -text
+src/etc/httpd.conf.d/lists-vhost-plugin-mailman.inc -text
src/etc/httpd.conf.d/log.inc -text
src/etc/httpd.conf.d/plugin-authhttpd.inc -text
src/etc/httpd.conf.d/plugin-fckeditor.inc -text
src/etc/httpd.conf.d/plugin-generic.inc -text
-src/etc/httpd.conf.d/plugin-mailman.inc -text
src/etc/httpd.conf.d/plugin-mediawiki.inc -text
src/etc/httpd.conf.d/plugin-scmbzr.inc -text
src/etc/httpd.conf.d/plugin-scmdarcs.inc -text
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;
}
}
function read_config_file ($filename) {
+ if (getenv ('FUSIONFORGE_USE_PRE_51_CONFIG') == 'true') {
+ $fallback_only = true;
+ } else {
+ $fallback_only = false;
+ }
+
if (file_exists($filename) && is_readable($filename)) {
$sections = parse_ini_file ($filename, true) ;
if (is_array($sections)) {
foreach ($sections as $section => $options) {
foreach ($options as $var => $value) {
- $this->settings[$section][$var] = $value ;
+ if ($fallback_only) {
+ $this->set_value($section,$var,$value);
+ } else {
+ $this->reset_value($section,$var,$value);
+ }
}
}
}
$qpa = $this->getQuery();
}
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,
#
<VirtualHost *: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]
</VirtualHost>
<VirtualHost *: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]
set -e
+export FUSIONFORGE_USE_PRE_51_CONFIG=true
+
config_dir=$(forge_get_config extra_config_dirs | xargs -n 1 echo | head -1)
if [ "$config_dir" = "" ] ; then
config_path=$(forge_get_config config_path)/config.ini.d
}
// 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("reallysure");
$this->click("reallyreallysure");
$this->click("submit");
+ $this->waitForPageToLoad("30000");
+ $this->click("link=Home");
+ $this->waitForPageToLoad("30000");
+ $this->assertFalse($this->isTextPresent("testal1"));
}
}