Passed
Push — master ( 490f47...e6442b )
by Michael
31:53 queued 14:41
created
htdocs/modules/protector/class/ProtectorMysqlDatabase.class.php 1 patch
Spacing   +86 added lines, -86 removed lines patch added patch discarded remove patch
@@ -22,103 +22,103 @@  discard block
 block discarded – undo
22 22
 $root_path = \XoopsBaseConfig::get('root-path');
23 23
 $db_type = \XoopsBaseConfig::get('db-type');
24 24
 
25
-if( XoopsLoad::fileExists( $root_path.'/class/database/drivers/'.$db_type.'/database.php' ) ) {
25
+if (XoopsLoad::fileExists($root_path.'/class/database/drivers/'.$db_type.'/database.php')) {
26 26
     require_once $root_path.'/class/database/drivers/'.$db_type.'/database.php';
27 27
 } else {
28 28
     require_once $root_path.'/class/database/'.$db_type.'database.php';
29 29
 }
30 30
 
31
-require_once $root_path.'/class/database/database.php' ;
31
+require_once $root_path.'/class/database/database.php';
32 32
 
33 33
 class ProtectorMySQLDatabase extends XoopsMySQLDatabaseProxy
34 34
 {
35 35
 
36
-var $doubtful_requests = array() ;
36
+var $doubtful_requests = array();
37 37
 var $doubtful_needles = array(
38 38
     // 'order by' ,
39
-    'concat' ,
40
-    'information_schema' ,
41
-    'select' ,
42
-    'union' ,
43
-    '/*' , /**/
44
-    '--' ,
45
-    '#' ,
46
-) ;
39
+    'concat',
40
+    'information_schema',
41
+    'select',
42
+    'union',
43
+    '/*', /**/
44
+    '--',
45
+    '#',
46
+);
47 47
 
48 48
 
49 49
 function ProtectorMySQLDatabase()
50 50
 {
51
-    $protector = Protector::getInstance() ;
52
-    $this->doubtful_requests = $protector->getDblayertrapDoubtfuls() ;
53
-    $this->doubtful_needles = array_merge( $this->doubtful_needles , $this->doubtful_requests ) ;
51
+    $protector = Protector::getInstance();
52
+    $this->doubtful_requests = $protector->getDblayertrapDoubtfuls();
53
+    $this->doubtful_needles = array_merge($this->doubtful_needles, $this->doubtful_requests);
54 54
 }
55 55
 
56 56
 
57
-function injectionFound( $sql )
57
+function injectionFound($sql)
58 58
 {
59
-    $protector = Protector::getInstance() ;
59
+    $protector = Protector::getInstance();
60 60
 
61
-    $protector->last_error_type = 'SQL Injection' ;
62
-    $protector->message .= $sql ;
63
-    $protector->output_log( $protector->last_error_type ) ;
64
-    die( 'SQL Injection found' ) ;
61
+    $protector->last_error_type = 'SQL Injection';
62
+    $protector->message .= $sql;
63
+    $protector->output_log($protector->last_error_type);
64
+    die('SQL Injection found');
65 65
 }
66 66
 
67 67
 
68
-function separateStringsInSQL( $sql )
68
+function separateStringsInSQL($sql)
69 69
 {
70
-    $sql = trim( $sql ) ;
71
-    $sql_len = strlen( $sql ) ;
72
-    $char = '' ;
73
-    $string_start = '' ;
70
+    $sql = trim($sql);
71
+    $sql_len = strlen($sql);
72
+    $char = '';
73
+    $string_start = '';
74 74
     $in_string = false;
75
-    $sql_wo_string = '' ;
76
-    $strings = array() ;
77
-    $current_string = '' ;
78
-
79
-    for( $i = 0 ; $i < $sql_len ; ++$i ) {
80
-        $char = $sql[$i] ;
81
-        if( $in_string ) {
82
-            while( 1 ) {
83
-                $new_i = strpos( $sql , $string_start , $i ) ;
84
-                $current_string .= substr( $sql , $i , $new_i - $i + 1 ) ;
85
-                $i = $new_i ;
86
-                if( $i === false ) {
87
-                    break 2 ;
88
-                } else if( /* $string_start == '`' || */ $sql[$i-1] !== '\\' ) {
89
-                    $string_start = '' ;
90
-                    $in_string = false ;
91
-                    $strings[] = $current_string ;
92
-                    break ;
75
+    $sql_wo_string = '';
76
+    $strings = array();
77
+    $current_string = '';
78
+
79
+    for ($i = 0; $i < $sql_len; ++$i) {
80
+        $char = $sql[$i];
81
+        if ($in_string) {
82
+            while (1) {
83
+                $new_i = strpos($sql, $string_start, $i);
84
+                $current_string .= substr($sql, $i, $new_i - $i + 1);
85
+                $i = $new_i;
86
+                if ($i === false) {
87
+                    break 2;
88
+                } else if ( /* $string_start == '`' || */ $sql[$i - 1] !== '\\' ) {
89
+                    $string_start = '';
90
+                    $in_string = false;
91
+                    $strings[] = $current_string;
92
+                    break;
93 93
                 } else {
94
-                    $j = 2 ;
95
-                    $escaped_backslash = false ;
96
-                    while( $i - $j > 0 && $sql[$i-$j] === '\\' ) {
97
-                        $escaped_backslash = ! $escaped_backslash ;
94
+                    $j = 2;
95
+                    $escaped_backslash = false;
96
+                    while ($i - $j > 0 && $sql[$i - $j] === '\\') {
97
+                        $escaped_backslash = !$escaped_backslash;
98 98
                         ++$j;
99 99
                     }
100 100
                     if ($escaped_backslash) {
101
-                        $string_start = '' ;
102
-                        $in_string = false ;
103
-                        $strings[] = $current_string ;
104
-                        break ;
101
+                        $string_start = '';
102
+                        $in_string = false;
103
+                        $strings[] = $current_string;
104
+                        break;
105 105
                     } else {
106 106
                         ++$i;
107 107
                     }
108 108
                 }
109 109
             }
110
-        } else if( $char === '"' || $char === "'" ) { // dare to ignore ``
111
-            $in_string = true ;
112
-            $string_start = $char ;
113
-            $current_string = $char ;
110
+        } else if ($char === '"' || $char === "'") { // dare to ignore ``
111
+            $in_string = true;
112
+            $string_start = $char;
113
+            $current_string = $char;
114 114
         } else {
115
-            $sql_wo_string .= $char ;
115
+            $sql_wo_string .= $char;
116 116
         }
117 117
         // dare to ignore comment
118 118
         // because unescaped ' or " have been already checked in stage1
119 119
     }
120 120
 
121
-    return array( $sql_wo_string , $strings ) ;
121
+    return array($sql_wo_string, $strings);
122 122
 }
123 123
 
124 124
 
@@ -126,24 +126,24 @@  discard block
 block discarded – undo
126 126
 /**
127 127
  * @param string $sql
128 128
  */
129
-function checkSql( $sql )
129
+function checkSql($sql)
130 130
 {
131
-    list( $sql_wo_strings , $strings ) = $this->separateStringsInSQL( $sql ) ;
131
+    list($sql_wo_strings, $strings) = $this->separateStringsInSQL($sql);
132 132
 
133 133
     // stage1: addslashes() processed or not
134
-    foreach( $this->doubtful_requests as $request ) {
135
-        if( addslashes( $request ) != $request ) {
136
-            if( stristr( $sql , trim( $request ) ) ) {
134
+    foreach ($this->doubtful_requests as $request) {
135
+        if (addslashes($request) != $request) {
136
+            if (stristr($sql, trim($request))) {
137 137
                 // check the request stayed inside of strings as whole
138
-                $ok_flag = false ;
139
-                foreach( $strings as $string ) {
140
-                    if( strstr( $string , $request ) ) {
141
-                        $ok_flag = true ;
142
-                        break ;
138
+                $ok_flag = false;
139
+                foreach ($strings as $string) {
140
+                    if (strstr($string, $request)) {
141
+                        $ok_flag = true;
142
+                        break;
143 143
                     }
144 144
                 }
145
-                if( ! $ok_flag ) {
146
-                    $this->injectionFound( $sql ) ;
145
+                if (!$ok_flag) {
146
+                    $this->injectionFound($sql);
147 147
                 }
148 148
             }
149 149
         }
@@ -155,39 +155,39 @@  discard block
 block discarded – undo
155 155
     // OK: select a from b where c='$d_escaped'
156 156
     // $_GET['d'] = '(select ... FROM)'
157 157
     // NG: select a from b where c=(select ... from)
158
-    foreach( $this->doubtful_requests as $request ) {
159
-        if( strstr( $sql_wo_strings , trim( $request ) ) ) {
160
-            $this->injectionFound( $sql ) ;
158
+    foreach ($this->doubtful_requests as $request) {
159
+        if (strstr($sql_wo_strings, trim($request))) {
160
+            $this->injectionFound($sql);
161 161
         }
162 162
     }
163 163
 
164 164
     // stage3: comment exists or not without quoted strings (too sensitive?)
165
-    if( preg_match( '/(\/\*|\-\-|\#)/' , $sql_wo_strings , $regs ) ) {
166
-        foreach( $this->doubtful_requests as $request ) {
167
-            if( strstr( $request , $regs[1] ) ) {
168
-                $this->injectionFound( $sql ) ;
165
+    if (preg_match('/(\/\*|\-\-|\#)/', $sql_wo_strings, $regs)) {
166
+        foreach ($this->doubtful_requests as $request) {
167
+            if (strstr($request, $regs[1])) {
168
+                $this->injectionFound($sql);
169 169
             }
170 170
         }
171 171
     }
172 172
 }
173 173
 
174 174
 
175
-function query( $sql , $limit = 0 , $start = 0 )
175
+function query($sql, $limit = 0, $start = 0)
176 176
 {
177
-    $sql4check = substr( $sql , 7 ) ;
178
-    foreach( $this->doubtful_needles as $needle ) {
179
-        if( stristr( $sql4check , $needle ) ) {
180
-            $this->checkSql( $sql ) ;
181
-            break ;
177
+    $sql4check = substr($sql, 7);
178
+    foreach ($this->doubtful_needles as $needle) {
179
+        if (stristr($sql4check, $needle)) {
180
+            $this->checkSql($sql);
181
+            break;
182 182
         }
183 183
     }
184 184
 
185
-    if( ! defined( 'XOOPS_DB_PROXY' ) ) {
186
-        $ret = parent::queryF( $sql , $limit , $start ) ;
185
+    if (!defined('XOOPS_DB_PROXY')) {
186
+        $ret = parent::queryF($sql, $limit, $start);
187 187
     } else {
188
-        $ret = parent::query( $sql , $limit , $start ) ;
188
+        $ret = parent::query($sql, $limit, $start);
189 189
     }
190
-    return $ret ;
190
+    return $ret;
191 191
 }
192 192
 
193 193
 }
Please login to merge, or discard this patch.
htdocs/modules/menus/admin/admin_menus.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
  * @version         $Id$
21 21
  */
22 22
 
23
-include_once __DIR__ . '/header.php';
23
+include_once __DIR__.'/header.php';
24 24
 
25 25
 $xoops = Xoops::getInstance();
26 26
 $helper = Menus::getInstance();
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 $xoops->theme()->addStylesheet('modules/system/css/admin.css');
33 33
 
34 34
 // Get $_GET, $_POST, ...
35
-$op =Request::getCmd('op', 'list');
35
+$op = Request::getCmd('op', 'list');
36 36
 $id = Request::getInt('id', 0);
37 37
 $limit = Request::getInt('limit', 15);
38 38
 $start = Request::getInt('start', 0);
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
         $msg[] = _AM_MENUS_SAVE;
67 67
 
68 68
         $id = Request::getInt('id', 0);
69
-        if (isset($id) && $id !=0) {
69
+        if (isset($id) && $id != 0) {
70 70
             $obj = $helper->getHandlerMenus()->get($id);
71 71
         } else {
72 72
             $obj = $helper->getHandlerMenus()->create();
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
             echo $xoops->confirm(
103 103
                 array('ok' => 1, 'id' => $id, 'op' => 'del'),
104 104
                 $helper->url('admin/admin_menus.php'),
105
-                _AM_MENUS_MSG_SUREDEL . '<br /><strong>' . $obj->getVar('title') . '</strong>'
105
+                _AM_MENUS_MSG_SUREDEL.'<br /><strong>'.$obj->getVar('title').'</strong>'
106 106
             );
107 107
         }
108 108
         break;
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 
122 122
         $criteria = new CriteriaCompo();
123 123
         if ($query != '') {
124
-            $crit = new CriteriaCompo(new Criteria('title', $query . '%', 'LIKE'));
124
+            $crit = new CriteriaCompo(new Criteria('title', $query.'%', 'LIKE'));
125 125
             $criteria->add($crit);
126 126
         }
127 127
 
Please login to merge, or discard this patch.
htdocs/modules/menus/admin/admin_menu.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -191,7 +191,7 @@
 block discarded – undo
191 191
             $menusArray = $builder->render();
192 192
             $xoops->tpl()->assign('menus', $menusArray);
193 193
         } else {
194
-             $xoops->tpl()->assign('error_message', _AM_MENUS_MSG_NOTFOUND);
194
+                $xoops->tpl()->assign('error_message', _AM_MENUS_MSG_NOTFOUND);
195 195
         }
196 196
         break;
197 197
 }
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
  * @version         $Id$
21 21
  */
22 22
 
23
-include_once __DIR__ . '/header.php';
23
+include_once __DIR__.'/header.php';
24 24
 
25 25
 $xoops = Xoops::getInstance();
26 26
 $helper = Menus::getInstance();
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
         $msg[] = _AM_MENUS_SAVE;
95 95
 
96 96
         $id = Request::getInt('id', 0);
97
-        if (isset($id) && $id !=0) {
97
+        if (isset($id) && $id != 0) {
98 98
             $obj = $helper->getHandlerMenu()->get($id);
99 99
         } else {
100 100
             $obj = $helper->getHandlerMenu()->create();
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 
120 120
         if ($helper->getHandlerMenu()->insert($obj)) {
121 121
             $this_handler->update_weights($obj);
122
-            $xoops->redirect('admin_menu.php?op=list&amp;menu_id=' . $obj->getVar('mid'), 2, implode('<br />', $msg));
122
+            $xoops->redirect('admin_menu.php?op=list&amp;menu_id='.$obj->getVar('mid'), 2, implode('<br />', $msg));
123 123
         }
124 124
         echo $xoops->alert('error', $obj->getHtmlErrors());
125 125
         $form = $helper->getForm($obj, 'menus_menu');
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
                 $xoops->redirect('admin_menu.php', 3, implode(',', $xoops->security()->getErrors()));
136 136
             }
137 137
             if ($helper->getHandlerMenu()->delete($obj)) {
138
-                $xoops->redirect('admin_menu.php?menu_id=' . $menu_id, 2, _AM_MENUS_MSG_SUCCESS);
138
+                $xoops->redirect('admin_menu.php?menu_id='.$menu_id, 2, _AM_MENUS_MSG_SUCCESS);
139 139
             } else {
140 140
                 echo $xoops->alert('error', $obj->getHtmlErrors());
141 141
             }
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
             echo $xoops->confirm(
144 144
                 array('ok' => 1, 'id' => $id, 'op' => 'del', 'menu_id' => $menu_id),
145 145
                 $helper->url('admin/admin_menu.php'),
146
-                _AM_MENUS_MSG_SUREDEL . '<br /><strong>' . $obj->getVar('title') . '</strong>'
146
+                _AM_MENUS_MSG_SUREDEL.'<br /><strong>'.$obj->getVar('title').'</strong>'
147 147
             );
148 148
         }
149 149
         break;
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
         $obj->setVar('weight', $weight);
155 155
         $this_handler->insert($obj);
156 156
         $this_handler->update_weights($obj);
157
-        $xoops->redirect('admin_menu.php?op=list&amp;menu_id=' . $obj->getVar('mid'), 2, _AM_MENUS_SAVE);
157
+        $xoops->redirect('admin_menu.php?op=list&amp;menu_id='.$obj->getVar('mid'), 2, _AM_MENUS_SAVE);
158 158
         break;
159 159
 
160 160
     case 'toggle':
@@ -163,12 +163,12 @@  discard block
 block discarded – undo
163 163
         $obj = $this_handler->get($id);
164 164
         $obj->setVar('visible', $visible);
165 165
         $this_handler->insert($obj);
166
-        $xoops->redirect('admin_menu.php?op=list&amp;menu_id=' . $obj->getVar('mid'), 2, _AM_MENUS_SAVE);
166
+        $xoops->redirect('admin_menu.php?op=list&amp;menu_id='.$obj->getVar('mid'), 2, _AM_MENUS_SAVE);
167 167
         break;
168 168
 
169 169
     case 'list':
170 170
     default:
171
-        $admin_page->addItemButton(_AM_MENUS_ADD_MENUS, 'admin_menu.php?op=add&amp;menu_id=' . $menu_id, 'add');
171
+        $admin_page->addItemButton(_AM_MENUS_ADD_MENUS, 'admin_menu.php?op=add&amp;menu_id='.$menu_id, 'add');
172 172
         $admin_page->renderButton();
173 173
 
174 174
         $this_handler = $helper->getHandlerMenu();
Please login to merge, or discard this patch.
htdocs/modules/menus/admin/header.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
  * @version         $Id$
19 19
  */
20 20
 
21
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
21
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
22 22
 
23 23
 $xoops = Xoops::getInstance();
24 24
 $helper = Xoops\Module\Helper::getHelper('menus');
Please login to merge, or discard this patch.
htdocs/modules/menus/preloads/preload.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -32,9 +32,9 @@
 block discarded – undo
32 32
     {
33 33
         $path = dirname(__DIR__);
34 34
         XoopsLoad::addMap(array(
35
-            'menus' => $path . '/class/helper.php',
36
-            'menusbuilder' => $path . '/class/builder.php',
37
-            'menusdecorator' => $path . '/class/decorator.php',
35
+            'menus' => $path.'/class/helper.php',
36
+            'menusbuilder' => $path.'/class/builder.php',
37
+            'menusdecorator' => $path.'/class/decorator.php',
38 38
         ));
39 39
     }
40 40
 }
Please login to merge, or discard this patch.
htdocs/modules/menus/language/english/about.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -3,26 +3,26 @@
 block discarded – undo
3 3
 //  URL: http://www.xuups.com
4 4
 //  E-Mail: [email protected]
5 5
 
6
-define('_AB_MENUS_AUTHOR_INFO',"Contributors information");
7
-define('_AB_MENUS_AUTHOR_WORD',"The Author's Word");
8
-define('_AB_MENUS_BY',"By");
9
-define('_AB_MENUS_DEVELOPER_CONTRIBUTOR',"Contributor(s)");
10
-define('_AB_MENUS_DEVELOPER_CREDITS',"Credits");
11
-define('_AB_MENUS_DEVELOPER_EMAIL',"Email");
12
-define('_AB_MENUS_DEVELOPER_WEBSITE',"Website");
13
-define('_AB_MENUS_MODULE_BUG',"Report a bug for this module");
14
-define('_AB_MENUS_MODULE_DEMO',"Demo Site");
15
-define('_AB_MENUS_MODULE_DISCLAIMER',"Disclaimer");
16
-define('_AB_MENUS_MODULE_FEATURE',"Suggest a new feature for this module");
17
-define('_AB_MENUS_MODULE_INFO',"Module Developpment Informations");
18
-define('_AB_MENUS_MODULE_RELEASE_DATE',"Release date");
19
-define('_AB_MENUS_MODULE_STATUS',"Status");
20
-define('_AB_MENUS_MODULE_SUBMIT_BUG',"Submit a bug");
21
-define('_AB_MENUS_MODULE_SUBMIT_FEATURE',"Request a feature");
22
-define('_AB_MENUS_MODULE_SUPPORT',"Official support site");
23
-define('_AB_MENUS_PEOPLE_DEVELOPERS',"Developers");
24
-define('_AB_MENUS_PEOPLE_TESTERS',"Testers");
25
-define('_AB_MENUS_PEOPLE_DOCUMENTERS',"Documenters");
26
-define('_AB_MENUS_PEOPLE_TRANSLATERS',"Translaters");
27
-define('_AB_MENUS_PEOPLE_OTHER',"Other contributors");
28
-define('_AB_MENUS_VERSION_HISTORY',"Version History");
6
+define('_AB_MENUS_AUTHOR_INFO', "Contributors information");
7
+define('_AB_MENUS_AUTHOR_WORD', "The Author's Word");
8
+define('_AB_MENUS_BY', "By");
9
+define('_AB_MENUS_DEVELOPER_CONTRIBUTOR', "Contributor(s)");
10
+define('_AB_MENUS_DEVELOPER_CREDITS', "Credits");
11
+define('_AB_MENUS_DEVELOPER_EMAIL', "Email");
12
+define('_AB_MENUS_DEVELOPER_WEBSITE', "Website");
13
+define('_AB_MENUS_MODULE_BUG', "Report a bug for this module");
14
+define('_AB_MENUS_MODULE_DEMO', "Demo Site");
15
+define('_AB_MENUS_MODULE_DISCLAIMER', "Disclaimer");
16
+define('_AB_MENUS_MODULE_FEATURE', "Suggest a new feature for this module");
17
+define('_AB_MENUS_MODULE_INFO', "Module Developpment Informations");
18
+define('_AB_MENUS_MODULE_RELEASE_DATE', "Release date");
19
+define('_AB_MENUS_MODULE_STATUS', "Status");
20
+define('_AB_MENUS_MODULE_SUBMIT_BUG', "Submit a bug");
21
+define('_AB_MENUS_MODULE_SUBMIT_FEATURE', "Request a feature");
22
+define('_AB_MENUS_MODULE_SUPPORT', "Official support site");
23
+define('_AB_MENUS_PEOPLE_DEVELOPERS', "Developers");
24
+define('_AB_MENUS_PEOPLE_TESTERS', "Testers");
25
+define('_AB_MENUS_PEOPLE_DOCUMENTERS', "Documenters");
26
+define('_AB_MENUS_PEOPLE_TRANSLATERS', "Translaters");
27
+define('_AB_MENUS_PEOPLE_OTHER', "Other contributors");
28
+define('_AB_MENUS_VERSION_HISTORY', "Version History");
Please login to merge, or discard this patch.
htdocs/modules/menus/language/english/blocks.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -3,17 +3,17 @@
 block discarded – undo
3 3
 //  URL: http://www.xuups.com
4 4
 //  E-Mail: [email protected]
5 5
 
6
-define('_MB_MENUS_SELECT_MENU',"Select menu");
7
-define('_MB_MENUS_SELECT_MENU_DSC',"");
8
-define('_MB_MENUS_SELECT_SKIN',"Select skin");
9
-define('_MB_MENUS_SELECT_SKIN_DSC',"");
10
-define('_MB_MENUS_USE_THEME_SKIN',"Use skin from theme");
11
-define('_MB_MENUS_USE_THEME_SKIN_DSC',"If the theme does not provide a skin, the above selection will be used");
12
-define('_MB_MENUS_UNIQUEID',"Unique ID");
13
-define('_MB_MENUS_UNIQUEID_DSC',"Please keep ID unique for each block. It is used when menu is assigned to template");
14
-define('_MB_MENUS_DISPLAY_METHOD',"Display Method");
15
-define('_MB_MENUS_DISPLAY_METHOD_DSC',"If you choose assign to the template, then you can use <{\$xoops_menu_%s}> in your theme");
16
-define('_MB_MENUS_DISPLAY_METHOD_BLOCK',"Display this block");
17
-define('_MB_MENUS_DISPLAY_METHOD_TEMPLATE',"Assign to template");
6
+define('_MB_MENUS_SELECT_MENU', "Select menu");
7
+define('_MB_MENUS_SELECT_MENU_DSC', "");
8
+define('_MB_MENUS_SELECT_SKIN', "Select skin");
9
+define('_MB_MENUS_SELECT_SKIN_DSC', "");
10
+define('_MB_MENUS_USE_THEME_SKIN', "Use skin from theme");
11
+define('_MB_MENUS_USE_THEME_SKIN_DSC', "If the theme does not provide a skin, the above selection will be used");
12
+define('_MB_MENUS_UNIQUEID', "Unique ID");
13
+define('_MB_MENUS_UNIQUEID_DSC', "Please keep ID unique for each block. It is used when menu is assigned to template");
14
+define('_MB_MENUS_DISPLAY_METHOD', "Display Method");
15
+define('_MB_MENUS_DISPLAY_METHOD_DSC', "If you choose assign to the template, then you can use <{\$xoops_menu_%s}> in your theme");
16
+define('_MB_MENUS_DISPLAY_METHOD_BLOCK', "Display this block");
17
+define('_MB_MENUS_DISPLAY_METHOD_TEMPLATE', "Assign to template");
18 18
 
19
-define('_MB_MENUS_HOME',"Home");
20 19
\ No newline at end of file
20
+define('_MB_MENUS_HOME', "Home");
21 21
\ No newline at end of file
Please login to merge, or discard this patch.
htdocs/modules/menus/language/english/modinfo.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -4,26 +4,26 @@
 block discarded – undo
4 4
 //  E-Mail: [email protected]
5 5
 
6 6
 // Module Info
7
-define('_MI_MENUS_NAME',"Menus");
8
-define('_MI_MENUS_DSC',"Menus for your site");
7
+define('_MI_MENUS_NAME', "Menus");
8
+define('_MI_MENUS_DSC', "Menus for your site");
9 9
 
10 10
 // Blocks
11
-define('_MI_MENUS_BLK1',"Menu block");
12
-define('_MI_MENUS_BLK1_DSC',"");
13
-define('_MI_MENUS_BLK2',"Main Menu");
14
-define('_MI_MENUS_BLK2_DSC',"Shows the main navigation menu of the site");
11
+define('_MI_MENUS_BLK1', "Menu block");
12
+define('_MI_MENUS_BLK1_DSC', "");
13
+define('_MI_MENUS_BLK2', "Main Menu");
14
+define('_MI_MENUS_BLK2_DSC', "Shows the main navigation menu of the site");
15 15
 
16 16
 // Admin menu
17
-define('_MI_MENUS_MENUSMANAGER',"Menus manager");
18
-define('_MI_MENUS_MENUMANAGER',"Links manager");
19
-define('_MI_MENUS_ABOUT',"About");
17
+define('_MI_MENUS_MENUSMANAGER', "Menus manager");
18
+define('_MI_MENUS_MENUMANAGER', "Links manager");
19
+define('_MI_MENUS_ABOUT', "About");
20 20
 
21 21
 //Configs
22
-define('_MI_MENUS_CONF_ASSIGN_METHOD',"Assign method");
23
-define('_MI_MENUS_CONF_ASSIGN_METHOD_DSC',"Method for assigning css and js to header");
24
-define('_MI_MENUS_CONF_ASSIGN_METHOD_XOOPSTPL',"XoopsTpl");
25
-define('_MI_MENUS_CONF_ASSIGN_METHOD_XOTHEME',"XoTheme");
22
+define('_MI_MENUS_CONF_ASSIGN_METHOD', "Assign method");
23
+define('_MI_MENUS_CONF_ASSIGN_METHOD_DSC', "Method for assigning css and js to header");
24
+define('_MI_MENUS_CONF_ASSIGN_METHOD_XOOPSTPL', "XoopsTpl");
25
+define('_MI_MENUS_CONF_ASSIGN_METHOD_XOTHEME', "XoTheme");
26 26
 
27 27
 //1.4
28
-define('_MI_MENUS_ADMMENU0','Home');
28
+define('_MI_MENUS_ADMMENU0', 'Home');
29 29
 
Please login to merge, or discard this patch.
htdocs/modules/menus/language/english/admin.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -3,36 +3,36 @@
 block discarded – undo
3 3
 //  URL: http://www.xuups.com
4 4
 //  E-Mail: [email protected]
5 5
 
6
-define('_AM_MENUS_MENU_TITLE',"Title");
7
-define('_AM_MENUS_MENU_ALTTITLE',"Alt title");
8
-define('_AM_MENUS_MENU_LINK',"Link");
9
-define('_AM_MENUS_MENU_PARENT',"Parent menu");
10
-define('_AM_MENUS_MENU_VISIBLE',"Visible");
11
-define('_AM_MENUS_MENU_TARGET',"Target");
12
-define('_AM_MENUS_MENU_GROUPS',"Groups");
13
-define('_AM_MENUS_MENU_GROUPS_HELP',"Choose groups which can view this link");
14
-define('_AM_MENUS_MENU_HOOKS',"Hooks");
15
-define('_AM_MENUS_MENU_IMAGE',"Image");
16
-define('_AM_MENUS_MENU_CSS',"Css");
6
+define('_AM_MENUS_MENU_TITLE', "Title");
7
+define('_AM_MENUS_MENU_ALTTITLE', "Alt title");
8
+define('_AM_MENUS_MENU_LINK', "Link");
9
+define('_AM_MENUS_MENU_PARENT', "Parent menu");
10
+define('_AM_MENUS_MENU_VISIBLE', "Visible");
11
+define('_AM_MENUS_MENU_TARGET', "Target");
12
+define('_AM_MENUS_MENU_GROUPS', "Groups");
13
+define('_AM_MENUS_MENU_GROUPS_HELP', "Choose groups which can view this link");
14
+define('_AM_MENUS_MENU_HOOKS', "Hooks");
15
+define('_AM_MENUS_MENU_IMAGE', "Image");
16
+define('_AM_MENUS_MENU_CSS', "Css");
17 17
 
18
-define('_AM_MENUS_MENU_ACCESS_FILTER',"Access filter");
18
+define('_AM_MENUS_MENU_ACCESS_FILTER', "Access filter");
19 19
 
20
-define('_AM_MENUS_ADD_MENUS',"Add a menu");
21
-define('_AM_MENUS_LIST_MENUS',"List of menus");
22
-define('_AM_MENUS_EDIT_MENUS',"Edit a menu");
23
-define('_AM_MENUS_SAVE',"Menu saved");
20
+define('_AM_MENUS_ADD_MENUS', "Add a menu");
21
+define('_AM_MENUS_LIST_MENUS', "List of menus");
22
+define('_AM_MENUS_EDIT_MENUS', "Edit a menu");
23
+define('_AM_MENUS_SAVE', "Menu saved");
24 24
 
25
-define('_AM_MENUS_MENU_TARG_SELF',"Self");
26
-define('_AM_MENUS_MENU_TARG_BLANK',"Blank");
27
-define('_AM_MENUS_MENU_TARG_PARENT',"Parent");
28
-define('_AM_MENUS_MENU_TARG_TOP',"Top");
25
+define('_AM_MENUS_MENU_TARG_SELF', "Self");
26
+define('_AM_MENUS_MENU_TARG_BLANK', "Blank");
27
+define('_AM_MENUS_MENU_TARG_PARENT', "Parent");
28
+define('_AM_MENUS_MENU_TARG_TOP', "Top");
29 29
 
30
-define('_AM_MENUS_ACTION_GOTO_MENU',"Go to Menu");
31
-define('_AM_MENUS_ACTION_TOGGLE',"Toggle visibility");
32
-define('_AM_MENUS_ACTION_UP',"Move menu up");
33
-define('_AM_MENUS_ACTION_DOWN',"Move menu down");
30
+define('_AM_MENUS_ACTION_GOTO_MENU', "Go to Menu");
31
+define('_AM_MENUS_ACTION_TOGGLE', "Toggle visibility");
32
+define('_AM_MENUS_ACTION_UP', "Move menu up");
33
+define('_AM_MENUS_ACTION_DOWN', "Move menu down");
34 34
 
35
-define('_AM_MENUS_MSG_SUCCESS',"Done!");
36
-define("_AM_MENUS_MSG_SUREDEL","Are you sure you want to delete this menu?");
37
-define('_AM_MENUS_MSG_NOTFOUND',"No entries found!");
38
-define('_AM_MENUS_MSG_NOMENUS',"Please create a menu first!");
35
+define('_AM_MENUS_MSG_SUCCESS', "Done!");
36
+define("_AM_MENUS_MSG_SUREDEL", "Are you sure you want to delete this menu?");
37
+define('_AM_MENUS_MSG_NOTFOUND', "No entries found!");
38
+define('_AM_MENUS_MSG_NOMENUS', "Please create a menu first!");
Please login to merge, or discard this patch.