Only include and construct OpenSim when needed
parent
c9cad23e2c
commit
08f29758c0
|
@ -15,13 +15,15 @@
|
||||||
|
|
||||||
echo '<table style="width:350px;margin-left:auto;margin-right:auto;margin-top:25px"><tr><th align="left" style="background-color: #FF8000;">Name</th><th align="left" style="background-color: #FF8000;">Region</th></tr>';
|
echo '<table style="width:350px;margin-left:auto;margin-right:auto;margin-top:25px"><tr><th align="left" style="background-color: #FF8000;">Name</th><th align="left" style="background-color: #FF8000;">Region</th></tr>';
|
||||||
$entryColor = TRUE;
|
$entryColor = TRUE;
|
||||||
|
include '../app/OpenSim.php';
|
||||||
|
$opensim = new OpenSim();
|
||||||
while($row = $statement->fetch())
|
while($row = $statement->fetch())
|
||||||
{
|
{
|
||||||
if($entryColor == TRUE)
|
if($entryColor == TRUE)
|
||||||
$entry = '<tr style="background-color: #F2F2F2;"><td>'.trim($RUNTIME['OPENSIM']->getUserName($row['UserID'])).'</td><td>'.$RUNTIME['OPENSIM']->getRegionName($row['RegionID']).'</td></tr>';
|
$entry = '<tr style="background-color: #F2F2F2;"><td>'.trim($opensim->getUserName($row['UserID'])).'</td><td>'.$opensim->getRegionName($row['RegionID']).'</td></tr>';
|
||||||
|
|
||||||
if($entryColor == FALSE)
|
if($entryColor == FALSE)
|
||||||
$entry = '<tr style="background-color: #E6E6E6;"><td>'.trim($RUNTIME['OPENSIM']->getUserName($row['UserID'])).'</td><td>'.$RUNTIME['OPENSIM']->getRegionName($row['RegionID']).'</td></tr>';
|
$entry = '<tr style="background-color: #E6E6E6;"><td>'.trim($opensim->getUserName($row['UserID'])).'</td><td>'.$opensim->getRegionName($row['RegionID']).'</td></tr>';
|
||||||
|
|
||||||
echo $entry;
|
echo $entry;
|
||||||
$entryColor = !$entryColor;
|
$entryColor = !$entryColor;
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
|
include '../app/OpenSim.php';
|
||||||
|
$opensim = new OpenSim();
|
||||||
|
|
||||||
$HTML = new HTML();
|
$HTML = new HTML();
|
||||||
$HTML->setHTMLTitle("Spalsh");
|
$HTML->setHTMLTitle("Spalsh");
|
||||||
$HTML->importHTML("style/viewerWelcomeSite/default.html");
|
$HTML->importHTML("style/viewerWelcomeSite/default.html");
|
||||||
|
@ -26,7 +29,7 @@
|
||||||
$HTML->ReplaceSeitenInhalt("%%SHOWNEWS%%", $RUNTIME['GRID']['MAIN_NEWS']);
|
$HTML->ReplaceSeitenInhalt("%%SHOWNEWS%%", $RUNTIME['GRID']['MAIN_NEWS']);
|
||||||
|
|
||||||
|
|
||||||
$HTML->ReplaceSeitenInhalt("%%SHOWSTATS%%", "Registrierte User: ".$RUNTIME['OPENSIM']->getUserCount()."<br>Regionen: ".$RUNTIME['OPENSIM']->getRegionCount()."<br>Aktuell Online: ".($RUNTIME['OPENSIM']->getOnlineCount()-1));
|
$HTML->ReplaceSeitenInhalt("%%SHOWSTATS%%", "Registrierte User: ".$opensim->getUserCount()."<br>Regionen: ".$opensim->getRegionCount()."<br>Aktuell Online: ".($opensim->getOnlineCount()-1));
|
||||||
|
|
||||||
|
|
||||||
$HTML->build();
|
$HTML->build();
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
|
include '../app/OpenSim.php';
|
||||||
|
$opensim = new OpenSim();
|
||||||
|
|
||||||
$statement = $RUNTIME['PDO']->prepare("CREATE TABLE IF NOT EXISTS `iarstates` (`userID` VARCHAR(36) NOT NULL COLLATE 'utf8_unicode_ci', `filesize` BIGINT(20) NOT NULL DEFAULT '0', `iarfilename` VARCHAR(64) NOT NULL COLLATE 'utf8_unicode_ci', `running` INT(1) NOT NULL DEFAULT '0', PRIMARY KEY (`userID`) USING BTREE) COLLATE='utf8_unicode_ci' ENGINE=InnoDB;");
|
$statement = $RUNTIME['PDO']->prepare("CREATE TABLE IF NOT EXISTS `iarstates` (`userID` VARCHAR(36) NOT NULL COLLATE 'utf8_unicode_ci', `filesize` BIGINT(20) NOT NULL DEFAULT '0', `iarfilename` VARCHAR(64) NOT NULL COLLATE 'utf8_unicode_ci', `running` INT(1) NOT NULL DEFAULT '0', PRIMARY KEY (`userID`) USING BTREE) COLLATE='utf8_unicode_ci' ENGINE=InnoDB;");
|
||||||
$statement->execute();
|
$statement->execute();
|
||||||
|
|
||||||
|
@ -7,11 +10,11 @@
|
||||||
|
|
||||||
if($row = $statement->fetch())
|
if($row = $statement->fetch())
|
||||||
{
|
{
|
||||||
$email = $RUNTIME['OPENSIM']->getUserMail($row['userID']);
|
$email = $opensim->getUserMail($row['userID']);
|
||||||
|
|
||||||
$fullFilePath = "/var/www/html/data/".$row['iarfilename'];
|
$fullFilePath = "/var/www/html/data/".$row['iarfilename'];
|
||||||
|
|
||||||
echo "Aktive IAR für ".$RUNTIME['OPENSIM']->getUserName($row['userID'])." gefunden. File: ".$fullFilePath."\n";
|
echo "Aktive IAR für ".$opensim->getUserName($row['userID'])." gefunden. File: ".$fullFilePath."\n";
|
||||||
|
|
||||||
if(file_exists($fullFilePath))
|
if(file_exists($fullFilePath))
|
||||||
{
|
{
|
||||||
|
@ -22,18 +25,18 @@
|
||||||
$statementUpdate = $RUNTIME['PDO']->prepare('UPDATE iarstates SET filesize = :filesize WHERE userID = :userID');
|
$statementUpdate = $RUNTIME['PDO']->prepare('UPDATE iarstates SET filesize = :filesize WHERE userID = :userID');
|
||||||
$statementUpdate->execute(['filesize' => $filesize, 'userID' => $row['userID']]);
|
$statementUpdate->execute(['filesize' => $filesize, 'userID' => $row['userID']]);
|
||||||
|
|
||||||
echo "Status der IAR für ".$RUNTIME['OPENSIM']->getUserName($row['userID']).": Speichert...\n";
|
echo "Status der IAR für ".$opensim->getUserName($row['userID']).": Speichert...\n";
|
||||||
}else{
|
}else{
|
||||||
$APIURL = $RUNTIME['SIDOMAN']['URL']."api.php?CONTAINER=".$RUNTIME['SIDOMAN']['CONTAINER']."&KEY=".$RUNTIME['SIDOMAN']['PASSWORD']."&METODE=RESTART";
|
$APIURL = $RUNTIME['SIDOMAN']['URL']."api.php?CONTAINER=".$RUNTIME['SIDOMAN']['CONTAINER']."&KEY=".$RUNTIME['SIDOMAN']['PASSWORD']."&METODE=RESTART";
|
||||||
$APIResult = file_get_contents($APIURL);
|
$APIResult = file_get_contents($APIURL);
|
||||||
echo "Status der IAR für ".$RUNTIME['OPENSIM']->getUserName($row['userID']).": Sende Mail...\n";
|
echo "Status der IAR für ".$opensim->getUserName($row['userID']).": Sende Mail...\n";
|
||||||
$statementUpdate = $RUNTIME['PDO']->prepare('DELETE FROM iarstates WHERE userID = :userID');
|
$statementUpdate = $RUNTIME['PDO']->prepare('DELETE FROM iarstates WHERE userID = :userID');
|
||||||
$statementUpdate->execute(['userID' => $row['userID']]);
|
$statementUpdate->execute(['userID' => $row['userID']]);
|
||||||
|
|
||||||
sendInworldIM("00000000-0000-0000-0000-000000000000", $row['userID'], "Inventory", $RUNTIME['GRID']['HOMEURL'], "Deine IAR ist fertig zum Download: ".$RUNTIME['IAR']['BASEURL'].$row['iarfilename']);
|
sendInworldIM("00000000-0000-0000-0000-000000000000", $row['userID'], "Inventory", $RUNTIME['GRID']['HOMEURL'], "Deine IAR ist fertig zum Download: ".$RUNTIME['IAR']['BASEURL'].$row['iarfilename']);
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
$name = explode(" ", $RUNTIME['OPENSIM']->getUserName($row['userID']));
|
$name = explode(" ", $opensim->getUserName($row['userID']));
|
||||||
|
|
||||||
$APIURL = $RUNTIME['SIDOMAN']['URL']."api.php?CONTAINER=".$RUNTIME['SIDOMAN']['CONTAINER']."&KEY=".$RUNTIME['SIDOMAN']['PASSWORD']."&METODE=COMMAND&COMMAND=".urlencode("save iar ".$name[0]." ".$name[1]." /* PASSWORD /downloads/".$row['iarfilename']);
|
$APIURL = $RUNTIME['SIDOMAN']['URL']."api.php?CONTAINER=".$RUNTIME['SIDOMAN']['CONTAINER']."&KEY=".$RUNTIME['SIDOMAN']['PASSWORD']."&METODE=COMMAND&COMMAND=".urlencode("save iar ".$name[0]." ".$name[1]." /* PASSWORD /downloads/".$row['iarfilename']);
|
||||||
$APIResult = file_get_contents($APIURL);
|
$APIResult = file_get_contents($APIURL);
|
||||||
|
@ -49,7 +52,7 @@
|
||||||
$statementUpdate = $RUNTIME['PDO']->prepare('UPDATE iarstates SET running = :running WHERE userID = :userID');
|
$statementUpdate = $RUNTIME['PDO']->prepare('UPDATE iarstates SET running = :running WHERE userID = :userID');
|
||||||
$statementUpdate->execute(['running' => 1, 'userID' => $row['userID']]);
|
$statementUpdate->execute(['running' => 1, 'userID' => $row['userID']]);
|
||||||
|
|
||||||
$name = explode(" ", $RUNTIME['OPENSIM']->getUserName($row['userID']));
|
$name = explode(" ", $opensim->getUserName($row['userID']));
|
||||||
|
|
||||||
$APIURL = $RUNTIME['SIDOMAN']['URL']."api.php?CONTAINER=".$RUNTIME['SIDOMAN']['CONTAINER']."&KEY=".$RUNTIME['SIDOMAN']['PASSWORD']."&METODE=COMMAND&COMMAND=".urlencode("save iar ".$name[0]." ".$name[1]." /* PASSWORD /downloads/".$row['iarfilename']);
|
$APIURL = $RUNTIME['SIDOMAN']['URL']."api.php?CONTAINER=".$RUNTIME['SIDOMAN']['CONTAINER']."&KEY=".$RUNTIME['SIDOMAN']['PASSWORD']."&METODE=COMMAND&COMMAND=".urlencode("save iar ".$name[0]." ".$name[1]." /* PASSWORD /downloads/".$row['iarfilename']);
|
||||||
$APIResult = file_get_contents($APIURL);
|
$APIResult = file_get_contents($APIURL);
|
||||||
|
|
|
@ -39,8 +39,11 @@
|
||||||
|
|
||||||
while($row = $statement->fetch())
|
while($row = $statement->fetch())
|
||||||
{
|
{
|
||||||
$email = $RUNTIME['OPENSIM']->getUserMail($row['PrincipalID']);
|
include '../app/OpenSim.php';
|
||||||
$allowOfflineIM = $RUNTIME['OPENSIM']->allowOfflineIM($row['PrincipalID']);
|
$opensim = new OpenSim();
|
||||||
|
|
||||||
|
$email = $opensim->getUserMail($row['PrincipalID']);
|
||||||
|
$allowOfflineIM = $opensim->allowOfflineIM($row['PrincipalID']);
|
||||||
|
|
||||||
if($email != "" && $allowOfflineIM == "TRUE")
|
if($email != "" && $allowOfflineIM == "TRUE")
|
||||||
{
|
{
|
||||||
|
@ -58,7 +61,7 @@
|
||||||
$mail->SMTPAuth = false;
|
$mail->SMTPAuth = false;
|
||||||
|
|
||||||
$mail->setFrom($RUNTIME['SMTP']['ADRESS'], $RUNTIME['GRID']['NAME']);
|
$mail->setFrom($RUNTIME['SMTP']['ADRESS'], $RUNTIME['GRID']['NAME']);
|
||||||
$mail->addAddress($email, $RUNTIME['OPENSIM']->getUserName($row['PrincipalID']));
|
$mail->addAddress($email, $opensim->getUserName($row['PrincipalID']));
|
||||||
|
|
||||||
$XMLMESSAGE = new SimpleXMLElement($row['Message']);
|
$XMLMESSAGE = new SimpleXMLElement($row['Message']);
|
||||||
|
|
||||||
|
@ -71,9 +74,9 @@
|
||||||
{
|
{
|
||||||
if($XMLMESSAGE->Position->X != 0 || $XMLMESSAGE->Position->X != 0 || $XMLMESSAGE->Position->X != 0)
|
if($XMLMESSAGE->Position->X != 0 || $XMLMESSAGE->Position->X != 0 || $XMLMESSAGE->Position->X != 0)
|
||||||
{
|
{
|
||||||
$HTMLMESSAGE .= " @ ".$RUNTIME['OPENSIM']->getRegionName($XMLMESSAGE->RegionID)."/".$XMLMESSAGE->Position->X."/".$XMLMESSAGE->Position->Y."/".$XMLMESSAGE->Position->Z;
|
$HTMLMESSAGE .= " @ ".$opensim->getRegionName($XMLMESSAGE->RegionID)."/".$XMLMESSAGE->Position->X."/".$XMLMESSAGE->Position->Y."/".$XMLMESSAGE->Position->Z;
|
||||||
}else{
|
}else{
|
||||||
$HTMLMESSAGE .= " @ ".$RUNTIME['OPENSIM']->getRegionName($XMLMESSAGE->RegionID);
|
$HTMLMESSAGE .= " @ ".$opensim->getRegionName($XMLMESSAGE->RegionID);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,9 @@
|
||||||
|
|
||||||
if($result == FALSE || $result == "")
|
if($result == FALSE || $result == "")
|
||||||
{
|
{
|
||||||
echo "Die Region ".$row['regionName']." von ".$RUNTIME['OPENSIM']->getUserName($row['owner_uuid'])." ist nicht erreichbar.\n";
|
include '../app/OpenSim.php';
|
||||||
|
|
||||||
|
echo "Die Region ".$row['regionName']." von ".$opensim->getUserName($row['owner_uuid'])." ist nicht erreichbar.\n";
|
||||||
|
|
||||||
$infoStatement = $RUNTIME['PDO']->prepare("SELECT OfflineTimer FROM regions_info WHERE regionID = :regionID");
|
$infoStatement = $RUNTIME['PDO']->prepare("SELECT OfflineTimer FROM regions_info WHERE regionID = :regionID");
|
||||||
$infoStatement->execute(['regionID' => $row['uuid']]);
|
$infoStatement->execute(['regionID' => $row['uuid']]);
|
||||||
|
@ -28,7 +30,7 @@
|
||||||
{
|
{
|
||||||
if(($infoRow['OfflineTimer'] + 3600) <= time())
|
if(($infoRow['OfflineTimer'] + 3600) <= time())
|
||||||
{
|
{
|
||||||
echo "Die Region ".$row['regionName']." von ".$RUNTIME['OPENSIM']->getUserName($row['owner_uuid'])." ist seit über eine Stunde nicht erreichbar!\n";
|
echo "Die Region ".$row['regionName']." von ".$opensim->getUserName($row['owner_uuid'])." ist seit über eine Stunde nicht erreichbar!\n";
|
||||||
|
|
||||||
//sendInworldIM("00000000-0000-0000-0000-000000000000", $row['owner_uuid'], "Region", $RUNTIME['GRID']['HOMEURL'], "WARNUNG: Deine Region '".$row['regionName']."' ist nicht erreichbar und wurde deshalb aus dem Grid entfernt.");
|
//sendInworldIM("00000000-0000-0000-0000-000000000000", $row['owner_uuid'], "Region", $RUNTIME['GRID']['HOMEURL'], "WARNUNG: Deine Region '".$row['regionName']."' ist nicht erreichbar und wurde deshalb aus dem Grid entfernt.");
|
||||||
|
|
||||||
|
|
|
@ -5,12 +5,9 @@ session_start();
|
||||||
|
|
||||||
include_once("classen/utils.php");
|
include_once("classen/utils.php");
|
||||||
include_once("classen/HTML.php");
|
include_once("classen/HTML.php");
|
||||||
include_once("classen/OpenSim.php");
|
|
||||||
include_once("classen/discord.php");
|
include_once("classen/discord.php");
|
||||||
|
|
||||||
$RUNTIME = array();
|
$RUNTIME = array();
|
||||||
$RUNTIME['OPENSIM'] = new OpenSim();
|
|
||||||
|
|
||||||
include_once("config.php");
|
include_once("config.php");
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -19,11 +19,8 @@ if(!isset($_SESSION['csrf']) || strlen($_SESSION['csrf']) != 64) {
|
||||||
|
|
||||||
include_once("classen/utils.php");
|
include_once("classen/utils.php");
|
||||||
include_once("classen/HTML.php");
|
include_once("classen/HTML.php");
|
||||||
include_once("classen/OpenSim.php");
|
|
||||||
include_once("classen/discord.php");
|
include_once("classen/discord.php");
|
||||||
|
|
||||||
$RUNTIME['OPENSIM'] = new OpenSim();
|
|
||||||
|
|
||||||
function isValidEndpoint(string $pageName, string $dirPrefix) {
|
function isValidEndpoint(string $pageName, string $dirPrefix) {
|
||||||
return preg_match("/[a-zA-Z0-9\.]{1,100}/", $pageName) && file_exists("./".$dirPrefix."/".$pageName.".php");
|
return preg_match("/[a-zA-Z0-9\.]{1,100}/", $pageName) && file_exists("./".$dirPrefix."/".$pageName.".php");
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,12 @@
|
||||||
<?php
|
<?php
|
||||||
|
include 'app/OpenSim.php';
|
||||||
|
$opensim = new OpenSim();
|
||||||
|
|
||||||
$HTML->setHTMLTitle("Dashboard");
|
$HTML->setHTMLTitle("Dashboard");
|
||||||
$HTML->importSeitenInhalt("pages/HTML/dashboard.html");
|
$HTML->importSeitenInhalt("pages/HTML/dashboard.html");
|
||||||
|
|
||||||
$HTML->ReplaceSeitenInhalt("%%GLOBAL-USER-COUNT%%", $RUNTIME['OPENSIM']->getUserCount());
|
$HTML->ReplaceSeitenInhalt("%%GLOBAL-USER-COUNT%%", $opensim->getUserCount());
|
||||||
$HTML->ReplaceSeitenInhalt("%%GLOBAL-REGION-COUNT%%", $RUNTIME['OPENSIM']->getRegionCount());
|
$HTML->ReplaceSeitenInhalt("%%GLOBAL-REGION-COUNT%%", $opensim->getRegionCount());
|
||||||
|
|
||||||
$HTML->ReplaceLayoutInhalt("%%USERNAME%%", htmlspecialchars($_SESSION['DISPLAYNAME']));
|
$HTML->ReplaceLayoutInhalt("%%USERNAME%%", htmlspecialchars($_SESSION['DISPLAYNAME']));
|
||||||
|
|
||||||
|
|
|
@ -25,14 +25,17 @@
|
||||||
$FriendData = explode(";", $row['Friend']);
|
$FriendData = explode(";", $row['Friend']);
|
||||||
$Friend = $FriendData[0];
|
$Friend = $FriendData[0];
|
||||||
|
|
||||||
$entry = '<tr><td>'.trim($RUNTIME['OPENSIM']->getUserName($Friend)).'</td><td><a href="index.php?page=friends&action=remove&uuid='.$row['Friend'].'">LÖSCHEN</a></td></tr>';
|
include '../app/OpenSim.php';
|
||||||
|
$opensim = new OpenSim();
|
||||||
|
|
||||||
|
$entry = '<tr><td>'.trim($opensim->getUserName($Friend)).'</td><td><a href="index.php?page=friends&action=remove&uuid='.$row['Friend'].'">LÖSCHEN</a></td></tr>';
|
||||||
|
|
||||||
if(count($FriendData) > 1)
|
if(count($FriendData) > 1)
|
||||||
{
|
{
|
||||||
$FriendData[1] = str_replace("http://", "", $FriendData[1]);
|
$FriendData[1] = str_replace("http://", "", $FriendData[1]);
|
||||||
$FriendData[1] = str_replace("https://", "", $FriendData[1]);
|
$FriendData[1] = str_replace("https://", "", $FriendData[1]);
|
||||||
$FriendData[1] = str_replace("/", "", $FriendData[1]);
|
$FriendData[1] = str_replace("/", "", $FriendData[1]);
|
||||||
$entry = '<tr><td>'.htmlspecialchars(trim($RUNTIME['OPENSIM']->getUserName($Friend)).' @ '.strtolower($FriendData[1])).'</td><td><a href="index.php?page=friends&action=remove&uuid='.urlencode($row['Friend']).'">LÖSCHEN</a></td></tr>';
|
$entry = '<tr><td>'.htmlspecialchars(trim($opensim->getUserName($Friend)).' @ '.strtolower($FriendData[1])).'</td><td><a href="index.php?page=friends&action=remove&uuid='.urlencode($row['Friend']).'">LÖSCHEN</a></td></tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
$table = str_replace("%%ENTRY%%", $entry."%%ENTRY%%", $table);
|
$table = str_replace("%%ENTRY%%", $entry."%%ENTRY%%", $table);
|
||||||
|
|
|
@ -8,6 +8,9 @@
|
||||||
die();
|
die();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
include '../app/OpenSim.php';
|
||||||
|
$opensim = new OpenSim();
|
||||||
|
|
||||||
$HTML->setHTMLTitle("Gruppen");
|
$HTML->setHTMLTitle("Gruppen");
|
||||||
$HTML->importSeitenInhalt("pages/HTML/deine-regionen.html");
|
$HTML->importSeitenInhalt("pages/HTML/deine-regionen.html");
|
||||||
|
|
||||||
|
@ -23,7 +26,7 @@
|
||||||
|
|
||||||
while($rowGroups = $statementGroups->fetch())
|
while($rowGroups = $statementGroups->fetch())
|
||||||
{
|
{
|
||||||
$entry = '<tr><td>'.htmlspecialchars($rowGroups['Name']).'</td><td>'.htmlspecialchars($RUNTIME['OPENSIM']->getUserName($rowGroups['FounderID'])).'</td><td><a href="index.php?page=groups&action=leave&group='.htmlspecialchars($rowGroups['GroupID']).'">VERLASSEN</a></td></tr>';
|
$entry = '<tr><td>'.htmlspecialchars($rowGroups['Name']).'</td><td>'.htmlspecialchars($opensim->getUserName($rowGroups['FounderID'])).'</td><td><a href="index.php?page=groups&action=leave&group='.htmlspecialchars($rowGroups['GroupID']).'">VERLASSEN</a></td></tr>';
|
||||||
$table = str_replace("%%ENTRY%%", $entry."%%ENTRY%%", $table);
|
$table = str_replace("%%ENTRY%%", $entry."%%ENTRY%%", $table);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -64,6 +64,9 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
include '../app/OpenSim.php';
|
||||||
|
$opensim = new OpenSim();
|
||||||
|
|
||||||
if(isset($_REQUEST['createIdent']) && isset($_REQUEST['newName']) && $_REQUEST['createIdent'] == "" && $_REQUEST['newName'] != "")
|
if(isset($_REQUEST['createIdent']) && isset($_REQUEST['newName']) && $_REQUEST['createIdent'] == "" && $_REQUEST['newName'] != "")
|
||||||
{
|
{
|
||||||
$avatarNameParts = explode(" ", trim($_REQUEST['newName']));
|
$avatarNameParts = explode(" ", trim($_REQUEST['newName']));
|
||||||
|
@ -75,7 +78,7 @@
|
||||||
|
|
||||||
if($statement->rowCount() == 0)
|
if($statement->rowCount() == 0)
|
||||||
{
|
{
|
||||||
$avatarUUID = $RUNTIME['OPENSIM']->gen_uuid();
|
$avatarUUID = $opensim->gen_uuid();
|
||||||
|
|
||||||
$statementAccounts = $RUNTIME['PDO']->prepare('INSERT INTO UserAccounts (PrincipalID, ScopeID, FirstName, LastName, Email, ServiceURLs, Created, UserLevel, UserFlags, UserTitle, active) VALUES (:PrincipalID, :ScopeID, :FirstName, :LastName, :Email, :ServiceURLs, :Created, :UserLevel, :UserFlags, :UserTitle, :active )');
|
$statementAccounts = $RUNTIME['PDO']->prepare('INSERT INTO UserAccounts (PrincipalID, ScopeID, FirstName, LastName, Email, ServiceURLs, Created, UserLevel, UserFlags, UserTitle, active) VALUES (:PrincipalID, :ScopeID, :FirstName, :LastName, :Email, :ServiceURLs, :Created, :UserLevel, :UserFlags, :UserTitle, :active )');
|
||||||
$statementAccounts->execute(['PrincipalID' => $avatarUUID, 'ScopeID' => "00000000-0000-0000-0000-000000000000", 'FirstName' => $avatarNameParts[0], 'LastName' => $avatarNameParts[1], 'Email' => $_SESSION['EMAIL'], 'ServiceURLs' => "HomeURI= GatekeeperURI= InventoryServerURI= AssetServerURI= ", 'Created' => time(), 'UserLevel' => 0, 'UserFlags' => 0, 'UserTitle' => "", 'active' => 1]);
|
$statementAccounts->execute(['PrincipalID' => $avatarUUID, 'ScopeID' => "00000000-0000-0000-0000-000000000000", 'FirstName' => $avatarNameParts[0], 'LastName' => $avatarNameParts[1], 'Email' => $_SESSION['EMAIL'], 'ServiceURLs' => "HomeURI= GatekeeperURI= InventoryServerURI= AssetServerURI= ", 'Created' => time(), 'UserLevel' => 0, 'UserFlags' => 0, 'UserTitle' => "", 'active' => 1]);
|
||||||
|
@ -93,7 +96,7 @@
|
||||||
}else{
|
}else{
|
||||||
$HTML->ReplaceSeitenInhalt("%%MESSAGE%%", '<div class="alert alert-danger" role="alert">Der Name muss aus einem Vor und einem Nachnamen bestehen.</div>');
|
$HTML->ReplaceSeitenInhalt("%%MESSAGE%%", '<div class="alert alert-danger" role="alert">Der Name muss aus einem Vor und einem Nachnamen bestehen.</div>');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$table = '<table class="table"><thead><tr><th scope="col">Name</th><th scope="col">Aktionen</th></thead><tbody>%%ENTRY%%</tbody></table>';
|
$table = '<table class="table"><thead><tr><th scope="col">Name</th><th scope="col">Aktionen</th></thead><tbody>%%ENTRY%%</tbody></table>';
|
||||||
$statement = $RUNTIME['PDO']->prepare("SELECT IdentityID FROM UserIdentitys WHERE PrincipalID = ? ORDER BY IdentityID ASC");
|
$statement = $RUNTIME['PDO']->prepare("SELECT IdentityID FROM UserIdentitys WHERE PrincipalID = ? ORDER BY IdentityID ASC");
|
||||||
|
@ -103,9 +106,9 @@
|
||||||
{
|
{
|
||||||
if($row['IdentityID'] == $_SESSION['UUID'])
|
if($row['IdentityID'] == $_SESSION['UUID'])
|
||||||
{
|
{
|
||||||
$entry = '<tr><td>'.htmlspecialchars(trim($RUNTIME['OPENSIM']->getUserName($row['IdentityID']))).' <span class="badge badge-info">Aktiv</span></td><td>-</td></tr>';
|
$entry = '<tr><td>'.htmlspecialchars(trim($opensim->getUserName($row['IdentityID']))).' <span class="badge badge-info">Aktiv</span></td><td>-</td></tr>';
|
||||||
}else{
|
}else{
|
||||||
$entry = '<tr><td>'.htmlspecialchars(trim($RUNTIME['OPENSIM']->getUserName($row['IdentityID']))).'</td><td><form action="index.php?page=identities" method="post">%%CSRF%%<input type="hidden" name="newuuid" value="'.htmlspecialchars($row['IdentityID']).'"><button type="submit" name="enableIdent" class="btn btn-success btn-sm">Aktivieren</button></form></td></tr>';
|
$entry = '<tr><td>'.htmlspecialchars(trim($opensim->getUserName($row['IdentityID']))).'</td><td><form action="index.php?page=identities" method="post">%%CSRF%%<input type="hidden" name="newuuid" value="'.htmlspecialchars($row['IdentityID']).'"><button type="submit" name="enableIdent" class="btn btn-success btn-sm">Aktivieren</button></form></td></tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
$table = str_replace("%%ENTRY%%", $entry."%%ENTRY%%", $table);
|
$table = str_replace("%%ENTRY%%", $entry."%%ENTRY%%", $table);
|
||||||
|
|
|
@ -56,15 +56,18 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
include '../app/OpenSim.php';
|
||||||
|
$opensim = new OpenSim();
|
||||||
|
|
||||||
$PartnerName = "";
|
$PartnerName = "";
|
||||||
$PartnerUUID = $RUNTIME['OPENSIM']->getPartner($_SESSION['UUID']);
|
$PartnerUUID = $opensim->getPartner($_SESSION['UUID']);
|
||||||
if($PartnerUUID != null)$PartnerName = $RUNTIME['OPENSIM']->getUserName($PartnerUUID);
|
if($PartnerUUID != null)$PartnerName = $opensim->getUserName($PartnerUUID);
|
||||||
|
|
||||||
$HTML->ReplaceSeitenInhalt("%%offlineIMSTATE%%", ' ');
|
$HTML->ReplaceSeitenInhalt("%%offlineIMSTATE%%", ' ');
|
||||||
$HTML->ReplaceSeitenInhalt("%%firstname%%", htmlspecialchars($_SESSION['FIRSTNAME']));
|
$HTML->ReplaceSeitenInhalt("%%firstname%%", htmlspecialchars($_SESSION['FIRSTNAME']));
|
||||||
$HTML->ReplaceSeitenInhalt("%%lastname%%", htmlspecialchars($_SESSION['LASTNAME']));
|
$HTML->ReplaceSeitenInhalt("%%lastname%%", htmlspecialchars($_SESSION['LASTNAME']));
|
||||||
$HTML->ReplaceSeitenInhalt("%%partner%%", htmlspecialchars($PartnerName));
|
$HTML->ReplaceSeitenInhalt("%%partner%%", htmlspecialchars($PartnerName));
|
||||||
$HTML->ReplaceSeitenInhalt("%%email%%", htmlspecialchars($RUNTIME['OPENSIM']->getUserMail($_SESSION['UUID'])));
|
$HTML->ReplaceSeitenInhalt("%%email%%", htmlspecialchars($opensim->getUserMail($_SESSION['UUID'])));
|
||||||
$HTML->ReplaceSeitenInhalt("%%listAllResidentsAsJSArray%%", "");
|
$HTML->ReplaceSeitenInhalt("%%listAllResidentsAsJSArray%%", "");
|
||||||
|
|
||||||
$pwChanged = false;
|
$pwChanged = false;
|
||||||
|
|
|
@ -101,18 +101,21 @@
|
||||||
$statement->execute(['IMState' => 'false', 'PrincipalID' => $_SESSION['UUID']]);
|
$statement->execute(['IMState' => 'false', 'PrincipalID' => $_SESSION['UUID']]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
include '../app/OpenSim.php';
|
||||||
|
$opensim = new OpenSim();
|
||||||
|
|
||||||
if(isset($_REQUEST['formInputFeldPartnerName']) && $_REQUEST['formInputFeldPartnerName'] != "")
|
if(isset($_REQUEST['formInputFeldPartnerName']) && $_REQUEST['formInputFeldPartnerName'] != "")
|
||||||
{
|
{
|
||||||
$NewPartner = trim($_REQUEST['formInputFeldPartnerName']);
|
$NewPartner = trim($_REQUEST['formInputFeldPartnerName']);
|
||||||
$CurrentPartner = $RUNTIME['OPENSIM']->getPartner($_SESSION['UUID']);
|
$CurrentPartner = $opensim->getPartner($_SESSION['UUID']);
|
||||||
|
|
||||||
if($CurrentPartner != "")$CurrentPartner = $RUNTIME['OPENSIM']->getUserName($CurrentPartner);
|
if($CurrentPartner != "")$CurrentPartner = $opensim->getUserName($CurrentPartner);
|
||||||
|
|
||||||
if($NewPartner != "")
|
if($NewPartner != "")
|
||||||
{
|
{
|
||||||
if($CurrentPartner != $NewPartner)
|
if($CurrentPartner != $NewPartner)
|
||||||
{
|
{
|
||||||
$newPartnerUUID = $RUNTIME['OPENSIM']->getUserUUID($NewPartner);
|
$newPartnerUUID = $opensim->getUserUUID($NewPartner);
|
||||||
|
|
||||||
if($newPartnerUUID != null)
|
if($newPartnerUUID != null)
|
||||||
{
|
{
|
||||||
|
@ -144,18 +147,18 @@
|
||||||
|
|
||||||
$allUsers .= '," "';
|
$allUsers .= '," "';
|
||||||
|
|
||||||
$PartnerUUID = $RUNTIME['OPENSIM']->getPartner($_SESSION['UUID']);
|
$PartnerUUID = $opensim->getPartner($_SESSION['UUID']);
|
||||||
$PartnerName = "";
|
$PartnerName = "";
|
||||||
|
|
||||||
if($PartnerUUID != null)$PartnerName = $RUNTIME['OPENSIM']->getUserName($PartnerUUID);
|
if($PartnerUUID != null)$PartnerName = $opensim->getUserName($PartnerUUID);
|
||||||
|
|
||||||
if($RUNTIME['OPENSIM']->allowOfflineIM($_SESSION['UUID']) == "TRUE")$HTML->ReplaceSeitenInhalt("%%offlineIMSTATE%%", ' checked');
|
if($opensim->allowOfflineIM($_SESSION['UUID']) == "TRUE")$HTML->ReplaceSeitenInhalt("%%offlineIMSTATE%%", ' checked');
|
||||||
|
|
||||||
$HTML->ReplaceSeitenInhalt("%%offlineIMSTATE%%", ' ');
|
$HTML->ReplaceSeitenInhalt("%%offlineIMSTATE%%", ' ');
|
||||||
$HTML->ReplaceSeitenInhalt("%%firstname%%", htmlspecialchars($_SESSION['FIRSTNAME']));
|
$HTML->ReplaceSeitenInhalt("%%firstname%%", htmlspecialchars($_SESSION['FIRSTNAME']));
|
||||||
$HTML->ReplaceSeitenInhalt("%%lastname%%", htmlspecialchars($_SESSION['LASTNAME']));
|
$HTML->ReplaceSeitenInhalt("%%lastname%%", htmlspecialchars($_SESSION['LASTNAME']));
|
||||||
$HTML->ReplaceSeitenInhalt("%%partner%%", htmlspecialchars($PartnerName));
|
$HTML->ReplaceSeitenInhalt("%%partner%%", htmlspecialchars($PartnerName));
|
||||||
$HTML->ReplaceSeitenInhalt("%%email%%", htmlspecialchars($RUNTIME['OPENSIM']->getUserMail($_SESSION['UUID'])));
|
$HTML->ReplaceSeitenInhalt("%%email%%", htmlspecialchars($opensim->getUserMail($_SESSION['UUID'])));
|
||||||
$HTML->ReplaceSeitenInhalt("%%listAllResidentsAsJSArray%%", "");
|
$HTML->ReplaceSeitenInhalt("%%listAllResidentsAsJSArray%%", "");
|
||||||
$HTML->ReplaceSeitenInhalt("%%INFOMESSAGE%%", ' ');
|
$HTML->ReplaceSeitenInhalt("%%INFOMESSAGE%%", ' ');
|
||||||
$HTML->ReplaceSeitenInhalt("%%IARINFOMESSAGE%%", ' ');
|
$HTML->ReplaceSeitenInhalt("%%IARINFOMESSAGE%%", ' ');
|
||||||
|
|
|
@ -61,11 +61,14 @@
|
||||||
$statement = $RUNTIME['PDO']->prepare("SELECT uuid,regionName,owner_uuid,locX,locY FROM regions ".($showAll ? "ORDER BY owner_uuid ASC" : "WHERE owner_uuid = ? ORDER BY uuid ASC"));
|
$statement = $RUNTIME['PDO']->prepare("SELECT uuid,regionName,owner_uuid,locX,locY FROM regions ".($showAll ? "ORDER BY owner_uuid ASC" : "WHERE owner_uuid = ? ORDER BY uuid ASC"));
|
||||||
$statement->execute(array($_SESSION['UUID']));
|
$statement->execute(array($_SESSION['UUID']));
|
||||||
|
|
||||||
|
include '../app/OpenSim.php';
|
||||||
|
$opensim = new OpenSim();
|
||||||
|
|
||||||
while($row = $statement->fetch())
|
while($row = $statement->fetch())
|
||||||
{
|
{
|
||||||
$stats = getRegionStatsData($row['uuid']);
|
$stats = getRegionStatsData($row['uuid']);
|
||||||
|
|
||||||
$entry = '<tr><td>'.htmlspecialchars($row['regionName']).'<div class="blockquote-footer">Prims: '.$stats['Prims'].'; RAM-Nutzung: '.$stats['ProcMem'].'; SIM/PHYS FPS: '.$stats['SimFPS'].'/'.$stats['PhyFPS'].' ('.$stats['RegionVersion'].')</div></td><td>'.htmlspecialchars($RUNTIME['OPENSIM']->getUserName($row['owner_uuid'])).'</td><td>'.fillString(($row['locX'] / 256), 4).' / '.fillString(($row['locY'] / 256), 4).'</td><td><a href="index.php?page=regions&action=remove®ion='.$row['uuid'].'">LÖSCHEN</a></td></tr>';
|
$entry = '<tr><td>'.htmlspecialchars($row['regionName']).'<div class="blockquote-footer">Prims: '.$stats['Prims'].'; RAM-Nutzung: '.$stats['ProcMem'].'; SIM/PHYS FPS: '.$stats['SimFPS'].'/'.$stats['PhyFPS'].' ('.$stats['RegionVersion'].')</div></td><td>'.htmlspecialchars($opensim->getUserName($row['owner_uuid'])).'</td><td>'.fillString(($row['locX'] / 256), 4).' / '.fillString(($row['locY'] / 256), 4).'</td><td><a href="index.php?page=regions&action=remove®ion='.$row['uuid'].'">LÖSCHEN</a></td></tr>';
|
||||||
$table = str_replace("%%ENTRY%%", $entry."%%ENTRY%%", $table);
|
$table = str_replace("%%ENTRY%%", $entry."%%ENTRY%%", $table);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -91,7 +91,11 @@
|
||||||
{
|
{
|
||||||
displayPage("Der gewählte Standardavatar existiert nicht.");
|
displayPage("Der gewählte Standardavatar existiert nicht.");
|
||||||
}
|
}
|
||||||
$avatarUUID = $RUNTIME['OPENSIM']->gen_uuid();
|
|
||||||
|
include '../app/OpenSim.php';
|
||||||
|
$opensim = new OpenSim();
|
||||||
|
|
||||||
|
$avatarUUID = $opensim->gen_uuid();
|
||||||
$passwordHash = password_hash($RUNTIME['REGISTER']['PASS'], PASSWORD_ARGON2ID);
|
$passwordHash = password_hash($RUNTIME['REGISTER']['PASS'], PASSWORD_ARGON2ID);
|
||||||
$avatarNameParts = explode(" ", $RUNTIME['REGISTER']['Name']);
|
$avatarNameParts = explode(" ", $RUNTIME['REGISTER']['Name']);
|
||||||
$statementAuth = $RUNTIME['PDO']->prepare('INSERT INTO `auth` (`UUID`, `passwordHash`, `webLoginKey`, `accountType`) VALUES (:UUID, :HASHVALUE, :WEBKEY, :ACCTYPE)');
|
$statementAuth = $RUNTIME['PDO']->prepare('INSERT INTO `auth` (`UUID`, `passwordHash`, `webLoginKey`, `accountType`) VALUES (:UUID, :HASHVALUE, :WEBKEY, :ACCTYPE)');
|
||||||
|
@ -101,10 +105,10 @@
|
||||||
$statementProfile = $RUNTIME['PDO']->prepare('INSERT INTO `userprofile` (`useruuid`, `profilePartner`, `profileImage`, `profileFirstImage`) VALUES (:useruuid, :profilePartner, :profileImage, :profileFirstImage)');
|
$statementProfile = $RUNTIME['PDO']->prepare('INSERT INTO `userprofile` (`useruuid`, `profilePartner`, `profileImage`, `profileFirstImage`) VALUES (:useruuid, :profilePartner, :profileImage, :profileFirstImage)');
|
||||||
$statementProfile->execute(['useruuid' => $avatarUUID, 'profilePartner' => "00000000-0000-0000-0000-000000000000", 'profileImage' => "00000000-0000-0000-0000-000000000000", 'profileFirstImage' => "00000000-0000-0000-0000-000000000000"]);
|
$statementProfile->execute(['useruuid' => $avatarUUID, 'profilePartner' => "00000000-0000-0000-0000-000000000000", 'profileImage' => "00000000-0000-0000-0000-000000000000", 'profileFirstImage' => "00000000-0000-0000-0000-000000000000"]);
|
||||||
$Inventory = array('Calling Cards' => 2, 'Objects' => 6, 'Landmarks' => 3, 'Clothing' => 5, 'Gestures' => 21, 'Body Parts' => 13, 'Textures' => 0, 'Scripts' => 10, 'Photo Album' => 15, 'Lost And Found' => 16, 'Trash' => 14, 'Notecards' => 7, 'My Inventory' => 8, 'Sounds' => 1, 'Animations' => 20);
|
$Inventory = array('Calling Cards' => 2, 'Objects' => 6, 'Landmarks' => 3, 'Clothing' => 5, 'Gestures' => 21, 'Body Parts' => 13, 'Textures' => 0, 'Scripts' => 10, 'Photo Album' => 15, 'Lost And Found' => 16, 'Trash' => 14, 'Notecards' => 7, 'My Inventory' => 8, 'Sounds' => 1, 'Animations' => 20);
|
||||||
$InventoryRootFolder = $RUNTIME['OPENSIM']->gen_uuid();
|
$InventoryRootFolder = $opensim->gen_uuid();
|
||||||
foreach ($Inventory as $FolderName => $InventoryType)
|
foreach ($Inventory as $FolderName => $InventoryType)
|
||||||
{
|
{
|
||||||
$FolderUUID = $RUNTIME['OPENSIM']->gen_uuid();
|
$FolderUUID = $opensim->gen_uuid();
|
||||||
if ($InventoryType == 8)
|
if ($InventoryType == 8)
|
||||||
{
|
{
|
||||||
$FolderUUID = $InventoryRootFolder;
|
$FolderUUID = $InventoryRootFolder;
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
|
include '../app/OpenSim.php';
|
||||||
|
$opensim = new OpenSim();
|
||||||
|
|
||||||
$HTML->setHTMLTitle("Online Anzeige");
|
$HTML->setHTMLTitle("Online Anzeige");
|
||||||
$HTML->importSeitenInhalt("pages/HTML/online-anzeige.html");
|
$HTML->importSeitenInhalt("pages/HTML/online-anzeige.html");
|
||||||
|
|
||||||
|
@ -11,7 +14,7 @@
|
||||||
{
|
{
|
||||||
if($row['RegionID'] != "00000000-0000-0000-0000-000000000000")
|
if($row['RegionID'] != "00000000-0000-0000-0000-000000000000")
|
||||||
{
|
{
|
||||||
$entry = '<tr><td>'.htmlspecialchars(trim($RUNTIME['OPENSIM']->getUserName($row['UserID']))).'</td><td>'.htmlspecialchars($RUNTIME['OPENSIM']->getRegionName($row['RegionID'])).'</td></tr>';
|
$entry = '<tr><td>'.htmlspecialchars(trim($opensim->getUserName($row['UserID']))).'</td><td>'.htmlspecialchars($opensim->getRegionName($row['RegionID'])).'</td></tr>';
|
||||||
$table = str_replace("%%ENTRY%%", $entry."%%ENTRY%%", $table);
|
$table = str_replace("%%ENTRY%%", $entry."%%ENTRY%%", $table);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,6 +12,9 @@
|
||||||
die();
|
die();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
include '../app/OpenSim.php';
|
||||||
|
$opensim = new OpenSim();
|
||||||
|
|
||||||
$HTML->setHTMLTitle("Benutzer");
|
$HTML->setHTMLTitle("Benutzer");
|
||||||
$HTML->importSeitenInhalt("pages/HTML/users.html");
|
$HTML->importSeitenInhalt("pages/HTML/users.html");
|
||||||
|
|
||||||
|
@ -22,7 +25,7 @@
|
||||||
$statement = $RUNTIME['PDO']->prepare('UPDATE auth SET passwordHash = :PasswordHash WHERE UUID = :PrincipalID');
|
$statement = $RUNTIME['PDO']->prepare('UPDATE auth SET passwordHash = :PasswordHash WHERE UUID = :PrincipalID');
|
||||||
$statement->execute(['PasswordHash' => password_hash($NEWPW, PASSWORD_ARGON2ID), 'PrincipalID' => $_REQUEST['userid']]);
|
$statement->execute(['PasswordHash' => password_hash($NEWPW, PASSWORD_ARGON2ID), 'PrincipalID' => $_REQUEST['userid']]);
|
||||||
|
|
||||||
$HTML->ReplaceSeitenInhalt("%%MESSAGE%%", '<div class="alert alert-danger" role="alert">Das Passwort für '.htmlspecialchars($RUNTIME['OPENSIM']->getUserName($_REQUEST['userid'])).' wurde geändert. Das neue Passwort ist <b>'.htmlspecialchars($NEWPW).'</b></div>');
|
$HTML->ReplaceSeitenInhalt("%%MESSAGE%%", '<div class="alert alert-danger" role="alert">Das Passwort für '.htmlspecialchars($opensim->getUserName($_REQUEST['userid'])).' wurde geändert. Das neue Passwort ist <b>'.htmlspecialchars($NEWPW).'</b></div>');
|
||||||
}
|
}
|
||||||
|
|
||||||
$statement = $RUNTIME['PDO']->prepare("CREATE TABLE IF NOT EXISTS `InviteCodes` (`InviteCode` VARCHAR(64) NOT NULL, PRIMARY KEY (`InviteCode`))");
|
$statement = $RUNTIME['PDO']->prepare("CREATE TABLE IF NOT EXISTS `InviteCodes` (`InviteCode` VARCHAR(64) NOT NULL, PRIMARY KEY (`InviteCode`))");
|
||||||
|
|
Loading…
Reference in New Issue