[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7440] Merge 7434:7439 from trunk
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [7440] Merge 7434:7439 from trunk |
Date: |
Tue, 28 Jun 2011 09:07:45 +0000 |
Revision: 7440
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7440
Author: sigurdne
Date: 2011-06-28 09:07:45 +0000 (Tue, 28 Jun 2011)
Log Message:
-----------
Merge 7434:7439 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/frontend/inc/class.uientity.inc.php
branches/Version-1_0-branch/property/inc/class.soadmin_location.inc.php
branches/Version-1_0-branch/property/inc/class.uiadmin_location.inc.php
branches/Version-1_0-branch/property/inc/class.uigallery.inc.php
branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
branches/Version-1_0-branch/property/inc/class.uitts.inc.php
branches/Version-1_0-branch/property/inc/hook_settings.inc.php
branches/Version-1_0-branch/property/setup/setup.inc.php
branches/Version-1_0-branch/property/setup/tables_current.inc.php
branches/Version-1_0-branch/property/setup/tables_update.inc.php
branches/Version-1_0-branch/property/templates/base/admin_location.xsl
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
+
/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
Modified: branches/Version-1_0-branch/frontend/inc/class.uientity.inc.php
===================================================================
--- branches/Version-1_0-branch/frontend/inc/class.uientity.inc.php
2011-06-28 09:04:27 UTC (rev 7439)
+++ branches/Version-1_0-branch/frontend/inc/class.uientity.inc.php
2011-06-28 09:07:45 UTC (rev 7440)
@@ -465,9 +465,18 @@
$entity_entry['directory']
= urlencode($_files[0]['directory']);
$entity_entry['img_id']
= $_files[0]['file_id'];
}
-
+
for
($i=0;$i<count($uicols['name']);$i++)
{
+ switch ($uicols['name'][$i])
+ {
+ case 'num':
+ case 'loc1':
+ case 'loc1_name':
+
$uicols['input_type'][$i] = 'hidden';
+ break;
+ }
+
if($uicols['input_type'][$i]!='hidden')
{
if(isset($entity_entry['query_location'][$uicols['name'][$i]]))
Modified:
branches/Version-1_0-branch/property/inc/class.soadmin_location.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soadmin_location.inc.php
2011-06-28 09:04:27 UTC (rev 7439)
+++ branches/Version-1_0-branch/property/inc/class.soadmin_location.inc.php
2011-06-28 09:07:45 UTC (rev 7440)
@@ -183,7 +183,8 @@
'name' =>
$this->db->f('name'),
'descr' =>
$this->db->f('descr'),
'list_info' =>
$this->db->f('list_info',true),
- 'list_address' =>
$this->db->f('list_address')
+ 'list_address' =>
$this->db->f('list_address'),
+ 'list_documents'=>
$this->db->f('list_documents')
);
}
return $standard;
@@ -363,7 +364,7 @@
$fd['part_of_town_id'] = array('type' => 'int',
'precision' => 2, 'nullable' => true);
}
- $fd['loc' .$standard['id'] . '_name'] = array('type' =>
'varchar', 'precision' => 25, 'nullable' => true);
+ $fd['loc' .$standard['id'] . '_name'] = array('type' =>
'varchar', 'precision' => 50, 'nullable' => true);
$fd['entry_date'] = array('type' => 'int', 'precision'
=> 4, 'nullable' => true);
$fd['category'] = array('type' => 'int', 'precision' =>
4, 'nullable' => true);
$fd['user_id'] = array('type' => 'int', 'precision' =>
4, 'nullable' => true);
@@ -499,7 +500,8 @@
'descr' =>
$this->db->db_addslashes($values['descr']),
'list_info' =>
(isset($values['list_info'])?serialize($values['list_info']):''),
'list_address' =>
(isset($values['list_address'])?$values['list_address']:''),
- );
+ 'list_documents'=>
(isset($values['list_documents'])?$values['list_documents']:''),
+ );
$value_set =
$this->db->validate_update($value_set);
@@ -668,7 +670,8 @@
'name' =>
stripslashes($this->db->f('name')),
'descr' =>
stripslashes($this->db->f('descr')),
'list_info' =>
unserialize($this->db->f('list_info')),
- 'list_address' =>
$this->db->f('list_address')
+ 'list_address' =>
$this->db->f('list_address'),
+ 'list_documents'=>
$this->db->f('list_documents')
);
}
//_debug_array($location_type);
Modified:
branches/Version-1_0-branch/property/inc/class.uiadmin_location.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiadmin_location.inc.php
2011-06-28 09:04:27 UTC (rev 7439)
+++ branches/Version-1_0-branch/property/inc/class.uiadmin_location.inc.php
2011-06-28 09:07:45 UTC (rev 7440)
@@ -534,10 +534,9 @@
'lang_select'
=> lang('select'),
'value_list_info'
=> $this->bo->get_list_info((isset($id)?$id:''),$values['list_info']),
'lang_location'
=> lang('location'),
- 'lang_list_address'
=> lang('list address'),
'lang_list_info_statustext'
=> lang('Names of levels to list at this level'),
- 'lang_list_address_statustext' =>
lang('List address at this level'),
- 'value_list_address'
=> (isset($values['list_address'])?$values['list_address']:'')
+ 'value_list_address'
=> isset($values['list_address'])?$values['list_address']:'',
+ 'value_list_documents'
=> isset($values['list_documents'])?$values['list_documents']:''
);
$appname = lang('location');
Modified: branches/Version-1_0-branch/property/inc/class.uigallery.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uigallery.inc.php
2011-06-28 09:04:27 UTC (rev 7439)
+++ branches/Version-1_0-branch/property/inc/class.uigallery.inc.php
2011-06-28 09:07:45 UTC (rev 7440)
@@ -126,10 +126,16 @@
return false;
}
- if($thumb && is_file($thumbfile))
+ $re_create= false;
+ if($this->is_image($source) && $thumb && $re_create)
{
+
$this->create_thumb($source,$thumbfile,$thumb_size = 100);
readfile($thumbfile);
}
+ else if($thumb && is_file($thumbfile))
+ {
+ readfile($thumbfile);
+ }
else if($this->is_image($source) && $thumb)
{
$this->create_thumb($source,$thumbfile,$thumb_size = 100);
@@ -141,12 +147,14 @@
}
}
- function create_thumb($source,$dest,$thumb_size = 100)
+ function create_thumb($source,$dest,$target_height = 100)
{
$size = getimagesize($source);
$width = $size[0];
$height = $size[1];
+ $target_width = round($width*($target_height/$height));
+
if ($width > $height)
{
$x = ceil(($width - $height) / 2 );
@@ -158,26 +166,26 @@
$height = $width;
}
- $new_im = ImageCreatetruecolor($thumb_size,$thumb_size);
+ $new_im =
ImageCreatetruecolor($target_width,$target_height);
@$imgInfo = getimagesize($source);
if ($imgInfo[2] == IMAGETYPE_JPEG)
{
$im = imagecreatefromjpeg($source);
-
imagecopyresampled($new_im,$im,0,0,$x,$y,$thumb_size,$thumb_size,$width,$height);
+
imagecopyresampled($new_im,$im,0,0,$x,$y,$target_width,$target_height,$width,$height);
imagejpeg($new_im,$dest,75); // Thumbnail
quality (Value from 1 to 100)
}
else if ($imgInfo[2] == IMAGETYPE_GIF)
{
$im = imagecreatefromgif($source);
-
imagecopyresampled($new_im,$im,0,0,$x,$y,$thumb_size,$thumb_size,$width,$height);
+
imagecopyresampled($new_im,$im,0,0,$x,$y,$target_width,$target_height,$width,$height);
imagegif($new_im,$dest);
}
else if ($imgInfo[2] == IMAGETYPE_PNG)
{
$im = imagecreatefrompng($source);
-
imagecopyresampled($new_im,$im,0,0,$x,$y,$thumb_size,$thumb_size,$width,$height);
+
imagecopyresampled($new_im,$im,0,0,$x,$y,$target_width,$target_height,$width,$height);
imagepng($new_im,$dest);
}
}
Modified: branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
2011-06-28 09:04:27 UTC (rev 7439)
+++ branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
2011-06-28 09:07:45 UTC (rev 7440)
@@ -30,7 +30,15 @@
public function __construct()
{
- set_time_limit(10000); //Set the time limit for this
request oto 3000 seconds
+ if ( !$GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin')
+ && !$GLOBALS['phpgw']->acl->check('admin',
phpgwapi_acl::ADD, 'property'))
+ {
+ $GLOBALS['phpgw_info']['flags']['xslt_app'] =
true;
+ execMethod('property.bocommon.no_access');
+ }
+
+ set_time_limit(10000);
+// $GLOBALS['phpgw']->common->phpgw_header(true);
$this->account =
(int)$GLOBALS['phpgw_info']['user']['account_id'];
$this->db = & $GLOBALS['phpgw']->db;
}
Modified: branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
2011-06-28 09:04:27 UTC (rev 7439)
+++ branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
2011-06-28 09:07:45 UTC (rev 7440)
@@ -2189,8 +2189,13 @@
$related =
$this->bo->read_entity_to_link($location_code);
$related_link = array();
- $document = CreateObject('property.sodocument');
- $documents = $document->get_files_at_location(
array('location_code' => $location_code) );
+ $location_type_info =
$this->soadmin_location->read_single($type_id);
+ $documents = array();
+ if($location_type_info['list_documents'])
+ {
+ $document =
CreateObject('property.sodocument');
+ $documents =
$document->get_files_at_location( array('location_code' => $location_code) );
+ }
if($documents)
{
Modified: branches/Version-1_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2011-06-28 09:04:27 UTC (rev 7439)
+++ branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2011-06-28 09:07:45 UTC (rev 7440)
@@ -1875,8 +1875,10 @@
'entity_data' =>
(isset($values['p'])?$values['p']:'')
));
-
-// $ticket['contact_id'] =
$GLOBALS['phpgw']->accounts->get($this->account)->person_id;
+ if
(isset($GLOBALS['phpgw_info']['user']['preferences']['property']['tts_me_as_contact'])
&&
$GLOBALS['phpgw_info']['user']['preferences']['property']['tts_me_as_contact']==1)
+ {
+ $ticket['contact_id'] =
$GLOBALS['phpgw']->accounts->get($this->account)->person_id;
+ }
$contact_data=$this->bocommon->initiate_ui_contact_lookup(array(
'contact_id' =>
$ticket['contact_id'],
'field' => 'contact',
Modified: branches/Version-1_0-branch/property/inc/hook_settings.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/hook_settings.inc.php
2011-06-28 09:04:27 UTC (rev 7439)
+++ branches/Version-1_0-branch/property/inc/hook_settings.inc.php
2011-06-28 09:07:45 UTC (rev 7440)
@@ -185,6 +185,8 @@
create_select_box('Send e-mail from
TTS','tts_user_mailnotification',$yes_and_no,'Send e-mail from TTS as default');
create_input_box('Refresh TTS every (seconds)','refreshinterval','The
intervall for Helpdesk refresh - cheking for new tickets');
+ create_select_box('Set myself as contact when adding a
ticket','tts_me_as_contact',$yes_and_no,'');
+
create_select_box('Default Degree Request
safety','default_safety',$degree,'The degree of seriousness');
create_select_box('Default Degree Request
aesthetics','default_aesthetics',$degree);
create_select_box('Default Degree Request indoor
climate','default_climate',$degree);
Modified: branches/Version-1_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/setup.inc.php 2011-06-28
09:04:27 UTC (rev 7439)
+++ branches/Version-1_0-branch/property/setup/setup.inc.php 2011-06-28
09:07:45 UTC (rev 7440)
@@ -12,7 +12,7 @@
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.618';
+ $setup_info['property']['version'] = '0.9.17.619';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
Modified: branches/Version-1_0-branch/property/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_current.inc.php
2011-06-28 09:04:27 UTC (rev 7439)
+++ branches/Version-1_0-branch/property/setup/tables_current.inc.php
2011-06-28 09:07:45 UTC (rev 7440)
@@ -149,6 +149,7 @@
'uc' => array('type' => 'text','nullable' =>
True),
'list_info' => array('type' =>
'varchar','precision' => '255','nullable' => True),
'list_address' => array('type' =>
'int','precision' => '2','nullable' => True),
+ 'list_documents' => array('type' =>
'int','precision' => '2','nullable' => True),
),
'pk' => array('id'),
'fk' => array(),
Modified: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php
2011-06-28 09:04:27 UTC (rev 7439)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php
2011-06-28 09:07:45 UTC (rev 7440)
@@ -5282,7 +5282,35 @@
}
}
+
/**
+ * Update property version from 0.9.17.618 to 0.9.17.619
+ */
+
+ $test[] = '0.9.17.618';
+ function property_upgrade0_9_17_618()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_location_type','list_documents',
array('type' => 'int','precision' => '2','nullable' => True));
+ $GLOBALS['phpgw_setup']->oProc->query("UPDATE fm_location_type
SET list_documents = 1");
+
+ $GLOBALS['phpgw_setup']->oProc->query("SELECT count(*) as cnt
FROM fm_location_type");
+ $GLOBALS['phpgw_setup']->oProc->next_record();
+ $locations = $GLOBALS['phpgw_setup']->oProc->f('cnt') +1;
+ for ($level = 5; $level < $locations; $level++)
+ {
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn("fm_location{$level}",
"loc{$level}_name",array('type' => 'varchar','precision' => '50','nullable' =>
True));
+ }
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.619';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
+
+
+ /**
* Update property version from 0.9.17.607 to 0.9.17.608
* Add more room for address at tickets
*
Modified: branches/Version-1_0-branch/property/templates/base/admin_location.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/admin_location.xsl
2011-06-28 09:04:27 UTC (rev 7439)
+++ branches/Version-1_0-branch/property/templates/base/admin_location.xsl
2011-06-28 09:07:45 UTC (rev 7440)
@@ -318,7 +318,7 @@
</xsl:template>
<!-- add / edit -->
- <xsl:template match="edit">
+ <xsl:template match="edit" xmlns:php="http://php.net/xsl">
<div align="left">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
@@ -393,33 +393,39 @@
<xsl:call-template name="list_info"/>
</td>
</tr>
-
<tr>
- <td
valign="top">
-
<xsl:value-of select="lang_list_address"/>
+ <td
align="left">
+
<xsl:value-of select="php:function('lang', 'list address')" />
</td>
+ <td>
+ <input
type="checkbox" name="values[list_address]" value="1" >
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'list address at this
level')" />
+
</xsl:attribute>
+
<xsl:if test="value_list_address = '1'">
+
<xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
+
</xsl:attribute>
+
</xsl:if>
+ </input>
+ </td>
+ </tr>
+ <tr>
<td
align="left">
-
<xsl:choose>
-
<xsl:when test="value_list_address='1'">
-
<input type="checkbox" name="values[list_address]" value="1"
checked="checked" onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="//lang_list_address_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
-
</input>
-
</xsl:when>
-
<xsl:otherwise>
-
<input type="checkbox" name="values[list_address]" value="1"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="//lang_list_address_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
-
</input>
-
</xsl:otherwise>
-
</xsl:choose>
+
<xsl:value-of select="php:function('lang', 'list documents')" />
</td>
+ <td>
+ <input
type="checkbox" name="values[list_documents]" value="1" >
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'list documents at level')"
/>
+
</xsl:attribute>
+
<xsl:if test="value_list_documents = '1'">
+
<xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
+
</xsl:attribute>
+
</xsl:if>
+ </input>
+ </td>
</tr>
</xsl:when>
</xsl:choose>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7440] Merge 7434:7439 from trunk,
Sigurd Nes <=