';
- # polovimo sezname
- $lists = array();
- $sql_string = "SELECT pid, name,comment FROM srv_invitations_recipients_profiles WHERE uid in('".$global_user_id."')";
- $sql_query = sisplet_query($sql_string);
- while ($sql_row = mysqli_fetch_assoc($sql_query)) {
- $lists[$sql_row['pid']] = $sql_row['name'];
- }
-
- $lists['-1'] = $lang['srv_invitation_new_templist'];
- $lists['0'] = $lang['srv_invitation_new_templist_author'];
-
-
- $data = explode('_',$_POST['arch_to_view']);
- $_success = (int)$data[2];
- $_arch_id = $data[3];
- $sql_string = "SELECT * FROM srv_invitations_archive WHERE id = '$_arch_id'";
- $sql_query = sisplet_query($sql_string);
- $sql_a_row = mysqli_fetch_assoc($sql_query);
-
- $sql_string = "SELECT email,firstname,lastname, password,salutation,phone,custom,relation,sent,responded,unsubscribed,deleted,last_status,list_id FROM srv_invitations_archive_recipients AS siar LEFT JOIN srv_invitations_recipients AS sir on siar.rec_id = sir.id WHERE arch_id = '$_arch_id' AND success = '$_success'";
- $sql_query = sisplet_query($sql_string);
-
-
- echo '
'; // id="arc_content"
- echo '
';
- echo '
';
- echo '
';
- echo '
';
- echo '
';
-
- echo '
';
+ return;
}
function editArchiveComment() {
@@ -7082,8 +6987,7 @@ class SurveyInvitationsNew {
echo '';
}
}
- // Nov način z trackingom
- elseif($this->newTracking == true) {
+ else{
$userAccess = UserAccess::getInstance($global_user_id);
@@ -7094,334 +6998,10 @@ class SurveyInvitationsNew {
echo '';
}
}
- # star način brez trackinga
- else {
- echo '
';
- $this->displayInvitationStatusOld();
- echo ' | ';
- }
echo '';
}
- function displayInvitationStatusOld() {
- global $lang, $admin_type, $global_user_id, $site_url, $site_path;
-
- $isEmail = (int)SurveyInfo::getInstance()->checkSurveyModule('email');
-
- # polovimo lurkerje
- echo '
';
-
- #pošiljanje po enotah
- $cnt_by_sendings = array();
- $all_units_count = 0;
- # najprej koliko enotam še ni bilo poslano
- $sel = "select count(*) FROM srv_invitations_recipients WHERE ank_id='$this->sid' AND sent = '0'";
- $query = sisplet_query($sel);
- list($count) = mysqli_fetch_row($query);
- if ($count > 0) {
- $cnt_by_sendings[0] = (int)$count;
- }
- $all_units_count = (int)$count;
- $sel1 = "select count(*) as cnt, rec_id FROM srv_invitations_archive_recipients WHERE arch_id in (select id from srv_invitations_archive where ank_id = '".$this->sid."') AND success !='0' group by rec_id ORDER BY cnt ASC;";
- $query1 = sisplet_query($sel1);
-
- while (list($count, $rec_id) = mysqli_fetch_row($query1)) {
- $cnt_by_sendings[(int)$count] ++;
- $all_units_count++;
- }
- if (count($cnt_by_sendings) > 0) {
- echo '
';
- }
- }
-
// Prikaz statusov posiljanj
private function displayInvitationStatusNew() {
global $lang, $admin_type, $global_user_id, $site_url, $site_path, $app_settings;
@@ -8035,14 +7615,6 @@ class SurveyInvitationsNew {
$row = $this->surveySettings;
$_email = (int)SurveyInfo::getInstance()->checkSurveyModule('email');
- $sqlu = sisplet_query("SELECT email FROM users WHERE id='".$global_user_id."'");
- $rowu = mysqli_fetch_array($sqlu);
- if ($rowu['email'] == '') {
- $sqlm = sisplet_query("SELECT * FROM misc WHERE what = 'AlertFrom'");
- $rowm = mysqli_fetch_array($sqlm);
- $rowu['email'] = $rowm['value'];
- }
-
$userAccess = UserAccess::getInstance($global_user_id);
$noEmailing = SurveySession::get('inv_noEmailing');
diff --git a/frontend/api/class.ApiLogin.php b/frontend/api/class.ApiLogin.php
index e9b1a4ddc..3dfe301ce 100644
--- a/frontend/api/class.ApiLogin.php
+++ b/frontend/api/class.ApiLogin.php
@@ -1635,10 +1635,10 @@ class ApiLogin
}
}
- $result = sisplet_query("SELECT value FROM misc WHERE what='ByeEmail'");
- list ($ByeEmail) = mysqli_fetch_row($result);
- $result = sisplet_query("SELECT value FROM misc WHERE what='ByeEmailSubject'");
- list ($ByeEmailSubject) = mysqli_fetch_row($result);
+
+ $ByeEmail = '
Spoštovani,
Uspešno ste se odjavili iz spletnega mesta www.1ka.si.
Veseli nas, da ste preizkusili orodje 1ka.
SFPAGENAME ekipa
';
+ $ByeEmailSubject = 'Uspešna odjava';
+
$result = sisplet_query("SELECT name FROM users WHERE email='$email'");
list ($ime) = mysqli_fetch_row($result);
diff --git a/function/ProfileClass.php b/function/ProfileClass.php
index 1c00562d2..34f2614d6 100644
--- a/function/ProfileClass.php
+++ b/function/ProfileClass.php
@@ -151,16 +151,9 @@ class Profile {
$this->ZePrijavljen = true;
- // Preveri ce moramo po registraciji vrec na kak URL
- $rt = sisplet_query ("SELECT value FROM misc WHERE what='AfterReg'");
- $rxx = mysqli_fetch_row ($rt);
-
- if (strlen ($rxx[0]) > 3){
- $rxx[0] = str_replace ($originating_domain, $keep_domain, $rxx[0]);
- header ('location: ' .$rxx[0] .'?&l=1');
- }
- else
- header ('location: /index.php');
+ // Moramo po registraciji vrec na kak URL
+ $rxx = str_replace ($originating_domain, $keep_domain, '/admin/survey/');
+ header ('location: '.$rxx.'?&l=1');
}
else
header ('location: /index.php');
@@ -223,16 +216,9 @@ class Profile {
$this->ZePrijavljen = true;
- // Preveri ce moramo po registraciji vrec na kak URL
- $rt = sisplet_query ("SELECT value FROM misc WHERE what='AfterReg'");
- $rxx = mysqli_fetch_row ($rt);
-
- if (strlen ($rxx[0]) > 3){
- $rxx[0] = str_replace ($originating_domain, $keep_domain, $rxx[0]);
- header ('location: ' .$rxx[0] .'?&l=1');
- }
- else
- header ('location: /index.php');
+ // Moramo po registraciji vrec na kak URL
+ $rxx = str_replace ($originating_domain, $keep_domain, '/admin/survey/');
+ header ('location: '.$rxx.'?&l=1');
}
function GoogleLogin () {
@@ -392,17 +378,17 @@ class Profile {
sisplet_query ("UPDATE users SET last_login=NOW() WHERE id='" .$r[3] ."'");
- // določi še, od kje se je prijavil
+ // določi še, od kje se je prijavil
- $hostname="";
- $headers = apache_request_headers();
- if (array_key_exists('X-Forwarded-For', $headers)){
- $hostname=$headers['X-Forwarded-For'];
- } else {
- $hostname=$_SERVER["REMOTE_ADDR"];
- }
+ $hostname="";
+ $headers = apache_request_headers();
+ if (array_key_exists('X-Forwarded-For', $headers)){
+ $hostname=$headers['X-Forwarded-For'];
+ } else {
+ $hostname=$_SERVER["REMOTE_ADDR"];
+ }
- sisplet_query ("INSERT INTO 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);
@@ -419,22 +405,9 @@ class Profile {
header ('location: ' .$site_url .str_replace (base64_decode($_POST['l']), $site_url, ""));
}
-
- // Preveri ce moramo po registraciji vrec na kak URL
- $rt = sisplet_query ("SELECT value FROM misc WHERE what='AfterReg'");
- $rxx = mysqli_fetch_row ($rt);
-
- if (strlen ($rxx[0]) > 3) {
- $rxx[0] = str_replace ($originating_domain, $keep_domain, $rxx[0]);
- header ('location: ' .$rxx[0] .'?&l=1');
- }
- else {
-
- if (!isset ($_GET['l']))
- header('Location: ' .$site_url .'?l=1');
- else
- header('Location: ' .base64_decode($_GET['l']) .'?&l=1');
- }
+ // Moramo po registraciji vrec na kak URL
+ $rxx = str_replace ($originating_domain, $keep_domain, '/admin/survey/');
+ header ('location: '.$rxx.'?&l=1');
}
else{
// Password prompt