Browse Source

Minor - format code removing unused variables see #6715

Julio Montoya 11 years ago
parent
commit
e838cb05a7

+ 11 - 7
plugin/ticket/src/assign_tickets.php

@@ -23,21 +23,23 @@ $id = intval($_GET['id']);
 $tblWeeklyReport = Database::get_main_table('rp_reporte_semanas');
 $sql ="SELECT * FROM $tblWeeklyReport WHERE id = '$id'";
 $sql_tasks = "SELECT id AS colid, title as coltitle
-    FROM ".Database::get_course_table(TABLE_STUDENT_PUBLICATION , $course_info['dbName'])."
+    FROM ".Database::get_course_table(TABLE_STUDENT_PUBLICATION)."
     WHERE parent_id = 0
         AND id NOT IN (
             SELECT work_id
             FROM $tblWeeklyReport
-            WHERE course_code = '$course_code'
-                AND id != '$id'
+            WHERE
+                course_code = '$course_code' AND
+                id != '$id'
         )";
 $sql_forum = "SELECT thread_id AS colid, thread_title AS coltitle
-    FROM ".Database::get_course_table(TABLE_FORUM_THREAD, $course_info['dbName'])."
+    FROM ".Database::get_course_table(TABLE_FORUM_THREAD)."
     WHERE thread_id NOT IN (
         SELECT forum_id
             FROM $tblWeeklyReport
-            WHERE course_code = '$course_code'
-                AND id != '$id'
+            WHERE
+                course_code = '$course_code' AND
+                id != '$id'
     )";
 $rs = Database::fetch_object(Database::query($sql));
 $result_tareas = Database::query($sql_tasks);
@@ -63,6 +65,8 @@ while ($row = Database::fetch_assoc($result_forum)) {
 }
 echo '</select></div><div>';
 echo '<div class="row">
-        <div class="formw"><button class="save" name="edit" type="button" value="' . get_lang('Edit') . '" onClick="save(' . "$id" . ');">' . get_lang('Edit') . '</button></div>
+        <div class="formw">
+        <button class="save" name="edit" type="button" value="' . get_lang('Edit') . '" onClick="save(' . "$id" . ');">' . get_lang('Edit') . '</button>
+        </div>
     </div>';
 echo '</form>';

+ 1 - 0
plugin/ticket/src/index.php

@@ -9,3 +9,4 @@
  */
 require_once '../config.php';
 header('location:' . api_get_path(WEB_PLUGIN_PATH) . PLUGIN_NAME . '/src/myticket.php?message=success');
+exit;

+ 36 - 28
plugin/ticket/src/myticket.php

@@ -43,12 +43,12 @@ function clear_course_list (div_course) {
     $("div#"+div_course).html("&nbsp;");
     $("div#"+div_course).hide("");
 }
-		
+
 $(function() {
     $( "#keyword_start_date_start" ).datepicker({ dateFormat: ' . "'dd/mm/yy'" . ' });
     $( "#keyword_start_date_end" ).datepicker({ dateFormat: ' . "'dd/mm/yy'" . ' });
 });
-  	
+
 $(document).ready(function() {
         $("#advanced_search_form").css("display","none");
 });
@@ -97,7 +97,7 @@ function display_advanced_search_form () {
     border: 1px solid black;
     width: 350px;
     background-color: white;
-    z-index: 99; 
+    z-index: 99;
     padding: 3px;
     display: inline;
 }
@@ -130,7 +130,15 @@ function display_advanced_search_form () {
 $this_section = 'tickets';
 unset($_SESSION['this_section']);
 
-$table = new SortableTable('Tickets', array('TicketManager', 'get_total_tickets_by_user_id'), array('TicketManager', 'get_tickets_by_user_id'), 2, 20, 'DESC');
+$table = new SortableTable(
+    'Tickets',
+    array('TicketManager', 'get_total_tickets_by_user_id'),
+    array('TicketManager', 'get_tickets_by_user_id'),
+    2,
+    20,
+    'DESC'
+);
+
 if ($table->per_page == 0) {
     $table->per_page = 20;
 }
@@ -153,32 +161,32 @@ if (isset($_GET['action'])) {
             break;
         case 'export':
             $data = array(
-                        array(
-                            $plugin->get_lang('TicketNum'), 
-                            $plugin->get_lang('Date'), 
-                            $plugin->get_lang('DateLastEdition'), 
-                            $plugin->get_lang('Category'), 
-                            $plugin->get_lang('User'), 
-                            $plugin->get_lang('Program'), 
-                            $plugin->get_lang('Responsible'), 
-                            $plugin->get_lang('Status'), 
-                            $plugin->get_lang('Description')
-                        )
-                    );
+                array(
+                    $plugin->get_lang('TicketNum'),
+                    $plugin->get_lang('Date'),
+                    $plugin->get_lang('DateLastEdition'),
+                    $plugin->get_lang('Category'),
+                    $plugin->get_lang('User'),
+                    $plugin->get_lang('Program'),
+                    $plugin->get_lang('Responsible'),
+                    $plugin->get_lang('Status'),
+                    $plugin->get_lang('Description')
+                )
+            );
             $datos = $table->get_clean_html();
             foreach ($datos as $ticket) {
                 $ticket[0] = substr(strip_tags($ticket[0]), 0, 12);
                 $ticket_rem = array(
-                    utf8_decode(strip_tags($ticket[0])), 
-                    utf8_decode(api_html_entity_decode($ticket[1])), 
-                    utf8_decode(strip_tags($ticket[2])), 
-                    utf8_decode(strip_tags($ticket[3])), 
-                    utf8_decode(strip_tags($ticket[4])), 
-                    utf8_decode(strip_tags($ticket[5])), 
-                    utf8_decode(strip_tags($ticket[6])), 
-                    utf8_decode(strip_tags($ticket[7])), 
+                    utf8_decode(strip_tags($ticket[0])),
+                    utf8_decode(api_html_entity_decode($ticket[1])),
+                    utf8_decode(strip_tags($ticket[2])),
+                    utf8_decode(strip_tags($ticket[3])),
+                    utf8_decode(strip_tags($ticket[4])),
+                    utf8_decode(strip_tags($ticket[5])),
+                    utf8_decode(strip_tags($ticket[6])),
+                    utf8_decode(strip_tags($ticket[7])),
                     utf8_decode(strip_tags(str_replace('&nbsp;', ' ', $ticket[9])))
-                    );
+                );
                 $data[] = $ticket_rem;
             }
             Export::export_table_xls($data, $plugin->get_lang('Tickets'));
@@ -251,7 +259,7 @@ if ($isAdmin) {
     $renderer->setElementTemplate('<span>{element}</span> ');
     $form->addElement('text', 'keyword', get_lang('keyword'), 'size="25"');
     $form->addElement('style_submit_button', 'submit_simple', get_lang('Search'), 'class="search"');
-    $form->addElement('static', 'search_advanced_link', null, 
+    $form->addElement('static', 'search_advanced_link', null,
             '<a href="javascript://" class = "advanced-parameters" onclick="display_advanced_search_form();">'
             . '<span id="img_plus_and_minus">&nbsp;'
             . Display::return_icon('div_show.gif', get_lang('Show')) . ' '
@@ -262,7 +270,7 @@ if ($isAdmin) {
         echo '<span class="fleft">' .
                 '<a href="' . api_get_path(WEB_PLUGIN_PATH) . 'ticket/src/new_ticket.php">' .
                     Display::return_icon('add.png', $plugin->get_lang('TckNew'), '', '32') . '</a>' .
-                '<a href="' . api_get_self() . '?action=export' . $get_parameter . $get_parameter2 . '">' .    
+                '<a href="' . api_get_self() . '?action=export' . $get_parameter . $get_parameter2 . '">' .
                     Display::return_icon('export_excel.png', get_lang('Export'), '', '32') . '</a>' .
              '</span>';
     }
@@ -354,7 +362,7 @@ if ($isAdmin) {
         echo '<div class="actions" >';
         echo '<span style="float:right;">' .
                 '<a href="' . api_get_path(WEB_PLUGIN_PATH) . 'ticket/src/new_ticket.php">' .
-                    Display::return_icon('add.png', $plugin->get_lang('TckNew'), '', '32') . 
+                    Display::return_icon('add.png', $plugin->get_lang('TckNew'), '', '32') .
                 '</a>' .
               '</span>';
         echo '<span style="float:right;">' .

+ 2 - 3
plugin/ticket/src/new_ticket.php

@@ -161,11 +161,11 @@ function js_str($s)
  */
 function js_array($array, $name, $key)
 {
-    $temp = array();
     $return = "new Array(); ";
     foreach ($array as $value) {
         $return .= $name . "['" . $value['category_id'] . "'] ='" . $value[$key] . "'; ";
     }
+
     return $return;
 }
 
@@ -362,6 +362,7 @@ function save_ticket()
             $source, $priority, $status, $user_id,
             $responsible)) {
         header('location:' . api_get_path(WEB_PLUGIN_PATH) . PLUGIN_NAME . '/src/myticket.php?message=success');
+        exit;
     } else {
         Display::display_header(get_lang('ComposeMessage'));
         Display::display_error_message($plugin->get_lang('ErrorRegisterMessage'));
@@ -406,7 +407,6 @@ function get_number_of_users()
 function get_user_data($from, $number_of_items, $column, $direction)
 {
     $user_table = Database :: get_main_table(TABLE_MAIN_USER);
-    $admin_table = Database :: get_main_table(TABLE_MAIN_ADMIN);
 
     if (api_is_western_name_order()) {
         $col34 = "u.firstname AS col3,
@@ -451,7 +451,6 @@ function get_user_data($from, $number_of_items, $column, $direction)
     $res = Database::query($sql);
 
     $users = array();
-    $t = time();
     while ($user = Database::fetch_row($res)) {
         $user_id = $user[0];
         $image_path = UserManager::get_user_picture_path_by_id($user_id, 'web', false, true);

+ 30 - 31
plugin/ticket/src/report.php

@@ -67,7 +67,7 @@ div.ticket-form {
     width: 70%;
     float: center;
     margin-left: 15%;
-	
+
 }
 
 </style>';
@@ -120,7 +120,7 @@ function show_form()
 	<div class="label2"  >' . get_lang('Tool') .':</div>
 	<div class="formw2">';
     $select_tool .= '<select style="width: 95%; " name = "tool" id="tool" >';
-    
+
     foreach ($tools as $tool) {
         $select_tool .= "<option value = '" . $tool['id'] . "' selected >" . $tool['name'] . "</option>";
     }
@@ -139,7 +139,7 @@ function show_form()
     echo '<div class="row">
 		<div class="label2">
 		</div>
-		<div class="formw2">	
+		<div class="formw2">
 			<button class="save" name="report" type="submit" id="btnsubmit" disabled="disabled">' . get_lang('CompleteReport') .'</button>
 		</div>
 	</div>';
@@ -159,12 +159,12 @@ function get_number_of_users()
     }
     if (isset($_GET['keyword'])) {
         $keyword = Database::escape_string(trim($_GET['keyword']));
-        $sql .= " WHERE (u.firstname LIKE '%$keyword%' OR 
-                  u.lastname LIKE '%$keyword%'  OR 
-                  concat(u.firstname,' ',u.lastname) LIKE '%$keyword%' OR 
-                  concat(u.lastname,' ',u.firstname) LIKE '%$keyword%' OR 
-                  u.username LIKE '%$keyword%' OR 
-                  u.email LIKE '%$keyword %'  OR 
+        $sql .= " WHERE (u.firstname LIKE '%$keyword%' OR
+                  u.lastname LIKE '%$keyword%'  OR
+                  concat(u.firstname,' ',u.lastname) LIKE '%$keyword%' OR
+                  concat(u.lastname,' ',u.firstname) LIKE '%$keyword%' OR
+                  u.username LIKE '%$keyword%' OR
+                  u.email LIKE '%$keyword %'  OR
                   u.official_code LIKE '%$keyword%') ";
     }
     $res = Database::query($sql);
@@ -183,8 +183,7 @@ function get_number_of_users()
 function get_user_data($from, $number_of_items, $column, $direction)
 {
     $user_table = Database :: get_main_table(TABLE_MAIN_USER);
-    $admin_table = Database :: get_main_table(TABLE_MAIN_ADMIN);
-    
+
     if (api_is_western_name_order()) {
         $col34 = "u.firstname AS col3,
                   u.lastname AS col4,";
@@ -192,27 +191,27 @@ function get_user_data($from, $number_of_items, $column, $direction)
         $col34 = "u.lastname AS col3,
                   u.firstname AS col4,";
     }
-    
+
     $sql = "SELECT
-                 u.user_id AS col0, 
-                 u.official_code AS col2, 
-		 $col34 
-                 u.username AS col5, 
-                 u.email AS col6, 
-                 u.status AS col7, 
-                 u.active AS col8, 
-                 u.user_id AS col9, 
-              u.expiration_date AS exp 
+                 u.user_id AS col0,
+                 u.official_code AS col2,
+		 $col34
+                 u.username AS col5,
+                 u.email AS col6,
+                 u.status AS col7,
+                 u.active AS col8,
+                 u.user_id AS col9,
+              u.expiration_date AS exp
            FROM $user_table u ";
 
     if (isset($_GET['keyword'])) {
         $keyword = Database::escape_string(trim($_GET['keyword']));
         $sql .= " WHERE (u.firstname LIKE '%$keyword%' OR
-                  u.lastname LIKE '%$keyword%' OR 
-                  concat(u.firstname,' ',u.lastname) LIKE '%$keyword%' OR 
-                  concat(u.lastname,' ',u.firstname) LIKE '%$keyword%' OR 
-                  u.username LIKE '%$keyword%'  OR 
-                  u.official_code LIKE '%$keyword%' 
+                  u.lastname LIKE '%$keyword%' OR
+                  concat(u.firstname,' ',u.lastname) LIKE '%$keyword%' OR
+                  concat(u.lastname,' ',u.firstname) LIKE '%$keyword%' OR
+                  u.username LIKE '%$keyword%'  OR
+                  u.official_code LIKE '%$keyword%'
                   OR u.email LIKE '%$keyword%' )";
     }
     if (!in_array($direction, array('ASC', 'DESC'))) {
@@ -280,9 +279,9 @@ if (isset($_POST['report'])) {
     $tool = $_POST['tool'];
     $course_info = api_get_course_info_by_id($course_id);
     $user_id = $_POST['user_id_request'];
-    $sql = "SELECT  
-                u.username , CONCAT(u.lastname, ' ', u.firstname) AS fullname, 
-                DATE_SUB(access.access_date,INTERVAL 5 HOUR) AS  access_date, 
+    $sql = "SELECT
+                u.username , CONCAT(u.lastname, ' ', u.firstname) AS fullname,
+                DATE_SUB(access.access_date,INTERVAL 5 HOUR) AS  access_date,
                 c.title AS course, access_tool AS tool
             FROM  " . Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ACCESS) . " access
             LEFT JOIN  " . Database::get_main_table(TABLE_MAIN_USER) . " u ON access.access_user_id = u.user_id
@@ -291,10 +290,10 @@ if (isset($_POST['report'])) {
     if ($tool != '') {
         $sql.="AND access.access_tool = '$tool' ";
     }
-    
+
     $start_date = $_POST['keyword_start_date_start'];
     $end_date = $_POST['keyword_start_date_end'];
-    
+
     if ($start_date != '' || $end_date != '') {
         $sql .= " HAVING ";
         if ($start_date != '')