Skip to content
Snippets Groups Projects
Commit eb6fc7fd authored by Giovannoni Laurent's avatar Giovannoni Laurent
Browse files

FEAT #2481 nettoyage

parent 51a0a3e2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
maarch_entreprise/trunk/indexing_searching/view_resource_controler.php
+ 36
− 69
View file @ eb6fc7fd
...@@ -168,77 +168,44 @@ if ($s_id == '') { ...@@ -168,77 +168,44 @@ if ($s_id == '') {
} }
$docserverControler = new docservers_controler(); $docserverControler = new docservers_controler();
$viewResourceArr = array(); $viewResourceArr = array();
$docserverLocation = array();
$docserverLocation = $viewResourceArr = $docserverControler->viewResource(
$docserverControler->retrieveDocserverNetLinkOfResource( $s_id,
$s_id, $table, $adrTable $table,
); $adrTable,
if ($docserverLocation['value'] <> '' false
&& $_SESSION['config']['coreurl'] <> $docserverLocation['value'] );
) { if ($viewResourceArr['error'] <> '') {
$connexion = new dbquery(); //...
$connexion->connect();
$connexion->query(
"select password from " . $_SESSION['tablename']['users']
. " where user_id = '" . $_SESSION['user']['UserId'] . "'"
);
$resultUser = $connexion->fetch_object();
if ($core_tools->isEncrypted() == 'true') {
//$core_tools->generatePrivatePublicKey();
$proxyOne = $core_tools->encrypt($_SESSION['user']['UserId']);
$proxyTwo = $core_tools->encrypt($resultUser->password);
if (!$proxyOne || !$proxyTwo) {
$_SESSION['error'] = _PB_WITH_PUBLIC_OR_PRIVATE_KEY;
header('location: ' . $_SESSION['config']['businessappurl']
. 'index.php');
exit();
}
} else {
$proxyOne = $_SESSION['user']['UserId'];
$proxyTwo = $resultUser->password;
}
header('location: ' . $docserverLocation['value'] . 'ws_client.php?id='
. $s_id . '&table=' . $table . '&proxy1=' . $proxyOne
. '&proxy2=' . $proxyTwo);
} else { } else {
$viewResourceArr = $docserverControler->viewResource( //$core_tools->show_array($viewResourceArr);
$s_id, if (strtoupper($viewResourceArr['ext']) == 'HTML'
$table, && $viewResourceArr['mime_type'] == "text/plain"
$adrTable, ) {
false $viewResourceArr['mime_type'] = "text/html";
); }
if ($viewResourceArr['error'] <> '') { if ($viewResourceArr['called_by_ws']) {
//... $fileContent = base64_decode($viewResourceArr['file_content']);
$fileNameOnTmp = 'tmp_file_' . rand() . '_'
. md5($fileContent) . '.'
. strtolower($viewResourceArr['ext']);
$filePathOnTmp = $_SESSION['config']['tmppath']
. DIRECTORY_SEPARATOR . $fileNameOnTmp;
$inF = fopen($filePathOnTmp, 'w');
fwrite($inF, $fileContent);
fclose($inF);
} else { } else {
//$core_tools->show_array($viewResourceArr); $filePathOnTmp = $viewResourceArr['file_path'];
if (strtoupper($viewResourceArr['ext']) == 'HTML' }
&& $viewResourceArr['mime_type'] == "text/plain" if (strtolower(
) { $viewResourceArr['mime_type']
$viewResourceArr['mime_type'] = "text/html"; ) == 'application/maarch'
} ) {
if ($viewResourceArr['called_by_ws']) { $myfile = fopen($filePathOnTmp, 'r');
$fileContent = base64_decode($viewResourceArr['file_content']); $data = fread($myfile, filesize($filePathOnTmp));
$fileNameOnTmp = 'tmp_file_' . rand() . '_' fclose($myfile);
. md5($fileContent) . '.' $content = stripslashes($data);
. strtolower($viewResourceArr['ext']);
$filePathOnTmp = $_SESSION['config']['tmppath']
. DIRECTORY_SEPARATOR . $fileNameOnTmp;
$inF = fopen($filePathOnTmp, 'w');
fwrite($inF, $fileContent);
fclose($inF);
} else {
$filePathOnTmp = $viewResourceArr['file_path'];
}
if (strtolower(
$viewResourceArr['mime_type']
) == 'application/maarch'
) {
$myfile = fopen($filePathOnTmp, 'r');
$data = fread($myfile, filesize($filePathOnTmp));
fclose($myfile);
$content = stripslashes($data);
}
} }
include('view_resource.php');
} }
include('view_resource.php');
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment