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_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/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;
 }

install/connection.servertest.php

Indentation +3 added lines, -3 removed lines

@@ -7,10 +7,10 @@ 
 $self = 'install/connection.servertest.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");
 
@@ -31,7 +31,7 @@ 
         $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
         $strictMode = false;
         foreach ($modes as $mode) {
-    		    if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) $strictMode = true;
+                if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) $strictMode = true;
         }
         if ($strictMode) $output .= '<br /><span style="color:#FF0000;"> '.$_lang['strict_mode'].'</span>';
     }

install/connection.collation.php

Indentation +8 added lines, -8 removed lines

@@ -7,10 +7,10 @@ 
 $self = 'install/connection.collation.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');
 
@@ -59,12 +59,12 @@ 
     $rs = array('recommend'=>'');
     $order = explode(',', $order);
     foreach($order as $v) {
-    	foreach($array as $name=>$sel) {
-        	if(strpos($name,$v)!==false) {
-        		$rs[$name] = $array[$name];
-        		unset($array[$name]);
-        	}
-    	}
+        foreach($array as $name=>$sel) {
+            if(strpos($name,$v)!==false) {
+                $rs[$name] = $array[$name];
+                unset($array[$name]);
+            }
+        }
     }
     $rs['unrecommend']='';
     return $rs + $array;

install/index.php

Indentation +2 added lines, -2 removed lines

@@ -16,10 +16,10 @@
 error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED);
 
 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');
 }
 
 

install/lang.php

Indentation +26 added lines, -26 removed lines

@@ -16,35 +16,35 @@ 
 $install_language = "english";
 
 $_langFiles= array (
- "en" => "english",
- "bg" => "bulgarian",
- "cs" => "czech",
- "da" => "danish",
- "fi" => "finnish-utf8",
- "fr" => "francais-utf8",
- "de" => "german",
- "he" => "hebrew",
- "it" => "italian",
- "ja" => "japanese-utf8",
- "nl" => "nederlands-utf8",
- "no" => "norwegian",
- "fa" => "persian",
- "pl" => "polish-utf8",
- "pt" => "portuguese-br-utf8",
+    "en" => "english",
+    "bg" => "bulgarian",
+    "cs" => "czech",
+    "da" => "danish",
+    "fi" => "finnish-utf8",
+    "fr" => "francais-utf8",
+    "de" => "german",
+    "he" => "hebrew",
+    "it" => "italian",
+    "ja" => "japanese-utf8",
+    "nl" => "nederlands-utf8",
+    "no" => "norwegian",
+    "fa" => "persian",
+    "pl" => "polish-utf8",
+    "pt" => "portuguese-br-utf8",
 // "pt" => "portuguese",
- "ru" => "russian-UTF8",
- "es" => "spanish-utf8",
- "sv" => "svenska"
+    "ru" => "russian-UTF8",
+    "es" => "spanish-utf8",
+    "sv" => "svenska"
 );
 $_langISO6391 = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2);
 if (!empty($_langFiles[$_langISO6391]))  $install_language = $_langFiles[$_langISO6391];
 
 
 if (isset($_POST['language']) && !stristr($_POST['language'],"..")) {
-	$install_language = $_POST['language'];
+    $install_language = $_POST['language'];
 } else {
-	if (isset($_GET['language']) && !stristr($_GET['language'],"..")) 
-		$install_language = $_GET['language'];
+    if (isset($_GET['language']) && !stristr($_GET['language'],"..")) 
+        $install_language = $_GET['language'];
 }
 # load language file
 require_once("lang/english.inc.php"); // As fallback
@@ -53,15 +53,15 @@ 
 $manager_language = $install_language;
 
 if (isset($_POST['managerlanguage']) && !stristr($_POST['managerlanguage'],"..")) {
-	$manager_language = $_POST['managerlanguage'];
+    $manager_language = $_POST['managerlanguage'];
 } else {
-	if (isset($_GET['managerlanguage']) && !stristr($_GET['managerlanguage'],"..")) 
-		$manager_language = $_GET['managerlanguage'];
+    if (isset($_GET['managerlanguage']) && !stristr($_GET['managerlanguage'],"..")) 
+        $manager_language = $_GET['managerlanguage'];
 }
 
 foreach($_lang as $k=>$v)
 {
-	if(strpos($v,'[+MGR_DIR+]')!==false)
-		$_lang[$k] = str_replace('[+MGR_DIR+]', MGR_DIR, $v);
+    if(strpos($v,'[+MGR_DIR+]')!==false)
+        $_lang[$k] = str_replace('[+MGR_DIR+]', MGR_DIR, $v);
 }
 ?>
\ No newline at end of file