[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6679] merge 6676:6678 from trunk
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [6679] merge 6676:6678 from trunk |
Date: |
Thu, 16 Dec 2010 13:11:57 +0000 |
Revision: 6679
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6679
Author: sigurdne
Date: 2010-12-16 13:11:57 +0000 (Thu, 16 Dec 2010)
Log Message:
-----------
merge 6676:6678 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.sodocument.inc.php
branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
branches/Version-1_0-branch/property/tutorials/property/examples/install.apache.sh
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678
Modified: branches/Version-1_0-branch/property/inc/class.sodocument.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sodocument.inc.php
2010-12-16 13:08:52 UTC (rev 6678)
+++ branches/Version-1_0-branch/property/inc/class.sodocument.inc.php
2010-12-16 13:11:57 UTC (rev 6679)
@@ -431,12 +431,11 @@
}
$document['descr'] =
$this->db->db_addslashes($document['descr']);
- $document['name'] =
$this->db->db_addslashes($document['name']);
$document['title'] =
$this->db->db_addslashes($document['title']);
//_debug_array($document);
$values= array(
- $document['document_name'],
+
$this->db->db_addslashes($document['document_name']),
$document['link'],
$document['title'],
'public',
@@ -483,21 +482,23 @@
function edit($document)
{
$receipt = array();
- while (is_array($document['location']) &&
list($input_name,$value) = each($document['location']))
+ $value_set=array();
+ if (isset($document['location']) &&
is_array($document['location']))
{
- $vals[] = "$input_name = '$value'";
+ foreach($document['location'] as $input_name =>
$value)
+ {
+ $value_set[$input_name] = $value;
+ }
}
- while (is_array($document['extra']) &&
list($input_name,$value) = each($document['extra']))
+ if (isset($document['extra']) &&
is_array($document['extra']))
{
- $vals[] = "$input_name = '$value'";
+ foreach($document['extra'] as $input_name =>
$value)
+ {
+ $value_set[$input_name] = $value;
+ }
}
- if($vals)
- {
- $vals = "," . implode(",",$vals);
- }
-
if($document['street_name'])
{
$address[]= $document['street_name'];
@@ -588,29 +589,23 @@
if($document['link'])
{
- unset($document['document_name']);
+ $document['document_name'] = '';
}
- $document['descr'] =
$this->db->db_addslashes($document['descr']);
- $document['name'] =
$this->db->db_addslashes($document['name']);
- $document['title'] =
$this->db->db_addslashes($document['title']);
+ $value_set['document_name'] =
$this->db->db_addslashes($document['document_name']);
+ $value_set['link'] =
$document['link'];
+ $value_set['title'] =
$this->db->db_addslashes($document['title']);
+ $value_set['branch_id'] =
$document['branch_id'];
+ $value_set['status'] = $document['status'];
+ $value_set['category'] = $document['doc_type'];
+ $value_set['document_date'] =
$document['document_date'];
+ $value_set['coordinator'] =
$document['coordinator'];
+ $value_set['descr'] =
$this->db->db_addslashes($document['descr']);
+ $value_set['version'] = $document['version'];
+ $value_set['location_code'] =
$document['location_code'];
+ $value_set['vendor_id'] =
$document['vendor_id'];
+ $value_set['address'] = $address;
- $value_set=array(
- 'document_name' =>$document['document_name'],
- 'link' =>$document['link'],
- 'title' =>$document['title'],
- 'branch_id'
=>$document['branch_id'],
- 'status' =>$document['status'],
- 'category' =>$document['doc_type'],
- 'document_date' =>$document['document_date'],
- 'coordinator' =>$document['coordinator'],
- 'descr' =>$document['descr'],
- 'version' =>$document['version'],
- 'location_code' =>$document['location_code'],
- 'vendor_id'
=>$document['vendor_id'],
- 'address' =>$address
- );
-
$value_set =
$this->db->validate_update($value_set);
$this->db->query("UPDATE fm_document set $value_set
$vals WHERE id= '" . $document['document_id'] ."'",__LINE__,__FILE__);
Modified: branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2010-12-16 13:08:52 UTC (rev 6678)
+++ branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2010-12-16 13:11:57 UTC (rev 6679)
@@ -585,7 +585,7 @@
$sql = "SELECT fm_workorder.*, fm_chapter.descr as
chapter ,fm_workorder.user_id as user_id FROM fm_workorder"
// . " $this->join fm_project on
fm_workorder.project_id=fm_project.id"
. " $this->left_join fm_chapter on "
- . " fm_workorder.chapter_id = fm_chapter.id
where fm_workorder.id={$workorder_id}";
+ . " fm_workorder.chapter_id = fm_chapter.id
WHERE fm_workorder.id='{$workorder_id}'";
$this->db->query($sql,__LINE__,__FILE__);
Modified:
branches/Version-1_0-branch/property/tutorials/property/examples/install.apache.sh
===================================================================
---
branches/Version-1_0-branch/property/tutorials/property/examples/install.apache.sh
2010-12-16 13:08:52 UTC (rev 6678)
+++
branches/Version-1_0-branch/property/tutorials/property/examples/install.apache.sh
2010-12-16 13:11:57 UTC (rev 6679)
@@ -54,8 +54,8 @@
# * @var string PHP, PHPTAR
# * Download: http://httpd.apache.org/
# */
-PHPTAR="php-5.3.3.tar.bz2"
-PHP="php-5.3.3"
+PHPTAR="php-5.3.4.tar.bz2"
+PHP="php-5.3.4"
#/**
# * Name of the EACCELERATOR tarball e.g eaccelerator-0.9.5.tar.bz2
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6679] merge 6676:6678 from trunk,
Sigurd Nes <=