View GitHub Repository chamilo-lms

Schedule Inspection
Subscribe
Completed
Push — 1.10.x ( e335cf...7cec8d )
by Angel Fernando Quiroz
44:59 queued 03:29
created
Status
Category
Toggle Patches
main/inc/lib/phpseclib/Crypt/Blowfish.php 4 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -625,13 +625,13 @@
 
 block discarded – undo
625 625 
             $l^= $p[++$i];
626 626 
             $r^= ($sb_0[$l >> 24 & 0xff]  +
627 627 
                   $sb_1[$l >> 16 & 0xff]  ^
628 
-                  $sb_2[$l >>  8 & 0xff]) +
628 
+                    $sb_2[$l >>  8 & 0xff]) +
629 629 
                   $sb_3[$l       & 0xff];
630 630
631 631 
             $r^= $p[++$i];
632 632 
             $l^= ($sb_0[$r >> 24 & 0xff]  +
633 633 
                   $sb_1[$r >> 16 & 0xff]  ^
634 
-                  $sb_2[$r >>  8 & 0xff]) +
634 
+                    $sb_2[$r >>  8 & 0xff]) +
635 635 
                   $sb_3[$r       & 0xff];
636 636
637 637 
         }
Please login to merge, or discard this patch.
Spacing   +45 added lines, -45 removed lines patch added patch discarded remove patch 
@@ -278,7 +278,7 @@  discard block
 
 block discarded – undo
278 278 
      * @access private
279 279 
      * @var    array
280 280 
      */
281 
-    var $sbox0 = array (
281 
+    var $sbox0 = array(
282 282 
         0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
283 283 
         0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16, 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
284 284 
         0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
 
@@ -469,7 +469,7 @@  discard block
 
 block discarded – undo
469 469 
      */
470 470 
     function Crypt_Blowfish($mode = CRYPT_BLOWFISH_MODE_CBC)
471 471 
     {
472 
-        if ( !defined('CRYPT_BLOWFISH_MODE') ) {
472 
+        if (!defined('CRYPT_BLOWFISH_MODE')) {
473 473 
             switch (true) {
474 474 
                 case extension_loaded('mcrypt') && in_array('blowfish', mcrypt_list_algorithms()):
475 475 
                     define('CRYPT_BLOWFISH_MODE', CRYPT_BLOWFISH_MODE_MCRYPT);
 
@@ -479,7 +479,7 @@  discard block
 
 block discarded – undo
479 479 
             }
480 480 
         }
481 481
482 
-        switch ( CRYPT_BLOWFISH_MODE ) {
482 
+        switch (CRYPT_BLOWFISH_MODE) {
483 483 
             case CRYPT_BLOWFISH_MODE_MCRYPT:
484 484 
                 switch ($mode) {
485 485 
                     case CRYPT_BLOWFISH_MODE_ECB:
 
@@ -590,13 +590,13 @@  discard block
 
 block discarded – undo
590 590 
         $datar = 0;
591 591 
         for ($i = 0; $i < 18; $i += 2) {
592 592 
             $this->_encryptBlock($datal, $datar);
593 
-            $this->bctx['p'][$i    ] = $datal;
593 
+            $this->bctx['p'][$i] = $datal;
594 594 
             $this->bctx['p'][$i + 1] = $datar;
595 595 
         }
596 596 
         for ($i = 0; $i < 4; ++$i) {
597 597 
             for ($j = 0; $j < 256; $j += 2) {
598 598 
                 $this->_encryptBlock($datal, $datar);
599 
-                $this->bctx['sb'][$i][$j    ] = $datal;
599 
+                $this->bctx['sb'][$i][$j] = $datal;
600 600 
                 $this->bctx['sb'][$i][$j + 1] = $datar;
601 601 
             }
602 602 
         }
 
@@ -622,17 +622,17 @@  discard block
 
 block discarded – undo
622 622
623 623 
         $i = -1;
624 624 
         while ($i < 15) {
625 
-            $l^= $p[++$i];
626 
-            $r^= ($sb_0[$l >> 24 & 0xff]  +
627 
-                  $sb_1[$l >> 16 & 0xff]  ^
628 
-                  $sb_2[$l >>  8 & 0xff]) +
629 
-                  $sb_3[$l       & 0xff];
630 
-
631 
-            $r^= $p[++$i];
632 
-            $l^= ($sb_0[$r >> 24 & 0xff]  +
633 
-                  $sb_1[$r >> 16 & 0xff]  ^
634 
-                  $sb_2[$r >>  8 & 0xff]) +
635 
-                  $sb_3[$r       & 0xff];
625 
+            $l ^= $p[++$i];
626 
+            $r ^= ($sb_0[$l >> 24 & 0xff] +
627 
+                  $sb_1[$l >> 16 & 0xff] ^
628 
+                  $sb_2[$l >> 8 & 0xff]) +
629 
+                  $sb_3[$l & 0xff];
630 
+
631 
+            $r ^= $p[++$i];
632 
+            $l ^= ($sb_0[$r >> 24 & 0xff] +
633 
+                  $sb_1[$r >> 16 & 0xff] ^
634 
+                  $sb_2[$r >> 8 & 0xff]) +
635 
+                  $sb_3[$r & 0xff];
636 636
637 637 
         }
638 638 
         $Xr = $l ^ $p[16];
 
@@ -656,7 +656,7 @@  discard block
 
 block discarded – undo
656 656
657 657 
         switch ($method) {
658 658 
             default: // 'pbkdf2'
659 
-                list(, , $hash, $salt, $count) = func_get_args();
659 
+                list(,, $hash, $salt, $count) = func_get_args();
660 660 
                 if (!isset($hash)) {
661 661 
                     $hash = 'sha1';
662 662 
                 }
 
@@ -680,12 +680,12 @@  discard block
 
 block discarded – undo
680 680 
                     $hmac = new Crypt_Hash();
681 681 
                     $hmac->setHash($hash);
682 682 
                     $hmac->setKey($password);
683 
-                    $f = $u = $hmac->hash($salt . pack('N', $i++));
683 
+                    $f = $u = $hmac->hash($salt.pack('N', $i++));
684 684 
                     for ($j = 2; $j <= $count; $j++) {
685 685 
                         $u = $hmac->hash($u);
686 
-                        $f^= $u;
686 
+                        $f ^= $u;
687 687 
                     }
688 
-                    $key.= $f;
688 
+                    $key .= $f;
689 689 
                 }
690 690 
         }
691 691 
 
@@ -727,7 +727,7 @@  discard block
 
 block discarded – undo
727 727 
      */
728 728 
     function encrypt($plaintext)
729 729 
     {
730 
-        if ( CRYPT_BLOWFISH_MODE == CRYPT_BLOWFISH_MODE_MCRYPT ) {
730 
+        if (CRYPT_BLOWFISH_MODE == CRYPT_BLOWFISH_MODE_MCRYPT) {
731 731 
             if ($this->paddable) {
732 732 
                 $plaintext = $this->_pad($plaintext);
733 733 
             }
 
@@ -753,11 +753,11 @@  discard block
 
 block discarded – undo
753 753 
                     $max = 8 - $pos;
754 754 
                     if ($len >= $max) {
755 755 
                         $i = $max;
756 
-                        $len-= $max;
756 
+                        $len -= $max;
757 757 
                         $pos = 0;
758 758 
                     } else {
759 759 
                         $i = $len;
760 
-                        $pos+= $len;
760 
+                        $pos += $len;
761 761 
                         $len = 0;
762 762 
                     }
763 763 
                     $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
 
@@ -770,15 +770,15 @@  discard block
 
 block discarded – undo
770 770 
                             mcrypt_generic_init($this->enmcrypt, $this->key, $iv);
771 771 
                             $this->enbuffer['enmcrypt_init'] = false;
772 772 
                         }
773 
-                        $ciphertext.= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % 8));
773 
+                        $ciphertext .= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % 8));
774 774 
                         $iv = substr($ciphertext, -8);
775 
-                        $len%= 8;
775 
+                        $len %= 8;
776 776 
                     } else {
777 777 
                         while ($len >= 8) {
778 778 
                             $iv = mcrypt_generic($this->ecb, $iv) ^ substr($plaintext, $i, 8);
779 
-                            $ciphertext.= $iv;
780 
-                            $len-= 8;
781 
-                            $i+= 8;
779 
+                            $ciphertext .= $iv;
780 
+                            $len -= 8;
781 
+                            $i += 8;
782 782 
                         }
783 783 
                     }
784 784 
                 }
 
@@ -786,7 +786,7 @@  discard block
 
 block discarded – undo
786 786 
                     $iv = mcrypt_generic($this->ecb, $iv);
787 787 
                     $block = $iv ^ substr($plaintext, -$len);
788 788 
                     $iv = substr_replace($iv, $block, 0, $len);
789 
-                    $ciphertext.= $block;
789 
+                    $ciphertext .= $block;
790 790 
                     $pos = $len;
791 791 
                 }
792 792 
                 return $ciphertext;
 
@@ -818,7 +818,7 @@  discard block
 
 block discarded – undo
818 818 
      */
819 819 
     function decrypt($ciphertext)
820 820 
     {
821 
-        if ( CRYPT_BLOWFISH_MODE == CRYPT_BLOWFISH_MODE_MCRYPT ) {
821 
+        if (CRYPT_BLOWFISH_MODE == CRYPT_BLOWFISH_MODE_MCRYPT) {
822 822 
             if ($this->paddable) {
823 823 
                 // we pad with chr(0) since that's what mcrypt_generic does.  to quote from http://php.net/function.mcrypt-generic :
824 824 
                 // "The data is padded with "\0" to make sure the length of the data is n * blocksize."
 
@@ -846,11 +846,11 @@  discard block
 
 block discarded – undo
846 846 
                     $max = 8 - $pos;
847 847 
                     if ($len >= $max) {
848 848 
                         $i = $max;
849 
-                        $len-= $max;
849 
+                        $len -= $max;
850 850 
                         $pos = 0;
851 851 
                     } else {
852 852 
                         $i = $len;
853 
-                        $pos+= $len;
853 
+                        $pos += $len;
854 854 
                         $len = 0;
855 855 
                     }
856 856 
                     $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
 
@@ -858,13 +858,13 @@  discard block
 
 block discarded – undo
858 858 
                 }
859 859 
                 if ($len >= 8) {
860 860 
                     $cb = substr($ciphertext, $i, $len - $len % 8);
861 
-                    $plaintext.= mcrypt_generic($this->ecb, $iv . $cb) ^ $cb;
861 
+                    $plaintext .= mcrypt_generic($this->ecb, $iv.$cb) ^ $cb;
862 862 
                     $iv = substr($cb, -8);
863 
-                    $len%= 8;
863 
+                    $len %= 8;
864 864 
                 }
865 865 
                 if ($len) {
866 866 
                     $iv = mcrypt_generic($this->ecb, $iv);
867 
-                    $plaintext.= $iv ^ substr($ciphertext, -$len);
867 
+                    $plaintext .= $iv ^ substr($ciphertext, -$len);
868 868 
                     $iv = substr_replace($iv, substr($ciphertext, -$len), 0, $len);
869 869 
                     $pos = $len;
870 870 
                 }
 
@@ -1032,7 +1032,7 @@  discard block
 
 block discarded – undo
1032 1032 
     function _generate_xor(&$iv)
1033 1033 
     {
1034 1034 
         $xor = $iv;
1035 
-        for ($j = 4; $j <= 8; $j+=4) {
1035 
+        for ($j = 4; $j <= 8; $j += 4) {
1036 1036 
             $temp = substr($iv, -$j, 4);
1037 1037 
             switch ($temp) {
1038 1038 
                 case "\xFF\xFF\xFF\xFF":
 
@@ -1058,7 +1058,7 @@  discard block
 
 block discarded – undo
1058 1058 
      */
1059 1059 
     function inline_crypt_setup()
1060 1060 
     {/*{{{*/
1061 
-        $lambda_functions =& Crypt_Blowfish::get_lambda_functions();
1061 
+        $lambda_functions = & Crypt_Blowfish::get_lambda_functions();
1062 1062 
         $block_size = 8;
1063 1063 
         $mode = $this->mode;
1064 1064 
         $code_hash = "$mode";
 
@@ -1075,8 +1075,8 @@  discard block
 
 block discarded – undo
1075 1075 
                 $l = $in[1];
1076 1076 
                 $r = $in[2];
1077 1077 
             ';
1078 
-            for ($i = 0; $i < 16; $i+= 2) {
1079 
-                $_encryptBlock.= '
1078 
+            for ($i = 0; $i < 16; $i += 2) {
1079 
+                $_encryptBlock .= '
1080 1080 
                     $l^= $p_'.($i).';
1081 1081 
                     $r^= ($sb_0[$l >> 24 & 0xff]  +
1082 1082 
                           $sb_1[$l >> 16 & 0xff]  ^
 
@@ -1090,7 +1090,7 @@  discard block
 
 block discarded – undo
1090 1090 
                           $sb_3[$r       & 0xff];
1091 1091 
                 ';
1092 1092 
             }
1093 
-            $_encryptBlock.= '
1093 
+            $_encryptBlock .= '
1094 1094 
                 $in = pack("N*", $r ^ $p_17, $l ^ $p_16);
1095 1095 
             ';
1096 1096 
 
@@ -1101,8 +1101,8 @@  discard block
 
 block discarded – undo
1101 1101 
                 $r = $in[2];
1102 1102 
             ';
1103 1103
1104 
-            for ($i = 17; $i > 2; $i-= 2) {
1105 
-                $_decryptBlock.= '
1104 
+            for ($i = 17; $i > 2; $i -= 2) {
1105 
+                $_decryptBlock .= '
1106 1106 
                     $l^= $p_'.($i).';
1107 1107 
                     $r^= ($sb_0[$l >> 24 & 0xff]  +
1108 1108 
                           $sb_1[$l >> 16 & 0xff]  ^
 
@@ -1117,7 +1117,7 @@  discard block
 
 block discarded – undo
1117 1117 
                 ';
1118 1118 
             }
1119 1119
1120 
-            $_decryptBlock.= '
1120 
+            $_decryptBlock .= '
1121 1121 
                 $in = pack("N*", $r ^ $p_0, $l ^ $p_1);
1122 1122 
             ';
1123 1123 
 
@@ -1439,12 +1439,12 @@  discard block
 
 block discarded – undo
1439 1439 
                     break;
1440 1440 
             }
1441 1441 
             $fnc_head = '$action, &$self, $text';
1442 
-            $fnc_body = $init_cryptBlock . 'if ($action == "encrypt") { ' . $encrypt . ' } else { ' . $decrypt . ' }';
1442 
+            $fnc_body = $init_cryptBlock.'if ($action == "encrypt") { '.$encrypt.' } else { '.$decrypt.' }';
1443 1443
1444 1444 
             if (function_exists('create_function') && is_callable('create_function')) {
1445 1445 
                 $lambda_functions[$code_hash] = create_function($fnc_head, $fnc_body);
1446 1446 
             } else {
1447 
-                eval('function ' . ($lambda_functions[$code_hash] = 'f' . md5(microtime())) . '(' . $fnc_head . ') { ' . $fnc_body . ' }');
1447 
+                eval('function '.($lambda_functions[$code_hash] = 'f'.md5(microtime())).'('.$fnc_head.') { '.$fnc_body.' }');
1448 1448 
             }
1449 1449 
         }
1450 1450 
         $this->inline_crypt = $lambda_functions[$code_hash];
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -545,8 +545,7 @@
 
 block discarded – undo
545 545
546 546 
         if (!$keylength) {
547 547 
             $key = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
548 
-        }
549 
-        elseif ($keylength > 56) {
548 
+        } elseif ($keylength > 56) {
550 549 
             $key = substr($key, 0, 56);
551 550 
         }
552 551
Please login to merge, or discard this patch.
Doc Comments   +3 added lines patch added patch discarded remove patch 
@@ -563,6 +563,7 @@  discard block
 
 block discarded – undo
563 563 
      * If not explictly set, CRYPT_TWOFISH_MODE_CBC will be used.
564 564 
      *
565 565 
      * @param optional Integer $mode
566 
+     * @param integer $mode
566 567 
      * @access public
567 568 
      */
568 569 
     function Crypt_Twofish($mode = CRYPT_TWOFISH_MODE_CBC)
 
@@ -1072,6 +1073,7 @@  discard block
 
 block discarded – undo
1072 1073 
      *
1073 1074 
      * @see Crypt_Twofish::_unpad()
1074 1075 
      * @access private
1076 
+     * @param string $text
1075 1077 
      */
1076 1078 
     function _pad($text)
1077 1079 
     {
 
@@ -1099,6 +1101,7 @@  discard block
 
 block discarded – undo
1099 1101 
      *
1100 1102 
      * @see Crypt_Twofish::_pad()
1101 1103 
      * @access private
1104 
+     * @param string $text
1102 1105 
      */
1103 1106 
     function _unpad($text)
1104 1107 
     {
Please login to merge, or discard this patch.
main/inc/lib/phpseclib/Crypt/RC4.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch 
@@ -171,7 +171,7 @@  discard block
 
 block discarded – undo
171 171 
      */
172 172 
     function Crypt_RC4()
173 173 
     {
174 
-        if ( !defined('CRYPT_RC4_MODE') ) {
174 
+        if (!defined('CRYPT_RC4_MODE')) {
175 175 
             switch (true) {
176 176 
                 case extension_loaded('mcrypt') && (defined('MCRYPT_ARCFOUR') || defined('MCRYPT_RC4')) && in_array('arcfour', mcrypt_list_algorithms()):
177 177 
                     define('CRYPT_RC4_MODE', CRYPT_RC4_MODE_MCRYPT);
 
@@ -181,7 +181,7 @@  discard block
 
 block discarded – undo
181 181 
             }
182 182 
         }
183 183
184 
-        switch ( CRYPT_RC4_MODE ) {
184 
+        switch (CRYPT_RC4_MODE) {
185 185 
             case CRYPT_RC4_MODE_MCRYPT:
186 186 
                 switch (true) {
187 187 
                     case defined('MCRYPT_ARCFOUR'):
 
@@ -209,7 +209,7 @@  discard block
 
 block discarded – undo
209 209 
     {
210 210 
         $this->key = $key;
211 211
212 
-        if ( CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT ) {
212 
+        if (CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT) {
213 213 
             mcrypt_generic_init($this->encryptStream, $this->key, '');
214 214 
             mcrypt_generic_init($this->decryptStream, $this->key, '');
215 215 
             return;
 
@@ -249,7 +249,7 @@  discard block
 
 block discarded – undo
249 249
250 250 
         switch ($method) {
251 251 
             default: // 'pbkdf2'
252 
-                list(, , $hash, $salt, $count) = func_get_args();
252 
+                list(,, $hash, $salt, $count) = func_get_args();
253 253 
                 if (!isset($hash)) {
254 254 
                     $hash = 'sha1';
255 255 
                 }
 
@@ -276,12 +276,12 @@  discard block
 
 block discarded – undo
276 276 
                     $hmac = new Crypt_Hash();
277 277 
                     $hmac->setHash($hash);
278 278 
                     $hmac->setKey($password);
279 
-                    $f = $u = $hmac->hash($salt . pack('N', $i++));
279 
+                    $f = $u = $hmac->hash($salt.pack('N', $i++));
280 280 
                     for ($j = 2; $j <= $count; $j++) {
281 281 
                         $u = $hmac->hash($u);
282 
-                        $f^= $u;
282 
+                        $f ^= $u;
283 283 
                     }
284 
-                    $key.= $f;
284 
+                    $key .= $f;
285 285 
                 }
286 286 
         }
287 287 
 
@@ -349,7 +349,7 @@  discard block
 
 block discarded – undo
349 349 
      */
350 350 
     function _crypt($text, $mode)
351 351 
     {
352 
-        if ( CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT ) {
352 
+        if (CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT) {
353 353 
             $keyStream = $mode == CRYPT_RC4_ENCRYPT ? 'encryptStream' : 'decryptStream';
354 354
355 355 
             if (!$this->continuousBuffer) {
 
@@ -381,7 +381,7 @@  discard block
 
 block discarded – undo
381 381 
             $keyStream[$i] = $keyStream[$j];
382 382 
             $keyStream[$j] = $temp;
383 383 
             $temp = $keyStream[($keyStream[$i] + $keyStream[$j]) & 255];
384 
-            $newText.= chr(ord($text[$k]) ^ $temp);
384 
+            $newText .= chr(ord($text[$k]) ^ $temp);
385 385 
         }
386 386
387 387 
         if ($this->continuousBuffer) {
 
@@ -438,7 +438,7 @@  discard block
 
 block discarded – undo
438 438 
      */
439 439 
     function enableContinuousBuffer()
440 440 
     {
441 
-        if ( CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT ) {
441 
+        if (CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT) {
442 442 
             mcrypt_generic_init($this->encryptStream, $this->key, '');
443 443 
             mcrypt_generic_init($this->decryptStream, $this->key, '');
444 444 
         }
 
@@ -456,7 +456,7 @@  discard block
 
 block discarded – undo
456 456 
      */
457 457 
     function disableContinuousBuffer()
458 458 
     {
459 
-        if ( CRYPT_RC4_MODE == CRYPT_RC4_MODE_INTERNAL ) {
459 
+        if (CRYPT_RC4_MODE == CRYPT_RC4_MODE_INTERNAL) {
460 460 
             $this->encryptIndex = $this->decryptIndex = array(0, 0);
461 461 
             $this->encryptStream = $this->decryptStream = false;
462 462 
         }
Please login to merge, or discard this patch.
main/inc/lib/lp_item.lib.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -34,9 +34,9 @@
 
 block discarded – undo
34 34 
     public $search_did = 0;
35 35 
     public $audio = "";
36 36
37 
-    public function __construct($in_c_id=0, $in_id=0)
37 
+    public function __construct($in_c_id = 0, $in_id = 0)
38 38 
     {
39 
-        if ($in_c_id > 0 && $in_id >0) {
39 
+        if ($in_c_id > 0 && $in_id > 0) {
40 40 
             $item_view_table = Database::get_course_table(TABLE_LP_ITEM);
41 41 
             $sql = "SELECT * FROM $item_view_table
42 42 
                     WHERE
Please login to merge, or discard this patch.
main/inc/lib/course_request.lib.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch 
@@ -65,8 +65,8 @@  discard block
 
 block discarded – undo
65 65 
         $exemplary_content
66 66 
     ) {
67 67 
         $wanted_code = trim($wanted_code);
68 
-        $user_id = (int)$user_id;
69 
-        $exemplary_content = (bool)$exemplary_content ? 1 : 0;
68 
+        $user_id = (int) $user_id;
69 
+        $exemplary_content = (bool) $exemplary_content ? 1 : 0;
70 70
71 71 
         if ($wanted_code == '') {
72 72 
             return false;
 
@@ -254,10 +254,10 @@  discard block
 
 block discarded – undo
254 254 
         $user_id,
255 255 
         $exemplary_content
256 256 
     ) {
257 
-        $id = (int)$id;
257 
+        $id = (int) $id;
258 258 
         $wanted_code = trim($wanted_code);
259 
-        $user_id = (int)$user_id;
260 
-        $exemplary_content = (bool)$exemplary_content ? 1 : 0;
259 
+        $user_id = (int) $user_id;
260 
+        $exemplary_content = (bool) $exemplary_content ? 1 : 0;
261 261
262 262 
         if ($wanted_code == '') {
263 263 
             return false;
 
@@ -360,7 +360,7 @@  discard block
 
 block discarded – undo
360 360 
      */
361 361 
     public static function delete_course_request($id)
362 362 
     {
363 
-        $id = (int)$id;
363 
+        $id = (int) $id;
364 364 
         $sql = "DELETE FROM ".Database :: get_main_table(TABLE_MAIN_COURSE_REQUEST)."
365 365 
                 WHERE id = ".$id;
366 366 
         $result = Database::query($sql);
 
@@ -377,7 +377,7 @@  discard block
 
 block discarded – undo
377 377 
         if (is_null($status)) {
378 378 
             $sql = "SELECT COUNT(id) AS number FROM ".$course_table;
379 379 
         } else {
380 
-            $status = (int)$status;
380 
+            $status = (int) $status;
381 381 
             $sql = "SELECT COUNT(id) AS number FROM ".$course_table."
382 382 
                     WHERE status = ".$status;
383 383 
         }
 
@@ -395,7 +395,7 @@  discard block
 
 block discarded – undo
395 395 
      */
396 396 
     public static function get_course_request_info($id)
397 397 
     {
398 
-        $id = (int)$id;
398 
+        $id = (int) $id;
399 399 
         $sql = "SELECT *
400 400 
                 FROM ".Database :: get_main_table(TABLE_MAIN_COURSE_REQUEST)."
401 401 
                 WHERE id = ".$id;
 
@@ -413,7 +413,7 @@  discard block
 
 block discarded – undo
413 413 
      */
414 414 
     public static function get_course_request_code($id)
415 415 
     {
416 
-        $id = (int)$id;
416 
+        $id = (int) $id;
417 417 
         $sql = "SELECT code
418 418 
                 FROM ".Database :: get_main_table(TABLE_MAIN_COURSE_REQUEST)."
419 419 
                 WHERE id = ".$id;
 
@@ -434,7 +434,7 @@  discard block
 
 block discarded – undo
434 434 
      */
435 435 
     public static function accept_course_request($id)
436 436 
     {
437 
-        $id = (int)$id;
437 
+        $id = (int) $id;
438 438
439 439 
         // Retrieve request's data
440 440 
         $course_request_info = self::get_course_request_info($id);
 
@@ -447,7 +447,7 @@  discard block
 
 block discarded – undo
447 447 
             return false;
448 448 
         }*/
449 449
450 
-        $user_id = (int)$course_request_info['user_id'];
450 
+        $user_id = (int) $course_request_info['user_id'];
451 451 
         if ($user_id <= 0) {
452 452 
             return false;
453 453 
         }
 
@@ -531,7 +531,7 @@  discard block
 
 block discarded – undo
531 531 
      */
532 532 
     public static function reject_course_request($id)
533 533 
     {
534 
-        $id = (int)$id;
534 
+        $id = (int) $id;
535 535 
         // Retrieve request's data
536 536 
         $course_request_info = self::get_course_request_info($id);
537 537 
         if (!is_array($course_request_info)) {
 
@@ -609,7 +609,7 @@  discard block
 
 block discarded – undo
609 609 
      */
610 610 
     public static function ask_for_additional_info($id)
611 611 
     {
612 
-        $id = (int)$id;
612 
+        $id = (int) $id;
613 613
614 614 
         // Retrieve request's data
615 615 
         $course_request_info = self::get_course_request_info($id);
 
@@ -700,7 +700,7 @@  discard block
 
 block discarded – undo
700 700 
      */
701 701 
     public static function additional_info_asked($id)
702 702 
     {
703 
-        $id = (int)$id;
703 
+        $id = (int) $id;
704 704 
         $sql = "SELECT id FROM ".Database :: get_main_table(TABLE_MAIN_COURSE_REQUEST)."
705 705 
                 WHERE (id = ".$id." AND info > 0)";
706 706 
         $result = Database::num_rows(Database::query($sql));
Please login to merge, or discard this patch.
main/inc/lib/access_url_edit_sessions_to_url_functions.lib.php 3 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -44,17 +44,17 @@
 
 block discarded – undo
44 44 
                     ORDER BY name, id
45 45 
                     LIMIT 11';
46 46 
             $rs = Database::query($sql);
47 
-            $i=0;
47 
+            $i = 0;
48 48 
             while ($session = Database :: fetch_array($rs)) {
49 49 
                 $i++;
50 
-                if ($i<=10) {
50 
+                if ($i <= 10) {
51 51 
                      $return .= '<a href="#" onclick="add_user_to_url(\''.addslashes($session['id']).'\',\''.addslashes($session['name']).' ('.addslashes($session['id']).')'.'\')">'.$session['name'].' </a><br />';
52 52 
                 } else {
53 53 
                     $return .= '...<br />';
54 54 
                 }
55 55 
             }
56 56 
         }
57 
-        $xajax_response -> addAssign('ajax_list_courses','innerHTML',api_utf8_encode($return));
57 
+        $xajax_response -> addAssign('ajax_list_courses', 'innerHTML', api_utf8_encode($return));
58 58 
         return $xajax_response;
59 59 
     }
60 60 
 }
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -23,7 +23,7 @@
 
 block discarded – undo
23 23 
      * search string
24 24 
      * @param string Search string
25 25 
      * @param int Deprecated param
26 
-     * @return string Xajax response block
26 
+     * @return xajaxResponse Xajax response block
27 27 
      * @assert () === false
28 28 
      */
29 29 
     function search_users($needle, $id)
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -48,7 +48,7 @@
 
 block discarded – undo
48 48 
             while ($session = Database :: fetch_array($rs)) {
49 49 
                 $i++;
50 50 
                 if ($i<=10) {
51 
-                     $return .= '<a href="#" onclick="add_user_to_url(\''.addslashes($session['id']).'\',\''.addslashes($session['name']).' ('.addslashes($session['id']).')'.'\')">'.$session['name'].' </a><br />';
51 
+                        $return .= '<a href="#" onclick="add_user_to_url(\''.addslashes($session['id']).'\',\''.addslashes($session['name']).' ('.addslashes($session['id']).')'.'\')">'.$session['name'].' </a><br />';
52 52 
                 } else {
53 53 
                     $return .= '...<br />';
54 54 
                 }
Please login to merge, or discard this patch.
main/inc/lib/nanogong/receiver.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -48,7 +48,7 @@  discard block
 
 block discarded – undo
48 48 
 $title = trim(str_replace('_chnano_.', '.', $filename)); //hide nanogong wav tag at title
49 49 
 $title = str_replace('_', ' ', $title);
50 50
51 
-$documentPath = $filepath . $filename;
51 
+$documentPath = $filepath.$filename;
52 52
53 53 
 if ($nano_user_id != api_get_user_id() || api_get_user_id() == 0 || $nano_user_id == 0) {
54 54 
     echo 'Not allowed';
 
@@ -66,7 +66,7 @@  discard block
 
 block discarded – undo
66 66 
     $groupId = $nano_group_id;
67 67 
     $file_size = filesize($documentPath);
68 68 
     $relativeUrlPath = $dir;
69 
-    $doc_id = add_document($_course, $relativeUrlPath . $filename, 'file', filesize($documentPath), $title);
69 
+    $doc_id = add_document($_course, $relativeUrlPath.$filename, 'file', filesize($documentPath), $title);
70 70 
     api_item_property_update(
71 71 
         $_course,
72 72 
         TOOL_DOCUMENT,
Please login to merge, or discard this patch.
main/inc/lib/mp3player/is_autostart.as.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -12,13 +12,13 @@
 
 block discarded – undo
12 12 
 switch ($_SESSION['whereami']) {
13 13
14 14
15 
-	case 'lp/build' :
16 
-	case 'document/create' :
17 
-	case 'document/edit' :
18 
-		$autostart = 'false';
19 
-	break;
20 
-	default :
21 
-		$autostart = 'true';
15 
+    case 'lp/build' :
16 
+    case 'document/create' :
17 
+    case 'document/edit' :
18 
+        $autostart = 'false';
19 
+    break;
20 
+    default :
21 
+        $autostart = 'true';
22 22
23 23 
 }
24 24 
 echo utf8_encode('autostart='.$autostart);
Please login to merge, or discard this patch.
main/inc/lib/internationalization_database/name_order_conventions.php 2 patches
Indentation   +77 added lines, -77 removed lines patch added patch discarded remove patch 
@@ -19,82 +19,82 @@
 
 block discarded – undo
19 19 
  * last_name                   - sorting names with priority for the last name.
20 20 
  */
21 21 
 return array(
22 
-	'afrikaans' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
23 
-	'albanian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
24 
-	'alemannic' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
25 
-	'amharic' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
26 
-	'armenian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
27 
-	'arabic' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
28 
-	'asturian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
29 
-	'bosnian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
30 
-	'brazilian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
31 
-	'breton' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
32 
-	'bulgarian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
33 
-	'catalan' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
34 
-	'croatian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
35 
-	'czech' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
36 
-	'danish' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
37 
-	'dari' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
38 
-	'dutch' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
39 
-	'english' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
40 
-	'esperanto' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
41 
-	'estonian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
42 
-	'basque'  =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
43 
-	'finnish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
44 
-	'french' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
45 
-	'frisian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
46 
-	'friulian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
22 
+    'afrikaans' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
23 
+    'albanian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
24 
+    'alemannic' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
25 
+    'amharic' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
26 
+    'armenian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
27 
+    'arabic' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
28 
+    'asturian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
29 
+    'bosnian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
30 
+    'brazilian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
31 
+    'breton' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
32 
+    'bulgarian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
33 
+    'catalan' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
34 
+    'croatian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
35 
+    'czech' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
36 
+    'danish' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
37 
+    'dari' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
38 
+    'dutch' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
39 
+    'english' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
40 
+    'esperanto' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
41 
+    'estonian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
42 
+    'basque'  =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
43 
+    'finnish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
44 
+    'french' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
45 
+    'frisian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
46 
+    'friulian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
47 47 
     'galician' =>         array('format' => 'title last_name first_name',  'sort_by' => 'last_name'),
48 
-	'georgian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
49 
-	'german' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
50 
-	'greek' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
51 
-	'hawaiian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
52 
-	'hebrew' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
53 
-	'hindi' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
54 
-	'hungarian' =>        array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
55 
-	'icelandic' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
56 
-	'indonesian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
57 
-	'irish' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
58 
-	'italian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
59 
-	'japanese' =>         array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
60 
-	'korean' =>           array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
61 
-	'latin' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
62 
-	'latvian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
63 
-	'lithuanian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
64 
-	'macedonian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
65 
-	'malay' =>            array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
66 
-	'manx' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
67 
-	'marathi' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
68 
-	'middle_frisian' =>   array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
69 
-	'mingo' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
70 
-	'nepali' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
71 
-	'norwegian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
72 
-	'occitan' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
73 
-	'pashto' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
74 
-	'persian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
75 
-	'polish' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
76 
-	'portuguese' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
77 
-	'quechua_cusco' =>    array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
78 
-	'romanian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
79 
-	'rumantsch' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
80 
-	'russian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
81 
-	'sanskrit' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
82 
-	'serbian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
83 
-	'serbian_cyrillic' => array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
84 
-	'simpl_chinese' =>    array('format' => 'title last_name first_name',  'sort_by' => 'last_name' ), // Eastern order
85 
-	'slovak' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
86 
-	'slovenian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
87 
-	'spanish' =>          array('format' => 'title last_name, first_name',  'sort_by' => 'last_name'), // Library order
88 
-	'swahili' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
89 
-	'swedish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
90 
-	'tagalog' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
91 
-	'tamil' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
92 
-	'thai' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
93 
-	'trad_chinese' =>     array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
94 
-	'turkish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
95 
-	'ukrainian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
96 
-	'vietnamese' =>       array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
97 
-	'welsh' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
98 
-	'yiddish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
99 
-	'yoruba' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name')
48 
+    'georgian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
49 
+    'german' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
50 
+    'greek' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
51 
+    'hawaiian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
52 
+    'hebrew' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
53 
+    'hindi' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
54 
+    'hungarian' =>        array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
55 
+    'icelandic' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
56 
+    'indonesian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
57 
+    'irish' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
58 
+    'italian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
59 
+    'japanese' =>         array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
60 
+    'korean' =>           array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
61 
+    'latin' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
62 
+    'latvian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
63 
+    'lithuanian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
64 
+    'macedonian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
65 
+    'malay' =>            array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
66 
+    'manx' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
67 
+    'marathi' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
68 
+    'middle_frisian' =>   array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
69 
+    'mingo' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
70 
+    'nepali' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
71 
+    'norwegian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
72 
+    'occitan' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
73 
+    'pashto' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
74 
+    'persian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
75 
+    'polish' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
76 
+    'portuguese' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
77 
+    'quechua_cusco' =>    array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
78 
+    'romanian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
79 
+    'rumantsch' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
80 
+    'russian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
81 
+    'sanskrit' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
82 
+    'serbian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
83 
+    'serbian_cyrillic' => array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
84 
+    'simpl_chinese' =>    array('format' => 'title last_name first_name',  'sort_by' => 'last_name' ), // Eastern order
85 
+    'slovak' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
86 
+    'slovenian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
87 
+    'spanish' =>          array('format' => 'title last_name, first_name',  'sort_by' => 'last_name'), // Library order
88 
+    'swahili' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
89 
+    'swedish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
90 
+    'tagalog' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
91 
+    'tamil' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
92 
+    'thai' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
93 
+    'trad_chinese' =>     array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
94 
+    'turkish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
95 
+    'ukrainian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
96 
+    'vietnamese' =>       array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
97 
+    'welsh' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
98 
+    'yiddish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
99 
+    'yoruba' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name')
100 100 
 );
Please login to merge, or discard this patch.
Spacing   +78 added lines, -78 removed lines patch added patch discarded remove patch 
@@ -19,82 +19,82 @@
 
 block discarded – undo
19 19 
  * last_name                   - sorting names with priority for the last name.
20 20 
  */
21 21 
 return array(
22 
-	'afrikaans' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
23 
-	'albanian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
24 
-	'alemannic' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
25 
-	'amharic' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
26 
-	'armenian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
27 
-	'arabic' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
28 
-	'asturian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
29 
-	'bosnian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
30 
-	'brazilian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
31 
-	'breton' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
32 
-	'bulgarian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
33 
-	'catalan' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
34 
-	'croatian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
35 
-	'czech' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
36 
-	'danish' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
37 
-	'dari' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
38 
-	'dutch' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
39 
-	'english' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
40 
-	'esperanto' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
41 
-	'estonian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
42 
-	'basque'  =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
43 
-	'finnish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
44 
-	'french' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
45 
-	'frisian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
46 
-	'friulian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
47 
-    'galician' =>         array('format' => 'title last_name first_name',  'sort_by' => 'last_name'),
48 
-	'georgian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
49 
-	'german' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
50 
-	'greek' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
51 
-	'hawaiian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
52 
-	'hebrew' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
53 
-	'hindi' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
54 
-	'hungarian' =>        array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
55 
-	'icelandic' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
56 
-	'indonesian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
57 
-	'irish' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
58 
-	'italian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
59 
-	'japanese' =>         array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
60 
-	'korean' =>           array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
61 
-	'latin' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
62 
-	'latvian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
63 
-	'lithuanian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
64 
-	'macedonian' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
65 
-	'malay' =>            array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
66 
-	'manx' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
67 
-	'marathi' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
68 
-	'middle_frisian' =>   array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
69 
-	'mingo' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
70 
-	'nepali' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
71 
-	'norwegian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
72 
-	'occitan' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
73 
-	'pashto' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
74 
-	'persian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
75 
-	'polish' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
76 
-	'portuguese' =>       array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
77 
-	'quechua_cusco' =>    array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
78 
-	'romanian' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
79 
-	'rumantsch' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
80 
-	'russian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
81 
-	'sanskrit' =>         array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
82 
-	'serbian' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
83 
-	'serbian_cyrillic' => array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
84 
-	'simpl_chinese' =>    array('format' => 'title last_name first_name',  'sort_by' => 'last_name' ), // Eastern order
85 
-	'slovak' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
86 
-	'slovenian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
87 
-	'spanish' =>          array('format' => 'title last_name, first_name',  'sort_by' => 'last_name'), // Library order
88 
-	'swahili' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
89 
-	'swedish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
90 
-	'tagalog' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
91 
-	'tamil' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
92 
-	'thai' =>             array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
93 
-	'trad_chinese' =>     array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
94 
-	'turkish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
95 
-	'ukrainian' =>        array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
96 
-	'vietnamese' =>       array('format' => 'title last_name first_name',  'sort_by' => 'last_name'), // Eastern order
97 
-	'welsh' =>            array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
98 
-	'yiddish' =>          array('format' => 'title first_name last_name',  'sort_by' => 'first_name'),
99 
-	'yoruba' =>           array('format' => 'title first_name last_name',  'sort_by' => 'first_name')
22 
+	'afrikaans' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
23 
+	'albanian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
24 
+	'alemannic' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
25 
+	'amharic' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
26 
+	'armenian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
27 
+	'arabic' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
28 
+	'asturian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
29 
+	'bosnian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
30 
+	'brazilian' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
31 
+	'breton' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
32 
+	'bulgarian' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
33 
+	'catalan' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
34 
+	'croatian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
35 
+	'czech' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
36 
+	'danish' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
37 
+	'dari' =>             array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
38 
+	'dutch' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
39 
+	'english' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
40 
+	'esperanto' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
41 
+	'estonian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
42 
+	'basque'  =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
43 
+	'finnish' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
44 
+	'french' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
45 
+	'frisian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
46 
+	'friulian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
47 
+    'galician' =>         array('format' => 'title last_name first_name', 'sort_by' => 'last_name'),
48 
+	'georgian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
49 
+	'german' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
50 
+	'greek' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
51 
+	'hawaiian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
52 
+	'hebrew' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
53 
+	'hindi' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
54 
+	'hungarian' =>        array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
55 
+	'icelandic' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
56 
+	'indonesian' =>       array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
57 
+	'irish' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
58 
+	'italian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
59 
+	'japanese' =>         array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
60 
+	'korean' =>           array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
61 
+	'latin' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
62 
+	'latvian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
63 
+	'lithuanian' =>       array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
64 
+	'macedonian' =>       array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
65 
+	'malay' =>            array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
66 
+	'manx' =>             array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
67 
+	'marathi' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
68 
+	'middle_frisian' =>   array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
69 
+	'mingo' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
70 
+	'nepali' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
71 
+	'norwegian' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
72 
+	'occitan' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
73 
+	'pashto' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
74 
+	'persian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
75 
+	'polish' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
76 
+	'portuguese' =>       array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
77 
+	'quechua_cusco' =>    array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
78 
+	'romanian' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
79 
+	'rumantsch' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
80 
+	'russian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
81 
+	'sanskrit' =>         array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
82 
+	'serbian' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
83 
+	'serbian_cyrillic' => array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
84 
+	'simpl_chinese' =>    array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
85 
+	'slovak' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
86 
+	'slovenian' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
87 
+	'spanish' =>          array('format' => 'title last_name, first_name', 'sort_by' => 'last_name'), // Library order
88 
+	'swahili' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
89 
+	'swedish' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
90 
+	'tagalog' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
91 
+	'tamil' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
92 
+	'thai' =>             array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
93 
+	'trad_chinese' =>     array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
94 
+	'turkish' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
95 
+	'ukrainian' =>        array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
96 
+	'vietnamese' =>       array('format' => 'title last_name first_name', 'sort_by' => 'last_name'), // Eastern order
97 
+	'welsh' =>            array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
98 
+	'yiddish' =>          array('format' => 'title first_name last_name', 'sort_by' => 'first_name'),
99 
+	'yoruba' =>           array('format' => 'title first_name last_name', 'sort_by' => 'first_name')
100 100 
 );
Please login to merge, or discard this patch.
main/inc/lib/internationalization_database/transliteration/x70.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -2,7 +2,7 @@
 
 block discarded – undo
2 2 
 // $Id: x70.php,v 1.1.8.1 2008/06/12 20:34:31 smk Exp $
3 3
4 4 
 return array(
5 
-  'en' => array('You ', 'Yang ', 'Lu ', 'Si ', 'Jie ', 'Ying ', 'Du ', 'Wang ', 'Hui ', 'Xie ', 'Pan ', 'Shen ', 'Biao ', 'Chan ', 'Mo ', 'Liu ',
5 
+    'en' => array('You ', 'Yang ', 'Lu ', 'Si ', 'Jie ', 'Ying ', 'Du ', 'Wang ', 'Hui ', 'Xie ', 'Pan ', 'Shen ', 'Biao ', 'Chan ', 'Mo ', 'Liu ',
6 6 
     'Jian ', 'Pu ', 'Se ', 'Cheng ', 'Gu ', 'Bin ', 'Huo ', 'Xian ', 'Lu ', 'Qin ', 'Han ', 'Ying ', 'Yong ', 'Li ', 'Jing ', 'Xiao ',
7 7 
     'Ying ', 'Sui ', 'Wei ', 'Xie ', 'Huai ', 'Hao ', 'Zhu ', 'Long ', 'Lai ', 'Dui ', 'Fan ', 'Hu ', 'Lai ', NULL, NULL, 'Ying ',
8 8 
     'Mi ', 'Ji ', 'Lian ', 'Jian ', 'Ying ', 'Fen ', 'Lin ', 'Yi ', 'Jian ', 'Yue ', 'Chan ', 'Dai ', 'Rang ', 'Jian ', 'Lan ', 'Fan ',
Please login to merge, or discard this patch.