@@ -164,7 +164,7 @@ |
||
| 164 | 164 | $user->prefs = $prefs; |
| 165 | 165 | } |
| 166 | 166 | function privilege($specialbit) { |
| 167 | - return (substr($this->special_user, $specialbit,1)==1); |
|
| 167 | + return (substr($this->special_user, $specialbit,1)==1); |
|
| 168 | 168 | } |
| 169 | 169 | function update($clause) { |
| 170 | 170 | $db = BoincDb::get(); |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | function print_text_field($text,$name,$value) { |
| 64 | 64 | echo "$text <input type=\"text\" size=\"10\" name=\"$name\" value=\"$value\">\n" |
| 65 | - . "<p>\n"; |
|
| 65 | + . "<p>\n"; |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | function row($x, $y) { |
@@ -378,7 +378,7 @@ discard block |
||
| 378 | 378 | $db->do_query($q4); |
| 379 | 379 | return 2; |
| 380 | 380 | } else if (!$db->do_query($q3)) { |
| 381 | - echo "MySQL command '$q3' failed:<br/>unable to cancel workunits and trigger transitioner.<br>\n"; |
|
| 381 | + echo "MySQL command '$q3' failed:<br/>unable to cancel workunits and trigger transitioner.<br>\n"; |
|
| 382 | 382 | $db->do_query($q4); |
| 383 | 383 | return 3; |
| 384 | 384 | } |
@@ -11,10 +11,10 @@ |
||
| 11 | 11 | |
| 12 | 12 | spl_autoload_register(function ($class) { |
| 13 | 13 | if (substr($class, 0, 10) !== 'ReCaptcha\\') { |
| 14 | - /* If the class does not lie under the "ReCaptcha" namespace, |
|
| 14 | + /* If the class does not lie under the "ReCaptcha" namespace, |
|
| 15 | 15 | * then we can exit immediately. |
| 16 | 16 | */ |
| 17 | - return; |
|
| 17 | + return; |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | /* All of the classes have names like "ReCaptcha\Foo", so we need |
@@ -23,9 +23,9 @@ discard block |
||
| 23 | 23 | header("Expires: Thu, 01 Jan 1970 00:00:00 GMT"); |
| 24 | 24 | |
| 25 | 25 | echo "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>" |
| 26 | - . "<!DOCTYPE wml PUBLIC \"-//WAPFORUM//DTD WML 1.2//EN\" " |
|
| 27 | - . "\"http://www.wapforum.org/DTD/wml_1.2.xml\">" |
|
| 28 | - . "<wml><card id=\"cd1\"><p>"; |
|
| 26 | + . "<!DOCTYPE wml PUBLIC \"-//WAPFORUM//DTD WML 1.2//EN\" " |
|
| 27 | + . "\"http://www.wapforum.org/DTD/wml_1.2.xml\">" |
|
| 28 | + . "<wml><card id=\"cd1\"><p>"; |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | function wap_end() { |
@@ -33,6 +33,6 @@ discard block |
||
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | function wap_timestamp() { |
| 36 | - return gmdate('j M Y G:i:s', time()) . " UTC"; |
|
| 36 | + return gmdate('j M Y G:i:s', time()) . " UTC"; |
|
| 37 | 37 | } |
| 38 | 38 | ?> |
@@ -213,26 +213,26 @@ discard block |
||
| 213 | 213 | } |
| 214 | 214 | function geoip_load_shared_mem ($file) { |
| 215 | 215 | |
| 216 | - $fp = fopen($file, "rb"); |
|
| 217 | - if (!$fp) { |
|
| 216 | + $fp = fopen($file, "rb"); |
|
| 217 | + if (!$fp) { |
|
| 218 | 218 | print "error opening $file: $php_errormsg\n"; |
| 219 | 219 | exit; |
| 220 | - } |
|
| 221 | - $s_array = fstat($fp); |
|
| 222 | - $size = $s_array['size']; |
|
| 223 | - if ($shmid = @shmop_open (GEOIP_SHM_KEY, "w", 0, 0)) { |
|
| 220 | + } |
|
| 221 | + $s_array = fstat($fp); |
|
| 222 | + $size = $s_array['size']; |
|
| 223 | + if ($shmid = @shmop_open (GEOIP_SHM_KEY, "w", 0, 0)) { |
|
| 224 | 224 | shmop_delete ($shmid); |
| 225 | 225 | shmop_close ($shmid); |
| 226 | - } |
|
| 227 | - $shmid = shmop_open (GEOIP_SHM_KEY, "c", 0644, $size); |
|
| 228 | - shmop_write ($shmid, fread($fp, $size), 0); |
|
| 229 | - shmop_close ($shmid); |
|
| 226 | + } |
|
| 227 | + $shmid = shmop_open (GEOIP_SHM_KEY, "c", 0644, $size); |
|
| 228 | + shmop_write ($shmid, fread($fp, $size), 0); |
|
| 229 | + shmop_close ($shmid); |
|
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | function _setup_segments($gi){ |
| 233 | - $gi->databaseType = GEOIP_COUNTRY_EDITION; |
|
| 234 | - $gi->record_length = STANDARD_RECORD_LENGTH; |
|
| 235 | - if ($gi->flags & GEOIP_SHARED_MEMORY) { |
|
| 233 | + $gi->databaseType = GEOIP_COUNTRY_EDITION; |
|
| 234 | + $gi->record_length = STANDARD_RECORD_LENGTH; |
|
| 235 | + if ($gi->flags & GEOIP_SHARED_MEMORY) { |
|
| 236 | 236 | $offset = @shmop_size ($gi->shmid) - 3; |
| 237 | 237 | for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) { |
| 238 | 238 | $delim = @shmop_read ($gi->shmid, $offset, 3); |
@@ -245,19 +245,19 @@ discard block |
||
| 245 | 245 | $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0; |
| 246 | 246 | } else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1){ |
| 247 | 247 | $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1; |
| 248 | - } else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0)|| |
|
| 248 | + } else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0)|| |
|
| 249 | 249 | ($gi->databaseType == GEOIP_CITY_EDITION_REV1) |
| 250 | 250 | || ($gi->databaseType == GEOIP_ORG_EDITION) |
| 251 | - || ($gi->databaseType == GEOIP_ISP_EDITION) |
|
| 252 | - || ($gi->databaseType == GEOIP_ASNUM_EDITION)){ |
|
| 251 | + || ($gi->databaseType == GEOIP_ISP_EDITION) |
|
| 252 | + || ($gi->databaseType == GEOIP_ASNUM_EDITION)){ |
|
| 253 | 253 | $gi->databaseSegments = 0; |
| 254 | 254 | $buf = @shmop_read ($gi->shmid, $offset, SEGMENT_RECORD_LENGTH); |
| 255 | 255 | for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++){ |
| 256 | 256 | $gi->databaseSegments += (ord($buf[$j]) << ($j * 8)); |
| 257 | 257 | } |
| 258 | - if (($gi->databaseType == GEOIP_ORG_EDITION)|| |
|
| 259 | - ($gi->databaseType == GEOIP_ISP_EDITION)) { |
|
| 260 | - $gi->record_length = ORG_RECORD_LENGTH; |
|
| 258 | + if (($gi->databaseType == GEOIP_ORG_EDITION)|| |
|
| 259 | + ($gi->databaseType == GEOIP_ISP_EDITION)) { |
|
| 260 | + $gi->record_length = ORG_RECORD_LENGTH; |
|
| 261 | 261 | } |
| 262 | 262 | } |
| 263 | 263 | break; |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | ($gi->databaseType == GEOIP_NETSPEED_EDITION)){ |
| 271 | 271 | $gi->databaseSegments = GEOIP_COUNTRY_BEGIN; |
| 272 | 272 | } |
| 273 | - } else { |
|
| 273 | + } else { |
|
| 274 | 274 | $filepos = ftell($gi->filehandle); |
| 275 | 275 | fseek($gi->filehandle, -3, SEEK_END); |
| 276 | 276 | for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) { |
@@ -281,19 +281,19 @@ discard block |
||
| 281 | 281 | $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0; |
| 282 | 282 | } |
| 283 | 283 | else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1){ |
| 284 | - $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1; |
|
| 284 | + $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1; |
|
| 285 | 285 | } else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0) || |
| 286 | 286 | ($gi->databaseType == GEOIP_CITY_EDITION_REV1) || |
| 287 | 287 | ($gi->databaseType == GEOIP_ORG_EDITION) || |
| 288 | - ($gi->databaseType == GEOIP_ISP_EDITION) || |
|
| 288 | + ($gi->databaseType == GEOIP_ISP_EDITION) || |
|
| 289 | 289 | ($gi->databaseType == GEOIP_ASNUM_EDITION)){ |
| 290 | 290 | $gi->databaseSegments = 0; |
| 291 | 291 | $buf = fread($gi->filehandle,SEGMENT_RECORD_LENGTH); |
| 292 | 292 | for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++){ |
| 293 | 293 | $gi->databaseSegments += (ord($buf[$j]) << ($j * 8)); |
| 294 | 294 | } |
| 295 | - if ($gi->databaseType == GEOIP_ORG_EDITION) { |
|
| 296 | - $gi->record_length = ORG_RECORD_LENGTH; |
|
| 295 | + if ($gi->databaseType == GEOIP_ORG_EDITION) { |
|
| 296 | + $gi->record_length = ORG_RECORD_LENGTH; |
|
| 297 | 297 | } |
| 298 | 298 | } |
| 299 | 299 | break; |
@@ -304,17 +304,17 @@ discard block |
||
| 304 | 304 | if (($gi->databaseType == GEOIP_COUNTRY_EDITION)|| |
| 305 | 305 | ($gi->databaseType == GEOIP_PROXY_EDITION)|| |
| 306 | 306 | ($gi->databaseType == GEOIP_NETSPEED_EDITION)){ |
| 307 | - $gi->databaseSegments = GEOIP_COUNTRY_BEGIN; |
|
| 307 | + $gi->databaseSegments = GEOIP_COUNTRY_BEGIN; |
|
| 308 | 308 | } |
| 309 | 309 | fseek($gi->filehandle,$filepos,SEEK_SET); |
| 310 | - } |
|
| 311 | - return $gi; |
|
| 310 | + } |
|
| 311 | + return $gi; |
|
| 312 | 312 | } |
| 313 | 313 | |
| 314 | 314 | function geoip_open($filename, $flags) { |
| 315 | - $gi = new GeoIP; |
|
| 316 | - $gi->flags = $flags; |
|
| 317 | - if ($gi->flags & GEOIP_SHARED_MEMORY) { |
|
| 315 | + $gi = new GeoIP; |
|
| 316 | + $gi->flags = $flags; |
|
| 317 | + if ($gi->flags & GEOIP_SHARED_MEMORY) { |
|
| 318 | 318 | $gi->shmid = @shmop_open (GEOIP_SHM_KEY, "a", 0, 0); |
| 319 | 319 | } else { |
| 320 | 320 | $gi->filehandle = fopen($filename,"rb"); |
@@ -322,174 +322,174 @@ discard block |
||
| 322 | 322 | $s_array = fstat($gi->filehandle); |
| 323 | 323 | $gi->memory_buffer = fread($gi->filehandle, $s_array[size]); |
| 324 | 324 | } |
| 325 | - } |
|
| 325 | + } |
|
| 326 | 326 | |
| 327 | - $gi = _setup_segments($gi); |
|
| 328 | - return $gi; |
|
| 327 | + $gi = _setup_segments($gi); |
|
| 328 | + return $gi; |
|
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | function geoip_close($gi) { |
| 332 | - if ($gi->flags & GEOIP_SHARED_MEMORY) { |
|
| 332 | + if ($gi->flags & GEOIP_SHARED_MEMORY) { |
|
| 333 | 333 | return true; |
| 334 | - } |
|
| 334 | + } |
|
| 335 | 335 | |
| 336 | - return fclose($gi->filehandle); |
|
| 336 | + return fclose($gi->filehandle); |
|
| 337 | 337 | } |
| 338 | 338 | |
| 339 | 339 | function geoip_country_id_by_name($gi, $name) { |
| 340 | - $addr = gethostbyname($name); |
|
| 341 | - if (!$addr || $addr == $name) { |
|
| 340 | + $addr = gethostbyname($name); |
|
| 341 | + if (!$addr || $addr == $name) { |
|
| 342 | 342 | return false; |
| 343 | - } |
|
| 344 | - return geoip_country_id_by_addr($gi, $addr); |
|
| 343 | + } |
|
| 344 | + return geoip_country_id_by_addr($gi, $addr); |
|
| 345 | 345 | } |
| 346 | 346 | |
| 347 | 347 | function geoip_country_code_by_name($gi, $name) { |
| 348 | - $country_id = geoip_country_id_by_name($gi,$name); |
|
| 349 | - if ($country_id !== false) { |
|
| 348 | + $country_id = geoip_country_id_by_name($gi,$name); |
|
| 349 | + if ($country_id !== false) { |
|
| 350 | 350 | return $gi->GEOIP_COUNTRY_CODES[$country_id]; |
| 351 | - } |
|
| 352 | - return false; |
|
| 351 | + } |
|
| 352 | + return false; |
|
| 353 | 353 | } |
| 354 | 354 | |
| 355 | 355 | function geoip_country_name_by_name($gi, $name) { |
| 356 | - $country_id = geoip_country_id_by_name($gi,$name); |
|
| 357 | - if ($country_id !== false) { |
|
| 356 | + $country_id = geoip_country_id_by_name($gi,$name); |
|
| 357 | + if ($country_id !== false) { |
|
| 358 | 358 | return $gi->GEOIP_COUNTRY_NAMES[$country_id]; |
| 359 | - } |
|
| 360 | - return false; |
|
| 359 | + } |
|
| 360 | + return false; |
|
| 361 | 361 | } |
| 362 | 362 | |
| 363 | 363 | function geoip_country_id_by_addr($gi, $addr) { |
| 364 | - $ipnum = ip2long($addr); |
|
| 365 | - return _geoip_seek_country($gi, $ipnum) - GEOIP_COUNTRY_BEGIN; |
|
| 364 | + $ipnum = ip2long($addr); |
|
| 365 | + return _geoip_seek_country($gi, $ipnum) - GEOIP_COUNTRY_BEGIN; |
|
| 366 | 366 | } |
| 367 | 367 | |
| 368 | 368 | function geoip_country_code_by_addr($gi, $addr) { |
| 369 | - $country_id = geoip_country_id_by_addr($gi,$addr); |
|
| 370 | - if ($country_id !== false) { |
|
| 369 | + $country_id = geoip_country_id_by_addr($gi,$addr); |
|
| 370 | + if ($country_id !== false) { |
|
| 371 | 371 | return $gi->GEOIP_COUNTRY_CODES[$country_id]; |
| 372 | - } |
|
| 373 | - return false; |
|
| 372 | + } |
|
| 373 | + return false; |
|
| 374 | 374 | } |
| 375 | 375 | |
| 376 | 376 | function geoip_country_name_by_addr($gi, $addr) { |
| 377 | - $country_id = geoip_country_id_by_addr($gi,$addr); |
|
| 378 | - if ($country_id !== false) { |
|
| 377 | + $country_id = geoip_country_id_by_addr($gi,$addr); |
|
| 378 | + if ($country_id !== false) { |
|
| 379 | 379 | return $gi->GEOIP_COUNTRY_NAMES[$country_id]; |
| 380 | - } |
|
| 381 | - return false; |
|
| 380 | + } |
|
| 381 | + return false; |
|
| 382 | 382 | } |
| 383 | 383 | |
| 384 | 384 | function _geoip_seek_country($gi, $ipnum) { |
| 385 | - $offset = 0; |
|
| 386 | - for ($depth = 31; $depth >= 0; --$depth) { |
|
| 385 | + $offset = 0; |
|
| 386 | + for ($depth = 31; $depth >= 0; --$depth) { |
|
| 387 | 387 | if ($gi->flags & GEOIP_MEMORY_CACHE) { |
| 388 | - $buf = substr($gi->memory_buffer, |
|
| 388 | + $buf = substr($gi->memory_buffer, |
|
| 389 | 389 | 2 * $gi->record_length * $offset, |
| 390 | 390 | 2 * $gi->record_length); |
| 391 | 391 | } elseif ($gi->flags & GEOIP_SHARED_MEMORY) { |
| 392 | - $buf = @shmop_read ($gi->shmid, |
|
| 392 | + $buf = @shmop_read ($gi->shmid, |
|
| 393 | 393 | 2 * $gi->record_length * $offset, |
| 394 | 394 | 2 * $gi->record_length ); |
| 395 | 395 | } else { |
| 396 | - fseek($gi->filehandle, 2 * $gi->record_length * $offset, SEEK_SET) == 0 |
|
| 396 | + fseek($gi->filehandle, 2 * $gi->record_length * $offset, SEEK_SET) == 0 |
|
| 397 | 397 | or die("fseek failed"); |
| 398 | - $buf = fread($gi->filehandle, 2 * $gi->record_length); |
|
| 398 | + $buf = fread($gi->filehandle, 2 * $gi->record_length); |
|
| 399 | 399 | } |
| 400 | 400 | $x = array(0,0); |
| 401 | 401 | for ($i = 0; $i < 2; ++$i) { |
| 402 | - for ($j = 0; $j < $gi->record_length; ++$j) { |
|
| 402 | + for ($j = 0; $j < $gi->record_length; ++$j) { |
|
| 403 | 403 | $x[$i] += ord($buf[$gi->record_length * $i + $j]) << ($j * 8); |
| 404 | - } |
|
| 404 | + } |
|
| 405 | 405 | } |
| 406 | 406 | if ($ipnum & (1 << $depth)) { |
| 407 | - if ($x[1] >= $gi->databaseSegments) { |
|
| 407 | + if ($x[1] >= $gi->databaseSegments) { |
|
| 408 | 408 | return $x[1]; |
| 409 | - } |
|
| 410 | - $offset = $x[1]; |
|
| 409 | + } |
|
| 410 | + $offset = $x[1]; |
|
| 411 | 411 | } else { |
| 412 | - if ($x[0] >= $gi->databaseSegments) { |
|
| 412 | + if ($x[0] >= $gi->databaseSegments) { |
|
| 413 | 413 | return $x[0]; |
| 414 | - } |
|
| 415 | - $offset = $x[0]; |
|
| 414 | + } |
|
| 415 | + $offset = $x[0]; |
|
| 416 | + } |
|
| 416 | 417 | } |
| 417 | - } |
|
| 418 | - trigger_error("error traversing database - perhaps it is corrupt?", E_USER_ERROR); |
|
| 419 | - return false; |
|
| 418 | + trigger_error("error traversing database - perhaps it is corrupt?", E_USER_ERROR); |
|
| 419 | + return false; |
|
| 420 | 420 | } |
| 421 | 421 | |
| 422 | 422 | function _get_org($gi,$ipnum){ |
| 423 | - $seek_org = _geoip_seek_country($gi,$ipnum); |
|
| 424 | - if ($seek_org == $gi->databaseSegments) { |
|
| 423 | + $seek_org = _geoip_seek_country($gi,$ipnum); |
|
| 424 | + if ($seek_org == $gi->databaseSegments) { |
|
| 425 | 425 | return NULL; |
| 426 | - } |
|
| 427 | - $record_pointer = $seek_org + (2 * $gi->record_length - 1) * $gi->databaseSegments; |
|
| 428 | - if ($gi->flags & GEOIP_SHARED_MEMORY) { |
|
| 426 | + } |
|
| 427 | + $record_pointer = $seek_org + (2 * $gi->record_length - 1) * $gi->databaseSegments; |
|
| 428 | + if ($gi->flags & GEOIP_SHARED_MEMORY) { |
|
| 429 | 429 | $org_buf = @shmop_read ($gi->shmid, $record_pointer, MAX_ORG_RECORD_LENGTH); |
| 430 | 430 | } else { |
| 431 | 431 | fseek($gi->filehandle, $record_pointer, SEEK_SET); |
| 432 | 432 | $org_buf = fread($gi->filehandle,MAX_ORG_RECORD_LENGTH); |
| 433 | - } |
|
| 434 | - $org_buf = substr($org_buf, 0, strpos($org_buf, 0)); |
|
| 435 | - return $org_buf; |
|
| 433 | + } |
|
| 434 | + $org_buf = substr($org_buf, 0, strpos($org_buf, 0)); |
|
| 435 | + return $org_buf; |
|
| 436 | 436 | } |
| 437 | 437 | |
| 438 | 438 | function geoip_org_by_addr ($gi,$addr) { |
| 439 | - if ($addr == NULL) { |
|
| 439 | + if ($addr == NULL) { |
|
| 440 | 440 | return 0; |
| 441 | - } |
|
| 442 | - $ipnum = ip2long($addr); |
|
| 443 | - return _get_org($gi, $ipnum); |
|
| 441 | + } |
|
| 442 | + $ipnum = ip2long($addr); |
|
| 443 | + return _get_org($gi, $ipnum); |
|
| 444 | 444 | } |
| 445 | 445 | |
| 446 | 446 | function _get_region($gi,$ipnum){ |
| 447 | - if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){ |
|
| 447 | + if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){ |
|
| 448 | 448 | $seek_region = _geoip_seek_country($gi,$ipnum) - GEOIP_STATE_BEGIN_REV0; |
| 449 | 449 | if ($seek_region >= 1000){ |
| 450 | - $country_code = "US"; |
|
| 451 | - $region = chr(($seek_region - 1000)/26 + 65) . chr(($seek_region - 1000)%26 + 65); |
|
| 450 | + $country_code = "US"; |
|
| 451 | + $region = chr(($seek_region - 1000)/26 + 65) . chr(($seek_region - 1000)%26 + 65); |
|
| 452 | 452 | } else { |
| 453 | 453 | $country_code = $gi->GEOIP_COUNTRY_CODES[$seek_region]; |
| 454 | - $region = ""; |
|
| 454 | + $region = ""; |
|
| 455 | 455 | } |
| 456 | - return array ($country_code,$region); |
|
| 456 | + return array ($country_code,$region); |
|
| 457 | 457 | } else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1) { |
| 458 | 458 | $seek_region = _geoip_seek_country($gi,$ipnum) - GEOIP_STATE_BEGIN_REV1; |
| 459 | 459 | //print $seek_region; |
| 460 | 460 | if ($seek_region < US_OFFSET){ |
| 461 | - $country_code = ""; |
|
| 462 | - $region = ""; |
|
| 461 | + $country_code = ""; |
|
| 462 | + $region = ""; |
|
| 463 | 463 | } else if ($seek_region < CANADA_OFFSET) { |
| 464 | - $country_code = "US"; |
|
| 465 | - $region = chr(($seek_region - US_OFFSET)/26 + 65) . chr(($seek_region - US_OFFSET)%26 + 65); |
|
| 464 | + $country_code = "US"; |
|
| 465 | + $region = chr(($seek_region - US_OFFSET)/26 + 65) . chr(($seek_region - US_OFFSET)%26 + 65); |
|
| 466 | 466 | } else if ($seek_region < WORLD_OFFSET) { |
| 467 | - $country_code = "CA"; |
|
| 468 | - $region = chr(($seek_region - CANADA_OFFSET)/26 + 65) . chr(($seek_region - CANADA_OFFSET)%26 + 65); |
|
| 467 | + $country_code = "CA"; |
|
| 468 | + $region = chr(($seek_region - CANADA_OFFSET)/26 + 65) . chr(($seek_region - CANADA_OFFSET)%26 + 65); |
|
| 469 | 469 | } else { |
| 470 | 470 | $country_code = $gi->GEOIP_COUNTRY_CODES[($seek_region - WORLD_OFFSET) / FIPS_RANGE]; |
| 471 | - $region = ""; |
|
| 471 | + $region = ""; |
|
| 472 | + } |
|
| 473 | + return array ($country_code,$region); |
|
| 472 | 474 | } |
| 473 | - return array ($country_code,$region); |
|
| 474 | - } |
|
| 475 | 475 | } |
| 476 | 476 | |
| 477 | 477 | function geoip_region_by_addr ($gi,$addr) { |
| 478 | - if ($addr == NULL) { |
|
| 478 | + if ($addr == NULL) { |
|
| 479 | 479 | return 0; |
| 480 | - } |
|
| 481 | - $ipnum = ip2long($addr); |
|
| 482 | - return _get_region($gi, $ipnum); |
|
| 480 | + } |
|
| 481 | + $ipnum = ip2long($addr); |
|
| 482 | + return _get_region($gi, $ipnum); |
|
| 483 | 483 | } |
| 484 | 484 | |
| 485 | 485 | function getdnsattributes ($l,$ip){ |
| 486 | - $r = new Net_DNS_Resolver(); |
|
| 487 | - $r->nameservers = array("ws1.maxmind.com"); |
|
| 488 | - $p = $r->search($l."." . $ip .".s.maxmind.com","TXT","IN"); |
|
| 489 | - $str = is_object($p->answer[0])?$p->answer[0]->string():''; |
|
| 490 | - ereg("\"(.*)\"",$str,$regs); |
|
| 491 | - $str = $regs[1]; |
|
| 492 | - return $str; |
|
| 486 | + $r = new Net_DNS_Resolver(); |
|
| 487 | + $r->nameservers = array("ws1.maxmind.com"); |
|
| 488 | + $p = $r->search($l."." . $ip .".s.maxmind.com","TXT","IN"); |
|
| 489 | + $str = is_object($p->answer[0])?$p->answer[0]->string():''; |
|
| 490 | + ereg("\"(.*)\"",$str,$regs); |
|
| 491 | + $str = $regs[1]; |
|
| 492 | + return $str; |
|
| 493 | 493 | } |
| 494 | 494 | |
| 495 | 495 | ?> |
@@ -7,15 +7,15 @@ |
||
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | 9 | class views_handler_argument_boincteam_id extends views_handler_argument_numeric { |
| 10 | - function construct() { |
|
| 10 | + function construct() { |
|
| 11 | 11 | parent::construct(); |
| 12 | - } |
|
| 12 | + } |
|
| 13 | 13 | |
| 14 | - function set_argument($arg) { |
|
| 14 | + function set_argument($arg) { |
|
| 15 | 15 | // When setting the ID argument, convert to BOINC ID |
| 16 | 16 | $id = is_numeric($arg) ? $arg : 0; |
| 17 | 17 | $boinc_id = db_result(db_query("SELECT team_id FROM {boincteam} WHERE nid = %d", $id)); |
| 18 | 18 | $this->argument = $boinc_id; |
| 19 | 19 | return $this->validate_arg($boinc_id); |
| 20 | - } |
|
| 20 | + } |
|
| 21 | 21 | } |
@@ -7,15 +7,15 @@ |
||
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | 9 | class views_handler_argument_boincuser_id extends views_handler_argument_numeric { |
| 10 | - function construct() { |
|
| 10 | + function construct() { |
|
| 11 | 11 | parent::construct(); |
| 12 | - } |
|
| 12 | + } |
|
| 13 | 13 | |
| 14 | - function set_argument($arg) { |
|
| 14 | + function set_argument($arg) { |
|
| 15 | 15 | // When setting the ID argument, convert to BOINC ID |
| 16 | 16 | $id = is_numeric($arg) ? $arg : 0; |
| 17 | 17 | $boinc_id = db_result(db_query("SELECT boinc_id FROM {boincuser} WHERE uid = %d", $id)); |
| 18 | 18 | $this->argument = $boinc_id; |
| 19 | 19 | return $this->validate_arg($boinc_id); |
| 20 | - } |
|
| 20 | + } |
|
| 21 | 21 | } |
@@ -7,15 +7,15 @@ |
||
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | 9 | class views_handler_argument_boincteam_id extends views_handler_argument_numeric { |
| 10 | - function construct() { |
|
| 10 | + function construct() { |
|
| 11 | 11 | parent::construct(); |
| 12 | - } |
|
| 12 | + } |
|
| 13 | 13 | |
| 14 | - function set_argument($arg) { |
|
| 14 | + function set_argument($arg) { |
|
| 15 | 15 | // When setting the ID argument, convert to BOINC ID |
| 16 | 16 | $id = is_numeric($arg) ? $arg : 0; |
| 17 | 17 | $boinc_id = db_result(db_query("SELECT team_id FROM {boincteam} WHERE nid = %d", $id)); |
| 18 | 18 | $this->argument = $boinc_id; |
| 19 | 19 | return $this->validate_arg($boinc_id); |
| 20 | - } |
|
| 20 | + } |
|
| 21 | 21 | } |
@@ -4,133 +4,133 @@ discard block |
||
| 4 | 4 | * Implementation of hook_views_default_views(). |
| 5 | 5 | */ |
| 6 | 6 | function friends_views_default_views() { |
| 7 | - $views = array(); |
|
| 7 | + $views = array(); |
|
| 8 | 8 | |
| 9 | - // Exported view: boinc_friends |
|
| 10 | - $view = new view; |
|
| 11 | - $view->name = 'boinc_friends'; |
|
| 12 | - $view->description = 'Customized views for friend relationships'; |
|
| 13 | - $view->tag = 'boinc'; |
|
| 14 | - $view->base_table = 'users'; |
|
| 15 | - $view->core = 6; |
|
| 16 | - $view->api_version = '2'; |
|
| 17 | - $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */ |
|
| 18 | - $handler = $view->new_display('default', 'Defaults', 'default'); |
|
| 19 | - $handler->override_option('relationships', array( |
|
| 9 | + // Exported view: boinc_friends |
|
| 10 | + $view = new view; |
|
| 11 | + $view->name = 'boinc_friends'; |
|
| 12 | + $view->description = 'Customized views for friend relationships'; |
|
| 13 | + $view->tag = 'boinc'; |
|
| 14 | + $view->base_table = 'users'; |
|
| 15 | + $view->core = 6; |
|
| 16 | + $view->api_version = '2'; |
|
| 17 | + $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */ |
|
| 18 | + $handler = $view->new_display('default', 'Defaults', 'default'); |
|
| 19 | + $handler->override_option('relationships', array( |
|
| 20 | 20 | 'flag_friend_content_rel' => array( |
| 21 | - 'label' => 'flag friend', |
|
| 22 | - 'required' => 1, |
|
| 23 | - 'flag' => 'friend', |
|
| 24 | - 'user_scope' => 'any', |
|
| 25 | - 'id' => 'flag_friend_content_rel', |
|
| 26 | - 'table' => 'users', |
|
| 27 | - 'field' => 'flag_friend_content_rel', |
|
| 28 | - 'override' => array( |
|
| 21 | + 'label' => 'flag friend', |
|
| 22 | + 'required' => 1, |
|
| 23 | + 'flag' => 'friend', |
|
| 24 | + 'user_scope' => 'any', |
|
| 25 | + 'id' => 'flag_friend_content_rel', |
|
| 26 | + 'table' => 'users', |
|
| 27 | + 'field' => 'flag_friend_content_rel', |
|
| 28 | + 'override' => array( |
|
| 29 | 29 | 'button' => 'Override', |
| 30 | - ), |
|
| 31 | - 'relationship' => 'none', |
|
| 30 | + ), |
|
| 31 | + 'relationship' => 'none', |
|
| 32 | 32 | ), |
| 33 | - )); |
|
| 34 | - $handler->override_option('fields', array( |
|
| 33 | + )); |
|
| 34 | + $handler->override_option('fields', array( |
|
| 35 | 35 | 'name' => array( |
| 36 | - 'label' => 'Name', |
|
| 37 | - 'link_to_user' => 1, |
|
| 38 | - 'exclude' => 0, |
|
| 39 | - 'id' => 'name', |
|
| 40 | - 'table' => 'users', |
|
| 41 | - 'field' => 'name', |
|
| 42 | - 'override' => array( |
|
| 36 | + 'label' => 'Name', |
|
| 37 | + 'link_to_user' => 1, |
|
| 38 | + 'exclude' => 0, |
|
| 39 | + 'id' => 'name', |
|
| 40 | + 'table' => 'users', |
|
| 41 | + 'field' => 'name', |
|
| 42 | + 'override' => array( |
|
| 43 | 43 | 'button' => 'Override', |
| 44 | - ), |
|
| 45 | - 'relationship' => 'none', |
|
| 44 | + ), |
|
| 45 | + 'relationship' => 'none', |
|
| 46 | 46 | ), |
| 47 | 47 | 'ops' => array( |
| 48 | - 'label' => 'Flag link', |
|
| 49 | - 'link_type' => '', |
|
| 50 | - 'exclude' => 0, |
|
| 51 | - 'id' => 'ops', |
|
| 52 | - 'table' => 'flag_content', |
|
| 53 | - 'field' => 'ops', |
|
| 54 | - 'relationship' => 'flag_friend_content_rel', |
|
| 55 | - 'override' => array( |
|
| 48 | + 'label' => 'Flag link', |
|
| 49 | + 'link_type' => '', |
|
| 50 | + 'exclude' => 0, |
|
| 51 | + 'id' => 'ops', |
|
| 52 | + 'table' => 'flag_content', |
|
| 53 | + 'field' => 'ops', |
|
| 54 | + 'relationship' => 'flag_friend_content_rel', |
|
| 55 | + 'override' => array( |
|
| 56 | 56 | 'button' => 'Override', |
| 57 | - ), |
|
| 57 | + ), |
|
| 58 | 58 | ), |
| 59 | 59 | 'uid' => array( |
| 60 | - 'label' => 'Flag friend links', |
|
| 61 | - 'exclude' => 0, |
|
| 62 | - 'id' => 'uid', |
|
| 63 | - 'table' => 'flag_friend', |
|
| 64 | - 'field' => 'uid', |
|
| 65 | - 'relationship' => 'none', |
|
| 66 | - ), |
|
| 67 | - )); |
|
| 68 | - $handler->override_option('arguments', array( |
|
| 60 | + 'label' => 'Flag friend links', |
|
| 61 | + 'exclude' => 0, |
|
| 62 | + 'id' => 'uid', |
|
| 63 | + 'table' => 'flag_friend', |
|
| 64 | + 'field' => 'uid', |
|
| 65 | + 'relationship' => 'none', |
|
| 66 | + ), |
|
| 67 | + )); |
|
| 68 | + $handler->override_option('arguments', array( |
|
| 69 | 69 | 'friend_uid' => array( |
| 70 | - 'id' => 'friend_uid', |
|
| 71 | - 'table' => 'flag_friend', |
|
| 72 | - 'field' => 'friend_uid', |
|
| 70 | + 'id' => 'friend_uid', |
|
| 71 | + 'table' => 'flag_friend', |
|
| 72 | + 'field' => 'friend_uid', |
|
| 73 | 73 | ), |
| 74 | - )); |
|
| 75 | - $handler->override_option('filters', array( |
|
| 74 | + )); |
|
| 75 | + $handler->override_option('filters', array( |
|
| 76 | 76 | 'status' => array( |
| 77 | - 'operator' => '=', |
|
| 78 | - 'value' => '1', |
|
| 79 | - 'group' => '0', |
|
| 80 | - 'exposed' => FALSE, |
|
| 81 | - 'expose' => array( |
|
| 77 | + 'operator' => '=', |
|
| 78 | + 'value' => '1', |
|
| 79 | + 'group' => '0', |
|
| 80 | + 'exposed' => FALSE, |
|
| 81 | + 'expose' => array( |
|
| 82 | 82 | 'operator' => FALSE, |
| 83 | 83 | 'label' => '', |
| 84 | - ), |
|
| 85 | - 'id' => 'status', |
|
| 86 | - 'table' => 'users', |
|
| 87 | - 'field' => 'status', |
|
| 88 | - 'relationship' => 'none', |
|
| 89 | - ), |
|
| 90 | - )); |
|
| 91 | - $handler->override_option('access', array( |
|
| 84 | + ), |
|
| 85 | + 'id' => 'status', |
|
| 86 | + 'table' => 'users', |
|
| 87 | + 'field' => 'status', |
|
| 88 | + 'relationship' => 'none', |
|
| 89 | + ), |
|
| 90 | + )); |
|
| 91 | + $handler->override_option('access', array( |
|
| 92 | 92 | 'type' => 'perm', |
| 93 | 93 | 'perm' => 'access content', |
| 94 | - )); |
|
| 95 | - $handler->override_option('cache', array( |
|
| 94 | + )); |
|
| 95 | + $handler->override_option('cache', array( |
|
| 96 | 96 | 'type' => 'none', |
| 97 | - )); |
|
| 98 | - $handler->override_option('empty', bts('No Friends have been added.', array(), NULL, 'boinc:friends-page')); |
|
| 99 | - $handler->override_option('empty_format', '5'); |
|
| 100 | - $handler->override_option('use_pager', '1'); |
|
| 101 | - $handler->override_option('distinct', 1); |
|
| 102 | - $handler->override_option('style_plugin', 'table'); |
|
| 103 | - $handler->override_option('style_options', array( |
|
| 97 | + )); |
|
| 98 | + $handler->override_option('empty', bts('No Friends have been added.', array(), NULL, 'boinc:friends-page')); |
|
| 99 | + $handler->override_option('empty_format', '5'); |
|
| 100 | + $handler->override_option('use_pager', '1'); |
|
| 101 | + $handler->override_option('distinct', 1); |
|
| 102 | + $handler->override_option('style_plugin', 'table'); |
|
| 103 | + $handler->override_option('style_options', array( |
|
| 104 | 104 | 'grouping' => '', |
| 105 | 105 | 'override' => 1, |
| 106 | 106 | 'sticky' => 0, |
| 107 | 107 | 'order' => 'asc', |
| 108 | 108 | 'summary' => '', |
| 109 | 109 | 'columns' => array( |
| 110 | - 'name' => 'name', |
|
| 111 | - 'ops' => 'ops', |
|
| 112 | - 'uid' => 'uid', |
|
| 110 | + 'name' => 'name', |
|
| 111 | + 'ops' => 'ops', |
|
| 112 | + 'uid' => 'uid', |
|
| 113 | 113 | ), |
| 114 | 114 | 'info' => array( |
| 115 | - 'name' => array( |
|
| 115 | + 'name' => array( |
|
| 116 | 116 | 'sortable' => 0, |
| 117 | 117 | 'separator' => '', |
| 118 | - ), |
|
| 119 | - 'ops' => array( |
|
| 118 | + ), |
|
| 119 | + 'ops' => array( |
|
| 120 | 120 | 'separator' => '', |
| 121 | - ), |
|
| 122 | - 'uid' => array( |
|
| 121 | + ), |
|
| 122 | + 'uid' => array( |
|
| 123 | 123 | 'separator' => '', |
| 124 | - ), |
|
| 124 | + ), |
|
| 125 | 125 | ), |
| 126 | 126 | 'default' => '-1', |
| 127 | - )); |
|
| 128 | - $handler = $view->new_display('page', 'Page (friends)', 'page_1'); |
|
| 129 | - $handler->override_option('relationships', array()); |
|
| 130 | - $handler->override_option('fields', array( |
|
| 127 | + )); |
|
| 128 | + $handler = $view->new_display('page', 'Page (friends)', 'page_1'); |
|
| 129 | + $handler->override_option('relationships', array()); |
|
| 130 | + $handler->override_option('fields', array( |
|
| 131 | 131 | 'picture' => array( |
| 132 | - 'label' => 'Friend', |
|
| 133 | - 'alter' => array( |
|
| 132 | + 'label' => 'Friend', |
|
| 133 | + 'alter' => array( |
|
| 134 | 134 | 'alter_text' => 0, |
| 135 | 135 | 'text' => '', |
| 136 | 136 | 'make_link' => 0, |
@@ -149,35 +149,35 @@ discard block |
||
| 149 | 149 | 'ellipsis' => 1, |
| 150 | 150 | 'html' => 0, |
| 151 | 151 | 'strip_tags' => 0, |
| 152 | - ), |
|
| 153 | - 'empty' => '', |
|
| 154 | - 'hide_empty' => 0, |
|
| 155 | - 'empty_zero' => 0, |
|
| 156 | - 'hide_alter_empty' => 1, |
|
| 157 | - 'exclude' => 1, |
|
| 158 | - 'id' => 'picture', |
|
| 159 | - 'table' => 'users', |
|
| 160 | - 'field' => 'picture', |
|
| 161 | - 'override' => array( |
|
| 152 | + ), |
|
| 153 | + 'empty' => '', |
|
| 154 | + 'hide_empty' => 0, |
|
| 155 | + 'empty_zero' => 0, |
|
| 156 | + 'hide_alter_empty' => 1, |
|
| 157 | + 'exclude' => 1, |
|
| 158 | + 'id' => 'picture', |
|
| 159 | + 'table' => 'users', |
|
| 160 | + 'field' => 'picture', |
|
| 161 | + 'override' => array( |
|
| 162 | 162 | 'button' => 'Use default', |
| 163 | - ), |
|
| 164 | - 'relationship' => 'none', |
|
| 163 | + ), |
|
| 164 | + 'relationship' => 'none', |
|
| 165 | 165 | ), |
| 166 | 166 | 'name' => array( |
| 167 | - 'label' => 'Name', |
|
| 168 | - 'link_to_user' => 1, |
|
| 169 | - 'exclude' => 0, |
|
| 170 | - 'id' => 'name', |
|
| 171 | - 'table' => 'users', |
|
| 172 | - 'field' => 'name', |
|
| 173 | - 'override' => array( |
|
| 167 | + 'label' => 'Name', |
|
| 168 | + 'link_to_user' => 1, |
|
| 169 | + 'exclude' => 0, |
|
| 170 | + 'id' => 'name', |
|
| 171 | + 'table' => 'users', |
|
| 172 | + 'field' => 'name', |
|
| 173 | + 'override' => array( |
|
| 174 | 174 | 'button' => 'Use default', |
| 175 | - ), |
|
| 176 | - 'relationship' => 'none', |
|
| 175 | + ), |
|
| 176 | + 'relationship' => 'none', |
|
| 177 | 177 | ), |
| 178 | 178 | 'uid' => array( |
| 179 | - 'label' => '', |
|
| 180 | - 'alter' => array( |
|
| 179 | + 'label' => '', |
|
| 180 | + 'alter' => array( |
|
| 181 | 181 | 'alter_text' => 0, |
| 182 | 182 | 'text' => '', |
| 183 | 183 | 'make_link' => 0, |
@@ -196,87 +196,87 @@ discard block |
||
| 196 | 196 | 'ellipsis' => 1, |
| 197 | 197 | 'html' => 0, |
| 198 | 198 | 'strip_tags' => 0, |
| 199 | - ), |
|
| 200 | - 'empty' => '', |
|
| 201 | - 'hide_empty' => 1, |
|
| 202 | - 'empty_zero' => 0, |
|
| 203 | - 'hide_alter_empty' => 1, |
|
| 204 | - 'exclude' => 0, |
|
| 205 | - 'id' => 'uid', |
|
| 206 | - 'table' => 'flag_friend', |
|
| 207 | - 'field' => 'uid', |
|
| 208 | - 'override' => array( |
|
| 199 | + ), |
|
| 200 | + 'empty' => '', |
|
| 201 | + 'hide_empty' => 1, |
|
| 202 | + 'empty_zero' => 0, |
|
| 203 | + 'hide_alter_empty' => 1, |
|
| 204 | + 'exclude' => 0, |
|
| 205 | + 'id' => 'uid', |
|
| 206 | + 'table' => 'flag_friend', |
|
| 207 | + 'field' => 'uid', |
|
| 208 | + 'override' => array( |
|
| 209 | 209 | 'button' => 'Use default', |
| 210 | - ), |
|
| 211 | - 'relationship' => 'none', |
|
| 210 | + ), |
|
| 211 | + 'relationship' => 'none', |
|
| 212 | 212 | ), |
| 213 | - )); |
|
| 214 | - $handler->override_option('arguments', array( |
|
| 213 | + )); |
|
| 214 | + $handler->override_option('arguments', array( |
|
| 215 | 215 | 'friend_uid' => array( |
| 216 | - 'default_action' => 'default', |
|
| 217 | - 'style_plugin' => 'default_summary', |
|
| 218 | - 'style_options' => array(), |
|
| 219 | - 'wildcard' => 'all', |
|
| 220 | - 'wildcard_substitution' => 'All', |
|
| 221 | - 'title' => '', |
|
| 222 | - 'breadcrumb' => '', |
|
| 223 | - 'default_argument_type' => 'current_user', |
|
| 224 | - 'default_argument' => '', |
|
| 225 | - 'validate_type' => 'none', |
|
| 226 | - 'validate_fail' => 'not found', |
|
| 227 | - 'break_phrase' => 0, |
|
| 228 | - 'not' => 0, |
|
| 229 | - 'flag_friend_include_arg_user' => 0, |
|
| 230 | - 'id' => 'friend_uid', |
|
| 231 | - 'table' => 'flag_friend', |
|
| 232 | - 'field' => 'friend_uid', |
|
| 233 | - 'override' => array( |
|
| 216 | + 'default_action' => 'default', |
|
| 217 | + 'style_plugin' => 'default_summary', |
|
| 218 | + 'style_options' => array(), |
|
| 219 | + 'wildcard' => 'all', |
|
| 220 | + 'wildcard_substitution' => 'All', |
|
| 221 | + 'title' => '', |
|
| 222 | + 'breadcrumb' => '', |
|
| 223 | + 'default_argument_type' => 'current_user', |
|
| 224 | + 'default_argument' => '', |
|
| 225 | + 'validate_type' => 'none', |
|
| 226 | + 'validate_fail' => 'not found', |
|
| 227 | + 'break_phrase' => 0, |
|
| 228 | + 'not' => 0, |
|
| 229 | + 'flag_friend_include_arg_user' => 0, |
|
| 230 | + 'id' => 'friend_uid', |
|
| 231 | + 'table' => 'flag_friend', |
|
| 232 | + 'field' => 'friend_uid', |
|
| 233 | + 'override' => array( |
|
| 234 | 234 | 'button' => 'Use default', |
| 235 | - ), |
|
| 236 | - 'relationship' => 'none', |
|
| 237 | - 'default_options_div_prefix' => '', |
|
| 238 | - 'default_argument_user' => 0, |
|
| 239 | - 'default_argument_fixed' => '', |
|
| 240 | - 'default_argument_php' => '', |
|
| 241 | - 'validate_argument_node_access' => 0, |
|
| 242 | - 'validate_argument_nid_type' => 'nid', |
|
| 243 | - 'validate_argument_vocabulary' => array( |
|
| 235 | + ), |
|
| 236 | + 'relationship' => 'none', |
|
| 237 | + 'default_options_div_prefix' => '', |
|
| 238 | + 'default_argument_user' => 0, |
|
| 239 | + 'default_argument_fixed' => '', |
|
| 240 | + 'default_argument_php' => '', |
|
| 241 | + 'validate_argument_node_access' => 0, |
|
| 242 | + 'validate_argument_nid_type' => 'nid', |
|
| 243 | + 'validate_argument_vocabulary' => array( |
|
| 244 | 244 | 2 => 0, |
| 245 | 245 | 3 => 0, |
| 246 | - ), |
|
| 247 | - 'validate_argument_type' => 'tid', |
|
| 248 | - 'validate_argument_node_flag_name' => '*relationship*', |
|
| 249 | - 'validate_argument_node_flag_test' => 'flaggable', |
|
| 250 | - 'validate_argument_node_flag_id_type' => 'id', |
|
| 251 | - 'validate_argument_user_flag_name' => '*relationship*', |
|
| 252 | - 'validate_argument_user_flag_test' => 'flaggable', |
|
| 253 | - 'validate_argument_user_flag_id_type' => 'id', |
|
| 254 | - 'validate_argument_php' => '', |
|
| 255 | - 'validate_user_argument_type' => 'uid', |
|
| 256 | - 'validate_user_roles' => array( |
|
| 246 | + ), |
|
| 247 | + 'validate_argument_type' => 'tid', |
|
| 248 | + 'validate_argument_node_flag_name' => '*relationship*', |
|
| 249 | + 'validate_argument_node_flag_test' => 'flaggable', |
|
| 250 | + 'validate_argument_node_flag_id_type' => 'id', |
|
| 251 | + 'validate_argument_user_flag_name' => '*relationship*', |
|
| 252 | + 'validate_argument_user_flag_test' => 'flaggable', |
|
| 253 | + 'validate_argument_user_flag_id_type' => 'id', |
|
| 254 | + 'validate_argument_php' => '', |
|
| 255 | + 'validate_user_argument_type' => 'uid', |
|
| 256 | + 'validate_user_roles' => array( |
|
| 257 | 257 | 2 => 0, |
| 258 | 258 | 3 => 0, |
| 259 | 259 | 5 => 0, |
| 260 | 260 | 4 => 0, |
| 261 | 261 | 6 => 0, |
| 262 | - ), |
|
| 263 | - 'me_redirect' => 0, |
|
| 264 | - 'me_validate_user_argument_type' => 'uid', |
|
| 265 | - 'me_validate_user_roles' => array( |
|
| 262 | + ), |
|
| 263 | + 'me_redirect' => 0, |
|
| 264 | + 'me_validate_user_argument_type' => 'uid', |
|
| 265 | + 'me_validate_user_roles' => array( |
|
| 266 | 266 | 2 => 0, |
| 267 | 267 | 3 => 0, |
| 268 | 268 | 5 => 0, |
| 269 | 269 | 4 => 0, |
| 270 | 270 | 6 => 0, |
| 271 | - ), |
|
| 272 | - 'default_taxonomy_tid_term_page' => 0, |
|
| 273 | - 'default_taxonomy_tid_node' => 0, |
|
| 274 | - 'default_taxonomy_tid_limit' => 0, |
|
| 275 | - 'default_taxonomy_tid_vids' => array( |
|
| 271 | + ), |
|
| 272 | + 'default_taxonomy_tid_term_page' => 0, |
|
| 273 | + 'default_taxonomy_tid_node' => 0, |
|
| 274 | + 'default_taxonomy_tid_limit' => 0, |
|
| 275 | + 'default_taxonomy_tid_vids' => array( |
|
| 276 | 276 | 2 => 0, |
| 277 | 277 | 3 => 0, |
| 278 | - ), |
|
| 279 | - 'validate_argument_node_type' => array( |
|
| 278 | + ), |
|
| 279 | + 'validate_argument_node_type' => array( |
|
| 280 | 280 | 'page' => 0, |
| 281 | 281 | 'profile' => 0, |
| 282 | 282 | 'forum' => 0, |
@@ -284,33 +284,33 @@ discard block |
||
| 284 | 284 | 'news' => 0, |
| 285 | 285 | 'story' => 0, |
| 286 | 286 | 'team' => 0, |
| 287 | - ), |
|
| 288 | - 'validate_argument_transform' => 0, |
|
| 289 | - 'validate_user_restrict_roles' => 0, |
|
| 290 | - 'me_validate_user_restrict_roles' => 0, |
|
| 291 | - ), |
|
| 292 | - )); |
|
| 293 | - $handler->override_option('title', 'Friends'); |
|
| 294 | - $handler->override_option('path', 'account/%/friends/all'); |
|
| 295 | - $handler->override_option('menu', array( |
|
| 287 | + ), |
|
| 288 | + 'validate_argument_transform' => 0, |
|
| 289 | + 'validate_user_restrict_roles' => 0, |
|
| 290 | + 'me_validate_user_restrict_roles' => 0, |
|
| 291 | + ), |
|
| 292 | + )); |
|
| 293 | + $handler->override_option('title', 'Friends'); |
|
| 294 | + $handler->override_option('path', 'account/%/friends/all'); |
|
| 295 | + $handler->override_option('menu', array( |
|
| 296 | 296 | 'type' => 'default tab', |
| 297 | 297 | 'title' => bts('View All Friends', array(), NULL, 'boinc:friends-page'), |
| 298 | 298 | 'description' => '', |
| 299 | 299 | 'weight' => '-10', |
| 300 | 300 | 'name' => 'navigation', |
| 301 | - )); |
|
| 302 | - $handler->override_option('tab_options', array( |
|
| 301 | + )); |
|
| 302 | + $handler->override_option('tab_options', array( |
|
| 303 | 303 | 'type' => 'normal', |
| 304 | 304 | 'title' => 'Friends', |
| 305 | 305 | 'description' => '', |
| 306 | 306 | 'weight' => '0', |
| 307 | 307 | 'name' => 'navigation', |
| 308 | - )); |
|
| 309 | - $handler = $view->new_display('page', 'Page (pending)', 'page_2'); |
|
| 310 | - $handler->override_option('fields', array( |
|
| 308 | + )); |
|
| 309 | + $handler = $view->new_display('page', 'Page (pending)', 'page_2'); |
|
| 310 | + $handler->override_option('fields', array( |
|
| 311 | 311 | 'picture' => array( |
| 312 | - 'label' => 'User', |
|
| 313 | - 'alter' => array( |
|
| 312 | + 'label' => 'User', |
|
| 313 | + 'alter' => array( |
|
| 314 | 314 | 'alter_text' => 0, |
| 315 | 315 | 'text' => '', |
| 316 | 316 | 'make_link' => 0, |
@@ -329,46 +329,46 @@ discard block |
||
| 329 | 329 | 'ellipsis' => 1, |
| 330 | 330 | 'html' => 0, |
| 331 | 331 | 'strip_tags' => 0, |
| 332 | - ), |
|
| 333 | - 'empty' => '', |
|
| 334 | - 'hide_empty' => 0, |
|
| 335 | - 'empty_zero' => 0, |
|
| 336 | - 'hide_alter_empty' => 1, |
|
| 337 | - 'exclude' => 1, |
|
| 338 | - 'id' => 'picture', |
|
| 339 | - 'table' => 'users', |
|
| 340 | - 'field' => 'picture', |
|
| 341 | - 'override' => array( |
|
| 332 | + ), |
|
| 333 | + 'empty' => '', |
|
| 334 | + 'hide_empty' => 0, |
|
| 335 | + 'empty_zero' => 0, |
|
| 336 | + 'hide_alter_empty' => 1, |
|
| 337 | + 'exclude' => 1, |
|
| 338 | + 'id' => 'picture', |
|
| 339 | + 'table' => 'users', |
|
| 340 | + 'field' => 'picture', |
|
| 341 | + 'override' => array( |
|
| 342 | 342 | 'button' => 'Use default', |
| 343 | - ), |
|
| 344 | - 'relationship' => 'none', |
|
| 343 | + ), |
|
| 344 | + 'relationship' => 'none', |
|
| 345 | 345 | ), |
| 346 | 346 | 'name' => array( |
| 347 | - 'label' => 'Name', |
|
| 348 | - 'link_to_user' => 1, |
|
| 349 | - 'exclude' => 0, |
|
| 350 | - 'id' => 'name', |
|
| 351 | - 'table' => 'users', |
|
| 352 | - 'field' => 'name', |
|
| 353 | - 'override' => array( |
|
| 347 | + 'label' => 'Name', |
|
| 348 | + 'link_to_user' => 1, |
|
| 349 | + 'exclude' => 0, |
|
| 350 | + 'id' => 'name', |
|
| 351 | + 'table' => 'users', |
|
| 352 | + 'field' => 'name', |
|
| 353 | + 'override' => array( |
|
| 354 | 354 | 'button' => 'Use default', |
| 355 | - ), |
|
| 356 | - 'relationship' => 'none', |
|
| 355 | + ), |
|
| 356 | + 'relationship' => 'none', |
|
| 357 | 357 | ), |
| 358 | 358 | 'message' => array( |
| 359 | - 'label' => 'Message', |
|
| 360 | - 'exclude' => 0, |
|
| 361 | - 'id' => 'message', |
|
| 362 | - 'table' => 'flag_friend_message', |
|
| 363 | - 'field' => 'message', |
|
| 364 | - 'relationship' => 'flag_friend_content_rel', |
|
| 365 | - 'override' => array( |
|
| 359 | + 'label' => 'Message', |
|
| 360 | + 'exclude' => 0, |
|
| 361 | + 'id' => 'message', |
|
| 362 | + 'table' => 'flag_friend_message', |
|
| 363 | + 'field' => 'message', |
|
| 364 | + 'relationship' => 'flag_friend_content_rel', |
|
| 365 | + 'override' => array( |
|
| 366 | 366 | 'button' => 'Use default', |
| 367 | - ), |
|
| 367 | + ), |
|
| 368 | 368 | ), |
| 369 | 369 | 'uid' => array( |
| 370 | - 'label' => 'Flag friend links', |
|
| 371 | - 'alter' => array( |
|
| 370 | + 'label' => 'Flag friend links', |
|
| 371 | + 'alter' => array( |
|
| 372 | 372 | 'alter_text' => 1, |
| 373 | 373 | 'text' => '<ul class="tab-list"> |
| 374 | 374 | <li class="alt tab">[uid]</li>', |
@@ -388,23 +388,23 @@ discard block |
||
| 388 | 388 | 'ellipsis' => 1, |
| 389 | 389 | 'html' => 0, |
| 390 | 390 | 'strip_tags' => 0, |
| 391 | - ), |
|
| 392 | - 'empty' => '', |
|
| 393 | - 'hide_empty' => 0, |
|
| 394 | - 'empty_zero' => 0, |
|
| 395 | - 'hide_alter_empty' => 1, |
|
| 396 | - 'exclude' => 0, |
|
| 397 | - 'id' => 'uid', |
|
| 398 | - 'table' => 'flag_friend', |
|
| 399 | - 'field' => 'uid', |
|
| 400 | - 'override' => array( |
|
| 391 | + ), |
|
| 392 | + 'empty' => '', |
|
| 393 | + 'hide_empty' => 0, |
|
| 394 | + 'empty_zero' => 0, |
|
| 395 | + 'hide_alter_empty' => 1, |
|
| 396 | + 'exclude' => 0, |
|
| 397 | + 'id' => 'uid', |
|
| 398 | + 'table' => 'flag_friend', |
|
| 399 | + 'field' => 'uid', |
|
| 400 | + 'override' => array( |
|
| 401 | 401 | 'button' => 'Use default', |
| 402 | - ), |
|
| 403 | - 'relationship' => 'none', |
|
| 402 | + ), |
|
| 403 | + 'relationship' => 'none', |
|
| 404 | 404 | ), |
| 405 | 405 | 'ops' => array( |
| 406 | - 'label' => '', |
|
| 407 | - 'alter' => array( |
|
| 406 | + 'label' => '', |
|
| 407 | + 'alter' => array( |
|
| 408 | 408 | 'alter_text' => 1, |
| 409 | 409 | 'text' => ' <li class="first alt tab">[ops]</li> |
| 410 | 410 | </ul>', |
@@ -424,148 +424,148 @@ discard block |
||
| 424 | 424 | 'ellipsis' => 1, |
| 425 | 425 | 'html' => 0, |
| 426 | 426 | 'strip_tags' => 0, |
| 427 | - ), |
|
| 428 | - 'empty' => '', |
|
| 429 | - 'hide_empty' => 0, |
|
| 430 | - 'empty_zero' => 0, |
|
| 431 | - 'hide_alter_empty' => 1, |
|
| 432 | - 'link_type' => '', |
|
| 433 | - 'exclude' => 0, |
|
| 434 | - 'id' => 'ops', |
|
| 435 | - 'table' => 'flag_content', |
|
| 436 | - 'field' => 'ops', |
|
| 437 | - 'relationship' => 'flag_friend_content_rel', |
|
| 438 | - 'override' => array( |
|
| 427 | + ), |
|
| 428 | + 'empty' => '', |
|
| 429 | + 'hide_empty' => 0, |
|
| 430 | + 'empty_zero' => 0, |
|
| 431 | + 'hide_alter_empty' => 1, |
|
| 432 | + 'link_type' => '', |
|
| 433 | + 'exclude' => 0, |
|
| 434 | + 'id' => 'ops', |
|
| 435 | + 'table' => 'flag_content', |
|
| 436 | + 'field' => 'ops', |
|
| 437 | + 'relationship' => 'flag_friend_content_rel', |
|
| 438 | + 'override' => array( |
|
| 439 | 439 | 'button' => 'Use default', |
| 440 | - ), |
|
| 440 | + ), |
|
| 441 | 441 | ), |
| 442 | - )); |
|
| 443 | - $handler->override_option('arguments', array( |
|
| 442 | + )); |
|
| 443 | + $handler->override_option('arguments', array( |
|
| 444 | 444 | 'content_id' => array( |
| 445 | - 'default_action' => 'default', |
|
| 446 | - 'style_plugin' => 'default_summary', |
|
| 447 | - 'style_options' => array(), |
|
| 448 | - 'wildcard' => 'all', |
|
| 449 | - 'wildcard_substitution' => 'All', |
|
| 450 | - 'title' => '', |
|
| 451 | - 'default_argument_type' => 'user', |
|
| 452 | - 'default_argument' => '', |
|
| 453 | - 'validate_type' => 'php', |
|
| 454 | - 'validate_fail' => 'not found', |
|
| 455 | - 'break_phrase' => 0, |
|
| 456 | - 'not' => 0, |
|
| 457 | - 'id' => 'content_id', |
|
| 458 | - 'table' => 'flag_content', |
|
| 459 | - 'field' => 'content_id', |
|
| 460 | - 'relationship' => 'flag_friend_content_rel', |
|
| 461 | - 'override' => array( |
|
| 445 | + 'default_action' => 'default', |
|
| 446 | + 'style_plugin' => 'default_summary', |
|
| 447 | + 'style_options' => array(), |
|
| 448 | + 'wildcard' => 'all', |
|
| 449 | + 'wildcard_substitution' => 'All', |
|
| 450 | + 'title' => '', |
|
| 451 | + 'default_argument_type' => 'user', |
|
| 452 | + 'default_argument' => '', |
|
| 453 | + 'validate_type' => 'php', |
|
| 454 | + 'validate_fail' => 'not found', |
|
| 455 | + 'break_phrase' => 0, |
|
| 456 | + 'not' => 0, |
|
| 457 | + 'id' => 'content_id', |
|
| 458 | + 'table' => 'flag_content', |
|
| 459 | + 'field' => 'content_id', |
|
| 460 | + 'relationship' => 'flag_friend_content_rel', |
|
| 461 | + 'override' => array( |
|
| 462 | 462 | 'button' => 'Use default', |
| 463 | - ), |
|
| 464 | - 'default_options_div_prefix' => '', |
|
| 465 | - 'default_argument_user' => 0, |
|
| 466 | - 'default_argument_fixed' => '', |
|
| 467 | - 'default_argument_php' => '', |
|
| 468 | - 'validate_argument_node_access' => 0, |
|
| 469 | - 'validate_argument_nid_type' => 'nid', |
|
| 470 | - 'validate_argument_vocabulary' => array(), |
|
| 471 | - 'validate_argument_type' => 'tid', |
|
| 472 | - 'validate_argument_node_flag_name' => '*relationship*', |
|
| 473 | - 'validate_argument_node_flag_test' => 'flaggable', |
|
| 474 | - 'validate_argument_node_flag_id_type' => 'id', |
|
| 475 | - 'validate_argument_user_flag_name' => '*relationship*', |
|
| 476 | - 'validate_argument_user_flag_test' => 'flaggable', |
|
| 477 | - 'validate_argument_user_flag_id_type' => 'id', |
|
| 478 | - 'validate_argument_php' => 'if ($argument !== $GLOBALS[\'user\']->uid && !user_access(\'administer users\')) { |
|
| 463 | + ), |
|
| 464 | + 'default_options_div_prefix' => '', |
|
| 465 | + 'default_argument_user' => 0, |
|
| 466 | + 'default_argument_fixed' => '', |
|
| 467 | + 'default_argument_php' => '', |
|
| 468 | + 'validate_argument_node_access' => 0, |
|
| 469 | + 'validate_argument_nid_type' => 'nid', |
|
| 470 | + 'validate_argument_vocabulary' => array(), |
|
| 471 | + 'validate_argument_type' => 'tid', |
|
| 472 | + 'validate_argument_node_flag_name' => '*relationship*', |
|
| 473 | + 'validate_argument_node_flag_test' => 'flaggable', |
|
| 474 | + 'validate_argument_node_flag_id_type' => 'id', |
|
| 475 | + 'validate_argument_user_flag_name' => '*relationship*', |
|
| 476 | + 'validate_argument_user_flag_test' => 'flaggable', |
|
| 477 | + 'validate_argument_user_flag_id_type' => 'id', |
|
| 478 | + 'validate_argument_php' => 'if ($argument !== $GLOBALS[\'user\']->uid && !user_access(\'administer users\')) { |
|
| 479 | 479 | return FALSE; |
| 480 | 480 | } |
| 481 | 481 | return TRUE;', |
| 482 | 482 | ), |
| 483 | - )); |
|
| 484 | - $handler->override_option('title', 'Friend Requests'); |
|
| 485 | - $handler->override_option('header', 'These are users who would like to be your friend.'); |
|
| 486 | - $handler->override_option('header_format', '5'); |
|
| 487 | - $handler->override_option('header_empty', 0); |
|
| 488 | - $handler->override_option('empty', 'No Friend Requests.'); |
|
| 489 | - $handler->override_option('style_options', array( |
|
| 483 | + )); |
|
| 484 | + $handler->override_option('title', 'Friend Requests'); |
|
| 485 | + $handler->override_option('header', 'These are users who would like to be your friend.'); |
|
| 486 | + $handler->override_option('header_format', '5'); |
|
| 487 | + $handler->override_option('header_empty', 0); |
|
| 488 | + $handler->override_option('empty', 'No Friend Requests.'); |
|
| 489 | + $handler->override_option('style_options', array( |
|
| 490 | 490 | 'grouping' => '', |
| 491 | 491 | 'override' => 1, |
| 492 | 492 | 'sticky' => 0, |
| 493 | 493 | 'order' => 'asc', |
| 494 | 494 | 'summary' => '', |
| 495 | 495 | 'columns' => array( |
| 496 | - 'picture' => 'picture', |
|
| 497 | - 'name' => 'name', |
|
| 498 | - 'message' => 'message', |
|
| 499 | - 'ops' => 'ops', |
|
| 500 | - 'uid' => 'ops', |
|
| 496 | + 'picture' => 'picture', |
|
| 497 | + 'name' => 'name', |
|
| 498 | + 'message' => 'message', |
|
| 499 | + 'ops' => 'ops', |
|
| 500 | + 'uid' => 'ops', |
|
| 501 | 501 | ), |
| 502 | 502 | 'info' => array( |
| 503 | - 'picture' => array( |
|
| 503 | + 'picture' => array( |
|
| 504 | 504 | 'sortable' => 0, |
| 505 | 505 | 'separator' => '', |
| 506 | - ), |
|
| 507 | - 'name' => array( |
|
| 506 | + ), |
|
| 507 | + 'name' => array( |
|
| 508 | 508 | 'sortable' => 0, |
| 509 | 509 | 'separator' => '', |
| 510 | - ), |
|
| 511 | - 'message' => array( |
|
| 510 | + ), |
|
| 511 | + 'message' => array( |
|
| 512 | 512 | 'separator' => '', |
| 513 | - ), |
|
| 514 | - 'ops' => array( |
|
| 513 | + ), |
|
| 514 | + 'ops' => array( |
|
| 515 | 515 | 'separator' => '', |
| 516 | - ), |
|
| 517 | - 'uid' => array( |
|
| 516 | + ), |
|
| 517 | + 'uid' => array( |
|
| 518 | 518 | 'separator' => '', |
| 519 | - ), |
|
| 519 | + ), |
|
| 520 | 520 | ), |
| 521 | 521 | 'default' => '-1', |
| 522 | - )); |
|
| 523 | - $handler->override_option('path', 'account/%/friends/pending'); |
|
| 524 | - $handler->override_option('menu', array( |
|
| 522 | + )); |
|
| 523 | + $handler->override_option('path', 'account/%/friends/pending'); |
|
| 524 | + $handler->override_option('menu', array( |
|
| 525 | 525 | 'type' => 'tab', |
| 526 | 526 | 'title' => bts('Friend Requests', array(), NULL, 'boinc:friends-page'), |
| 527 | 527 | 'description' => '', |
| 528 | 528 | 'weight' => '0', |
| 529 | 529 | 'name' => 'navigation', |
| 530 | - )); |
|
| 531 | - $handler->override_option('tab_options', array( |
|
| 530 | + )); |
|
| 531 | + $handler->override_option('tab_options', array( |
|
| 532 | 532 | 'type' => 'none', |
| 533 | 533 | 'title' => '', |
| 534 | 534 | 'description' => '', |
| 535 | 535 | 'weight' => 0, |
| 536 | 536 | 'name' => 'navigation', |
| 537 | - )); |
|
| 538 | - $handler = $view->new_display('page', 'Page (flagged)', 'page_3'); |
|
| 539 | - $handler->override_option('relationships', array( |
|
| 537 | + )); |
|
| 538 | + $handler = $view->new_display('page', 'Page (flagged)', 'page_3'); |
|
| 539 | + $handler->override_option('relationships', array( |
|
| 540 | 540 | 'flag_content_rel' => array( |
| 541 | - 'label' => 'flag', |
|
| 542 | - 'required' => 1, |
|
| 543 | - 'flag' => 'friend', |
|
| 544 | - 'user_scope' => 'any', |
|
| 545 | - 'id' => 'flag_content_rel', |
|
| 546 | - 'table' => 'users', |
|
| 547 | - 'field' => 'flag_content_rel', |
|
| 548 | - 'override' => array( |
|
| 541 | + 'label' => 'flag', |
|
| 542 | + 'required' => 1, |
|
| 543 | + 'flag' => 'friend', |
|
| 544 | + 'user_scope' => 'any', |
|
| 545 | + 'id' => 'flag_content_rel', |
|
| 546 | + 'table' => 'users', |
|
| 547 | + 'field' => 'flag_content_rel', |
|
| 548 | + 'override' => array( |
|
| 549 | 549 | 'button' => 'Use default', |
| 550 | - ), |
|
| 551 | - 'relationship' => 'none', |
|
| 550 | + ), |
|
| 551 | + 'relationship' => 'none', |
|
| 552 | 552 | ), |
| 553 | 553 | 'uid' => array( |
| 554 | - 'label' => 'Flag user', |
|
| 555 | - 'required' => 0, |
|
| 556 | - 'id' => 'uid', |
|
| 557 | - 'table' => 'flag_content', |
|
| 558 | - 'field' => 'uid', |
|
| 559 | - 'relationship' => 'flag_content_rel', |
|
| 560 | - 'override' => array( |
|
| 554 | + 'label' => 'Flag user', |
|
| 555 | + 'required' => 0, |
|
| 556 | + 'id' => 'uid', |
|
| 557 | + 'table' => 'flag_content', |
|
| 558 | + 'field' => 'uid', |
|
| 559 | + 'relationship' => 'flag_content_rel', |
|
| 560 | + 'override' => array( |
|
| 561 | 561 | 'button' => 'Use default', |
| 562 | - ), |
|
| 562 | + ), |
|
| 563 | 563 | ), |
| 564 | - )); |
|
| 565 | - $handler->override_option('fields', array( |
|
| 564 | + )); |
|
| 565 | + $handler->override_option('fields', array( |
|
| 566 | 566 | 'picture' => array( |
| 567 | - 'label' => 'User', |
|
| 568 | - 'alter' => array( |
|
| 567 | + 'label' => 'User', |
|
| 568 | + 'alter' => array( |
|
| 569 | 569 | 'alter_text' => 0, |
| 570 | 570 | 'text' => '', |
| 571 | 571 | 'make_link' => 0, |
@@ -584,46 +584,46 @@ discard block |
||
| 584 | 584 | 'ellipsis' => 1, |
| 585 | 585 | 'html' => 0, |
| 586 | 586 | 'strip_tags' => 0, |
| 587 | - ), |
|
| 588 | - 'empty' => '', |
|
| 589 | - 'hide_empty' => 0, |
|
| 590 | - 'empty_zero' => 0, |
|
| 591 | - 'hide_alter_empty' => 1, |
|
| 592 | - 'exclude' => 1, |
|
| 593 | - 'id' => 'picture', |
|
| 594 | - 'table' => 'users', |
|
| 595 | - 'field' => 'picture', |
|
| 596 | - 'override' => array( |
|
| 587 | + ), |
|
| 588 | + 'empty' => '', |
|
| 589 | + 'hide_empty' => 0, |
|
| 590 | + 'empty_zero' => 0, |
|
| 591 | + 'hide_alter_empty' => 1, |
|
| 592 | + 'exclude' => 1, |
|
| 593 | + 'id' => 'picture', |
|
| 594 | + 'table' => 'users', |
|
| 595 | + 'field' => 'picture', |
|
| 596 | + 'override' => array( |
|
| 597 | 597 | 'button' => 'Use default', |
| 598 | - ), |
|
| 599 | - 'relationship' => 'none', |
|
| 598 | + ), |
|
| 599 | + 'relationship' => 'none', |
|
| 600 | 600 | ), |
| 601 | 601 | 'name' => array( |
| 602 | - 'label' => 'Name', |
|
| 603 | - 'link_to_user' => 1, |
|
| 604 | - 'exclude' => 0, |
|
| 605 | - 'id' => 'name', |
|
| 606 | - 'table' => 'users', |
|
| 607 | - 'field' => 'name', |
|
| 608 | - 'override' => array( |
|
| 602 | + 'label' => 'Name', |
|
| 603 | + 'link_to_user' => 1, |
|
| 604 | + 'exclude' => 0, |
|
| 605 | + 'id' => 'name', |
|
| 606 | + 'table' => 'users', |
|
| 607 | + 'field' => 'name', |
|
| 608 | + 'override' => array( |
|
| 609 | 609 | 'button' => 'Use default', |
| 610 | - ), |
|
| 611 | - 'relationship' => 'none', |
|
| 610 | + ), |
|
| 611 | + 'relationship' => 'none', |
|
| 612 | 612 | ), |
| 613 | 613 | 'message' => array( |
| 614 | - 'label' => 'Message', |
|
| 615 | - 'exclude' => 0, |
|
| 616 | - 'id' => 'message', |
|
| 617 | - 'table' => 'flag_friend_message', |
|
| 618 | - 'field' => 'message', |
|
| 619 | - 'relationship' => 'flag_content_rel', |
|
| 620 | - 'override' => array( |
|
| 614 | + 'label' => 'Message', |
|
| 615 | + 'exclude' => 0, |
|
| 616 | + 'id' => 'message', |
|
| 617 | + 'table' => 'flag_friend_message', |
|
| 618 | + 'field' => 'message', |
|
| 619 | + 'relationship' => 'flag_content_rel', |
|
| 620 | + 'override' => array( |
|
| 621 | 621 | 'button' => 'Use default', |
| 622 | - ), |
|
| 622 | + ), |
|
| 623 | 623 | ), |
| 624 | 624 | 'ops' => array( |
| 625 | - 'label' => '', |
|
| 626 | - 'alter' => array( |
|
| 625 | + 'label' => '', |
|
| 626 | + 'alter' => array( |
|
| 627 | 627 | 'alter_text' => 0, |
| 628 | 628 | 'text' => '', |
| 629 | 629 | 'make_link' => 0, |
@@ -642,113 +642,113 @@ discard block |
||
| 642 | 642 | 'ellipsis' => 1, |
| 643 | 643 | 'html' => 0, |
| 644 | 644 | 'strip_tags' => 0, |
| 645 | - ), |
|
| 646 | - 'empty' => '', |
|
| 647 | - 'hide_empty' => 0, |
|
| 648 | - 'empty_zero' => 0, |
|
| 649 | - 'hide_alter_empty' => 1, |
|
| 650 | - 'link_type' => '', |
|
| 651 | - 'exclude' => 0, |
|
| 652 | - 'id' => 'ops', |
|
| 653 | - 'table' => 'flag_content', |
|
| 654 | - 'field' => 'ops', |
|
| 655 | - 'relationship' => 'flag_content_rel', |
|
| 656 | - 'override' => array( |
|
| 645 | + ), |
|
| 646 | + 'empty' => '', |
|
| 647 | + 'hide_empty' => 0, |
|
| 648 | + 'empty_zero' => 0, |
|
| 649 | + 'hide_alter_empty' => 1, |
|
| 650 | + 'link_type' => '', |
|
| 651 | + 'exclude' => 0, |
|
| 652 | + 'id' => 'ops', |
|
| 653 | + 'table' => 'flag_content', |
|
| 654 | + 'field' => 'ops', |
|
| 655 | + 'relationship' => 'flag_content_rel', |
|
| 656 | + 'override' => array( |
|
| 657 | 657 | 'button' => 'Use default', |
| 658 | - ), |
|
| 658 | + ), |
|
| 659 | 659 | ), |
| 660 | - )); |
|
| 661 | - $handler->override_option('arguments', array( |
|
| 660 | + )); |
|
| 661 | + $handler->override_option('arguments', array( |
|
| 662 | 662 | 'uid' => array( |
| 663 | - 'default_action' => 'default', |
|
| 664 | - 'style_plugin' => 'default_summary', |
|
| 665 | - 'style_options' => array(), |
|
| 666 | - 'wildcard' => 'all', |
|
| 667 | - 'wildcard_substitution' => 'All', |
|
| 668 | - 'title' => '', |
|
| 669 | - 'breadcrumb' => '', |
|
| 670 | - 'default_argument_type' => 'user', |
|
| 671 | - 'default_argument' => '', |
|
| 672 | - 'validate_type' => 'php', |
|
| 673 | - 'validate_fail' => 'not found', |
|
| 674 | - 'break_phrase' => 0, |
|
| 675 | - 'not' => 0, |
|
| 676 | - 'id' => 'uid', |
|
| 677 | - 'table' => 'users', |
|
| 678 | - 'field' => 'uid', |
|
| 679 | - 'validate_user_argument_type' => 'uid', |
|
| 680 | - 'validate_user_roles' => array( |
|
| 663 | + 'default_action' => 'default', |
|
| 664 | + 'style_plugin' => 'default_summary', |
|
| 665 | + 'style_options' => array(), |
|
| 666 | + 'wildcard' => 'all', |
|
| 667 | + 'wildcard_substitution' => 'All', |
|
| 668 | + 'title' => '', |
|
| 669 | + 'breadcrumb' => '', |
|
| 670 | + 'default_argument_type' => 'user', |
|
| 671 | + 'default_argument' => '', |
|
| 672 | + 'validate_type' => 'php', |
|
| 673 | + 'validate_fail' => 'not found', |
|
| 674 | + 'break_phrase' => 0, |
|
| 675 | + 'not' => 0, |
|
| 676 | + 'id' => 'uid', |
|
| 677 | + 'table' => 'users', |
|
| 678 | + 'field' => 'uid', |
|
| 679 | + 'validate_user_argument_type' => 'uid', |
|
| 680 | + 'validate_user_roles' => array( |
|
| 681 | 681 | 2 => 0, |
| 682 | - ), |
|
| 683 | - 'override' => array( |
|
| 682 | + ), |
|
| 683 | + 'override' => array( |
|
| 684 | 684 | 'button' => 'Use default', |
| 685 | - ), |
|
| 686 | - 'relationship' => 'uid', |
|
| 687 | - 'default_options_div_prefix' => '', |
|
| 688 | - 'default_argument_user' => 0, |
|
| 689 | - 'default_argument_fixed' => '', |
|
| 690 | - 'default_argument_php' => '', |
|
| 691 | - 'validate_argument_node_type' => array( |
|
| 685 | + ), |
|
| 686 | + 'relationship' => 'uid', |
|
| 687 | + 'default_options_div_prefix' => '', |
|
| 688 | + 'default_argument_user' => 0, |
|
| 689 | + 'default_argument_fixed' => '', |
|
| 690 | + 'default_argument_php' => '', |
|
| 691 | + 'validate_argument_node_type' => array( |
|
| 692 | 692 | 'page' => 0, |
| 693 | 693 | 'story' => 0, |
| 694 | - ), |
|
| 695 | - 'validate_argument_node_access' => 0, |
|
| 696 | - 'validate_argument_nid_type' => 'nid', |
|
| 697 | - 'validate_argument_vocabulary' => array(), |
|
| 698 | - 'validate_argument_type' => 'tid', |
|
| 699 | - 'validate_argument_transform' => 0, |
|
| 700 | - 'validate_user_restrict_roles' => 0, |
|
| 701 | - 'validate_argument_node_flag_name' => '*relationship*', |
|
| 702 | - 'validate_argument_node_flag_test' => 'flaggable', |
|
| 703 | - 'validate_argument_node_flag_id_type' => 'id', |
|
| 704 | - 'validate_argument_user_flag_name' => '*relationship*', |
|
| 705 | - 'validate_argument_user_flag_test' => 'flaggable', |
|
| 706 | - 'validate_argument_user_flag_id_type' => 'id', |
|
| 707 | - 'validate_argument_php' => 'if ($argument !== $GLOBALS[\'user\']->uid && !user_access(\'administer users\')) { |
|
| 694 | + ), |
|
| 695 | + 'validate_argument_node_access' => 0, |
|
| 696 | + 'validate_argument_nid_type' => 'nid', |
|
| 697 | + 'validate_argument_vocabulary' => array(), |
|
| 698 | + 'validate_argument_type' => 'tid', |
|
| 699 | + 'validate_argument_transform' => 0, |
|
| 700 | + 'validate_user_restrict_roles' => 0, |
|
| 701 | + 'validate_argument_node_flag_name' => '*relationship*', |
|
| 702 | + 'validate_argument_node_flag_test' => 'flaggable', |
|
| 703 | + 'validate_argument_node_flag_id_type' => 'id', |
|
| 704 | + 'validate_argument_user_flag_name' => '*relationship*', |
|
| 705 | + 'validate_argument_user_flag_test' => 'flaggable', |
|
| 706 | + 'validate_argument_user_flag_id_type' => 'id', |
|
| 707 | + 'validate_argument_php' => 'if ($argument !== $GLOBALS[\'user\']->uid && !user_access(\'administer users\')) { |
|
| 708 | 708 | return FALSE; |
| 709 | 709 | } |
| 710 | 710 | return TRUE;', |
| 711 | 711 | ), |
| 712 | - )); |
|
| 713 | - $handler->override_option('title', 'Awaiting Friend Approvals'); |
|
| 714 | - $handler->override_option('header', 'These are users who you have requested to be friends with.'); |
|
| 715 | - $handler->override_option('header_format', '5'); |
|
| 716 | - $handler->override_option('header_empty', 1); |
|
| 717 | - $handler->override_option('empty', 'No Friend Requests.'); |
|
| 718 | - $handler->override_option('path', 'account/%/friends/flagged'); |
|
| 719 | - $handler->override_option('menu', array( |
|
| 712 | + )); |
|
| 713 | + $handler->override_option('title', 'Awaiting Friend Approvals'); |
|
| 714 | + $handler->override_option('header', 'These are users who you have requested to be friends with.'); |
|
| 715 | + $handler->override_option('header_format', '5'); |
|
| 716 | + $handler->override_option('header_empty', 1); |
|
| 717 | + $handler->override_option('empty', 'No Friend Requests.'); |
|
| 718 | + $handler->override_option('path', 'account/%/friends/flagged'); |
|
| 719 | + $handler->override_option('menu', array( |
|
| 720 | 720 | 'type' => 'tab', |
| 721 | 721 | 'title' => bts('Awaiting Friend Approvals', array(), NULL, 'boinc:friends-page'), |
| 722 | 722 | 'description' => '', |
| 723 | 723 | 'weight' => '0', |
| 724 | 724 | 'name' => 'navigation', |
| 725 | - )); |
|
| 726 | - $handler->override_option('tab_options', array( |
|
| 725 | + )); |
|
| 726 | + $handler->override_option('tab_options', array( |
|
| 727 | 727 | 'type' => 'none', |
| 728 | 728 | 'title' => '', |
| 729 | 729 | 'description' => '', |
| 730 | 730 | 'weight' => 0, |
| 731 | 731 | 'name' => 'navigation', |
| 732 | - )); |
|
| 733 | - $handler = $view->new_display('block', 'Current user\'s Friends block', 'block_1'); |
|
| 734 | - $handler->override_option('relationships', array( |
|
| 732 | + )); |
|
| 733 | + $handler = $view->new_display('block', 'Current user\'s Friends block', 'block_1'); |
|
| 734 | + $handler->override_option('relationships', array( |
|
| 735 | 735 | 'content_profile_rel' => array( |
| 736 | - 'label' => 'Content Profile', |
|
| 737 | - 'required' => 0, |
|
| 738 | - 'type' => 'profile', |
|
| 739 | - 'id' => 'content_profile_rel', |
|
| 740 | - 'table' => 'users', |
|
| 741 | - 'field' => 'content_profile_rel', |
|
| 742 | - 'override' => array( |
|
| 736 | + 'label' => 'Content Profile', |
|
| 737 | + 'required' => 0, |
|
| 738 | + 'type' => 'profile', |
|
| 739 | + 'id' => 'content_profile_rel', |
|
| 740 | + 'table' => 'users', |
|
| 741 | + 'field' => 'content_profile_rel', |
|
| 742 | + 'override' => array( |
|
| 743 | 743 | 'button' => 'Use default', |
| 744 | - ), |
|
| 745 | - 'relationship' => 'none', |
|
| 744 | + ), |
|
| 745 | + 'relationship' => 'none', |
|
| 746 | 746 | ), |
| 747 | - )); |
|
| 748 | - $handler->override_option('fields', array( |
|
| 747 | + )); |
|
| 748 | + $handler->override_option('fields', array( |
|
| 749 | 749 | 'name' => array( |
| 750 | - 'label' => 'Name', |
|
| 751 | - 'alter' => array( |
|
| 750 | + 'label' => 'Name', |
|
| 751 | + 'alter' => array( |
|
| 752 | 752 | 'alter_text' => 0, |
| 753 | 753 | 'text' => '', |
| 754 | 754 | 'make_link' => 0, |
@@ -767,26 +767,26 @@ discard block |
||
| 767 | 767 | 'ellipsis' => 1, |
| 768 | 768 | 'html' => 0, |
| 769 | 769 | 'strip_tags' => 0, |
| 770 | - ), |
|
| 771 | - 'empty' => '', |
|
| 772 | - 'hide_empty' => 0, |
|
| 773 | - 'empty_zero' => 0, |
|
| 774 | - 'hide_alter_empty' => 1, |
|
| 775 | - 'link_to_user' => 0, |
|
| 776 | - 'overwrite_anonymous' => 0, |
|
| 777 | - 'anonymous_text' => '', |
|
| 778 | - 'exclude' => 0, |
|
| 779 | - 'id' => 'name', |
|
| 780 | - 'table' => 'users', |
|
| 781 | - 'field' => 'name', |
|
| 782 | - 'override' => array( |
|
| 770 | + ), |
|
| 771 | + 'empty' => '', |
|
| 772 | + 'hide_empty' => 0, |
|
| 773 | + 'empty_zero' => 0, |
|
| 774 | + 'hide_alter_empty' => 1, |
|
| 775 | + 'link_to_user' => 0, |
|
| 776 | + 'overwrite_anonymous' => 0, |
|
| 777 | + 'anonymous_text' => '', |
|
| 778 | + 'exclude' => 0, |
|
| 779 | + 'id' => 'name', |
|
| 780 | + 'table' => 'users', |
|
| 781 | + 'field' => 'name', |
|
| 782 | + 'override' => array( |
|
| 783 | 783 | 'button' => 'Use default', |
| 784 | - ), |
|
| 785 | - 'relationship' => 'none', |
|
| 784 | + ), |
|
| 785 | + 'relationship' => 'none', |
|
| 786 | 786 | ), |
| 787 | 787 | 'field_image_fid' => array( |
| 788 | - 'label' => '', |
|
| 789 | - 'alter' => array( |
|
| 788 | + 'label' => '', |
|
| 789 | + 'alter' => array( |
|
| 790 | 790 | 'alter_text' => 0, |
| 791 | 791 | 'text' => '', |
| 792 | 792 | 'make_link' => 0, |
@@ -805,32 +805,32 @@ discard block |
||
| 805 | 805 | 'ellipsis' => 1, |
| 806 | 806 | 'html' => 0, |
| 807 | 807 | 'strip_tags' => 0, |
| 808 | - ), |
|
| 809 | - 'empty' => '', |
|
| 810 | - 'hide_empty' => 0, |
|
| 811 | - 'empty_zero' => 0, |
|
| 812 | - 'hide_alter_empty' => 1, |
|
| 813 | - 'link_to_node' => 0, |
|
| 814 | - 'label_type' => 'none', |
|
| 815 | - 'format' => 'image_plain', |
|
| 816 | - 'multiple' => array( |
|
| 808 | + ), |
|
| 809 | + 'empty' => '', |
|
| 810 | + 'hide_empty' => 0, |
|
| 811 | + 'empty_zero' => 0, |
|
| 812 | + 'hide_alter_empty' => 1, |
|
| 813 | + 'link_to_node' => 0, |
|
| 814 | + 'label_type' => 'none', |
|
| 815 | + 'format' => 'image_plain', |
|
| 816 | + 'multiple' => array( |
|
| 817 | 817 | 'group' => TRUE, |
| 818 | 818 | 'multiple_number' => '', |
| 819 | 819 | 'multiple_from' => '', |
| 820 | 820 | 'multiple_reversed' => FALSE, |
| 821 | - ), |
|
| 822 | - 'exclude' => 0, |
|
| 823 | - 'id' => 'field_image_fid', |
|
| 824 | - 'table' => 'node_data_field_image', |
|
| 825 | - 'field' => 'field_image_fid', |
|
| 826 | - 'relationship' => 'content_profile_rel', |
|
| 827 | - 'override' => array( |
|
| 821 | + ), |
|
| 822 | + 'exclude' => 0, |
|
| 823 | + 'id' => 'field_image_fid', |
|
| 824 | + 'table' => 'node_data_field_image', |
|
| 825 | + 'field' => 'field_image_fid', |
|
| 826 | + 'relationship' => 'content_profile_rel', |
|
| 827 | + 'override' => array( |
|
| 828 | 828 | 'button' => 'Use default', |
| 829 | - ), |
|
| 829 | + ), |
|
| 830 | 830 | ), |
| 831 | 831 | 'uid' => array( |
| 832 | - 'label' => 'Uid', |
|
| 833 | - 'alter' => array( |
|
| 832 | + 'label' => 'Uid', |
|
| 833 | + 'alter' => array( |
|
| 834 | 834 | 'alter_text' => 0, |
| 835 | 835 | 'text' => '', |
| 836 | 836 | 'make_link' => 0, |
@@ -849,70 +849,70 @@ discard block |
||
| 849 | 849 | 'ellipsis' => 1, |
| 850 | 850 | 'html' => 0, |
| 851 | 851 | 'strip_tags' => 0, |
| 852 | - ), |
|
| 853 | - 'empty' => '', |
|
| 854 | - 'hide_empty' => 0, |
|
| 855 | - 'empty_zero' => 0, |
|
| 856 | - 'hide_alter_empty' => 1, |
|
| 857 | - 'link_to_user' => 0, |
|
| 858 | - 'exclude' => 0, |
|
| 859 | - 'id' => 'uid', |
|
| 860 | - 'table' => 'users', |
|
| 861 | - 'field' => 'uid', |
|
| 862 | - 'override' => array( |
|
| 852 | + ), |
|
| 853 | + 'empty' => '', |
|
| 854 | + 'hide_empty' => 0, |
|
| 855 | + 'empty_zero' => 0, |
|
| 856 | + 'hide_alter_empty' => 1, |
|
| 857 | + 'link_to_user' => 0, |
|
| 858 | + 'exclude' => 0, |
|
| 859 | + 'id' => 'uid', |
|
| 860 | + 'table' => 'users', |
|
| 861 | + 'field' => 'uid', |
|
| 862 | + 'override' => array( |
|
| 863 | 863 | 'button' => 'Use default', |
| 864 | - ), |
|
| 865 | - 'relationship' => 'none', |
|
| 864 | + ), |
|
| 865 | + 'relationship' => 'none', |
|
| 866 | 866 | ), |
| 867 | - )); |
|
| 868 | - $handler->override_option('arguments', array( |
|
| 867 | + )); |
|
| 868 | + $handler->override_option('arguments', array( |
|
| 869 | 869 | 'friend_uid' => array( |
| 870 | - 'default_action' => 'default', |
|
| 871 | - 'style_plugin' => 'default_summary', |
|
| 872 | - 'style_options' => array(), |
|
| 873 | - 'wildcard' => 'all', |
|
| 874 | - 'wildcard_substitution' => 'All', |
|
| 875 | - 'title' => '', |
|
| 876 | - 'default_argument_type' => 'current_user', |
|
| 877 | - 'default_argument' => '', |
|
| 878 | - 'validate_type' => 'none', |
|
| 879 | - 'validate_fail' => 'not found', |
|
| 880 | - 'break_phrase' => 0, |
|
| 881 | - 'not' => 0, |
|
| 882 | - 'id' => 'friend_uid', |
|
| 883 | - 'table' => 'flag_friend', |
|
| 884 | - 'field' => 'friend_uid', |
|
| 885 | - 'override' => array( |
|
| 870 | + 'default_action' => 'default', |
|
| 871 | + 'style_plugin' => 'default_summary', |
|
| 872 | + 'style_options' => array(), |
|
| 873 | + 'wildcard' => 'all', |
|
| 874 | + 'wildcard_substitution' => 'All', |
|
| 875 | + 'title' => '', |
|
| 876 | + 'default_argument_type' => 'current_user', |
|
| 877 | + 'default_argument' => '', |
|
| 878 | + 'validate_type' => 'none', |
|
| 879 | + 'validate_fail' => 'not found', |
|
| 880 | + 'break_phrase' => 0, |
|
| 881 | + 'not' => 0, |
|
| 882 | + 'id' => 'friend_uid', |
|
| 883 | + 'table' => 'flag_friend', |
|
| 884 | + 'field' => 'friend_uid', |
|
| 885 | + 'override' => array( |
|
| 886 | 886 | 'button' => 'Use default', |
| 887 | - ), |
|
| 888 | - 'relationship' => 'none', |
|
| 889 | - 'default_options_div_prefix' => '', |
|
| 890 | - 'default_argument_user' => 0, |
|
| 891 | - 'default_argument_fixed' => '', |
|
| 892 | - 'default_argument_php' => '', |
|
| 893 | - 'validate_argument_node_access' => 0, |
|
| 894 | - 'validate_argument_nid_type' => 'nid', |
|
| 895 | - 'validate_argument_node_flag_name' => '*relationship*', |
|
| 896 | - 'validate_argument_node_flag_test' => 'flaggable', |
|
| 897 | - 'validate_argument_node_flag_id_type' => 'id', |
|
| 898 | - 'validate_argument_user_flag_name' => '*relationship*', |
|
| 899 | - 'validate_argument_user_flag_test' => 'flaggable', |
|
| 900 | - 'validate_argument_user_flag_id_type' => 'id', |
|
| 901 | - 'validate_argument_php' => '', |
|
| 902 | - ), |
|
| 903 | - )); |
|
| 904 | - $handler->override_option('header_format', '3'); |
|
| 905 | - $handler->override_option('header_empty', 0); |
|
| 906 | - $handler->override_option('items_per_page', 6); |
|
| 907 | - $handler->override_option('use_pager', '0'); |
|
| 908 | - $handler->override_option('use_more', 1); |
|
| 909 | - $handler->override_option('use_more_always', 1); |
|
| 910 | - $handler->override_option('style_plugin', 'default'); |
|
| 911 | - $handler->override_option('style_options', array()); |
|
| 912 | - $handler->override_option('block_description', ''); |
|
| 913 | - $handler->override_option('block_caching', -1); |
|
| 887 | + ), |
|
| 888 | + 'relationship' => 'none', |
|
| 889 | + 'default_options_div_prefix' => '', |
|
| 890 | + 'default_argument_user' => 0, |
|
| 891 | + 'default_argument_fixed' => '', |
|
| 892 | + 'default_argument_php' => '', |
|
| 893 | + 'validate_argument_node_access' => 0, |
|
| 894 | + 'validate_argument_nid_type' => 'nid', |
|
| 895 | + 'validate_argument_node_flag_name' => '*relationship*', |
|
| 896 | + 'validate_argument_node_flag_test' => 'flaggable', |
|
| 897 | + 'validate_argument_node_flag_id_type' => 'id', |
|
| 898 | + 'validate_argument_user_flag_name' => '*relationship*', |
|
| 899 | + 'validate_argument_user_flag_test' => 'flaggable', |
|
| 900 | + 'validate_argument_user_flag_id_type' => 'id', |
|
| 901 | + 'validate_argument_php' => '', |
|
| 902 | + ), |
|
| 903 | + )); |
|
| 904 | + $handler->override_option('header_format', '3'); |
|
| 905 | + $handler->override_option('header_empty', 0); |
|
| 906 | + $handler->override_option('items_per_page', 6); |
|
| 907 | + $handler->override_option('use_pager', '0'); |
|
| 908 | + $handler->override_option('use_more', 1); |
|
| 909 | + $handler->override_option('use_more_always', 1); |
|
| 910 | + $handler->override_option('style_plugin', 'default'); |
|
| 911 | + $handler->override_option('style_options', array()); |
|
| 912 | + $handler->override_option('block_description', ''); |
|
| 913 | + $handler->override_option('block_caching', -1); |
|
| 914 | 914 | |
| 915 | - $views[$view->name] = $view; |
|
| 915 | + $views[$view->name] = $view; |
|
| 916 | 916 | |
| 917 | - return $views; |
|
| 917 | + return $views; |
|
| 918 | 918 | } |