mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

Issue #6 - LAN fixes. Default timezone set to UTC. Issue #1174 - Extra check added on multiple-login check.

Browse Source
This commit is contained in:
Cameron
2015-09-02 09:57:56 -07:00
parent e55e305d0c
commit 0ab62ac407
4 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_core/xml/default_install.xml
View File

@@ -264,7 +264,7 @@ City, State, Country
<core name="themecss">canvas.css</core> <core name="themecss">canvas.css</core>
<core name="thumbnail_quality">75</core> <core name="thumbnail_quality">75</core>
<core name="time_offset">0</core> <core name="time_offset">0</core>
<core name="timezone">GMT</core> <core name="timezone">UTC</core>
<core name="track_online">1</core> <core name="track_online">1</core>
<core name="ue_upgrade">1</core> <core name="ue_upgrade">1</core>
<core name="upload_class">255</core> <core name="upload_class">255</core>

6
e107_handlers/login.php
View File

@@ -233,11 +233,11 @@ class userlogin
$user_email = $this->userData['user_email']; $user_email = $this->userData['user_email'];
/* restrict more than one person logging in using same us/pw */ /* restrict more than one person logging in using same us/pw */
if($pref['disallowMultiLogin']) if(!empty($pref['disallowMultiLogin']) && !empty($user_id))
{ {
if($sql->db_Select("online", "online_ip", "online_user_id='".$user_id.".".$user_name."'")) if($sql->select("online", "online_ip", "online_user_id='".$user_id.".".$user_name."'"))
{ {
return $this->invalidLogin($username,LOGIN_MULTIPLE,$user_id); return $this->invalidLogin($username, LOGIN_MULTIPLE, $user_id);
} }
} }

18
e107_languages/English/lan_installer.php
View File

@@ -90,22 +90,6 @@ Please ensure the file [b]core_sql.php[/b] exists in the [b]/e107_core/sql[/b] d
define("LANINS_061", "e107 was unable to create all of the required database tables. define("LANINS_061", "e107 was unable to create all of the required database tables.
Please clear the database and rectify any problems before trying again."); Please clear the database and rectify any problems before trying again.");
define("LANINS_062", "[b]Welcome to your new website![/b]
e107 has installed successfully and is now ready to accept content.
Your administration section is [link=e107_admin/admin.php]located here[/link], click to go there now. You will have to login using the name and password you entered during the installation process.
[b]Support[/b]
e107 Homepage: [link=http://e107.org]http://e107.org[/link], you will find the FAQ and documentation here.
Forums: [link=http://e107.org/e107_plugins/forum/forum.php]http://e107.org/e107_plugins/forum/forum.php[/link]
Plugin Developer Community: [link=http://www.e107coders.org]http://e107coders.org[/link]
[b]Downloads[/b]
Plugins: [link=http://plugins.e107.org]http://plugins.e107.org[/link]
Themes: [link=http://themes.e107.org]http://themes.e107.org[/link]
Thank you for trying e107, we hope it fulfils your website needs.
(You can delete this message from your admin section.)");
// define("LANINS_063", "Welcome to e107"); // define("LANINS_063", "Welcome to e107");
@@ -138,7 +122,7 @@ define("LANINS_083", "MySQL Reported Error:");
define("LANINS_084", "The installer could not establish a connection to the database"); define("LANINS_084", "The installer could not establish a connection to the database");
define("LANINS_085", "The installer could not select database:"); define("LANINS_085", "The installer could not select database:");
define("LANINS_086", "Admin Username, Admin Password and Admin Email are [b]required[/b] fields. Please return to the last page and ensure the information is correctly entered."); define("LANINS_086", "Admin Username, Admin Password and Admin Email are required fields. Please return to the last page and ensure the information is correctly entered.");
// define("LANINS_087", "Misc"); // define("LANINS_087", "Misc");
// define("LANINS_088", "Home"); // define("LANINS_088", "Home");

4
install.php
View File

@@ -858,7 +858,7 @@ class e_install
</tr> </tr>
<tr> <tr>
<td>".LANINS_016."</td> <td>MySQL</td>
<td>{$mysql_note}</td> <td>{$mysql_note}</td>
<td class='{$mysqlColor}'>{$mysql_help}</td> <td class='{$mysqlColor}'>{$mysql_help}</td>
</tr> </tr>
@@ -1466,7 +1466,7 @@ class e_install
$this->previous_steps['prefs']['install_date'] = time(); $this->previous_steps['prefs']['install_date'] = time();
$this->previous_steps['prefs']['siteurl'] = e_HTTP; $this->previous_steps['prefs']['siteurl'] = e_HTTP;
$this->previous_steps['prefs']['sitetag'] = LAN_PREF_2; $this->previous_steps['prefs']['sitetag'] = "e107 Website System";
$this->previous_steps['prefs']['sitedisclaimer'] = ''; $this->previous_steps['prefs']['sitedisclaimer'] = '';
$this->previous_steps['prefs']['replyto_name'] = $this->previous_steps['admin']['display']; $this->previous_steps['prefs']['replyto_name'] = $this->previous_steps['admin']['display'];