- Changed regex for redirect path (Web sites, subdomains, vhost subdomains,...

ftimme

2013-01-16 08cc7f673c377bf88897743e340097e93f1e95f4

 server/plugins-available/cron_plugin.inc.php

@@ -142,7 +142,7 @@
        }
      
      // make temp directory writable for the apache and website users
      chmod(escapeshellcmd($parent_domain["document_root"].'/tmp'), 0777);
      $app->system->chmod(escapeshellcmd($parent_domain["document_root"].'/tmp'), 0777);
      
        /** TODO READ CRON MASTER **/
        
@@ -198,7 +198,7 @@
            if($job['run_month'] == '@reboot') {
               $command = "@reboot";
            } else {
               $command = "{$job['run_min']}\t{$job['run_hour']}\t{$job['run_mday']}\t{$job['run_month']}\t{$job['run_wday']}";
               $command = str_replace(" ", "", $job['run_min']) . "\t" . str_replace(" ", "", $job['run_hour']) . "\t" . str_replace(" ", "", $job['run_mday']) . "\t" . str_replace(" ", "", $job['run_month']) . "\t" . str_replace(" ", "", $job['run_wday']);
                }
            $command .= "\t{$this->parent_domain['system_user']}"; //* running as user
                if($job['type'] == 'url') {
@@ -217,10 +217,10 @@
                }
                
                if($job['type'] == 'chrooted') {
                    $chr_cron_content .= $command . "\t#{$job['domain']}\n";
                    $chr_cron_content .= $command . " #{$job['domain']}\n";
                    $chr_cmd_count++;
                } else {
                    $cron_content .= $command . "\t#{$job['domain']}\n";
                    $cron_content .= $command . " #{$job['domain']}\n";
                    $cmd_count++;
                }
            }
@@ -234,19 +234,19 @@
        }
        
        if($cmd_count > 0) {
            file_put_contents($cron_file, $cron_content);
            $app->system->file_put_contents($cron_file, $cron_content);
            $app->log("Wrote Cron file $cron_file with content:\n$cron_content",LOGLEVEL_DEBUG);
        } else {
            @unlink($cron_file);
            $app->system->unlink($cron_file);
            $app->log("Deleted Cron file $cron_file",LOGLEVEL_DEBUG);
        }
        
        $cron_file = escapeshellcmd($cron_config["crontab_dir"].'/ispc_chrooted_'.$this->parent_domain["system_user"]);
        if($chr_cmd_count > 0) {
            file_put_contents($cron_file, $chr_cron_content);
            $app->system->file_put_contents($cron_file, $chr_cron_content);
            $app->log("Wrote Cron file $cron_file with content:\n$chr_cron_content",LOGLEVEL_DEBUG);
        } else {
            @unlink($cron_file);
            $app->system->unlink($cron_file);
            $app->log("Deleted Cron file $cron_file",LOGLEVEL_DEBUG);
        }