Completed
Push — 1.11.x ( b5113d...148111 )
by José
54:42 queued 27:38
created
main/inc/lib/extra_field.lib.php 1 patch
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -27,19 +27,19 @@  discard block
 block discarded – undo
27 27
     );
28 28
 
29 29
     public $ops = array(
30
-        'eq' => '=',        //equal
31
-        'ne' => '<>',       //not equal
32
-        'lt' => '<',        //less than
33
-        'le' => '<=',       //less than or equal
34
-        'gt' => '>',        //greater than
35
-        'ge' => '>=',       //greater than or equal
36
-        'bw' => 'LIKE',     //begins with
30
+        'eq' => '=', //equal
31
+        'ne' => '<>', //not equal
32
+        'lt' => '<', //less than
33
+        'le' => '<=', //less than or equal
34
+        'gt' => '>', //greater than
35
+        'ge' => '>=', //greater than or equal
36
+        'bw' => 'LIKE', //begins with
37 37
         'bn' => 'NOT LIKE', //doesn't begin with
38
-        'in' => 'LIKE',     //is in
38
+        'in' => 'LIKE', //is in
39 39
         'ni' => 'NOT LIKE', //is not in
40
-        'ew' => 'LIKE',     //ends with
40
+        'ew' => 'LIKE', //ends with
41 41
         'en' => 'NOT LIKE', //doesn't end with
42
-        'cn' => 'LIKE',     //contains
42
+        'cn' => 'LIKE', //contains
43 43
         'nc' => 'NOT LIKE'  //doesn't contain
44 44
     );
45 45
 
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
      */
385 385
     public static function get_extra_fields_by_handler($handler)
386 386
     {
387
-        $types= array();
387
+        $types = array();
388 388
         $types[self::FIELD_TYPE_TEXT] = get_lang('FieldTypeText');
389 389
         $types[self::FIELD_TYPE_TEXTAREA] = get_lang('FieldTypeTextarea');
390 390
         $types[self::FIELD_TYPE_RADIO] = get_lang('FieldTypeRadio');
@@ -1072,7 +1072,7 @@  discard block
 block discarded – undo
1072 1072
                         // chzn-select doesn't work for sessions??
1073 1073
                         $form->addElement(
1074 1074
                             'select',
1075
-                            'extra_' . $field_details['variable'],
1075
+                            'extra_'.$field_details['variable'],
1076 1076
                             $field_details['display_text'],
1077 1077
                             $options,
1078 1078
                             array('id' => 'extra_'.$field_details['variable'])
@@ -1131,7 +1131,7 @@  discard block
 block discarded – undo
1131 1131
 
1132 1132
                         if (!$admin_permissions) {
1133 1133
                             if ($field_details['visible_to_self'] == 0) {
1134
-                                $form->freeze('extra_' . $field_details['variable']);
1134
+                                $form->freeze('extra_'.$field_details['variable']);
1135 1135
                             }
1136 1136
                         }
1137 1137
                         break;
@@ -1208,7 +1208,7 @@  discard block
 block discarded – undo
1208 1208
                             }
1209 1209
                         });';
1210 1210
 
1211
-                        $first_id  = null;
1211
+                        $first_id = null;
1212 1212
                         if (!empty($extraData)) {
1213 1213
                             if (isset($extraData['extra_'.$field_details['variable']])) {
1214 1214
                                 $first_id = $extraData['extra_'.$field_details['variable']]['extra_'.$field_details['variable']];
@@ -1266,7 +1266,7 @@  discard block
 block discarded – undo
1266 1266
                             <div class="form-group ">
1267 1267
                                 <div class="col-sm-12">
1268 1268
                                     <div class="panel-separator">
1269
-                                       <h4 id="' . $field_details['variable'] . '" class="form-separator">' . $field_details['display_text'] . '</h4>
1269
+                                       <h4 id="' . $field_details['variable'].'" class="form-separator">'.$field_details['display_text'].'</h4>
1270 1270
                                     </div>
1271 1271
                                 </div>
1272 1272
                             </div>    
@@ -1472,9 +1472,9 @@  discard block
 block discarded – undo
1472 1472
 
1473 1473
                         if (is_array($extraData) && array_key_exists($fieldVariable, $extraData)) {
1474 1474
 
1475
-                            if (file_exists(api_get_path(SYS_UPLOAD_PATH) . $extraData[$fieldVariable])) {
1475
+                            if (file_exists(api_get_path(SYS_UPLOAD_PATH).$extraData[$fieldVariable])) {
1476 1476
                                 $fieldTexts[] = Display::img(
1477
-                                    api_get_path(WEB_UPLOAD_PATH) . $extraData[$fieldVariable],
1477
+                                    api_get_path(WEB_UPLOAD_PATH).$extraData[$fieldVariable],
1478 1478
                                     $field_details['display_text'],
1479 1479
                                     ['width' => '300']
1480 1480
                                 );
@@ -1497,7 +1497,7 @@  discard block
 block discarded – undo
1497 1497
                         $allowed_picture_types = ['jpg', 'jpeg', 'png', 'gif'];
1498 1498
                         $form->addRule(
1499 1499
                             'extra_'.$field_details['variable'],
1500
-                            get_lang('OnlyImagesAllowed') . ' ('.implode(',', $allowed_picture_types).')',
1500
+                            get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')',
1501 1501
                             'filetype',
1502 1502
                             $allowed_picture_types
1503 1503
                         );
@@ -1539,10 +1539,10 @@  discard block
 block discarded – undo
1539 1539
                         if (is_array($extraData) &&
1540 1540
                             array_key_exists($fieldVariable, $extraData)
1541 1541
                         ) {
1542
-                            if (file_exists(api_get_path(SYS_UPLOAD_PATH) . $extraData[$fieldVariable])) {
1542
+                            if (file_exists(api_get_path(SYS_UPLOAD_PATH).$extraData[$fieldVariable])) {
1543 1543
                                 $fieldTexts[] = Display::url(
1544
-                                    api_get_path(WEB_UPLOAD_PATH) . $extraData[$fieldVariable],
1545
-                                    api_get_path(WEB_UPLOAD_PATH) . $extraData[$fieldVariable],
1544
+                                    api_get_path(WEB_UPLOAD_PATH).$extraData[$fieldVariable],
1545
+                                    api_get_path(WEB_UPLOAD_PATH).$extraData[$fieldVariable],
1546 1546
                                     array(
1547 1547
                                         'title' => $field_details['display_text'],
1548 1548
                                         'target' => '_blank'
@@ -1582,12 +1582,12 @@  discard block
 block discarded – undo
1582 1582
                             "extra_{$field_details['variable']}",
1583 1583
                             $field_details['display_text']
1584 1584
                         );
1585
-                        $form->applyFilter('extra_' . $field_details['variable'], 'stripslashes');
1585
+                        $form->applyFilter('extra_'.$field_details['variable'], 'stripslashes');
1586 1586
 
1587 1587
                         if (!$admin_permissions) {
1588 1588
                             if ($field_details['visible_to_self'] == 0) {
1589 1589
                                 $form->freeze(
1590
-                                    'extra_' . $field_details['variable']
1590
+                                    'extra_'.$field_details['variable']
1591 1591
                                 );
1592 1592
                             }
1593 1593
                         }
@@ -1598,13 +1598,13 @@  discard block
 block discarded – undo
1598 1598
                             $field_details['display_text']
1599 1599
                         );
1600 1600
                         $form->applyFilter(
1601
-                            'extra_' . $field_details['variable'],
1601
+                            'extra_'.$field_details['variable'],
1602 1602
                             'stripslashes'
1603 1603
                         );
1604 1604
                         if (!$admin_permissions) {
1605 1605
                             if ($field_details['visible_to_self'] == 0) {
1606 1606
                                 $form->freeze(
1607
-                                    'extra_' . $field_details['variable']
1607
+                                    'extra_'.$field_details['variable']
1608 1608
                                 );
1609 1609
                             }
1610 1610
                         }
@@ -1614,12 +1614,12 @@  discard block
 block discarded – undo
1614 1614
                             "extra_{$field_details['variable']}",
1615 1615
                             $field_details['display_text']
1616 1616
                         );
1617
-                        $form->applyFilter('extra_' . $field_details['variable'], 'stripslashes');
1617
+                        $form->applyFilter('extra_'.$field_details['variable'], 'stripslashes');
1618 1618
 
1619 1619
                         if (!$admin_permissions) {
1620 1620
                             if ($field_details['visible_to_self'] == 0) {
1621 1621
                                 $form->freeze(
1622
-                                    'extra_' . $field_details['variable']
1622
+                                    'extra_'.$field_details['variable']
1623 1623
                                 );
1624 1624
                             }
1625 1625
                         }
@@ -1630,13 +1630,13 @@  discard block
 block discarded – undo
1630 1630
                             $field_details['display_text']
1631 1631
                         );
1632 1632
                         $form->applyFilter(
1633
-                            'extra_' . $field_details['variable'],
1633
+                            'extra_'.$field_details['variable'],
1634 1634
                             'stripslashes'
1635 1635
                         );
1636 1636
                         if (!$admin_permissions) {
1637 1637
                             if ($field_details['visible_to_self'] == 0) {
1638 1638
                                 $form->freeze(
1639
-                                    'extra_' . $field_details['variable']
1639
+                                    'extra_'.$field_details['variable']
1640 1640
                                 );
1641 1641
                             }
1642 1642
                         }
@@ -1667,7 +1667,7 @@  discard block
 block discarded – undo
1667 1667
                                     
1668 1668
                                     if (typeof google === "object") {
1669 1669
                                         
1670
-                                        var address = "' . $dataValue . '";
1670
+                                        var address = "' . $dataValue.'";
1671 1671
                                         initializeGeo'.$field_details['variable'].'(address, false);
1672 1672
     
1673 1673
                                         $("#geolocalization_extra_'.$field_details['variable'].'").on("click", function() {
@@ -1689,7 +1689,7 @@  discard block
 block discarded – undo
1689 1689
                                         });
1690 1690
                                         
1691 1691
                                     } else {
1692
-                                        $("#map_extra_'.$field_details['variable'].'").html("<div class=\"alert alert-info\">' . get_lang('YouNeedToActivateTheGoogleMapsPluginInAdminPlatformToSeeTheMap') . '</div>");
1692
+                                        $("#map_extra_'.$field_details['variable'].'").html("<div class=\"alert alert-info\">'.get_lang('YouNeedToActivateTheGoogleMapsPluginInAdminPlatformToSeeTheMap').'</div>");
1693 1693
                                     }
1694 1694
                                     
1695 1695
                                 });
@@ -1704,7 +1704,7 @@  discard block
 block discarded – undo
1704 1704
                                         };
1705 1705
 
1706 1706
                                         var geoError = function(error) {
1707
-                                            alert("Geocode ' . get_lang('Error') . ': " + error);
1707
+                                            alert("Geocode ' . get_lang('Error').': " + error);
1708 1708
                                         };
1709 1709
 
1710 1710
                                         var geoOptions = {
@@ -1755,11 +1755,11 @@  discard block
 block discarded – undo
1755 1755
                                                         infowindow.open(map_'.$field_details['variable'].', marker);
1756 1756
                                                     });
1757 1757
                                                 } else {
1758
-                                                    alert("' . get_lang("NotFound") . '");
1758
+                                                    alert("' . get_lang("NotFound").'");
1759 1759
                                                 }
1760 1760
 
1761 1761
                                             } else {
1762
-                                                alert("Geocode ' . get_lang('Error') . ': ' . get_lang("AddressField") . ' ' . get_lang("NotFound") . '");
1762
+                                                alert("Geocode ' . get_lang('Error').': '.get_lang("AddressField").' '.get_lang("NotFound").'");
1763 1763
                                             }
1764 1764
                                         });
1765 1765
                                     }
@@ -1823,8 +1823,8 @@  discard block
 block discarded – undo
1823 1823
                                 $(document).ready(function() {
1824 1824
                                     if (typeof google === "object") {
1825 1825
                                         
1826
-                                        var lat = "' . $lat . '";
1827
-                                        var lng = "' . $lng . '";
1826
+                                        var lat = "' . $lat.'";
1827
+                                        var lng = "' . $lng.'";
1828 1828
                                         var latLng = new google.maps.LatLng(lat, lng);
1829 1829
                                         initializeGeo'.$field_details['variable'].'(false, latLng);
1830 1830
     
@@ -1849,7 +1849,7 @@  discard block
 block discarded – undo
1849 1849
                                             }
1850 1850
                                         });
1851 1851
                                     } else {
1852
-                                        $("#map_extra_'.$field_details['variable'].'").html("<div class=\"alert alert-info\">' . get_lang('YouNeedToActivateTheGoogleMapsPluginInAdminPlatformToSeeTheMap') . '</div>");
1852
+                                        $("#map_extra_'.$field_details['variable'].'").html("<div class=\"alert alert-info\">'.get_lang('YouNeedToActivateTheGoogleMapsPluginInAdminPlatformToSeeTheMap').'</div>");
1853 1853
                                     }
1854 1854
                                     
1855 1855
                                 });
@@ -1864,7 +1864,7 @@  discard block
 block discarded – undo
1864 1864
                                         };
1865 1865
 
1866 1866
                                         var geoError = function(error) {
1867
-                                            alert("Geocode ' . get_lang('Error') . ': " + error);
1867
+                                            alert("Geocode ' . get_lang('Error').': " + error);
1868 1868
                                         };
1869 1869
 
1870 1870
                                         var geoOptions = {
@@ -1915,11 +1915,11 @@  discard block
 block discarded – undo
1915 1915
                                                         infowindow.open(map_'.$field_details['variable'].', marker);
1916 1916
                                                     });
1917 1917
                                                 } else {
1918
-                                                    alert("' . get_lang("NotFound") . '");
1918
+                                                    alert("' . get_lang("NotFound").'");
1919 1919
                                                 }
1920 1920
 
1921 1921
                                             } else {
1922
-                                                alert("Geocode ' . get_lang('Error') . ': " + status);
1922
+                                                alert("Geocode ' . get_lang('Error').': " + status);
1923 1923
                                             }
1924 1924
                                         });
1925 1925
                                     }
@@ -2115,7 +2115,7 @@  discard block
 block discarded – undo
2115 2115
         $form->addElement('header', $header);
2116 2116
 
2117 2117
         if ($action == 'edit') {
2118
-            $translateUrl = api_get_path(WEB_CODE_PATH) . 'extrafield/translate.php?' . http_build_query([
2118
+            $translateUrl = api_get_path(WEB_CODE_PATH).'extrafield/translate.php?'.http_build_query([
2119 2119
                 'extra_field' => $id
2120 2120
             ]);
2121 2121
             $translateButton = Display::toolbarButton(get_lang('TranslateThisTerm'), $translateUrl, 'language', 'link');
@@ -2452,7 +2452,7 @@  discard block
 block discarded – undo
2452 2452
                 foreach ($extra_fields as $extra_info) {
2453 2453
                     $extra_field_info = $extra_info['extra_field_info'];
2454 2454
                     $inject_joins .= " INNER JOIN $this->table_field_values fv$counter
2455
-                                       ON (s." . $this->primaryKey . " = fv$counter." . $this->handler_id . ") ";
2455
+                                       ON (s.".$this->primaryKey." = fv$counter.".$this->handler_id.") ";
2456 2456
                     // Add options
2457 2457
                     if (isset($extra_field_info['field_type']) && in_array(
2458 2458
                             $extra_field_info['field_type'],
@@ -2465,7 +2465,7 @@  discard block
 block discarded – undo
2465 2465
                     ) {
2466 2466
                         $options['where'] = str_replace(
2467 2467
                             $extra_info['field'],
2468
-                            'fv' . $counter . '.field_id = ' . $extra_info['id'] . ' AND fvo' . $counter . '.option_value',
2468
+                            'fv'.$counter.'.field_id = '.$extra_info['id'].' AND fvo'.$counter.'.option_value',
2469 2469
                             $options['where']
2470 2470
                         );
2471 2471
                         $inject_joins .= "
@@ -2480,13 +2480,13 @@  discard block
 block discarded – undo
2480 2480
                     ) {
2481 2481
                         $options['where'] = str_replace(
2482 2482
                             $extra_info['field'],
2483
-                            'tag' . $counter . '.tag ',
2483
+                            'tag'.$counter.'.tag ',
2484 2484
                             $options['where']
2485 2485
                         );
2486 2486
 
2487 2487
                         $inject_joins .= "
2488 2488
                             INNER JOIN $this->table_field_rel_tag tag_rel$counter
2489
-                            ON (tag_rel$counter.field_id = ".$extra_info['id']." AND tag_rel$counter.item_id = s." . $this->primaryKey.")
2489
+                            ON (tag_rel$counter.field_id = ".$extra_info['id']." AND tag_rel$counter.item_id = s.".$this->primaryKey.")
2490 2490
                             INNER JOIN $this->table_field_tag tag$counter
2491 2491
                             ON (tag$counter.id =  tag_rel$counter.tag_id)
2492 2492
                         ";
@@ -2692,19 +2692,19 @@  discard block
 block discarded – undo
2692 2692
                         break;
2693 2693
                     }
2694 2694
 
2695
-                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH) . $valueData['value'])) {
2695
+                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH).$valueData['value'])) {
2696 2696
                         break;
2697 2697
                     }
2698 2698
 
2699 2699
                     $image = Display::img(
2700
-                        api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
2700
+                        api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
2701 2701
                         $field['display_text'],
2702 2702
                         array('width' => '300')
2703 2703
                     );
2704 2704
 
2705 2705
                     $displayedValue = Display::url(
2706 2706
                         $image,
2707
-                        api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
2707
+                        api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
2708 2708
                         array('target' => '_blank')
2709 2709
                     );
2710 2710
                     break;
@@ -2713,13 +2713,13 @@  discard block
 block discarded – undo
2713 2713
                         break;
2714 2714
                     }
2715 2715
 
2716
-                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH) . $valueData['value'])) {
2716
+                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH).$valueData['value'])) {
2717 2717
                         break;
2718 2718
                     }
2719 2719
 
2720 2720
                     $displayedValue = Display::url(
2721 2721
                         get_lang('Download'),
2722
-                        api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
2722
+                        api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
2723 2723
                         array(
2724 2724
                             'title' => $field['display_text'],
2725 2725
                             'target' => '_blank'
Please login to merge, or discard this patch.