[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7553] Merge 7550:7551 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7553] Merge 7550:7551 from trunk |
|
Date: |
Mon, 05 Sep 2011 06:32:00 +0000 |
Revision: 7553
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7553
Author: sigurdne
Date: 2011-09-05 06:32:00 +0000 (Mon, 05 Sep 2011)
Log Message:
-----------
Merge 7550:7551 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.sodocument.inc.php
branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
branches/Version-1_0-branch/property/inc/class.uidocument.inc.php
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,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549
+
/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,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551
Modified: branches/Version-1_0-branch/property/inc/class.sodocument.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sodocument.inc.php
2011-09-05 06:29:33 UTC (rev 7552)
+++ branches/Version-1_0-branch/property/inc/class.sodocument.inc.php
2011-09-05 06:32:00 UTC (rev 7553)
@@ -399,6 +399,11 @@
function add($document)
{
+ if(isset($document['link']) && $document['link'])
+ {
+ $document['link'] = str_replace('\\' , '/',
$document['link']);
+ }
+
while (is_array($document['location']) &&
list($input_name,$value) = each($document['location']))
{
if($value)
@@ -441,7 +446,7 @@
$values= array(
$this->db->db_addslashes($document['document_name']),
- $document['link'],
+ $this->db->db_addslashes($document['link']),
$document['title'],
'public',
$document['doc_type'],
@@ -486,6 +491,12 @@
function edit($document)
{
+
+ if(isset($document['link']) && $document['link'])
+ {
+ $document['link'] = str_replace('\\' , '/',
$document['link']);
+ }
+
$receipt = array();
$value_set=array();
if (isset($document['location']) &&
is_array($document['location']))
@@ -523,7 +534,7 @@
$old_doc_type = $this->db->f('category');
$old_coordinator = $this->db->f('coordinator');
$old_document_name = $this->db->f('document_name');
- $old_link = $this->db->f('link');
+ $old_link =
$this->db->f('link',true);
$old_location_code = $this->db->f('location_code');
$old_p_entity_id = $this->db->f('p_entity_id');
$old_p_cat_id = $this->db->f('p_cat_id');
@@ -560,9 +571,9 @@
$document['document_name'] =
$document['document_name_orig'];
}
- if($old_link !=$document['link'] )
+ if($old_link != $document['link'] )
{
-
$this->historylog->add('L',$document['document_id'],$document['link'],$old_link);
+
$this->historylog->add('L',$document['document_id'],$this->db->db_addslashes($document['link']),$old_link);
$alter_link=true;
}
@@ -598,7 +609,7 @@
}
$value_set['document_name'] =
$this->db->db_addslashes($document['document_name']);
- $value_set['link'] =
$document['link'];
+ $value_set['link'] =
$this->db->db_addslashes($document['link']);
$value_set['title'] =
$this->db->db_addslashes($document['title']);
$value_set['branch_id'] =
$document['branch_id'];
$value_set['status'] = $document['status'];
Modified: branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
2011-09-05 06:29:33 UTC (rev 7552)
+++ branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
2011-09-05 06:32:00 UTC (rev 7553)
@@ -2244,7 +2244,16 @@
{
unset($data['apply']);
}
+
+ // in case of backslash characters - as in
path-references
+ foreach($data as $_key => &$_value)
+ {
+ $_value = str_replace('\\' , '/', $_value);
+ }
+ unset($_key);
+ unset($_value);
+
foreach ( $this->location_info['fields'] as $field )
{
if (isset($field['filter']) && $field['filter'])
@@ -2351,6 +2360,7 @@
function edit($data,$values_attribute)
{
+
$receipt = array();
if (!isset($this->location_info['table']) || !$table =
$this->location_info['table'])
@@ -2359,6 +2369,14 @@
return $receipt;
}
+ // in case of backslash characters - as in
path-references
+ foreach($data as $_key => &$_value)
+ {
+ $_value = str_replace('\\' , '/', $_value);
+ }
+ unset($_key);
+ unset($_value);
+
$value_set = array();
if(isset($data['extra']))
Modified: branches/Version-1_0-branch/property/inc/class.uidocument.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uidocument.inc.php
2011-09-05 06:29:33 UTC (rev 7552)
+++ branches/Version-1_0-branch/property/inc/class.uidocument.inc.php
2011-09-05 06:32:00 UTC (rev 7553)
@@ -763,6 +763,11 @@
{
if($document_entry['link'])
{
+ if(!preg_match('/^HTTP/i',
$document_entry['link']))
+ {
+ $document_entry['link']
= 'file:///' . str_replace(':','|',$document_entry['link']);
+ }
+
$link_view_file=$document_entry['link'];
$document_entry['document_name']='link';
unset($link_to_files);
@@ -788,8 +793,8 @@
if(isset($uicols['datatype'])
&& isset($uicols['datatype'][$k]) && $uicols['datatype'][$k]=='link' &&
$document_entry[$uicols['name'][$k]])
{
$datatable['rows']['row'][$j]['column'][$k]['format'] = 'link';
+
$datatable['rows']['row'][$j]['column'][$k]['link'] =
$link_view_file;
$datatable['rows']['row'][$j]['column'][$k]['value'] =
$document_entry[$uicols['name'][$k]];
-
$datatable['rows']['row'][$j]['column'][$k]['link'] =
$link_view_file;
$datatable['rows']['row'][$j]['column'][$k]['target'] = '_blank';
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7553] Merge 7550:7551 from trunk,
Sigurd Nes <=