evolution-cms / evolution

manager/includes/extenders/modxmailer.class.inc.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -8,8 +8,8 @@
  *******************************************************
  */
 
-use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\Exception;
+use PHPMailer\PHPMailer\PHPMailer;
 
 require MODX_MANAGER_PATH . 'includes/controls/phpmailer/Exception.php';
 require MODX_MANAGER_PATH . 'includes/controls/phpmailer/PHPMailer.php';

install/setup.info.php

Indentation +64 added lines, -64 removed lines

@@ -170,70 +170,70 @@
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false
             );
         }
-		if (intval($params['shareparams']) || !empty($params['dependencies'])) {
-			$dependencies = explode(',', $params['dependencies']);
-			foreach ($dependencies as $dependency) {
-				$dependency = explode(':', $dependency);
-				switch (trim($dependency[0])) {
-					case 'template':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'templates',
-							'column' => 'templatename',
-							'type' => 50,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'tv':
-					case 'tmplvar':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'tmplvars',
-							'column' => 'name',
-							'type' => 60,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'chunk':
-					case 'htmlsnippet':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'htmlsnippets',
-							'column' => 'name',
-							'type' => 10,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'snippet':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'snippets',
-							'column' => 'name',
-							'type' => 40,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'plugin':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'plugins',
-							'column' => 'name',
-							'type' => 30,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'resource':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'content',
-							'column' => 'pagetitle',
-							'type' => 20,
-							'name' => trim($dependency[1])
-						);
-						break;
-				}
-			}
-		}
+        if (intval($params['shareparams']) || !empty($params['dependencies'])) {
+            $dependencies = explode(',', $params['dependencies']);
+            foreach ($dependencies as $dependency) {
+                $dependency = explode(':', $dependency);
+                switch (trim($dependency[0])) {
+                    case 'template':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'templates',
+                            'column' => 'templatename',
+                            'type' => 50,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'tv':
+                    case 'tmplvar':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'tmplvars',
+                            'column' => 'name',
+                            'type' => 60,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'chunk':
+                    case 'htmlsnippet':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'htmlsnippets',
+                            'column' => 'name',
+                            'type' => 10,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'snippet':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'snippets',
+                            'column' => 'name',
+                            'type' => 40,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'plugin':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'plugins',
+                            'column' => 'name',
+                            'type' => 30,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'resource':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'content',
+                            'column' => 'pagetitle',
+                            'type' => 20,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                }
+            }
+        }
     }
     $d->close();
 }

install/actions/action_language.php

Indentation +4 added lines, -4 removed lines

@@ -7,10 +7,10 @@
 function getLangOptions($install_language='english') {
     $langs = array();
     if( $handle = opendir('lang/') ) {
-    	while( false !== ( $file = readdir( $handle ) ) ) {
-    		if( strpos( $file, '.' ) ) $langs[] = str_replace('.inc.php', '', $file);
-    	}
-    	closedir( $handle );
+        while( false !== ( $file = readdir( $handle ) ) ) {
+            if( strpos( $file, '.' ) ) $langs[] = str_replace('.inc.php', '', $file);
+        }
+        closedir( $handle );
     }
     sort( $langs );
     $_ = array();

install/actions/action_install.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 <form name="install" id="install_form" action="index.php?action=options" method="post">
 <?php
 if ($errors == 0) {
-	// check if install folder is removeable
+    // check if install folder is removeable
     if (is_writable("../install")) { ?>
 <span id="removeinstall" style="float:left;cursor:pointer;color:#505050;line-height:18px;" onclick="var chk=document.install.rminstaller; if(chk) chk.checked=!chk.checked;"><input type="checkbox" name="rminstaller" onclick="event.cancelBubble=true;" <?php echo (empty ($errors) ? 'checked="checked"' : '') ?> style="cursor:default;" /><?php echo $_lang['remove_install_folder_auto'] ?></span>
 <?php 

install/actions/action_summary.php

Indentation +12 added lines, -12 removed lines

@@ -192,9 +192,9 @@ 
         echo "<span class=\"notok\">" . $_lang['failed'] . "</span></b>" . $_lang['table_prefix_not_exist'] . "</p>";
         $errors += 1;
         echo "<p>" . $_lang['table_prefix_not_exist_note'] . "</p>";
-  } else {
+    } else {
         echo "<span class=\"ok\">" . $_lang['ok'] . "</span></p>";
-  }
+    }
 }
 
 // check mysql version
@@ -252,16 +252,16 @@ 
 ?>
       <p>
       <?php
-      echo $_lang['setup_cannot_continue'] . ' ';
-      echo $errors > 1 ? $errors." " : "";
-      if ($errors > 1) echo $_lang['errors'];
-      else echo $_lang['error'];
-      if ($errors > 1) echo $_lang['please_correct_errors'];
-      else echo $_lang['please_correct_error'];
-      if ($errors > 1) echo $_lang['and_try_again_plural'];
-      else echo $_lang['and_try_again'];
-      echo $_lang['visit_forum'];
-      ?>
+        echo $_lang['setup_cannot_continue'] . ' ';
+        echo $errors > 1 ? $errors." " : "";
+        if ($errors > 1) echo $_lang['errors'];
+        else echo $_lang['error'];
+        if ($errors > 1) echo $_lang['please_correct_errors'];
+        else echo $_lang['please_correct_error'];
+        if ($errors > 1) echo $_lang['and_try_again_plural'];
+        else echo $_lang['and_try_again'];
+        echo $_lang['visit_forum'];
+        ?>
       </p>
       <?php
 }

install/actions/action_connection.php

Indentation +28 added lines, -28 removed lines

@@ -15,13 +15,13 @@ 
         include($base_path.MGR_DIR.'/includes/config.inc.php');
         // We need to have all connection settings - but prefix may be empty so we have to ignore it
         if ($dbase) {
-          $database_name = trim($dbase, '`');
-          if (!$conn = mysqli_connect($database_server, $database_user, $database_password))
-              $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2;
-          elseif (! mysqli_select_db($conn, trim($dbase, '`')))
-              $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2;
-          else
-              $upgradeable = 1;
+            $database_name = trim($dbase, '`');
+            if (!$conn = mysqli_connect($database_server, $database_user, $database_password))
+                $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2;
+            elseif (! mysqli_select_db($conn, trim($dbase, '`')))
+                $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2;
+            else
+                $upgradeable = 1;
         }
         else $upgradable= 2;
     }
@@ -75,28 +75,28 @@ 
 echo $content;
 
 function getLangs($install_language) {
-	if (isset($_POST['managerlanguage']))   $manager_language = $_POST['managerlanguage'];
-	elseif(isset($_GET['managerlanguage'])) $manager_language = $_GET['managerlanguage'];
-	if ($install_language != "english" && is_file(sprintf("../%s/includes/lang/%s.inc.php",MGR_DIR,$install_language)))
-		$manager_language = $install_language;
-	else
-		$manager_language = "english";
+    if (isset($_POST['managerlanguage']))   $manager_language = $_POST['managerlanguage'];
+    elseif(isset($_GET['managerlanguage'])) $manager_language = $_GET['managerlanguage'];
+    if ($install_language != "english" && is_file(sprintf("../%s/includes/lang/%s.inc.php",MGR_DIR,$install_language)))
+        $manager_language = $install_language;
+    else
+        $manager_language = "english";
 	
-	$langs = array();
-	if ($handle = opendir("../".MGR_DIR."/includes/lang")) {
-	    while (false !== ($file = readdir($handle))) {
-	        if (strpos($file, '.inc.') !== false)
-	            $langs[] = $file;
-	    }
-	    closedir($handle);
-	}
-	sort($langs);
+    $langs = array();
+    if ($handle = opendir("../".MGR_DIR."/includes/lang")) {
+        while (false !== ($file = readdir($handle))) {
+            if (strpos($file, '.inc.') !== false)
+                $langs[] = $file;
+        }
+        closedir($handle);
+    }
+    sort($langs);
 	
-	$_ = array();
-	foreach ($langs as $language) {
-	    $abrv_language = explode('.', $language);
-	    $selected = (strtolower($abrv_language[0]) == strtolower($manager_language)) ? ' selected' : '';
+    $_ = array();
+    foreach ($langs as $language) {
+        $abrv_language = explode('.', $language);
+        $selected = (strtolower($abrv_language[0]) == strtolower($manager_language)) ? ' selected' : '';
         $_[] = sprintf('<option value="%s" %s>%s</option>', $abrv_language[0], $selected, ucwords($abrv_language[0]));
-	}
-	return join("\n", $_);
+    }
+    return join("\n", $_);
 }

install/actions/action_options.php

Indentation +5 added lines, -5 removed lines

@@ -80,7 +80,7 @@ 
 
 
 function getTemplates($presets=array()) {
-	if(!count($presets)) return '';
+    if(!count($presets)) return '';
     $selectedTemplates = isset ($_POST['template']) ? $_POST['template'] : array ();
     $tpl = '<label><input type="checkbox" name="template[]" value="[+i+]" class="[+class+]" [+checked+] />[%install_update%] <span class="comname">[+name+]</span> - [+desc+]</label><hr />';
     $_ = array();
@@ -118,7 +118,7 @@ 
 
 // display chunks
 function getChunks($presets=array()) {
-	if(!count($presets)) return '';
+    if(!count($presets)) return '';
     $selected = isset ($_POST['chunk']) ? $_POST['chunk'] : array ();
     $tpl = '<label><input type="checkbox" name="chunk[]" value="[+i+]" class="[+class+]" [+checked+] />[%install_update%] <span class="comname">[+name+]</span> - [+desc+]</label><hr />';
     $_ = array();
@@ -137,7 +137,7 @@ 
 
 // display modules
 function getModules($presets=array()) {
-	if(!count($presets)) return '';
+    if(!count($presets)) return '';
     $selected = isset ($_POST['module']) ? $_POST['module'] : array ();
     $tpl = '<label><input type="checkbox" name="module[]" value="[+i+]" class="[+class+]" [+checked+] />[%install_update%] <span class="comname">[+name+]</span> - [+desc+]</label><hr />';
     $_ = array();
@@ -156,7 +156,7 @@ 
 
 // display plugins
 function getPlugins($presets=array()) {
-	if(!count($presets)) return '';
+    if(!count($presets)) return '';
     $selected = isset ($_POST['plugin']) ? $_POST['plugin'] : array ();
     $tpl = '<label><input type="checkbox" name="plugin[]" value="[+i+]" class="[+class+]" [+checked+] />[%install_update%] <span class="comname">[+name+]</span> - [+desc+]</label><hr />';
     $_ = array();
@@ -179,7 +179,7 @@ 
 
 // display snippets
 function getSnippets($presets=array()) {
-	if(!count($presets)) return '';
+    if(!count($presets)) return '';
     $selected = isset ($_POST['snippet']) ? $_POST['snippet'] : array ();
     $tpl = '<label><input type="checkbox" name="snippet[]" value="[+i+]" class="[+class+]" [+checked+] />[%install_update%] <span class="comname">[+name+]</span> - [+desc+]</label><hr />';
     $_ = array();

install/connection.databasetest.php

Indentation +2 added lines, -2 removed lines

@@ -8,10 +8,10 @@
 $self = 'install/connection.databasetest.php';
 $base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
-	include_once("{$base_path}assets/cache/siteManager.php");
+    include_once("{$base_path}assets/cache/siteManager.php");
 }
 if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+    define('MGR_DIR','manager');
 }
 require_once("lang.php");
 

install/functions.php

Indentation +69 added lines, -69 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 function install_sessionCheck()
 {
-	global $_lang;
+    global $_lang;
 	
-	// session loop-back tester
-	if(!isset($_GET['action']) || $_GET['action']!=='mode')
-	{
-		if(!isset($_SESSION['test']) || $_SESSION['test']!=1)
-		{
-			echo '
+    // session loop-back tester
+    if(!isset($_GET['action']) || $_GET['action']!=='mode')
+    {
+        if(!isset($_SESSION['test']) || $_SESSION['test']!=1)
+        {
+            echo '
 <html>
 <head>
 	<title>Install Problem</title>
@@ -27,86 +27,86 @@ 
 	</div>
 </body>
 </html>';
-		exit;
-		}
-	}
+        exit;
+        }
+    }
 }
 
 function parse($src,$ph,$left='[+',$right='+]')
 {
-	foreach($ph as $k=>$v)
-	{
-		$k = $left . $k . $right;
-		$src = str_replace($k,$v,$src);
-	}
-	return $src;
+    foreach($ph as $k=>$v)
+    {
+        $k = $left . $k . $right;
+        $src = str_replace($k,$v,$src);
+    }
+    return $src;
 }
 
 function ph()
 {
-	global $_lang,$moduleName,$moduleVersion,$modx_textdir,$modx_release_date;
+    global $_lang,$moduleName,$moduleVersion,$modx_textdir,$modx_release_date;
 
-	if(isset($_SESSION['installmode'])) $installmode = $_SESSION['installmode'];
-	else                                $installmode = get_installmode();
+    if(isset($_SESSION['installmode'])) $installmode = $_SESSION['installmode'];
+    else                                $installmode = get_installmode();
 
-	$ph['pagetitle']     = $_lang['modx_install'];
-	$ph['textdir']       = $modx_textdir ? ' id="rtl"':'';
-	$ph['help_link']     = $installmode == 0 ? $_lang['help_link_new'] : $_lang['help_link_upd'];
-	$ph['version']       = $moduleVersion;
-	$ph['release_date']  = ($modx_textdir ? '&rlm;':'') . $modx_release_date;
-	$ph['footer1']       = $_lang['modx_footer1'];
-	$ph['footer2']       = $_lang['modx_footer2'];
-	$ph['current_year']  = date('Y');
-	return $ph;
+    $ph['pagetitle']     = $_lang['modx_install'];
+    $ph['textdir']       = $modx_textdir ? ' id="rtl"':'';
+    $ph['help_link']     = $installmode == 0 ? $_lang['help_link_new'] : $_lang['help_link_upd'];
+    $ph['version']       = $moduleVersion;
+    $ph['release_date']  = ($modx_textdir ? '&rlm;':'') . $modx_release_date;
+    $ph['footer1']       = $_lang['modx_footer1'];
+    $ph['footer2']       = $_lang['modx_footer2'];
+    $ph['current_year']  = date('Y');
+    return $ph;
 }
 
 function get_installmode()
 {
-	global $base_path,$database_server, $database_user, $database_password, $dbase, $table_prefix;
+    global $base_path,$database_server, $database_user, $database_password, $dbase, $table_prefix;
 	
-	$conf_path = "{$base_path}manager/includes/config.inc.php";
-	if (!is_file($conf_path)) $installmode = 0;
-	elseif(isset($_POST['installmode'])) $installmode = $_POST['installmode'];
-	else
-	{
-		include_once("{$base_path}manager/includes/config.inc.php");
+    $conf_path = "{$base_path}manager/includes/config.inc.php";
+    if (!is_file($conf_path)) $installmode = 0;
+    elseif(isset($_POST['installmode'])) $installmode = $_POST['installmode'];
+    else
+    {
+        include_once("{$base_path}manager/includes/config.inc.php");
 		
-		if(!isset($dbase) || empty($dbase)) $installmode = 0;
-		else
-		{
-			$conn = mysqli_connect($database_server, $database_user, $database_password);
-			if($conn)
-			{
-				$_SESSION['database_server']   = $database_server;
-				$_SESSION['database_user']     = $database_user;
-				$_SESSION['database_password'] = $database_password;
+        if(!isset($dbase) || empty($dbase)) $installmode = 0;
+        else
+        {
+            $conn = mysqli_connect($database_server, $database_user, $database_password);
+            if($conn)
+            {
+                $_SESSION['database_server']   = $database_server;
+                $_SESSION['database_user']     = $database_user;
+                $_SESSION['database_password'] = $database_password;
 				
-				$dbase = trim($dbase, '`');
-				$rs = mysqli_select_db($conn, $dbase);
-			}
-			else $rs = false;
+                $dbase = trim($dbase, '`');
+                $rs = mysqli_select_db($conn, $dbase);
+            }
+            else $rs = false;
 			
-			if($rs)
-			{
-				$_SESSION['dbase']                      = $dbase;
-				$_SESSION['table_prefix']               = $table_prefix;
-				$_SESSION['database_collation']         = 'utf8_general_ci';
-				$_SESSION['database_connection_method'] = 'SET CHARACTER SET';
+            if($rs)
+            {
+                $_SESSION['dbase']                      = $dbase;
+                $_SESSION['table_prefix']               = $table_prefix;
+                $_SESSION['database_collation']         = 'utf8_general_ci';
+                $_SESSION['database_connection_method'] = 'SET CHARACTER SET';
 				
-				$tbl_system_settings = "`{$dbase}`.`{$table_prefix}system_settings`";
-				$rs = mysqli_query($conn, "SELECT setting_value FROM {$tbl_system_settings} WHERE setting_name='settings_version'");
-				if($rs)
-				{
-					$row = mysqli_fetch_assoc($rs);
-					$settings_version = $row['setting_value'];
-				}
-				else $settings_version = '';
+                $tbl_system_settings = "`{$dbase}`.`{$table_prefix}system_settings`";
+                $rs = mysqli_query($conn, "SELECT setting_value FROM {$tbl_system_settings} WHERE setting_name='settings_version'");
+                if($rs)
+                {
+                    $row = mysqli_fetch_assoc($rs);
+                    $settings_version = $row['setting_value'];
+                }
+                else $settings_version = '';
 				
-				if (empty($settings_version)) $installmode = 0;
-				else                          $installmode = 1;
-			}
-			else $installmode = 1;
-		}
-	}
-	return $installmode;
+                if (empty($settings_version)) $installmode = 0;
+                else                          $installmode = 1;
+            }
+            else $installmode = 1;
+        }
+    }
+    return $installmode;
 }