Changeset 1303221

Timestamp:

12/08/2015 07:55:33 PM (9 years ago)

Author:

nickmomrik

Message:

Coding standards

File:

• card-converter/trunk/card-converter.php (modified) (3 diffs)

card-converter/trunk/card-converter.php

@@ -9 +9 @@
 */ 
 
-function mdv_card_converter($text) {
+function mdv_card_converter() {
     // Check what is in between <card> and </card>.
-    $output = preg_replace("'<card>([a-zA-Z0-9\?]*)</card>'e", "mdv_convert_card('\\1')", $text);
+    $output = preg_replace();
 
     return $output;
 }
 
-function mdv_valid_card($card) {
-    //This function is always given a valid card
-    $output = "";
-    $len = strlen($card);
+function mdv_valid_card( $card ) {
+    $len = strlen( $card );
 
     //No suit
-    if ($len == 1) {
-        $output = '<span class="nocardsuit">'.$card.'&nbsp;</span>';
-    }
-    //Suited card
-    else {
-        $suit = substr($card, 1, 1);
-        //Red suit
-        if (preg_match("/[DH]/", $suit)) {
-            $card = preg_replace("/D/", "&diams;", $card);
-            $card = preg_replace("/H/", "&hearts;", $card);
-            $output = '<span class="redcardsuit">'.$card.'</span>';
-        }
-        //Black suit
-        else {
-            $card = preg_replace("/C/", "&clubs;", $card);
-            $card = preg_replace("/S/", "&spades;", $card);
-            $output = '<span class="blackcardsuit">'.$card.'</span>';
+    if ( 1 == $len ) {
+        $output = '<span class="nocardsuit">' . $card . '&nbsp;</span>';
+    } else {
+        // Suited card
+        $suit = substr( $card, 1, 1 );
+
+        // Red suit
+        if ( preg_match( "/[DH]/", $suit ) ) {
+            $card = preg_replace( "/D/", "&diams;", $card );
+            $card = preg_replace( "/H/", "&hearts;", $card );
+            $output = '<span class="redcardsuit">' . $card . '</span>';
+        } else {
+            // Black suit
+            $card = preg_replace( "/C/", "&clubs;", $card );
+            $card = preg_replace( "/S/", "&spades;", $card );
+            $output = '<span class="blackcardsuit">' . $card . '</span>';
         }
     }
@@ -45 +42 @@
 }
 
-function mdv_convert_card($card) {
-    $output = "";
-    $invalid_message = "[invalid card]"; //Text to display for invalid card input
-    $inv = '<span class="invalidcard">'.$invalid_message.'</span>';
+function mdv_convert_card( $card ) {
+    $invalid_message = "[invalid card]";
+    $inv = '<span class="invalidcard">' . $invalid_message . '</span>';
 
-    //Make some format changes to the input
-    $card = strtoupper($card);
-    $card = str_replace("10", "T", $card);
-    $card = str_replace("1", "A", $card);
+    //Make some format changes to the input
+    $card = strtoupper();
+    $card = str_replace();
+    $card = str_replace();
 
-    $len = strlen($card);
-    if ($len == 1) {
-        //Unsuited card
-        if (preg_match("/[2-9TJQKAX\?]/", $card)) {
+    $len = strlen();
+    if () {
+        
+        
             $output = mdv_valid_card($card);
-        }
-        //Suit w/o card rank
-        else if (preg_match("/[CDHS]/", $card)) {
-            $card = "X".$card;
-            $output = mdv_valid_card($card);
-        }
-        //Invalid card
-        else {
+        } elseif ( preg_match( "/[CDHS]/", $card ) ) {
+            //Suit w/o card rank
+            $card = "X" . $card;
+            $output = mdv_valid_card( $card );
+        } else {
             $output = $inv;
         }
-    }
-    else if ($len == 2) {
-        if (preg_match("/[2-9TJQKAX\?][CDHS]/", $card)) {
-            $output = mdv_valid_card($card);
-        }
-        else {
+    } elseif (2 == $len ) {
+        if ( preg_match( "/[2-9TJQKAX\?][CDHS]/", $card ) ) {
+            $output = mdv_valid_card( $card );
+        } else {
             $output = $inv;
         }
-    }
-    else {
+    } else {
         $output = $inv;
     }
 
     return $output;
-
 }
 
@@ -113 +102 @@
 
 // Define custom tags to allow span tag
-define('CUSTOM_TAGS', true);
+define();
 $allowedtags = array(
-                'a' => array(
-                    'href' => array(),
-                    'title' => array(),
-                    'rel' => array()),
-                'abbr' => array('title' => array()),
-                'acronym' => array('title' => array()),
-                'b' => array(),
-                'blockquote' => array('cite' => array()),
-                'card' => array(),
-                'code' => array(),
-                'em' => array(),
-                'i' => array(),
-                'span' => array('class' => array()),
-                'strike' => array(),
-                'strong' => array(),
-                );
+    'a'          => array(
+        'href'  => array(),
+        'title' => array(),
+        'rel'   => array(),
+    ),
+    'abbr'       => array( 'title' => array() ),
+    'acronym'    => array( 'title' => array() ),
+    'b'          => array(),
+    'blockquote' => array( 'cite' => array() ),
+    'card'       => array(),
+    'code'       => array(),
+    'em'         => array(),
+    'i'          => array(),
+    'span'       => array( 'class' => array() ),
+    'strike'     => array(),
+    'strong'     => array(),
+);
 
-add_filter('the_content', 'mdv_card_converter');
-add_filter('the_excerpt', 'mdv_card_converter');
-add_filter('comment_text', 'mdv_card_converter', 9);
-add_action('wp_head', 'mdv_card_converter_css');
-?>
+add_filter( 'the_content', 'mdv_card_converter' );
+add_filter( 'the_excerpt', 'mdv_card_converter' );
+add_filter( 'comment_text', 'mdv_card_converter', 9 );
+add_action( 'wp_head', 'mdv_card_converter_css' );