From 924ad8f73fc8cae4d7bc7251a73e8c72169829c5 Mon Sep 17 00:00:00 2001
From: Geo Varghese <sendtogeo@gmail.com>
Date: Sun, 29 Nov 2020 00:36:38 +0530
Subject: [PATCH] 4.8.0 all template changes

---
 .../views/adminpanel/adminleftmenu.ctp.php    |  5 +-
 themes/simple/views/log/showcrawllog.ctp.php  | 86 +++++++++----------
 .../views/settings/showsettings.ctp.php       | 48 ++++++++---
 themes/simple/views/website/new.ctp.php       |  2 +-
 4 files changed, 77 insertions(+), 64 deletions(-)

diff --git a/themes/simple/views/adminpanel/adminleftmenu.ctp.php b/themes/simple/views/adminpanel/adminleftmenu.ctp.php
index 4f78d8c0..e72ae8f1 100644
--- a/themes/simple/views/adminpanel/adminleftmenu.ctp.php
+++ b/themes/simple/views/adminpanel/adminleftmenu.ctp.php
@@ -91,8 +91,7 @@
 				<?php if (isAdmin()) {?>
     				<li><a href="javascript:void(0);" onclick="scriptDoLoad('cron.php', 'content')"><?php echo $spTextPanel['Report Generation Manager']?></a></li>
     				<li><a href="javascript:void(0);" onclick="scriptDoLoad('reports.php?sec=report_gen_logs', 'content')"><?php echo $spTextPanel['Report Generation Logs']?></a></li>
-    				<li><a href="javascript:void(0);" onclick="scriptDoLoad('cron.php?sec=croncommand', 'content')"><?php echo $spTextPanel['Cron Command']?></a></li>
-					<li><a href="javascript:void(0);" onclick="scriptDoLoad('settings.php?sec=reportsettings', 'content')"><?php echo $spTextPanel['Global Reports Settings']?></a></li>
+    				<li><a href="javascript:void(0);" onclick="scriptDoLoad('cron.php?sec=croncommand', 'content')"><?php echo $spTextPanel['Cron Command']?></a></li>					
 				<?php }?>
 			</ul>
 			<?php
@@ -177,8 +176,10 @@
 			<script type="text/javascript">scriptList[<?php echo $i?>] = 'settings.php';</script>			
 			<ul id='subui'>
 				<li><a href="javascript:void(0);" onclick="scriptDoLoad('settings.php', 'content')"><?php echo $spTextPanel['System Settings']?></a></li>
+				<li><a href="javascript:void(0);" onclick="scriptDoLoad('settings.php?sec=reportsettings', 'content')"><?php echo $spTextPanel['Global Reports Settings']?></a></li>
 				<li><a href="javascript:void(0);" onclick="scriptDoLoad('settings.php?category=moz', 'content')"><?php echo $spTextPanel['MOZ Settings']?></a></li>
 				<li><a href="javascript:void(0);" onclick="scriptDoLoad('settings.php?category=google', 'content')"><?php echo $spTextPanel['Google Settings']?></a></li>
+				<li><a href="javascript:void(0);" onclick="scriptDoLoad('settings.php?category=dataforseo', 'content')"><?php echo $spTextPanel['DataForSEO Settings']?></a></li>
 				<li><a href="javascript:void(0);" onclick="scriptDoLoad('settings.php?category=mail', 'content')"><?php echo $spTextPanel['Mail Settings']?></a></li>
 				<li><a href="javascript:void(0);" onclick="scriptDoLoad('settings.php?sec=test_email', 'content')"><?php echo $spTextPanel['Test Email Settings']?></a></li>
 			</ul>
diff --git a/themes/simple/views/log/showcrawllog.ctp.php b/themes/simple/views/log/showcrawllog.ctp.php
index c07069aa..78acf025 100644
--- a/themes/simple/views/log/showcrawllog.ctp.php
+++ b/themes/simple/views/log/showcrawllog.ctp.php
@@ -18,54 +18,54 @@
 
 }
 ?>
-<table width="100%" border="0" cellspacing="0" cellpadding="0" class="list">
+<table class="list">
 	<tr class="listHead">
-		<td class="left" width='30%'><?php echo $spTextLog['Crawl Log Details']?></td>
-		<td class="right">&nbsp;</td>
+		<td width='30%'><?php echo $spTextLog['Crawl Log Details']?></td>
+		<td>&nbsp;</td>
 	</tr>
-	<tr class="white_row">
-		<td class="td_left_col"><?php echo $spText['label']['Report Type']?>:</td>
-		<td class="td_right_col"><?php echo $logInfo['crawl_type']?></td>
+	<tr>
+		<td><?php echo $spText['label']['Report Type']?>:</td>
+		<td><?php echo $logInfo['crawl_type']?></td>
 	</tr>
-	<tr class="blue_row">
-		<td class="td_left_col"><?php echo $spText['label']['Reference']?>:</td>
-		<td class="td_right_col"><?php echo $logInfo['ref_id']?></td>
+	<tr>
+		<td><?php echo $spText['label']['Reference']?>:</td>
+		<td><?php echo $logInfo['ref_id']?></td>
 	</tr>
-	<tr class="white_row">
-		<td class="td_left_col"><?php echo $spText['label']['Subject']?>:</td>
-		<td class="td_right_col"><?php echo $logInfo['subject']?></td>
+	<tr>
+		<td><?php echo $spText['label']['Subject']?>:</td>
+		<td><?php echo $logInfo['subject']?></td>
 	</tr>
-	<tr class="blue_row">
-		<td class="td_left_col"><?php echo $spText['common']['Url']?>:</td>
-		<td class="td_right_col"><?php echo $logInfo['crawl_link']?></td>
+	<tr>
+		<td><?php echo $spText['common']['Url']?>:</td>
+		<td><?php echo $logInfo['crawl_link']?></td>
 	</tr>
-	<tr class="white_row">
-		<td class="td_left_col"><?php echo $spText['label']['Referer']?>:</td>
-		<td class="td_right_col"><?php echo $logInfo['crawl_referer']?></td>
+	<tr>
+		<td><?php echo $spText['label']['Referer']?>:</td>
+		<td><?php echo $logInfo['crawl_referer']?></td>
 	</tr>
-	<tr class="blue_row">
-		<td class="td_left_col"><?php echo $spText['label']['Cookie']?>:</td>
-		<td class="td_right_col"><?php echo $logInfo['crawl_cookie']?></td>
+	<tr>
+		<td><?php echo $spText['label']['Cookie']?>:</td>
+		<td><?php echo $logInfo['crawl_cookie']?></td>
 	</tr>
-	<tr class="white_row">
-		<td class="td_left_col"><?php echo $spTextLog['Post Fields']?>:</td>
-		<td class="td_right_col"><?php echo $logInfo['crawl_post_fields']?></td>
+	<tr>
+		<td><?php echo $spTextLog['Post Fields']?>:</td>
+		<td><?php echo $logInfo['crawl_post_fields']?></td>
 	</tr>
-	<tr class="blue_row">
-		<td class="td_left_col"><?php echo $spText['label']['User agent']?>:</td>
-		<td class="td_right_col"><?php echo $logInfo['crawl_useragent']?></td>
+	<tr>
+		<td><?php echo $spText['label']['User agent']?>:</td>
+		<td><?php echo $logInfo['crawl_useragent']?></td>
 	</tr>
-	<tr class="white_row">
-		<td class="td_left_col"><?php echo $spText['label']['Proxy']?>:</td>
-		<td class="td_right_col"><?php echo $logInfo['proxy_id']?></td>
+	<tr>
+		<td><?php echo $spText['label']['Proxy']?>:</td>
+		<td><?php echo !empty($logInfo['proxy_id']) ? $logInfo['proxy_id'] : ""?></td>
 	</tr>
-	<tr class="blue_row">
-		<td class="td_left_col"><?php echo $spText['common']['Details']?>:</td>
-		<td class="td_right_col"><?php echo $logInfo['log_message']?></td>
+	<tr>
+		<td><?php echo $spText['common']['Details']?>:</td>
+		<td><?php echo $logInfo['log_message']?></td>
 	</tr>
-	<tr class="white_row">
-		<td class="td_left_col"><?php echo $spText['common']['Status']?>:</td>
-		<td class="td_right_col">
+	<tr>
+		<td><?php echo $spText['common']['Status']?>:</td>
+		<td>
 			<?php 
 			if ($logInfo['crawl_status']) {
 				echo "<b class='success'>{$spText['label']['Success']}</b>";
@@ -75,17 +75,9 @@
 			?>
 		</td>
 	</tr>
-	<tr class="blue_row">
-		<td class="td_left_col"><?php echo $spText['label']['Updated']?>:</td>
-		<td class="td_right_col"><?php echo $logInfo['crawl_time']?></td>
-	</tr>
-	<tr class="white_row">
-		<td class="tab_left_bot_noborder"></td>
-		<td class="tab_right_bot"></td>
-	</tr>
-	<tr class="listBot">
-		<td class="left" colspan="1"></td>
-		<td class="right"></td>
+	<tr>
+		<td><?php echo $spText['label']['Updated']?>:</td>
+		<td><?php echo $logInfo['crawl_time']?></td>
 	</tr>
 </table>
 <br><br>
\ No newline at end of file
diff --git a/themes/simple/views/settings/showsettings.ctp.php b/themes/simple/views/settings/showsettings.ctp.php
index 00d49d7c..3b53b5a9 100644
--- a/themes/simple/views/settings/showsettings.ctp.php
+++ b/themes/simple/views/settings/showsettings.ctp.php
@@ -34,12 +34,20 @@
 		</a>
 	</div>
 	<?php
+} else if ($category == "dataforseo") {
+    ?>
+	<div id="topnewsbox" style="margin-bottom: 20px;">
+		<a class="bold_link" href="https://www.seopanel.org/blog/2020/11/how-to-integrate-dataforseo-with-seo-panel/" target="_blank">
+			<?php echo $spTextSettings['click-to-get-dataforseo-account']; ?> &gt;&gt;
+		</a>
+	</div>
+	<?php
 }
 ?>
 <form id="updateSettings">
 <input type="hidden" value="update" name="sec">
 <input type="hidden" value="<?php echo $category?>" name="category">
-<table width="100%" border="0" cellspacing="0" cellpadding="0" class="list">
+<table class="list">
 	<tr class="listHead">
 		<td width='30%'><?php echo $headLabel?></td>
 		<td>&nbsp;</td>
@@ -74,18 +82,20 @@
 		// sp demo settings
 		$demoCheckArr = array(
 			'SP_API_KEY', 'API_SECRET', 'SP_SMTP_PASSWORD', 'SP_MOZ_API_ACCESS_ID', 'SP_MOZ_API_SECRET', 'SP_GOOGLE_API_KEY',
-			'SP_GOOGLE_API_CLIENT_ID', 'SP_GOOGLE_API_CLIENT_SECRET', 'SP_GOOGLE_ANALYTICS_TRACK_CODE'
+			'SP_GOOGLE_API_CLIENT_ID', 'SP_GOOGLE_API_CLIENT_SECRET', 'SP_GOOGLE_ANALYTICS_TRACK_CODE', 'SP_RECAPTCHA_SITE_KEY', 
+			'SP_RECAPTCHA_SECRET_KEY', 'SP_DFS_API_LOGIN', 'SP_DFS_API_PASSWORD',
 		);
 		if (SP_DEMO && in_array($listInfo['set_name'], $demoCheckArr)) {
 			$listInfo['set_val'] = "********";
-		}
-		
+		}		
 		?>
 		<tr>
 			<td class="td_left_col">
 				<?php
 				if ($listInfo['set_name'] == 'SP_PAYMENT_CURRENCY') {
-					echo $spTextSubscription["Currency"] . ":";
+				    echo $spTextSubscription["Currency"] . ":";
+				} elseif ($listInfo['set_name'] == 'SP_DEFAULT_COUNTRY') {
+			        echo $spText['common']["Country"] . ":";
 				} else {
 					echo $spTextSettings[$listInfo['set_name']] . ":";
 				}
@@ -133,6 +143,19 @@
 								}
 								?>
 							</select>
+						<?php } else if ($listInfo['set_name'] == 'SP_DEFAULT_COUNTRY') {?>
+							<select  name="<?php echo $listInfo['set_name']?>">
+								<?php						
+								foreach ($countryList as $countryCode => $countryName) {
+									$selectedVal = ($listInfo['set_val'] == $countryCode) ? "selected" : "";
+									?>
+									<option value="<?php echo $countryCode; ?>" <?php echo $selectedVal; ?>><?php echo $countryName; ?></option>
+									<?php
+								}
+								?>
+							</select>
+						<?php } else if ($listInfo['set_name'] == 'SP_DFS_BALANCE') {?>
+							<label id='sp_dfs_balance'><?php echo stripslashes($listInfo['set_val'])?></label>
 						<?php } else {
 							$passTypeList = array('SP_SMTP_PASSWORD', 'API_SECRET');
 						    $type = in_array($listInfo['set_name'], $passTypeList) ? "password" : "text";
@@ -149,6 +172,11 @@
 									<a href="javascript:void(0);" onclick="checkGoogleAPIConnection('settings.php?sec=checkGoogleAPI', 'show_conn_res')" style="text-decoration: none;"><?php echo $spTextSettings['Verify connection']; ?> &gt;&gt;</a>
 								</div>
 								<div id="show_conn_res" style="padding: 10px 6px;"></div>
+							<?php } else if ($listInfo['set_name'] == 'SP_DFS_API_PASSWORD') {?>
+								<div style="padding: 10px 6px;">
+									<a href="javascript:void(0);" onclick="checkDataForSEOAPIConnection('settings.php?sec=checkDataForSEOAPI', 'show_conn_res')" style="text-decoration: none;"><?php echo $spTextSettings['Verify connection']; ?> &gt;&gt;</a>
+								</div>
+								<div id="show_conn_res" style="padding: 10px 6px;"></div>
 							<?php }?>
 							
 						<?php }?>
@@ -170,16 +198,8 @@
 		<?php
 	}
 	?>
-	<tr class="blue_row">
-		<td class="tab_left_bot_noborder"></td>
-		<td class="tab_right_bot"></td>
-	</tr>
-	<tr class="listBot">
-		<td class="left" colspan="1"></td>
-		<td class="right"></td>
-	</tr>
 </table>
-<table width="100%" cellspacing="0" cellpadding="0" border="0" class="actionSec">
+<table class="actionSec">
 	<tr>
     	<td style="padding-top: 6px;text-align:right;">
     		<a onclick="scriptDoLoad('settings.php?category=<?php echo $category?>', 'content', 'layout=ajax')" href="javascript:void(0);" class="actionbut">
diff --git a/themes/simple/views/website/new.ctp.php b/themes/simple/views/website/new.ctp.php
index 7c4c6b61..91ff69c9 100644
--- a/themes/simple/views/website/new.ctp.php
+++ b/themes/simple/views/website/new.ctp.php
@@ -16,7 +16,7 @@
 	<?php 
 }
 
-$post['url'] = empty($post['url']) ? "http://" : $post['url'];
+$post['url'] = empty($post['url']) ? "https://" : $post['url'];
 ?>
 <form id="newWebsite">
 <input type="hidden" name="sec" value="create"/>