adamjakab / SuiteCRM

modules/Reminders_Invitees/Reminder_Invitee.php

Spacing +12 added lines, -12 removed lines

@@ -60,8 +60,8 @@ 
         parent::Basic();
     }
 
-    public function bean_implements($interface){
-        switch($interface){
+    public function bean_implements($interface) {
+        switch ($interface) {
             case 'ACL': return true;
         }
         return false;
@@ -75,13 +75,13 @@ 
 	 */
     public static function saveRemindersInviteesData($reminderId, $inviteesData) {
         $savedInviteeIds = array();
-        foreach($inviteesData as $k => $inviteeData) {
-            if(isset($_POST['isDuplicate']) && $_POST['isDuplicate']) $inviteeData->id = '';
+        foreach ($inviteesData as $k => $inviteeData) {
+            if (isset($_POST['isDuplicate']) && $_POST['isDuplicate']) $inviteeData->id = '';
             $reminderInviteeBean = BeanFactory::getBean('Reminders_Invitees', $inviteeData->id);
             $reminderInviteeBean->reminder_id = $reminderId;
             $reminderInviteeBean->related_invitee_module = $inviteeData->module;
             $reminderInviteeBean->related_invitee_module_id = $inviteeData->module_id;
-            if(!$inviteeData->id) {
+            if (!$inviteeData->id) {
                 $reminderInviteeBean->save();
                 $savedInviteeIds[] = $reminderInviteeBean->id;
             }
@@ -108,7 +108,7 @@ 
 		$ret = array();
 		$reminderInviteeBeen = new Reminder_Invitee();
 		$reminderInvitees = $reminderInviteeBeen->get_full_list("reminders_invitees.date_entered", "reminders_invitees.reminder_id = '$reminderId'");
-        if($reminderInvitees) {
+        if ($reminderInvitees) {
             foreach ($reminderInvitees as $reminderInvitee) {
                 $ret[] = array(
                     'id' => $isDuplicate ? null : $reminderInvitee->id,
@@ -125,21 +125,21 @@ 
         $retValue = "unknown";
 
         $bean = BeanFactory::getBean($module, $moduleId);
-        switch($module) {
+        switch ($module) {
             case 'Users':
             case 'Contacts':
             case 'Leads':
             default:
-                if(isset($bean->first_name) && isset($bean->last_name)) {
+                if (isset($bean->first_name) && isset($bean->last_name)) {
                     $retValue = "{$bean->first_name} {$bean->last_name}";
                 }
-                else if(isset($bean->name)) {
+                else if (isset($bean->name)) {
                     $retValue = $bean->name;
                 }
-                else if(isset($bean->email)) {
+                else if (isset($bean->email)) {
                     $retValue = $bean->email;
                 }
-                if(!$retValue) {
+                if (!$retValue) {
                     $retValue = "$module ($moduleId)";
                 }
                 break;
@@ -155,7 +155,7 @@ 
 	 */
     public static function deleteRemindersInviteesMultiple($reminderId, $inviteeIds = array()) {
         $invitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list("", "reminders_invitees.reminder_id = '$reminderId'");
-        if($invitees) {
+        if ($invitees) {
             foreach ($invitees as $invitee) {
                 if (!in_array($invitee->id, $inviteeIds)) {
                     $invitee->mark_deleted($invitee->id);

Braces +6 added lines, -7 removed lines

@@ -76,7 +76,9 @@ 
     public static function saveRemindersInviteesData($reminderId, $inviteesData) {
         $savedInviteeIds = array();
         foreach($inviteesData as $k => $inviteeData) {
-            if(isset($_POST['isDuplicate']) && $_POST['isDuplicate']) $inviteeData->id = '';
+            if(isset($_POST['isDuplicate']) && $_POST['isDuplicate']) {
+                $inviteeData->id = '';
+            }
             $reminderInviteeBean = BeanFactory::getBean('Reminders_Invitees', $inviteeData->id);
             $reminderInviteeBean->reminder_id = $reminderId;
             $reminderInviteeBean->related_invitee_module = $inviteeData->module;
@@ -84,8 +86,7 @@ 
             if(!$inviteeData->id) {
                 $reminderInviteeBean->save();
                 $savedInviteeIds[] = $reminderInviteeBean->id;
-            }
-            else {
+            } else {
                 $addedInvitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list("", "reminders_invitees.id != '{$inviteeData->id}' AND reminders_invitees.reminder_id = '{$reminderInviteeBean->reminder_id}' AND reminders_invitees.related_invitee_module = '{$reminderInviteeBean->related_invitee_module}' AND reminders_invitees.related_invitee_module_id = '{$reminderInviteeBean->related_invitee_module_id}'");
                 if (!$addedInvitees) {
                     $reminderInviteeBean->save();
@@ -132,11 +133,9 @@ 
             default:
                 if(isset($bean->first_name) && isset($bean->last_name)) {
                     $retValue = "{$bean->first_name} {$bean->last_name}";
-                }
-                else if(isset($bean->name)) {
+                } else if(isset($bean->name)) {
                     $retValue = $bean->name;
-                }
-                else if(isset($bean->email)) {
+                } else if(isset($bean->email)) {
                     $retValue = $bean->email;
                 }
                 if(!$retValue) {

Indentation +24 added lines, -24 removed lines

@@ -67,12 +67,12 @@ 
         return false;
     }
 
-	/**
-	 * Save multiple reminders invitees data.
-	 *
-	 * @param string $reminderId Related Reminder GUID
-	 * @param array $inviteesData Invitees Data
-	 */
+    /**
+     * Save multiple reminders invitees data.
+     *
+     * @param string $reminderId Related Reminder GUID
+     * @param array $inviteesData Invitees Data
+     */
     public static function saveRemindersInviteesData($reminderId, $inviteesData) {
         $savedInviteeIds = array();
         foreach($inviteesData as $k => $inviteeData) {
@@ -98,16 +98,16 @@ 
         self::deleteRemindersInviteesMultiple($reminderId, $savedInviteeIds);
     }
 
-	/**
-	 * Load reminders invitees data.
-	 *
-	 * @param string $reminderId Related Reminder GUID
-	 * @return array Invitees data
-	 */
-	public static function loadRemindersInviteesData($reminderId, $isDuplicate = false) {
-		$ret = array();
-		$reminderInviteeBeen = new Reminder_Invitee();
-		$reminderInvitees = $reminderInviteeBeen->get_full_list("reminders_invitees.date_entered", "reminders_invitees.reminder_id = '$reminderId'");
+    /**
+     * Load reminders invitees data.
+     *
+     * @param string $reminderId Related Reminder GUID
+     * @return array Invitees data
+     */
+    public static function loadRemindersInviteesData($reminderId, $isDuplicate = false) {
+        $ret = array();
+        $reminderInviteeBeen = new Reminder_Invitee();
+        $reminderInvitees = $reminderInviteeBeen->get_full_list("reminders_invitees.date_entered", "reminders_invitees.reminder_id = '$reminderId'");
         if($reminderInvitees) {
             foreach ($reminderInvitees as $reminderInvitee) {
                 $ret[] = array(
@@ -118,8 +118,8 @@ 
                 );
             }
         }
-		return $ret;
-	}
+        return $ret;
+    }
 
     private static function getInviteeName($module, $moduleId) {
         $retValue = "unknown";
@@ -147,12 +147,12 @@ 
         return $retValue;
     }
 
-	/**
-	 * Delete reminders invitees multiple.
-	 *
-	 * @param string $reminderId Related Reminder GUID
-	 * @param array $inviteeIds (optional) Exluded Invitees GUIDs, the invitee will not deleted if this argument contains that. Default is empty array.
-	 */
+    /**
+     * Delete reminders invitees multiple.
+     *
+     * @param string $reminderId Related Reminder GUID
+     * @param array $inviteeIds (optional) Exluded Invitees GUIDs, the invitee will not deleted if this argument contains that. Default is empty array.
+     */
     public static function deleteRemindersInviteesMultiple($reminderId, $inviteeIds = array()) {
         $invitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list("", "reminders_invitees.reminder_id = '$reminderId'");
         if($invitees) {

modules/AOP_Case_Updates/Case_Updates.php

Braces +6 added lines, -4 removed lines

@@ -159,7 +159,7 @@ 
         $bDate = $b->fetched_row['date_entered'];
         if($aDate < $bDate){
             return -1;
-        }elseif($aDate > $bDate){
+        } elseif($aDate > $bDate){
             return 1;
         }
         return 0;
@@ -195,9 +195,9 @@ 
     global $mod_strings;
     if($update->contact_id){
         $name = $update->getUpdateContact()->name;
-    }elseif($update->assigned_user_id){
+    } elseif($update->assigned_user_id){
         $name = $update->getUpdateUser()->name;
-    }else{
+    } else{
         $name = "Unknown";
     }
     $html = "<a href='' onclick='toggleCaseUpdate(\"".$update->id."\");return false;'>";
@@ -281,7 +281,9 @@ 
     global $action;
 
     //on DetailView only
-    if($action != 'DetailView') return;
+    if($action != 'DetailView') {
+        return;
+    }
 
     //current record id
     $record = $_GET['record'];

Spacing +30 added lines, -30 removed lines

@@ -23,7 +23,7 @@ 
  */
 
 
-function display_updates($focus, $field, $value, $view){
+function display_updates($focus, $field, $value, $view) {
     global $mod_strings;
 
     $hideImage = SugarThemeRegistry::current()->getImageURL('basic_search.gif');
@@ -127,8 +127,8 @@ 
 </script>
 A;
 
-    $updates = $focus->get_linked_beans('aop_case_updates',"AOP_Case_Updates");
-    if(!$updates || is_null($focus->id)){
+    $updates = $focus->get_linked_beans('aop_case_updates', "AOP_Case_Updates");
+    if (!$updates || is_null($focus->id)) {
         $html .= quick_edit_case_updates($focus);
         return $html;
         //return $mod_strings['LBL_NO_CASE_UPDATES'];
@@ -154,18 +154,18 @@ 
 EOD;
 
 
-    usort($updates,function($a,$b){
+    usort($updates, function($a, $b) {
         $aDate = $a->fetched_row['date_entered'];
         $bDate = $b->fetched_row['date_entered'];
-        if($aDate < $bDate){
+        if ($aDate < $bDate) {
             return -1;
-        }elseif($aDate > $bDate){
+        }elseif ($aDate > $bDate) {
             return 1;
         }
         return 0;
     });
 
-    foreach($updates as $update){
+    foreach ($updates as $update) {
         $html .= display_single_update($update, $hideImage);
     }
     $html .= "</div>";
@@ -178,9 +178,9 @@ 
 /**
  * @return mixed|string|void
  */
-function display_update_form(){
+function display_update_form() {
     global $mod_strings, $app_strings;
-    $sugar_smarty	= new Sugar_Smarty();
+    $sugar_smarty = new Sugar_Smarty();
     $sugar_smarty->assign('MOD', $mod_strings);
     $sugar_smarty->assign('APP', $app_strings);
     return $sugar_smarty->fetch('modules/AOP_Case_Updates/tpl/caseUpdateForm.tpl');
@@ -191,23 +191,23 @@ 
  * @param SugarBean $update
  * @return string - html to be displayed
  */
-function getUpdateDisplayHead(SugarBean $update){
+function getUpdateDisplayHead(SugarBean $update) {
     global $mod_strings;
-    if($update->contact_id){
+    if ($update->contact_id) {
         $name = $update->getUpdateContact()->name;
-    }elseif($update->assigned_user_id){
+    }elseif ($update->assigned_user_id) {
         $name = $update->getUpdateUser()->name;
-    }else{
+    } else {
         $name = "Unknown";
     }
     $html = "<a href='' onclick='toggleCaseUpdate(\"".$update->id."\");return false;'>";
     $html .= "<img  id='caseUpdate".$update->id."Image' class='caseUpdateImage' src='".SugarThemeRegistry::current()->getImageURL('basic_search.gif')."'>";
     $html .= "</a>";
-    $html .= "<span>".($update->internal ? "<strong>" . $mod_strings['LBL_INTERNAL'] . "</strong> " : '') .$name . " ".$update->date_entered."</span><br>";
-    $notes = $update->get_linked_beans('notes','Notes');
-    if($notes){
-        $html.= $mod_strings['LBL_AOP_CASE_ATTACHMENTS'];
-        foreach($notes as $note){
+    $html .= "<span>".($update->internal ? "<strong>".$mod_strings['LBL_INTERNAL']."</strong> " : '').$name." ".$update->date_entered."</span><br>";
+    $notes = $update->get_linked_beans('notes', 'Notes');
+    if ($notes) {
+        $html .= $mod_strings['LBL_AOP_CASE_ATTACHMENTS'];
+        foreach ($notes as $note) {
             $html .= "<a href='index.php?module=Notes&action=DetailView&record={$note->id}'>{$note->filename}</a>&nbsp;";
         }
     }
@@ -220,12 +220,12 @@ 
  * @param AOP_Case_Updates $update
  * @return string - the html for the update
  */
-function display_single_update(AOP_Case_Updates $update){
+function display_single_update(AOP_Case_Updates $update) {
 
     /*if assigned user*/
-    if($update->assigned_user_id){
+    if ($update->assigned_user_id) {
         /*if internal update*/
-        if ($update->internal){
+        if ($update->internal) {
             $html = "<div id='caseStyleInternal'>".getUpdateDisplayHead($update);
             $html .= "<div id='caseUpdate".$update->id."' class='caseUpdate'>";
             $html .= nl2br(html_entity_decode($update->description));
@@ -243,7 +243,7 @@ 
     }
 
     /*if contact user*/
-    if($update->contact_id){
+    if ($update->contact_id) {
         $html = "<div id='extramargin'><div id='caseStyleContact'>".getUpdateDisplayHead($update);
         $html .= "<div id='caseUpdate".$update->id."' class='caseUpdate'>";
         $html .= nl2br(html_entity_decode($update->description));
@@ -259,11 +259,11 @@ 
  * @param $case
  * @return string - html link
  */
-function display_case_attachments($case){
+function display_case_attachments($case) {
     $html = '';
-    $notes = $case->get_linked_beans('notes','Notes');
-    if($notes){
-        foreach($notes as $note){
+    $notes = $case->get_linked_beans('notes', 'Notes');
+    if ($notes) {
+        foreach ($notes as $note) {
             $html .= "<a href='index.php?module=Notes&action=DetailView&record={$note->id}'>{$note->filename}</a>&nbsp;";
         }
     }
@@ -277,11 +277,11 @@ 
  *
  * @return string - the html to be displayed and javascript
  */
-function quick_edit_case_updates($case){
+function quick_edit_case_updates($case) {
     global $action;
 
     //on DetailView only
-    if($action != 'DetailView') return;
+    if ($action != 'DetailView') return;
 
     //current record id
     $record = $_GET['record'];
@@ -294,12 +294,12 @@ 
     $roles = $acl->getUserRoles($id);
 
     //Return if user cannot edit cases
-    if(in_array( "no edit cases", $roles) || $roles === "no edit cases"){
+    if (in_array("no edit cases", $roles) || $roles === "no edit cases") {
 
         return;
     }
     $internalChecked = '';
-    if($case->internal){
+    if ($case->internal) {
         $internalChecked = "checked='checked'";
     }
     $html = <<< EOD

modules/AOP_Case_Updates/AOPAssignManager.php

Spacing +46 added lines, -46 removed lines

@@ -1,76 +1,76 @@ 
 <?php
-class AOPAssignManager{
+class AOPAssignManager {
     private $ieX = false;
     private $distributionMethod = '';
     private $aopFallback = true;
     private $assignableUsers = array();
 
-    function __construct($ieX = false){
+    function __construct($ieX = false) {
         global $sugar_config;
         $this->ieX = $ieX;
-        if($ieX) {
+        if ($ieX) {
             $inboundDistribMethod = $ieX->get_stored_options("distrib_method", "");
-        }else{
+        } else {
             $inboundDistribMethod = '';
         }
-        if($this->isAOPFallback($inboundDistribMethod)){
+        if ($this->isAOPFallback($inboundDistribMethod)) {
             $this->distributionMethod = $sugar_config['aop']['distribution_method'];
             $this->aopFallback = true;
-        }else{
+        } else {
             $this->distributionMethod = $inboundDistribMethod;
             $this->aopFallback = false;
         }
         $this->assignableUsers = $this->getAssignableUsers();
     }
 
-    private function isAOPFallback($distribMethod){
+    private function isAOPFallback($distribMethod) {
         return empty($distribMethod) || $distribMethod == 'AOPDefault';
     }
 
-    private function getDistributionOptions(){
+    private function getDistributionOptions() {
         global $sugar_config;
-        if($this->aopFallback){
+        if ($this->aopFallback) {
             return $sugar_config['aop']['distribution_options'];
-        }else{
+        } else {
             return $this->ieX->get_stored_options("distribution_options", '');
         }
     }
 
-    private function getRoleUsers($roleId){
+    private function getRoleUsers($roleId) {
         require_once('modules/ACLRoles/ACLRole.php');
         $role = new ACLRole();
         $role->retrieve($roleId);
-        $role_users = $role->get_linked_beans( 'users','User');
+        $role_users = $role->get_linked_beans('users', 'User');
         $r_users = array();
-        foreach($role_users as $role_user){
+        foreach ($role_users as $role_user) {
             $r_users[$role_user->id] = $role_user->name;
         }
         return $r_users;
     }
 
-    private function getAssignableUsers(){
-        if($this->distributionMethod == 'singleUser'){
+    private function getAssignableUsers() {
+        if ($this->distributionMethod == 'singleUser') {
             return array();
         }
         $distributionOptions = $this->getDistributionOptions();
 
-        if(empty($distributionOptions)){
+        if (empty($distributionOptions)) {
             return array();
         }
-        switch($distributionOptions[0]) {
+        switch ($distributionOptions[0]) {
             Case 'security_group':
-                if(file_exists('modules/SecurityGroups/SecurityGroup.php')){
+                if (file_exists('modules/SecurityGroups/SecurityGroup.php')) {
                     require_once('modules/SecurityGroups/SecurityGroup.php');
                     $security_group = new SecurityGroup();
                     $security_group->retrieve($distributionOptions[1]);
-                    $group_users = $security_group->get_linked_beans( 'users','User');
+                    $group_users = $security_group->get_linked_beans('users', 'User');
                     $users = array();
                     $r_users = array();
-                    if($distributionOptions[2] != ''){
+                    if ($distributionOptions[2] != '') {
                         $r_users = $this->getRoleUsers($distributionOptions[2]);
                     }
-                    foreach($group_users as $group_user){
-                        if($distributionOptions[2] != '' && !isset($r_users[$group_user->id])){
+                    foreach ($group_users as $group_user) {
+                        if ($distributionOptions[2] != '' && !isset($r_users[$group_user->id])) {
                             continue;
                         }
                         $users[$group_user->id] = $group_user->name;
@@ -90,57 +90,57 @@ 
 
     }
 
-    private function getSingleUser(){
+    private function getSingleUser() {
         global $sugar_config;
-        if($this->singleUser){
+        if ($this->singleUser) {
             return $this->singleUser;
         }
-        if($this->aopFallback){
+        if ($this->aopFallback) {
             $this->singleUser = !empty($sugar_config['aop']['distribution_user_id']) ? $sugar_config['aop']['distribution_user_id'] : '';
-        }else{
+        } else {
             $this->singleUser = $this->ieX->get_stored_options("distribution_user_id", "");
         }
         return $this->singleUser;
     }
 
-    private function getLeastBusyCounts(){
-        if($this->leastBusyUsers){
+    private function getLeastBusyCounts() {
+        if ($this->leastBusyUsers) {
             return $this->leastBusyUsers;
         }
         global $db;
-        $idIn = implode("','",$db->arrayQuote(array_keys($this->assignableUsers)));
-        if($idIn){
+        $idIn = implode("','", $db->arrayQuote(array_keys($this->assignableUsers)));
+        if ($idIn) {
             $idIn = "'".$idIn."'";
         }
         $res = $db->query("SELECT assigned_user_id, COUNT(*) AS c FROM cases WHERE assigned_user_id IN ({$idIn}) AND deleted = 0 GROUP BY assigned_user_id ORDER BY COUNT(*)");
         $this->leastBusyUsers = array();
-        while($row = $db->fetchByAssoc($res)){
+        while ($row = $db->fetchByAssoc($res)) {
             $this->leastBusyUsers[$row['assigned_user_id']] = $row['c'];
         }
         return $this->leastBusyUsers;
     }
 
-    private function getLeastBusyUser(){
+    private function getLeastBusyUser() {
         $leastBusyCounts = $this->getLeastBusyCounts();
         asort($leastBusyCounts);
         reset($leastBusyCounts);
         return key($leastBusyCounts);
     }
 
-    private function updateLeastBusy($id){
-        if(!$this->leastBusyUsers){
+    private function updateLeastBusy($id) {
+        if (!$this->leastBusyUsers) {
             $this->getLeastBusyCounts();
         }
         $this->leastBusyUsers[$id] = $this->leastBusyUsers[$id] + 1;
     }
 
-    private function getRandomUser(){
+    private function getRandomUser() {
         $randKey = array_rand($this->assignableUsers);
         return $this->assignableUsers[$randKey];
     }
 
-    function getNextAssignedUser(){
-        switch($this->distributionMethod){
+    function getNextAssignedUser() {
+        switch ($this->distributionMethod) {
             case 'singleUser':
                 $userId = $this->getSingleUser();
                 break;
@@ -163,20 +163,20 @@ 
 
     private function getRoundRobinUser() {
         $id = empty($this->ieX) ? '' : $this->ieX->id;
-        $file = create_cache_directory('modules/AOP_Case_Updates/Users/') . $id . 'lastUser.cache.php';
-        if(isset($_SESSION['AOPlastuser'][$id]) && $_SESSION['AOPlastuser'][$id] != '') {
+        $file = create_cache_directory('modules/AOP_Case_Updates/Users/').$id.'lastUser.cache.php';
+        if (isset($_SESSION['AOPlastuser'][$id]) && $_SESSION['AOPlastuser'][$id] != '') {
             $lastUserId = $_SESSION['AOPlastuser'][$id];
         }
-        else if (is_file($file)){
+        else if (is_file($file)) {
             include $file;
-            if(isset($lastUser['User']) && $lastUser['User'] != '') {
+            if (isset($lastUser['User']) && $lastUser['User'] != '') {
                 $lastUserId = $lastUser['User'];
             }
         }
         $users = array_keys($this->assignableUsers);
-        $lastOffset = array_search($lastUserId,$users);
+        $lastOffset = array_search($lastUserId, $users);
         $newOffset = ($lastOffset + 1) % count($users);
-        if(!empty($users[$newOffset])) {
+        if (!empty($users[$newOffset])) {
             return $users[$newOffset];
         }
         return reset($users);
@@ -185,14 +185,14 @@ 
     private function setLastRoundRobinUser($user_id) {
         $id = empty($this->ieX) ? '' : $this->ieX->id;
         $_SESSION['AOPlastuser'][$id] = $user_id;
-        $file = create_cache_directory('modules/AOP_Case_Updates/Users/') . $id . 'lastUser.cache.php';
+        $file = create_cache_directory('modules/AOP_Case_Updates/Users/').$id.'lastUser.cache.php';
         $arrayString = var_export_helper(array('User' => $user_id));
-        $content =<<<eoq
+        $content = <<<eoq
 <?php
 	\$lastUser = {$arrayString};
 ?>
 eoq;
-        if($fh = @sugar_fopen($file, 'w')) {
+        if ($fh = @sugar_fopen($file, 'w')) {
             fputs($fh, $content);
             fclose($fh);
         }

Braces +5 added lines, -6 removed lines

@@ -10,13 +10,13 @@ 
         $this->ieX = $ieX;
         if($ieX) {
             $inboundDistribMethod = $ieX->get_stored_options("distrib_method", "");
-        }else{
+        } else{
             $inboundDistribMethod = '';
         }
         if($this->isAOPFallback($inboundDistribMethod)){
             $this->distributionMethod = $sugar_config['aop']['distribution_method'];
             $this->aopFallback = true;
-        }else{
+        } else{
             $this->distributionMethod = $inboundDistribMethod;
             $this->aopFallback = false;
         }
@@ -31,7 +31,7 @@ 
         global $sugar_config;
         if($this->aopFallback){
             return $sugar_config['aop']['distribution_options'];
-        }else{
+        } else{
             return $this->ieX->get_stored_options("distribution_options", '');
         }
     }
@@ -97,7 +97,7 @@ 
         }
         if($this->aopFallback){
             $this->singleUser = !empty($sugar_config['aop']['distribution_user_id']) ? $sugar_config['aop']['distribution_user_id'] : '';
-        }else{
+        } else{
             $this->singleUser = $this->ieX->get_stored_options("distribution_user_id", "");
         }
         return $this->singleUser;
@@ -166,8 +166,7 @@ 
         $file = create_cache_directory('modules/AOP_Case_Updates/Users/') . $id . 'lastUser.cache.php';
         if(isset($_SESSION['AOPlastuser'][$id]) && $_SESSION['AOPlastuser'][$id] != '') {
             $lastUserId = $_SESSION['AOPlastuser'][$id];
-        }
-        else if (is_file($file)){
+        } else if (is_file($file)){
             include $file;
             if(isset($lastUser['User']) && $lastUser['User'] != '') {
                 $lastUserId = $lastUser['User'];

modules/SchedulersJobs/field_arrays.php

Indentation +18 added lines, -18 removed lines

@@ -40,23 +40,23 @@
 
 
 $fields_array['Schedulers_jobs'] = array (
-	'column_fields' => array (
-		'id',
-		'deleted',
-		'date_entered',
-		'date_modified',
-		'job_id',
-		'execute_time',
-		'status',
-	),
-	'list_fields' => array (
-		'id',
-		'job_id',
-		'execute_time'
-	),
-	'required_fields' => array (
-		'job_id' => 1,
-		'execute_time' => 1
-	)
+    'column_fields' => array (
+        'id',
+        'deleted',
+        'date_entered',
+        'date_modified',
+        'job_id',
+        'execute_time',
+        'status',
+    ),
+    'list_fields' => array (
+        'id',
+        'job_id',
+        'execute_time'
+    ),
+    'required_fields' => array (
+        'job_id' => 1,
+        'execute_time' => 1
+    )
 );
 ?>

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -39,8 +39,8 @@ 
  ********************************************************************************/
 
 
-$fields_array['Schedulers_jobs'] = array (
-	'column_fields' => array (
+$fields_array['Schedulers_jobs'] = array(
+	'column_fields' => array(
 		'id',
 		'deleted',
 		'date_entered',
@@ -49,12 +49,12 @@ 
 		'execute_time',
 		'status',
 	),
-	'list_fields' => array (
+	'list_fields' => array(
 		'id',
 		'job_id',
 		'execute_time'
 	),
-	'required_fields' => array (
+	'required_fields' => array(
 		'job_id' => 1,
 		'execute_time' => 1
 	)

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/SchedulersJobs/SchedulersJob.php

Spacing +49 added lines, -49 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -70,7 +70,7 @@ 
     public $requeue; // Requeue on failure?
     public $retry_count;
     public $failure_count;
-    public $job_delay=0; // Frequency to run it
+    public $job_delay = 0; // Frequency to run it
     public $assigned_user_id; // User under which the task is running
     public $client; // Client ID that owns this job
     public $execute_time_db;
@@ -78,13 +78,13 @@ 
 
 	// standard SugarBean child attrs
 	var $table_name		= "job_queue";
-	var $object_name		= "SchedulersJob";
+	var $object_name = "SchedulersJob";
 	var $module_dir		= "SchedulersJobs";
 	var $new_schema		= true;
 	var $process_save_dates = true;
 	// related fields
-	var $job_name;	// the Scheduler's 'name' field
-	var $job;		// the Scheduler's 'job' field
+	var $job_name; // the Scheduler's 'name' field
+	var $job; // the Scheduler's 'job' field
 	// object specific attributes
 	public $user; // User object
 	var $scheduler; // Scheduler parent
@@ -98,7 +98,7 @@ 
 	function SchedulersJob()
 	{
         parent::Basic();
-        if(!empty($GLOBALS['sugar_config']['jobs']['min_retry_interval'])) {
+        if (!empty($GLOBALS['sugar_config']['jobs']['min_retry_interval'])) {
             $this->min_interval = $GLOBALS['sugar_config']['jobs']['min_retry_interval'];
         }
 	}
@@ -121,10 +121,10 @@ 
      *
 	 * @return string Formatted datetime value
 	 */
-	function handleDateFormat($date='now', $user=null, $user_format=false) {
+	function handleDateFormat($date = 'now', $user = null, $user_format = false) {
 		global $timedate;
 
-		if(!isset($timedate) || empty($timedate))
+		if (!isset($timedate) || empty($timedate))
         {
 			$timedate = new TimeDate();
 		}
@@ -132,7 +132,7 @@ 
 		// get user for calculation
 		$user = (empty($user)) ? $this->user : $user;
 
-        if($date == 'now')
+        if ($date == 'now')
         {
             $dbTime = $timedate->asUser($timedate->getNow(), $user);
         } else {
@@ -152,7 +152,7 @@ 
 	 * @param	$job		String in URI-clean format
 	 * @param	$timeout	Int value in secs for cURL to timeout. 30 default.
 	 */
-	public function fireUrl($job, $timeout=30)
+	public function fireUrl($job, $timeout = 30)
 	{
 	// TODO: figure out what error is thrown when no more apache instances can be spun off
 	    // cURL inits
@@ -161,16 +161,16 @@ 
 		curl_setopt($ch, CURLOPT_FAILONERROR, true); // silent failure (code >300);
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); // do not follow location(); inits - we always use the current
 		curl_setopt($ch, CURLOPT_FORBID_REUSE, 1);
-		curl_setopt($ch, CURLOPT_DNS_USE_GLOBAL_CACHE, false);  // not thread-safe
+		curl_setopt($ch, CURLOPT_DNS_USE_GLOBAL_CACHE, false); // not thread-safe
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); // return into a variable to continue program execution
 		curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); // never times out - bad idea?
 		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5); // 5 secs for connect timeout
-		curl_setopt($ch, CURLOPT_FRESH_CONNECT, true);  // open brand new conn
+		curl_setopt($ch, CURLOPT_FRESH_CONNECT, true); // open brand new conn
 		curl_setopt($ch, CURLOPT_HEADER, true); // do not return header info with result
 		curl_setopt($ch, CURLOPT_NOPROGRESS, true); // do not have progress bar
 		$urlparts = parse_url($job);
-		if(empty($urlparts['port'])) {
-		    if($urlparts['scheme'] == 'https'){
+		if (empty($urlparts['port'])) {
+		    if ($urlparts['scheme'] == 'https') {
 				$urlparts['port'] = 443;
 			} else {
 				$urlparts['port'] = 80;
@@ -183,17 +183,17 @@ 
 
 		curl_setopt($ch, CURLOPT_NOSIGNAL, true); // ignore any cURL signals to PHP (for multi-threading)
 		$result = curl_exec($ch);
-		$cInfo = curl_getinfo($ch);	//url,content_type,header_size,request_size,filetime,http_code
+		$cInfo = curl_getinfo($ch); //url,content_type,header_size,request_size,filetime,http_code
 									//ssl_verify_result,total_time,namelookup_time,connect_time
 									//pretransfer_time,size_upload,size_download,speed_download,
 									//speed_upload,download_content_length,upload_content_length
 									//starttransfer_time,redirect_time
-		if(curl_errno($ch)) {
+		if (curl_errno($ch)) {
 		    $this->errors .= curl_errno($ch)."\n";
 		}
 		curl_close($ch);
 
-		if($result !== FALSE && $cInfo['http_code'] < 400) {
+		if ($result !== FALSE && $cInfo['http_code'] < 400) {
 			$GLOBALS['log']->debug("----->Firing was successful: $job");
 			$GLOBALS['log']->debug('----->WTIH RESULT: '.strip_tags($result).' AND '.strip_tags(print_r($cInfo, true)));
 			return true;
@@ -217,7 +217,7 @@ 
 
 		$temp_array = $this->get_list_view_array();
 		$temp_array['JOB_NAME'] = $this->job_name;
-		$temp_array['JOB']		= $this->job;
+		$temp_array['JOB'] = $this->job;
 
     	return $temp_array;
 	}
@@ -276,12 +276,12 @@ 
     public function resolveJob($resolution, $message = null)
     {
         $GLOBALS['log']->info("Resolving job {$this->id} as $resolution: $message");
-        if($resolution == self::JOB_FAILURE) {
+        if ($resolution == self::JOB_FAILURE) {
             $this->failure_count++;
-            if($this->requeue && $this->retry_count > 0) {
+            if ($this->requeue && $this->retry_count > 0) {
                 // retry failed job
                 $this->status = self::JOB_STATUS_QUEUED;
-                if($this->job_delay < $this->min_interval) {
+                if ($this->job_delay < $this->min_interval) {
                     $this->job_delay = $this->min_interval;
                 }
                 $this->execute_time = $GLOBALS['timedate']->getNow()->modify("+{$this->job_delay} seconds")->asDb();
@@ -299,7 +299,7 @@ 
         $this->addMessages($message);
         $this->resolution = $resolution;
         $this->save();
-        if($this->status == self::JOB_STATUS_DONE && $this->resolution == self::JOB_SUCCESS) {
+        if ($this->status == self::JOB_STATUS_DONE && $this->resolution == self::JOB_SUCCESS) {
             $this->updateSchedulerSuccess();
         }
         return true;
@@ -310,7 +310,7 @@ 
      */
     protected function updateSchedulerSuccess()
     {
-        if(empty($this->scheduler_id)) {
+        if (empty($this->scheduler_id)) {
             return;
         }
         $this->db->query("UPDATE schedulers SET last_run={$this->db->now()} WHERE id=".$this->db->quoted($this->scheduler_id));
@@ -323,11 +323,11 @@ 
      */
     protected function addMessages($message)
     {
-        if(!empty($this->errors)) {
+        if (!empty($this->errors)) {
             $this->message .= $this->errors;
             $this->errors = '';
         }
-        if(!empty($message)) {
+        if (!empty($message)) {
             $this->message .= "$message\n";
         }
     }
@@ -343,7 +343,7 @@ 
         $this->status = self::JOB_STATUS_QUEUED;
         $this->addMessages($message);
         $this->resolution = self::JOB_PARTIAL;
-        if(empty($delay)) {
+        if (empty($delay)) {
             $delay = intval($this->job_delay);
         }
         $this->execute_time = $GLOBALS['timedate']->getNow()->modify("+$delay seconds")->asDb();
@@ -367,7 +367,7 @@ 
      */
     public function unexpectedExit()
     {
-        if(!$this->job_done) {
+        if (!$this->job_done) {
             // Job wasn't properly finished, fail it
             $this->resolveJob(self::JOB_FAILURE, translate('ERR_FAILED', 'SchedulersJobs'));
         }
@@ -383,15 +383,15 @@ 
     {
         $job = new self();
         $job->retrieve($id);
-        if(empty($job->id)) {
+        if (empty($job->id)) {
             $GLOBALS['log']->fatal("Job $id not found.");
             return "Job $id not found.";
         }
-        if($job->status != self::JOB_STATUS_RUNNING) {
+        if ($job->status != self::JOB_STATUS_RUNNING) {
             $GLOBALS['log']->fatal("Job $id is not marked as running.");
             return "Job $id is not marked as running.";
         }
-        if($job->client != $client) {
+        if ($job->client != $client) {
             $GLOBALS['log']->fatal("Job $id belongs to client {$job->client}, can not run as $client.");
             return "Job $id belongs to another client, can not run as $client.";
         }
@@ -411,7 +411,7 @@ 
      */
     public function errorHandler($errno, $errstr, $errfile, $errline)
     {
-        switch($errno)
+        switch ($errno)
         {
     		case E_USER_WARNING:
     		case E_COMPILE_WARNING:
@@ -447,14 +447,14 @@ 
     {
         $GLOBALS['current_user'] = $user;
         // Reset the session
-        if(session_id()) {
+        if (session_id()) {
             session_destroy();
         }
-        if(!headers_sent()) {
+        if (!headers_sent()) {
     		session_start();
             session_regenerate_id();
         }
-        $_SESSION['is_valid_session']= true;
+        $_SESSION['is_valid_session'] = true;
     	$_SESSION['user_id'] = $user->id;
     	$_SESSION['type'] = 'user';
     	$_SESSION['authenticated_user_id'] = $user->id;
@@ -467,11 +467,11 @@ 
     protected function setJobUser()
     {
         // set up the current user and drop session
-        if(!empty($this->assigned_user_id)) {
+        if (!empty($this->assigned_user_id)) {
             $this->old_user = $GLOBALS['current_user'];
-            if(empty($this->user->id) || $this->assigned_user_id != $this->user->id) {
+            if (empty($this->user->id) || $this->assigned_user_id != $this->user->id) {
                 $this->user = BeanFactory::getBean('Users', $this->assigned_user_id);
-                if(empty($this->user->id)) {
+                if (empty($this->user->id)) {
                     $this->resolveJob(self::JOB_FAILURE, sprintf(translate('ERR_NOSUCHUSER', 'SchedulersJobs'), $this->assigned_user_id));
                     return false;
                 }
@@ -489,7 +489,7 @@ 
      */
     protected function restoreJobUser()
     {
-        if(!empty($this->old_user->id) && $this->old_user->id != $this->user->id) {
+        if (!empty($this->old_user->id) && $this->old_user->id != $this->user->id) {
             $this->sudo($this->old_user);
         }
     }
@@ -504,27 +504,27 @@ 
 
         $this->errors = "";
         $exJob = explode('::', $this->target, 2);
-        if($exJob[0] == 'function') {
+        if ($exJob[0] == 'function') {
             // set up the current user and drop session
-            if(!$this->setJobUser()) {
+            if (!$this->setJobUser()) {
                 return false;
             }
     		$func = $exJob[1];
 			$GLOBALS['log']->debug("----->SchedulersJob calling function: $func");
             set_error_handler(array($this, "errorHandler"), E_ALL & ~E_NOTICE & ~E_STRICT);
-			if(!is_callable($func)) {
+			if (!is_callable($func)) {
 			    $this->resolveJob(self::JOB_FAILURE, sprintf(translate('ERR_CALL', 'SchedulersJobs'), $func));
 			}
 			$data = array($this);
-			if(!empty($this->data)) {
+			if (!empty($this->data)) {
 			    $data[] = $this->data;
 			}
             $res = call_user_func_array($func, $data);
             restore_error_handler();
             $this->restoreJobUser();
-			if($this->status == self::JOB_STATUS_RUNNING) {
+			if ($this->status == self::JOB_STATUS_RUNNING) {
 			    // nobody updated the status yet - job function could do that
-    			if($res) {
+    			if ($res) {
     			    $this->resolveJob(self::JOB_SUCCESS);
     				return true;
     			} else {
@@ -534,11 +534,11 @@ 
 			} else {
 			    return $this->resolution != self::JOB_FAILURE;
 			}
-		} elseif($exJob[0] == 'url') {
-			if(function_exists('curl_init')) {
+		} elseif ($exJob[0] == 'url') {
+			if (function_exists('curl_init')) {
 				$GLOBALS['log']->debug('----->SchedulersJob firing URL job: '.$exJob[1]);
                 set_error_handler(array($this, "errorHandler"), E_ALL & ~E_NOTICE & ~E_STRICT);
-				if($this->fireUrl($exJob[1])) {
+				if ($this->fireUrl($exJob[1])) {
                     restore_error_handler();
                     $this->resolveJob(self::JOB_SUCCESS);
 					return true;
@@ -552,10 +552,10 @@ 
 			}
 		} elseif ($exJob[0] == 'class') {
             $tmpJob = new $exJob[1]();
-            if($tmpJob instanceof RunnableSchedulerJob)
+            if ($tmpJob instanceof RunnableSchedulerJob)
             {
                 // set up the current user and drop session
-                if(!$this->setJobUser()) {
+                if (!$this->setJobUser()) {
                     return false;
                 }
                 $tmpJob->setJob($this);

Braces +5 added lines, -5 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -573,12 +575,10 @@ 
                 } else {
                     return $this->resolution != self::JOB_FAILURE;
                 }
-            }
-            else {
+            } else {
                 $this->resolveJob(self::JOB_FAILURE, sprintf(translate('ERR_JOBTYPE', 'SchedulersJobs'), strip_tags($this->target)));
             }
-        }
-        else {
+        } else {
 		    $this->resolveJob(self::JOB_FAILURE, sprintf(translate('ERR_JOBTYPE', 'SchedulersJobs'), strip_tags($this->target)));
 		}
 		return false;

Doc Comments +4 added lines

@@ -356,6 +356,7 @@ 
     /**
      * Delete a job
      * @see SugarBean::mark_deleted($id)
+     * @param string $id
      */
     public function mark_deleted($id)
     {
@@ -595,12 +596,15 @@ 
     /**
      * @abstract
      * @param SchedulersJob $job
+     * @return void
      */
     public function setJob(SchedulersJob $job);
 
     /**
      * @abstract
      *
+     * @param string $data
+     * @return boolean
      */
     public function run($data);
 }

Indentation +207 added lines, -207 removed lines

@@ -55,17 +55,17 @@ 
     const JOB_FAILURE = 'failure';
 
     // schema attributes
-	public $id;
-	public $name;
-	public $deleted;
-	public $date_entered;
-	public $date_modified;
-	public $scheduler_id;
-	public $execute_time; // when to execute
+    public $id;
+    public $name;
+    public $deleted;
+    public $date_entered;
+    public $date_modified;
+    public $scheduler_id;
+    public $execute_time; // when to execute
     public $status;
     public $resolution;
     public $message;
-	public $target; // URL or function name
+    public $target; // URL or function name
     public $data; // Data set
     public $requeue; // Requeue on failure?
     public $retry_count;
@@ -76,61 +76,61 @@ 
     public $execute_time_db;
     public $percent_complete; // how much of the job is done
 
-	// standard SugarBean child attrs
-	var $table_name		= "job_queue";
-	var $object_name		= "SchedulersJob";
-	var $module_dir		= "SchedulersJobs";
-	var $new_schema		= true;
-	var $process_save_dates = true;
-	// related fields
-	var $job_name;	// the Scheduler's 'name' field
-	var $job;		// the Scheduler's 'job' field
-	// object specific attributes
-	public $user; // User object
-	var $scheduler; // Scheduler parent
-	public $min_interval = 30; // minimal interval for job reruns
-	protected $job_done = true;
+    // standard SugarBean child attrs
+    var $table_name		= "job_queue";
+    var $object_name		= "SchedulersJob";
+    var $module_dir		= "SchedulersJobs";
+    var $new_schema		= true;
+    var $process_save_dates = true;
+    // related fields
+    var $job_name;	// the Scheduler's 'name' field
+    var $job;		// the Scheduler's 'job' field
+    // object specific attributes
+    public $user; // User object
+    var $scheduler; // Scheduler parent
+    public $min_interval = 30; // minimal interval for job reruns
+    protected $job_done = true;
     protected $old_user;
 
-	/**
-	 * Job constructor.
-	 */
-	function __construct()
-	{
+    /**
+     * Job constructor.
+     */
+    function __construct()
+    {
         parent::__construct();
         if(!empty($GLOBALS['sugar_config']['jobs']['min_retry_interval'])) {
             $this->min_interval = $GLOBALS['sugar_config']['jobs']['min_retry_interval'];
         }
-	}
+    }
 
-	public function check_date_relationships_load()
-	{
+    public function check_date_relationships_load()
+    {
         // Hack to work around the mess with dates being auto-converted to user format on retrieve
-	    $this->execute_time_db = $this->db->fromConvert($this->execute_time, 'datetime');
-	    parent::check_date_relationships_load();
+        $this->execute_time_db = $this->db->fromConvert($this->execute_time, 'datetime');
+        parent::check_date_relationships_load();
     }
-	/**
+    /**
      * handleDateFormat
      *
-	 * This function handles returning a datetime value.  It allows a user instance to be passed in, but will default to the
+     * This function handles returning a datetime value.  It allows a user instance to be passed in, but will default to the
      * user member variable instance if none is found.
      *
-	 * @param string $date String value of the date to calculate, defaults to 'now'
-	 * @param object $user The User instance to use in calculating the time value, if empty, it will default to user member variable
-	 * @param boolean $user_format Boolean indicating whether or not to convert to user's time format, defaults to false
+     * @param string $date String value of the date to calculate, defaults to 'now'
+     * @param object $user The User instance to use in calculating the time value, if empty, it will default to user member variable
+     * @param boolean $user_format Boolean indicating whether or not to convert to user's time format, defaults to false
      *
-	 * @return string Formatted datetime value
-	 */
-	function handleDateFormat($date='now', $user=null, $user_format=false) {
-		global $timedate;
+     * @return string Formatted datetime value
+     */
+    function handleDateFormat($date='now', $user=null, $user_format=false) {
+        global $timedate;
 
-		if(!isset($timedate) || empty($timedate))
+        if(!isset($timedate) || empty($timedate))
         {
-			$timedate = new TimeDate();
-		}
+            $timedate = new TimeDate();
+        }
 
-		// get user for calculation
-		$user = (empty($user)) ? $this->user : $user;
+        // get user for calculation
+        $user = (empty($user)) ? $this->user : $user;
 
         if($date == 'now')
         {
@@ -141,109 +141,109 @@ 
 
         // if $user_format is set to true then just return as th user's time format, otherwise, return as database format
         return $user_format ? $dbTime : $timedate->fromUser($dbTime, $user)->asDb();
-	}
-
-
-	///////////////////////////////////////////////////////////////////////////
-	////	SCHEDULERSJOB HELPER FUNCTIONS
-
-	/**
-	 * This function takes a passed URL and cURLs it to fake multi-threading with another httpd instance
-	 * @param	$job		String in URI-clean format
-	 * @param	$timeout	Int value in secs for cURL to timeout. 30 default.
-	 */
-	public function fireUrl($job, $timeout=30)
-	{
-	// TODO: figure out what error is thrown when no more apache instances can be spun off
-	    // cURL inits
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, $job); // set url
-		curl_setopt($ch, CURLOPT_FAILONERROR, true); // silent failure (code >300);
-		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); // do not follow location(); inits - we always use the current
-		curl_setopt($ch, CURLOPT_FORBID_REUSE, 1);
-		curl_setopt($ch, CURLOPT_DNS_USE_GLOBAL_CACHE, false);  // not thread-safe
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); // return into a variable to continue program execution
-		curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); // never times out - bad idea?
-		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5); // 5 secs for connect timeout
-		curl_setopt($ch, CURLOPT_FRESH_CONNECT, true);  // open brand new conn
-		curl_setopt($ch, CURLOPT_HEADER, true); // do not return header info with result
-		curl_setopt($ch, CURLOPT_NOPROGRESS, true); // do not have progress bar
-		$urlparts = parse_url($job);
-		if(empty($urlparts['port'])) {
-		    if($urlparts['scheme'] == 'https'){
-				$urlparts['port'] = 443;
-			} else {
-				$urlparts['port'] = 80;
-			}
-		}
-		curl_setopt($ch, CURLOPT_PORT, $urlparts['port']); // set port as reported by Server
-		//TODO make the below configurable
-		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); // most customers will not have Certificate Authority account
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); // most customers will not have Certificate Authority account
-
-		curl_setopt($ch, CURLOPT_NOSIGNAL, true); // ignore any cURL signals to PHP (for multi-threading)
-		$result = curl_exec($ch);
-		$cInfo = curl_getinfo($ch);	//url,content_type,header_size,request_size,filetime,http_code
-									//ssl_verify_result,total_time,namelookup_time,connect_time
-									//pretransfer_time,size_upload,size_download,speed_download,
-									//speed_upload,download_content_length,upload_content_length
-									//starttransfer_time,redirect_time
-		if(curl_errno($ch)) {
-		    $this->errors .= curl_errno($ch)."\n";
-		}
-		curl_close($ch);
-
-		if($result !== FALSE && $cInfo['http_code'] < 400) {
-			$GLOBALS['log']->debug("----->Firing was successful: $job");
-			$GLOBALS['log']->debug('----->WTIH RESULT: '.strip_tags($result).' AND '.strip_tags(print_r($cInfo, true)));
-			return true;
-		} else {
-			$GLOBALS['log']->fatal("Job failed: $job");
-			return false;
-		}
-	}
-	////	END SCHEDULERSJOB HELPER FUNCTIONS
-	///////////////////////////////////////////////////////////////////////////
-
-
-	///////////////////////////////////////////////////////////////////////////
-	////	STANDARD SUGARBEAN OVERRIDES
-	/**
-	 * This function gets DB data and preps it for ListViews
-	 */
-	function get_list_view_data()
-	{
-		global $mod_strings;
-
-		$temp_array = $this->get_list_view_array();
-		$temp_array['JOB_NAME'] = $this->job_name;
-		$temp_array['JOB']		= $this->job;
-
-    	return $temp_array;
-	}
-
-	/** method stub for future customization
-	 *
-	 */
-	function fill_in_additional_list_fields()
-	{
-		$this->fill_in_additional_detail_fields();
-	}
-
-
-	/**
-	 * Mark this job as failed
-	 * @param string $message
-	 */
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    ////	SCHEDULERSJOB HELPER FUNCTIONS
+
+    /**
+     * This function takes a passed URL and cURLs it to fake multi-threading with another httpd instance
+     * @param	$job		String in URI-clean format
+     * @param	$timeout	Int value in secs for cURL to timeout. 30 default.
+     */
+    public function fireUrl($job, $timeout=30)
+    {
+    // TODO: figure out what error is thrown when no more apache instances can be spun off
+        // cURL inits
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $job); // set url
+        curl_setopt($ch, CURLOPT_FAILONERROR, true); // silent failure (code >300);
+        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); // do not follow location(); inits - we always use the current
+        curl_setopt($ch, CURLOPT_FORBID_REUSE, 1);
+        curl_setopt($ch, CURLOPT_DNS_USE_GLOBAL_CACHE, false);  // not thread-safe
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); // return into a variable to continue program execution
+        curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); // never times out - bad idea?
+        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5); // 5 secs for connect timeout
+        curl_setopt($ch, CURLOPT_FRESH_CONNECT, true);  // open brand new conn
+        curl_setopt($ch, CURLOPT_HEADER, true); // do not return header info with result
+        curl_setopt($ch, CURLOPT_NOPROGRESS, true); // do not have progress bar
+        $urlparts = parse_url($job);
+        if(empty($urlparts['port'])) {
+            if($urlparts['scheme'] == 'https'){
+                $urlparts['port'] = 443;
+            } else {
+                $urlparts['port'] = 80;
+            }
+        }
+        curl_setopt($ch, CURLOPT_PORT, $urlparts['port']); // set port as reported by Server
+        //TODO make the below configurable
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); // most customers will not have Certificate Authority account
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); // most customers will not have Certificate Authority account
+
+        curl_setopt($ch, CURLOPT_NOSIGNAL, true); // ignore any cURL signals to PHP (for multi-threading)
+        $result = curl_exec($ch);
+        $cInfo = curl_getinfo($ch);	//url,content_type,header_size,request_size,filetime,http_code
+                                    //ssl_verify_result,total_time,namelookup_time,connect_time
+                                    //pretransfer_time,size_upload,size_download,speed_download,
+                                    //speed_upload,download_content_length,upload_content_length
+                                    //starttransfer_time,redirect_time
+        if(curl_errno($ch)) {
+            $this->errors .= curl_errno($ch)."\n";
+        }
+        curl_close($ch);
+
+        if($result !== FALSE && $cInfo['http_code'] < 400) {
+            $GLOBALS['log']->debug("----->Firing was successful: $job");
+            $GLOBALS['log']->debug('----->WTIH RESULT: '.strip_tags($result).' AND '.strip_tags(print_r($cInfo, true)));
+            return true;
+        } else {
+            $GLOBALS['log']->fatal("Job failed: $job");
+            return false;
+        }
+    }
+    ////	END SCHEDULERSJOB HELPER FUNCTIONS
+    ///////////////////////////////////////////////////////////////////////////
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    ////	STANDARD SUGARBEAN OVERRIDES
+    /**
+     * This function gets DB data and preps it for ListViews
+     */
+    function get_list_view_data()
+    {
+        global $mod_strings;
+
+        $temp_array = $this->get_list_view_array();
+        $temp_array['JOB_NAME'] = $this->job_name;
+        $temp_array['JOB']		= $this->job;
+
+        return $temp_array;
+    }
+
+    /** method stub for future customization
+     *
+     */
+    function fill_in_additional_list_fields()
+    {
+        $this->fill_in_additional_detail_fields();
+    }
+
+
+    /**
+     * Mark this job as failed
+     * @param string $message
+     */
     public function failJob($message = null)
     {
         return $this->resolveJob(self::JOB_FAILURE, $message);
     }
 
-	/**
-	 * Mark this job as success
-	 * @param string $message
-	 */
+    /**
+     * Mark this job as success
+     * @param string $message
+     */
     public function succeedJob($message = null)
     {
         return $this->resolveJob(self::JOB_SUCCESS, $message);
@@ -413,28 +413,28 @@ 
     {
         switch($errno)
         {
-    		case E_USER_WARNING:
-    		case E_COMPILE_WARNING:
-    		case E_CORE_WARNING:
-    		case E_WARNING:
-    			$type = "Warning";
-    			break;
-    		case E_USER_ERROR:
-    		case E_COMPILE_ERROR:
-    		case E_CORE_ERROR:
-    		case E_ERROR:
-    			$type = "Fatal Error";
-	    		break;
-    		case E_PARSE:
-    			$type = "Parse Error";
-	    		break;
-    		case E_RECOVERABLE_ERROR:
-    			$type = "Recoverable Error";
-	    		break;
-		    default:
-		        // Ignore errors we don't know about
-		        return;
-    	}
+            case E_USER_WARNING:
+            case E_COMPILE_WARNING:
+            case E_CORE_WARNING:
+            case E_WARNING:
+                $type = "Warning";
+                break;
+            case E_USER_ERROR:
+            case E_COMPILE_ERROR:
+            case E_CORE_ERROR:
+            case E_ERROR:
+                $type = "Fatal Error";
+                break;
+            case E_PARSE:
+                $type = "Parse Error";
+                break;
+            case E_RECOVERABLE_ERROR:
+                $type = "Recoverable Error";
+                break;
+            default:
+                // Ignore errors we don't know about
+                return;
+        }
         $errstr = strip_tags($errstr);
         $this->errors .= sprintf(translate('ERR_PHP', 'SchedulersJobs'), $type, $errno, $errstr, $errfile, $errline)."\n";
     }
@@ -451,13 +451,13 @@ 
             session_destroy();
         }
         if(!headers_sent()) {
-    		session_start();
+            session_start();
             session_regenerate_id();
         }
         $_SESSION['is_valid_session']= true;
-    	$_SESSION['user_id'] = $user->id;
-    	$_SESSION['type'] = 'user';
-    	$_SESSION['authenticated_user_id'] = $user->id;
+        $_SESSION['user_id'] = $user->id;
+        $_SESSION['type'] = 'user';
+        $_SESSION['authenticated_user_id'] = $user->id;
     }
 
     /**
@@ -509,48 +509,48 @@ 
             if(!$this->setJobUser()) {
                 return false;
             }
-    		$func = $exJob[1];
-			$GLOBALS['log']->debug("----->SchedulersJob calling function: $func");
+            $func = $exJob[1];
+            $GLOBALS['log']->debug("----->SchedulersJob calling function: $func");
             set_error_handler(array($this, "errorHandler"), E_ALL & ~E_NOTICE & ~E_STRICT);
-			if(!is_callable($func)) {
-			    $this->resolveJob(self::JOB_FAILURE, sprintf(translate('ERR_CALL', 'SchedulersJobs'), $func));
-			}
-			$data = array($this);
-			if(!empty($this->data)) {
-			    $data[] = $this->data;
-			}
+            if(!is_callable($func)) {
+                $this->resolveJob(self::JOB_FAILURE, sprintf(translate('ERR_CALL', 'SchedulersJobs'), $func));
+            }
+            $data = array($this);
+            if(!empty($this->data)) {
+                $data[] = $this->data;
+            }
             $res = call_user_func_array($func, $data);
             restore_error_handler();
             $this->restoreJobUser();
-			if($this->status == self::JOB_STATUS_RUNNING) {
-			    // nobody updated the status yet - job function could do that
-    			if($res) {
-    			    $this->resolveJob(self::JOB_SUCCESS);
-    				return true;
-    			} else {
-    			    $this->resolveJob(self::JOB_FAILURE);
-    			    return false;
-    			}
-			} else {
-			    return $this->resolution != self::JOB_FAILURE;
-			}
-		} elseif($exJob[0] == 'url') {
-			if(function_exists('curl_init')) {
-				$GLOBALS['log']->debug('----->SchedulersJob firing URL job: '.$exJob[1]);
+            if($this->status == self::JOB_STATUS_RUNNING) {
+                // nobody updated the status yet - job function could do that
+                if($res) {
+                    $this->resolveJob(self::JOB_SUCCESS);
+                    return true;
+                } else {
+                    $this->resolveJob(self::JOB_FAILURE);
+                    return false;
+                }
+            } else {
+                return $this->resolution != self::JOB_FAILURE;
+            }
+        } elseif($exJob[0] == 'url') {
+            if(function_exists('curl_init')) {
+                $GLOBALS['log']->debug('----->SchedulersJob firing URL job: '.$exJob[1]);
                 set_error_handler(array($this, "errorHandler"), E_ALL & ~E_NOTICE & ~E_STRICT);
-				if($this->fireUrl($exJob[1])) {
+                if($this->fireUrl($exJob[1])) {
                     restore_error_handler();
                     $this->resolveJob(self::JOB_SUCCESS);
-					return true;
-				} else {
+                    return true;
+                } else {
                     restore_error_handler();
-				    $this->resolveJob(self::JOB_FAILURE);
-					return false;
-				}
-			} else {
-			    $this->resolveJob(self::JOB_FAILURE, translate('ERR_CURL', 'SchedulersJobs'));
-			}
-		} elseif ($exJob[0] == 'class') {
+                    $this->resolveJob(self::JOB_FAILURE);
+                    return false;
+                }
+            } else {
+                $this->resolveJob(self::JOB_FAILURE, translate('ERR_CURL', 'SchedulersJobs'));
+            }
+        } elseif ($exJob[0] == 'class') {
             $tmpJob = new $exJob[1]();
             if($tmpJob instanceof RunnableSchedulerJob)
             {
@@ -579,9 +579,9 @@ 
             }
         }
         else {
-		    $this->resolveJob(self::JOB_FAILURE, sprintf(translate('ERR_JOBTYPE', 'SchedulersJobs'), strip_tags($this->target)));
-		}
-		return false;
+            $this->resolveJob(self::JOB_FAILURE, sprintf(translate('ERR_JOBTYPE', 'SchedulersJobs'), strip_tags($this->target)));
+        }
+        return false;
     }
 
 }  // end class Job

modules/Import/ImportFieldSanitize.php

Spacing +36 added lines, -36 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
@@ -87,24 +87,24 @@ 
     {
         static $sfh;
         
-        if(!isset($sfh)) {
+        if (!isset($sfh)) {
             require_once('include/SugarFields/SugarFieldHandler.php');
             $sfh = new SugarFieldHandler();
         }
         $value = $params[0];
         $vardef = $params[1];
-        if ( isset($params[2]) )
+        if (isset($params[2]))
             $focus = $params[2];
         else
             $focus = null;
-        if ( $name == 'relate' && !empty($params[3]) )
+        if ($name == 'relate' && !empty($params[3]))
             $this->addRelatedBean = true;
         else
             $this->addRelatedBean = false;
         
         $field = $sfh->getSugarField(ucfirst($name));
-        if ( $field instanceOf SugarFieldBase ) {
-            $value = $field->importSanitize($value,$vardef,$focus,$this);
+        if ($field instanceOf SugarFieldBase) {
+            $value = $field->importSanitize($value, $vardef, $focus, $this);
         }
         
         return $value;
@@ -128,10 +128,10 @@ 
 
         $format = $this->dateformat;
 
-        if ( !$timedate->check_matching_format($value, $format) )
+        if (!$timedate->check_matching_format($value, $format))
             return false;
 
-        if ( !$this->isValidTimeDate($value, $format) )
+        if (!$this->isValidTimeDate($value, $format))
             return false;
 
         $value = $timedate->swap_formats(
@@ -156,11 +156,11 @@ 
         // cache $sea instance
         static $sea;
         
-        if ( !($sea instanceof SugarEmailAddress) ) {
+        if (!($sea instanceof SugarEmailAddress)) {
             $sea = new SugarEmailAddress;
         }
         
-        if ( !empty($value) && !preg_match($sea->regex,$value) ) {
+        if (!empty($value) && !preg_match($sea->regex, $value)) {
             return false;
         }
 
@@ -184,18 +184,18 @@ 
         static $focus_user;
 
         // cache this object since we'll be reusing it a bunch
-        if ( !($focus_user instanceof User) ) {
+        if (!($focus_user instanceof User)) {
 
             $focus_user = new User();
         }
 
 
-        if ( !empty($value) && strtolower($value) != "all" ) {
-            $theList   = explode(",",$value);
+        if (!empty($value) && strtolower($value) != "all") {
+            $theList   = explode(",", $value);
             $isValid   = true;
             $bad_names = array();
             foreach ($theList as $eachItem) {
-                if ( $focus_user->retrieve_user_id($eachItem)
+                if ($focus_user->retrieve_user_id($eachItem)
                         || $focus_user->retrieve($eachItem)
                 ) {
                     // all good
@@ -206,7 +206,7 @@ 
                     continue;
                 }
             }
-            if(!$isValid) {
+            if (!$isValid) {
                 return false;
             }
         }
@@ -232,10 +232,10 @@ 
 
         $format = $this->timeformat;
 
-        if ( !$timedate->check_matching_format($value, $format) )
+        if (!$timedate->check_matching_format($value, $format))
             return false;
 
-        if ( !$this->isValidTimeDate($value, $format) )
+        if (!$this->isValidTimeDate($value, $format))
             return false;
 
         $value = $timedate->swap_formats(
@@ -266,46 +266,46 @@ 
         $reg = $timedate->get_regular_expression($format);
         preg_match('@'.$reg['format'].'@', $value, $dateparts);
 
-        if ( empty($dateparts) )
+        if (empty($dateparts))
             return false;
-        if ( isset($reg['positions']['a'])
-                && !in_array($dateparts[$reg['positions']['a']], array('am','pm')) )
+        if (isset($reg['positions']['a'])
+                && !in_array($dateparts[$reg['positions']['a']], array('am', 'pm')))
             return false;
-        if ( isset($reg['positions']['A'])
-                && !in_array($dateparts[$reg['positions']['A']], array('AM','PM')) )
+        if (isset($reg['positions']['A'])
+                && !in_array($dateparts[$reg['positions']['A']], array('AM', 'PM')))
             return false;
-        if ( isset($reg['positions']['h']) && (
+        if (isset($reg['positions']['h']) && (
                 !is_numeric($dateparts[$reg['positions']['h']])
                 || $dateparts[$reg['positions']['h']] < 1
-                || $dateparts[$reg['positions']['h']] > 12 ) )
+                || $dateparts[$reg['positions']['h']] > 12 ))
             return false;
-        if ( isset($reg['positions']['H']) && (
+        if (isset($reg['positions']['H']) && (
                 !is_numeric($dateparts[$reg['positions']['H']])
                 || $dateparts[$reg['positions']['H']] < 0
-                || $dateparts[$reg['positions']['H']] > 23 ) )
+                || $dateparts[$reg['positions']['H']] > 23 ))
             return false;
-        if ( isset($reg['positions']['i']) && (
+        if (isset($reg['positions']['i']) && (
                 !is_numeric($dateparts[$reg['positions']['i']])
                 || $dateparts[$reg['positions']['i']] < 0
-                || $dateparts[$reg['positions']['i']] > 59 ) )
+                || $dateparts[$reg['positions']['i']] > 59 ))
             return false;
-        if ( isset($reg['positions']['s']) && (
+        if (isset($reg['positions']['s']) && (
                 !is_numeric($dateparts[$reg['positions']['s']])
                 || $dateparts[$reg['positions']['s']] < 0
-                || $dateparts[$reg['positions']['s']] > 59 ) )
+                || $dateparts[$reg['positions']['s']] > 59 ))
             return false;
-        if ( isset($reg['positions']['d']) && (
+        if (isset($reg['positions']['d']) && (
                 !is_numeric($dateparts[$reg['positions']['d']])
                 || $dateparts[$reg['positions']['d']] < 1
-                || $dateparts[$reg['positions']['d']] > 31 ) )
+                || $dateparts[$reg['positions']['d']] > 31 ))
             return false;
-        if ( isset($reg['positions']['m']) && (
+        if (isset($reg['positions']['m']) && (
                 !is_numeric($dateparts[$reg['positions']['m']])
                 || $dateparts[$reg['positions']['m']] < 1
-                || $dateparts[$reg['positions']['m']] > 12 ) )
+                || $dateparts[$reg['positions']['m']] > 12 ))
             return false;
-        if ( isset($reg['positions']['Y']) &&
-                !is_numeric($dateparts[$reg['positions']['Y']]) )
+        if (isset($reg['positions']['Y']) &&
+                !is_numeric($dateparts[$reg['positions']['Y']]))
             return false;
 
         return true;

Braces +56 added lines, -39 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
@@ -93,14 +95,16 @@ 
         }
         $value = $params[0];
         $vardef = $params[1];
-        if ( isset($params[2]) )
-            $focus = $params[2];
-        else
-            $focus = null;
-        if ( $name == 'relate' && !empty($params[3]) )
-            $this->addRelatedBean = true;
-        else
-            $this->addRelatedBean = false;
+        if ( isset($params[2]) ) {
+                    $focus = $params[2];
+        } else {
+                    $focus = null;
+        }
+        if ( $name == 'relate' && !empty($params[3]) ) {
+                    $this->addRelatedBean = true;
+        } else {
+                    $this->addRelatedBean = false;
+        }
         
         $field = $sfh->getSugarField(ucfirst($name));
         if ( $field instanceOf SugarFieldBase ) {
@@ -128,11 +132,13 @@ 
 
         $format = $this->dateformat;
 
-        if ( !$timedate->check_matching_format($value, $format) )
-            return false;
+        if ( !$timedate->check_matching_format($value, $format) ) {
+                    return false;
+        }
 
-        if ( !$this->isValidTimeDate($value, $format) )
-            return false;
+        if ( !$this->isValidTimeDate($value, $format) ) {
+                    return false;
+        }
 
         $value = $timedate->swap_formats(
             $value, $format, $timedate->get_date_format());
@@ -199,8 +205,7 @@ 
                         || $focus_user->retrieve($eachItem)
                 ) {
                     // all good
-                }
-                else {
+                } else {
                     $isValid     = false;
                     $bad_names[] = $eachItem;
                     continue;
@@ -232,11 +237,13 @@ 
 
         $format = $this->timeformat;
 
-        if ( !$timedate->check_matching_format($value, $format) )
-            return false;
+        if ( !$timedate->check_matching_format($value, $format) ) {
+                    return false;
+        }
 
-        if ( !$this->isValidTimeDate($value, $format) )
-            return false;
+        if ( !$this->isValidTimeDate($value, $format) ) {
+                    return false;
+        }
 
         $value = $timedate->swap_formats(
             $value, $format, $timedate->get_time_format());
@@ -266,47 +273,57 @@ 
         $reg = $timedate->get_regular_expression($format);
         preg_match('@'.$reg['format'].'@', $value, $dateparts);
 
-        if ( empty($dateparts) )
-            return false;
+        if ( empty($dateparts) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['a'])
-                && !in_array($dateparts[$reg['positions']['a']], array('am','pm')) )
-            return false;
+                && !in_array($dateparts[$reg['positions']['a']], array('am','pm')) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['A'])
-                && !in_array($dateparts[$reg['positions']['A']], array('AM','PM')) )
-            return false;
+                && !in_array($dateparts[$reg['positions']['A']], array('AM','PM')) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['h']) && (
                 !is_numeric($dateparts[$reg['positions']['h']])
                 || $dateparts[$reg['positions']['h']] < 1
-                || $dateparts[$reg['positions']['h']] > 12 ) )
-            return false;
+                || $dateparts[$reg['positions']['h']] > 12 ) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['H']) && (
                 !is_numeric($dateparts[$reg['positions']['H']])
                 || $dateparts[$reg['positions']['H']] < 0
-                || $dateparts[$reg['positions']['H']] > 23 ) )
-            return false;
+                || $dateparts[$reg['positions']['H']] > 23 ) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['i']) && (
                 !is_numeric($dateparts[$reg['positions']['i']])
                 || $dateparts[$reg['positions']['i']] < 0
-                || $dateparts[$reg['positions']['i']] > 59 ) )
-            return false;
+                || $dateparts[$reg['positions']['i']] > 59 ) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['s']) && (
                 !is_numeric($dateparts[$reg['positions']['s']])
                 || $dateparts[$reg['positions']['s']] < 0
-                || $dateparts[$reg['positions']['s']] > 59 ) )
-            return false;
+                || $dateparts[$reg['positions']['s']] > 59 ) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['d']) && (
                 !is_numeric($dateparts[$reg['positions']['d']])
                 || $dateparts[$reg['positions']['d']] < 1
-                || $dateparts[$reg['positions']['d']] > 31 ) )
-            return false;
+                || $dateparts[$reg['positions']['d']] > 31 ) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['m']) && (
                 !is_numeric($dateparts[$reg['positions']['m']])
                 || $dateparts[$reg['positions']['m']] < 1
-                || $dateparts[$reg['positions']['m']] > 12 ) )
-            return false;
+                || $dateparts[$reg['positions']['m']] > 12 ) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['Y']) &&
-                !is_numeric($dateparts[$reg['positions']['Y']]) )
-            return false;
+                !is_numeric($dateparts[$reg['positions']['Y']]) ) {
+                    return false;
+        }
 
         return true;
     }

Doc Comments +1 added lines, -1 removed lines

@@ -253,7 +253,7 @@
      *
      * @param  $value  string
      * @param  $format string
-     * @return string sanitized and validated value on success, bool false on failure
+     * @return boolean sanitized and validated value on success, bool false on failure
      */
     public function isValidTimeDate(
         $value,

modules/Import/maps/ImportMapOutlook.php

Indentation +4 added lines, -4 removed lines

@@ -49,11 +49,11 @@ 
 
 class ImportMapOutlook extends ImportMapOther
 {
-	/**
+    /**
      * String identifier for this import
      */
     public $name = 'outlook';
-	/**
+    /**
      * Field delimiter
      */
     public $delimiter = ',';
@@ -61,7 +61,7 @@ 
      * Field enclosure
      */
     public $enclosure = '"';
-	/**
+    /**
      * Do we have a header?
      */
     public $has_header = true;
@@ -72,7 +72,7 @@ 
      * @param  string $module
      * @return array field mappings
      */
-	public function getMapping(
+    public function getMapping(
         $module
         )
     {

Switch Indentation +13 added lines, -13 removed lines

@@ -78,19 +78,19 @@
     {
         $return_array = parent::getMapping($module);
         switch ($module) {
-        case 'Contacts':
-        case 'Leads':
-            return $return_array + array(
-                "Job Title"=>"title",
-                "Home Country"=>"alt_address_country",
-                "E-mail 2 Address"=>"email2",
-                );
-            break;
-        case 'Accounts':
-            return $return_array;
-            break;
-        default:
-            return $return_array;
+            case 'Contacts':
+            case 'Leads':
+                return $return_array + array(
+                    "Job Title"=>"title",
+                    "Home Country"=>"alt_address_country",
+                    "E-mail 2 Address"=>"email2",
+                    );
+                break;
+            case 'Accounts':
+                return $return_array;
+                break;
+            default:
+                return $return_array;
         }
     }
 }

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/Import/maps/ImportMapGoogle.php

Indentation +27 added lines, -27 removed lines

@@ -44,7 +44,7 @@ 
 
 class ImportMapGoogle extends ImportMapOther
 {
-	/**
+    /**
      * String identifier for this import
      */
     public $name = 'google';
@@ -55,38 +55,38 @@ 
      * @param  string $module
      * @return array field mappings
      */
-	public function getMapping($module)
+    public function getMapping($module)
     {
-         $return_array = array(
-             'first_name' => array('sugar_key' => 'first_name', 'sugar_label' => '', 'default_label' => 'Given Name'),
-             'last_name' => array('sugar_key' => 'last_name', 'sugar_label' => '', 'default_label' => 'Family Name'),
-             'birthday' => array('sugar_key' => 'birthdate', 'sugar_label' => '', 'default_label' => 'Birthday'),
-             'title' => array('sugar_key' => 'title', 'sugar_label' => '', 'default_label' => 'Title'),
-             'notes' => array('sugar_key' => 'description', 'sugar_label' => '', 'default_label' => 'Notes'),
+            $return_array = array(
+                'first_name' => array('sugar_key' => 'first_name', 'sugar_label' => '', 'default_label' => 'Given Name'),
+                'last_name' => array('sugar_key' => 'last_name', 'sugar_label' => '', 'default_label' => 'Family Name'),
+                'birthday' => array('sugar_key' => 'birthdate', 'sugar_label' => '', 'default_label' => 'Birthday'),
+                'title' => array('sugar_key' => 'title', 'sugar_label' => '', 'default_label' => 'Title'),
+                'notes' => array('sugar_key' => 'description', 'sugar_label' => '', 'default_label' => 'Notes'),
 
-             'alt_address_street' => array('sugar_key' => 'alt_address_street', 'sugar_label' => '', 'default_label' => 'Home Street'),
-             'alt_address_postcode' => array('sugar_key' => 'alt_address_postalcode', 'sugar_label' => '', 'default_label' => 'Home Postcode'),
-             'alt_address_city' => array('sugar_key' => 'alt_address_city', 'sugar_label' => '', 'default_label' => 'Home City'),
-             'alt_address_state' => array('sugar_key' => 'alt_address_state', 'sugar_label' => '', 'default_label' => 'Home State'),
-             'alt_address_country' => array('sugar_key' => 'alt_address_country', 'sugar_label' => '', 'default_label' => 'Home Country'),
+                'alt_address_street' => array('sugar_key' => 'alt_address_street', 'sugar_label' => '', 'default_label' => 'Home Street'),
+                'alt_address_postcode' => array('sugar_key' => 'alt_address_postalcode', 'sugar_label' => '', 'default_label' => 'Home Postcode'),
+                'alt_address_city' => array('sugar_key' => 'alt_address_city', 'sugar_label' => '', 'default_label' => 'Home City'),
+                'alt_address_state' => array('sugar_key' => 'alt_address_state', 'sugar_label' => '', 'default_label' => 'Home State'),
+                'alt_address_country' => array('sugar_key' => 'alt_address_country', 'sugar_label' => '', 'default_label' => 'Home Country'),
 
-             'primary_address_street' => array('sugar_key' => 'primary_address_street', 'sugar_label' => '', 'default_label' => 'Work Street'),
-             'primary_address_postcode' => array('sugar_key' => 'primary_address_postalcode', 'sugar_label' => '', 'default_label' => 'Work Postcode'),
-             'primary_address_city' => array('sugar_key' => 'primary_address_city', 'sugar_label' => '', 'default_label' => 'Work City'),
-             'primary_address_state' => array('sugar_key' => 'primary_address_state', 'sugar_label' => '', 'default_label' => 'Work State'),
-             'primary_address_country' => array('sugar_key' => 'primary_address_country', 'sugar_label' => '', 'default_label' => 'Work Country'),
+                'primary_address_street' => array('sugar_key' => 'primary_address_street', 'sugar_label' => '', 'default_label' => 'Work Street'),
+                'primary_address_postcode' => array('sugar_key' => 'primary_address_postalcode', 'sugar_label' => '', 'default_label' => 'Work Postcode'),
+                'primary_address_city' => array('sugar_key' => 'primary_address_city', 'sugar_label' => '', 'default_label' => 'Work City'),
+                'primary_address_state' => array('sugar_key' => 'primary_address_state', 'sugar_label' => '', 'default_label' => 'Work State'),
+                'primary_address_country' => array('sugar_key' => 'primary_address_country', 'sugar_label' => '', 'default_label' => 'Work Country'),
 
-             'phone_main' => array('sugar_key' => 'phone_other', 'sugar_label' => '', 'default_label' => 'Main Phone'),
-             'phone_mobile' => array('sugar_key' => 'phone_mobile', 'sugar_label' => '', 'default_label' => 'Mobile Phone'),
-             'phone_home' => array('sugar_key' => 'phone_home', 'sugar_label' => '', 'default_label' => 'Home phone'),
-             'phone_work' => array('sugar_key' => 'phone_work', 'sugar_label' => '', 'default_label' => 'Work phone'),
-             'phone_fax' => array('sugar_key' => 'phone_fax', 'sugar_label' => '', 'default_label' => 'Fax phone'),
+                'phone_main' => array('sugar_key' => 'phone_other', 'sugar_label' => '', 'default_label' => 'Main Phone'),
+                'phone_mobile' => array('sugar_key' => 'phone_mobile', 'sugar_label' => '', 'default_label' => 'Mobile Phone'),
+                'phone_home' => array('sugar_key' => 'phone_home', 'sugar_label' => '', 'default_label' => 'Home phone'),
+                'phone_work' => array('sugar_key' => 'phone_work', 'sugar_label' => '', 'default_label' => 'Work phone'),
+                'phone_fax' => array('sugar_key' => 'phone_fax', 'sugar_label' => '', 'default_label' => 'Fax phone'),
 
-             'email1' => array('sugar_key' => 'email1', 'sugar_label' => 'LBL_EMAIL_ADDRESS', 'default_label' => 'Email Address'),
-             'email2' => array('sugar_key' => 'email2', 'sugar_label' => 'LBL_OTHER_EMAIL_ADDRESS', 'default_label' => 'Other Email'),
+                'email1' => array('sugar_key' => 'email1', 'sugar_label' => 'LBL_EMAIL_ADDRESS', 'default_label' => 'Email Address'),
+                'email2' => array('sugar_key' => 'email2', 'sugar_label' => 'LBL_OTHER_EMAIL_ADDRESS', 'default_label' => 'Other Email'),
 
-             'assigned_user_name' => array('sugar_key' => 'assigned_user_name', 'sugar_help_key' => 'LBL_EXTERNAL_ASSIGNED_TOOLTIP', 'sugar_label' => 'LBL_ASSIGNED_TO_NAME', 'default_label' => 'Assigned To'),
-             'team_name' => array('sugar_key' => 'team_name', 'sugar_help_key' => 'LBL_EXTERNAL_TEAM_TOOLTIP','sugar_label' => 'LBL_TEAMS', 'default_label' => 'Teams'),
+                'assigned_user_name' => array('sugar_key' => 'assigned_user_name', 'sugar_help_key' => 'LBL_EXTERNAL_ASSIGNED_TOOLTIP', 'sugar_label' => 'LBL_ASSIGNED_TO_NAME', 'default_label' => 'Assigned To'),
+                'team_name' => array('sugar_key' => 'team_name', 'sugar_help_key' => 'LBL_EXTERNAL_TEAM_TOOLTIP','sugar_label' => 'LBL_TEAMS', 'default_label' => 'Teams'),
             );
 
         if($module == 'Users')

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -86,13 +86,13 @@ 
              'email2' => array('sugar_key' => 'email2', 'sugar_label' => 'LBL_OTHER_EMAIL_ADDRESS', 'default_label' => 'Other Email'),
 
              'assigned_user_name' => array('sugar_key' => 'assigned_user_name', 'sugar_help_key' => 'LBL_EXTERNAL_ASSIGNED_TOOLTIP', 'sugar_label' => 'LBL_ASSIGNED_TO_NAME', 'default_label' => 'Assigned To'),
-             'team_name' => array('sugar_key' => 'team_name', 'sugar_help_key' => 'LBL_EXTERNAL_TEAM_TOOLTIP','sugar_label' => 'LBL_TEAMS', 'default_label' => 'Teams'),
+             'team_name' => array('sugar_key' => 'team_name', 'sugar_help_key' => 'LBL_EXTERNAL_TEAM_TOOLTIP', 'sugar_label' => 'LBL_TEAMS', 'default_label' => 'Teams'),
             );
 
-        if($module == 'Users')
+        if ($module == 'Users')
         {
-            $return_array['status'] =  array('sugar_key' => 'status', 'sugar_label' => '', 'default_label' => 'Status');
-            $return_array['full_name'] =  array('sugar_key' => 'user_name', 'sugar_label' => '', 'default_label' => 'Full Name');
+            $return_array['status'] = array('sugar_key' => 'status', 'sugar_label' => '', 'default_label' => 'Status');
+            $return_array['full_name'] = array('sugar_key' => 'user_name', 'sugar_label' => '', 'default_label' => 'Full Name');
         }
         return $return_array;
     }

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/Import/maps/ImportMapSalesforce.php

Indentation +13 added lines, -13 removed lines

@@ -49,11 +49,11 @@ 
 
 class ImportMapSalesforce extends ImportMapOther
 {
-	/**
+    /**
      * String identifier for this import
      */
     public $name = 'salesforce';
-	/**
+    /**
      * Field delimiter
      */
     public $delimiter = ',';
@@ -61,18 +61,18 @@ 
      * Field enclosure
      */
     public $enclosure = '"';
-	/**
+    /**
      * Do we have a header?
      */
     public $has_header = true;
 
-	/**
+    /**
      * Gets the default mapping for a module
      *
      * @param  string $module
      * @return array field mappings
      */
-	public function getMapping(
+    public function getMapping(
         $module
         )
     {
@@ -151,15 +151,15 @@ 
         }
     }
 	
-	/**
-	* @see ImportMapOther::getIgnoredFields()
+    /**
+     * @see ImportMapOther::getIgnoredFields()
      */
-	public function getIgnoredFields(
-		$module
-		)
-	{
-		return array_merge(parent::getIgnoredFields($module),array('id'));
-	}
+    public function getIgnoredFields(
+        $module
+        )
+    {
+        return array_merge(parent::getIgnoredFields($module),array('id'));
+    }
 }
 
 

Switch Indentation +70 added lines, -70 removed lines

@@ -78,76 +78,76 @@
     {
         $return_array = parent::getMapping($module);
         switch ($module) {
-        case 'Contacts':
-        case 'Leads':
-            return $return_array + array(
-                "Description"=>"description",
-                "Birthdate"=>"birthdate",
-                "Lead Source"=>"lead_source",
-                "Assistant"=>"assistant",
-                "Asst. Phone"=>"assistant_phone",
-                "Mailing Street"=>"primary_address_street",
-                "Mailing Address Line1"=>"primary_address_street_2",
-                "Mailing Address Line2"=>"primary_address_street_3",
-                "Mailing Address Line3"=>"primary_address_street_4",
-                "Mailing City"=>"primary_address_city",
-                "Mailing State"=>"primary_address_state",
-                "Mailing Zip/Postal Code"=>"primary_address_postalcode",
-                "Mailing Country"=>"primary_address_country",
-                "Other Street"=>"alt_address_street",
-                "Other Address Line 1"=>"alt_address_street_2",
-                "Other Address Line 2"=>"alt_address_street_3",
-                "Other Address Line 3"=>"alt_address_street_4",
-                "Other City"=>"alt_address_city",
-                "Other State"=>"alt_address_state",
-                "Other Zip/Postal Code"=>"alt_address_postalcode",
-                "Other Country"=>"alt_address_country",
-                "Phone"=>"phone_work",
-                "Mobile"=>"phone_mobile",
-                "Home Phone"=>"phone_home",
-                "Other Phone"=>"phone_other",
-                "Fax"=>"phone_fax",
-                "Email"=>"email1",
-                "Email Opt Out"=>"email_opt_out",
-                "Do Not Call"=>"do_not_call",
-                "Account Name"=>"account_name",
-                );
-            break;
-        case 'Accounts':
-            return array(
-                "Account Name"=>"name",
-                "Annual Revenue"=>"annual_revenue",
-                "Type"=>"account_type",
-                "Ticker Symbol"=>"ticker_symbol",
-                "Rating"=>"rating",
-                "Industry"=>"industry",
-                "SIC Code"=>"sic_code",
-                "Ownership"=>"ownership",
-                "Employees"=>"employees",
-                "Description"=>"description",
-                "Billing Street"=>"billing_address_street",
-                "Billing Address Line1"=>"billing_address_street_2",
-                "Billing Address Line2"=>"billing_address_street_3",
-                "Billing City"=>"billing_address_city",
-                "Billing State"=>"billing_address_state",
-                "Billing State/Province"=>"billing_address_state",
-                "Billing Zip/Postal Code"=>"billing_address_postalcode",
-                "Billing Country"=>"billing_address_country",
-                "Shipping Street"=>"shipping_address_street",
-                "Shipping Address Line1"=>"shipping_address_street_2",
-                "Shipping Address Line2"=>"shipping_address_street_3",
-                "Shipping City"=>"shipping_address_city",
-                "Shipping State"=>"shipping_address_state",
-                "Shipping Zip/Postal Code"=>"shipping_address_postalcode",
-                "Shipping Country"=>"shipping_address_country",
-                "Phone"=>"phone_office",
-                "Fax"=>"phone_fax",
-                "Website"=>"website",
-                "Created Date"=>"date_entered",
-                );
-            break;
-        default:
-            return $return_array;
+            case 'Contacts':
+            case 'Leads':
+                return $return_array + array(
+                    "Description"=>"description",
+                    "Birthdate"=>"birthdate",
+                    "Lead Source"=>"lead_source",
+                    "Assistant"=>"assistant",
+                    "Asst. Phone"=>"assistant_phone",
+                    "Mailing Street"=>"primary_address_street",
+                    "Mailing Address Line1"=>"primary_address_street_2",
+                    "Mailing Address Line2"=>"primary_address_street_3",
+                    "Mailing Address Line3"=>"primary_address_street_4",
+                    "Mailing City"=>"primary_address_city",
+                    "Mailing State"=>"primary_address_state",
+                    "Mailing Zip/Postal Code"=>"primary_address_postalcode",
+                    "Mailing Country"=>"primary_address_country",
+                    "Other Street"=>"alt_address_street",
+                    "Other Address Line 1"=>"alt_address_street_2",
+                    "Other Address Line 2"=>"alt_address_street_3",
+                    "Other Address Line 3"=>"alt_address_street_4",
+                    "Other City"=>"alt_address_city",
+                    "Other State"=>"alt_address_state",
+                    "Other Zip/Postal Code"=>"alt_address_postalcode",
+                    "Other Country"=>"alt_address_country",
+                    "Phone"=>"phone_work",
+                    "Mobile"=>"phone_mobile",
+                    "Home Phone"=>"phone_home",
+                    "Other Phone"=>"phone_other",
+                    "Fax"=>"phone_fax",
+                    "Email"=>"email1",
+                    "Email Opt Out"=>"email_opt_out",
+                    "Do Not Call"=>"do_not_call",
+                    "Account Name"=>"account_name",
+                    );
+                break;
+            case 'Accounts':
+                return array(
+                    "Account Name"=>"name",
+                    "Annual Revenue"=>"annual_revenue",
+                    "Type"=>"account_type",
+                    "Ticker Symbol"=>"ticker_symbol",
+                    "Rating"=>"rating",
+                    "Industry"=>"industry",
+                    "SIC Code"=>"sic_code",
+                    "Ownership"=>"ownership",
+                    "Employees"=>"employees",
+                    "Description"=>"description",
+                    "Billing Street"=>"billing_address_street",
+                    "Billing Address Line1"=>"billing_address_street_2",
+                    "Billing Address Line2"=>"billing_address_street_3",
+                    "Billing City"=>"billing_address_city",
+                    "Billing State"=>"billing_address_state",
+                    "Billing State/Province"=>"billing_address_state",
+                    "Billing Zip/Postal Code"=>"billing_address_postalcode",
+                    "Billing Country"=>"billing_address_country",
+                    "Shipping Street"=>"shipping_address_street",
+                    "Shipping Address Line1"=>"shipping_address_street_2",
+                    "Shipping Address Line2"=>"shipping_address_street_3",
+                    "Shipping City"=>"shipping_address_city",
+                    "Shipping State"=>"shipping_address_state",
+                    "Shipping Zip/Postal Code"=>"shipping_address_postalcode",
+                    "Shipping Country"=>"shipping_address_country",
+                    "Phone"=>"phone_office",
+                    "Fax"=>"phone_fax",
+                    "Website"=>"website",
+                    "Created Date"=>"date_entered",
+                    );
+                break;
+            default:
+                return $return_array;
         }
     }
 	

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -158,7 +158,7 @@ 
 		$module
 		)
 	{
-		return array_merge(parent::getIgnoredFields($module),array('id'));
+		return array_merge(parent::getIgnoredFields($module), array('id'));
 	}
 }
 

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.