diff --git a/e107_core/xml/default_install.xml b/e107_core/xml/default_install.xml index 1599796b8..36c4ab018 100644 --- a/e107_core/xml/default_install.xml +++ b/e107_core/xml/default_install.xml @@ -264,7 +264,7 @@ City, State, Country canvas.css 75 0 - GMT + UTC 1 1 255 diff --git a/e107_handlers/login.php b/e107_handlers/login.php index 295131a1e..1dcab555f 100644 --- a/e107_handlers/login.php +++ b/e107_handlers/login.php @@ -233,11 +233,11 @@ class userlogin $user_email = $this->userData['user_email']; /* 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); } } diff --git a/e107_languages/English/lan_installer.php b/e107_languages/English/lan_installer.php index c44c59bc5..29f1e7ef7 100644 --- a/e107_languages/English/lan_installer.php +++ b/e107_languages/English/lan_installer.php @@ -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. 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"); @@ -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_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_088", "Home"); diff --git a/install.php b/install.php index 9b74ed2d2..a7f142577 100644 --- a/install.php +++ b/install.php @@ -858,7 +858,7 @@ class e_install - ".LANINS_016." + MySQL {$mysql_note} {$mysql_help} @@ -1466,7 +1466,7 @@ class e_install $this->previous_steps['prefs']['install_date'] = time(); $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']['replyto_name'] = $this->previous_steps['admin']['display'];