Completed
Pull Request — 1.11.x (#1459)
by José
164:59 queued 133:05
created
plugin/add_facebook_login_button/index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 // Show the FACEBOOK login button
3
-$_template['show_message']   = false;
3
+$_template['show_message'] = false;
4 4
 
5 5
 //if (api_is_anonymous() && api_get_setting('facebook_login_activate') == 'true') {
6 6
 if (api_is_anonymous()) {
7 7
     require_once api_get_path(SYS_CODE_PATH)."auth/external_login/facebook.inc.php";
8
-    $_template['show_message']   = true;
8
+    $_template['show_message'] = true;
9 9
     // the default title
10 10
     $button_url = api_get_path(WEB_PLUGIN_PATH)."add_facebook_login_button/img/cnx_fb.png";
11 11
     $href_link = facebookGetLoginUrl();
Please login to merge, or discard this patch.
plugin/jcapture/action.php 3 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -11,18 +11,18 @@
 block discarded – undo
11 11
  
12 12
 class action_plugin_jcapture extends DokuWiki_Action_Plugin {
13 13
  
14
-  /**
15
-   * return some info
16
-   */
17
-  function getInfo(){
14
+    /**
15
+     * return some info
16
+     */
17
+    function getInfo(){
18 18
     return array(
19
-                 'author' => 'Pavel Vlasov',
20
-                 'email'  => '[email protected]',
21
-                 'name'   => 'JCapture',
22
-                 'desc'   => 'Plugin for making screen captures.',
23
-                 'url'    => 'http://www.nasdanika.com/wiki/doku.php?id=products:jcapture:start',
24
-                 );
25
-  }
19
+                    'author' => 'Pavel Vlasov',
20
+                    'email'  => '[email protected]',
21
+                    'name'   => 'JCapture',
22
+                    'desc'   => 'Plugin for making screen captures.',
23
+                    'url'    => 'http://www.nasdanika.com/wiki/doku.php?id=products:jcapture:start',
24
+                    );
25
+    }
26 26
 
27 27
     /**
28 28
      * Register the eventhandlers
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -6,15 +6,15 @@  discard block
 block discarded – undo
6 6
  */
7 7
  
8 8
 if (!defined('DOKU_INC')) die();
9
-if (!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/');
10
-require_once (DOKU_PLUGIN . 'action.php');
9
+if (!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN', DOKU_INC.'lib/plugins/');
10
+require_once (DOKU_PLUGIN.'action.php');
11 11
  
12 12
 class action_plugin_jcapture extends DokuWiki_Action_Plugin {
13 13
  
14 14
   /**
15 15
    * return some info
16 16
    */
17
-  function getInfo(){
17
+  function getInfo() {
18 18
     return array(
19 19
                  'author' => 'Pavel Vlasov',
20 20
                  'email'  => '[email protected]',
@@ -28,14 +28,14 @@  discard block
 block discarded – undo
28 28
      * Register the eventhandlers
29 29
      */
30 30
     function register(&$controller) {
31
-        $controller->register_hook('TOOLBAR_DEFINE', 'AFTER', $this, 'insert_button', array ());
31
+        $controller->register_hook('TOOLBAR_DEFINE', 'AFTER', $this, 'insert_button', array());
32 32
     }
33 33
  
34 34
     /**
35 35
      * Inserts the toolbar button
36 36
      */
37 37
     function insert_button(& $event, $param) {
38
-        $event->data[] = array (
38
+        $event->data[] = array(
39 39
             'type' => 'JCapture',
40 40
             'title' => 'Screen capture',
41 41
             'icon' => '../../plugins/jcapture/camera.png',
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -5,8 +5,12 @@
 block discarded – undo
5 5
  * @author Pavel Vlasov
6 6
  */
7 7
  
8
-if (!defined('DOKU_INC')) die();
9
-if (!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/');
8
+if (!defined('DOKU_INC')) {
9
+    die();
10
+}
11
+if (!defined('DOKU_PLUGIN')) {
12
+    define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/');
13
+}
10 14
 require_once (DOKU_PLUGIN . 'action.php');
11 15
  
12 16
 class action_plugin_jcapture extends DokuWiki_Action_Plugin {
Please login to merge, or discard this patch.
plugin/jcapture/upload.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,9 +21,9 @@
 block discarded – undo
21 21
 $documentId = DocumentManager::get_document_id($courseInfo, '/'.$folderName);
22 22
 $path = null;
23 23
 if (empty($documentId)) {
24
-    $course_dir = $courseInfo['path'] . '/document';
24
+    $course_dir = $courseInfo['path'].'/document';
25 25
     $sys_course_path = api_get_path(SYS_COURSE_PATH);
26
-    $dir = $sys_course_path . $course_dir;
26
+    $dir = $sys_course_path.$course_dir;
27 27
     $createdDir = create_unexisting_directory(
28 28
         $courseInfo,
29 29
         api_get_user_id(),
Please login to merge, or discard this patch.
plugin/jcapture/applet.php 3 patches
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -1,31 +1,31 @@
 block discarded – undo
1 1
 <?php 
2 2
 
3
-	//fix for Opera XMLHttpRequests
4
-	if(!count($_POST) && $HTTP_RAW_POST_DATA){
5
-	  parse_str($HTTP_RAW_POST_DATA, $_POST);
6
-	}
3
+    //fix for Opera XMLHttpRequests
4
+    if(!count($_POST) && $HTTP_RAW_POST_DATA){
5
+        parse_str($HTTP_RAW_POST_DATA, $_POST);
6
+    }
7 7
 	
8
-	if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../../');
9
-	require_once(DOKU_INC.'inc/init.php');
10
-	require_once(DOKU_INC.'inc/common.php');
11
-	require_once(DOKU_INC.'inc/pageutils.php');
12
-	require_once(DOKU_INC.'inc/auth.php');
13
-	//close sesseion
14
-	session_write_close();
8
+    if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../../');
9
+    require_once(DOKU_INC.'inc/init.php');
10
+    require_once(DOKU_INC.'inc/common.php');
11
+    require_once(DOKU_INC.'inc/pageutils.php');
12
+    require_once(DOKU_INC.'inc/auth.php');
13
+    //close sesseion
14
+    session_write_close();
15 15
 	
16
-	header('Content-Type: text/html; charset=utf-8');
16
+    header('Content-Type: text/html; charset=utf-8');
17 17
 	
18
-	$hostName = "http".($_SERVER['HTTPS'] ? 's' : null).'://'.$_SERVER['HTTP_HOST']; 
18
+    $hostName = "http".($_SERVER['HTTPS'] ? 's' : null).'://'.$_SERVER['HTTP_HOST']; 
19 19
 	
20
-	$imageFormat = "PNG";
20
+    $imageFormat = "PNG";
21 21
 
22
-	$cookies;
23
-	foreach (array_keys($_COOKIE) as $cookieName) {
24
-		$cookies.=bin2hex($cookieName)."=".bin2hex($_COOKIE[$cookieName]).";";
25
-	} 
22
+    $cookies;
23
+    foreach (array_keys($_COOKIE) as $cookieName) {
24
+        $cookies.=bin2hex($cookieName)."=".bin2hex($_COOKIE[$cookieName]).";";
25
+    } 
26 26
 	
27
-	$pageName = $_GET["pageName"];
28
-	$edid = $_GET["edid"];
27
+    $pageName = $_GET["pageName"];
28
+    $edid = $_GET["edid"];
29 29
 ?>
30 30
 
31 31
 <script language="JavaScript" type="text/javascript"><!--
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php 
2 2
 
3 3
 	//fix for Opera XMLHttpRequests
4
-	if(!count($_POST) && $HTTP_RAW_POST_DATA){
4
+	if (!count($_POST) && $HTTP_RAW_POST_DATA) {
5 5
 	  parse_str($HTTP_RAW_POST_DATA, $_POST);
6 6
 	}
7 7
 	
8
-	if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../../');
8
+	if (!defined('DOKU_INC')) define('DOKU_INC', dirname(__FILE__).'/../../../');
9 9
 	require_once(DOKU_INC.'inc/init.php');
10 10
 	require_once(DOKU_INC.'inc/common.php');
11 11
 	require_once(DOKU_INC.'inc/pageutils.php');
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 
22 22
 	$cookies;
23 23
 	foreach (array_keys($_COOKIE) as $cookieName) {
24
-		$cookies.=bin2hex($cookieName)."=".bin2hex($_COOKIE[$cookieName]).";";
24
+		$cookies .= bin2hex($cookieName)."=".bin2hex($_COOKIE[$cookieName]).";";
25 25
 	} 
26 26
 	
27 27
 	$pageName = $_GET["pageName"];
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,9 @@
 block discarded – undo
5 5
 	  parse_str($HTTP_RAW_POST_DATA, $_POST);
6 6
 	}
7 7
 	
8
-	if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../../');
8
+	if(!defined('DOKU_INC')) {
9
+	    define('DOKU_INC',dirname(__FILE__).'/../../../');
10
+	}
9 11
 	require_once(DOKU_INC.'inc/init.php');
10 12
 	require_once(DOKU_INC.'inc/common.php');
11 13
 	require_once(DOKU_INC.'inc/pageutils.php');
Please login to merge, or discard this patch.
plugin/jcapture/plugin_applet.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
 $imageFormat = "PNG";
25 25
 $cookies = null;
26 26
 foreach (array_keys($_COOKIE) as $cookieName) {
27
-    $cookies.=bin2hex($cookieName)."=".bin2hex($_COOKIE[$cookieName]).";";
27
+    $cookies .= bin2hex($cookieName)."=".bin2hex($_COOKIE[$cookieName]).";";
28 28
 }
29 29
 
30 30
 $pageName = 'file';
Please login to merge, or discard this patch.
plugin/date/index.act.php 2 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -7,15 +7,15 @@
 block discarded – undo
7 7
  * Initialization
8 8
  */
9 9
 $convert_lang_to_code = array(
10
-  "english" => "en_US",
11
-  "french"  => "fr_BE",
12
-  "dutch" => "nl_NL",
13
-  "german" => "de_DE",
14
-  "japanese" => "ja_JP",
15
-  "danish" => "da_DK",
10
+    "english" => "en_US",
11
+    "french"  => "fr_BE",
12
+    "dutch" => "nl_NL",
13
+    "german" => "de_DE",
14
+    "japanese" => "ja_JP",
15
+    "danish" => "da_DK",
16 16
 );
17 17
 if(!empty($_SESSION['user_language_choice']) && !empty($convert_lang_to_code[$_SESSION['user_language_choice']])){
18
-  $code = $convert_lang_to_code[$_SESSION['user_language_choice']];
19
-  $locale = setlocale(LC_TIME,$code);
18
+    $code = $convert_lang_to_code[$_SESSION['user_language_choice']];
19
+    $locale = setlocale(LC_TIME,$code);
20 20
 }
21 21
 $date = strftime('%c');
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,8 +14,8 @@
 block discarded – undo
14 14
   "japanese" => "ja_JP",
15 15
   "danish" => "da_DK",
16 16
 );
17
-if(!empty($_SESSION['user_language_choice']) && !empty($convert_lang_to_code[$_SESSION['user_language_choice']])){
17
+if (!empty($_SESSION['user_language_choice']) && !empty($convert_lang_to_code[$_SESSION['user_language_choice']])) {
18 18
   $code = $convert_lang_to_code[$_SESSION['user_language_choice']];
19
-  $locale = setlocale(LC_TIME,$code);
19
+  $locale = setlocale(LC_TIME, $code);
20 20
 }
21 21
 $date = strftime('%c');
Please login to merge, or discard this patch.
plugin/date/plugin.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -9,10 +9,10 @@
 block discarded – undo
9 9
  * Plugin details (must be present)
10 10
  */
11 11
 //the plugin title
12
-$plugin_info['title']='Date';
12
+$plugin_info['title'] = 'Date';
13 13
 //the comments that go with the plugin
14
-$plugin_info['comment']="Multinational date display";
14
+$plugin_info['comment'] = "Multinational date display";
15 15
 //the plugin version
16
-$plugin_info['version']='1.0';
16
+$plugin_info['version'] = '1.0';
17 17
 //the plugin author
18
-$plugin_info['author']='Yannick Warnier';
18
+$plugin_info['author'] = 'Yannick Warnier';
Please login to merge, or discard this patch.
plugin/olpc_peru_filter/lib/olpc_peru_filter_plugin.class.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
         $list = $this->get_blacklist_options();
34 34
         foreach ($list as $k => $v) {
35 35
             $this->course_settings[] =
36
-              array('group'=> 'olpc_peru_filter_filter', 'name' => $k,  'type' => 'checkbox', 'init_value' => $v);
36
+                array('group'=> 'olpc_peru_filter_filter', 'name' => $k,  'type' => 'checkbox', 'init_value' => $v);
37 37
         }
38 38
         require_once dirname(__FILE__).'/../config.php';
39 39
         if (!empty($blacklist_enabled_file)) {
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
         $list = $this->get_blacklist_options();
34 34
         foreach ($list as $k => $v) {
35 35
             $this->course_settings[] =
36
-              array('group'=> 'olpc_peru_filter_filter', 'name' => $k,  'type' => 'checkbox', 'init_value' => $v);
36
+              array('group'=> 'olpc_peru_filter_filter', 'name' => $k, 'type' => 'checkbox', 'init_value' => $v);
37 37
         }
38 38
         require_once dirname(__FILE__).'/../config.php';
39 39
         if (!empty($blacklist_enabled_file)) {
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
     }
66 66
 
67 67
     function course_settings_updated($values = array()) {
68
-        if (!is_array($values) or count($values)==0) {
68
+        if (!is_array($values) or count($values) == 0) {
69 69
             return false;
70 70
         }
71 71
         $this->set_blacklist_options($values['olpc_peru_filter_filter']);
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
         }
87 87
         $list = scandir($this->blacklists_dir);
88 88
         foreach ($list as $file) {
89
-            if (substr($file,0,1) == '.' or $file == 'custom_blacklist' or is_dir($this->blacklists_dir.'/'.$file)) {
89
+            if (substr($file, 0, 1) == '.' or $file == 'custom_blacklist' or is_dir($this->blacklists_dir.'/'.$file)) {
90 90
                 continue;
91 91
             }
92 92
             $categories[] = $file;
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
                 $new_blacklist .= $k."\n";
122 122
             }
123 123
         }
124
-        $r = @file_put_contents($this->blacklist_enabled_file,$new_blacklist);
124
+        $r = @file_put_contents($this->blacklist_enabled_file, $new_blacklist);
125 125
         //todo check the value or $r in $php_errormsg
126 126
         return true;
127 127
     }
Please login to merge, or discard this patch.
plugin/clockworksms/config.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
  * @package chamilo.plugin.clockworksms
8 8
  * @author  Imanol Losada <[email protected]>
9 9
  */
10
-require_once __DIR__ . '/../../main/inc/global.inc.php';
10
+require_once __DIR__.'/../../main/inc/global.inc.php';
11 11
 
12 12
 require_once 'lib/clockworksms.lib.php';
13 13
 require_once 'vendor/clockworksms_api.php';
Please login to merge, or discard this patch.