Fix path for pi-billion

# Conflicts:
#   app/controller/cron.php

app/controller/admin.php

@@ -57,7 +57,7 @@ class Admin extends Controller
         if (!$f3->get('SESSION.admin')) {
             $mapper = new\DB\SQL\Mapper($f3->get('DB'), 'admins');
             $auth = new \Auth($mapper, array('id'=>'user_id', 'pw'=>'password'));
-            $success = $auth->basic('Admin::hash_password');
+            $success = $auth->basic('\Controller\Admin::hash_password');
             if (!$success) {
                 $f3->error(401);
             } else {

app/controller/bank.php

@@ -168,7 +168,7 @@ class Bank extends Controller
 
         // Puis envoi du mail
         if ($user["email"]) {
-            $mailer = new SMTP(SMTP_HOST, SMTP_PORT, SMTP_SECURITY, SMTP_USER, SMTP_PW);
+            $mailer = new \SMTP(SMTP_HOST, SMTP_PORT, SMTP_SECURITY, SMTP_USER, SMTP_PW);
             $cb_log->write("Sending email for id: ".$id." at ".$user['email']);
             $mailer->set('From', "contact@laquadrature.net");
             $mailer->set('FromName', "La Quadrature du Net");

app/controller/cron.php

@@ -41,7 +41,7 @@ class Cron extends Controller
 
         // We do have our IDs
         // We need to create a PDF
-        $lock = @fopen("tmp/piplomes.lock", "ab");
+        $lock = @fopen("../tmp/piplomes.lock", "ab");
         if ($lock) {
             flock($lock, LOCK_EX);
             foreach ($pdfs as $pdf) {
@@ -64,9 +64,9 @@ class Cron extends Controller
 
                 // Let's trash the garbage
                 foreach (array('tex', 'aux', 'pdf', 'log') as $ext) {
-                    @unlink(dirname(__FILE__)."/../tmp/pplome.".$ext);
+                    @unlink(dirname(__FILE__)."/../../tmp/pplome.".$ext);
                 }
-                
+
                 // We now have only fr or en templates
                 if ($pdf['lang'] == 'fr') {
                     $pdf['lang'] = 'fr_FR';
@@ -76,10 +76,11 @@ class Cron extends Controller
                 }
                 $logger->write("Language is ".$pdf['lang']."");
 
-                $template = file_get_contents(dirname(__FILE__)."/../locales/".$pdf['lang']."/LC_MESSAGES/plome.tex");
+                $template = file_get_contents(dirname(__FILE__)."/../../locales/".$pdf['lang']."/LC_MESSAGES/plome.tex");
 
                 // We will open the pi-decimals file
-                $pi = fopen(dirname(__FILE__)."/../static/pi-billion/pi-billion.txt", "rb");
+                $pi = fopen(dirname(__FILE__)."/../../www/static/pi-billion/pi-billion.txt", "rb");
+
                 if (!$pi) {
                     $logger->write("FATAL: Can't open decimals");
                     exit();
@@ -100,7 +101,7 @@ class Cron extends Controller
 
                 // Let's replace the templates with values
                 file_put_contents(
-                    dirname(__FILE__)."/../tmp/pplome.tex",
+                    dirname(__FILE__)."/../../tmp/pplome.tex",
                     str_replace(
                         "%%DECIMALES%%",
                         $decimales,
@@ -118,13 +119,13 @@ class Cron extends Controller
 
                 // Let's create the pdf from the template
                 $logger->write("Building the pdf from the tex template");
-                $command = 'TEXINPUTS='.dirname(__FILE__).'/tex/:$TEXINPUTS ';
+                $command = 'TEXINPUTS='.dirname(__FILE__).'/../../tex/:$TEXINPUTS ';
 
                 // We need to set an env variable first
-                putenv('TEXINPUTS='.dirname(__FILE__).'/../tex:'.getenv('TEXINPUTS'));
+                putenv('TEXINPUTS='.dirname(__FILE__).'/../../tex:'.getenv('TEXINPUTS'));
                 $command .= '/usr/bin/pdflatex ';
-                $command .= '-output-directory='.dirname(__FILE__)."/../tmp ";
-                $command .= dirname(__FILE__)."/../tmp/pplome.tex";
+                $command .= '-output-directory='.dirname(__FILE__)."/../../tmp ";
+                $command .= dirname(__FILE__)."/../../tmp/pplome.tex";
                 $logger->write($command);
                 exec($command, $output, $return);
                 foreach ($output as $line) {
@@ -141,11 +142,11 @@ class Cron extends Controller
                 // Move the pdf to its position
                 @unlink(PIPLOME_PATH . $pdf['hash'] .".pdf");
                 $logger->write("Moving pdf to ".PIPLOME_PATH.$pdf['hash'].".pdf");
-                @rename(dirname(__FILE__)."/../tmp/pplome.pdf", PIPLOME_PATH . $pdf['hash'] . ".pdf");
+                @rename(dirname(__FILE__)."/../../tmp/pplome.pdf", PIPLOME_PATH . $pdf['hash'] . ".pdf");
                 
                 // Let's trash the garbage
                 foreach (array('tex', 'aux', 'pdf', 'log') as $ext) {
-                    @unlink(dirname(__FILE__)."/../tmp/pplome.".$ext);
+                    @unlink(dirname(__FILE__)."/../../tmp/pplome.".$ext);
                 }
 
                 // Saving the pathin database
@@ -167,17 +168,18 @@ class Cron extends Controller
             $result = $db->query("SELECT dons.id as id,
                     decimale,
                     users.pseudo as nom,
-                    lang
+                    lang,
+                    pdf
                 FROM dons
                     LEFT JOIN users ON dons.user_id = users.id
                 WHERE dons.status IN (1, 4, 101)
                     AND dons.id='".\Utils::asl($args['id'])."'");
             $pdf = $result->fetch(\PDO::FETCH_ASSOC);
-            $fp = fopen(PIPLOME_PATH . $pdf['hash'] .".pdf", "rb");
+            $fp = fopen(PIPLOME_PATH . $pdf['pdf'] .".pdf", "rb");
             if ($fp) {
-                $fsize = filesize(PIPLOME_PATH . $pdf['hash'] .".pdf");
+                $fsize = filesize(PIPLOME_PATH . $pdf['pdf'] .".pdf");
                 header("Content-Type: application/pdf");
-                header("Content-Disposition: attachment; filename=\"".$pdf['hash'].".pdf\"");
+                header("Content-Disposition: attachment; filename=\"".$pdf['pdf'].".pdf\"");
                 header("Content-Length: $fsize");
                 while (!feof($fp)) {
                     $buffer = fread($fp, 2048);

app/controller/perso.php

@@ -179,7 +179,7 @@ class Perso extends Controller
 
                 // On le renvoie par email
                 // On utilise le système SMTP de fat free
-                $mailer = new SMTP(SMTP_HOST, SMTP_PORT, SMTP_SECURITY, SMTP_USER, SMTP_PW);
+                $mailer = new \SMTP(SMTP_HOST, SMTP_PORT, SMTP_SECURITY, SMTP_USER, SMTP_PW);
                 $mailer->set('From', $f3->get('mail.from'));
                 $mailer->set('To', $f3->get('email'));
                 $mailer->set('Subject', _("Renouvellement de mot de passe"));