Skip to content

Commit

Permalink
fix #4
Browse files Browse the repository at this point in the history 
see #3
  • Loading branch information
amma35 committed Jan 29, 2018
1 parent 45e88e1 commit 77b4af3
Show file tree
Hide file tree
Showing 37 changed files with 960 additions and 1,121 deletions.
24 changes: 17 additions & 7 deletions front/config.form.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,23 @@

include('../../../inc/includes.php');

$config = new PluginAdditionalalertsConfig();
if (isset($_POST["update"])) {
$config->update($_POST);
Html::back();
} else {
Html::header(PluginAdditionalalertsAdditionalalert::getTypeName(2), '', "plugins", "pluginadditionalalertsmenu");
$plugin = new Plugin();
if ($plugin->isActivated("additionalalerts")) {

$config = new PluginAdditionalalertsConfig();
$config->showForm();
if (isset($_POST["update"])) {
$config->update($_POST);
Html::back();
} else {
Html::header(PluginAdditionalalertsAdditionalalert::getTypeName(2), '', "plugins", "pluginadditionalalertsmenu");
$config = new PluginAdditionalalertsConfig();
$config->showForm();
Html::footer();
}
} else {
Html::header(__('Setup'), '', "config", "plugins");
echo "<div align='center'><br><br>";
echo "<img src=\"" . $CFG_GLPI["root_doc"] . "/pics/warning.png\" alt='warning'><br><br>";
echo "<b>" . __('Please activate the plugin', 'additionalalerts') . "</b></div>";
Html::footer();
}
15 changes: 5 additions & 10 deletions inc/additionalalert.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,24 +62,21 @@ static function displayAlerts()
$infocom = new PluginAdditionalalertsInfocomAlert();
$infocom->getFromDBbyEntity($_SESSION["glpiactive_entity"]);
if (isset($infocom->fields["use_infocom_alert"])
&& $infocom->fields["use_infocom_alert"] > 0
)
&& $infocom->fields["use_infocom_alert"] > 0)
$use_infocom_alert = $infocom->fields["use_infocom_alert"];
else
$use_infocom_alert = $config->fields["use_infocom_alert"];

$ocsalert = new PluginAdditionalalertsOcsAlert();
$ocsalert->getFromDBbyEntity($_SESSION["glpiactive_entity"]);
if (isset($ocsalert->fields["use_newocs_alert"])
&& $ocsalert->fields["use_newocs_alert"] > 0
)
&& $ocsalert->fields["use_newocs_alert"] > 0)
$use_newocs_alert = $ocsalert->fields["use_newocs_alert"];
else
$use_newocs_alert = $config->fields["use_newocs_alert"];

if (isset($ocsalert->fields["delay_ocs"])
&& $ocsalert->fields["delay_ocs"] > 0
)
&& $ocsalert->fields["delay_ocs"] > 0)
$delay_ocs = $ocsalert->fields["delay_ocs"];
else
$delay_ocs = $config->fields["delay_ocs"];
Expand All @@ -99,8 +96,7 @@ static function displayAlerts()
$ticketunresolved = new PluginAdditionalalertsTicketUnresolved();
$ticketunresolved->getFromDBbyEntity($_SESSION["glpiactive_entity"]);
if (isset($ticketunresolved->fields["delay_ticket_alert"])
&& $ticketunresolved->fields["delay_ticket_alert"] > 0
) {
&& $ticketunresolved->fields["delay_ticket_alert"] > 0) {
$delay_ticket_alert = $ticketunresolved->fields["delay_ticket_alert"];
} else {
$delay_ticket_alert = $config->fields["delay_ticket_alert"];
Expand All @@ -109,8 +105,7 @@ static function displayAlerts()
$inkalert = new PluginAdditionalalertsInkAlert();
$inkalert->getFromDBbyEntity($_SESSION["glpiactive_entity"]);
if (isset($inkalert->fields["use_ink_alert"])
&& $inkalert->fields["use_ink_alert"] > 0
)
&& $inkalert->fields["use_ink_alert"] > 0)
$use_ink_alert = $inkalert->fields["use_ink_alert"];
else
$use_ink_alert = $config->fields["use_ink_alert"];
Expand Down
4 changes: 2 additions & 2 deletions inc/config.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ function showForm($options=array()) {

echo "<tr class='tab_bg_2'>";
echo "<td >" . __('New imported computers from OCS-NG', 'additionalalerts') . "</td><td>";
if($plugin->isActivated('ocsinventorying')){
if($plugin->isActivated('ocsinventoryng')){
Alert::dropdownYesNo(array('name'=>"use_newocs_alert",
'value'=>$this->fields["use_newocs_alert"]));
} else {
Expand All @@ -119,7 +119,7 @@ function showForm($options=array()) {
echo "</td></tr>";

echo "<tr class='tab_bg_2'><td >" . __('OCS-NG Synchronization alerts', 'additionalalerts') . "</td><td>";
if($plugin->isActivated('ocsinventorying')){
if($plugin->isActivated('ocsinventoryng')){
Alert::dropdownIntegerNever('delay_ocs',
$this->fields["delay_ocs"],
array('max'=>99));
Expand Down
7 changes: 4 additions & 3 deletions inc/infocomalert.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,11 @@ static function query($entity)
{
global $DB;

$query = "SELECT `glpi_computers`.*
$query = "SELECT `glpi_computers`.*, `glpi_items_operatingsystems`.`operatingsystems_id`
FROM `glpi_computers`
LEFT JOIN `glpi_infocoms` ON (`glpi_computers`.`id` = `glpi_infocoms`.`items_id` AND `glpi_infocoms`.`itemtype` = 'Computer')
LEFT JOIN `glpi_items_operatingsystems` ON (`glpi_computers`.`id` = `glpi_items_operatingsystems`.`items_id`
AND `glpi_items_operatingsystems`.`itemtype` = 'Computer')
WHERE `glpi_computers`.`is_deleted` = 0
AND `glpi_computers`.`is_template` = 0
AND `glpi_infocoms`.`buy_date` IS NULL ";
Expand Down Expand Up @@ -293,8 +295,7 @@ static function cronAdditionalalertsNotInfocom($task = NULL)
if (NotificationEvent::raiseEvent("notinfocom",
new PluginAdditionalalertsInfocomAlert(),
array('entities_id' => $entity,
'notinfocoms' => $notinfocoms))
) {
'notinfocoms' => $notinfocoms))) {
$message = $notinfocom_messages[$type][$entity];
$cron_status = 1;
if ($task) {
Expand Down
2 changes: 1 addition & 1 deletion inc/inkalert.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ static function configCron($target, $ID) {
echo "<form method='post' action=\"$target\">";
echo "<table class='tab_cadre_fixe' cellpadding='5'>";
echo "<tr class='tab_bg_1'>";
echo "<td>" . __('Parameter') . "</td>";
echo "<td>" . __('Parameter', 'additionalalerts') . "</td>";
echo "<td>" . __('Statutes used for the ink level', 'additionalalerts') . " : ";
Dropdown::show('State', array('name' => "states_id"));
echo "&nbsp;<input type='submit' name='add_state' value=\"" . __('Update') . "\" class='submit' ></div></td>";
Expand Down
30 changes: 15 additions & 15 deletions inc/notificationtargetinfocomalert.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,29 +52,29 @@ function getEvents()
* @param $event
* @param array $options
*/
function getDatasForTemplate($event, $options = array())
function addDataForTemplate($event, $options = array())
{
global $CFG_GLPI;

$this->datas['##notinfocom.entity##'] =
$this->data['##notinfocom.entity##'] =
Dropdown::getDropdownName('glpi_entities',
$options['entities_id']);
$this->datas['##lang.notinfocom.entity##'] = __('Entity');
$this->data['##lang.notinfocom.entity##'] = __('Entity');

$events = $this->getAllEvents();

$this->datas['##lang.notinfocom.title##'] = $events[$event];
$this->data['##lang.notinfocom.title##'] = $events[$event];

$this->datas['##lang.notinfocom.name##'] = __('Name');
$this->datas['##lang.notinfocom.urlname##'] = __('URL');
$this->datas['##lang.notinfocom.computertype##'] = __('Type');
$this->datas['##lang.notinfocom.operatingsystem##'] = __('Operating system');
$this->datas['##lang.notinfocom.state##'] = __('Status');
$this->datas['##lang.notinfocom.location##'] = __('Location');
$this->datas['##lang.notinfocom.urluser##'] = __('URL');
$this->datas['##lang.notinfocom.urlgroup##'] = __('URL');
$this->datas['##lang.notinfocom.user##'] = __('User');
$this->datas['##lang.notinfocom.group##'] = __('Group');
$this->data['##lang.notinfocom.name##'] = __('Name');
$this->data['##lang.notinfocom.urlname##'] = __('URL');
$this->data['##lang.notinfocom.computertype##'] = __('Type');
$this->data['##lang.notinfocom.operatingsystem##'] = __('Operating system');
$this->data['##lang.notinfocom.state##'] = __('Status');
$this->data['##lang.notinfocom.location##'] = __('Location');
$this->data['##lang.notinfocom.urluser##'] = __('URL');
$this->data['##lang.notinfocom.urlgroup##'] = __('URL');
$this->data['##lang.notinfocom.user##'] = __('User');
$this->data['##lang.notinfocom.group##'] = __('Group');

foreach ($options['notinfocoms'] as $id => $notinfocom) {
$tmp = array();
Expand All @@ -97,7 +97,7 @@ function getDatasForTemplate($event, $options = array())
$tmp['##notinfocom.group##'] = Dropdown::getDropdownName("glpi_groups", $notinfocom['groups_id']);
$tmp['##notinfocom.contact##'] = $notinfocom['contact'];

$this->datas['notinfocoms'][] = $tmp;
$this->data['notinfocoms'][] = $tmp;
}
}

Expand Down
16 changes: 8 additions & 8 deletions inc/notificationtargetinkalert.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,20 +50,20 @@ function getEvents()
* @param $event
* @param array $options
*/
function getDatasForTemplate($event, $options = array())
function addDataForTemplate($event, $options = array())
{
global $CFG_GLPI;

$this->datas['##ink.entity##'] = Dropdown::getDropdownName('glpi_entities', $options['entities_id']);
$this->datas['##lang.ink.entity##'] = __('Entity');
$this->data['##ink.entity##'] = Dropdown::getDropdownName('glpi_entities', $options['entities_id']);
$this->data['##lang.ink.entity##'] = __('Entity');

$events = $this->getAllEvents();

$this->datas['##lang.ink.title##'] = $events[$event];
$this->data['##lang.ink.title##'] = $events[$event];

$this->datas['##lang.ink.printer##'] = __('Printers');
$this->datas['##lang.ink.cartridge##'] = _n('Cartridge', 'Cartridges', 2);
$this->datas['##lang.ink.state##'] = __('State');
$this->data['##lang.ink.printer##'] = __('Printers');
$this->data['##lang.ink.cartridge##'] = _n('Cartridge', 'Cartridges', 2);
$this->data['##lang.ink.state##'] = __('State');

foreach ($options['ink'] as $id => $ink) {
$snmp = new PluginFusioninventoryPrinterCartridge();
Expand All @@ -83,7 +83,7 @@ function getDatasForTemplate($event, $options = array())
$tmp['##ink.cartridge##'] = $cartridge->fields['name'] . " (" . $cartridge->fields['ref'] . ")";
$tmp['##ink.state##'] = $snmp->fields['state'];

$this->datas['inks'][] = $tmp;
$this->data['inks'][] = $tmp;
}
}

Expand Down
116 changes: 56 additions & 60 deletions inc/notificationtargetocsalert.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,110 +35,106 @@
/**
* Class PluginAdditionalalertsNotificationTargetOcsAlert
*/
class PluginAdditionalalertsNotificationTargetOcsAlert extends NotificationTarget
{
class PluginAdditionalalertsNotificationTargetOcsAlert extends NotificationTarget {

static $rightname = "plugin_additionalalerts";

/**
* @return array
*/
function getEvents()
{
return array('ocs' => PluginAdditionalalertsOcsAlert::getTypeName(2),
'newocs' => __('New imported computers from OCS-NG', 'additionalalerts'));
function getEvents() {
return array('ocs' => PluginAdditionalalertsOcsAlert::getTypeName(2),
'newocs' => __('New imported computers from OCS-NG', 'additionalalerts'));
}

/**
* @param $event
* @param $event
* @param array $options
*/
function getDatasForTemplate($event, $options = array())
{
function addDataForTemplate($event, $options = array()) {
global $CFG_GLPI;

$this->datas['##ocsmachine.entity##'] =
$this->data['##ocsmachine.entity##'] =
Dropdown::getDropdownName('glpi_entities',
$options['entities_id']);
$this->datas['##lang.ocsmachine.entity##'] = __('Entity');
$options['entities_id']);
$this->data['##lang.ocsmachine.entity##'] = __('Entity');

$events = $this->getAllEvents();

$delay_ocs = $options["delay_ocs"];

if ($event == "newocs")
$this->datas['##lang.ocsmachine.title##'] = $events[$event];
$this->data['##lang.ocsmachine.title##'] = $events[$event];
else
$this->datas['##lang.ocsmachine.title##'] = __('Computers not synchronized with OCS-NG since more', 'additionalalerts') . " " . $delay_ocs . " " . _n('Day', 'Days', 2);
$this->datas['##lang.ocsmachine.name##'] = __('Name');
$this->datas['##lang.ocsmachine.urlname##'] = __('URL');
$this->datas['##lang.ocsmachine.operatingsystem##'] = __('Operating system');
$this->datas['##lang.ocsmachine.state##'] = __('Status');
$this->datas['##lang.ocsmachine.location##'] = __('Location');
$this->datas['##lang.ocsmachine.user##'] = __('User') . " / " . __('Group') . " / " . __('Alternate username');
$this->datas['##lang.ocsmachine.urluser##'] = __('URL');
$this->datas['##lang.ocsmachine.urlgroup##'] = __('URL');
$this->datas['##lang.ocsmachine.lastocsupdate##'] = __('Last OCSNG inventory date', 'additionalalerts');
$this->datas['##lang.ocsmachine.lastupdate##'] = __('Import date in GLPI', 'additionalalerts');
$this->datas['##lang.ocsmachine.ocsserver##'] = __('OCSNG server', 'additionalalerts');
$this->data['##lang.ocsmachine.title##'] = __('Computers not synchronized with OCS-NG since more', 'additionalalerts') . " " . $delay_ocs . " " . _n('Day', 'Days', 2);
$this->data['##lang.ocsmachine.name##'] = __('Name');
$this->data['##lang.ocsmachine.urlname##'] = __('URL');
$this->data['##lang.ocsmachine.operatingsystem##'] = __('Operating system');
$this->data['##lang.ocsmachine.state##'] = __('Status');
$this->data['##lang.ocsmachine.location##'] = __('Location');
$this->data['##lang.ocsmachine.user##'] = __('User') . " / " . __('Group') . " / " . __('Alternate username');
$this->data['##lang.ocsmachine.urluser##'] = __('URL');
$this->data['##lang.ocsmachine.urlgroup##'] = __('URL');
$this->data['##lang.ocsmachine.lastocsupdate##'] = __('Last OCSNG inventory date', 'additionalalerts');
$this->data['##lang.ocsmachine.lastupdate##'] = __('Import date in GLPI', 'additionalalerts');
$this->data['##lang.ocsmachine.ocsserver##'] = __('OCSNG server', 'additionalalerts');

foreach ($options['ocsmachines'] as $id => $ocsmachine) {
$tmp = array();

$tmp['##ocsmachine.urlname##'] = urldecode($CFG_GLPI["url_base"] . "/index.php?redirect=computer_" .
$ocsmachine['id']);
$tmp['##ocsmachine.name##'] = $ocsmachine['name'];
$tmp['##ocsmachine.urlname##'] = urldecode($CFG_GLPI["url_base"] . "/index.php?redirect=computer_" .
$ocsmachine['id']);
$tmp['##ocsmachine.name##'] = $ocsmachine['name'];
$tmp['##ocsmachine.operatingsystem##'] = Dropdown::getDropdownName("glpi_operatingsystems", $ocsmachine['operatingsystems_id']);
$tmp['##ocsmachine.state##'] = Dropdown::getDropdownName("glpi_states", $ocsmachine['states_id']);
$tmp['##ocsmachine.location##'] = Dropdown::getDropdownName("glpi_locations", $ocsmachine['locations_id']);
$tmp['##ocsmachine.state##'] = Dropdown::getDropdownName("glpi_states", $ocsmachine['states_id']);
$tmp['##ocsmachine.location##'] = Dropdown::getDropdownName("glpi_locations", $ocsmachine['locations_id']);

$tmp['##ocsmachine.urluser##'] = urldecode($CFG_GLPI["url_base"] . "/index.php?redirect=user_" .
$ocsmachine['users_id']);
$ocsmachine['users_id']);

$tmp['##ocsmachine.urlgroup##'] = urldecode($CFG_GLPI["url_base"] . "/index.php?redirect=group_" .
$ocsmachine['groups_id']);
$ocsmachine['groups_id']);

$tmp['##ocsmachine.user##'] = getUserName($ocsmachine['users_id']);
$tmp['##ocsmachine.group##'] = Dropdown::getDropdownName("glpi_groups", $ocsmachine['groups_id']);
$tmp['##ocsmachine.user##'] = getUserName($ocsmachine['users_id']);
$tmp['##ocsmachine.group##'] = Dropdown::getDropdownName("glpi_groups", $ocsmachine['groups_id']);
$tmp['##ocsmachine.contact##'] = $ocsmachine['contact'];

$tmp['##ocsmachine.lastocsupdate##'] = Html::convDateTime($ocsmachine['last_ocs_update']);
$tmp['##ocsmachine.lastupdate##'] = Html::convDateTime($ocsmachine['last_update']);
$tmp['##ocsmachine.ocsserver##'] = Dropdown::getDropdownName("glpi_plugin_ocsinventoryng_ocsservers", $ocsmachine['plugin_ocsinventoryng_ocsservers_id']);
$tmp['##ocsmachine.lastupdate##'] = Html::convDateTime($ocsmachine['last_update']);
$tmp['##ocsmachine.ocsserver##'] = Dropdown::getDropdownName("glpi_plugin_ocsinventoryng_ocsservers", $ocsmachine['plugin_ocsinventoryng_ocsservers_id']);

$this->datas['ocsmachines'][] = $tmp;
$this->data['ocsmachines'][] = $tmp;
}
}

/**
*
*/
function getTags()
{

$tags = array('ocsmachine.name' => __('Name'),
'ocsmachine.urlname' => __('URL') . " " . __('Name'),
'ocsmachine.operatingsystem' => __('Operating system'),
'ocsmachine.state' => __('Status'),
'ocsmachine.location' => __('Location'),
'ocsmachine.user' => __('User'),
'ocsmachine.urluser' => __('URL') . " " . __('User'),
'ocsmachine.group' => __('Group'),
'ocsmachine.urlgroup' => __('URL') . " " . __('Group'),
'ocsmachine.contact' => __('Alternate username'),
'ocsmachine.lastocsupdate' => __('Last OCSNG inventory date', 'additionalalerts'),
'ocsmachine.lastupdate' => __('Import date in GLPI', 'additionalalerts'),
'ocsmachine.ocsserver' => __('OCSNG server', 'additionalalerts'));
function getTags() {

$tags = array('ocsmachine.name' => __('Name'),
'ocsmachine.urlname' => __('URL') . " " . __('Name'),
'ocsmachine.operatingsystem' => __('Operating system'),
'ocsmachine.state' => __('Status'),
'ocsmachine.location' => __('Location'),
'ocsmachine.user' => __('User'),
'ocsmachine.urluser' => __('URL') . " " . __('User'),
'ocsmachine.group' => __('Group'),
'ocsmachine.urlgroup' => __('URL') . " " . __('Group'),
'ocsmachine.contact' => __('Alternate username'),
'ocsmachine.lastocsupdate' => __('Last OCSNG inventory date', 'additionalalerts'),
'ocsmachine.lastupdate' => __('Import date in GLPI', 'additionalalerts'),
'ocsmachine.ocsserver' => __('OCSNG server', 'additionalalerts'));
foreach ($tags as $tag => $label) {
$this->addTagToList(array('tag' => $tag, 'label' => $label,
'value' => true));
$this->addTagToList(array('tag' => $tag, 'label' => $label,
'value' => true));
}

$this->addTagToList(array('tag' => 'additionalalerts',
'label' => PluginAdditionalalertsOcsAlert::getTypeName(2),
'value' => false,
'foreach' => true,
'events' => array('ocs', 'newocs')));
$this->addTagToList(array('tag' => 'additionalalerts',
'label' => PluginAdditionalalertsOcsAlert::getTypeName(2),
'value' => false,
'foreach' => true,
'events' => array('ocs', 'newocs')));

asort($this->tag_descriptions);
}
Expand Down
Loading

0 comments on commit 77b4af3

Please sign in to comment.