\ from path, is not insert to MySQL database
resolved:
mysqli_real_escape_string and table for registry key:
--
Michał Panasiewicz Linux user nr. #425323 - jabber: wolvverine [at]chrome
[dot]pl
e-mail: wolvverine [ at ] tlen [ dot ] pl , wolvverine [at] pld-linux
[dot]org
http://www.linkomp.pl - Linkomp - Usługi informatyczne dla firm - biuro [at]
linkomp [dot]pl
PLD Linux Distribution Developer - http://www.pld-linux.org
diff -uNr mskey.orig/hook.php mskey/hook.php
--- mskey.orig/hook.php 2009-12-21 02:24:43.000000000 +0100
+++ mskey/hook.php 2009-12-21 20:25:04.000000000 +0100
@@ -32,7 +32,6 @@
// Original Author of file: Damien BARON
// Purpose of file:
// ----------------------------------------------------------------------
-
include_once (GLPI_ROOT . '/inc/ocsng.class.php');
include_once (GLPI_ROOT . '/inc/ocsng.function.php');
@@ -43,42 +42,21 @@
global $DB, $DBocs, $CFG_GLPI;
include_once (GLPI_ROOT."/inc/profile.class.php");
-
- plugin_mskey_installing("1.0.0");
+
+ plugin_mskey_installing("1.0.0");
plugin_mskey_createfirstaccess($_SESSION['glpiactiveprofile']['ID']);
$query = "SELECT ID FROM glpi_ocs_config ORDER BY name ASC";
$result = $DB->query($query);
while ($ocs = $DB->fetch_array($result))
{
- checkOCSconnection($ocs["ID"]);
+ checkOCSconnection($ocs["ID"]);
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE', 2,'SOFTWARE\\Microsoft\\Office\\9.0\\Registration\\{9011040C-6000-11D3-8CFE-0150048383C9}','DigitalProductID');");
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE-PROD', 2,'SOFTWARE\\Microsoft\\Office\\9.0\\Registration\\{9011040C-6000-11D3-8CFE-0150048383C9}','ProductName');");
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE', 2,'SOFTWARE\\Microsoft\\Office\\10.0\\Registration\\{9011040C-6000-11D3-8CFE-0150048383C9}','DigitalProductID');");
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE-PROD', 2,'SOFTWARE\\Microsoft\\Office\\10.0\\Registration\\{9011040C-6000-11D3-8CFE-0150048383C9}','ProductName');");
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE', 2,'SOFTWARE\\Microsoft\\Office\\11.0\\Registration\\{9011040C-6000-11D3-8CFE-0150048383C9}','DigitalProductID');");
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE-PROD', 2,'SOFTWARE\\Microsoft\\Office\\11.0\\Registration\\{9011040C-6000-11D3-8CFE-0150048383C9}','ProductName');");
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE', 2,'SOFTWARE\\Microsoft\\Office\\12.0\\Registration\\{9011040C-6000-11D3-8CFE-0150048383C9}','DigitalProductID');");
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE-PROD', 2,'SOFTWARE\\Microsoft\\Office\\12.0\\Registration\\{9011040C-6000-11D3-8CFE-0150048383C9}','ProductName');");
-
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE', 2,'SOFTWARE\\Microsoft\\Office\\9.0\\Registration\\{91CA040C-6000-11D3-8CFE-0150048383C9}','DigitalProductID');");
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE-PROD', 2,'SOFTWARE\\Microsoft\\Office\\9.0\\Registration\\{91CA040C-6000-11D3-8CFE-0150048383C9}','ProductName');");
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE', 2,'SOFTWARE\\Microsoft\\Office\\10.0\\Registration\\{91CA040C-6000-11D3-8CFE-0150048383C9}','DigitalProductID');");
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE-PROD', 2,'SOFTWARE\\Microsoft\\Office\\10.0\\Registration\\{91CA040C-6000-11D3-8CFE-0150048383C9}','ProductName');");
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE', 2,'SOFTWARE\\Microsoft\\Office\\11.0\\Registration\\{91CA040C-6000-11D3-8CFE-0150048383C9}','DigitalProductID');");
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE-PROD', 2,'SOFTWARE\\Microsoft\\Office\\11.0\\Registration\\{91CA040C-6000-11D3-8CFE-0150048383C9}','ProductName');");
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE', 2,'SOFTWARE\\Microsoft\\Office\\12.0\\Registration\\{91CA040C-6000-11D3-8CFE-0150048383C9}','DigitalProductID');");
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE-PROD', 2,'SOFTWARE\\Microsoft\\Office\\12.0\\Registration\\{91CA040C-6000-11D3-8CFE-0150048383C9}','ProductName');");
-
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE', 2,'SOFTWARE\\Microsoft\\Office\\9.0\\Registration\\{91120000-6000-11D3-8CFE-0150048383C9}','DigitalProductID');");
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE-PROD', 2,'SOFTWARE\\Microsoft\\Office\\9.0\\Registration\\{91120000-6000-11D3-8CFE-0150048383C9}','ProductName');");
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE', 2,'SOFTWARE\\Microsoft\\Office\\10.0\\Registration\\{91120000-6000-11D3-8CFE-0150048383C9}','DigitalProductID');");
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE-PROD', 2,'SOFTWARE\\Microsoft\\Office\\10.0\\Registration\\{91120000-6000-11D3-8CFE-0150048383C9}','ProductName');");
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE', 2,'SOFTWARE\\Microsoft\\Office\\11.0\\Registration\\{91120000-6000-11D3-8CFE-0150048383C9}','DigitalProductID');");
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE-PROD', 2,'SOFTWARE\\Microsoft\\Office\\11.0\\Registration\\{91120000-6000-11D3-8CFE-0150048383C9}','ProductName');");
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE', 2,'SOFTWARE\\Microsoft\\Office\\12.0\\Registration\\{91120000-6000-11D3-8CFE-0150048383C9}','DigitalProductID');");
- $DBocs->query("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE-PROD', 2,'SOFTWARE\\Microsoft\\Office\\12.0\\Registration\\{91120000-6000-11D3-8CFE-0150048383C9}','ProductName');");
+ include_once (GLPI_ROOT."/plugins/mskey/plugin_mskey.msofficeregkey.php");
+ foreach ($msofficeregkey_table as $regkey) {
+ $DBocs->query ("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE', 2,'".mysql_real_escape_string($regkey)."','DigitalProductID');");
+ $DBocs->query ("INSERT INTO `regconfig` (`NAME`, `REGTREE`, `REGKEY`, `REGVALUE`) VALUES ('MSKEY-OFFICE-PROD', 2,'".mysql_real_escape_string($regkey)."','ProductName');");
+ }
}
return true;
}
@@ -174,4 +152,5 @@
return false;
*/
}
-?>
\ Brak znaku nowej linii na końcu pliku
+?>
+
diff -uNr mskey.orig/plugin_mskey.msofficeregkey.php mskey/plugin_mskey.msofficeregkey.php
--- mskey.orig/plugin_mskey.msofficeregkey.php 1970-01-01 01:00:00.000000000 +0100
+++ mskey/plugin_mskey.msofficeregkey.php 2009-12-21 19:59:06.000000000 +0100
@@ -0,0 +1,31 @@
+<?php
+
+if (!defined('GLPI_ROOT')){
+ die("Sorry. You can't access directly to this file");
+}
+
+$msofficeregkey_table = array(
+ 'SOFTWARE\Microsoft\Office\10.0\Registration\{9011040C-6000-11D3-8CFE-0050048383C9}',
+ 'SOFTWARE\Microsoft\Office\10.0\Registration\{9011040C-6000-11D3-8CFE-0150048383C9}',
+ 'SOFTWARE\Microsoft\Office\10.0\Registration\{91120000-6000-11D3-8CFE-0150048383C9}',
+ 'SOFTWARE\Microsoft\Office\10.0\Registration\{91CA040C-6000-11D3-8CFE-0150048383C9}',
+ 'SOFTWARE\Microsoft\Office\11.0\Registration\{9011040C-6000-11D3-8CFE-0150048383C9}',
+ 'SOFTWARE\Microsoft\Office\11.0\Registration\{90110419-6000-11D3-8CFE-0150048383C9}',
+ 'SOFTWARE\Microsoft\OFFICE\11.0\Registration\{90110419-6000-11D3-8CFE-0150048383C9}',
+ 'SOFTWARE\Microsoft\Office\11.0\Registration\{91120000-6000-11D3-8CFE-0150048383C9}',
+ 'SOFTWARE\Microsoft\Office\11.0\Registration\{91CA040C-6000-11D3-8CFE-0150048383C9}',
+ 'SOFTWARE\Microsoft\Office\12.0\Registration\{9011040C-6000-11D3-8CFE-0150048383C9}',
+ 'SOFTWARE\Microsoft\Office\12.0\Registration\{90120000-0030-0000-0000-0000000FF1CE}',
+ 'SOFTWARE\Microsoft\OFFICE\12.0\Registration\{90120000-0030-0000-0000-0000000FF1CE}',
+ 'SOFTWARE\Microsoft\Office\12.0\Registration\{90120000-00CA-0000-0000-0000000FF1CE}',
+ 'SOFTWARE\Microsoft\Office\12.0\Registration\{90120000-110F-0000-0000-0000000FF1CE}',
+ 'SOFTWARE\Microsoft\OFFICE\12.0\Registration\{90120000-110F-0000-0000-0000000FF1CE}',
+ 'SOFTWARE\Microsoft\Office\12.0\Registration\{91120000-6000-11D3-8CFE-0150048383C9}',
+ 'SOFTWARE\Microsoft\Office\12.0\Registration\{91CA040C-6000-11D3-8CFE-0150048383C9}',
+ 'SOFTWARE\Microsoft\Office\9.0\Registration\{9011040C-6000-11D3-8CFE-0150048383C9}',
+ 'SOFTWARE\Microsoft\Office\9.0\Registration\{91120000-6000-11D3-8CFE-0150048383C9}',
+ 'SOFTWARE\Microsoft\Office\9.0\Registration\{91CA040C-6000-11D3-8CFE-0150048383C9}'
+);
+
+?>
+
_______________________________________________
Glpi-dev mailing list
[email protected]
https://mail.gna.org/listinfo/glpi-dev
