diff --git a/html/catalog/config.php b/html/catalog/config.php
index a47cbc9..a19bf84 100644
--- a/html/catalog/config.php
+++ b/html/catalog/config.php
@@ -36,8 +36,8 @@ if(isset($_GET['id']))
$itemrender = getAssetRender($id);
//...
- //only allow shirts, pants and t shirts to be modified by the end user
- if ($itemtypeint == 2 or $itemtypeint == 11 or $itemtypeint == 12 or $user->isOwner())
+ //only allow shirts, pants, t shirts and audios to be modified by the end user
+ if ($itemtypeint == 2 or $itemtypeint == 11 or $itemtypeint == 12 or $itemtypeint == 3 or $user->isOwner())
{
//handle onsale checkbox
$onsalestatus = "";
@@ -83,7 +83,7 @@ if(isset($_GET['id']))
$alert = "
Item description too short, must be over 3 characters
";
}
*/
- elseif(strlen($_POST['item_price']) < 1)
+ elseif(strlen($_POST['item_price']) < 1 && $itemtypeint != 3) // no audios
{
$alert = "
Item price too short, must be at least 1 character
";
}
@@ -95,11 +95,11 @@ if(isset($_GET['id']))
{
$alert = "
Item description too long, must be under 1k characters
";
}
- elseif(strlen($_POST['item_price']) > 8)
+ elseif(strlen($_POST['item_price']) > 8 && $itemtypeint != 3) // no audios
{
$alert = "
Item price too short, must be under 8 characters
";
}
- elseif($_POST['item_price'] < $minimumprice)
+ elseif($_POST['item_price'] < $minimumprice && $itemtypeint != 3) // no audios
{
$alert = "
{$pricealert}
";
}
@@ -124,12 +124,15 @@ if(isset($_GET['id']))
$c->execute();
// ...
- //update item price
- $c = $pdo->prepare("UPDATE assets SET PriceInAlphabux = :n, Updated = UNIX_TIMESTAMP() WHERE id = :i");
- $c->bindParam(":n", $_POST['item_price'], PDO::PARAM_INT); //item price
- $c->bindParam(":i", $id, PDO::PARAM_INT); //catalog id
- $c->execute();
- // ...
+ if($itemtypeint != 3) // Audios
+ {
+ //update item price
+ $c = $pdo->prepare("UPDATE assets SET PriceInAlphabux = :n, Updated = UNIX_TIMESTAMP() WHERE id = :i");
+ $c->bindParam(":n", $_POST['item_price'], PDO::PARAM_INT); //item price
+ $c->bindParam(":i", $id, PDO::PARAM_INT); //catalog id
+ $c->execute();
+ // ...
+ }
if (isset($_POST['onsale_checkbox']))
{
@@ -164,7 +167,7 @@ if(isset($_GET['id']))
}
elseif (isset($_POST['RegenItem'])) //for admin regen stuff
{
- if ($user->IsStaff())
+ if ($user->IsStaff() && $itemtypeint != 3) // Staff and not audio
{
$script = "";
$scripttype = "";
@@ -333,9 +336,25 @@ else
$moderatebutton = '';
$regenbutton = '';
+$itempricebutton = '';
+$itemimage = '';
+if($itemtypeint != 3) {
+ $itempricebutton = '
';
+}
+
+$itemimage = '
) . ')
';
+
if ($user->IsStaff())
{
- $regenbutton = '
';
+ if($itemtypeint != 3) {
+ $regenbutton = '
';
+ }
+
$moderatebutton = '
';
}
@@ -355,7 +374,7 @@ $body = <<
@@ -367,12 +386,7 @@ $body = <<{$itemtype} Description
-
+ {$itempricebutton}
{$moderatebutton}
{$regenbutton}
diff --git a/html/catalog/view.php b/html/catalog/view.php
index c6a7dd9..7905a12 100644
--- a/html/catalog/view.php
+++ b/html/catalog/view.php
@@ -37,6 +37,7 @@ if(isset($_GET['id']))
$itemrender = getAssetRender($id);
$ownerrender = getPlayerRender($i->CreatorId);
$itemtypeint = $i->AssetTypeId;
+ $approved = $i->IsApproved;
$description = '';
//handle item descriptions
@@ -148,7 +149,11 @@ EOT;
'.$configbutton_html.'
-
+ '.
+ ($itemtypeint == 3 && $approved ?
+ '
' :
+ '
')
+ .'
Item Description
diff --git a/html/create/index.php b/html/create/index.php
index 6067688..0566748 100644
--- a/html/create/index.php
+++ b/html/create/index.php
@@ -13,6 +13,7 @@ $alert = '';
$cosmuploadsuccess = $_GET['cosSuccess'];
$placesuccess = $_GET['placeSuccess'];
$pbssuccess = $_GET['pbsSuccess'];
+$audsuccess = $_GET['audSuccess'];
//dont want to be posting same data after refresh (ghetto until JS implementation)
if ($cosmuploadsuccess)
@@ -27,6 +28,10 @@ if ($pbssuccess)
{
$alert = "
Created Personal Server
";
}
+if ($audsuccess)
+{
+ $alert = "
Created audio
";
+}
function uploadCosmetic()
{
@@ -230,6 +235,111 @@ function uploadCosmetic()
return true;
}
+function uploadSound()
+{
+ //upload directories
+ $uploadDirectory = $GLOBALS['assetCDNPath']; //directory where the assets are stored
+
+ //allowed image types
+ $types = array('audio/mp3', 'audio/mpeg', 'audio/ogg');
+
+ //generate new hashes
+ $audHash = genAssetHash(16);
+
+ //post variables
+ $audio = $_FILES['audio_file']['tmp_name'];
+ $name = $_POST['audio_name'];
+ $description = $_POST['audio_desc'];
+
+ //variables used for checks
+ $price = 0;
+ $assettype = 3;
+ $minimumprice = 10;
+ $isapproved = false;
+ $onsale = false;
+
+ //time for a lot of checks
+
+ //onsale
+ if (isset($_POST['aud_onsale_checkbox']))
+ {
+ $onsale = true;
+ }
+
+ //check if audio is posted
+ if (!file_exists($audio) || !is_uploaded_file($audio))
+ {
+ return "Please provide an audio";
+ }
+
+ //verify that its a valid .mp3 or .ogg via mimetype
+ $type = finfo_file(finfo_open(FILEINFO_MIME_TYPE), $audio);
+ if (!in_array($type, $types))
+ {
+ return "Invalid audio, must be mp3 or ogg";
+ }
+
+ //name checks
+ if (strlen($name) > 50)
+ {
+ return "Provided name is too long";
+ }
+
+ if (strlen($name) < 3)
+ {
+ return "Provided name is too short";
+ }
+
+ //description check
+ if (strlen($description) > 1000)
+ {
+ return "Provided description too long";
+ }
+
+ //remove currency
+ if (!EconomyHelper::RemoveAlphabux($minimumprice, $GLOBALS['user']->id, "Creation of audio name ".$name))
+ {
+ return "You don't have enough currency";
+ }
+
+ //POINT OF NO RETURN, ALL CHECKS PASSED
+
+ //setup the new asset in the DB, lock it!
+ $GLOBALS['pdo']->exec("LOCK TABLES assets WRITE"); //lock since this stuff is sensitive
+
+ $b = $GLOBALS['pdo']->prepare("SELECT * FROM assets");
+ $b->execute();
+
+ //grab auto increment values
+ $autoincrement = $b->rowCount() + 1; //initial auto increment value
+ $autoincrement2 = $autoincrement+1; //initial auto increment value + 1
+
+ //add XML (selected type) to assets
+ $m = $GLOBALS['pdo']->prepare("INSERT INTO `assets`(`id`, `AssetTypeId`, `Name`, `Description`, `Created`, `Updated`, `CreatorId`, `TargetId`, `PriceInAlphabux`, `Sales`, `IsNew`, `IsForSale`, `IsPublicDomain`, `IsLimited`, `IsLimitedUnique`, `IsApproved`, `Remaining`, `MinimumMembershipLevel`, `ContentRatingTypeId`, `Favorited`, `Visited`, `MaxPlayers`, `UpVotes`, `DownVotes`, `Hash`) VALUES (:aid,:atid,:aname,:adesc,UNIX_TIMESTAMP(),UNIX_TIMESTAMP(),:oid,:aid2,:price,0,0,:onsale,1,0,0,:ia,0,0,0,0,0,8,0,0,:hash)");
+ $m->bindParam(":aid", $autoincrement, PDO::PARAM_INT);
+ $m->bindParam(":atid", $assettype, PDO::PARAM_INT);
+ $m->bindParam(":aname", $name, PDO::PARAM_STR);
+ $m->bindParam(":adesc", $description, PDO::PARAM_STR);
+ $m->bindParam(":oid", $GLOBALS['user']->id, PDO::PARAM_STR);
+ $m->bindParam(":aid2", $autoincrement, PDO::PARAM_INT);
+ $m->bindParam(":ia", $isapproved, PDO::PARAM_INT);
+ $m->bindParam(":price", $price, PDO::PARAM_INT);
+ $m->bindParam(":onsale", $onsale, PDO::PARAM_INT);
+ $m->bindParam(":hash", $audHash, PDO::PARAM_STR);
+ $m->execute();
+
+ //unlock since we are done with sensitive asset stuff
+ $GLOBALS['pdo']->exec("UNLOCK TABLES");
+
+ //give the creator the asset
+ Asset::GiveAsset($autoincrement, $GLOBALS['user']->id, $GLOBALS['user']->id);
+
+ //upload audio to assets
+ move_uploaded_file($audio, $uploadDirectory . $audHash);
+
+ return true;
+}
+
function newPlace()
{
//upload parameters
@@ -375,6 +485,19 @@ if (isset($_POST['SubmitAsset']))
}
}
+if (isset($_POST['SubmitAudio']))
+{
+ $upload = uploadSound();
+ if ($upload !== true)
+ {
+ $alert = "
" . $upload . "
";
+ }
+ else
+ {
+ WebContextManager::Redirect('/create?audSuccess=true');
+ }
+}
+
if (isset($_POST['SubmitPlace']))
{
@@ -401,6 +524,7 @@ if (isset($_POST['SubmitPlace']))
';
+ html +='[assetTypeToThumb]';
html +='{name}';
html +='';
html +='';
diff --git a/html/MCP/pendingassets.php b/html/MCP/pendingassets.php
index 9bd3c7c..0b069d3 100644
--- a/html/MCP/pendingassets.php
+++ b/html/MCP/pendingassets.php
@@ -66,7 +66,10 @@ foreach($assets as $asset)
$desc = cleanOutputNoFilter($asset['Description']); //description of the game
$creatorname = getUsername($creatorid); //creator of the game username
$image = "";
- if ($assettypeid == 2|| $assettypeid == 11 || $assettypeid == 12) { //tshirts, shirts and pants
+ if ($assettypeid == 3) { //audio
+ $image = getAssetFromAsset($assetid);
+ }
+ elseif ($assettypeid == 2|| $assettypeid == 11 || $assettypeid == 12) { //tshirts, shirts and pants
$image = getSPTCosmeticTexture($assetid);
} else {
$image = getImageFromAsset($assetid); //anything else probably
diff --git a/html/Studio/IDE/UploadModel.php b/html/Studio/IDE/UploadModel.php
index 3b05d0e..a45405b 100644
--- a/html/Studio/IDE/UploadModel.php
+++ b/html/Studio/IDE/UploadModel.php
@@ -30,7 +30,7 @@ $body = <<