This commit is contained in:
Romain Neutron
2012-05-24 16:06:47 +02:00
parent dc9d0c5e55
commit f6c7acd837
9 changed files with 58 additions and 59 deletions

View File

@@ -1159,14 +1159,6 @@ class ACL implements cache_cacheableInterface
$stmt->execute($params); $stmt->execute($params);
$stmt->closeCursor(); $stmt->closeCursor();
// $sql = 'DELETE FROM sbasusr
// WHERE sbas_id NOT IN
// (SELECT distinct sbas_id FROM sbas)';
//
// $stmt = $this->appbox->get_connection()->prepare($sql);
// $stmt->execute();
// $stmt->closeCursor();
$this->delete_data_from_cache(self::CACHE_RIGHTS_SBAS); $this->delete_data_from_cache(self::CACHE_RIGHTS_SBAS);
return $this; return $this;

View File

@@ -18,7 +18,6 @@
use Monolog\Handler; use Monolog\Handler;
use Monolog\Logger; use Monolog\Logger;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;

View File

@@ -487,6 +487,7 @@ class setup
</form> </form>
<?php <?php
return; return;
} }

View File

@@ -10,7 +10,6 @@
*/ */
use Monolog\Logger; use Monolog\Logger;
use Symfony\Component\Console\Output\OutputInterface;
/** /**
* *

View File

@@ -178,6 +178,7 @@ class task_period_archive extends task_abstract
<?php echo $form ?>.copy_spe.checked = <?php echo p4field::isyes($sxml->copy_spe) ? "true" : "false" ?>; <?php echo $form ?>.copy_spe.checked = <?php echo p4field::isyes($sxml->copy_spe) ? "true" : "false" ?>;
</script> </script>
<?php <?php
return(""); return("");
} else { // ... so we NEVER come here } else { // ... so we NEVER come here
// bad xml // bad xml
@@ -208,6 +209,7 @@ class task_period_archive extends task_abstract
} }
</script> </script>
<?php <?php
return; return;
} }
@@ -570,7 +572,8 @@ class task_period_archive extends task_abstract
if ($this->debug) if ($this->debug)
$this->log("=========== listFilesPhase1 ========== (returned " . $nnew . ")\n" . $dom->saveXML()); $this->log("=========== listFilesPhase1 ========== (returned " . $nnew . ")\n" . $dom->saveXML());
if ($nnew === 'TOSTOP') { // special case : status has changed to TOSTOP while listing files // special case : status has changed to TOSTOP while listing files
if ($nnew === 'TOSTOP') {
return('TOSTOP'); return('TOSTOP');
} }
@@ -1046,8 +1049,10 @@ class task_period_archive extends task_abstract
$ret = false; $ret = false;
if ($depth == 0 && $node->getAttribute('temperature') == 'hot') // if root of hotfolder if hot, die... // if root of hotfolder if hot, die...
if ($depth == 0 && $node->getAttribute('temperature') == 'hot') {
return($ret); return($ret);
}
$nodesToDel = array(); $nodesToDel = array();
for ($n = $node->firstChild; $n; $n = $n->nextSibling) { for ($n = $node->firstChild; $n; $n = $n->nextSibling) {
@@ -1263,11 +1268,11 @@ class task_period_archive extends task_abstract
$ret = false; $ret = false;
if ($depth == 0 && $node->getAttribute('temperature') == 'hot') { // if root of hotfolder if hot, die... // if root of hotfolder if hot, die...
if ($depth == 0 && $node->getAttribute('temperature') == 'hot') {
return($ret); return($ret);
} }
//printf("%s : \n", __LINE__);
$nodesToDel = array(); $nodesToDel = array();
for ($n = $node->firstChild; $n; $n = $n->nextSibling) { for ($n = $node->firstChild; $n; $n = $n->nextSibling) {
if (($iloop ++ % 20) == 0) { if (($iloop ++ % 20) == 0) {

View File

@@ -100,6 +100,7 @@ class task_period_ftp extends task_appboxAbstract
<?php echo $form ?>.period.value = "<?php echo p4string::MakeString($sxml->period, "js", '"') ?>"; <?php echo $form ?>.period.value = "<?php echo p4string::MakeString($sxml->period, "js", '"') ?>";
</script> </script>
<?php <?php
return(""); return("");
} else { // ... so we NEVER come here } else { // ... so we NEVER come here
// bad xml // bad xml
@@ -131,6 +132,7 @@ class task_period_ftp extends task_appboxAbstract
} }
</script> </script>
<?php <?php
return; return;
} }

View File

@@ -99,6 +99,7 @@ class task_period_ftpPull extends task_appboxAbstract
</script> </script>
<?php <?php
return(""); return("");
} else { // ... so we NEVER come here } else { // ... so we NEVER come here
// bad xml // bad xml