@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | $moduleTableIndexList = $meta->getEntityTableIndexList(); |
121 | 121 | foreach ($tableList as $index => $tableName) { |
122 | 122 | if ($tableName != $tableList[0]) { |
123 | - $sql .=' INNER JOIN ' . $tableName . ' ON ' . $tableList[0] . '.' . |
|
123 | + $sql .= ' INNER JOIN ' . $tableName . ' ON ' . $tableList[0] . '.' . |
|
124 | 124 | $moduleTableIndexList[$tableList[0]] . '=' . $tableName . '.' . |
125 | 125 | $moduleTableIndexList[$tableName]; |
126 | 126 | } |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | //If module is Leads and if you are not selected any leads fields then query failure is happening. |
129 | 129 | //By default we are checking where condition on base table. |
130 | 130 | if ($module == 'Leads' && !in_array('vtiger_leaddetails', $tableList)) { |
131 | - $sql .=' INNER JOIN vtiger_leaddetails ON vtiger_leaddetails.leadid = vtiger_crmentity.crmid'; |
|
131 | + $sql .= ' INNER JOIN vtiger_leaddetails ON vtiger_leaddetails.leadid = vtiger_crmentity.crmid'; |
|
132 | 132 | } |
133 | 133 | |
134 | 134 | $sql .= ' WHERE'; |
@@ -209,8 +209,9 @@ discard block |
||
209 | 209 | $needle = '$' . strtolower($this->module) . '-' . $parentFieldColumnMapping[$params['field']] . ':' . $column . '$'; |
210 | 210 | $this->processedDescription = str_replace($needle, $values[array_search($column, $fieldColumnMapping)], $this->processedDescription); |
211 | 211 | } |
212 | - if (!$params['owner']) |
|
213 | - $this->processedmodules[$module] = true; |
|
212 | + if (!$params['owner']) { |
|
213 | + $this->processedmodules[$module] = true; |
|
214 | + } |
|
214 | 215 | } |
215 | 216 | } |
216 | 217 | } |
@@ -253,7 +254,8 @@ discard block |
||
253 | 254 | $rows = $adb->num_rows($res); |
254 | 255 | if ($rows > 0) { |
255 | 256 | return true; |
256 | - } else |
|
257 | - return false; |
|
257 | + } else { |
|
258 | + return false; |
|
259 | + } |
|
258 | 260 | } |
259 | 261 | } |
@@ -37,8 +37,9 @@ discard block |
||
37 | 37 | |
38 | 38 | public function setConfig($key, $value) |
39 | 39 | { |
40 | - if (empty($key)) |
|
41 | - return; |
|
40 | + if (empty($key)) { |
|
41 | + return; |
|
42 | + } |
|
42 | 43 | $this->properties[$key] = $value; |
43 | 44 | //not neccessary for php5.x versions |
44 | 45 | self::$propertiesCache[$this->name] = $this->properties; |
@@ -46,8 +47,9 @@ discard block |
||
46 | 47 | |
47 | 48 | public function getConfig($key) |
48 | 49 | { |
49 | - if (empty($key)) |
|
50 | - return ''; |
|
50 | + if (empty($key)) { |
|
51 | + return ''; |
|
52 | + } |
|
51 | 53 | return $this->properties[$key]; |
52 | 54 | } |
53 | 55 | } |
@@ -15,6 +15,10 @@ discard block |
||
15 | 15 | protected $name; |
16 | 16 | static $propertiesCache = []; |
17 | 17 | |
18 | + /** |
|
19 | + * @param string $path |
|
20 | + * @param string $name |
|
21 | + */ |
|
18 | 22 | public function __construct($path, $name, $force = false) |
19 | 23 | { |
20 | 24 | $this->load($path, $name, $force); |
@@ -41,6 +45,9 @@ discard block |
||
41 | 45 | self::$propertiesCache[$this->name] = $this->properties; |
42 | 46 | } |
43 | 47 | |
48 | + /** |
|
49 | + * @param string $key |
|
50 | + */ |
|
44 | 51 | public function getConfig($key) |
45 | 52 | { |
46 | 53 | if (empty($key)) |
@@ -28,8 +28,9 @@ |
||
28 | 28 | $blockid_list = '('; |
29 | 29 | for ($i = 0; $i < $noofrows; $i++) { |
30 | 30 | $blockid = $adb->query_result($result, $i, "blockid"); |
31 | - if ($i != 0) |
|
32 | - $blockid_list .= ', '; |
|
31 | + if ($i != 0) { |
|
32 | + $blockid_list .= ', '; |
|
33 | + } |
|
33 | 34 | $blockid_list .= $blockid; |
34 | 35 | $block_label[$blockid] = $adb->query_result($result, $i, "blocklabel"); |
35 | 36 | } |
@@ -69,8 +69,9 @@ discard block |
||
69 | 69 | } |
70 | 70 | $this->dayofweek_to_rpt = $repeat_arr['dayofweek_to_repeat']; |
71 | 71 | $this->repeat_monthby = $repeat_arr['repeatmonth_type']; |
72 | - if (isset($repeat_arr['repeatmonth_date'])) |
|
73 | - $this->rptmonth_datevalue = $repeat_arr['repeatmonth_date']; |
|
72 | + if (isset($repeat_arr['repeatmonth_date'])) { |
|
73 | + $this->rptmonth_datevalue = $repeat_arr['repeatmonth_date']; |
|
74 | + } |
|
74 | 75 | $this->rptmonth_daytype = $repeat_arr['repeatmonth_daytype']; |
75 | 76 | |
76 | 77 | $this->recurringdates = $this->_getRecurringDates(); |
@@ -409,13 +410,13 @@ discard block |
||
409 | 410 | if ($this->rptmonth_datevalue <= $date) { |
410 | 411 | $index = $this->rptmonth_datevalue - 1; |
411 | 412 | $day = $this->rptmonth_datevalue; |
412 | - if (isset($this->recur_freq)) |
|
413 | - $month = $month + $this->recur_freq; |
|
414 | - else |
|
415 | - $month = $month + 1; |
|
413 | + if (isset($this->recur_freq)) { |
|
414 | + $month = $month + $this->recur_freq; |
|
415 | + } else { |
|
416 | + $month = $month + 1; |
|
417 | + } |
|
416 | 418 | $tempdateObj = $tempdateObj->getThismonthDaysbyIndex($index, $day, $month, $year); |
417 | - } |
|
418 | - else { |
|
419 | + } else { |
|
419 | 420 | $index = $this->rptmonth_datevalue - 1; |
420 | 421 | $day = $this->rptmonth_datevalue; |
421 | 422 | $tempdateObj = $tempdateObj->getThismonthDaysbyIndex($index, $day, $month, $year); |
@@ -430,10 +431,11 @@ discard block |
||
430 | 431 | $tempdateObj = new vt_DateTime($date_arr, true); |
431 | 432 | $firstdayofmonthObj = $this->getFistdayofmonth($this->dayofweek_to_rpt[0], $tempdateObj); |
432 | 433 | if ($firstdayofmonthObj->get_DB_formatted_date() <= $tempdate) { |
433 | - if (isset($this->recur_freq)) |
|
434 | - $month = $firstdayofmonthObj->getMonth() + $this->recur_freq; |
|
435 | - else |
|
436 | - $month = $firstdayofmonthObj->getMonth() + 1; |
|
434 | + if (isset($this->recur_freq)) { |
|
435 | + $month = $firstdayofmonthObj->getMonth() + $this->recur_freq; |
|
436 | + } else { |
|
437 | + $month = $firstdayofmonthObj->getMonth() + 1; |
|
438 | + } |
|
437 | 439 | $dateObj = $firstdayofmonthObj->getThismonthDaysbyIndex(0, 1, $month, $firstdayofmonthObj->getYear()); |
438 | 440 | $nextmonthObj = $this->getFistdayofmonth($this->dayofweek_to_rpt[0], $dateObj); |
439 | 441 | $tempdateObj = $nextmonthObj; |
@@ -449,16 +451,16 @@ discard block |
||
449 | 451 | $tempdateObj = new vt_DateTime($date_arr, true); |
450 | 452 | $lastdayofmonthObj = $this->getLastdayofmonth($this->dayofweek_to_rpt[0], $tempdateObj); |
451 | 453 | if ($lastdayofmonthObj->get_DB_formatted_date() <= $tempdate) { |
452 | - if (isset($this->recur_freq)) |
|
453 | - $month = $lastdayofmonthObj->getMonth() + $this->recur_freq; |
|
454 | - else |
|
455 | - $month = $lastdayofmonthObj->getMonth() + 1; |
|
454 | + if (isset($this->recur_freq)) { |
|
455 | + $month = $lastdayofmonthObj->getMonth() + $this->recur_freq; |
|
456 | + } else { |
|
457 | + $month = $lastdayofmonthObj->getMonth() + 1; |
|
458 | + } |
|
456 | 459 | $dateObj = $lastdayofmonthObj->getThismonthDaysbyIndex(0, 1, $month, $lastdayofmonthObj->getYear()); |
457 | 460 | $dateObj = $dateObj->getThismonthDaysbyIndex($dateObj->getDaysInMonth() - 1, $dateObj->getDaysInMonth(), $month, $lastdayofmonthObj->getYear()); |
458 | 461 | $nextmonthObj = $this->getLastdayofmonth($this->dayofweek_to_rpt[0], $dateObj); |
459 | 462 | $tempdateObj = $nextmonthObj; |
460 | - } |
|
461 | - else { |
|
463 | + } else { |
|
462 | 464 | $tempdateObj = $lastdayofmonthObj; |
463 | 465 | } |
464 | 466 | } |
@@ -476,10 +478,11 @@ discard block |
||
476 | 478 | } |
477 | 479 | } elseif ($this->recur_type == 'Yearly') { |
478 | 480 | |
479 | - if (isset($this->recur_freq)) |
|
480 | - $index = $year + $this->recur_freq; |
|
481 | - else |
|
482 | - $index = $year + 1; |
|
481 | + if (isset($this->recur_freq)) { |
|
482 | + $index = $year + $this->recur_freq; |
|
483 | + } else { |
|
484 | + $index = $year + 1; |
|
485 | + } |
|
483 | 486 | if ($index > 2037 || $index < 1970) { |
484 | 487 | print("<font color='red'>" . \includes\Language::translate('LBL_CAL_LIMIT_MSG') . "</font>"); |
485 | 488 | exit; |
@@ -534,10 +537,11 @@ discard block |
||
534 | 537 | if ($dayofweek == $dateObj->dayofweek) { |
535 | 538 | return $dateObj; |
536 | 539 | } else { |
537 | - if ($dayofweek > $dateObj->dayofweek) |
|
538 | - $day = $dateObj->day - 7 + ($dayofweek - $dateObj->dayofweek); |
|
539 | - else |
|
540 | - $day = $dateObj->day - ($dateObj->dayofweek - $dayofweek); |
|
540 | + if ($dayofweek > $dateObj->dayofweek) { |
|
541 | + $day = $dateObj->day - 7 + ($dayofweek - $dateObj->dayofweek); |
|
542 | + } else { |
|
543 | + $day = $dateObj->day - ($dateObj->dayofweek - $dayofweek); |
|
544 | + } |
|
541 | 545 | $index = $day - 1; |
542 | 546 | $month = $dateObj->month; |
543 | 547 | $year = $dateObj->year; |
@@ -1401,7 +1401,7 @@ |
||
1401 | 1401 | function isRecordExists($recordId, $cache = true) |
1402 | 1402 | { |
1403 | 1403 | $recordMetaData = vtlib\Functions::getCRMRecordMetadata($recordId); |
1404 | - return (isset($recordMetaData) && $recordMetaData['deleted'] == 0 ) ? true : false; |
|
1404 | + return (isset($recordMetaData) && $recordMetaData['deleted'] == 0) ? true : false; |
|
1405 | 1405 | } |
1406 | 1406 | |
1407 | 1407 | /** Function to set date values compatible to database (YY_MM_DD) |
@@ -367,6 +367,7 @@ discard block |
||
367 | 367 | |
368 | 368 | /** |
369 | 369 | * Function to find the UI type of a field based on the uitype id |
370 | + * @param string $reqtype |
|
370 | 371 | */ |
371 | 372 | function is_uitype($uitype, $reqtype) |
372 | 373 | { |
@@ -752,6 +753,8 @@ discard block |
||
752 | 753 | |
753 | 754 | /** |
754 | 755 | * Function to get the approximate difference between two date time values as string |
756 | + * @param integer $d1 |
|
757 | + * @param integer $d2 |
|
755 | 758 | */ |
756 | 759 | function dateDiffAsString($d1, $d2) |
757 | 760 | { |
@@ -289,13 +289,15 @@ discard block |
||
289 | 289 | while (($i--) > 0) { |
290 | 290 | if ($data != ($a = $data % ($p = pow(64, $i)))) { |
291 | 291 | $ret = chr(base_convert(str_pad(str_repeat(1, $i + 1), 8, "0"), 2, 10) + (($data - $a) / $p)); |
292 | - for ($i; $i > 0; $i--) |
|
293 | - $ret .= chr(128 + ((($data % pow(64, $i)) - ($data % ($p = pow(64, $i - 1)))) / $p)); |
|
292 | + for ($i; $i > 0; $i--) { |
|
293 | + $ret .= chr(128 + ((($data % pow(64, $i)) - ($data % ($p = pow(64, $i - 1)))) / $p)); |
|
294 | + } |
|
294 | 295 | break; |
295 | 296 | } |
296 | 297 | } |
297 | - } else |
|
298 | - $ret = "&#$data;"; |
|
298 | + } else { |
|
299 | + $ret = "&#$data;"; |
|
300 | + } |
|
299 | 301 | return $ret; |
300 | 302 | } |
301 | 303 | |
@@ -344,8 +346,9 @@ discard block |
||
344 | 346 | */ |
345 | 347 | function escape_single_quotes($value) |
346 | 348 | { |
347 | - if (isset($value)) |
|
348 | - $value = str_replace("'", "\'", $value); |
|
349 | + if (isset($value)) { |
|
350 | + $value = str_replace("'", "\'", $value); |
|
351 | + } |
|
349 | 352 | return $value; |
350 | 353 | } |
351 | 354 | |
@@ -366,10 +369,11 @@ discard block |
||
366 | 369 | $str = str_replace('_', '\_', $str); |
367 | 370 | if ($flag == 0) { |
368 | 371 | // If value what to search is null then we should not add % which will fail |
369 | - if (empty($str)) |
|
370 | - $str = '' . $str . ''; |
|
371 | - else |
|
372 | - $str = '%' . $str . '%'; |
|
372 | + if (empty($str)) { |
|
373 | + $str = '' . $str . ''; |
|
374 | + } else { |
|
375 | + $str = '%' . $str . '%'; |
|
376 | + } |
|
373 | 377 | } elseif ($flag == 1) { |
374 | 378 | $str = '%' . $str; |
375 | 379 | } elseif ($flag == 2) { |
@@ -402,8 +406,9 @@ discard block |
||
402 | 406 | |
403 | 407 | $ret_str .= " ifnull($tbl_name.$col_name,'null') = ifnull(temp.$col_name,'null')"; |
404 | 408 | |
405 | - if (count($field_array) != $i) |
|
406 | - $ret_str .= " and "; |
|
409 | + if (count($field_array) != $i) { |
|
410 | + $ret_str .= " and "; |
|
411 | + } |
|
407 | 412 | $i++; |
408 | 413 | } |
409 | 414 | return $ret_str; |
@@ -430,8 +435,9 @@ discard block |
||
430 | 435 | foreach ($name as $module) { |
431 | 436 | $focus = CRMEntity::getInstance($module); |
432 | 437 | $query = $focus->buildSearchQueryForFieldTypes(11, $number); |
433 | - if (empty($query)) |
|
434 | - return; |
|
438 | + if (empty($query)) { |
|
439 | + return; |
|
440 | + } |
|
435 | 441 | |
436 | 442 | $result = $adb->pquery($query, []); |
437 | 443 | if ($adb->num_rows($result) > 0) { |
@@ -569,8 +575,9 @@ discard block |
||
569 | 575 | //require_once('modules/com_vtiger_workflow/VTEntityCache.php'); |
570 | 576 | $em = new VTEventsManager($adb); |
571 | 577 | $em->initTriggerCache(); |
572 | - if (!is_array($destinationRecordIds)) |
|
573 | - $destinationRecordIds = [$destinationRecordIds]; |
|
578 | + if (!is_array($destinationRecordIds)) { |
|
579 | + $destinationRecordIds = [$destinationRecordIds]; |
|
580 | + } |
|
574 | 581 | |
575 | 582 | $data = []; |
576 | 583 | $data['CRMEntity'] = $focus; |
@@ -626,20 +633,23 @@ discard block |
||
626 | 633 | $delim = array('/', '.'); |
627 | 634 | foreach ($delim as $delimiter) { |
628 | 635 | $x = strpos($value, $delimiter); |
629 | - if ($x === false) |
|
630 | - continue; |
|
631 | - else { |
|
636 | + if ($x === false) { |
|
637 | + continue; |
|
638 | + } else { |
|
632 | 639 | $value = str_replace($delimiter, '-', $value); |
633 | 640 | break; |
634 | 641 | } |
635 | 642 | } |
636 | 643 | list($y, $m, $d) = explode('-', $value); |
637 | - if (strlen($y) == 1) |
|
638 | - $y = '0' . $y; |
|
639 | - if (strlen($m) == 1) |
|
640 | - $m = '0' . $m; |
|
641 | - if (strlen($d) == 1) |
|
642 | - $d = '0' . $d; |
|
644 | + if (strlen($y) == 1) { |
|
645 | + $y = '0' . $y; |
|
646 | + } |
|
647 | + if (strlen($m) == 1) { |
|
648 | + $m = '0' . $m; |
|
649 | + } |
|
650 | + if (strlen($d) == 1) { |
|
651 | + $d = '0' . $d; |
|
652 | + } |
|
643 | 653 | $value = implode('-', array($y, $m, $d)); |
644 | 654 | |
645 | 655 | if (strlen($y) < 4) { |
@@ -61,8 +61,9 @@ |
||
61 | 61 | self::$modules[$module] = $CONFIG; |
62 | 62 | switch ($argsLength) { |
63 | 63 | case 2: |
64 | - if (!isset($CONFIG[$key])) |
|
65 | - return false; |
|
64 | + if (!isset($CONFIG[$key])) { |
|
65 | + return false; |
|
66 | + } |
|
66 | 67 | return $CONFIG[$key]; |
67 | 68 | break; |
68 | 69 | default: |
@@ -16,11 +16,17 @@ discard block |
||
16 | 16 | protected static $sounds = []; |
17 | 17 | protected static $search = []; |
18 | 18 | |
19 | + /** |
|
20 | + * @param string $key |
|
21 | + */ |
|
19 | 22 | public static function load($key, $config) |
20 | 23 | { |
21 | 24 | self::$$key = $config; |
22 | 25 | } |
23 | 26 | |
27 | + /** |
|
28 | + * @param string $key |
|
29 | + */ |
|
24 | 30 | public static function main($key, $value = false) |
25 | 31 | { |
26 | 32 | if (isset(self::$main[$key])) { |
@@ -75,11 +81,17 @@ discard block |
||
75 | 81 | } |
76 | 82 | } |
77 | 83 | |
84 | + /** |
|
85 | + * @param string $key |
|
86 | + */ |
|
78 | 87 | public static function api($key, $defvalue = false) |
79 | 88 | { |
80 | 89 | return self::$api[$key]; |
81 | 90 | } |
82 | 91 | |
92 | + /** |
|
93 | + * @param string $key |
|
94 | + */ |
|
83 | 95 | public static function debug($key, $defvalue = false) |
84 | 96 | { |
85 | 97 | if (empty(self::$debug)) { |
@@ -89,6 +101,9 @@ discard block |
||
89 | 101 | return self::$debug[$key]; |
90 | 102 | } |
91 | 103 | |
104 | + /** |
|
105 | + * @param string $key |
|
106 | + */ |
|
92 | 107 | public static function developer($key, $defvalue = false) |
93 | 108 | { |
94 | 109 | if (empty(self::$developer)) { |
@@ -98,6 +113,9 @@ discard block |
||
98 | 113 | return self::$developer[$key]; |
99 | 114 | } |
100 | 115 | |
116 | + /** |
|
117 | + * @param string $key |
|
118 | + */ |
|
101 | 119 | public static function security($key, $defvalue = false) |
102 | 120 | { |
103 | 121 | if (empty(self::$security)) { |
@@ -107,6 +125,9 @@ discard block |
||
107 | 125 | return self::$security[$key]; |
108 | 126 | } |
109 | 127 | |
128 | + /** |
|
129 | + * @param string $key |
|
130 | + */ |
|
110 | 131 | public static function securityKeys($key, $defvalue = false) |
111 | 132 | { |
112 | 133 | if (empty(self::$securityKeys)) { |
@@ -116,6 +137,11 @@ discard block |
||
116 | 137 | return self::$securityKeys[$key]; |
117 | 138 | } |
118 | 139 | |
140 | + /** |
|
141 | + * @param string $key |
|
142 | + * |
|
143 | + * @return integer |
|
144 | + */ |
|
119 | 145 | public static function performance($key, $defvalue = false) |
120 | 146 | { |
121 | 147 | if (empty(self::$performance)) { |
@@ -125,6 +151,9 @@ discard block |
||
125 | 151 | return self::$performance[$key]; |
126 | 152 | } |
127 | 153 | |
154 | + /** |
|
155 | + * @param string $key |
|
156 | + */ |
|
128 | 157 | public static function relation($key, $defvalue = false) |
129 | 158 | { |
130 | 159 | if (empty(self::$relation)) { |
@@ -147,6 +176,9 @@ discard block |
||
147 | 176 | return self::$sounds[$key]; |
148 | 177 | } |
149 | 178 | |
179 | + /** |
|
180 | + * @param string $key |
|
181 | + */ |
|
150 | 182 | public static function search($key, $defvalue = false) |
151 | 183 | { |
152 | 184 | if (empty(self::$search)) { |
@@ -156,6 +188,10 @@ discard block |
||
156 | 188 | return self::$search[$key]; |
157 | 189 | } |
158 | 190 | |
191 | + /** |
|
192 | + * @param string $key |
|
193 | + * @param integer $value |
|
194 | + */ |
|
159 | 195 | public static function iniSet($key, $value) |
160 | 196 | { |
161 | 197 | @ini_set($key, $value); |
@@ -73,14 +73,16 @@ discard block |
||
73 | 73 | $modulesInformation = $modulesDetails["information"]; |
74 | 74 | |
75 | 75 | foreach ($modulesInformation as $moduleName => $entityInformation) { |
76 | - if ($entityInformation["isEntity"]) |
|
77 | - $entityModules[] = $moduleName; |
|
76 | + if ($entityInformation["isEntity"]) { |
|
77 | + $entityModules[] = $moduleName; |
|
78 | + } |
|
78 | 79 | } |
79 | 80 | if (!$typed) { |
80 | 81 | $accessableModules = $entityModules; |
81 | 82 | } else { |
82 | - if (!in_array($elementType, $entityModules)) |
|
83 | - throw new WebServiceException(WebServiceErrorCode::$ACCESSDENIED, "Permission to perform the operation is denied"); |
|
83 | + if (!in_array($elementType, $entityModules)) { |
|
84 | + throw new WebServiceException(WebServiceErrorCode::$ACCESSDENIED, "Permission to perform the operation is denied"); |
|
85 | + } |
|
84 | 86 | $accessableModules[] = $elementType; |
85 | 87 | } |
86 | 88 | |
@@ -101,15 +103,17 @@ discard block |
||
101 | 103 | if ($elementType == "Calendar" || $elementType == "Events") { |
102 | 104 | $baseCRMTable = getSyncQueryBaseTable($elementType); |
103 | 105 | } |
104 | - } else |
|
105 | - $baseCRMTable = " vtiger_crmentity "; |
|
106 | + } else { |
|
107 | + $baseCRMTable = " vtiger_crmentity "; |
|
108 | + } |
|
106 | 109 | |
107 | 110 | //modifiedtime - next token |
108 | 111 | $q = "SELECT modifiedtime FROM $baseCRMTable WHERE modifiedtime>? and setype IN(" . generateQuestionMarks($accessableModules) . ") "; |
109 | 112 | $params = array($datetime); |
110 | 113 | foreach ($accessableModules as $entityModule) { |
111 | - if ($entityModule == "Events") |
|
112 | - $entityModule = "Calendar"; |
|
114 | + if ($entityModule == "Events") { |
|
115 | + $entityModule = "Calendar"; |
|
116 | + } |
|
113 | 117 | $params[] = $entityModule; |
114 | 118 | } |
115 | 119 | if (!$applicationSync) { |
@@ -159,10 +163,11 @@ discard block |
||
159 | 163 | $selectClause .=", " . $table_fieldName; |
160 | 164 | } |
161 | 165 | } |
162 | - if ($elementType == "Emails") |
|
163 | - $fromClause = vtws_getEmailFromClause(); |
|
164 | - else |
|
165 | - $fromClause = $queryGenerator->getFromClause(); |
|
166 | + if ($elementType == "Emails") { |
|
167 | + $fromClause = vtws_getEmailFromClause(); |
|
168 | + } else { |
|
169 | + $fromClause = $queryGenerator->getFromClause(); |
|
170 | + } |
|
166 | 171 | |
167 | 172 | $fromClause .= " INNER JOIN (select modifiedtime, crmid,deleted,setype FROM $baseCRMTable WHERE setype=? and modifiedtime >? and modifiedtime<=?"; |
168 | 173 | if (!$applicationSync) { |
@@ -201,8 +206,9 @@ discard block |
||
201 | 206 | $params = array($maxModifiedTime); |
202 | 207 | |
203 | 208 | foreach ($accessableModules as $entityModule) { |
204 | - if ($entityModule == "Events") |
|
205 | - $entityModule = "Calendar"; |
|
209 | + if ($entityModule == "Events") { |
|
210 | + $entityModule = "Calendar"; |
|
211 | + } |
|
206 | 212 | $params[] = $entityModule; |
207 | 213 | } |
208 | 214 | if (!$applicationSync) { |
@@ -285,10 +291,11 @@ discard block |
||
285 | 291 | |
286 | 292 | function getCalendarTypeCondition($elementType) |
287 | 293 | { |
288 | - if ($elementType == "Events") |
|
289 | - $activityCondition = "vtiger_activity.activitytype !='Task' and vtiger_activity.activitytype !='Emails'"; |
|
290 | - else |
|
291 | - $activityCondition = "vtiger_activity.activitytype ='Task'"; |
|
294 | + if ($elementType == "Events") { |
|
295 | + $activityCondition = "vtiger_activity.activitytype !='Task' and vtiger_activity.activitytype !='Emails'"; |
|
296 | + } else { |
|
297 | + $activityCondition = "vtiger_activity.activitytype ='Task'"; |
|
298 | + } |
|
292 | 299 | return $activityCondition; |
293 | 300 | } |
294 | 301 |
@@ -13,6 +13,9 @@ discard block |
||
13 | 13 | require_once 'include/utils/CommonUtils.php'; |
14 | 14 | require_once 'include/Webservices/DescribeObject.php'; |
15 | 15 | |
16 | +/** |
|
17 | + * @param string $syncType |
|
18 | + */ |
|
16 | 19 | function vtws_sync($mtime, $elementType, $syncType, $user) |
17 | 20 | { |
18 | 21 | return 'Currently not supported'; |
@@ -246,6 +249,9 @@ discard block |
||
246 | 249 | return strtotime($mtimeString); |
247 | 250 | } |
248 | 251 | |
252 | +/** |
|
253 | + * @param string[] $deletedValues |
|
254 | + */ |
|
249 | 255 | function vtws_isRecordDeleted($recordDetails, $deleteColumnDetails, $deletedValues) |
250 | 256 | { |
251 | 257 | $deletedRecord = false; |
@@ -294,6 +300,9 @@ discard block |
||
294 | 300 | return $activityCondition; |
295 | 301 | } |
296 | 302 | |
303 | +/** |
|
304 | + * @param Users $user |
|
305 | + */ |
|
297 | 306 | function getSelectClauseFields($module, $moduleMeta, $user) |
298 | 307 | { |
299 | 308 | $moduleFieldNames = $moduleMeta->getModuleFields(); |
@@ -212,8 +212,9 @@ discard block |
||
212 | 212 | $adb = PearDatabase::getInstance(); |
213 | 213 | |
214 | 214 | // administrator's have assign privilege |
215 | - if (\vtlib\Functions::userIsAdministrator($this->user)) |
|
216 | - return true; |
|
215 | + if (\vtlib\Functions::userIsAdministrator($this->user)) { |
|
216 | + return true; |
|
217 | + } |
|
217 | 218 | |
218 | 219 | $idComponents = vtws_getIdComponents($webserviceId); |
219 | 220 | $userId = $idComponents[1]; |
@@ -353,8 +354,9 @@ discard block |
||
353 | 354 | $theme = vtws_preserveGlobal('theme', $this->user->theme); |
354 | 355 | $default_language = AppConfig::main('default_language'); |
355 | 356 | $current_language = vglobal('current_language'); |
356 | - if (empty($current_language)) |
|
357 | - $current_language = $default_language; |
|
357 | + if (empty($current_language)) { |
|
358 | + $current_language = $default_language; |
|
359 | + } |
|
358 | 360 | $current_language = vtws_preserveGlobal('current_language', $current_language); |
359 | 361 | |
360 | 362 | $this->computeAccess(); |
@@ -31,8 +31,9 @@ discard block |
||
31 | 31 | $page = empty($element['page']) ? 0 : intval($element['page']); // Page to start |
32 | 32 | |
33 | 33 | $acrossAllModule = false; |
34 | - if ($moduleName == 'Home') |
|
35 | - $acrossAllModule = true; |
|
34 | + if ($moduleName == 'Home') { |
|
35 | + $acrossAllModule = true; |
|
36 | + } |
|
36 | 37 | |
37 | 38 | // Pre-condition check |
38 | 39 | if (empty($moduleName)) { |
@@ -71,8 +72,10 @@ discard block |
||
71 | 72 | |
72 | 73 | // Get most recently tracked changes with limit |
73 | 74 | $start = $page * $MAXLIMIT; |
74 | - if ($start > 0) |
|
75 | - $start = $start + 1; // Adjust the start range |
|
75 | + if ($start > 0) { |
|
76 | + $start = $start + 1; |
|
77 | + } |
|
78 | + // Adjust the start range |
|
76 | 79 | $sql .= sprintf(' ORDER BY vtiger_modtracker_basic.id DESC LIMIT %s,%s', $start, $MAXLIMIT); |
77 | 80 | |
78 | 81 | $result = $adb->pquery($sql, $params); |