Menu
▾
▴
web-erp-svn
|
From: <dai...@us...> - 2012-08-21 07:54:52
|
Revision: 5606
http://web-erp.svn.sourceforge.net/web-erp/?rev=5606&view=rev
Author: daintree
Date: 2012-08-21 07:54:46 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
added company database name rather than company name in the setup wizard
Modified Paths:
--------------
trunk/install/index.php
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2012-08-21 07:48:47 UTC (rev 5605)
+++ trunk/install/index.php 2012-08-21 07:54:46 UTC (rev 5606)
@@ -270,7 +270,7 @@
</td>
</tr>
<tr>
- <td colspan="5"><h3>Step 5</h3>Please enter the company name below...</td>
+ <td colspan="5"><h3>Step 5</h3>Please enter the company database name below...</td>
</tr>
<tr>
<td style="color: #666666;" colspan="1">Company Name:</td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-08-21 07:54:56
|
Revision: 5606
http://web-erp.svn.sourceforge.net/web-erp/?rev=5606&view=rev
Author: daintree
Date: 2012-08-21 07:54:46 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
added company database name rather than company name in the setup wizard
Modified Paths:
--------------
trunk/install/index.php
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2012-08-21 07:48:47 UTC (rev 5605)
+++ trunk/install/index.php 2012-08-21 07:54:46 UTC (rev 5606)
@@ -270,7 +270,7 @@
</td>
</tr>
<tr>
- <td colspan="5"><h3>Step 5</h3>Please enter the company name below...</td>
+ <td colspan="5"><h3>Step 5</h3>Please enter the company database name below...</td>
</tr>
<tr>
<td style="color: #666666;" colspan="1">Company Name:</td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ice...@us...> - 2013-07-29 00:57:53
|
Revision: 6159
http://sourceforge.net/p/web-erp/reponame/6159
Author: icedlava
Date: 2013-07-29 00:57:51 +0000 (Mon, 29 Jul 2013)
Log Message:
-----------
Link installer footer image to existing webERPsm.gif
Modified Paths:
--------------
trunk/install/index.php
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2013-07-29 00:28:11 UTC (rev 6158)
+++ trunk/install/index.php 2013-07-29 00:57:51 UTC (rev 6159)
@@ -847,7 +847,7 @@
<div class="page_help_text">
<p>'. _('webERP is an open source application licenced under GPL V2 and absolutely free to download.<br /> By installing webERP you acknowledge you have read <a href="http://www.gnu.org/licenses/gpl-2.0.html#SEC1" target="_blank">the licence</a>. <br />Please visit the official webERP website for more information.').'
</p>
- <p><img src="../css/webERPweb.gif" title="webERP" alt="webERP" />  <a href="http://www.weberp.org">http://www.weberp.org</a></p>
+ <p><img src="../css/webERPsm.gif" title="webERP" alt="webERP" />  <a href="http://www.weberp.org">http://www.weberp.org</a></p>
</div>';
?>
|
|
From: <ice...@us...> - 2013-07-29 03:00:57
|
Revision: 6162
http://sourceforge.net/p/web-erp/reponame/6162
Author: icedlava
Date: 2013-07-29 03:00:55 +0000 (Mon, 29 Jul 2013)
Log Message:
-----------
Hard code in English the page title, previously missing, so we can move the language include files back below user selection code. Put back some default values for user. Still to investigate why timezone not autoselected.
Modified Paths:
--------------
trunk/install/index.php
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2013-07-29 02:21:27 UTC (rev 6161)
+++ trunk/install/index.php 2013-07-29 03:00:55 UTC (rev 6162)
@@ -4,14 +4,6 @@
session_name('weberp_installation');
session_start();
- //we need a languate for the LanguageSetup.php functions - first load we have none
- if (!isset($_POST['Language'])) { //check that we haven't selected a language already
- $DefaultLanguage = 'en_US.utf8'; // load a default language early so we can use defines - this will be overridden by user one
- }
- $PathPrefix = '../';//To make the LanguageSetup.php script run properly
- include('../includes/LanguageSetup.php'); // load LanguagesSetup early so we can use it earlier
- include('../includes/MiscFunctions.php');
-
/*
* Web ERP Installer
* Step 1: Licence acknowledgement and Choose Language
@@ -28,7 +20,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title><?php echo _('WebERP Installer'); ?></title>
+ <title>WebERP Installation Wizard</title>
<link rel="stylesheet" type="text/css" href="installer.css" />
</head>
<body>
@@ -147,7 +139,9 @@
}
-
+ $PathPrefix = '../';//To make the LanguageSetup.php script run properly
+ include('../includes/LanguageSetup.php');
+ include('../includes/MiscFunctions.php');
//prevent the installation file from running again
if(file_exists('../config.php') or file_exists('../Config.php')){
@@ -874,12 +868,12 @@
<ul>
<li>
<label for="HostName"><?php echo _('Host Name'); ?>: </label>
- <input type="text" name="HostName" id="HostName" required="true" placeholder="<?php echo _('Enter database host name'); ?>" />
+ <input type="text" name="HostName" id="HostName" required="true" value="localhost" placeholder="<?php echo _('Enter database host name'); ?>" />
<span><?php echo _('Commonly: localhost or 127.0.0.1'); ?></span>
</li>
<li>
<label for="Database"><?php echo _('Database Name'); ?>: </label>
- <input type="text" name="Database" id="Database" required="true" maxlength="16" placeholder="<?php echo _('The database name'); ?>" />
+ <input type="text" name="Database" id="Database" required="true" value="weberp" maxlength="16" placeholder="<?php echo _('The database name'); ?>" />
<span><?php echo _('The database must have a valid name'); ?></span>
</li>
<li>
@@ -889,7 +883,7 @@
</li>
<li>
<label for="UserName"><?php echo _('Database User Name'); ?>: </label>
- <input type="text" name="UserName" id="UserName" placeholder="<?php echo _('A valid database user name'); ?>" maxlength="16" required="true" /> 
+ <input type="text" name="UserName" id="UserName" value="root" placeholder="<?php echo _('A valid database user name'); ?>" maxlength="16" required="true" /> 
<span><?php echo _('Must be a user that has permission to create a database.'); ?></span>
</li>
<li>
@@ -1047,7 +1041,7 @@
</li>
<li>
<label for="Email"><?php echo _('Email address'); ?>: </label>
- <input type="text" name="Email" required="true" placeholder="ad...@yo..." pattern="[a-z0-9!#$%&'*+/=?^_`{|}~.-]+@[a-z0-9-]+(\.[a-z0-9-]+)*" />
+ <input type="text" name="Email" required="true" placeholder="ad...@yo..." value="ad...@we..." pattern="[a-z0-9!#$%&'*+/=?^_`{|}~.-]+@[a-z0-9-]+(\.[a-z0-9-]+)*" />
<span> <?php echo _('For example: ad...@yo...'); ?></span>
</li>
<li>
|
|
From: <ice...@us...> - 2013-07-29 14:31:17
|
Revision: 6163
http://sourceforge.net/p/web-erp/reponame/6163
Author: icedlava
Date: 2013-07-29 14:31:14 +0000 (Mon, 29 Jul 2013)
Log Message:
-----------
Closing form and div elements. On recheck and final company check source shows missing closing body and html - still a problem.
Modified Paths:
--------------
trunk/install/index.php
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2013-07-29 03:00:55 UTC (rev 6162)
+++ trunk/install/index.php 2013-07-29 14:31:14 UTC (rev 6163)
@@ -910,6 +910,8 @@
<fieldset>
<button type="submit" name="DbConfig"><?php echo _('Next Step'); ?></button>
</fieldset>
+ </form>
+</div>
<?php
}
@@ -1017,7 +1019,7 @@
<legend><?php echo _('Installation option'); ?></legend>
<ul>
<li>
- <label for="InstallDemo"><?php echo _('Install the demo data?'); ?>: </label><input type="checkbox" name="Demo" checked="checked" />
+ <label for="InstallDemo"><?php echo _('Install the demo data?'); ?> </label><input type="checkbox" name="Demo" checked="checked" />
<span><?php echo _("WebERPDemo site and data will be installed"); ?></span>
</li>
</ul>
@@ -1066,6 +1068,9 @@
<fieldset>
<button type="submit" name="Install"><?php echo _('Install'); ?></button>
</fieldset>
+ </form>
+</div>
+
<?php
}
|
|
From: <ice...@us...> - 2013-08-04 11:57:08
|
Revision: 6175
http://sourceforge.net/p/web-erp/reponame/6175
Author: icedlava
Date: 2013-08-04 11:57:06 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
Prevent closing php tag displaying in output - use C style comments for last line of config.php
Modified Paths:
--------------
trunk/install/index.php
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2013-08-04 05:48:54 UTC (rev 6174)
+++ trunk/install/index.php 2013-08-04 11:57:06 UTC (rev 6175)
@@ -387,7 +387,7 @@
$msg .= "\$CompanyList[".$k."] = array('database'=>'".$compinfo['database']."' ,'company'=>'".addslashes($compinfo['company'])."' );\n"; //simpler to manipulate this way
}
$msg .= "//End Installed companies-do not change this line\n";
- $msg .= "//Make sure there is nothing - not even spaces after this last ?>\n";
+ $msg .= "/* Make sure there is nothing - not even spaces after this last ?> */\n";
$msg .= "?>";
//write the config.php file since we have test the writability of the root path and companies,
|
|
From: <ex...@us...> - 2013-08-26 11:40:43
|
Revision: 6292
http://sourceforge.net/p/web-erp/reponame/6292
Author: exsonqu
Date: 2013-08-26 11:40:39 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
26/8/2013 Exson Add A default company name to make the installation as dummy as possible.
Modified Paths:
--------------
trunk/install/index.php
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2013-08-26 05:43:36 UTC (rev 6291)
+++ trunk/install/index.php 2013-08-26 11:40:39 UTC (rev 6292)
@@ -1003,6 +1003,7 @@
//@para $MysqlEx is refer to the php mysql extention if it's false, it means the php configuration only support mysql instead of mysqli
//The purpose of this function is to display the final screen for users to input company, admin user accounts etc informatioin
function CompanySetup($UserLanguage,$HostName,$UserName,$Password,$DatabaseName,$MysqlExt = FALSE){//display the company setup for users
+ $CompanyName = $DatabaseName;
?>
<h1><?php echo _('webERP Installation Wizard'); ?></h1>
<!--<p style="text-align:center;"><?php echo _("Please enter the company name and please pay attention the company will be as same as the database name"); ?></p>-->
|
|
From: <ex...@us...> - 2013-08-27 15:44:51
|
Revision: 6302
http://sourceforge.net/p/web-erp/reponame/6302
Author: exsonqu
Date: 2013-08-27 15:44:46 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
27/8/2013 Exson: Remove the option of weberp-demo.sql to avoid installation error. Reported by icedlava.
Modified Paths:
--------------
trunk/install/index.php
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2013-08-27 15:22:34 UTC (rev 6301)
+++ trunk/install/index.php 2013-08-27 15:44:46 UTC (rev 6302)
@@ -1029,7 +1029,7 @@
foreach($COAs as $Value){
if($Value == 'weberp-new.sql'){
echo '<option value="'.$Value.'" selected="true">'.$Value.'</option>';
- }else{
+ }elseif($Value != 'weberp-demo.sql'){// the demo sql selection is not necessary so not allowed
echo '<option value="'.$Value.'">'.$Value.'</option>';
}
}
|
|
From: <dai...@us...> - 2013-12-23 10:46:18
|
Revision: 6516
http://sourceforge.net/p/web-erp/reponame/6516
Author: daintree
Date: 2013-12-23 10:46:14 +0000 (Mon, 23 Dec 2013)
Log Message:
-----------
force lower case database name
Modified Paths:
--------------
trunk/install/index.php
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2013-12-23 06:59:57 UTC (rev 6515)
+++ trunk/install/index.php 2013-12-23 10:46:14 UTC (rev 6516)
@@ -178,12 +178,12 @@
//The mysql database name cannot contains illegal characters such as "/","\","." etc
//and it should not contains illegal characters as file name such as "?""%"<"">"" " etc
- if(!preg_match(',[a-zA-Z0-9_\&\-\ ]*,',$_POST['Database'])){
+ if(!preg_match(',[a-z0-9_\&\-\ ]*,',$_POST['Database'])){
$InputError = 1;
- prnMsg(_('The database name should not contains illegal characters such as "/\?%:|<>" blank etc'),'error');
+ prnMsg(_('The database name must be lower case and should not contains illegal characters such as "/\?%:|<>" blank etc'),'error');
}
- $DatabaseName = $_POST['Database'];
+ $DatabaseName = strtolower($_POST['Database']);
}else{
$InputError = 1;
prnMsg(_('The database name should not be empty'),'error');
@@ -482,7 +482,7 @@
session_destroy();
header('Location: ' . $Path_To_Root . '/index.php?newDb=1');
- ini_set('max_execution_time', '60');
+ ini_set('max_execution_time', '120');
echo '<META HTTP-EQUIV="Refresh" CONTENT="0; URL=' . $Path_To_Root . '/index.php">';
@@ -526,10 +526,10 @@
}
if(preg_match(',[/\\\?%:\|<>\.\s"]+,',$_POST['Database'])){
$InputError = 1;
- prnMsg(_('The database name should not contains illegal characters such as "/\?%:|<>" or blank spaces'),'error');
+ prnMsg(_('The database name should be lower case and not contains illegal characters such as "/\?%:|<>" or blank spaces'),'error');
}
- $DatabaseName = $_POST['Database'];
+ $DatabaseName = strtolower($_POST['Database']);
}else{
$InputError = 1;
prnMsg(_('The database name should not be empty'),'error');
@@ -909,7 +909,7 @@
</li>
<li>
<label for="Database"><?php echo _('Database Name'); ?>: </label>
- <input type="text" name="Database" id="Database" required="true" value="weberp" maxlength="16" placeholder="<?php echo _('The database name'); ?>" />
+ <input type="text" name="Database" id="Database" required="true" pattern="^[a-z0-9$]+_$" value="weberp" maxlength="16" placeholder="<?php echo _('The database name'); ?>" />
<span><?php echo _('The database must have a valid name'); ?></span>
</li>
<li>
|
|
From: <ex...@us...> - 2014-01-02 08:39:29
|
Revision: 6524
http://sourceforge.net/p/web-erp/reponame/6524
Author: exsonqu
Date: 2014-01-02 08:39:24 +0000 (Thu, 02 Jan 2014)
Log Message:
-----------
2/1/2014 Exson: Fixed php-mbstring extension detection failure in install/index.php during installation.
Modified Paths:
--------------
trunk/install/index.php
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2014-01-01 16:11:26 UTC (rev 6523)
+++ trunk/install/index.php 2014-01-02 08:39:24 UTC (rev 6524)
@@ -3,6 +3,10 @@
ini_set('max_execution_time', "600");
session_name('weberp_installation');
session_start();
+if(!extension_loaded('mbstring')){
+ echo 'The php-mbstring extension has not been installed or loaded, please correct your php configuration first';
+ exit;
+}
/*
* Web ERP Installer
|
|
From: <ex...@us...> - 2014-02-03 08:48:57
|
Revision: 6557
http://sourceforge.net/p/web-erp/reponame/6557
Author: exsonqu
Date: 2014-02-03 08:48:54 +0000 (Mon, 03 Feb 2014)
Log Message:
-----------
03/02/14 Exson: Make company names allowed non alphanumeric characters.
Modified Paths:
--------------
trunk/install/index.php
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2014-02-02 09:13:54 UTC (rev 6556)
+++ trunk/install/index.php 2014-02-03 08:48:54 UTC (rev 6557)
@@ -165,9 +165,9 @@
//The mysql database name cannot contains illegal characters such as "/","\","." etc
//and it should not contains illegal characters as file name such as "?""%"<"">"" " etc
- if(!preg_match(',[a-zA-Z0-9_\&\-\ ]*,',$_POST['CompanyName'])){
+ if(!preg_match(',^[^/\\\?%:\|<>\"]+$,',$_POST['CompanyName'])){
$InputError = 1;
- prnMsg(_('The Company names can only contain alphanumeric characters plus -,_, & and spaces'),'error');
+ prnMsg(_('The Company names cannot contain illegal characters such as /\?%:|<>"'),'error');
}
$CompanyName= $_POST['CompanyName'];
@@ -182,9 +182,9 @@
//The mysql database name cannot contains illegal characters such as "/","\","." etc
//and it should not contains illegal characters as file name such as "?""%"<"">"" " etc
- if(!preg_match(',[a-z0-9_\&\-\ ]*,',$_POST['Database'])){
+ if(!preg_match(',[a-zA-Z0-9_\&\-\ ]*,',$_POST['Database'])){
$InputError = 1;
- prnMsg(_('The database name must be lower case and should not contains illegal characters such as "/\?%:|<>" blank etc'),'error');
+ prnMsg(_('The database name should not contains illegal characters such as "/\?%:|<>" etc'),'error');
}
$DatabaseName = strtolower($_POST['Database']);
@@ -528,12 +528,12 @@
if(!empty($_POST['Prefix'])){
$_POST['Database'] = $_POST['Prefix'].$_POST['Database'];
}
- if(preg_match(',[/\\\?%:\|<>\.\s"]+,',$_POST['Database'])){
+ if(preg_match(',[/\\\?%:\|<>\."]+,',$_POST['Database'])){
$InputError = 1;
- prnMsg(_('The database name should be lower case and not contains illegal characters such as "/\?%:|<>" or blank spaces'),'error');
+ prnMsg(_('The database name should be lower case and not contains illegal characters such as "/\?%:|<>"'),'error');
}
- $DatabaseName = strtolower($_POST['Database']);
+ $DatabaseName = $_POST['Database'];
}else{
$InputError = 1;
prnMsg(_('The database name should not be empty'),'error');
@@ -913,7 +913,7 @@
</li>
<li>
<label for="Database"><?php echo _('Database Name'); ?>: </label>
- <input type="text" name="Database" id="Database" required="true" pattern="^[a-z0-9$]+_$" value="weberp" maxlength="16" placeholder="<?php echo _('The database name'); ?>" />
+ <input type="text" name="Database" id="Database" required="true" pattern="^[a-zA-Z0-9_\&\-\ ]+$" value="weberp" maxlength="16" placeholder="<?php echo _('The database name'); ?>" />
<span><?php echo _('The database must have a valid name'); ?></span>
</li>
<li>
@@ -1020,8 +1020,8 @@
<ul>
<li>
<label for="CompanyName"><?php echo _("Company Name"); ?>: </label>
- <input type="text" name="CompanyName" required="true" pattern="[a-zA-Z0-9_\'\&\-\ ]*" value="<?php echo $CompanyName; ?>" maxlength="50" />
- <span><?php echo _('The name of your company'); ?></span>
+ <input type="text" name="CompanyName" required="true" pattern='[^|/\\\?%:\<>"]+' value="<?php echo $CompanyName; ?>" maxlength="50" />
+ <span><?php echo _('The name of your company should not contain characters such as |\?%:<>"'); ?></span>
</li>
<li>
<label for="CountrySQL"><?php echo _("Chart of Accounts"); ?>: </label>
|
|
From: <ex...@us...> - 2014-02-03 09:06:57
|
Revision: 6559
http://sourceforge.net/p/web-erp/reponame/6559
Author: exsonqu
Date: 2014-02-03 09:06:53 +0000 (Mon, 03 Feb 2014)
Log Message:
-----------
03/02/14 Exson: Add sql statement 'SET names utf8' to make company name which is not alphanumeric display correctly.
Modified Paths:
--------------
trunk/install/index.php
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2014-02-03 09:04:01 UTC (rev 6558)
+++ trunk/install/index.php 2014-02-03 09:06:53 UTC (rev 6559)
@@ -1126,7 +1126,8 @@
if($DBType == 'mysqli'){//if the mysql db type is mysqli
mysqli_select_db($db,$NewDB);
//currently there is no 'USE' statements in sql file, no bother to remove them
- $sql = file_get_contents($NewSQL);
+ $sql = 'SET names UTF8;';
+ $sql .= file_get_contents($NewSQL);
if(!$sql){
die(_('Failed to open the new sql file'));
}
@@ -1210,7 +1211,7 @@
($DBType=='mysqli')?mysqli_select_db($db,$dbName):mysql_select_db($dbName,$db);
$SQLScriptFile = file($File);
$ScriptFileEntries = sizeof($SQLScriptFile);
- $SQL ='';
+ $SQL =' SET names UTF8;';
$InAFunction = false;
for ($i=0; $i<$ScriptFileEntries; $i++) {
|
|
From: <rc...@us...> - 2014-03-29 19:52:42
|
Revision: 6651
http://sourceforge.net/p/web-erp/reponame/6651
Author: rchacon
Date: 2014-03-29 19:52:39 +0000 (Sat, 29 Mar 2014)
Log Message:
-----------
Fixing spacing and variable name.
Modified Paths:
--------------
trunk/install/index.php
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2014-03-29 12:52:19 UTC (rev 6650)
+++ trunk/install/index.php 2014-03-29 19:52:39 UTC (rev 6651)
@@ -774,12 +774,12 @@
if(substr($DefaultLanguage,0,2) !='en'){//ensure that the bilingual only display when the language is not english
foreach($LanguagesArray as $Key => $Language1){//since we only use the first 2 characters to separate the language, there are some
//chance that different locale but use same first 2 letters.
- if(!isset($SelectedKey) and substr($DefaultLanugage,0,2) == substr($Key,0,2)){
+ if(!isset($SelectedKey) and substr($DefaultLanguage,0,2) == substr($Key,0,2)){
$SelectedKey = $Key;
- echo '<option value="'.$Key.'" selected="selected">' . $Language1['LanguageName'].$Language1['WindowsLocale'] . '</option>';
+ echo '<option value="'.$Key.'" selected="selected">' . $Language1['LanguageName'].' - '.$Language1['WindowsLocale'] . '</option>';
}
if(!isset($SelectedKey) or (isset($SelectedKey) and $Key != $SelectedKey)){
- echo '<option value="'.$Key.'" >' . $Language1['LanguageName'].$Language1['WindowsLocale'] . '</option>';
+ echo '<option value="'.$Key.'" >' . $Language1['LanguageName'].' - '.$Language1['WindowsLocale'] . '</option>';
}
}
}else{
|
|
From: <ser...@us...> - 2014-08-19 13:53:20
|
Revision: 6834
http://sourceforge.net/p/web-erp/reponame/6834
Author: serakfalcon
Date: 2014-08-19 13:53:15 +0000 (Tue, 19 Aug 2014)
Log Message:
-----------
Update installer to use new password hash function, remove $CryptFunction global from installer.
Modified Paths:
--------------
trunk/install/index.php
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2014-08-19 11:53:15 UTC (rev 6833)
+++ trunk/install/index.php 2014-08-19 13:53:15 UTC (rev 6834)
@@ -372,7 +372,6 @@
}
$msg .= "\$SessionLifeTime = 3600;\n";
$msg .= "\$MaximumExecutionTime = 120;\n";
- $msg .= "\$CryptFunction = 'sha1';\n";
$msg .= "\$DefaultClock = 12;\n";
$msg .= "\$RootPath = dirname(htmlspecialchars(\$_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'));\n";
$msg .= "if (isset(\$DirectoryLevelsDeep)){\n";
@@ -1252,6 +1251,17 @@
}
+function CryptPass( $Password ) {
+ if (PHP_VERSION_ID < 50500) {
+ $salt = base64_encode(mcrypt_create_iv(22, MCRYPT_DEV_URANDOM));
+ $salt = str_replace('+', '.', $salt);
+ $hash = crypt($Password, '$2y$10$'.$salt.'$');
+ } else {
+ $hash = password_hash($Password,PASSWORD_DEFAULT);
+ }
+ return $hash;
+ }
+
//@para $db the database connection
//@para $DatabaseName the database to update
//@para $DBConnectType if it is mysql extention or not
@@ -1267,7 +1277,7 @@
$Result = (!$MysqlExt) ? mysqli_select_db($db,$DatabaseName):mysql_select_db($DatabaseName,$db);
$sql = "UPDATE www_users
- SET password = '".sha1($AdminPasswd)."',
+ SET password = '".CryptPass($AdminPasswd)."',
email = '".$AdminEmail."',
language = '".$AdminLanguage."'
WHERE userid = 'admin'";
|
|
From: <ex...@us...> - 2015-05-27 05:19:32
|
Revision: 7314
http://sourceforge.net/p/web-erp/reponame/7314
Author: exsonqu
Date: 2015-05-27 05:19:30 +0000 (Wed, 27 May 2015)
Log Message:
-----------
27/05/15 Thumb: Fix error_reporting() bug change && to & in install/index.php.
Modified Paths:
--------------
trunk/install/index.php
Modified: trunk/install/index.php
===================================================================
--- trunk/install/index.php 2015-05-26 09:43:57 UTC (rev 7313)
+++ trunk/install/index.php 2015-05-27 05:19:30 UTC (rev 7314)
@@ -386,7 +386,7 @@
$msg .= "if (\$RootPath == '/' OR \$RootPath == '\\\') {\n";
$msg .= " \$RootPath = '';\n";
$msg .= "}\n";
- $msg .= "error_reporting(E_ALL && ~E_NOTICE && ~E_WARNING);\n";
+ $msg .= "error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);\n";
$msg .= "//Installed companies \n";
foreach ($CompanyList as $k=>$compinfo)
{
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X