adamjakab / SuiteCRM

include/MassUpdate.php

Switch Indentation +16 added lines, -16 removed lines

@@ -1302,22 +1302,22 @@
                 if(isset($field['type']))
                 {
                     switch($field["type"]){
-                    case "relate":
-                    case "parent":
-                    case "int":
-                    case "contact_id":
-                    case "assigned_user_name":
-                    case "account_id":
-                    case "account_name":
-                    case "bool":
-                    case "enum":
-                    case "multienum":
-                    case "radioenum":
-                    case "datetimecombo":
-                    case "datetime":
-                    case "date":
-                        return true;
-                        break;
+                        case "relate":
+                        case "parent":
+                        case "int":
+                        case "contact_id":
+                        case "assigned_user_name":
+                        case "account_id":
+                        case "account_name":
+                        case "bool":
+                        case "enum":
+                        case "multienum":
+                        case "radioenum":
+                        case "datetimecombo":
+                        case "datetime":
+                        case "date":
+                            return true;
+                            break;
                     }
                 }
             }

include/HTTP_WebDAV_Server/Server.php

Switch Indentation +98 added lines, -98 removed lines

@@ -501,34 +501,34 @@ 
                 // here we strip all unrequested entries out of the response
 
                 switch($options['props']) {
-                case "all":
-                    // nothing to remove
-                    break;
+                    case "all":
+                        // nothing to remove
+                        break;
 
-                case "names":
-                    // only the names of all existing properties were requested
-                    // so we remove all values
-                    unset($files["files"][$filekey]["props"][$key]["val"]);
-                    break;
+                    case "names":
+                        // only the names of all existing properties were requested
+                        // so we remove all values
+                        unset($files["files"][$filekey]["props"][$key]["val"]);
+                        break;
 
-                default:
-                    $found = false;
+                    default:
+                        $found = false;
 
-                    // search property name in requested properties
-                    foreach((array)$options["props"] as $reqprop) {
-                        if (   $reqprop["name"]  == $prop["name"]
-                            && $reqprop["xmlns"] == $prop["ns"]) {
-                            $found = true;
-                            break;
+                        // search property name in requested properties
+                        foreach((array)$options["props"] as $reqprop) {
+                            if (   $reqprop["name"]  == $prop["name"]
+                                && $reqprop["xmlns"] == $prop["ns"]) {
+                                $found = true;
+                                break;
+                            }
                         }
-                    }
 
-                    // unset property and continue with next one if not found/requested
-                    if (!$found) {
-                        $files["files"][$filekey]["props"][$key]="";
-                        continue(2);
-                    }
-                    break;
+                        // unset property and continue with next one if not found/requested
+                        if (!$found) {
+                            $files["files"][$filekey]["props"][$key]="";
+                            continue(2);
+                        }
+                        break;
                 }
 
                 // namespace handling
@@ -629,32 +629,32 @@ 
                     } else if ($prop["ns"] == "DAV:") {
                         // some WebDAV properties need special treatment
                         switch ($prop["name"]) {
-                        case "creationdate":
-                            echo "     <D:creationdate ns0:dt=\"dateTime.tz\">"
-                                . gmdate("Y-m-d\\TH:i:s\\Z",$prop['val'])
-                                . "</D:creationdate>\n";
-                            break;
-                        case "getlastmodified":
-                            echo "     <D:getlastmodified ns0:dt=\"dateTime.rfc1123\">"
-                                . TimeDate::httptime($prop['val'])
-                                . "</D:getlastmodified>\n";
-                            break;
-                        case "resourcetype":
-                            echo "     <D:resourcetype><D:$prop[val]/></D:resourcetype>\n";
-                            break;
-                        case "supportedlock":
-                            echo "     <D:supportedlock>$prop[val]</D:supportedlock>\n";
-                            break;
-                        case "lockdiscovery":
-                            echo "     <D:lockdiscovery>\n";
-                            echo $prop["val"];
-                            echo "     </D:lockdiscovery>\n";
-                            break;
-                        default:
-                            echo "     <D:$prop[name]>"
-                                . $this->_prop_encode(htmlspecialchars($prop['val']))
-                                .     "</D:$prop[name]>\n";
-                            break;
+                            case "creationdate":
+                                echo "     <D:creationdate ns0:dt=\"dateTime.tz\">"
+                                    . gmdate("Y-m-d\\TH:i:s\\Z",$prop['val'])
+                                    . "</D:creationdate>\n";
+                                break;
+                            case "getlastmodified":
+                                echo "     <D:getlastmodified ns0:dt=\"dateTime.rfc1123\">"
+                                    . TimeDate::httptime($prop['val'])
+                                    . "</D:getlastmodified>\n";
+                                break;
+                            case "resourcetype":
+                                echo "     <D:resourcetype><D:$prop[val]/></D:resourcetype>\n";
+                                break;
+                            case "supportedlock":
+                                echo "     <D:supportedlock>$prop[val]</D:supportedlock>\n";
+                                break;
+                            case "lockdiscovery":
+                                echo "     <D:lockdiscovery>\n";
+                                echo $prop["val"];
+                                echo "     </D:lockdiscovery>\n";
+                                break;
+                            default:
+                                echo "     <D:$prop[name]>"
+                                    . $this->_prop_encode(htmlspecialchars($prop['val']))
+                                    .     "</D:$prop[name]>\n";
+                                break;
                         }
                     } else {
                         // properties from namespaces != "DAV:" or without any namespace
@@ -1041,56 +1041,56 @@ 
             foreach ($_SERVER as $key => $val) {
                 if (strncmp($key, "HTTP_CONTENT", 11)) continue;
                 switch ($key) {
-                case 'HTTP_CONTENT_ENCODING': // RFC 2616 14.11
-                    // TODO support this if ext/zlib filters are available
-                    $this->http_status("501 not implemented");
-                    echo "The service does not support '$val' content encoding";
-                    return;
+                    case 'HTTP_CONTENT_ENCODING': // RFC 2616 14.11
+                        // TODO support this if ext/zlib filters are available
+                        $this->http_status("501 not implemented");
+                        echo "The service does not support '$val' content encoding";
+                        return;
 
-                case 'HTTP_CONTENT_LANGUAGE': // RFC 2616 14.12
-                    // we assume it is not critical if this one is ignored
-                    // in the actual PUT implementation ...
-                    $options["content_language"] = $value;
-                    break;
+                    case 'HTTP_CONTENT_LANGUAGE': // RFC 2616 14.12
+                        // we assume it is not critical if this one is ignored
+                        // in the actual PUT implementation ...
+                        $options["content_language"] = $value;
+                        break;
 
-                case 'HTTP_CONTENT_LOCATION': // RFC 2616 14.14
-                    /* The meaning of the Content-Location header in PUT
+                    case 'HTTP_CONTENT_LOCATION': // RFC 2616 14.14
+                        /* The meaning of the Content-Location header in PUT
                        or POST requests is undefined; servers are free
                        to ignore it in those cases. */
-                    break;
-
-                case 'HTTP_CONTENT_RANGE':    // RFC 2616 14.16
-                    // single byte range requests are supported
-                    // the header format is also specified in RFC 2616 14.16
-                    // TODO we have to ensure that implementations support this or send 501 instead
-                    if (!preg_match('@bytes\s+(\d+)-(\d+)/((\d+)|\*)@', $value, $matches)) {
-                        $this->http_status("400 bad request");
-                        echo "The service does only support single byte ranges";
-                        return;
-                    }
+                        break;
 
-                    $range = array("start"=>$matches[1], "end"=>$matches[2]);
-                    if (is_numeric($matches[3])) {
-                        $range["total_length"] = $matches[3];
-                    }
-                    $option["ranges"][] = $range;
+                    case 'HTTP_CONTENT_RANGE':    // RFC 2616 14.16
+                        // single byte range requests are supported
+                        // the header format is also specified in RFC 2616 14.16
+                        // TODO we have to ensure that implementations support this or send 501 instead
+                        if (!preg_match('@bytes\s+(\d+)-(\d+)/((\d+)|\*)@', $value, $matches)) {
+                            $this->http_status("400 bad request");
+                            echo "The service does only support single byte ranges";
+                            return;
+                        }
 
-                    // TODO make sure the implementation supports partial PUT
-                    // this has to be done in advance to avoid data being overwritten
-                    // on implementations that do not support this ...
-                    break;
+                        $range = array("start"=>$matches[1], "end"=>$matches[2]);
+                        if (is_numeric($matches[3])) {
+                            $range["total_length"] = $matches[3];
+                        }
+                        $option["ranges"][] = $range;
 
-                case 'HTTP_CONTENT_MD5':      // RFC 2616 14.15
-                    // TODO: maybe we can just pretend here?
-                    $this->http_status("501 not implemented");
-                    echo "The service does not support content MD5 checksum verification";
-                    return;
+                        // TODO make sure the implementation supports partial PUT
+                        // this has to be done in advance to avoid data being overwritten
+                        // on implementations that do not support this ...
+                        break;
 
-                default:
-                    // any other unknown Content-* headers
-                    $this->http_status("501 not implemented");
-                    echo "The service does not support '$key'";
-                    return;
+                    case 'HTTP_CONTENT_MD5':      // RFC 2616 14.15
+                        // TODO: maybe we can just pretend here?
+                        $this->http_status("501 not implemented");
+                        echo "The service does not support content MD5 checksum verification";
+                        return;
+
+                    default:
+                        // any other unknown Content-* headers
+                        $this->http_status("501 not implemented");
+                        echo "The service does not support '$key'";
+                        return;
                 }
             }
 
@@ -1853,13 +1853,13 @@ 
     function _prop_encode($text)
     {
         switch (strtolower($this->_prop_encoding)) {
-        case "utf-8":
-            return $text;
-        case "iso-8859-1":
-        case "iso-8859-15":
-        case "latin-1":
-        default:
-            return utf8_encode($text);
+            case "utf-8":
+                return $text;
+            case "iso-8859-1":
+            case "iso-8859-15":
+            case "latin-1":
+            default:
+                return utf8_encode($text);
         }
     }
 }

include/Pear/XML_HTMLSax3/HTMLSax3/States.php

Switch Indentation +15 added lines, -15 removed lines

@@ -71,21 +71,21 @@
     */
     function parse(&$context) {
         switch($context->ScanCharacter()) {
-        case '/':
-            return XML_HTMLSAX3_STATE_CLOSING_TAG;
-            break;
-        case '?':
-            return XML_HTMLSAX3_STATE_PI;
-            break;
-        case '%':
-            return XML_HTMLSAX3_STATE_JASP;
-            break;
-        case '!':
-            return XML_HTMLSAX3_STATE_ESCAPE;
-            break;
-        default:
-            $context->unscanCharacter();
-            return XML_HTMLSAX3_STATE_OPENING_TAG;
+            case '/':
+                return XML_HTMLSAX3_STATE_CLOSING_TAG;
+                break;
+            case '?':
+                return XML_HTMLSAX3_STATE_PI;
+                break;
+            case '%':
+                return XML_HTMLSAX3_STATE_JASP;
+                break;
+            case '!':
+                return XML_HTMLSAX3_STATE_ESCAPE;
+                break;
+            default:
+                $context->unscanCharacter();
+                return XML_HTMLSAX3_STATE_OPENING_TAG;
         }
     }
 }

include/social/twitter/twitter_auth/twitteroauth/twitteroauth.php

Switch Indentation +4 added lines, -4 removed lines

@@ -178,10 +178,10 @@
     $request = OAuthRequest::from_consumer_and_token($this->consumer, $this->token, $method, $url, $parameters);
     $request->sign_request($this->sha1_method, $this->consumer, $this->token);
     switch ($method) {
-    case 'GET':
-      return $this->http($request->to_url(), 'GET');
-    default:
-      return $this->http($request->get_normalized_http_url(), $method, $request->to_postdata());
+        case 'GET':
+          return $this->http($request->to_url(), 'GET');
+        default:
+          return $this->http($request->get_normalized_http_url(), $method, $request->to_postdata());
     }
   }
 

include/phpmailer/extras/htmlfilter.php

Switch Indentation +104 added lines, -104 removed lines

@@ -182,34 +182,34 @@ 
      *	  <img src="blah"/>
      */
     switch (substr($body, $pos, 1)) {
-    case '/':
-        $tagtype = 2;
-        $pos++;
-        break;
-    case '!':
-        /**
+        case '/':
+            $tagtype = 2;
+            $pos++;
+            break;
+        case '!':
+            /**
          * A comment or an SGML declaration.
          */
-            if (substr($body, $pos + 1, 2) == '--') {
-            $gt = strpos($body, '-->', $pos);
-            if ($gt === false) {
-                $gt = strlen($body);
+                if (substr($body, $pos + 1, 2) == '--') {
+                $gt = strpos($body, '-->', $pos);
+                if ($gt === false) {
+                    $gt = strlen($body);
+                } else {
+                    $gt += 2;
+                }
+                return array(false, false, false, $lt, $gt);
             } else {
-                $gt += 2;
+                $gt = tln_findnxstr($body, $pos, '>');
+                return array(false, false, false, $lt, $gt);
             }
-            return array(false, false, false, $lt, $gt);
-        } else {
-            $gt = tln_findnxstr($body, $pos, '>');
-            return array(false, false, false, $lt, $gt);
-        }
-        break;
-    default:
-        /**
+            break;
+        default:
+            /**
          * Assume tagtype 1 for now. If it's type 3, we'll switch values
          * later.
          */
-        $tagtype = 1;
-        break;
+            $tagtype = 1;
+            break;
     }
 
     /**
@@ -231,36 +231,36 @@ 
      * Whatever else we find there indicates an invalid tag.
      */
     switch ($match) {
-    case '/':
-        /**
+        case '/':
+            /**
          * This is an xhtml-style tag with a closing / at the
          * end, like so: <img src="blah"/>. Check if it's followed
          * by the closing bracket. If not, then this tag is invalid
          */
-        if (substr($body, $pos, 2) == '/>') {
-            $pos++;
-            $tagtype = 3;
-        } else {
-            $gt = tln_findnxstr($body, $pos, '>');
-            $retary = array(false, false, false, $lt, $gt);
-            return $retary;
-        }
-            //intentional fall-through
-    case '>':
-        return array($tagname, false, $tagtype, $lt, $pos);
-        break;
-    default:
-        /**
+            if (substr($body, $pos, 2) == '/>') {
+                $pos++;
+                $tagtype = 3;
+            } else {
+                $gt = tln_findnxstr($body, $pos, '>');
+                $retary = array(false, false, false, $lt, $gt);
+                return $retary;
+            }
+                //intentional fall-through
+        case '>':
+            return array($tagname, false, $tagtype, $lt, $pos);
+            break;
+        default:
+            /**
          * Check if it's whitespace
          */
-        if (!preg_match('/\s/', $match)) {
-            /**
+            if (!preg_match('/\s/', $match)) {
+                /**
              * This is an invalid tag! Look for the next closing ">".
              */
-            $gt = tln_findnxstr($body, $lt, '>');
-            return array(false, false, false, $lt, $gt);
-        }
-        break;
+                $gt = tln_findnxstr($body, $lt, '>');
+                return array(false, false, false, $lt, $gt);
+            }
+            break;
     }
 
     /**
@@ -332,32 +332,32 @@ 
          *		anything else means the attribute is invalid.
          */
         switch ($match) {
-        case '/':
-            /**
+            case '/':
+                /**
              * This is an xhtml-style tag with a closing / at the
              * end, like so: <img src="blah"/>. Check if it's followed
              * by the closing bracket. If not, then this tag is invalid
              */
-            if (substr($body, $pos, 2) == '/>') {
-                $pos++;
-                $tagtype = 3;
-            } else {
-                $gt = tln_findnxstr($body, $pos, '>');
-                $retary = array(false, false, false, $lt, $gt);
-                return $retary;
-            }
-                //intentional fall-through
-        case '>':
-            $attary{$attname} = '"yes"';
-            return array($tagname, $attary, $tagtype, $lt, $pos);
-            break;
-        default:
-            /**
+                if (substr($body, $pos, 2) == '/>') {
+                    $pos++;
+                    $tagtype = 3;
+                } else {
+                    $gt = tln_findnxstr($body, $pos, '>');
+                    $retary = array(false, false, false, $lt, $gt);
+                    return $retary;
+                }
+                    //intentional fall-through
+            case '>':
+                $attary{$attname} = '"yes"';
+                return array($tagname, $attary, $tagtype, $lt, $pos);
+                break;
+            default:
+                /**
              * Skip whitespace and see what we arrive at.
              */
-            $pos = tln_skipspace($body, $pos);
-            $char = substr($body, $pos, 1);
-            /**
+                $pos = tln_skipspace($body, $pos);
+                $char = substr($body, $pos, 1);
+                /**
              * Two things are valid here:
              * '=' means this is attribute type 1 2 or 3.
              * \w means this was attribute type 4.
@@ -365,60 +365,60 @@ 
              * invalid stuff will be caught by our checks at the beginning
              * of the loop.
              */
-            if ($char == '=') {
-                $pos++;
-                $pos = tln_skipspace($body, $pos);
-                /**
+                if ($char == '=') {
+                    $pos++;
+                    $pos = tln_skipspace($body, $pos);
+                    /**
                  * Here are 3 possibilities:
                  * "'"	attribute type 1
                  * '"'	attribute type 2
                  * everything else is the content of tag type 3
                  */
-                $quot = substr($body, $pos, 1);
-                if ($quot == '\'') {
-                        $regary = tln_findnxreg($body, $pos + 1, '\'');
-                    if ($regary == false) {
-                        return array(false, false, false, $lt, strlen($body));
-                    }
-                    list($pos, $attval, $match) = $regary;
-                    $pos++;
-                    $attary{$attname} = '\'' . $attval . '\'';
-                } elseif ($quot == '"') {
-                    $regary = tln_findnxreg($body, $pos + 1, '\"');
-                    if ($regary == false) {
-                        return array(false, false, false, $lt, strlen($body));
-                    }
-                    list($pos, $attval, $match) = $regary;
-                    $pos++;
-                            $attary{$attname} = '"' . $attval . '"';
-                } else {
-                    /**
+                    $quot = substr($body, $pos, 1);
+                    if ($quot == '\'') {
+                            $regary = tln_findnxreg($body, $pos + 1, '\'');
+                        if ($regary == false) {
+                            return array(false, false, false, $lt, strlen($body));
+                        }
+                        list($pos, $attval, $match) = $regary;
+                        $pos++;
+                        $attary{$attname} = '\'' . $attval . '\'';
+                    } elseif ($quot == '"') {
+                        $regary = tln_findnxreg($body, $pos + 1, '\"');
+                        if ($regary == false) {
+                            return array(false, false, false, $lt, strlen($body));
+                        }
+                        list($pos, $attval, $match) = $regary;
+                        $pos++;
+                                $attary{$attname} = '"' . $attval . '"';
+                    } else {
+                        /**
                      * These are hateful. Look for \s, or >.
                      */
-                    $regary = tln_findnxreg($body, $pos, '[\s>]');
-                    if ($regary == false) {
-                        return array(false, false, false, $lt, strlen($body));
-                    }
-                    list($pos, $attval, $match) = $regary;
-                    /**
+                        $regary = tln_findnxreg($body, $pos, '[\s>]');
+                        if ($regary == false) {
+                            return array(false, false, false, $lt, strlen($body));
+                        }
+                        list($pos, $attval, $match) = $regary;
+                        /**
                      * If it's ">" it will be caught at the top.
                      */
-                    $attval = preg_replace('/\"/s', '&quot;', $attval);
-                    $attary{$attname} = '"' . $attval . '"';
-                }
-            } elseif (preg_match('|[\w/>]|', $char)) {
-                /**
+                        $attval = preg_replace('/\"/s', '&quot;', $attval);
+                        $attary{$attname} = '"' . $attval . '"';
+                    }
+                } elseif (preg_match('|[\w/>]|', $char)) {
+                    /**
                  * That was attribute type 4.
                  */
-                $attary{$attname} = '"yes"';
-            } else {
-                /**
+                    $attary{$attname} = '"yes"';
+                } else {
+                    /**
                  * An illegal character. Find next '>' and return.
                  */
-                $gt = tln_findnxstr($body, $pos, '>');
-                return array(false, false, false, $lt, $gt);
-            }
-            break;
+                    $gt = tln_findnxstr($body, $pos, '>');
+                    return array(false, false, false, $lt, $gt);
+                }
+                break;
         }
     }
     /**

modules/vCals/HTTP_WebDAV_Server_vCal.php

Switch Indentation +31 added lines, -31 removed lines

@@ -295,49 +295,49 @@
             foreach ($_SERVER as $key => $val) {
                 if (strncmp($key, "HTTP_CONTENT", 11)) continue;
                 switch ($key) {
-                case 'HTTP_CONTENT_ENCODING': // RFC 2616 14.11
-                    // TODO support this if ext/zlib filters are available
-                    $this->http_status("501 not implemented");
-                    echo "The service does not support '$val' content encoding";
-                    return;
+                    case 'HTTP_CONTENT_ENCODING': // RFC 2616 14.11
+                        // TODO support this if ext/zlib filters are available
+                        $this->http_status("501 not implemented");
+                        echo "The service does not support '$val' content encoding";
+                        return;
 
-                case 'HTTP_CONTENT_LANGUAGE': // RFC 2616 14.12
-                    // we assume it is not critical if this one is ignored
-                    // in the actual PUT implementation ...
-                    $options["content_language"] = $val;
-                    break;
+                    case 'HTTP_CONTENT_LANGUAGE': // RFC 2616 14.12
+                        // we assume it is not critical if this one is ignored
+                        // in the actual PUT implementation ...
+                        $options["content_language"] = $val;
+                        break;
 
-                case 'HTTP_CONTENT_LOCATION': // RFC 2616 14.14
-                    /* The meaning of the Content-Location header in PUT
+                    case 'HTTP_CONTENT_LOCATION': // RFC 2616 14.14
+                        /* The meaning of the Content-Location header in PUT
                        or POST requests is undefined; servers are free
                        to ignore it in those cases. */
-                    break;
-
-                case 'HTTP_CONTENT_RANGE':    // RFC 2616 14.16
-                    // single byte range requests are NOT supported
-                    // the header format is also specified in RFC 2616 14.16
-                    // TODO we have to ensure that implementations support this or send 501 instead
-                        $this->http_status("400 bad request");
-                        echo "The service does only support single byte ranges";
+                        break;
+
+                    case 'HTTP_CONTENT_RANGE':    // RFC 2616 14.16
+                        // single byte range requests are NOT supported
+                        // the header format is also specified in RFC 2616 14.16
+                        // TODO we have to ensure that implementations support this or send 501 instead
+                            $this->http_status("400 bad request");
+                            echo "The service does only support single byte ranges";
+                            return;
+
+                    case 'HTTP_CONTENT_MD5':      // RFC 2616 14.15
+                        // TODO: maybe we can just pretend here?
+                        $this->http_status("501 not implemented");
+                        echo "The service does not support content MD5 checksum verification";
                         return;
 
-                case 'HTTP_CONTENT_MD5':      // RFC 2616 14.15
-                    // TODO: maybe we can just pretend here?
-                    $this->http_status("501 not implemented");
-                    echo "The service does not support content MD5 checksum verification";
-                    return;
-
 				case 'HTTP_CONTENT_LENGTH': // RFC 2616 14.14
                     /* The meaning of the Content-Location header in PUT
                        or POST requests is undefined; servers are free
                        to ignore it in those cases. */
                     break;
 
-                default:
-                    // any other unknown Content-* headers
-                    $this->http_status("501 not implemented");
-                    echo "The service does not support '$key'";
-                    return;
+                    default:
+                        // any other unknown Content-* headers
+                        $this->http_status("501 not implemented");
+                        echo "The service does not support '$key'";
+                        return;
                 }
             }
 

modules/Import/maps/ImportMapAct.php

Switch Indentation +46 added lines, -46 removed lines

@@ -78,52 +78,52 @@
     {
         $return_array = parent::getMapping($module);
         switch ($module) {
-        case 'Contacts':
-        case 'Leads':
-            return $return_array + array(
-                "Web Site"=>"website",
-                "Company"=>"account_name",
-                "Name Suffix"=>"salutation",
-                "Address 1"=>"primary_address_street",
-                "Address 2"=>"primary_address_street_2",
-                "Address 3"=>"primary_address_street_3",
-                "City"=>"primary_address_city",
-                "State"=>"primary_address_state",
-                "Zip"=>"primary_address_postalcode",
-                "Country"=>"primary_address_country",
-                "Phone"=>"phone_work",
-                "Phone Ext-"=>"phone_work_ext",
-                "Mobile Phone"=>"phone_mobile",
-                "Alt Phone"=>"phone_other",
-                "Fax"=>"phone_fax",
-                "E-mail Login"=>"email1",
-                "E-mail"=>"email1",
-                "Assistant"=>"assistant",
-                "Asst. Phone"=>"assistant_phone",
-                "Home Address 1"=>"alt_address_street",
-                "Home Address 2"=>"alt_address_street_2",
-                "Home Address 3"=>"alt_address_street_3",
-                "Home Zip"=>"alt_address_postalcode",
-                "Home Country"=>"alt_address_country",
-                "Home Phone"=>"phone_home",
-                );
-            break;
-        case 'Accounts':
-            return $return_array + array(
-                "Revenue"=>"annual_revenue",
-                "Number of Employees"=>"employees",
-                "Address 1"=>"billing_address_street",
-                "City"=>"billing_address_city",
-                "State"=>"billing_address_state",
-                "Zip Code"=>"billing_address_postalcode",
-                "Country"=>"billing_address_country",
-                "Phone"=>"phone_office",
-                "Fax Phone"=>"phone_fax",
-                "Ticker Symbol"=>"ticker_symbol",
-                );
-            break;
-        default:
-            return $return_array;
+            case 'Contacts':
+            case 'Leads':
+                return $return_array + array(
+                    "Web Site"=>"website",
+                    "Company"=>"account_name",
+                    "Name Suffix"=>"salutation",
+                    "Address 1"=>"primary_address_street",
+                    "Address 2"=>"primary_address_street_2",
+                    "Address 3"=>"primary_address_street_3",
+                    "City"=>"primary_address_city",
+                    "State"=>"primary_address_state",
+                    "Zip"=>"primary_address_postalcode",
+                    "Country"=>"primary_address_country",
+                    "Phone"=>"phone_work",
+                    "Phone Ext-"=>"phone_work_ext",
+                    "Mobile Phone"=>"phone_mobile",
+                    "Alt Phone"=>"phone_other",
+                    "Fax"=>"phone_fax",
+                    "E-mail Login"=>"email1",
+                    "E-mail"=>"email1",
+                    "Assistant"=>"assistant",
+                    "Asst. Phone"=>"assistant_phone",
+                    "Home Address 1"=>"alt_address_street",
+                    "Home Address 2"=>"alt_address_street_2",
+                    "Home Address 3"=>"alt_address_street_3",
+                    "Home Zip"=>"alt_address_postalcode",
+                    "Home Country"=>"alt_address_country",
+                    "Home Phone"=>"phone_home",
+                    );
+                break;
+            case 'Accounts':
+                return $return_array + array(
+                    "Revenue"=>"annual_revenue",
+                    "Number of Employees"=>"employees",
+                    "Address 1"=>"billing_address_street",
+                    "City"=>"billing_address_city",
+                    "State"=>"billing_address_state",
+                    "Zip Code"=>"billing_address_postalcode",
+                    "Country"=>"billing_address_country",
+                    "Phone"=>"phone_office",
+                    "Fax Phone"=>"phone_fax",
+                    "Ticker Symbol"=>"ticker_symbol",
+                    );
+                break;
+            default:
+                return $return_array;
         }
     }
 }

modules/Users/password_utils.php

Switch Indentation +17 added lines, -17 removed lines

@@ -113,23 +113,23 @@
 				break;
 
 
-		    case '2':
-		    	$login=$current_user->getPreference('loginexpiration');
-		    	$current_user->setPreference('loginexpiration',$login+1);
-		        $current_user->save();
-		        if ($login+1 >= $res[$type.'expirationlogin']){
-		        	$_SESSION['expiration_type']= $mod_strings['LBL_PASSWORD_EXPIRATION_LOGIN'];
-		        	return true;
-		        }
-		        else
-		            {
-			    	return false;
-			    	}
-		    	break;
-
-		    case '0':
-		        return false;
-		   	 	break;
+		        case '2':
+		    	    $login=$current_user->getPreference('loginexpiration');
+		    	    $current_user->setPreference('loginexpiration',$login+1);
+		            $current_user->save();
+		            if ($login+1 >= $res[$type.'expirationlogin']){
+		        	    $_SESSION['expiration_type']= $mod_strings['LBL_PASSWORD_EXPIRATION_LOGIN'];
+		        	    return true;
+		            }
+		            else
+		                {
+			    	    return false;
+			    	    }
+		    	    break;
+
+		        case '0':
+		            return false;
+		   	 	    break;
 		    }
 		}
     }

modules/Users/Changenewpassword.php

Switch Indentation +15 added lines, -15 removed lines

@@ -72,21 +72,21 @@
 										$_REQUEST["recaptcha_response_field"]);
 	if(!$response->is_valid){
 		switch ($response->error){
-		case 'invalid-site-private-key':
-			echo $mod_strings['LBL_RECAPTCHA_INVALID_PRIVATE_KEY'];
-			break;
-		case 'incorrect-captcha-sol' :
-			echo $mod_strings['LBL_RECAPTCHA_FILL_FIELD'];
-			break;
-		case 'invalid-request-cookie' :
-			echo $mod_strings['LBL_RECAPTCHA_INVALID_REQUEST_COOKIE'];
-			break;
-		case 'unknown' :
-			echo $mod_strings['LBL_RECAPTCHA_UNKNOWN'];
-			break;
-
-		default:
-			echo "Invalid captcha entry, go back and fix. ". $response->error. " ";
+		    case 'invalid-site-private-key':
+			    echo $mod_strings['LBL_RECAPTCHA_INVALID_PRIVATE_KEY'];
+			    break;
+		    case 'incorrect-captcha-sol' :
+			    echo $mod_strings['LBL_RECAPTCHA_FILL_FIELD'];
+			    break;
+		    case 'invalid-request-cookie' :
+			    echo $mod_strings['LBL_RECAPTCHA_INVALID_REQUEST_COOKIE'];
+			    break;
+		    case 'unknown' :
+			    echo $mod_strings['LBL_RECAPTCHA_UNKNOWN'];
+			    break;
+
+		    default:
+			    echo "Invalid captcha entry, go back and fix. ". $response->error. " ";
 		}
 	}
 	else {