Code clean up + format - refs BT#15515

pull/2874/head
Angel Fernando Quiroz Campos 7 years ago
parent ff66bd1712
commit ea2f8f5b24
  1. 86
      main/session/session_category_list.php

@ -27,8 +27,12 @@ $tbl_session_category = Database::get_main_table(TABLE_MAIN_SESSION_CATEGORY);
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
$page = isset($_GET['page']) ? intval($_GET['page']) : null;
$action = isset($_REQUEST['action']) ? Security::remove_XSS($_REQUEST['action']) : null;
$sort = isset($_GET['sort']) && in_array($_GET['sort'], ['name', 'nbr_session', 'date_start', 'date_end']) ? Security::remove_XSS($_GET['sort']) : 'name';
$action = isset($_REQUEST['action'])
? Security::remove_XSS($_REQUEST['action'])
: null;
$sort = isset($_GET['sort']) && in_array($_GET['sort'], ['name', 'nbr_session', 'date_start', 'date_end'])
? Security::remove_XSS($_GET['sort'])
: 'name';
$idChecked = isset($_REQUEST['idChecked']) ? Security::remove_XSS($_REQUEST['idChecked']) : null;
$order = isset($_REQUEST['order']) ? Security::remove_XSS($_REQUEST['order']) : 'ASC';
$keyword = isset($_REQUEST['keyword']) ? Security::remove_XSS($_REQUEST['keyword']) : null;
@ -64,9 +68,9 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
//if user is crfp admin only list its sessions
$where = null;
if (!api_is_platform_admin()) {
$where .= (empty($keyword) ? "" : " WHERE name LIKE '%".Database::escape_string(trim($_REQUEST['keyword']))."%'");
$where .= empty($keyword) ? "" : " WHERE name LIKE '%".Database::escape_string(trim($_REQUEST['keyword']))."%'";
} else {
$where .= (empty($keyword) ? "" : " WHERE name LIKE '%".Database::escape_string(trim($_REQUEST['keyword']))."%'");
$where .= empty($keyword) ? "" : " WHERE name LIKE '%".Database::escape_string(trim($_REQUEST['keyword']))."%'";
}
if (empty($where)) {
$where = " WHERE access_url_id = ".api_get_current_access_url_id()." ";
@ -103,10 +107,15 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
<div class="row">
<div class="col-md-6">
<?php
echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_category_add.php">'.
Display::return_icon('new_folder.png', get_lang('AddSessionCategory'), '', ICON_SIZE_MEDIUM).'</a>
<a href="'.api_get_path(WEB_CODE_PATH).'session/session_list.php">'.
Display::return_icon('session.png', get_lang('ListSession'), '', ICON_SIZE_MEDIUM).'</a>'; ?>
echo Display::url(
Display::return_icon('new_folder.png', get_lang('AddSessionCategory'), [], ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH).'session/session_category_add.php'
);
echo Display::url(
Display::return_icon('session.png', get_lang('ListSession'), [], ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH).'session/session_list.php'
);
?>
</div>
<div class="col-md-6">
<div class="pull-right">
@ -114,7 +123,9 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
<div class="form-group">
<input class="form-control" type="text" name="keyword" value="<?php echo $keyword; ?>"
aria-label="<?php echo get_lang('Search'); ?>"/>
<button class="btn btn-default" type="submit" name="name" value="<?php echo get_lang('Search'); ?>"><em class="fa fa-search"></em> <?php echo get_lang('Search'); ?></button>
<button class="btn btn-default" type="submit" name="name"
value="<?php echo get_lang('Search'); ?>"><em
class="fa fa-search"></em> <?php echo get_lang('Search'); ?></button>
<!-- <a href="session_list.php?search=advanced"><?php echo get_lang('AdvancedSearch'); ?></a> -->
</div>
</form>
@ -122,7 +133,8 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
</div>
</div>
</div>
<form method="post" action="<?php echo api_get_self(); ?>?action=delete&sort=<?php echo $sort; ?>" onsubmit="javascript:if(!confirm('<?php echo get_lang('ConfirmYourChoice'); ?>')) return false;">
<form method="post" action="<?php echo api_get_self(); ?>?action=delete&sort=<?php echo $sort; ?>"
onsubmit="if(!confirm('<?php echo get_lang('ConfirmYourChoice'); ?>')) return false;">
<?php
if (count($Sessions) == 0 && isset($_POST['keyword'])) {
echo Display::return_message(get_lang('NoSearchResults'), 'warning');
@ -167,10 +179,14 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
<table class="data_table" width="100%">
<tr>
<th>&nbsp;</th>
<th><a href="<?php echo api_get_self(); ?>?sort=name&order=<?php echo ($sort == 'name') ? $order : 'ASC'; ?>"><?php echo get_lang('SessionCategoryName'); ?></a></th>
<th><a href="<?php echo api_get_self(); ?>?sort=nbr_session&order=<?php echo ($sort == 'nbr_session') ? $order : 'ASC'; ?>"><?php echo get_lang('NumberOfSession'); ?></a></th>
<th><a href="<?php echo api_get_self(); ?>?sort=date_start&order=<?php echo ($sort == 'date_start') ? $order : 'ASC'; ?>"><?php echo get_lang('StartDate'); ?></a></th>
<th><a href="<?php echo api_get_self(); ?>?sort=date_end&order=<?php echo ($sort == 'date_end') ? $order : 'ASC'; ?>"><?php echo get_lang('EndDate'); ?></a></th>
<th><a href="<?php echo api_get_self(); ?>?sort=name&order=<?php echo ($sort == 'name') ? $order
: 'ASC'; ?>"><?php echo get_lang('SessionCategoryName'); ?></a></th>
<th><a href="<?php echo api_get_self(); ?>?sort=nbr_session&order=<?php echo ($sort
== 'nbr_session') ? $order : 'ASC'; ?>"><?php echo get_lang('NumberOfSession'); ?></a></th>
<th><a href="<?php echo api_get_self(); ?>?sort=date_start&order=<?php echo ($sort == 'date_start')
? $order : 'ASC'; ?>"><?php echo get_lang('StartDate'); ?></a></th>
<th><a href="<?php echo api_get_self(); ?>?sort=date_end&order=<?php echo ($sort == 'date_end')
? $order : 'ASC'; ?>"><?php echo get_lang('EndDate'); ?></a></th>
<th><?php echo get_lang('Actions'); ?></th>
</tr>
@ -192,9 +208,11 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
$rs = Database::query($sql);
list($nb_courses) = Database::fetch_array($rs); ?>
<tr class="<?php echo $i ? 'row_odd' : 'row_even'; ?>">
<td><input type="checkbox" id="idChecked_<?php echo $x; ?>" name="idChecked[]" value="<?php echo $enreg['id']; ?>"></td>
<td><input type="checkbox" id="idChecked_<?php echo $x; ?>" name="idChecked[]"
value="<?php echo $enreg['id']; ?>"></td>
<td><?php echo api_htmlentities($enreg['name'], ENT_QUOTES, $charset); ?></td>
<td><?php echo "<a href=\"session_list.php?id_category=".$enreg['id']."\">".$nb_courses." Session(s) </a>"; ?></td>
<td><?php echo "<a href=\"session_list.php?id_category=".$enreg['id']."\">".$nb_courses
." Session(s) </a>"; ?></td>
<td><?php echo api_format_date($enreg['date_start'], DATE_FORMAT_SHORT); ?></td>
<td>
<?php
@ -208,7 +226,11 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
<a href="session_category_edit.php?&id=<?php echo $enreg['id']; ?>">
<?php Display::display_icon('edit.png', get_lang('Edit'), [], ICON_SIZE_SMALL); ?>
</a>
<a href="<?php echo api_get_self(); ?>?sort=<?php echo $sort; ?>&action=delete_off_session&idChecked=<?php echo $enreg['id']; ?>" onclick="javascript:if(!confirm('<?php echo get_lang('ConfirmYourChoice'); ?>')) return false;">
<a href="<?php echo api_get_self(
); ?>?sort=<?php echo $sort; ?>&action=delete_off_session&idChecked=<?php echo $enreg['id']; ?>"
onclick="if(!confirm('<?php echo get_lang(
'ConfirmYourChoice'
); ?>')) return false;">
<?php Display::display_icon('delete.png', get_lang('Delete'), [], ICON_SIZE_SMALL); ?>
</a>
</td>
@ -225,7 +247,10 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
if ($num > $limit) {
if ($page) {
?>
<a href="<?php echo api_get_self(); ?>?page=<?php echo $page - 1; ?>&sort=<?php echo $sort; ?>&order=<?php echo Security::remove_XSS($_REQUEST['order']); ?>&keyword=<?php echo $_REQUEST['keyword']; ?><?php echo @$cond_url; ?>">
<a href="<?php echo api_get_self(); ?>?page=<?php echo $page
- 1; ?>&sort=<?php echo $sort; ?>&order=<?php echo Security::remove_XSS(
$_REQUEST['order']
); ?>&keyword=<?php echo $_REQUEST['keyword']; ?><?php echo @$cond_url; ?>">
<?php echo get_lang('Previous'); ?></a>
<?php
} else {
@ -236,7 +261,10 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
if ($nbr_results > $limit) {
?>
<a href="<?php echo api_get_self(); ?>?page=<?php echo $page + 1; ?>&sort=<?php echo $sort; ?>&order=<?php echo Security::remove_XSS($_REQUEST['order']); ?>&keyword=<?php echo $_REQUEST['keyword']; ?><?php echo @$cond_url; ?>">
<a href="<?php echo api_get_self(); ?>?page=<?php echo $page
+ 1; ?>&sort=<?php echo $sort; ?>&order=<?php echo Security::remove_XSS(
$_REQUEST['order']
); ?>&keyword=<?php echo $_REQUEST['keyword']; ?><?php echo @$cond_url; ?>">
<?php echo get_lang('Next'); ?></a>
<?php
@ -248,18 +276,28 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
<div class="row">
<div class="col-sm-4">
<div class="btn-group">
<a class="btn btn-default" href="#" onclick="selectAll('idChecked',<?php echo $x; ?>,'true');return false;"><?php echo get_lang('SelectAll'); ?></a>
<a class="btn btn-default" href="#" onclick="selectAll('idChecked',<?php echo $x; ?>,'false');return false;"><?php echo get_lang('UnSelectAll'); ?></a>
<button type="button" class="btn btn-default" onclick="selectAll('idChecked',<?php echo $x; ?>,'true');">
<?php echo get_lang('SelectAll'); ?>
</button>
<button type="button" class="btn btn-default" onclick="selectAll('idChecked',<?php echo $x; ?>,'false');">
<?php echo get_lang('UnSelectAll'); ?>
</button>
</div>
</div>
<div class="col-sm-6">
<select class="selectpicker show-tick form-control" name="action">
<option value="delete_off_session" selected="selected"><?php echo get_lang('DeleteSelectedSessionCategory'); ?></option>
<option value="delete_on_session"><?php echo get_lang('DeleteSelectedFullSessionCategory'); ?></option>
<option value="delete_off_session" selected="selected">
<?php echo get_lang('DeleteSelectedSessionCategory'); ?>
</option>
<option value="delete_on_session">
<?php echo get_lang('DeleteSelectedFullSessionCategory'); ?>
</option>
</select>
</div>
<div class="col-sm-2">
<button class="btn btn-success" type="submit" name="name" value="<?php echo get_lang('Ok'); ?>"><?php echo get_lang('Ok'); ?></button>
<button class="btn btn-success" type="submit" name="name" value="<?php echo get_lang('Ok'); ?>">
<?php echo get_lang('Ok'); ?>
</button>
</div>
</div>
<?php

Loading…
Cancel
Save