@@ -59,239 +59,239 @@ |
||
| 59 | 59 | |
| 60 | 60 | global $jsArray; |
| 61 | 61 | $jsArray = array( |
| 62 | - JS_JQUERY => array( |
|
| 63 | - 'no' => array( |
|
| 64 | - 'no' => '/js/common/jquery.js', |
|
| 65 | - 'min' => '/js/common/jquery.min.js' |
|
| 66 | - ), |
|
| 67 | - 'cdn' => array( |
|
| 68 | - 'no' => '//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.js', |
|
| 69 | - 'min' => '//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js' |
|
| 70 | - ) |
|
| 71 | - ), |
|
| 72 | - JS_JQUERY_UI => array( |
|
| 73 | - 'no' => array( |
|
| 74 | - 'no' => '/js/common/jquery-ui.js', |
|
| 75 | - 'min' => '/js/common/jquery-ui.min.js' |
|
| 76 | - ), |
|
| 77 | - 'cdn' => array( |
|
| 78 | - 'no' => '//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.js', |
|
| 79 | - 'min' => '//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js' |
|
| 80 | - ) |
|
| 81 | - ), |
|
| 82 | - JS_BOOTSTRAP => array( |
|
| 83 | - 'no' => array( |
|
| 84 | - 'no' => '/js/common/bootstrap.js', |
|
| 85 | - 'min' => '/js/common/bootstrap.min.js' |
|
| 86 | - ), |
|
| 87 | - 'cdn' => array( |
|
| 88 | - 'no' => '//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.js', |
|
| 89 | - 'min' => '//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js' |
|
| 90 | - ) |
|
| 91 | - ), |
|
| 92 | - JQUERY_VALIDATE => array( |
|
| 93 | - 'no' => array( |
|
| 94 | - 'no' => '/js/common/jquery.validate.js', |
|
| 95 | - 'min' => '/js/common/jquery.validate.min.js' |
|
| 96 | - ), |
|
| 97 | - 'cdn' => array( |
|
| 98 | - 'no' => '//ajax.aspnetcdn.com/ajax/jquery.validate/1.13.1/jquery.validate.js', |
|
| 99 | - 'min' => '//ajax.aspnetcdn.com/ajax/jquery.validate/1.13.1/jquery.validate.min.js' |
|
| 100 | - ) |
|
| 101 | - ), |
|
| 102 | - JQUERY_TOUCH => array( |
|
| 103 | - 'no' => array( |
|
| 104 | - 'no' => '/js/common/jquery.ui.touch-punch.min.js', |
|
| 105 | - 'min' => '/js/common/jquery.ui.touch-punch.min.js' |
|
| 106 | - ), |
|
| 107 | - 'cdn' => array( |
|
| 108 | - 'no' => '//cdnjs.cloudflare.com/ajax/libs/jqueryui-touch-punch/0.2.3/jquery.ui.touch-punch.min.js', |
|
| 109 | - 'min' => '//cdnjs.cloudflare.com/ajax/libs/jqueryui-touch-punch/0.2.3/jquery.ui.touch-punch.min.js' |
|
| 110 | - ) |
|
| 111 | - ), |
|
| 112 | - JS_TINYNAV => array( |
|
| 113 | - 'no' => array( |
|
| 114 | - 'no' => '/js/common/tinynav.js', |
|
| 115 | - 'min' => '/js/common/tinynav.min.js' |
|
| 116 | - ), |
|
| 117 | - 'cdn' => array( |
|
| 118 | - 'no' => '//cdnjs.cloudflare.com/ajax/libs/TinyNav.js/1.2.0/tinynav.js', |
|
| 119 | - 'min' => '//cdnjs.cloudflare.com/ajax/libs/TinyNav.js/1.2.0/tinynav.min.js' |
|
| 120 | - ) |
|
| 121 | - ), |
|
| 122 | - JS_BOOTSTRAP_FH => array( |
|
| 123 | - 'no' => array( |
|
| 124 | - 'no' => '/js/common/bootstrap-formhelpers.js', |
|
| 125 | - 'min' => '/js/common/bootstrap-formhelpers.min.js' |
|
| 126 | - ), |
|
| 127 | - 'cdn' => array( |
|
| 128 | - 'no' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-formhelpers/2.3.0/js/bootstrap-formhelpers.js', |
|
| 129 | - 'min' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-formhelpers/2.3.0/js/bootstrap-formhelpers.min.js' |
|
| 130 | - ) |
|
| 131 | - ), |
|
| 132 | - JS_BOOTSTRAP_SW => array( |
|
| 133 | - 'no' => array( |
|
| 134 | - 'no' => '/js/common/bootstrap-switch.js', |
|
| 135 | - 'min' => '/js/common/bootstrap-switch.min.js' |
|
| 136 | - ), |
|
| 137 | - 'cdn' => array( |
|
| 138 | - 'no' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.2/js/bootstrap-switch.js', |
|
| 139 | - 'min' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.2/js/bootstrap-switch.min.js' |
|
| 140 | - ) |
|
| 141 | - ), |
|
| 142 | - JS_DATATABLE => array( |
|
| 143 | - 'no' => array( |
|
| 144 | - 'no' => '/js/common/jquery.dataTables.js', |
|
| 145 | - 'min' => '/js/common/jquery.dataTables.min.js' |
|
| 146 | - ), |
|
| 147 | - 'cdn' => array( |
|
| 148 | - 'no' => '//cdn.datatables.net/1.10.7/js/jquery.dataTables.js', |
|
| 149 | - 'min' => '//cdn.datatables.net/1.10.7/js/jquery.dataTables.min.js' |
|
| 150 | - ) |
|
| 151 | - ), |
|
| 152 | - JS_CHART => array( |
|
| 153 | - 'no' => array( |
|
| 154 | - 'no' => '/js/common/Chart.js', |
|
| 155 | - 'min' => '/js/common/Chart.min.js' |
|
| 156 | - ), |
|
| 157 | - 'cdn' => array( |
|
| 158 | - 'no' => '//cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.2/Chart.js', |
|
| 159 | - 'min' => '//cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.2/Chart.min.js' |
|
| 160 | - ) |
|
| 161 | - ), |
|
| 162 | - JS_METISMENU => array( |
|
| 163 | - 'no' => array( |
|
| 164 | - 'no' => '/js/common/metisMenu.js', |
|
| 165 | - 'min' => '/js/common/metisMenu.min.js' |
|
| 166 | - ), |
|
| 167 | - 'cdn' => array( |
|
| 168 | - 'no' => '//cdnjs.cloudflare.com/ajax/libs/metisMenu/2.0.2/metisMenu.js', |
|
| 169 | - 'min' => '//cdnjs.cloudflare.com/ajax/libs/metisMenu/2.0.2/metisMenu.min.js' |
|
| 170 | - ) |
|
| 171 | - ), |
|
| 172 | - JS_BOOTBOX => array( |
|
| 173 | - 'no' => array( |
|
| 174 | - 'no' => '/js/common/bootbox.js', |
|
| 175 | - 'min' => '/js/common/bootbox.min.js' |
|
| 176 | - ), |
|
| 177 | - 'cdn' => array( |
|
| 178 | - 'no' => '//cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.3.0/bootbox.js', |
|
| 179 | - 'min' => '//cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.3.0/bootbox.min.js' |
|
| 180 | - ) |
|
| 181 | - ), |
|
| 182 | - JS_DATATABLE_ODATA => array( |
|
| 183 | - 'no' => array( |
|
| 184 | - 'no' => '/js/common/jquery.dataTables.odata.js', |
|
| 185 | - 'min' => '/js/common/jquery.dataTables.odata.js', |
|
| 186 | - ), |
|
| 187 | - 'cdn' => array( |
|
| 188 | - 'no' => '/js/common/jquery.dataTables.odata.js', |
|
| 189 | - 'min' => '/js/common/jquery.dataTables.odata.js', |
|
| 190 | - ) |
|
| 191 | - ), |
|
| 192 | - JS_CRYPTO_MD5_JS => array( |
|
| 193 | - 'no' => array( |
|
| 194 | - 'no' => '/js/common/md5.js', |
|
| 195 | - 'min' => '/js/common/md5.js', |
|
| 196 | - ), |
|
| 197 | - 'cdn' => array( |
|
| 198 | - 'no' => '//cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/rollups/md5.js', |
|
| 199 | - 'min' => '//cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/rollups/md5.js', |
|
| 200 | - ) |
|
| 201 | - ), |
|
| 202 | - JS_JCROP => array( |
|
| 203 | - 'no' => array( |
|
| 204 | - 'no' => '/js/common/jquery.Jcrop.min.js', |
|
| 205 | - 'min' => '/js/common/jquery.Jcrop.min.js' |
|
| 206 | - ), |
|
| 207 | - 'cdn' => array( |
|
| 208 | - 'no' => '//cdnjs.cloudflare.com/ajax/libs/jquery-jcrop/0.9.12/js/jquery.Jcrop.min.js', |
|
| 209 | - 'min' => '//cdnjs.cloudflare.com/ajax/libs/jquery-jcrop/0.9.12/js/jquery.Jcrop.min.js' |
|
| 210 | - ) |
|
| 211 | - ), |
|
| 212 | - JS_TYPEAHEAD => array( |
|
| 213 | - 'no' => array( |
|
| 214 | - 'no' => '/js/common/typeahead.bundle.js', |
|
| 215 | - 'min' => '/js/common/typeahead.bundle.min.js' |
|
| 216 | - ), |
|
| 217 | - 'cdn' => array( |
|
| 218 | - 'no' => '//cdnjs.cloudflare.com/ajax/libs/typeahead.js/0.11.1/typeahead.bundle.js', |
|
| 219 | - 'min' => '//cdnjs.cloudflare.com/ajax/libs/typeahead.js/0.11.1/typeahead.bundle.min.js' |
|
| 220 | - ) |
|
| 221 | - ), |
|
| 222 | - JS_FLIPSIDE => array( |
|
| 223 | - 'no' => array( |
|
| 224 | - 'no' => '/js/common/flipside.js', |
|
| 225 | - 'min' => '/js/common/flipside.min.js' |
|
| 226 | - ), |
|
| 227 | - 'cdn' => array( |
|
| 228 | - 'no' => '/js/common/flipside.js', |
|
| 229 | - 'min' => '/js/common/flipside.min.js' |
|
| 230 | - ) |
|
| 231 | - ), |
|
| 232 | - JS_LOGIN => array( |
|
| 233 | - 'no' => array( |
|
| 234 | - 'no' => '/js/common/login.js', |
|
| 235 | - 'min' => '/js/common/login.min.js' |
|
| 236 | - ), |
|
| 237 | - 'cdn' => array( |
|
| 238 | - 'no' => '/js/common/login.js', |
|
| 239 | - 'min' => '/js/common/login.min.js' |
|
| 240 | - ) |
|
| 241 | - ) |
|
| 62 | + JS_JQUERY => array( |
|
| 63 | + 'no' => array( |
|
| 64 | + 'no' => '/js/common/jquery.js', |
|
| 65 | + 'min' => '/js/common/jquery.min.js' |
|
| 66 | + ), |
|
| 67 | + 'cdn' => array( |
|
| 68 | + 'no' => '//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.js', |
|
| 69 | + 'min' => '//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js' |
|
| 70 | + ) |
|
| 71 | + ), |
|
| 72 | + JS_JQUERY_UI => array( |
|
| 73 | + 'no' => array( |
|
| 74 | + 'no' => '/js/common/jquery-ui.js', |
|
| 75 | + 'min' => '/js/common/jquery-ui.min.js' |
|
| 76 | + ), |
|
| 77 | + 'cdn' => array( |
|
| 78 | + 'no' => '//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.js', |
|
| 79 | + 'min' => '//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js' |
|
| 80 | + ) |
|
| 81 | + ), |
|
| 82 | + JS_BOOTSTRAP => array( |
|
| 83 | + 'no' => array( |
|
| 84 | + 'no' => '/js/common/bootstrap.js', |
|
| 85 | + 'min' => '/js/common/bootstrap.min.js' |
|
| 86 | + ), |
|
| 87 | + 'cdn' => array( |
|
| 88 | + 'no' => '//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.js', |
|
| 89 | + 'min' => '//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js' |
|
| 90 | + ) |
|
| 91 | + ), |
|
| 92 | + JQUERY_VALIDATE => array( |
|
| 93 | + 'no' => array( |
|
| 94 | + 'no' => '/js/common/jquery.validate.js', |
|
| 95 | + 'min' => '/js/common/jquery.validate.min.js' |
|
| 96 | + ), |
|
| 97 | + 'cdn' => array( |
|
| 98 | + 'no' => '//ajax.aspnetcdn.com/ajax/jquery.validate/1.13.1/jquery.validate.js', |
|
| 99 | + 'min' => '//ajax.aspnetcdn.com/ajax/jquery.validate/1.13.1/jquery.validate.min.js' |
|
| 100 | + ) |
|
| 101 | + ), |
|
| 102 | + JQUERY_TOUCH => array( |
|
| 103 | + 'no' => array( |
|
| 104 | + 'no' => '/js/common/jquery.ui.touch-punch.min.js', |
|
| 105 | + 'min' => '/js/common/jquery.ui.touch-punch.min.js' |
|
| 106 | + ), |
|
| 107 | + 'cdn' => array( |
|
| 108 | + 'no' => '//cdnjs.cloudflare.com/ajax/libs/jqueryui-touch-punch/0.2.3/jquery.ui.touch-punch.min.js', |
|
| 109 | + 'min' => '//cdnjs.cloudflare.com/ajax/libs/jqueryui-touch-punch/0.2.3/jquery.ui.touch-punch.min.js' |
|
| 110 | + ) |
|
| 111 | + ), |
|
| 112 | + JS_TINYNAV => array( |
|
| 113 | + 'no' => array( |
|
| 114 | + 'no' => '/js/common/tinynav.js', |
|
| 115 | + 'min' => '/js/common/tinynav.min.js' |
|
| 116 | + ), |
|
| 117 | + 'cdn' => array( |
|
| 118 | + 'no' => '//cdnjs.cloudflare.com/ajax/libs/TinyNav.js/1.2.0/tinynav.js', |
|
| 119 | + 'min' => '//cdnjs.cloudflare.com/ajax/libs/TinyNav.js/1.2.0/tinynav.min.js' |
|
| 120 | + ) |
|
| 121 | + ), |
|
| 122 | + JS_BOOTSTRAP_FH => array( |
|
| 123 | + 'no' => array( |
|
| 124 | + 'no' => '/js/common/bootstrap-formhelpers.js', |
|
| 125 | + 'min' => '/js/common/bootstrap-formhelpers.min.js' |
|
| 126 | + ), |
|
| 127 | + 'cdn' => array( |
|
| 128 | + 'no' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-formhelpers/2.3.0/js/bootstrap-formhelpers.js', |
|
| 129 | + 'min' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-formhelpers/2.3.0/js/bootstrap-formhelpers.min.js' |
|
| 130 | + ) |
|
| 131 | + ), |
|
| 132 | + JS_BOOTSTRAP_SW => array( |
|
| 133 | + 'no' => array( |
|
| 134 | + 'no' => '/js/common/bootstrap-switch.js', |
|
| 135 | + 'min' => '/js/common/bootstrap-switch.min.js' |
|
| 136 | + ), |
|
| 137 | + 'cdn' => array( |
|
| 138 | + 'no' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.2/js/bootstrap-switch.js', |
|
| 139 | + 'min' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.2/js/bootstrap-switch.min.js' |
|
| 140 | + ) |
|
| 141 | + ), |
|
| 142 | + JS_DATATABLE => array( |
|
| 143 | + 'no' => array( |
|
| 144 | + 'no' => '/js/common/jquery.dataTables.js', |
|
| 145 | + 'min' => '/js/common/jquery.dataTables.min.js' |
|
| 146 | + ), |
|
| 147 | + 'cdn' => array( |
|
| 148 | + 'no' => '//cdn.datatables.net/1.10.7/js/jquery.dataTables.js', |
|
| 149 | + 'min' => '//cdn.datatables.net/1.10.7/js/jquery.dataTables.min.js' |
|
| 150 | + ) |
|
| 151 | + ), |
|
| 152 | + JS_CHART => array( |
|
| 153 | + 'no' => array( |
|
| 154 | + 'no' => '/js/common/Chart.js', |
|
| 155 | + 'min' => '/js/common/Chart.min.js' |
|
| 156 | + ), |
|
| 157 | + 'cdn' => array( |
|
| 158 | + 'no' => '//cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.2/Chart.js', |
|
| 159 | + 'min' => '//cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.2/Chart.min.js' |
|
| 160 | + ) |
|
| 161 | + ), |
|
| 162 | + JS_METISMENU => array( |
|
| 163 | + 'no' => array( |
|
| 164 | + 'no' => '/js/common/metisMenu.js', |
|
| 165 | + 'min' => '/js/common/metisMenu.min.js' |
|
| 166 | + ), |
|
| 167 | + 'cdn' => array( |
|
| 168 | + 'no' => '//cdnjs.cloudflare.com/ajax/libs/metisMenu/2.0.2/metisMenu.js', |
|
| 169 | + 'min' => '//cdnjs.cloudflare.com/ajax/libs/metisMenu/2.0.2/metisMenu.min.js' |
|
| 170 | + ) |
|
| 171 | + ), |
|
| 172 | + JS_BOOTBOX => array( |
|
| 173 | + 'no' => array( |
|
| 174 | + 'no' => '/js/common/bootbox.js', |
|
| 175 | + 'min' => '/js/common/bootbox.min.js' |
|
| 176 | + ), |
|
| 177 | + 'cdn' => array( |
|
| 178 | + 'no' => '//cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.3.0/bootbox.js', |
|
| 179 | + 'min' => '//cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.3.0/bootbox.min.js' |
|
| 180 | + ) |
|
| 181 | + ), |
|
| 182 | + JS_DATATABLE_ODATA => array( |
|
| 183 | + 'no' => array( |
|
| 184 | + 'no' => '/js/common/jquery.dataTables.odata.js', |
|
| 185 | + 'min' => '/js/common/jquery.dataTables.odata.js', |
|
| 186 | + ), |
|
| 187 | + 'cdn' => array( |
|
| 188 | + 'no' => '/js/common/jquery.dataTables.odata.js', |
|
| 189 | + 'min' => '/js/common/jquery.dataTables.odata.js', |
|
| 190 | + ) |
|
| 191 | + ), |
|
| 192 | + JS_CRYPTO_MD5_JS => array( |
|
| 193 | + 'no' => array( |
|
| 194 | + 'no' => '/js/common/md5.js', |
|
| 195 | + 'min' => '/js/common/md5.js', |
|
| 196 | + ), |
|
| 197 | + 'cdn' => array( |
|
| 198 | + 'no' => '//cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/rollups/md5.js', |
|
| 199 | + 'min' => '//cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/rollups/md5.js', |
|
| 200 | + ) |
|
| 201 | + ), |
|
| 202 | + JS_JCROP => array( |
|
| 203 | + 'no' => array( |
|
| 204 | + 'no' => '/js/common/jquery.Jcrop.min.js', |
|
| 205 | + 'min' => '/js/common/jquery.Jcrop.min.js' |
|
| 206 | + ), |
|
| 207 | + 'cdn' => array( |
|
| 208 | + 'no' => '//cdnjs.cloudflare.com/ajax/libs/jquery-jcrop/0.9.12/js/jquery.Jcrop.min.js', |
|
| 209 | + 'min' => '//cdnjs.cloudflare.com/ajax/libs/jquery-jcrop/0.9.12/js/jquery.Jcrop.min.js' |
|
| 210 | + ) |
|
| 211 | + ), |
|
| 212 | + JS_TYPEAHEAD => array( |
|
| 213 | + 'no' => array( |
|
| 214 | + 'no' => '/js/common/typeahead.bundle.js', |
|
| 215 | + 'min' => '/js/common/typeahead.bundle.min.js' |
|
| 216 | + ), |
|
| 217 | + 'cdn' => array( |
|
| 218 | + 'no' => '//cdnjs.cloudflare.com/ajax/libs/typeahead.js/0.11.1/typeahead.bundle.js', |
|
| 219 | + 'min' => '//cdnjs.cloudflare.com/ajax/libs/typeahead.js/0.11.1/typeahead.bundle.min.js' |
|
| 220 | + ) |
|
| 221 | + ), |
|
| 222 | + JS_FLIPSIDE => array( |
|
| 223 | + 'no' => array( |
|
| 224 | + 'no' => '/js/common/flipside.js', |
|
| 225 | + 'min' => '/js/common/flipside.min.js' |
|
| 226 | + ), |
|
| 227 | + 'cdn' => array( |
|
| 228 | + 'no' => '/js/common/flipside.js', |
|
| 229 | + 'min' => '/js/common/flipside.min.js' |
|
| 230 | + ) |
|
| 231 | + ), |
|
| 232 | + JS_LOGIN => array( |
|
| 233 | + 'no' => array( |
|
| 234 | + 'no' => '/js/common/login.js', |
|
| 235 | + 'min' => '/js/common/login.min.js' |
|
| 236 | + ), |
|
| 237 | + 'cdn' => array( |
|
| 238 | + 'no' => '/js/common/login.js', |
|
| 239 | + 'min' => '/js/common/login.min.js' |
|
| 240 | + ) |
|
| 241 | + ) |
|
| 242 | 242 | ); |
| 243 | 243 | |
| 244 | 244 | global $cssArray; |
| 245 | 245 | $cssArray = array( |
| 246 | 246 | CSS_JQUERY_UI => array( |
| 247 | 247 | 'no' => array( |
| 248 | - 'no' => '/css/common/jquery-ui.css', |
|
| 249 | - 'min' => '/css/common/jquery-ui.min.css' |
|
| 250 | - ), |
|
| 251 | - 'cdn' => array( |
|
| 252 | - 'no' => '//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/themes/smoothness/jquery-ui.css', |
|
| 253 | - 'min' => '//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/themes/smoothness/jquery-ui.min.css' |
|
| 254 | - ) |
|
| 248 | + 'no' => '/css/common/jquery-ui.css', |
|
| 249 | + 'min' => '/css/common/jquery-ui.min.css' |
|
| 250 | + ), |
|
| 251 | + 'cdn' => array( |
|
| 252 | + 'no' => '//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/themes/smoothness/jquery-ui.css', |
|
| 253 | + 'min' => '//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/themes/smoothness/jquery-ui.min.css' |
|
| 254 | + ) |
|
| 255 | 255 | ), |
| 256 | 256 | CSS_BOOTSTRAP => array( |
| 257 | - 'no' => array( |
|
| 258 | - 'no' => '/css/common/bootstrap.css', |
|
| 259 | - 'min' => '/css/common/bootstrap.min.css' |
|
| 260 | - ), |
|
| 261 | - 'cdn' => array( |
|
| 262 | - 'no' => '//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.css', |
|
| 263 | - 'min' => '//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css' |
|
| 264 | - ) |
|
| 257 | + 'no' => array( |
|
| 258 | + 'no' => '/css/common/bootstrap.css', |
|
| 259 | + 'min' => '/css/common/bootstrap.min.css' |
|
| 260 | + ), |
|
| 261 | + 'cdn' => array( |
|
| 262 | + 'no' => '//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.css', |
|
| 263 | + 'min' => '//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css' |
|
| 264 | + ) |
|
| 265 | 265 | ), |
| 266 | 266 | CSS_BOOTSTRAP_FH => array( |
| 267 | 267 | 'no' => array( |
| 268 | - 'no' => '/css/common/bootstrap-formhelpers.css', |
|
| 269 | - 'min' => '/css/common/bootstrap-formhelpers.min.css' |
|
| 270 | - ), |
|
| 271 | - 'cdn' => array( |
|
| 272 | - 'no' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-formhelpers/2.3.0/css/bootstrap-formhelpers.css', |
|
| 273 | - 'min' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-formhelpers/2.3.0/css/bootstrap-formhelpers.min.css' |
|
| 274 | - ) |
|
| 268 | + 'no' => '/css/common/bootstrap-formhelpers.css', |
|
| 269 | + 'min' => '/css/common/bootstrap-formhelpers.min.css' |
|
| 270 | + ), |
|
| 271 | + 'cdn' => array( |
|
| 272 | + 'no' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-formhelpers/2.3.0/css/bootstrap-formhelpers.css', |
|
| 273 | + 'min' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-formhelpers/2.3.0/css/bootstrap-formhelpers.min.css' |
|
| 274 | + ) |
|
| 275 | 275 | ), |
| 276 | 276 | CSS_BOOTSTRAP_SW => array( |
| 277 | - 'no' => array( |
|
| 278 | - 'no' => '/css/common/bootstrap-switch.css', |
|
| 279 | - 'min' => '/css/common/bootstrap-switch.min.css' |
|
| 280 | - ), |
|
| 281 | - 'cdn' => array( |
|
| 282 | - 'no' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.2/css/bootstrap3/bootstrap-switch.css', |
|
| 283 | - 'min' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.2/css/bootstrap3/bootstrap-switch.min.css' |
|
| 284 | - ) |
|
| 277 | + 'no' => array( |
|
| 278 | + 'no' => '/css/common/bootstrap-switch.css', |
|
| 279 | + 'min' => '/css/common/bootstrap-switch.min.css' |
|
| 280 | + ), |
|
| 281 | + 'cdn' => array( |
|
| 282 | + 'no' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.2/css/bootstrap3/bootstrap-switch.css', |
|
| 283 | + 'min' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.2/css/bootstrap3/bootstrap-switch.min.css' |
|
| 284 | + ) |
|
| 285 | 285 | ), |
| 286 | 286 | CSS_DATATABLE => array( |
| 287 | 287 | 'no' => array( |
| 288 | - 'no' => '/css/common/jquery.dataTables.css', |
|
| 289 | - 'min' => '/css/common/jquery.dataTables.min.css' |
|
| 290 | - ), |
|
| 291 | - 'cdn' => array( |
|
| 292 | - 'no' => '//cdn.datatables.net/1.10.7/css/jquery.dataTables.css', |
|
| 293 | - 'min' => '//cdn.datatables.net/1.10.7/css/jquery.dataTables.min.css' |
|
| 294 | - ) |
|
| 288 | + 'no' => '/css/common/jquery.dataTables.css', |
|
| 289 | + 'min' => '/css/common/jquery.dataTables.min.css' |
|
| 290 | + ), |
|
| 291 | + 'cdn' => array( |
|
| 292 | + 'no' => '//cdn.datatables.net/1.10.7/css/jquery.dataTables.css', |
|
| 293 | + 'min' => '//cdn.datatables.net/1.10.7/css/jquery.dataTables.min.css' |
|
| 294 | + ) |
|
| 295 | 295 | ), |
| 296 | 296 | CSS_JCROP => array( |
| 297 | 297 | 'no' => array( |
@@ -423,7 +423,10 @@ |
||
| 423 | 423 | */ |
| 424 | 424 | private function setupVars() |
| 425 | 425 | { |
| 426 | - if($this->minified !== null && $this->cdn !== null) return; |
|
| 426 | + if($this->minified !== null && $this->cdn !== null) |
|
| 427 | + { |
|
| 428 | + return; |
|
| 429 | + } |
|
| 427 | 430 | $this->minified = 'min'; |
| 428 | 431 | $this->cdn = 'cdn'; |
| 429 | 432 | if(isset(FlipsideSettings::$global)) |
@@ -75,8 +75,8 @@ |
||
| 75 | 75 | if(!isset($this->headers['Authorization'])) |
| 76 | 76 | { |
| 77 | 77 | $this->app->user = $this->getUserFromSession(); |
| 78 | - } |
|
| 79 | - else |
|
| 78 | + } |
|
| 79 | + else |
|
| 80 | 80 | { |
| 81 | 81 | $header = $this->headers['Authorization']; |
| 82 | 82 | $this->app->user = $this->getUserFromHeader($header); |
@@ -35,11 +35,17 @@ discard block |
||
| 35 | 35 | return array(new FilterClause($string)); |
| 36 | 36 | } |
| 37 | 37 | $children = array(); |
| 38 | - if($parens) array_push($children, '('); |
|
| 38 | + if($parens) |
|
| 39 | + { |
|
| 40 | + array_push($children, '('); |
|
| 41 | + } |
|
| 39 | 42 | $children = array_merge($children, self::process_string($clauses[1])); |
| 40 | 43 | array_push($children, trim($clauses[2])); |
| 41 | 44 | $children = array_merge($children, self::process_string($clauses[3])); |
| 42 | - if($parens) array_push($children, ')'); |
|
| 45 | + if($parens) |
|
| 46 | + { |
|
| 47 | + array_push($children, ')'); |
|
| 48 | + } |
|
| 43 | 49 | return $children; |
| 44 | 50 | } |
| 45 | 51 | |
@@ -178,7 +184,10 @@ discard block |
||
| 178 | 184 | $count = count($this->children); |
| 179 | 185 | for($i = 0; $i < $count; $i++) |
| 180 | 186 | { |
| 181 | - if(!is_object($this->children[$i])) continue; |
|
| 187 | + if(!is_object($this->children[$i])) |
|
| 188 | + { |
|
| 189 | + continue; |
|
| 190 | + } |
|
| 182 | 191 | if(strstr($this->children[$i]->var1, $substr) !== false || |
| 183 | 192 | strstr($this->children[$i]->var2, $substr) !== false) |
| 184 | 193 | { |
@@ -9,7 +9,10 @@ |
||
| 9 | 9 | |
| 10 | 10 | function __construct($string=false) |
| 11 | 11 | { |
| 12 | - if($string !== false) $this->process_filter_string($string); |
|
| 12 | + if($string !== false) |
|
| 13 | + { |
|
| 14 | + $this->process_filter_string($string); |
|
| 15 | + } |
|
| 13 | 16 | } |
| 14 | 17 | |
| 15 | 18 | static function str_startswith($haystack, $needle) |
@@ -280,11 +280,17 @@ |
||
| 280 | 280 | public function canLoginWith($provider) |
| 281 | 281 | { |
| 282 | 282 | $hosts = $this->getLoginProviders(); |
| 283 | - if($hosts === false) return false; |
|
| 283 | + if($hosts === false) |
|
| 284 | + { |
|
| 285 | + return false; |
|
| 286 | + } |
|
| 284 | 287 | $count = count($hosts); |
| 285 | 288 | for($i = 0; $i < $count; $i++) |
| 286 | 289 | { |
| 287 | - if(strcasecmp($hosts[$i], $provider) === 0) return true; |
|
| 290 | + if(strcasecmp($hosts[$i], $provider) === 0) |
|
| 291 | + { |
|
| 292 | + return true; |
|
| 293 | + } |
|
| 288 | 294 | } |
| 289 | 295 | return false; |
| 290 | 296 | } |
@@ -179,7 +179,10 @@ |
||
| 179 | 179 | $count = count($groups); |
| 180 | 180 | for($i = 0; $i < $count; $i++) |
| 181 | 181 | { |
| 182 | - if($groups[$i] === false || $groups[$i] === null) continue; |
|
| 182 | + if($groups[$i] === false || $groups[$i] === null) |
|
| 183 | + { |
|
| 184 | + continue; |
|
| 185 | + } |
|
| 183 | 186 | array_push($data, new LDAPGroup($groups[$i])); |
| 184 | 187 | } |
| 185 | 188 | $users = $this->server->read($this->server->user_base, $userFilter, false, $select); |
@@ -41,10 +41,16 @@ |
||
| 41 | 41 | switch($orderby[$keys[0]]) |
| 42 | 42 | { |
| 43 | 43 | case 1: |
| 44 | - if($d > 0) swap($array, $i, $j); |
|
| 44 | + if($d > 0) |
|
| 45 | + { |
|
| 46 | + swap($array, $i, $j); |
|
| 47 | + } |
|
| 45 | 48 | break; |
| 46 | 49 | case 0: |
| 47 | - if($d < 0) swap($array, $i, $j); |
|
| 50 | + if($d < 0) |
|
| 51 | + { |
|
| 52 | + swap($array, $i, $j); |
|
| 53 | + } |
|
| 48 | 54 | break; |
| 49 | 55 | } |
| 50 | 56 | } |
@@ -1,7 +1,7 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace Auth; |
| 3 | 3 | |
| 4 | -trait LDAPCachableObject |
|
| 4 | +trait LDAPCachableObject |
|
| 5 | 5 | { |
| 6 | 6 | protected function update($obj) |
| 7 | 7 | { |
@@ -13,7 +13,10 @@ discard block |
||
| 13 | 13 | { |
| 14 | 14 | $auth = \AuthProvider::getInstance(); |
| 15 | 15 | $ldap = $auth->getAuthenticator('Auth\LDAPAuthenticator'); |
| 16 | - if($ldap === false) return false; |
|
| 16 | + if($ldap === false) |
|
| 17 | + { |
|
| 18 | + return false; |
|
| 19 | + } |
|
| 17 | 20 | $this->server = $ldap->get_and_bind_server(true); |
| 18 | 21 | return $this->server->update($obj); |
| 19 | 22 | } |
@@ -1,24 +1,24 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace Auth; |
| 3 | 3 | |
| 4 | -class NullAuthenticator extends Authenticator |
|
| 5 | -{
|
|
| 6 | - public function login($username, $password) |
|
| 7 | - {
|
|
| 4 | +class NullAuthenticator extends Authenticator |
|
| 5 | +{ |
|
| 6 | + public function login($username, $password) |
|
| 7 | + { |
|
| 8 | 8 | return array('res'=>true, 'extended'=>null);
|
| 9 | 9 | } |
| 10 | 10 | |
| 11 | - public function isLoggedIn($data) |
|
| 12 | - {
|
|
| 13 | - if(isset($data['res'])) |
|
| 14 | - {
|
|
| 11 | + public function isLoggedIn($data) |
|
| 12 | + { |
|
| 13 | + if(isset($data['res'])) |
|
| 14 | + { |
|
| 15 | 15 | return $data['res']; |
| 16 | 16 | } |
| 17 | 17 | return false; |
| 18 | 18 | } |
| 19 | 19 | |
| 20 | - public function getUser($data) |
|
| 21 | - {
|
|
| 20 | + public function getUser($data) |
|
| 21 | + { |
|
| 22 | 22 | return null; |
| 23 | 23 | } |
| 24 | 24 | } |