git.p6c8.net
/
jirafeau_project.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master'
[jirafeau_project.git]
/
install.php
diff --git
a/install.php
b/install.php
index 78680f83b490afa87bbd0477ca6256ed5e80b9db..ae4bd99b4d0df702fe9ae1161b4b4f50337556b5 100644
(file)
--- a/
install.php
+++ b/
install.php
@@
-2,6
+2,7
@@
/*
* Jirafeau, your web file repository
* Copyright (C) 2008 Julien "axolotl" BERNARD <axolotl@magieeternelle.org>
/*
* Jirafeau, your web file repository
* Copyright (C) 2008 Julien "axolotl" BERNARD <axolotl@magieeternelle.org>
+ * Copyright (C) 2015 Nicola Spanti (RyDroid) <dev@nicola-spanti.info>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@@
-14,7
+15,7
@@
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http
s
://www.gnu.org/licenses/>.
*/
define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
define ('NL', "\n");
*/
define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
define ('NL', "\n");
@@
-67,9
+68,7
@@
jirafeau_export_cfg ($cfg)
function
jirafeau_mkdir ($path)
{
function
jirafeau_mkdir ($path)
{
- if (!file_exists ($path) && !@mkdir ($path, 0755))
- return false;
- return true;
+ return !(!file_exists ($path) && !@mkdir ($path, 0755));
}
/**
}
/**
@@
-167,7
+166,7
@@
if (isset ($_POST['step']) && isset ($_POST['next']))
break;
case 2:
break;
case 2:
- $cfg['admin_password'] =
$_POST['admin_password']
;
+ $cfg['admin_password'] =
hash('sha256', $_POST['admin_password'])
;
jirafeau_export_cfg ($cfg);
break;
jirafeau_export_cfg ($cfg);
break;
@@
-182,8
+181,6
@@
if (isset ($_POST['step']) && isset ($_POST['next']))
$cfg['var_root'] = jirafeau_add_ending_slash ($_POST['var_root']);
jirafeau_export_cfg ($cfg);
break;
$cfg['var_root'] = jirafeau_add_ending_slash ($_POST['var_root']);
jirafeau_export_cfg ($cfg);
break;
-
- default: break;
}
}
}
}
@@
-235,7
+232,7
@@
default:
"<?php echo t('Next step'); ?>" /></td> </tr> </table>
</fieldset> </form> </div> <?php
break;
"<?php echo t('Next step'); ?>" /></td> </tr> </table>
</fieldset> </form> </div> <?php
break;
-
+
case 2:
?><h2><?php printf (t('Installation of Jirafeau') . ' - ' . t('step') .
' %d ' . t('out of') . ' %d', 2, 4);
case 2:
?><h2><?php printf (t('Installation of Jirafeau') . ' - ' . t('step') .
' %d ' . t('out of') . ' %d', 2, 4);
patrick-canterino.de