Empty commit

This commit is contained in:
Git 2013-04-07 08:00:41 +00:00
parent 6e8e01a471
commit a7a85c2bdb
7 changed files with 21 additions and 22 deletions

View File

@ -706,7 +706,7 @@ private function to_html ($Array) {
global $LoggedUser;
if ($LoggedUser['EnableMatureContent']) {
if (!empty($Block['Attr'])) {
$Str.='<strong class="mature" style="font-size: 1.2em;">Mature content:</strong><strong> ' . $Block['Attr'] . '</strong><br \> <a href="javascript:void(0);" onclick="BBCode.spoiler(this);">Show</a>';
$Str.='<strong class="mature" style="font-size: 1.2em;">Mature content:</strong><strong> ' . $Block['Attr'] . '</strong><br /> <a href="javascript:void(0);" onclick="BBCode.spoiler(this);">Show</a>';
$Str.='<blockquote class="hidden spoiler">'.$this->to_html($Block['Val']).'</blockquote>';
}
else {

View File

@ -549,8 +549,7 @@ public static function show_avatar($Avatar, $Username, $Setting, $Size=150, $Ret
case 0:
if (!empty($Avatar)) {
$ToReturn = $ReturnHTML ? "<img src='$Avatar' width='$Size' style='max-height:400px;' alt='$Username avatar' />" : $Avatar;
}
else {
} else {
$URL = STATIC_SERVER."common/avatars/default.png";
$ToReturn = $ReturnHTML ? "<img src='$URL' width='$Size' style='max-height:400px;' alt='Default Avatar'/>" : $URL;
}
@ -588,15 +587,13 @@ public static function show_avatar($Avatar, $Username, $Setting, $Size=150, $Ret
}
$Rating = "pg";
if (!$Robot) {
$URL = "https://www.gravatar.com/avatar/".md5(strtolower(trim($Username)))."?s=$Size&d=$Type&r=$Rating";
}
else {
$URL = "https://secure.gravatar.com/avatar/".md5(strtolower(trim($Username)))."?s=$Size&d=$Type&r=$Rating";
} else {
$URL = "https://static1.robohash.org/".md5($Username)."?set=set".$Type."&size=".$Size."x".$Size;
}
if ($ShowAvatar == True && !empty($Avatar)) {
$ToReturn = $ReturnHTML ? "<img src='$Avatar' width='$Size' style='max-height:400px;' alt='$Username avatar' />" : $Avatar;
}
else {
} else {
$ToReturn = $ReturnHTML ? "<img src='$URL' width='$Size' style='max-height:400px;' alt='Default Avatar'/>" : $URL;
}
break;

View File

@ -68,7 +68,9 @@
*/
/*
if (!check_perms('admin_update_geoip')) { die(); }
if (!check_perms('admin_update_geoip')) {
die();
}
enforce_login();
ini_set('memory_limit',1024*1024*1024);

View File

@ -562,7 +562,7 @@ function num_compare($Field, $Operand, $Num1, $Num2 = '') {
<td>
</td>
<? } ?>
<td class="label nobr"><span title="Units are in bytes">Uploaded:</span></td>
<td class="label nobr"><span title="Units are in gibibytes (the base 2 sibling of gigabytes)">Uploaded:</span></td>
<td width="30%">
<select name="uploaded">
<option value="equal"<? if ($_GET['uploaded']==='equal') {echo ' selected="selected"';}?>>Equal</option>
@ -596,7 +596,7 @@ function num_compare($Field, $Operand, $Num1, $Num2 = '') {
<input type="text" name="invites1" size="6" value="<?=display_str($_GET['invites1'])?>" />
<input type="text" name="invites2" size="6" value="<?=display_str($_GET['invites2'])?>" />
</td>
<td class="label nobr"><span title="Units are in bytes">Downloaded:</span></td>
<td class="label nobr"><span title="Units are in gibibytes (the base 2 sibling of gigabytes)">Downloaded:</span></td>
<td width="30%">
<select name="downloaded">
<option value="equal"<? if ($_GET['downloaded']==='equal') {echo ' selected="selected"';}?>>Equal</option>