| Index: trunk/extensions/BoardVote/BoardVote_body.php |
| — | — | @@ -31,7 +31,7 @@ |
| 32 | 32 | #$url = "http://eva/w2/extensions/BotQuery/query.php?what=userinfo&format=php"; |
| 33 | 33 | wfDebug( "Fetching URL $url\n" ); |
| 34 | 34 | $c = curl_init( $url ); |
| 35 | | - curl_setopt( $c, CURLOPT_CAINFO, dirname( __FILE__ ) . '/cacert-both.crt' ); |
| | 35 | + #curl_setopt( $c, CURLOPT_CAINFO, dirname( __FILE__ ) . '/cacert-both.crt' ); |
| 36 | 36 | curl_setopt( $c, CURLOPT_RETURNTRANSFER, true ); |
| 37 | 37 | curl_setopt( $c, CURLOPT_COOKIE, "{$db}_session=" . urlencode( $sid ) ); |
| 38 | 38 | curl_setopt( $c, CURLOPT_FOLLOWLOCATION, true ); |
| — | — | @@ -39,6 +39,7 @@ |
| 40 | 40 | $value = curl_exec( $c ); |
| 41 | 41 | if ( !$value ) { |
| 42 | 42 | wfDebug( __METHOD__.": No response from server\n" ); |
| | 43 | + $_SESSION['bvCurlError'] = curl_error( $c ); |
| 43 | 44 | return array( false, false, false ); |
| 44 | 45 | } |
| 45 | 46 | |
| Index: trunk/extensions/BoardVote/BoardVote.php |
| — | — | @@ -36,10 +36,13 @@ |
| 37 | 37 | if ( !function_exists( 'extAddSpecialPage' ) ) { |
| 38 | 38 | require( dirname(__FILE__) . '/../ExtensionFunctions.php' ); |
| 39 | 39 | } |
| 40 | | -extAddSpecialPage( dirname(__FILE__) . '/BoardVote_body.php', 'Boardvote', 'BoardVotePage' ); |
| 41 | 40 | extAddSpecialPage( dirname(__FILE__) . '/GoToBoardVote_body.php', 'Go_to_board_vote', 'GoToBoardVotePage' ); |
| 42 | 41 | |
| 43 | | -$wgExtensionFunctions[] = 'wfSetupBoardVote'; |
| | 42 | +if ( !defined( 'BOARDVOTE_REDIRECT_ONLY' ) ) { |
| | 43 | + extAddSpecialPage( dirname(__FILE__) . '/BoardVote_body.php', 'Boardvote', 'BoardVotePage' ); |
| | 44 | + $wgExtensionFunctions[] = 'wfSetupBoardVote'; |
| | 45 | +} |
| | 46 | + |
| 44 | 47 | function wfSetupBoardVote() { |
| 45 | 48 | wfSetupSession(); |
| 46 | 49 | if ( isset( $_SESSION['bvLang'] ) && !isset( $_REQUEST['uselang'] ) ) { |