|
@@ -26,7 +26,18 @@
|
|
* @return void
|
|
* @return void
|
|
*/
|
|
*/
|
|
function sqspell_makePage($title, $scriptsrc, $body){
|
|
function sqspell_makePage($title, $scriptsrc, $body){
|
|
- global $color, $SQSPELL_VERSION, $MOD;
|
|
|
|
|
|
+ global $color, $SQSPELL_VERSION;
|
|
|
|
+
|
|
|
|
+ if ( (float)substr(PHP_VERSION,0,3) < 4.1 ) {
|
|
|
|
+ global $_GET;
|
|
|
|
+ }
|
|
|
|
+ if (isset($_GET['MOD'])) {
|
|
|
|
+ $MOD = $_GET['MOD'];
|
|
|
|
+ }
|
|
|
|
+ else {
|
|
|
|
+ $MOD = 'options_main';
|
|
|
|
+ }
|
|
|
|
+
|
|
displayPageHeader($color, 'None');
|
|
displayPageHeader($color, 'None');
|
|
echo " <br>\n";
|
|
echo " <br>\n";
|
|
/**
|
|
/**
|
|
@@ -331,9 +342,12 @@ function sqspell_getWords(){
|
|
* the user's old mailbox password. I admin, this is rather dirty,
|
|
* the user's old mailbox password. I admin, this is rather dirty,
|
|
* but efficient. ;)
|
|
* but efficient. ;)
|
|
*/
|
|
*/
|
|
- global $key, $onetimepad, $old_key;
|
|
|
|
- if ($old_key) {
|
|
|
|
- $clear_key=$old_key;
|
|
|
|
|
|
+ $key = $_COOKIE['key'];
|
|
|
|
+ $onetimepad = $_SESSION['onetimepad'];
|
|
|
|
+ $old_key = $_POST['old_key'];
|
|
|
|
+
|
|
|
|
+ if ($old_key != '') {
|
|
|
|
+ $clear_key=$old_key;
|
|
} else {
|
|
} else {
|
|
/**
|
|
/**
|
|
* Get user's password (the key).
|
|
* Get user's password (the key).
|
|
@@ -443,7 +457,9 @@ function sqspell_writeWords($words){
|
|
* User wants to encrypt the file. So be it.
|
|
* User wants to encrypt the file. So be it.
|
|
* Get the user's password to use as a key.
|
|
* Get the user's password to use as a key.
|
|
*/
|
|
*/
|
|
- global $key, $onetimepad;
|
|
|
|
|
|
+ $key = $_COOKIE['key'];
|
|
|
|
+ $onetimepad = $_SESSION['onetimepad'];
|
|
|
|
+
|
|
$clear_key=OneTimePadDecrypt($key, $onetimepad);
|
|
$clear_key=OneTimePadDecrypt($key, $onetimepad);
|
|
/**
|
|
/**
|
|
* Try encrypting it. If fails, scream bloody hell.
|
|
* Try encrypting it. If fails, scream bloody hell.
|