Add original phptidy and setting to select between phptidy and wp-phptidy

PhpTidy.sublime-settings

@@ -1,4 +1,7 @@
 {
    //Filetypes that PhpTidy can run on.
-   "filetypes": [".php", ".module", ".inc"]
+   "filetypes": [".php", ".module", ".inc"],
+
+   //Selected Tidy Type (phptidy, wp)
+   "tidytype": "wp"
 }

README.md

@@ -16,7 +16,7 @@ http://magp.ie/2011/01/10/tidy-and-format-your-php-and-meet-wordpress-standards-
 ctrl + shift + P and type `Tidy PHP`, or you can use the ctrl + alt + T keybinding.
 
 ## Customize
-Custom settings file (for choosing between original phptidy and wp-phptidy) coming soon.
+Custom settings file (for choosing between original phptidy and wp-phptidy).
 
 ## Known issues
 Running phptidy on your file will clear all bookmarks and foldings.

php_tidy.py

@@ -13,9 +13,17 @@ def run(self, edit):
 
             print('PhpTidy: Ok, this seems to be PHP')            
 
+            # set tidy type
+            tidy_type = settings.get('tidytype') or 'wp'
+
+            if tidy_type == 'wp':
+                tidy_file = 'wp-phptidy.php'
+            else:
+                tidy_file = 'phptidy.php'
+
             # path to plugin - <sublime dir>/Packages/PhpTidy
             pluginpath = sublime.packages_path() + '/PhpTidy'
-            scriptpath = pluginpath + '/wp-phptidy.php'
+            scriptpath = pluginpath + '/' + tidy_file
 
             # path to temp file
             tmpfile = '/tmp/phptidy-sublime-buffer.php'
@@ -48,7 +56,7 @@ def run(self, edit):
 
 
             # call phptidy on tmpfile
-            scriptpath = pluginpath + '/wp-phptidy.php'
+            scriptpath = pluginpath + '/' + tidy_file
             print('PhpTidy: calling script: %s "%s" replace "%s"' % ( phppath, scriptpath, tmpfile ) )
             retval = os.system( '%s "%s" replace "%s"' % ( phppath, scriptpath, tmpfile ) )
             if not ((retval == 0) or (retval == 1)):