Fossil SCM
Do not attempt to use the Right-Column Ad-Unit if the content contains a <table> element.
Commit
7d794604794c025a863dd4e92d12000bd5aac3be
Parent
4bc5b6cf9b7466c…
2 files changed
+3
+2
-1
+3
| --- src/cgi.c | ||
| +++ src/cgi.c | ||
| @@ -108,10 +108,13 @@ | ||
| 108 | 108 | ** if it does and false if it does not. |
| 109 | 109 | */ |
| 110 | 110 | int cgi_header_contains(const char *zNeedle){ |
| 111 | 111 | return strstr(blob_str(&cgiContent[0]), zNeedle)!=0; |
| 112 | 112 | } |
| 113 | +int cgi_body_contains(const char *zNeedle){ | |
| 114 | + return strstr(blob_str(&cgiContent[1]), zNeedle)!=0; | |
| 115 | +} | |
| 113 | 116 | |
| 114 | 117 | /* |
| 115 | 118 | ** Append reply content to what already exists. |
| 116 | 119 | */ |
| 117 | 120 | void cgi_append_content(const char *zData, int nAmt){ |
| 118 | 121 |
| --- src/cgi.c | |
| +++ src/cgi.c | |
| @@ -108,10 +108,13 @@ | |
| 108 | ** if it does and false if it does not. |
| 109 | */ |
| 110 | int cgi_header_contains(const char *zNeedle){ |
| 111 | return strstr(blob_str(&cgiContent[0]), zNeedle)!=0; |
| 112 | } |
| 113 | |
| 114 | /* |
| 115 | ** Append reply content to what already exists. |
| 116 | */ |
| 117 | void cgi_append_content(const char *zData, int nAmt){ |
| 118 |
| --- src/cgi.c | |
| +++ src/cgi.c | |
| @@ -108,10 +108,13 @@ | |
| 108 | ** if it does and false if it does not. |
| 109 | */ |
| 110 | int cgi_header_contains(const char *zNeedle){ |
| 111 | return strstr(blob_str(&cgiContent[0]), zNeedle)!=0; |
| 112 | } |
| 113 | int cgi_body_contains(const char *zNeedle){ |
| 114 | return strstr(blob_str(&cgiContent[1]), zNeedle)!=0; |
| 115 | } |
| 116 | |
| 117 | /* |
| 118 | ** Append reply content to what already exists. |
| 119 | */ |
| 120 | void cgi_append_content(const char *zData, int nAmt){ |
| 121 |
+2
-1
| --- src/style.c | ||
| +++ src/style.c | ||
| @@ -385,10 +385,11 @@ | ||
| 385 | 385 | ){ |
| 386 | 386 | return 0; |
| 387 | 387 | } |
| 388 | 388 | if( (adUnitFlags & ADUNIT_RIGHT_OK)!=0 |
| 389 | 389 | && !fossil_all_whitespace(zAd = db_get("adunit-right", 0)) |
| 390 | + && !cgi_body_contains("<table") | |
| 390 | 391 | ){ |
| 391 | 392 | *pAdFlag = ADUNIT_RIGHT_OK; |
| 392 | 393 | return zAd; |
| 393 | 394 | }else if( !fossil_all_whitespace(zAd = db_get("adunit",0)) ){ |
| 394 | 395 | return zAd; |
| @@ -425,11 +426,11 @@ | ||
| 425 | 426 | } |
| 426 | 427 | @ </div> |
| 427 | 428 | } |
| 428 | 429 | |
| 429 | 430 | zAd = style_adunit_text(&mAdFlags); |
| 430 | - if( mAdFlags & ADUNIT_RIGHT_OK ){ | |
| 431 | + if( (mAdFlags & ADUNIT_RIGHT_OK)!=0 ){ | |
| 431 | 432 | @ <div class="content adunit_right_container"> |
| 432 | 433 | @ <div class="adunit_right"> |
| 433 | 434 | cgi_append_content(zAd, -1); |
| 434 | 435 | @ </div> |
| 435 | 436 | }else{ |
| 436 | 437 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -385,10 +385,11 @@ | |
| 385 | ){ |
| 386 | return 0; |
| 387 | } |
| 388 | if( (adUnitFlags & ADUNIT_RIGHT_OK)!=0 |
| 389 | && !fossil_all_whitespace(zAd = db_get("adunit-right", 0)) |
| 390 | ){ |
| 391 | *pAdFlag = ADUNIT_RIGHT_OK; |
| 392 | return zAd; |
| 393 | }else if( !fossil_all_whitespace(zAd = db_get("adunit",0)) ){ |
| 394 | return zAd; |
| @@ -425,11 +426,11 @@ | |
| 425 | } |
| 426 | @ </div> |
| 427 | } |
| 428 | |
| 429 | zAd = style_adunit_text(&mAdFlags); |
| 430 | if( mAdFlags & ADUNIT_RIGHT_OK ){ |
| 431 | @ <div class="content adunit_right_container"> |
| 432 | @ <div class="adunit_right"> |
| 433 | cgi_append_content(zAd, -1); |
| 434 | @ </div> |
| 435 | }else{ |
| 436 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -385,10 +385,11 @@ | |
| 385 | ){ |
| 386 | return 0; |
| 387 | } |
| 388 | if( (adUnitFlags & ADUNIT_RIGHT_OK)!=0 |
| 389 | && !fossil_all_whitespace(zAd = db_get("adunit-right", 0)) |
| 390 | && !cgi_body_contains("<table") |
| 391 | ){ |
| 392 | *pAdFlag = ADUNIT_RIGHT_OK; |
| 393 | return zAd; |
| 394 | }else if( !fossil_all_whitespace(zAd = db_get("adunit",0)) ){ |
| 395 | return zAd; |
| @@ -425,11 +426,11 @@ | |
| 426 | } |
| 427 | @ </div> |
| 428 | } |
| 429 | |
| 430 | zAd = style_adunit_text(&mAdFlags); |
| 431 | if( (mAdFlags & ADUNIT_RIGHT_OK)!=0 ){ |
| 432 | @ <div class="content adunit_right_container"> |
| 433 | @ <div class="adunit_right"> |
| 434 | cgi_append_content(zAd, -1); |
| 435 | @ </div> |
| 436 | }else{ |
| 437 |