Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

SeedDMS_SQLiteFTS/SQLiteFTS/Document.php

@@ -36,6 +36,13 @@ class SeedDMS_SQLiteFTS_Document {
 	 */
 	protected $fields;
 
+	public function __get($key) { /* {{{ */
+		if(isset($this->fields[$key]))
+			return $this->fields[$key];
+		else
+			return false;
+	} /* }}} */
+
 	public function addField($key, $value) { /* {{{ */
 		if($key == 'document_id') {
 			$this->id = $this->fields[$key] = (int) $value;

SeedDMS_SQLiteFTS/package.xml

@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2015-08-10</date>
+ <date>2015-11-16</date>
- <time>21:13:13</time>
+ <time>09:07:07</time>
  <version>
-  <release>1.0.0</release>
+  <release>1.0.1</release>
-  <api>1.0.0</api>
+  <api>1.0.1</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-initial release
+add __get() to SQLiteFTS_Document because class.IndexInfo.php access class variable title which doesn't exists
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -66,5 +66,21 @@ initial release
  </dependencies>
  <phprelease />
  <changelog>
+  <release>
+   <date>2015-08-10</date>
+   <time>21:13:13</time>
+   <version>
+    <release>1.0.0</release>
+    <api>1.0.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+initial release
+   </notes>
+  </release>
  </changelog>
 </package>

languages/ar_EG/lang.inc

@@ -1231,6 +1231,7 @@ URL: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',

languages/bg_BG/lang.inc

@@ -1096,6 +1096,7 @@ $text = array(
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',

languages/ca_ES/lang.inc

@@ -1101,6 +1101,7 @@ URL: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',

languages/cs_CZ/lang.inc

@@ -1240,6 +1240,7 @@ URL: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',

languages/de_DE/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2136), dgrutsch (18)
+//    Translators: Admin (2137), dgrutsch (18)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -1260,6 +1260,7 @@ URL: [url]',
 'timeline_full_add_file' => '[document]<br />Neuer Anhang',
 'timeline_full_add_version' => '[document]<br />Neue Version [version]',
 'timeline_full_status_change' => '[document]<br />Version [version]: [status]',
+'timeline_selected_item' => 'Ausgewähltes Dokument',
 'timeline_skip_add_file' => 'Anhang hinzugefügt',
 'timeline_skip_status_change_-1' => 'abgelehnt',
 'timeline_skip_status_change_-3' => 'abgelaufen',

languages/en_GB/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1271), dgrutsch (3), netixw (14)
+//    Translators: Admin (1272), dgrutsch (3), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -1267,6 +1267,7 @@ URL: [url]',
 'timeline_full_add_file' => '[document]<br />New Attachment',
 'timeline_full_add_version' => '[document]<br />New version [version]',
 'timeline_full_status_change' => '[document]<br />Version [version]: [status]',
+'timeline_selected_item' => 'Selected document',
 'timeline_skip_add_file' => 'attachment added',
 'timeline_skip_status_change_-1' => 'rejected',
 'timeline_skip_status_change_-3' => 'expired',

languages/es_ES/lang.inc

@@ -1246,6 +1246,7 @@ URL: [url]',
 'timeline_full_add_file' => '[document<br />nuevo anexo',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '[document]<br />Versión [version]: [status]',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => 'anexos agregados',
 'timeline_skip_status_change_-1' => 'rechazado',
 'timeline_skip_status_change_-3' => 'expirado',

languages/fr_FR/lang.inc

@@ -1222,6 +1222,7 @@ URL: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',

languages/hr_HR/lang.inc

@@ -1252,6 +1252,7 @@ Internet poveznica: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',

languages/hu_HU/lang.inc

@@ -1245,6 +1245,7 @@ URL: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',

languages/it_IT/lang.inc

@@ -1269,6 +1269,7 @@ URL: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',

languages/ko_KR/lang.inc

@@ -1260,6 +1260,7 @@ URL : [url]',
 'timeline_full_add_file' => '[document]<br />새로운 첨부',
 'timeline_full_add_version' => '[document]<br />새버전 [version]',
 'timeline_full_status_change' => '[document]<br />버전[version]: [status]',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '첨부 파일 이 추가 되었습니다',
 'timeline_skip_status_change_-1' => '거부',
 'timeline_skip_status_change_-3' => '만료',

languages/nl_NL/lang.inc

@@ -1237,6 +1237,7 @@ URL: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',

languages/pl_PL/lang.inc

@@ -1225,6 +1225,7 @@ URL: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',

languages/pt_BR/lang.inc

@@ -1243,6 +1243,7 @@ URL: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',

languages/ro_RO/lang.inc

@@ -1268,6 +1268,7 @@ URL: [url]',
 'timeline_full_add_file' => '[document]<br />Adaugă atașament',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '[document] Versiune [version]: [status]',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => 'atașament adăugat',
 'timeline_skip_status_change_-1' => 'rejectat',
 'timeline_skip_status_change_-3' => 'expirat',

languages/ru_RU/lang.inc

@@ -1236,6 +1236,7 @@ URL: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',

languages/sk_SK/lang.inc

@@ -1096,6 +1096,7 @@ $text = array(
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',

languages/sv_SE/lang.inc

@@ -1231,6 +1231,7 @@ URL: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',

languages/tr_TR/lang.inc

@@ -1247,6 +1247,7 @@ URL: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => 'ek eklendi',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',

languages/uk_UA/lang.inc

@@ -1258,6 +1258,7 @@ URL: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',

languages/zh_CN/lang.inc

@@ -1102,6 +1102,7 @@ URL: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',

languages/zh_TW/lang.inc

@@ -1100,6 +1100,7 @@ URL: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',

out/out.Timeline.php

@@ -25,6 +25,11 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
@@ -67,6 +72,9 @@ if($view) {
 	$view->setParam('skip', $skip);
 	$view->setParam('document', $document);
 	$view->setParam('version', $content);
+	$view->setParam('cachedir', $settings->_cacheDir);
+	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
 	$view($_GET);
 	exit;
 }

views/bootstrap/class.Timeline.php

@@ -39,9 +39,33 @@ class SeedDMS_View_Timeline extends SeedDMS_Bootstrap_Style {
 	function iteminfo() { /* {{{ */
 		$dms = $this->params['dms'];
 		$document = $this->params['document'];
+		$version = $this->params['version'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidthlist = $this->params['previewWidthList'];
+		$previewwidthdetail = $this->params['previewWidthDetail'];
 		if($document) {
-			$this->contentHeading(getMLText("selected_item"));
+			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail);
+			$previewer->createPreview($version);
+
+			$this->contentHeading(getMLText("timeline_selected_item"));
+			$folder = $document->getFolder();
+			$path = $folder->getPath();
+			print "<div>";
+			print "<a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\">/";
+			for ($i = 1; $i  < count($path); $i++) {
+				print htmlspecialchars($path[$i]->getName())."/";
+			}
 			echo $document->getName();
+			print "</a>";
+			print "</div>";
+
+			print "<div>";
+			if($previewer->hasPreview($version)) {
+				print("<img class=\"mimeicon\" width=\"".$previewwidthdetail."\" src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($version->getMimeType())."\">");
+			} else {
+				print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+			}
+			print "</div>";
 		}
 	} /* }}} */