All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 56e25542 authored by Leigh B Stoller's avatar Leigh B Stoller

Turn off all of the collaboration tools but leave a My Wikis

link on the showuser page for local admins (Mike) to get some
old pages.
parent 2b2f8a7b
......@@ -74,12 +74,12 @@ SPEWFROMOPS=1
# This next group will not work outside of Utah (yet).
#
PUBSUPPORT=1
WIKISUPPORT=1
TRACSUPPORT=1
BUGDBSUPPORT=1
WIKISUPPORT=0
TRACSUPPORT=0
BUGDBSUPPORT=0
MAILMANSUPPORT=1
SFSSUPPORT=0
CVSSUPPORT=1
CVSSUPPORT=0
STAMPS=1
CHATSUPPORT=0
NFSTRACESUPPORT=1
......
#!/usr/bin/perl -wT
#
# Copyright (c) 2005, 2006 University of Utah and the Flux Group.
# Copyright (c) 2005-2014 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -44,6 +44,7 @@ my $TBOPS = "@TBOPSEMAIL@";
my $CONTROL = "@USERNODE@";
my $BOSSNODE = "@BOSSNODE@";
my $WIKISUPPORT = @WIKISUPPORT@;
my $TBMAINSITE = @TBMAINSITE@;
my $SSH = "$TB/bin/sshtb";
my $WIKIPROXY = "$TB/sbin/wikiproxy";
......@@ -88,9 +89,12 @@ if ($UID == 0) {
#
# If no wiki support, just exit.
#
if (! $WIKISUPPORT) {
print "WIKI support is not enabled. Exit ...\n";
exit(0);
# No more WIKISUPPORT, but allow Utah admins to access old pages.
if (! $TBMAINSITE) {
if (! $WIKISUPPORT) {
print "WIKI support is not enabled. Exit ...\n";
exit(0);
}
}
#
......
<?php
#
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
# Copyright (c) 2000-2014 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -23,16 +23,19 @@
#
include("defs.php3");
if (!$WIKISUPPORT) {
header("Location: index.php3");
return;
}
# No Pageheader since we spit out a redirection below.
$this_user = CheckLoginOrDie(CHECKLOGIN_USERSTATUS|
CHECKLOGIN_WEBONLY|CHECKLOGIN_WIKIONLY);
$uid = $this_user->uid();
# No more WIKISUPPORT, but allow Utah admins to access old pages.
if (! ($TBMAINSITE && ISADMIN())) {
if (!$WIKISUPPORT) {
header("Location: index.php3");
return;
}
}
#
# Verify page arguments. project_title is the project to zap to.
#
......
......@@ -510,7 +510,7 @@ function WRITELOGINBOX($loginbox_content) {
}
function WRITEEXPERIMENTMENU($firstinitstate) {
global $TBBASE, $TBDOCBASE;
global $TBBASE, $TBDOCBASE, $TBMAINSITE;
global $WIKISUPPORT, $CHECKLOGIN_WIKINAME, $EXPOSETEMPLATES, $FLAVOR;
global $login_status, $login_user;
......@@ -810,7 +810,7 @@ function WRITESIDEBAR() {
# And now the Collaboration menu.
if (($login_status & (CHECKLOGIN_LOGGEDIN|CHECKLOGIN_MAYBEVALID)) &&
($WIKISUPPORT || $MAILMANSUPPORT || $BUGDBSUPPORT ||
($WIKISUPPORT || $BUGDBSUPPORT ||
$CVSSUPPORT || $CHATSUPPORT)) {
NavMenuSection("collaboration", "Collaboration");
......@@ -828,10 +828,6 @@ function WRITESIDEBAR() {
}
}
}
if ($MAILMANSUPPORT) {
NavMenuButton("My Mailing Lists",
"$TBBASE/" . CreateURL("showmmlists", $login_user));
}
if ($BUGDBSUPPORT) {
$bugdburl = "gotobugdb.php3";
......
......@@ -151,6 +151,12 @@ if (!$archived && !$target_user->wikionly() &&
CreateURL("showmmlists", $target_user));
}
}
if ($TBMAINSITE && ISADMIN()) {
$wikiname = $CHECKLOGIN_WIKINAME;
WRITESUBMENUBUTTON("My Wikis",
"gotowiki.php3?redurl=Main/$wikiname");
}
if ($PORTAL_ENABLE && $PORTAL_ISPRIMARY) {
$peer_result =
DBQueryFatal("select peer from user_exports ".
......
......@@ -966,7 +966,7 @@ function DOLOGIN_MAGIC($uid, $uid_idx, $email = null,
global $TBMAIL_OPS, $TBMAIL_AUDIT, $TBMAIL_WWW;
global $WIKISUPPORT, $WIKICOOKIENAME;
global $BUGDBSUPPORT, $BUGDBCOOKIENAME, $TRACSUPPORT, $TRACCOOKIENAME;
global $TBLIBEXEC_DIR, $EXP_VIS;
global $TBLIBEXEC_DIR, $EXP_VIS, $TBMAINSITE;
$flushtime = time() - 1000000;
# Caller makes these checks too.
......@@ -1051,7 +1051,7 @@ function DOLOGIN_MAGIC($uid, $uid_idx, $email = null,
# Clear the existing Wiki cookie so that there is not an old one
# for a different user, sitting in the brower.
#
if ($WIKISUPPORT) {
if ($WIKISUPPORT || $TBMAINSITE) {
setcookie($WIKICOOKIENAME, "", $flushtime, "/",
$TBAUTHDOMAIN, $TBSECURECOOKIES);
}
......@@ -1126,7 +1126,7 @@ function VERIFYPASSWD($uid, $password) {
function DOLOGOUT($user) {
global $CHECKLOGIN_STATUS, $CHECKLOGIN_USER;
global $TBAUTHCOOKIE, $TBLOGINCOOKIE, $TBAUTHDOMAIN, $WWWHOST;
global $WIKISUPPORT, $WIKICOOKIENAME;
global $WIKISUPPORT, $WIKICOOKIENAME, $TBMAINSITE;
global $BUGDBSUPPORT, $BUGDBCOOKIENAME, $TRACSUPPORT, $TRACCOOKIENAME;
global $TBLIBEXEC_DIR, $EXP_VIS;
......@@ -1198,7 +1198,7 @@ function DOLOGOUT($user) {
setcookie("trac_auth_protogeni_priv", "", $timeout, "/",
$TBAUTHDOMAIN, 0);
}
if ($WIKISUPPORT) {
if ($WIKISUPPORT || $TBMAINSITE) {
setcookie($WIKICOOKIENAME, "", $timeout, "/", $TBAUTHDOMAIN, 0);
}
if ($BUGDBSUPPORT) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment