ovidiul / XCloner-Wordpress

admin/partials/xcloner_restore_page.php

Spacing +55 added lines, -55 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-$xcloner_settings 		= new Xcloner_Settings();
-$logger					= new Xcloner_Logger();
-$xcloner_file_system 	= new Xcloner_File_System();
-$xcloner_file_transfer 	= new Xcloner_File_Transfer();
+$xcloner_settings = new Xcloner_Settings();
+$logger = new Xcloner_Logger();
+$xcloner_file_system = new Xcloner_File_System();
+$xcloner_file_transfer = new Xcloner_File_Transfer();
 
-$start = 0 ;
+$start = 0;
 
 $backup_list = $xcloner_file_system->get_latest_backups();
 
@@ -21,22 +21,22 @@ 
 	<div class="col s12">
 		<ul class="collapsible xcloner-restore " data-collapsible="accordion">
 			<li data-step="1" class="restore-script-upload-step steps active show">
-				<div class="collapsible-header active"><i class="material-icons">settings_remote</i><?php echo __("Restore Script Upload",'xcloner-backup-and-restore')?></div>
+				<div class="collapsible-header active"><i class="material-icons">settings_remote</i><?php echo __("Restore Script Upload", 'xcloner-backup-and-restore')?></div>
 				<div class="collapsible-body row">
 						
 						<ul class="text-steps">
-							<li><?php echo __("Please download the restore script from",'xcloner-backup-and-restore')?> <a href='#' onclick="window.location=ajaxurl+'?action=download_restore_script&phar=true'"><strong><?php echo __("here",'xcloner-backup-and-restore')?></strong></a>
+							<li><?php echo __("Please download the restore script from", 'xcloner-backup-and-restore')?> <a href='#' onclick="window.location=ajaxurl+'?action=download_restore_script&phar=true'"><strong><?php echo __("here", 'xcloner-backup-and-restore')?></strong></a>
 							</li>	
 							<li>
-							<?php echo __("Extract the files on your new host",'xcloner-backup-and-restore')?>
+							<?php echo __("Extract the files on your new host", 'xcloner-backup-and-restore')?>
 							</li>
 							<li>
-							<?php echo __("Provide url below to the <u>xcloner_restore.php</u> restore script, like http://my_restore_site.com/xcloner_restore.php",'xcloner-backup-and-restore')?>
+							<?php echo __("Provide url below to the <u>xcloner_restore.php</u> restore script, like http://my_restore_site.com/xcloner_restore.php", 'xcloner-backup-and-restore')?>
 							</li>
 							<li>
-							<?php echo __("If your server is not web accessible, like a localhost computer, you can use a DynDNS service or install a blank copy of Wordpress with XCloner in the same environment and start the restore from there.",'xcloner-backup-and-restore')?>
+							<?php echo __("If your server is not web accessible, like a localhost computer, you can use a DynDNS service or install a blank copy of Wordpress with XCloner in the same environment and start the restore from there.", 'xcloner-backup-and-restore')?>
 							</li>
-							<?php if(is_ssl()):?>
+							<?php if (is_ssl()):?>
 							<li>
 								<?php echo __("We have detected your connection to the site as being secure, so your restore script address must start with https://.")?>
 							</li>
@@ -45,12 +45,12 @@ 
 						</ul>	
 						
 						<div class="input-field col l9 s12">
-							<input value="<?php echo (is_ssl())?"https://":"http://"?>" id="restore_script_url" type="text" class="validate" placeholder="Url to XCloner Restore Script, example http://myddns.com/xcloner/xcloner_restore.php" >
+							<input value="<?php echo (is_ssl()) ? "https://" : "http://"?>" id="restore_script_url" type="text" class="validate" placeholder="Url to XCloner Restore Script, example http://myddns.com/xcloner/xcloner_restore.php" >
 							<label for="restore_script_url"></label>
 							<div id="url_validation_status" class="status"></div>
 				        </div>
 				        <div class="col l3 s12 right-align">
-							<button class="btn waves-effect waves-light" type="submit" id="validate_url" name="action"><?php echo __("Check",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light" type="submit" id="validate_url" name="action"><?php echo __("Check", 'xcloner-backup-and-restore')?>
 							    <i class="material-icons right">send</i>
 							</button>
 				        </div>
@@ -58,15 +58,15 @@ 
 			</li>
 			
 			<li data-step="2" class="backup-upload-step steps">
-				<div class="collapsible-header active"><i class="material-icons">file_upload</i><?php echo __("Upload Local Backup Archive To Remote Host",'xcloner-backup-and-restore')?>
+				<div class="collapsible-header active"><i class="material-icons">file_upload</i><?php echo __("Upload Local Backup Archive To Remote Host", 'xcloner-backup-and-restore')?>
 				</div>
 				<div class="collapsible-body row">
-					<p><?php echo __("You can skip this step if you want to transfer the archive in some other way, make sure you upload it in the same directory as the restore script from the previous step.",'xcloner-backup-and-restore')?></p>
+					<p><?php echo __("You can skip this step if you want to transfer the archive in some other way, make sure you upload it in the same directory as the restore script from the previous step.", 'xcloner-backup-and-restore')?></p>
 					<div class="input-field col s12 l7">
 						<select id="backup_file" name="backup_file" class="browser-default">
-					      <option value="" disabled selected><?php echo __("Please select a local backup archive to upload to remote host",'xcloner-backup-and-restore')?></option>
-					      <?php if(is_array($backup_list)):?>
-							<?php foreach($backup_list as $file):?>
+					      <option value="" disabled selected><?php echo __("Please select a local backup archive to upload to remote host", 'xcloner-backup-and-restore')?></option>
+					      <?php if (is_array($backup_list)):?>
+							<?php foreach ($backup_list as $file):?>
 								<option value="<?php echo $file['basename']?>">
 								<?php echo $file['basename']?> (<?php echo size_format($file['size'])?>)
 								</option>
@@ -82,14 +82,14 @@ 
 					</div>
 					<div class="col s12 l5 right-align">
 						<div class="toggler">
-							<button class="btn waves-effect waves-light upload-backup normal" type="submit" id="" name="action"><?php echo __("Upload",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light upload-backup normal" type="submit" id="" name="action"><?php echo __("Upload", 'xcloner-backup-and-restore')?>
 							    <i class="material-icons right">send</i>
 							</button>
-							<button class="btn waves-effect waves-light red upload-backup cancel" type="submit" id="" name="action"><?php echo __("Cancel",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light red upload-backup cancel" type="submit" id="" name="action"><?php echo __("Cancel", 'xcloner-backup-and-restore')?>
 							    <i class="material-icons right">close</i>
 							</button>
 						</div>
-						<button class="btn waves-effect waves-light grey" type="submit" title="<?php echo __("Skip Next",'xcloner-backup-and-restore')?>" id="skip_upload_backup" name="action"><?php echo __("Next",'xcloner-backup-and-restore')?>
+						<button class="btn waves-effect waves-light grey" type="submit" title="<?php echo __("Skip Next", 'xcloner-backup-and-restore')?>" id="skip_upload_backup" name="action"><?php echo __("Next", 'xcloner-backup-and-restore')?>
 						    <i class="material-icons right">navigate_next</i>
 						</button>
 					</div>
@@ -97,7 +97,7 @@ 
 			</li>	
 			
 			<li data-step="3" class="restore-remote-backup-step steps active">
-				<div class="collapsible-header"><i class="material-icons">folder_open</i><?php echo __("Restore Files Backup Available On Remote Host",'xcloner-backup-and-restore')?>
+				<div class="collapsible-header"><i class="material-icons">folder_open</i><?php echo __("Restore Files Backup Available On Remote Host", 'xcloner-backup-and-restore')?>
 						<i class="material-icons right" title="Refresh Remote Backup Files List" id="refresh_remote_backup_file">cached</i>
 
 						<div class="switch right">
@@ -114,12 +114,12 @@ 
 						<div class=" col s12 l7">
 							<div class="input-field row">
 								<input type="text" name="remote_restore_path" id="remote_restore_path" class="validate" placeholder="Restore Target Path">
-								<label><?php echo __("Remote Restore Target Path",'xcloner-backup-and-restore')?></label>
+								<label><?php echo __("Remote Restore Target Path", 'xcloner-backup-and-restore')?></label>
 							</div>
 							
 							<div class="input-field row">
 								<select id="remote_backup_file" name="remote_backup_file" class="browser-default">
-									<option value="" disabled selected><?php echo __("Please select the remote backup file to restore",'xcloner-backup-and-restore')?></option>
+									<option value="" disabled selected><?php echo __("Please select the remote backup file to restore", 'xcloner-backup-and-restore')?></option>
 							    </select>
 							    <label></label>
 							</div>
@@ -134,14 +134,14 @@ 
 				       
 				        <div class="col s12 l5 right-align">
 							<div class="toggler">
-								<button class="btn waves-effect waves-light restore_remote_backup normal " type="submit" id="" name="action"><?php echo __("Restore",'xcloner-backup-and-restore')?>
+								<button class="btn waves-effect waves-light restore_remote_backup normal " type="submit" id="" name="action"><?php echo __("Restore", 'xcloner-backup-and-restore')?>
 								    <i class="material-icons right">send</i>
 								</button>
-								<button class="btn waves-effect waves-light red restore_remote_backup cancel" type="submit" id="" name="action"><?php echo __("Cancel",'xcloner-backup-and-restore')?>
+								<button class="btn waves-effect waves-light red restore_remote_backup cancel" type="submit" id="" name="action"><?php echo __("Cancel", 'xcloner-backup-and-restore')?>
 								    <i class="material-icons right">close</i>
 								</button>
 							</div>
-							<button class="btn waves-effect waves-light grey" type="submit" title="<?php echo __("Skip Next",'xcloner-backup-and-restore')?>" id="skip_remote_backup_step" name="action"><?php echo __("Next",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light grey" type="submit" title="<?php echo __("Skip Next", 'xcloner-backup-and-restore')?>" id="skip_remote_backup_step" name="action"><?php echo __("Next", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">navigate_next</i>
 							</button>
 				        </div>
@@ -149,71 +149,71 @@ 
 			</li>
 			
 			<li data-step="4" class="restore-remote-database-step steps active">
-				<div class="collapsible-header"><i class="material-icons">list</i><?php echo __("Restore Remote Database - Search and Replace",'xcloner-backup-and-restore')?>
+				<div class="collapsible-header"><i class="material-icons">list</i><?php echo __("Restore Remote Database - Search and Replace", 'xcloner-backup-and-restore')?>
 					<i class="material-icons right" title="Refresh Database Backup Files List" id="refresh_database_file">cached</i>
 				</div>
 				<div class="collapsible-body row">
 						
 						<div class="col s12">
-							<a class="btn-floating tooltipped btn-small right" data-position="left" data-delay="50" data-tooltip="<?php echo __('Please provide below the mysql connection details for the remote host database.','xcloner-backup-and-restore')?>" data-tooltip-id="92c95730-94e9-7b59-bd52-14adc30d5e3e"><i class="material-icons">help_outline</i></a>	
-							<h5><?php echo __('Remote Mysql Details','xcloner-backup-and-restore')?></h5>
+							<a class="btn-floating tooltipped btn-small right" data-position="left" data-delay="50" data-tooltip="<?php echo __('Please provide below the mysql connection details for the remote host database.', 'xcloner-backup-and-restore')?>" data-tooltip-id="92c95730-94e9-7b59-bd52-14adc30d5e3e"><i class="material-icons">help_outline</i></a>	
+							<h5><?php echo __('Remote Mysql Details', 'xcloner-backup-and-restore')?></h5>
 						</div>						
 						<div class=" col s12">
 							<div class="input-field col s12 m6">
 								<input type="text" name="remote_mysql_host" id="remote_mysql_host" class="validate" placeholder="Remote Mysql Hostname" value="localhost">
-								<label><?php echo __("Remote Mysql Hostname",'xcloner-backup-and-restore')?></label>
+								<label><?php echo __("Remote Mysql Hostname", 'xcloner-backup-and-restore')?></label>
 							</div>
 							
 							<div class="input-field  col s12 m6">
 								<input type="text" name="remote_mysql_db" id="remote_mysql_db" class="validate" placeholder="Remote Mysql Database">
-								<label><?php echo __("Remote Mysql Database",'xcloner-backup-and-restore')?></label>
+								<label><?php echo __("Remote Mysql Database", 'xcloner-backup-and-restore')?></label>
 							</div>
 							
 							<div class="input-field  col s12 m6">
 								<input type="text" name="remote_mysql_user" id="remote_mysql_user" class="validate" placeholder="Remote Mysql Username">
-								<label><?php echo __("Remote Mysql Username",'xcloner-backup-and-restore')?></label>
+								<label><?php echo __("Remote Mysql Username", 'xcloner-backup-and-restore')?></label>
 							</div>
 							
 							
 							<div class="input-field  col s12 m6">
 								<input type="text" name="remote_mysql_pass" id="remote_mysql_pass" class="validate" placeholder="Remote Mysql Password">
-								<label><?php echo __("Remote Mysql Password",'xcloner-backup-and-restore')?></label>
+								<label><?php echo __("Remote Mysql Password", 'xcloner-backup-and-restore')?></label>
 							</div>
 							
 						</div>	
 						<div class="col s12">
-						<a class="btn-floating tooltipped btn-small right" data-position="left" data-delay="50" data-html="true" data-tooltip="<?php echo __('I will attempt to replace all mysql backup records matching the provided Source Url with the provided Target Url. <br />Leave blank the Target Url if you would like to skip this option. <br />As a bonus, I will also replace all matching serialized data and fix it\'s parsing.','xcloner-backup-and-restore')?>" data-tooltip-id="92c95730-94e9-7b59-bd52-14adc30d5e3e"><i class="material-icons">help_outline</i></a>	
-							<h5><?php echo __('Remote Mysql Search and Replace','xcloner-backup-and-restore')?></h5>
+						<a class="btn-floating tooltipped btn-small right" data-position="left" data-delay="50" data-html="true" data-tooltip="<?php echo __('I will attempt to replace all mysql backup records matching the provided Source Url with the provided Target Url. <br />Leave blank the Target Url if you would like to skip this option. <br />As a bonus, I will also replace all matching serialized data and fix it\'s parsing.', 'xcloner-backup-and-restore')?>" data-tooltip-id="92c95730-94e9-7b59-bd52-14adc30d5e3e"><i class="material-icons">help_outline</i></a>	
+							<h5><?php echo __('Remote Mysql Search and Replace', 'xcloner-backup-and-restore')?></h5>
 						</div>
 						<div class="col s12">  
 							<div class="input-field col s12 m6 ">
-									<input type="text" name="wp_home_url" id="wp_home_url" class="validate" placeholder="WP Home Url" value="<?php echo home_url();?>">
-									<label><?php echo __("Source Home Url",'xcloner-backup-and-restore')?></label>
+									<input type="text" name="wp_home_url" id="wp_home_url" class="validate" placeholder="WP Home Url" value="<?php echo home_url(); ?>">
+									<label><?php echo __("Source Home Url", 'xcloner-backup-and-restore')?></label>
 							</div>	
 							
 							<div class="input-field col s12 m6 ">
 									<input type="text" name="remote_restore_url" id="remote_restore_url" class="validate" placeholder="Restore Target Url">
-									<label><?php echo __("With Target Home Url",'xcloner-backup-and-restore')?></label>
+									<label><?php echo __("With Target Home Url", 'xcloner-backup-and-restore')?></label>
 							</div>
 						
-						<?php if( site_url() != home_url()) : ?>
+						<?php if (site_url() != home_url()) : ?>
 							<div class="input-field col s12 m6 ">
-									<input type="text" name="wp_site_url" id="wp_site_url" class="validate" placeholder="WP Site Url" value="<?php echo site_url();?>">
-									<label><?php echo __("Source Site Url",'xcloner-backup-and-restore')?></label>
+									<input type="text" name="wp_site_url" id="wp_site_url" class="validate" placeholder="WP Site Url" value="<?php echo site_url(); ?>">
+									<label><?php echo __("Source Site Url", 'xcloner-backup-and-restore')?></label>
 							</div>	
 							
 							<div class="input-field col s12 m6 ">
 									<input type="text" name="remote_restore_site_url" id="remote_restore_site_url" class="validate" placeholder="Restore Target Url">
-									<label><?php echo __("With Target Site Url",'xcloner-backup-and-restore')?></label>
+									<label><?php echo __("With Target Site Url", 'xcloner-backup-and-restore')?></label>
 							</div>
 						
-						<?php endif;?>
+						<?php endif; ?>
 						</div>
 						
 						<div class=" col s12 l7">
 							<div class="input-field row">
 								<select id="remote_database_file" name="remote_database_file" class="browser-default">
-									<option value="" disabled selected><?php echo __("Please select the remote database backup file to restore",'xcloner-backup-and-restore')?></option>
+									<option value="" disabled selected><?php echo __("Please select the remote database backup file to restore", 'xcloner-backup-and-restore')?></option>
 							    </select>
 							    
 							    <label></label>
@@ -232,15 +232,15 @@ 
 				      
 				        <div class="col s12 l5 right-align">
 							<div class="toggler">
-								<button class="btn waves-effect waves-light restore_remote_mysqldump normal " type="submit" id="" name="action"><?php echo __("Restore",'xcloner-backup-and-restore')?>
+								<button class="btn waves-effect waves-light restore_remote_mysqldump normal " type="submit" id="" name="action"><?php echo __("Restore", 'xcloner-backup-and-restore')?>
 								    <i class="material-icons right">send</i>
 								</button>
-								<button class="btn waves-effect waves-light red restore_remote_mysqldump cancel" type="submit" id="" name="action"><?php echo __("Cancel",'xcloner-backup-and-restore')?>
+								<button class="btn waves-effect waves-light red restore_remote_mysqldump cancel" type="submit" id="" name="action"><?php echo __("Cancel", 'xcloner-backup-and-restore')?>
 								    <i class="material-icons right">close</i>
 								</button>
 							</div>
 							
-							<button class="btn waves-effect waves-light grey" type="submit" title="<?php echo __("Skip Next",'xcloner-backup-and-restore')?>" id="skip_restore_remote_database_step" name="action"><?php echo __("Next",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light grey" type="submit" title="<?php echo __("Skip Next", 'xcloner-backup-and-restore')?>" id="skip_restore_remote_database_step" name="action"><?php echo __("Next", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">navigate_next</i>
 							</button>
 							
@@ -250,13 +250,13 @@ 
 			</li>
 			
 			<li data-step="5" class="restore-finish-step steps active">
-				<div class="collapsible-header"><i class="material-icons">folder_open</i><?php echo __("Finishing up...",'xcloner-backup-and-restore')?>
+				<div class="collapsible-header"><i class="material-icons">folder_open</i><?php echo __("Finishing up...", 'xcloner-backup-and-restore')?>
 				</div>
 				<div class="collapsible-body row">
 						
 						<div class="row">
 							<div class="col s4">
-								<label><?php echo __("Update wp-config.php mysql details and update the restored site Url",'xcloner-backup-and-restore')?></label>
+								<label><?php echo __("Update wp-config.php mysql details and update the restored site Url", 'xcloner-backup-and-restore')?></label>
 							</div>
 							
 							<div class="col s8">
@@ -273,7 +273,7 @@ 
 						
 						<div class="row">
 							<div class="col s4">
-								<label><?php echo __("Delete Restored Backup Temporary Folder",'xcloner-backup-and-restore')?></label>
+								<label><?php echo __("Delete Restored Backup Temporary Folder", 'xcloner-backup-and-restore')?></label>
 							</div>
 							<div class="col s8">
 								<div class="switch">
@@ -289,7 +289,7 @@ 
 						
 						<div class="row">
 							<div class="col s4">
-								<label><?php echo __("Delete Restore Script",'xcloner-backup-and-restore')?></label>
+								<label><?php echo __("Delete Restore Script", 'xcloner-backup-and-restore')?></label>
 							</div>
 							<div class="col s8">
 								<div class="switch">
@@ -308,15 +308,15 @@ 
 				        </div>
 				        
 						<div class=" row col s12 center-align" id="xcloner_restore_finish">
-							<h5><?php echo __("Thank you for using XCloner.",'xcloner-backup-and-restore')?></h5>
-							<h6><?php echo sprintf(__("We would love to hear about your experience in the %s.", 'xcloner-backup-and-restore'),'<a href="https://wordpress.org/support/plugin/xcloner-backup-and-restore" target="_blank">Wordpress XCloner forums</a>') ?></h6>
+							<h5><?php echo __("Thank you for using XCloner.", 'xcloner-backup-and-restore')?></h5>
+							<h6><?php echo sprintf(__("We would love to hear about your experience in the %s.", 'xcloner-backup-and-restore'), '<a href="https://wordpress.org/support/plugin/xcloner-backup-and-restore" target="_blank">Wordpress XCloner forums</a>') ?></h6>
 							<a class="twitter-follow-button" href="https://twitter.com/thinkovi" data-show-count="false">Follow @thinkovi</a>
 							<script src="//platform.twitter.com/widgets.js" async="" charset="utf-8"></script>
 				        </div>
 				        
 				        <div class="col s12 center-align">
 
-							<button class="btn waves-effect waves-light teal" type="submit" id="restore_finish" name="action"><?php echo __("Finish",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light teal" type="submit" id="restore_finish" name="action"><?php echo __("Finish", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">navigate_next</i>
 							</button>
 				        </div>

admin/partials/xcloner_generate_backups_page.php

Spacing +49 added lines, -49 removed lines

@@ -10,13 +10,13 @@ 
 <h1><?= esc_html(get_admin_page_title()); ?></h1>
          
 <ul class="nav-tab-wrapper content row">
-	<li><a href="#backup_options" class="nav-tab col s12 m3 l2 nav-tab-active"><?php echo $tab.". ".__('Backup Options','xcloner-backup-and-restore')?></a></li>
-	<?php if($xcloner_settings->get_enable_mysql_backup()):?>
-		<li><a href="#database_options" class="nav-tab col s12 m3 l2 "><?php echo ++$tab.". ".__('Database Options','xcloner-backup-and-restore')?></a></li>
+	<li><a href="#backup_options" class="nav-tab col s12 m3 l2 nav-tab-active"><?php echo $tab.". ".__('Backup Options', 'xcloner-backup-and-restore')?></a></li>
+	<?php if ($xcloner_settings->get_enable_mysql_backup()):?>
+		<li><a href="#database_options" class="nav-tab col s12 m3 l2 "><?php echo ++$tab.". ".__('Database Options', 'xcloner-backup-and-restore')?></a></li>
 	<?php endif?>
-	<li><a href="#files_options" class="nav-tab col s12 m3 l2 "><?php echo ++$tab.". ".__('Files Options','xcloner-backup-and-restore')?></a></li>
-	<li><a href="#generate_backup" class="nav-tab col s12 m3 l2 "><?php echo ++$tab.". ".__('Generate Backup','xcloner-backup-and-restore')?></a></li>
-	<li><a href="#schedule_backup" class="nav-tab col s12 m3 l2 "><?php echo ++$tab.". ".__('Schedule Backup','xcloner-backup-and-restore')?></a></li>
+	<li><a href="#files_options" class="nav-tab col s12 m3 l2 "><?php echo ++$tab.". ".__('Files Options', 'xcloner-backup-and-restore')?></a></li>
+	<li><a href="#generate_backup" class="nav-tab col s12 m3 l2 "><?php echo ++$tab.". ".__('Generate Backup', 'xcloner-backup-and-restore')?></a></li>
+	<li><a href="#schedule_backup" class="nav-tab col s12 m3 l2 "><?php echo ++$tab.". ".__('Schedule Backup', 'xcloner-backup-and-restore')?></a></li>
 </ul>
 
 <form action="" method="POST" id="generate_backup_form">
@@ -27,21 +27,21 @@ 
 		        <div class="input-field inline col s12 m10 l6">
 					<i class="material-icons prefix">input</i>
 					<input name="backup_name" id="backup_name" type="text" value=<?php echo $xcloner_settings->get_default_backup_name() ?> >
-					<label for="backup_name"><?php echo __('Backup Name','xcloner-backup-and-restore')?></label>
+					<label for="backup_name"><?php echo __('Backup Name', 'xcloner-backup-and-restore')?></label>
 				</div>
 				<div class="hide-on-small-only m2">
-					<a class="btn-floating tooltipped btn-small" data-position="right" data-delay="50" data-tooltip="<?php echo __('The default backup name, supported tags [time], [hostname], [domain]','xcloner-backup-and-restore')?>" data-tooltip-id=""><i class="material-icons">help_outline</i></a>
+					<a class="btn-floating tooltipped btn-small" data-position="right" data-delay="50" data-tooltip="<?php echo __('The default backup name, supported tags [time], [hostname], [domain]', 'xcloner-backup-and-restore')?>" data-tooltip-id=""><i class="material-icons">help_outline</i></a>
 				</div>
 		     </div>
 		     
 		     <div class="row">
 		        <div class="input-field inline col s12 m10 l6">
 					<i class="material-icons prefix">input</i>
-					<input name="email_notification" id="email_notification" type="text" value="<?php echo get_option('admin_email');?>" >
-					<label for="email_notification"><?php echo __('Send Email Notification To','xcloner-backup-and-restore')?></label>
+					<input name="email_notification" id="email_notification" type="text" value="<?php echo get_option('admin_email'); ?>" >
+					<label for="email_notification"><?php echo __('Send Email Notification To', 'xcloner-backup-and-restore')?></label>
 				</div>
 				<div class="hide-on-small-only m2">
-					<a class="btn-floating tooltipped btn-small" data-position="right" data-delay="50" data-tooltip="<?php echo __('If left blank, no notification will be sent','xcloner-backup-and-restore')?>" data-tooltip-id=""><i class="material-icons">help_outline</i></a>
+					<a class="btn-floating tooltipped btn-small" data-position="right" data-delay="50" data-tooltip="<?php echo __('If left blank, no notification will be sent', 'xcloner-backup-and-restore')?>" data-tooltip-id=""><i class="material-icons">help_outline</i></a>
 				</div>
 		     </div>
 		     
@@ -49,10 +49,10 @@ 
 				<div class="input-field col s12 m10 l6">
 					<i class="material-icons prefix">input</i>
 					<textarea name="backup_comments" id="backup_comments" class="materialize-textarea"></textarea>
-					<label for="backup_comments"><?php echo __('Backup Comments','xcloner-backup-and-restore')?></label>
+					<label for="backup_comments"><?php echo __('Backup Comments', 'xcloner-backup-and-restore')?></label>
 				</div>
 				<div class="hide-on-small-only m2">
-					<a class="btn-floating tooltipped btn-small" data-position="right" data-delay="50" data-tooltip="<?php echo __('Some default backup comments that will be stored inside the backup archive','xcloner-backup-and-restore')?>" data-tooltip-id=""><i class="material-icons">help_outline</i></a>
+					<a class="btn-floating tooltipped btn-small" data-position="right" data-delay="50" data-tooltip="<?php echo __('Some default backup comments that will be stored inside the backup archive', 'xcloner-backup-and-restore')?>" data-tooltip-id=""><i class="material-icons">help_outline</i></a>
 				</div>
 		     </div>
 		     
@@ -63,10 +63,10 @@ 
 			 </div>
 		</div>
 		
-		<?php if($xcloner_settings->get_enable_mysql_backup()):?>
+		<?php if ($xcloner_settings->get_enable_mysql_backup()):?>
 		<div id="database_options" class="tab-content">
 			<h2><?php echo __('Select database data to include in the backup', 'xcloner-backup-and-restore')?>:
-				<a class="btn-floating tooltipped btn-small" data-position="right" data-delay="50" data-tooltip="<?php echo __('Enable the \'Backup only WP tables\' setting if you don\'t want to show all other databases and tables not related to this Wordpress install','xcloner-backup-and-restore');?>" data-tooltip-id=""><i class="material-icons">help_outline</i></a>
+				<a class="btn-floating tooltipped btn-small" data-position="right" data-delay="50" data-tooltip="<?php echo __('Enable the \'Backup only WP tables\' setting if you don\'t want to show all other databases and tables not related to this Wordpress install', 'xcloner-backup-and-restore'); ?>" data-tooltip-id=""><i class="material-icons">help_outline</i></a>
 			</h2>
 			
 			<!-- database/tables tree -->
@@ -86,8 +86,8 @@ 
 		<?php endif ?>
 		
 		<div id="files_options" class="tab-content">
-			<h2><?php echo __('Select from below the files/folders you want to exclude from your Backup Archive','xcloner-backup-and-restore')?>:
-				<a class="btn-floating tooltipped btn-small" data-position="bottom" data-delay="50" data-html="true" data-tooltip="<?php echo __('You can navigate below through all your site structure(Backup Start Location) to exclude any file/folder you need by clicking the checkbox near it. <br />If the checkobx is disabled, then it matches a Regex Exclude File option and it can\'t be unchecked','xcloner-backup-and-restore');?>" data-tooltip-id=""><i class="material-icons">help_outline</i></a>
+			<h2><?php echo __('Select from below the files/folders you want to exclude from your Backup Archive', 'xcloner-backup-and-restore')?>:
+				<a class="btn-floating tooltipped btn-small" data-position="bottom" data-delay="50" data-html="true" data-tooltip="<?php echo __('You can navigate below through all your site structure(Backup Start Location) to exclude any file/folder you need by clicking the checkbox near it. <br />If the checkobx is disabled, then it matches a Regex Exclude File option and it can\'t be unchecked', 'xcloner-backup-and-restore'); ?>" data-tooltip-id=""><i class="material-icons">help_outline</i></a>
 			</h2>
 			
 			<!-- Files System Container -->
@@ -115,7 +115,7 @@ 
 					<ul class="backup-status collapsible" data-collapsible="accordion">
 					    <li class="file-system">
 						      <div class="collapsible-header">
-									<i class="material-icons">folder</i><?php echo __('Scanning The File System...','xcloner-backup-and-restore')?>
+									<i class="material-icons">folder</i><?php echo __('Scanning The File System...', 'xcloner-backup-and-restore')?>
 									
 									<p class="right"><?php echo sprintf(__('Found %s files (%s)', 'xcloner-backup-and-restore'), '<span class="file-counter">0</span>', '<span  class="file-size-total">0</span>MB')?></p>
 
@@ -129,12 +129,12 @@ 
 								</div>	
 						      <div class="collapsible-body status-body"></div>
 					    </li>
-					    <?php if($xcloner_settings->get_enable_mysql_backup()):?>
+					    <?php if ($xcloner_settings->get_enable_mysql_backup()):?>
 					    <li class="database-backup">
 						      <div class="collapsible-header">
-									<i class="material-icons">storage</i><?php echo __('Generating the Mysql Backup...','xcloner-backup-and-restore')?>
+									<i class="material-icons">storage</i><?php echo __('Generating the Mysql Backup...', 'xcloner-backup-and-restore')?>
 									
-									<p class="right"><?php echo sprintf(__('Found %s tables in %s databases (%s)', 'xcloner-backup-and-restore'), '<span class="table-counter">0</span>', '<span class="database-counter">0</span>', '<span data-processed="0" class="total-records">0</span> records','xcloner-backup-and-restore')?></p>
+									<p class="right"><?php echo sprintf(__('Found %s tables in %s databases (%s)', 'xcloner-backup-and-restore'), '<span class="table-counter">0</span>', '<span class="database-counter">0</span>', '<span data-processed="0" class="total-records">0</span> records', 'xcloner-backup-and-restore')?></p>
 									
 									<div>
 										<p class="right"><span class="last-logged-table"></span></p>
@@ -158,9 +158,9 @@ 
 					    <?php endif?>
 					    <li class="files-backup">
 						      <div class="collapsible-header">
-									<i class="material-icons">archive</i><?php echo __('Adding Files to Archive...','xcloner-backup-and-restore')?>
+									<i class="material-icons">archive</i><?php echo __('Adding Files to Archive...', 'xcloner-backup-and-restore')?>
 									
-									<p class="right"><?php echo sprintf(__('Adding %s files (%s)','xcloner-backup-and-restore'), '<span class="file-counter">0</span>', '<span  data-processed="0" class="file-size-total">0</span>MB')?></p>
+									<p class="right"><?php echo sprintf(__('Adding %s files (%s)', 'xcloner-backup-and-restore'), '<span class="file-counter">0</span>', '<span  data-processed="0" class="file-size-total">0</span>MB')?></p>
 
 									<div>
 										<p class="right"><span class="last-logged-file"></span></p>
@@ -173,7 +173,7 @@ 
 						      <div class="collapsible-body status-body">
 									<div class="row">
 										<div class="col l3 s12">
-											<h2><?php echo __("Backup Parts",'xcloner-backup-and-restore')?>: </h2>
+											<h2><?php echo __("Backup Parts", 'xcloner-backup-and-restore')?>: </h2>
 										</div>	
 										<div class="col l9 s12">
 											<ul class="backup-name"></ul>
@@ -183,14 +183,14 @@ 
 					    </li>
 					    <li class="backup-done">
 						      <div class="collapsible-header">
-									<i class="material-icons">done</i><?php echo __('Backup Done','xcloner-backup-and-restore')?>
+									<i class="material-icons">done</i><?php echo __('Backup Done', 'xcloner-backup-and-restore')?>
 									
 									<p class="right">
-										 <?php if(sizeof($available_storages)):?>
-											<a href="#" class="cloud-upload" title="<?php echo __("Send Backup To Remote Storage",'xcloner-backup-and-restore')?>"><i class="material-icons">cloud_upload</i></a>
+										 <?php if (sizeof($available_storages)):?>
+											<a href="#" class="cloud-upload" title="<?php echo __("Send Backup To Remote Storage", 'xcloner-backup-and-restore')?>"><i class="material-icons">cloud_upload</i></a>
 										 <?php endif?>
-										 <a href="#" class="download" title="<?php echo __("Download Backup",'xcloner-backup-and-restore')?>"><i class="material-icons">file_download</i></a>
-										 <a href="#" class="list-backup-content" title="<?php echo __("List Backup Content",'xcloner-backup-and-restore')?>"><i class="material-icons">folder_open</i></a>
+										 <a href="#" class="download" title="<?php echo __("Download Backup", 'xcloner-backup-and-restore')?>"><i class="material-icons">file_download</i></a>
+										 <a href="#" class="list-backup-content" title="<?php echo __("List Backup Content", 'xcloner-backup-and-restore')?>"><i class="material-icons">folder_open</i></a>
 									</p>
 									
 									<div class="progress">
@@ -200,8 +200,8 @@ 
 								</div>	
 						      <div class="collapsible-body center-align">
 									<div class="row">
-										<h5><?php echo __("Thank you for using XCloner.",'xcloner-backup-and-restore')?></h5>
-										<h6><?php echo sprintf(__("We would love to hear about your experience in the %s.", 'xcloner-backup-and-restore'),'<a href="https://wordpress.org/support/plugin/xcloner-backup-and-restore/reviews/" target="_blank">Wordpress XCloner Reviews Section</a>') ?></h6>
+										<h5><?php echo __("Thank you for using XCloner.", 'xcloner-backup-and-restore')?></h5>
+										<h6><?php echo sprintf(__("We would love to hear about your experience in the %s.", 'xcloner-backup-and-restore'), '<a href="https://wordpress.org/support/plugin/xcloner-backup-and-restore/reviews/" target="_blank">Wordpress XCloner Reviews Section</a>') ?></h6>
 										<a class="twitter-follow-button" href="https://twitter.com/thinkovi" data-show-count="false">Follow @thinkovi</a>
 										<script src="//platform.twitter.com/widgets.js" async="" charset="utf-8"></script>
 									</div>
@@ -218,7 +218,7 @@ 
 			<div class="row">
 				<div id="schedule_backup_success" class="col s12 l6 updated settings-error notice is-dismissible"> 
 					<p><strong><?php echo __('Schedule Saved', 'xcloner-backup-and-restore')?></strong></p>
-					<button type="button" class="notice-dismiss"><span class="screen-reader-text"><?php echo __('(Dismiss this notice.','xcloner-backup-and-restore')?></span></button>
+					<button type="button" class="notice-dismiss"><span class="screen-reader-text"><?php echo __('(Dismiss this notice.', 'xcloner-backup-and-restore')?></span></button>
 				</div>
 			</div>
 			
@@ -238,11 +238,11 @@ 
 			<div class="row">
 				 <div class="input-field inline col s12 m6 l4">
 					  <input type="datetime-local" id="datepicker" class="datepicker" name="schedule_start_date" >
-					  <label for="datepicker"><?php echo __('Schedule Backup To Start On:','xcloner-backup-and-restore')?></label>
+					  <label for="datepicker"><?php echo __('Schedule Backup To Start On:', 'xcloner-backup-and-restore')?></label>
 				</div>
 				 <div class="input-field inline col s12 m4 l2">
 					  <input id="timepicker_ampm_dark" class="timepicker" type="time" name="schedule_start_time">
-					  <label for="timepicker_ampm_dark"><?php echo __('At:','xcloner-backup-and-restore')?></label>
+					  <label for="timepicker_ampm_dark"><?php echo __('At:', 'xcloner-backup-and-restore')?></label>
 				</div>
 			</div>
 			
@@ -250,22 +250,22 @@ 
 				<div class="input-field col s12 m10 l6">
 					<select name="schedule_frequency" id="schedule_frequency" class="validate" required>
 						<option value="" disabled selected><?php echo __('please select', 'xcloner-backup-and-restore') ?></option>
-						<option value="single"><?php echo __("Don't Repeat",'xcloner-backup-and-restore')?></option>
-						<option value="hourly"><?php echo __("Hourly",'xcloner-backup-and-restore')?></option>
-						<option value="daily"><?php echo __("Daily",'xcloner-backup-and-restore')?></option>
-						<option value="weekly"><?php echo __("Weekly",'xcloner-backup-and-restore')?></option>
-						<option value="monthly"><?php echo __("Monthly",'xcloner-backup-and-restore')?></option>
+						<option value="single"><?php echo __("Don't Repeat", 'xcloner-backup-and-restore')?></option>
+						<option value="hourly"><?php echo __("Hourly", 'xcloner-backup-and-restore')?></option>
+						<option value="daily"><?php echo __("Daily", 'xcloner-backup-and-restore')?></option>
+						<option value="weekly"><?php echo __("Weekly", 'xcloner-backup-and-restore')?></option>
+						<option value="monthly"><?php echo __("Monthly", 'xcloner-backup-and-restore')?></option>
 						</select>
 						<label><?php echo __('Please Select Frequency to run', 'xcloner-backup-and-restore') ?></label>
 				</div>
 			</div>	
 
-			<?php if(sizeof($available_storages)):?>
+			<?php if (sizeof($available_storages)):?>
 			<div class="row">
 				<div class="input-field col s12 m10 l6">
 					<select name="schedule_storage" id="schedule_storage" class="validate">
 						<option value="" selected><?php echo __('none', 'xcloner-backup-and-restore') ?></option>
-						<?php foreach($available_storages as $storage=>$text):?>
+						<?php foreach ($available_storages as $storage=>$text):?>
 							<option value="<?php echo $storage?>"><?php echo $text?></option>
 						<?php endforeach?>
 						</select>
@@ -275,7 +275,7 @@ 
 			<?php endif?>
 			<div class="row">
 				<div class="col s12 m10 l6">
-					<button class="right btn waves-effect waves-light submit_schedule" type="submit" name="action"><?php echo __("Submit" ,'xcloner-backup-and-restore')?>
+					<button class="right btn waves-effect waves-light submit_schedule" type="submit" name="action"><?php echo __("Submit", 'xcloner-backup-and-restore')?>
 						<i class="material-icons right">send</i>
 					</button>
 				</div>
@@ -294,7 +294,7 @@ 
 		<textarea  class="body" rows="5"></textarea>
 	</div>
 	<div class="modal-footer">
-		<a class=" modal-action modal-close waves-effect waves-green btn-flat  red darken-2"><?php echo __('Close','xcloner-backup-and-restore')?></a>
+		<a class=" modal-action modal-close waves-effect waves-green btn-flat  red darken-2"><?php echo __('Close', 'xcloner-backup-and-restore')?></a>
 	</div>
 </div>
 
@@ -302,7 +302,7 @@ 
 
 <div id="backup_cotent_modal" class="modal">
 	<div class="modal-content">
-		<h4><?php echo sprintf(__("Listing Backup Content ",'xcloner-backup-and-restore'), "")?></h4>
+		<h4><?php echo sprintf(__("Listing Backup Content ", 'xcloner-backup-and-restore'), "")?></h4>
 		<h5 class="backup-name"></h5>
 		
 		<div class="progress">
@@ -317,9 +317,9 @@ 
 	<form method="POST" class="remote-storage-form">
 	<input type="hidden" name="file" class="backup_name">	  
 	<div class="modal-content">
-	  <h4><?php echo __("Remote Storage Transfer",'xcloner-backup-and-restore')?></h4>
+	  <h4><?php echo __("Remote Storage Transfer", 'xcloner-backup-and-restore')?></h4>
 	  <p>
-	  <?php if(sizeof($available_storages)):?>
+	  <?php if (sizeof($available_storages)):?>
 			<div class="row">
 				<div class="col s12 label">
 					<label><?php echo __(sprintf('Send %s to remote storage', "<span class='backup_name'></span>"), 'xcloner-backup-and-restore') ?></label>
@@ -327,7 +327,7 @@ 
 				<div class="input-field col s8 m10">
 					<select name="transfer_storage" id="transfer_storage" class="validate" required >
 						<option value="" selected><?php echo __('please select...', 'xcloner-backup-and-restore') ?></option>
-						<?php foreach($available_storages as $storage=>$text):?>
+						<?php foreach ($available_storages as $storage=>$text):?>
 							<option value="<?php echo $storage?>"><?php echo $text?></option>
 						<?php endforeach?>
 						</select>
@@ -338,7 +338,7 @@ 
 				</div>
 			</div>
 			<div class="row status">
-				<?php echo __("Uploading backup to the selected remote storage...",'xcloner-backup-and-restore')?> <span class="status-text"></span>
+				<?php echo __("Uploading backup to the selected remote storage...", 'xcloner-backup-and-restore')?> <span class="status-text"></span>
 				<div class="progress">
 					<div class="indeterminate"></div>
 				</div>
@@ -411,7 +411,7 @@ 
 		}
 	});
 	
-	<?php if($xcloner_settings->get_enable_mysql_backup()):?>
+	<?php if ($xcloner_settings->get_enable_mysql_backup()):?>
 	jQuery('#jstree_database_container').jstree({
 			'core' : {
 				'check_callback' : true,

admin/class-xcloner-admin.php

Indentation +17 added lines, -17 removed lines

@@ -193,26 +193,26 @@ 
 		
 		// add error/update messages
  
-	    // check if the user have submitted the settings
-	    // wordpress will add the "settings-updated" $_GET parameter to the url
-	    if (isset($_GET['settings-updated'])) {
-	        // add settings saved message with the class of "updated"
-	        add_settings_error('wporg_messages', 'wporg_message', __('Settings Saved', 'wporg'), 'updated');
-	    }
+		// check if the user have submitted the settings
+		// wordpress will add the "settings-updated" $_GET parameter to the url
+		if (isset($_GET['settings-updated'])) {
+			// add settings saved message with the class of "updated"
+			add_settings_error('wporg_messages', 'wporg_message', __('Settings Saved', 'wporg'), 'updated');
+		}
 	 
-	    // show error/update messages
-	    settings_errors('wporg_messages');
-	    ?>
+		// show error/update messages
+		settings_errors('wporg_messages');
+		?>
 	   
 	    <?php
-            if( isset( $_GET[ 'tab' ] ) ) {
-                $active_tab = $_GET[ 'tab' ];
-            } // end if
-            else{
+			if( isset( $_GET[ 'tab' ] ) ) {
+				$active_tab = $_GET[ 'tab' ];
+			} // end if
+			else{
 				$active_tab = "general_options";
 			}
             
-        ?>
+		?>
         <h1><?= esc_html(get_admin_page_title()); ?></h1>
          
         <ul class="nav-tab-wrapper row">
@@ -252,9 +252,9 @@ 
 					do_settings_sections('xcloner_cron_settings_page');
 				}*/
 
-	            // output save settings button
-	            submit_button('Save Settings');
-	            ?>
+				// output save settings button
+				submit_button('Save Settings');
+				?>
 	        </form>
 
 	    </div>

Spacing +33 added lines, -33 removed lines

@@ -47,7 +47,7 @@ 
 	 * @param      string    $plugin_name       The name of this plugin.
 	 * @param      string    $version    The version of this plugin.
 	 */
-	public function __construct( $plugin_name, $version ) {
+	public function __construct($plugin_name, $version) {
 
 		$this->plugin_name = $plugin_name;
 		$this->version = $version;
@@ -61,7 +61,7 @@ 
 	 */
 	public function enqueue_styles($hook) {
 		
-		if(!stristr($hook, "page_".$this->plugin_name) || (isset($_GET['option']) and $_GET['option']=="com_cloner"))
+		if (!stristr($hook, "page_".$this->plugin_name) || (isset($_GET['option']) and $_GET['option'] == "com_cloner"))
 			return;
 
 		/**
@@ -76,13 +76,13 @@ 
 		 * class.
 		 */
 		
-		wp_enqueue_style( $this->plugin_name."_materialize", plugin_dir_url( __FILE__ ) . 'css/materialize.min.css', array(), $this->version, 'all' );
-		wp_enqueue_style( $this->plugin_name."_materialize.clockpicker", plugin_dir_url( __FILE__ ) . 'css/materialize.clockpicker.css', array(), $this->version, 'all' );
-		wp_enqueue_style( $this->plugin_name."_materialize.icons", '//fonts.googleapis.com/icon?family=Material+Icons', array(), $this->version, 'all' );
-		wp_enqueue_style( $this->plugin_name."_jquery.datatables", plugin_dir_url( __FILE__ ) . 'css/jquery.dataTables.min.css', array(), $this->version, 'all' );
-		wp_enqueue_style( $this->plugin_name."_jquery.datatables.responsive", plugin_dir_url( __FILE__ ) . 'css/responsive.dataTables.css', array(), $this->version, 'all' );
-		wp_enqueue_style( $this->plugin_name."_jstree", dirname(plugin_dir_url( __FILE__ )) . '/vendor/vakata/jstree/dist/themes/default/style.min.css', array(), '3.3', 'all' );
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/xcloner-admin.css', array(), $this->version, 'all' );
+		wp_enqueue_style($this->plugin_name."_materialize", plugin_dir_url(__FILE__).'css/materialize.min.css', array(), $this->version, 'all');
+		wp_enqueue_style($this->plugin_name."_materialize.clockpicker", plugin_dir_url(__FILE__).'css/materialize.clockpicker.css', array(), $this->version, 'all');
+		wp_enqueue_style($this->plugin_name."_materialize.icons", '//fonts.googleapis.com/icon?family=Material+Icons', array(), $this->version, 'all');
+		wp_enqueue_style($this->plugin_name."_jquery.datatables", plugin_dir_url(__FILE__).'css/jquery.dataTables.min.css', array(), $this->version, 'all');
+		wp_enqueue_style($this->plugin_name."_jquery.datatables.responsive", plugin_dir_url(__FILE__).'css/responsive.dataTables.css', array(), $this->version, 'all');
+		wp_enqueue_style($this->plugin_name."_jstree", dirname(plugin_dir_url(__FILE__)).'/vendor/vakata/jstree/dist/themes/default/style.min.css', array(), '3.3', 'all');
+		wp_enqueue_style($this->plugin_name, plugin_dir_url(__FILE__).'css/xcloner-admin.css', array(), $this->version, 'all');
 
 	}
 
@@ -93,7 +93,7 @@ 
 	 */
 	public function enqueue_scripts($hook) {
 
-		if(!stristr($hook, "page_".$this->plugin_name))
+		if (!stristr($hook, "page_".$this->plugin_name))
 			return;
 			
 		/**
@@ -108,17 +108,17 @@ 
 		 * class.
 		 */
 
-		wp_enqueue_script( $this->plugin_name."_materialize", plugin_dir_url( __FILE__ ) . 'js/materialize.min.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name."_materialize.clockpicker", plugin_dir_url( __FILE__ ) . 'js/materialize.clockpicker.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name."_jquery.datatables", plugin_dir_url( __FILE__ ) . 'js/jquery.dataTables.min.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name."_jquery.datatables.respnsive", plugin_dir_url( __FILE__ ) . 'js/dataTables.responsive.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name."_vakata", dirname(plugin_dir_url( __FILE__ )) . '/vendor/vakata/jstree/dist/jstree.min.js', array( 'jquery' ), '3.3', false );
-		wp_enqueue_script( $this->plugin_name."_xcloner-backup-class", plugin_dir_url( __FILE__ ) . 'js/xcloner-backup-class.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name."_xcloner-scheduler-class", plugin_dir_url( __FILE__ ) . 'js/xcloner-scheduler-class.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name."_xcloner-restore-class", plugin_dir_url( __FILE__ ) . 'js/xcloner-restore-class.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name."_xcloner-manage-backups-class", plugin_dir_url( __FILE__ ) . 'js/xcloner-manage-backups-class.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name."_xcloner-remote-storage-class", plugin_dir_url( __FILE__ ) . 'js/xcloner-remote-storage-class.js', array( 'jquery' ), $this->version, false );
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/xcloner-admin.js', array( 'jquery' ), $this->version, false );
+		wp_enqueue_script($this->plugin_name."_materialize", plugin_dir_url(__FILE__).'js/materialize.min.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_materialize.clockpicker", plugin_dir_url(__FILE__).'js/materialize.clockpicker.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_jquery.datatables", plugin_dir_url(__FILE__).'js/jquery.dataTables.min.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_jquery.datatables.respnsive", plugin_dir_url(__FILE__).'js/dataTables.responsive.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_vakata", dirname(plugin_dir_url(__FILE__)).'/vendor/vakata/jstree/dist/jstree.min.js', array('jquery'), '3.3', false);
+		wp_enqueue_script($this->plugin_name."_xcloner-backup-class", plugin_dir_url(__FILE__).'js/xcloner-backup-class.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_xcloner-scheduler-class", plugin_dir_url(__FILE__).'js/xcloner-scheduler-class.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_xcloner-restore-class", plugin_dir_url(__FILE__).'js/xcloner-restore-class.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_xcloner-manage-backups-class", plugin_dir_url(__FILE__).'js/xcloner-manage-backups-class.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name."_xcloner-remote-storage-class", plugin_dir_url(__FILE__).'js/xcloner-remote-storage-class.js', array('jquery'), $this->version, false);
+		wp_enqueue_script($this->plugin_name, plugin_dir_url(__FILE__).'js/xcloner-admin.js', array('jquery'), $this->version, false);
 		
 
 	}
@@ -131,7 +131,7 @@ 
 	
 	public function xcloner_remote_storage_page()
 	{
-		if(isset($_POST['action']))
+		if (isset($_POST['action']))
 		{
 			$remote_storage = new Xcloner_Remote_Storage();
 			$remote_storage->save($_POST['action']);
@@ -142,8 +142,8 @@ 
 	
 	public function xcloner_scheduled_backups_page()
 	{
-		$requirements 			= new XCloner_Requirements();
-		if(!$requirements->check_backup_ready_status())
+		$requirements = new XCloner_Requirements();
+		if (!$requirements->check_backup_ready_status())
 		{
 			require_once("partials/xcloner_init_page.php");
 			return false;
@@ -173,8 +173,8 @@ 
 	
 	public function xcloner_generate_backups_page()
 	{
-		$requirements 			= new XCloner_Requirements();
-		if(!$requirements->check_backup_ready_status())
+		$requirements = new XCloner_Requirements();
+		if (!$requirements->check_backup_ready_status())
 		{
 			require_once("partials/xcloner_init_page.php");
 			return false;
@@ -205,10 +205,10 @@ 
 	    ?>
 	   
 	    <?php
-            if( isset( $_GET[ 'tab' ] ) ) {
-                $active_tab = $_GET[ 'tab' ];
+            if (isset($_GET['tab'])) {
+                $active_tab = $_GET['tab'];
             } // end if
-            else{
+            else {
 				$active_tab = "general_options";
 			}
             
@@ -229,20 +229,20 @@ 
 	        <form action="options.php" method="post">
 	            <?php
 				
-				if( $active_tab == 'general_options' ) {
+				if ($active_tab == 'general_options') {
 					
 					settings_fields('xcloner_general_settings_group');
 					do_settings_sections('xcloner_settings_page');
 					
-				}elseif( $active_tab == 'mysql_options' ) {
+				}elseif ($active_tab == 'mysql_options') {
 					
 					settings_fields('xcloner_mysql_settings_group');
 					do_settings_sections('xcloner_mysql_settings_page');
-				}elseif( $active_tab == 'system_options' ) {
+				}elseif ($active_tab == 'system_options') {
 					
 					settings_fields('xcloner_system_settings_group');
 					do_settings_sections('xcloner_system_settings_page');
-				}elseif( $active_tab == 'cleanup_options' ) {
+				}elseif ($active_tab == 'cleanup_options') {
 					
 					settings_fields('xcloner_cleanup_settings_group');
 					do_settings_sections('xcloner_cleanup_settings_page');

Braces +9 added lines, -7 removed lines

@@ -61,8 +61,9 @@ 
 	 */
 	public function enqueue_styles($hook) {
 		
-		if(!stristr($hook, "page_".$this->plugin_name) || (isset($_GET['option']) and $_GET['option']=="com_cloner"))
-			return;
+		if(!stristr($hook, "page_".$this->plugin_name) || (isset($_GET['option']) and $_GET['option']=="com_cloner")) {
+					return;
+		}
 
 		/**
 		 * This function is provided for demonstration purposes only.
@@ -93,8 +94,9 @@ 
 	 */
 	public function enqueue_scripts($hook) {
 
-		if(!stristr($hook, "page_".$this->plugin_name))
-			return;
+		if(!stristr($hook, "page_".$this->plugin_name)) {
+					return;
+		}
 			
 		/**
 		 * This function is provided for demonstration purposes only.
@@ -234,15 +236,15 @@ 
 					settings_fields('xcloner_general_settings_group');
 					do_settings_sections('xcloner_settings_page');
 					
-				}elseif( $active_tab == 'mysql_options' ) {
+				} elseif( $active_tab == 'mysql_options' ) {
 					
 					settings_fields('xcloner_mysql_settings_group');
 					do_settings_sections('xcloner_mysql_settings_page');
-				}elseif( $active_tab == 'system_options' ) {
+				} elseif( $active_tab == 'system_options' ) {
 					
 					settings_fields('xcloner_system_settings_group');
 					do_settings_sections('xcloner_system_settings_page');
-				}elseif( $active_tab == 'cleanup_options' ) {
+				} elseif( $active_tab == 'cleanup_options' ) {
 					
 					settings_fields('xcloner_cleanup_settings_group');
 					do_settings_sections('xcloner_cleanup_settings_page');

admin/partials/xcloner_remote_storage_page.php

Spacing +98 added lines, -98 removed lines

@@ -10,12 +10,12 @@ 
 			<!-- FTP STORAGE-->
 			<li id="ftp">
 				<div class="collapsible-header">
-					<i class="material-icons">computer</i><?php echo __("FTP Storage",'xcloner-backup-and-restore')?>
+					<i class="material-icons">computer</i><?php echo __("FTP Storage", 'xcloner-backup-and-restore')?>
 					<div class="right">
 						<div class="switch">
 							<label>
 							Off
-							<input type="checkbox" name="xcloner_ftp_enable" class="status" value="1" <?php if(get_option("xcloner_ftp_enable")) echo "checked"?> \>
+							<input type="checkbox" name="xcloner_ftp_enable" class="status" value="1" <?php if (get_option("xcloner_ftp_enable")) echo "checked"?> \>
 							<span class="lever"></span>
 							On
 							</label>
@@ -25,96 +25,96 @@ 
 				<div class="collapsible-body">
 					<div class="row">
 						<div class="col s12 m3 label">
-							<label for="ftp_host"><?php echo __("Ftp Hostname",'xcloner-backup-and-restore')?></label>
+							<label for="ftp_host"><?php echo __("Ftp Hostname", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class="col s12 m6">
-							<input placeholder="<?php echo __("Ftp Hostname",'xcloner-backup-and-restore')?>" id="ftp_host" type="text" name="xcloner_ftp_hostname" class="validate" value="<?php echo get_option("xcloner_ftp_hostname")?>">
+							<input placeholder="<?php echo __("Ftp Hostname", 'xcloner-backup-and-restore')?>" id="ftp_host" type="text" name="xcloner_ftp_hostname" class="validate" value="<?php echo get_option("xcloner_ftp_hostname")?>">
 				        </div>
 				        <div class=" col s12 m2">
-							<input placeholder="<?php echo __("Ftp Port",'xcloner-backup-and-restore')?>" id="ftp_port" type="text" name="xcloner_ftp_port" class="validate" value="<?php echo get_option("xcloner_ftp_port", 21)?>">
+							<input placeholder="<?php echo __("Ftp Port", 'xcloner-backup-and-restore')?>" id="ftp_port" type="text" name="xcloner_ftp_port" class="validate" value="<?php echo get_option("xcloner_ftp_port", 21)?>">
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="ftp_username"><?php echo __("Ftp Username",'xcloner-backup-and-restore')?></label>
+							<label for="ftp_username"><?php echo __("Ftp Username", 'xcloner-backup-and-restore')?></label>
 						</div>	
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("Ftp Username",'xcloner-backup-and-restore')?>" id="ftp_username" type="text" name="xcloner_ftp_username" class="validate" value="<?php echo get_option("xcloner_ftp_username")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("Ftp Username", 'xcloner-backup-and-restore')?>" id="ftp_username" type="text" name="xcloner_ftp_username" class="validate" value="<?php echo get_option("xcloner_ftp_username")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="ftp_password"><?php echo __("Ftp Password",'xcloner-backup-and-restore')?></label>
+							<label for="ftp_password"><?php echo __("Ftp Password", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("Ftp Password",'xcloner-backup-and-restore')?>" id="ftp_password" type="password" name="xcloner_ftp_password" class="validate" value="<?php echo get_option("xcloner_ftp_password")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("Ftp Password", 'xcloner-backup-and-restore')?>" id="ftp_password" type="password" name="xcloner_ftp_password" class="validate" value="<?php echo get_option("xcloner_ftp_password")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="ftp_root"><?php echo __("Ftp Storage Folder",'xcloner-backup-and-restore')?></label>
+							<label for="ftp_root"><?php echo __("Ftp Storage Folder", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("Ftp Storage Folder",'xcloner-backup-and-restore')?>" id="ftp_root" type="text" name="xcloner_ftp_path" class="validate" value="<?php echo get_option("xcloner_ftp_path")?>">
+							<input placeholder="<?php echo __("Ftp Storage Folder", 'xcloner-backup-and-restore')?>" id="ftp_root" type="text" name="xcloner_ftp_path" class="validate" value="<?php echo get_option("xcloner_ftp_path")?>">
 						</div>	
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="ftp_root"><?php echo __("Ftp Transfer Mode",'xcloner-backup-and-restore')?></label>
+							<label for="ftp_root"><?php echo __("Ftp Transfer Mode", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6 input-field inline">
-							<input name="xcloner_ftp_transfer_mode" type="radio" id="passive" value="1" <?php if(get_option("xcloner_ftp_transfer_mode", 1)) echo "checked"?> />
-							<label for="passive"><?php echo __("Passive",'xcloner-backup-and-restore')?></label>
+							<input name="xcloner_ftp_transfer_mode" type="radio" id="passive" value="1" <?php if (get_option("xcloner_ftp_transfer_mode", 1)) echo "checked"?> />
+							<label for="passive"><?php echo __("Passive", 'xcloner-backup-and-restore')?></label>
 
-							<input name="xcloner_ftp_transfer_mode" type="radio" id="active" value="0" <?php if(!get_option("xcloner_ftp_transfer_mode", 1)) echo "checked"?> />
-							<label for="active"><?php echo __("Active",'xcloner-backup-and-restore')?></label>
+							<input name="xcloner_ftp_transfer_mode" type="radio" id="active" value="0" <?php if (!get_option("xcloner_ftp_transfer_mode", 1)) echo "checked"?> />
+							<label for="active"><?php echo __("Active", 'xcloner-backup-and-restore')?></label>
 						</div>	
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="ftp_ssl_mode"><?php echo __("Ftp Secure Connection",'xcloner-backup-and-restore')?></label>
+							<label for="ftp_ssl_mode"><?php echo __("Ftp Secure Connection", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6 input-field inline">
-							<input name="xcloner_ftp_ssl_mode" type="radio" id="ftp_ssl_mode_inactive" value="0" <?php if(!get_option("xcloner_ftp_ssl_mode")) echo "checked"?> />
-							<label for="ftp_ssl_mode_inactive"><?php echo __("Disable",'xcloner-backup-and-restore')?></label>
+							<input name="xcloner_ftp_ssl_mode" type="radio" id="ftp_ssl_mode_inactive" value="0" <?php if (!get_option("xcloner_ftp_ssl_mode")) echo "checked"?> />
+							<label for="ftp_ssl_mode_inactive"><?php echo __("Disable", 'xcloner-backup-and-restore')?></label>
 
-							<input name="xcloner_ftp_ssl_mode" type="radio" id="ftp_ssl_mode_active" value="1" <?php if(get_option("xcloner_ftp_ssl_mode")) echo "checked"?> />
-							<label for="ftp_ssl_mode_active"><?php echo __("Enable",'xcloner-backup-and-restore')?></label>
+							<input name="xcloner_ftp_ssl_mode" type="radio" id="ftp_ssl_mode_active" value="1" <?php if (get_option("xcloner_ftp_ssl_mode")) echo "checked"?> />
+							<label for="ftp_ssl_mode_active"><?php echo __("Enable", 'xcloner-backup-and-restore')?></label>
 						</div>	
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="ftp_timeout"><?php echo __("Ftp Timeout",'xcloner-backup-and-restore')?></label>
+							<label for="ftp_timeout"><?php echo __("Ftp Timeout", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m2">
-							<input placeholder="<?php echo __("Ftp Timeout",'xcloner-backup-and-restore')?>" id="ftp_timeout" type="text" name="xcloner_ftp_timeout" class="validate" value="<?php echo get_option("xcloner_ftp_timeout", 30)?>">
+							<input placeholder="<?php echo __("Ftp Timeout", 'xcloner-backup-and-restore')?>" id="ftp_timeout" type="text" name="xcloner_ftp_timeout" class="validate" value="<?php echo get_option("xcloner_ftp_timeout", 30)?>">
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="ftp_cleanup_days"><?php echo __("Ftp Cleanup (days)",'xcloner-backup-and-restore')?></label>
+							<label for="ftp_cleanup_days"><?php echo __("Ftp Cleanup (days)", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("how many days to keep the backups for",'xcloner-backup-and-restore')?>" id="ftp_cleanup_days" type="text" name="xcloner_ftp_cleanup_days" class="validate" value="<?php echo get_option("xcloner_ftp_cleanup_days")?>">
+							<input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore')?>" id="ftp_cleanup_days" type="text" name="xcloner_ftp_cleanup_days" class="validate" value="<?php echo get_option("xcloner_ftp_cleanup_days")?>">
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="ftp"><?php echo __("Save Settings",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="ftp"><?php echo __("Save Settings", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">save</i>
 							</button>
 						</div>	
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="ftp" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="ftp" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">import_export</i>
 							</button>
 						</div>
@@ -125,12 +125,12 @@ 
 			<!-- SFTP STORAGE-->
 			<li id="sftp">
 				<div class="collapsible-header">
-					<i class="material-icons">computer</i><?php echo __("SFTP Storage",'xcloner-backup-and-restore')?>
+					<i class="material-icons">computer</i><?php echo __("SFTP Storage", 'xcloner-backup-and-restore')?>
 					<div class="right">
 						<div class="switch">
 							<label>
 							Off
-							<input type="checkbox" name="xcloner_sftp_enable" class="status" value="1" <?php if(get_option("xcloner_sftp_enable")) echo "checked"?> \>
+							<input type="checkbox" name="xcloner_sftp_enable" class="status" value="1" <?php if (get_option("xcloner_sftp_enable")) echo "checked"?> \>
 							<span class="lever"></span>
 							On
 							</label>
@@ -140,79 +140,79 @@ 
 				<div class="collapsible-body">
 					<div class="row">
 						<div class="col s12 m3 label">
-							<label for="sftp_host"><?php echo __("SFTP Hostname",'xcloner-backup-and-restore')?></label>
+							<label for="sftp_host"><?php echo __("SFTP Hostname", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class="col s12 m6">
-							<input placeholder="<?php echo __("SFTP Hostname",'xcloner-backup-and-restore')?>" id="sftp_host" type="text" name="xcloner_sftp_hostname" class="validate" value="<?php echo get_option("xcloner_sftp_hostname")?>">
+							<input placeholder="<?php echo __("SFTP Hostname", 'xcloner-backup-and-restore')?>" id="sftp_host" type="text" name="xcloner_sftp_hostname" class="validate" value="<?php echo get_option("xcloner_sftp_hostname")?>">
 				        </div>
 				        <div class=" col s12 m2">
-							<input placeholder="<?php echo __("SFTP Port",'xcloner-backup-and-restore')?>" id="sftp_port" type="text" name="xcloner_sftp_port" class="validate" value="<?php echo get_option("xcloner_sftp_port", 22)?>">
+							<input placeholder="<?php echo __("SFTP Port", 'xcloner-backup-and-restore')?>" id="sftp_port" type="text" name="xcloner_sftp_port" class="validate" value="<?php echo get_option("xcloner_sftp_port", 22)?>">
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="sftp_username"><?php echo __("SFTP Username",'xcloner-backup-and-restore')?></label>
+							<label for="sftp_username"><?php echo __("SFTP Username", 'xcloner-backup-and-restore')?></label>
 						</div>	
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("SFTP Username",'xcloner-backup-and-restore')?>" id="sftp_username" type="text" name="xcloner_sftp_username" class="validate" value="<?php echo get_option("xcloner_sftp_username")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("SFTP Username", 'xcloner-backup-and-restore')?>" id="sftp_username" type="text" name="xcloner_sftp_username" class="validate" value="<?php echo get_option("xcloner_sftp_username")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="sftp_password"><?php echo __("SFTP Password",'xcloner-backup-and-restore')?></label>
+							<label for="sftp_password"><?php echo __("SFTP Password", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("SFTP Password",'xcloner-backup-and-restore')?>" id="ftp_spassword" type="password" name="xcloner_sftp_password" class="validate" value="<?php echo get_option("xcloner_sftp_password")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("SFTP Password", 'xcloner-backup-and-restore')?>" id="ftp_spassword" type="password" name="xcloner_sftp_password" class="validate" value="<?php echo get_option("xcloner_sftp_password")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="sftp_private_key"><?php echo __("SFTP Private Key",'xcloner-backup-and-restore')?></label>
+							<label for="sftp_private_key"><?php echo __("SFTP Private Key", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("SFTP Private Key",'xcloner-backup-and-restore')?>" id="sftp_private_key" type="text" name="xcloner_sftp_private_key" class="validate" value="<?php echo get_option("xcloner_sftp_private_key")?>">
+							<input placeholder="<?php echo __("SFTP Private Key", 'xcloner-backup-and-restore')?>" id="sftp_private_key" type="text" name="xcloner_sftp_private_key" class="validate" value="<?php echo get_option("xcloner_sftp_private_key")?>">
 						</div>	
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="sftp_root"><?php echo __("SFTP Storage Folder",'xcloner-backup-and-restore')?></label>
+							<label for="sftp_root"><?php echo __("SFTP Storage Folder", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("SFTP Storage Folder",'xcloner-backup-and-restore')?>" id="sftp_root" type="text" name="xcloner_sftp_path" class="validate" value="<?php echo get_option("xcloner_sftp_path")?>">
+							<input placeholder="<?php echo __("SFTP Storage Folder", 'xcloner-backup-and-restore')?>" id="sftp_root" type="text" name="xcloner_sftp_path" class="validate" value="<?php echo get_option("xcloner_sftp_path")?>">
 						</div>	
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="sftp_timeout"><?php echo __("SFTP Timeout",'xcloner-backup-and-restore')?></label>
+							<label for="sftp_timeout"><?php echo __("SFTP Timeout", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m2">
-							<input placeholder="<?php echo __("SFTP Timeout",'xcloner-backup-and-restore')?>" id="sftp_timeout" type="text" name="xcloner_sftp_timeout" class="validate" value="<?php echo get_option("xcloner_sftp_timeout", 30)?>">
+							<input placeholder="<?php echo __("SFTP Timeout", 'xcloner-backup-and-restore')?>" id="sftp_timeout" type="text" name="xcloner_sftp_timeout" class="validate" value="<?php echo get_option("xcloner_sftp_timeout", 30)?>">
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="sftp_cleanup_days"><?php echo __("SFTP Cleanup (days)",'xcloner-backup-and-restore')?></label>
+							<label for="sftp_cleanup_days"><?php echo __("SFTP Cleanup (days)", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("how many days to keep the backups for",'xcloner-backup-and-restore')?>" id="sftp_cleanup_days" type="text" name="xcloner_sftp_cleanup_days" class="validate" value="<?php echo get_option("xcloner_sftp_cleanup_days")?>">
+							<input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore')?>" id="sftp_cleanup_days" type="text" name="xcloner_sftp_cleanup_days" class="validate" value="<?php echo get_option("xcloner_sftp_cleanup_days")?>">
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="sftp"><?php echo __("Save Settings",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="sftp"><?php echo __("Save Settings", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">save</i>
 							</button>
 						</div>	
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="sftp" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="sftp" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">import_export</i>
 							</button>
 						</div>
@@ -224,12 +224,12 @@ 
 			<!-- AWS STORAGE-->
 			<li id="aws">
 				<div class="collapsible-header">
-					<i class="material-icons">computer</i><?php echo __("AWS Storage",'xcloner-backup-and-restore')?>
+					<i class="material-icons">computer</i><?php echo __("AWS Storage", 'xcloner-backup-and-restore')?>
 					<div class="right">
 						<div class="switch">
 							<label>
 							Off
-							<input type="checkbox" name="xcloner_aws_enable" class="status" value="1" <?php if(get_option("xcloner_aws_enable")) echo "checked"?> \>
+							<input type="checkbox" name="xcloner_aws_enable" class="status" value="1" <?php if (get_option("xcloner_aws_enable")) echo "checked"?> \>
 							<span class="lever"></span>
 							On
 							</label>
@@ -251,57 +251,57 @@ 
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="aws_key"><?php echo __("AWS Key",'xcloner-backup-and-restore')?></label>
+							<label for="aws_key"><?php echo __("AWS Key", 'xcloner-backup-and-restore')?></label>
 						</div>	
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("AWS Key",'xcloner-backup-and-restore')?>" id="aws_key" type="text" name="xcloner_aws_key" class="validate" value="<?php echo get_option("xcloner_aws_key")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("AWS Key", 'xcloner-backup-and-restore')?>" id="aws_key" type="text" name="xcloner_aws_key" class="validate" value="<?php echo get_option("xcloner_aws_key")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="aws_secret"><?php echo __("AWS Secret",'xcloner-backup-and-restore')?></label>
+							<label for="aws_secret"><?php echo __("AWS Secret", 'xcloner-backup-and-restore')?></label>
 						</div>	
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("AWS Secret",'xcloner-backup-and-restore')?>" id="aws_secret" type="text" name="xcloner_aws_secret" class="validate" value="<?php echo get_option("xcloner_aws_secret")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("AWS Secret", 'xcloner-backup-and-restore')?>" id="aws_secret" type="text" name="xcloner_aws_secret" class="validate" value="<?php echo get_option("xcloner_aws_secret")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="aws_region"><?php echo __("AWS Region",'xcloner-backup-and-restore')?></label>
+							<label for="aws_region"><?php echo __("AWS Region", 'xcloner-backup-and-restore')?></label>
 						</div>	
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("AWS Region",'xcloner-backup-and-restore')?>" id="aws_region" type="text" name="xcloner_aws_region" class="validate" value="<?php echo get_option("xcloner_aws_region")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("AWS Region", 'xcloner-backup-and-restore')?>" id="aws_region" type="text" name="xcloner_aws_region" class="validate" value="<?php echo get_option("xcloner_aws_region")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="aws_bucket_name"><?php echo __("AWS Bucket Name",'xcloner-backup-and-restore')?></label>
+							<label for="aws_bucket_name"><?php echo __("AWS Bucket Name", 'xcloner-backup-and-restore')?></label>
 						</div>	
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("AWS Bucket Name",'xcloner-backup-and-restore')?>" id="aws_bucket_name" type="text" name="xcloner_aws_bucket_name" class="validate" value="<?php echo get_option("xcloner_aws_bucket_name")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("AWS Bucket Name", 'xcloner-backup-and-restore')?>" id="aws_bucket_name" type="text" name="xcloner_aws_bucket_name" class="validate" value="<?php echo get_option("xcloner_aws_bucket_name")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="aws_cleanup_days"><?php echo __("AWS Cleanup (days)",'xcloner-backup-and-restore')?></label>
+							<label for="aws_cleanup_days"><?php echo __("AWS Cleanup (days)", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("how many days to keep the backups for",'xcloner-backup-and-restore')?>" id="aws_cleanup_days" type="text" name="xcloner_aws_cleanup_days" class="validate" value="<?php echo get_option("xcloner_aws_cleanup_days")?>">
+							<input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore')?>" id="aws_cleanup_days" type="text" name="xcloner_aws_cleanup_days" class="validate" value="<?php echo get_option("xcloner_aws_cleanup_days")?>">
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="aws"><?php echo __("Save Settings",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="aws"><?php echo __("Save Settings", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">save</i>
 							</button>
 						</div>	
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="aws" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="aws" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">import_export</i>
 							</button>
 						</div>
@@ -313,12 +313,12 @@ 
 			<!-- DROPBOX STORAGE-->
 			<li id="dropbox">
 				<div class="collapsible-header">
-					<i class="material-icons">computer</i><?php echo __("Dropbox Storage",'xcloner-backup-and-restore')?>
+					<i class="material-icons">computer</i><?php echo __("Dropbox Storage", 'xcloner-backup-and-restore')?>
 					<div class="right">
 						<div class="switch">
 							<label>
 							Off
-							<input type="checkbox" name="xcloner_dropbox_enable" class="status" value="1" <?php if(get_option("xcloner_dropbox_enable")) echo "checked"?> \>
+							<input type="checkbox" name="xcloner_dropbox_enable" class="status" value="1" <?php if (get_option("xcloner_dropbox_enable")) echo "checked"?> \>
 							<span class="lever"></span>
 							On
 							</label>
@@ -340,49 +340,49 @@ 
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="dropbox_access_token"><?php echo __("Dropbox Access Token",'xcloner-backup-and-restore')?></label>
+							<label for="dropbox_access_token"><?php echo __("Dropbox Access Token", 'xcloner-backup-and-restore')?></label>
 						</div>	
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("Dropbox Access Token",'xcloner-backup-and-restore')?>" id="dropbox_access_token" type="text" name="xcloner_dropbox_access_token" class="validate" value="<?php echo get_option("xcloner_dropbox_access_token")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("Dropbox Access Token", 'xcloner-backup-and-restore')?>" id="dropbox_access_token" type="text" name="xcloner_dropbox_access_token" class="validate" value="<?php echo get_option("xcloner_dropbox_access_token")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="dropbox_app_secret"><?php echo __("Dropbox App Secret",'xcloner-backup-and-restore')?></label>
+							<label for="dropbox_app_secret"><?php echo __("Dropbox App Secret", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("Dropbox App Secret",'xcloner-backup-and-restore')?>" id="dropbox_app_secret" type="text" name="xcloner_dropbox_app_secret" class="validate" value="<?php echo get_option("xcloner_dropbox_app_secret")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("Dropbox App Secret", 'xcloner-backup-and-restore')?>" id="dropbox_app_secret" type="text" name="xcloner_dropbox_app_secret" class="validate" value="<?php echo get_option("xcloner_dropbox_app_secret")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="dropbox_prefix"><?php echo __("Dropbox Prefix",'xcloner-backup-and-restore')?></label>
+							<label for="dropbox_prefix"><?php echo __("Dropbox Prefix", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("Dropbox Prefix",'xcloner-backup-and-restore')?>" id="dropbox_prefix" type="text" name="xcloner_dropbox_prefix" class="validate" value="<?php echo get_option("xcloner_dropbox_prefix")?>">
+							<input placeholder="<?php echo __("Dropbox Prefix", 'xcloner-backup-and-restore')?>" id="dropbox_prefix" type="text" name="xcloner_dropbox_prefix" class="validate" value="<?php echo get_option("xcloner_dropbox_prefix")?>">
 						</div>	
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="dropbox_cleanup_days"><?php echo __("Dropbox Cleanup (days)",'xcloner-backup-and-restore')?></label>
+							<label for="dropbox_cleanup_days"><?php echo __("Dropbox Cleanup (days)", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("how many days to keep the backups for",'xcloner-backup-and-restore')?>" id="dropbox_cleanup_days" type="text" name="xcloner_dropbox_cleanup_days" class="validate" value="<?php echo get_option("xcloner_dropbox_cleanup_days")?>">
+							<input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore')?>" id="dropbox_cleanup_days" type="text" name="xcloner_dropbox_cleanup_days" class="validate" value="<?php echo get_option("xcloner_dropbox_cleanup_days")?>">
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="dropbox"><?php echo __("Save Settings",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="dropbox"><?php echo __("Save Settings", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">save</i>
 							</button>
 						</div>	
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="dropbox" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="dropbox" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">import_export</i>
 							</button>
 						</div>
@@ -394,12 +394,12 @@ 
 			<!-- AZURE STORAGE-->
 			<li id="azure">
 				<div class="collapsible-header">
-					<i class="material-icons">computer</i><?php echo __("Azure Blog Storage",'xcloner-backup-and-restore')?>
+					<i class="material-icons">computer</i><?php echo __("Azure Blog Storage", 'xcloner-backup-and-restore')?>
 					<div class="right">
 						<div class="switch">
 							<label>
 							Off
-							<input type="checkbox" name="xcloner_azure_enable" class="status" value="1" <?php if(get_option("xcloner_azure_enable")) echo "checked"?> \>
+							<input type="checkbox" name="xcloner_azure_enable" class="status" value="1" <?php if (get_option("xcloner_azure_enable")) echo "checked"?> \>
 							<span class="lever"></span>
 							On
 							</label>
@@ -414,56 +414,56 @@ 
 						</div>	
 						<div class=" col s12 m6">
 							<p>
-								<?php echo sprintf(__('Visit %s and get your "Api Key".','xcloner-backup-and-restore'), '<a href="https://azure.microsoft.com/en-us/services/storage/blobs/" target="_blank">https://azure.microsoft.com/en-us/services/storage/blobs/</a>')?>
+								<?php echo sprintf(__('Visit %s and get your "Api Key".', 'xcloner-backup-and-restore'), '<a href="https://azure.microsoft.com/en-us/services/storage/blobs/" target="_blank">https://azure.microsoft.com/en-us/services/storage/blobs/</a>')?>
 							</p>
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="azure_account_name"><?php echo __("Azure Account Name",'xcloner-backup-and-restore')?></label>
+							<label for="azure_account_name"><?php echo __("Azure Account Name", 'xcloner-backup-and-restore')?></label>
 						</div>	
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("Azure Account Name",'xcloner-backup-and-restore')?>" id="azure_account_name" type="text" name="xcloner_azure_account_name" class="validate" value="<?php echo get_option("xcloner_azure_account_name")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("Azure Account Name", 'xcloner-backup-and-restore')?>" id="azure_account_name" type="text" name="xcloner_azure_account_name" class="validate" value="<?php echo get_option("xcloner_azure_account_name")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="azure_api_key"><?php echo __("Azure Api Key",'xcloner-backup-and-restore')?></label>
+							<label for="azure_api_key"><?php echo __("Azure Api Key", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("Azure Api Key",'xcloner-backup-and-restore')?>" id="azure_api_key" type="text" name="xcloner_azure_api_key" class="validate" value="<?php echo get_option("xcloner_azure_api_key")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("Azure Api Key", 'xcloner-backup-and-restore')?>" id="azure_api_key" type="text" name="xcloner_azure_api_key" class="validate" value="<?php echo get_option("xcloner_azure_api_key")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="azure_container"><?php echo __("Azure Container",'xcloner-backup-and-restore')?></label>
+							<label for="azure_container"><?php echo __("Azure Container", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("Azure Container",'xcloner-backup-and-restore')?>" id="azure_container" type="text" name="xcloner_azure_container" class="validate" value="<?php echo get_option("xcloner_azure_container")?>">
+							<input placeholder="<?php echo __("Azure Container", 'xcloner-backup-and-restore')?>" id="azure_container" type="text" name="xcloner_azure_container" class="validate" value="<?php echo get_option("xcloner_azure_container")?>">
 						</div>	
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="azure_cleanup_days"><?php echo __("Azure Cleanup (days)",'xcloner-backup-and-restore')?></label>
+							<label for="azure_cleanup_days"><?php echo __("Azure Cleanup (days)", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("how many days to keep the backups for",'xcloner-backup-and-restore')?>" id="azure_cleanup_days" type="text" name="xcloner_azure_cleanup_days" class="validate" value="<?php echo get_option("xcloner_azure_cleanup_days")?>">
+							<input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore')?>" id="azure_cleanup_days" type="text" name="xcloner_azure_cleanup_days" class="validate" value="<?php echo get_option("xcloner_azure_cleanup_days")?>">
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="azure"><?php echo __("Save Settings",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="azure"><?php echo __("Save Settings", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">save</i>
 							</button>
 						</div>	
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="azure" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="azure" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">import_export</i>
 							</button>
 						</div>
@@ -475,12 +475,12 @@ 
 			<!-- BACKBLAZE STORAGE-->
 			<li id="backblaze">
 				<div class="collapsible-header">
-					<i class="material-icons">computer</i><?php echo __("BackBlaze Storage",'xcloner-backup-and-restore')?>
+					<i class="material-icons">computer</i><?php echo __("BackBlaze Storage", 'xcloner-backup-and-restore')?>
 					<div class="right">
 						<div class="switch">
 							<label>
 							Off
-							<input type="checkbox" name="xcloner_backblaze_enable" class="status" value="1" <?php if(get_option("xcloner_backblaze_enable")) echo "checked"?> \>
+							<input type="checkbox" name="xcloner_backblaze_enable" class="status" value="1" <?php if (get_option("xcloner_backblaze_enable")) echo "checked"?> \>
 							<span class="lever"></span>
 							On
 							</label>
@@ -495,56 +495,56 @@ 
 						</div>	
 						<div class=" col s12 m6">
 							<p>
-								<?php echo sprintf(__('Visit %s and get your Account Id and  Application Key.','xcloner-backup-and-restore'), '<a href="https://secure.backblaze.com/b2_buckets.htm" target="_blank">https://secure.backblaze.com/b2_buckets.htm</a>')?>
+								<?php echo sprintf(__('Visit %s and get your Account Id and  Application Key.', 'xcloner-backup-and-restore'), '<a href="https://secure.backblaze.com/b2_buckets.htm" target="_blank">https://secure.backblaze.com/b2_buckets.htm</a>')?>
 							</p>
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="backblaze_account_id"><?php echo __("BackBlaze Account Id",'xcloner-backup-and-restore')?></label>
+							<label for="backblaze_account_id"><?php echo __("BackBlaze Account Id", 'xcloner-backup-and-restore')?></label>
 						</div>	
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("BackBlaze Account Id",'xcloner-backup-and-restore')?>" id="backblaze_account_id" type="text" name="xcloner_backblaze_account_id" class="validate" value="<?php echo get_option("xcloner_backblaze_account_id")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("BackBlaze Account Id", 'xcloner-backup-and-restore')?>" id="backblaze_account_id" type="text" name="xcloner_backblaze_account_id" class="validate" value="<?php echo get_option("xcloner_backblaze_account_id")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="backblaze_application_key"><?php echo __("BackBlaze Application Key",'xcloner-backup-and-restore')?></label>
+							<label for="backblaze_application_key"><?php echo __("BackBlaze Application Key", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("BackBlaze Application Key",'xcloner-backup-and-restore')?>" id="backblaze_application_key" type="text" name="xcloner_backblaze_application_key" class="validate" value="<?php echo get_option("xcloner_backblaze_application_key")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("BackBlaze Application Key", 'xcloner-backup-and-restore')?>" id="backblaze_application_key" type="text" name="xcloner_backblaze_application_key" class="validate" value="<?php echo get_option("xcloner_backblaze_application_key")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="backblaze_bucket_name"><?php echo __("BackBlaze Bucket Name",'xcloner-backup-and-restore')?></label>
+							<label for="backblaze_bucket_name"><?php echo __("BackBlaze Bucket Name", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("BackBlaze Bucket Name",'xcloner-backup-and-restore')?>" id="backblaze_bucket_name" type="text" name="xcloner_backblaze_bucket_name" class="validate" value="<?php echo get_option("xcloner_backblaze_bucket_name")?>" autocomplete="off" >
+							<input placeholder="<?php echo __("BackBlaze Bucket Name", 'xcloner-backup-and-restore')?>" id="backblaze_bucket_name" type="text" name="xcloner_backblaze_bucket_name" class="validate" value="<?php echo get_option("xcloner_backblaze_bucket_name")?>" autocomplete="off" >
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s12 m3 label">
-							<label for="backblaze_cleanup_days"><?php echo __("BackBlaze Cleanup (days)",'xcloner-backup-and-restore')?></label>
+							<label for="backblaze_cleanup_days"><?php echo __("BackBlaze Cleanup (days)", 'xcloner-backup-and-restore')?></label>
 						</div>
 						<div class=" col s12 m6">
-							<input placeholder="<?php echo __("how many days to keep the backups for",'xcloner-backup-and-restore')?>" id="backblaze_cleanup_days" type="text" name="xcloner_backblaze_cleanup_days" class="validate" value="<?php echo get_option("xcloner_backblaze_cleanup_days")?>">
+							<input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore')?>" id="backblaze_cleanup_days" type="text" name="xcloner_backblaze_cleanup_days" class="validate" value="<?php echo get_option("xcloner_backblaze_cleanup_days")?>">
 				        </div>
 			        </div>
 			        
 			        <div class="row">
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="backblaze"><?php echo __("Save Settings",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light" type="submit" name="action" id="action"  value="backblaze"><?php echo __("Save Settings", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">save</i>
 							</button>
 						</div>	
 						<div class="col s6 m4">
-							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="backblaze" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify",'xcloner-backup-and-restore')?>
+							<button class="btn waves-effect waves-light orange" type="submit" name="action" id="action"  value="backblaze" onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore')?>
 								<i class="material-icons right">import_export</i>
 							</button>
 						</div>

admin/partials/xcloner_scheduled_backups_page.php

Spacing +8 added lines, -8 removed lines

@@ -3,7 +3,7 @@ 
 $xcloner_remote_storage = new Xcloner_Remote_Storage();
 $available_storages = $xcloner_remote_storage->get_available_storages();
 ?>
-<?php if(!defined("DISABLE_WP_CRON") || !DISABLE_WP_CRON): ?>
+<?php if (!defined("DISABLE_WP_CRON") || !DISABLE_WP_CRON): ?>
 	<div id="setting-error-" class="error settings-error notice is-dismissible"> 
 		<p><strong>
 			<?php echo sprintf(__('We have noticed that DISABLE_WP_CRON is disabled, we recommend enabling that and setting up wp-cron.php to run manually through your hosting account scheduler as explained <a href="%s" target="_blank">here</a>', 'xcloner-backup-and-restore'), "http://www.inmotionhosting.com/support/website/wordpress/disabling-the-wp-cronphp-in-wordpress") ?>
@@ -102,21 +102,21 @@ 
 					<div class="input-field col s12 l6">
 						<select name="schedule_frequency" id="schedule_frequency" class="validate" required>
 							<option value="" disabled selected><?php echo __('Schedule Recurrence', 'xcloner-backup-and-restore') ?></option>
-							<option value="single"><?php echo __("Don't Repeat",'xcloner-backup-and-restore')?></option>
-							<option value="hourly"><?php echo __("Hourly",'xcloner-backup-and-restore')?></option>
-							<option value="daily"><?php echo __("Daily",'xcloner-backup-and-restore')?></option>
-							<option value="weekly"><?php echo __("Weekly",'xcloner-backup-and-restore')?></option>
-							<option value="monthly"><?php echo __("Monthly",'xcloner-backup-and-restore')?></option>
+							<option value="single"><?php echo __("Don't Repeat", 'xcloner-backup-and-restore')?></option>
+							<option value="hourly"><?php echo __("Hourly", 'xcloner-backup-and-restore')?></option>
+							<option value="daily"><?php echo __("Daily", 'xcloner-backup-and-restore')?></option>
+							<option value="weekly"><?php echo __("Weekly", 'xcloner-backup-and-restore')?></option>
+							<option value="monthly"><?php echo __("Monthly", 'xcloner-backup-and-restore')?></option>
 						</select>
 					</div>
 				</div>
 				
-				<?php if(sizeof($available_storages)):?>
+				<?php if (sizeof($available_storages)):?>
 				<div class="row">
 					<div class="input-field col s12 l6">
 						<select name="schedule_storage" id="schedule_storage" class="validate" >
 							<option value="" selected><?php echo __('none', 'xcloner-backup-and-restore') ?></option>
-							<?php foreach($available_storages as $storage=>$text):?>
+							<?php foreach ($available_storages as $storage=>$text):?>
 								<option value="<?php echo $storage?>"><?php echo $text?></option>
 							<?php endforeach?>
 						</select>

includes/class-xcloner-logger.php

Spacing +16 added lines, -16 removed lines

@@ -4,32 +4,32 @@ 
 use Monolog\Handler\StreamHandler;
 use Monolog\Handler\RotatingFileHandler;
 
-class Xcloner_Logger extends Logger{
+class Xcloner_Logger extends Logger {
 	
-	private $logger_path ;
+	private $logger_path;
 	private $max_logger_files = 15;
 	private $main_logger_url;
 	
-	public function __construct($logger_name = "xcloner_logger", $hash="")
+	public function __construct($logger_name = "xcloner_logger", $hash = "")
 	{
-		$xcloner_settings 	= new Xcloner_Settings($hash);
-		$logger_path 		= $xcloner_settings->get_xcloner_store_path().DS.$xcloner_settings->get_logger_filename();
+		$xcloner_settings = new Xcloner_Settings($hash);
+		$logger_path = $xcloner_settings->get_xcloner_store_path().DS.$xcloner_settings->get_logger_filename();
 		$logger_path_tmp 	= "";
 		
-		if($hash)
+		if ($hash)
 			$logger_path_tmp = $xcloner_settings->get_xcloner_tmp_path().DS.$xcloner_settings->get_logger_filename(1);
 		
 		
 		$this->logger_path = $logger_path;
 		//$this->logger_path_tmp = $logger_path_tmp;
 		
-		if(!is_dir($xcloner_settings->get_xcloner_store_path()) or !is_writable($xcloner_settings->get_xcloner_store_path()))
+		if (!is_dir($xcloner_settings->get_xcloner_store_path()) or !is_writable($xcloner_settings->get_xcloner_store_path()))
 		{
 			$logger_path = "php://stderr";
 			$logger_path_tmp = "";
 		}
 		
-		if(!$xcloner_settings->get_xcloner_option('xcloner_enable_log'))
+		if (!$xcloner_settings->get_xcloner_option('xcloner_enable_log'))
 		{
 			$logger_path = "php://stderr";
 			$logger_path_tmp = "";
@@ -40,19 +40,19 @@ 
 		
 		$debug_level = Logger::INFO;
 		
-		if(WP_DEBUG)
+		if (WP_DEBUG)
 			$debug_level = Logger::DEBUG;
 
 	
-		if($logger_path)
+		if ($logger_path)
 		{
 			$stream = new RotatingFileHandler($logger_path, $this->max_logger_files, $debug_level);
 			$this->pushHandler($stream);
 			
-			$this->main_logger_url =  $stream->getUrl();
+			$this->main_logger_url = $stream->getUrl();
 		}
 			
-		if($hash and $logger_path_tmp)
+		if ($hash and $logger_path_tmp)
 			$this->pushHandler(new StreamHandler($logger_path_tmp, $debug_level));
 		
 		//return $this;
@@ -68,7 +68,7 @@ 
 		$lines = array();
 		
 		//if(!file_exists($this->logger_path) or !is_readable($this->logger_path))
-		if(!file_exists($this->main_logger_url) or !is_readable($this->main_logger_url))
+		if (!file_exists($this->main_logger_url) or !is_readable($this->main_logger_url))
 			return false;
 		
 		//$fp = fopen($this->logger_path, 'r');
@@ -78,12 +78,12 @@ 
 		$lastLine = "";
 		
 		// Loop backword until we have our lines or we reach the start
-		while($pos > 0 && count($lines) < $totalLines) {
+		while ($pos > 0 && count($lines) < $totalLines) {
 		
 		$C = fgetc($fp);
-		if($C == "\n") {
+		if ($C == "\n") {
 		  // skip empty lines
-		  if(trim($lastLine) != "") {
+		  if (trim($lastLine) != "") {
 			$lines[] = $lastLine;
 		  }
 		  $lastLine = '';

Braces +12 added lines, -8 removed lines

@@ -16,8 +16,9 @@ 
 		$logger_path 		= $xcloner_settings->get_xcloner_store_path().DS.$xcloner_settings->get_logger_filename();
 		$logger_path_tmp 	= "";
 		
-		if($hash)
-			$logger_path_tmp = $xcloner_settings->get_xcloner_tmp_path().DS.$xcloner_settings->get_logger_filename(1);
+		if($hash) {
+					$logger_path_tmp = $xcloner_settings->get_xcloner_tmp_path().DS.$xcloner_settings->get_logger_filename(1);
+		}
 		
 		
 		$this->logger_path = $logger_path;
@@ -40,8 +41,9 @@ 
 		
 		$debug_level = Logger::INFO;
 		
-		if(WP_DEBUG)
-			$debug_level = Logger::DEBUG;
+		if(WP_DEBUG) {
+					$debug_level = Logger::DEBUG;
+		}
 
 	
 		if($logger_path)
@@ -52,8 +54,9 @@ 
 			$this->main_logger_url =  $stream->getUrl();
 		}
 			
-		if($hash and $logger_path_tmp)
-			$this->pushHandler(new StreamHandler($logger_path_tmp, $debug_level));
+		if($hash and $logger_path_tmp) {
+					$this->pushHandler(new StreamHandler($logger_path_tmp, $debug_level));
+		}
 		
 		//return $this;
 	}
@@ -68,8 +71,9 @@ 
 		$lines = array();
 		
 		//if(!file_exists($this->logger_path) or !is_readable($this->logger_path))
-		if(!file_exists($this->main_logger_url) or !is_readable($this->main_logger_url))
-			return false;
+		if(!file_exists($this->main_logger_url) or !is_readable($this->main_logger_url)) {
+					return false;
+		}
 		
 		//$fp = fopen($this->logger_path, 'r');
 		$fp = fopen($this->main_logger_url, 'r');

includes/class-xcloner-loader.php

Spacing +19 added lines, -19 removed lines

@@ -55,19 +55,19 @@ 
 	
 	public function xcloner_backup_add_admin_menu()
 	{
-		if ( function_exists('add_menu_page') )
-			add_menu_page( __('Site Backup','xcloner-backup-and-restore'), __('Site Backup','xcloner-backup-and-restore'), 'manage_options', 'xcloner_init_page', 'xcloner_display', 'dashicons-backup');
+		if (function_exists('add_menu_page'))
+			add_menu_page(__('Site Backup', 'xcloner-backup-and-restore'), __('Site Backup', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_init_page', 'xcloner_display', 'dashicons-backup');
 
-		if ( function_exists('add_submenu_page') )
+		if (function_exists('add_submenu_page'))
 		{
 			
-			add_submenu_page( 'xcloner_init_page', __('XCloner Dashboard','xcloner-backup-and-restore'), __('Dashboard','xcloner-backup-and-restore'), 'manage_options', 'xcloner_init_page', 'xcloner_display');
-			add_submenu_page( 'xcloner_init_page', __('XCloner Backup Settings','xcloner-backup-and-restore'), __('Settings','xcloner-backup-and-restore'), 'manage_options', 'xcloner_settings_page', 'xcloner_display');
-			add_submenu_page( 'xcloner_init_page', __('Remote Storage Settings','xcloner-backup-and-restore'), __('Remote Storage','xcloner-backup-and-restore'), 'manage_options', 'xcloner_remote_storage_page', 'xcloner_display');
-			add_submenu_page( 'xcloner_init_page', __('Manage Backups','xcloner-backup-and-restore'), __('Manage Backups','xcloner-backup-and-restore'), 'manage_options', 'xcloner_manage_backups_page', 'xcloner_display');
-			add_submenu_page( 'xcloner_init_page', __('Scheduled Backups','xcloner-backup-and-restore'), __('Scheduled Backups','xcloner-backup-and-restore'), 'manage_options', 'xcloner_scheduled_backups_page', 'xcloner_display');
-			add_submenu_page( 'xcloner_init_page', __('Generate Backups','xcloner-backup-and-restore'), __('Generate Backups','xcloner-backup-and-restore'), 'manage_options', 'xcloner_generate_backups_page', 'xcloner_display');
-			add_submenu_page( 'xcloner_init_page', __('Restore Backups','xcloner-backup-and-restore'), __('Restore Backups','xcloner-backup-and-restore'), 'manage_options', 'xcloner_restore_page', 'xcloner_display');
+			add_submenu_page('xcloner_init_page', __('XCloner Dashboard', 'xcloner-backup-and-restore'), __('Dashboard', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_init_page', 'xcloner_display');
+			add_submenu_page('xcloner_init_page', __('XCloner Backup Settings', 'xcloner-backup-and-restore'), __('Settings', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_settings_page', 'xcloner_display');
+			add_submenu_page('xcloner_init_page', __('Remote Storage Settings', 'xcloner-backup-and-restore'), __('Remote Storage', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_remote_storage_page', 'xcloner_display');
+			add_submenu_page('xcloner_init_page', __('Manage Backups', 'xcloner-backup-and-restore'), __('Manage Backups', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_manage_backups_page', 'xcloner_display');
+			add_submenu_page('xcloner_init_page', __('Scheduled Backups', 'xcloner-backup-and-restore'), __('Scheduled Backups', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_scheduled_backups_page', 'xcloner_display');
+			add_submenu_page('xcloner_init_page', __('Generate Backups', 'xcloner-backup-and-restore'), __('Generate Backups', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_generate_backups_page', 'xcloner_display');
+			add_submenu_page('xcloner_init_page', __('Restore Backups', 'xcloner-backup-and-restore'), __('Restore Backups', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_restore_page', 'xcloner_display');
 		}
 	
 	}
@@ -82,8 +82,8 @@ 
 	 * @param    int                  $priority         Optional. he priority at which the function should be fired. Default is 10.
 	 * @param    int                  $accepted_args    Optional. The number of arguments that should be passed to the $callback. Default is 1.
 	 */
-	public function add_action( $hook, $component, $callback, $priority = 10, $accepted_args = 1 ) {
-		$this->actions = $this->add( $this->actions, $hook, $component, $callback, $priority, $accepted_args );
+	public function add_action($hook, $component, $callback, $priority = 10, $accepted_args = 1) {
+		$this->actions = $this->add($this->actions, $hook, $component, $callback, $priority, $accepted_args);
 	}
 
 	/**
@@ -96,8 +96,8 @@ 
 	 * @param    int                  $priority         Optional. he priority at which the function should be fired. Default is 10.
 	 * @param    int                  $accepted_args    Optional. The number of arguments that should be passed to the $callback. Default is 1
 	 */
-	public function add_filter( $hook, $component, $callback, $priority = 10, $accepted_args = 1 ) {
-		$this->filters = $this->add( $this->filters, $hook, $component, $callback, $priority, $accepted_args );
+	public function add_filter($hook, $component, $callback, $priority = 10, $accepted_args = 1) {
+		$this->filters = $this->add($this->filters, $hook, $component, $callback, $priority, $accepted_args);
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 	 * @param    int                  $accepted_args    The number of arguments that should be passed to the $callback.
 	 * @return   array                                  The collection of actions and filters registered with WordPress.
 	 */
-	private function add( $hooks, $hook, $component, $callback, $priority, $accepted_args ) {
+	private function add($hooks, $hook, $component, $callback, $priority, $accepted_args) {
 
 		$hooks[] = array(
 			'hook'          => $hook,
@@ -135,12 +135,12 @@ 
 	 */
 	public function run() {
 
-		foreach ( $this->filters as $hook ) {
-			add_filter( $hook['hook'], array( $hook['component'], $hook['callback'] ), $hook['priority'], $hook['accepted_args'] );
+		foreach ($this->filters as $hook) {
+			add_filter($hook['hook'], array($hook['component'], $hook['callback']), $hook['priority'], $hook['accepted_args']);
 		}
 
-		foreach ( $this->actions as $hook ) {
-			add_action( $hook['hook'], array( $hook['component'], $hook['callback'] ), $hook['priority'], $hook['accepted_args'] );
+		foreach ($this->actions as $hook) {
+			add_action($hook['hook'], array($hook['component'], $hook['callback']), $hook['priority'], $hook['accepted_args']);
 		}
 
 	}

Braces +3 added lines, -2 removed lines

@@ -55,8 +55,9 @@
 	
 	public function xcloner_backup_add_admin_menu()
 	{
-		if ( function_exists('add_menu_page') )
-			add_menu_page( __('Site Backup','xcloner-backup-and-restore'), __('Site Backup','xcloner-backup-and-restore'), 'manage_options', 'xcloner_init_page', 'xcloner_display', 'dashicons-backup');
+		if ( function_exists('add_menu_page') ) {
+					add_menu_page( __('Site Backup','xcloner-backup-and-restore'), __('Site Backup','xcloner-backup-and-restore'), 'manage_options', 'xcloner_init_page', 'xcloner_display', 'dashicons-backup');
+		}
 
 		if ( function_exists('add_submenu_page') )
 		{

includes/class-xcloner-scheduler.php

Spacing +59 added lines, -59 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class Xcloner_Scheduler{
+class Xcloner_Scheduler {
 	
 	private $db;
 	private $scheduler_table = "xcloner_scheduler";
@@ -20,23 +20,23 @@ 
 		global $wpdb;
 		$this->db = $wpdb;
 		
-		$wpdb->show_errors				= false;
+		$wpdb->show_errors = false;
 		
 		$this->xcloner_settings 		= new Xcloner_Settings();
 		
 		$this->scheduler_table 			= $this->db->prefix.$this->scheduler_table;
 	}
 
-	public function get_scheduler_list($return_only_enabled = 0 )
+	public function get_scheduler_list($return_only_enabled = 0)
 	{
 		$list = $this->db->get_results("SELECT * FROM ".$this->scheduler_table);
 		
-		if($return_only_enabled)
+		if ($return_only_enabled)
 		{
-			$new_list= array();
+			$new_list = array();
 			
-			foreach($list as $res)
-				if($res->status)
+			foreach ($list as $res)
+				if ($res->status)
 				{
 					$res->next_run_time = wp_next_scheduled('xcloner_scheduler_'.$res->id, array($res->id));
 					$new_list[] = $res;
@@ -64,7 +64,7 @@ 
 	{
 		$data = $this->db->get_row("SELECT * FROM ".$this->scheduler_table." WHERE id=".$id, ARRAY_A);
 		
-		if(!$data)
+		if (!$data)
 			return false;
 		
 		$params = json_decode($data['params']);
@@ -81,10 +81,10 @@ 
 	
 	public function delete_schedule_by_id($id)
 	{
-		$hook =  'xcloner_scheduler_'.$id;
-		wp_clear_scheduled_hook( $hook, array($id) );
+		$hook = 'xcloner_scheduler_'.$id;
+		wp_clear_scheduled_hook($hook, array($id));
 		
-		$data = $this->db->delete( $this->scheduler_table , array( 'id' => $id ) );
+		$data = $this->db->delete($this->scheduler_table, array('id' => $id));
 		
 		return $data;
 	}
@@ -93,12 +93,12 @@ 
 	{
 		$list = $this->get_scheduler_list();
 		
-		foreach($list as $schedule)
+		foreach ($list as $schedule)
 		{
-			$hook =  'xcloner_scheduler_'.$schedule->id;
+			$hook = 'xcloner_scheduler_'.$schedule->id;
 			
-			$timestamp = wp_next_scheduled( $hook , array($schedule->id) );
-			wp_unschedule_event( $timestamp, $hook, array($schedule->id) );
+			$timestamp = wp_next_scheduled($hook, array($schedule->id));
+			wp_unschedule_event($timestamp, $hook, array($schedule->id));
 		}
 	}
 	
@@ -106,24 +106,24 @@ 
 	{
 		$list = $this->get_scheduler_list();
 		
-		foreach($list as $schedule)
+		foreach ($list as $schedule)
 		{
-			$hook =  'xcloner_scheduler_'.$schedule->id;
+			$hook = 'xcloner_scheduler_'.$schedule->id;
 			
 			//adding the xcloner_scheduler hook with xcloner_scheduler_callback callback
-			add_action( $hook, array($this, 'xcloner_scheduler_callback'), 10,  1 );
+			add_action($hook, array($this, 'xcloner_scheduler_callback'), 10, 1);
 			
-			if ( ! wp_next_scheduled( $hook, array($schedule->id) ) and $schedule->status) {
+			if (!wp_next_scheduled($hook, array($schedule->id)) and $schedule->status) {
 				
-				if($schedule->recurrence == "single")
-					wp_schedule_single_event( strtotime($schedule->start_at), $hook, array($schedule->id));
+				if ($schedule->recurrence == "single")
+					wp_schedule_single_event(strtotime($schedule->start_at), $hook, array($schedule->id));
 				else	
-					wp_schedule_event( strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id) );
+					wp_schedule_event(strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id));
 					
-			}elseif(!$schedule->status)
+			}elseif (!$schedule->status)
 			{
-				$timestamp = wp_next_scheduled( $hook , array($schedule->id) );
-				wp_unschedule_event( $timestamp, $hook, array($schedule->id) );
+				$timestamp = wp_next_scheduled($hook, array($schedule->id));
+				wp_unschedule_event($timestamp, $hook, array($schedule->id));
 			}
 		}
 	
@@ -132,17 +132,17 @@ 
 	public function update_cron_hook($id)
 	{
 		$schedule = $this->get_schedule_by_id_object($id);
-		$hook =  'xcloner_scheduler_'.$schedule->id;
+		$hook = 'xcloner_scheduler_'.$schedule->id;
 		
-		$timestamp = wp_next_scheduled( $hook , array($schedule->id) );
-		wp_unschedule_event( $timestamp, $hook, array($schedule->id) );
+		$timestamp = wp_next_scheduled($hook, array($schedule->id));
+		wp_unschedule_event($timestamp, $hook, array($schedule->id));
 		
 		if ($schedule->status) {
 			
-			if($schedule->recurrence == "single")
-				wp_schedule_single_event( strtotime($schedule->start_at), $hook, array($schedule->id));
-			else{	
-				wp_schedule_event( strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id) );
+			if ($schedule->recurrence == "single")
+				wp_schedule_single_event(strtotime($schedule->start_at), $hook, array($schedule->id));
+			else {	
+				wp_schedule_event(strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id));
 			}
 				
 		}
@@ -150,16 +150,16 @@ 
 	
 	public function disable_single_cron($schedule_id)
 	{
-		$hook =  'xcloner_scheduler_'.$schedule_id;
-		$timestamp = wp_next_scheduled( $hook , array($schedule_id) );
-		wp_unschedule_event( $timestamp, $hook, array($schedule_id) );
+		$hook = 'xcloner_scheduler_'.$schedule_id;
+		$timestamp = wp_next_scheduled($hook, array($schedule_id));
+		wp_unschedule_event($timestamp, $hook, array($schedule_id));
 		
 		$schedule['status'] = 0;
 		
 		$update = $this->db->update( 
 				$this->scheduler_table, 
 				$schedule, 
-				array( 'id' => $schedule_id ), 
+				array('id' => $schedule_id), 
 				array( 
 					'%s', 
 					'%s' 
@@ -175,7 +175,7 @@ 
 		$update = $this->db->update( 
 				$this->scheduler_table, 
 				$schedule, 
-				array( 'id' => $schedule_id ), 
+				array('id' => $schedule_id), 
 				array( 
 					'%s', 
 					'%s' 
@@ -191,7 +191,7 @@ 
 		$update = $this->db->update( 
 				$this->scheduler_table, 
 				$schedule, 
-				array( 'id' => $schedule_id ), 
+				array('id' => $schedule_id), 
 				array( 
 					'%s', 
 					'%s' 
@@ -206,20 +206,20 @@ 
 		
 		$this->xcloner_settings->generate_new_hash();
 		
-		$this->xcloner_file_system 		= new Xcloner_File_System($this->xcloner_settings->get_hash());
-		$this->xcloner_database 		= new XCloner_Database($this->xcloner_settings->get_hash());
-		$this->archive_system 			= new Xcloner_Archive($this->xcloner_settings->get_hash());
-		$this->logger 					= new XCloner_Logger('xcloner_scheduler', $this->xcloner_settings->get_hash());
-		$this->xcloner_remote_storage 	= new Xcloner_Remote_Storage($this->xcloner_settings->get_hash());
+		$this->xcloner_file_system = new Xcloner_File_System($this->xcloner_settings->get_hash());
+		$this->xcloner_database = new XCloner_Database($this->xcloner_settings->get_hash());
+		$this->archive_system = new Xcloner_Archive($this->xcloner_settings->get_hash());
+		$this->logger = new XCloner_Logger('xcloner_scheduler', $this->xcloner_settings->get_hash());
+		$this->xcloner_remote_storage = new Xcloner_Remote_Storage($this->xcloner_settings->get_hash());
 		
 		//$schedule = $this->get_schedule_by_id($id);
 		
-		if($schedule['recurrence'] == "single")
+		if ($schedule['recurrence'] == "single")
 		{
 			$this->disable_single_cron($schedule['id']);
 		}
 		
-		if(!$schedule)
+		if (!$schedule)
 		{
 			$this->logger->info(sprintf("Could not load schedule with id'%s'", $id), array("CRON"));
 			return;
@@ -234,7 +234,7 @@ 
 		$init = 1;
 		$continue = 1;
 
-		while($continue)
+		while ($continue)
 		{
 			$continue = $this->xcloner_file_system->start_file_recursion($init);
 			
@@ -248,9 +248,9 @@ 
 		$init = 1;
 		$return['finished'] = 0;
 		
-		while(!$return['finished'])
+		while (!$return['finished'])
 		{
-			$return  = $this->xcloner_database->start_database_recursion((array)json_decode($schedule['table_params']), $return, $init);
+			$return = $this->xcloner_database->start_database_recursion((array)json_decode($schedule['table_params']), $return, $init);
 			$init = 0;
 		}
 		
@@ -262,7 +262,7 @@ 
 		$return['finished'] = 0;
 		$return['extra'] = array();
 		
-		while(!$return['finished'])
+		while (!$return['finished'])
 		{
 			$return = $this->archive_system->start_incremental_backup((array)$schedule['backup_params'], $return['extra'], $init);
 			$init = 0;
@@ -271,28 +271,28 @@ 
 		
 		//getting the last backup archive file
 		$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_with_extension();
-		if($this->xcloner_file_system->is_part($this->archive_system->get_archive_name_with_extension()))
+		if ($this->xcloner_file_system->is_part($this->archive_system->get_archive_name_with_extension()))
 				$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_multipart();
 		
 		$this->update_last_backup($schedule['id'], $return['extra']['backup_parent']);
 		
-		if($schedule['remote_storage'] and array_key_exists($schedule['remote_storage'], $this->xcloner_remote_storage->get_available_storages()))
+		if ($schedule['remote_storage'] and array_key_exists($schedule['remote_storage'], $this->xcloner_remote_storage->get_available_storages()))
 		{
 			$backup_file = $return['extra']['backup_parent'];
 			
 			$this->logger->info(sprintf("Transferring backup to remote storage %s", strtoupper($schedule['remote_storage'])), array("CRON"));
 			
-			if(method_exists($this->xcloner_remote_storage, "upload_backup_to_storage"))
+			if (method_exists($this->xcloner_remote_storage, "upload_backup_to_storage"))
 				call_user_func_array(array($this->xcloner_remote_storage, "upload_backup_to_storage"), array($backup_file, $schedule['remote_storage']));
 		}
 		
 		
-		if(isset($schedule['backup_params']->email_notification) and $to=$schedule['backup_params']->email_notification)
+		if (isset($schedule['backup_params']->email_notification) and $to = $schedule['backup_params']->email_notification)
 		{	
-			try{
+			try {
 				$from = "XCloner Schedule - ".$schedule['name'];
 				$this->archive_system->send_notification($to, $from, "", $return['extra']['backup_parent'], $schedule);
-			}catch(Exception $e)
+			}catch (Exception $e)
 			{
 				$this->logger->error($e->getMessage());
 			}
@@ -307,16 +307,16 @@ 
 	{
 		$schedule = $this->get_schedule_by_id($id);
 		
-		try{
+		try {
 
 			$this->__xcloner_scheduler_callback($id, $schedule);
 			
-		}catch(Exception $e){
+		}catch (Exception $e) {
 			
-			if(isset($schedule['backup_params']->email_notification) and $to=$schedule['backup_params']->email_notification)
+			if (isset($schedule['backup_params']->email_notification) and $to = $schedule['backup_params']->email_notification)
 			{
 				$from = "XCloner Schedule - ".$schedule['name'];
-				$this->archive_system->send_notification($to, $from, "Scheduled backup error","", "", $e->getMessage());
+				$this->archive_system->send_notification($to, $from, "Scheduled backup error", "", "", $e->getMessage());
 			}
 			
 		}

Braces +23 added lines, -18 removed lines

@@ -35,10 +35,11 @@ 
 		{
 			$new_list= array();
 			
-			foreach($list as $res)
-				if($res->status)
+			foreach($list as $res) {
+							if($res->status)
 				{
 					$res->next_run_time = wp_next_scheduled('xcloner_scheduler_'.$res->id, array($res->id));
+			}
 					$new_list[] = $res;
 				}
 			$list = $new_list;	
@@ -64,8 +65,9 @@ 
 	{
 		$data = $this->db->get_row("SELECT * FROM ".$this->scheduler_table." WHERE id=".$id, ARRAY_A);
 		
-		if(!$data)
-			return false;
+		if(!$data) {
+					return false;
+		}
 		
 		$params = json_decode($data['params']);
 		
@@ -115,12 +117,13 @@ 
 			
 			if ( ! wp_next_scheduled( $hook, array($schedule->id) ) and $schedule->status) {
 				
-				if($schedule->recurrence == "single")
-					wp_schedule_single_event( strtotime($schedule->start_at), $hook, array($schedule->id));
-				else	
-					wp_schedule_event( strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id) );
+				if($schedule->recurrence == "single") {
+									wp_schedule_single_event( strtotime($schedule->start_at), $hook, array($schedule->id));
+				} else {
+									wp_schedule_event( strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id) );
+				}
 					
-			}elseif(!$schedule->status)
+			} elseif(!$schedule->status)
 			{
 				$timestamp = wp_next_scheduled( $hook , array($schedule->id) );
 				wp_unschedule_event( $timestamp, $hook, array($schedule->id) );
@@ -139,9 +142,9 @@ 
 		
 		if ($schedule->status) {
 			
-			if($schedule->recurrence == "single")
-				wp_schedule_single_event( strtotime($schedule->start_at), $hook, array($schedule->id));
-			else{	
+			if($schedule->recurrence == "single") {
+							wp_schedule_single_event( strtotime($schedule->start_at), $hook, array($schedule->id));
+			} else{	
 				wp_schedule_event( strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id) );
 			}
 				
@@ -271,8 +274,9 @@ 
 		
 		//getting the last backup archive file
 		$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_with_extension();
-		if($this->xcloner_file_system->is_part($this->archive_system->get_archive_name_with_extension()))
-				$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_multipart();
+		if($this->xcloner_file_system->is_part($this->archive_system->get_archive_name_with_extension())) {
+						$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_multipart();
+		}
 		
 		$this->update_last_backup($schedule['id'], $return['extra']['backup_parent']);
 		
@@ -282,8 +286,9 @@ 
 			
 			$this->logger->info(sprintf("Transferring backup to remote storage %s", strtoupper($schedule['remote_storage'])), array("CRON"));
 			
-			if(method_exists($this->xcloner_remote_storage, "upload_backup_to_storage"))
-				call_user_func_array(array($this->xcloner_remote_storage, "upload_backup_to_storage"), array($backup_file, $schedule['remote_storage']));
+			if(method_exists($this->xcloner_remote_storage, "upload_backup_to_storage")) {
+							call_user_func_array(array($this->xcloner_remote_storage, "upload_backup_to_storage"), array($backup_file, $schedule['remote_storage']));
+			}
 		}
 		
 		
@@ -292,7 +297,7 @@ 
 			try{
 				$from = "XCloner Schedule - ".$schedule['name'];
 				$this->archive_system->send_notification($to, $from, "", $return['extra']['backup_parent'], $schedule);
-			}catch(Exception $e)
+			} catch(Exception $e)
 			{
 				$this->logger->error($e->getMessage());
 			}
@@ -311,7 +316,7 @@ 
 
 			$this->__xcloner_scheduler_callback($id, $schedule);
 			
-		}catch(Exception $e){
+		} catch(Exception $e){
 			
 			if(isset($schedule['backup_params']->email_notification) and $to=$schedule['backup_params']->email_notification)
 			{