- change line endings

This commit is contained in:
steinm 2012-01-12 16:58:02 +00:00
parent 77d05a607e
commit 89a29fcd29

View File

@ -1,98 +1,98 @@
<?php <?php
// MyDMS. Document Management System // MyDMS. Document Management System
// Copyright (C) 2002-2005 Markus Westphal // Copyright (C) 2002-2005 Markus Westphal
// Copyright (C) 2006-2008 Malcolm Cowe // Copyright (C) 2006-2008 Malcolm Cowe
// Copyright (C) 2010 Matteo Lucarelli // Copyright (C) 2010 Matteo Lucarelli
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or // the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// This program is distributed in the hope that it will be useful, // This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php"); include("../inc/inc.Settings.php");
include("../inc/inc.LogInit.php"); include("../inc/inc.LogInit.php");
include("../inc/inc.Utils.php"); include("../inc/inc.Utils.php");
include("../inc/inc.ClassEmail.php"); include("../inc/inc.ClassEmail.php");
include("../inc/inc.DBInit.php"); include("../inc/inc.DBInit.php");
include("../inc/inc.Language.php"); include("../inc/inc.Language.php");
include("../inc/inc.ClassUI.php"); include("../inc/inc.ClassUI.php");
include("../inc/inc.Authentication.php"); include("../inc/inc.Authentication.php");
if (!isset($_POST["folderid"]) || !is_numeric($_POST["folderid"]) || intval($_POST["folderid"])<1) { if (!isset($_POST["folderid"]) || !is_numeric($_POST["folderid"]) || intval($_POST["folderid"])<1) {
UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id")); UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
} }
$folderid = $_POST["folderid"]; $folderid = $_POST["folderid"];
$folder = $dms->getFolder($folderid); $folder = $dms->getFolder($folderid);
if (!is_object($folder)) { if (!is_object($folder)) {
UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id")); UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
} }
$folderPathHTML = getFolderPathHTML($folder, true); $folderPathHTML = getFolderPathHTML($folder, true);
if ($folder->getAccessMode($user) < M_READWRITE) { if ($folder->getAccessMode($user) < M_READWRITE) {
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("access_denied")); UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("access_denied"));
} }
$comment = $_POST["comment"]; $comment = $_POST["comment"];
$version_comment = $_POST["version_comment"]; $version_comment = $_POST["version_comment"];
$keywords = $_POST["keywords"]; $keywords = $_POST["keywords"];
$categories = preg_replace('/[^0-9,]+/', '', $_POST["categoryidform1"]); $categories = preg_replace('/[^0-9,]+/', '', $_POST["categoryidform1"]);
$reqversion = (int)$_POST["reqversion"]; $reqversion = (int)$_POST["reqversion"];
if ($reqversion<1) $reqversion=1; if ($reqversion<1) $reqversion=1;
$sequence = $_POST["sequence"]; $sequence = $_POST["sequence"];
if (!is_numeric($sequence)) { if (!is_numeric($sequence)) {
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("invalid_sequence")); UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("invalid_sequence"));
} }
$expires = ($_POST["expires"] == "true") ? mktime(0,0,0, intval($_POST["expmonth"]), intval($_POST["expday"]), intval($_POST["expyear"])) : false; $expires = ($_POST["expires"] == "true") ? mktime(0,0,0, intval($_POST["expmonth"]), intval($_POST["expday"]), intval($_POST["expyear"])) : false;
// Get the list of reviewers and approvers for this document. // Get the list of reviewers and approvers for this document.
$reviewers = array(); $reviewers = array();
$approvers = array(); $approvers = array();
$reviewers["i"] = array(); $reviewers["i"] = array();
$reviewers["g"] = array(); $reviewers["g"] = array();
$approvers["i"] = array(); $approvers["i"] = array();
$approvers["g"] = array(); $approvers["g"] = array();
// Retrieve the list of individual reviewers from the form. // Retrieve the list of individual reviewers from the form.
if (isset($_POST["indReviewers"])) { if (isset($_POST["indReviewers"])) {
foreach ($_POST["indReviewers"] as $ind) { foreach ($_POST["indReviewers"] as $ind) {
$reviewers["i"][] = $ind; $reviewers["i"][] = $ind;
} }
} }
// Retrieve the list of reviewer groups from the form. // Retrieve the list of reviewer groups from the form.
if (isset($_POST["grpReviewers"])) { if (isset($_POST["grpReviewers"])) {
foreach ($_POST["grpReviewers"] as $grp) { foreach ($_POST["grpReviewers"] as $grp) {
$reviewers["g"][] = $grp; $reviewers["g"][] = $grp;
} }
} }
// Retrieve the list of individual approvers from the form. // Retrieve the list of individual approvers from the form.
if (isset($_POST["indApprovers"])) { if (isset($_POST["indApprovers"])) {
foreach ($_POST["indApprovers"] as $ind) { foreach ($_POST["indApprovers"] as $ind) {
$approvers["i"][] = $ind; $approvers["i"][] = $ind;
} }
} }
// Retrieve the list of approver groups from the form. // Retrieve the list of approver groups from the form.
if (isset($_POST["grpApprovers"])) { if (isset($_POST["grpApprovers"])) {
foreach ($_POST["grpApprovers"] as $grp) { foreach ($_POST["grpApprovers"] as $grp) {
$approvers["g"][] = $grp; $approvers["g"][] = $grp;
} }
} }
// add mandatory reviewers/approvers // add mandatory reviewers/approvers
$docAccess = $folder->getApproversList(); $docAccess = $folder->getApproversList();
@ -141,13 +141,13 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("uploading_failed")); UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("uploading_failed"));
} }
$userfiletmp = $_FILES["userfile"]["tmp_name"][$file_num]; $userfiletmp = $_FILES["userfile"]["tmp_name"][$file_num];
$userfiletype = sanitizeString($_FILES["userfile"]["type"][$file_num]); $userfiletype = $_FILES["userfile"]["type"][$file_num];
$userfilename = sanitizeString($_FILES["userfile"]["name"][$file_num]); $userfilename = $_FILES["userfile"]["name"][$file_num];
$lastDotIndex = strrpos(basename($userfilename), "."); $lastDotIndex = strrpos(basename($userfilename), ".");
if (is_bool($lastDotIndex) && !$lastDotIndex) $fileType = "."; if (is_bool($lastDotIndex) && !$lastDotIndex) $fileType = ".";
else $fileType = substr($userfilename, $lastDotIndex); else $fileType = substr($userfilename, $lastDotIndex);
if ((count($_FILES["userfile"]["tmp_name"])==1)&&($_POST["name"]!="")) if ((count($_FILES["userfile"]["tmp_name"])==1)&&($_POST["name"]!=""))
$name = $_POST["name"]; $name = $_POST["name"];
@ -160,9 +160,9 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
$cats[] = $dms->getDocumentCategory($catid); $cats[] = $dms->getDocumentCategory($catid);
} }
} }
$res = $folder->addDocument($name, $comment, $expires, $user, $keywords, $res = $folder->addDocument($name, $comment, $expires, $user, $keywords,
$cats, $userfiletmp, basename($userfilename), $cats, $userfiletmp, basename($userfilename),
$fileType, $userfiletype, $sequence, $fileType, $userfiletype, $sequence,
$reviewers, $approvers, $reqversion,$version_comment); $reviewers, $approvers, $reqversion,$version_comment);
if (is_bool($res) && !$res) { if (is_bool($res) && !$res) {
@ -200,7 +200,7 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
add_log_line("?name=".$name."&folderid=".$folderid); add_log_line("?name=".$name."&folderid=".$folderid);
} }
header("Location:../out/out.ViewFolder.php?folderid=".$folderid."&showtree=".$_POST["showtree"]); header("Location:../out/out.ViewFolder.php?folderid=".$folderid."&showtree=".$_POST["showtree"]);
?> ?>