Add Romaji titles

classes/requests.class.php

@@ -94,6 +94,7 @@ class Requests {
           LastVote,
           CategoryID,
           Title,
+          TitleRJ,
           TitleJP,
           Image,
           Description,

classes/text.class.php

@@ -736,7 +736,8 @@ class Text {
                 if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
                   $Str .= " onmouseover=\"getCover(event)\" cover=\"".ImageTools::process($Group['WikiImage'], true)."\" onmouseleave=\"ungetCover(event)\"";
                 }
-                $Str .= '>'.$Group['Name'].'</a>';
+                $Name = empty($Group['Name']) ? (empty($Group['NameRJ']) ? $Group['NameJP'] : $Group['NameRJ']) : $Group['Name'];
+                $Str .= '>'.$Name.'</a>';
               } else {
                 $Str .= '[torrent]'.str_replace('[inlineurl]', '', $Block['Val']).'[/torrent]';
               }

classes/torrent_form.class.php

@@ -216,10 +216,14 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
         </td>
       </tr>
       <tr id="title_tr">
-        <td class="label">Title:</td>
+        <td class="label">English Title:</td>
         <td><input type="text" id="title" name="title" size="60" value="<?=display_str($Torrent['Title']) ?>" <?=$this->Disabled?>/></td>
       </tr>
-      <tr>
+      <tr id="title_rj_tr">
+        <td class="label">Romaji Title:</td>
+        <td><input type="text" id="title_rj" name="title_rj" size="60" value="<?=display_str($Torrent['TitleRJ']) ?>" <?=$this->Disabled?>/></td>
+      </tr>
+      <tr id="title_jp_tr">
         <td class="label">Japanese Title:</td>
         <td><input type="text" id="title_jp" name="title_jp" size="60" value="<?=display_str($Torrent['TitleJP']) ?>" <?=$this->Disabled?>/></td>
       </tr>
@@ -474,10 +478,14 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
         </td>
       </tr>
       <tr id="title_tr">
-        <td class="label">Title:</td>
+        <td class="label">English Title:</td>
         <td><input type="text" id="title" name="title" size="60" value="<?=display_str($Torrent['Title']) ?>" <?=$this->Disabled?>/></td>
       </tr>
-      <tr>
+      <tr id="title_rj_tr">
+        <td class="label">Romaji Title:</td>
+        <td><input type="text" id="title_rj" name="title_rj" size="60" value="<?=display_str($Torrent['TitleRJ']) ?>" <?=$this->Disabled?>/></td>
+      </tr>
+      <tr id="title_jp_tr">
         <td class="label">Japanese Title:</td>
         <td><input type="text" id="title_jp" name="title_jp" size="60" value="<?=display_str($Torrent['TitleJP']) ?>" <?=$this->Disabled?>/></td>
       </tr>
@@ -723,10 +731,14 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
         </td>
       </tr>
       <tr id="title_tr">
-        <td class="label">Title:</td>
+        <td class="label">English Title:</td>
         <td><input type="text" id="title" name="title" size="60" value="<?=display_str($Torrent['Title']) ?>" <?=$this->Disabled?> /></td>
       </tr>
-      <tr>
+      <tr id="title_rj_tr">
+        <td class="label">Romaji Title:</td>
+        <td><input type="text" id="title_rj" name="title_rj" size="60" value="<?=display_str($Torrent['TitleRJ']) ?>" <?=$this->Disabled?>/></td>
+      </tr>
+      <tr id="title_jp_tr">
         <td class="label">Japanese Title:</td>
         <td><input type="text" id="title_jp" name="title_jp" size="60" value="<?=display_str($Torrent['TitleJP']) ?>" <?=$this->Disabled?>/></td>
       </tr>
@@ -895,7 +907,11 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
         <td class="label">Title:</td>
         <td><input type="text" id="title" name="title" size="60" value="<?=display_str($Torrent['Title']) ?>" <?=$this->Disabled?> /></td>
       </tr>
-      <tr>
+      <tr id="title_rj_tr">
+        <td class="label">Romaji Title:</td>
+        <td><input type="text" id="title_rj" name="title_rj" size="60" value="<?=display_str($Torrent['TitleRJ']) ?>" <?=$this->Disabled?>/></td>
+      </tr>
+      <tr id="title_jp_tr">
         <td class="label">Japanese Title:</td>
         <td><input type="text" id="title_jp" name="title_jp" size="60" value="<?=display_str($Torrent['TitleJP'])?>" <?=$this->Disabled?>/></td>
       </tr>
@@ -961,10 +977,14 @@ new TEXTAREA_PREVIEW('album_desc', 'album_desc', display_str($Torrent['GroupDesc
 ?>    <table cellpadding="3" cellspacing="1" border="0" class="layout slice" width="100%">
 <?    if ($this->NewTorrent) { ?>
       <tr id="title_tr">
-        <td class="label">Title:</td>
+        <td class="label">English Title:</td>
         <td><input type="text" id="title" name="title" size="60" value="<?=display_str($Torrent['Title'])?>" <?=$this->Disabled?> /></td>
       </tr>
-      <tr>
+      <tr id="title_rj_tr">
+        <td class="label">Romaji Title:</td>
+        <td><input type="text" id="title_rj" name="title_rj" size="60" value="<?=display_str($Torrent['TitleRJ']) ?>" <?=$this->Disabled?>/></td>
+      </tr>
+      <tr id="title_jp_tr">
         <td class="label">Japanese Title:</td>
         <td><input type="text" id="title_jp" name="title_jp" size="60" value="<?=display_str($Torrent['TitleJP'])?>" <?=$this->Disabled?> /></td>
       </tr>

classes/torrents.class.php

@@ -81,7 +81,7 @@ class Torrents {
       $QueryID = G::$DB->get_query_id();
       G::$DB->query("
         SELECT
-          ID, Name, Year, CatalogueNumber, Pages, Studio, Series, DLSiteID, TagList, WikiImage, CategoryID
+          ID, Name, NameRJ, NameJP, Year, CatalogueNumber, Pages, Studio, Series, DLSiteID, TagList, WikiImage, CategoryID
         FROM torrents_group
         WHERE ID IN ($IDs)");
 
@@ -177,6 +177,8 @@ class Torrents {
     return array(
       'GroupID' => $Group['ID'],
       'GroupName' => $Group['Name'],
+      'GroupNameRJ' => $Group['NameRJ'],
+      'GroupNameJP' => $Group['NameJP'],
       'GroupYear' => $Group['Year'],
       'GroupCategoryID' => $Group['CategoryID'],
       'GroupCatalogueNumber' => $Group['CatalogueNumber'],

classes/torrentsearch.class.php

@@ -51,7 +51,9 @@ class TorrentSearch {
     'dlsiteid' => 1,
     'filelist' => 1,
     'groupname' => 1,
+    'groupnamerj' => 1,
     'groupnamejp' => 1,
+    'advgroupname' => 1,
     'language' => 1,
     'media' => 1,
     'resolution' => 1,
@@ -74,7 +76,8 @@ class TorrentSearch {
 
   // Some form field names don't match the ones in the index
   private static $FormsToFields = array(
-    'searchstr' => '(groupname,groupnamejp,artistname,studio,series,dlsiteid,cataloguenumber,yearfulltext)');
+    'searchstr' => '(groupname,groupnamerj,groupnamejp,artistname,studio,series,dlsiteid,cataloguenumber,yearfulltext)',
+    'advgroupname' => '(groupname,groupnamerj,groupnamejp)');
 
   // Specify the operator type to use for fields. Empty key sets the default
   private static $FieldOperators = array(

sections/artist/artist.php

@@ -77,6 +77,7 @@ if (empty($LoggedUser['DisableRequests'])) {
         r.ID,
         r.CategoryID,
         r.Title,
+        r.TitleRJ,
         r.TitleJP,
         r.CatalogueNumber,
         r.DLSiteID,
@@ -212,6 +213,9 @@ foreach ($TorrentList as $Group) {
     if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
       $DisplayName .= 'onmouseover="getCover(event)" cover="'.ImageTools::process($WikiImage, true).'" onmouseleave="ungetCover()" ';
     }
+
+    $GroupName = empty($GroupName) ? (empty($GroupNameRJ) ? $GroupNameJP : $GroupNameRJ) : $GroupName;
+
     $DisplayName .= "dir=\"ltr\">$GroupName</a>";
 
     if ($GroupYear) {
@@ -312,6 +316,8 @@ foreach ($TorrentList as $Group) {
     if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
       $DisplayName .= "onmouseover=\"getCover(event)\" cover=\"".ImageTools::process($WikiImage, true)."\" onmouseleave=\"ungetCover(event)\" ";
     }
+
+    $GroupName = empty($GroupName) ? (empty($GroupNameRJ) ? $GroupNameJP : $GroupNameRJ) : $GroupName;
     $DisplayName .= "dir=\"ltr\">$GroupName</a>";
 
     if ($GroupYear) {
@@ -713,7 +719,7 @@ if ($NumRequests > 0) {
   $Tags = Requests::get_tags(array_keys($Requests));
   foreach ($Requests as $RequestID => $Request) {
       $CategoryName = $Categories[$Request['CategoryID'] - 1];
-      $Title = display_str($Request['Title']);
+      $Title = empty($Request['Title']) ? (empty($Request['TitleRJ']) ? display_str($Request['TitleJP']) : display_str($Request['TitleRJ'])) : display_str($Request['Title']);
       if ($CategoryName != 'Other') {
         $ArtistForm = Requests::get_artists($RequestID);
         $ArtistLink = Artists::display_artists($ArtistForm, true, true);

sections/bookmarks/torrents.php

@@ -72,6 +72,8 @@ foreach ($GroupIDs as $GroupID) {
 
   $DisplayName = Artists::display_artists($Artists);
 
+  $GroupName = empty($GroupName) ? (empty($GroupNameRJ) ? $GroupNameJP : $GroupNameRJ) : $GroupName;
+
   $DisplayName .= '<a href="torrents.php?id='.$GroupID.'" class="tooltip" title="View torrent group" dir="ltr">'.$GroupName.'</a>';
   if ($GroupYear > 0) {
     $DisplayName = "$DisplayName [$GroupYear]";

sections/collages/torrent_collage.php

@@ -74,6 +74,7 @@ foreach ($GroupIDs as $GroupID) {
   if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
     $DisplayName .= 'onmouseover="getCover(event)" cover="'.ImageTools::process($WikiImage, true).'" onmouseleave="ungetCover(event)" ';
   }
+  $GroupName = empty($GroupName) ? (empty($GroupNameRJ) ? $GroupNameJP : $GroupNameRJ) : $GroupName;
   $DisplayName .= "dir=\"ltr\">$GroupName</a>";
   if ($GroupYear > 0) {
     $DisplayName = "$DisplayName [$GroupYear]";

sections/requests/new_edit.php

@@ -33,6 +33,7 @@ if (!$NewRequest) {
     // Define these variables to simplify _GET['groupid'] requests later on
     $CategoryID = $Request['CategoryID'];
     $Title = $Request['Title'];
+    $TitleRJ = $Request['TitleRJ'];
     $TitleJP = $Request['TitleJP'];
     $CatalogueNumber = $Request['CatalogueNumber'];
     $DLsiteID = $Request['DLsiteID'];
@@ -75,6 +76,7 @@ if ($NewRequest && !empty($_GET['artistid']) && is_number($_GET['artistid'])) {
   $DB->query("
     SELECT
       tg.Name,
+      tg.NameRJ,
       tg.NameJP,
       tg.Year,
       tg.Studio,
@@ -88,7 +90,7 @@ if ($NewRequest && !empty($_GET['artistid']) && is_number($_GET['artistid'])) {
       JOIN torrents_tags AS tt ON tt.GroupID = tg.ID
       JOIN tags AS t ON t.ID = tt.TagID
     WHERE tg.ID = ".$_GET['groupid']);
-  if (list($Title, $TitleJP, $Year, $Studio, $Series, $CatalogueNumber, $DLsiteID, $Image, $Tags, $CategoryID) = $DB->next_record()) {
+  if (list($Title, $TitleRJ, $TitleJP, $Year, $Studio, $Series, $CatalogueNumber, $DLsiteID, $Image, $Tags, $CategoryID) = $DB->next_record()) {
     $GroupID = trim($_REQUEST['groupid']);
     $CategoryName = $Categories[$CategoryID - 1];
     $Disabled = 'readonly="readonly"';
@@ -173,10 +175,16 @@ View::show_header(($NewRequest ? 'Create a request' : 'Edit a request'), 'reques
             <input type="text" id="title" name="title" size="45" value="<?=(!empty($Title) ? $Title : '')?>" <?=$Disabled?>/>
           </td>
         </tr>
+        <tr>
+          <td class="label">Romaji Title</td>
+          <td>
+            <input type="text" id="title_rj" name="title_rj" size="45" value="<?=(!empty($TitleRJ) ? $TitleRJ : '')?>" <?=$Disabled?>/>
+          </td>
+        </tr>
         <tr>
           <td class="label">Japanese Title</td>
           <td>
-            <input type="text" id="title_jp" name="title_jp" size="45" value="<?=isset($TitleJP)?$TitleJP:''?>" <?=$Disabled?>/>
+            <input type="text" id="title_jp" name="title_jp" size="45" value="<?=!empty($TitleJP)?$TitleJP:''?>" <?=$Disabled?>/>
           </td>
         </tr>
         <tr id="dlsiteid_tr">

sections/requests/request.php

@@ -27,6 +27,8 @@ if ($Request['CategoryID'] === '0') {
   $CategoryName = $Categories[$Request['CategoryID'] - 1];
 }
 
+$Title = empty($Request['Title']) ? (empty($Request['TitleRJ']) ? $Request['TitleJP'] : $Request['TitleRJ']) : $Request['Title'];
+
 //Do we need to get artists?
 if ($CategoryName != 'Other') {
   $ArtistForm = Requests::get_artists($RequestID);
@@ -34,23 +36,31 @@ if ($CategoryName != 'Other') {
   $ArtistLink = Artists::display_artists($ArtistForm, true, true);
 
   if ($IsFilled) {
-    $DisplayLink = "$ArtistLink<a href=\"torrents.php?torrentid=$Request[TorrentID]\" dir=\"ltr\">$Request[Title]</a>";
+    $DisplayLink = "$ArtistLink<a href=\"torrents.php?torrentid=$Request[TorrentID]\" dir=\"ltr\">$Title</a>";
   } else {
-    $DisplayLink = $ArtistLink.'<span dir="ltr">'.$Request['Title']."</span>";
+    $DisplayLink = $ArtistLink.'<span dir="ltr">'.$Title."</span>";
   }
 
-  $FullName = $ArtistName.$Request['Title'];
+  $FullName = $ArtistName.$Title;
 
 } else {
   if ($IsFilled) {
-    $DisplayLink = "<a href=\"torrents.php?torrentid=$Request[TorrentID]\" dir=\"ltr\">$Request[Title]</a>";
+    $DisplayLink = "<a href=\"torrents.php?torrentid=$Request[TorrentID]\" dir=\"ltr\">$Title</a>";
   } else {
-    $DisplayLink = "<span dir=\"ltr\">$Request[Title]</span>";
+    $DisplayLink = "<span dir=\"ltr\">$Title</span>";
   }
-  $FullName = $Request['Title'];
+  $FullName = $Title;
 }
 
-$Extra = '<br />'.$Request['TitleJP'];
+$Extra = "";
+
+if (!empty($Request['TitleRJ']) && $Request['TitleRJ'] != $Title) {
+  $Extra .= '<br />' . $Request['TitleRJ'];
+}
+
+if (!empty($Request['TitleJP']) && $Request['TitleJP'] != $Title) {
+  $Extra .= '<br />' . $Request['TitleJP'];
+}
 
 if (!empty($Request['CatalogueNumber'])) {
   $Extra .= "<br />[$Request[CatalogueNumber]]";

sections/requests/requests.php

@@ -491,6 +491,8 @@ View::show_header($Title, 'requests');
       $IsFilled = false;
     }
 
+    $Title = empty($Request['Title']) ? (empty($Request['TitleRJ']) ? $Request['TitleJP'] : $Request['TitleRJ']) : $Request['Title'];
+
     if ($CategoryName != 'Other') {
       $ArtistForm = Requests::get_artists($RequestID);
       $ArtistLink = Artists::display_artists($ArtistForm, true, true);
@@ -498,7 +500,7 @@ View::show_header($Title, 'requests');
       if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
         $FullName .= 'onmouseover="getCover(event)" cover="'.ImageTools::process($Request['Image']).'" onmouseleave="ungetCover(event)" ';
       }
-      $FullName .= "dir=\"ltr\">$Request[Title]</span></a>";
+      $FullName .= "dir=\"ltr\">$Title</span></a>";
 
       $ExtraInfo = '';
 
@@ -513,7 +515,7 @@ View::show_header($Title, 'requests');
         $FullName .= " $ExtraInfo";
       }
     } else {
-      $FullName = "<a href=\"requests.php?action=view&amp;id=$RequestID\" dir=\"ltr\">$Request[Title]</a>";
+      $FullName = "<a href=\"requests.php?action=view&amp;id=$RequestID\" dir=\"ltr\">$Title</a>";
     }
     $Tags = $Request['Tags'];
 ?>

sections/requests/take_new_edit.php

@@ -53,15 +53,19 @@ if (empty($CategoryID)) {
   error(0);
 }
 
-if (empty($_POST['title'])) {
-  $Err = 'You forgot to enter the title!';
-} else {
+if (empty($_POST['title']) && empty($_POST['title_rj']) && empty($_POST['title_jp'])) {
+  $Err = 'You must enter at least one title!';
+}
+
+if (!empty($_POST['title'])) {
   $Title = trim($_POST['title']);
 }
 
-if (empty($_POST['title_jp'])) {
-  $Err = 'You forgot to enter the Japanese title!';
-} else {
+if (!empty($_POST['title_rj'])) {
+  $TitleRJ = trim($_POST['title_rj']);
+}
+
+if (!empty($_POST['title_jp'])) {
   $TitleJP = trim($_POST['title_jp']);
 }
 
@@ -240,10 +244,10 @@ if (!isset($GroupID)) $GroupID = '';
 if ($NewRequest) {
   $DB->query('
     INSERT INTO requests (
-      UserID, TimeAdded, LastVote, CategoryID, Title, TitleJP, Image, Description,
+      UserID, TimeAdded, LastVote, CategoryID, Title, TitleRJ, TitleJP, Image, Description,
       CatalogueNumber, DLSiteID, Visible, GroupID)
     VALUES
-      ('.$LoggedUser['ID'].", '".sqltime()."', '".sqltime()."', $CategoryID, '".db_string($Title)."', '".db_string($TitleJP)."', '".db_string($Image)."', '".db_string($Description)."',
+      ('.$LoggedUser['ID'].", '".sqltime()."', '".sqltime()."', $CategoryID, '".db_string($Title)."', '".db_string($TitleRJ)."', '".db_string($TitleJP)."', '".db_string($Image)."', '".db_string($Description)."',
           '".db_string($CatalogueNumber)."', '".db_string($DLSiteID)."', '1', '$GroupID')");
 
   $RequestID = $DB->inserted_id();
@@ -253,6 +257,7 @@ if ($NewRequest) {
     UPDATE requests
     SET CategoryID = $CategoryID,
       Title = '".db_string($Title)."',
+      TitleRJ = '".db_string($TitleRJ)."',
       TitleJP = '".db_string($TitleJP)."',
       Image = '".db_string($Image)."',
       Description = '".db_string($Description)."',
@@ -409,12 +414,12 @@ if ($NewRequest) {
     WHERE ID = ".$LoggedUser['ID']);
   $Cache->delete_value('user_stats_'.$LoggedUser['ID']);
 
-
+  $AnnounceTitle = empty($Title) ? (empty($TitleRJ) ? $TitleJP : $TitleRJ) : $Title;
 
   if ($CategoryName != 'Other') {
-    $Announce = "\"$Title\"".(isset($ArtistForm)?(' - '.Artists::display_artists($ArtistForm, false, false)):'').' '.site_url()."requests.php?action=view&id=$RequestID - ".implode(' ', $Tags);
+    $Announce = "\"$AnnounceTitle\"".(isset($ArtistForm)?(' - '.Artists::display_artists($ArtistForm, false, false)):'').' '.site_url()."requests.php?action=view&id=$RequestID - ".implode(' ', $Tags);
   } else {
-    $Announce = "\"$Title\" - ".site_url()."requests.php?action=view&id=$RequestID - ".implode(' ', $Tags);
+    $Announce = "\"$AnnounceTitle\" - ".site_url()."requests.php?action=view&id=$RequestID - ".implode(' ', $Tags);
   }
   send_irc('PRIVMSG '.BOT_REQUEST_CHAN.' '.$Announce);
 

sections/top10/torrents.php

@@ -153,6 +153,8 @@ $BaseQuery = '
     t.ID,
     g.ID,
     g.Name,
+    g.NameRJ,
+    g.NameJP,
     g.CategoryID,
     g.WikiImage,
     g.TagList,
@@ -447,7 +449,7 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) {
   $Artists = Artists::get_artists($GroupIDs);
 
   foreach ($Details as $Detail) {
-    list($TorrentID, $GroupID, $GroupName, $GroupCategoryID, $WikiImage, $TagsList,
+    list($TorrentID, $GroupID, $GroupName, $GroupNameRJ, $GroupNameJP, $GroupCategoryID, $WikiImage, $TagsList,
       $Media, $Year, $Snatched, $Seeders, $Leechers, $Data, $Size) = $Detail;
 
     $IsBookmarked = Bookmarks::has_bookmarked('torrent', $GroupID);
@@ -466,7 +468,10 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) {
     if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
       $DisplayName .= 'onmouseover="getCover(event)" cover="'.ImageTools::process($WikiImage, true).'" onmouseleave="ungetCover()" ';
     }
-    $DisplayName .= "dir=\"ltr\">$GroupName</a>";
+
+
+    $Name = empty($GroupName) ? (empty($GroupNameRJ) ? $GroupNameJP : $GroupNameRJ) : $GroupName;
+    $DisplayName .= "dir=\"ltr\">$Name</a>";
 
     // append extra info to torrent title
     $ExtraInfo = '';

sections/torrents/browse.php

@@ -179,7 +179,7 @@ View::show_header('Browse Torrents', 'browse');
         <tr id="album_torrent_name" class="ftr_advanced<?=$HideAdvanced?>">
           <td class="label"><!--Torrent name:--></td>
           <td colspan="3" class="ft_groupname">
-            <input type="search" spellcheck="false" size="65" name="groupname" class="inputtext smaller fti_advanced" placeholder="Torrent name" value="<?Format::form('groupname')?>" />
+            <input type="search" spellcheck="false" size="65" name="advgroupname" class="inputtext smaller fti_advanced" placeholder="Torrent name" value="<?Format::form('advgroupname')?>" />
           </td>
         </tr>
         <tr id="catalogue_number" class="ftr_advanced<?=$HideAdvanced?>">
@@ -482,7 +482,7 @@ View::show_header('Browse Torrents', 'browse');
   $GroupPages = $GroupInfo['Pages'];
   $GroupStudio = $GroupInfo['Studio'];
   $GroupDLsiteID = $GroupInfo['DLSiteID'];
-  $GroupName = $GroupInfo['Name'];
+  $GroupName = empty($GroupInfo['Name']) ? (empty($GroupInfo['NameRJ']) ? $GroupInfo['NameJP'] : $GroupInfo['NameRJ']) : $GroupInfo['Name'];
   if ($GroupResults) {
     $Torrents = $GroupInfo['Torrents'];
     $GroupTime = $MaxSize = $TotalLeechers = $TotalSeeders = $TotalSnatched = 0;

sections/torrents/details.php

@@ -21,11 +21,19 @@ $TorrentDetails = $TorrentCache[0];
 $TorrentList = $TorrentCache[1];
 
 // Group details
-list($WikiBody, $WikiImage, $GroupID, $GroupName, $GroupNameJP, $GroupYear,
+list($WikiBody, $WikiImage, $GroupID, $GroupName, $GroupNameRJ, $GroupNameJP, $GroupYear,
   $GroupStudio, $GroupSeries, $GroupCatalogueNumber, $GroupPages, $GroupCategoryID,
   $GroupDLsiteID, $GroupTime, $TorrentTags, $TorrentTagIDs, $TorrentTagUserIDs,
   $TagPositiveVotes, $TagNegativeVotes, $Screenshots, $GroupFlags) = array_values($TorrentDetails);
 
+if (!$GroupName) {
+  if (!$GroupNameRJ) {
+    $GroupName = $GroupNameJP;
+  } else {
+    $GroupName = $GroupNameRJ;
+  }
+}
+
 $DisplayName = "<span dir=\"ltr\">$GroupName</span><br />";
 $AltName = $GroupName; // Goes in the alt text of the image
 $Title = $GroupName; // goes in <title>
@@ -33,6 +41,10 @@ $WikiBody = Text::full_format($WikiBody);
 
 $Artists = Artists::get_artist($GroupID);
 
+if ($GroupNameRJ && $GroupNameRJ != $GroupName) {
+  $DisplayName .= "<span dir=\"ltr\">$GroupNameRJ</span><br />";
+}
+
 if ($GroupNameJP && $GroupNameJP != $GroupName) {
   $DisplayName .= "<span dir=\"ltr\">$GroupNameJP</span><br />";
 }

sections/torrents/editgroup.php

@@ -40,6 +40,7 @@ $DB->query("
 $DB->query("
   SELECT
     tg.Name,
+    tg.NameRJ,
     tg.NameJP,
     wt.Image,
     wt.Body,
@@ -59,7 +60,7 @@ $DB->query("
 if (!$DB->has_results()) {
   error(404);
 }
-list($Name, $NameJP, $Image, $Body, $WikiImage, $WikiBody, $Year, $Studio, $Series, $DLsiteID, $CatalogueNumber, $Pages, $CategoryID, $DLsiteID) = $DB->next_record();
+list($Name, $NameRJ, $NameJP, $Image, $Body, $WikiImage, $WikiBody, $Year, $Studio, $Series, $DLsiteID, $CatalogueNumber, $Pages, $CategoryID, $DLsiteID) = $DB->next_record();
 
 $DB->query("
   SELECT
@@ -296,11 +297,17 @@ if ($CategoryID != 5) { ?>
           <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
           <input type="hidden" name="groupid" value="<?=$GroupID?>" />
           <tr>
-            <td class="label">Title: </td>
+            <td class="label">English Title: </td>
             <td>
               <input type="text" name="name" size="70" value="<?=$Name?>" />
             </td>
           </tr>
+          <tr>
+            <td class="label">Romaji Title: </td>
+            <td>
+              <input type="text" name="namerj" size="70" value="<?=$NameRJ?>" />
+            </td>
+          </tr>
           <tr>
             <td class="label">Japanese Title: </td>
             <td>

sections/torrents/functions.php

@@ -22,6 +22,7 @@ function get_group_info($GroupID, $Return = true, $RevisionID = 0, $PersonalProp
     $SQL .= "
         g.ID,
         g.Name,
+        g.NameRJ,
         g.NameJP,
         g.Year,
         g.Studio,

sections/torrents/rename.php

@@ -4,6 +4,7 @@ authorize();
 $GroupID = $_POST['groupid'];
 $OldGroupID = $GroupID;
 $NewName = $_POST['name'];
+$NewRJ = $_POST['namerj'];
 $NewJP = $_POST['namejp'];
 
 $DB->query("
@@ -17,30 +18,43 @@ if (!$GroupID || !is_number($GroupID)) {
   error(404);
 }
 
-if (empty($NewName) || empty($NewJP)) {
-  error('Torrent groups must have a name');
-}
-
 if (!($Contributed || check_perms('torrents_edit'))) {
   error(403);
 }
 
-$DB->query("
-  SELECT Name
-  FROM torrents_group
-  WHERE ID = $GroupID");
-list($OldName) = $DB->next_record(MYSQLI_NUM, false);
+if (empty($NewName) && empty($NewRJ) && empty($NewJP)) {
+  error('Torrent groups must have a name');
+}
 
 $DB->query("
   UPDATE torrents_group
   SET Name = '".db_string($NewName)."',
+  NameRJ = '".db_string($NewRJ)."',
   NameJP = '".db_string($NewJP)."'
   WHERE ID = '$GroupID'");
 $Cache->delete_value("torrents_details_$GroupID");
 
 Torrents::update_hash($GroupID);
 
-Misc::write_log("Torrent Group $GroupID ($OldName) was renamed to \"$NewName\" from \"$OldName\" by ".$LoggedUser['Username']);
-Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "renamed to \"$NewName\" from \"$OldName\"", 0);
+$DB->query("
+  SELECT Name, NameRJ, NameJP
+  FROM torrents_group
+  WHERE ID = $GroupID");
+list($OldName, $OldRJ, $OldJP) = $DB->next_record(MYSQLI_NUM, false);
+
+if ($OldName != $NewName) {
+  Misc::write_log("Torrent Group $GroupID ($OldName)'s title was changed to \"$NewName\" from \"$OldName\" by ".$LoggedUser['Username']);
+  Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "title changed to \"$NewName\" from \"$OldName\"", 0);
+}
+
+if ($OldRJ != $NewRJ) {
+  Misc::write_log("Torrent Group $GroupID ($OldRJ)'s romaji title was changed to \"$NewRJ\" from \"$OldRJ\" by ".$LoggedUser['Username']);
+  Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "romaji title changed to \"$NewRJ\" from \"$OldRJ\"", 0);
+}
+
+if ($OldJP != $NewJP) {
+  Misc::write_log("Torrent Group $GroupID ($OldJP)'s japanese title was changed to \"$NewJP\" from \"$OldJP\" by ".$LoggedUser['Username']);
+  Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "japanese title changed to \"$NewJP\" from \"$OldJP\"", 0);
+}
 
 header("Location: torrents.php?id=$GroupID");

sections/torrents/user.php

@@ -515,6 +515,7 @@ foreach ($Categories as $CatKey => $CatName) {
     if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
       $DisplayName .= 'onmouseover="getCover(event)" cover="'.ImageTools::process($WikiImage).'" onmouseleave="ungetCover()" ';
     }
+    $GroupName = empty($GroupName) ? (empty($GroupNameRJ) ? $GroupNameJP : $GroupNameRJ) : $GroupName;
     $DisplayName .= 'dir="ltr">'.$GroupName.'</a>';
     if ($GroupYear) {
       $DisplayName .= " [$GroupYear]";

sections/upload/upload_handle.php

@@ -38,6 +38,7 @@ $Type = $Categories[(int)$_POST['type']];
 $TypeID = $_POST['type'] + 1;
 $Properties['CategoryName'] = $Type;
 $Properties['Title'] = $_POST['title'];
+$Properties['TitleRJ'] = $_POST['title_rj'];
 $Properties['TitleJP'] = $_POST['title_jp'];
 $Properties['Year'] = $_POST['year'];
 
@@ -145,12 +146,12 @@ switch ($Type) {
   default:
     if (!isset($_POST['groupid']) || !$_POST['groupid']) {
       $Validate->SetFields('title',
-        '1','string','Title must be between 1 and 200 characters.', array('maxlength'=>200, 'minlength'=>1));
+        '0','string','Title must be between 1 and 300 characters.', array('maxlength'=>300, 'minlength'=>1));
+      $Validate->SetFields('title_rj',
+        '0','string', 'Romaji Title must be between 1 and 300 characters.', array('maxlength'=>300, 'minlength'=>1));
 
-    if (isset($_POST['title_jp'])) {
       $Validate->SetFields('title_jp',
-        '1','string','Japanese Title must be between 1 and 512 bytes.', array('maxlength'=>512, 'minlength'=>1));
-    }
+        '0','string','Japanese Title must be between 1 and 512 bytes.', array('maxlength'=>512, 'minlength'=>1));
 
       $Validate->SetFields('tags',
         '1','string','You must enter at least five tag. Maximum length is 1500 characters.', array('maxlength'=>1500, 'minlength'=>2));
@@ -174,6 +175,10 @@ if (count(explode(',', $Properties['TagList'])) < 5) {
   $Err = 'You must enter at least 5 tags.';
 }
 
+if (!(isset($_POST['title']) || isset($_POST['title_rj']) || isset($_POST['title_jp']))) {
+  $Err = 'You must enter at least one title.';
+}
+
 $File = $_FILES['file_input']; // This is our torrent file
 $TorrentName = $File['tmp_name'];
 
@@ -448,9 +453,9 @@ if (!isset($GroupID) || !$GroupID) {
   // Create torrent group
   $DB->query("
     INSERT INTO torrents_group
-      (CategoryID, Name, NameJP, Year, Series, Studio, CatalogueNumber, Pages, Time, WikiBody, WikiImage, DLsiteID)
+      (CategoryID, Name, NameRJ, NameJP, Year, Series, Studio, CatalogueNumber, Pages, Time, WikiBody, WikiImage, DLsiteID)
     VALUES
-      ($TypeID, ".$T['Title'].", ".$T['TitleJP'].", ".$T['Year'].", ".$T['Series'].", ".$T['Studio'].", ".$T['CatalogueNumber'].", " . $T['Pages'] . ", '".sqltime()."', '".db_string($Body)."', ".$T['Image'].", ".$T['DLsiteID'].")");
+      ($TypeID, ".$T['Title'].", ".$T['TitleRJ'].", ".$T['TitleJP'].", ".$T['Year'].", ".$T['Series'].", ".$T['Studio'].", ".$T['CatalogueNumber'].", " . $T['Pages'] . ", '".sqltime()."', '".db_string($Body)."', ".$T['Image'].", ".$T['DLsiteID'].")");
   $GroupID = $DB->inserted_id();
   if ($Type == 'Movies' || $Type == 'Anime' || $Type == 'Manga' || $Type == 'Games') {
     foreach ($ArtistForm as $Num => $Artist) {
@@ -696,7 +701,8 @@ $Announce = '';
 if ($Type != 'Other') {
   $Announce .= Artists::display_artists($ArtistForm, false);
 }
-$Announce .= trim($Properties['Title']).' ';
+$Announce .= empty($Properties['Title']) ? (empty($Properties['TitleRJ']) ? trim($Properties['TitleJP']) : trim($Properties['TitleRJ'])) : trim($Properties['Title']);
+$Announce .= ' ';
 if ($Type != 'Other') {
   $Announce .= '['.Torrents::torrent_info($Properties, false, false, false).']';
 }

sections/user/user.php

@@ -690,6 +690,8 @@ if (check_paranoia_here('snatched')) {
       SELECT
         g.ID,
         g.Name,
+        g.NameRJ,
+        g.NameJP,
         g.WikiImage
       FROM xbt_snatched AS s
         INNER JOIN torrents AS t ON t.ID = s.fid
@@ -715,10 +717,12 @@ if (check_paranoia_here('snatched')) {
       <span style="float: right;"><a onclick="$('#recent_snatches_images').gtoggle(); this.innerHTML = (this.innerHTML == 'Hide' ? 'Show' : 'Hide'); wall('#recent_snatches_images', '.collage_image', [2,3]); return false;" class="brackets">Show</a></span>&nbsp;
     </div>
     <div id="recent_snatches_images" class="collage_images hidden">
-<?    foreach ($RecentSnatches as $RS) { ?>
+<?    foreach ($RecentSnatches as $RS) {
+        $RSName = empty($RS['Name']) ? (empty($RS['NameRJ']) ? $RS['NameJP'] : $RS['NameRJ']) : $RS['Name'];
+ ?>
       <div style='width: 100px;' class='collage_image' >
         <a href="torrents.php?id=<?=$RS['ID']?>">
-          <img class="tooltip" title="<?=display_str($RS['Artist'])?><?=display_str($RS['Name'])?>" src="<?=ImageTools::process($RS['WikiImage'], true)?>" alt="<?=display_str($RS['Artist'])?><?=display_str($RS['Name'])?>" width="100%" />
+          <img class="tooltip" title="<?=display_str($RS['Artist'])?><?=display_str($RSName)?>" src="<?=ImageTools::process($RS['WikiImage'], true)?>" alt="<?=display_str($RS['Artist'])?><?=display_str($RSName)?>" width="100%" />
         </a>
       </div>
 <?    } ?>
@@ -735,6 +739,8 @@ if (check_paranoia_here('uploads')) {
       SELECT
         g.ID,
         g.Name,
+        g.NameRJ,
+        g.NameJP,
         g.WikiImage
       FROM torrents_group AS g
         INNER JOIN torrents AS t ON t.GroupID = g.ID
@@ -758,10 +764,12 @@ if (check_paranoia_here('uploads')) {
       <span style="float: right;"><a onclick="$('#recent_uploads_images').gtoggle(); this.innerHTML = (this.innerHTML == 'Hide' ? 'Show' : 'Hide'); wall('#recent_uploads_images', '.collage_image', [2,3]); return false;" class="brackets">Show</a></span>&nbsp;
     </div>
     <div id="recent_uploads_images" class="collage_images hidden">
-<?    foreach ($RecentUploads as $RU) { ?>
+<?    foreach ($RecentUploads as $RU) {
+        $RUName = empty($RU['Name']) ? (empty($RU['NameRJ']) ? $RU['NameJP'] : $RU['NameRJ']) : $RU['Name'];
+?>
       <div style='width: 100px;' class='collage_image' >
         <a href="torrents.php?id=<?=$RU['ID']?>">
-          <img class="tooltip" title="<?=$RU['Artist']?><?=$RU['Name']?>" src="<?=ImageTools::process($RU['WikiImage'], true)?>" alt="<?=$RU['Artist']?><?=$RU['Name']?>" width="100%" />
+          <img class="tooltip" title="<?=$RU['Artist']?><?=$RUName?>" src="<?=ImageTools::process($RU['WikiImage'], true)?>" alt="<?=$RU['Artist']?><?=$RUName?>" width="100%" />
         </a>
       </div>
 <?    } ?>
@@ -912,6 +920,8 @@ if (empty($LoggedUser['DisableRequests']) && check_paranoia_here('requestsvoted_
       } elseif ($CategoryName == 'Audiobooks' || $CategoryName == 'Comedy') {
         $FullName = "<a href=\"requests.php?action=view&amp;id=$RequestID\">$Request[Title] [$Request[Year]]</a>";
       } else {
+        if (!$Request['Title']) { $Request['Title'] = $Request['TitleRJ']; }
+        if (!$Request['Title']) { $Request['Title'] = $Request['TitleJP']; }
         $FullName = "<a href=\"requests.php?action=view&amp;id=$RequestID\">$Request[Title]</a>";
       }
 ?>