From 58d9bc83b173761abb2d15ff6d0e0cb2b06afc2e Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Mon, 20 Sep 2021 16:18:54 +0200
Subject: [PATCH] Ciscenje stare kode

---
 admin/survey/SurveyAdmin.php                  | 28 ---------------
 admin/survey/classes/class.Forum.php          | 18 +---------
 admin/survey/classes/class.SurveyCopy.php     |  1 -
 .../class.SurveyAnalysisArchive.php           |  4 ---
 function/ProfileClass.php                     | 34 +++++++------------
 .../survey/app/Controllers/BodyController.php |  4 +--
 6 files changed, 14 insertions(+), 75 deletions(-)

diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index ceb802a5e..49ab4b59f 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -6908,34 +6908,6 @@ class SurveyAdmin
 
             echo '</span>';
         }
-
-
-        # Objava na FB, twitter, .... share pac
-        if ($row['active'] == 1 && false) {
-            # NE PRIKAZUJEMO IKONIC
-            $sqlu = sisplet_query("SELECT email FROM users WHERE id='" . $this->uid() . "'");
-            $rowu = mysqli_fetch_array($sqlu);
-            if ($rowu['email'] == '') {
-                $sqlm = sisplet_query("SELECT value FROM misc WHERE what = 'AlertFrom'");
-                $rowm = mysqli_fetch_array($sqlm);
-                $rowu['email'] = $rowm['value'];
-            }
-            ?><span style="display: inline-block; margin-left:25px;">
-            <span class="anketa_img_icons" style="margin-top: 3px;">
-			<a href="mailto:<?= $rowu['email'] ?>?body=<?= urlencode(SurveyInfo::getSurveyLink()) ?>?subject=<?= $row['naslov'] ?>"
-               target="_blank" title="<?= $lang['srv_add_to_mail'] ?>"><span class="sprites email"></span></a>
-			</span>
-			<span class="anketa_img_icons">
-			<a href="http://www.facebook.com/share.php?u=<?= urlencode(SurveyInfo::getSurveyLink()) ?>" target="_blank"
-               title="<?= $lang['srv_add_to_fb'] ?>"><span class="sprites facebook"></span></a>
-			</span>
-			<span class="anketa_img_icons">
-			<a href="http://twitter.com/share?url=<?= urlencode(SurveyInfo::getSurveyLink()) ?>?text=<?= $row['naslov'] ?>"
-               target="_blank" title="<?= $lang['srv_add_to_tw'] ?>"><span class="sprites twitter"></span></a>
-			</span>
-            </span>
-            <?php
-        }
     }
 
     function surveyAutoActivate()
diff --git a/admin/survey/classes/class.Forum.php b/admin/survey/classes/class.Forum.php
index 1ef68df6d..44ffc2cc1 100644
--- a/admin/survey/classes/class.Forum.php
+++ b/admin/survey/classes/class.Forum.php
@@ -403,27 +403,11 @@ class Forum {
 		return $out;
 	}	
 	
-	// Polepsa izpis datuma in ure
-	function datetime($time) {
-		global $admin_type;
-		
-		$sql = sisplet_query("SELECT value FROM misc WHERE what='ForumHourDisplay'");
-		$row = mysqli_fetch_row($sql);
-
-		// Funkcija se klice zelooooo pogosto, zato sem vrgel ven substr in sestavljam rocno, je hitreje.
-		if ($row[0] == 0 || $admin_type==0)
-			return $time[8] .$time[9] ."." .$time[5] .$time[6] ."." .$time[0] .$time[1] .$time[2] .$time[3] ." " .$time[11] .$time[12] .":" .$time[14] .$time[15];
-		else 
-			return $time[8] .$time[9] ."." .$time[5] .$time[6] ."." .$time[0] .$time[1] .$time[2] .$time[3];
-	}
-	
 	// Polepsa izpis datuma in ure
 	function datetime1($time) {
 		global $admin_type;
 		
-		$sql = sisplet_query("SELECT value FROM misc WHERE what='ForumHourDisplay'");
-		$row = mysqli_fetch_row($sql);
-		if ($row[0] == 0 || $admin_type==0)
+		if ($admin_type==0)
 			return $time[8] .$time[9] ."." .$time[5] .$time[6]  ." " .$time[11] .$time[12] .":" .$time[14] .$time[15];
 		else
 			return $time[8] .$time[9] ."." .$time[5] .$time[6];
diff --git a/admin/survey/classes/class.SurveyCopy.php b/admin/survey/classes/class.SurveyCopy.php
index c915f3c29..d894d5948 100644
--- a/admin/survey/classes/class.SurveyCopy.php
+++ b/admin/survey/classes/class.SurveyCopy.php
@@ -723,7 +723,6 @@ class SurveyCopy {
 
 					foreach ($srv_if AS $row) {
 						// IF-i, tabela srv_if
-						//$qry_src_if = sisplet_query("SELECT * FROM srv_if WHERE id = '".$row[id]."'", self :: $src_connect_db);
 						$qry_src_if = self::arrayfilter($arr_src['srv_if'], 'id', $row['id']);
 						$pre_set = array('id' => "NULL");
 						$tmp_if_ids = self :: preformCopyTable('srv_if', 'id', $qry_src_if, $pre_set);
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
index eddcb3dea..04dcbd809 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
@@ -811,10 +811,6 @@ class SurveyAnalysisArchive {
 	static function ViewArchive($aid) {
 		global $site_path, $global_user_id, $lang, $site_url;
 
-		#izpišemo osnovni html
-		$sql = sisplet_query("SELECT * FROM misc WHERE what='name'");
-		$row = mysqli_fetch_array($sql);
-
 		// nastavimo jezik
 		if (self::$sid > 0) {
 			$sql = sisplet_query("SELECT lang_admin FROM srv_anketa WHERE id = '".self::$sid."'");
diff --git a/function/ProfileClass.php b/function/ProfileClass.php
index 71732b151..55ae16364 100644
--- a/function/ProfileClass.php
+++ b/function/ProfileClass.php
@@ -409,15 +409,13 @@ class Profile {
                 setcookie("unam", base64_encode($r[4].' '.$r[5]),time() + $LifeTime, '/', $cookie_domain);
 				setcookie ("secret", $r[1], time()+$LifeTime, '/', $cookie_domain);
 
-				if ($r[2] == "2" || $r[2] == "6") 
-				{
+				if ($r[2] == "2" || $r[2] == "6"){
 					setcookie ("P", time(), time()+$LifeTime, '/', $cookie_domain);
 				}
 
 				$this->ZePrijavljen = true;
 
-                                if (isset ($_POST['l']) && $_POST['l']!='')
-				{
+                if (isset ($_POST['l']) && $_POST['l']!=''){
 					header ('location: ' .$site_url .str_replace (base64_decode($_POST['l']), $site_url, ""));
 				}
 
@@ -426,33 +424,25 @@ class Profile {
 				$rt = sisplet_query ("SELECT value FROM misc WHERE what='AfterReg'");
 				$rxx = mysqli_fetch_row ($rt);
 
-				if (strlen ($rxx[0]) > 3)
-				{
+				if (strlen ($rxx[0]) > 3) {
 					$rxx[0] = str_replace ($originating_domain, $keep_domain, $rxx[0]);
 					header ('location: ' .$rxx[0] .'?&l=1');
-				} else {
-					$CheckCasovnice = sisplet_query ("SELECT * FROM misc WHERE what='TimeTables' AND value='1'");
-					if (mysqli_num_rows ($CheckCasovnice) != 0)
-					{
-						if (!isset ($_GET['l']))	header('Location: ' .$site_url .'index.php?fl=13');
-						else				header('Location: ' .base64_decode($_GET['l']) .'&l=1');
-					}
-					else
-					{
-						if (!isset ($_GET['l']))	header('Location: ' .$site_url .'?l=1');
-						else				header('Location: ' .base64_decode($_GET['l']) .'?&l=1');
-					}
+				} 
+                else {
+
+					if (!isset ($_GET['l']))	
+                        header('Location: ' .$site_url .'?l=1');
+					else				
+                        header('Location: ' .base64_decode($_GET['l']) .'?&l=1');
 				}
 			}
-			else
-			{
+			else{
 				// Password prompt
 				header ('location: ' .$site_url .'index.php?fl=8&lact=20&em=' .$this->email .(isset ($_GET['l'])?'&l=' .$_GET['l']:''));
 				die();
 			}
 		}
-		else
-		{
+		else{
 			// Ni kul mail
 			header ('location: ' .$site_url .'index.php?fl=8&lact=10&em=' .$this->email .(isset ($_GET['l'])?'&l=' .$_GET['l']:''));
 			die();
diff --git a/main/survey/app/Controllers/BodyController.php b/main/survey/app/Controllers/BodyController.php
index 67c223fa8..5a53ab888 100644
--- a/main/survey/app/Controllers/BodyController.php
+++ b/main/survey/app/Controllers/BodyController.php
@@ -1101,9 +1101,7 @@ class BodyController extends Controller
 
                     if (!get('printPreview')) {
                         $srv_konec = SurveySetting::getInstance()->getSurveyMiscSetting('srvlang_srv_konec' . $_lang);
-                        /*if ($row['text'] != '')	// besedilo koncne povezave shranimo v misc setting, da bo konsistentno z ostalimi prevodi
-                            $text = $row['text'];
-                        else*/
+
                         if ($srv_konec != '')
                             $text = $srv_konec;
                         else