bunch fixes

n0needt0 · Mar 7, 2013 · d638fd2 · d638fd2
1 parent 79058a3
commit d638fd2
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 4 deletions.
diff --git a/...e/var/mail.oopzy.com/.htaccess.production → ...e/var/mail.oopzy.com/.production.htaccess b/...e/var/mail.oopzy.com/.htaccess.production → ...e/var/mail.oopzy.com/.production.htaccess
diff --git a/...code/var/mail.oopzy.com/.htaccess.staging → ...code/var/mail.oopzy.com/.staging.htaccess b/...code/var/mail.oopzy.com/.htaccess.staging → ...code/var/mail.oopzy.com/.staging.htaccess
diff --git a/mail.oopzy.com/code/var/mail.oopzy.com/app/helpers/utils.php b/mail.oopzy.com/code/var/mail.oopzy.com/app/helpers/utils.php
@@ -93,7 +93,9 @@ public function box_quality($box)
               return $quality;
           }
 
-          if(!filter_var($box . '@oopzy.com', FILTER_VALIDATE_EMAIL))
+          $result = filter_var($box . '@oopzy.com', FILTER_VALIDATE_EMAIL);
+
+          if(empty($result))
           {
              return -1;
           }

diff --git a/mail.oopzy.com/code/var/mail.oopzy.com/app/models/oopzy_model.php b/mail.oopzy.com/code/var/mail.oopzy.com/app/models/oopzy_model.php
@@ -25,8 +25,11 @@ public function do_remail_queue($ref, $box, $toemail)
       }
 
       //if obj is email init verification
-      if(filter_var($obj, FILTER_VALIDATE_EMAIL))
+      $result = filter_var($obj, FILTER_VALIDATE_EMAIL);
+
+      if(empty($result))
       {
+
           if(stristr($obj, $GLOBALS['host_name']))
           {
             //we do not verify ourselves

diff --git a/.../code/var/mail.oopzy.com/index.production → ...e/var/mail.oopzy.com/index.production.php b/.../code/var/mail.oopzy.com/index.production → ...e/var/mail.oopzy.com/index.production.php
diff --git a/...com/code/var/mail.oopzy.com/index.staging → ...code/var/mail.oopzy.com/index.staging.php b/...com/code/var/mail.oopzy.com/index.staging → ...code/var/mail.oopzy.com/index.staging.php
diff --git a/mail.oopzy.com/config/deploy.rb b/mail.oopzy.com/config/deploy.rb
@@ -88,9 +88,9 @@ def remote_file_exists?(full_path)
 
   desc "get correct config"
   task :get_correct_config do
-    run "cp #{deploy_to}/current/mail.oopzy.com/code/var/mail.oopzy.com/index.#{stage} #{deploy_to}/current/mail.oopzy.com/code/var/mail.oopzy.com/index.php"
+    run "cp #{deploy_to}/current/mail.oopzy.com/code/var/mail.oopzy.com/index.#{stage}.php #{deploy_to}/current/mail.oopzy.com/code/var/mail.oopzy.com/index.php"
 
-    run "cp #{deploy_to}/current/mail.oopzy.com/code/var/mail.oopzy.com/.htaccess.#{stage} #{deploy_to}/current/mail.oopzy.com/code/var/mail.oopzy.com/.htaccess"
+    run "cp #{deploy_to}/current/mail.oopzy.com/code/var/mail.oopzy.com/.#{stage}.htaccess #{deploy_to}/current/mail.oopzy.com/code/var/mail.oopzy.com/.htaccess"
   end
 
  desc "get correct smtp2redis"