@@ -97,10 +97,10 @@ |
||
97 | 97 | public function addNamespace($prefix, $base_dir, $prepend = false) |
98 | 98 | { |
99 | 99 | // normalize namespace prefix |
100 | - $prefix = trim($prefix, '\\') . '\\'; |
|
100 | + $prefix = trim($prefix, '\\').'\\'; |
|
101 | 101 | |
102 | 102 | // normalize the base directory with a trailing separator |
103 | - $base_dir = rtrim($base_dir, DIRECTORY_SEPARATOR) . '/'; |
|
103 | + $base_dir = rtrim($base_dir, DIRECTORY_SEPARATOR).'/'; |
|
104 | 104 | |
105 | 105 | // initialize the namespace prefix array |
106 | 106 | if (isset($this->prefixes[$prefix]) === false) { |
@@ -24,6 +24,6 @@ |
||
24 | 24 | /** |
25 | 25 | * This script deletes obsolete directories from installer cache and siverbullet directory |
26 | 26 | */ |
27 | -require_once dirname(dirname(__FILE__)) . "/config/_config.php"; |
|
27 | +require_once dirname(dirname(__FILE__))."/config/_config.php"; |
|
28 | 28 | |
29 | 29 | web\lib\admin\Maintenance::deleteObsoleteTempDirs(); |
@@ -28,11 +28,11 @@ discard block |
||
28 | 28 | * It works on two CAs, the RSA and ECDSA variant. There is a separate temp |
29 | 29 | * subdir for both ( temp_ocsp_RSA and temp_ocsp_ECDSA ). |
30 | 30 | */ |
31 | -require_once dirname(dirname(__FILE__)) . "/config/_config.php"; |
|
32 | -if (file_exists(__DIR__ . "/semaphore")) { |
|
31 | +require_once dirname(dirname(__FILE__))."/config/_config.php"; |
|
32 | +if (file_exists(__DIR__."/semaphore")) { |
|
33 | 33 | exit(1); // another instance is still busy doing stuff. Don't interfere. |
34 | 34 | } |
35 | -file_put_contents(__DIR__ . "/semaphore", "BUSY"); |
|
35 | +file_put_contents(__DIR__."/semaphore", "BUSY"); |
|
36 | 36 | $dbLink = \core\DBConnection::handle("INST"); |
37 | 37 | $allSerials = $dbLink->exec("SELECT serial_number, ca_type FROM silverbullet_certificate WHERE serial_number IS NOT NULL AND expiry > NOW() AND OCSP_timestamp < DATE_SUB(NOW(), INTERVAL 1 WEEK)"); |
38 | 38 | // SELECT query -> always returns a mysql_result, not boolean |
@@ -58,8 +58,8 @@ discard block |
||
58 | 58 | # echo "Writing OCSP statement for serial number $statementRow->serial_number\n"; |
59 | 59 | $filename = strtoupper(dechex($statementRow->serial_number)).".der"; |
60 | 60 | if (strlen($filename) % 2 == 1) { |
61 | - $filename = "0" . $filename; |
|
61 | + $filename = "0".$filename; |
|
62 | 62 | } |
63 | 63 | file_put_contents($tempdirBase."_".$statementRow->ca_type."/".$filename, $statementRow->OCSP); |
64 | 64 | } |
65 | -unlink(__DIR__ . "/semaphore"); |
|
66 | 65 | \ No newline at end of file |
66 | +unlink(__DIR__."/semaphore"); |
|
67 | 67 | \ No newline at end of file |
@@ -44,7 +44,7 @@ |
||
44 | 44 | $caEngine->triggerNewOCSPStatement(/** @scrutinizer ignore-type */ $certObject->serial); |
45 | 45 | } |
46 | 46 | |
47 | - /* |
|
47 | + /* |
|
48 | 48 | * and then writes all recently updated statements to a temporary directory. The |
49 | 49 | * calling script ocsp_update.sh should then scp all the files to their |
50 | 50 | * destination. |
@@ -26,7 +26,7 @@ |
||
26 | 26 | * @package Core |
27 | 27 | */ |
28 | 28 | |
29 | -require_once dirname(dirname(__FILE__)) . "/config/_config.php"; |
|
29 | +require_once dirname(dirname(__FILE__))."/config/_config.php"; |
|
30 | 30 | |
31 | 31 | $validator = new \web\lib\common\InputValidation(); |
32 | 32 |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | * @author Stefan Winter <[email protected]> |
28 | 28 | * @package UserGUI |
29 | 29 | */ |
30 | -require dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
30 | +require dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
31 | 31 | $API = new \core\UserAPI(); |
32 | 32 | $loggerInstance = new \core\common\Logging(); |
33 | 33 | $validator = new \web\lib\common\InputValidation(); |
@@ -76,6 +76,6 @@ discard block |
||
76 | 76 | if ($accountPageUrl === FALSE) { |
77 | 77 | throw new Exception("Unable to find our accountstatus.php page."); |
78 | 78 | } |
79 | - header("Location: ../accountstatus/accountstatus.php?token=" . $cleanToken . "&errorcode=GENERATOR_CONSUMED"); |
|
79 | + header("Location: ../accountstatus/accountstatus.php?token=".$cleanToken."&errorcode=GENERATOR_CONSUMED"); |
|
80 | 80 | throw $e; |
81 | 81 | } |
@@ -24,7 +24,7 @@ |
||
24 | 24 | * |
25 | 25 | * @package UserAPI |
26 | 26 | */ |
27 | -require dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
27 | +require dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
28 | 28 | $API = new \core\UserNetAPI(); |
29 | 29 | $validator = new web\lib\common\InputValidation(); |
30 | 30 | $loggerInstance = new \core\common\Logging(); |
@@ -19,7 +19,7 @@ |
||
19 | 19 | * <base_url>/copyright.php after deploying the software |
20 | 20 | */ |
21 | 21 | |
22 | - $Tou = [ |
|
22 | + $Tou = [ |
|
23 | 23 | 'title' => _("Terms of Use"), |
24 | 24 | 'subtitle' => _("(for legal reasons, the Terms of Use are in English only)"), |
25 | 25 | 'short' => "<p>The purpose of this service is to make eduroam configuration easier for end users and eduroam |
@@ -20,7 +20,7 @@ |
||
20 | 20 | */ |
21 | 21 | ?> |
22 | 22 | <?php |
23 | -require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php"; |
|
23 | +require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php"; |
|
24 | 24 | |
25 | 25 | $auth = new \web\lib\admin\Authentication(); |
26 | 26 |
@@ -19,7 +19,7 @@ |
||
19 | 19 | * <base_url>/copyright.php after deploying the software |
20 | 20 | */ |
21 | 21 | |
22 | -require_once dirname(dirname(__DIR__)) . "/config/_config.php"; |
|
22 | +require_once dirname(dirname(__DIR__))."/config/_config.php"; |
|
23 | 23 | |
24 | 24 | $sociopath = new \core\diag\Sociopath(); |
25 | 25 |