Menu
▾
▴
[Globalstore-code] [Global-Store Repo] Global Store branch, master, updated. 8b645d6ddec7e79df20ffed1dafbd3338d068f6b
|
From: Rómulo RodrÃg. <elt...@us...> - 2015-01-22 00:46:56
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Global Store".
The branch, master has been updated
via 8b645d6ddec7e79df20ffed1dafbd3338d068f6b (commit)
from 374466fac74ef0a77b73c7ce974050a3e9deae09 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8b645d6ddec7e79df20ffed1dafbd3338d068f6b
Author: Rómulo Rodriguez <rod...@gm...>
Date: Wed Jan 21 20:16:45 2015 -0430
Fix Bug.
Signed-off-by: Rómulo Rodriguez <rod...@gm...>
diff --git a/src/php/protocol/app.class.php b/src/php/protocol/app.class.php
index 5896e37..2b0057f 100644
--- a/src/php/protocol/app.class.php
+++ b/src/php/protocol/app.class.php
@@ -300,7 +300,7 @@ class App implements Protocol {
".$_POST["appLic"]."
)";
Core::$db->query($sql1);
- Log::sysLog(3040,"con_name=".$_POST["conName"].",con_description=".$_POST["conDes"].",con_cost=".$_POST["conCost"].",con_release_date=".$_POST["conRlsD"].",app_version=".$_POST["appVer"].",fk_developer=".$_POST["appDev"].",fk_license=".$_POST["appLic"],$_POST["conID"],Core::$user->getNick());
+ Log::sysLog(3040,"con_name=".$_POST["conName"].",con_description=".$_POST["conDes"].",con_cost=".$_POST["conCost"].",con_release_date=".$_POST["conRlsD"].",app_version=".$_POST["appVer"].",fk_developer=".$_POST["appDev"].",fk_license=".$_POST["appLic"],$line["id"],Core::$user->getNick());
ProtocolController::createPacket($_GET["pid"],true,true);
} catch (Exception $e) {
ProtocolController::createPacket($_GET["pid"],true,false);
diff --git a/src/php/protocol/boo.class.php b/src/php/protocol/boo.class.php
index 009abec..b5d6e31 100644
--- a/src/php/protocol/boo.class.php
+++ b/src/php/protocol/boo.class.php
@@ -299,7 +299,7 @@ class Boo implements Protocol {
".$_POST["bookEdi"]."
)";
Core::$db->query($sql1);
- Log::sysLog(3047,"con_name=".$_POST["conName"].",con_description=".$_POST["conDes"].",con_cost=".$_POST["conCost"].",con_release_date=".$_POST["conRlsD"].",boo_isbn=".$_POST["bookIsbn"].",boo_number_page=".$_POST["bookNP"],$_POST["conID"],Core::$user->getNick());
+ Log::sysLog(3047,"con_name=".$_POST["conName"].",con_description=".$_POST["conDes"].",con_cost=".$_POST["conCost"].",con_release_date=".$_POST["conRlsD"].",boo_isbn=".$_POST["bookIsbn"].",boo_number_page=".$_POST["bookNP"],$line["id"],Core::$user->getNick());
ProtocolController::createPacket($_GET["pid"],true,true);
} catch (Exception $e) {
ProtocolController::createPacket($_GET["pid"],true,false);
diff --git a/src/php/protocol/mov.class.php b/src/php/protocol/mov.class.php
index 8c549c2..b4ee8e9 100644
--- a/src/php/protocol/mov.class.php
+++ b/src/php/protocol/mov.class.php
@@ -501,7 +501,7 @@ class Mov implements Protocol {
".$_POST["movDur"]."
)";
Core::$db->query($sql1);
- Log::sysLog(3059,"con_name=".$_POST["conName"].",con_description=".$_POST["conDes"].",con_cost=".$_POST["conCost"].",con_release_date=".$_POST["conRlsD"].",app_version=".$_POST["movDur"],$_POST["conID"],Core::$user->getNick());
+ Log::sysLog(3059,"con_name=".$_POST["conName"].",con_description=".$_POST["conDes"].",con_cost=".$_POST["conCost"].",con_release_date=".$_POST["conRlsD"].",app_version=".$_POST["movDur"],$line["id"],Core::$user->getNick());
ProtocolController::createPacket($_GET["pid"],true,true);
} catch (Exception $e) {
ProtocolController::createPacket($_GET["pid"],true,false);
diff --git a/src/php/protocol/mus.class.php b/src/php/protocol/mus.class.php
index 7ed5d3b..50b3b49 100644
--- a/src/php/protocol/mus.class.php
+++ b/src/php/protocol/mus.class.php
@@ -374,7 +374,7 @@ class Mus implements Protocol {
".$_POST["albDis"]."
)";
Core::$db->query($sql1);
- Log::sysLog(3026,"con_name=".$_POST["conName"].",con_description=".$_POST["conDes"].",con_cost=".$_POST["conCost"].",con_release_date=".$_POST["conRlsD"].",alb_format=".$_POST["albFormat"].",fk_editorial_record=".$_POST["albDis"],$_POST["conID"],Core::$user->getNick());
+ Log::sysLog(3026,"con_name=".$_POST["conName"].",con_description=".$_POST["conDes"].",con_cost=".$_POST["conCost"].",con_release_date=".$_POST["conRlsD"].",alb_format=".$_POST["albFormat"].",fk_editorial_record=".$_POST["albDis"],$line["id"],Core::$user->getNick());
ProtocolController::createPacket($_GET["pid"],true,true);
} catch (Exception $e) {
ProtocolController::createPacket($_GET["pid"],true,false);
diff --git a/src/php/protocol/userp.class.php b/src/php/protocol/userp.class.php
index 0af35af..f1b0743 100644
--- a/src/php/protocol/userp.class.php
+++ b/src/php/protocol/userp.class.php
@@ -63,6 +63,20 @@ class Userp implements Protocol {
}
if(isset($_POST["nick"]) && isset($_POST["empSName"]) && isset($_POST["empSLName"]) && isset($_POST["empEL"]) && isset($_POST["empEL"]) && isset($_POST["empBlood"]) && isset($_POST["empObl"]) && isset($_POST["empSR"])){
$sql="
+ select case when fk_obligation <> ".$_POST["empObl"]." then obl_name else 'false' end as cambio
+ from employee, obligation
+ where fk_sys_user='".$_POST["nick"]."' and fk_obligation=obl_id
+ ";
+ $cc=false;
+ try {
+ Core::$db->query($sql);
+ $line=Core::$db->fetchArray();
+ if($line["cambio"]!="false"){
+ $cc=$line["cambio"];
+ }
+ } catch (Exception $e) {
+ }
+ $sql="
update employee
SET emp_sec_name='".$_POST["empSName"]."',emp_sec_lastname='".$_POST["empSLName"]."',emp_education='".$_POST["empEL"]."',emp_blood='".$_POST["empBlood"]."',fk_obligation=".$_POST["empObl"]."
WHERE fk_sys_user='".$_POST["nick"]."'";
@@ -74,6 +88,9 @@ class Userp implements Protocol {
Core::$db->query($sql);
Core::$db->query($sql1);
Log::sysLog(2005,"emp_sec_name=".$_POST["empSName"].",emp_sec_lastname=".$_POST["empSLName"].",emp_education=".$_POST["empEL"].",emp_blood=".$_POST["empBlood"].",fk_obligation=".$_POST["empObl"]."fk_sr=".$_POST["empSR"],$_POST["nick"],Core::$user->getNick());
+ if($cc){
+ Log::sysLog(2006,$_POST["empObl"],$_POST["nick"],Core::$user->getNick());
+ }
ProtocolController::createPacket($_GET["pid"],true,true);
} catch (Exception $e) {
ProtocolController::createPacket($_GET["pid"],true,false);
@@ -113,6 +130,7 @@ class Userp implements Protocol {
Core::$db->query($sql);
Core::$db->query($sql1);
Log::sysLog(5003,"emp_sec_name=".$_POST["empSName"].",emp_sec_lastname=".$_POST["empSLName"].",emp_education=".$_POST["empEL"].",emp_blood=".$_POST["empBlood"].",fk_obligation=".$_POST["empObl"]."fk_sr=".$_POST["empSR"],$_POST["nick"],Core::$user->getNick());
+ Log::sysLog(2006,$_POST["empObl"],$_POST["nick"],Core::$user->getNick());
ProtocolController::createPacket($_GET["pid"],true,true);
} catch (Exception $e) {
ProtocolController::createPacket($_GET["pid"],true,false);
-----------------------------------------------------------------------
Summary of changes:
src/php/protocol/app.class.php | 2 +-
src/php/protocol/boo.class.php | 2 +-
src/php/protocol/mov.class.php | 2 +-
src/php/protocol/mus.class.php | 2 +-
src/php/protocol/userp.class.php | 18 ++++++++++++++++++
5 files changed, 22 insertions(+), 4 deletions(-)
hooks/post-receive
--
Global Store
|
