ci-bonfire / Sprint

myth/_generators/Controller/ControllerGenerator.php

Indentation +37 added lines, -37 removed lines

@@ -203,20 +203,20 @@ 
 
 		if ( empty( $fields ) )
 		{
-            // If we have a model, we can get our fields from there
-            if (! empty($this->options['model']))
-            {
-                $fields = $this->getFieldsFromModel( $this->options['model'] );
-
-                if (empty($fields))
-                {
-                    return NULL;
-                }
-            }
-            else
-            {
-                return NULL;
-            }
+			// If we have a model, we can get our fields from there
+			if (! empty($this->options['model']))
+			{
+				$fields = $this->getFieldsFromModel( $this->options['model'] );
+
+				if (empty($fields))
+				{
+					return NULL;
+				}
+			}
+			else
+			{
+				return NULL;
+			}
 		}
 
 		$fields = explode( ' ', $fields );
@@ -277,36 +277,36 @@ 
 
 	//--------------------------------------------------------------------
 
-    private function getFieldsFromModel( $model )
-    {
-        $this->load->model($model);
+	private function getFieldsFromModel( $model )
+	{
+		$this->load->model($model);
 
-        if (! $this->db->table_exists( $this->$model->table() ))
-        {
-            return '';
-        }
+		if (! $this->db->table_exists( $this->$model->table() ))
+		{
+			return '';
+		}
 
-        $fields = $this->db->field_data( $this->$model->table() );
+		$fields = $this->db->field_data( $this->$model->table() );
 
-        $return = '';
+		$return = '';
 
-        // Prepare the fields in a string format like
-        // it would have been passed on the CLI
-        foreach ($fields as $field)
-        {
-            $temp = $field->name .':'. $field->type;
+		// Prepare the fields in a string format like
+		// it would have been passed on the CLI
+		foreach ($fields as $field)
+		{
+			$temp = $field->name .':'. $field->type;
 
-            if (! empty($field->max_length))
-            {
-                $temp .= ':'. $field->max_length;
-            }
+			if (! empty($field->max_length))
+			{
+				$temp .= ':'. $field->max_length;
+			}
 
-            $return .= ' '. $temp;
-        }
+			$return .= ' '. $temp;
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

myth/_generators/Controller/controller.tpl.php

Indentation +10 added lines, -10 removed lines

@@ -23,7 +23,7 @@ 
 
 if (! empty($model) )
 {
-    $index_method = <<<EOD
+	$index_method = <<<EOD
 \$this->load->library('table');
 
         \$offset = \$this->uri->segment( \$this->uri->total_segments() );
@@ -44,7 +44,7 @@ 
 
 if (! empty($model))
 {
-    $create_method = <<<EOD
+	$create_method = <<<EOD
 \$this->load->helper('form');
         \$this->load->helper('inflector');
 
@@ -72,7 +72,7 @@ 
 
 if (! empty($model))
 {
-    $show_method = <<<EOD
+	$show_method = <<<EOD
 \$item = \$this->{$lower_model}->find(\$id);
 
         if (! \$item)
@@ -94,7 +94,7 @@ 
 
 if (! empty($model))
 {
-    $update_method = <<<EOD
+	$update_method = <<<EOD
 \$this->load->helper('form');
         \$this->load->helper('inflector');
 
@@ -125,7 +125,7 @@ 
 
 if (! empty($model))
 {
-    $delete_method = <<<EOD
+	$delete_method = <<<EOD
 if (\$this->{$lower_model}->delete(\$id))
         {
             \$this->setMessage('Successfully deleted item.', 'success');
@@ -145,12 +145,12 @@ 
 
 if ($themed)
 {
-    $index_method   .= "\$this->render();";
-    $create_method  .= "\$this->render();";
-    $show_method    .= "\$this->render();";
-    $update_method  .= "\$this->render();";
+	$index_method   .= "\$this->render();";
+	$create_method  .= "\$this->render();";
+	$show_method    .= "\$this->render();";
+	$update_method  .= "\$this->render();";
 
-    $fields = "
+	$fields = "
     /**
      * Allows per-controller override of theme.
      * @var null

myth/_generators/Controller/forge.php

Indentation +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
  */
 
 $descriptions = [
-    'controller' => ['controller <name> [<base>]', 'Creates a new controller file that extends from <base> or BaseController.']
+	'controller' => ['controller <name> [<base>]', 'Creates a new controller file that extends from <base> or BaseController.']
 ];
 
 $long_description = <<<EOT

myth/_generators/Controller/view_create.tpl.php

Indentation +37 added lines, -37 removed lines

@@ -4,43 +4,43 @@
 
 <?= $uikit->row([], function() use($uikit, $fields) {
 
-    $sizes = [
-        's' => 12,
-        'm' => 6,
-        'l' => 4
-    ];
-    echo $uikit->column(['sizes' => $sizes], function() use($uikit, $fields) {
-
-        foreach ($fields as $field)
-        {
-            echo $uikit->inputWrap( humanize($field['name']), null, function() use($uikit, $field) {
-
-                switch ($field['type'])
-                {
-                    case 'text':
-                        echo "            <input type='text' class='form-control' name='{$field['name']}' />\n";
-                        break;
-                    case 'number':
-                        echo "            <input type='number' class='form-control' name='{$field['name']}' />\n";
-                        break;
-                    case 'date':
-                        echo "            <input type='date' class='form-control' name='{$field['name']}' />\n";
-                        break;
-                    case 'datetime':
-                        echo "            <input type='datetime' class='form-control' name='{$field['name']}' />\n";
-                        break;
-                    case 'time':
-                        echo "            <input type='time' class='form-control' name='{$field['name']}' />\n";
-                        break;
-                    case 'textarea':
-                        echo "            <textarea name='{$field['name']}' class='form-control'></textarea>\n";
-                        break;
-                }
-
-            } );
-        }
-
-    });
+	$sizes = [
+		's' => 12,
+		'm' => 6,
+		'l' => 4
+	];
+	echo $uikit->column(['sizes' => $sizes], function() use($uikit, $fields) {
+
+		foreach ($fields as $field)
+		{
+			echo $uikit->inputWrap( humanize($field['name']), null, function() use($uikit, $field) {
+
+				switch ($field['type'])
+				{
+					case 'text':
+						echo "            <input type='text' class='form-control' name='{$field['name']}' />\n";
+						break;
+					case 'number':
+						echo "            <input type='number' class='form-control' name='{$field['name']}' />\n";
+						break;
+					case 'date':
+						echo "            <input type='date' class='form-control' name='{$field['name']}' />\n";
+						break;
+					case 'datetime':
+						echo "            <input type='datetime' class='form-control' name='{$field['name']}' />\n";
+						break;
+					case 'time':
+						echo "            <input type='time' class='form-control' name='{$field['name']}' />\n";
+						break;
+					case 'textarea':
+						echo "            <textarea name='{$field['name']}' class='form-control'></textarea>\n";
+						break;
+				}
+
+			} );
+		}
+
+	});
 
 }); ?>
 

myth/_generators/Migration/migration.tpl.php

Indentation +11 added lines, -11 removed lines

@@ -12,21 +12,21 @@ 
  */
 if ($action == 'create')
 {
-    $up = "\$fields = {$fields};
+	$up = "\$fields = {$fields};
 
         \$this->dbforge->add_field(\$fields);
 ";
 
-    if (! empty($primary_key))
-    {
-        $up .= "        \$this->dbforge->add_key('{$primary_key}', true);
+	if (! empty($primary_key))
+	{
+		$up .= "        \$this->dbforge->add_key('{$primary_key}', true);
 ";
-    }
+	}
 
-    $up .="	    \$this->dbforge->create_table('{$table}', true, config_item('migration_create_table_attr') );
+	$up .="	    \$this->dbforge->create_table('{$table}', true, config_item('migration_create_table_attr') );
     ";
 
-    $down = "\$this->dbforge->drop_table('{$table}');";
+	$down = "\$this->dbforge->drop_table('{$table}');";
 }
 
 /*
@@ -34,10 +34,10 @@ 
  */
 if ($action == 'add' && ! empty($column))
 {
-    $up = "\$field = {$column_string};
+	$up = "\$field = {$column_string};
         \$this->dbforge->add_column('{$table}', \$field);";
 
-    $down = "\$this->dbforge->drop_column('{$table}', '{$column}');";
+	$down = "\$this->dbforge->drop_column('{$table}', '{$column}');";
 }
 
 /*
@@ -45,9 +45,9 @@ 
  */
 if ($action == 'remove' && ! empty($column))
 {
-    $up = "\$this->dbforge->drop_column('{$table}', '{$column}');";
+	$up = "\$this->dbforge->drop_column('{$table}', '{$column}');";
 
-    $down = "\$field = {$column_string};
+	$down = "\$field = {$column_string};
         \$this->dbforge->add_column('{$table}', \$field);";
 }
 

myth/_generators/Model/ModelGenerator.php

Indentation +92 added lines, -92 removed lines

@@ -60,7 +60,7 @@ 
 	{
 		$name = array_shift( $segments );
 
-        $options = CLI::getOptions();
+		$options = CLI::getOptions();
 
 		$this->options['table_name'] = array_shift( $segments );
 
@@ -213,17 +213,17 @@ 
 		// Check whether the table exists in this database
 		if ( ! $this->db->table_exists( $table_name ) )
 		{
-            if (empty($options['fields']))
-            {
-                return FALSE;
-            }
+			if (empty($options['fields']))
+			{
+				return FALSE;
+			}
 
-            $fields = $this->parseFieldString($options['fields']);
+			$fields = $this->parseFieldString($options['fields']);
+		}
+		else
+		{
+			$fields = $this->db->field_data( $table_name );
 		}
-        else
-        {
-            $fields = $this->db->field_data( $table_name );
-        }
 
 		// There may be something wrong or the database driver may not return
 		// field data
@@ -232,9 +232,9 @@ 
 			return FALSE;
 		}
 
-        $this->options['set_created']       = false;
-        $this->options['set_modified']      = false;
-        $this->options['use_soft_deletes']  = false;
+		$this->options['set_created']       = false;
+		$this->options['set_modified']      = false;
+		$this->options['use_soft_deletes']  = false;
 
 		// Use the primary key if the table has one already set.
 		foreach ( $fields as $field )
@@ -244,20 +244,20 @@ 
 				$this->options['primary_key'] = $field->name;
 			}
 
-            if ($field->name == $this->options['created_field'])
-            {
-                $this->options['set_created'] = true;
-            }
+			if ($field->name == $this->options['created_field'])
+			{
+				$this->options['set_created'] = true;
+			}
 
-            if ($field->name == $this->options['modified_field'])
-            {
-                $this->options['set_modified'] = true;
-            }
+			if ($field->name == $this->options['modified_field'])
+			{
+				$this->options['set_modified'] = true;
+			}
 
-            if ($field->name == $this->options['soft_delete_key'])
-            {
-                $this->options['use_soft_deletes'] = true;
-            }
+			if ($field->name == $this->options['soft_delete_key'])
+			{
+				$this->options['use_soft_deletes'] = true;
+			}
 		}
 
 		// Set our validation rules based on these fields
@@ -268,73 +268,73 @@ 
 
 	//--------------------------------------------------------------------
 
-    /**
-     * Grabs the fields from the CLI options and gets them ready for
-     * use within the views.
-     */
-    protected function parseFieldString($fields)
-    {
-        if ( empty( $fields ) )
-        {
-            return NULL;
-        }
-
-        $fields = explode( ' ', $fields );
-
-        $new_fields = [ ];
-
-        foreach ( $fields as $field )
-        {
-            $pop = [ NULL, NULL, NULL ];
-            list( $field, $type, $size ) = array_merge( explode( ':', $field ), $pop );
-            $type = strtolower( $type );
-
-            // Strings
-            if (in_array($type, ['char', 'varchar', 'string']))
-            {
-                $new_fields[] = [
-                    'name'  => $field,
-                    'type'  => 'text'
-                ];
-            }
-
-            // Textarea
-            else if ($type == 'text')
-            {
-                $new_fields[] = [
-                    'name'  => $field,
-                    'type'  => 'textarea'
-                ];
-            }
-
-            // Number
-            else if (in_array($type, ['tinyint', 'int', 'bigint', 'mediumint', 'float', 'double', 'number']))
-            {
-                $new_fields[] = [
-                    'name'  => $field,
-                    'type'  => 'number'
-                ];
-            }
-
-            // Date
-            else if (in_array($type, ['date', 'datetime', 'time']))
-            {
-                $new_fields[] = [
-                    'name'  => $field,
-                    'type'  => $type
-                ];
-            }
-        }
-
-        // Convert to objects
-        array_walk($new_fields, function(&$item, $key) {
-            $item = (object)$item;
-        });
-
-        return $new_fields;
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Grabs the fields from the CLI options and gets them ready for
+	 * use within the views.
+	 */
+	protected function parseFieldString($fields)
+	{
+		if ( empty( $fields ) )
+		{
+			return NULL;
+		}
+
+		$fields = explode( ' ', $fields );
+
+		$new_fields = [ ];
+
+		foreach ( $fields as $field )
+		{
+			$pop = [ NULL, NULL, NULL ];
+			list( $field, $type, $size ) = array_merge( explode( ':', $field ), $pop );
+			$type = strtolower( $type );
+
+			// Strings
+			if (in_array($type, ['char', 'varchar', 'string']))
+			{
+				$new_fields[] = [
+					'name'  => $field,
+					'type'  => 'text'
+				];
+			}
+
+			// Textarea
+			else if ($type == 'text')
+			{
+				$new_fields[] = [
+					'name'  => $field,
+					'type'  => 'textarea'
+				];
+			}
+
+			// Number
+			else if (in_array($type, ['tinyint', 'int', 'bigint', 'mediumint', 'float', 'double', 'number']))
+			{
+				$new_fields[] = [
+					'name'  => $field,
+					'type'  => 'number'
+				];
+			}
+
+			// Date
+			else if (in_array($type, ['date', 'datetime', 'time']))
+			{
+				$new_fields[] = [
+					'name'  => $field,
+					'type'  => $type
+				];
+			}
+		}
+
+		// Convert to objects
+		array_walk($new_fields, function(&$item, $key) {
+			$item = (object)$item;
+		});
+
+		return $new_fields;
+	}
+
+	//--------------------------------------------------------------------
 
 
 	/**

myth/_generators/Model/forge.php

Indentation +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
  */
 
 $descriptions = [
-    'model' => ['model <name>', 'Creates a new model file that extends from CIDbModel.']
+	'model' => ['model <name>', 'Creates a new model file that extends from CIDbModel.']
 ];
 
 $long_description = <<<EOT

myth/_generators/Scaffold/ScaffoldGenerator.php

Indentation +37 added lines, -37 removed lines

@@ -38,7 +38,7 @@ 
 
 	protected $model_name = '';
 
-    protected $table_exists = false;
+	protected $table_exists = false;
 
 	//--------------------------------------------------------------------
 
@@ -46,32 +46,32 @@ 
 	{
 		$name = array_shift( $segments );
 
-        // If a table already exists then we don't need a migration
-        $this->load->database();
-        if ($this->db->table_exists($name))
-        {
-            $this->table_exists = true;
-        }
+		// If a table already exists then we don't need a migration
+		$this->load->database();
+		if ($this->db->table_exists($name))
+		{
+			$this->table_exists = true;
+		}
 
 		// If we didn't attach any fields, then we
 		// need to generate the barebones here.
 		$this->fields = CLI::option('fields');
 
-        // If we don't have any fields, and no model
-        // exists, then we need to provide some default fields.
-        if (empty($this->fields))
-        {
-            if (! $this->table_exists)
-            {
-                $this->fields = "id:int id:id title:string created_on:datetime modified_on:datetime";
-            }
-        }
+		// If we don't have any fields, and no model
+		// exists, then we need to provide some default fields.
+		if (empty($this->fields))
+		{
+			if (! $this->table_exists)
+			{
+				$this->fields = "id:int id:id title:string created_on:datetime modified_on:datetime";
+			}
+		}
 
 		// Perform the steps.
-        if (! $this->table_exists)
-        {
-            $this->makeMigration( $name );
-        }
+		if (! $this->table_exists)
+		{
+			$this->makeMigration( $name );
+		}
 		$this->makeSeed($name);
 		$this->makeModel($name);
 		$this->makeController($name);
@@ -98,7 +98,7 @@ 
 
 	public function makeSeed($name)
 	{
-	    $this->generate("seed {$name}", null, true);
+		$this->generate("seed {$name}", null, true);
 	}
 
 	//--------------------------------------------------------------------
@@ -106,33 +106,33 @@ 
 
 	public function makeModel($name)
 	{
-	    $this->load->helper('inflector');
+		$this->load->helper('inflector');
 
 		$name = singular($name);
 		$this->model_name = $name;
 
-        // If a table exists, we can build it from that
-        if ($this->table_exists)
-        {
-            $this->generate( "model {$name}", "-table $name -primary_key id", TRUE );
-        }
-        // Otherwise, we need to provide the fields to make the model out of.
-        else
-        {
-            $this->generate( "model {$name}", "-fields '{$this->fields}'", TRUE );
-        }
+		// If a table exists, we can build it from that
+		if ($this->table_exists)
+		{
+			$this->generate( "model {$name}", "-table $name -primary_key id", TRUE );
+		}
+		// Otherwise, we need to provide the fields to make the model out of.
+		else
+		{
+			$this->generate( "model {$name}", "-fields '{$this->fields}'", TRUE );
+		}
 	}
 
 	//--------------------------------------------------------------------
 
 	public function makeController($name)
 	{
-        $options = "-model {$this->model_name} -create_views";
+		$options = "-model {$this->model_name} -create_views";
 
-        if (! empty($this->fields))
-        {
-            $options .= " -fields '{$this->fields}'";
-        }
+		if (! empty($this->fields))
+		{
+			$options .= " -fields '{$this->fields}'";
+		}
 
 		$this->generate("controller {$name}", $options, true);
 	}

system/libraries/Xmlrpc.php

Indentation +1 added lines, -1 removed lines

@@ -1914,7 +1914,7 @@
 	 * @param	int	unix timestamp
 	 * @param	bool
 	 * @return	string
-	*/
+	 */
 	public function iso8601_encode($time, $utc = FALSE)
 	{
 		return ($utc) ? strftime('%Y%m%dT%H:%i:%s', $time) : gmstrftime('%Y%m%dT%H:%i:%s', $time);