Mirror/Gazelle
1
0
Fork 0
mirror of https://github.com/WhatCD/Gazelle.git synced 2025-01-18 20:21:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Empty commit

Browse Source
This commit is contained in:
Git 2015-02-24 08:00:27 +00:00
parent 051ed8520e
commit 1972eded06
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
classes/users.class.php
View File

@ -648,14 +648,15 @@ public static function show_avatar($Avatar, $UserID, $Username, $Setting, $Size
switch ($Setting) {
case 0:
if (!empty($Avatar)) {
$ToReturn = ($ReturnHTML ? "<img src=\"$Avatar\" width=\"$Size\" $Style $AvatarMouseOverText$SecondAvatar $Class />" : $Avatar);
$ToReturn = ($ReturnHTML ? "<div><img src=\"$Avatar\" width=\"$Size\" $Style $AvatarMouseOverText$SecondAvatar $Class /></div>" : $Avatar);
} else {
$URL = STATIC_SERVER.'common/avatars/default.png';
$ToReturn = ($ReturnHTML ? "<img src=\"$URL\" width=\"$Size\" $Style $AvatarMouseOverText$SecondAvatar />" : $URL);
$ToReturn = ($ReturnHTML ? "<div><img src=\"$URL\" width=\"$Size\" $Style $AvatarMouseOverText$SecondAvatar /></div>" : $URL);
}
break;
case 2:
$ShowAvatar = true;
// Fallthrough
case 3:
switch (G::$LoggedUser['Identicons']) {
case 0:
@ -692,14 +693,14 @@ public static function show_avatar($Avatar, $UserID, $Username, $Setting, $Size
$URL = 'https://robohash.org/'.md5($Username)."?set=set$Type&amp;size={$Size}x$Size";
}
if ($ShowAvatar == true && !empty($Avatar)) {
$ToReturn = ($ReturnHTML ? "<img src=\"$Avatar\" width=\"$Size\" $Style $AvatarMouseOverText$SecondAvatar $Class />" : $Avatar);
$ToReturn = ($ReturnHTML ? "<div><img src=\"$Avatar\" width=\"$Size\" $Style $AvatarMouseOverText$SecondAvatar $Class /></div>" : $Avatar);
} else {
$ToReturn = ($ReturnHTML ? "<img src=\"$URL\" width=\"$Size\" $Style $AvatarMouseOverText$SecondAvatar $Class />" : $URL);
$ToReturn = ($ReturnHTML ? "<div><img src=\"$URL\" width=\"$Size\" $Style $AvatarMouseOverText$SecondAvatar $Class /></div>" : $URL);
}
break;
default:
$URL = STATIC_SERVER.'common/avatars/default.png';
$ToReturn = ($ReturnHTML ? "<img src=\"$URL\" width=\"$Size\" $Style $AvatarMouseOverText$SecondAvatar $Class/>" : $URL);
$ToReturn = ($ReturnHTML ? "<div><img src=\"$URL\" width=\"$Size\" $Style $AvatarMouseOverText$SecondAvatar $Class/></div>" : $URL);
}
return $ToReturn;
}

2
static/functions/autocomplete.js
View File

@ -2,7 +2,7 @@ var ARTIST_AUTOCOMPLETE_URL = 'artist.php?action=autocomplete';
var TAGS_AUTOCOMPLETE_URL = 'torrents.php?action=autocomplete_tags';
var SELECTOR = '[data-gazelle-autocomplete="true"]';
$(document).ready(function() {
var url = new URL();
var url = new gazURL();
$('#artistsearch' + SELECTOR).autocomplete({
deferRequestBy: 300,

2
static/functions/comments.js
View File

@ -1,6 +1,6 @@
var username;
var postid;
var url = new URL();
var url = new gazURL();
function QuoteJump(event, post) {
var button = event.button;

2
static/functions/form_validate.js
View File

@ -1,5 +1,5 @@
$(document).ready(function() {
var url = new URL();
var url = new gazURL();
var query = url.query;
switch (url.path) {
case "forums":

2
static/functions/script_start.js
View File

@ -194,7 +194,7 @@ var util = function (selector, context) {
return new util.fn.init(selector, context);
}
function URL() {
function gazURL() {
var path = window.location.pathname.split('/');
var path = path[path.length - 1].split(".")[0];
var splitted = window.location.search.substr(1).split("&");

2
static/functions/user_notifications.js
View File

@ -14,7 +14,7 @@ $(document).ready(function() {
});
function getSkippedPage() {
var skip, url = new URL();
var skip, url = new gazURL();
switch(url.path) {
case "inbox":
if (url.query.length == 0 || (url.query.length == 1 && url.query.hasOwnProperty('sort'))) {