Format code - refs #6715

1.9.x
Francis Gonzales 12 years ago
parent 2c23cf4b44
commit c0ba6cd567
  1. 8
      main/inc/lib/plugin.lib.php
  2. 38
      plugin/ticket/src/new_ticket.php
  3. 5
      plugin/ticket/src/ticket.class.php

@ -180,15 +180,17 @@ class AppPlugin
} else { } else {
$urlId = intval($urlId); $urlId = intval($urlId);
} }
api_delete_settings_params( // First call the custom uninstall to allow full access to global settings
array('category = ? AND access_url = ? AND subkey = ? ' => array('Plugins', $urlId, $pluginName))
);
$pluginPath = api_get_path(SYS_PLUGIN_PATH).$pluginName.'/uninstall.php'; $pluginPath = api_get_path(SYS_PLUGIN_PATH).$pluginName.'/uninstall.php';
if (is_file($pluginPath) && is_readable($pluginPath)) { if (is_file($pluginPath) && is_readable($pluginPath)) {
// Execute the uninstall procedure. // Execute the uninstall procedure.
require $pluginPath; require $pluginPath;
} }
// Second remove all remaining global settings
api_delete_settings_params(
array('category = ? AND access_url = ? AND subkey = ? ' => array('Plugins', $urlId, $pluginName))
);
} }
/** /**

@ -36,24 +36,24 @@ function load_course_list (div_course,my_user_id) {
} }
function changeType() { function changeType() {
var selected = document.getElementById("category_id").selectedIndex; var selected = document.getElementById("category_id").selectedIndex;
var id = document.getElementById("category_id").options[selected].value ; var id = document.getElementById("category_id").options[selected].value;
document.getElementById("project_id").value= projects[id]; document.getElementById("project_id").value = projects[id];
document.getElementById("other_area").value= other_area[id]; document.getElementById("other_area").value = other_area[id];
document.getElementById("email").value= email[id]; document.getElementById("email").value = email[id];
document.getElementById("divEmail").style.display="none"; document.getElementById("divEmail").style.display = "none";
if(parseInt(course_required[id]) == 0){ if(parseInt(course_required[id]) == 0){
document.getElementById("divCourse").style.display="none"; document.getElementById("divCourse").style.display = "none";
if( id != "CUR"){ if( id != "CUR"){
document.getElementById("divEmail").style.display=""; document.getElementById("divEmail").style.display = "";
document.getElementById("personal_email").required="required"; document.getElementById("personal_email").required = "required";
} }
document.getElementById("course_id").disabled=true; document.getElementById("course_id").disabled = true;
document.getElementById("course_id").value=0; document.getElementById("course_id").value = 0;
}else{ }else{
document.getElementById("divCourse").style.display = ""; document.getElementById("divCourse").style.display = "";
document.getElementById("course_id").disabled=false; document.getElementById("course_id").disabled = false;
document.getElementById("course_id").value=0; document.getElementById("course_id").value = 0;
document.getElementById("personal_email").value=""; document.getElementById("personal_email").value = "";
} }
} }
function handleClick2(myRadio) { function handleClick2(myRadio) {
@ -67,22 +67,22 @@ function validate() {
document.getElementById("content").value= fckEditor1val; document.getElementById("content").value= fckEditor1val;
var selected = document.getElementById("category_id").selectedIndex; var selected = document.getElementById("category_id").selectedIndex;
var id = document.getElementById("category_id").options[selected].value; var id = document.getElementById("category_id").options[selected].value;
if(document.getElementById("user_id_request").value == ""){ if (document.getElementById("user_id_request").value == "") {
alert("' . $plugin->get_lang("ValidUser") . '"); alert("' . $plugin->get_lang("ValidUser") . '");
return false; return false;
}else if( id == 0){ } else if( id == 0) {
alert("' . $plugin->get_lang("ValidType") . '"); alert("' . $plugin->get_lang("ValidType") . '");
return false; return false;
}else if(document.getElementById("subject").value == ""){ } else if(document.getElementById("subject").value == "") {
alert("' . $plugin->get_lang("ValidSubject") . '"); alert("' . $plugin->get_lang("ValidSubject") . '");
return false; return false;
}else if(parseInt(course_required[id]) == 1 && document.getElementById("course_id").value == 0){ } else if(parseInt(course_required[id]) == 1 && document.getElementById("course_id").value == 0) {
alert("' . $plugin->get_lang("ValidCourse") . '"); alert("' . $plugin->get_lang("ValidCourse") . '");
return false; return false;
}else if(id !="CUR" && parseInt(course_required[id]) != 1 && !re.test(document.getElementById("personal_email").value)){ } else if(id !="CUR" && parseInt(course_required[id]) != 1 && !re.test(document.getElementById("personal_email").value)) {
alert("' . $plugin->get_lang("ValidEmail") . '"); alert("' . $plugin->get_lang("ValidEmail") . '");
return false; return false;
}else if(fckEditor1val ==""){ } else if(fckEditor1val == "") {
alert("' . $plugin->get_lang("ValidMessage") . '"); alert("' . $plugin->get_lang("ValidMessage") . '");
return false; return false;
} }

@ -34,8 +34,9 @@ class TicketManager
TABLE_TICKET_PROJECT TABLE_TICKET_PROJECT
); );
$sql = "SELECT category.*, project.other_area , project.email $sql = "SELECT category.*, project.other_area , project.email
FROM " . $table_support_category . " category," . $table_support_project . " project FROM $table_support_category category, $table_support_project project
WHERE project.project_id = category.project_id ORDER BY category.total_tickets DESC;"; WHERE project.project_id = category.project_id
ORDER BY category.total_tickets DESC;";
$result = Database::query($sql); $result = Database::query($sql);
$types = array(); $types = array();
while ($row = Database::fetch_assoc($result)) { while ($row = Database::fetch_assoc($result)) {

Loading…
Cancel
Save