evolution-cms / evolution

install/stubs/migrations/2018_06_29_182342_create_webgroup_names_table.php

Indentation +22 added lines, -22 removed lines

@@ -5,29 +5,29 @@
 
 class CreateWebgroupNamesTable extends Migration {
 
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('webgroup_names', function(Blueprint $table)
-		{
-			$table->integer('id', true);
-			$table->string('name', 245)->default('')->unique('name');
-		});
-	}
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('webgroup_names', function(Blueprint $table)
+        {
+            $table->integer('id', true);
+            $table->string('name', 245)->default('')->unique('name');
+        });
+    }
 
 
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('webgroup_names');
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('webgroup_names');
+    }
 
 }

install/stubs/migrations/2018_06_29_182342_create_webgroup_access_table.php

Indentation +23 added lines, -23 removed lines

@@ -5,30 +5,30 @@
 
 class CreateWebgroupAccessTable extends Migration {
 
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('webgroup_access', function(Blueprint $table)
-		{
-			$table->integer('id', true);
-			$table->integer('webgroup')->default(0);
-			$table->integer('documentgroup')->default(0);
-		});
-	}
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('webgroup_access', function(Blueprint $table)
+        {
+            $table->integer('id', true);
+            $table->integer('webgroup')->default(0);
+            $table->integer('documentgroup')->default(0);
+        });
+    }
 
 
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('webgroup_access');
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('webgroup_access');
+    }
 
 }

install/stubs/migrations/2018_06_29_182342_create_site_templates_table.php

Indentation +32 added lines, -32 removed lines

@@ -5,39 +5,39 @@
 
 class CreateSiteTemplatesTable extends Migration {
 
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('site_templates', function(Blueprint $table)
-		{
-			$table->integer('id', true);
-			$table->string('templatename', 100)->default('');
-			$table->string('description')->default('Template');
-			$table->integer('editor_type')->default(0)->comment('0-plain text,1-rich text,2-code editor');
-			$table->integer('category')->default(0)->comment('category id');
-			$table->string('icon')->default('')->comment('url to icon file');
-			$table->integer('template_type')->default(0)->comment('0-page,1-content');
-			$table->text('content', 16777215)->nullable();
-			$table->boolean('locked')->default(0);
-			$table->boolean('selectable')->default(1);
-			$table->integer('createdon')->default(0);
-			$table->integer('editedon')->default(0);
-		});
-	}
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('site_templates', function(Blueprint $table)
+        {
+            $table->integer('id', true);
+            $table->string('templatename', 100)->default('');
+            $table->string('description')->default('Template');
+            $table->integer('editor_type')->default(0)->comment('0-plain text,1-rich text,2-code editor');
+            $table->integer('category')->default(0)->comment('category id');
+            $table->string('icon')->default('')->comment('url to icon file');
+            $table->integer('template_type')->default(0)->comment('0-page,1-content');
+            $table->text('content', 16777215)->nullable();
+            $table->boolean('locked')->default(0);
+            $table->boolean('selectable')->default(1);
+            $table->integer('createdon')->default(0);
+            $table->integer('editedon')->default(0);
+        });
+    }
 
 
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('site_templates');
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('site_templates');
+    }
 
 }

install/stubs/migrations/2018_06_29_182342_create_active_users_table.php

Indentation +26 added lines, -26 removed lines

@@ -5,33 +5,33 @@
 
 class CreateActiveUsersTable extends Migration {
 
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('active_users', function(Blueprint $table)
-		{
-			$table->string('sid', 32)->default('')->primary();
-			$table->integer('internalKey')->default(0);
-			$table->string('username', 50)->default('');
-			$table->integer('lasthit')->default(0);
-			$table->string('action', 10)->default('');
-			$table->integer('id')->nullable();
-		});
-	}
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('active_users', function(Blueprint $table)
+        {
+            $table->string('sid', 32)->default('')->primary();
+            $table->integer('internalKey')->default(0);
+            $table->string('username', 50)->default('');
+            $table->integer('lasthit')->default(0);
+            $table->string('action', 10)->default('');
+            $table->integer('id')->nullable();
+        });
+    }
 
 
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('active_users');
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('active_users');
+    }
 
 }

install/src/sqlParser.class.php

Indentation +121 added lines, -121 removed lines

@@ -4,141 +4,141 @@ 
 // SNUFFKIN/ Alex 2004
 
 class SqlParser {
-	public $host;
-	public $dbname;
-	public $prefix;
-	public $user;
-	public $password;
-	public $mysqlErrors;
-	public $conn;
-	public $installFailed;
-	public $sitename;
-	public $adminname;
-	public $adminemail;
-	public $adminpass;
-	public $managerlanguage;
-	public $mode;
-	public $fileManagerPath;
-	public $imgPath;
-	public $imgUrl;
-	public $dbMODx;
-	public $dbVersion;
+    public $host;
+    public $dbname;
+    public $prefix;
+    public $user;
+    public $password;
+    public $mysqlErrors;
+    public $conn;
+    public $installFailed;
+    public $sitename;
+    public $adminname;
+    public $adminemail;
+    public $adminpass;
+    public $managerlanguage;
+    public $mode;
+    public $fileManagerPath;
+    public $imgPath;
+    public $imgUrl;
+    public $dbMODx;
+    public $dbVersion;
     public $connection_charset;
     public $connection_method;
     public $ignoreDuplicateErrors;
     public $autoTemplateLogic;
 
-	public function __construct($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent') {
-		$this->host = $host;
-		$this->dbname = $db;
-		$this->prefix = $prefix;
-		$this->user = $user;
-		$this->password = $password;
-		$this->adminpass = $adminpass;
-		$this->adminname = $adminname;
-		$this->adminemail = $adminemail;
-		$this->connection_charset = $connection_charset;
-		$this->connection_method = $connection_method;
-		$this->ignoreDuplicateErrors = false;
-		$this->managerlanguage = $managerlanguage;
+    public function __construct($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent') {
+        $this->host = $host;
+        $this->dbname = $db;
+        $this->prefix = $prefix;
+        $this->user = $user;
+        $this->password = $password;
+        $this->adminpass = $adminpass;
+        $this->adminname = $adminname;
+        $this->adminemail = $adminemail;
+        $this->connection_charset = $connection_charset;
+        $this->connection_method = $connection_method;
+        $this->ignoreDuplicateErrors = false;
+        $this->managerlanguage = $managerlanguage;
         $this->autoTemplateLogic = $auto_template_logic;
-	}
+    }
 
-	public function connect() {
+    public function connect() {
         $host = explode(':', $this->host, 2);
         $this->conn = mysqli_connect($host[0], $this->user, $this->password,'', isset($host[1]) ? $host[1] : null);
-		mysqli_select_db($this->conn, $this->dbname);
-		if (function_exists('mysqli_set_charset')) mysqli_set_charset($this->conn, $this->connection_charset);
-
-		$this->dbVersion = 3.23; // assume version 3.23
-		if(function_exists("mysqli_get_server_info")) {
-			$ver = mysqli_get_server_info($this->conn);
-			$this->dbMODx 	 = version_compare($ver,"4.0.2");
-			$this->dbVersion = (float) $ver; // Typecasting (float) instead of floatval() [PHP < 4.2]
-		}
+        mysqli_select_db($this->conn, $this->dbname);
+        if (function_exists('mysqli_set_charset')) mysqli_set_charset($this->conn, $this->connection_charset);
+
+        $this->dbVersion = 3.23; // assume version 3.23
+        if(function_exists("mysqli_get_server_info")) {
+            $ver = mysqli_get_server_info($this->conn);
+            $this->dbMODx 	 = version_compare($ver,"4.0.2");
+            $this->dbVersion = (float) $ver; // Typecasting (float) instead of floatval() [PHP < 4.2]
+        }
 
         mysqli_query($this->conn,"{$this->connection_method} {$this->connection_charset}");
-	}
+    }
 
     public function process($filename) {
-	    global $custom_placeholders;
-
-		// check to make sure file exists
-		if (!file_exists($filename)) {
-			$this->mysqlErrors[] = array("error" => "File '$filename' not found");
-			$this->installFailed = true ;
-			return false;
-		}
-
-		$fh = fopen($filename, 'r');
-		$idata = '';
-
-		while (!feof($fh)) {
-			$idata .= fread($fh, 1024);
-		}
-
-		fclose($fh);
-		$idata = str_replace("\r", '', $idata);
-
-		// check if in upgrade mode
-		if ($this->mode === 'upd') {
-			// remove non-upgradeable parts
-			$s = strpos($idata,'non-upgrade-able[[');
-			$e = strpos($idata,']]non-upgrade-able') + 17;
-			if($s && $e) {
-			    $idata = str_replace(substr($idata, $s,$e-$s),' Removed non upgradeable items', $idata);
+        global $custom_placeholders;
+
+        // check to make sure file exists
+        if (!file_exists($filename)) {
+            $this->mysqlErrors[] = array("error" => "File '$filename' not found");
+            $this->installFailed = true ;
+            return false;
+        }
+
+        $fh = fopen($filename, 'r');
+        $idata = '';
+
+        while (!feof($fh)) {
+            $idata .= fread($fh, 1024);
+        }
+
+        fclose($fh);
+        $idata = str_replace("\r", '', $idata);
+
+        // check if in upgrade mode
+        if ($this->mode === 'upd') {
+            // remove non-upgradeable parts
+            $s = strpos($idata,'non-upgrade-able[[');
+            $e = strpos($idata,']]non-upgrade-able') + 17;
+            if($s && $e) {
+                $idata = str_replace(substr($idata, $s,$e-$s),' Removed non upgradeable items', $idata);
             }
-		}
+        }
 
-		// replace {} tags
-		$idata = str_replace('{PREFIX}', $this->prefix, $idata);
+        // replace {} tags
+        $idata = str_replace('{PREFIX}', $this->prefix, $idata);
         $idata = str_replace('{TABLEENCODING}', $this->getTableEncoding(), $idata);
-		$idata = str_replace('{ADMIN}', $this->adminname, $idata);
-		$idata = str_replace('{ADMINEMAIL}', $this->adminemail, $idata);
-		$idata = str_replace('{ADMINPASS}', $this->adminpass, $idata);
-		$idata = str_replace('{IMAGEPATH}', $this->imgPath, $idata);
-		$idata = str_replace('{IMAGEURL}', $this->imgUrl, $idata);
-		$idata = str_replace('{FILEMANAGERPATH}', $this->fileManagerPath, $idata);
-		$idata = str_replace('{MANAGERLANGUAGE}', $this->managerlanguage, $idata);
-		$idata = str_replace('{AUTOTEMPLATELOGIC}', $this->autoTemplateLogic, $idata);
-		/*$idata = str_replace('{VERSION}', $modx_version, $idata);*/
-
-		// Replace custom placeholders
-		foreach($custom_placeholders as $key=>$val) {
-			if (strpos($idata, '{'.$key.'}') !== false) {
-				$idata = str_replace('{'.$key.'}', $val, $idata);
-			}
-		}
-
-		$sql_array = explode("\n\n", $idata);
-
-		$num = 0;
-		foreach($sql_array as $sql_entry) {
-			$sql_do = trim($sql_entry, "\r\n; ");
-
-			if (preg_match('/^\#/', $sql_do)) continue;
-
-			// strip out comments and \n for mysql 3.x
-			if ($this->dbVersion <4.0) {
-				$sql_do = preg_replace("~COMMENT.*[^']?'.*[^']?'~","",$sql_do);
-				$sql_do = str_replace('\r', "", $sql_do);
-				$sql_do = str_replace('\n', "", $sql_do);
-			}
-
-
-			$num = $num + 1;
-			if ($sql_do) mysqli_query($this->conn, $sql_do);
-			if(mysqli_error($this->conn)) {
-				// Ignore duplicate and drop errors - Raymond
-				if ($this->ignoreDuplicateErrors){
-					if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 ||mysqli_errno($this->conn) == 1091) continue;
-				}
-				// End Ignore duplicate
-				$this->mysqlErrors[] = array("error" => mysqli_error($this->conn), "sql" => $sql_do);
-				$this->installFailed = true;
-			}
-		}
-	}
+        $idata = str_replace('{ADMIN}', $this->adminname, $idata);
+        $idata = str_replace('{ADMINEMAIL}', $this->adminemail, $idata);
+        $idata = str_replace('{ADMINPASS}', $this->adminpass, $idata);
+        $idata = str_replace('{IMAGEPATH}', $this->imgPath, $idata);
+        $idata = str_replace('{IMAGEURL}', $this->imgUrl, $idata);
+        $idata = str_replace('{FILEMANAGERPATH}', $this->fileManagerPath, $idata);
+        $idata = str_replace('{MANAGERLANGUAGE}', $this->managerlanguage, $idata);
+        $idata = str_replace('{AUTOTEMPLATELOGIC}', $this->autoTemplateLogic, $idata);
+        /*$idata = str_replace('{VERSION}', $modx_version, $idata);*/
+
+        // Replace custom placeholders
+        foreach($custom_placeholders as $key=>$val) {
+            if (strpos($idata, '{'.$key.'}') !== false) {
+                $idata = str_replace('{'.$key.'}', $val, $idata);
+            }
+        }
+
+        $sql_array = explode("\n\n", $idata);
+
+        $num = 0;
+        foreach($sql_array as $sql_entry) {
+            $sql_do = trim($sql_entry, "\r\n; ");
+
+            if (preg_match('/^\#/', $sql_do)) continue;
+
+            // strip out comments and \n for mysql 3.x
+            if ($this->dbVersion <4.0) {
+                $sql_do = preg_replace("~COMMENT.*[^']?'.*[^']?'~","",$sql_do);
+                $sql_do = str_replace('\r', "", $sql_do);
+                $sql_do = str_replace('\n', "", $sql_do);
+            }
+
+
+            $num = $num + 1;
+            if ($sql_do) mysqli_query($this->conn, $sql_do);
+            if(mysqli_error($this->conn)) {
+                // Ignore duplicate and drop errors - Raymond
+                if ($this->ignoreDuplicateErrors){
+                    if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 ||mysqli_errno($this->conn) == 1091) continue;
+                }
+                // End Ignore duplicate
+                $this->mysqlErrors[] = array("error" => mysqli_error($this->conn), "sql" => $sql_do);
+                $this->installFailed = true;
+            }
+        }
+    }
 
     public function getTableEncoding()
     {
@@ -150,6 +150,6 @@ 
     }
 
     public function close() {
-		mysqli_close($this->conn);
-	}
+        mysqli_close($this->conn);
+    }
 }

core/functions/actions/import.php

Indentation +3 added lines, -3 removed lines

@@ -114,9 +114,9 @@
                 $field['menuindex'] = 1;
                 $find = false;
                 foreach (array(
-                             'index.html',
-                             'index.htm'
-                         ) as $filename) {
+                                'index.html',
+                                'index.htm'
+                            ) as $filename) {
                     $filepath = $filedir . $alias . '/' . $filename;
                     if ($find === false && file_exists($filepath)) {
                         $file = getFileContent($filepath);

core/vendor/monolog/monolog/tests/Monolog/Handler/DynamoDbHandlerTest.php

Indentation +14 added lines, -14 removed lines

@@ -60,22 +60,22 @@
         }
 
         $formatter
-             ->expects($this->once())
-             ->method('format')
-             ->with($record)
-             ->will($this->returnValue($formatted));
+                ->expects($this->once())
+                ->method('format')
+                ->with($record)
+                ->will($this->returnValue($formatted));
         $this->client
-             ->expects($isV3 ? $this->never() : $this->once())
-             ->method('formatAttributes')
-             ->with($this->isType('array'))
-             ->will($this->returnValue($formatted));
+                ->expects($isV3 ? $this->never() : $this->once())
+                ->method('formatAttributes')
+                ->with($this->isType('array'))
+                ->will($this->returnValue($formatted));
         $this->client
-             ->expects($this->once())
-             ->method('__call')
-             ->with('putItem', array(array(
-                 'TableName' => 'foo',
-                 'Item' => $expFormatted,
-             )));
+                ->expects($this->once())
+                ->method('__call')
+                ->with('putItem', array(array(
+                    'TableName' => 'foo',
+                    'Item' => $expFormatted,
+                )));
 
         $handler->handle($record);
     }

core/vendor/monolog/monolog/tests/Monolog/Handler/InsightOpsHandlerTest.php

Indentation +3 added lines, -3 removed lines

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
- namespace Monolog\Handler;
+    namespace Monolog\Handler;
  
- use Monolog\TestCase;
- use Monolog\Logger;
+    use Monolog\TestCase;
+    use Monolog\Logger;
 
 /**
  * @author Robert Kaufmann III <rok3@rok3.me>

core/vendor/monolog/monolog/src/Monolog/Handler/InsightOpsHandler.php

Indentation +2 added lines, -2 removed lines

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
- namespace Monolog\Handler;
+    namespace Monolog\Handler;
  
- use Monolog\Logger;
+    use Monolog\Logger;
 
 /**
  * Inspired on LogEntriesHandler.