From b222680ef14fd6daf2a7152a61e931300f7d1c8b Mon Sep 17 00:00:00 2001 From: Git Date: Sat, 9 Mar 2013 08:00:18 +0000 Subject: [PATCH] Empty commit --- classes/class_text.php | 6 ++-- classes/class_text2.php | 2 +- classes/class_text3.php | 2 +- classes/script_start.php | 3 ++ design/privateheader.php | 40 +--------------------- sections/artist/concerts.php | 2 +- sections/artist/edit.php | 10 +++--- sections/collages/manage.php | 46 +++++++++++++------------- sections/index/feat_album.php | 16 ++++++--- sections/index/private.php | 6 ++-- sections/reports/reports.php | 24 +++++++------- sections/reportsv2/ajax_new_report.php | 2 +- sections/reportsv2/reports.php | 20 +++-------- sections/reportsv2/static.php | 4 +-- sections/top10/torrents.php | 2 +- sections/top10/users.php | 28 ++++++++-------- sections/torrents/details.php | 14 ++++---- sections/user/community_stats.php | 4 +-- sections/user/edit.php | 24 +++++++------- sections/user/invite.php | 4 +-- sections/userhistory/subscriptions.php | 5 +-- static/functions/reports.js | 4 +-- static/functions/rippy.js | 21 ++++++------ 23 files changed, 126 insertions(+), 163 deletions(-) diff --git a/classes/class_text.php b/classes/class_text.php index 4908b1de..d77938f9 100644 --- a/classes/class_text.php +++ b/classes/class_text.php @@ -540,7 +540,7 @@ public function parse_toc ($Min = 3) * * @param int $ItemLevel Current item level * @param int $Level Current list level - * @param str $List reference to an xHTML string + * @param str $List reference to an XHTML string * @param int $i Iterator digit * @param int $Offset If the list doesn't start at level 1 */ @@ -581,7 +581,7 @@ private function to_html ($Array) { $Str.=''.$this->to_html($Block['Val']).''; break; case 'i': - $Str.=''.$this->to_html($Block['Val']).""; + $Str.=''.$this->to_html($Block['Val']).""; break; case 's': $Str.=''.$this->to_html($Block['Val']).''; @@ -623,7 +623,7 @@ private function to_html ($Array) { $Str.=''.$Block['Val'].''; break; case 'tex': - $Str.='TeX'; + $Str.=''.$Block['Val'].''; break; case 'plain': $Str.=$Block['Val']; diff --git a/classes/class_text2.php b/classes/class_text2.php index fe1c53b4..3d395c67 100644 --- a/classes/class_text2.php +++ b/classes/class_text2.php @@ -542,7 +542,7 @@ function to_html($Array) { $Str.='[img]'.$Block['Val'].'[/img]'; } else { if(check_perms('site_proxy_images')) { - $Str.=''.$Block['Val'].''; + $Str.=''.$Block['Val'].''; } else { $Str.=''.$Block['Val'].''; } diff --git a/classes/class_text3.php b/classes/class_text3.php index 33697de5..bebfd56f 100644 --- a/classes/class_text3.php +++ b/classes/class_text3.php @@ -503,7 +503,7 @@ function to_html($Array) { $Str.='[img]'.$Block['Val'].'[/img]'; } else { if(check_perms('site_proxy_images')) { - $Str.=''.$Block['Val'].''; + $Str.=''.$Block['Val'].''; } else { $Str.=''.$Block['Val'].''; } diff --git a/classes/script_start.php b/classes/script_start.php index a48e41e2..2ce9b0c5 100644 --- a/classes/script_start.php +++ b/classes/script_start.php @@ -117,6 +117,9 @@ case 'Requests': $FileName = 'class_requests'; break; + case 'Rippy': + $FileName = 'rippy.class'; + break; case 'SphinxQL': case 'SphinxQL_Query': case 'SphinxQL_Result': diff --git a/design/privateheader.php b/design/privateheader.php index 44404469..3b592637 100644 --- a/design/privateheader.php +++ b/design/privateheader.php @@ -1,6 +1,4 @@ @@ -87,7 +85,7 @@ ?> -> +>

@@ -411,44 +409,8 @@ get_value('rippy_message_'.$LoggedUser['ID']); - if($Says === false) { - $Says = $Cache->get_value('global_rippy_message'); - } - $Show = ($Says !== false); - $Cache->delete_value('rippy_message_'.$LoggedUser['ID']); - break; - case 'On' : - $Show = true; - $Says = ''; - break; - /* Uncomment to always show globals - case 'Off' : - $Says = $Cache->get_value('global_rippy_message'); - $Show = ($Says !== false); - break; - */ - } - - if($Show) { ?> -
-
- - - -
-
-
-
    diff --git a/sections/artist/concerts.php b/sections/artist/concerts.php index cfcfba05..fa93c2b7 100644 --- a/sections/artist/concerts.php +++ b/sections/artist/concerts.php @@ -28,7 +28,7 @@ ↑ Upcoming concerts Toggle
-
> +
diff --git a/sections/artist/edit.php b/sections/artist/edit.php index 03a749fe..1e0d4f38 100644 --- a/sections/artist/edit.php +++ b/sections/artist/edit.php @@ -85,7 +85,7 @@ OR
 

- +
@@ -100,10 +100,10 @@ while(list($AliasID, $AliasName, $User, $Redirect) = $DB->next_record(MYSQLI_NUM, true)) { if($AliasName == $Name) { $DefaultRedirectID = $AliasID; } ?> -
  • . - User (writes redirect to ) - X +
  • . + User (writes redirect to ) + X
    • diff --git a/sections/collages/manage.php b/sections/collages/manage.php index ea073527..807f13e7 100644 --- a/sections/collages/manage.php +++ b/sections/collages/manage.php @@ -49,8 +49,8 @@
  • Click on the headings to organize columns automatically.
  • Sort multiple columns simultaneously by holding down the shift key and clicking other column headers.
  • Click and drag any row to change its order.
    • -
  • Press Save All Changes when you are finished sorting.
    • -
  • Press Edit or Remove to simply modify one entry.
    • +
  • Press "Save All Changes" when you are finished sorting.
    • +
  • Press "Edit" or "Remove" to simply modify one entry.
    • @@ -97,27 +97,27 @@ $AltCSS = $Number % 2 === 0 ? 'rowa' : 'rowb'; ?> - -
    - - - - - - - - - - - - - - - - - -
    - + +
    + + + + + + + + + + + + + + + + + +
    + diff --git a/sections/index/feat_album.php b/sections/index/feat_album.php index 672c076b..54a5aa78 100644 --- a/sections/index/feat_album.php +++ b/sections/index/feat_album.php @@ -10,10 +10,18 @@ ?>
    Featured Album
    -
    -
    <?=Artists::display_artists($Artists, false, false)?> - <?=$FeaturedAlbum['Name']?>
    -
    Read the interview with the artist, discuss here
    +
    + +
    +
    + + <?=Artists::display_artists($Artists, false, false)?> - <?=$FeaturedAlbum['Name']?> + +
    +
    + Read the interview with the artist, discuss here +
    \ No newline at end of file +?> diff --git a/sections/index/private.php b/sections/index/private.php index afeffb92..61df76da 100644 --- a/sections/index/private.php +++ b/sections/index/private.php @@ -123,7 +123,7 @@
    Stats
    -
    + )" name="submit" value="Resolve" />
    - - - - Resolved By - - - + + + + Resolved by + + +
    diff --git a/sections/reportsv2/ajax_new_report.php b/sections/reportsv2/ajax_new_report.php index 256d9f48..07e0a35d 100644 --- a/sections/reportsv2/ajax_new_report.php +++ b/sections/reportsv2/ajax_new_report.php @@ -432,7 +432,7 @@ - | + | | | Multi-resolve | diff --git a/sections/reportsv2/reports.php b/sections/reportsv2/reports.php index cf57a26b..20b7c7b6 100644 --- a/sections/reportsv2/reports.php +++ b/sections/reportsv2/reports.php @@ -9,29 +9,17 @@ } View::show_header('Reports V2!', 'reportsv2'); -?> - +?>

    New reports, auto assigned!

    - + | - | - | + | + |

    diff --git a/sections/reportsv2/static.php b/sections/reportsv2/static.php index f25b3441..5159410d 100644 --- a/sections/reportsv2/static.php +++ b/sections/reportsv2/static.php @@ -198,7 +198,7 @@ - | + |

    @@ -592,7 +592,7 @@ - | + | | diff --git a/sections/top10/torrents.php b/sections/top10/torrents.php index 84a1dc84..97fc7ec6 100644 --- a/sections/top10/torrents.php +++ b/sections/top10/torrents.php @@ -125,7 +125,7 @@ ?>
    - Freeleech in Top 10 + freeleech in Top 10
    Rank User - Uploaded - UL speed - Downloaded - DL speed - Uploads - Ratio - Joined + Uploaded + UL speed + Downloaded + DL speed + Uploads + Ratio + Joined "> - - /s - - /s - - - + + /s + + /s + + +

    - Tagging rules + View tagging rules
    - + - + - +
    ↑ This album is in collage1)?'s':'')?>↑ This album is in collage1) ? 's' : '')?> # torrents
    @@ -743,7 +743,7 @@ function filelist($Str) { ?> - + - + - +
    ↑ This album is in personal collage1)?'s':'')?>↑ This album is in personal collage1) ? 's' : '')?> # torrents
    diff --git a/sections/user/community_stats.php b/sections/user/community_stats.php index 19dc3219..d9df5f3b 100644 --- a/sections/user/community_stats.php +++ b/sections/user/community_stats.php @@ -130,7 +130,7 @@ ? '(' . 100*min(1,round($Seeding/$UniqueSnatched,2)).'%)' : ''); ?> View - Download + Download @@ -152,7 +152,7 @@ View - Download + Download diff --git a/sections/user/edit.php b/sections/user/edit.php index c17eec21..cb3d6c68 100644 --- a/sections/user/edit.php +++ b/sections/user/edit.php @@ -157,8 +157,9 @@ function checked($Checked) {

    Note: Checked items will be hidden.

    - @@ -174,11 +175,11 @@ function checked($Checked) { --> - Cover Art + Cover art - /> - + /> + @@ -299,18 +300,17 @@ function checked($Checked) { - Email + Email address

    If changing this field, you must enter your current password in the "Current password" field before saving your changes.

    - - Last.fm username - -

    Your Last.fm username. Will be used to display Last.fm information on your profile which can be seen by other users.

    - - - + + Last.fm username + +

    Your Last.fm username. Will be used to display Last.fm information on your profile which can be seen by other users.

    + + Info diff --git a/sections/user/invite.php b/sections/user/invite.php index a026bad9..c7cf3d1e 100644 --- a/sections/user/invite.php +++ b/sections/user/invite.php @@ -121,8 +121,8 @@ ){ ?>

    Please note that the selling, trading or public giving away of our invitations, or responding to public requests, is strictly forbidden, and may result in you and your entire invite tree being banned. This includes offering to give away our invitations on any forum which is not a class-restricted forum on another private tracker.

    -

    Remember that you are responsible for ALL invitees, and your account and/or privileges may be lost due to their actions. You should know the person you're inviting. If you aren't familiar enough with the user to trust them, we suggest not inviting them.

    -

    Do not send an invite if you haven't read and understood the information above.

    +

    Remember that you are responsible for ALL invitees, and your account and/or privileges may be disabled due to your invitees' actions. You should know the person you're inviting. If you aren't familiar enough with the user to trust them, we suggest not inviting them.

    +

    Do not send an invite if you haven't read or don't understood the information above.

    diff --git a/sections/userhistory/subscriptions.php b/sections/userhistory/subscriptions.php index 1faf4274..d79274b3 100644 --- a/sections/userhistory/subscriptions.php +++ b/sections/userhistory/subscriptions.php @@ -168,8 +168,9 @@ - ]+)+\.(jpg|jpeg|gif|png|tif|tiff|bmp)$/is',$AuthorAvatar)) { ?> - <?=$AuthorName?>'s avatar + ]+)+\.(jpg|jpeg|gif|png|tif|tiff|bmp)$/is',$AuthorAvatar)) { + $AuthorAvatar = 'http'.($SSL?'s':'').'://'.SITE_URL.'/image.php?c=1&i='.urlencode($AuthorAvatar); ?> + <?=$AuthorName?>'s avatar Default avatar diff --git a/static/functions/reports.js b/static/functions/reports.js index 6ea5e4c3..3219f6d9 100644 --- a/static/functions/reports.js +++ b/static/functions/reports.js @@ -39,7 +39,7 @@ function unClaim(id) { ajax.get('reports.php?action=unclaim&remove=1&id=' + id, function (response) { var json = JSON.parse(response); if (json['status'] == 'success') { - $('#claimed_' + id).raw().innerHTML = 'Claim'; + $('#claimed_' + id).raw().innerHTML = 'Claim'; } }); } @@ -48,7 +48,7 @@ function resolve(id, claimer) { var answer = true; if (!claimer) { if ($('#claimed_' + id).raw()) { - var answer = confirm("This is a claimed report, are you sure you want to resolve it?"); + var answer = confirm("This is a claimed report. Are you sure you want to resolve it?"); if (answer) answer = true; else diff --git a/static/functions/rippy.js b/static/functions/rippy.js index 5047806a..faaf129a 100644 --- a/static/functions/rippy.js +++ b/static/functions/rippy.js @@ -1,17 +1,18 @@ function say() { - ajax.get("ajax.php?action=rippy", function (message) { - if(message) { - $('#rippy-says').raw().innerHTML = message; - $('#bubble').raw().style.display = "block"; - } else { - $('#bubble').raw().style.display = "none"; - } + ajax.get("ajax.php?action=rippy", function(response) { + response = JSON.parse(response); + if (response['Message']) { + var say = response['Message']; + if(response['From']) { + say += "
    Ripback"; } - ); + $('#rippywrap').raw().style.display = ""; + $('#rippy-says').raw().innerHTML = say; + $('#bubble').raw().style.display = "block"; + } + }); } function rippyclick() { $('.rippywrap').remove(); } - -