OCS Inventory: OCSReports

Merge lp:~airoine/ocsinventory-ocsreports/ocsreports_mass_affect into lp:ocsinventory-ocsreports

  1. ocsreports_mass_affect
  2. Merge into trunk
Proposed by Erwan
Status: Merged
Approved by: Erwan
Approved revision: 313
Merged at revision: not available
Proposed branch: lp:~airoine/ocsinventory-ocsreports/ocsreports_mass_affect
Merge into: lp:ocsinventory-ocsreports
Diff against target: None lines
To merge this branch: bzr merge lp:~airoine/ocsinventory-ocsreports/ocsreports_mass_affect
Reviewer Review Type Date Requested Status
Erwan Approve
Review via email: mp+11709@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Erwan (airoine) wrote :

Fix bugs and code clean up

Revision history for this message
Erwan (airoine) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'backend/require/connexion.php'
2--- backend/require/connexion.php 2009-08-18 19:44:33 +0000
3+++ backend/require/connexion.php 2009-09-14 05:46:12 +0000
4@@ -7,7 +7,7 @@
5 //connection OCS
6 $db_ocs = DB_NAME;
7 //lien sur le serveur OCS
8- $link_ocs=mysql_connect($_SESSION["SERVER_READ"],$_SESSION["COMPTE_BASE"],$_SESSION["PSWD_BASE"]);
9+ $link_ocs=mysql_connect(SERVER_READ,COMPTE_BASE,PSWD_BASE);
10
11 if(!$link_ocs) {
12 echo "<br><center><font color=red><b>ERROR: MySql connection problem<br>".mysql_error()."</b></font></center>";
13
14=== modified file 'dbconfig.inc.php'
15--- dbconfig.inc.php 2009-08-18 19:44:33 +0000
16+++ dbconfig.inc.php 2009-09-14 05:46:12 +0000
17@@ -1,7 +1,7 @@
18 <?php
19 define("DB_NAME", "ocsweb");
20-$_SESSION["SERVER_READ"]="localhost";
21-$_SESSION["SERVER_WRITE"]="localhost";
22-$_SESSION["COMPTE_BASE"]="ocs";
23-$_SESSION["PSWD_BASE"]="ocs";
24+define("SERVER_READ","localhost");
25+define("SERVER_WRITE","localhost");
26+define("COMPTE_BASE","ocs");
27+define("PSWD_BASE","ocs");
28 ?>
29\ No newline at end of file
30
31=== modified file 'install.php'
32--- install.php 2009-09-10 09:02:46 +0000
33+++ install.php 2009-09-14 05:46:12 +0000
34@@ -98,9 +98,9 @@
35 if( $hnd = @fopen("dbconfig.inc.php", "r") ) {
36 fclose($hnd);
37 require("dbconfig.inc.php");
38- $valNme = $_SESSION["COMPTE_BASE"];
39- $valPass = $_SESSION["PSWD_BASE"];
40- $valServ = $_SESSION["SERVER_WRITE"];
41+ $valNme = COMPTE_BASE;
42+ $valPass = PSWD_BASE;
43+ $valServ = SERVER_WRITE;
44 }
45
46 if( ! $instOk ) {
47@@ -241,10 +241,10 @@
48 //echo "toto";
49 fwrite($ch,"<?php\n");
50 fwrite($ch,"define(\"DB_NAME\", \"ocsweb\");\n");
51- fwrite($ch,"\$_SESSION[\"SERVER_READ\"]=\"".$_POST["host"]."\";\n");
52- fwrite($ch,"\$_SESSION[\"SERVER_WRITE\"]=\"".$_POST["host"]."\";\n");
53- fwrite($ch,"\$_SESSION[\"COMPTE_BASE\"]=\"".$_POST["name"]."\";\n");
54- fwrite($ch,"\$_SESSION[\"PSWD_BASE\"]=\"".$_POST["pass"]."\";\n");
55+ fwrite($ch,"\define(\"SERVER_READ\",\"".$_POST["host"]."\");\n");
56+ fwrite($ch,"\define(\"SERVER_WRITE\",\"".$_POST["host"]."\");\n");
57+ fwrite($ch,"\define(\"COMPTE_BASE\",\"".$_POST["name"]."\");\n");
58+ fwrite($ch,"\define(\"PSWD_BASE\",\"".$_POST["pass"]."\");\n");
59 fwrite($ch,"?>");
60 fclose($ch);
61 echo "<br><center><font color=green><b>MySql config file successfully written (using ".$_POST["name"]." account)</b></font></center>";
62@@ -253,10 +253,10 @@
63 // Use account created during installation
64 fwrite($ch,"<?php\n");
65 fwrite($ch,"define(\"DB_NAME\", \"ocsweb\");\n");
66- fwrite($ch,"\$_SESSION[\"SERVER_READ\"]=\"".$_POST["host"]."\";\n");
67- fwrite($ch,"\$_SESSION[\"SERVER_WRITE\"]=\"".$_POST["host"]."\";\n");
68- fwrite($ch,"\$_SESSION[\"COMPTE_BASE\"]=\"ocs\";\n");
69- fwrite($ch,"\$_SESSION[\"PSWD_BASE\"]=\"ocs\";\n");
70+ fwrite($ch,"\define(\"SERVER_READ\",\"".$_POST["host"]."\");\n");
71+ fwrite($ch,"\define(\"SERVER_WRITE\"],\"".$_POST["host"]."\");\n");
72+ fwrite($ch,"\define(\"COMPTE_BASE\"],\"ocs\");\n");
73+ fwrite($ch,"\define(\"PSWD_BASE\",\"ocs\");\n");
74 fwrite($ch,"?>");
75 fclose($ch);
76 echo "<br><center><font color=green><b>MySql config file successfully written (using new ocs account)</b></font></center>";
77
78=== modified file 'preferences.php'
79--- preferences.php 2009-09-10 10:43:04 +0000
80+++ preferences.php 2009-09-14 05:46:12 +0000
81@@ -127,10 +127,11 @@
82 }
83
84 function dbconnect() {
85+ //global SERVER_READ,COMPTE_BASE,PSWD_BASE,SERVER_WRITE;
86 $db = DB_NAME;
87 //echo $db;
88 //echo $_SESSION["SERVER_READ"];
89- $link=@mysql_connect($_SESSION["SERVER_READ"],$_SESSION["COMPTE_BASE"],$_SESSION["PSWD_BASE"]);
90+ $link=@mysql_connect(SERVER_READ,COMPTE_BASE,PSWD_BASE);
91 if(!$link) {
92 echo "<br><center><font color=red><b>ERROR: MySql connection problem<br>".mysql_error()."</b></font></center>";
93 die();
94@@ -140,7 +141,7 @@
95 die();
96 }
97
98- $link2=@mysql_connect($_SESSION["SERVER_WRITE"],$_SESSION["COMPTE_BASE"],$_SESSION["PSWD_BASE"]);
99+ $link2=@mysql_connect(SERVER_WRITE,COMPTE_BASE,PSWD_BASE);
100 if(!$link2) {
101 echo "<br><center><font color=red><b>ERROR: MySql connection problem<br>".mysql_error($link2)."</b></font></center>";
102 die();
103
104=== modified file 'require/html_header.php'
105--- require/html_header.php 2009-09-10 09:02:46 +0000
106+++ require/html_header.php 2009-09-14 12:46:39 +0000
107@@ -1,14 +1,15 @@
108 <?php
109 /*******************************************************AFFICHAGE HTML DU HEADER*******************************************/
110 //require("fichierConf.class.php");
111-
112+header("Pragma: no-cache");
113+header("Expires: -1");
114+header("Cache-control: must-revalidate, post-check=0, pre-check=0");
115+header("Cache-control: private", false);
116+header("Content-type: text/html; charset=utf-8");
117 ?>
118 <html>
119 <head>
120 <TITLE>OCS Inventory</TITLE>
121-<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
122-<META HTTP-EQUIV="Expires" CONTENT="-1">
123-<META HTTP-EQUIV="Content-Type" CONTENT="text/html"; charset="UTF-8";>
124 <link rel="shortcut icon" href="favicon.ico" />
125 <LINK REL='StyleSheet' TYPE='text/css' HREF='css/ocsreports.css'>
126 <script language='javascript' type='text/javascript' src='js/function.js'></script>

Subscribers

People subscribed via source and target branches