Completed
Pull Request — master (#1795)
by Christian
16:22 queued 04:43
created
drupal/sites/all/libraries/phpmailer/class.pop3.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -276,11 +276,11 @@
 block discarded – undo
276 276
         }
277 277
 
278 278
         // Send the Username
279
-        $this->sendString("USER $username" . self::CRLF);
279
+        $this->sendString("USER $username".self::CRLF);
280 280
         $pop3_response = $this->getResponse();
281 281
         if ($this->checkResponse($pop3_response)) {
282 282
             // Send the Password
283
-            $this->sendString("PASS $password" . self::CRLF);
283
+            $this->sendString("PASS $password".self::CRLF);
284 284
             $pop3_response = $this->getResponse();
285 285
             if ($this->checkResponse($pop3_response)) {
286 286
                 return true;
Please login to merge, or discard this patch.
drupal/sites/all/libraries/phpmailer/class.phpmaileroauth.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@
 block discarded – undo
141 141
             if ($tport > 0 and $tport < 65536) {
142 142
                 $port = $tport;
143 143
             }
144
-            if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) {
144
+            if ($this->smtp->connect($prefix.$host, $port, $this->Timeout, $options)) {
145 145
                 try {
146 146
                     if ($this->Helo) {
147 147
                         $hello = $this->Helo;
Please login to merge, or discard this patch.
drupal/sites/all/libraries/phpmailer/language/phpmailer.lang-ar.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
 $PHPMAILER_LANG['invalid_address']      = 'الإرسال غير ممكن لأن عنوان البريد الإلكتروني غير صالح: ';
19 19
 $PHPMAILER_LANG['mailer_not_supported'] = ' برنامج الإرسال غير مدعوم.';
20 20
 $PHPMAILER_LANG['provide_address']      = 'يجب توفير عنوان البريد الإلكتروني لمستلم واحد على الأقل.';
21
-$PHPMAILER_LANG['recipients_failed']    = 'خطأ SMTP: الأخطاء التالية ' .
21
+$PHPMAILER_LANG['recipients_failed']    = 'خطأ SMTP: الأخطاء التالية '.
22 22
                                           'فشل في الارسال لكل من : ';
23 23
 $PHPMAILER_LANG['signing']              = 'خطأ في التوقيع: ';
24 24
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() غير ممكن.';
Please login to merge, or discard this patch.
drupal/sites/all/libraries/phpmailer/extras/EasyPeasyICS.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -52,11 +52,11 @@  discard block
 block discarded – undo
52 52
     public function addEvent($start, $end, $summary = '', $description = '', $url = '', $uid = '')
53 53
     {
54 54
         if (empty($uid)) {
55
-            $uid = md5(uniqid(mt_rand(), true)) . '@EasyPeasyICS';
55
+            $uid = md5(uniqid(mt_rand(), true)).'@EasyPeasyICS';
56 56
         }
57 57
         $event = array(
58
-            'start' => gmdate('Ymd', $start) . 'T' . gmdate('His', $start) . 'Z',
59
-            'end' => gmdate('Ymd', $end) . 'T' . gmdate('His', $end) . 'Z',
58
+            'start' => gmdate('Ymd', $start).'T'.gmdate('His', $start).'Z',
59
+            'end' => gmdate('Ymd', $end).'T'.gmdate('His', $end).'Z',
60 60
             'summary' => $summary,
61 61
             'description' => $description,
62 62
             'url' => $url,
@@ -111,20 +111,20 @@  discard block
 block discarded – undo
111 111
         $ics = 'BEGIN:VCALENDAR
112 112
 METHOD:PUBLISH
113 113
 VERSION:2.0
114
-X-WR-CALNAME:' . $this->calendarName . '
114
+X-WR-CALNAME:' . $this->calendarName.'
115 115
 PRODID:-//hacksw/handcal//NONSGML v1.0//EN';
116 116
 
117 117
         //Add events
118 118
         foreach ($this->events as $event) {
119 119
             $ics .= '
120 120
 BEGIN:VEVENT
121
-UID:' . $event['uid'] . '
122
-DTSTAMP:' . gmdate('Ymd') . 'T' . gmdate('His') . 'Z
123
-DTSTART:' . $event['start'] . '
124
-DTEND:' . $event['end'] . '
125
-SUMMARY:' . str_replace("\n", "\\n", $event['summary']) . '
126
-DESCRIPTION:' . str_replace("\n", "\\n", $event['description']) . '
127
-URL;VALUE=URI:' . $event['url'] . '
121
+UID:' . $event['uid'].'
122
+DTSTAMP:' . gmdate('Ymd').'T'.gmdate('His').'Z
123
+DTSTART:' . $event['start'].'
124
+DTEND:' . $event['end'].'
125
+SUMMARY:' . str_replace("\n", "\\n", $event['summary']).'
126
+DESCRIPTION:' . str_replace("\n", "\\n", $event['description']).'
127
+URL;VALUE=URI:' . $event['url'].'
128 128
 END:VEVENT';
129 129
         }
130 130
 
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
                 $filename = '"'.$filename.'"';
141 141
             }
142 142
             header('Content-type: text/calendar; charset=utf-8');
143
-            header('Content-Disposition: inline; filename=' . $filename . '.ics');
143
+            header('Content-Disposition: inline; filename='.$filename.'.ics');
144 144
             echo $ics;
145 145
         }
146 146
         return $ics;
Please login to merge, or discard this patch.
drupal/sites/all/libraries/phpmailer/extras/ntlm_sasl_client.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
                 "mcrypt_encrypt" => "mcrypt",
28 28
                 "mhash" => "mhash"
29 29
             );
30
-            $client->error = "the extension " . $extensions[$function] .
30
+            $client->error = "the extension ".$extensions[$function].
31 31
                 " required by the NTLM SASL client class is not available in this PHP configuration";
32 32
             return (0);
33 33
         }
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
     public function ASCIIToUnicode($ascii)
38 38
     {
39 39
         for ($unicode = "", $a = 0; $a < strlen($ascii); $a++) {
40
-            $unicode .= substr($ascii, $a, 1) . chr(0);
40
+            $unicode .= substr($ascii, $a, 1).chr(0);
41 41
         }
42 42
         return ($unicode);
43 43
     }
@@ -49,16 +49,16 @@  discard block
 block discarded – undo
49 49
         $workstation_offset = 32;
50 50
         $domain_offset = $workstation_offset + $workstation_length;
51 51
         return (
52
-            "NTLMSSP\0" .
53
-            "\x01\x00\x00\x00" .
54
-            "\x07\x32\x00\x00" .
55
-            pack("v", $domain_length) .
56
-            pack("v", $domain_length) .
57
-            pack("V", $domain_offset) .
58
-            pack("v", $workstation_length) .
59
-            pack("v", $workstation_length) .
60
-            pack("V", $workstation_offset) .
61
-            $workstation .
52
+            "NTLMSSP\0".
53
+            "\x01\x00\x00\x00".
54
+            "\x07\x32\x00\x00".
55
+            pack("v", $domain_length).
56
+            pack("v", $domain_length).
57
+            pack("V", $domain_offset).
58
+            pack("v", $workstation_length).
59
+            pack("v", $workstation_length).
60
+            pack("V", $workstation_offset).
61
+            $workstation.
62 62
             $domain
63 63
         );
64 64
     }
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
     {
68 68
         $unicode = $this->ASCIIToUnicode($password);
69 69
         $md4 = mhash(MHASH_MD4, $unicode);
70
-        $padded = $md4 . str_repeat(chr(0), 21 - strlen($md4));
70
+        $padded = $md4.str_repeat(chr(0), 21 - strlen($md4));
71 71
         $iv_size = mcrypt_get_iv_size(MCRYPT_DES, MCRYPT_MODE_ECB);
72 72
         $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
73 73
         for ($response = "", $third = 0; $third < 21; $third += 7) {
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
             }
77 77
             for ($key = "", $p = 0; $p < strlen($packed); $p += 7) {
78 78
                 $s = substr($packed, $p, 7);
79
-                $b = $s . ((substr_count($s, "1") % 2) ? "0" : "1");
79
+                $b = $s.((substr_count($s, "1")%2) ? "0" : "1");
80 80
                 $key .= chr(bindec($b));
81 81
             }
82 82
             $ciphertext = mcrypt_encrypt(MCRYPT_DES, $key, $challenge, MCRYPT_MODE_ECB, $iv);
@@ -106,31 +106,31 @@  discard block
 block discarded – undo
106 106
         $session_length = strlen($session);
107 107
         $session_offset = $ntlm_offset + $ntlm_length;
108 108
         return (
109
-            "NTLMSSP\0" .
110
-            "\x03\x00\x00\x00" .
111
-            pack("v", $lm_length) .
112
-            pack("v", $lm_length) .
113
-            pack("V", $lm_offset) .
114
-            pack("v", $ntlm_length) .
115
-            pack("v", $ntlm_length) .
116
-            pack("V", $ntlm_offset) .
117
-            pack("v", $domain_length) .
118
-            pack("v", $domain_length) .
119
-            pack("V", $domain_offset) .
120
-            pack("v", $user_length) .
121
-            pack("v", $user_length) .
122
-            pack("V", $user_offset) .
123
-            pack("v", $workstation_length) .
124
-            pack("v", $workstation_length) .
125
-            pack("V", $workstation_offset) .
126
-            pack("v", $session_length) .
127
-            pack("v", $session_length) .
128
-            pack("V", $session_offset) .
129
-            "\x01\x02\x00\x00" .
130
-            $domain_unicode .
131
-            $user_unicode .
132
-            $workstation_unicode .
133
-            $lm .
109
+            "NTLMSSP\0".
110
+            "\x03\x00\x00\x00".
111
+            pack("v", $lm_length).
112
+            pack("v", $lm_length).
113
+            pack("V", $lm_offset).
114
+            pack("v", $ntlm_length).
115
+            pack("v", $ntlm_length).
116
+            pack("V", $ntlm_offset).
117
+            pack("v", $domain_length).
118
+            pack("v", $domain_length).
119
+            pack("V", $domain_offset).
120
+            pack("v", $user_length).
121
+            pack("v", $user_length).
122
+            pack("V", $user_offset).
123
+            pack("v", $workstation_length).
124
+            pack("v", $workstation_length).
125
+            pack("V", $workstation_offset).
126
+            pack("v", $session_length).
127
+            pack("v", $session_length).
128
+            pack("V", $session_offset).
129
+            "\x01\x02\x00\x00".
130
+            $domain_unicode.
131
+            $user_unicode.
132
+            $workstation_unicode.
133
+            $lm.
134 134
             $ntlm
135 135
         );
136 136
     }
Please login to merge, or discard this patch.
drupal/sites/all/libraries/phpmailer/extras/htmlfilter.php 1 patch
Spacing   +48 added lines, -48 removed lines patch added patch discarded remove patch
@@ -41,15 +41,15 @@  discard block
 block discarded – undo
41 41
 function tln_tagprint($tagname, $attary, $tagtype)
42 42
 {
43 43
     if ($tagtype == 2) {
44
-        $fulltag = '</' . $tagname . '>';
44
+        $fulltag = '</'.$tagname.'>';
45 45
     } else {
46
-        $fulltag = '<' . $tagname;
46
+        $fulltag = '<'.$tagname;
47 47
         if (is_array($attary) && sizeof($attary)) {
48 48
             $atts = array();
49 49
             while (list($attname, $attvalue) = each($attary)) {
50 50
                 array_push($atts, "$attname=$attvalue");
51 51
             }
52
-            $fulltag .= ' ' . join(' ', $atts);
52
+            $fulltag .= ' '.join(' ', $atts);
53 53
         }
54 54
         if ($tagtype == 3) {
55 55
             $fulltag .= ' /';
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 {
129 129
     $matches = array();
130 130
     $retarr = array();
131
-    $preg_rule = '%^(.*?)(' . $reg . ')%s';
131
+    $preg_rule = '%^(.*?)('.$reg.')%s';
132 132
     preg_match($preg_rule, substr($body, $offset), $matches);
133 133
     if (!isset($matches[0]) || !$matches[0]) {
134 134
         $retarr = false;
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
                     }
383 383
                     list($pos, $attval, $match) = $regary;
384 384
                     $pos++;
385
-                    $attary{$attname} = '\'' . $attval . '\'';
385
+                    $attary{$attname} = '\''.$attval.'\'';
386 386
                 } elseif ($quot == '"') {
387 387
                     $regary = tln_findnxreg($body, $pos + 1, '\"');
388 388
                     if ($regary == false) {
@@ -390,7 +390,7 @@  discard block
 block discarded – undo
390 390
                     }
391 391
                     list($pos, $attval, $match) = $regary;
392 392
                     $pos++;
393
-                            $attary{$attname} = '"' . $attval . '"';
393
+                            $attary{$attname} = '"'.$attval.'"';
394 394
                 } else {
395 395
                     /**
396 396
                      * These are hateful. Look for \s, or >.
@@ -404,7 +404,7 @@  discard block
 block discarded – undo
404 404
                      * If it's ">" it will be caught at the top.
405 405
                      */
406 406
                     $attval = preg_replace('/\"/s', '&quot;', $attval);
407
-                    $attary{$attname} = '"' . $attval . '"';
407
+                    $attary{$attname} = '"'.$attval.'"';
408 408
                 }
409 409
             } elseif (preg_match('|[\w/>]|', $char)) {
410 410
                 /**
@@ -576,7 +576,7 @@  discard block
 block discarded – undo
576 576
             }
577 577
             preg_match_all("/url\s*\((.+)\)/si", $attvalue, $aMatch);
578 578
             if (count($aMatch)) {
579
-                foreach($aMatch[1] as $sMatch) {
579
+                foreach ($aMatch[1] as $sMatch) {
580 580
                     $urlvalue = $sMatch;
581 581
                     tln_fixurl($attname, $urlvalue, $trans_image_path, $block_external_images);
582 582
                     $attary{$attname} = str_replace($sMatch, $urlvalue, $attvalue);
@@ -599,10 +599,10 @@  discard block
 block discarded – undo
599 599
 {
600 600
     $sQuote = '"';
601 601
     $attvalue = trim($attvalue);
602
-    if ($attvalue && ($attvalue[0] =='"'|| $attvalue[0] == "'")) {
602
+    if ($attvalue && ($attvalue[0] == '"' || $attvalue[0] == "'")) {
603 603
         // remove the double quotes
604 604
         $sQuote = $attvalue[0];
605
-        $attvalue = trim(substr($attvalue,1,-1));
605
+        $attvalue = trim(substr($attvalue, 1, -1));
606 606
     }
607 607
 
608 608
     /**
@@ -612,51 +612,51 @@  discard block
 block discarded – undo
612 612
      * IE from being kicked off when src for img tags are not set
613 613
      */
614 614
     if ($attvalue == '') {
615
-        $attvalue = $sQuote . $trans_image_path . $sQuote;
615
+        $attvalue = $sQuote.$trans_image_path.$sQuote;
616 616
     } else {
617 617
         // first, disallow 8 bit characters and control characters
618
-        if (preg_match('/[\0-\37\200-\377]+/',$attvalue)) {
618
+        if (preg_match('/[\0-\37\200-\377]+/', $attvalue)) {
619 619
             switch ($attname) {
620 620
                 case 'href':
621
-                    $attvalue = $sQuote . 'http://invalid-stuff-detected.example.com' . $sQuote;
621
+                    $attvalue = $sQuote.'http://invalid-stuff-detected.example.com'.$sQuote;
622 622
                     break;
623 623
                 default:
624
-                    $attvalue = $sQuote . $trans_image_path . $sQuote;
624
+                    $attvalue = $sQuote.$trans_image_path.$sQuote;
625 625
                     break;
626 626
             }
627 627
         } else {
628 628
             $aUrl = parse_url($attvalue);
629 629
             if (isset($aUrl['scheme'])) {
630
-                switch(strtolower($aUrl['scheme'])) {
630
+                switch (strtolower($aUrl['scheme'])) {
631 631
                     case 'mailto':
632 632
                     case 'http':
633 633
                     case 'https':
634 634
                     case 'ftp':
635 635
                         if ($attname != 'href') {
636 636
                             if ($block_external_images == true) {
637
-                                $attvalue = $sQuote . $trans_image_path . $sQuote;
637
+                                $attvalue = $sQuote.$trans_image_path.$sQuote;
638 638
                             } else {
639 639
                                 if (!isset($aUrl['path'])) {
640
-                                    $attvalue = $sQuote . $trans_image_path . $sQuote;
640
+                                    $attvalue = $sQuote.$trans_image_path.$sQuote;
641 641
                                 }
642 642
                             }
643 643
                         } else {
644
-                            $attvalue = $sQuote . $attvalue . $sQuote;
644
+                            $attvalue = $sQuote.$attvalue.$sQuote;
645 645
                         }
646 646
                         break;
647 647
                     case 'outbind':
648
-                        $attvalue = $sQuote . $attvalue . $sQuote;
648
+                        $attvalue = $sQuote.$attvalue.$sQuote;
649 649
                         break;
650 650
                     case 'cid':
651
-                        $attvalue = $sQuote . $attvalue . $sQuote;
651
+                        $attvalue = $sQuote.$attvalue.$sQuote;
652 652
                         break;
653 653
                     default:
654
-                        $attvalue = $sQuote . $trans_image_path . $sQuote;
654
+                        $attvalue = $sQuote.$trans_image_path.$sQuote;
655 655
                         break;
656 656
                 }
657 657
             } else {
658 658
                 if (!isset($aUrl['path']) || $aUrl['path'] != $trans_image_path) {
659
-                    $$attvalue = $sQuote . $trans_image_path . $sQuote;
659
+                    $$attvalue = $sQuote.$trans_image_path.$sQuote;
660 660
                 }
661 661
             }
662 662
         }
@@ -670,7 +670,7 @@  discard block
 block discarded – undo
670 670
     $sToken = '';
671 671
     $bSucces = false;
672 672
     $bEndTag = false;
673
-    for ($i=$pos,$iCount=strlen($body);$i<$iCount;++$i) {
673
+    for ($i = $pos, $iCount = strlen($body); $i < $iCount; ++$i) {
674 674
         $char = $body{$i};
675 675
         switch ($char) {
676 676
             case '<':
@@ -687,7 +687,7 @@  discard block
 block discarded – undo
687 687
             case '>':
688 688
                  if ($bEndTag) {
689 689
                     $sToken .= $char;
690
-                    if (preg_match('/\<\/\s*style\s*\>/i',$sToken,$aMatch)) {
690
+                    if (preg_match('/\<\/\s*style\s*\>/i', $sToken, $aMatch)) {
691 691
                         $newpos = $i + 1;
692 692
                         $bSucces = true;
693 693
                         break 2;
@@ -702,8 +702,8 @@  discard block
 block discarded – undo
702 702
             case '!':
703 703
                 if ($sToken == '<') {
704 704
                     // possible comment
705
-                    if (isset($body{$i+2}) && substr($body,$i,3) == '!--') {
706
-                        $i = strpos($body,'-->',$i+3);
705
+                    if (isset($body{$i + 2}) && substr($body, $i, 3) == '!--') {
706
+                        $i = strpos($body, '-->', $i + 3);
707 707
                         if ($i === false) { // no end comment
708 708
                             $i = strlen($body);
709 709
                         }
@@ -722,7 +722,7 @@  discard block
 block discarded – undo
722 722
                 break;
723 723
         }
724 724
     }
725
-    if ($bSucces == FALSE){
725
+    if ($bSucces == FALSE) {
726 726
         return array(FALSE, strlen($body));
727 727
     }
728 728
 
@@ -743,26 +743,26 @@  discard block
 block discarded – undo
743 743
     //                           "url(\\1$trans_image_path\\2)", $content);
744 744
 
745 745
     // first check for 8bit sequences and disallowed control characters
746
-    if (preg_match('/[\16-\37\200-\377]+/',$content)) {
746
+    if (preg_match('/[\16-\37\200-\377]+/', $content)) {
747 747
         $content = '<!-- style block removed by html filter due to presence of 8bit characters -->';
748 748
         return array($content, $newpos);
749 749
     }
750 750
 
751 751
     // remove @import line
752
-    $content = preg_replace("/^\s*(@import.*)$/mi","\n<!-- @import rules forbidden -->\n",$content);
752
+    $content = preg_replace("/^\s*(@import.*)$/mi", "\n<!-- @import rules forbidden -->\n", $content);
753 753
 
754 754
     $content = preg_replace("/(\\\\)?u(\\\\)?r(\\\\)?l(\\\\)?/i", 'url', $content);
755
-    preg_match_all("/url\s*\((.+)\)/si",$content,$aMatch);
755
+    preg_match_all("/url\s*\((.+)\)/si", $content, $aMatch);
756 756
     if (count($aMatch)) {
757 757
         $aValue = $aReplace = array();
758
-        foreach($aMatch[1] as $sMatch) {
758
+        foreach ($aMatch[1] as $sMatch) {
759 759
             // url value
760 760
             $urlvalue = $sMatch;
761
-            tln_fixurl('style',$urlvalue, $trans_image_path, $block_external_images);
761
+            tln_fixurl('style', $urlvalue, $trans_image_path, $block_external_images);
762 762
             $aValue[] = $sMatch;
763 763
             $aReplace[] = $urlvalue;
764 764
         }
765
-        $content = str_replace($aValue,$aReplace,$content);
765
+        $content = str_replace($aValue, $aReplace, $content);
766 766
     }
767 767
 
768 768
     /**
@@ -772,7 +772,7 @@  discard block
 block discarded – undo
772 772
     tln_defang($contentTemp);
773 773
     tln_unspace($contentTemp);
774 774
 
775
-    $match   = Array('/\/\*.*\*\//',
775
+    $match = Array('/\/\*.*\*\//',
776 776
                     '/expression/i',
777 777
                     '/behaviou*r/i',
778 778
                     '/binding/i',
@@ -780,7 +780,7 @@  discard block
 block discarded – undo
780 780
                     '/javascript/i',
781 781
                     '/script/i',
782 782
                     '/position/i');
783
-    $replace = Array('','idiocy', 'idiocy', 'idiocy', 'idiocy', 'idiocy', 'idiocy', '');
783
+    $replace = Array('', 'idiocy', 'idiocy', 'idiocy', 'idiocy', 'idiocy', 'idiocy', '');
784 784
     $contentNew = preg_replace($match, $replace, $contentTemp);
785 785
     if ($contentNew !== $contentTemp) {
786 786
         $content = $contentNew;
@@ -794,11 +794,11 @@  discard block
 block discarded – undo
794 794
     $text = '#000000';
795 795
     $has_bgc_stl = $has_txt_stl = false;
796 796
     $styledef = '';
797
-    if (is_array($attary) && sizeof($attary) > 0){
798
-        foreach ($attary as $attname=>$attvalue){
797
+    if (is_array($attary) && sizeof($attary) > 0) {
798
+        foreach ($attary as $attname=>$attvalue) {
799 799
             $quotchar = substr($attvalue, 0, 1);
800 800
             $attvalue = str_replace($quotchar, "", $attvalue);
801
-            switch ($attname){
801
+            switch ($attname) {
802 802
                 case 'background':
803 803
                     $styledef .= "background-image: url('$trans_image_path'); ";
804 804
                     break;
@@ -817,7 +817,7 @@  discard block
 block discarded – undo
817 817
         if ($has_bgc_stl && !$has_txt_stl) {
818 818
             $styledef .= "color: $text; ";
819 819
         }
820
-        if (strlen($styledef) > 0){
820
+        if (strlen($styledef) > 0) {
821 821
             $divattary{"style"} = "\"$styledef\"";
822 822
         }
823 823
     }
@@ -874,15 +874,15 @@  discard block
 block discarded – undo
874 874
     $body = preg_replace('/&(\{.*?\};)/si', '&amp;\\1', $body);
875 875
     while (($curtag = tln_getnxtag($body, $curpos)) != false) {
876 876
         list($tagname, $attary, $tagtype, $lt, $gt) = $curtag;
877
-        $free_content = substr($body, $curpos, $lt-$curpos);
877
+        $free_content = substr($body, $curpos, $lt - $curpos);
878 878
         /**
879 879
          * Take care of <style>
880 880
          */
881
-        if ($tagname == "style" && $tagtype == 1){
881
+        if ($tagname == "style" && $tagtype == 1) {
882 882
             list($free_content, $curpos) =
883
-                tln_fixstyle($body, $gt+1, $trans_image_path, $block_external_images);
884
-            if ($free_content != FALSE){
885
-                if ( !empty($attary) ) {
883
+                tln_fixstyle($body, $gt + 1, $trans_image_path, $block_external_images);
884
+            if ($free_content != FALSE) {
885
+                if (!empty($attary)) {
886 886
                     $attary = tln_fixatts($tagname,
887 887
                                          $attary,
888 888
                                          $rm_attnames,
@@ -898,7 +898,7 @@  discard block
 block discarded – undo
898 898
             }
899 899
             continue;
900 900
         }
901
-        if ($skip_content == false){
901
+        if ($skip_content == false) {
902 902
             $trusted .= $free_content;
903 903
         }
904 904
         if ($tagname != false) {
@@ -956,7 +956,7 @@  discard block
 block discarded – undo
956 956
                             /**
957 957
                              * Convert body into div.
958 958
                              */
959
-                            if ($tagname == "body"){
959
+                            if ($tagname == "body") {
960 960
                                 $tagname = "div";
961 961
                                 $attary = tln_body2div($attary, $trans_image_path);
962 962
                             }
@@ -995,7 +995,7 @@  discard block
 block discarded – undo
995 995
     if ($force_tag_closing == true) {
996 996
         foreach ($open_tags as $tagname => $opentimes) {
997 997
             while ($opentimes > 0) {
998
-                $trusted .= '</' . $tagname . '>';
998
+                $trusted .= '</'.$tagname.'>';
999 999
                 $opentimes--;
1000 1000
             }
1001 1001
         }
@@ -1037,7 +1037,7 @@  discard block
 block discarded – undo
1037 1037
         "xml"
1038 1038
     );
1039 1039
 
1040
-    $self_closing_tags =  array(
1040
+    $self_closing_tags = array(
1041 1041
         "img",
1042 1042
         "br",
1043 1043
         "hr",
Please login to merge, or discard this patch.
drupal/sites/all/libraries/phpmailer/get_oauth_token.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 session_start();
26 26
 
27 27
 //If this automatic URL doesn't work, set it yourself manually
28
-$redirectUri = isset($_SERVER['HTTPS']) ? 'https://' : 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];
28
+$redirectUri = isset($_SERVER['HTTPS']) ? 'https://' : 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'];
29 29
 //$redirectUri = 'http://localhost/phpmailer/get_oauth_token.php';
30 30
 
31 31
 //These details obtained are by setting up app in Google developer console.
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
     // If we don't have an authorization code then get one
143 143
     $authUrl = $provider->getAuthorizationUrl();
144 144
     $_SESSION['oauth2state'] = $provider->getState();
145
-    header('Location: ' . $authUrl);
145
+    header('Location: '.$authUrl);
146 146
     exit;
147 147
 // Check given state against previously stored one to mitigate CSRF attack
148 148
 } elseif (empty($_GET['state']) || ($_GET['state'] !== $_SESSION['oauth2state'])) {
@@ -158,5 +158,5 @@  discard block
 block discarded – undo
158 158
     );
159 159
 
160 160
     // Use this to get a new access token if the old one expires
161
-    echo 'Refresh Token: ' . $token->getRefreshToken();
161
+    echo 'Refresh Token: '.$token->getRefreshToken();
162 162
 }
Please login to merge, or discard this patch.
drupal/sites/all/themes/zen/zen-internals/template.conditional-styles.inc 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
       // Render the stylesheets to link elements.
65 65
       $conditional_styles = $conditional_styles_rtl = '';
66 66
       if (!empty($stylesheets)) {
67
-        $query_string = '?'. substr(variable_get('css_js_query_string', '0'), 0, 1);
67
+        $query_string = '?'.substr(variable_get('css_js_query_string', '0'), 0, 1);
68 68
         $base_path = base_path();
69 69
         foreach ($stylesheets AS $condition => $css) {
70 70
           // Each condition requires its own set of links.
@@ -92,17 +92,17 @@  discard block
 block discarded – undo
92 92
       // Save the stylesheets for later retrieval.
93 93
       if ($conditional_styles) {
94 94
         if (db_is_active()) {
95
-          variable_set('conditional_styles_' . $theme, $conditional_styles);
96
-          variable_set('conditional_styles_' . $theme . '_rtl', $conditional_styles_rtl);
95
+          variable_set('conditional_styles_'.$theme, $conditional_styles);
96
+          variable_set('conditional_styles_'.$theme.'_rtl', $conditional_styles_rtl);
97 97
         }
98 98
         else {
99
-          $GLOBALS['conf']['conditional_styles_' . $theme] = $conditional_styles;
100
-          $GLOBALS['conf']['conditional_styles_' . $theme . '_rtl'] = $conditional_styles_rtl;
99
+          $GLOBALS['conf']['conditional_styles_'.$theme] = $conditional_styles;
100
+          $GLOBALS['conf']['conditional_styles_'.$theme.'_rtl'] = $conditional_styles_rtl;
101 101
         }
102 102
       }
103 103
       elseif (db_is_active()) {
104
-        variable_del('conditional_styles_' . $theme);
105
-        variable_del('conditional_styles_' . $theme . '_rtl');
104
+        variable_del('conditional_styles_'.$theme);
105
+        variable_del('conditional_styles_'.$theme.'_rtl');
106 106
       }
107 107
     }
108 108
   }
Please login to merge, or discard this patch.
drupal/sites/all/themes/zen/zen-internals/template.block-editing.inc 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 
18 18
   // Display 'edit block' for custom blocks.
19 19
   if ($block->module == 'block') {
20
-    $vars['edit_links_array']['block-edit'] = l('<span>' . t('edit block') . '</span>', 'admin/build/block/configure/' . $block->module . '/' . $block->delta,
20
+    $vars['edit_links_array']['block-edit'] = l('<span>'.t('edit block').'</span>', 'admin/build/block/configure/'.$block->module.'/'.$block->delta,
21 21
       array(
22 22
         'attributes' => array(
23 23
           'title' => t('edit the content of this block'),
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
   }
31 31
   // Display 'configure' for other blocks.
32 32
   else {
33
-    $vars['edit_links_array']['block-config'] = l('<span>' . t('configure') . '</span>', 'admin/build/block/configure/' . $block->module . '/' . $block->delta,
33
+    $vars['edit_links_array']['block-config'] = l('<span>'.t('configure').'</span>', 'admin/build/block/configure/'.$block->module.'/'.$block->delta,
34 34
       array(
35 35
         'attributes' => array(
36 36
           'title' => t('configure this block'),
@@ -45,14 +45,14 @@  discard block
 block discarded – undo
45 45
   // Display 'edit view' for Views blocks.
46 46
   if ($block->module == 'views' && user_access('administer views')) {
47 47
     list($view_name, $view_block) = explode('-block', $block->delta);
48
-    $vars['edit_links_array']['block-edit-view'] = l('<span>' . t('edit view') . '</span>', 'admin/build/views/edit/' . $view_name,
48
+    $vars['edit_links_array']['block-edit-view'] = l('<span>'.t('edit view').'</span>', 'admin/build/views/edit/'.$view_name,
49 49
       array(
50 50
         'attributes' => array(
51 51
           'title' => t('edit the view that defines this block'),
52 52
           'class' => 'block-edit-view',
53 53
         ),
54 54
         'query' => drupal_get_destination(),
55
-        'fragment' => 'views-tab-block' . $view_block,
55
+        'fragment' => 'views-tab-block'.$view_block,
56 56
         'html' => TRUE,
57 57
       )
58 58
     );
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
   // Display 'edit menu' for Menu blocks.
61 61
   elseif (($block->module == 'menu' || ($block->module == 'user' && $block->delta == 1)) && user_access('administer menu')) {
62 62
     $menu_name = ($block->module == 'user') ? 'navigation' : $block->delta;
63
-    $vars['edit_links_array']['block-edit-menu'] = l('<span>' . t('edit menu') . '</span>', 'admin/build/menu-customize/' . $menu_name,
63
+    $vars['edit_links_array']['block-edit-menu'] = l('<span>'.t('edit menu').'</span>', 'admin/build/menu-customize/'.$menu_name,
64 64
       array(
65 65
         'attributes' => array(
66 66
           'title' => t('edit the menu that defines this block'),
@@ -73,8 +73,8 @@  discard block
 block discarded – undo
73 73
   }
74 74
   // Display 'edit menu' for Menu block blocks.
75 75
   elseif ($block->module == 'menu_block' && user_access('administer menu')) {
76
-    list($menu_name, ) = split(':', variable_get("menu_block_{$block->delta}_parent", 'navigation:0'));
77
-    $vars['edit_links_array']['block-edit-menu'] = l('<span>' . t('edit menu') . '</span>', 'admin/build/menu-customize/' . $menu_name,
76
+    list($menu_name,) = split(':', variable_get("menu_block_{$block->delta}_parent", 'navigation:0'));
77
+    $vars['edit_links_array']['block-edit-menu'] = l('<span>'.t('edit menu').'</span>', 'admin/build/menu-customize/'.$menu_name,
78 78
       array(
79 79
         'attributes' => array(
80 80
           'title' => t('edit the menu that defines this block'),
Please login to merge, or discard this patch.