Completed
Pull Request — 1.11.x (#1599)
by José
28:19
created
main/auth/shibboleth/test/test_no_email.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  * @license see /license.txt
7 7
  * @author Laurent Opprecht <[email protected]>, Nicolas Rod for the University of Geneva
8 8
  */
9
-include_once(dirname(__FILE__) . '/../init.php');
9
+include_once(dirname(__FILE__).'/../init.php');
10 10
 
11 11
 if (!ShibbolethTest::is_enabled())
12 12
 {
@@ -17,4 +17,4 @@  discard block
 block discarded – undo
17 17
 Shibboleth::session()->logout();
18 18
 ShibbolethTest::helper()->setup_new_student_no_email();
19 19
 
20
-require_once dirname(__FILE__) . '/../login.php';
21 20
\ No newline at end of file
21
+require_once dirname(__FILE__).'/../login.php';
22 22
\ No newline at end of file
Please login to merge, or discard this patch.
main/auth/shibboleth/app/shibboleth.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -78,14 +78,14 @@
 block discarded – undo
78 78
 
79 79
     public static function sys_path()
80 80
     {
81
-        $path = dirname(__FILE__) . '/../';
81
+        $path = dirname(__FILE__).'/../';
82 82
         return $path;
83 83
     }
84 84
 
85 85
     public static function url($path = '')
86 86
     {
87 87
         $result = api_get_path('WEB_PATH');
88
-        $result .= '/main/auth/shibboleth/' . $path;
88
+        $result .= '/main/auth/shibboleth/'.$path;
89 89
         return $result;
90 90
     }
91 91
 
Please login to merge, or discard this patch.
main/auth/shibboleth/app/model/user.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 
3 3
 namespace Shibboleth;
4 4
 
5
-require_once dirname(__FILE__) . '/scaffold/user.class.php';
5
+require_once dirname(__FILE__).'/scaffold/user.class.php';
6 6
 
7 7
 /**
8 8
  * A Chamilo user. Model for the User table.
Please login to merge, or discard this patch.
main/auth/shibboleth/app/model/admin.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 
3 3
 namespace Shibboleth;
4 4
 
5
-require_once dirname(__FILE__) . '/scaffold/admin.class.php';
5
+require_once dirname(__FILE__).'/scaffold/admin.class.php';
6 6
 
7 7
 /**
8 8
  * A Chamilo admin. Model for the Admin table.
Please login to merge, or discard this patch.
main/auth/shibboleth/app/view/shibboleth_status_request_form.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
         $status_options = '';
53 53
         foreach ($items as $key => $value)
54 54
         {
55
-            $status_options.= "<option value=\"$key\">$value</option>";
55
+            $status_options .= "<option value=\"$key\">$value</option>";
56 56
         }
57 57
 
58 58
         return <<<EOT
Please login to merge, or discard this patch.
main/auth/shibboleth/config-dist.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,6 +11,6 @@
 block discarded – undo
11 11
  * @license see /license.txt
12 12
  * @author Laurent Opprecht <[email protected]>, Nicolas Rod for the University of Geneva
13 13
  */
14
-require_once dirname(__FILE__) . '/config/aai.class.php';
14
+require_once dirname(__FILE__).'/config/aai.class.php';
15 15
 
16 16
 Shibboleth::set_config(aai::config());
17 17
\ No newline at end of file
Please login to merge, or discard this patch.
main/auth/shibboleth/init.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -10,14 +10,14 @@
 block discarded – undo
10 10
  * @author Laurent Opprecht <[email protected]>, Nicolas Rod for the University of Geneva
11 11
  */
12 12
 
13
-$__dir = dirname(__FILE__) . '/';
14
-$no_redirection = true;  //no redirection in global.
15
-include_once($__dir . '/../../inc/global.inc.php');
13
+$__dir = dirname(__FILE__).'/';
14
+$no_redirection = true; //no redirection in global.
15
+include_once($__dir.'/../../inc/global.inc.php');
16 16
 
17
-require_once $__dir . 'config.php';
17
+require_once $__dir.'config.php';
18 18
 
19 19
 if (api_get_setting('server_type') == 'test')
20 20
 {
21
-    include_once $__dir . '/test/shibboleth_test_helper.class.php';
22
-    include_once $__dir . '/test/shibboleth_test.class.php';
21
+    include_once $__dir.'/test/shibboleth_test_helper.class.php';
22
+    include_once $__dir.'/test/shibboleth_test.class.php';
23 23
 }
Please login to merge, or discard this patch.
main/auth/shibboleth/script/scaffold.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,8 +12,8 @@
 block discarded – undo
12 12
  * @author Laurent Opprecht <[email protected]>, Nicolas Rod for the University of Geneva
13 13
  */
14 14
 $dir = dirname(__FILE__);
15
-include_once($dir . '/../init.php');
16
-include_once($dir . '/../app/lib/scaffolder/scaffolder.class.php');
15
+include_once($dir.'/../init.php');
16
+include_once($dir.'/../app/lib/scaffolder/scaffolder.class.php');
17 17
 
18 18
 if (!ShibbolethTest::is_enabled())
19 19
 {
Please login to merge, or discard this patch.
main/auth/shibboleth/lib/scaffolder/template/default.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
  * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html
24 24
  * @author Laurent Opprecht <[email protected]>
25 25
  */
26
-class <?php echo $prefix . $class_name ?>
26
+class <?php echo $prefix.$class_name ?>
27 27
 
28 28
 {
29 29
 
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
         return self::store()->create_object($data);
52 52
     }   
53 53
 
54
-<?php foreach($fields as $field){?>
54
+<?php foreach ($fields as $field) {?>
55 55
     public $<?php echo $field->name; ?> = <?php echo $field->def ? $field->def : 'null'; ?>;    
56 56
 <?php }?> 
57 57
     
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
  * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html
74 74
  * @author Laurent Opprecht <[email protected]>
75 75
  */
76
-class <?php echo $prefix . $class_name ?>Store extends Store
76
+class <?php echo $prefix.$class_name ?>Store extends Store
77 77
 {
78 78
 
79 79
     /**
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
     
93 93
     public function __construct()
94 94
     {
95
-        parent::__construct('<?php echo $table_name;?>', '<?php echo $class_name;?>', '<?php echo $id_name;?>');
95
+        parent::__construct('<?php echo $table_name; ?>', '<?php echo $class_name; ?>', '<?php echo $id_name; ?>');
96 96
     }
97 97
     
98 98
     /**
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
     {
115 115
         return parent::create_object($data);
116 116
     }    
117
-<?php foreach($keys as $key){?>
117
+<?php foreach ($keys as $key) {?>
118 118
     
119 119
     /**
120 120
      *
Please login to merge, or discard this patch.