Home Explore Help
Register Sign In
biotorrents
/
Gazelle
forked from Oppaitime/Gazelle
Watch 2
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 2 Wiki Activity
Browse Source

Public header and query escape

biotorrents 4 years ago
parent
24ef500b33
commit
cc088f5938
2 changed files with 45 additions and 40 deletions
Split View Show Diff Stats
  1. 25
    20
      design/publicheader.php
  2. 20
    20
      gazelle.sql

+ 25
- 20
design/publicheader.php View File 

@@ -3,23 +3,20 @@ declare(strict_types=1);
3 3
4 4 
 $ENV = ENV::go();
5 5 
 global $LoggedUser;
6 
-?>
7 6
7 
+echo <<<HTML
8 8 
 <!doctype html>
9 9 
 <html>
10 10
11 11 
 <head>
12 
-  <title>
13 
-    <?= display_str($PageTitle) ?>
14 
-  </title>
12 
+  <title>$PageTitle</title>
13 
+HTML;
15 14
16 
-  <?= View::commonMeta(); ?>
15 
+echo View::commonMeta();
16 
+echo "<link href='$ENV->STATIC_SERVER/styles/public.css?v="
17 
+     . filemtime(SERVER_ROOT.'/static/styles/public.css')
18 
+     . "' rel='stylesheet' type='text/css'>";
17 19
18 
-  <link
19 
-    href="<?=STATIC_SERVER ?>styles/public.css?v=<?=filemtime(SERVER_ROOT.'/static/styles/public.css')?>"
20 
-    rel="stylesheet" type="text/css">
21 
-
22 
-  <?php
23 20 
 # Load JS
24 21 
 $Scripts = array_filter(
25 22 
     array_merge(
 
@@ -57,22 +54,30 @@ echo View::pushAsset(
57 54 
 # Only Noto Sans available on public pages
58 55 
 "$ENV->STATIC_SERVER/styles/assets/fonts/noto/woff2/NotoSans-SemiCondensed.woff2",
59 56 
     'font'
60 
-); ?>
57 
+);
58 
+
59 
+echo <<<HTML
61 60 
 </head>
62 61
63 62 
 <body>
64 63 
   <header>
65 64 
     <a href="login.php">Log In</a>
65 
+HTML;
66 
+
67 
+if ($ENV->OPEN_REGISTRATION) {
68 
+    echo '<a href="register.php">Register</a>';
69 
+}
66 70
67 
-    <?php if ($ENV->OPEN_REGISTRATION) { ?>
68 
-    <a href="register.php">Register</a>
69 
-    <?php } ?>
71 
+$Email = $ENV->HELP->Email;
72 
+$Subject = $ENV->HELP->Subject;
73 
+$Body = $ENV->HELP->Body;
74 
+echo "<a href='mailto:$Email?subject=$Subject&body=$Body'>Support</a>";
70 75
71 
-    <a
72 
-      href="mailto:help@biotorrents.de?subject=[TxID <?= strtoupper(bin2hex(random_bytes(2))) ?>] Vague subject lines ignored">Support</a>
76 
+echo <<<HTML
73 77 
   </header>
74 78
75 
-  <main>
76 
-    <h1 id="logo">
77 
-      <a href="/" aria-label="Front page"></a>
78 
-    </h1>
79 
+<main>
80 
+  <h1 id="logo">
81 
+    <a href="/" aria-label="Front page"></a>
82 
+  </h1>
83 
+HTML;

+ 20
- 20
gazelle.sql View File 

@@ -1754,7 +1754,7 @@ CREATE TABLE `xbt_snatched` (
1754 1754 
 -- Now we have the default values to initialize the DB with
1755 1755 
 SET FOREIGN_KEY_CHECKS = 1;
1756 1756
1757 
-INSERT INTO permissions (ID, Level, Name, `Values`, DisplayStaff) VALUES
1757 
+INSERT INTO `permissions` (`ID`, `Level`, `Name`, `Values`, `DisplayStaff`) VALUES
1758 1758 
   (15, 1000, 'Sysop', 'a:100:{s:10:\"site_leech\";i:1;s:11:\"site_upload\";i:1;s:9:\"site_vote\";i:1;s:20:\"site_submit_requests\";i:1;s:20:\"site_advanced_search\";i:1;s:10:\"site_top10\";i:1;s:19:\"site_advanced_top10\";i:1;s:16:\"site_album_votes\";i:1;s:20:\"site_torrents_notify\";i:1;s:20:\"site_collages_create\";i:1;s:20:\"site_collages_manage\";i:1;s:20:\"site_collages_delete\";i:1;s:23:\"site_collages_subscribe\";i:1;s:22:\"site_collages_personal\";i:1;s:28:\"site_collages_renamepersonal\";i:1;s:19:\"site_make_bookmarks\";i:1;s:14:\"site_edit_wiki\";i:1;s:22:\"site_can_invite_always\";i:1;s:27:\"site_send_unlimited_invites\";i:1;s:22:\"site_moderate_requests\";i:1;s:18:\"site_delete_artist\";i:1;s:20:\"site_moderate_forums\";i:1;s:17:\"site_admin_forums\";i:1;s:23:\"site_forums_double_post\";i:1;s:14:\"site_view_flow\";i:1;s:18:\"site_view_full_log\";i:1;s:28:\"site_view_torrent_snatchlist\";i:1;s:18:\"site_recommend_own\";i:1;s:27:\"site_manage_recommendations\";i:1;s:15:\"site_delete_tag\";i:1;s:23:\"site_disable_ip_history\";i:1;s:14:\"zip_downloader\";i:1;s:10:\"site_debug\";i:1;s:17:\"site_proxy_images\";i:1;s:16:\"site_search_many\";i:1;s:20:\"users_edit_usernames\";i:1;s:16:\"users_edit_ratio\";i:1;s:20:\"users_edit_own_ratio\";i:1;s:17:\"users_edit_titles\";i:1;s:18:\"users_edit_avatars\";i:1;s:18:\"users_edit_invites\";i:1;s:22:\"users_edit_watch_hours\";i:1;s:21:\"users_edit_reset_keys\";i:1;s:19:\"users_edit_profiles\";i:1;s:18:\"users_view_friends\";i:1;s:20:\"users_reset_own_keys\";i:1;s:19:\"users_edit_password\";i:1;s:19:\"users_promote_below\";i:1;s:16:\"users_promote_to\";i:1;s:16:\"users_give_donor\";i:1;s:10:\"users_warn\";i:1;s:19:\"users_disable_users\";i:1;s:19:\"users_disable_posts\";i:1;s:17:\"users_disable_any\";i:1;s:18:\"users_delete_users\";i:1;s:18:\"users_view_invites\";i:1;s:20:\"users_view_seedleech\";i:1;s:19:\"users_view_uploaded\";i:1;s:15:\"users_view_keys\";i:1;s:14:\"users_view_ips\";i:1;s:16:\"users_view_email\";i:1;s:18:\"users_invite_notes\";i:1;s:23:\"users_override_paranoia\";i:1;s:12:\"users_logout\";i:1;s:20:\"users_make_invisible\";i:1;s:9:\"users_mod\";i:1;s:13:\"torrents_edit\";i:1;s:15:\"torrents_delete\";i:1;s:20:\"torrents_delete_fast\";i:1;s:18:\"torrents_freeleech\";i:1;s:20:\"torrents_search_fast\";i:1;i:1;s:19:\"torrents_fix_ghosts\";i:1;s:17:\"admin_manage_news\";i:1;s:17:\"admin_manage_blog\";i:1;s:18:\"admin_manage_polls\";i:1;s:19:\"admin_manage_forums\";i:1;s:16:\"admin_manage_fls\";i:1;s:13:\"admin_reports\";i:1;s:26:\"admin_advanced_user_search\";i:1;s:18:\"admin_create_users\";i:1;s:15:\"admin_donor_log\";i:1;s:19:\"admin_manage_ipbans\";i:1;i:1;s:17:\"admin_clear_cache\";i:1;s:15:\"admin_whitelist\";i:1;s:24:\"admin_manage_permissions\";i:1;s:14:\"admin_schedule\";i:1;s:17:\"admin_login_watch\";i:1;s:17:\"admin_manage_wiki\";i:1;i:1;s:21:\"site_collages_recover\";i:1;s:19:\"torrents_add_artist\";i:1;s:13:\"edit_unknowns\";i:1;s:19:\"forums_polls_create\";i:1;s:21:\"forums_polls_moderate\";i:1;s:12:\"project_team\";i:1;s:25:\"torrents_edit_vanityhouse\";i:1;s:23:\"artist_edit_vanityhouse\";i:1;s:21:\"site_tag_aliases_read\";i:1;}', '1'),
1759 1759 
   (11, 800, 'Moderator', 'a:89:{s:26:\"admin_advanced_user_search\";i:1;s:17:\"admin_clear_cache\";i:1;s:18:\"admin_create_users\";i:1;i:1;s:15:\"admin_donor_log\";i:1;s:17:\"admin_login_watch\";i:1;s:17:\"admin_manage_blog\";i:1;s:19:\"admin_manage_ipbans\";i:1;s:17:\"admin_manage_news\";i:1;s:18:\"admin_manage_polls\";i:1;s:17:\"admin_manage_wiki\";i:1;s:13:\"admin_reports\";i:1;s:23:\"artist_edit_vanityhouse\";i:1;s:13:\"edit_unknowns\";i:1;s:19:\"forums_polls_create\";i:1;s:21:\"forums_polls_moderate\";i:1;s:12:\"project_team\";i:1;s:17:\"site_admin_forums\";i:1;s:20:\"site_advanced_search\";i:1;s:19:\"site_advanced_top10\";i:1;s:16:\"site_album_votes\";i:1;s:22:\"site_can_invite_always\";i:1;s:20:\"site_collages_create\";i:1;s:20:\"site_collages_delete\";i:1;s:20:\"site_collages_manage\";i:1;s:22:\"site_collages_personal\";i:1;s:21:\"site_collages_recover\";i:1;s:28:\"site_collages_renamepersonal\";i:1;s:23:\"site_collages_subscribe\";i:1;s:18:\"site_delete_artist\";i:1;s:15:\"site_delete_tag\";i:1;s:23:\"site_disable_ip_history\";i:1;s:14:\"site_edit_wiki\";i:1;s:23:\"site_forums_double_post\";i:1;s:10:\"site_leech\";i:1;s:19:\"site_make_bookmarks\";i:1;s:27:\"site_manage_recommendations\";i:1;s:20:\"site_moderate_forums\";i:1;s:22:\"site_moderate_requests\";i:1;s:17:\"site_proxy_images\";i:1;s:18:\"site_recommend_own\";i:1;s:16:\"site_search_many\";i:1;s:27:\"site_send_unlimited_invites\";i:1;s:20:\"site_submit_requests\";i:1;s:21:\"site_tag_aliases_read\";i:1;s:10:\"site_top10\";i:1;s:20:\"site_torrents_notify\";i:1;s:11:\"site_upload\";i:1;s:14:\"site_view_flow\";i:1;s:18:\"site_view_full_log\";i:1;s:28:\"site_view_torrent_snatchlist\";i:1;s:9:\"site_vote\";i:1;s:19:\"torrents_add_artist\";i:1;s:15:\"torrents_delete\";i:1;s:20:\"torrents_delete_fast\";i:1;s:13:\"torrents_edit\";i:1;s:25:\"torrents_edit_vanityhouse\";i:1;s:19:\"torrents_fix_ghosts\";i:1;s:18:\"torrents_freeleech\";i:1;i:1;s:20:\"torrents_search_fast\";i:1;s:18:\"users_delete_users\";i:1;s:17:\"users_disable_any\";i:1;s:19:\"users_disable_posts\";i:1;s:19:\"users_disable_users\";i:1;s:18:\"users_edit_avatars\";i:1;s:18:\"users_edit_invites\";i:1;s:20:\"users_edit_own_ratio\";i:1;s:19:\"users_edit_password\";i:1;s:19:\"users_edit_profiles\";i:1;s:16:\"users_edit_ratio\";i:1;s:21:\"users_edit_reset_keys\";i:1;s:17:\"users_edit_titles\";i:1;s:16:\"users_give_donor\";i:1;s:12:\"users_logout\";i:1;s:20:\"users_make_invisible\";i:1;s:9:\"users_mod\";i:1;s:23:\"users_override_paranoia\";i:1;s:19:\"users_promote_below\";i:1;s:20:\"users_reset_own_keys\";i:1;s:10:\"users_warn\";i:1;s:16:\"users_view_email\";i:1;s:18:\"users_view_friends\";i:1;s:18:\"users_view_invites\";i:1;s:14:\"users_view_ips\";i:1;s:15:\"users_view_keys\";i:1;s:20:\"users_view_seedleech\";i:1;s:19:\"users_view_uploaded\";i:1;s:14:\"zip_downloader\";i:1;}', '1'),
1760 1760 
   (2, 100, 'User', 'a:7:{s:10:\"site_leech\";i:1;s:11:\"site_upload\";i:1;s:9:\"site_vote\";i:1;s:20:\"site_advanced_search\";i:1;s:10:\"site_top10\";i:1;s:14:\"site_edit_wiki\";i:1;s:19:\"torrents_add_artist\";i:1;}', '0'),
 
@@ -1764,7 +1764,7 @@ INSERT INTO permissions (ID, Level, Name, `Values`, DisplayStaff) VALUES
1764 1764 
   (20, 202, 'Donor', 'a:9:{s:9:\"site_vote\";i:1;s:20:\"site_submit_requests\";i:1;s:20:\"site_advanced_search\";i:1;s:10:\"site_top10\";i:1;s:20:\"site_torrents_notify\";i:1;s:20:\"site_collages_create\";i:1;s:20:\"site_collages_manage\";i:1;s:14:\"zip_downloader\";i:1;s:19:\"forums_polls_create\";i:1;}', '0'),
1765 1765 
   (19, 201, 'Artist', 'a:9:{s:10:\"site_leech\";s:1:\"1\";s:11:\"site_upload\";s:1:\"1\";s:9:\"site_vote\";s:1:\"1\";s:20:\"site_submit_requests\";s:1:\"1\";s:20:\"site_advanced_search\";s:1:\"1\";s:10:\"site_top10\";s:1:\"1\";s:19:\"site_make_bookmarks\";s:1:\"1\";s:14:\"site_edit_wiki\";s:1:\"1\";s:18:\"site_recommend_own\";s:1:\"1\";}', '0');
1766 1766
1767 
-INSERT INTO stylesheets (ID, Name, Description, `Default`, Additions, Color) VALUES
1767 
+INSERT INTO `stylesheets` (`ID`, `Name`, `Description`, `Default`, `Additions`, `Color`) VALUES
1768 1768 
   (1, 'matcha', 'BioTorrents.de Stylesheet', '0', 'radio=noto_sans;radio=noto_serif;radio=opendyslexic;radio=comic_neue', '#000000'),
1769 1769 
   (2, 'bookish', 'Template Stylesheet', '1', 'radio=noto_sans;radio=noto_serif;radio=opendyslexic;radio=comic_neue', '#000000'),
1770 1770 
   (3, 'oppai', 'Oppaitime Stylesheet', '0', 'radio=noto_sans;radio=noto_serif;radio=opendyslexic;radio=comic_neue', '#fbc2e5'),
 
@@ -1772,40 +1772,40 @@ INSERT INTO stylesheets (ID, Name, Description, `Default`, Additions, Color) VAL
1772 1772 
   (5, 'genaviv', 'Genaviv Stylesheet', '0', 'radio=noto_sans;radio=noto_serif;radio=opendyslexic;radio=comic_neue;checkbox=fixed_header', '#0a0a0a'),
1773 1773 
   (6, 'postmod', 'What.cd Stylesheet', '0', 'radio=noto_sans;radio=noto_serif;radio=opendyslexic;radio=comic_neue', '#000000');
1774 1774
1775 
-INSERT INTO wiki_articles (ID, Revision, Title, Body, MinClassRead, MinClassEdit, Date, Author) VALUES
1775 
+INSERT INTO `wiki_articles` (`ID`, `Revision`, `Title`, `Body`, `MinClassRead`, `MinClassEdit`, `Date`, `Author`) VALUES
1776 1776 
   (1, 1, 'Wiki', 'Welcome to your new wiki! Hope this works.', 100, 475, NOW(), 1);
1777 1777
1778 
-INSERT INTO wiki_aliases (Alias, UserID, ArticleID) VALUES ('wiki', 1, 1);
1778 
+INSERT INTO `wiki_aliases` (`Alias`, `UserID`, `ArticleID`) VALUES ('wiki', 1, 1);
1779 1779
1780 
-INSERT INTO wiki_revisions (ID, Revision, Title, Body, Date, Author) VALUES
1780 
+INSERT INTO `wiki_revisions` (`ID`, `Revision`, `Title`, `Body`, `Date`, `Author`) VALUES
1781 1781 
   (1, 1, 'Wiki', 'Welcome to your new wiki! Hope this works.', NOW(), 1);
1782 1782
1783 
-INSERT INTO forums (ID, CategoryID, Sort, Name, Description, MinClassRead, MinClassWrite, MinClassCreate, NumTopics, NumPosts, LastPostID, LastPostAuthorID, LastPostTopicID, LastPostTime) VALUES
1783 
+INSERT INTO `forums` (`ID`, `CategoryID`, `Sort`, `Name`, `Description`, `MinClassRead`, `MinClassWrite`, `MinClassCreate`, `NumTopics`, `NumPosts`, `LastPostID`, `LastPostAuthorID`, `LastPostTopicID`, `LastPostTime`) VALUES
1784 1784 
   (1, 1, 20, 'Your Site', 'Totally rad forum', 100, 100, 100, 0, 0, 0, 0, 0, NULL),
1785 1785 
   (2, 5, 30, 'Chat', 'Expect this to fill up with spam', 100, 100, 100, 0, 0, 0, 0, 0, NULL),
1786 1786 
   (3, 10, 40, 'Help!', 'I fell down and I cant get up', 100, 100, 100, 0, 0, 0, 0, 0, NULL),
1787 1787 
   (4, 20, 100, 'Trash', 'Every thread ends up here eventually', 100, 500, 500, 0, 0, 0, 0, 0, NULL);
1788 1788
1789 
-INSERT INTO tags (ID, Name, TagType, Uses, UserID) VALUES
1789 
+INSERT INTO `tags` (`ID`, `Name`, `TagType`, `Uses`, `UserID`) VALUES
1790 1790 
   (1, 'one', 'genre', 0, 1),
1791 1791 
   (2, 'two', 'genre', 0, 1),
1792 1792 
   (3, 'three', 'genre', 0, 1),
1793 1793 
   (4, 'four', 'genre', 0, 1),
1794 1794 
   (5, 'five', 'genre', 0, 1);
1795 1795
1796 
-INSERT INTO schedule (NextHour, NextDay, NextBiWeekly) VALUES (0,0,0);
1796 
+INSERT INTO `schedule` (`NextHour`, `NextDay`, `NextBiWeekly`) VALUES (0,0,0);
1797 1797
1798 
-INSERT INTO forums_categories (ID, Sort, Name) VALUES (1,1,'Site');
1798 
+INSERT INTO `forums_categories` (`ID`, `Sort`, `Name`) VALUES (1,1,'Site');
1799 1799
1800 
-INSERT INTO forums_categories (ID, Sort, Name) VALUES (5,5,'Community');
1800 
+INSERT INTO `forums_categories` (`ID`, `Sort`, `Name`) VALUES (5,5,'Community');
1801 1801
1802 
-INSERT INTO forums_categories (ID, Sort, Name) VALUES (10,10,'Help');
1802 
+INSERT INTO `forums_categories` (`ID`, `Sort`, `Name`) VALUES (10,10,'Help');
1803 1803
1804 
-INSERT INTO forums_categories (ID, Sort, Name) VALUES (8,8,'Music');
1804 
+INSERT INTO `forums_categories` (`ID`, `Sort`, `Name`) VALUES (8,8,'Music');
1805 1805
1806 
-INSERT INTO forums_categories (ID, Sort, Name) VALUES (20,20,'Trash');
1806 
+INSERT INTO `forums_categories` (`ID`, `Sort`, `Name`) VALUES (20,20,'Trash');
1807 1807
1808 
-INSERT INTO misc (ID, Name, First, Second) VALUES (1, 'FreeleechPool', '100', '200');
1808 
+INSERT INTO `misc` (`ID`, `Name`, `First`, `Second`) VALUES (1, 'FreeleechPool', '100', '200');
1809 1809
1810 1810 
 -- One last thing: a trigger to update seeding stats
1811 1811 
 DELIMITER ;;
 
@@ -1813,15 +1813,15 @@ CREATE TRIGGER update_seedtime
1813 1813 
   AFTER UPDATE ON `xbt_files_users`
1814 1814 
   FOR EACH ROW BEGIN
1815 1815 
     IF ( (OLD.timespent < NEW.timespent) AND (OLD.active = 1) AND (NEW.active = 1) ) THEN
1816 
-      INSERT INTO users_seedtime
1817 
-        (UserID, TorrentID, SeedTime, Uploaded, Downloaded, LastUpdate)
1816 
+      INSERT INTO `users_seedtime`
1817 
+        (`UserID`, `TorrentID`, `SeedTime`, `Uploaded`, `Downloaded`, `LastUpdate`)
1818 1818 
         VALUES
1819 1819 
         (NEW.uid, NEW.fid, NEW.timespent, NEW.uploaded, NEW.downloaded, NOW())
1820 1820 
         ON DUPLICATE KEY UPDATE
1821 
-          SeedTime = SeedTime + (NEW.timespent - OLD.timespent),
1822 
-          Uploaded = Uploaded + (NEW.uploaded - OLD.uploaded),
1823 
-          Downloaded = Downloaded + (NEW.downloaded - OLD.downloaded),
1824 
-          LastUpdate = NOW();
1821 
+          `SeedTime` = `SeedTime` + (NEW.timespent - OLD.timespent),
1822 
+          `Uploaded` = `Uploaded` + (NEW.uploaded - OLD.uploaded),
1823 
+          `Downloaded` = `Downloaded` + (NEW.downloaded - OLD.downloaded),
1824 
+          `LastUpdate` = NOW();
1825 1825 
     END IF;
1826 1826 
   END;;
1827 1827 
 DELIMITER ;

Write Preview
Loading…
Cancel
Save