ci-bonfire / Sprint

application/database/migrations/20141010063911_Create_user_tables.php

Indentation +97 added lines, -97 removed lines

@@ -10,111 +10,111 @@
  */
 class Migration_create_user_tables extends CI_Migration {
 
-    public function up ()
-    {
-        // Users
-        $fields = [
-            'id'    => [
-                'type'  => 'int',
-                'constraint' => 11,
-                'unsigned'  => true,
-                'auto_increment' => true
-            ],
-            'email' => [
-                'type' => 'varchar',
-                'constraint' => 255
-            ],
-            'username'  => [
-                'type'  => 'varchar',
-                'constraint'    => 30,
-                'null'          => true
-            ],
-            'password_hash' => [
-                'type' => 'varchar',
-                'constraint' => 255
-            ],
-            'reset_hash' => [
-                'type' => 'varchar',
-                'constraint' => 40,
-                'null'      => true
-            ],
-            'activate_hash' => [
-                'type' => 'varchar',
-                'constraint' => 40,
-                'null'  => true
-            ],
-            'created_on' => [
-                'type' => 'datetime',
-                'default' => '0000-00-00 00:00:00'
-            ],
-            'status' => [
-                'type' => 'varchar',
-                'constraint'    => 255,
-                'null'      => true
-            ],
-            'status_message' => [
-                'type' => 'varchar',
-                'constraint'    => 255,
-                'null'      => true
-            ],
-            'active'  => [
-                'type'          => 'tinyint',
-                'constraint'    => 1,
-                'null'          => 0,
-                'default'       => 0
-            ],
-            'deleted'  => [
-                'type'          => 'tinyint',
-                'constraint'    => 1,
-                'null'          => 0,
-                'default'       => 0
-            ],
-            'force_pass_reset'  => [
-                'type'          => 'tinyint',
-                'constraint'    => 1,
-                'null'          => 0,
-                'default'       => 0
-            ],
-        ];
+	public function up ()
+	{
+		// Users
+		$fields = [
+			'id'    => [
+				'type'  => 'int',
+				'constraint' => 11,
+				'unsigned'  => true,
+				'auto_increment' => true
+			],
+			'email' => [
+				'type' => 'varchar',
+				'constraint' => 255
+			],
+			'username'  => [
+				'type'  => 'varchar',
+				'constraint'    => 30,
+				'null'          => true
+			],
+			'password_hash' => [
+				'type' => 'varchar',
+				'constraint' => 255
+			],
+			'reset_hash' => [
+				'type' => 'varchar',
+				'constraint' => 40,
+				'null'      => true
+			],
+			'activate_hash' => [
+				'type' => 'varchar',
+				'constraint' => 40,
+				'null'  => true
+			],
+			'created_on' => [
+				'type' => 'datetime',
+				'default' => '0000-00-00 00:00:00'
+			],
+			'status' => [
+				'type' => 'varchar',
+				'constraint'    => 255,
+				'null'      => true
+			],
+			'status_message' => [
+				'type' => 'varchar',
+				'constraint'    => 255,
+				'null'      => true
+			],
+			'active'  => [
+				'type'          => 'tinyint',
+				'constraint'    => 1,
+				'null'          => 0,
+				'default'       => 0
+			],
+			'deleted'  => [
+				'type'          => 'tinyint',
+				'constraint'    => 1,
+				'null'          => 0,
+				'default'       => 0
+			],
+			'force_pass_reset'  => [
+				'type'          => 'tinyint',
+				'constraint'    => 1,
+				'null'          => 0,
+				'default'       => 0
+			],
+		];
 
-        $this->dbforge->add_field($fields);
-        $this->dbforge->add_key('id', true);
-        $this->dbforge->add_key('email');
+		$this->dbforge->add_field($fields);
+		$this->dbforge->add_key('id', true);
+		$this->dbforge->add_key('email');
 
-        $this->dbforge->create_table('users', true, config_item('migration_create_table_attr'));
+		$this->dbforge->create_table('users', true, config_item('migration_create_table_attr'));
 
-        // User Meta
-        $fields = [
-            'user_id'   => [
-                'type'          => 'int',
-                'constraint'    => 11,
-                'unsigned'      => true
-            ],
-            'meta_key'    => [
-                'type'          => 'varchar',
-                'constraint'    => 255
-            ],
-            'meta_value'    => [
-                'type'          => 'text',
-                'null'       => true
-            ],
-        ];
+		// User Meta
+		$fields = [
+			'user_id'   => [
+				'type'          => 'int',
+				'constraint'    => 11,
+				'unsigned'      => true
+			],
+			'meta_key'    => [
+				'type'          => 'varchar',
+				'constraint'    => 255
+			],
+			'meta_value'    => [
+				'type'          => 'text',
+				'null'       => true
+			],
+		];
 
-        $this->dbforge->add_field($fields);
-        $this->dbforge->add_key(['user_id', 'meta_key'], true);
+		$this->dbforge->add_field($fields);
+		$this->dbforge->add_key(['user_id', 'meta_key'], true);
 
-        $this->dbforge->create_table('user_meta', true, config_item('migration_create_table_attr'));
+		$this->dbforge->create_table('user_meta', true, config_item('migration_create_table_attr'));
 
-    }
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function down ()
-    {
-        $this->dbforge->drop_table('users');
-        $this->dbforge->drop_table('user_meta');
-    }
+	public function down ()
+	{
+		$this->dbforge->drop_table('users');
+		$this->dbforge->drop_table('user_meta');
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
  */
 class Migration_Createsessiontable extends CI_Migration {
 
-    public function up ()
+    public function up()
     {
         $fields = array(
             'id' => array(
@@ -47,7 +47,7 @@ 
 
     //--------------------------------------------------------------------
 
-    public function down ()
+    public function down()
     {
         $this->dbforge->drop_table('ci_sessions');
     }

application/database/migrations/20141020184926_Create_settings_table.php

Indentation +27 added lines, -27 removed lines

@@ -10,35 +10,35 @@
  */
 class Migration_create_settings_table extends CI_Migration {
 
-    public function up ()
-    {
-        $fields = [
-            'name'  => [
-                'type'  => 'varchar',
-                'constraint' => 255
-            ],
-            'value' => [
-                'type' => 'varchar',
-                'constraint' => 255,
-                'null'  => true
-            ],
-            'group' => [
-                'type' => 'varchar',
-                'constraint' => 255
-            ]
-        ];
-        $this->dbforge->add_field($fields);
-        $this->dbforge->add_key(['name', 'group'], true);
-        $this->dbforge->create_table('settings', true, config_item('migration_create_table_attr'));
-    }
+	public function up ()
+	{
+		$fields = [
+			'name'  => [
+				'type'  => 'varchar',
+				'constraint' => 255
+			],
+			'value' => [
+				'type' => 'varchar',
+				'constraint' => 255,
+				'null'  => true
+			],
+			'group' => [
+				'type' => 'varchar',
+				'constraint' => 255
+			]
+		];
+		$this->dbforge->add_field($fields);
+		$this->dbforge->add_key(['name', 'group'], true);
+		$this->dbforge->create_table('settings', true, config_item('migration_create_table_attr'));
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function down ()
-    {
-        $this->dbforge->drop_table('settings');
-    }
+	public function down ()
+	{
+		$this->dbforge->drop_table('settings');
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
  */
 class Migration_Createsessiontable extends CI_Migration {
 
-    public function up ()
+    public function up()
     {
         $fields = array(
             'id' => array(
@@ -47,7 +47,7 @@ 
 
     //--------------------------------------------------------------------
 
-    public function down ()
+    public function down()
     {
         $this->dbforge->drop_table('ci_sessions');
     }

application/database/migrations/20141105055640_Create_mail_queue.php

Indentation +43 added lines, -43 removed lines

@@ -10,52 +10,52 @@
  */
 class Migration_create_mail_queue extends CI_Migration {
 
-    public function up ()
-    {
-        $fields = [
-            'id'    => [
-                'type'  => 'int',
-                'constraint' => 11,
-                'unsigned' => true,
-                'auto_increment' => true
-            ],
-            'mailer' => [
-                'type'  => 'varchar',
-                'constraint' => 255
-            ],
-            'params'    => [
-                'type'  => 'text',
-                'null' => true
-            ],
-            'options'   => [
-                'type'  => 'text',
-                'null' => true
-            ],
-            'sent' => [
-                'type'  => 'tinyint',
-                'constraint' => 1,
-                'default' => 0
-            ],
-            'sent_on' => [
-                'type'  => 'datetime',
-                'null'  => true,
-                'default' => null
-            ],
-        ];
+	public function up ()
+	{
+		$fields = [
+			'id'    => [
+				'type'  => 'int',
+				'constraint' => 11,
+				'unsigned' => true,
+				'auto_increment' => true
+			],
+			'mailer' => [
+				'type'  => 'varchar',
+				'constraint' => 255
+			],
+			'params'    => [
+				'type'  => 'text',
+				'null' => true
+			],
+			'options'   => [
+				'type'  => 'text',
+				'null' => true
+			],
+			'sent' => [
+				'type'  => 'tinyint',
+				'constraint' => 1,
+				'default' => 0
+			],
+			'sent_on' => [
+				'type'  => 'datetime',
+				'null'  => true,
+				'default' => null
+			],
+		];
 
-        $this->dbforge->add_field($fields);
-        $this->dbforge->add_key('id', true);
-        $this->dbforge->add_key('sent');
-        $this->dbforge->create_table('mail_queue', true, config_item('migration_create_table_attr'));
-    }
+		$this->dbforge->add_field($fields);
+		$this->dbforge->add_key('id', true);
+		$this->dbforge->add_key('sent');
+		$this->dbforge->create_table('mail_queue', true, config_item('migration_create_table_attr'));
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function down ()
-    {
-        $this->dbforge->drop_table('mail_queue');
-    }
+	public function down ()
+	{
+		$this->dbforge->drop_table('mail_queue');
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
  */
 class Migration_Createsessiontable extends CI_Migration {
 
-    public function up ()
+    public function up()
     {
         $fields = array(
             'id' => array(
@@ -47,7 +47,7 @@ 
 
     //--------------------------------------------------------------------
 
-    public function down ()
+    public function down()
     {
         $this->dbforge->drop_table('ci_sessions');
     }

application/database/migrations/20141211054140_Create_authorization_tables.php

Indentation +89 added lines, -89 removed lines

@@ -10,110 +10,110 @@
  */
 class Migration_create_authorization_tables extends CI_Migration {
 
-    public function up ()
-    {
+	public function up ()
+	{
 		/**
 		 * Groups Table
 		 */
-	    $fields = [
-		    'id'    => [
-			    'type'  => 'int',
-			    'constraint' => 11,
-			    'unsigned' => true,
-			    'auto_increment' => true
-		    ],
-		    'name'  => [
-			    'type' => 'varchar',
-			    'constraint' => 255
-		    ],
-		    'description' => [
-			    'type' => 'varchar',
-			    'constraint' => 255
-		    ]
-	    ];
+		$fields = [
+			'id'    => [
+				'type'  => 'int',
+				'constraint' => 11,
+				'unsigned' => true,
+				'auto_increment' => true
+			],
+			'name'  => [
+				'type' => 'varchar',
+				'constraint' => 255
+			],
+			'description' => [
+				'type' => 'varchar',
+				'constraint' => 255
+			]
+		];
 
-	    $this->dbforge->add_field($fields);
-	    $this->dbforge->add_key('id', true);
-	    $this->dbforge->create_table('auth_groups', true, config_item('migration_create_table_attr'));
-	    /**
-	     * Permissions Table
-	     */
-	    $fields = [
-		    'id'    => [
-			    'type'  => 'int',
-			    'constraint' => 11,
-			    'unsigned' => true,
-			    'auto_increment' => true
-		    ],
-		    'name'  => [
-			    'type' => 'varchar',
-			    'constraint' => 255
-		    ],
-		    'description' => [
-			    'type' => 'varchar',
-			    'constraint' => 255
-		    ]
-	    ];
+		$this->dbforge->add_field($fields);
+		$this->dbforge->add_key('id', true);
+		$this->dbforge->create_table('auth_groups', true, config_item('migration_create_table_attr'));
+		/**
+		 * Permissions Table
+		 */
+		$fields = [
+			'id'    => [
+				'type'  => 'int',
+				'constraint' => 11,
+				'unsigned' => true,
+				'auto_increment' => true
+			],
+			'name'  => [
+				'type' => 'varchar',
+				'constraint' => 255
+			],
+			'description' => [
+				'type' => 'varchar',
+				'constraint' => 255
+			]
+		];
 
-	    $this->dbforge->add_field($fields);
-	    $this->dbforge->add_key('id', true);
-	    $this->dbforge->create_table('auth_permissions', true, config_item('migration_create_table_attr'));
+		$this->dbforge->add_field($fields);
+		$this->dbforge->add_key('id', true);
+		$this->dbforge->create_table('auth_permissions', true, config_item('migration_create_table_attr'));
 
-	    /**
-	     * Groups/Permissions Table
-	     */
-	    $fields = [
-		    'group_id'    => [
-			    'type'  => 'int',
-			    'constraint' => 11,
-			    'unsigned' => true,
-			    'default' => 0
-		    ],
-		    'permission_id'    => [
-			    'type'  => 'int',
-			    'constraint' => 11,
-			    'unsigned' => true,
-			    'default' => 0
-		    ],
-	    ];
+		/**
+		 * Groups/Permissions Table
+		 */
+		$fields = [
+			'group_id'    => [
+				'type'  => 'int',
+				'constraint' => 11,
+				'unsigned' => true,
+				'default' => 0
+			],
+			'permission_id'    => [
+				'type'  => 'int',
+				'constraint' => 11,
+				'unsigned' => true,
+				'default' => 0
+			],
+		];
 
-	    $this->dbforge->add_field($fields);
-	    $this->dbforge->add_key(['group_id', 'permission_id']);
-	    $this->dbforge->create_table('auth_groups_permissions', true, config_item('migration_create_table_attr'));
+		$this->dbforge->add_field($fields);
+		$this->dbforge->add_key(['group_id', 'permission_id']);
+		$this->dbforge->create_table('auth_groups_permissions', true, config_item('migration_create_table_attr'));
 
-	    /**
-	     * Users/Groups Table
-	     */
-	    $fields = [
-		    'group_id'    => [
-			    'type'  => 'int',
-			    'constraint' => 11,
-			    'unsigned' => true,
-			    'default' => 0
-		    ],
-		    'user_id'    => [
-			    'type'  => 'int',
-			    'constraint' => 11,
-			    'unsigned' => true,
-			    'default' => 0
-		    ],
-	    ];
+		/**
+		 * Users/Groups Table
+		 */
+		$fields = [
+			'group_id'    => [
+				'type'  => 'int',
+				'constraint' => 11,
+				'unsigned' => true,
+				'default' => 0
+			],
+			'user_id'    => [
+				'type'  => 'int',
+				'constraint' => 11,
+				'unsigned' => true,
+				'default' => 0
+			],
+		];
 
-	    $this->dbforge->add_field($fields);
-	    $this->dbforge->add_key(['group_id', 'user_id']);
-	    $this->dbforge->create_table('auth_groups_users', true, config_item('migration_create_table_attr'));
-    }
+		$this->dbforge->add_field($fields);
+		$this->dbforge->add_key(['group_id', 'user_id']);
+		$this->dbforge->create_table('auth_groups_users', true, config_item('migration_create_table_attr'));
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function down ()
-    {
+	public function down ()
+	{
 		$this->dbforge->drop_table('auth_groups');
 		$this->dbforge->drop_table('auth_permissions');
 		$this->dbforge->drop_table('auth_groups_permissions');
 		$this->dbforge->drop_table('auth_groups_users');
-    }
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
  */
 class Migration_Createsessiontable extends CI_Migration {
 
-    public function up ()
+    public function up()
     {
         $fields = array(
             'id' => array(
@@ -47,7 +47,7 @@ 
 
     //--------------------------------------------------------------------
 
-    public function down ()
+    public function down()
     {
         $this->dbforge->drop_table('ci_sessions');
     }

application/database/migrations/20150123155112_CreateSessionTable.php

Indentation +43 added lines, -43 removed lines

@@ -10,48 +10,48 @@
  */
 class Migration_Createsessiontable extends CI_Migration {
 
-    public function up ()
-    {
-        $fields = array(
-            'id' => array(
-                'type'          => 'varchar',
-                'constraint'    => 40,
-                'null'          => false
-            ),
-            'ip_address' => array(
-                'type'          => 'varchar',
-                'constraint'    => 45,
-                'null'          => false
-            ),
-            'timestamp' => array(
-                'type'          => 'int',
-                'constraint'    => 10,
-                'unsigned'      => true,
-                'default'       => '0',
-                'null'          => false,
-            ),
-            'data' => array(
-                'type'          => 'blob',
-                'null'          => false
-            )
-        );
-
-        $this->dbforge->add_field($fields);
-
-        $this->dbforge->add_key('id', TRUE);
-        $this->dbforge->add_key('ip_address', TRUE);
-        $this->dbforge->add_key('ci_sessions_timestamp');
-
-        $this->dbforge->create_table('ci_sessions', true, config_item('migration_create_table_attr'));
-    }
-
-    //--------------------------------------------------------------------
-
-    public function down ()
-    {
-        $this->dbforge->drop_table('ci_sessions');
-    }
-
-    //--------------------------------------------------------------------
+	public function up ()
+	{
+		$fields = array(
+			'id' => array(
+				'type'          => 'varchar',
+				'constraint'    => 40,
+				'null'          => false
+			),
+			'ip_address' => array(
+				'type'          => 'varchar',
+				'constraint'    => 45,
+				'null'          => false
+			),
+			'timestamp' => array(
+				'type'          => 'int',
+				'constraint'    => 10,
+				'unsigned'      => true,
+				'default'       => '0',
+				'null'          => false,
+			),
+			'data' => array(
+				'type'          => 'blob',
+				'null'          => false
+			)
+		);
+
+		$this->dbforge->add_field($fields);
+
+		$this->dbforge->add_key('id', TRUE);
+		$this->dbforge->add_key('ip_address', TRUE);
+		$this->dbforge->add_key('ci_sessions_timestamp');
+
+		$this->dbforge->create_table('ci_sessions', true, config_item('migration_create_table_attr'));
+	}
+
+	//--------------------------------------------------------------------
+
+	public function down ()
+	{
+		$this->dbforge->drop_table('ci_sessions');
+	}
+
+	//--------------------------------------------------------------------
 
 }

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
  */
 class Migration_Createsessiontable extends CI_Migration {
 
-    public function up ()
+    public function up()
     {
         $fields = array(
             'id' => array(
@@ -47,7 +47,7 @@ 
 
     //--------------------------------------------------------------------
 
-    public function down ()
+    public function down()
     {
         $this->dbforge->drop_table('ci_sessions');
     }

application/database/seeds/FlatAuthorizationSeeder.php

Indentation +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 
 	public function run()
 	{
-	    $flat = new \Myth\Auth\FlatAuthorization();
+		$flat = new \Myth\Auth\FlatAuthorization();
 
 		$flat->createPermission('viewPosts', 'View the blog posts.');
 		$flat->createPermission('managePosts', 'Manage the blog posts.');

application/database/seeds/TestSeeder.php

Indentation +5 added lines, -5 removed lines

@@ -8,9 +8,9 @@ 
  */
 class TestSeeder extends Seeder {
     
-    public function run()
-    {
-        /*
+	public function run()
+	{
+		/*
             Here, you can do anything you need to do to get your
             database in the desired state. The following tools are ready for you:
 
@@ -23,8 +23,8 @@ 
 
                 $this->call('UserSeeder');
          */
-    }
+	}
     
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
     
 }

application/helpers/markdown_extended_helper.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (! function_exists('Markdown')) {
+if ( ! function_exists('Markdown')) {
     require_once('markdown_helper.php');
 }
 define('MARKDOWNEXTRAEXTENDED_VERSION', "0.3");
@@ -67,7 +67,7 @@ 
     function _doBlockQuotes_callback($matches)
     {
         $cite = $matches[1];
-        $bq   = '> ' . $matches[2];
+        $bq   = '> '.$matches[2];
         # trim one level of quoting - trim whitespace-only lines
         $bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
         $bq = $this->runBlockGamut($bq); # recurse
@@ -84,7 +84,7 @@ 
         $res = "<blockquote";
         $res .= empty($cite) ? ">" : " cite=\"$cite\">";
         $res .= "\n$bq\n</blockquote>";
-        return "\n" . $this->hashBlock($res) . "\n\n";
+        return "\n".$this->hashBlock($res)."\n\n";
     }
 
     function doFencedCodeBlocks($text)
@@ -133,7 +133,7 @@ 
         $cb = empty($matches[3]) ? "<pre><code" : "<pre class=\"linenums:$matches[3]\"><code";
         $cb .= empty($matches[2]) ? ">" : " class=\"language-$matches[2]\">";
         $cb .= "$codeblock</code></pre>";
-        return "\n\n" . $this->hashBlock($cb) . "\n\n";
+        return "\n\n".$this->hashBlock($cb)."\n\n";
     }
 
     function doFencedFigures($text)
@@ -184,15 +184,15 @@ 
         );
 
         $res = "<figure>";
-        if (!empty($topcaption)) {
+        if ( ! empty($topcaption)) {
             $res .= "\n<figcaption>$topcaption</figcaption>";
         }
         $res .= "\n$figure\n";
-        if (!empty($bottomcaption) && empty($topcaption)) {
+        if ( ! empty($bottomcaption) && empty($topcaption)) {
             $res .= "<figcaption>$bottomcaption</figcaption>";
         }
         $res .= "</figure>";
-        return "\n" . $this->hashBlock($res) . "\n\n";
+        return "\n".$this->hashBlock($res)."\n\n";
     }
 }
 

Indentation +140 added lines, -140 removed lines

@@ -1,98 +1,98 @@ 
 <?php
 
 if (! function_exists('Markdown')) {
-    require_once('markdown_helper.php');
+	require_once('markdown_helper.php');
 }
 define('MARKDOWNEXTRAEXTENDED_VERSION', "0.3");
 
 function MarkdownExtended($text, $default_classes = array())
 {
-    $parser = new MarkdownExtraExtended_Parser($default_classes);
-    return $parser->transform($text);
+	$parser = new MarkdownExtraExtended_Parser($default_classes);
+	return $parser->transform($text);
 }
 
 class MarkdownExtraExtended_Parser extends MarkdownExtra_Parser
 {
 
-    # Tags that are always treated as block tags:
-    var $block_tags_re = 'figure|figcaption|p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend';
-
-    var $default_classes;
-
-    function __construct($default_classes = array())
-    {
-        $default_classes = $default_classes;
-
-        $this->block_gamut += array(
-            "doFencedFigures" => 7,
-        );
-
-        parent::__construct();
-    }
-
-    function transform($text)
-    {
-        $text = parent::transform($text);
-        return $text;
-    }
-
-    function doHardBreaks($text)
-    {
-        # Do hard breaks:
-        # EXTENDED: changed to allow breaks without two spaces and just one new line
-        # original code /* return preg_replace_callback('/ {2,}\n/', */
-        return preg_replace_callback(
-            '/ *\n/',
-            array(&$this, '_doHardBreaks_callback'),
-            $text
-        );
-    }
-
-    function doBlockQuotes($text)
-    {
-        $text = preg_replace_callback(
-            '/
+	# Tags that are always treated as block tags:
+	var $block_tags_re = 'figure|figcaption|p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend';
+
+	var $default_classes;
+
+	function __construct($default_classes = array())
+	{
+		$default_classes = $default_classes;
+
+		$this->block_gamut += array(
+			"doFencedFigures" => 7,
+		);
+
+		parent::__construct();
+	}
+
+	function transform($text)
+	{
+		$text = parent::transform($text);
+		return $text;
+	}
+
+	function doHardBreaks($text)
+	{
+		# Do hard breaks:
+		# EXTENDED: changed to allow breaks without two spaces and just one new line
+		# original code /* return preg_replace_callback('/ {2,}\n/', */
+		return preg_replace_callback(
+			'/ *\n/',
+			array(&$this, '_doHardBreaks_callback'),
+			$text
+		);
+	}
+
+	function doBlockQuotes($text)
+	{
+		$text = preg_replace_callback(
+			'/
 			(?>^[ ]*>[ ]?
 				(?:\((.+?)\))?
 				[ ]*(.+\n(?:.+\n)*)
 			)+
 			/xm',
-            array(&$this, '_doBlockQuotes_callback'),
-            $text
-        );
-
-        return $text;
-    }
-
-    function _doBlockQuotes_callback($matches)
-    {
-        $cite = $matches[1];
-        $bq   = '> ' . $matches[2];
-        # trim one level of quoting - trim whitespace-only lines
-        $bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
-        $bq = $this->runBlockGamut($bq); # recurse
-
-        $bq = preg_replace('/^/m', "  ", $bq);
-        # These leading spaces cause problem with <pre> content,
-        # so we need to fix that:
-        $bq = preg_replace_callback(
-            '{(\s*<pre>.+?</pre>)}sx',
-            array(&$this, '_doBlockQuotes_callback2'),
-            $bq
-        );
-
-        $res = "<blockquote";
-        $res .= empty($cite) ? ">" : " cite=\"$cite\">";
-        $res .= "\n$bq\n</blockquote>";
-        return "\n" . $this->hashBlock($res) . "\n\n";
-    }
-
-    function doFencedCodeBlocks($text)
-    {
-        $less_than_tab = $this->tab_width;
-
-        $text = preg_replace_callback(
-            '{
+			array(&$this, '_doBlockQuotes_callback'),
+			$text
+		);
+
+		return $text;
+	}
+
+	function _doBlockQuotes_callback($matches)
+	{
+		$cite = $matches[1];
+		$bq   = '> ' . $matches[2];
+		# trim one level of quoting - trim whitespace-only lines
+		$bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
+		$bq = $this->runBlockGamut($bq); # recurse
+
+		$bq = preg_replace('/^/m', "  ", $bq);
+		# These leading spaces cause problem with <pre> content,
+		# so we need to fix that:
+		$bq = preg_replace_callback(
+			'{(\s*<pre>.+?</pre>)}sx',
+			array(&$this, '_doBlockQuotes_callback2'),
+			$bq
+		);
+
+		$res = "<blockquote";
+		$res .= empty($cite) ? ">" : " cite=\"$cite\">";
+		$res .= "\n$bq\n</blockquote>";
+		return "\n" . $this->hashBlock($res) . "\n\n";
+	}
+
+	function doFencedCodeBlocks($text)
+	{
+		$less_than_tab = $this->tab_width;
+
+		$text = preg_replace_callback(
+			'{
 				(?:\n|\A)
 				# 1: Opening marker
 				(
@@ -112,34 +112,34 @@ 
 				# Closing marker.
 				\1 [ ]* \n
 			}xm',
-            array(&$this, '_doFencedCodeBlocks_callback'),
-            $text
-        );
-
-        return $text;
-    }
-
-    function _doFencedCodeBlocks_callback($matches)
-    {
-        $codeblock = $matches[4];
-        $codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
-        $codeblock = preg_replace_callback(
-            '/^\n+/',
-            array(&$this, '_doFencedCodeBlocks_newlines'),
-            $codeblock
-        );
-        //$codeblock = "<pre><code>$codeblock</code></pre>";
-        //$cb = "<pre><code";
-        $cb = empty($matches[3]) ? "<pre><code" : "<pre class=\"linenums:$matches[3]\"><code";
-        $cb .= empty($matches[2]) ? ">" : " class=\"language-$matches[2]\">";
-        $cb .= "$codeblock</code></pre>";
-        return "\n\n" . $this->hashBlock($cb) . "\n\n";
-    }
-
-    function doFencedFigures($text)
-    {
-        $text = preg_replace_callback(
-            '{
+			array(&$this, '_doFencedCodeBlocks_callback'),
+			$text
+		);
+
+		return $text;
+	}
+
+	function _doFencedCodeBlocks_callback($matches)
+	{
+		$codeblock = $matches[4];
+		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+		$codeblock = preg_replace_callback(
+			'/^\n+/',
+			array(&$this, '_doFencedCodeBlocks_newlines'),
+			$codeblock
+		);
+		//$codeblock = "<pre><code>$codeblock</code></pre>";
+		//$cb = "<pre><code";
+		$cb = empty($matches[3]) ? "<pre><code" : "<pre class=\"linenums:$matches[3]\"><code";
+		$cb .= empty($matches[2]) ? ">" : " class=\"language-$matches[2]\">";
+		$cb .= "$codeblock</code></pre>";
+		return "\n\n" . $this->hashBlock($cb) . "\n\n";
+	}
+
+	function doFencedFigures($text)
+	{
+		$text = preg_replace_callback(
+			'{
 			(?:\n|\A)
 			# 1: Opening marker
 			(
@@ -159,41 +159,41 @@ 
 			# Closing marker.
 			\1 [ ]?(?:\[([^\]]+)\])?[ ]* \n
 		}xm',
-            array(&$this, '_doFencedFigures_callback'),
-            $text
-        );
-
-        return $text;
-    }
-
-    function _doFencedFigures_callback($matches)
-    {
-        # get figcaption
-        $topcaption    = empty($matches[2]) ? null : $this->runBlockGamut($matches[2]);
-        $bottomcaption = empty($matches[5]) ? null : $this->runBlockGamut($matches[5]);
-        $figure        = $matches[3];
-        $figure        = $this->runBlockGamut($figure); # recurse
-
-        $figure = preg_replace('/^/m', "  ", $figure);
-        # These leading spaces cause problem with <pre> content,
-        # so we need to fix that - reuse blockqoute code to handle this:
-        $figure = preg_replace_callback(
-            '{(\s*<pre>.+?</pre>)}sx',
-            array(&$this, '_doBlockQuotes_callback2'),
-            $figure
-        );
-
-        $res = "<figure>";
-        if (!empty($topcaption)) {
-            $res .= "\n<figcaption>$topcaption</figcaption>";
-        }
-        $res .= "\n$figure\n";
-        if (!empty($bottomcaption) && empty($topcaption)) {
-            $res .= "<figcaption>$bottomcaption</figcaption>";
-        }
-        $res .= "</figure>";
-        return "\n" . $this->hashBlock($res) . "\n\n";
-    }
+			array(&$this, '_doFencedFigures_callback'),
+			$text
+		);
+
+		return $text;
+	}
+
+	function _doFencedFigures_callback($matches)
+	{
+		# get figcaption
+		$topcaption    = empty($matches[2]) ? null : $this->runBlockGamut($matches[2]);
+		$bottomcaption = empty($matches[5]) ? null : $this->runBlockGamut($matches[5]);
+		$figure        = $matches[3];
+		$figure        = $this->runBlockGamut($figure); # recurse
+
+		$figure = preg_replace('/^/m', "  ", $figure);
+		# These leading spaces cause problem with <pre> content,
+		# so we need to fix that - reuse blockqoute code to handle this:
+		$figure = preg_replace_callback(
+			'{(\s*<pre>.+?</pre>)}sx',
+			array(&$this, '_doBlockQuotes_callback2'),
+			$figure
+		);
+
+		$res = "<figure>";
+		if (!empty($topcaption)) {
+			$res .= "\n<figcaption>$topcaption</figcaption>";
+		}
+		$res .= "\n$figure\n";
+		if (!empty($bottomcaption) && empty($topcaption)) {
+			$res .= "<figcaption>$bottomcaption</figcaption>";
+		}
+		$res .= "</figure>";
+		return "\n" . $this->hashBlock($res) . "\n\n";
+	}
 }
 
 ?>

application/language/english/application_lang.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 $lang['cron.invalid_task']      = 'Not a valid task.';
 $lang['cron.running_task']      = "Running task: %s...";
 $lang['cron.done_with_msg']     = "Done with message:\n%s\n";
-$lang['cron.not_scheduled_until']   = "'%s' Not scheduled to run until %s.";
+$lang['cron.not_scheduled_until'] = "'%s' Not scheduled to run until %s.";
 $lang['cron.nothing_scheduled'] = "No Tasks scheduled to run currently.";
 
 // Forge