deprecated/phpki-ng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3 from lgnap/master

Browse Source 
Merged
This commit is contained in:
Nick Pappas
2013-04-24 00:38:46 -07:00
parent fe66105581 1613ae8119
commit f72e9a9f02
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -22,7 +22,7 @@ distclean: clean
echo -e '<?php\nheader("Location: ./../index.php");\n?>' > ca/index.php echo -e '<?php\nheader("Location: ./../index.php");\n?>' > ca/index.php
echo '<?php' > config.php echo '<?php' > config.php
echo 'define(PHPKI_VERSION, "$(VERSION)");' >> config.php echo 'define("PHPKI_VERSION", "$(VERSION)");' >> config.php
echo '?>' >> config.php echo '?>' >> config.php
rm -f index.php setup.php rm -f index.php setup.php

2
config.php
View File

@@ -1,3 +1,3 @@
<?php <?php
define(PHPKI_VERSION, "0.83"); define("PHPKI_VERSION", "0.83");
?> ?>

2
include/common.php
View File

@@ -2,7 +2,7 @@
umask(0007); umask(0007);
if ($_SERVER['PHP_AUTH_USER']) if (isset($_SERVER['PHP_AUTH_USER']))
$PHPki_user = md5($_SERVER['PHP_AUTH_USER']); $PHPki_user = md5($_SERVER['PHP_AUTH_USER']);
else else
$PHPki_user = md5('default'); $PHPki_user = md5('default');

4
include/my_functions.php
View File

@@ -64,8 +64,8 @@ function upload($source, $destination, $content_type="application/octet-stream")
function gpvar($v) { function gpvar($v) {
global $_GET, $_POST; global $_GET, $_POST;
$x = ""; $x = "";
if ($_GET[$v]) $x = $_GET[$v]; if (isset($_GET[$v])) $x = $_GET[$v];
if ($_POST[$v]) $x = $_POST[$v]; if (isset($_POST[$v])) $x = $_POST[$v];
if (get_magic_quotes_gpc()) $x = stripslashes($x); if (get_magic_quotes_gpc()) $x = stripslashes($x);
return $x; return $x;
} }

4
setup.php-presetup
View File

@@ -109,7 +109,7 @@ case 'validate':
if ( $passwd and $passwd != $passwdv ) if ( $passwd and $passwd != $passwdv )
$er .= 'Password and password verification do not match.<br>'; $er .= 'Password and password verification do not match.<br>';
if ( $email && ! is_email($contact) ) if ( $contact && ! is_email($contact) )
$er .= 'E-mail address ('. htvar($contact) . ') may be invalid.<br>'; $er .= 'E-mail address ('. htvar($contact) . ') may be invalid.<br>';
if (strpos($store_dir,$_SERVER['DOCUMENT_ROOT']) === 0) if (strpos($store_dir,$_SERVER['DOCUMENT_ROOT']) === 0)
@@ -739,7 +739,7 @@ E-mail: <a href=mailto:someone@somewhere.com>someone@somewhere.com</a>&nbsp;&nbs
<td> <td>
<strong>Password</strong> <font color=red>*</font><br> <strong>Password</strong> <font color=red>*</font><br>
This password will be used to protect your root certificate private This password will be used to protect your root certificate private
key. <strong><font color=red>Do not lose or forget this password.</font></strong> key.<br/>Can't contain single quote ! <strong><font color=red>Do not lose or forget this password.</font></strong>
</td> </td>
<td><input type=password name=passwd value="<?=htvar($passwd)?>" size=30>&nbsp;&nbsp; Again <input type=password name=passwdv value="<?=htvar($passwdv)?>" size=30></td> <td><input type=password name=passwd value="<?=htvar($passwd)?>" size=30>&nbsp;&nbsp; Again <input type=password name=passwdv value="<?=htvar($passwdv)?>" size=30></td>
</tr> </tr>