joepie91
/
cvm
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Merge branch 'fix/rename-templater' into develop

Browse Source
feature/node-rewrite
Sven Slootweg 11 years ago
parent eab62d5985 7e709b7f57
commit e5662c600f
17 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File

2
frontend/authenticators/vps.php
Unescape Escape View File

@ -48,7 +48,7 @@ try
catch(NotFoundException $e)
{
$router->uVariables['display_menu'] = false;
$sMainContents = Templater::AdvancedParse("{$sTheme}/client/vps/error/notfound", $locale->strings, array());
$sMainContents = NewTemplater::Render("{$sTheme}/client/vps/error/notfound", $locale->strings, array());
$sRouterAuthenticated = false;
}
catch(UnauthorizedException $e)

2
frontend/modules/admin/node/add.php
Unescape Escape View File

@ -83,6 +83,6 @@ if(isset($_POST['submit']))
}
}
$sPageContents = Templater::AdvancedParse("{$sTheme}/admin/node/add", $locale->strings, array(
$sPageContents = NewTemplater::Render("{$sTheme}/admin/node/add", $locale->strings, array(
'errors' => $sErrors
));

2
frontend/modules/admin/node/list.php
Unescape Escape View File

@ -29,6 +29,6 @@ if($result = $database->CachedQuery("SELECT * FROM nodes"))
}
}
$sPageContents = Templater::AdvancedParse("{$sTheme}/admin/node/list", $locale->strings, array(
$sPageContents = NewTemplater::Render("{$sTheme}/admin/node/list", $locale->strings, array(
'nodes' => $sNodeList
));

2
frontend/modules/admin/node/lookup.php
Unescape Escape View File

@ -50,7 +50,7 @@ try
}
}
$sPageContents = Templater::AdvancedParse("{$sTheme}/admin/node/lookup", $locale->strings, array(
$sPageContents = NewTemplater::Render("{$sTheme}/admin/node/lookup", $locale->strings, array(
'id' => $sNode->sId,
'hostname' => $sNode->sHostname,
'location' => $sNode->sPhysicalLocation,

2
frontend/modules/admin/overview/index.php
Unescape Escape View File

@ -13,4 +13,4 @@
if(!isset($_APP)) { die("Unauthorized."); }
$sPageContents = Templater::AdvancedParse("{$sTheme}/admin/overview/index", $locale->strings, array());
$sPageContents = NewTemplater::Render("{$sTheme}/admin/overview/index", $locale->strings, array());

2
frontend/modules/admin/user/list.php
Unescape Escape View File

@ -28,6 +28,6 @@ foreach($result->data as $row)
);
}
$sPageContents = Templater::AdvancedParse("{$sTheme}/admin/user/list", $locale->strings, array(
$sPageContents = NewTemplater::Render("{$sTheme}/admin/user/list", $locale->strings, array(
'users' => $sUserList
));

2
frontend/modules/admin/user/lookup.php
Unescape Escape View File

@ -52,7 +52,7 @@ try
}
}
$sPageContents = Templater::AdvancedParse("{$sTheme}/admin/user/lookup", $locale->strings, array(
$sPageContents = NewTemplater::Render("{$sTheme}/admin/user/lookup", $locale->strings, array(
'id' => $sUserEntry->sId,
'username' => $sUserEntry->sUsername,
'email' => $sUserEntry->sEmailAddress,

2
frontend/modules/admin/vps/create.php
Unescape Escape View File

@ -205,7 +205,7 @@ foreach($result->data as $row)
);
}
$sPageContents = Templater::AdvancedParse("{$sTheme}/admin/vps/add", $locale->strings, array(
$sPageContents = NewTemplater::Render("{$sTheme}/admin/vps/add", $locale->strings, array(
'errors' => $sErrors,
'nodes' => $sNodes,
'users' => $sUsers,

2
frontend/modules/admin/vps/list.php
Unescape Escape View File

@ -46,6 +46,6 @@ if($result = $database->CachedQuery("SELECT * FROM containers"))
}
}
$sPageContents = Templater::AdvancedParse("{$sTheme}/admin/vps/list", $locale->strings, array(
$sPageContents = NewTemplater::Render("{$sTheme}/admin/vps/list", $locale->strings, array(
'vpses' => $sVpsList
));

2
frontend/modules/admin/vps/suspend.php
Unescape Escape View File

@ -47,7 +47,7 @@ try
$sSuspended = ($sVps->sStatus == CVM_STATUS_SUSPENDED) ? true : false;
$sPageContents = Templater::AdvancedParse("{$sTheme}/admin/vps/suspend", $locale->strings, array(
$sPageContents = NewTemplater::Render("{$sTheme}/admin/vps/suspend", $locale->strings, array(
'id' => $sVps->sId,
'suspended' => $sSuspended
));

2
frontend/modules/client/vps/console.php
Unescape Escape View File

@ -13,7 +13,7 @@
if(!isset($_APP)) { die("Unauthorized."); }
$sPageContents .= Templater::AdvancedParse("{$sTheme}/client/vps/console", $locale->strings, array(
$sPageContents .= NewTemplater::Render("{$sTheme}/client/vps/console", $locale->strings, array(
'host' => htmlspecialchars($_SERVER['SERVER_NAME']),
'port' => 22,
'username' => "vzshell",

2
frontend/modules/client/vps/list.php
Unescape Escape View File

@ -48,7 +48,7 @@ if($sLoggedIn === true)
}
}
$sMainContents = Templater::AdvancedParse("{$sTheme}/client/vps/list", $locale->strings, array(
$sMainContents = NewTemplater::Render("{$sTheme}/client/vps/list", $locale->strings, array(
'vpses' => $sVpsList
));
}

2
frontend/modules/client/vps/lookup.php
Unescape Escape View File

@ -117,5 +117,5 @@ catch (SshExitException $e)
}
$sPageContents = Templater::AdvancedParse("{$sTheme}/client/vps/lookup", $locale->strings, $sVariables);
$sPageContents = NewTemplater::Render("{$sTheme}/client/vps/lookup", $locale->strings, $sVariables);

2
frontend/modules/client/vps/password.php
Unescape Escape View File

@ -76,7 +76,7 @@ if($display_form === true)
'message' => $locale->strings['warning-password-text']
));
$sPageContents .= Templater::AdvancedParse("{$sTheme}/client/vps/password", $locale->strings, array(
$sPageContents .= NewTemplater::Render("{$sTheme}/client/vps/password", $locale->strings, array(
'id' => $sVps->sId
));
}

2
frontend/modules/client/vps/reinstall.php
Unescape Escape View File

@ -113,7 +113,7 @@ if($display_form === true)
);
}
$sPageContents .= Templater::AdvancedParse("{$sTheme}/client/vps/reinstall", $locale->strings, array(
$sPageContents .= NewTemplater::Render("{$sTheme}/client/vps/reinstall", $locale->strings, array(
'templates' => $sTemplateList
));
}

2
frontend/modules/shared/login.php
Unescape Escape View File

@ -53,7 +53,7 @@ if(isset($_POST['submit']))
}
}
$sMainContents = Templater::AdvancedParse("{$sTheme}/shared/login", $locale->strings, array(
$sMainContents = NewTemplater::Render("{$sTheme}/shared/login", $locale->strings, array(
'error' => $sError,
'field-username' => $sFieldUsername
));

6
frontend/rewrite.php
Unescape Escape View File

@ -249,7 +249,7 @@ try
{
if(isset($router->uVariables['menu']) && $router->uVariables['menu'] == "vps" && $router->uVariables['display_menu'] === true)
{
$sMainContents .= Templater::AdvancedParse("{$sTheme}/client/vps/main", $locale->strings, array(
$sMainContents .= NewTemplater::Render("{$sTheme}/client/vps/main", $locale->strings, array(
'error' => $sError,
'contents' => $sPageContents,
'id' => $sVps->sId
@ -257,7 +257,7 @@ try
}
elseif(isset($router->uVariables['menu']) && $router->uVariables['menu'] == "admin" && $router->uVariables['display_menu'] === true)
{
$sMainContents .= Templater::AdvancedParse("{$sTheme}/admin/main", $locale->strings, array(
$sMainContents .= NewTemplater::Render("{$sTheme}/admin/main", $locale->strings, array(
'error' => $sError,
'contents' => $sPageContents
));
@ -284,7 +284,7 @@ if(empty($router->uVariables['raw']))
'generation' => round(microtime(true) - $timing_start, 6)
));
echo(Templater::AdvancedParse("{$sTheme}/shared/main", $locale->strings, $sTemplateParameters));
echo(NewTemplater::Render("{$sTheme}/shared/main", $locale->strings, $sTemplateParameters));
}
else
{

Write Preview
Loading…
Cancel
Save