Completed
Push — master ( 5061b6...54eaec )
by Michael
12:20 queued 12:16
created
htdocs/class/downloader.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
      * @param boolean|string $newfilename
75 75
      * @return void
76 76
      */
77
-     abstract function addFile($filepath, $newfilename = null);
77
+        abstract function addFile($filepath, $newfilename = null);
78 78
 
79 79
     /**
80 80
      * @abstract
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -55,14 +55,14 @@
 block discarded – undo
55 55
         if (function_exists('mb_http_output')) {
56 56
             mb_http_output('pass');
57 57
         }
58
-        header('Content-Type: ' . $this->mimetype);
58
+        header('Content-Type: '.$this->mimetype);
59 59
         if (preg_match("/MSIE ([0-9]\.[0-9]{1,2})/", $_SERVER['HTTP_USER_AGENT'])) {
60
-            header('Content-Disposition: attachment; filename="' . $filename . '"');
60
+            header('Content-Disposition: attachment; filename="'.$filename.'"');
61 61
             header('Expires: 0');
62 62
             header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
63 63
             header('Pragma: public');
64 64
         } else {
65
-            header('Content-Disposition: attachment; filename="' . $filename . '"');
65
+            header('Content-Disposition: attachment; filename="'.$filename.'"');
66 66
             header('Expires: 0');
67 67
             header('Pragma: no-cache');
68 68
         }
Please login to merge, or discard this patch.
htdocs/class/xoopseditor/xoopseditor.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
         // TODO: switch to property_exists() as of PHP 5.1.0
85 85
         $vars = get_class_vars(__CLASS__);
86 86
         foreach ($configs as $key => $val) {
87
-            $method = "set" . ucfirst($key);
87
+            $method = "set".ucfirst($key);
88 88
             if (method_exists($this, $method)) {
89 89
                 $this->$method($val);
90 90
             } else {
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
      */
155 155
     private function __construct()
156 156
     {
157
-        $this->root_path = \XoopsBaseConfig::get('root-path') . '/class/xoopseditor';
157
+        $this->root_path = \XoopsBaseConfig::get('root-path').'/class/xoopseditor';
158 158
     }
159 159
 
160 160
     /**
@@ -205,17 +205,17 @@  discard block
 block discarded – undo
205 205
     {
206 206
         $list = array();
207 207
         $order = array();
208
-        $fileList = XoopsLists::getDirListAsArray($this->root_path . '/');
208
+        $fileList = XoopsLists::getDirListAsArray($this->root_path.'/');
209 209
 
210 210
         foreach ($fileList as $item) {
211
-            if (XoopsLoad::fileExists($file = $this->root_path . '/' . $item . '/language/' . XoopsLocale::getLegacyLanguage() . '.php')) {
211
+            if (XoopsLoad::fileExists($file = $this->root_path.'/'.$item.'/language/'.XoopsLocale::getLegacyLanguage().'.php')) {
212 212
                 include_once $file;
213 213
             } else {
214
-                if (XoopsLoad::fileExists($file = $this->root_path . '/' . $item . '/language/english.php')) {
214
+                if (XoopsLoad::fileExists($file = $this->root_path.'/'.$item.'/language/english.php')) {
215 215
                     include_once $file;
216 216
                 }
217 217
             }
218
-            if (XoopsLoad::fileExists($file = $this->root_path . '/' . $item . '/editor_registry.php')) {
218
+            if (XoopsLoad::fileExists($file = $this->root_path.'/'.$item.'/editor_registry.php')) {
219 219
                 include $file;
220 220
                 if (empty($config['order'])) {
221 221
                     continue;
@@ -277,15 +277,15 @@  discard block
 block discarded – undo
277 277
         if (empty($name) || !array_key_exists($name, $this->getList())) {
278 278
             return $editor;
279 279
         }
280
-        $editor_path = $this->root_path . '/' . $name;
281
-        if (XoopsLoad::fileExists($file = $editor_path . '/language/' . XoopsLocale::getLegacyLanguage() . '.php')) {
280
+        $editor_path = $this->root_path.'/'.$name;
281
+        if (XoopsLoad::fileExists($file = $editor_path.'/language/'.XoopsLocale::getLegacyLanguage().'.php')) {
282 282
             include_once $file;
283 283
         } else {
284
-            if (XoopsLoad::fileExists($file = $editor_path . '/language/english.php')) {
284
+            if (XoopsLoad::fileExists($file = $editor_path.'/language/english.php')) {
285 285
                 include_once $file;
286 286
             }
287 287
         }
288
-        if (XoopsLoad::fileExists($file = $editor_path . '/editor_registry.php')) {
288
+        if (XoopsLoad::fileExists($file = $editor_path.'/editor_registry.php')) {
289 289
             include $file;
290 290
         } else {
291 291
             return $editor;
Please login to merge, or discard this patch.
htdocs/class/xoopseditor/dhtmltextarea/dhtmltextarea.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
     public function __construct($options = array())
40 40
     {
41 41
         parent::__construct($options);
42
-        $this->rootPath = '/class/xoopseditor/' . basename(__DIR__);
42
+        $this->rootPath = '/class/xoopseditor/'.basename(__DIR__);
43 43
         $hiddenText = isset($this->configs['hiddenText']) ? $this->configs['hiddenText'] : $this->_hiddenText;
44 44
         $this->renderer = new Xoops\Form\DhtmlTextArea('', $this->getName(), $this->getValue(), $this->getRows(), $this->getCols(), $hiddenText, $this->configs);
45 45
     }
Please login to merge, or discard this patch.
htdocs/class/xoopseditor/dhtmltextarea/editor_registry.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
 
24 24
 return $config = array(
25 25
     'class' => 'FormDhtmlTextArea',
26
-    'file' => \XoopsBaseConfig::get('root-path') . '/class/xoopseditor/dhtmltextarea/dhtmltextarea.php',
26
+    'file' => \XoopsBaseConfig::get('root-path').'/class/xoopseditor/dhtmltextarea/dhtmltextarea.php',
27 27
     'title' => _XOOPS_EDITOR_DHTMLTEXTAREA,
28 28
     'order' => 2,
29 29
     'nohtml' => 1
Please login to merge, or discard this patch.
htdocs/class/xoopseditor/dhtmltextarea/language/english.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,4 +12,4 @@
 block discarded – undo
12 12
 /**
13 13
  * Assocated with editor_registry.php
14 14
  */
15
-define('_XOOPS_EDITOR_DHTMLTEXTAREA','DHTML Form with xCode');
15
+define('_XOOPS_EDITOR_DHTMLTEXTAREA', 'DHTML Form with xCode');
Please login to merge, or discard this patch.
htdocs/class/xoopseditor/xoopseditor.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,9 +27,9 @@
 block discarded – undo
27 27
      */
28 28
     function xoopseditor_get_rootpath()
29 29
     {
30
-        return \XoopsBaseConfig::get('root-path') . '/class/xoopseditor';
30
+        return \XoopsBaseConfig::get('root-path').'/class/xoopseditor';
31 31
     }
32 32
 }
33 33
 
34
-$mainfile = dirname(dirname(__DIR__)) . '/mainfile.php';
34
+$mainfile = dirname(dirname(__DIR__)).'/mainfile.php';
35 35
 require $mainfile;
Please login to merge, or discard this patch.
htdocs/class/xoopseditor/tinymce4/formtinymce.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
     public function getFonts()
108 108
     {
109 109
         if (empty($this->config["fonts"]) && defined("_XOOPS_EDITOR_TINYMCE4_FONTS")) {
110
-             $this->config["fonts"] = constant("_XOOPS_EDITOR_TINYMCE4_FONTS");
110
+                $this->config["fonts"] = constant("_XOOPS_EDITOR_TINYMCE4_FONTS");
111 111
         }
112 112
 
113 113
         return @$this->config["fonts"];
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
      */
134 134
     public function isActive()
135 135
     {
136
-		$xoops_root_path = \XoopsBaseConfig::get('root-path');
136
+        $xoops_root_path = \XoopsBaseConfig::get('root-path');
137 137
         return is_readable($xoops_root_path . $this->rootPath . "/tinymce.php");
138 138
     }
139 139
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
         $this->configs["area_height"] = isset($this->configs["height"]) ? $this->configs["height"] : $this->height;
54 54
         $this->configs["fonts"] = $this->getFonts();
55 55
 
56
-        require_once __DIR__ . "/tinymce.php";
56
+        require_once __DIR__."/tinymce.php";
57 57
         $this->editor = new TinyMCE($this->configs);
58 58
     }
59 59
 
@@ -73,8 +73,8 @@  discard block
 block discarded – undo
73 73
             $eltmsg = empty($eltcaption) ? sprintf(XoopsLocale::F_ENTER, $eltname) : sprintf(XoopsLocale::F_ENTER, $eltcaption);
74 74
             $eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
75 75
             $ret = "\n";
76
-            $ret.= "if ( tinyMCE.get('{$eltname}').getContent() == \"\" || tinyMCE.get('{$eltname}').getContent() == null) ";
77
-            $ret.= "{ window.alert(\"{$eltmsg}\"); tinyMCE.get('{$eltname}').focus(); return false; }";
76
+            $ret .= "if ( tinyMCE.get('{$eltname}').getContent() == \"\" || tinyMCE.get('{$eltname}').getContent() == null) ";
77
+            $ret .= "{ window.alert(\"{$eltmsg}\"); tinyMCE.get('{$eltname}').focus(); return false; }";
78 78
 
79 79
             return $ret;
80 80
         }
@@ -134,6 +134,6 @@  discard block
 block discarded – undo
134 134
     public function isActive()
135 135
     {
136 136
 		$xoops_root_path = \XoopsBaseConfig::get('root-path');
137
-        return is_readable($xoops_root_path . $this->rootPath . "/tinymce.php");
137
+        return is_readable($xoops_root_path.$this->rootPath."/tinymce.php");
138 138
     }
139 139
 }
Please login to merge, or discard this patch.
htdocs/class/xoopseditor/tinymce4/settings.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -55,28 +55,28 @@
 block discarded – undo
55 55
     "accessibility_focus" => true,
56 56
     // if true, some accessibility warnings will be presented to the user
57 57
     "accessibility_warnings" => true,
58
-	//image_advtab: True/false option if the advanced tab should be displayed or not.
59
-	"image_advtab" => true,
58
+    //image_advtab: True/false option if the advanced tab should be displayed or not.
59
+    "image_advtab" => true,
60 60
 
61
-	// Display or not the menu bar"
62
-	"menubar" => true,
61
+    // Display or not the menu bar"
62
+    "menubar" => true,
63 63
 	
64 64
 
65 65
 // load plugins
66
-	"plugins" => "advlist,autolink,lists,link,image,preview,hr,anchor,".
67
-				 "searchreplace,wordcount,visualblocks,visualchars,code,fullscreen,".
68
-				 "insertdatetime,media,nonbreaking,save,table,contextmenu,directionality,".
69
-				 "emoticons,template,paste,textcolor,".
70
-				 "xoops_quote,xoops_code,xoops_tagextgal,".
71
-				 "filemanager,responsivefilemanager,youtube,qrcode,alignbtn,chartextbtn",
66
+    "plugins" => "advlist,autolink,lists,link,image,preview,hr,anchor,".
67
+                    "searchreplace,wordcount,visualblocks,visualchars,code,fullscreen,".
68
+                    "insertdatetime,media,nonbreaking,save,table,contextmenu,directionality,".
69
+                    "emoticons,template,paste,textcolor,".
70
+                    "xoops_quote,xoops_code,xoops_tagextgal,".
71
+                    "filemanager,responsivefilemanager,youtube,qrcode,alignbtn,chartextbtn",
72 72
 
73 73
 
74 74
 //	"exclude_plugins" => "autosave,bbcode,example,fullpage",
75 75
 //  "content_css" => "editor_xoops.css",
76 76
 
77 77
     "toolbar1" => "chartext align table | forecolor backcolor bullist numlist | styleselect formatselect",
78
-	"toolbar2" => "responsivefilemanager image media youtube | link unlink anchor | qrcode emoticons hr xoops_emoticons xoops_quote xoops_code xoops_tagextgal template",
79
-	"toolbar3" => "undo redo preview fullscreen removeformat visualblocks code",
78
+    "toolbar2" => "responsivefilemanager image media youtube | link unlink anchor | qrcode emoticons hr xoops_emoticons xoops_quote xoops_code xoops_tagextgal template",
79
+    "toolbar3" => "undo redo preview fullscreen removeformat visualblocks code",
80 80
 
81 81
     // Full XHTML rule set
82 82
     "valid_elements" => ""
Please login to merge, or discard this patch.
class/xoopseditor/tinymce4/external_plugins/filemanager/lang/fr_FR.php 1 patch
Spacing   +67 added lines, -67 removed lines patch added patch discarded remove patch
@@ -1,74 +1,74 @@
 block discarded – undo
1 1
 <?php
2
-define('lang_Select','Sélectionner');
3
-define('lang_Erase','Effacer');
4
-define('lang_Open','Ouvrir');
5
-define('lang_Confirm_del','Êtes-vous sûr de vouloir effacer ce fichier ?');
6
-define('lang_All','Tous');
7
-define('lang_Files','Fichiers');
8
-define('lang_Images','Images');
9
-define('lang_Archives','Archives');
2
+define('lang_Select', 'Sélectionner');
3
+define('lang_Erase', 'Effacer');
4
+define('lang_Open', 'Ouvrir');
5
+define('lang_Confirm_del', 'Êtes-vous sûr de vouloir effacer ce fichier ?');
6
+define('lang_All', 'Tous');
7
+define('lang_Files', 'Fichiers');
8
+define('lang_Images', 'Images');
9
+define('lang_Archives', 'Archives');
10 10
 define('lang_Error_Upload', 'Votre fichier dépasse la taille maximum autorisée.');
11
-define('lang_Error_extension','Extension de fichier non autorisée');
12
-define('lang_Upload_file','Envoyer un fichier');
13
-define('lang_Filters','Filtrer');
14
-define('lang_Videos','Vidéos');
15
-define('lang_Music','Musique');
16
-define('lang_New_Folder','Nouveau dossier');
17
-define('lang_Folder_Created','Dossier correctement créé');
18
-define('lang_Existing_Folder','Dossier existant');
19
-define('lang_Confirm_Folder_del','Êtes-vous sûr de vouloir supprimer le dossier ainsi que tous ses éléments ?');
20
-define('lang_Return_Files_List','Revenir à la liste des fichiers');
21
-define('lang_Preview','Aperçu');
22
-define('lang_Download','Télécharger');
23
-define('lang_Insert_Folder_Name','Insérer le nom du dossier:');
24
-define('lang_Root','Racine');
25
-define('lang_Rename','Renommer');
26
-define('lang_Back','Retour');
27
-define('lang_View','Vue');
28
-define('lang_View_list','Vue par liste');
29
-define('lang_View_columns_list','Vue par listes de colonne');
30
-define('lang_View_boxes','Vue par icônes');
31
-define('lang_Toolbar','Barre d\'outils');
32
-define('lang_Actions','Actions');
33
-define('lang_Rename_existing_file','Ce fichier existe déjà');
34
-define('lang_Rename_existing_folder','Ce dossier existe déjà');
35
-define('lang_Empty_name','Le nom est vide');
36
-define('lang_Text_filter','texte de filtrage');
37
-define('lang_Swipe_help','Swipe the name of file/folder to show options');
38
-define('lang_Upload_base','Base upload');
39
-define('lang_Upload_java','JAVA upload (big size files)');
40
-define('lang_Upload_java_help',"If the Java Applet don't load 1. make sure you have Java installed otherwise <a href='http://java.com/en/download/'>[download link]</a> 2. make sure nothing is blocked from firewall");
41
-define('lang_Upload_base_help',"Drag & Drop file/s inside above area or click in it (for modern browsers) otherwise select the file and click on button. When the upload end, click on upper return button.");
42
-define('lang_Type_dir','dir');
43
-define('lang_Type','Type');
44
-define('lang_Dimension','Dimension');
45
-define('lang_Size','Taille');
46
-define('lang_Date','Date');
47
-define('lang_Filename','Nom');
48
-define('lang_Operations','Opérations');
49
-define('lang_Date_type','d/m/Y');
50
-define('lang_OK','OK');
51
-define('lang_Cancel','Annuler');
52
-define('lang_Sorting','Trier');
53
-define('lang_Show_url','Afficher l\'URL');
54
-define('lang_Extract','Extraire ici');
55
-define('lang_File_info','Information');
56
-define('lang_Edit_image','Editer l\'image');
57
-define('lang_Duplicate','Dupliquer');
11
+define('lang_Error_extension', 'Extension de fichier non autorisée');
12
+define('lang_Upload_file', 'Envoyer un fichier');
13
+define('lang_Filters', 'Filtrer');
14
+define('lang_Videos', 'Vidéos');
15
+define('lang_Music', 'Musique');
16
+define('lang_New_Folder', 'Nouveau dossier');
17
+define('lang_Folder_Created', 'Dossier correctement créé');
18
+define('lang_Existing_Folder', 'Dossier existant');
19
+define('lang_Confirm_Folder_del', 'Êtes-vous sûr de vouloir supprimer le dossier ainsi que tous ses éléments ?');
20
+define('lang_Return_Files_List', 'Revenir à la liste des fichiers');
21
+define('lang_Preview', 'Aperçu');
22
+define('lang_Download', 'Télécharger');
23
+define('lang_Insert_Folder_Name', 'Insérer le nom du dossier:');
24
+define('lang_Root', 'Racine');
25
+define('lang_Rename', 'Renommer');
26
+define('lang_Back', 'Retour');
27
+define('lang_View', 'Vue');
28
+define('lang_View_list', 'Vue par liste');
29
+define('lang_View_columns_list', 'Vue par listes de colonne');
30
+define('lang_View_boxes', 'Vue par icônes');
31
+define('lang_Toolbar', 'Barre d\'outils');
32
+define('lang_Actions', 'Actions');
33
+define('lang_Rename_existing_file', 'Ce fichier existe déjà');
34
+define('lang_Rename_existing_folder', 'Ce dossier existe déjà');
35
+define('lang_Empty_name', 'Le nom est vide');
36
+define('lang_Text_filter', 'texte de filtrage');
37
+define('lang_Swipe_help', 'Swipe the name of file/folder to show options');
38
+define('lang_Upload_base', 'Base upload');
39
+define('lang_Upload_java', 'JAVA upload (big size files)');
40
+define('lang_Upload_java_help', "If the Java Applet don't load 1. make sure you have Java installed otherwise <a href='http://java.com/en/download/'>[download link]</a> 2. make sure nothing is blocked from firewall");
41
+define('lang_Upload_base_help', "Drag & Drop file/s inside above area or click in it (for modern browsers) otherwise select the file and click on button. When the upload end, click on upper return button.");
42
+define('lang_Type_dir', 'dir');
43
+define('lang_Type', 'Type');
44
+define('lang_Dimension', 'Dimension');
45
+define('lang_Size', 'Taille');
46
+define('lang_Date', 'Date');
47
+define('lang_Filename', 'Nom');
48
+define('lang_Operations', 'Opérations');
49
+define('lang_Date_type', 'd/m/Y');
50
+define('lang_OK', 'OK');
51
+define('lang_Cancel', 'Annuler');
52
+define('lang_Sorting', 'Trier');
53
+define('lang_Show_url', 'Afficher l\'URL');
54
+define('lang_Extract', 'Extraire ici');
55
+define('lang_File_info', 'Information');
56
+define('lang_Edit_image', 'Editer l\'image');
57
+define('lang_Duplicate', 'Dupliquer');
58 58
 define('lang_Folders', 'Folders');
59
-define('lang_Copy','Copy');
60
-define('lang_Cut','Cut');
61
-define('lang_Paste','Paste');
59
+define('lang_Copy', 'Copy');
60
+define('lang_Cut', 'Cut');
61
+define('lang_Paste', 'Paste');
62 62
 define('lang_CB', 'CB'); // clipboard
63
-define('lang_Paste_Here','Paste to this directory');
64
-define('lang_Paste_Confirm','Are you sure you want to paste to this directory? This will overwrite existing files/folders if encountered any.');
65
-define('lang_Paste_Failed','Failed to paste file(s)');
66
-define('lang_Clear_Clipboard','Clear clipboard');
67
-define('lang_Clear_Clipboard_Confirm','Are you sure you want to clear the clipboard?');
68
-define('lang_Files_ON_Clipboard','There are files on the clipboard.');
69
-define('lang_Copy_Cut_Size_Limit','The selected files/folders are too big to %s. Limit: %d MB/operation'); // %s = cut or copy
70
-define('lang_Copy_Cut_Count_Limit','You selected too many files/folders to %s. Limit: %d files/operation'); // %s = cut or copy
71
-define('lang_Copy_Cut_Not_Allowed','You are not allowed to %s files.'); // %s(1) = cut or copy, %s(2) = files or folders
63
+define('lang_Paste_Here', 'Paste to this directory');
64
+define('lang_Paste_Confirm', 'Are you sure you want to paste to this directory? This will overwrite existing files/folders if encountered any.');
65
+define('lang_Paste_Failed', 'Failed to paste file(s)');
66
+define('lang_Clear_Clipboard', 'Clear clipboard');
67
+define('lang_Clear_Clipboard_Confirm', 'Are you sure you want to clear the clipboard?');
68
+define('lang_Files_ON_Clipboard', 'There are files on the clipboard.');
69
+define('lang_Copy_Cut_Size_Limit', 'The selected files/folders are too big to %s. Limit: %d MB/operation'); // %s = cut or copy
70
+define('lang_Copy_Cut_Count_Limit', 'You selected too many files/folders to %s. Limit: %d files/operation'); // %s = cut or copy
71
+define('lang_Copy_Cut_Not_Allowed', 'You are not allowed to %s files.'); // %s(1) = cut or copy, %s(2) = files or folders
72 72
 define('lang_Aviary_No_Save', 'Could not save image');
73 73
 define('lang_Zip_No_Extract', 'Could not extract. File might be corrupt.');
74 74
 define('lang_Zip_Invalid', 'This extension is not supported. Valid: zip, gz, tar.');
Please login to merge, or discard this patch.