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

This commit is contained in:
Uwe Steinmann 2017-01-04 17:11:39 +01:00
commit 7d8f4f54c0
33 changed files with 809 additions and 722 deletions

View File

@ -1,7 +1,7 @@
--------------------------------------------------------------------------------
Changes in version 5.1.2
--------------------------------------------------------------------------------
- merge changes up to 5.0.7
- merge changes up to 5.0.9
--------------------------------------------------------------------------------
Changes in version 5.1.1
@ -23,6 +23,12 @@
- add document list which can be exported as an archive
- search results can be exported
--------------------------------------------------------------------------------
Changes in version 5.0.9
--------------------------------------------------------------------------------
- merged changes from 4.3.32
- add hooks for previewing documents
--------------------------------------------------------------------------------
Changes in version 5.0.8
--------------------------------------------------------------------------------
@ -82,6 +88,11 @@
- add .xml to online file types by default
- add home folder for users
--------------------------------------------------------------------------------
Changes in version 4.3.32
--------------------------------------------------------------------------------
- fix saving new mimetype for fulltext search, available languages
--------------------------------------------------------------------------------
Changes in version 4.3.31
--------------------------------------------------------------------------------

View File

@ -38,7 +38,7 @@ class Controller {
$classname = "SeedDMS_Controller_".$class;
$filename = '';
foreach($EXT_CONF as $extname=>$extconf) {
$filename = '../ext/'.$extname.'/controllers/class.'.$class.".php";
$filename = $settings->_rootDir.'ext/'.$extname.'/controllers/class.'.$class.".php";
if(file_exists($filename)) {
break;
}

View File

@ -79,7 +79,7 @@ class UI_Default {
function footNote() { /* {{{ */
global $settings;
echo "<div class=\"container-fluid\" style=\"margin-top: 0px;\">\n";
echo '<div class="row-fluid">'."\n";
echo '<div class="span12">'."\n";
@ -95,7 +95,7 @@ class UI_Default {
echo "</div>\n";
echo "</div>\n";
echo "</div>\n";
return;
} /* }}} */
@ -124,7 +124,7 @@ class UI_Default {
} /* }}} */
function __globalNavigation($folder=null) { /* {{{ */
global $settings, $user;
echo "<div class=\"globalBox\">\n";
@ -203,7 +203,7 @@ class UI_Default {
} /* }}} */
function __folderNavigationBar($folder) { /* {{{ */
global $user, $settings, $theme;
if (!is_object($folder) || strcasecmp(get_class($folder), "SeedDMS_Core_Folder")) {
@ -237,7 +237,7 @@ class UI_Default {
} /* }}} */
function __documentNavigationBar() { /* {{{ */
global $user, $settings, $document;
$accessMode = $document->getAccessMode($user);
@ -274,13 +274,13 @@ class UI_Default {
} /* }}} */
function __accountNavigationBar() { /* {{{ */
global $settings,$user;
echo "<ul class=\"localNav\">\n";
if (!$settings->_disableSelfEdit) echo "<li id=\"first\"><a href=\"../out/out.EditUserData.php\">".getMLText("edit_user_details")."</a></li>\n";
if (!$user->isAdmin())
if (!$user->isAdmin())
echo "<li><a href=\"../out/out.UserDefaultKeywords.php\">".getMLText("edit_default_keywords")."</a></li>\n";
echo "<li><a href=\"../out/out.ManageNotify.php\">".getMLText("edit_existing_notify")."</a></li>\n";
@ -288,7 +288,7 @@ class UI_Default {
if ($settings->_enableUsersView){
echo "<li><a href=\"../out/out.UsrView.php\">".getMLText("users")."</a></li>\n";
echo "<li><a href=\"../out/out.GroupView.php\">".getMLText("groups")."</a></li>\n";
}
}
echo "</ul>\n";
return;
} /* }}} */
@ -305,7 +305,7 @@ class UI_Default {
} /* }}} */
function __adminToolsNavigationBar() { /* {{{ */
global $settings;
echo "<ul class=\"localNav\">\n";
@ -318,13 +318,13 @@ class UI_Default {
echo "</ul>\n";
return;
} /* }}} */
function __calendarNavigationBar($d){ /* {{{ */
global $settings,$user;
$ds="&day=".$d[0]."&month=".$d[1]."&year=".$d[2];
echo "<ul class=\"localNav\">\n";
echo "<li><a href=\"../out/out.Calendar.php?mode=w".$ds."\">".getMLText("week_view")."</a></li>\n";
echo "<li><a href=\"../out/out.Calendar.php?mode=m".$ds."\">".getMLText("month_view")."</a></li>\n";
@ -332,7 +332,7 @@ class UI_Default {
if (!$user->isGuest()) echo "<li><a href=\"../out/out.AddEvent.php\">".getMLText("add_event")."</a></li>\n";
echo "</ul>\n";
return;
} /* }}} */
function __pageList($pageNumber, $totalPages, $baseURI, $params) { /* {{{ */
@ -359,7 +359,7 @@ class UI_Default {
}
}
else {
$resultsURI .= ($first ? "?" : "&").$key."=".$value;
$resultsURI .= ($first ? "?" : "&").$key."=".$value;
}
$first = false;
}
@ -496,7 +496,7 @@ class UI_Default {
} /* }}} */
function __printDateChooser($defDate = -1, $varName) { /* {{{ */
if ($defDate == -1)
$defDate = mktime();
$day = date("d", $defDate);
@ -521,7 +521,7 @@ class UI_Default {
print ">" . $i . "</option>\n";
}
print "</select> \n";
print "<select name=\"" . $varName . "year\">\n";
print "<select name=\"" . $varName . "year\">\n";
for ($i = $year-5 ; $i <= $year+5 ; $i++)
{
print "<option value=\"" . $i . "\"";
@ -557,7 +557,7 @@ class UI_Default {
}
print "</select>";
} /* }}} */
function __printDocumentChooser($formName) { /* {{{ */
global $settings;
?>
@ -657,46 +657,46 @@ class UI_Default {
} /* }}} */
static function exitError($pagetitle,$error) { /* {{{ */
UI::htmlStartPage($pagetitle);
UI::globalNavigation();
print "<div class=\"error\">";
print htmlspecialchars($error);
print "</div>";
UI::htmlEndPage();
add_log_line(" UI::exitError error=".$error." pagetitle=".$pagetitle);
exit;
exit;
} /* }}} */
// navigation flag is used for items links (navigation or selection)
function __printFoldersTree($accessMode, $exclude, $folderID, $currentFolderID=-1, $navigation=false) { /* {{{ */
global $dms, $user, $form, $settings;
if ($settings->_expandFolderTree==2){
// folder completely open
$is_open=true;
}else if ($settings->_expandFolderTree==1 && $folderID==$settings->_rootFolderID ){
$is_open=true;
}else{
// open the tree until the current folder
$is_open=false;
if ($currentFolderID!=-1){
$currentFolder=$dms->getFolder($currentFolderID);
if (is_object($currentFolder)){
$parent=$currentFolder->getParent();
while (is_object($parent)){
if ($parent->getID()==$folderID){
$is_open=true;
@ -707,25 +707,25 @@ class UI_Default {
}
}
}
$folder = $dms->getFolder($folderID);
if (!is_object($folder)) return;
$subFolders = $folder->getSubFolders();
$subFolders = SeedDMS_Core_DMS::filterAccess($subFolders, $user, M_READ);
if ($folderID == $settings->_rootFolderID) print "<ul style='list-style-type: none;' class='tree'>\n";
print "<li>\n";
if (count($subFolders) > 0){
print "<a href=\"javascript:toggleTree(".$folderID.")\"><img class='treeicon' name=\"treedot".$folderID."\" src=\"";
print "<a href=\"javascript:toggleTree(".$folderID.")\"><img class='treeicon' name=\"treedot".$folderID."\" src=\"";
if ($is_open) UI::printImgPath("minus.png");
else UI::printImgPath("plus.png");
print "\" border=0></a>\n";
}
else{
print "<img class='treeicon' src=\"";
print "<img class='treeicon' src=\"";
UI::printImgPath("blank.png");
print "\" border=0>\n";
}
@ -733,12 +733,12 @@ class UI_Default {
if ($folder->getAccessMode($user) >= $accessMode) {
if ($folderID != $currentFolderID){
if ($navigation) print "<a href=\"../out/out.ViewFolder.php?folderid=" . $folderID . "&showtree=1\">";
else print "<a class=\"foldertree_selectable\" href=\"javascript:folderSelected(" . $folderID . ", '" . str_replace("'", "\\'", htmlspecialchars($folder->getName())) . "')\">";
}else print "<span class=\"selectedfoldertree\">";
if ($is_open) print "<img src=\"".UI::getImgPath("folder_opened.gif")."\" border=0 name=\"treeimg".$folderID."\">".htmlspecialchars($folder->getName());
else print "<img src=\"".UI::getImgPath("folder_closed.gif")."\" border=0 name=\"treeimg".$folderID."\">".htmlspecialchars($folder->getName());
@ -750,22 +750,22 @@ class UI_Default {
if ($is_open) print "<ul style='list-style-type: none;' id=\"tree".$folderID."\" >\n";
else print "<ul style='list-style-type: none; display: none;' id=\"tree".$folderID."\" >\n";
for ($i = 0; $i < count($subFolders); $i++) {
if ($subFolders[$i]->getID() == $exclude) continue;
UI::printFoldersTree( $accessMode, $exclude, $subFolders[$i]->getID(),$currentFolderID,$navigation);
}
print "</ul>\n";
if ($folderID == $settings->_rootFolderID) print "</ul>\n";
} /* }}} */
function __printTreeNavigation($folderid,$showtree){ /* {{{ */
global $settings;
?>
<script language="JavaScript">
function toggleTree(id){
@ -798,9 +798,9 @@ class UI_Default {
UI::contentContainerEnd();
}else{
print "<td id='tree-closed'>";
print "<td id='tree-closed'>";
UI::contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=1\"><img src=\"".UI::getImgPath("p.png")."\" border=0></a>", true);
UI::contentContainerStart();
UI::contentContainerEnd();

View File

@ -88,7 +88,7 @@ $controller->setParam('document', $document);
$controller->setParam('index', $index);
$controller->setParam('indexconf', $indexconf);
if(!$controller->run()) {
UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($docname)))),getMLText("error_remove_document"));
UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($docname))),getMLText("error_remove_document"));
}
if ($notifier){

View File

@ -58,8 +58,11 @@ if ($action == "saveSettings")
$settings->_siteName = $_POST["siteName"];
$settings->_footNote = $_POST["footNote"];
$settings->_printDisclaimer = getBoolValue("printDisclaimer");
$settings->_language = $_POST["language"];
$settings->_availablelanguages = $_POST["availablelanguages"];
$settings->_language = $_POST["language"];
if(empty($_POST["availablelanguages"]))
$settings->_availablelanguages = array();
else
$settings->_availablelanguages = $_POST["availablelanguages"];
$settings->_theme = $_POST["theme"];
$settings->_previewWidthList = $_POST["previewWidthList"];
$settings->_previewWidthDetail = $_POST["previewWidthDetail"];

View File

@ -33,7 +33,7 @@ if (isset($_REQUEST["hash"]) && strlen($_REQUEST["hash"])>0) {
$hash = $_REQUEST["hash"];
} else {
header("Location: ../out/out.Login.php");
exit;
exit;
}
$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));

View File

@ -58,6 +58,7 @@ if (!is_object($version)) {
$latestContent = $document->getLatestContent();
if ($latestContent->getVersion()==$version->getVersion()) {
header("Location:../out/out.ViewDocument.php?documentid=".$document->getID());
exit;
}
$folder = $document->getFolder();

View File

@ -59,6 +59,7 @@ if (!$document->getLatestContent()) {
*/
if ($document->verifyLastestContentExpriry()){
header("Location:../out/out.ViewDocument.php?documentid=".$document->getID());
exit;
}
/* Recalculate the status of a document and reload the page if the status

View File

@ -425,8 +425,9 @@ function uploadDocument($id) { /* {{{ */
fclose($handle);
$finfo = finfo_open(FILEINFO_MIME_TYPE);
$userfiletype = finfo_file($finfo, $temp);
$fileType = ".".pathinfo($origfilename, PATHINFO_EXTENSION);
finfo_close($finfo);
$res = $mfolder->addDocument($docname, '', 0, $userobj, '', array(), $temp, $origfilename ? $origfilename : basename($temp), '.', $userfiletype, 0);
$res = $mfolder->addDocument($docname, '', 0, $userobj, '', array(), $temp, $origfilename ? $origfilename : basename($temp), $fileType, $userfiletype, 0);
unlink($temp);
if($res) {
$doc = $res[0];

View File

@ -82,38 +82,44 @@ $(document).ready(function() {
$expdate = date('Y-m-d');
?>
<form action="../op/op.AddEvent.php" id="form1" name="form1" method="post">
<table class="table-condensed">
<tr>
<td><?php printMLText("from");?>:</td>
<td><?php //$this->printDateChooser(-1, "from");?>
<form class="form-horizontal" action="../op/op.AddEvent.php" id="form1" name="form1" method="post">
<div class="control-group">
<label class="control-label"><?php printMLText("from");?>:</label>
<div class="controls"><?php //$this->printDateChooser(-1, "from");?>
<span class="input-append date span12" id="fromdate" data-date="<?php echo $expdate; ?>" data-date-format="yyyy-mm-dd">
<input class="span6" size="16" name="from" type="text" value="<?php echo $expdate; ?>">
<span class="add-on"><i class="icon-calendar"></i></span>
</span>
</td>
</tr>
<tr>
<td><?php printMLText("to");?>:</td>
<td><?php //$this->printDateChooser(-1, "to");?>
</div>
</div>
<div class="control-group">
<label class="control-label"><?php printMLText("to");?>:</label>
<div class="controls"><?php //$this->printDateChooser(-1, "to");?>
<span class="input-append date span12" id="todate" data-date="<?php echo $expdate; ?>" data-date-format="yyyy-mm-dd">
<input class="span6" size="16" name="to" type="text" value="<?php echo $expdate; ?>">
<span class="add-on"><i class="icon-calendar"></i></span>
</span>
</td>
</tr>
<tr>
<td class="inputDescription"><?php printMLText("name");?>:</td>
<td><input type="text" name="name" size="60"></td>
</tr>
<tr>
<td valign="top" class="inputDescription"><?php printMLText("comment");?>:</td>
<td><textarea name="comment" rows="4" cols="80"></textarea></td>
</tr>
<tr>
<td></td><td><input class="btn" type="submit" value="<?php printMLText("add_event");?>"></td>
</tr>
</table>
</div>
</div>
<div class="control-group">
<label class="control-label"><?php printMLText("name");?>:</label>
<div class="controls"><input type="text" name="name" size="60"></div>
</div>
<div class="control-group">
<label class="control-label"><?php printMLText("comment");?>:</label>
<div class="controls"><textarea name="comment" rows="4" cols="80"></textarea></div>
</div>
<div class="controls">
<input class="btn" type="submit" value="<?php printMLText("add_event");?>">
</div>
</form>
<?php
$this->contentContainerEnd();

View File

@ -98,30 +98,37 @@ $(document).ready( function() {
$this->contentContainerStart();
?>
<form action="../op/op.AddFile.php" enctype="multipart/form-data" method="post" name="form1" id="fileupload">
<form class="form-horizontal" action="../op/op.AddFile.php" enctype="multipart/form-data" method="post" name="form1" id="fileupload">
<input type="hidden" name="documentid" value="<?php print $document->getId(); ?>">
<table class="table-condensed">
<tr>
<td><?php printMLText("local_file");?>:</td>
<td><!-- <input type="File" name="userfile" size="60"> -->
<?php
$this->printFileChooser('userfile', false);
?>
</td>
</tr>
<tr>
<td><?php printMLText("name");?>:</td>
<td><input type="text" name="name" id="name" size="60"></td>
</tr>
<tr>
<td><?php printMLText("comment");?>:</td>
<td><textarea name="comment" id="comment" rows="4" cols="80"></textarea></td>
</tr>
<tr>
<td></td>
<td><input class="btn" type="submit" value="<?php printMLText("add");?>"></td>
</tr>
</table>
<div class="control-group">
<label class="control-label"><?php printMLText("local_file");?>:</label>
<div class="controls">
<?php $this->printFileChooser('userfile', false); ?>
</div>
</div>
<div class="control-group">
<label class="control-label"><?php printMLText("name");?>:</label>
<div class="controls">
<input type="text" name="name" id="name" size="60">
</div>
</div>
<div class="control-group">
<label class="control-label"><?php printMLText("comment");?>:</label>
<div class="controls">
<textarea name="comment" id="comment" rows="4" cols="80"></textarea>
</div>
</div>
<div class="controls">
<input class="btn" type="submit" value="<?php printMLText("add");?>">
</div>
</form>
<?php
$this->contentContainerEnd();

View File

@ -103,40 +103,43 @@ $(document).ready( function() {
$this->contentContainerStart();
?>
<form action="../op/op.AddSubFolder.php" id="form1" name="form1" method="post">
<form class="form-horizontal" action="../op/op.AddSubFolder.php" id="form1" name="form1" method="post">
<?php echo createHiddenFieldWithKey('addsubfolder'); ?>
<input type="Hidden" name="folderid" value="<?php print $folder->getId();?>">
<input type="Hidden" name="showtree" value="<?php echo showtree();?>">
<table class="table-condensed">
<tr>
<td class="inputDescription"><?php printMLText("name");?>:</td>
<td><input type="text" name="name" size="60" required></td>
</tr>
<tr>
<td class="inputDescription"><?php printMLText("comment");?>:</td>
<td><textarea name="comment" rows="4" cols="80"<?php echo $strictformcheck ? ' required' : ''; ?>></textarea></td>
</tr>
<tr>
<td class="inputDescription"><?php printMLText("sequence");?>:</td>
<td><?php $this->printSequenceChooser($folder->getSubFolders('s')); if($orderby != 's') echo "<br />".getMLText('order_by_sequence_off');?></td>
</tr>
<input type="hidden" name="folderid" value="<?php print $folder->getId();?>">
<input type="hidden" name="showtree" value="<?php echo showtree();?>">
<div class="control-group">
<label class="control-label"><?php printMLText("name");?>:</label>
<div class="controls"><input type="text" name="name" size="60" required></div>
</div>
<div class="control-group">
<label class="control-label"><?php printMLText("comment");?>:</label>
<div class="controls"><textarea name="comment" rows="4" cols="80"<?php echo $strictformcheck ? ' required' : ''; ?>></textarea></div>
</div>
<div class="control-group">
<label class="control-label"><?php printMLText("sequence");?>:</label>
<div class="controls"><?php $this->printSequenceChooser($folder->getSubFolders('s')); if($orderby != 's') echo "<br />".getMLText('order_by_sequence_off');?></div>
</div>
<?php
$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_folder, SeedDMS_Core_AttributeDefinition::objtype_all));
if($attrdefs) {
foreach($attrdefs as $attrdef) {
?>
<tr>
<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
<td><?php $this->printAttributeEditField($attrdef, '') ?></td>
</tr>
<div class="control-group">
<label class="control-label"><?php echo htmlspecialchars($attrdef->getName()); ?>:</label>
<div class="controls"><?php $this->printAttributeEditField($attrdef, '') ?></div>
</div>
<?php
}
}
?>
<tr>
<td></td><td><input type="submit" class="btn" value="<?php printMLText("add_subfolder");?>"></td>
</tr>
</table>
<div class="controls">
<input type="submit" class="btn" value="<?php printMLText("add_subfolder");?>">
</div>
</form>
<?php
$this->contentContainerEnd();

View File

@ -163,7 +163,7 @@ $(document).ready( function() {
<?php
}
?>
<form action="../op/op.AttributeMgr.php" method="post">
<form class="form-horizontal" action="../op/op.AttributeMgr.php" method="post">
<?php
if($attrdef) {
echo createHiddenFieldWithKey('editattrdef');
@ -178,82 +178,89 @@ $(document).ready( function() {
<?php
}
?>
<table class="table-condensed">
<tr>
<td>
<div class="control-group">
<label class="control-label">
<?php printMLText("attrdef_name");?>:
</td>
<td>
</label>
<div class="controls">
<input type="text" name="name" value="<?php echo $attrdef ? htmlspecialchars($attrdef->getName()) : '' ?>">
</td>
</tr>
<tr>
<td>
</div>
</div>
<div class="control-group">
<label class="control-label">
<?php printMLText("attrdef_objtype");?>:
</td>
<td>
<select name="objtype"><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_all ?>">All</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_folder ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_folder) echo "selected"; ?>>Folder</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_document ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document) echo "selected"; ?>>Document</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_documentcontent ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent) echo "selected"; ?>>Document content</option></select>
</td>
</tr>
<tr>
<td>
<?php printMLText("attrdef_type");?>:
</td>
<td>
</label>
<div class="controls">
<select name="objtype"><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_all ?>"><?php printMLText('all'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_folder ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_folder) echo "selected"; ?>><?php printMLText('folder'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_document ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document) echo "selected"; ?>><?php printMLText('document'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_documentcontent ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent) echo "selected"; ?>><?php printMLText('version'); ?></option></select>
</div>
</div>
<div class="control-group">
<label class="control-label"><?php printMLText("attrdef_type");?>:</label>
<div class="controls">
<select name="type"><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_int ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int) echo "selected"; ?>><?php printMLText('attrdef_type_int'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_float ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_float) echo "selected"; ?>><?php printMLText('attrdef_type_float'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_string ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_string) echo "selected"; ?>><?php printMLText('attrdef_type_string'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_boolean ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_boolean) echo "selected"; ?>><?php printMLText('attrdef_type_boolean'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_date ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date) echo "selected"; ?>><?php printMLText('attrdef_type_date'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_email ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_email) echo "selected"; ?>><?php printMLText('attrdef_type_email'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_url ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_url) echo "selected"; ?>><?php printMLText('attrdef_type_url'); ?></option></select>
</td>
</tr>
<tr>
<td>
</div>
</div>
<div class="control-group">
<label class="control-label">
<?php printMLText("attrdef_multiple");?>:
</td>
<td>
</label>
<div class="controls">
<input type="checkbox" value="1" name="multiple" <?php echo ($attrdef && $attrdef->getMultipleValues()) ? "checked" : "" ?>/>
</td>
</tr>
<tr>
<td>
<?php printMLText("attrdef_minvalues");?>:
</td>
<td>
</div>
</div>
<div class="control-group">
<label class="control-label"><?php printMLText("attrdef_minvalues");?>:</label>
<div class="controls">
<input type="text" value="<?php echo $attrdef ? $attrdef->getMinValues() : '' ?>" name="minvalues" />
</td>
</tr>
<tr>
<td>
</div>
</div>
<div class="control-group">
<label class="control-label">
<?php printMLText("attrdef_maxvalues");?>:
</td>
<td>
</label>
<div class="controls">
<input type="text" value="<?php echo $attrdef ? $attrdef->getMaxValues() : '' ?>" name="maxvalues" />
</td>
</tr>
<tr>
<td>
</div>
</div>
<div class="control-group">
<label class="control-label">
<?php printMLText("attrdef_valueset");?>:
</td>
<td>
</label>
<div class="controls">
<?php if($attrdef && strlen($attrdef->getValueSet()) > 30) { ?>
<textarea name="valueset" rows="5"><?php echo ($attrdef && $attrdef->getValueSet()) ? $attrdef->getValueSetSeparator().implode("\n".$attrdef->getValueSetSeparator(), $attrdef->getValueSetAsArray()) : '' ?></textarea>
<?php } else { ?>
<input type="text" value="<?php echo $attrdef ? $attrdef->getValueSet() : '' ?>" name="valueset" />
<?php } ?>
</td>
</tr>
<tr>
<td>
</div>
</div>
<div class="control-group">
<label class="control-label">
<?php printMLText("attrdef_regex");?>:
</td>
<td>
</label>
<div class="controls">
<input type="text" value="<?php echo $attrdef ? $attrdef->getRegex() : '' ?>" name="regex" />
</td>
</tr>
<tr>
<td></td>
<td>
<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button>
</td>
</tr>
</table>
</div>
</div>
<div class="controls">
<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button>
</div>
</form>
<?php
} /* }}} */

View File

@ -1306,8 +1306,8 @@ $('#acceptkeywords').click(function(ev) {
case SeedDMS_Core_AttributeDefinition::type_date:
$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
?>
<span class="input-append date datepicker" style="_display: inline;" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
<input id="<?php echo $fieldname."_".$attrdef->getId();?>" class="span4" size="16" name="<?php echo $fieldname ?>[<?php echo $attrdef->getId() ?>]" type="text" value="<?php if($objvalue) echo $objvalue; else echo "" /*date('Y-m-d')*/; ?>">
<span class="input-append date datepicker" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
<input id="<?php echo $fieldname."_".$attrdef->getId();?>" class="span9" size="16" name="<?php echo $fieldname ?>[<?php echo $attrdef->getId() ?>]" type="text" value="<?php if($objvalue) echo $objvalue; else echo "" /*date('Y-m-d')*/; ?>">
<span class="add-on"><i class="icon-calendar"></i></span>
</span>
<?php

View File

@ -58,48 +58,54 @@ $(document).ready( function() {
function showCategoryForm($category) { /* {{{ */
?>
<table class="table-condensed">
<tr>
<td></td><td>
<div class="control-group">
<label class="control-label"></label>
<div class="controls">
<?php
if($category) {
if($category && $category->isUsed()) {
if($category->isUsed()) {
?>
<p><?php echo getMLText('category_in_use') ?></p>
<?php
} else {
} else {
?>
<form style="display: inline-block;" method="post" action="../op/op.Categories.php" >
<?php echo createHiddenFieldWithKey('removecategory'); ?>
<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
<input type="Hidden" name="action" value="removecategory">
<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
<input type="hidden" name="action" value="removecategory">
<button class="btn" type="submit"><i class="icon-remove"></i> <?php echo getMLText("rm_document_category")?></button>
</form>
<?php
}
}
}
?>
</td>
</tr>
<tr>
<td><?php echo getMLText("name")?>:</td>
<td>
<form class="form-inline" style="margin-bottom: 0px;" action="../op/op.Categories.php" method="post">
<?php if(!$category) { ?>
<?php echo createHiddenFieldWithKey('addcategory'); ?>
<input type="Hidden" name="action" value="addcategory">
<?php } else { ?>
<?php echo createHiddenFieldWithKey('editcategory'); ?>
<input type="Hidden" name="action" value="editcategory">
<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
<?php } ?>
</div>
</div>
<form class="form-horizontal" style="margin-bottom: 0px;" action="../op/op.Categories.php" method="post">
<?php if(!$category) { ?>
<?php echo createHiddenFieldWithKey('addcategory'); ?>
<input type="hidden" name="action" value="addcategory">
<?php } else { ?>
<?php echo createHiddenFieldWithKey('editcategory'); ?>
<input type="hidden" name="action" value="editcategory">
<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
<?php } ?>
<div class="control-group">
<label class="control-label"><?php echo getMLText("name")?>:</label>
<div class="controls">
<input name="name" type="text" value="<?php echo $category ? htmlspecialchars($category->getName()) : '' ?>">&nbsp;
<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button>
</form>
</td>
</tr>
</table>
</div>
</div>
<div class="control-group">
<div class="controls">
<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button>
</div>
</div>
</form>
<?php
} /* }}} */

View File

@ -50,7 +50,7 @@ document.form1.newpassword.focus();
$this->pageNavigation(getMLText("change_password"));
$this->contentContainerStart();
?>
<form action="../op/op.ChangePassword.php" method="post" name="form1">
<form class="form-horizontal" action="../op/op.ChangePassword.php" method="post" name="form1">
<?php
if ($referuri) {
echo "<input type='hidden' name='referuri' value='".$referuri."'/>";
@ -59,32 +59,32 @@ document.form1.newpassword.focus();
echo "<input type='hidden' name='hash' value='".$hash."'/>";
}
?>
<table class="table-condensed">
<tr>
<td><?php printMLText("password");?>:</td>
<td><input class="pwd" type="password" rel="strengthbar" name="newpassword" id="password"></td>
</tr>
<div class="control-group">
<label class="control-label"><?php printMLText("password");?>:</label>
<div class="controls"><input class="pwd" type="password" rel="strengthbar" name="newpassword" id="password"></div>
</div>
<?php
if($passwordstrength > 0) {
?>
<tr>
<td><?php printMLText("password_strength");?>:</td>
<td>
<div class="control-group">
<label class="control-label"><?php printMLText("password_strength");?>:</label>
<div class="controls">
<div id="strengthbar" class="progress" style="width: 220px; height: 30px; margin-bottom: 8px;"><div class="bar bar-danger" style="width: 0%;"></div></div>
</td>
</tr>
</div>
</div>
<?php
}
?>
<tr>
<td><?php printMLText("confirm_pwd");?>:</td>
<td><input type="password" name="newpasswordrepeat" id="passwordrepeat"></td>
</tr>
<tr>
<td></td>
<td><input class="btn" type="submit" value="<?php printMLText("submit_password") ?>"></td>
</tr>
</table>
<div class="control-group">
<label class="control-label"><?php printMLText("confirm_pwd");?>:</label>
<div class="controls"><input type="password" name="newpasswordrepeat" id="passwordrepeat"></div>
</div>
<div class="control-group">
<label class="control-label"></label>
<div class="controls"><input class="btn" type="submit" value="<?php printMLText("submit_password") ?>"></div>
</div>
</form>
<?php $this->contentContainerEnd(); ?>
<p><a href="../out/out.Login.php"><?php echo getMLText("login"); ?></a></p>

View File

@ -140,21 +140,22 @@ $(document).ready( function() {
$owner = $category->getOwner();
if ((!$user->isAdmin()) && ($owner->getID() != $user->getID())) return;
?>
<table class="table-condensed">
<tr>
<td></td>
<td>
<div class="control-group">
<label class="control-label"></label>
<div class="controls">
<form action="../op/op.DefaultKeywords.php" method="post">
<?php echo createHiddenFieldWithKey('removecategory'); ?>
<input type="Hidden" name="action" value="removecategory">
<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
<button type="submit" class="btn" title="<?php echo getMLText("delete")?>"><i class="icon-remove"></i> <?php printMLText("rm_default_keyword_category");?></button>
</form>
</td>
</tr>
<tr>
<td><?php echo getMLText("name")?>:</td>
<td>
</div>
</div>
<div class="control-group">
<label class="control-label"><?php echo getMLText("name")?>:</label>
<div class="controls">
<form class="form-inline formn" action="../op/op.DefaultKeywords.php" method="post">
<?php echo createHiddenFieldWithKey('editcategory'); ?>
<input type="hidden" name="action" value="editcategory">
@ -162,11 +163,12 @@ $(document).ready( function() {
<input name="name" class="name" type="text" value="<?php echo htmlspecialchars($category->getName()) ?>">
<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button>
</form>
</td>
</tr>
<tr>
<td><?php echo getMLText("default_keywords")?>:</td>
<td>
</div>
</div>
<div class="control-group">
<label class="control-label"><?php echo getMLText("default_keywords")?>:</label>
<div class="controls">
<?php
$lists = $category->getKeywordLists();
if (count($lists) == 0)
@ -192,23 +194,22 @@ $(document).ready( function() {
</form>
<br>
<?php } ?>
</td>
</tr>
<tr>
<td></td>
<td>
</div>
</div>
<div class="control-group">
<label class="control-label"></label>
<div class="controls">
<form class="form-inline formk" action="../op/op.DefaultKeywords.php" method="post">
<?php echo createHiddenFieldWithKey('newkeywords'); ?>
<input type="Hidden" name="action" value="newkeywords">
<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
<input type="text" class="keywords" name="keywords">
<input type="submit" class="btn" value="<?php printMLText("new_default_keywords");?>">
<input type="submit" class="btn" value="<?php printMLText("new_default_keywords");?>">
</form>
</td>
</tr>
</div>
</div>
</table>
<?php
}
} /* }}} */

View File

@ -115,13 +115,13 @@ $(document).ready( function() {
?>
<br>
<form action="../op/op.DocumentNotify.php" name="form1" id="form1">
<form class=form-horizontal" action="../op/op.DocumentNotify.php" name="form1" id="form1">
<input type="hidden" name="documentid" value="<?php print $document->getID()?>">
<input type="hidden" name="action" value="addnotify">
<table class="table-condensed">
<tr>
<td><?php printMLText("user");?>:</td>
<td>
<div class="control-group">
<label class="control-label"><?php printMLText("user");?>:</label>
<div class="controls">
<select name="userid">
<option value="-1"><?php printMLText("select_one");?>
<?php
@ -137,11 +137,14 @@ $(document).ready( function() {
}
?>
</select>
</td>
</tr>
<tr>
<td><?php printMLText("group");?>:</td>
<td>
</div>
</div>
<div class="control-group">
<label class="control-label"><?php printMLText("group");?>:</label>
<div class="controls">
<select name="groupid">
<option value="-1"><?php printMLText("select_one");?>
<?php
@ -153,13 +156,13 @@ $(document).ready( function() {
}
?>
</select>
</td>
</tr>
<tr>
<td></td>
<td><input type="submit" class="btn" value="<?php printMLText("add") ?>"></td>
</tr>
</table>
</div>
</div>
<div class="controls">
<input type="submit" class="btn" value="<?php printMLText("add") ?>">
</div>
</form>
<?php

View File

@ -47,27 +47,28 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style {
$this->contentHeading(getMLText("edit_attributes"));
$this->contentContainerStart();
?>
<form action="../op/op.EditAttributes.php" name="form1" method="POST">
<form class="form-horizontal" action="../op/op.EditAttributes.php" name="form1" method="POST">
<?php echo createHiddenFieldWithKey('editattributes'); ?>
<input type="Hidden" name="documentid" value="<?php print $document->getID();?>">
<input type="Hidden" name="version" value="<?php print $version->getVersion();?>">
<table class="table-condensed">
<input type="hidden" name="documentid" value="<?php print $document->getID();?>">
<input type="hidden" name="version" value="<?php print $version->getVersion();?>">
<?php
if($attrdefs) {
foreach($attrdefs as $attrdef) {
?>
<tr>
<td><?php echo htmlspecialchars($attrdef->getName()); ?></td>
<td><?php $this->printAttributeEditField($attrdef, $version->getAttribute($attrdef)) ?></td>
</tr>
<div class="control-group">
<label class="control-label"><?php echo htmlspecialchars($attrdef->getName()); ?></label>
<div class="controls">
<?php $this->printAttributeEditField($attrdef, $version->getAttribute($attrdef)) ?>
</div>
</div>
<?php
}
}
?>
<tr>
<td colspan="2"><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save") ?></button></td>
</tr>
</table>
<div class="controls">
<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save") ?></button>
</div>
</form>
<?php
$this->contentContainerEnd();

View File

@ -84,20 +84,19 @@ $(document).ready(function() {
$this->contentHeading(getMLText("edit_comment"));
$this->contentContainerStart();
?>
<form action="../op/op.EditComment.php" id="form1" name="form1" method="post">
<form class="form-horizontal" action="../op/op.EditComment.php" id="form1" name="form1" method="post">
<?php echo createHiddenFieldWithKey('editcomment'); ?>
<input type="Hidden" name="documentid" value="<?php print $document->getID();?>">
<input type="Hidden" name="version" value="<?php print $version->getVersion();?>">
<table class="table-condensed">
<tr>
<td class="inputDescription"><?php printMLText("comment");?>:</td>
<td><textarea name="comment" rows="4" cols="80"><?php print htmlspecialchars($version->getComment());?></textarea></td>
</tr>
<tr>
<td></td>
<td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save") ?></button></td>
</tr>
</table>
<div class="control-group">
<label class="control-label"><?php printMLText("comment");?>:</label>
<div class="controls">
<textarea name="comment" rows="4" cols="80"><?php print htmlspecialchars($version->getComment());?></textarea>
</div>
</div>
<div class="controls">
<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save") ?></button>
</div>
</form>
<?php
$this->contentContainerEnd();

View File

@ -84,43 +84,46 @@ $(document).ready(function() {
$this->contentContainerStart();
?>
<form action="../op/op.EditEvent.php" id="form1" name="form1" method="POST">
<form class="form-horizontal" action="../op/op.EditEvent.php" id="form1" name="form1" method="POST">
<?php echo createHiddenFieldWithKey('editevent'); ?>
<input type="Hidden" name="eventid" value="<?php echo (int) $event["id"]; ?>">
<input type="hidden" name="eventid" value="<?php echo (int) $event["id"]; ?>">
<table class="table-condensed">
<tr>
<td><?php printMLText("from");?>:</td>
<td><?php //$this->printDateChooser($event["start"], "from");?>
<span class="input-append date span12" id="fromdate" data-date="<?php echo date('Y-m-d', $event["start"]); ?>" data-date-format="yyyy-mm-dd">
<input class="span6" size="16" name="from" type="text" value="<?php echo date('Y-m-d', $event["start"]); ?>">
<span class="add-on"><i class="icon-calendar"></i></span>
</span>
</td>
</tr>
<tr>
<td><?php printMLText("to");?>:</td>
<td><?php //$this->printDateChooser($event["stop"], "to");?>
<span class="input-append date span12" id="todate" data-date="<?php echo date('Y-m-d', $event["stop"]); ?>" data-date-format="yyyy-mm-dd">
<input class="span6" size="16" name="to" type="text" value="<?php echo date('Y-m-d', $event["stop"]); ?>">
<span class="add-on"><i class="icon-calendar"></i></span>
</span>
</td>
</tr>
<tr>
<td class="inputDescription"><?php printMLText("name");?>:</td>
<td><input type="text" name="name" value="<?php echo htmlspecialchars($event["name"]);?>" size="60"></td>
</tr>
<tr>
<td valign="top" class="inputDescription"><?php printMLText("comment");?>:</td>
<td><textarea name="comment" rows="4" cols="80"><?php echo htmlspecialchars($event["comment"])?></textarea></td>
</tr>
<tr>
<td></td>
<td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button></td>
</tr>
</table>
<div class="control-group">
<label class="control-label"><?php printMLText("from");?>:</label>
<div class="controls">
<?php //$this->printDateChooser($event["start"], "from");?>
<span class="input-append date span12" id="fromdate" data-date="<?php echo date('Y-m-d', $event["start"]); ?>" data-date-format="yyyy-mm-dd">
<input class="span6" size="16" name="from" type="text" value="<?php echo date('Y-m-d', $event["start"]); ?>">
<span class="add-on"><i class="icon-calendar"></i>
</span>
</div>
</div>
<div class="control-group">
<label class="control-label"><?php printMLText("to");?>:</label>
<div class="controls">
<?php //$this->printDateChooser($event["stop"], "to");?>
<span class="input-append date span12" id="todate" data-date="<?php echo date('Y-m-d', $event["stop"]); ?>" data-date-format="yyyy-mm-dd">
<input class="span6" size="16" name="to" type="text" value="<?php echo date('Y-m-d', $event["stop"]); ?>">
<span class="add-on"><i class="icon-calendar"></i></span>
</span>
</div>
</div>
<div class="control-group">
<label class="control-label"><?php printMLText("name");?>:</label>
<div class="controls">
<input type="text" name="name" value="<?php echo htmlspecialchars($event["name"]);?>" size="60">
</div>
</div>
<div class="control-group">
<label class="control-label"><?php printMLText("comment");?>:</label>
<div class="controls">
<textarea name="comment" rows="4" cols="80"><?php echo htmlspecialchars($event["comment"])?></textarea>
</div>
</div>
<div class="controls">
<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
</div>
</form>
<?php
$this->contentContainerEnd();

View File

@ -104,27 +104,30 @@ $(document).ready(function() {
$this->contentHeading(getMLText("edit_folder_props"));
$this->contentContainerStart();
?>
<form action="../op/op.EditFolder.php" id="form1" name="form1" method="post">
<input type="Hidden" name="folderid" value="<?php print $folder->getID();?>">
<input type="Hidden" name="showtree" value="<?php echo showtree();?>">
<table class="table-condensed">
<tr>
<td><?php printMLText("name");?>:</td>
<td><input type="text" name="name" value="<?php print htmlspecialchars($folder->getName());?>" size="60" required></td>
</tr>
<tr>
<td><?php printMLText("comment");?>:</td>
<td><textarea name="comment" rows="4" cols="80"<?php echo $strictformcheck ? ' required' : ''; ?>><?php print htmlspecialchars($folder->getComment());?></textarea></td>
</tr>
<form class="form-horizontal" action="../op/op.EditFolder.php" id="form1" name="form1" method="post">
<input type="hidden" name="folderid" value="<?php print $folder->getID();?>">
<input type="hidden" name="showtree" value="<?php echo showtree();?>">
<div class="control-group">
<label class="control-label"><?php printMLText("name");?>:</label>
<div class="controls">
<input type="text" name="name" value="<?php print htmlspecialchars($folder->getName());?>" size="60" required>
</div>
</div>
<div class="control-group">
<label class="control-label"><?php printMLText("comment");?>:</label>
<div class="controls">
<textarea name="comment" rows="4" cols="80"<?php echo $strictformcheck ? ' required' : ''; ?>><?php print htmlspecialchars($folder->getComment());?></textarea>
</div>
</div>
<?php
$parent = ($folder->getID() == $rootfolderid) ? false : $folder->getParent();
if ($parent && $parent->getAccessMode($user) > M_READ) {
print "<tr>";
print "<td>" . getMLText("sequence") . ":</td>";
print "<td>";
print "<div class=\"control-group\">";
print "<label class=\"control-label\">" . getMLText("sequence") . ":</label>";
print "<div class=\"controls\">";
$this->printSequenceChooser($parent->getSubFolders('s'), $folder->getID());
if($orderby != 's') echo "<br />".getMLText('order_by_sequence_off');
print "</td></tr>\n";
print "</div></div>\n";
}
if($attrdefs) {
@ -132,26 +135,26 @@ $(document).ready(function() {
$arr = $this->callHook('folderEditAttribute', $folder, $attrdef);
if(is_array($arr)) {
echo $txt;
echo "<tr>";
echo "<td>".$arr[0]."</td>";
echo "<td>".$arr[1]."</td>";
echo "</tr>";
echo "<div class=\"control-group\">";
echo "<label class=\"control-label\">".$arr[0]."</label>";
echo "<div class=\"controls\">".$arr[1]."</div>";
echo "</div>";
} else {
?>
<tr>
<td><?php echo htmlspecialchars($attrdef->getName()); ?></td>
<td><?php $this->printAttributeEditField($attrdef, $folder->getAttribute($attrdef)) ?></td>
</tr>
<div class="control-group">
<label class="control-label"><?php echo htmlspecialchars($attrdef->getName()); ?>:</label>
<div class="controls">
<?php $this->printAttributeEditField($attrdef, $folder->getAttribute($attrdef)) ?>
</div>
</div>
<?php
}
}
}
?>
<tr>
<td></td>
<td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save"); ?></button></td>
</tr>
</table>
<div class="controls">
<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save"); ?></button>
</div>
</form>
<?php
$this->contentContainerEnd();

View File

@ -118,73 +118,84 @@ $(document).ready( function() {
$this->contentHeading(getMLText("edit_user_details"));
$this->contentContainerStart();
?>
<form action="../op/op.EditUserData.php" enctype="multipart/form-data" method="post" id="form">
<table class="table-condensed">
<tr>
<td><?php printMLText("current_password");?>:</td>
<td><input id="currentpwd" type="password" name="currentpwd" size="30"></td>
</tr>
<tr>
<td><?php printMLText("new_password");?>:</td>
<td><input class="pwd" type="password" rel="strengthbar" id="pwd" name="pwd" size="30"></td>
</tr>
<form class="form-horizontal" action="../op/op.EditUserData.php" enctype="multipart/form-data" method="post" id="form">
<div class="control-group">
<label class="control-label"><?php printMLText("current_password");?>:</label>
<div class="controls">
<input id="currentpwd" type="password" name="currentpwd" size="30">
</div>
</div>
<div class="control-group">
<label class="control-label"><?php printMLText("new_password");?>:</label>
<div class="controls">
<input class="pwd" type="password" rel="strengthbar" id="pwd" name="pwd" size="30">
</div>
</div>
<?php
if($passwordstrength) {
?>
<tr>
<td><?php printMLText("password_strength");?>:</td>
<td>
<div class="control-group">
<label class="control-label"><?php printMLText("password_strength");?>:</label>
<div class="controls">
<div id="strengthbar" class="progress" style="width: 220px; height: 30px; margin-bottom: 8px;"><div class="bar bar-danger" style="width: 0%;"></div></div>
</td>
</tr>
</div>
</div>
<?php
}
?>
<tr>
<td><?php printMLText("confirm_pwd");?>:</td>
<td><input id="pwdconf" type="Password" id="pwdconf" name="pwdconf" size="30"></td>
</tr>
<tr>
<td><?php printMLText("name");?>:</td>
<td><input type="text" id="fullname" name="fullname" value="<?php print htmlspecialchars($user->getFullName());?>" size="30"></td>
</tr>
<tr>
<td><?php printMLText("email");?>:</td>
<td><input type="text" id="email" name="email" value="<?php print htmlspecialchars($user->getEmail());?>" size="30"></td>
</tr>
<tr>
<td><?php printMLText("comment");?>:</td>
<td><textarea name="comment" rows="4" cols="80"><?php print htmlspecialchars($user->getComment());?></textarea></td>
</tr>
<div class="control-group">
<label class="control-label"><?php printMLText("confirm_pwd");?>:</label>
<div class="controls">
<input id="pwdconf" type="Password" id="pwdconf" name="pwdconf" size="30">
</div>
</div>
<div class="control-group">
<label class="control-label"><?php printMLText("name");?>:</label>
<div class="controls">
<input type="text" id="fullname" name="fullname" value="<?php print htmlspecialchars($user->getFullName());?>" size="30">
</div>
</div>
<div class="control-group">
<label class="control-label"><?php printMLText("email");?>:</label>
<div class="controls">
<input type="text" id="email" name="email" value="<?php print htmlspecialchars($user->getEmail());?>" size="30">
</div>
</div>
<div class="control-group">
<label class="control-label"><?php printMLText("comment");?>:</label>
<div class="controls">
<textarea name="comment" rows="4" cols="80"><?php print htmlspecialchars($user->getComment());?></textarea>
</div>
</div>
<?php
if ($enableuserimage){
?>
<tr>
<td><?php printMLText("user_image");?>:</td>
<td>
<div class="control-group">
<label class="control-label"><?php printMLText("user_image");?>:</label>
<div class="controls">
<?php
if ($user->hasImage())
print "<img src=\"".$httproot . "out/out.UserImage.php?userid=".$user->getId()."\">";
else printMLText("no_user_image");
?>
</td>
</tr>
<tr>
<td><?php printMLText("new_user_image");?>:</td>
<td>
</div>
</div>
<div class="control-group">
<label class="control-label"><?php printMLText("new_user_image");?>:</label>
<div class="controls">
<?php
$this->printFileChooser('userfile', false, "image/jpeg");
?>
</td>
</tr>
</div>
</div>
<?php
}
if ($enablelanguageselector){
?>
<tr>
<td><?php printMLText("language");?>:</td>
<td>
<div class="control-group">
<label class="control-label"><?php printMLText("language");?>:</label>
<div class="controls">
<select name="language">
<?php
$languages = getLanguages();
@ -193,15 +204,15 @@ $(document).ready( function() {
}
?>
</select>
</td>
</tr>
</div>
</div>
<?php
}
if ($enablethemeselector){
?>
<tr>
<td><?php printMLText("theme");?>:</td>
<td>
<div class="control-group">
<label class="control-label"><?php printMLText("theme");?>:</label>
<div class="controls">
<select name="theme">
<?php
$themes = UI::getStyles();
@ -210,16 +221,14 @@ $(document).ready( function() {
}
?>
</select>
</td>
</tr>
</div>
</div>
<?php
}
?>
<tr>
<td></td>
<td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save"); ?></button></td>
</tr>
</table>
<div class="controls">
<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save"); ?></button>
</div>
</form>
<?php

View File

@ -158,8 +158,8 @@ $(document).ready(function() {
?>
<form class="form-inline" action="../op/op.FolderAccess.php">
<?php echo createHiddenFieldWithKey('folderaccess'); ?>
<input type="Hidden" name="folderid" value="<?php print $folder->getID();?>">
<input type="Hidden" name="action" value="setdefault">
<input type="hidden" name="folderid" value="<?php print $folder->getID();?>">
<input type="hidden" name="action" value="setdefault">
<?php $this->printAccessModeSelection($folder->getDefaultAccess()); ?>
<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
</form>
@ -179,9 +179,9 @@ $(document).ready(function() {
print "<td>". htmlspecialchars($userObj->getFullName()) . "</td>\n";
print "<form action=\"../op/op.FolderAccess.php\">\n";
echo createHiddenFieldWithKey('folderaccess')."\n";
print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
print "<input type=\"Hidden\" name=\"action\" value=\"editaccess\">\n";
print "<input type=\"Hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
print "<input type=\"hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
print "<input type=\"hidden\" name=\"action\" value=\"editaccess\">\n";
print "<input type=\"hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
print "<td>\n";
$this->printAccessModeSelection($userAccess->getMode());
print "</td>\n";
@ -191,9 +191,9 @@ $(document).ready(function() {
print "</form>\n";
print "<form action=\"../op/op.FolderAccess.php\">\n";
echo createHiddenFieldWithKey('folderaccess')."\n";
print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
print "<input type=\"Hidden\" name=\"action\" value=\"delaccess\">\n";
print "<input type=\"Hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
print "<input type=\"hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
print "<input type=\"hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
print "<td>\n";
print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
print "</td>\n";
@ -209,9 +209,9 @@ $(document).ready(function() {
print "<td>". htmlspecialchars($groupObj->getName()) . "</td>";
print "<form action=\"../op/op.FolderAccess.php\">";
echo createHiddenFieldWithKey('folderaccess')."\n";
print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">";
print "<input type=\"Hidden\" name=\"action\" value=\"editaccess\">";
print "<input type=\"Hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">";
print "<input type=\"hidden\" name=\"folderid\" value=\"".$folder->getID()."\">";
print "<input type=\"hidden\" name=\"action\" value=\"editaccess\">";
print "<input type=\"hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">";
print "<td>";
$this->printAccessModeSelection($groupAccess->getMode());
print "</td>\n";
@ -221,9 +221,9 @@ $(document).ready(function() {
print "</form>";
print "<form action=\"../op/op.FolderAccess.php\">\n";
echo createHiddenFieldWithKey('folderaccess')."\n";
print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
print "<input type=\"Hidden\" name=\"action\" value=\"delaccess\">\n";
print "<input type=\"Hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">\n";
print "<input type=\"hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
print "<input type=\"hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">\n";
print "<td>";
print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button>";
print "</td>\n";
@ -236,8 +236,8 @@ $(document).ready(function() {
?>
<form action="../op/op.FolderAccess.php" id="form1" name="form1">
<?php echo createHiddenFieldWithKey('folderaccess'); ?>
<input type="Hidden" name="folderid" value="<?php print $folder->getID()?>">
<input type="Hidden" name="action" value="addaccess">
<input type="hidden" name="folderid" value="<?php print $folder->getID()?>">
<input type="hidden" name="action" value="addaccess">
<table class="table-condensed">
<tr>
<td><?php printMLText("user");?>:</td>

View File

@ -153,7 +153,7 @@ $(document).ready( function() {
$allUsers = $this->params['allusers'];
$groups = $this->params['allgroups'];
?>
<form action="../op/op.GroupMgr.php" name="form_1" id="form_1" method="post">
<form class="form-horizontal" action="../op/op.GroupMgr.php" name="form_1" id="form_1" method="post">
<?php
if($group) {
echo createHiddenFieldWithKey('editgroup');
@ -168,30 +168,34 @@ $(document).ready( function() {
<?php
}
?>
<table class="table-condensed">
<?php
if($group && $this->check_access('RemoveGroup')) {
?>
<tr>
<td></td>
<td><?php echo $this->html_link('RemoveGroup', array('groupid'=>$group->getID()), array('class'=>'btn'), '<i class="icon-remove"></i> '.getMLText("rm_group"), false); ?></td>
</tr>
<div class="control-group">
<div class="controls">
<?php echo $this->html_link('RemoveGroup', array('groupid'=>$group->getID()), array('class'=>'btn'), '<i class="icon-remove"></i> '.getMLText("rm_group"), false); ?>
</div>
</div>
<?php
}
?>
<tr>
<td><?php printMLText("name");?>:</td>
<td><input type="text" name="name" id="name" value="<?php print $group ? htmlspecialchars($group->getName()) : '';?>"></td>
</tr>
<tr>
<td><?php printMLText("comment");?>:</td>
<td><textarea name="comment" id="comment" rows="4" cols="50"><?php print $group ? htmlspecialchars($group->getComment()) : '';?></textarea></td>
</tr>
<tr>
<td></td>
<td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button></td>
</tr>
</table>
<div class="control-group">
<label class="control-label"><?php printMLText("name");?>:</label>
<div class="controls">
<input type="text" name="name" id="name" value="<?php print $group ? htmlspecialchars($group->getName()) : '';?>">
</div>
</div>
<div class="control-group">
<label class="control-label"><?php printMLText("comment");?>:</label>
<div class="controls">
<textarea name="comment" id="comment" rows="4" cols="50"><?php print $group ? htmlspecialchars($group->getComment()) : '';?></textarea>
</div>
</div>
<div class="controls">
<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
</div>
</form>
<?php
if($group) {

View File

@ -126,13 +126,13 @@ $(document).ready( function() {
<div class="control-group">
<label class="control-label" for="login"><?php printMLText("user_login");?>:</label>
<div class="controls">
<input type="text" id="login" name="login" placeholder="login" required>
<input type="text" id="login" name="login" placeholder="login" autocomplete="off" required>
</div>
</div>
<div class="control-group">
<label class="control-label" for="pwd"><?php printMLText("password");?>:</label>
<div class="controls">
<input type="Password" id="pwd" name="pwd" required>
<input type="Password" id="pwd" name="pwd" autocomplete="off" required>
</div>
</div>
<?php if($enable2factauth) { ?>

View File

@ -51,20 +51,19 @@ class SeedDMS_View_MoveFolder extends SeedDMS_Bootstrap_Style {
$this->contentContainerStart();
?>
<form action="../op/op.MoveFolder.php" name="form1">
<form class="form-horizontal" action="../op/op.MoveFolder.php" name="form1">
<input type="hidden" name="folderid" value="<?php print $folder->getID();?>">
<input type="hidden" name="showtree" value="<?php echo showtree();?>">
<table class="table-condensed">
<tr>
<td><?php printMLText("choose_target_folder");?>:</td>
<td><?php $this->printFolderChooserHtml("form1", M_READWRITE, $folder->getID(), $target);?></td>
</tr>
<tr>
<td></td>
<td><input class="btn" type="submit" value="<?php printMLText("move_folder"); ?>"></td>
</tr>
</table>
</form>
<div class="control-group">
<label class="control-label"><?php printMLText("choose_target_folder");?>:</label>
<div class="controls">
<?php $this->printFolderChooserHtml("form1", M_READWRITE, $folder->getID(), $target);?>
</div>
</div>
<div class="controls">
<input class="btn" type="submit" value="<?php printMLText("move_folder"); ?>">
</div>
</form>
<?php

View File

@ -84,27 +84,32 @@ $(document).ready(function() {
// Display the Review form.
?>
<form method="post" action="../op/op.OverrideContentStatus.php" id="form1" name="form1">
<table class="table-condensed">
<tr><td><?php echo(printMLText("comment")); ?>:</td>
<td><textarea name="comment" cols="40" rows="4"></textarea>
</td></tr>
<tr><td><?php echo(printMLText("status")); ?>:</td>
<td><select name="overrideStatus">
<option value=''></option>
<?php
<form class="form-horizontal" method="post" action="../op/op.OverrideContentStatus.php" id="form1" name="form1">
<div class="control-group">
<label class="control-label"><?php echo(printMLText("comment"));?>:</label>
<div class="controls">
<textarea name="comment" cols="40" rows="4"></textarea>
</div>
</div>
<div class="control-group">
<label class="control-label"><?php echo(printMLText("status")); ?>:</label>
<div class="controls">
<select name="overrideStatus">
<option value=''></option>
<?php
if ($overallStatus["status"] != S_RELEASED) echo "<option value='".S_RELEASED."'>".getOverallStatusText(S_RELEASED)."</option>";
if ($overallStatus["status"] != S_OBSOLETE) echo "<option value='".S_OBSOLETE."'>".getOverallStatusText(S_OBSOLETE)."</option>";
if ($overallStatus["status"] != S_DRAFT) echo "<option value='".S_DRAFT."'>".getOverallStatusText(S_DRAFT)."</option>";
?>
</select>
</td></tr><tr><td></td><td>
<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
<input type='submit' class="btn" name='overrideContentStatus' value='<?php echo(printMLText("update")); ?>'/>
</td></tr></table>
?>
</select>
</div></div>
<div class="controls">
<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
<input type='submit' class="btn" name='overrideContentStatus' value='<?php echo(printMLText("update")); ?>'/>
</div>
</form>
<?php
$this->contentContainerEnd();

View File

@ -73,27 +73,31 @@ document.form1.email.focus();
?>
<?php $this->contentContainerStart(); ?>
<form action="../op/op.PasswordForgotten.php" method="post" id="form1" name="form1">
<form class="form-horizontal" action="../op/op.PasswordForgotten.php" method="post" id="form1" name="form1">
<?php
if ($referrer) {
echo "<input type='hidden' name='referuri' value='".$referrer."'/>";
}
?>
<p><?php printMLText("password_forgotten_text"); ?></p>
<table class="table-condensed">
<tr>
<td><?php printMLText("login");?>:</td>
<td><input type="text" name="login" id="login"></td>
</tr>
<tr>
<td><?php printMLText("email");?>:</td>
<td><input type="text" name="email" id="email"></td>
</tr>
<tr>
<td></td>
<td><input class="btn" type="submit" value="<?php printMLText("submit_password_forgotten") ?>"></td>
</tr>
</table>
<div class="control-group">
<label class="control-label"><?php printMLText("login");?>:</label>
<div class="controls">
<input type="text" name="login" id="login">
</div>
</div>
<div class="control-group">
<label class="control-label"><?php printMLText("email");?>:</label>
<div class="controls">
<input type="text" name="email" id="email">
</div>
</div>
<div class="controls">
<input class="btn" type="submit" value="<?php printMLText("submit_password_forgotten") ?>">
</div>
</form>
<?php $this->contentContainerEnd(); ?>
<p><a href="../out/out.Login.php"><?php echo getMLText("login"); ?></a></p>

View File

@ -76,17 +76,17 @@ $(document).ready( function() {
$workflows = $dms->getAllWorkflows();
if($workflows) {
?>
<form action="../op/op.SetWorkflow.php" method="post" name="form1">
<form class="form-horizontal" action="../op/op.SetWorkflow.php" method="post" name="form1">
<?php echo createHiddenFieldWithKey('setworkflow'); ?>
<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
<input type="hidden" name="version" value="<?php print $latestContent->getVersion(); ?>">
<input type="hidden" name="showtree" value="<?php echo showtree();?>">
<table class="table-condensed">
<tr>
<td>
<div class="cbSelectTitle"><?php printMLText("workflow");?>:</div>
</td>
<td>
<div class="control-group">
<label class="control-label">
<div class="cbSelectTitle"><?php printMLText("workflow");?>:</div>
</label>
<div class="controls">
<?php
echo "<select id=\"selector\" class=\"_chzn-select-deselect\" name=\"workflow\" data-placeholder=\"".getMLText('select_workflow')."\">";
$mandatoryworkflow = $user->getMandatoryWorkflow();
@ -99,14 +99,13 @@ $(document).ready( function() {
}
echo "</select>";
?>
</td>
</tr>
<tr>
<td>
</td>
<td><input type="submit" class="btn" value="<?php printMLText("set_workflow");?>"></td>
</tr>
</table>
</div>
</div>
<div class="controls">
<input type="submit" class="btn" value="<?php printMLText("set_workflow");?>">
</div>
</form>
<?php
} else {

View File

@ -76,12 +76,15 @@ $(document).ready(function() {
$this->contentHeading(getMLText("edit_default_keywords"));
?>
<div class="row-fluid">
<div class="span4">
<div class="well">
<?php echo getMLText("selection")?>:
<select id="selector">
<option value="-1"><?php echo getMLText("choose_category")?>
<option value="0"><?php echo getMLText("new_default_keyword_category")?>
<div class="span4">
<div class="well">
<form class="form-horizontal">
<div class="control-group">
<label class="control-label" for="login"><?php printMLText("selection");?>:</label>
<div class="controls">
<select id="selector">
<option value="-1"><?php echo getMLText("choose_category")?>
<option value="0"><?php echo getMLText("new_default_keyword_category")?>
<?php
$selected=0;
@ -96,62 +99,62 @@ $(document).ready(function() {
$count++;
}
?>
</select>
</div>
</div>
</select>
</div>
</div>
</form>
</div>
</div>
<div class="span8">
<div class="well">
<div class="span8">
<div class="well">
<table class="table-condensed"><tr>
<td id="keywords0" style="display : none;">
<form action="../op/op.UserDefaultKeywords.php" method="post" name="addcategory">
<input type="hidden" name="action" value="addcategory">
<table class="table-condensed">
<tr>
<td><?php printMLText("name");?>:</td>
<td><input type="text" name="name"></td>
</tr>
<tr>
<td></td><td><input type="submit" class="btn" value="<?php printMLText("new_default_keyword_category"); ?>"></td>
</tr>
</table>
</form>
</td>
<div id="keywords0" style="display : none;">
<form class="form-horizontal" action="../op/op.UserDefaultKeywords.php" method="post" name="addcategory">
<input type="hidden" name="action" value="addcategory">
<div class="control-group">
<label class="control-label"><?php printMLText("name");?>:</label>
<div class="controls">
<input type="text" name="name">
</div>
</div>
<div class="controls">
<input type="submit" class="btn" value="<?php printMLText("new_default_keyword_category"); ?>">
</div>
</form>
</div>
<?php
foreach ($categories as $category) {
$owner = $category->getOwner();
if ($owner->getID() != $user->getID()) continue;
print "<td id=\"keywords".$category->getID()."\" style=\"display : none;\">";
print "<div id=\"keywords".$category->getID()."\" style=\"display : none;\">";
?>
<table class="table-condensed">
<tr>
<td></td>
<td>
<form action="../op/op.UserDefaultKeywords.php" method="post">
<?php echo createHiddenFieldWithKey('removecategory'); ?>
<input type="hidden" name="action" value="removecategory">
<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
<button type="submit" class="btn" title="<?php echo getMLText("delete")?>"><i class="icon-remove"></i> <?php printMLText("rm_default_keyword_category");?></button>
</form>
</td>
</tr>
<tr>
<td><?php echo getMLText("name")?>:</td>
<td>
<form class="form-inline" action="../op/op.UserDefaultKeywords.php" method="post" name="<?php echo "category".$category->getID()?>">
<div class="controls">
<form class="form-horizontal" action="../op/op.UserDefaultKeywords.php" method="post">
<?php echo createHiddenFieldWithKey('removecategory'); ?>
<input type="hidden" name="action" value="removecategory">
<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
<button type="submit" class="btn" title="<?php echo getMLText("delete")?>"><i class="icon-remove"></i> <?php printMLText("rm_default_keyword_category");?></button>
</form>
</div>
<form class="form-inline" action="../op/op.UserDefaultKeywords.php" method="post" name="<?php echo "category".$category->getID()?>">
<div class="control-group">
<label class="control-label"><?php echo getMLText("name")?>:</label>
<div class="controls">
<?php echo createHiddenFieldWithKey('editcategory'); ?>
<input type="hidden" name="action" value="editcategory">
<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
<input name="name" type="text" value="<?php echo htmlspecialchars($category->getName())?>">
<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
</form>
</td>
</tr>
<tr>
<td><?php echo getMLText("default_keywords")?>:</td>
<td>
</div>
</div>
</form>
<div class="control-group">
<label class="control-label"><?php echo getMLText("default_keywords")?>:</label>
<div class="controls">
<?php
$lists = $category->getKeywordLists();
if (count($lists) == 0)
@ -175,11 +178,9 @@ $(document).ready(function() {
</form>
<br>
<?php } ?>
</td>
</tr>
<tr>
<td></td>
<td>
</div>
</div>
<div class="controls">
<form class="form-inline" action="../op/op.UserDefaultKeywords.php" method="post" name="<?php echo $category->getID().".add"?>">
<?php echo createHiddenFieldWithKey('newkeywords'); ?>
<input type="hidden" name="action" value="newkeywords">
@ -187,13 +188,10 @@ $(document).ready(function() {
<input type="text" name="keywords">
<input type="submit" class="btn" value="<?php printMLText("new_default_keywords");?>">
</form>
</td>
</tr>
</div>
</table>
</td>
</div>
<?php } ?>
</tr></table>
</div>
</div>
</div>

View File

@ -165,141 +165,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
$this->printDocumentChooserJs("form1");
} /* }}} */
function preview() { /* {{{ */
$document = $this->params['document'];
$timeout = $this->params['timeout'];
$showfullpreview = $this->params['showFullPreview'];
$converttopdf = $this->params['convertToPdf'];
$cachedir = $this->params['cachedir'];
if(!$showfullpreview)
return;
$accessop = $this->params['accessobject'];
if($accessop->check_controller_access('Download', array('action'=>'version'))) {
$latestContent = $document->getLatestContent();
switch($latestContent->getMimeType()) {
case 'audio/mpeg':
case 'audio/mp3':
case 'audio/ogg':
case 'audio/wav':
$this->contentHeading(getMLText("preview"));
?>
<audio controls style="width: 100%;">
<source src="../op/op.Download.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" type="audio/mpeg">
</audio>
<?php
break;
case 'application/pdf':
$this->contentHeading(getMLText("preview"));
?>
<iframe src="../pdfviewer/web/viewer.html?file=<?php echo urlencode('../../op/op.Download.php?documentid='.$document->getID().'&version='.$latestContent->getVersion()); ?>" width="100%" height="700px"></iframe>
<?php
break;
case 'image/svg+xml':
$this->contentHeading(getMLText("preview"));
?>
<img src="../op/op.Download.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" width="100%">
<?php
break;
default:
break;
}
if($converttopdf) {
$pdfpreviewer = new SeedDMS_Preview_PdfPreviewer($cachedir, $timeout);
if($pdfpreviewer->hasConverter($latestContent->getMimeType())) {
$this->contentHeading(getMLText("preview"));
?>
<iframe src="../pdfviewer/web/viewer.html?file=<?php echo urlencode('../../op/op.PdfPreview.php?documentid='.$document->getID().'&version='.$latestContent->getVersion()); ?>" width="100%" height="700px"></iframe>
<?php
}
}
}
} /* }}} */
function show() { /* {{{ */
parent::show();
function documentInfos() { /* {{{ */
$dms = $this->params['dms'];
$user = $this->params['user'];
$folder = $this->params['folder'];
$document = $this->params['document'];
$accessop = $this->params['accessobject'];
$viewonlinefiletypes = $this->params['viewonlinefiletypes'];
$enableownerrevapp = $this->params['enableownerrevapp'];
$enableownerreceipt = $this->params['enableownerreceipt'];
$workflowmode = $this->params['workflowmode'];
$cachedir = $this->params['cachedir'];
$previewwidthlist = $this->params['previewWidthList'];
$previewwidthdetail = $this->params['previewWidthDetail'];
$previewconverters = $this->params['previewConverters'];
$checkoutdir = $this->params['checkOutDir'];
$documentid = $document->getId();
$currenttab = $this->params['currenttab'];
$timeout = $this->params['timeout'];
$versions = $document->getContent();
$this->htmlAddHeader('<link href="../styles/'.$this->theme.'/timeline/timeline.css" rel="stylesheet">'."\n", 'css');
$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/timeline/timeline-min.js"></script>'."\n", 'js');
$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/timeline/timeline-locales.js"></script>'."\n", 'js');
$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
$this->globalNavigation($folder);
$this->contentStart();
$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
if ($document->isLocked()) {
$lockingUser = $document->getLockingUser();
$txt = $this->callHook('documentIsLocked', $document, $lockingUser);
if(is_string($txt))
echo $txt;
else {
?>
<div class="alert alert-warning">
<?php printMLText("lock_message", array("email" => $lockingUser->getEmail(), "username" => htmlspecialchars($lockingUser->getFullName())));?>
</div>
<?php
}
}
/* Retrieve attacheѕ files */
$files = $document->getDocumentFiles();
/* Retrieve linked documents */
$links = $document->getDocumentLinks();
$links = SeedDMS_Core_DMS::filterDocumentLinks($user, $links);
/* Retrieve reverse linked documents */
$reverselinks = $document->getReverseDocumentLinks();
$reverselinks = SeedDMS_Core_DMS::filterDocumentLinks($user, $reverselinks);
/* Retrieve latest content */
$latestContent = $document->getLatestContent();
$needwkflaction = false;
if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
} else {
$workflow = $latestContent->getWorkflow();
if($workflow) {
$workflowstate = $latestContent->getWorkflowState();
$transitions = $workflow->getNextTransitions($workflowstate);
$needwkflaction = $latestContent->needsWorkflowAction($user);
}
}
if($needwkflaction) {
$this->infoMsg(getMLText('needs_workflow_action'));
}
$status = $latestContent->getStatus();
$reviewStatus = $latestContent->getReviewStatus();
$approvalStatus = $latestContent->getApprovalStatus();
$receiptStatus = $latestContent->getReceiptStatus();
$revisionStatus = $latestContent->getRevisionStatus();
?>
<div class="row-fluid">
<div class="span4">
<?php
$this->contentHeading(getMLText("document_infos"));
if($info = $document->getCheckOutInfo()) {
echo "<div class=\"alert alert-info\">";
@ -439,6 +310,143 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
if(is_string($txt))
echo $txt;
$this->contentContainerEnd();
} /* }}} */
function preview() { /* {{{ */
$document = $this->params['document'];
$timeout = $this->params['timeout'];
$showfullpreview = $this->params['showFullPreview'];
$converttopdf = $this->params['convertToPdf'];
$cachedir = $this->params['cachedir'];
if(!$showfullpreview)
return;
$accessop = $this->params['accessobject'];
if($accessop->check_controller_access('Download', array('action'=>'version'))) {
$latestContent = $document->getLatestContent();
switch($latestContent->getMimeType()) {
case 'audio/mpeg':
case 'audio/mp3':
case 'audio/ogg':
case 'audio/wav':
$this->contentHeading(getMLText("preview"));
?>
<audio controls style="width: 100%;">
<source src="../op/op.Download.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" type="audio/mpeg">
</audio>
<?php
break;
case 'application/pdf':
$this->contentHeading(getMLText("preview"));
?>
<iframe src="../pdfviewer/web/viewer.html?file=<?php echo urlencode('../../op/op.Download.php?documentid='.$document->getID().'&version='.$latestContent->getVersion()); ?>" width="100%" height="700px"></iframe>
<?php
break;
case 'image/svg+xml':
$this->contentHeading(getMLText("preview"));
?>
<img src="../op/op.Download.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" width="100%">
<?php
break;
default:
break;
}
if($converttopdf) {
$pdfpreviewer = new SeedDMS_Preview_PdfPreviewer($cachedir, $timeout);
if($pdfpreviewer->hasConverter($latestContent->getMimeType())) {
$this->contentHeading(getMLText("preview"));
?>
<iframe src="../pdfviewer/web/viewer.html?file=<?php echo urlencode('../../op/op.PdfPreview.php?documentid='.$document->getID().'&version='.$latestContent->getVersion()); ?>" width="100%" height="700px"></iframe>
<?php
}
}
}
} /* }}} */
function show() { /* {{{ */
parent::show();
$dms = $this->params['dms'];
$user = $this->params['user'];
$folder = $this->params['folder'];
$document = $this->params['document'];
$accessop = $this->params['accessobject'];
$viewonlinefiletypes = $this->params['viewonlinefiletypes'];
$enableownerrevapp = $this->params['enableownerrevapp'];
$enableownerreceipt = $this->params['enableownerreceipt'];
$workflowmode = $this->params['workflowmode'];
$cachedir = $this->params['cachedir'];
$previewwidthlist = $this->params['previewWidthList'];
$previewwidthdetail = $this->params['previewWidthDetail'];
$previewconverters = $this->params['previewConverters'];
$documentid = $document->getId();
$currenttab = $this->params['currenttab'];
$timeout = $this->params['timeout'];
$versions = $document->getContent();
$this->htmlAddHeader('<link href="../styles/'.$this->theme.'/timeline/timeline.css" rel="stylesheet">'."\n", 'css');
$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/timeline/timeline-min.js"></script>'."\n", 'js');
$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/timeline/timeline-locales.js"></script>'."\n", 'js');
$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
$this->globalNavigation($folder);
$this->contentStart();
$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
if ($document->isLocked()) {
$lockingUser = $document->getLockingUser();
$txt = $this->callHook('documentIsLocked', $document, $lockingUser);
if(is_string($txt))
echo $txt;
else {
?>
<div class="alert alert-warning">
<?php printMLText("lock_message", array("email" => $lockingUser->getEmail(), "username" => htmlspecialchars($lockingUser->getFullName())));?>
</div>
<?php
}
}
/* Retrieve attacheѕ files */
$files = $document->getDocumentFiles();
/* Retrieve linked documents */
$links = $document->getDocumentLinks();
$links = SeedDMS_Core_DMS::filterDocumentLinks($user, $links);
/* Retrieve reverse linked documents */
$reverselinks = $document->getReverseDocumentLinks();
$reverselinks = SeedDMS_Core_DMS::filterDocumentLinks($user, $reverselinks);
/* Retrieve latest content */
$latestContent = $document->getLatestContent();
$needwkflaction = false;
if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
} else {
$workflow = $latestContent->getWorkflow();
if($workflow) {
$workflowstate = $latestContent->getWorkflowState();
$transitions = $workflow->getNextTransitions($workflowstate);
$needwkflaction = $latestContent->needsWorkflowAction($user);
}
}
if($needwkflaction) {
$this->infoMsg(getMLText('needs_workflow_action'));
}
$status = $latestContent->getStatus();
$reviewStatus = $latestContent->getReviewStatus();
$approvalStatus = $latestContent->getApprovalStatus();
$receiptStatus = $latestContent->getReceiptStatus();
$revisionStatus = $latestContent->getRevisionStatus();
?>
<div class="row-fluid">
<div class="span4">
<?php
$this->documentInfos();
if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) {
$this->preview();
}

View File

@ -135,13 +135,13 @@ $(document).ready(function() {
}
?>
<div class="well">
<form action="../op/op.WorkflowMgr.php" method="post" enctype="multipart/form-data">
<form class="form-horizontal" action="../op/op.WorkflowMgr.php" method="post" enctype="multipart/form-data">
<?php
if($workflow) {
echo createHiddenFieldWithKey('editworkflow');
?>
<input type="Hidden" name="workflowid" value="<?php print $workflow->getID();?>">
<input type="Hidden" name="action" value="editworkflow">
<input type="hidden" name="workflowid" value="<?php print $workflow->getID();?>">
<input type="hidden" name="action" value="editworkflow">
<?php
} else {
echo createHiddenFieldWithKey('addworkflow');
@ -150,21 +150,26 @@ $(document).ready(function() {
<?php
}
?>
<table class="table-condensed">
<?php
if($workflow && !$workflow->isUsed()) {
?>
<tr><td></td><td><a class="standardText btn" href="../out/out.RemoveWorkflow.php?workflowid=<?php print $workflow->getID();?>"><i class="icon-remove"></i> <?php printMLText("rm_workflow");?></a></td></tr>
<div class="controls">
<a class="standardText btn" href="../out/out.RemoveWorkflow.php?workflowid=<?php print $workflow->getID();?>"><i class="icon-remove"></i> <?php printMLText("rm_workflow");?></a>
</div>
<?php
}
?>
<tr>
<td><?php printMLText("workflow_name");?>:</td>
<td><input type="text" name="name" value="<?php print ($workflow ? htmlspecialchars($workflow->getName()) : "");?>"></td>
</tr>
<tr>
<td><?php printMLText("workflow_initstate");?>:</td>
<td><select name="initstate">
<div class="control-group">
<label class="control-label"><?php printMLText("workflow_name");?>:</label>
<div class="controls">
<input type="text" name="name" value="<?php print ($workflow ? htmlspecialchars($workflow->getName()) : "");?>">
</div>
</div>
<div class="control-group">
<label class="control-label"><?php printMLText("workflow_initstate");?>:</label>
<div class="controls">
<select name="initstate">
<?php
foreach($workflowstates as $workflowstate) {
echo "<option value=\"".$workflowstate->getID()."\"";
@ -173,14 +178,14 @@ $(document).ready(function() {
echo ">".htmlspecialchars($workflowstate->getName())."</option>\n";
}
?>
</select></td>
</tr>
</select>
</div>
</div>
<div class="controls">
<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
</div>
<tr>
<td></td>
<td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button></td>
</tr>
</table>
</form>
</div>
<?php