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);

modules/AOP_Case_Updates/Case_Updates.php

Spacing +29 added lines, -29 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();
         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(){
+function quick_edit_case_updates() {
     global $action;
 
     //on DetailView only
-    if($action != 'DetailView') return;
+    if ($action != 'DetailView') return;
 
     //current record id
     $record = $_GET['record'];
@@ -294,7 +294,7 @@ 
     $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;
     }

modules/AOP_Case_Updates/AOP_Case_Updates.php

Spacing +49 added lines, -49 removed lines

@@ -30,35 +30,35 @@ 
 require_once 'include/clean.php';
 class AOP_Case_Updates extends AOP_Case_Updates_sugar {
 
-    function AOP_Case_Updates(){
+    function AOP_Case_Updates() {
         parent::AOP_Case_Updates_sugar();
     }
 
-    function save($check_notify = false){
+    function save($check_notify = false) {
         $this->name = SugarCleaner::cleanHtml($this->name);
         $this->description = SugarCleaner::cleanHtml($this->description);
         global $current_user, $sugar_config;
         parent::save($check_notify);
         $email_template = new EmailTemplate();
-        if($_REQUEST['module'] == 'Import'){
+        if ($_REQUEST['module'] == 'Import') {
             //Don't send email on import
             return;
         }
-        if(!isAOPEnabled()){
+        if (!isAOPEnabled()) {
             return;
         }
-        if($this->internal){
+        if ($this->internal) {
             return;
         }
         $signature = array();
         $addDelimiter = true;
         $aop_config = $sugar_config['aop'];
-        if($this->assigned_user_id){
-            if($aop_config['contact_email_template_id']){
+        if ($this->assigned_user_id) {
+            if ($aop_config['contact_email_template_id']) {
                 $email_template = $email_template->retrieve($aop_config['contact_email_template_id']);
                 $signature = $current_user->getDefaultSignature();
             }
-            if($email_template) {
+            if ($email_template) {
                 foreach ($this->getContacts() as $contact) {
                     $GLOBALS['log']->info("AOPCaseUpdates: Calling send email");
                     $emails = array();
@@ -66,15 +66,15 @@ 
                     $res = $this->sendEmail($emails, $email_template, $signature, $this->case_id, $addDelimiter, $contact->id);
                 }
             }
-        }else{
+        } else {
             $emails = $this->getEmailForUser();
-            if($aop_config['user_email_template_id']){
+            if ($aop_config['user_email_template_id']) {
                 $email_template = $email_template->retrieve($aop_config['user_email_template_id']);
             }
             $addDelimiter = false;
-            if($emails && $email_template){
+            if ($emails && $email_template) {
                 $GLOBALS['log']->info("AOPCaseUpdates: Calling send email");
-                $res = $this->sendEmail($emails, $email_template, $signature, $this->case_id, $addDelimiter,$this->contact_id);
+                $res = $this->sendEmail($emails, $email_template, $signature, $this->case_id, $addDelimiter, $this->contact_id);
             }
         }
 
@@ -83,68 +83,68 @@ 
     /**
      * @return aCase
      */
-    public function getCase(){
-        $case = BeanFactory::getBean("Cases",$this->case_id);
+    public function getCase() {
+        $case = BeanFactory::getBean("Cases", $this->case_id);
         return $case;
     }
 
-    public function getContacts(){
+    public function getContacts() {
         $case = $this->getCase();
-        if($case){
-            return $case->get_linked_beans("contacts","Contacts");
+        if ($case) {
+            return $case->get_linked_beans("contacts", "Contacts");
         }
         return null;
     }
 
-    public function getUpdateContact(){
-        if($this->contact_id){
-            return BeanFactory::getBean("Contacts",$this->contact_id);
+    public function getUpdateContact() {
+        if ($this->contact_id) {
+            return BeanFactory::getBean("Contacts", $this->contact_id);
         }
         return null;
     }
-    public function getUser(){
-        $user = BeanFactory::getBean('Users',$this->getCase()->assigned_user_id);
+    public function getUser() {
+        $user = BeanFactory::getBean('Users', $this->getCase()->assigned_user_id);
         return $user;
     }
-    public function getUpdateUser(){
-        $user = BeanFactory::getBean('Users',$this->assigned_user_id);
+    public function getUpdateUser() {
+        $user = BeanFactory::getBean('Users', $this->assigned_user_id);
         return $user;
     }
 
-    private function getEmailForUser(){
+    private function getEmailForUser() {
         $user = $this->getUser();
-        if($user){
+        if ($user) {
             return array($user->emailAddress->getPrimaryAddress($user));
         }
         return array();
     }
 
-    private function populateTemplate(EmailTemplate $template, $addDelimiter = true, $contactId = null){
+    private function populateTemplate(EmailTemplate $template, $addDelimiter = true, $contactId = null) {
         global $app_strings, $sugar_config;
         //Order of beans seems to matter here so we place contact first.
         $userId = '';
         $user = $this->getUpdateUser();
-        if(!$user){
+        if (!$user) {
             $this->getUser();
         }
-        $beans = array("Contacts" => $contactId,"Cases" => $this->getCase()->id, "Users" => $user->id, "AOP_Case_Updates" => $this->id);
+        $beans = array("Contacts" => $contactId, "Cases" => $this->getCase()->id, "Users" => $user->id, "AOP_Case_Updates" => $this->id);
         $ret = array();
-        $ret['subject'] = from_html(aop_parse_template($template->subject,$beans));
-        $body = aop_parse_template(str_replace("\$sugarurl",$sugar_config['site_url'],$template->body_html),$beans);
-        $bodyAlt = aop_parse_template(str_replace("\$sugarurl",$sugar_config['site_url'],$template->body),$beans);
-        if($addDelimiter){
-            $body = $app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER'] . $body;
-            $bodyAlt = $app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER'] . $bodyAlt;
+        $ret['subject'] = from_html(aop_parse_template($template->subject, $beans));
+        $body = aop_parse_template(str_replace("\$sugarurl", $sugar_config['site_url'], $template->body_html), $beans);
+        $bodyAlt = aop_parse_template(str_replace("\$sugarurl", $sugar_config['site_url'], $template->body), $beans);
+        if ($addDelimiter) {
+            $body = $app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER'].$body;
+            $bodyAlt = $app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER'].$bodyAlt;
         }
         $ret['body'] = from_html($body);
         $ret['body_alt'] = strip_tags(from_html($bodyAlt));
         return $ret;
     }
 
-    private function sendEmail($emails, $template, $signature = array(), $caseId = null, $addDelimiter = true, $contactId = null){
+    private function sendEmail($emails, $template, $signature = array(), $caseId = null, $addDelimiter = true, $contactId = null) {
         $GLOBALS['log']->info("AOPCaseUpdates: sendEmail called");
         require_once("include/SugarPHPMailer.php");
-        $mailer=new SugarPHPMailer();
+        $mailer = new SugarPHPMailer();
         $admin = new Administration();
         $admin->retrieveSettings();
 
@@ -152,36 +152,36 @@ 
         $mailer->setMailerForSystem();
 
         $signatureHTML = "";
-        if($signature && array_key_exists("signature_html",$signature)){
+        if ($signature && array_key_exists("signature_html", $signature)) {
             $signatureHTML = from_html($signature['signature_html']);
         }
         $signaturePlain = "";
-        if($signature && array_key_exists("signature",$signature)){
+        if ($signature && array_key_exists("signature", $signature)) {
             $signaturePlain = $signature['signature'];
         }
         $emailSettings = getPortalEmailSettings();
-        $GLOBALS['log']->info("AOPCaseUpdates: sendEmail email portal settings are ".print_r($emailSettings,true));
+        $GLOBALS['log']->info("AOPCaseUpdates: sendEmail email portal settings are ".print_r($emailSettings, true));
         $text = $this->populateTemplate($template, $addDelimiter, $contactId);
         $mailer->Subject = $text['subject'];
-        $mailer->Body = $text['body'] . $signatureHTML;
+        $mailer->Body = $text['body'].$signatureHTML;
         $mailer->IsHTML(true);
-        $mailer->AltBody = $text['body_alt'] . $signaturePlain;
+        $mailer->AltBody = $text['body_alt'].$signaturePlain;
         $mailer->From     = $emailSettings['from_address'];
         $mailer->FromName = $emailSettings['from_name'];
-        foreach($emails as $email){
+        foreach ($emails as $email) {
             $mailer->AddAddress($email);
         }
-        if ($mailer->Send()){
+        if ($mailer->Send()) {
             require_once('modules/Emails/Email.php');
             $emailObj = new Email();
-            $emailObj->to_addrs = implode(",",$emails);
-            $emailObj->type= 'out';
+            $emailObj->to_addrs = implode(",", $emails);
+            $emailObj->type = 'out';
             $emailObj->deleted = '0';
             $emailObj->name = $mailer->Subject;
             $emailObj->description = $mailer->AltBody;
             $emailObj->description_html = $mailer->Body;
             $emailObj->from_addr = $mailer->From;
-            if ( $caseId) {
+            if ($caseId) {
                 $emailObj->parent_type = "Cases";
                 $emailObj->parent_id = $caseId;
             }
@@ -190,8 +190,8 @@ 
             $emailObj->created_by = '1';
             $emailObj->status = 'sent';
             $emailObj->save();
-        }else{
-            $GLOBALS['log']->info("AOPCaseUpdates: Could not send email:  " . $mailer->ErrorInfo);
+        } else {
+            $GLOBALS['log']->info("AOPCaseUpdates: Could not send email:  ".$mailer->ErrorInfo);
             return false;
         }
         return true;

modules/AOP_Case_Updates/CaseUpdatesHook.php

Spacing +105 added lines, -105 removed lines

@@ -25,27 +25,27 @@ 
 class CaseUpdatesHook {
     private $slug_size = 50;
 
-    private function getCaseCounts(){
+    private function getCaseCounts() {
         global $db;
         $counts = array();
         $r = $db->query("SELECT users.id,count(cases.id) AS c FROM users LEFT JOIN cases ON (cases.assigned_user_id = users.id AND cases.status != 'Closed' AND cases.status != 'Duplicate' AND cases.status != 'Rejected') WHERE NOT users.deleted GROUP BY users.id");
-        while($a = $db->fetchByAssoc($r)){
+        while ($a = $db->fetchByAssoc($r)) {
             $counts[$a['id']] = $a['c'];
         }
         return $counts;
     }
 
-    private function getAssignToUser(){
+    private function getAssignToUser() {
         require_once 'modules/AOP_Case_Updates/AOPAssignManager.php';
         $assignManager = new AOPAssignManager();
         return $assignManager->getNextAssignedUser();
     }
 
-    private function arrangeFilesArray(){
+    private function arrangeFilesArray() {
         $count = 0;
-        foreach($_FILES['case_update_file'] as $key => $vals){
-            foreach($vals as $index => $val){
-                if(!array_key_exists('case_update_file'.$index,$_FILES)){
+        foreach ($_FILES['case_update_file'] as $key => $vals) {
+            foreach ($vals as $index => $val) {
+                if (!array_key_exists('case_update_file'.$index, $_FILES)) {
                     $_FILES['case_update_file'.$index] = array();
                     $count++;
                 }
@@ -56,34 +56,34 @@ 
     }
 
 
-    public function saveUpdate($bean, $event, $arguments){
-        if(!isAOPEnabled()){
+    public function saveUpdate($bean, $event, $arguments) {
+        if (!isAOPEnabled()) {
             return;
         }
         global $current_user, $app_list_strings;
-        if(empty($bean->fetched_row) || !$bean->id){
+        if (empty($bean->fetched_row) || !$bean->id) {
 
-            if(!$bean->state){
+            if (!$bean->state) {
                 $bean->state = $app_list_strings['case_state_default_key'];
             }
-            if($bean->status == "New"){
+            if ($bean->status == "New") {
                 $bean->status = $app_list_strings['case_status_default_key'];
             }
 
             //New case - assign
-            if(!$bean->assigned_user_id){
+            if (!$bean->assigned_user_id) {
                 $userId = $this->getAssignToUser();
                 $bean->assigned_user_id = $userId;
                 $bean->notify_inworkflow = true;
             }
             return;
         }
-        if($_REQUEST['module'] == 'Import'){
+        if ($_REQUEST['module'] == 'Import') {
             return;
         }
         //Grab the update field and create a new update with it.
         $text = $bean->update_text;
-        if(!$text && empty($_FILES['case_update_file'])){
+        if (!$text && empty($_FILES['case_update_file'])) {
             //No text or files, so nothing really to save.
             return;
         }
@@ -93,8 +93,8 @@ 
         $case_update->internal = $bean->internal;
         $bean->internal = false;
         $case_update->assigned_user_id = $current_user->id;
-        if(strlen($text) > $this->slug_size){
-            $case_update->name = substr($text,0,$this->slug_size)."...";
+        if (strlen($text) > $this->slug_size) {
+            $case_update->name = substr($text, 0, $this->slug_size)."...";
         }
         $case_update->description = nl2br($text);
         $case_update->case_id = $bean->id;
@@ -102,12 +102,12 @@ 
 
         $fileCount = $this->arrangeFilesArray();
 
-        for($x = 0; $x < $fileCount; $x++){
-            if($_FILES['case_update_file']['error'][$x] == UPLOAD_ERR_NO_FILE){
+        for ($x = 0; $x < $fileCount; $x++) {
+            if ($_FILES['case_update_file']['error'][$x] == UPLOAD_ERR_NO_FILE) {
                 continue;
             }
             $uploadFile = new UploadFile('case_update_file'.$x);
-            if(!$uploadFile->confirm_upload()){
+            if (!$uploadFile->confirm_upload()) {
                 continue;
             }
             $note = $this->newNote($case_update->id);
@@ -118,13 +118,13 @@ 
             $uploadFile->final_move($note->id);
         }
         $postPrefix = 'case_update_id_';
-        foreach($_POST as $key => $val){
-            if(strpos($key, $postPrefix) !== 0 || empty($val)){
+        foreach ($_POST as $key => $val) {
+            if (strpos($key, $postPrefix) !== 0 || empty($val)) {
                 continue;
             }
             //Val is selected doc id
-            $doc = BeanFactory::getBean('Documents',$val);
-            if(!$doc){
+            $doc = BeanFactory::getBean('Documents', $val);
+            if (!$doc) {
                 continue;
             }
             $note = $this->newNote($case_update->id);
@@ -134,11 +134,11 @@ 
             $note->save();
             $srcFile = "upload://{$doc->document_revision_id}";
             $destFile = "upload://{$note->id}";
-            copy($srcFile,$destFile);
+            copy($srcFile, $destFile);
         }
     }
 
-    private function newNote($caseUpdateId){
+    private function newNote($caseUpdateId) {
         $note = BeanFactory::newBean('Notes');
         $note->parent_type = 'AOP_Case_Updates';
         $note->parent_id = $caseUpdateId;
@@ -146,30 +146,30 @@ 
         return $note;
     }
 
-    private function linkAccountAndCase($case_id,$account_id){
-        if(!$account_id || !$case_id){
+    private function linkAccountAndCase($case_id, $account_id) {
+        if (!$account_id || !$case_id) {
             return;
         }
-        $case = BeanFactory::getBean("Cases",$case_id);
-        if(!$case->account_id){
+        $case = BeanFactory::getBean("Cases", $case_id);
+        if (!$case->account_id) {
             $case->account_id = $account_id;
             $case->save();
         }
     }
 
-    public function assignAccount($bean, $event, $arguments){
-        if($arguments['module'] != "Cases" || $arguments['related_module'] != "Contacts"){
+    public function assignAccount($bean, $event, $arguments) {
+        if ($arguments['module'] != "Cases" || $arguments['related_module'] != "Contacts") {
             return;
         }
-        if(!isAOPEnabled()){
+        if (!isAOPEnabled()) {
             return;
         }
-        $contact = BeanFactory::getBean("Contacts",$arguments['related_id']);
+        $contact = BeanFactory::getBean("Contacts", $arguments['related_id']);
         $contact->load_relationship("accounts");
-        if(!$contact || !$contact->account_id){
+        if (!$contact || !$contact->account_id) {
             return;
         }
-        $this->linkAccountAndCase($bean->id,$contact->account_id);
+        $this->linkAccountAndCase($bean->id, $contact->account_id);
     }
 
     /**
@@ -178,26 +178,26 @@ 
      * @param $event
      * @param $arguments
      */
-    public function saveEmailUpdate($bean, $event, $arguments){
+    public function saveEmailUpdate($bean, $event, $arguments) {
         global $mod_strings;
-        if($bean->intent != "createcase" || $bean->parent_type != "Cases"){
+        if ($bean->intent != "createcase" || $bean->parent_type != "Cases") {
             $GLOBALS['log']->warn("CaseUpdatesHook: saveEmailUpdate: Not a create case or wrong parent type");
             return;
         }
-        if(!isAOPEnabled()){
+        if (!isAOPEnabled()) {
             return;
         }
-        if(!$bean->parent_id ){
+        if (!$bean->parent_id) {
             $GLOBALS['log']->warn("CaseUpdatesHook: saveEmailUpdate No parent id");
             return;
         }
 
-        if($bean->cases){
+        if ($bean->cases) {
             $GLOBALS['log']->warn("CaseUpdatesHook: saveEmailUpdate cases already set");
             return;
         }
 
-        if($bean->fetched_row['parent_id']){
+        if ($bean->fetched_row['parent_id']) {
             //Will have been processed already
             return;
         }
@@ -206,10 +206,10 @@ 
         $ea = new SugarEmailAddress();
         $beans = $ea->getBeansByEmailAddress($bean->from_addr);
         $contact_id = null;
-        foreach($beans as $emailBean){
-            if($emailBean->module_name == "Contacts" && !empty($emailBean->id)){
+        foreach ($beans as $emailBean) {
+            if ($emailBean->module_name == "Contacts" && !empty($emailBean->id)) {
                 $contact_id = $emailBean->id;
-                $this->linkAccountAndCase($bean->parent_id,$emailBean->account_id);
+                $this->linkAccountAndCase($bean->parent_id, $emailBean->account_id);
             }
         }
         $case_update = new AOP_Case_Updates();
@@ -220,8 +220,8 @@ 
         $case_update->internal = false;
         $case_update->case_id = $bean->parent_id;
         $case_update->save();
-        $notes = $bean->get_linked_beans('notes','Notes');
-        foreach($notes as $note){
+        $notes = $bean->get_linked_beans('notes', 'Notes');
+        foreach ($notes as $note) {
             //Link notes to case update also
             $newNote = BeanFactory::newBean('Notes');
             $newNote->name = $note->name;
@@ -232,7 +232,7 @@ 
             $newNote->save();
             $srcFile = "upload://{$note->id}";
             $destFile = "upload://{$newNote->id}";
-            copy($srcFile,$destFile);
+            copy($srcFile, $destFile);
         }
 
         $this->updateCaseStatus($case_update->case_id);
@@ -242,71 +242,71 @@ 
      * Changes the status of the supplied case based on the case_status_changes config values.
      * @param $caseId
      */
-    private function updateCaseStatus($caseId){
+    private function updateCaseStatus($caseId) {
         global $sugar_config;
-        if(empty($caseId)){
+        if (empty($caseId)) {
             return;
         }
-        if(empty($sugar_config['aop']['case_status_changes'])){
+        if (empty($sugar_config['aop']['case_status_changes'])) {
             return;
         }
-        $statusMap = json_decode($sugar_config['aop']['case_status_changes'],1);
-        if(empty($statusMap)){
+        $statusMap = json_decode($sugar_config['aop']['case_status_changes'], 1);
+        if (empty($statusMap)) {
             return;
         }
-        $case = BeanFactory::getBean('Cases',$caseId);
-        if(empty($case)){
+        $case = BeanFactory::getBean('Cases', $caseId);
+        if (empty($case)) {
             return;
         }
-        if(array_key_exists($case->status,$statusMap)){
+        if (array_key_exists($case->status, $statusMap)) {
             $case->status = $statusMap[$case->status];
-            $statusBits = explode('_',$case->status);
+            $statusBits = explode('_', $case->status);
             $case->state = array_shift($statusBits);
             $case->save();
         }
 
     }
 
-    private function unquoteEmail($text){
+    private function unquoteEmail($text) {
         global $app_strings;
         $text = html_entity_decode($text);
-        $text = preg_replace('/(\r\n|\r|\n)/s',"\n",$text);
-        $pos = strpos($text,$app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER']);
-        if($pos !== false){
-            $text = substr($text,0,$pos);
+        $text = preg_replace('/(\r\n|\r|\n)/s', "\n", $text);
+        $pos = strpos($text, $app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER']);
+        if ($pos !== false) {
+            $text = substr($text, 0, $pos);
         }
         return $text;
     }
 
-    public function closureNotifyPrep($bean, $event, $arguments){
-        if($_REQUEST['module'] == 'Import'){
+    public function closureNotifyPrep($bean, $event, $arguments) {
+        if ($_REQUEST['module'] == 'Import') {
             return;
         }
-        if($bean->state!= "Closed" || $bean->fetched_row['state'] == "Closed"){
+        if ($bean->state != "Closed" || $bean->fetched_row['state'] == "Closed") {
             $bean->send_closure_email = false;
-        }else{
+        } else {
             $bean->send_closure_email = true;
         }
 
     }
 
-    public function closureNotify($bean, $event, $arguments){
-        if($_REQUEST['module'] == 'Import'){
+    public function closureNotify($bean, $event, $arguments) {
+        if ($_REQUEST['module'] == 'Import') {
             return;
         }
-        if($bean->state != "Closed" || !$bean->send_closure_email){
+        if ($bean->state != "Closed" || !$bean->send_closure_email) {
             return;
         }
         $this->sendClosureEmail($bean, $arguments['related_bean']);
     }
 
-    private function sendClosureEmail(aCase $bean){
-        if(!isAOPEnabled()){
+    private function sendClosureEmail(aCase $bean) {
+        if (!isAOPEnabled()) {
             return;
         }
         $GLOBALS['log']->warn("CaseUpdatesHook: sendClosureEmail called");
         require_once("include/SugarPHPMailer.php");
-        $mailer=new SugarPHPMailer();
+        $mailer = new SugarPHPMailer();
         $admin = new Administration();
         $admin->retrieveSettings();
 
@@ -315,18 +315,18 @@ 
 
         $email_template = new EmailTemplate();
         $aop_config = $this->getAOPConfig();
-        $GLOBALS['log']->warn("CaseUpdatesHook: sendClosureEmail Config is ".print_r($aop_config,true));
+        $GLOBALS['log']->warn("CaseUpdatesHook: sendClosureEmail Config is ".print_r($aop_config, true));
         $email_template = $email_template->retrieve($aop_config['case_closure_email_template_id']);
 
-        if(!$email_template){
+        if (!$email_template) {
             $GLOBALS['log']->warn("CaseUpdatesHook: sendClosureEmail template is empty");
             return false;
         }
 
-        $contact = $bean->get_linked_beans("contacts","Contact");
-        if($contact){
+        $contact = $bean->get_linked_beans("contacts", "Contact");
+        if ($contact) {
             $contact = $contact[0];
-        }else{
+        } else {
             return false;
         }
 
@@ -343,10 +343,10 @@ 
         $email = $contact->emailAddress->getPrimaryAddress($contact);
 
         $mailer->AddAddress($email);
-        if (!$mailer->Send()){
-            $GLOBALS['log']->info("CaseUpdatesHook: Could not send email:  " . $mailer->ErrorInfo);
+        if (!$mailer->Send()) {
+            $GLOBALS['log']->info("CaseUpdatesHook: Could not send email:  ".$mailer->ErrorInfo);
             return false;
-        }else{
+        } else {
             $this->logEmail($email, $mailer, $bean->id);
             return true;
         }
@@ -359,25 +359,25 @@ 
      * @param $event
      * @param $arguments
      */
-    public function creationNotify($bean, $event, $arguments){
-        if($_REQUEST['module'] == 'Import'){
+    public function creationNotify($bean, $event, $arguments) {
+        if ($_REQUEST['module'] == 'Import') {
             return;
         }
-        if($arguments['module'] != "Cases" || $arguments['related_module'] != "Contacts"){
+        if ($arguments['module'] != "Cases" || $arguments['related_module'] != "Contacts") {
             return;
         }
-        if(!$bean->fetched_row){
+        if (!$bean->fetched_row) {
             return;
         }
-        if(!empty($arguments['related_bean'])){
+        if (!empty($arguments['related_bean'])) {
             $contact = $arguments['related_bean'];
-        }else{
-            $contact = BeanFactory::getBean("Contacts",$arguments['related_id']);
+        } else {
+            $contact = BeanFactory::getBean("Contacts", $arguments['related_id']);
         }
         $this->sendCreationEmail($bean, $contact);
     }
 
-    private function populateTemplate(EmailTemplate $template, aCase $bean, $contact){
+    private function populateTemplate(EmailTemplate $template, aCase $bean, $contact) {
         global $app_strings, $sugar_config;
         //Order of beans seems to matter here so we place contact first.
         $beans = array(
@@ -386,26 +386,26 @@ 
             "Users" => $bean->assigned_user_id
         );
         $ret = array();
-        $ret['subject'] = from_html(aop_parse_template($template->subject,$beans));
-        $ret['body'] = from_html($app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER'].aop_parse_template(str_replace("\$sugarurl",$sugar_config['site_url'],$template->body_html),$beans));
-        $ret['body_alt'] = strip_tags(from_html(aop_parse_template(str_replace("\$sugarurl",$sugar_config['site_url'],$template->body),$beans)));
+        $ret['subject'] = from_html(aop_parse_template($template->subject, $beans));
+        $ret['body'] = from_html($app_strings['LBL_AOP_EMAIL_REPLY_DELIMITER'].aop_parse_template(str_replace("\$sugarurl", $sugar_config['site_url'], $template->body_html), $beans));
+        $ret['body_alt'] = strip_tags(from_html(aop_parse_template(str_replace("\$sugarurl", $sugar_config['site_url'], $template->body), $beans)));
         return $ret;
     }
 
-    private function getAOPConfig(){
+    private function getAOPConfig() {
         global $sugar_config;
-        if(!array_key_exists("aop",$sugar_config)){
+        if (!array_key_exists("aop", $sugar_config)) {
             return array();
         }
         return $sugar_config['aop'];
     }
 
-    private function sendCreationEmail(aCase $bean, $contact){
-        if(!isAOPEnabled()){
+    private function sendCreationEmail(aCase $bean, $contact) {
+        if (!isAOPEnabled()) {
             return;
         }
         require_once("include/SugarPHPMailer.php");
-        $mailer=new SugarPHPMailer();
+        $mailer = new SugarPHPMailer();
         $admin = new Administration();
         $admin->retrieveSettings();
 
@@ -416,7 +416,7 @@ 
 
         $aop_config = $this->getAOPConfig();
         $email_template = $email_template->retrieve($aop_config['case_creation_email_template_id']);
-        if(!$aop_config['case_creation_email_template_id'] || !$email_template){
+        if (!$aop_config['case_creation_email_template_id'] || !$email_template) {
             $GLOBALS['log']->warn("CaseUpdatesHook: sendCreationEmail template is empty");
             return false;
         }
@@ -430,24 +430,24 @@ 
         $mailer->From     = $emailSettings['from_address'];
         $mailer->FromName = $emailSettings['from_name'];
         $email = $contact->emailAddress->getPrimaryAddress($contact);
-        if(empty($email) && !empty($contact->email1)){
+        if (empty($email) && !empty($contact->email1)) {
             $email = $contact->email1;
         }
         $mailer->AddAddress($email);
-        if (!$mailer->Send()){
-            $GLOBALS['log']->info("CaseUpdatesHook: Could not send email:  " . $mailer->ErrorInfo);
+        if (!$mailer->Send()) {
+            $GLOBALS['log']->info("CaseUpdatesHook: Could not send email:  ".$mailer->ErrorInfo);
             return false;
-        }else{
+        } else {
             $this->logEmail($email, $mailer, $bean->id);
             return true;
         }
     }
 
-    private function logEmail($email, $mailer, $caseId = null){
+    private function logEmail($email, $mailer, $caseId = null) {
         require_once('modules/Emails/Email.php');
         $emailObj = new Email();
         $emailObj->to_addrs = $email;
-        $emailObj->type= 'out';
+        $emailObj->type = 'out';
         $emailObj->deleted = '0';
         $emailObj->name = $mailer->Subject;
         $emailObj->description = $mailer->AltBody;
@@ -464,7 +464,7 @@ 
         $emailObj->save();
     }
 
-    public function filterHTML($bean, $event, $arguments){
-        $bean->description = SugarCleaner::cleanHtml($bean->description,true);
+    public function filterHTML($bean, $event, $arguments) {
+        $bean->description = SugarCleaner::cleanHtml($bean->description, true);
     }
 }

modules/AOP_Case_Updates/AOP_Case_Updates_sugar.php

Spacing +4 added lines, -4 removed lines

@@ -36,7 +36,7 @@ 
 	var $table_name = 'aop_case_updates';
 	var $tracker_visibility = false;
 	var $importable = false;
-	var $disable_row_level_security = true ; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
+	var $disable_row_level_security = true; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
 		var $id;
 		var $name;
 		var $date_entered;
@@ -52,12 +52,12 @@ 
 		var $assigned_user_id;
 		var $assigned_user_name;
 		var $assigned_user_link;
-		function AOP_Case_Updates_sugar(){	
+		function AOP_Case_Updates_sugar() {	
 		parent::Basic();
 	}
 	
-	function bean_implements($interface){
-		switch($interface){
+	function bean_implements($interface) {
+		switch ($interface) {
 			case 'ACL': return true;
 		}
 		return false;

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);
         }

modules/SchedulersJobs/field_arrays.php

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
 	)

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);

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;