Permalink
Browse files

Move privileges' template dir to server's

Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
  • Loading branch information...
laps15 committed Jul 18, 2018
1 parent 9425fb9 commit 685ccaf680cd855fa57f332928d746fbc26a20cd
@@ -492,7 +492,7 @@ public function getHtmlForColumnPrivileges(
$name_for_dfn,
$name_for_current
) {
return $this->template->render('privileges/column_privileges', [
return $this->template->render('server/privileges/column_privileges', [
'columns' => $columns,
'row' => $row,
'name_for_select' => $name_for_select,
@@ -573,7 +573,7 @@ public function getHtmlToChooseUserGroup($username)
}
$GLOBALS['dbi']->freeResult($result);
return $this->template->render('privileges/choose_user_group', [
return $this->template->render('server/privileges/choose_user_group', [
'all_user_groups' => $allUserGroups,
'user_group' => $userGroup,
'params' => ['username' => $username]
@@ -845,7 +845,7 @@ public function getHtmlForRequires(array $row)
],
];
return $this->template->render('privileges/require_options', [
return $this->template->render('server/privileges/require_options', [
'require_options' => $require_options
]);
}
@@ -897,7 +897,7 @@ public function getHtmlForResourceLimits(array $row)
]
];
$html_output = $this->template->render('privileges/resource_limits', [
$html_output = $this->template->render('server/privileges/resource_limits', [
'limits' => $limits
]);
@@ -953,7 +953,7 @@ public function getHtmlForRoutineSpecificPrivileges(
$privs
);
return $this->template->render('privileges/edit_routine_privileges', [
return $this->template->render('server/privileges/edit_routine_privileges', [
'username' => $username,
'hostname' => $hostname,
'database' => $db,
@@ -1455,7 +1455,7 @@ public function getHtmlForGlobalPrivTableWithCheckboxes(
array $privTableNames,
array $row
) {
return $this->template->render('privileges/global_priv_table', [
return $this->template->render('server/privileges/global_priv_table', [
'priv_table' => $privTable,
'priv_table_names' => $privTableNames,
'row' => $row,
@@ -3581,7 +3581,7 @@ public function getHtmlForAllTableSpecificRights(
$data['routines'] = $routines;
}
return $this->template->render('privileges/privileges_summary', $data);
return $this->template->render('server/privileges/privileges_summary', $data);
}
/**
@@ -3812,7 +3812,7 @@ public function getFieldsetForAddDeleteUser()
{
$html_output = $this->getAddUserHtmlFieldset();
$html_output .= $this->template->render('privileges/delete_user_fieldset');
$html_output .= $this->template->render('server/privileges/delete_user_fieldset');
return $html_output;
}
@@ -3851,7 +3851,7 @@ public function getHtmlForInitials(array $array_initials)
uksort($array_initials, "strnatcasecmp");
return $this->template->render('privileges/initials_row', [
return $this->template->render('server/privileges/initials_row', [
'array_initials' => $array_initials,
'initial' => isset($_REQUEST['initial']) ? $_REQUEST['initial'] : null,
]);
@@ -4572,7 +4572,7 @@ public function getAddUserHtmlFieldset($db = '', $table = '')
= $table;
}
return $this->template->render('privileges/add_user_fieldset', [
return $this->template->render('server/privileges/add_user_fieldset', [
'url_params' => $url_params,
'rel_params' => $rel_params
]);
@@ -8,7 +8,7 @@
{% for priv in table %}
{% set checked = row[priv[0] ~ '_priv'] is defined and row[priv[0] ~ '_priv'] == 'Y' ? ' checked="checked"' %}
{% set formatted_priv = ServerPrivileges_formatPrivilege(priv, true) %}
{% include 'privileges/global_priv_tbl_item.twig' with {
{% include 'server/privileges/global_priv_tbl_item.twig' with {
'checked': checked,
'formatted_priv': formatted_priv,
'priv': priv
@@ -31,7 +31,7 @@
</tr>
{% else %}
{% for privilege in privileges %}
{% include 'privileges/privileges_summary_row.twig' with
{% include 'server/privileges/privileges_summary_row.twig' with
privilege|merge({'type': type})
only %}
{% endfor %}
@@ -40,16 +40,16 @@
</table>
{% if type == 'database' %}
{% include 'privileges/add_privileges_database.twig' with {
{% include 'server/privileges/add_privileges_database.twig' with {
'databases': databases
} only %}
{% elseif type == 'table' %}
{% include 'privileges/add_privileges_table.twig' with {
{% include 'server/privileges/add_privileges_table.twig' with {
'database': database,
'tables': tables
} only %}
{% else %}
{% include 'privileges/add_privileges_routine.twig' with {
{% include 'server/privileges/add_privileges_routine.twig' with {
'database': database,
'routines': routines
} only %}
@@ -5,7 +5,7 @@
{% if require_option['name'] is same as('ssl_cipher') %}
<div id="specified_div" style="padding-left:20px;">
{% endif %}
{% include 'privileges/require_options_item.twig' with {
{% include 'server/privileges/require_options_item.twig' with {
'require_option': require_option
} only %}
{% endfor %}
@@ -6,7 +6,7 @@
</small>
</p>
{% for limit in limits %}
{% include 'privileges/resource_limit_item.twig' with {
{% include 'server/privileges/resource_limit_item.twig' with {
'limit': limit
} only %}
{% endfor %}

0 comments on commit 685ccaf

Please sign in to comment.