Merge branch 'seeddms-4.3.1' into develop

Conflicts:
	Makefile

CHANGELOG

@@ -1,3 +1,13 @@
+--------------------------------------------------------------------------------
+                     Changes in version 4.3.1
+--------------------------------------------------------------------------------
+- translates strings (Bug #86, #87, #88, #90)
+- add icon for rar files (Bug #85)
+- webdav: PROPFIND returns only released documents (just like GET did already)
+- folder tree can be completely expanded again if set in configuration
+- add missing div to header and fix folding of main menu
+- consistent implementation of approval/release of document owner
+
 --------------------------------------------------------------------------------
                      Changes in version 4.3.0
 --------------------------------------------------------------------------------

Makefile

@@ -1,4 +1,4 @@
-VERSION=4.3.0
+VERSION=4.3.1
 SRC=CHANGELOG inc conf utils index.php languages views op out controllers README.md README.Notification README.Ubuntu drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install
 #restapi webapp
 

SeedDMS_Core/Core/inc.ClassDMS.php

@@ -243,7 +243,7 @@ class SeedDMS_Core_DMS {
 		$this->convertFileTypes = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '4.3.0';
+			$this->version = '4.3.1';
 	} /* }}} */
 
 	function getDB() { /* {{{ */

inc/inc.Version.php

@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	var $_number = "4.3.0";
+	var $_number = "4.3.1";
 	var $_string = "SeedDMS";
 
 	function SeedDMS_Version() {

install/install.php

@@ -116,7 +116,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "4.3.0");
+define("SEEDDMS_VERSION", "4.3.1");
 
 require_once('../inc/inc.ClassSettings.php');
 

languages/de_DE/lang.inc

@@ -85,6 +85,7 @@ $text = array(
 'assign_reviewers' => "Prüfer zuweisen",
 'assign_user_property_to' => "Dokumente einem anderen Benutzer zuweisen",
 'assumed_released' => "Angenommen, freigegeben",
+'at_least_n_users_of_group' => "Mindestens [number_of_users] Benutzer der Gruppe [group]",
 'attrdef_management' => "Attributdefinitions-Management",
 'attrdef_exists' => "Attributdefinition existiert bereits",
 'attrdef_in_use' => "Definition des Attributs noch in Gebrauch",
@@ -161,6 +162,7 @@ $text = array(
 'create_fulltext_index_warning' => "Sie möchten den Volltextindex neu erzeugen. Dies kann beträchtlich Zeit in Anspruch nehmen und Gesamtleistung Ihres System beeinträchtigen. Bestätigen Sie bitte diese Operation.",
 'creation_date' => "Erstellt am",
 'current_password' => "Aktuelles Passwort",
+'current_state' => "Aktueller Status",
 'current_version' => "Aktuelle Version",
 'daily' => "täglich",
 'days' => "Tage",
@@ -790,6 +792,8 @@ $text = array(
 'splash_settings_saved' => "Einstellungen gesichert",
 'splash_substituted_user' => "Benutzer gewechselt",
 'splash_switched_back_user' => "Zum ursprünglichen Benutzer zurückgekehrt",
+'state_and_next_state' => "Status/Nächster Status",
+'statistic' => "Statistik",
 'status_approval_rejected' => "Entwurf abgelehnt",
 'status_approved' => "freigegeben",
 'status_approver_removed' => "Freigebender wurde vom Prozess ausgeschlossen",
@@ -859,6 +863,8 @@ $text = array(
 'user_management' => "Benutzerverwaltung",
 'user_name' => "Vollst. Name",
 'users' => "Benutzer",
+'users_and_groups' => "Benutzer/Gruppen",
+'users_done_work' => "Bereits aktive Benutzer",
 'user' => "Benutzer",
 'version_deleted_email' => "Version gelöscht",
 'version_deleted_email_subject' => "[sitename]: [name] - Version gelöscht",

languages/en_GB/lang.inc

@@ -85,6 +85,7 @@ $text = array(
 'assign_reviewers' => "Assign Reviewers",
 'assign_user_property_to' => "Assign user's properties to",
 'assumed_released' => "Assumed released",
+'at_least_n_users_of_group' => "At least [number_of_users] users of [group]",
 'attr_no_regex_match' => "The attribute value does not match the regular expression",
 'attrdef_management' => "Attribute definition management",
 'attrdef_exists' => "Attribute definition already exists",
@@ -165,6 +166,7 @@ $text = array(
 'create_fulltext_index_warning' => "You are to recreate the fulltext index. This can take a considerable amount of time and reduce your overall system performance. If you really want to recreate the index, please confirm your operation.",
 'creation_date' => "Created",
 'current_password' => "Current Password",
+'current_state' => "Current State",
 'current_version' => "Current version",
 'daily' => "Daily",
 'days' => "days",
@@ -821,6 +823,8 @@ $text = array(
 'splash_settings_saved' => "Settings saved",
 'splash_substituted_user' => "Substituted user",
 'splash_switched_back_user' => "Switched back to original user",
+'state_and_next_state' => "State/Next state",
+'statistic' => "Statistic",
 'status_approval_rejected' => "Draft rejected",
 'status_approved' => "Approved",
 'status_approver_removed' => "Approver removed from process",
@@ -892,6 +896,8 @@ $text = array(
 'user_management' => "Users management",
 'user_name' => "Full name",
 'users' => "Users",
+'users_and_groups' => "Users/Groups",
+'users_done_work' => "Users done work",
 'user' => "User",
 'version_deleted_email' => "Version deleted",
 'version_deleted_email_subject' => "[sitename]: [name] - Version deleted",

views/bootstrap/class.Statistic.php

@@ -219,7 +219,7 @@ print "<li><span style=\"color:".$this->getAccessColor(M_READ)."\">".getMLText("
 print "<li><span style=\"color:".$this->getAccessColor(M_NONE)."\">".getMLText("access_mode_none")." </span></li>";
 print "</ul>\n";
 
-print "<legend>Statistic</legend>\n";
+print "<legend>".getMLText("statistic")."</legend>\n";
 print "<ul class=\"unstyled\">\n";
 print "<li>".getMLText("folders").": ".$this->folder_count."</li>\n";
 print "<li>".getMLText("documents").": ".$this->document_count."</li>\n";

views/bootstrap/class.ViewDocument.php

@@ -607,24 +607,24 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			}
 			echo "<div class=\"row-fluid\">";
 			echo "<div class=\"span8\">";
-			echo "<h5>Current State: ".$workflowstate->getName()."</h5>";
+			echo "<h5>".getMLText('current_state').": ".$workflowstate->getName()."</h5>";
 			echo "<table class=\"table table-condensed\">\n";
 			echo "<tr>";
-			echo "<td>Next state:</td>";
+			echo "<td>".getMLText('next_state').":</td>";
 			foreach($transitions as $transition) {
 				$nextstate = $transition->getNextState();
 				echo "<td>".$nextstate->getName()."</td>";
 			}
 			echo "</tr>";
 			echo "<tr>";
-			echo "<td>Action:</td>";
+			echo "<td>".getMLText('action').":</td>";
 			foreach($transitions as $transition) {
 				$action = $transition->getAction();
 				echo "<td>".getMLText('action_'.strtolower($action->getName()), array(), $action->getName())."</td>";
 			}
 			echo "</tr>";
 			echo "<tr>";
-			echo "<td>Users:</td>";
+			echo "<td>".getMLText('users').":</td>";
 			foreach($transitions as $transition) {
 				$transusers = $transition->getUsers();
 				echo "<td>";
@@ -640,13 +640,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			}
 			echo "</tr>";
 			echo "<tr>";
-			echo "<td>Groups:</td>";
+			echo "<td>".getMLText('groups').":</td>";
 			foreach($transitions as $transition) {
 				$transgroups = $transition->getGroups();
 				echo "<td>";
 				foreach($transgroups as $transgroup) {
 					$g = $transgroup->getGroup();
-					echo "At least ".$transgroup->getNumOfUsers()." users of ".$g->getName();
+					echo getMLText('at_least_n_users_of_group',
+						array("number_of_users" => $transgroup->getNumOfUsers(),
+							"group" => $g->getName()));
 					if ($document->getGroupAccessMode($g) < M_READ) {
 						echo " (no access)";
 					}
@@ -656,7 +658,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			}
 			echo "</tr>";
 			echo "<tr class=\"success\">";
-			echo "<td>User done work:</td>";
+			echo "<td>".getMLText('users_done_work').":</td>";
 			foreach($transitions as $transition) {
 				echo "<td>";
 				if($latestContent->executeWorkflowTransitionIsAllowed($transition)) {
@@ -723,7 +725,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					 * parent workflow
 					 */
 					if($latestContent->getWorkflowState()->getID() == $state->getID()) {
-						echo "Switch from sub workflow '".$workflow->getName()."' into state ".$state->getName()." of parent workflow '".$parentworkflow->getName()."' is possible<br />";
+						echo "Switching from sub workflow '".$workflow->getName()."' into state ".$state->getName()." of parent workflow '".$parentworkflow->getName()."' is possible<br />";
 						/* Check if the transition from the state where the sub workflow
 						 * starts into the current state is also allowed in the parent
 						 * workflow. Checking at this point is actually too late, because

views/bootstrap/class.WorkflowMgr.php

@@ -235,7 +235,7 @@ function showWorkflow(selectObj) {
 		if($actions) {
 		$transitions = $currWorkflow->getTransitions();
 		echo "<table class=\"table table-condensed\">";
-		echo "<tr><th>State/Next state</th><th>Action</th><th>".getMLText('user')."/".getMLText('group')."</th></tr>";
+		echo "<tr><th>".getMLText('state_and_next_state')."</th><th>".getMLText('action')."</th><th>".getMLText('users_and_groups')."</th></tr>";
 		if($transitions) {
 			foreach($transitions as $transition) {
 				$state = $transition->getState();
@@ -258,12 +258,14 @@ function showWorkflow(selectObj) {
 				echo "<td>";
 				foreach($transusers as $transuser) {
 					$u = $transuser->getUser();
-					echo "User ".$u->getFullName();
+					echo getMLText('user').": ".$u->getFullName();
 					echo "<br />";
 				}
 				foreach($transgroups as $transgroup) {
 					$g = $transgroup->getGroup();
-					echo "At least ".$transgroup->getNumOfUsers()." users of ".$g->getName();
+					echo getMLText('at_least_n_users_of_group',
+						array("number_of_users" => $transgroup->getNumOfUsers(),
+							"group" => $g->getName()));
 					echo "<br />";
 				}
 				echo "</td>";