hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 19:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

CS

Browse Source
This commit is contained in:
jygaulier
2012-09-26 17:14:14 +02:00
committed by Romain Neutron
parent 255cc7b3ad
commit ec9ce01a6e
1 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/classes/task/period/cindexer.class.php
View File

@@ -160,6 +160,39 @@ class task_period_cindexer extends task_abstract
return($dom->saveXML()); return($dom->saveXML());
} }
/**
*
* @param string $xml
* @param string $form
* @return string
*/
public function xml2graphic($xml, $form)
{
if (($sxml = simplexml_load_string($xml)) != FALSE) { // in fact XML IS always valid here...
?>
<script type="text/javascript">
<?php echo $form ?>.binpath.value = "<?php echo p4string::MakeString($sxml->binpath, "js", '"') ?>";
<?php echo $form ?>.host.value = "<?php echo p4string::MakeString($sxml->host, "js", '"') ?>";
<?php echo $form ?>.port.value = "<?php echo p4string::MakeString($sxml->port, "js", '"') ?>";
<?php echo $form ?>.base.value = "<?php echo p4string::MakeString($sxml->base, "js", '"') ?>";
<?php echo $form ?>.user.value = "<?php echo p4string::MakeString($sxml->user, "js", '"') ?>";
<?php echo $form ?>.socket.value = "<?php echo p4string::MakeString($sxml->socket, "js", '"') ?>";
<?php echo $form ?>.password.value = "<?php echo p4string::MakeString($sxml->password, "js", '"') ?>";
<?php echo $form ?>.clng.value = "<?php echo p4string::MakeString($sxml->clng, "js", '"') ?>";
<?php echo $form ?>.use_sbas.checked = <?php echo trim((string) $sxml->use_sbas) != '' ? (p4field::isyes($sxml->use_sbas) ? 'true' : 'false') : 'true' ?>;
<?php echo $form ?>.nolog.checked = <?php echo p4field::isyes($sxml->nolog) ? 'true' : 'false' ?>;
<?php echo $form ?>.winsvc_run.checked = <?php echo p4field::isyes($sxml->winsvc_run) ? 'true' : 'false' ?>;
<?php echo $form ?>.charset.value = "<?php echo trim((string) $sxml->charset) != '' ? p4string::MakeString($sxml->charset, "js", '"') : 'utf8' ?>";
<?php echo $form ?>.debugmask.value = "<?php echo trim((string) $sxml->debugmask) != '' ? p4string::MakeString($sxml->debugmask, "js", '"') : '0' ?>";
parent.calccmd();
</script>
<?php
return("");
} else { // ... so we NEVER come here
// bad xml
return("BAD XML");
}
}
/** /**
* *
@@ -247,7 +280,6 @@ class task_period_cindexer extends task_abstract
</script> </script>
<?php <?php
return; return;
} }
@@ -306,7 +338,6 @@ class task_period_cindexer extends task_abstract
<div style="margin:10px; padding:5px; border:1px #000000 solid; font-family:monospace; font-size:14px; text-align:left; color:#00e000; background-color:#404040" id="cmd">cmd</div> <div style="margin:10px; padding:5px; border:1px #000000 solid; font-family:monospace; font-size:14px; text-align:left; color:#00e000; background-color:#404040" id="cmd">cmd</div>
</center> </center>
<?php <?php
return ob_get_clean(); return ob_get_clean();
} }
@@ -443,16 +474,14 @@ class task_period_cindexer extends task_abstract
$pipes = array(); $pipes = array();
$logcmd = $cmd; $logcmd = $cmd;
foreach ($args_nopwd as $arg) foreach ($args_nopwd as $arg) {
{
$logcmd .= ' ' . escapeshellarg($arg); $logcmd .= ' ' . escapeshellarg($arg);
} }
$this->log(sprintf('cmd=\'%s\'', escapeshellcmd($logcmd) )); $this->log(sprintf('cmd=\'%s\'', escapeshellcmd($logcmd)));
$execmd = $cmd; $execmd = $cmd;
foreach ($args as $arg) foreach ($args as $arg) {
{
$execmd .= ' ' . escapeshellarg($arg); $execmd .= ' ' . escapeshellarg($arg);
} }
$process = proc_open(escapeshellcmd($execmd), $descriptors, $pipes, $this->binpath, null, array('bypass_shell' => true)); $process = proc_open(escapeshellcmd($execmd), $descriptors, $pipes, $this->binpath, null, array('bypass_shell' => true));