Empty commit

This commit is contained in:
Git 2013-04-06 08:01:05 +00:00
parent f3d8caee38
commit 6e8e01a471
5 changed files with 23 additions and 12 deletions

View File

@ -192,10 +192,10 @@ protected function listen() {
} }
if (preg_match("/:([^!]+)![^\s]* KICK #what.cd-disabled.* /", $this->Data, $Nick)) { if (preg_match("/:([^!]+)![^\s]* KICK #what.cd-disabled.* /", $this->Data, $Nick)) {
if (isset($this->DisabledUsers[$Nick[1]])) { $Nick = explode(" ", $Nick[0]);
$Nick = explode(" ", $Nick[0]); if (isset($this->DisabledUsers[$Nick[3]])) {
$DB->query("DELETE FROM disable_list WHERE Nick = '" . $Nick[3] . "'"); $DB->query("DELETE FROM disable_list WHERE Nick = '" . $Nick[3] . "'");
unset($this->DisabledUsers[$Nick[1]]); unset($this->DisabledUsers[$Nick[3]]);
} }
} }

View File

@ -61,7 +61,7 @@ public static function get_group_votes($GroupID) {
} else { } else {
$GroupVotes = $DB->next_record(MYSQLI_ASSOC, false); $GroupVotes = $DB->next_record(MYSQLI_ASSOC, false);
} }
$Cache->cache_value('votes_'.$GroupID, $GroupVotes); $Cache->cache_value('votes_'.$GroupID, $GroupVotes, 259200);
} }
return $GroupVotes; return $GroupVotes;
} }
@ -211,7 +211,7 @@ public static function get_rank_all($GroupID) {
while (list($GID) = $DB->next_record()) { while (list($GID) = $DB->next_record()) {
$Rankings[$GID] = ++$i; $Rankings[$GID] = ++$i;
} }
$Cache->cache_value('voting_ranks_overall', $Rankings); $Cache->cache_value('voting_ranks_overall', $Rankings, 259200);
} }
return isset($Rankings[$GroupID])?$Rankings[$GroupID]:false; return isset($Rankings[$GroupID])?$Rankings[$GroupID]:false;
@ -246,7 +246,7 @@ public static function get_rank_year($GroupID, $Year) {
while (list($GID) = $DB->next_record()) { while (list($GID) = $DB->next_record()) {
$Rankings[$GID] = ++$i; $Rankings[$GID] = ++$i;
} }
$Cache->cache_value('voting_ranks_year_'.$Year , $Rankings); $Cache->cache_value('voting_ranks_year_'.$Year , $Rankings, 259200);
} }
return isset($Rankings[$GroupID])?$Rankings[$GroupID]:false; return isset($Rankings[$GroupID])?$Rankings[$GroupID]:false;
@ -286,7 +286,7 @@ public static function get_rank_decade($GroupID, $Year) {
while (list($GID) = $DB->next_record()) { while (list($GID) = $DB->next_record()) {
$Rankings[$GID] = ++$i; $Rankings[$GID] = ++$i;
} }
$Cache->cache_value('voting_ranks_decade_'.$Year , $Rankings); $Cache->cache_value('voting_ranks_decade_'.$Year , $Rankings, 259200);
} }
return isset($Rankings[$GroupID])?$Rankings[$GroupID]:false; return isset($Rankings[$GroupID])?$Rankings[$GroupID]:false;

View File

@ -11,7 +11,7 @@
shell_exec('unzip GeoLiteCity-latest.zip'); shell_exec('unzip GeoLiteCity-latest.zip');
shell_exec('rm GeoLiteCity-latest.zip'); shell_exec('rm GeoLiteCity-latest.zip');
if(($Locations = file("GeoLiteCity_".date('Ym')."05/GeoLiteCity-Location.csv", FILE_IGNORE_NEW_LINES)) === false) { if(($Locations = file("GeoLiteCity_".date('Ym')."02/GeoLiteCity-Location.csv", FILE_IGNORE_NEW_LINES)) === false) {
error("Download or extraction of maxmind database failed"); error("Download or extraction of maxmind database failed");
} }
array_shift($Locations); array_shift($Locations);
@ -30,7 +30,7 @@
echo "There are ".count($CountryIDs)." CountryIDs"; echo "There are ".count($CountryIDs)." CountryIDs";
echo "<br />"; echo "<br />";
if(($Blocks = file("GeoLiteCity_".date('Ym')."05/GeoLiteCity-Blocks.csv", FILE_IGNORE_NEW_LINES)) === false) { if(($Blocks = file("GeoLiteCity_".date('Ym')."02/GeoLiteCity-Blocks.csv", FILE_IGNORE_NEW_LINES)) === false) {
echo "Error"; echo "Error";
} }
array_shift($Blocks); array_shift($Blocks);

View File

@ -247,6 +247,7 @@ ul#userinfo_username li, ul#userinfo_major li, ul#userinfo_stats li {
} }
ul#userinfo_username li a { ul#userinfo_username li a {
overflow: hidden;
color: #d5efff; color: #d5efff;
} }
@ -394,7 +395,12 @@ ul#userinfo_stats {
ul#userinfo_username { ul#userinfo_username {
z-index: 6; z-index: 6;
padding-left: 320px; padding-left: 320px;
width: 175px; width: 185px;
}
.username {
text-overflow: ellipsis;
max-width: 70px;
} }
#alerts { #alerts {

View File

@ -255,6 +255,7 @@ ul#userinfo_username li, ul#userinfo_major li, ul#userinfo_stats li {
ul#userinfo_username li a { ul#userinfo_username li a {
color: #bebebe; color: #bebebe;
overflow: hidden;
} }
ul#userinfo_username li a:hover { ul#userinfo_username li a:hover {
@ -264,6 +265,8 @@ ul#userinfo_username li a:hover {
ul#userinfo_username li a.username { ul#userinfo_username li a.username {
color: #575757; color: #575757;
max-width: 70px;
text-overflow: ellipsis;
} }
ul#userinfo_username li a.username:hover { ul#userinfo_username li a.username:hover {
@ -380,6 +383,7 @@ ul#userinfo_minor a:hover {
ul#userinfo_major { ul#userinfo_major {
z-index: 2; z-index: 2;
padding-left: 510px; padding-left: 510px;
width: 300px;
} }
ul#userinfo_minor { ul#userinfo_minor {
@ -397,6 +401,7 @@ ul#userinfo_stats {
ul#userinfo_username { ul#userinfo_username {
z-index: 5; z-index: 5;
padding-left: 290px; padding-left: 290px;
width: 200px;
} }
#alerts { #alerts {
@ -1533,11 +1538,11 @@ h3 {
} }
#userinfo_username .brackets { #userinfo_username .brackets {
padding: 0; padding: 0 8px;
} }
#userinfo_major .brackets { #userinfo_major .brackets {
padding: 0; padding: 0 8px 0 0;
} }
#forums table.border .cat_list { #forums table.border .cat_list {