[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7103] Merge 7098:7102 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7103] Merge 7098:7102 from trunk |
|
Date: |
Thu, 10 Mar 2011 10:23:41 +0000 |
Revision: 7103
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7103
Author: sigurdne
Date: 2011-03-10 10:23:40 +0000 (Thu, 10 Mar 2011)
Log Message:
-----------
Merge 7098:7102 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/frontend/inc/class.uidrawings.inc.php
branches/Version-1_0-branch/frontend/inc/class.uifrontend.inc.php
branches/Version-1_0-branch/frontend/templates/base/config.tpl
branches/Version-1_0-branch/phpgwapi/inc/class.sessions.inc.php
branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
branches/Version-1_0-branch/property/templates/base/attributes_view.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
+
/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
Modified: branches/Version-1_0-branch/frontend/inc/class.uidrawings.inc.php
===================================================================
--- branches/Version-1_0-branch/frontend/inc/class.uidrawings.inc.php
2011-03-10 09:38:47 UTC (rev 7102)
+++ branches/Version-1_0-branch/frontend/inc/class.uidrawings.inc.php
2011-03-10 10:23:40 UTC (rev 7103)
@@ -73,23 +73,31 @@
}
}
-
//----------------------------------------------datatable settings--------
+ $valid_types =
isset($config->config_data['document_valid_types']) &&
$config->config_data['document_valid_types'] ? str_replace ( ',' , '|' ,
$config->config_data['document_valid_types'] ) : '';
+
$content = array();
- foreach($document_list as $entry)
+ if($valid_types)
{
- $content[] = array
- (
- 'document_id' =>
$entry['document_id'],
- 'document_name' =>
$entry['document_name'],
- 'link'
=> $entry['link'],
- 'title'
=> $entry['title'],
- 'doc_type'
=> $entry['doc_type'],
+ foreach($document_list as $entry)
+ {
+ if (
!preg_match("/({$valid_types})$/i", $entry['document_name']) )
+ {
+ continue;
+ }
+
+ $content[] = array
+ (
+ 'document_id'
=> $entry['document_id'],
+ 'document_name'
=> $entry['document_name'],
+ 'link'
=> $entry['link'],
+ 'title'
=> $entry['title'],
+ 'doc_type'
=> $entry['doc_type'],
'document_date' =>
$GLOBALS['phpgw']->common->show_date($entry['document_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']),
- );
+ );
+ }
}
-
$datavalues[0] = array
(
'name' => "0",
Modified: branches/Version-1_0-branch/frontend/inc/class.uifrontend.inc.php
===================================================================
--- branches/Version-1_0-branch/frontend/inc/class.uifrontend.inc.php
2011-03-10 09:38:47 UTC (rev 7102)
+++ branches/Version-1_0-branch/frontend/inc/class.uifrontend.inc.php
2011-03-10 10:23:40 UTC (rev 7103)
@@ -479,12 +479,21 @@
{
$mime_type = $ls_array[0]['mime_type'];
}
-
+
if(isset($document) && $document != '')
{
header('Content-type: ' . $mime_type);
- echo $document;
+ if(function_exists('imagejpeg'))
+ {
+ $source =
"{$GLOBALS['phpgw_info']['server']['files_dir']}{$ls_array[0]['directory']}/{$ls_array[0]['name']}";
+ $this->create_thumb($source,173);
+ }
+ else
+ {
+ echo $document;
+ }
+
$GLOBALS['phpgw']->common->phpgw_exit();
}
else
@@ -492,4 +501,47 @@
$GLOBALS['phpgw']->redirect_link('templates/base/images/missing_picture.png');
}
}
+
+ function create_thumb($source,$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 );
+ $width = $height;
+ }
+ else if($height > $width)
+ {
+ $y = ceil(($height - $width) / 2);
+ $height = $width;
+ }
+
+ $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,$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,$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,$target_width,$target_height,$width,$height);
+ imagepng($new_im,$dest);
+ }
+ }
}
Modified: branches/Version-1_0-branch/frontend/templates/base/config.tpl
===================================================================
--- branches/Version-1_0-branch/frontend/templates/base/config.tpl
2011-03-10 09:38:47 UTC (rev 7102)
+++ branches/Version-1_0-branch/frontend/templates/base/config.tpl
2011-03-10 10:23:40 UTC (rev 7103)
@@ -81,6 +81,10 @@
</table>
</td>
</tr>
+ <tr class="row_on">
+ <td>{lang_document_valid_types}(comma separated list of
valid filetypes):</td>
+ <td><input name="newsettings[document_valid_types]"
value="{value_document_valid_types}"></td>
+ </tr>
<tr class="row_off">
<td>{lang_delegate_limit}:</td>
<td><input name="newsettings[delegate_limit]"
value="{value_delegate_limit}"></td>
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.sessions.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.sessions.inc.php
2011-03-10 09:38:47 UTC (rev 7102)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.sessions.inc.php
2011-03-10 10:23:40 UTC (rev 7103)
@@ -1112,15 +1112,18 @@
$session = $this->read_session($sessionid);
- $timeout = time() -
$GLOBALS['phpgw_info']['server']['sessions_timeout'];
- if ( !isset($session['session_dla'])
- || $session['session_dla'] <= $timeout )
+ if ($GLOBALS['phpgw_info']['server']['auth_type'] !=
'ntlm') //Timeout make no sense for SSO
{
- if(isset($session['session_dla']))
+ $timeout = time() -
$GLOBALS['phpgw_info']['server']['sessions_timeout'];
+ if ( !isset($session['session_dla'])
+ || $session['session_dla'] <= $timeout )
{
- $this->cd_reason = 10;
+ if(isset($session['session_dla']))
+ {
+ $this->cd_reason = 10;
+ }
+ return false;
}
- return false;
}
$this->_session_flags = $session['session_flags'];
Modified:
branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
2011-03-10 09:38:47 UTC (rev 7102)
+++ branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
2011-03-10 10:23:40 UTC (rev 7103)
@@ -298,6 +298,22 @@
</xsl:choose>
</input>
</xsl:when>
+ <xsl:when
test="datatype='link'">
+ <input
type="text" name="values_attribute[{counter}][value]" value="{value}" size="30">
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
+ </input>
+
<xsl:choose>
+
<xsl:when test="value!=''">
+
<br/><a href="{value}" target="_blank"><xsl:value-of
select="value"/></a>
+
</xsl:when>
+
</xsl:choose>
+ </xsl:when>
<xsl:when
test="datatype='event'">
<xsl:choose>
<xsl:when test="warning!=''">
Modified:
branches/Version-1_0-branch/property/templates/base/attributes_view.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/attributes_view.xsl
2011-03-10 09:38:47 UTC (rev 7102)
+++ branches/Version-1_0-branch/property/templates/base/attributes_view.xsl
2011-03-10 10:23:40 UTC (rev 7103)
@@ -77,6 +77,13 @@
<xsl:value-of
select="value"/>
<img
id="values_attribute_{counter}-trigger"/>
</xsl:when>
+ <xsl:when
test="datatype='link'">
+ <xsl:choose>
+
<xsl:when test="value!=''">
+
<br/><a href="{value}" target="_blank"><xsl:value-of select="value"/></a>
+
</xsl:when>
+ </xsl:choose>
+ </xsl:when>
<xsl:otherwise>
<xsl:value-of
select="value"/>
</xsl:otherwise>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7103] Merge 7098:7102 from trunk,
Sigurd Nes <=