Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into deltaquad-usermgmt-cleanup

  • Loading branch information...
commit 777f5001fc100c65f1c504c95d9aa93353591a3d 2 parents a8928af + e88cf60
@dqwiki dqwiki authored
View
17 mysql_schema.sql
@@ -22,6 +22,7 @@ CREATE TABLE `appeal` (
`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`appealText` varchar(4096) NOT NULL,
`intendedEdits` varchar(1024) NOT NULL,
+ `blockReason` varchar(1024) NOT NULL,
`otherInfo` varchar(1024) DEFAULT NULL,
`status` varchar(255) NOT NULL,
`handlingAdmin` int(11) DEFAULT NULL,
@@ -31,7 +32,7 @@ CREATE TABLE `appeal` (
PRIMARY KEY (`appealID`),
KEY `handlingAdmin` (`handlingAdmin`),
FULLTEXT KEY `email` (`email`,`wikiAccountName`,`blockingAdmin`,`appealText`,`intendedEdits`,`otherInfo`)
-) ENGINE=MyISAM AUTO_INCREMENT=8 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
@@ -46,7 +47,7 @@ CREATE TABLE `banList` (
PRIMARY KEY (`banID`),
UNIQUE KEY `target` (`target`),
KEY `admin` (`admin`)
-) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
@@ -62,7 +63,7 @@ CREATE TABLE `comment` (
KEY `appealID` (`appealID`),
KEY `commentUser` (`commentUser`),
FULLTEXT KEY `comment` (`comment`)
-) ENGINE=MyISAM AUTO_INCREMENT=25 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
@@ -80,7 +81,7 @@ CREATE TABLE `irc` (
`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`unblock` tinyint(1) NOT NULL DEFAULT '0',
PRIMARY KEY (`ircID`)
-) ENGINE=MyISAM AUTO_INCREMENT=36 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
@@ -98,7 +99,7 @@ CREATE TABLE `sitenotice` (
`author` int(11) NOT NULL,
`time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`messageID`)
-) ENGINE=MyISAM AUTO_INCREMENT=7 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
@@ -113,7 +114,7 @@ CREATE TABLE `template` (
PRIMARY KEY (`templateID`),
UNIQUE KEY `name` (`name`),
KEY `lastEditUserIdx` (`lastEditUser`)
-) ENGINE=MyISAM AUTO_INCREMENT=41 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
@@ -144,7 +145,7 @@ CREATE TABLE `user` (
KEY `active` (`active`),
KEY `toolAdmin` (`toolAdmin`),
KEY `registered` (`registered`)
-) ENGINE=MyISAM AUTO_INCREMENT=61 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
@@ -159,7 +160,7 @@ CREATE TABLE `userMgmtLog` (
PRIMARY KEY (`logID`),
KEY `target` (`target`),
KEY `doneBy` (`doneBy`)
-) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
/*!50001 DROP TABLE IF EXISTS `actionAppealLog`*/;
/*!50001 SET @saved_cs_client = @@character_set_client */;
View
4 public_html/appeal.php
@@ -307,6 +307,7 @@ function hideContextWindow() {
}
}
+if ($appeal->getStatus() != Appeal::$STATUS_UNVERIFIED) {
?>
<h1>Details for Request #<?php echo $appeal->getID(); ?>: <a href="<?php echo getWikiLink($appeal->getUserPage(), $user->getUseSecure()); ?>" target="_blank"><?php echo $appeal->getCommonName(); ?></a> :: ******<?php echo substr($appeal->getEmail(), strpos($appeal->getEmail(), "@")); ?></h1>
<table class="appeal">
@@ -571,7 +572,8 @@ function hideContextWindow() {
</div>
<?php
-
+}
+else displayError("You may not view appeals that have not been email verified.");
skinFooter();
?>
View
5 public_html/home.php
@@ -52,11 +52,6 @@
<h2>Awaiting tool admin</h2>
<?php echo printToolAdmin();?>
-<h2>Backlog</h2>
-<?php echo printBacklog(); ?>
-
-<h2>Awaiting email verification</h2>
-<?php echo printUnverified(); ?>
</td>
<td style="width:33%" valign=top>
<h2>Waiting on me</h2>
View
2  public_html/src/userObject.php
@@ -424,7 +424,7 @@ public function setPermissions($adminFlag, $devFlag, $cuFlag, $admin, $reason){
$this->checkuser = $cuFlag;
$this->developer = $devFlag;
- UserMgmtLog::insert("changed permissions for\'",
+ UserMgmtLog::insert("changed permissions for",
(($adminFlag == TRUE)? "Administrator":"". ($cuFlag == TRUE || $devFlag == TRUE)? ",":"".
($cuFlag == TRUE)? "Checkuser":"". ($devFlag == TRUE)? ",":"".
($devFlag == TRUE)? "Developer":""), $reason, $this->userId, $admin->userId);
Please sign in to comment.
Something went wrong with that request. Please try again.