| @@ -72,7 +72,7 @@ discard block | ||
| 72 | 72 | /** | 
| 73 | 73 | * Who is this email going to | 
| 74 | 74 | * | 
| 75 | - * @return array The recipients of the email | |
| 75 | + * @return string The recipients of the email | |
| 76 | 76 | */ | 
| 77 | 77 | public function getToAddresses() | 
| 78 | 78 |      { | 
| @@ -82,7 +82,7 @@ discard block | ||
| 82 | 82 | /** | 
| 83 | 83 | * Who is this email going to (CC) | 
| 84 | 84 | * | 
| 85 | - * @return array The recipients of the email | |
| 85 | + * @return string The recipients of the email | |
| 86 | 86 | */ | 
| 87 | 87 | public function getCCAddresses() | 
| 88 | 88 |      { | 
| @@ -92,7 +92,7 @@ discard block | ||
| 92 | 92 | /** | 
| 93 | 93 | * Who is this email going to (BCC) | 
| 94 | 94 | * | 
| 95 | - * @return array The recipients of the email | |
| 95 | + * @return string The recipients of the email | |
| 96 | 96 | */ | 
| 97 | 97 | public function getBCCAddresses() | 
| 98 | 98 |      { | 
| @@ -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( | 
| @@ -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 | } | 
| @@ -90,7 +90,7 @@ | ||
| 90 | 90 | * We need the ability to obtain the user's unhashed plain text password to allow for it to be sent | 
| 91 | 91 | * to the correct backend which will hash it | 
| 92 | 92 | * | 
| 93 | - * @return boolean|string The current password | |
| 93 | + * @return boolean The current password | |
| 94 | 94 | */ | 
| 95 | 95 | public function getPassword() | 
| 96 | 96 |      { | 
| @@ -140,7 +140,7 @@ discard block | ||
| 140 | 140 | /** | 
| 141 | 141 | * Get the data table for Pending Users | 
| 142 | 142 | * | 
| 143 | - * @return boolean|\Data\DataTable The Pending User Data Table | |
| 143 | + * @return boolean The Pending User Data Table | |
| 144 | 144 | */ | 
| 145 | 145 | private function getPendingUserDataTable() | 
| 146 | 146 |      { | 
| @@ -213,6 +213,9 @@ discard block | ||
| 213 | 213 | return new SQLUser($users[0], $this); | 
| 214 | 214 | } | 
| 215 | 215 | |
| 216 | + /** | |
| 217 | + * @param string $dataTableName | |
| 218 | + */ | |
| 216 | 219 | private function getDataByFilter($dataTableName, $filter, $select, $top, $skip, $orderby) | 
| 217 | 220 |      { | 
| 218 | 221 | $dataTable = $this->getDataTable($dataTableName); | 
| @@ -278,6 +281,9 @@ discard block | ||
| 278 | 281 | return $dataTable->count(); | 
| 279 | 282 | } | 
| 280 | 283 | |
| 284 | + /** | |
| 285 | + * @param \Data\Filter $filter | |
| 286 | + */ | |
| 281 | 287 | private function searchPendingUsers($filter, $select, $top, $skip, $orderby) | 
| 282 | 288 |      { | 
| 283 | 289 | $userDataTable = $this->getPendingUserDataTable(); | 
| @@ -113,6 +113,9 @@ discard block | ||
| 113 | 113 |          throw new \Exception('No such table '.$name); | 
| 114 | 114 | } | 
| 115 | 115 | |
| 116 | + /** | |
| 117 | + * @param string $tablename | |
| 118 | + */ | |
| 116 | 119 | function read($tablename, $where = false, $select = '*', $count = false, $skip = false, $sort = false) | 
| 117 | 120 |      { | 
| 118 | 121 | if($select === false) | 
| @@ -158,6 +161,9 @@ discard block | ||
| 158 | 161 | return $ret; | 
| 159 | 162 | } | 
| 160 | 163 | |
| 164 | + /** | |
| 165 | + * @param string $tablename | |
| 166 | + */ | |
| 161 | 167 | function update($tablename, $where, $data) | 
| 162 | 168 |      { | 
| 163 | 169 | $set = array(); | 
| @@ -180,6 +186,9 @@ discard block | ||
| 180 | 186 | return true; | 
| 181 | 187 | } | 
| 182 | 188 | |
| 189 | + /** | |
| 190 | + * @param string $tablename | |
| 191 | + */ | |
| 183 | 192 | function create($tablename, $data) | 
| 184 | 193 |      { | 
| 185 | 194 | $set = array(); | 
| @@ -203,6 +212,9 @@ discard block | ||
| 203 | 212 | return true; | 
| 204 | 213 | } | 
| 205 | 214 | |
| 215 | + /** | |
| 216 | + * @param string $tablename | |
| 217 | + */ | |
| 206 | 218 | function delete($tablename, $where) | 
| 207 | 219 |      { | 
| 208 | 220 | $sql = "DELETE FROM $tablename WHERE $where"; | 
| @@ -41,7 +41,7 @@ discard block | ||
| 41 | 41 | /** | 
| 42 | 42 | * The name the user should be displayed as | 
| 43 | 43 | * | 
| 44 | - * @return boolean|string The name the user should be displayed as | |
| 44 | + * @return boolean The name the user should be displayed as | |
| 45 | 45 | */ | 
| 46 | 46 | public function getDisplayName() | 
| 47 | 47 |      { | 
| @@ -51,7 +51,7 @@ discard block | ||
| 51 | 51 | /** | 
| 52 | 52 | * The given (or first) name for the user | 
| 53 | 53 | * | 
| 54 | - * @return boolean|string The user's first name | |
| 54 | + * @return boolean The user's first name | |
| 55 | 55 | */ | 
| 56 | 56 | public function getGivenName() | 
| 57 | 57 |      { | 
| @@ -61,7 +61,7 @@ discard block | ||
| 61 | 61 | /** | 
| 62 | 62 | * The email address for the user | 
| 63 | 63 | * | 
| 64 | - * @return boolean|string The user's email address | |
| 64 | + * @return boolean The user's email address | |
| 65 | 65 | */ | 
| 66 | 66 | public function getEmail() | 
| 67 | 67 |      { | 
| @@ -71,7 +71,7 @@ discard block | ||
| 71 | 71 | /** | 
| 72 | 72 | * The user ID for the user | 
| 73 | 73 | * | 
| 74 | - * @return boolean|string The user's ID or username | |
| 74 | + * @return boolean The user's ID or username | |
| 75 | 75 | */ | 
| 76 | 76 | public function getUid() | 
| 77 | 77 |      { | 
| @@ -81,7 +81,7 @@ discard block | ||
| 81 | 81 | /** | 
| 82 | 82 | * The photo for the user | 
| 83 | 83 | * | 
| 84 | - * @return boolean|string The user's photo as a binary string | |
| 84 | + * @return boolean The user's photo as a binary string | |
| 85 | 85 | */ | 
| 86 | 86 | public function getPhoto() | 
| 87 | 87 |      { | 
| @@ -91,7 +91,7 @@ discard block | ||
| 91 | 91 | /** | 
| 92 | 92 | * The phone number for the user | 
| 93 | 93 | * | 
| 94 | - * @return boolean|string The user's phone number | |
| 94 | + * @return boolean The user's phone number | |
| 95 | 95 | */ | 
| 96 | 96 | public function getPhoneNumber() | 
| 97 | 97 |      { | 
| @@ -101,7 +101,7 @@ discard block | ||
| 101 | 101 | /** | 
| 102 | 102 | * The organziation for the user | 
| 103 | 103 | * | 
| 104 | - * @return boolean|string The user's organization | |
| 104 | + * @return boolean The user's organization | |
| 105 | 105 | */ | 
| 106 | 106 | public function getOrganization() | 
| 107 | 107 |      { | 
| @@ -111,7 +111,7 @@ discard block | ||
| 111 | 111 | /** | 
| 112 | 112 | * The list of titles for the user | 
| 113 | 113 | * | 
| 114 | - * @return boolean|array The user's title(s) in short format | |
| 114 | + * @return boolean The user's title(s) in short format | |
| 115 | 115 | */ | 
| 116 | 116 | public function getTitles() | 
| 117 | 117 |      { | 
| @@ -121,7 +121,7 @@ discard block | ||
| 121 | 121 | /** | 
| 122 | 122 | * The list of titles for the user | 
| 123 | 123 | * | 
| 124 | - * @return boolean|array The user's title(s) in user friendly strings | |
| 124 | + * @return boolean The user's title(s) in user friendly strings | |
| 125 | 125 | * | 
| 126 | 126 |       * @SuppressWarnings("StaticAccess") | 
| 127 | 127 | */ | 
| @@ -159,7 +159,7 @@ discard block | ||
| 159 | 159 | /** | 
| 160 | 160 | * The state the user's mailing address is in | 
| 161 | 161 | * | 
| 162 | - * @return boolean|string The user's state from their mailing address | |
| 162 | + * @return boolean The user's state from their mailing address | |
| 163 | 163 | */ | 
| 164 | 164 | public function getState() | 
| 165 | 165 |      { | 
| @@ -169,7 +169,7 @@ discard block | ||
| 169 | 169 | /** | 
| 170 | 170 | * The city the user's mailing address is in | 
| 171 | 171 | * | 
| 172 | - * @return boolean|string The user's city from their mailing address | |
| 172 | + * @return boolean The user's city from their mailing address | |
| 173 | 173 | */ | 
| 174 | 174 | public function getCity() | 
| 175 | 175 |      { | 
| @@ -179,7 +179,7 @@ discard block | ||
| 179 | 179 | /** | 
| 180 | 180 | * The last name for the user | 
| 181 | 181 | * | 
| 182 | - * @return boolean|string The user's last name | |
| 182 | + * @return boolean The user's last name | |
| 183 | 183 | */ | 
| 184 | 184 | public function getLastName() | 
| 185 | 185 |      { | 
| @@ -189,7 +189,7 @@ discard block | ||
| 189 | 189 | /** | 
| 190 | 190 | * The nick name for the user | 
| 191 | 191 | * | 
| 192 | - * @return boolean|string The user's nick name | |
| 192 | + * @return boolean The user's nick name | |
| 193 | 193 | */ | 
| 194 | 194 | public function getNickName() | 
| 195 | 195 |      { | 
| @@ -199,7 +199,7 @@ discard block | ||
| 199 | 199 | /** | 
| 200 | 200 | * The street address for the user | 
| 201 | 201 | * | 
| 202 | - * @return boolean|string The user's street address | |
| 202 | + * @return boolean The user's street address | |
| 203 | 203 | */ | 
| 204 | 204 | public function getAddress() | 
| 205 | 205 |      { | 
| @@ -209,7 +209,7 @@ discard block | ||
| 209 | 209 | /** | 
| 210 | 210 | * The postal (zip) code for the user's mailing address | 
| 211 | 211 | * | 
| 212 | - * @return boolean|string The user's postal code | |
| 212 | + * @return boolean The user's postal code | |
| 213 | 213 | */ | 
| 214 | 214 | public function getPostalCode() | 
| 215 | 215 |      { | 
| @@ -219,7 +219,7 @@ discard block | ||
| 219 | 219 | /** | 
| 220 | 220 | * The country the user's mailing address is in | 
| 221 | 221 | * | 
| 222 | - * @return boolean|string The user's country from their mailing address | |
| 222 | + * @return boolean The user's country from their mailing address | |
| 223 | 223 | */ | 
| 224 | 224 | public function getCountry() | 
| 225 | 225 |      { | 
| @@ -231,7 +231,7 @@ discard block | ||
| 231 | 231 | * | 
| 232 | 232 | * This is the same as Areas in Flipside speak. | 
| 233 | 233 | * | 
| 234 | - * @return boolean|array The user's orgnaiational units | |
| 234 | + * @return boolean The user's orgnaiational units | |
| 235 | 235 | */ | 
| 236 | 236 | public function getOrganizationUnits() | 
| 237 | 237 |      { | 
| @@ -241,7 +241,7 @@ discard block | ||
| 241 | 241 | /** | 
| 242 | 242 | * The supplemental login types that the user can use to login | 
| 243 | 243 | * | 
| 244 | - * @return boolean|array The user's login providers | |
| 244 | + * @return boolean The user's login providers | |
| 245 | 245 | */ | 
| 246 | 246 | public function getLoginProviders() | 
| 247 | 247 |      { | 
| @@ -251,7 +251,7 @@ discard block | ||
| 251 | 251 | /** | 
| 252 | 252 | * The groups the user is a part of | 
| 253 | 253 | * | 
| 254 | - * @return boolean|array The user's Auth\Group structures | |
| 254 | + * @return boolean The user's Auth\Group structures | |
| 255 | 255 | */ | 
| 256 | 256 | public function getGroups() | 
| 257 | 257 |      { | 
| @@ -727,7 +727,7 @@ discard block | ||
| 727 | 727 | * | 
| 728 | 728 | * @param stdClass $data The user's new data | 
| 729 | 729 | * | 
| 730 | - * @return boolean true if the user's data was changed, false otherwise | |
| 730 | + * @return boolean|null true if the user's data was changed, false otherwise | |
| 731 | 731 | */ | 
| 732 | 732 | public function editUser($data) | 
| 733 | 733 |      { | 
| @@ -754,7 +754,7 @@ discard block | ||
| 754 | 754 | /** | 
| 755 | 755 | * Obtain the user's password reset hash | 
| 756 | 756 | * | 
| 757 | - * @return string|false A hash if available, false otherwise | |
| 757 | + * @return boolean A hash if available, false otherwise | |
| 758 | 758 | */ | 
| 759 | 759 | public function getPasswordResetHash() | 
| 760 | 760 |      { | 
| @@ -60,7 +60,7 @@ discard block | ||
| 60 | 60 | * | 
| 61 | 61 | * @param string $methodName The class name of the Authenticator to get the instance for | 
| 62 | 62 | * | 
| 63 | - * @return Auth\Authenticator|false The specified Authenticator class instance or false if it is not loaded | |
| 63 | + * @return string The specified Authenticator class instance or false if it is not loaded | |
| 64 | 64 | */ | 
| 65 | 65 | public function getAuthenticator($methodName) | 
| 66 | 66 |      { | 
| @@ -276,11 +276,11 @@ discard block | ||
| 276 | 276 | * Get an array of Auth\PendingUser from a filtered set | 
| 277 | 277 | * | 
| 278 | 278 | * @param Data\Filter|boolean $filter The filter conditions or false to retreive all | 
| 279 | - * @param array|boolean $methodName The user fields to obtain or false to obtain all | |
| 280 | - * @param integer|boolean $top The number of users to obtain or false to obtain all | |
| 281 | - * @param integer|boolean $skip The number of users to skip or false to skip none | |
| 282 | - * @param array|boolean $orderby The field to sort by and the method to sort or false to not sort | |
| 283 | - * @param string|boolean $methodName The AuthMethod if information is desired only from a particular Auth\Authenticator | |
| 279 | + * @param boolean $methodName The user fields to obtain or false to obtain all | |
| 280 | + * @param boolean $top The number of users to obtain or false to obtain all | |
| 281 | + * @param boolean $skip The number of users to skip or false to skip none | |
| 282 | + * @param boolean $orderby The field to sort by and the method to sort or false to not sort | |
| 283 | + * @param boolean $methodName The AuthMethod if information is desired only from a particular Auth\Authenticator | |
| 284 | 284 | * | 
| 285 | 285 | * @return array|boolean An array of Auth\PendingUser objects or false if no pending users were found | 
| 286 | 286 | */ | 
| @@ -210,7 +210,7 @@ | ||
| 210 | 210 | /** | 
| 211 | 211 | * Get the LDAP filter represented by the passed object | 
| 212 | 212 | * | 
| 213 | - * @param boolean|string|\Data\Filter $filter The fiter to use | |
| 213 | + * @param boolean $filter The fiter to use | |
| 214 | 214 | * | 
| 215 | 215 | * @return string The filter in LDAP format | 
| 216 | 216 | */ |