diff --git a/admin/survey/classes/class.Dostop.php b/admin/survey/classes/class.Dostop.php index 0976acffe..9e3394bb4 100644 --- a/admin/survey/classes/class.Dostop.php +++ b/admin/survey/classes/class.Dostop.php @@ -1432,15 +1432,13 @@ class Dostop { public function ajax_unconfirmed_mail_user_list_delet_user() { - global $user_db; - $uid = (!empty($_POST['uid']) ? $_POST['uid'] : NULL); if (empty($uid)) { return NULL; } - sisplet_query("DELETE FROM $user_db.users_to_be WHERE id='" . $uid . "'"); + sisplet_query("DELETE FROM users_to_be WHERE id='" . $uid . "'"); echo 'ok'; } @@ -1448,7 +1446,6 @@ class Dostop { public function ajax_confirm_user_email() { global $pass_salt; - global $user_db; $uid = (!empty($_POST['uid']) ? $_POST['uid'] : NULL); @@ -1457,15 +1454,15 @@ class Dostop { } // kopirano iz user_to_be v users - $result = sisplet_query("SELECT type, email, name, surname, pass, status, gdpr_agree, when_reg, came_from, lang FROM " . $user_db . "users_to_be WHERE id='" . $uid . "'"); + $result = sisplet_query("SELECT type, email, name, surname, pass, status, gdpr_agree, when_reg, came_from, lang FROM users_to_be WHERE id='" . $uid . "'"); if (mysqli_num_rows($result) > 0) { $r = mysqli_fetch_assoc($result); $g = base64_encode((hash('SHA256', base64_decode($r['pass']) . $pass_salt))); - sisplet_query("INSERT INTO $user_db.users (type, email, name, surname, pass, status, gdpr_agree, when_reg, came_from, lang, manuallyApproved) + sisplet_query("INSERT INTO users (type, email, name, surname, pass, status, gdpr_agree, when_reg, came_from, lang, manuallyApproved) VALUES ('" . $r['type'] . "', '" . $r['email'] . "', '" . $r['name'] . "', '" . $r['surname'] . "', '" . $g . "','" . $r['status'] . "', '" . $r['gdpr_agree'] . "','" . $r['when_reg'] . "', '" . $r['came_from'] . "', '" . $r['lang'] . "', 'Y')"); - sisplet_query("DELETE FROM $user_db.users_to_be WHERE id='" . $uid . "' OR email='" . $r['email'] . "'"); + sisplet_query("DELETE FROM users_to_be WHERE id='" . $uid . "' OR email='" . $r['email'] . "'"); echo 'ok'; } else { diff --git a/admin/survey/classes/class.Forum.php b/admin/survey/classes/class.Forum.php index 5d45acb55..1ef68df6d 100644 --- a/admin/survey/classes/class.Forum.php +++ b/admin/survey/classes/class.Forum.php @@ -118,7 +118,6 @@ class Forum { global $admin_type; global $pass_salt; global $global_user_id; - global $user_db; global $cookie_domain; // preden naredimo karkoli, odstranimo javascript iz vsebine in naslova: @@ -142,7 +141,7 @@ class Forum { if ($global_user_id > 0) { $uid = $global_user_id; - $resu = sisplet_query ("SELECT name FROM $user_db.users WHERE id='" .$uid ."'"); + $resu = sisplet_query ("SELECT name FROM users WHERE id='" .$uid ."'"); $ru = mysqli_fetch_row ($resu); $user = $ru[0]; } else { @@ -194,7 +193,7 @@ class Forum { if ($_POST['alertmail'] != '') { $mail = $_POST['alertmail']; - $sqla = sisplet_query("SELECT id FROM $user_db.users WHERE email = '$mail'"); + $sqla = sisplet_query("SELECT id FROM users WHERE email = '$mail'"); if (mysqli_num_rows($sqla) > 0) { $rowa = mysqli_fetch_row($sqla); @@ -204,16 +203,16 @@ class Forum { // Preveri ali je vzdevek ze zaseden- ce je, mu dodaj neko stevilko da bo unique $a2 = $avtor; - $result = sisplet_query ("SELECT * FROM $user_db.users WHERE name='$a2' AND surname=''"); + $result = sisplet_query ("SELECT * FROM users WHERE name='$a2' AND surname=''"); while (mysqli_num_rows ($result) > 0) { $a2 = $avtor .rand(0, 32767); - $result = sisplet_query ("SELECT * FROM $user_db.users WHERE name='$a2' AND surname=''"); + $result = sisplet_query ("SELECT * FROM users WHERE name='$a2' AND surname=''"); } $avtor = $a2; $g = base64_encode((hash('SHA256', '' .$pass_salt))); - $sqln = sisplet_query("INSERT INTO $user_db.users (email, name, when_reg, came_from, pass) VALUES ('" .$_POST['alertmail'] ."', '$avtor', NOW(), '2', '$g')"); + $sqln = sisplet_query("INSERT INTO users (email, name, when_reg, came_from, pass) VALUES ('" .$_POST['alertmail'] ."', '$avtor', NOW(), '2', '$g')"); $narocnikID = mysqli_insert_id($GLOBALS['connect_db']); // Ker je noviregistriran mu dajmo se UID. @@ -287,14 +286,14 @@ class Forum { foreach ($mails as $key => $mail) { $mail = trim($mail); - $sqla = sisplet_query("SELECT id FROM $user_db.users WHERE email = '$mail'"); + $sqla = sisplet_query("SELECT id FROM users WHERE email = '$mail'"); if (mysqli_num_rows($sqla) > 0) { $rowa = mysqli_fetch_row($sqla); $narocnikID = $rowa[0]; } else { $g = base64_encode((hash('SHA256', '' .$pass_salt))); - $sqln = sisplet_query("INSERT INTO $user_db.users (email, name, when_reg, camefrom, pass) VALUES ('$mail', '$mail', NOW(), '2', '$g')"); + $sqln = sisplet_query("INSERT INTO users (email, name, when_reg, camefrom, pass) VALUES ('$mail', '$mail', NOW(), '2', '$g')"); $narocnikID = mysqli_insert_id($GLOBALS['connect_db']); } @@ -351,10 +350,9 @@ class Forum { global $global_user_id; global $admin_type; global $lang; - global $user_db; if (isset ($_GET['em'])) { // email iz alerta - $result = sisplet_query ("SELECT id FROM $user_db.users WHERE email='" .$_GET['em'] ."'"); + $result = sisplet_query ("SELECT id FROM users WHERE email='" .$_GET['em'] ."'"); $r = mysqli_fetch_row ($result); return $r[0]; } @@ -368,10 +366,9 @@ class Forum { global $lang; global $site_url; global $skin_name; - global $user_db; if ($uid > 0) { - $sql = sisplet_query("SELECT email, name, show_email FROM $user_db.users WHERE id='$uid'"); + $sql = sisplet_query("SELECT email, name, show_email FROM users WHERE id='$uid'"); $row = mysqli_fetch_row($sql); $return = ''; diff --git a/admin/survey/public.php b/admin/survey/public.php index 6ed09307b..13b069049 100644 --- a/admin/survey/public.php +++ b/admin/survey/public.php @@ -19,7 +19,6 @@ global $global_user_id; global $mysql_database_name; global $pass_salt; global $is_meta; -global $user_db; global $cookie_domain; global $lang; global $site_url; diff --git a/frontend/api/class.ApiLogin.php b/frontend/api/class.ApiLogin.php index 84a018daa..5d65302a0 100644 --- a/frontend/api/class.ApiLogin.php +++ b/frontend/api/class.ApiLogin.php @@ -1596,7 +1596,6 @@ class ApiLogin global $site_path; global $lang; global $global_user_id; - global $user_db; global $cookie_domain; global $app_settings; @@ -1606,7 +1605,7 @@ class ApiLogin $email = strtolower($_GET['email']); if (is_numeric($email)) { - $result = sisplet_query("SELECT email FROM $user_db.users WHERE id='$email'"); + $result = sisplet_query("SELECT email FROM users WHERE id='$email'"); $r = mysqli_fetch_row($result); $email = $r[0]; @@ -1617,7 +1616,7 @@ class ApiLogin list ($ByeEmail) = mysqli_fetch_row($result); $result = sisplet_query("SELECT value FROM misc WHERE what='ByeEmailSubject'"); list ($ByeEmailSubject) = mysqli_fetch_row($result); - $result = sisplet_query("SELECT name FROM $user_db.users WHERE email='$email'"); + $result = sisplet_query("SELECT name FROM users WHERE email='$email'"); list ($ime) = mysqli_fetch_row($result); $PageName = $app_settings['app_name']; @@ -1640,7 +1639,7 @@ class ApiLogin } - $result = sisplet_query("UPDATE $user_db.users SET email=CONCAT('UNSU8MD-', UNIX_TIMESTAMP(), email) WHERE email='$email'"); + $result = sisplet_query("UPDATE users SET email=CONCAT('UNSU8MD-', UNIX_TIMESTAMP(), email) WHERE email='$email'"); setcookie('uid', '', time() - 3600, '/', $cookie_domain); setcookie('secret', '', time() - 3600, '/', $cookie_domain); @@ -1836,7 +1835,6 @@ class ApiLogin global $lang; global $site_url; global $pass_salt; - global $user_db; global $cookie_domain; $ajaxKlic = (!empty($_POST['ajax']) ? true : false); diff --git a/function.php b/function.php index 25678e239..31cd6880c 100644 --- a/function.php +++ b/function.php @@ -224,7 +224,7 @@ if (!isset ($lang)) { $admin_type = login(); if ($admin_type > -1) { - $result = sisplet_query("SELECT id FROM $user_db.users WHERE email='" . base64_decode($_COOKIE['uid']) . "'"); + $result = sisplet_query("SELECT id FROM users WHERE email='" . base64_decode($_COOKIE['uid']) . "'"); if (mysqli_num_rows($result) > 0) { $r = mysqli_fetch_row($result); @@ -349,7 +349,6 @@ function login() global $mysql_database_name; global $pass_salt; global $is_meta; - global $user_db; global $cookie_domain; $is_meta = 0; @@ -373,7 +372,7 @@ function login() mysqli_select_db($GLOBALS['connect_db'], $mysql_database_name); $meta = 0; - $result = sisplet_query("SELECT pass, id, type FROM $user_db.users WHERE email='$user_email'"); + $result = sisplet_query("SELECT pass, id, type FROM users WHERE email='$user_email'"); if (!$result || mysqli_num_rows($result) == 0) { // najprej poradiraij cookije! setcookie('uid', "", time() - 3600, $cookie_domain); @@ -420,7 +419,7 @@ function login() mysqli_select_db($GLOBALS['connect_db'], $mysql_database_name); - $result = sisplet_query("SELECT pass, id, type FROM $user_db.users WHERE email='$user_email'"); + $result = sisplet_query("SELECT pass, id, type FROM users WHERE email='$user_email'"); if (mysqli_num_rows($result) > 0) { $r = mysqli_fetch_row($result); $global_user_id = $r[1]; @@ -432,7 +431,7 @@ function login() // Obstaja tudi primer ko je IN meta IN navaden- in se je pac prijavil kot navaden user - $result = sisplet_query("SELECT pass, id, type FROM $user_db.users WHERE email='$user_email'"); + $result = sisplet_query("SELECT pass, id, type FROM users WHERE email='$user_email'"); if (!$result || mysqli_num_rows($result) == 0) { return -1; } else { @@ -795,9 +794,6 @@ function browser_info($agent = null) function GenerateRandomCode($len = 3) { - - global $user_db; - $RandomId = md5(uniqid(time())); $confirm_chars = array('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'Z', '1', '2', '3', '4', '5', '6', '7', '8', '9'); list($usec, $sec) = explode(' ', microtime()); @@ -820,8 +816,8 @@ function GenerateRandomCode($len = 3) $hostname = $_SERVER["REMOTE_ADDR"]; } - $result = sisplet_query("DELETE FROM $user_db.registers WHERE lasttime<$casb"); - $result = sisplet_query("INSERT INTO $user_db.registers (ip, lasttime, handle, code) VALUES ('$hostname', '$cas', '$RandomId', '$code')"); + $result = sisplet_query("DELETE FROM registers WHERE lasttime<$casb"); + $result = sisplet_query("INSERT INTO registers (ip, lasttime, handle, code) VALUES ('$hostname', '$cas', '$RandomId', '$code')"); return $RandomId; diff --git a/function/ProfileClass.php b/function/ProfileClass.php index e42b43ef7..71732b151 100644 --- a/function/ProfileClass.php +++ b/function/ProfileClass.php @@ -21,10 +21,8 @@ class Profile { global $mysql_server; global $mysql_database_name; - global $user_db; global $cookie_domain; - // AAI prijava na vrh. if ($admin_type==-1 && isset ($_SERVER['Shib-Session-Index']) && isset ($_SERVER['eduPersonPrincipalName']) && isset ($_SERVER['mail']) && isset ($_SERVER['givenName']) && isset ($_SERVER['sn']) && $_SERVER['mail']!='') { // se prijavljam preko eduroam! @@ -36,7 +34,7 @@ class Profile { $this->ZePrijavljen = true; $this->LoggingIn = false; - $sql = sisplet_query ("SELECT name, surname, lang FROM $user_db.users WHERE email='" .base64_decode ($_COOKIE['uid']) ."'"); + $sql = sisplet_query ("SELECT name, surname, lang FROM users WHERE email='" .base64_decode ($_COOKIE['uid']) ."'"); if ($r = mysqli_fetch_row ($sql)) { $this->ime = $r[0]; $this->priimek = $r[1]; @@ -75,7 +73,6 @@ class Profile { function eduroamAnotherServerLogin() { global $pass_salt; - global $user_db; global $cookie_domain; global $originating_domain; global $keep_domain; @@ -111,12 +108,12 @@ class Profile { $pass = base64_encode((hash('SHA256', "e5zhbWRTEGW&u375ejsznrtztjhdtz%WZ&" .$pass_salt))); // Preverimo ce obstaja user v bazi - $result = sisplet_query ("SELECT pass, id FROM $user_db.users WHERE email='" .$mail ."'"); + $result = sisplet_query ("SELECT pass, id FROM users WHERE email='" .$mail ."'"); if (mysqli_num_rows ($result) == 0) { // dodaj ga v bazo $pass = base64_encode(hash('SHA256', "e5zhbWRTEGW&u375ejsznrtztjhdtz%WZ&" .$pass_salt)); - sisplet_query ("INSERT INTO $user_db.users (email, name, surname, type, pass, eduroam, when_reg) VALUES ('$mail', '$ime', '$priimek', '3', '" .$pass ."', '1', NOW())"); + sisplet_query ("INSERT INTO users (email, name, surname, type, pass, eduroam, when_reg) VALUES ('$mail', '$ime', '$priimek', '3', '" .$pass ."', '1', NOW())"); // Pridobimo id dodanega userja $user_id = mysqli_insert_id($GLOBALS['connect_db']); @@ -134,7 +131,7 @@ class Profile { $LifeTime = $row[0]; // Zlogiramo login - sisplet_query ("UPDATE $user_db.users SET last_login=NOW() WHERE id='".$user_id."'"); + sisplet_query ("UPDATE users SET last_login=NOW() WHERE id='".$user_id."'"); // določi še, od kje se je prijavil $hostname=""; @@ -145,7 +142,7 @@ class Profile { $hostname=$_SERVER["REMOTE_ADDR"]; } - sisplet_query ("INSERT INTO $user_db.user_login_tracker (uid, IP, kdaj) VALUES ('".$user_id."', '" .$hostname ."', NOW())"); + sisplet_query ("INSERT INTO user_login_tracker (uid, IP, kdaj) VALUES ('".$user_id."', '" .$hostname ."', NOW())"); setcookie ("uid", base64_encode($mail), time()+$LifeTime, '/', $cookie_domain); setcookie ("secret", $pass, time()+$LifeTime, '/', $cookie_domain); @@ -171,7 +168,6 @@ class Profile { function eduroamLogin() { global $pass_salt; - global $user_db; global $cookie_domain; global $originating_domain; global $keep_domain; @@ -181,11 +177,11 @@ class Profile { $priimek = $_SERVER['sn']; $pass = base64_encode((hash('SHA256', "e5zhbWRTEGW&u375ejsznrtztjhdtz%WZ&" .$pass_salt))); - $result = sisplet_query ("SELECT pass, id FROM $user_db.users WHERE email='" .$mail ."'"); + $result = sisplet_query ("SELECT pass, id FROM users WHERE email='" .$mail ."'"); if (mysqli_num_rows ($result) == 0) { // dodaj ga v bazo $pass = base64_encode((hash('SHA256', "e5zhbWRTEGW&u375ejsznrtztjhdtz%WZ&" .$pass_salt))); - sisplet_query ("INSERT INTO $user_db.users (email, name, surname, type, pass, eduroam) VALUES ('$mail', '$ime', '$priimek', '3', '" .$pass ."', '1')"); + sisplet_query ("INSERT INTO users (email, name, surname, type, pass, eduroam) VALUES ('$mail', '$ime', '$priimek', '3', '" .$pass ."', '1')"); // Pridobimo id dodanega userja $user_id = mysqli_insert_id($GLOBALS['connect_db']); @@ -202,7 +198,7 @@ class Profile { $row = mysqli_fetch_row ($result); $LifeTime = $row[0]; - sisplet_query ("UPDATE $user_db.users SET last_login=NOW() WHERE id='" .$user_id ."'"); + sisplet_query ("UPDATE users SET last_login=NOW() WHERE id='" .$user_id ."'"); // določi še, od kje se je prijavil $hostname=""; @@ -213,7 +209,7 @@ class Profile { $hostname=$_SERVER["REMOTE_ADDR"]; } - sisplet_query ("INSERT INTO $user_db.user_login_tracker (uid, IP, kdaj) VALUES ('" .$user_id ."', '" .$hostname ."', NOW())"); + sisplet_query ("INSERT INTO user_login_tracker (uid, IP, kdaj) VALUES ('" .$user_id ."', '" .$hostname ."', NOW())"); setcookie ("uid", base64_encode($mail), time()+$LifeTime, '/', $cookie_domain); setcookie ("secret", $pass, time()+$LifeTime, '/', $cookie_domain); @@ -247,7 +243,6 @@ class Profile { global $google_login_client_secret; global $site_url; global $lang; - global $user_db; global $proxy; $oauth2_code = $_GET['code']; @@ -316,7 +311,7 @@ class Profile { if ($user_email != '' && $user_id != '') { $this->email = $user_email; - $res = sisplet_query ("SELECT pass FROM $user_db.users WHERE email='" .$user_email ."'"); + $res = sisplet_query ("SELECT pass FROM users WHERE email='" .$user_email ."'"); // Je noter, ga samo prijavim... if (mysqli_num_rows ($res) > 0) { @@ -334,13 +329,13 @@ class Profile { $this->email = $user_email; $fn = explode ("@", $user_email); - sisplet_query ("INSERT INTO $user_db.users + sisplet_query ("INSERT INTO users (name, surname, email, pass, lang, when_reg) VALUES ('".$fn[0]."', '', '".$user_email."', '".$this->EncPass."', '".(isset ($_GET['regFromEnglish']) && $_GET['regFromEnglish']=="1"?'2':'1')."', NOW())"); $uid = mysqli_insert_id($GLOBALS['connect_db']); - sisplet_query ("INSERT INTO $user_db.oid_users (uid) VALUES ('$uid')"); + sisplet_query ("INSERT INTO oid_users (uid) VALUES ('$uid')"); // prijavi $this->Login(); @@ -356,7 +351,6 @@ class Profile { global $pass_salt; global $cookie_domain; - global $user_db; global $originating_domain; global $keep_domain; @@ -380,7 +374,7 @@ class Profile { $LifeTime = $LifeTime; } - $sql = sisplet_query("SELECT type, pass, status, id, name, surname, email FROM $user_db.users WHERE email='" .$this->email ."'"); + $sql = sisplet_query("SELECT type, pass, status, id, name, surname, email FROM users WHERE email='" .$this->email ."'"); if (mysqli_num_rows($sql) > 0) { $r = mysqli_fetch_row ($sql); @@ -395,7 +389,7 @@ class Profile { if (base64_encode((hash('SHA256', $this->pass .$pass_salt))) == $r[1] || $this->EncPass == $r[1]) { - sisplet_query ("UPDATE $user_db.users SET last_login=NOW() WHERE id='" .$r[3] ."'"); + sisplet_query ("UPDATE users SET last_login=NOW() WHERE id='" .$r[3] ."'"); // določi še, od kje se je prijavil @@ -408,7 +402,7 @@ class Profile { $hostname=$_SERVER["REMOTE_ADDR"]; } - sisplet_query ("INSERT INTO $user_db.user_login_tracker (uid, IP, kdaj) VALUES ('" .$r[3] ."', '" .$hostname ."', NOW())"); + sisplet_query ("INSERT INTO user_login_tracker (uid, IP, kdaj) VALUES ('" .$r[3] ."', '" .$hostname ."', NOW())"); setcookie ("uid", base64_encode($this->email), time()+$LifeTime, '/', $cookie_domain); @@ -521,7 +515,6 @@ class Profile { function FBLogin() { global $facebook_appid; global $facebook_appsecret; - global $user_db; global $cookie_path; if ($r = file_get_contents ("https://graph.facebook.com/v2.9/oauth/access_token?client_id=" .$facebook_appid ."&redirect_uri=https://www.1ka.si/fb_login.php&client_secret=" .$facebook_appsecret ."&code=" .$_GET['code'])) { @@ -538,9 +531,9 @@ class Profile { // preveri email, ce ga imas v bazi: if (isset ($user->email) && $user->email!='') { - $result = sisplet_query ("select u.name, u.surname, f.id, u.id, u.pass FROM $user_db.users u, $user_db.fb_users f WHERE u.id=f.uid AND u.email='" .str_replace ("'", '', $user->email) ."'"); + $result = sisplet_query ("select u.name, u.surname, f.id, u.id, u.pass FROM users u, fb_users f WHERE u.id=f.uid AND u.email='" .str_replace ("'", '', $user->email) ."'"); if (mysqli_num_rows ($result)==0) { - $result2 = sisplet_query ("select u.id FROM $user_db.users u LEFT JOIN $user_db.fb_users f on (u.id=f.uid) where u.email='" .str_replace ("'", '', $old_email) ."'"); + $result2 = sisplet_query ("select u.id FROM users u LEFT JOIN fb_users f on (u.id=f.uid) where u.email='" .str_replace ("'", '', $old_email) ."'"); if (mysqli_num_rows ($result2)>0) { $r2 = mysqli_fetch_row ($result2); @@ -562,7 +555,7 @@ class Profile { } } - $result = sisplet_query ("select u.name, u.surname, IF(ISNULL(f.id),'0',f.id), u.id, u.pass FROM $user_db.users u LEFT JOIN $user_db.fb_users f on (u.id=f.uid) where u.email='" .str_replace ("'", '', $user->email) ."'"); + $result = sisplet_query ("select u.name, u.surname, IF(ISNULL(f.id),'0',f.id), u.id, u.pass FROM users u LEFT JOIN fb_users f on (u.id=f.uid) where u.email='" .str_replace ("'", '', $user->email) ."'"); // je noter, preveri ce je v FB (podatki, podatki!) @@ -594,7 +587,7 @@ class Profile { if (isset ($user->timezone)) $tz = $user->timezone; else $tz = ''; - sisplet_query ("INSERT INTO $user_db.fb_users (uid, first_name, last_name, gender, timezone, profile_link) VALUES ('" .$r[3] ."', '" .$fn ."', '" .$ln ."', '" .$gn ."', '" .$tz ."', '" .$pl ."')"); + sisplet_query ("INSERT INTO fb_users (uid, first_name, last_name, gender, timezone, profile_link) VALUES ('" .$r[3] ."', '" .$fn ."', '" .$ln ."', '" .$gn ."', '" .$tz ."', '" .$pl ."')"); // Prijaviga :) $this->EncPass = $r[4]; @@ -627,12 +620,12 @@ class Profile { $this->EncPass = base64_encode((hash('SHA256', $this->pass .$pass_salt))); $this->email = str_replace (array(" ","č","ć","Č","Ć","ž","Ž","š","Š","đ","Đ"), array(".","c","c","C","C","z","Z","s","S","d","D"), $user->email); - //sisplet_query ("INSERT INTO $user_db.users (name, surname, email, pass, when_reg) VALUES ('" .iconv('utf-8', 'iso-8859-2//TRANSLIT', $fn) ."', '" .iconv('utf-8', 'iso-8859-2//TRANSLIT',$ln) ."', '" .iconv('utf-8', 'iso-8859-2//TRANSLIT',$this->email) ."', '" .$this->EncPass ."', NOW())"); - sisplet_query ("INSERT INTO $user_db.users (name, surname, email, pass, when_reg) VALUES ('" . $fn ."', '" . $ln ."', '" .iconv('utf-8', 'iso-8859-2//TRANSLIT',$this->email) ."', '" .$this->EncPass ."', NOW())"); + //sisplet_query ("INSERT INTO users (name, surname, email, pass, when_reg) VALUES ('" .iconv('utf-8', 'iso-8859-2//TRANSLIT', $fn) ."', '" .iconv('utf-8', 'iso-8859-2//TRANSLIT',$ln) ."', '" .iconv('utf-8', 'iso-8859-2//TRANSLIT',$this->email) ."', '" .$this->EncPass ."', NOW())"); + sisplet_query ("INSERT INTO users (name, surname, email, pass, when_reg) VALUES ('" . $fn ."', '" . $ln ."', '" .iconv('utf-8', 'iso-8859-2//TRANSLIT',$this->email) ."', '" .$this->EncPass ."', NOW())"); $uid = mysqli_insert_id($GLOBALS['connect_db']); - //sisplet_query ("INSERT INTO $user_db.fb_users (uid, first_name, last_name, gender, timezone, profile_link) VALUES ('" .$uid ."', '" .iconv('utf-8', 'iso-8859-2//TRANSLIT',$fn) ."', '" .iconv('utf-8', 'iso-8859-2//TRANSLIT',$ln) ."', '" .$gn ."', '" .$tz ."', '" .$pl ."')"); - sisplet_query ("INSERT INTO $user_db.fb_users (uid, first_name, last_name, gender, timezone, profile_link) VALUES ('" .$uid ."', '" . $fn ."', '" . $ln ."', '" .$gn ."', '" .$tz ."', '" .$pl ."')"); + //sisplet_query ("INSERT INTO fb_users (uid, first_name, last_name, gender, timezone, profile_link) VALUES ('" .$uid ."', '" .iconv('utf-8', 'iso-8859-2//TRANSLIT',$fn) ."', '" .iconv('utf-8', 'iso-8859-2//TRANSLIT',$ln) ."', '" .$gn ."', '" .$tz ."', '" .$pl ."')"); + sisplet_query ("INSERT INTO fb_users (uid, first_name, last_name, gender, timezone, profile_link) VALUES ('" .$uid ."', '" . $fn ."', '" . $ln ."', '" .$gn ."', '" .$tz ."', '" .$pl ."')"); // prijavi $this->Login();