Completed
Pull Request — master (#588)
by
unknown
14:32
created
extras/modules/system/language/english/admin/filemanager.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
6 6
  * _CHARSET     UTF-8
7 7
  */
8 8
 
9
- //Nav
9
+    //Nav
10 10
 define('_AM_SYSTEM_FILEMANAGER_NAV_MANAGER','File Manager');
11 11
 define('_AM_SYSTEM_FILEMANAGER_NAV_MAIN','File Manager');
12 12
 
Please login to merge, or discard this patch.
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -7,56 +7,56 @@
 block discarded – undo
7 7
  */
8 8
 
9 9
  //Nav
10
-define('_AM_SYSTEM_FILEMANAGER_NAV_MANAGER','File Manager');
11
-define('_AM_SYSTEM_FILEMANAGER_NAV_MAIN','File Manager');
10
+define('_AM_SYSTEM_FILEMANAGER_NAV_MANAGER', 'File Manager');
11
+define('_AM_SYSTEM_FILEMANAGER_NAV_MAIN', 'File Manager');
12 12
 
13 13
 //Tips
14
-define('_AM_SYSTEM_FILEMANAGER_NAV_TIPS','
14
+define('_AM_SYSTEM_FILEMANAGER_NAV_TIPS', '
15 15
 <ul>
16 16
 <li>Change file permission, content or just delete an unused file from your XOOPS site.</li>
17 17
 </ul>
18 18
 ');
19 19
 
20 20
 // Main
21
-define('_AM_SYSTEM_FILEMANAGER_DIRECTORY','Directory');
22
-define('_AM_SYSTEM_FILEMANAGER_FILES','Files');
23
-define('_AM_SYSTEM_FILEMANAGER_GENERATE','Force generation');
24
-define('_AM_SYSTEM_FILEMANAGER_SELECT_THEME','Select theme');
25
-define('_AM_SYSTEM_FILEMANAGER_FORCE_GENERATED','Force generated');
26
-define('_AM_SYSTEM_FILEMANAGER_NAV_FILE_GENERATED','Files generated');
27
-define('_AM_SYSTEM_FILEMANAGER_NOT_CREATED','No files created');
28
-define('_AM_SYSTEM_FILEMANAGER_HOME','Home');
29
-define('_AM_SYSTEM_FILEMANAGER_SAVE','Save');
30
-define('_AM_SYSTEM_FILEMANAGER_CANCEL','Cancel');
31
-define('_AM_SYSTEM_FILEMANAGER_RESTORE','Restore');
32
-define('_AM_SYSTEM_FILEMANAGER_REFRESH','Refresh');
33
-define('_AM_SYSTEM_FILEMANAGER_UPLOAD','Upload file');
34
-define('_AM_SYSTEM_FILEMANAGER_UPLOAD_CHOOSE','Select file to upload');
35
-define('_AM_SYSTEM_FILEMANAGER_ADDDIR','Add Directory');
36
-define('_AM_SYSTEM_FILEMANAGER_ADDDIR_NAME','Choose name of directory');
37
-define('_AM_SYSTEM_FILEMANAGER_ADDFILE','Add New File');
38
-define('_AM_SYSTEM_FILEMANAGER_DELDIR','Delete Directory');
21
+define('_AM_SYSTEM_FILEMANAGER_DIRECTORY', 'Directory');
22
+define('_AM_SYSTEM_FILEMANAGER_FILES', 'Files');
23
+define('_AM_SYSTEM_FILEMANAGER_GENERATE', 'Force generation');
24
+define('_AM_SYSTEM_FILEMANAGER_SELECT_THEME', 'Select theme');
25
+define('_AM_SYSTEM_FILEMANAGER_FORCE_GENERATED', 'Force generated');
26
+define('_AM_SYSTEM_FILEMANAGER_NAV_FILE_GENERATED', 'Files generated');
27
+define('_AM_SYSTEM_FILEMANAGER_NOT_CREATED', 'No files created');
28
+define('_AM_SYSTEM_FILEMANAGER_HOME', 'Home');
29
+define('_AM_SYSTEM_FILEMANAGER_SAVE', 'Save');
30
+define('_AM_SYSTEM_FILEMANAGER_CANCEL', 'Cancel');
31
+define('_AM_SYSTEM_FILEMANAGER_RESTORE', 'Restore');
32
+define('_AM_SYSTEM_FILEMANAGER_REFRESH', 'Refresh');
33
+define('_AM_SYSTEM_FILEMANAGER_UPLOAD', 'Upload file');
34
+define('_AM_SYSTEM_FILEMANAGER_UPLOAD_CHOOSE', 'Select file to upload');
35
+define('_AM_SYSTEM_FILEMANAGER_ADDDIR', 'Add Directory');
36
+define('_AM_SYSTEM_FILEMANAGER_ADDDIR_NAME', 'Choose name of directory');
37
+define('_AM_SYSTEM_FILEMANAGER_ADDFILE', 'Add New File');
38
+define('_AM_SYSTEM_FILEMANAGER_DELDIR', 'Delete Directory');
39 39
 
40
-define('_AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_EXISTS','Error: File not exist');
41
-define('_AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_DELETE','Error: File not delete');
42
-define('_AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_RENAME','Error: File not rename');
43
-define('_AM_SYSTEM_FILEMANAGER_BACK','Back');
44
-define('_AM_SYSTEM_FILEMANAGER_DELETE','Delete');
45
-define('_AM_SYSTEM_FILEMANAGER_ERROR','Error');
46
-define('_AM_SYSTEM_FILEMANAGER_EDIT','Edit of:');
47
-define('_AM_SYSTEM_FILEMANAGER_EMPTY_FILE','File empty');
48
-define('_AM_SYSTEM_FILEMANAGER_DELDIR_NOTOK','Error: delete this directory');
49
-define('_AM_SYSTEM_FILEMANAGER_DELDIR_OK','Directory successfully deleted');
40
+define('_AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_EXISTS', 'Error: File not exist');
41
+define('_AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_DELETE', 'Error: File not delete');
42
+define('_AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_RENAME', 'Error: File not rename');
43
+define('_AM_SYSTEM_FILEMANAGER_BACK', 'Back');
44
+define('_AM_SYSTEM_FILEMANAGER_DELETE', 'Delete');
45
+define('_AM_SYSTEM_FILEMANAGER_ERROR', 'Error');
46
+define('_AM_SYSTEM_FILEMANAGER_EDIT', 'Edit of:');
47
+define('_AM_SYSTEM_FILEMANAGER_EMPTY_FILE', 'File empty');
48
+define('_AM_SYSTEM_FILEMANAGER_DELDIR_NOTOK', 'Error: delete this directory');
49
+define('_AM_SYSTEM_FILEMANAGER_DELDIR_OK', 'Directory successfully deleted');
50 50
 
51 51
 // Message
52
-define('_AM_SYSTEM_FILEMANAGER_UPLOAD_FILE','Files successfully uploaded');
53
-define('_AM_SYSTEM_FILEMANAGER_EXTRACT_FILE','Files successfully extracted');
54
-define('_AM_SYSTEM_FILEMANAGER_EXTRACT_ERROR','Files could not be extracted');
55
-define('_AM_SYSTEM_FILEMANAGER_DELETE_FILE','Files successfully deleted');
56
-define('_AM_SYSTEM_FILEMANAGER_DIR_SUCCESS','Directory successfully created');
57
-define('_AM_SYSTEM_FILEMANAGER_DIR_ERROR','Directory could not be created');
58
-define('_AM_SYSTEM_FILEMANAGER_DIR_RYSDEL','Are you sure to delete this folder?');
59
-define('_AM_SYSTEM_FILEMANAGER_FILE_SUCCESS','File successfully created');
52
+define('_AM_SYSTEM_FILEMANAGER_UPLOAD_FILE', 'Files successfully uploaded');
53
+define('_AM_SYSTEM_FILEMANAGER_EXTRACT_FILE', 'Files successfully extracted');
54
+define('_AM_SYSTEM_FILEMANAGER_EXTRACT_ERROR', 'Files could not be extracted');
55
+define('_AM_SYSTEM_FILEMANAGER_DELETE_FILE', 'Files successfully deleted');
56
+define('_AM_SYSTEM_FILEMANAGER_DIR_SUCCESS', 'Directory successfully created');
57
+define('_AM_SYSTEM_FILEMANAGER_DIR_ERROR', 'Directory could not be created');
58
+define('_AM_SYSTEM_FILEMANAGER_DIR_RYSDEL', 'Are you sure to delete this folder?');
59
+define('_AM_SYSTEM_FILEMANAGER_FILE_SUCCESS', 'File successfully created');
60 60
 define('_AM_SYSTEM_FILEMANAGER_SUREDEL', 'Are you sure to delete this file %s?');
61 61
 define('_AM_SYSTEM_FILEMANAGER_DIR_SUREDEL', 'Are you sure you want to delete this directory %s?<br />Warning: all subdirectories and files file will be deleted');
62 62
 ?>
Please login to merge, or discard this patch.
extras/mainfile.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,6 +14,6 @@
 block discarded – undo
14 14
  * Typical writable permission would be 665 (user read/write, group read/write, other read)
15 15
  * If problems persist, escalate permission to 777 (world read/write/execute) as a last resort.
16 16
  */
17
-if (! defined('XOOPS_INSTALL')) {
17
+if (!defined('XOOPS_INSTALL')) {
18 18
     header('Location: install/index.php');
19 19
 }
Please login to merge, or discard this patch.
upgrade/upd-2.0.16-to-2.0.17/index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
     {
31 31
         $xoops = Xoops::getInstance();
32 32
         $db = $xoops->db();
33
-        $value = getDbValue($db, 'config', 'conf_id', "`conf_name` = 'ldap_use_TLS' AND `conf_catid` = " . XOOPS_CONF_AUTH);
33
+        $value = getDbValue($db, 'config', 'conf_id', "`conf_name` = 'ldap_use_TLS' AND `conf_catid` = ".XOOPS_CONF_AUTH);
34 34
         return (bool)($value);
35 35
     }
36 36
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
         );
56 56
         foreach ($data as $name => $values) {
57 57
             if (!getDbValue($db, 'config', 'conf_id', "`conf_modid`=0 AND `conf_catid`=7 AND `conf_name`='$name'")) {
58
-                $this->query("INSERT INTO `$table` (conf_modid,conf_catid,conf_name,conf_title,conf_value,conf_desc,conf_formtype,conf_valuetype,conf_order) " . "VALUES ( 0,7,'$name',$values)");
58
+                $this->query("INSERT INTO `$table` (conf_modid,conf_catid,conf_name,conf_title,conf_value,conf_desc,conf_formtype,conf_valuetype,conf_order) "."VALUES ( 0,7,'$name',$values)");
59 59
             }
60 60
         }
61 61
         return true;
Please login to merge, or discard this patch.
htdocs/themes/default/locale/en_US/_main.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -20,22 +20,22 @@
 block discarded – undo
20 20
  * @version         $Id$
21 21
  */
22 22
 
23
-define("_THEME_LOGIN","Login");
24
-define("_THEME_REGISTER","Register");
23
+define("_THEME_LOGIN", "Login");
24
+define("_THEME_REGISTER", "Register");
25 25
 
26
-define("_THEME_HOME","Home");
26
+define("_THEME_HOME", "Home");
27 27
 
28
-define("_THEME_WELCOME","Welcome");
28
+define("_THEME_WELCOME", "Welcome");
29 29
 
30 30
 
31
-define("_THEME_QUICK","Quick links");
32
-define("_THEME_ADMIN","Administration");
33
-define("_THEME_MYACCOUNT","View account");
34
-define("_THEME_EDITPROFILE","Edit account");
35
-define("_THEME_NOTIFICATION","Notifications");
36
-define("_THEME_PM","Inbox");
37
-define("_THEME_LOGOUT","Logout");
31
+define("_THEME_QUICK", "Quick links");
32
+define("_THEME_ADMIN", "Administration");
33
+define("_THEME_MYACCOUNT", "View account");
34
+define("_THEME_EDITPROFILE", "Edit account");
35
+define("_THEME_NOTIFICATION", "Notifications");
36
+define("_THEME_PM", "Inbox");
37
+define("_THEME_LOGOUT", "Logout");
38 38
 
39
-define("_THEME_BACKTOP","Back to top");
39
+define("_THEME_BACKTOP", "Back to top");
40 40
 
41
-define("_THEME_LANGUAGE","Choose your language");
41
+define("_THEME_LANGUAGE", "Choose your language");
Please login to merge, or discard this patch.
htdocs/modules/gravatars/admin/about.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
  * @author          Mage Grégory (AKA Mage)
19 19
  * @version         $Id$
20 20
  */
21
-include __DIR__ . '/header.php';
21
+include __DIR__.'/header.php';
22 22
 $xoops = Xoops::getInstance();
23 23
 $xoops->header();
24 24
 $aboutAdmin = new \Xoops\Module\Admin();
Please login to merge, or discard this patch.
htdocs/modules/gravatars/admin/header.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,4 +19,4 @@
 block discarded – undo
19 19
  * @author          Mage Grégory (AKA Mage)
20 20
  * @version         $Id$
21 21
  */
22
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
22
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
Please login to merge, or discard this patch.
htdocs/modules/pdf/admin/about.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
  * @author          Mage Grégory (AKA Mage)
19 19
  * @version         $Id$
20 20
  */
21
-include __DIR__ . '/header.php';
21
+include __DIR__.'/header.php';
22 22
 $xoops = Xoops::getInstance();
23 23
 $xoops->header();
24 24
 $aboutAdmin = new \Xoops\Module\Admin();
Please login to merge, or discard this patch.
htdocs/modules/pdf/admin/header.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,4 +19,4 @@
 block discarded – undo
19 19
  * @author          Mage Grégory (AKA Mage)
20 20
  * @version         $Id$
21 21
  */
22
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
22
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
Please login to merge, or discard this patch.
htdocs/modules/xlanguage/admin/about.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
  * @version         $Id$
18 18
  */
19 19
 
20
-include __DIR__ . '/header.php';
20
+include __DIR__.'/header.php';
21 21
 
22 22
 $xoops = Xoops::getInstance();
23 23
 $xoops->header();
Please login to merge, or discard this patch.