evolution-cms / evolution

install/stubs/migrations/2018_06_29_182342_create_categories_table.php

Indentation +23 added lines, -23 removed lines

@@ -5,30 +5,30 @@
 
 class CreateCategoriesTable extends Migration {
 
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('categories', function(Blueprint $table)
-		{
-			$table->integer('id', true);
-			$table->string('category', 45)->default('');
-			$table->integer('rank')->unsigned()->default(0);
-		});
-	}
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('categories', function(Blueprint $table)
+        {
+            $table->integer('id', true);
+            $table->string('category', 45)->default('');
+            $table->integer('rank')->unsigned()->default(0);
+        });
+    }
 
 
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('categories');
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('categories');
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateCategoriesTable extends Migration {
+class CreateCategoriesTable extends Migration{
 
 	/**
 	 * Run the migrations.

Braces +3 added lines, -3 removed lines

@@ -3,7 +3,8 @@ 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateCategoriesTable extends Migration {
+class CreateCategoriesTable extends Migration
+{
 
 	/**
 	 * Run the migrations.
@@ -12,8 +13,7 @@ 
 	 */
 	public function up()
 	{
-		Schema::create('categories', function(Blueprint $table)
-		{
+		Schema::create('categories', function(Blueprint $table){
 			$table->integer('id', true);
 			$table->string('category', 45)->default('');
 			$table->integer('rank')->unsigned()->default(0);

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');
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateWebgroupNamesTable extends Migration {
+class CreateWebgroupNamesTable extends Migration{
 
 	/**
 	 * Run the migrations.

Braces +3 added lines, -3 removed lines

@@ -3,7 +3,8 @@ 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateWebgroupNamesTable extends Migration {
+class CreateWebgroupNamesTable extends Migration
+{
 
 	/**
 	 * Run the migrations.
@@ -12,8 +13,7 @@ 
 	 */
 	public function up()
 	{
-		Schema::create('webgroup_names', function(Blueprint $table)
-		{
+		Schema::create('webgroup_names', function(Blueprint $table){
 			$table->integer('id', true);
 			$table->string('name', 245)->default('')->unique('name');
 		});

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');
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateWebgroupAccessTable extends Migration {
+class CreateWebgroupAccessTable extends Migration{
 
 	/**
 	 * Run the migrations.

Braces +3 added lines, -3 removed lines

@@ -3,7 +3,8 @@ 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateWebgroupAccessTable extends Migration {
+class CreateWebgroupAccessTable extends Migration
+{
 
 	/**
 	 * Run the migrations.
@@ -12,8 +13,7 @@ 
 	 */
 	public function up()
 	{
-		Schema::create('webgroup_access', function(Blueprint $table)
-		{
+		Schema::create('webgroup_access', function(Blueprint $table){
 			$table->integer('id', true);
 			$table->integer('webgroup')->default(0);
 			$table->integer('documentgroup')->default(0);

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');
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateSiteTemplatesTable extends Migration {
+class CreateSiteTemplatesTable extends Migration{
 
 	/**
 	 * Run the migrations.

Braces +3 added lines, -3 removed lines

@@ -3,7 +3,8 @@ 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateSiteTemplatesTable extends Migration {
+class CreateSiteTemplatesTable extends Migration
+{
 
 	/**
 	 * Run the migrations.
@@ -12,8 +13,7 @@ 
 	 */
 	public function up()
 	{
-		Schema::create('site_templates', function(Blueprint $table)
-		{
+		Schema::create('site_templates', function(Blueprint $table){
 			$table->integer('id', true);
 			$table->string('templatename', 100)->default('');
 			$table->string('description')->default('Template');

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');
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateActiveUsersTable extends Migration {
+class CreateActiveUsersTable extends Migration{
 
 	/**
 	 * Run the migrations.

Braces +3 added lines, -3 removed lines

@@ -3,7 +3,8 @@ 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class CreateActiveUsersTable extends Migration {
+class CreateActiveUsersTable extends Migration
+{
 
 	/**
 	 * Run the migrations.
@@ -12,8 +13,7 @@ 
 	 */
 	public function up()
 	{
-		Schema::create('active_users', function(Blueprint $table)
-		{
+		Schema::create('active_users', function(Blueprint $table){
 			$table->string('sid', 32)->default('')->primary();
 			$table->integer('internalKey')->default(0);
 			$table->string('username', 50)->default('');

install/src/processor/result.php

Spacing +14 added lines, -16 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 //:: EVO Installer Setup file
 //:::::::::::::::::::::::::::::::::::::::::
-if (is_file($base_path . 'assets/cache/siteManager.php')) {
-    include_once($base_path . 'assets/cache/siteManager.php');
+if (is_file($base_path.'assets/cache/siteManager.php')) {
+    include_once($base_path.'assets/cache/siteManager.php');
 }
 if (!defined('MGR_DIR')) {
     define('MGR_DIR', 'manager');
 }
 
-require_once dirname(__DIR__, 3) . '/' . MGR_DIR . '/includes/version.inc.php';
+require_once dirname(__DIR__, 3).'/'.MGR_DIR.'/includes/version.inc.php';
 
-$chunkPath = $base_path . 'install/assets/chunks';
-$snippetPath = $base_path . 'install/assets/snippets';
-$pluginPath = $base_path . 'install/assets/plugins';
-$modulePath = $base_path . 'install/assets/modules';
-$templatePath = $base_path . 'install/assets/templates';
-$tvPath = $base_path . 'install/assets/tvs';
+$chunkPath = $base_path.'install/assets/chunks';
+$snippetPath = $base_path.'install/assets/snippets';
+$pluginPath = $base_path.'install/assets/plugins';
+$modulePath = $base_path.'install/assets/modules';
+$templatePath = $base_path.'install/assets/templates';
+$tvPath = $base_path.'install/assets/tvs';
 
 // setup Template template files - array : name, description, type - 0:file or 1:content, parameters, category
 $mt = &$moduleTemplates;
@@ -28,8 +28,7 @@ 
         $params = parse_docblock($templatePath, $tplfile);
         if (is_array($params) && (count($params) > 0)) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
-            $mt[] = array
-            (
+            $mt[] = array(
                 $params['name'],
                 $description,
                 // Don't think this is gonna be used ... but adding it just in case 'type'
@@ -69,8 +68,7 @@ 
                 "$templatePath/{$params['filename']}",
                 /* not currently used */
                 $params['template_assignments'] !== "*" ?
-                    $params['template_assignments'] :
-                    implode(',', array_map(function($value){return isset($value[0]) && is_scalar($value[0]);},$mt)),
+                    $params['template_assignments'] : implode(',', array_map(function($value){return isset($value[0]) && is_scalar($value[0]); },$mt)),
                 /* comma-separated list of template names */
                 $params['modx_category'],
                 $params['lock_tv'],
@@ -150,7 +148,7 @@ 
                 $params['modx_category'],
                 $params['legacy_names'],
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false,
-                (int)$params['disabled']
+                (int) $params['disabled']
             );
         }
     }
@@ -175,12 +173,12 @@ 
                 "$modulePath/{$params['filename']}",
                 $params['properties'],
                 $params['guid'],
-                (int)$params['shareparams'],
+                (int) $params['shareparams'],
                 $params['modx_category'],
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false
             );
         }
-        if ((int)$params['shareparams'] || !empty($params['dependencies'])) {
+        if ((int) $params['shareparams'] || !empty($params['dependencies'])) {
             $dependencies = explode(',', $params['dependencies']);
             foreach ($dependencies as $dependency) {
                 $dependency = explode(':', $dependency);

install/src/controllers/mode.php

Spacing +12 added lines, -12 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 // Determine upgradeability
 $upgradeable = 0;
-if (is_file($base_path . MGR_DIR . '/includes/config.inc.php')) { // Include the file so we can test its validity
-    include_once $base_path . MGR_DIR . '/includes/config.inc.php';
+if (is_file($base_path.MGR_DIR.'/includes/config.inc.php')) { // Include the file so we can test its validity
+    include_once $base_path.MGR_DIR.'/includes/config.inc.php';
     // We need to have all connection settings - tho prefix may be empty so we have to ignore it
     if (isset($dbase)) {
         $host = explode(':', $database_server, 2);
-        if (!$conn = @mysqli_connect($host[0], $database_user, $database_password,'', isset($host[1]) ? $host[1] : null))
+        if (!$conn = @mysqli_connect($host[0], $database_user, $database_password, '', isset($host[1]) ? $host[1] : null))
             $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;
@@ -18,16 +18,16 @@ 
 }
 
 $ph['moduleName']       = $moduleName;
-$ph['displayNew']       = ($upgradeable!=0) ? 'display:none;' : '';
-$ph['displayUpg']       = ($upgradeable==0) ? 'display:none;' : '';
+$ph['displayNew']       = ($upgradeable != 0) ? 'display:none;' : '';
+$ph['displayUpg']       = ($upgradeable == 0) ? 'display:none;' : '';
 $ph['displayAdvUpg']    = $ph['displayUpg'];
-$ph['checkedNew']       = !$upgradeable     ? 'checked' : '';
-$ph['checkedUpg']       = ($_POST['installmode']==1 || $upgradeable==1) ? 'checked' : '';
-$ph['checkedAdvUpg']    = ($_POST['installmode']==2 || $upgradeable==2) ? 'checked' : '';
+$ph['checkedNew']       = !$upgradeable ? 'checked' : '';
+$ph['checkedUpg']       = ($_POST['installmode'] == 1 || $upgradeable == 1) ? 'checked' : '';
+$ph['checkedAdvUpg']    = ($_POST['installmode'] == 2 || $upgradeable == 2) ? 'checked' : '';
 $ph['install_language'] = $install_language;
-$ph['disabledUpg']      = ($upgradeable!=1) ? 'disabled' : '';
-$ph['disabledAdvUpg']   = ($upgradeable==0) ? 'disabled' : '';
+$ph['disabledUpg']      = ($upgradeable != 1) ? 'disabled' : '';
+$ph['disabledAdvUpg']   = ($upgradeable == 0) ? 'disabled' : '';
 
-$tpl = file_get_contents(dirname(__DIR__) . '/template/actions/mode.tpl');
+$tpl = file_get_contents(dirname(__DIR__).'/template/actions/mode.tpl');
 $content = parse($tpl, $ph);
-echo parse($content, $_lang,'[%','%]');
+echo parse($content, $_lang, '[%', '%]');

Braces +12 added lines, -10 removed lines

@@ -1,21 +1,23 @@
 <?php
 // Determine upgradeability
 $upgradeable = 0;
-if (is_file($base_path . MGR_DIR . '/includes/config.inc.php')) { // Include the file so we can test its validity
+if (is_file($base_path . MGR_DIR . '/includes/config.inc.php')) {
+// Include the file so we can test its validity
     include_once $base_path . MGR_DIR . '/includes/config.inc.php';
     // We need to have all connection settings - tho prefix may be empty so we have to ignore it
     if (isset($dbase)) {
         $host = explode(':', $database_server, 2);
-        if (!$conn = @mysqli_connect($host[0], $database_user, $database_password,'', isset($host[1]) ? $host[1] : null))
-            $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;
+        if (!$conn = @mysqli_connect($host[0], $database_user, $database_password,'', isset($host[1]) ? $host[1] : null)) {
+                    $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 {
+            $upgradeable = 2;
+    }
     }
-    else
-        $upgradeable = 2;
-}
 
 $ph['moduleName']       = $moduleName;
 $ph['displayNew']       = ($upgradeable!=0) ? 'display:none;' : '';

install/src/controllers/connection.php

Spacing +9 added lines, -9 removed lines

@@ -1,28 +1,28 @@ 
 <?php
-$installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0;
+$installMode = isset($_POST['installmode']) ? (int) $_POST['installmode'] : 0;
 
 // Determine upgradeability
 $upgradeable = 0;
 if ($installMode === 0) {
     $database_name = '';
     $database_server = 'localhost';
-    $table_prefix = base_convert(mt_rand(10, 20), 10, 36) .
-        substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyz'), mt_rand(0, 33), 3) .
+    $table_prefix = base_convert(mt_rand(10, 20), 10, 36).
+        substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyz'), mt_rand(0, 33), 3).
         '_';
 } else {
     $database_name = '';
-    if (! is_file($base_path . MGR_DIR . '/includes/config.inc.php')) {
+    if (!is_file($base_path.MGR_DIR.'/includes/config.inc.php')) {
         $upgradeable = 0;
     } else {
         // Include the file so we can test its validity
-        include $base_path . MGR_DIR . '/includes/config.inc.php';
+        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, '`');
             $host = explode(':', $database_server, 2);
-            if (!$conn = mysqli_connect($host[0], $database_user, $database_password,'', isset($host[1]) ? $host[1] : null)) {
+            if (!$conn = mysqli_connect($host[0], $database_user, $database_password, '', isset($host[1]) ? $host[1] : null)) {
                 $upgradeable = (isset($_POST['installmode']) && $_POST['installmode'] === 'new') ? 0 : 2;
-            } elseif (! mysqli_select_db($conn, trim($dbase, '`'))) {
+            } elseif (!mysqli_select_db($conn, trim($dbase, '`'))) {
                 $upgradeable = (isset($_POST['installmode']) && $_POST['installmode'] === 'new') ? 0 : 2;
             } else {
                 $upgradeable = 1;
@@ -34,7 +34,7 @@ 
 }
 
 // check the database collation if not specified in the configuration
-if ($upgradeable && (! isset($database_connection_charset) || empty($database_connection_charset))) {
+if ($upgradeable && (!isset($database_connection_charset) || empty($database_connection_charset))) {
     if (!$rs = mysqli_query($conn, "show session variables like 'collation_database'")) {
         $rs = mysqli_query($conn, "show session variables like 'collation_server'");
     }
@@ -78,7 +78,7 @@ 
 $ph['databaseloginpassword'] = isset($_SESSION['databaseloginpassword']) ? $_SESSION['databaseloginpassword'] : "";
 $ph['MGR_DIR'] = MGR_DIR;
 
-$content = file_get_contents(dirname(__DIR__) . '/template/actions/connection.tpl');
+$content = file_get_contents(dirname(__DIR__).'/template/actions/connection.tpl');
 $content = parse($content, $_lang, '[%', '%]');
 $content = parse($content, $ph);
 

install/src/controllers/connection/collation.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
 if (function_exists('mysqli_connect')) {
     $h = explode(':', $host, 2);
-    $conn = mysqli_connect($h[0], $uid, $pwd,'', isset($h[1]) ? $h[1] : null);
+    $conn = mysqli_connect($h[0], $uid, $pwd, '', isset($h[1]) ? $h[1] : null);
     if (!$conn) {
         exit('can not connect');
     }