API tools faq
paste
Guest User

Untitled

a guest
Apr 30th, 2013
141
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 10.26 KB | None | 0 0
raw download clone embed print report
  1. diff -ruN OLDDIR/messages_en.yml NEWDIR/messages_en.yml
  2. --- OLDDIR/messages_en.yml  2013-04-25 03:14:52.000000000 +0100
  3. +++ NEWDIR/messages_en.yml  2013-04-30 20:09:47.397638264 +0100
  4. @@ -40,4 +40,16 @@
  5.  valid_captcha: '&cYour captcha is valid !'
  6.  kick_forvip: '&cA VIP Player join the full server!'
  7.  kick_fullserver: '&cThe server is actually full, Sorry!'
  8. +usage_email_add: 'use: /email add <Email> <ConfirmeEmail> '
  9. +usage_email_change: 'use: /email change <EmailAntigo> <NovoEmail> '
  10. +usage_email_recovery: 'use: /email recovery <Email>'
  11. +usage_email_info: 'use: /email info'
  12. +new_email_invalid: '[AuthMe] New email invalid!'
  13. +old_email_invalid: '[AuthMe] Old email invalid!'
  14. +email_invalid: '[AuthMe] Invalid Email'
  15. +email_added: '[AuthMe] Email Added !'
  16. +email_confirm: '[AuthMe] Confirm your Email !'
  17. +email_defined: '[AuthMe] Your Email : '
  18. +email_changed: '[AuthMe] Email Change !'
  19. +email_send: '[AuthMe] Recovery Email Send !'
  20.  
  21. diff -ruN OLDDIR/src/uk/org/whoami/authme/commands/CaptchaCommand.java NEWDIR/src/uk/org/whoami/authme/commands/CaptchaCommand.java
  22. --- OLDDIR/src/uk/org/whoami/authme/commands/CaptchaCommand.java    2013-04-25 03:14:52.000000000 +0100
  23. +++ NEWDIR/src/uk/org/whoami/authme/commands/CaptchaCommand.java    2013-04-30 20:09:55.809638584 +0100
  24. @@ -68,7 +68,7 @@
  25.              plugin.cap.remove(name);
  26.          } catch (NullPointerException npe) {
  27.          }
  28. -        player.sendMessage("Your captcha is correct");
  29. +        player.sendMessage(m._("valid_captcha"));
  30.          player.sendMessage(m._("login_msg"));
  31.          return true;
  32.     }
  33. diff -ruN OLDDIR/src/uk/org/whoami/authme/commands/EmailCommand.java NEWDIR/src/uk/org/whoami/authme/commands/EmailCommand.java
  34. --- OLDDIR/src/uk/org/whoami/authme/commands/EmailCommand.java  2013-04-25 03:14:52.000000000 +0100
  35. +++ NEWDIR/src/uk/org/whoami/authme/commands/EmailCommand.java  2013-04-30 20:17:13.917655244 +0100
  36. @@ -62,25 +62,40 @@
  37.         String name = player.getName().toLowerCase();
  38.  
  39.         if (args.length == 0) {
  40. -          player.sendMessage("usage: /email add <Email> <confirmEmail> ");
  41. -           player.sendMessage("usage: /email change <old> <new> ");
  42. -           player.sendMessage("usage: /email recovery <Email>");
  43. +          player.sendMessage(m._("usage_email_add"));
  44. +           player.sendMessage(m._("usage_email_change"));
  45. +           player.sendMessage(m._("usage_email_recovery"));
  46. +          player.sendMessage(m._("usage_email_info"));
  47.             return true;
  48.         }
  49.  
  50. +       if(args[0].equalsIgnoreCase("info") && PlayerCache.getInstance().isAuthenticated(name)) {
  51. +        
  52. +          PlayerAuth auth = PlayerCache.getInstance().getAuth(name);
  53. +          if (auth.getEmail() == null || auth.getEmail().contains("[email protected]")) {
  54. +              player.sendMessage(m._("usage_email_add"));
  55. +              return true;
  56. +          }
  57. +                              
  58. +           if (auth.getEmail() != null && !auth.getEmail().contains("[email protected]") && auth.getEmail().length() > 5) {
  59. +              player.sendMessage(m._("email_defined") + "*****" + auth.getEmail().substring(5) ); // some noob privacy
  60. +              return true;
  61. +           }
  62. +       }
  63. +
  64.          if(args[0].equalsIgnoreCase("add")) {
  65.             if (args.length != 3) {
  66. -               player.sendMessage("[AuthMe] /email add <Email> <confirmEmail>");
  67. +               player.sendMessage(m._("usage_email_add"));
  68.                 return true;
  69.             }
  70.              if(args[1].equals(args[2]) && PlayerCache.getInstance().isAuthenticated(name)) {
  71.                  PlayerAuth auth = PlayerCache.getInstance().getAuth(name);
  72.                  if (auth.getEmail() == null || !auth.getEmail().contains("[email protected]")) {
  73. -                   player.sendMessage("[AuthMe] /email change <old> <new>");
  74. +                   player.sendMessage("usage_email_change");
  75.                     return true;
  76.                  }
  77.                  if (!args[1].contains("@")) {
  78. -                   player.sendMessage("[AuthMe] Invalid Email !");
  79. +                   player.sendMessage(m._("email_invalid"));
  80.                     return true;
  81.                  }
  82.                  auth.setEmail(args[1]);
  83. @@ -89,10 +104,10 @@
  84.                      return true;
  85.                  }
  86.                  PlayerCache.getInstance().updatePlayer(auth);
  87. -                player.sendMessage("[AuthMe] Email Added !");
  88. +                player.sendMessage(m._("email_added"));
  89.                  player.sendMessage(auth.getEmail());
  90.              } else if (PlayerCache.getInstance().isAuthenticated(name)){
  91. -                player.sendMessage("[AuthMe] Confirm your Email ! ");
  92. +                player.sendMessage(m._("email_confirm"));
  93.              } else {
  94.                 if (!data.isAuthAvailable(name)) {
  95.                     player.sendMessage(m._("login_msg"));
  96. @@ -104,27 +119,27 @@
  97.              if(PlayerCache.getInstance().isAuthenticated(name)) {
  98.                  PlayerAuth auth = PlayerCache.getInstance().getAuth(name);
  99.                  if (auth.getEmail() == null || auth.getEmail() == "[email protected]") {
  100. -                   player.sendMessage("[AuthMe] Please use : /email add <email> <confirmEmail>");
  101. +                   player.sendMessage(m._("usage_email_add"));
  102.                     return true;
  103.                  }
  104. -                if (args[1] != auth.getEmail()) {
  105. -                   player.sendMessage("[AuthMe] Invalid Email !");
  106. +                if (!args[1].equals(auth.getEmail())) {
  107. +                   player.sendMessage(m._("old_email_invalid"));
  108.                     return true;
  109.                  }
  110.                  if (!args[2].contains("@")) {
  111. -                   player.sendMessage("[AuthMe] New Email is Invalid !");
  112. +                   player.sendMessage(m._("new_email_invalid"));
  113.                     return true;
  114.                  }
  115.                  auth.setEmail(args[2]);
  116.                  if (!data.updateEmail(auth)) {
  117. -                    player.sendMessage("[AuthMe] /email command only available with MySQL and SQLite");
  118. +                    player.sendMessage(m._("bad_database_email"));
  119.                      return true;
  120.                  }
  121.                  PlayerCache.getInstance().updatePlayer(auth);
  122. -                player.sendMessage("[AuthMe] Email Change !");
  123. -                player.sendMessage("[AuthMe] Your Email : " + auth.getEmail());
  124. +                player.sendMessage(m._("email_changed"));
  125. +                player.sendMessage(m._("email_defined") + auth.getEmail());
  126.              } else if (PlayerCache.getInstance().isAuthenticated(name)){
  127. -                player.sendMessage("[AuthMe] Confirm your Email ! ");
  128. +                player.sendMessage(m._("email_confirm"));
  129.              } else {
  130.                 if (!data.isAuthAvailable(name)) {
  131.                     player.sendMessage(m._("login_msg"));
  132. @@ -135,7 +150,7 @@
  133.          }
  134.          if(args[0].equalsIgnoreCase("recovery")) {
  135.             if (args.length != 2) {
  136. -               player.sendMessage("usage: /email recovery <Email>");
  137. +               player.sendMessage(m._("usage_email_recovery"));
  138.                 return true;
  139.             }
  140.             if (plugin.mail == null) {
  141. @@ -167,7 +182,7 @@
  142.                         }
  143.                        
  144.                         if (!args[1].equalsIgnoreCase(auth.getEmail())) {
  145. -                           player.sendMessage("[AuthMe] Invalid Email");
  146. +                           player.sendMessage(m._("email_invalid"));
  147.                             return true;
  148.                         }
  149.                         final String finalhashnew = hashnew;
  150. @@ -180,7 +195,7 @@
  151.                             }
  152.                         });
  153.                         plugin.mail.main(auth, thePass);
  154. -                       player.sendMessage("[AuthMe] Recovery Email Send !");
  155. +                       player.sendMessage(m._("email_send"));
  156.                     } catch (NoSuchAlgorithmException ex) {
  157.                         ConsoleLogger.showError(ex.getMessage());
  158.                         sender.sendMessage(m._("error"));
  159. diff -ruN OLDDIR/src/uk/org/whoami/authme/commands/RegisterCommand.java NEWDIR/src/uk/org/whoami/authme/commands/RegisterCommand.java
  160. --- OLDDIR/src/uk/org/whoami/authme/commands/RegisterCommand.java   2013-04-25 03:14:52.000000000 +0100
  161. +++ NEWDIR/src/uk/org/whoami/authme/commands/RegisterCommand.java   2013-04-30 20:15:48.045651979 +0100
  162. @@ -128,8 +128,8 @@
  163.                 if(args.length < 2) {
  164.                      player.sendMessage(m._("usage_reg"));
  165.                      return true;
  166. -               }
  167. -               if(args[0] != args[1]) {
  168. +               }              
  169. +               if (!args[0].equals(args[1])) {
  170.                      player.sendMessage(m._("usage_reg"));
  171.                      return true;
  172.                 }
  173. @@ -173,7 +173,7 @@
  174.                     }
  175.                 });
  176.  
  177. -                if(!Settings.getRegisteredGroup.isEmpty()){
  178. +                if(!Settings.emailRegistration && !Settings.getRegisteredGroup.isEmpty()){
  179.                      Utils.getInstance().setGroup(player, Utils.groupType.REGISTERED);
  180.                  }
  181.                 player.sendMessage(m._("vb_nonActiv"));
  182. diff -ruN OLDDIR/src/uk/org/whoami/authme/settings/Messages.java NEWDIR/src/uk/org/whoami/authme/settings/Messages.java
  183. --- OLDDIR/src/uk/org/whoami/authme/settings/Messages.java  2013-04-25 03:14:52.000000000 +0100
  184. +++ NEWDIR/src/uk/org/whoami/authme/settings/Messages.java  2013-04-30 20:17:43.157656356 +0100
  185. @@ -72,6 +72,20 @@
  186.          this.set("valid_captcha", "&cYour captcha is valid !");
  187.          this.set("kick_forvip", "&cA VIP Player join the full server!");
  188.          this.set("kick_fullserver", "&cThe server is actually full, Sorry!");
  189. +        this.set("usage_email_add", "usage: /email add <Email> <confirmEmail> ");
  190. +        this.set("usage_email_change", "usage: /email change <old> <new> ");
  191. +        this.set("usage_email_recovery", "usage: /email recovery <Email>");
  192. +        this.set("usage_email_info", "usage: /email info");
  193. +        this.set("email_add", "[AuthMe] /email add <Email> <confirmEmail>");
  194. +        this.set("new_email_invalid", "[AuthMe] New email invalid!");
  195. +        this.set("old_email_invalid", "[AuthMe] Old email invalid!");
  196. +        this.set("email_invalid", "[AuthMe] Invalid Email !");
  197. +        this.set("email_added", "[AuthMe] Email Added !");
  198. +        this.set("email_confirm", "[AuthMe] Confirm your Email !");
  199. +        this.set("email_defined", "[AuthMe] Your Email : ");
  200. +        this.set("email_changed", "[AuthMe] Email Change !");
  201. +        this.set("email_send", "[AuthMe] Recovery Email Send !");
  202. +        
  203.      }
  204.  
  205.     private void loadFile() {
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!