| Property changes on: branches/extensions-realtime/AddMediaWizard/MwEmbedModules/AddMedia/AddMedia.i18n.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1 | 1 | Merged /trunk/extensions/AddMediaWizard/MwEmbedModules/AddMedia/AddMedia.i18n.php:r94187-94267 |
| Property changes on: branches/extensions-realtime/TrustedXFF/trusted-hosts.txt |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2 | 2 | Merged /trunk/extensions/TrustedXFF/trusted-hosts.txt:r94187-94267 |
| Property changes on: branches/extensions-realtime/TrustedXFF |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 3 | 3 | Merged /trunk/extensions/TrustedXFF:r94187-94267 |
| Index: branches/extensions-realtime/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialQueryCreator.php |
| — | — | @@ -37,13 +37,17 @@ |
| 38 | 38 | $html_output = $this->makeResults( $p ); |
| 39 | 39 | if ( $this->uiCore->getQueryString() != "" ) { |
| 40 | 40 | if ( $this->usesNavigationBar() ) { |
| 41 | | - $html_output .= $this->getNavigationBar ( $this->uiCore->getLimit(), $this->uiCore->getOffset(), $this->uiCore->hasFurtherResults() ); // ? can we preload offset and limit? |
| | 41 | + $html_output .= Html::rawElement( 'div', array( 'class' => 'smwqcnavbar' ), |
| | 42 | + $this->getNavigationBar ( $this->uiCore->getLimit(), $this->uiCore->getOffset(), $this->uiCore->hasFurtherResults() ) |
| | 43 | + ); // ? can we preload offset and limit? |
| 42 | 44 | } |
| 43 | 45 | |
| 44 | | - $html_output .= "<br/>" . $this->uiCore->getHTMLResult() . "<br>"; |
| | 46 | + $html_output .= Html::rawElement( 'div', array( 'class' => 'smw-qc-result' ), $this->uiCore->getHTMLResult() ); |
| 45 | 47 | |
| 46 | 48 | if ( $this->usesNavigationBar() ) { |
| 47 | | - $html_output .= $this->getNavigationBar ( $this->uiCore->getLimit(), $this->uiCore->getOffset(), $this->uiCore->hasFurtherResults() ); // ? can we preload offset and limit? |
| | 49 | + $html_output .= Html::rawElement( 'div', array( 'class' => 'smwqcnavbar' ), |
| | 50 | + $this->getNavigationBar ( $this->uiCore->getLimit(), $this->uiCore->getOffset(), $this->uiCore->hasFurtherResults() ) |
| | 51 | + ); // ? can we preload offset and limit? |
| 48 | 52 | } |
| 49 | 53 | } |
| 50 | 54 | $wgOut->addHTML( $html_output ); |
| — | — | @@ -62,7 +66,7 @@ |
| 63 | 67 | * Overridden from parent to ignore GUI parameters 'format' 'limit' and 'offset' |
| 64 | 68 | */ |
| 65 | 69 | protected function showFormatOptions( $format, array $paramValues, array $ignoredAttribs = array() ) { |
| 66 | | - return parent::showFormatOptions( $format, $paramValues, array( 'format', 'limit', 'offset' ) ); |
| | 70 | + return parent::showFormatOptions( $format, $paramValues, array( 'format', 'limit', 'offset', 'mainlabel' ) ); |
| 67 | 71 | } |
| 68 | 72 | /** |
| 69 | 73 | * Creates the input form |
| — | — | @@ -112,7 +116,7 @@ |
| 113 | 117 | $result .= '</div>'; // end of hidden additional options |
| 114 | 118 | $result .= '<br /><input type="submit" value="' . wfMsg( 'smw_ask_submit' ) . '"/>' . |
| 115 | 119 | '<input type="hidden" name="eq" value="no"/>' . |
| 116 | | - "\n</form>"; |
| | 120 | + "\n</form><br/>"; |
| 117 | 121 | |
| 118 | 122 | return $result; |
| 119 | 123 | |
| — | — | @@ -126,11 +130,12 @@ |
| 127 | 131 | * Overrides method from SMWQueryUI (modal window added) |
| 128 | 132 | * |
| 129 | 133 | * @global boolean $smwgQSortingSupport |
| | 134 | + * @global Language $wgContLang |
| 130 | 135 | * @param WebRequest $wgRequest |
| 131 | 136 | * @return string |
| 132 | 137 | */ |
| 133 | 138 | protected function processPoSortFormBox( WebRequest $wgRequest ) { |
| 134 | | - global $smwgQSortingSupport; |
| | 139 | + global $smwgQSortingSupport, $wgContLang; |
| 135 | 140 | if ( !$smwgQSortingSupport ) return array(); |
| 136 | 141 | |
| 137 | 142 | $params = array(); |
| — | — | @@ -138,13 +143,28 @@ |
| 139 | 144 | $property_values = $wgRequest->getArray( 'property' ); |
| 140 | 145 | $category_values = $wgRequest->getArray( 'category' ); |
| 141 | 146 | $category_label_values = $wgRequest->getArray( 'cat_label' ); |
| | 147 | + $main_column_labels = $wgRequest->getArray( 'maincol_label' ); |
| 142 | 148 | $po = array(); |
| | 149 | + $category_namespace = $wgContLang->getNsText( NS_CATEGORY ); |
| | 150 | + if ( is_array( $main_column_labels ) ) { |
| | 151 | + $po['mainlabel'] = '-'; // disables mainlabel parameter so that the UI can control it from here |
| | 152 | + foreach ( $main_column_labels as $key => $label ) { |
| | 153 | + if ( $label == '' ) { |
| | 154 | + $po[$key] = "?"; |
| | 155 | + } else { |
| | 156 | + $po[$key] = "? = $label"; |
| | 157 | + } |
| | 158 | + |
| | 159 | + } |
| | 160 | + } else { |
| | 161 | + $po['mainlabel'] = ''; // enables mainlabel parameter |
| | 162 | + } |
| 143 | 163 | if ( is_array( $category_values ) ) { |
| 144 | 164 | foreach ( $category_values as $key => $value ) { |
| 145 | 165 | if ( trim( $value ) == '' ) { |
| 146 | | - $po[$key] = '?Category'; // Todo: i18n |
| | 166 | + $po[$key] = "?$category_namespace" ; |
| 147 | 167 | } else { |
| 148 | | - $po[$key] = '?Category:' . $value; // Todo: i18n |
| | 168 | + $po[$key] = "?$category_namespace:$value"; |
| 149 | 169 | } |
| 150 | 170 | } |
| 151 | 171 | } |
| — | — | @@ -221,13 +241,19 @@ |
| 222 | 242 | $display_values = $wgRequest->getArray( 'display' ); |
| 223 | 243 | $category_values = $wgRequest->getArray( 'category' ); |
| 224 | 244 | $category_label_values = $wgRequest->getArray( 'cat_label' ); |
| | 245 | + $main_column_labels = $wgRequest->getArray( 'maincol_label' ); |
| 225 | 246 | |
| 226 | | - if ( is_array( $property_values ) ) { |
| 227 | | - // removing empty values |
| 228 | | - foreach ( $property_values as $key => $property_value ) { |
| 229 | | - $property_values[$key] = trim( $property_value ); |
| 230 | | - if ( $property_value == '' ) { |
| 231 | | - unset( $property_values[$key] ); |
| | 247 | + if ( is_array( $property_values ) or is_array( $category_values ) or is_array( $main_column_labels ) ) { |
| | 248 | + /* |
| | 249 | + * Printouts were set via this Ui |
| | 250 | + */ |
| | 251 | + if ( is_array( $property_values ) ) { |
| | 252 | + // remove empty property values |
| | 253 | + foreach ( $property_values as $key => $property_value ) { |
| | 254 | + $property_values[$key] = trim( $property_value ); |
| | 255 | + if ( $property_value == '' ) { |
| | 256 | + unset( $property_values[$key] ); |
| | 257 | + } |
| 232 | 258 | } |
| 233 | 259 | } |
| 234 | 260 | } else { |
| — | — | @@ -258,19 +284,18 @@ |
| 259 | 285 | $order_values = array(); // do not even show one sort input here |
| 260 | 286 | $property_values = array(); |
| 261 | 287 | } |
| 262 | | - |
| 263 | | - foreach ( $po as $po_key => $po_value ) { |
| | 288 | + foreach ( $po as $po_value ) { |
| 264 | 289 | if ( !in_array( $po_value, $property_values ) ) { |
| 265 | 290 | $property_values[] = $po_value; |
| 266 | 291 | } |
| 267 | | - } |
| 268 | | - $display_values = array(); |
| 269 | | - reset( $property_values ); |
| 270 | | - foreach ( $property_values as $property_key => $property_value ) { |
| 271 | | - if ( in_array( $property_value, $po ) ) { |
| 272 | | - $display_values[$property_key] = "yes"; |
| 273 | | - } |
| 274 | | - } |
| | 292 | + } |
| | 293 | + $display_values = array(); |
| | 294 | + reset( $property_values ); |
| | 295 | + foreach ( $property_values as $property_key => $property_value ) { |
| | 296 | + if ( in_array( $property_value, $po ) ) { |
| | 297 | + $display_values[$property_key] = "yes"; |
| | 298 | + } |
| | 299 | + } |
| 275 | 300 | } |
| 276 | 301 | $i = 0; |
| 277 | 302 | $additional_POs = array(); |
| — | — | @@ -278,13 +303,24 @@ |
| 279 | 304 | $additional_POs = array_merge( $additional_POs, $property_values ); |
| 280 | 305 | } |
| 281 | 306 | if ( is_array( $category_values ) ) {// same as testing $category_label_values |
| 282 | | - $additional_POs = array_merge( $additional_POs, $category_values ); |
| | 307 | + $keys = array_keys( $category_values ); |
| | 308 | + foreach ( $keys as $value ) { |
| | 309 | + $additional_POs[$value] = $category_values[$value]; // array_merge won't work because numeric keys need to be preserved |
| | 310 | + } |
| 283 | 311 | } |
| | 312 | + if ( is_array( $main_column_labels ) ) { |
| | 313 | + $keys = array_keys( $main_column_labels ); |
| | 314 | + foreach ( $keys as $value ) { |
| | 315 | + $additional_POs[$value] = $main_column_labels[$value]; // array_merge won't work because numeric keys need to be preserved |
| | 316 | + } |
| | 317 | + } |
| 284 | 318 | ksort( $additional_POs ); |
| 285 | 319 | foreach ( $additional_POs as $key => $value ) { |
| 286 | | - if ( array_key_exists( $key, $property_values ) ) { |
| 287 | | - // make a element for additional properties |
| 288 | | - $result .= Html::openElement( 'div', array( 'id' => "sort_div_$i", 'class' => 'smw-sort' ) ); |
| | 320 | + if ( is_array( $property_values ) and array_key_exists( $key, $property_values ) ) { |
| | 321 | + /* |
| | 322 | + * Make an element for additional properties |
| | 323 | + */ |
| | 324 | + $result .= Html::openElement( 'div', array( 'id' => "sort_div_$i", 'class' => 'smwsort' ) ); |
| 289 | 325 | $result .= '<span class="smw-remove"><a href="javascript:removePOInstance(\'sort_div_' . $i . '\')"><img src="' . $smwgScriptPath . '/skins/images/close-button.png" alt="' . wfMsg( 'smw_qui_delete' ) . '"></a></span>'; |
| 290 | 326 | $result .= wfMsg( 'smw_qui_property' ); |
| 291 | 327 | $result .= Html::input( 'property[' . $i . ']', $property_values[$key], 'text', array( 'size' => '35', 'id' => "property$i" ) ) . "\n"; |
| — | — | @@ -309,22 +345,36 @@ |
| 310 | 346 | $i++; |
| 311 | 347 | } |
| 312 | 348 | if ( is_array( $category_values ) and array_key_exists( $key, $category_values ) ) { |
| 313 | | - $result .= Html::openElement( 'div', array( 'id' => "sort_div_$i", 'class' => 'smw-sort' ) ); |
| | 349 | + /* |
| | 350 | + * Make an element for additional categories |
| | 351 | + */ |
| | 352 | + $result .= Html::openElement( 'div', array( 'id' => "sort_div_$i", 'class' => 'smwsort' ) ); |
| 314 | 353 | $result .= '<span class="smw-remove"><a href="javascript:removePOInstance(\'sort_div_' . $i . '\')"><img src="' . $smwgScriptPath . '/skins/images/close-button.png" alt="' . wfMsg( 'smw_qui_delete' ) . '"></a></span>' . |
| 315 | 354 | 'Category (optional)' . // todo: i18n |
| 316 | | - Xml::input( "category[$i]", '20', $category_values[$key] ) . " " . |
| | 355 | + Xml::input( "category[$i]", '20', $category_values[$key], array( 'id' => "category$i" ) ) . " " . |
| 317 | 356 | 'Label' . // todo: i18n |
| 318 | | - Xml::input( "cat_label[$i]", '20', array_key_exists( $key, $category_label_values ) ? $category_label_values[$key]:false ) . " " . |
| | 357 | + Xml::input( "cat_label[$i]", '20', array_key_exists( $key, $category_label_values ) ? $category_label_values[$key]:false, array( 'id' => "cat_label$i" ) ) . " " . |
| 319 | 358 | ' <a id="more' . $i . '" "class="smwq-more" href="javascript:smw_makeCatDialog(\'' . $i . '\')"> options </a> ' . // TODO: i18n |
| 320 | 359 | Xml::closeElement( 'div' ); |
| 321 | 360 | $i++; |
| 322 | 361 | } |
| | 362 | + if ( is_array( $main_column_labels ) and array_key_exists( $key, $main_column_labels ) ) { |
| | 363 | + /* |
| | 364 | + * Make an element for main column |
| | 365 | + */ |
| | 366 | + $result .= Html::openElement( 'div', array( 'id' => "sort_div_$i", 'class' => 'smwsort' ) ) . |
| | 367 | + '<span class="smw-remove"><a href="javascript:removePOInstance(\'sort_div_' . $i . '\')"><img src="' . $smwgScriptPath . '/skins/images/close-button.png" alt="' . wfMsg( 'smw_qui_delete' ) . '"></a></span>' . |
| | 368 | + wfMsg( 'smw_qui_rescol' ) . |
| | 369 | + Xml::input( "maincol_label[$i]", '20', $main_column_labels[$key], array ( 'id' => "maincol_label$i" ) ) . " " . |
| | 370 | + Xml::closeElement( 'div' ); |
| | 371 | + $i++; |
| | 372 | + } |
| 323 | 373 | } |
| 324 | 374 | $num_sort_values = $i; |
| 325 | 375 | // END: create form elements already submitted earlier via form |
| 326 | 376 | |
| 327 | 377 | // create hidden form elements to be cloned later |
| 328 | | - $hidden_property = Html::openElement( 'div', array( 'id' => 'property_starter', 'class' => 'smw-sort', 'style' => 'display:none' ) ) . |
| | 378 | + $hidden_property = Html::openElement( 'div', array( 'id' => 'property_starter', 'class' => 'smwsort', 'style' => 'display:none' ) ) . |
| 329 | 379 | '<span class="smw-remove"><a><img src="' . $smwgScriptPath . '/skins/images/close-button.png" alt="' . wfMsg( 'smw_qui_delete' ) . '"></a></span>' . |
| 330 | 380 | wfMsg( 'smw_qui_property' ) . |
| 331 | 381 | Xml::input( "property_num", '35' ) . " " . |
| — | — | @@ -337,7 +387,7 @@ |
| 338 | 388 | Xml::closeElement( 'div' ); |
| 339 | 389 | $hidden_property = json_encode( $hidden_property ); |
| 340 | 390 | |
| 341 | | - $hidden_category = Html::openElement( 'div', array( 'id' => 'category_starter', 'class' => 'smw-sort', 'style' => 'display:none' ) ) . |
| | 391 | + $hidden_category = Html::openElement( 'div', array( 'id' => 'category_starter', 'class' => 'smwsort', 'style' => 'display:none' ) ) . |
| 342 | 392 | '<span class="smw-remove"><a><img src="' . $smwgScriptPath . '/skins/images/close-button.png" alt="' . wfMsg( 'smw_qui_delete' ) . '"></a></span>' . |
| 343 | 393 | 'Category (optional)' . // todo: i18n |
| 344 | 394 | Xml::input( "category_num", '20' ) . " " . |
| — | — | @@ -346,10 +396,17 @@ |
| 347 | 397 | Xml::closeElement( 'div' ); |
| 348 | 398 | $hidden_category = json_encode( $hidden_category ); |
| 349 | 399 | |
| 350 | | - $property_dialog_box = Xml::openElement( 'div', array( 'id' => 'prop-dialog', 'title' => 'Property Options', 'class' => 'smw-prop-dialog' ) ) . // todo i18n |
| | 400 | + $hidden_main_column = Html::openElement( 'div', array( 'id' => 'maincol_starter', 'class' => 'smwsort', 'style' => 'display:none' ) ) . |
| | 401 | + '<span class="smw-remove"><a><img src="' . $smwgScriptPath . '/skins/images/close-button.png" alt="' . wfMsg( 'smw_qui_delete' ) . '"></a></span>' . |
| | 402 | + wfMsg( 'smw_qui_rescol' ) . |
| | 403 | + Xml::input( "maincol_label_num", '20' ) . " " . |
| | 404 | + Xml::closeElement( 'div' ); |
| | 405 | + $hidden_main_column = json_encode( $hidden_main_column ); |
| | 406 | + |
| | 407 | + $property_dialog_box = Xml::openElement( 'div', array( 'id' => 'prop-dialog', 'title' => 'Property Options', 'class' => 'smwpropdialog' ) ) . // todo i18n |
| 351 | 408 | Xml::inputLabel( 'Property:', '', 'd-property', 'd-property' ) . '<br/>' . // todo i18n |
| 352 | 409 | Xml::inputLabel( 'Label:', '', 'd-property-label', 'd-property-label' ) . '<br/>' . // todo i18n |
| 353 | | - 'Format: ' . Html::openElement( 'select', array( 'name' => 'd-format', 'id' => 'd-format' ) ) . // todo i18n |
| | 410 | + '<label for="d-format">Format:</label> ' . Html::openElement( 'select', array( 'name' => 'd-format', 'id' => 'd-format' ) ) . // todo i18n |
| 354 | 411 | Xml::option( 'None (default)', ' ' ) . // todo i18n |
| 355 | 412 | Xml::option( 'Simple', '#-' ) . // todo i18n |
| 356 | 413 | Xml::closeElement( 'select' ) . |
| — | — | @@ -357,7 +414,7 @@ |
| 358 | 415 | // Xml::inputLabel( 'Limit:', 'd-property-limit', 'd-property-limit' ) . '<br/>' . // todo i18n |
| 359 | 416 | '<input type="hidden" name="d-property-code" id="d-property-code">' . |
| 360 | 417 | Xml::closeElement( 'div' ); |
| 361 | | - $category_dialog_box = Xml::openElement( 'div', array( 'id' => 'cat-dialog', 'title' => 'Category Options', 'class' => 'smw-cat-dialog' ) ) . // todo i18n |
| | 418 | + $category_dialog_box = Xml::openElement( 'div', array( 'id' => 'cat-dialog', 'title' => 'Category Options', 'class' => 'smwcatdialog' ) ) . // todo i18n |
| 362 | 419 | Xml::inputLabel( 'Category:', '', 'd-category', 'd-category' ) . '<br/>' . // todo i18n |
| 363 | 420 | Xml::inputLabel( 'Label:', '', 'd-category-label', 'd-category-label' ) . '<br/>' . // todo i18n |
| 364 | 421 | Xml::inputLabel( 'Yes:', '', 'd-category-yes', 'd-category-yes' ) . '<br/>' . // todo i18n |
| — | — | @@ -368,6 +425,7 @@ |
| 369 | 426 | $result .= '<div id="sorting_main"></div>' . "\n"; |
| 370 | 427 | $result .= '[<a href="javascript:smw_addPropertyInstance(\'property_starter\', \'sorting_main\')">' . wfMsg( 'smw_qui_addnprop' ) . '</a>]' . |
| 371 | 428 | '[<a href="javascript:smw_addCategoryInstance(\'category_starter\', \'sorting_main\')">' . 'Add additional category' . '</a>]' . // todo i18n |
| | 429 | + '[<a href="javascript:smw_addMainColInstance(\'maincol_starter\', \'sorting_main\')">' . 'Add main column' . '</a>]' . // todo i18n |
| 372 | 430 | "\n"; |
| 373 | 431 | |
| 374 | 432 | // Javascript code for handling adding and removing the "sort" inputs |
| — | — | @@ -397,6 +455,7 @@ |
| 398 | 456 | } |
| 399 | 457 | }); |
| 400 | 458 | } |
| | 459 | + |
| 401 | 460 | function smw_category_autocomplete(){ |
| 402 | 461 | jQuery('[name*="category"]').autocomplete({ |
| 403 | 462 | minLength: 2, |
| — | — | @@ -417,47 +476,63 @@ |
| 418 | 477 | $javascript_text .= <<<EOT |
| 419 | 478 | function smw_property_autocomplete(){ |
| 420 | 479 | } |
| | 480 | + |
| 421 | 481 | function smw_category_autocomplete(){ |
| 422 | 482 | } |
| | 483 | + |
| 423 | 484 | EOT; |
| 424 | 485 | } |
| 425 | 486 | |
| 426 | 487 | $javascript_text .= <<<EOT |
| 427 | 488 | function smw_prop_code_update(){ |
| 428 | | - code = '?'+\$j('#d-property')[0].value; |
| 429 | | - if(code!=''){ |
| 430 | | - if(\$j('#d-property-format-custom')[0].value !=''){ |
| 431 | | - code = code + \$j('#d-property-format-custom')[0].value; |
| 432 | | - } |
| 433 | | - if(\$j('#d-property-label')[0].value !=''){ |
| 434 | | - code = code + ' = '+ \$j('#d-property-label')[0].value; |
| 435 | | - } |
| 436 | | - \$j('#d-property-code')[0].value= code; |
| | 489 | + code = '?'+jQuery('#d-property')[0].value; |
| | 490 | + if(code!=''){ |
| | 491 | + if(jQuery('#d-property-format-custom')[0].value !=''){ |
| | 492 | + code = code + jQuery('#d-property-format-custom')[0].value; |
| 437 | 493 | } |
| | 494 | + if(jQuery('#d-property-label')[0].value !=''){ |
| | 495 | + code = code + ' = '+ jQuery('#d-property-label')[0].value; |
| | 496 | + } |
| | 497 | + jQuery('#d-property-code')[0].value= code; |
| | 498 | + } |
| 438 | 499 | } |
| | 500 | + |
| | 501 | +function smw_cat_code_update(){ |
| | 502 | + |
| | 503 | +} |
| | 504 | + |
| | 505 | +function smw_makeCatDialog(cat_id){ |
| | 506 | + jQuery('#prop-cat input').attr('value',''); |
| | 507 | + cat=jQuery('#category'+cat_id)[0].value; |
| | 508 | + jQuery('#d-category').attr('value',cat); |
| | 509 | + label=jQuery('#cat_label'+cat_id)[0].value; |
| | 510 | + jQuery('#d-category-label').attr('value',label); |
| | 511 | + //jQuery('#cat-dialog').dialog('open'); |
| | 512 | +} |
| | 513 | + |
| 439 | 514 | function smw_makePropDialog(prop_id){ |
| 440 | | - jQuery('#prop-dialog input').attr('value',''); |
| 441 | | - prop=val=\$j('#property'+prop_id)[0].value; |
| 442 | | - if(val[0]='?') val=prop=prop.substr(1); |
| 443 | | - if((i=val.indexOf('='))!=-1) prop=prop.substring(0, i); |
| 444 | | - if((i=val.indexOf('#'))!=-1) prop=prop.substring(0, i); |
| 445 | | - if(val.split('=')[1]){ |
| 446 | | - label=val.split('=')[1].trim(); |
| 447 | | - }else{ |
| 448 | | - label=""; |
| 449 | | - } |
| 450 | | - format = val.split('=')[0]; |
| 451 | | - if(format.indexOf('#')!=-1){ |
| 452 | | - format=format.substr(format.indexOf('#')); |
| 453 | | - }else{ |
| 454 | | - format=""; |
| 455 | | - } |
| | 515 | + jQuery('#prop-dialog input').attr('value',''); |
| | 516 | + prop=val=jQuery('#property'+prop_id)[0].value; |
| | 517 | + if(val[0]='?') val=prop=prop.substr(1); |
| | 518 | + if((i=val.indexOf('='))!=-1) prop=prop.substring(0, i); |
| | 519 | + if((i=val.indexOf('#'))!=-1) prop=prop.substring(0, i); |
| | 520 | + if(val.split('=')[1]){ |
| | 521 | + label=val.split('=')[1].trim(); |
| | 522 | + }else{ |
| | 523 | + label=""; |
| | 524 | + } |
| | 525 | + format = val.split('=')[0]; |
| | 526 | + if(format.indexOf('#')!=-1){ |
| | 527 | + format=format.substr(format.indexOf('#')); |
| | 528 | + }else{ |
| | 529 | + format=""; |
| | 530 | + } |
| 456 | 531 | |
| 457 | | - \$j('#d-property').attr('value', prop.trim()); |
| 458 | | - \$j('#d-property-label').attr('value', label); |
| 459 | | - \$j('#d-property-format-custom').attr('value', format.trim()); |
| 460 | | - \$j('#prop-dialog').dialog.id=prop_id; |
| 461 | | - \$j('#prop-dialog').dialog('open'); |
| | 532 | + jQuery('#d-property').attr('value', prop.trim()); |
| | 533 | + jQuery('#d-property-label').attr('value', label); |
| | 534 | + jQuery('#d-property-format-custom').attr('value', format.trim()); |
| | 535 | + jQuery('#prop-dialog').dialog.id=prop_id; |
| | 536 | + jQuery('#prop-dialog').dialog('open'); |
| 462 | 537 | } |
| 463 | 538 | // code for handling adding and removing the "sort" inputs |
| 464 | 539 | |
| — | — | @@ -533,6 +608,36 @@ |
| 534 | 609 | smw_category_autocomplete(); |
| 535 | 610 | } |
| 536 | 611 | |
| | 612 | +function smw_addMainColInstance(starter_div_id, main_div_id) { |
| | 613 | + var starter_div = document.getElementById(starter_div_id); |
| | 614 | + var main_div = document.getElementById(main_div_id); |
| | 615 | + |
| | 616 | + //Create the new instance |
| | 617 | + var new_div = starter_div.cloneNode(true); |
| | 618 | + var div_id = 'sort_div_' + num_elements; |
| | 619 | + new_div.id = div_id; |
| | 620 | + new_div.style.display = 'block'; |
| | 621 | + jQuery(new_div.getElementsByTagName('label')).attr('for', 'display'+num_elements); |
| | 622 | + var children = new_div.getElementsByTagName('*'); |
| | 623 | + var x; |
| | 624 | + for (x = 0; x < children.length; x++) { |
| | 625 | + if (children[x].for) children[x].for="display"+num_elements; |
| | 626 | + if (children[x].name){ |
| | 627 | + children[x].id = children[x].name.replace(/_num/, ''+num_elements); |
| | 628 | + children[x].name = children[x].name.replace(/_num/, '[' + num_elements + ']'); |
| | 629 | + } |
| | 630 | + } |
| | 631 | + |
| | 632 | + //Add the new instance |
| | 633 | + main_div.appendChild(new_div); |
| | 634 | + |
| | 635 | + // initialize delete button |
| | 636 | + st='sort_div_'+num_elements; |
| | 637 | + jQuery('#'+new_div.id).find(".smw-remove a")[0].href="javascript:removePOInstance('"+st+"')"; |
| | 638 | + num_elements++; |
| | 639 | + smw_category_autocomplete(); |
| | 640 | +} |
| | 641 | + |
| 537 | 642 | function removePOInstance(div_id) { |
| 538 | 643 | var olddiv = document.getElementById(div_id); |
| 539 | 644 | var parent = olddiv.parentNode; |
| — | — | @@ -542,6 +647,7 @@ |
| 543 | 648 | jQuery(function(){ |
| 544 | 649 | jQuery('$hidden_property').appendTo(document.body); |
| 545 | 650 | jQuery('$hidden_category').appendTo(document.body); |
| | 651 | + jQuery('$hidden_main_column').appendTo(document.body); |
| 546 | 652 | jQuery('$property_dialog_box').appendTo(document.body); |
| 547 | 653 | jQuery('$category_dialog_box').appendTo(document.body); |
| 548 | 654 | jQuery('#cat-dialog').dialog({ |
| — | — | @@ -550,7 +656,20 @@ |
| 551 | 657 | resizable: true, |
| 552 | 658 | minHeight: 200, |
| 553 | 659 | minWidth: 400, |
| | 660 | + buttons: { |
| | 661 | + "Ok": function(){ //todo i18 |
| | 662 | + smw_cat_code_update(); |
| | 663 | + // todo: move modal window data to main window form controls; |
| | 664 | + jQuery(this).dialog("close"); |
| | 665 | + }, |
| | 666 | + "Cancel": function(){ //todo:i18n |
| | 667 | + jQuery('#cat-dialog input').attr('value',''); |
| | 668 | + jQuery(this).dialog("close"); |
| | 669 | + } |
| | 670 | + } |
| 554 | 671 | }); |
| | 672 | + //todo: run smw_cat_code_update() when input values in category modal windows changes |
| | 673 | + |
| 555 | 674 | jQuery('#prop-dialog').dialog({ |
| 556 | 675 | autoOpen: false, |
| 557 | 676 | modal: true, |
| — | — | @@ -560,7 +679,7 @@ |
| 561 | 680 | buttons: { |
| 562 | 681 | "Ok": function(){ //todo: i18n |
| 563 | 682 | smw_prop_code_update(); |
| 564 | | - \$j('#property'+\$j('#prop-dialog').dialog.id)[0].value=\$j('#d-property-code')[0].value; |
| | 683 | + jQuery('#property'+jQuery('#prop-dialog').dialog.id)[0].value=jQuery('#d-property-code')[0].value; |
| 565 | 684 | jQuery(this).dialog("close"); |
| 566 | 685 | }, |
| 567 | 686 | "Cancel": function(){ //todo: i18n |
| — | — | @@ -577,10 +696,9 @@ |
| 578 | 697 | smw_prop_code_update(); |
| 579 | 698 | }); |
| 580 | 699 | }); |
| 581 | | -function smw_makeCatDialog(cat_id){ |
| 582 | | - //\$j('#cat-dialog').dialog('open'); |
| 583 | | -} |
| | 700 | + |
| 584 | 701 | jQuery(document).ready(smw_property_autocomplete); |
| | 702 | +jQuery(document).ready(smw_category_autocomplete); |
| 585 | 703 | </script> |
| 586 | 704 | |
| 587 | 705 | EOT; |
| Index: branches/extensions-realtime/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialAsk.php |
| — | — | @@ -147,18 +147,6 @@ |
| 148 | 148 | } |
| 149 | 149 | } |
| 150 | 150 | |
| 151 | | - // Find implicit ordering for RSS -- needed for downwards compatibility with SMW <=1.1 |
| 152 | | - /* |
| 153 | | - if ( ($this->m_params['format'] == 'rss') && ($this->m_params['sort'] == '') && ($sortcount==0)) { |
| 154 | | - foreach ($this->m_printouts as $printout) { |
| 155 | | - if ((strtolower($printout->getLabel()) == "date") && ($printout->getTypeID() == "_dat")) { |
| 156 | | - $this->m_params['sort'] = $printout->getTitle()->getText(); |
| 157 | | - $this->m_params['order'] = 'DESC'; |
| 158 | | - } |
| 159 | | - } |
| 160 | | - } |
| 161 | | - */ |
| 162 | | - |
| 163 | 151 | if ( !array_key_exists( 'offset', $this->m_params ) ) { |
| 164 | 152 | $this->m_params['offset'] = $wgRequest->getVal( 'offset' ); |
| 165 | 153 | if ( $this->m_params['offset'] == '' ) $this->m_params['offset'] = 0; |
| — | — | @@ -361,7 +349,7 @@ |
| 362 | 350 | $result_mime = false; // output in MW Special page as usual |
| 363 | 351 | |
| 364 | 352 | // build parameter strings for URLs, based on current settings |
| 365 | | - $urltail = '&q=' . urlencode( $this->m_querystring ); |
| | 353 | + $urlArgs['q'] = $this->m_querystring; |
| 366 | 354 | |
| 367 | 355 | $tmp_parray = array(); |
| 368 | 356 | foreach ( $this->m_params as $key => $value ) { |
| — | — | @@ -370,16 +358,16 @@ |
| 371 | 359 | } |
| 372 | 360 | } |
| 373 | 361 | |
| 374 | | - $urltail .= '&p=' . urlencode( SMWInfolink::encodeParameters( $tmp_parray ) ); |
| | 362 | + $urlArgs['p'] = SMWInfolink::encodeParameters( $tmp_parray ); |
| 375 | 363 | $printoutstring = ''; |
| 376 | 364 | |
| 377 | 365 | foreach ( $this->m_printouts as $printout ) { |
| 378 | 366 | $printoutstring .= $printout->getSerialisation() . "\n"; |
| 379 | 367 | } |
| 380 | 368 | |
| 381 | | - if ( $printoutstring != '' ) $urltail .= '&po=' . urlencode( $printoutstring ); |
| 382 | | - if ( array_key_exists( 'sort', $this->m_params ) ) $urltail .= '&sort=' . $this->m_params['sort']; |
| 383 | | - if ( array_key_exists( 'order', $this->m_params ) ) $urltail .= '&order=' . $this->m_params['order']; |
| | 369 | + if ( $printoutstring != '' ) $urlArgs['po'] = $printoutstring; |
| | 370 | + if ( array_key_exists( 'sort', $this->m_params ) ) $urlArgs['sort'] = $this->m_params['sort']; |
| | 371 | + if ( array_key_exists( 'order', $this->m_params ) ) $urlArgs['order'] = $this->m_params['order']; |
| 384 | 372 | |
| 385 | 373 | if ( $this->m_querystring != '' ) { |
| 386 | 374 | $queryobj = SMWQueryProcessor::createQuery( $this->m_querystring, $this->m_params, SMWQueryProcessor::SPECIAL_PAGE , $this->m_params['format'], $this->m_printouts ); |
| — | — | @@ -425,10 +413,14 @@ |
| 426 | 414 | |
| 427 | 415 | if ( $result_mime == false ) { |
| 428 | 416 | if ( $res->getCount() > 0 ) { |
| 429 | | - if ( $this->m_editquery ) $urltail .= '&eq=yes'; |
| 430 | | - if ( $hidequery ) $urltail .= '&eq=no'; |
| | 417 | + if ( $this->m_editquery ) { |
| | 418 | + $urlArgs['eq'] = 'yes'; |
| | 419 | + } |
| | 420 | + else if ( $hidequery ) { |
| | 421 | + $urlArgs['eq'] = 'no'; |
| | 422 | + } |
| 431 | 423 | |
| 432 | | - $navigation = $this->getNavigationBar( $res, $urltail ); |
| | 424 | + $navigation = $this->getNavigationBar( $res, $urlArgs ); |
| 433 | 425 | $result .= '<div style="text-align: center;">' . "\n" . $navigation . "\n</div>\n"; |
| 434 | 426 | $query_result = $printer->getResult( $res, $this->m_params, SMW_OUTPUT_HTML ); |
| 435 | 427 | |
| — | — | @@ -440,7 +432,7 @@ |
| 441 | 433 | |
| 442 | 434 | $result .= '<div style="text-align: center;">' . "\n" . $navigation . "\n</div>\n"; |
| 443 | 435 | } else { |
| 444 | | - $result = '<div style="text-align: center;">' . wfMsg( 'smw_result_noresults' ) . '</div>'; |
| | 436 | + $result = '<div style="text-align: center;">' . wfMsgHtml( 'smw_result_noresults' ) . '</div>'; |
| 445 | 437 | } |
| 446 | 438 | } else { // make a stand-alone file |
| 447 | 439 | $result = $printer->getResult( $res, $this->m_params, SMW_OUTPUT_FILE ); |
| — | — | @@ -455,7 +447,13 @@ |
| 456 | 448 | $wgOut->setHTMLtitle( wfMsg( 'ask' ) ); |
| 457 | 449 | } |
| 458 | 450 | |
| 459 | | - $result = $this->getInputForm( $printoutstring, 'offset=' . $this->m_params['offset'] . '&limit=' . $this->m_params['limit'] . $urltail ) . $result; |
| | 451 | + $result = $this->getInputForm( |
| | 452 | + $printoutstring, |
| | 453 | + 'offset=' . $this->m_params['offset'] |
| | 454 | + . '&limit=' . $this->m_params['limit'] |
| | 455 | + . wfArrayToCGI( $urlArgs ) |
| | 456 | + ) . $result; |
| | 457 | + |
| 460 | 458 | $wgOut->addHTML( $result ); |
| 461 | 459 | } else { |
| 462 | 460 | $wgOut->disable(); |
| — | — | @@ -560,7 +558,7 @@ |
| 561 | 559 | $result .= '<fieldset><legend>' . wfMsg( 'smw_ask_otheroptions' ) . "</legend>\n"; |
| 562 | 560 | $result .= "<div id=\"other_options\">" . $this->showFormatOptions( $this->m_params['format'], $this->m_params ) . "</div>"; |
| 563 | 561 | $result .= "</fieldset>\n"; |
| 564 | | - $urltail = str_replace( '&eq=yes', '', $urltail ) . '&eq=no'; |
| | 562 | + $urltail = str_replace( '&eq=yes', '', $urltail ) . '&eq=no'; // FIXME: doing it wrong, srysly |
| 565 | 563 | |
| 566 | 564 | $result .= '<br /><input type="submit" value="' . wfMsg( 'smw_ask_submit' ) . '"/>' . |
| 567 | 565 | '<input type="hidden" name="eq" value="yes"/>' . |
| — | — | @@ -629,11 +627,11 @@ |
| 630 | 628 | * Build the navigation for some given query result, reuse url-tail parameters. |
| 631 | 629 | * |
| 632 | 630 | * @param SMWQueryResult $res |
| 633 | | - * @param string $urltail |
| | 631 | + * @param array $urlArgs |
| 634 | 632 | * |
| 635 | 633 | * @return string |
| 636 | 634 | */ |
| 637 | | - protected function getNavigationBar( SMWQueryResult $res, $urltail ) { |
| | 635 | + protected function getNavigationBar( SMWQueryResult $res, array $urlArgs ) { |
| 638 | 636 | global $smwgQMaxInlineLimit; |
| 639 | 637 | |
| 640 | 638 | $offset = $this->m_params['offset']; |
| — | — | @@ -646,8 +644,8 @@ |
| 647 | 645 | array( |
| 648 | 646 | 'href' => SpecialPage::getSafeTitleFor( 'Ask' )->getLocalURL( array( |
| 649 | 647 | 'offset' => max( 0, $offset - $limit ), |
| 650 | | - 'limit' => $limit . $urltail |
| 651 | | - ) ), |
| | 648 | + 'limit' => $limit |
| | 649 | + ) + $urlArgs ), |
| 652 | 650 | 'rel' => 'nofollow' |
| 653 | 651 | ), |
| 654 | 652 | wfMsg( 'smw_result_prev' ) |
| — | — | @@ -670,8 +668,8 @@ |
| 671 | 669 | array( |
| 672 | 670 | 'href' => SpecialPage::getSafeTitleFor( 'Ask' )->getLocalURL( array( |
| 673 | 671 | 'offset' => ( $offset + $limit ), |
| 674 | | - 'limit' => $limit . $urltail |
| 675 | | - ) ), |
| | 672 | + 'limit' => $limit |
| | 673 | + ) + $urlArgs ), |
| 676 | 674 | 'rel' => 'nofollow' |
| 677 | 675 | ), |
| 678 | 676 | wfMsg( 'smw_result_next' ) |
| — | — | @@ -698,8 +696,8 @@ |
| 699 | 697 | array( |
| 700 | 698 | 'href' => SpecialPage::getSafeTitleFor( 'Ask' )->getLocalURL( array( |
| 701 | 699 | 'offset' => $offset, |
| 702 | | - 'limit' => $l . $urltail |
| 703 | | - ) ), |
| | 700 | + 'limit' => $l |
| | 701 | + ) + $urlArgs ), |
| 704 | 702 | 'rel' => 'nofollow' |
| 705 | 703 | ), |
| 706 | 704 | $l |
| — | — | @@ -802,21 +800,4 @@ |
| 803 | 801 | return $input->getHtml(); |
| 804 | 802 | } |
| 805 | 803 | |
| 806 | | - /** |
| 807 | | - * Compatibility method to get the skin; MW 1.18 introduces a getSkin method in SpecialPage. |
| 808 | | - * |
| 809 | | - * @since 1.6 |
| 810 | | - * |
| 811 | | - * @return Skin |
| 812 | | - */ |
| 813 | | - public function getSkin() { |
| 814 | | - if ( method_exists( 'SpecialPage', 'getSkin' ) ) { |
| 815 | | - return parent::getSkin(); |
| 816 | | - } |
| 817 | | - else { |
| 818 | | - global $wgUser; |
| 819 | | - return $wgUser->getSkin(); |
| 820 | | - } |
| 821 | | - } |
| 822 | | - |
| 823 | 804 | } |
| Index: branches/extensions-realtime/SemanticMediaWiki/RELEASE-NOTES |
| — | — | @@ -1,5 +1,11 @@ |
| 2 | 2 | For a documentation of all features, see http://semantic-mediawiki.org |
| 3 | 3 | |
| | 4 | + |
| | 5 | +== SMW 1.6.1 == |
| | 6 | + |
| | 7 | +* Fixed continue and limit escaping issues on Special:Ask. |
| | 8 | +* Internationalization improvements and layout tweaks to #smwdoc. |
| | 9 | + |
| 4 | 10 | == SMW 1.6 == |
| 5 | 11 | |
| 6 | 12 | Released on July 30, 2011. |
| Index: branches/extensions-realtime/SemanticMediaWiki/languages/SMW_Messages.php |
| — | — | @@ -254,6 +254,7 @@ |
| 255 | 255 | 'smw_qui_descorder' => 'Descending', |
| 256 | 256 | 'smw_qui_addnprop' => 'Add additional properties', |
| 257 | 257 | 'smw_qui_delete' => 'Remove', |
| | 258 | + 'smw_qui_rescol' => 'Result column label', |
| 258 | 259 | |
| 259 | 260 | // Messages for the search by property special |
| 260 | 261 | 'searchbyproperty' => 'Search by property', |
| Index: branches/extensions-realtime/SemanticMediaWiki/skins/SMW_custom.css |
| — | — | @@ -131,22 +131,35 @@ |
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | /* ui buttons for QueryUI */ |
| 135 | | -.smw-sort input, .smw-sort a, .smw-sort select, .smw-sort checkbox{ |
| | 135 | +.smwsort input, .smwsort a, .smwsort select, .smwsort checkbox{ |
| 136 | 136 | margin-left: 5px; |
| 137 | 137 | margin-bottom: 5px; |
| 138 | 138 | } |
| | 139 | + |
| 139 | 140 | span.smw-remove a img{ |
| 140 | 141 | text-decoration: none; |
| 141 | 142 | margin-right: 5px; |
| 142 | 143 | vertical-align: -3px; |
| 143 | 144 | } |
| 144 | 145 | |
| 145 | | -.smw-prop-dialog input, .smw-prop-dialog select{ |
| | 146 | +.smwpropdialog input, .smwpropdialog select{ |
| 146 | 147 | margin-top: 10px; |
| 147 | 148 | margin-right: 5px; |
| | 149 | + margin-left: 5px; |
| 148 | 150 | } |
| 149 | 151 | |
| | 152 | +.smwcatdialog input, .smwcatdialog select{ |
| | 153 | + margin-top: 10px; |
| | 154 | + margin-right: 5px; |
| | 155 | + margin-left: 5px; |
| | 156 | +} |
| 150 | 157 | |
| | 158 | +/* Query Creator */ |
| | 159 | +div.smwqcnavbar{ |
| | 160 | + padding-bottom: 5px; |
| | 161 | + padding-top: 5px; |
| | 162 | +} |
| | 163 | + |
| 151 | 164 | /* search, browse, RDF icons */ |
| 152 | 165 | |
| 153 | 166 | span.smwsearchicon { /*FIXME: this was only used for Factbox docu, should be removed from code*/ |
| Index: branches/extensions-realtime/Babel/BabelAutoCreate.class.php |
| — | — | @@ -37,7 +37,7 @@ |
| 38 | 38 | } else { |
| 39 | 39 | $text = wfMsgForContent( 'babel-autocreate-text-levels', $level, $language ); |
| 40 | 40 | } |
| 41 | | - $article = new Article( $title ); |
| | 41 | + $article = new Article( $title, 0 ); |
| 42 | 42 | |
| 43 | 43 | $user = self::user(); |
| 44 | 44 | # Do not add a message if the username is invalid or if the account that adds it, is blocked |
| Index: branches/extensions-realtime/SocialProfile/UserStatus/UserStatus.js |
| — | — | @@ -36,6 +36,10 @@ |
| 37 | 37 | toEditMode: function() { |
| 38 | 38 | jQuery( '#user-status-block' ).hide(); |
| 39 | 39 | jQuery( '#status-edit-controls' ).show(); |
| | 40 | + // If the history div is (still) present, hide it |
| | 41 | + if ( jQuery( '#status-history-block' ) ) { |
| | 42 | + jQuery( '#status-history-block' ).hide(); |
| | 43 | + } |
| 40 | 44 | }, |
| 41 | 45 | |
| 42 | 46 | /** |
| Index: branches/extensions-realtime/LiquidThreads/i18n/Lqt.i18n.php |
| — | — | @@ -214,7 +214,7 @@ |
| 215 | 215 | 'lqt-enotif-subject-reply' => '{{SITENAME}} discussion - Reply: $1', |
| 216 | 216 | 'lqt-enotif-subject-newthread' => '{{SITENAME}} discussion - New thread: $1', |
| 217 | 217 | 'lqt-enotif-newthread' => "Hi $1, |
| 218 | | - |
| | 218 | + |
| 219 | 219 | this is a notification from {{SITENAME}} that a new thread on $5, '$2', |
| 220 | 220 | was created on $3 at $4 by $8 |
| 221 | 221 | |
| — | — | @@ -256,13 +256,10 @@ |
| 257 | 257 | 'lqt-marked-as-read-placeholder' => 'The thread $1 was marked as read.', |
| 258 | 258 | 'lqt-change-subject' => 'Change subject', |
| 259 | 259 | 'lqt-save-subject' => 'Save', |
| 260 | | - 'lqt-save-subject-failed' => 'The following error occurred while attempting to ' . |
| 261 | | -'change the subject of this thread: $1', |
| 262 | | - 'lqt-ajax-invalid-subject' => 'The subject you specified was invalid, probably ' . |
| 263 | | -'because it was too long.', |
| | 260 | + 'lqt-save-subject-failed' => 'The following error occurred while attempting to change the subject of this thread: $1', |
| | 261 | + 'lqt-ajax-invalid-subject' => 'The subject you specified was invalid, probably because it was too long.', |
| 264 | 262 | 'lqt-ajax-no-subject' => 'You must specify a subject for the new thread.', |
| 265 | | - 'lqt-save-subject-error-unknown' => 'An unknown error occurred when attempting ' . |
| 266 | | -'to set the subject of this thread. Please try to do this by clicking "edit" on the top post.', |
| | 263 | + 'lqt-save-subject-error-unknown' => 'An unknown error occurred when attempting to set the subject of this thread. Please try to do this by clicking "edit" on the top post.', |
| 267 | 264 | 'lqt-cancel-subject-edit' => 'Cancel', |
| 268 | 265 | 'lqt-drag-activate' => 'Drag to new location', |
| 269 | 266 | 'lqt-drag-drop-zone' => 'Drop here', |
| — | — | @@ -2050,7 +2047,7 @@ |
| 2051 | 2048 | 'lqt-enotif-subject-newthread' => 'Абмеркаваньне {{GRAMMAR:родны|{{SITENAME}}}} — Новая галіна: $1', |
| 2052 | 2049 | 'lqt-enotif-newthread' => "Вітаем $1, |
| 2053 | 2050 | |
| 2054 | | -Гэта паведамленьне з {{GRAMMAR:родны|{{SITENAME}}}} пра новую галіну $5, '$2', |
| | 2051 | +Гэта паведамленьне з {{GRAMMAR:родны|{{SITENAME}}}} пра новую галіну $5, '$2', |
| 2055 | 2052 | створаную $3 $4 удзельнікам $8. |
| 2056 | 2053 | |
| 2057 | 2054 | Вы можаце паглядзець яе на <$6> |
| — | — | @@ -2059,7 +2056,7 @@ |
| 2060 | 2057 | $7", |
| 2061 | 2058 | 'lqt-enotif-reply' => "Вітаем, $1! |
| 2062 | 2059 | |
| 2063 | | -Гэта паведамленьне з {{GRAMMAR:родны|{{SITENAME}}}} пра новы адказ '$2' на старонцы $5, |
| | 2060 | +Гэта паведамленьне з {{GRAMMAR:родны|{{SITENAME}}}} пра новы адказ '$2' на старонцы $5, |
| 2064 | 2061 | створаны ў $4 $3 удзельнікам $8. |
| 2065 | 2062 | |
| 2066 | 2063 | Вы можаце паглядзець яго на <$6>. |
| — | — | @@ -2312,7 +2309,7 @@ |
| 2313 | 2310 | 'lqt-thread-link-url' => 'URL на препратката:', |
| 2314 | 2311 | 'lqt-thread-link-title' => 'Уикитекст на препратката:', |
| 2315 | 2312 | 'lqt-thread-link-copy' => 'Копиране в системния буфер', |
| 2316 | | - 'lqt-sign-not-necessary' => 'Не е нужно да подписвате коментара си с четири вълнички. |
| | 2313 | + 'lqt-sign-not-necessary' => 'Не е нужно да подписвате коментара си с четири вълнички. |
| 2317 | 2314 | Подписът ви ще се покаже автоматично.', |
| 2318 | 2315 | 'lqt-marked-as-read-placeholder' => 'Тема $1 беше отбелязана като прочетена.', |
| 2319 | 2316 | 'lqt-change-subject' => 'Смяна на темата', |
| — | — | @@ -2617,7 +2614,7 @@ |
| 2618 | 2615 | 'lqt_delete_show_checkbox' => "Diskouez ar c'haozeadennoù diverket", |
| 2619 | 2616 | 'lqt_talkpage_autocreate_summary' => "Pajenn gaozeal krouet ent emgefre p'eo bet kaset an neudennad kaozioù kentañ", |
| 2620 | 2617 | 'lqt_header_warning_big' => "Emaoc'h o kemmañ ur $1", |
| 2621 | | - 'lqt_header_warning_after_big' => "Evit ar c'hemennoù hag ar rakgerioù eo an talbennoù. |
| | 2618 | + 'lqt_header_warning_after_big' => "Evit ar c'hemennoù hag ar rakgerioù eo an talbennoù. |
| 2622 | 2619 | Marteze e fell deoc'h $2 kentoc'h.", |
| 2623 | 2620 | 'lqt_header_warning_bold' => 'Talbenn ur bajenn gaozeal', |
| 2624 | 2621 | 'lqt_header_warning_new_discussion' => "boulc'hañ gant ur gaoz nevez", |
| — | — | @@ -3089,7 +3086,7 @@ |
| 3090 | 3087 | 'lqt_new_thread' => 'Comença una nova discussió', |
| 3091 | 3088 | 'lqt_invalid_subject' => 'El tema que heu introduït no és vàlid. |
| 3092 | 3089 | Pot: |
| 3093 | | -* ser massa llarg, o |
| | 3090 | +* ser massa llarg, o |
| 3094 | 3091 | * entrar en conflicte amb prefixos interwiki o altres espai de noms.', |
| 3095 | 3092 | 'lqt_empty_subject' => "Heu d'introduir un tema.", |
| 3096 | 3093 | 'lqt_reply' => 'Respon', |
| — | — | @@ -3265,7 +3262,7 @@ |
| 3266 | 3263 | |
| 3267 | 3264 | El podeu veure a <$6>', |
| 3268 | 3265 | 'lqt-enotif-reply' => 'Hola $1, |
| 3269 | | -Açò és una notificació des del projecte {{SITENAME}} per a avisar-vos que ha aparegut una resposta al fil «$2» a $5, |
| | 3266 | +Açò és una notificació des del projecte {{SITENAME}} per a avisar-vos que ha aparegut una resposta al fil «$2» a $5, |
| 3270 | 3267 | creada el dia $3 a les $4. |
| 3271 | 3268 | |
| 3272 | 3269 | El podeu veure a <$6> |
| — | — | @@ -3723,8 +3720,8 @@ |
| 3724 | 3721 | 'lqt_toc_thread_modified' => 'Newidiwyd ddiwethaf', |
| 3725 | 3722 | 'lqt_add_header' => 'Ychwanegu pennawd', |
| 3726 | 3723 | 'lqt_new_thread' => 'Dechrau trafodaeth newydd', |
| 3727 | | - 'lqt_invalid_subject' => "Mae'r pwnc a roddoch yn annilys. |
| 3728 | | -Efallai: |
| | 3724 | + 'lqt_invalid_subject' => "Mae'r pwnc a roddoch yn annilys. |
| | 3725 | +Efallai: |
| 3729 | 3726 | * ei fod yn rhy hir, neu |
| 3730 | 3727 | * bod gwrthdaro yn codi rhyngddo a rhagddodiaid rhyngwici neu ag enwau parthau'r wici.", |
| 3731 | 3728 | 'lqt_empty_subject' => "Mae'n rhaid gosod pwnc.", |
| — | — | @@ -5515,7 +5512,7 @@ |
| 5516 | 5513 | 'lqt-preference-custom-signatures' => 'Mostrar firmas de usuario personalizadas', |
| 5517 | 5514 | 'lqt-enotif-subject-reply' => '{{SITENAME}} discusión - Respuesta: $1', |
| 5518 | 5515 | 'lqt-enotif-subject-newthread' => '{{SITENAME}} discusión - Nuevo hilo: $1', |
| 5519 | | - 'lqt-enotif-newthread' => "Hola $1, |
| | 5516 | + 'lqt-enotif-newthread' => "Hola $1, |
| 5520 | 5517 | |
| 5521 | 5518 | esta es una notificación de {{SITENAME}} de que un nuevo hilo en $5, '$2', |
| 5522 | 5519 | ha sido creado el $3 a las $4 por $8. |
| — | — | @@ -6177,7 +6174,7 @@ |
| 6178 | 6175 | 'lqt-marked-as-read-placeholder' => 'مبحث $1 به عنوان خواندهشده نشانهگذاری شده است.', |
| 6179 | 6176 | 'lqt-change-subject' => 'تغییر عنوان', |
| 6180 | 6177 | 'lqt-save-subject' => 'ذخیره', |
| 6181 | | - 'lqt-save-subject-failed' => 'هنگامی که قصد تغییر عنوان این مبحث را داشتید خطای زیر رخ داد: |
| | 6178 | + 'lqt-save-subject-failed' => 'هنگامی که قصد تغییر عنوان این مبحث را داشتید خطای زیر رخ داد: |
| 6182 | 6179 | $1', |
| 6183 | 6180 | 'lqt-ajax-invalid-subject' => 'عنوانی که مشخص کردید نامعتبر بود، احتمالاً به خاطر طولانیبودن بیش از حد.', |
| 6184 | 6181 | 'lqt-ajax-no-subject' => 'شما باید یک عنوان مشخص کنید.', |
| — | — | @@ -6312,7 +6309,7 @@ |
| 6313 | 6310 | 'lqt_nosuchthread' => 'Määrittämääsi viestiketjua ei ole.', |
| 6314 | 6311 | 'lqt_nosuchthread_title' => 'Ketjua ei löydy', |
| 6315 | 6312 | 'lqt_threadrequired' => 'Sinun tulee antaa ketju URL-osoitteessa.', |
| 6316 | | - 'lqt_move_movingthread' => 'Siirretään $1. |
| | 6313 | + 'lqt_move_movingthread' => 'Siirretään $1. |
| 6317 | 6314 | Tämä ketju on osa sivua $2.', |
| 6318 | 6315 | 'lqt_move_torename' => 'Nimetäksesi uudelleen tämän ketjun – $1 ja muuta Aihe-kenttää.', |
| 6319 | 6316 | 'lqt_move_torename_edit' => 'muokkaa sitä', |
| — | — | @@ -6335,7 +6332,7 @@ |
| 6336 | 6333 | 'lqt_delete_show_checkbox' => 'Näytä poistetut ketjut', |
| 6337 | 6334 | 'lqt_talkpage_autocreate_summary' => 'Keskustelusivu luotiin automaattisesti kun ensimmäinen ketju lähettiin.', |
| 6338 | 6335 | 'lqt_header_warning_big' => 'Muokkaat $1.', |
| 6339 | | - 'lqt_header_warning_after_big' => 'Otsakkeet ovat ilmoituksille ja johdannoille. |
| | 6336 | + 'lqt_header_warning_after_big' => 'Otsakkeet ovat ilmoituksille ja johdannoille. |
| 6340 | 6337 | Saatat etsiä sivua $2 sen sijaan.', |
| 6341 | 6338 | 'lqt_header_warning_bold' => 'keskustelusivun otsikkoa', |
| 6342 | 6339 | 'lqt_header_warning_new_discussion' => 'aloita uusi keskustelu', |
| — | — | @@ -6423,7 +6420,7 @@ |
| 6424 | 6421 | 'lqt-enotif-subject-newthread' => '{{SITENAME}} – Uusi viestiketju: $1', |
| 6425 | 6422 | 'lqt-enotif-newthread' => 'Hei $1, |
| 6426 | 6423 | |
| 6427 | | -Tämä on ilmoitus sivustolta {{SITENAME}}, että sivulle $5 on luotu uusi ketju, ”$2”, |
| | 6424 | +Tämä on ilmoitus sivustolta {{SITENAME}}, että sivulle $5 on luotu uusi ketju, ”$2”, |
| 6428 | 6425 | $3 $4. |
| 6429 | 6426 | |
| 6430 | 6427 | Näet sen osoitteessa <$6>.', |
| — | — | @@ -8192,9 +8189,9 @@ |
| 8193 | 8190 | 'lqt_toc_thread_modified' => 'Zadnje izmjenjeno', |
| 8194 | 8191 | 'lqt_add_header' => 'Dodaj zaglavlje', |
| 8195 | 8192 | 'lqt_new_thread' => 'Započnite novu raspravu', |
| 8196 | | - 'lqt_invalid_subject' => 'Naziv teme koji ste unijeli nije ispravan. |
| 8197 | | -Može biti: |
| 8198 | | -* predug je, ili |
| | 8193 | + 'lqt_invalid_subject' => 'Naziv teme koji ste unijeli nije ispravan. |
| | 8194 | +Može biti: |
| | 8195 | +* predug je, ili |
| 8199 | 8196 | * naziv je isti kao međuwiki prefiks ili ime imenskog prostora.', |
| 8200 | 8197 | 'lqt_empty_subject' => 'Morate upisati temu/sažetak.', |
| 8201 | 8198 | 'lqt_reply' => 'Odgovori', |
| — | — | @@ -8246,11 +8243,11 @@ |
| 8247 | 8244 | 'lqt_protectedfromreply_link' => 'zaštićen', |
| 8248 | 8245 | 'lqt_subject' => 'Tema:', |
| 8249 | 8246 | 'lqt_noreason' => 'bez obrazloženja', |
| 8250 | | - 'lqt_move_placeholder' => 'Tema $1 premještena je odavdje na $5. |
| | 8247 | + 'lqt_move_placeholder' => 'Tema $1 premještena je odavdje na $5. |
| 8251 | 8248 | Premještaj je napravio suradnik $2 dana $3 u $4.', |
| 8252 | 8249 | 'lqt_thread_deleted_for_sysops' => "Tema je '''obrisana''' te je vidljiva samo administratorima.", |
| 8253 | 8250 | 'lqt_thread_deleted' => 'Tema je obrisana.', |
| 8254 | | - 'lqt_summary_notice' => 'Nije bilo uređivanja ove rasprave najmanje $2 {{PLURAL:$2|dan|dana|dana}}. |
| | 8251 | + 'lqt_summary_notice' => 'Nije bilo uređivanja ove rasprave najmanje $2 {{PLURAL:$2|dan|dana|dana}}. |
| 8255 | 8252 | Ukoliko je tema zaključena, možda želite urediti sažetak $1.', |
| 8256 | 8253 | 'lqt_summary_notice_link' => 'napiši sažetak', |
| 8257 | 8254 | 'lqt_summary_label' => 'Sažetak teme:', |
| — | — | @@ -8259,7 +8256,7 @@ |
| 8260 | 8257 | 'lqt_nosuchthread' => 'Tema koju ste naveli ne postoji.', |
| 8261 | 8258 | 'lqt_nosuchthread_title' => 'Ne postoji tema s tim nazivom', |
| 8262 | 8259 | 'lqt_threadrequired' => 'Morate navesti temu u URL-u.', |
| 8263 | | - 'lqt_move_movingthread' => 'Premještam $1. |
| | 8260 | + 'lqt_move_movingthread' => 'Premještam $1. |
| 8264 | 8261 | Ova tema je dio $2.', |
| 8265 | 8262 | 'lqt_move_torename' => "Za promjenu naslova ove teme, $1 i promijenite polje 'Subject'.", |
| 8266 | 8263 | 'lqt_move_torename_edit' => 'uredi', |
| — | — | @@ -8282,7 +8279,7 @@ |
| 8283 | 8280 | 'lqt_delete_show_checkbox' => 'Pokaži obrisane teme', |
| 8284 | 8281 | 'lqt_talkpage_autocreate_summary' => 'Stranica za razgovor automatski je stvorena kad je započeta prva tema', |
| 8285 | 8282 | 'lqt_header_warning_big' => 'Uređujete $1.', |
| 8286 | | - 'lqt_header_warning_after_big' => 'Zaglavlja služe za obavijesti i predgovore. |
| | 8283 | + 'lqt_header_warning_after_big' => 'Zaglavlja služe za obavijesti i predgovore. |
| 8287 | 8284 | Možda želite $2.', |
| 8288 | 8285 | 'lqt_header_warning_bold' => 'zaglavlje stranice za razgovor', |
| 8289 | 8286 | 'lqt_header_warning_new_discussion' => 'započnite novu temu', |
| — | — | @@ -8294,11 +8291,11 @@ |
| 8295 | 8292 | 'lqt-summary' => 'Sažetak', |
| 8296 | 8293 | 'lqt-searching' => 'Pretražujem teme', |
| 8297 | 8294 | 'lqt-read-message' => 'Označi kao pročitano', |
| 8298 | | - 'lqt-read-message-tooltip' => 'Ukloni ovu temu iz novih poruka. |
| | 8295 | + 'lqt-read-message-tooltip' => 'Ukloni ovu temu iz novih poruka. |
| 8299 | 8296 | Ona će još uvijek biti vidljiva na njenoj stranici za razgovor.', |
| 8300 | 8297 | 'lqt-read-all' => 'Označi sve pročitanim', |
| 8301 | | - 'lqt-read-all-tooltip' => 'Uklonite sve teme iz novih poruke. |
| 8302 | | -One će još uvijek biti vidljive na njihove izvornim stranicama za razgovor. |
| | 8298 | + 'lqt-read-all-tooltip' => 'Uklonite sve teme iz novih poruke. |
| | 8299 | +One će još uvijek biti vidljive na njihove izvornim stranicama za razgovor. |
| 8303 | 8300 | Ovu operaciju je moguće povratiti.', |
| 8304 | 8301 | 'lqt-marked-read' => "Tema '''$1''' označena je pročitanom.", |
| 8305 | 8302 | 'lqt-count-marked-read' => '$1 {{PLURAL:$1|poruka označena je pročitanom|poruke označene su pročitanima|poruka označene su pročitanima}}.', |
| — | — | @@ -8330,8 +8327,8 @@ |
| 8331 | 8328 | 'lqt-split-submit' => 'Razdvoji', |
| 8332 | 8329 | 'lqt_split_badsubject' => 'Tema koju ste unijeli nije ispravna.', |
| 8333 | 8330 | 'lqt-no-threads' => 'Na ovoj stranici još uvijek ne postoji rasprava.', |
| 8334 | | - 'lqt-delete-parent-warning' => 'Ovo je najviši-nivo teme s njenim odgovorima. |
| 8335 | | -Odgovori će također biti automatski obrisani. |
| | 8331 | + 'lqt-delete-parent-warning' => 'Ovo je najviši-nivo teme s njenim odgovorima. |
| | 8332 | +Odgovori će također biti automatski obrisani. |
| 8336 | 8333 | Kako bi to izbjegli, podijelite ih iz ove teme prije nego ju obrišete.', |
| 8337 | 8334 | 'lqt-delete-parent-deleted' => 'Tema "roditelj" je obrisana ($1)', |
| 8338 | 8335 | 'lqt-delete-replies-done' => 'Svi odgovori ove teme također su obrisani.', |
| — | — | @@ -8378,12 +8375,12 @@ |
| 8379 | 8376 | $7", |
| 8380 | 8377 | 'lqt-enotif-reply' => "Pozdrav $1, |
| 8381 | 8378 | |
| 8382 | | -ovo je obavijest s {{SITENAME}} o novom odgovoru na '$2' na $5, |
| | 8379 | +ovo je obavijest s {{SITENAME}} o novom odgovoru na '$2' na $5, |
| 8383 | 8380 | dan $3 u $4 od strane $8 |
| 8384 | 8381 | |
| 8385 | 8382 | Odgovor možete vidjeti ovdje <$6> |
| 8386 | 8383 | |
| 8387 | | -Odgovor glasi: |
| | 8384 | +Odgovor glasi: |
| 8388 | 8385 | $7", |
| 8389 | 8386 | 'lqt-quote-intro' => '$2 u $3, [[User:$1|$1]] je napisao:', |
| 8390 | 8387 | 'lqt-quote' => 'Citiraj', |
| — | — | @@ -10382,8 +10379,8 @@ |
| 10383 | 10380 | 'lqt-read-message-tooltip' => 'წაშალეთ ეს ტოტი თქვენი კონტროლის სიიდან. |
| 10384 | 10381 | იგი მაინც დარჩება განხილვის თავდაპირველ გვერდზე.', |
| 10385 | 10382 | 'lqt-read-all' => 'მონიშნეთ ყველა, როგორც წაკითხული', |
| 10386 | | - 'lqt-read-all-tooltip' => 'წაშალეთ ყველა ტოტი ახალი შეტყობინებების სიიდან. |
| 10387 | | -ისინი ისევ დარჩებიან შესაბამის გვერდებზე. |
| | 10383 | + 'lqt-read-all-tooltip' => 'წაშალეთ ყველა ტოტი ახალი შეტყობინებების სიიდან. |
| | 10384 | +ისინი ისევ დარჩებიან შესაბამის გვერდებზე. |
| 10388 | 10385 | ამ მოქმედების გაუქმება შეუძლებელია.', |
| 10389 | 10386 | 'lqt-marked-read' => "ტოტი '''$1''' მონიშნულია როგორც წაკითხული.", |
| 10390 | 10387 | 'lqt-count-marked-read' => '$1 {{PLURAL:$1|შეტყობინება მონიშნულია|შეტყობინებები მონიშნულია}} როგორც წაკითხული.', |
| — | — | @@ -12036,7 +12033,7 @@ |
| 12037 | 12034 | $7', |
| 12038 | 12035 | 'lqt-enotif-reply' => 'Здраво $1, |
| 12039 | 12036 | |
| 12040 | | -ова е известување од {{SITENAME}} дека на страницата $5 на $3 во $4 ч. |
| | 12037 | +ова е известување од {{SITENAME}} дека на страницата $5 на $3 во $4 ч. |
| 12041 | 12038 | е објавен одговор на „$2“ од страна на корисникот $8 |
| 12042 | 12039 | |
| 12043 | 12040 | Можете да го погледате на <$6> |
| — | — | @@ -13511,7 +13508,7 @@ |
| 13512 | 13509 | 'lqt_protectedfromreply_link' => 'låst', |
| 13513 | 13510 | 'lqt_subject' => 'Emne:', |
| 13514 | 13511 | 'lqt_noreason' => 'Ingen grunn gitt.', |
| 13515 | | - 'lqt_move_placeholder' => 'Denne tråden eksisterer kun for å vise at tråden $1 ble flyttet fra denne siden til en annen diskusjonsside. |
| | 13512 | + 'lqt_move_placeholder' => 'Denne tråden eksisterer kun for å vise at tråden $1 ble flyttet fra denne siden til en annen diskusjonsside. |
| 13516 | 13513 | Denne flyttingen ble foretatt av $2 $3 $4. |
| 13517 | 13514 | Denne tråden ligger nå på $5', |
| 13518 | 13515 | 'lqt_thread_deleted_for_sysops' => "Denne tråden har blitt '''slettet''' og er kun synlig for administratorer.", |
| — | — | @@ -15897,7 +15894,7 @@ |
| 15898 | 15895 | 'lqt-enotif-newthread' => 'Привет, $1. |
| 15899 | 15896 | |
| 15900 | 15897 | Это уведомление с сайта {{SITENAME}} о том, что $3 $4 на странице $5 |
| 15901 | | -участником $8 была создана новая ветка «$2» |
| | 15898 | +участником $8 была создана новая ветка «$2» |
| 15902 | 15899 | |
| 15903 | 15900 | Вы можете увидеть её по адресу <$6> |
| 15904 | 15901 | |
| — | — | @@ -16243,7 +16240,7 @@ |
| 16244 | 16241 | 'lqt_protectedfromreply_link' => 'көмүскэммит', |
| 16245 | 16242 | 'lqt_subject' => 'Аата:', |
| 16246 | 16243 | 'lqt_noreason' => 'Төрүөтэ ыйыллыбатах.', |
| 16247 | | - 'lqt_move_placeholder' => 'Бу салаа бүөтэ $1 салаа бу сирэйтэн көһөрүллүбүтүн көрдөрөр. |
| | 16244 | + 'lqt_move_placeholder' => 'Бу салаа бүөтэ $1 салаа бу сирэйтэн көһөрүллүбүтүн көрдөрөр. |
| 16248 | 16245 | Көһөрүүнү $3 $4 сирэйгэ $2 кыттааччы оҥорбут. Онон салаа маннык буолбут $5.', |
| 16249 | 16246 | 'lqt_thread_deleted_for_sysops' => "Бу салаа '''сотуллубут''', дьаһабылларга эрэ костөр кыахтаах.", |
| 16250 | 16247 | 'lqt_thread_deleted' => 'Бу салаа сотуллубут.', |
| — | — | @@ -16256,7 +16253,7 @@ |
| 16257 | 16254 | 'lqt_nosuchthread' => 'Ыйбыт салааҥ суох эбит.', |
| 16258 | 16255 | 'lqt_nosuchthread_title' => 'Маннык салаа суох', |
| 16259 | 16256 | 'lqt_threadrequired' => 'URL-га салааны ыйыахтааххын.', |
| 16260 | | - 'lqt_move_movingthread' => '$1 көһөрүү. |
| | 16257 | + 'lqt_move_movingthread' => '$1 көһөрүү. |
| 16261 | 16258 | Бу салаа $2 сорҕото буолар.', |
| 16262 | 16259 | 'lqt_move_torename' => "Салааны аатын уларытыаххын баҕарар буоллаххына, $1 уонна 'Аата' диэн түннүгү уларыт.", |
| 16263 | 16260 | 'lqt_move_torename_edit' => 'маны көннөр', |
| — | — | @@ -16279,7 +16276,7 @@ |
| 16280 | 16277 | 'lqt_delete_show_checkbox' => 'Сотуллубут салаалары көрдөр', |
| 16281 | 16278 | 'lqt_talkpage_autocreate_summary' => 'Саҥа ырытыы сирэйэ бастакы этии оҥоһуллубутун кэннэ апатмаатынан оҥоһулунна.', |
| 16282 | 16279 | 'lqt_header_warning_big' => 'Маны эрэдээксийэлиигин $1.', |
| 16283 | | - 'lqt_header_warning_after_big' => 'Ааттар биллэрии уонна киирии быһыытынан туттуллаллар. |
| | 16280 | + 'lqt_header_warning_after_big' => 'Ааттар биллэрии уонна киирии быһыытынан туттуллаллар. |
| 16284 | 16281 | Эн маны оҥоруоххун сөп $2.', |
| 16285 | 16282 | 'lqt_header_warning_bold' => 'ырытар сирэй аата', |
| 16286 | 16283 | 'lqt_header_warning_new_discussion' => 'саҥа ырытыыны саҕалааһын', |
| — | — | @@ -16365,11 +16362,11 @@ |
| 16366 | 16363 | 'lqt-enotif-subject-reply' => '{{SITENAME}} ырытыы — Хоруй: $1', |
| 16367 | 16364 | 'lqt-enotif-subject-newthread' => '{{SITENAME}} ырытыы — Саҥа салаа: $1', |
| 16368 | 16365 | 'lqt-enotif-newthread' => 'Дорообо, $1. |
| 16369 | | -Бу $3 $4 {{SITENAME}} саайка баар $5 сирэйгэ «$2» диэн саҥа салаа үөскээбитин туһунан биллэрии. |
| | 16366 | +Бу $3 $4 {{SITENAME}} саайка баар $5 сирэйгэ «$2» диэн саҥа салаа үөскээбитин туһунан биллэрии. |
| 16370 | 16367 | |
| 16371 | 16368 | Бу аадырыска <$6> көрүөххүн сөп.', |
| 16372 | 16369 | 'lqt-enotif-reply' => 'Дорообо, $1. |
| 16373 | | -Бу $3 $4 {{SITENAME}} саайка баар $5 сирэй «$2» салаатыгар саҥа хоруй баар буолбутун туһунан биллэрии. |
| | 16370 | +Бу $3 $4 {{SITENAME}} саайка баар $5 сирэй «$2» салаатыгар саҥа хоруй баар буолбутун туһунан биллэрии. |
| 16374 | 16371 | |
| 16375 | 16372 | Бу аадырыска <$6> көрүөххүн сөп. |
| 16376 | 16373 | |
| — | — | @@ -18382,7 +18379,7 @@ |
| 18383 | 18380 | 'lqt_subject' => 'Tema:', |
| 18384 | 18381 | 'lqt_noreason' => 'Sebäp görkezilmedik.', |
| 18385 | 18382 | 'lqt_move_placeholder' => 'Bu tred , $1 trediniň bu sahypadan başga bir ýere geçirilendigini görkezýän ýer-saklaýjydyr. |
| 18386 | | -Tred $4 $3 senesinde $2 tarapyndan geçirilipdir. |
| | 18383 | +Tred $4 $3 senesinde $2 tarapyndan geçirilipdir. |
| 18387 | 18384 | Tred häzirki wagtda $5 adresinde ýerleşýär.', |
| 18388 | 18385 | 'lqt_thread_deleted_for_sysops' => "Bu tred '''öçürilipdir''' we ony diňe administratorlar görüp bilýär.", |
| 18389 | 18386 | 'lqt_thread_deleted' => 'Bu tred öçürilipdir.', |
| — | — | @@ -18505,7 +18502,7 @@ |
| 18506 | 18503 | |
| 18507 | 18504 | Ony <$6> adresinde görüp bilersiňiz.", |
| 18508 | 18505 | 'lqt-enotif-reply' => "Salam $1, |
| 18509 | | -Bu {{SITENAME}} saýtynyň uwedomleniýasydyr: $5 sahypasynda $4 $3 senesinde '$2' tredine täze bir jogap döredildi. |
| | 18506 | +Bu {{SITENAME}} saýtynyň uwedomleniýasydyr: $5 sahypasynda $4 $3 senesinde '$2' tredine täze bir jogap döredildi. |
| 18510 | 18507 | |
| 18511 | 18508 | Ony <$6> adresinde görüp bilersiňiz.", |
| 18512 | 18509 | 'lqt-quote-intro' => '$2, $3 senesinde [[User:$1|$1]] ýazdy:', |
| — | — | @@ -18775,13 +18772,13 @@ |
| 18776 | 18773 | Ang teksto ay: |
| 18777 | 18774 | $7", |
| 18778 | 18775 | 'lqt-enotif-reply' => "Kumusta ka $1, |
| 18779 | | - |
| 18780 | | -Isa itong pabatid mula sa {{SITENAME}} na may isang bagong tugon sa '$2' na nasa $5, |
| 18781 | | -na nalikha ni $8 noong $3 sa ganap na ika-$4. |
| 18782 | 18776 | |
| 18783 | | -Makikita mo ito sa <$6> |
| | 18777 | +Isa itong pabatid mula sa {{SITENAME}} na may isang bagong tugon sa '$2' na nasa $5, |
| | 18778 | +na nalikha ni $8 noong $3 sa ganap na ika-$4. |
| 18784 | 18779 | |
| 18785 | | -Ang teksto ng tugon ay: |
| | 18780 | +Makikita mo ito sa <$6> |
| | 18781 | + |
| | 18782 | +Ang teksto ng tugon ay: |
| 18786 | 18783 | $7", |
| 18787 | 18784 | 'lqt-quote-intro' => 'Noong $2 noong $3, si [[User:$1|$1]] ang nagsulat ng:', |
| 18788 | 18785 | 'lqt-quote' => 'Sipi', |
| Property changes on: branches/extensions-realtime/LiquidThreads |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 18789 | 18786 | Merged /trunk/extensions/LiquidThreads:r94187-94267 |
| Property changes on: branches/extensions-realtime/WikiTweet |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 18790 | 18787 | Merged /trunk/extensions/WikiTweet:r94187-94267 |
| Property changes on: branches/extensions-realtime/ArticleFeedback/api/ApiArticleFeedback.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 18791 | 18788 | Merged /trunk/extensions/ArticleFeedback/api/ApiArticleFeedback.php:r94187-94267 |
| Property changes on: branches/extensions-realtime/ArticleFeedback/api/ApiQueryArticleFeedback.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 18792 | 18789 | Merged /trunk/extensions/ArticleFeedback/api/ApiQueryArticleFeedback.php:r94187-94267 |
| Index: branches/extensions-realtime/PrefSwitch/PrefSwitch.hooks.php |
| — | — | @@ -43,8 +43,8 @@ |
| 44 | 44 | */ |
| 45 | 45 | public static function personalUrls( &$personal_urls, &$title ) { |
| 46 | 46 | global $wgUser, $wgRequest, $wgPrefSwitchShowLinks; |
| 47 | | - if(!$wgPrefSwitchShowLinks) { |
| 48 | | - return true; |
| | 47 | + if ( !$wgPrefSwitchShowLinks ) { |
| | 48 | + return true; |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | // Figure out the orgin to include in the link |
| Property changes on: branches/extensions-realtime/Gadgets/Gadgets_body.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 52 | 52 | Merged /trunk/extensions/Gadgets/Gadgets_body.php:r94187-94267 |
| Property changes on: branches/extensions-realtime/SelectCategory |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 53 | 53 | Merged /trunk/extensions/SelectCategory:r94187-94267 |
| Index: branches/extensions-realtime/UploadWizard/test/jasmine/SpecRunner.html |
| — | — | @@ -12,9 +12,9 @@ |
| 13 | 13 | |
| 14 | 14 | <script type="text/javascript" src="../../../../resources/mediawiki/mediawiki.js"></script> |
| 15 | 15 | <script type="text/javascript" src="../../../../resources/mediawiki.language/mediawiki.language.js"></script> |
| | 16 | + <script type="text/javascript" src="../../../../resources/mediawiki/mediawiki.Uri.js"></script> |
| 16 | 17 | <script type="text/javascript" src="../../resources/mediawiki.language.parser.js"></script> |
| 17 | 18 | <script type="text/javascript" src="../../resources/mw.Utilities.js"></script> |
| 18 | | - <script type="text/javascript" src="../../resources/mw.Uri.js"></script> |
| 19 | 19 | <script type="text/javascript" src="../../resources/mw.Api.js"></script> |
| 20 | 20 | <script type="text/javascript" src="../../resources/mw.Api.edit.js"></script> |
| 21 | 21 | <script type="text/javascript" src="../../resources/mw.Title.js"></script> |
| — | — | @@ -25,7 +25,6 @@ |
| 26 | 26 | |
| 27 | 27 | |
| 28 | 28 | <!-- include spec files here... --> |
| 29 | | - <script type="text/javascript" src="spec/mw.Uri.spec.js"></script> |
| 30 | 29 | <script type="text/javascript" src="spec/mw.Api.spec.js"></script> |
| 31 | 30 | <script type="text/javascript" src="spec/mw.Api.edit.spec.js"></script> |
| 32 | 31 | |
| Index: branches/extensions-realtime/UploadWizard/test/jasmine/spec/mw.Api.edit.spec.js |
| — | — | @@ -17,9 +17,9 @@ |
| 18 | 18 | // TODO this only works for me (NeilK) |
| 19 | 19 | var wgScriptPath = '/w'; |
| 20 | 20 | |
| 21 | | - var pageUri = new mw.uri( window.location ); |
| | 21 | + var pageUri = new mw.Uri( window.location ); |
| 22 | 22 | |
| 23 | | - var apiUrl = new mw.uri( { |
| | 23 | + var apiUrl = new mw.Uri( { |
| 24 | 24 | protocol: pageUri.protocol, |
| 25 | 25 | host: pageUri.host, |
| 26 | 26 | path: wgScriptPath + '/api.php' |
| Index: branches/extensions-realtime/UploadWizard/UploadWizardHooks.php |
| — | — | @@ -24,7 +24,7 @@ |
| 25 | 25 | 'jquery.suggestions', |
| 26 | 26 | 'jquery.ui.widget', |
| 27 | 27 | 'mediawiki.language', |
| 28 | | - 'mediawiki.uri', |
| | 28 | + 'mediawiki.Uri', |
| 29 | 29 | 'mediawiki.util', |
| 30 | 30 | 'mediawiki.libs.jpegmeta', |
| 31 | 31 | 'ext.uploadwizard.mediawiki.language.parser', |
| Index: branches/extensions-realtime/UploadWizard/resources/mw.Api.js |
| — | — | @@ -37,7 +37,7 @@ |
| 38 | 38 | }, |
| 39 | 39 | |
| 40 | 40 | ajax: { |
| 41 | | - // force toString if we got a mw.uri object |
| | 41 | + // force toString if we got a mw.Uri object |
| 42 | 42 | url: new String( this.url ), |
| 43 | 43 | |
| 44 | 44 | /* default function for success and no API error */ |
| Property changes on: branches/extensions-realtime/UploadWizard/resources/mw.LanguageUpWiz.js |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 45 | 45 | Merged /trunk/extensions/UploadWizard/resources/mw.LanguageUpWiz.js:r94187-94267 |
| Property changes on: branches/extensions-realtime/UploadWizard |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 46 | 46 | Merged /trunk/extensions/UploadWizard:r94187-94267 |
| Property changes on: branches/extensions-realtime/SVGZoom |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 47 | 47 | Merged /trunk/extensions/SVGZoom:r94187-94267 |
| Property changes on: branches/extensions-realtime/CentralAuth/specials/SpecialWikiSets.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 48 | 48 | Merged /trunk/extensions/CentralAuth/specials/SpecialWikiSets.php:r94187-94267 |
| Property changes on: branches/extensions-realtime/FlaggedRevs |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 49 | 49 | Merged /trunk/extensions/FlaggedRevs:r94187-94267 |
| Property changes on: branches/extensions-realtime/FundraiserPortal |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 50 | 50 | Merged /trunk/extensions/FundraiserPortal:r94187-94267 |
| Index: branches/extensions-realtime/ArchiveLinks/ArchiveLinks.class.php |
| — | — | @@ -42,8 +42,6 @@ |
| 43 | 43 | $old_id = $article->getTitle(); |
| 44 | 44 | $old_id = $old_id->getPreviousRevisionID( $page_id ); |
| 45 | 45 | |
| 46 | | - die('firing'); |
| 47 | | - |
| 48 | 46 | $db_result['links_on_page'] = $db_master->select( 'el_archive_link_history', '*', array( 'hist_page_id' => $page_id ), __METHOD__ ); |
| 49 | 47 | |
| 50 | 48 | $old_external_links = array(); |
| — | — | @@ -68,96 +66,56 @@ |
| 69 | 67 | |
| 70 | 68 | if ( count( $new_external_links ) <= $wgArchiveLinksConfig['link_insert_max'] ) { |
| 71 | 69 | //insert the links into the queue now |
| 72 | | - foreach( $new_external_links as $link ) { |
| 73 | | - $this->feed_insert_links( $link ); |
| 74 | | - |
| 75 | | - /* |
| | 70 | + foreach( $new_external_links as $link ) { |
| | 71 | + $db_result['queue'] = $db_slave->select( 'el_archive_queue', '*', array( 'url' => $link ), __METHOD__, array( 'LIMIT' => '1', ) ); |
| | 72 | + $db_result['blacklist'] = $db_slave->select( 'el_archive_blacklist', '*', array( 'bl_url' => $link ), __METHOD__, array( 'LIMIT' => '1', ) ); |
| 76 | 73 | |
| 77 | | - |
| 78 | | - /* |
| 79 | | - |
| 80 | | - } elseif ( $db_result['history-row']['hist_insertion_time'] >= $time - $wgArchiveLinksConfig['global_rearchive_time'] ) { |
| 81 | | - $db_result['history_page'] = $db_slave->select( 'el_archive_link_history', '*', array( 'hist_url' => $link, 'page_id' => $page_id ), __METHOD__, array( 'LIMIT' => '1', 'ORDER BY' => 'hist_id DESC' ) ); |
| | 74 | + $db_result['queue-numrows'] = $db_result['queue']->numRows(); |
| | 75 | + $db_result['blacklist-numrows'] = $db_result['blacklist']->numRows(); |
| 82 | 76 | |
| 83 | | - $db_result['history_page-numrows'] = $db_result['history_page']->numRows(); |
| 84 | | - $db_result['history_page-row'] = $db_result['history_page']->fetchRow(); |
| | 77 | + if ( $db_result['blacklist-numrows'] === 0 && $db_result['queue-numrows'] === 0 ) { |
| | 78 | + $db_master->insert( 'el_archive_queue', array( |
| | 79 | + 'page_id' => $page_id, |
| | 80 | + 'url' => $link, |
| | 81 | + 'delay_time' => '0', |
| | 82 | + 'insertion_time' => $time, |
| | 83 | + 'in_progress' => '0', |
| | 84 | + )); |
| 85 | 85 | |
| 86 | | - if ( $db_result['history_page-numrows'] === 0 && $db_result['history-row']['hist_insertion_time'] >= $time - $wgArchiveLinksConfig['previous_archive_lockout_time'] ) { |
| 87 | | - //this link is new to this particular page but has been archived on another page less than the rearchive delay |
| 88 | | - //grab a new version of it in case the content has changed |
| 89 | | - $db_master->insert( 'el_archive_queue', array( |
| 90 | | - 'page_id' => $page_id, |
| 91 | | - 'url' => $link, |
| 92 | | - 'delay_time' => '0', |
| 93 | | - 'insertion_time' => $time, |
| 94 | | - 'in_progress' => '0', |
| 95 | | - )); |
| 96 | | - |
| 97 | | - $db_master->insert( 'el_archive_link_history', array( |
| 98 | | - 'page_id' => $page_id, |
| 99 | | - 'url' => $link, |
| 100 | | - 'delay_time' => '0', |
| 101 | | - 'insertion_time' => $time, |
| 102 | | - 'in_progress' => '0', |
| 103 | | - )); |
| 104 | | - |
| 105 | | - } |
| 106 | | - |
| 107 | | - if ( $db_result['history_page-row']['insertion_time'] >= $time - $wgArchiveLinksConfig['page_rearchive_time']) { |
| 108 | | - |
| 109 | | - } |
| 110 | | - }*/ |
| | 86 | + $db_master->insert( 'el_archive_link_history', array( |
| | 87 | + 'hist_page_id' => $page_id, |
| | 88 | + 'hist_url' => $link, |
| | 89 | + 'hist_insertion_time' => $time, |
| | 90 | + )); |
| | 91 | + } |
| 111 | 92 | } |
| 112 | 93 | } else { |
| 113 | 94 | //insert everything as a job and do the work later to avoid lagging page save |
| 114 | 95 | } |
| 115 | 96 | |
| 116 | 97 | } else { |
| 117 | | - |
| 118 | 98 | foreach ( $external_links as $link => $unused_value ) { |
| 119 | | - $link = $db_slave->strencode( $link ); |
| | 99 | + //$db_result['resource'] = $db_slave->select( 'el_archive_resource', '*', '`el_archive_resource`.`resource_url` = "' . $db_slave->strencode( $link ) . '"'); |
| | 100 | + $db_result['blacklist'] = $db_slave->select( 'el_archive_blacklist', '*', array( 'bl_url' => $link ), __METHOD__ ); |
| | 101 | + $db_result['queue'] = $db_slave->select( 'el_archive_queue', '*', array( 'url' => $link ), __METHOD__ ); |
| 120 | 102 | |
| 121 | | - if ( $wgArchiveLinksConfig['generate_feed'] === true ) { |
| 122 | | - |
| 123 | | - |
| 124 | | - |
| 125 | | - /*$diff_eng = new DifferenceEngine( null, $old_id, $page_id, null, false ); |
| 126 | | - |
| 127 | | - $diff = $diff_eng->getDiffBody(); |
| 128 | | - die( var_dump($diff) ); |
| 129 | | - */ |
| 130 | | - |
| 131 | | - //file_put_contents('stf.txt', var_export( $diff, TRUE ) ); |
| 132 | | - |
| 133 | | - /* |
| 134 | | - * Querying the db server with selects for every link on the page would potentially be a whole bunch of unnecessary load |
| 135 | | - * Let's take the diff first then do it on a job instead... |
| 136 | | - * |
| 137 | | -*/ |
| 138 | | - |
| 139 | | - } else { |
| 140 | | - //$db_result['resource'] = $db_slave->select( 'el_archive_resource', '*', '`el_archive_resource`.`resource_url` = "' . $db_slave->strencode( $link ) . '"'); |
| 141 | | - $db_result['blacklist'] = $db_slave->select( 'el_archive_blacklist', '*', array( 'bl_url' => $link ), __METHOD__ ); |
| 142 | | - $db_result['queue'] = $db_slave->select( 'el_archive_queue', '*', array( 'url' => $link ), __METHOD__ ); |
| 143 | | - |
| 144 | | - if ( $db_result['blacklist']->numRows() === 0 ) { |
| 145 | | - if ( $db_result['queue']->numRows() === 0 ) { |
| 146 | | - // this probably a first time job |
| 147 | | - // but we should check the logs and resource table |
| 148 | | - // to make sure |
| 149 | | - $db_master->insert( 'el_archive_queue', array ( |
| 150 | | - 'page_id' => $page_id, |
| 151 | | - 'url' => $link, |
| 152 | | - 'delay_time' => '0', |
| 153 | | - 'insertion_time' => $time, |
| 154 | | - 'in_progress' => '0', |
| 155 | | - )); |
| 156 | | - } else { |
| 157 | | - //this job is already in the queue, why? |
| 158 | | - // * most likely reason is it has already been inserted by another page |
| 159 | | - // * or we are checking it later because the site was down at last archival |
| 160 | | - // in either case we don't really need to do anything right now, so skip... |
| 161 | | - } |
| | 103 | + if ( $db_result['blacklist']->numRows() === 0 ) { |
| | 104 | + if ( $db_result['queue']->numRows() === 0 ) { |
| | 105 | + // this probably a first time job |
| | 106 | + // but we should check the logs and resource table |
| | 107 | + // to make sure |
| | 108 | + $db_master->insert( 'el_archive_queue', array ( |
| | 109 | + 'page_id' => $page_id, |
| | 110 | + 'url' => $link, |
| | 111 | + 'delay_time' => '0', |
| | 112 | + 'insertion_time' => $time, |
| | 113 | + 'in_progress' => '0', |
| | 114 | + )); |
| | 115 | + } else { |
| | 116 | + //this job is already in the queue, why? |
| | 117 | + // * most likely reason is it has already been inserted by another page |
| | 118 | + // * or we are checking it later because the site was down at last archival |
| | 119 | + // in either case we don't really need to do anything right now, so skip... |
| 162 | 120 | } |
| 163 | 121 | } |
| 164 | 122 | } |
| — | — | @@ -207,36 +165,6 @@ |
| 208 | 166 | } |
| 209 | 167 | } |
| 210 | 168 | |
| 211 | | - public function feed_insert_links ( $url, $escaped = false ) { |
| 212 | | - if ( !$escaped ) { |
| 213 | | - $url = $this->strencode( $url ); |
| 214 | | - } |
| 215 | | - |
| 216 | | - $db_result['queue'] = $db_slave->select( 'el_archive_queue', '*', array( 'url' => $link ), __METHOD__, array( 'LIMIT' => '1', ) ); |
| 217 | | - $db_result['blacklist'] = $db_slave->select( 'el_archive_blacklist', '*', array( 'bl_url' => $link ), __METHOD__, array( 'LIMIT' => '1', ) ); |
| 218 | | - |
| 219 | | - $db_result['queue-numrows'] = $db_result['queue']->numRows(); |
| 220 | | - $db_result['blacklist-numrows'] = $db_result['blacklist']->numRows(); |
| 221 | | - |
| 222 | | - if ( $db_result['blacklist-numrows'] === 0 && $db_result['queue-numrows'] === 0 ) { |
| 223 | | - $db_master->insert( 'el_archive_queue', array( |
| 224 | | - 'page_id' => $page_id, |
| 225 | | - 'url' => $link, |
| 226 | | - 'delay_time' => '0', |
| 227 | | - 'insertion_time' => $time, |
| 228 | | - 'in_progress' => '0', |
| 229 | | - )); |
| 230 | | - |
| 231 | | - $db_master->insert( 'el_archive_link_history', array( |
| 232 | | - 'page_id' => $page_id, |
| 233 | | - 'url' => $link, |
| 234 | | - 'delay_time' => '0', |
| 235 | | - 'insertion_time' => $time, |
| 236 | | - 'in_progress' => '0', |
| 237 | | - )); |
| 238 | | - } |
| 239 | | - } |
| 240 | | - |
| 241 | 169 | public static function schemaUpdates ( $updater = null ) { |
| 242 | 170 | $path = dirname( __FILE__ ); |
| 243 | 171 | $updater->addExtensionUpdate( array( |
| Index: branches/extensions-realtime/JSKit/JSKit.php |
| — | — | @@ -163,10 +163,10 @@ |
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | # Appends the javascript |
| 167 | | -function efJSKit(&$out, &$text) { |
| 168 | | - global $wgJSKitNamespaces, $wgJSKitAlways, $wgTitle; |
| 169 | | - $ns = $wgTitle->getNamespace(); |
| 170 | | - if( !$wgTitle->getArticleId() ) { |
| | 167 | +function efJSKit( $out, &$text ) { |
| | 168 | + global $wgJSKitNamespaces, $wgJSKitAlways; |
| | 169 | + $ns = $out->getTitle()->getNamespace(); |
| | 170 | + if( !$out->getTitle()->getArticleId() ) { |
| 171 | 171 | // special page or wrong namespace, so don't do anything |
| 172 | 172 | return true; |
| 173 | 173 | } |
| Index: branches/extensions-realtime/WikimediaIncubator/IncubatorTest.php |
| — | — | @@ -631,6 +631,11 @@ |
| 632 | 632 | return true; |
| 633 | 633 | } |
| 634 | 634 | |
| | 635 | + /** |
| | 636 | + * Make the page content language depend on the test wiki |
| | 637 | + * Only works for codes that are known to MediaWiki :( |
| | 638 | + * @return true |
| | 639 | + */ |
| 635 | 640 | static function onPageContentLanguage( $title, &$pageLang ) { |
| 636 | 641 | global $wmincTestWikiNamespaces, $wgOut; |
| 637 | 642 | $prefix = self::analyzePrefix( $title->getText(), /* onlyInfoPage*/ false ); |
| Property changes on: branches/extensions-realtime/ConditionalShowSection |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 638 | 643 | Merged /trunk/extensions/ConditionalShowSection:r94187-94267 |
| Index: branches/extensions-realtime/SemanticSignup/SemanticSignup.php |
| — | — | @@ -0,0 +1,74 @@ |
| | 2 | +<?php |
| | 3 | + |
| | 4 | +/** |
| | 5 | + * Initialization file for the Semantic Signup extension. |
| | 6 | + * |
| | 7 | + * Documentation: http://www.mediawiki.org/wiki/Extension:SemanticSignup |
| | 8 | + * Support http://www.mediawiki.org/wiki/Extension_talk:SemanticSignup |
| | 9 | + * Source code: http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/SemanticSignup |
| | 10 | + * |
| | 11 | + * @file SemanticSignup.php |
| | 12 | + * @ingroup SemanticSignup |
| | 13 | + * |
| | 14 | + * @licence GNU GPL v3+ |
| | 15 | + * @author Jeroen De Dauw < jeroendedauw@gmail.com > |
| | 16 | + */ |
| | 17 | + |
| | 18 | +/** |
| | 19 | + * This documenation group collects source code files belonging to SemanticSignup. |
| | 20 | + * |
| | 21 | + * @defgroup SemanticSignup SemanticSignup |
| | 22 | + */ |
| | 23 | + |
| | 24 | +if ( !defined( 'MEDIAWIKI' ) ) { |
| | 25 | + die( 'Not an entry point.' ); |
| | 26 | +} |
| | 27 | + |
| | 28 | +if ( version_compare( $wgVersion, '1.16', '<' ) ) { |
| | 29 | + die( '<b>Error:</b> SemanticSignup requires MediaWiki 1.16 or above.' ); |
| | 30 | +} |
| | 31 | + |
| | 32 | +// Show a warning if Semantic MediaWiki is not loaded. |
| | 33 | +if ( !defined( 'SMW_VERSION' ) ) { |
| | 34 | + die( '<b>Error:</b> You need to have <a href="http://semantic-mediawiki.org/wiki/Semantic_MediaWiki">Semantic MediaWiki</a> installed in order to use SemanticSignup.' ); |
| | 35 | +} |
| | 36 | + |
| | 37 | +if ( version_compare( SMW_VERSION, '1.6 alpha', '<' ) ) { |
| | 38 | + die( '<b>Error:</b> Semantic Signup requires Semantic MediaWiki 1.6 or above.' ); |
| | 39 | +} |
| | 40 | + |
| | 41 | +if ( !defined( 'SF_VERSION' ) ) { |
| | 42 | + die( '<b>Error:</b> You need to have <a href="http://semantic-mediawiki.org/wiki/Semantic_Forms">Semantic Forms</a> installed in order to use SemanticSignup.' ); |
| | 43 | +} |
| | 44 | + |
| | 45 | +define( 'SemanticSignup_VERSION', '0.3 alpha' ); |
| | 46 | + |
| | 47 | +$wgExtensionCredits[defined( 'SEMANTIC_EXTENSION_TYPE' ) ? 'semantic' : 'specialpage'][] = array( |
| | 48 | + 'path' => __FILE__, |
| | 49 | + 'name' => 'SemanticSignup', |
| | 50 | + 'version' => SemanticSignup_VERSION, |
| | 51 | + 'author' => array( |
| | 52 | + 'Serg Kutny', |
| | 53 | + '[http://www.mediawiki.org/wiki/User:Jeroen_De_Dauw Jeroen De Dauw]', |
| | 54 | + ), |
| | 55 | + 'url' => 'http://www.mediawiki.org/wiki/Extension:Semantic_Watchlist', |
| | 56 | + 'descriptionmsg' => 'ses-desc' |
| | 57 | +); |
| | 58 | + |
| | 59 | +$wgExtensionMessagesFiles['SemanticSignup'] = dirname( __FILE__ ) . '/SemanticSignup.i18n.php'; |
| | 60 | +$wgExtensionAliasesFiles['SemanticSignup'] = dirname( __FILE__ ) . '/SemanticSignup.i18n.aliases.php'; |
| | 61 | + |
| | 62 | +$wgAutoloadClasses['SemanticSignupSettings'] = dirname( __FILE__ ) . '/SemanticSignup.settings.php'; |
| | 63 | +$wgAutoloadClasses['SemanticSignupHooks'] = dirname( __FILE__ ) . '/SemanticSignup.hooks.php'; |
| | 64 | +$wgAutoloadClasses['SemanticSignup'] = dirname( __FILE__ ) . '/includes/SES_Special.php'; |
| | 65 | +$wgAutoloadClasses['SES_UserAccountDataChecker'] = dirname( __FILE__ ) . '/includes/SES_Special.php'; |
| | 66 | +$wgAutoloadClasses['SES_DataChecker'] = dirname( __FILE__ ) . '/includes/SES_Utils.php'; |
| | 67 | +$wgAutoloadClasses['SES_SignupFields'] = dirname( __FILE__ ) . '/includes/SES_SignupFields.php'; |
| | 68 | +$wgAutoloadClasses['CreateUserFieldsTemplate'] = dirname( __FILE__ ) . '/includes/SES_SignupFields.php'; |
| | 69 | + |
| | 70 | +$wgSpecialPages['SemanticSignup'] = 'SemanticSignup'; |
| | 71 | + |
| | 72 | +$egSemanticSignupSettings = array(); |
| | 73 | + |
| | 74 | +$wgHooks['UserCreateForm'][] = 'SemanticSignupHooks::onUserCreateForm'; |
| | 75 | +$wgHooks['ParserFirstCallInit'][] = 'SemanticSignupHooks::onParserFirstCallInit'; |
| Property changes on: branches/extensions-realtime/SemanticSignup/SemanticSignup.php |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 76 | + native |
| Index: branches/extensions-realtime/SemanticSignup/SemanticSignup.hooks.php |
| — | — | @@ -0,0 +1,47 @@ |
| | 2 | +<?php |
| | 3 | + |
| | 4 | +/** |
| | 5 | + * Static class for hooks handled by the SemanticSignup extension. |
| | 6 | + * |
| | 7 | + * @since 0.3 |
| | 8 | + * |
| | 9 | + * @file SemanticSignup.hooks.php |
| | 10 | + * @ingroup SemanticSignup |
| | 11 | + * |
| | 12 | + * @licence GNU GPL v3+ |
| | 13 | + * @author Jeroen De Dauw < jeroendedauw@gmail.com > |
| | 14 | + */ |
| | 15 | +final class SemanticSignupHooks { |
| | 16 | + |
| | 17 | + /** |
| | 18 | + * @since 0.3 |
| | 19 | + * |
| | 20 | + * @param $template |
| | 21 | + * |
| | 22 | + * @return false |
| | 23 | + */ |
| | 24 | + public static function onUserCreateForm( $template ) { |
| | 25 | + if ( is_null( Title::newFromText( SemanticSignupSettings::get( 'formName' ), SF_NS_FORM ) ) ) { |
| | 26 | + return true; |
| | 27 | + } |
| | 28 | + |
| | 29 | + $semantic_signup_title = SemanticSignup::getTitleFor( 'SemanticSignup' ); |
| | 30 | + $url = $semantic_signup_title->escapeFullURL(); |
| | 31 | + global $wgOut; |
| | 32 | + $wgOut->redirect( $url ); |
| | 33 | + |
| | 34 | + return false; |
| | 35 | + } |
| | 36 | + |
| | 37 | + /** |
| | 38 | + * @since 0.3 |
| | 39 | + * |
| | 40 | + * @return true |
| | 41 | + */ |
| | 42 | + public static function onParserFirstCallInit() { |
| | 43 | + global $wgParser; |
| | 44 | +// $wgParser->setHook( 'signupfields', 'SES_SignupFields::render' ); |
| | 45 | + return true; |
| | 46 | + } |
| | 47 | + |
| | 48 | +} |
| Property changes on: branches/extensions-realtime/SemanticSignup/SemanticSignup.hooks.php |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 49 | + native |
| Index: branches/extensions-realtime/SemanticSignup/INSTALL |
| — | — | @@ -0,0 +1,45 @@ |
| | 2 | +These is the install file for the SemanticSignup extension. |
| | 3 | + |
| | 4 | +Extension page on mediawiki.org: http://www.mediawiki.org/wiki/Extension:SemanticSignup |
| | 5 | +Latest version of the install file: http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/SemanticSignup/INSTALL?view=co |
| | 6 | + |
| | 7 | + |
| | 8 | +== Requirements == |
| | 9 | + |
| | 10 | +SemanticSignup requires: |
| | 11 | + |
| | 12 | +* MediaWiki 1.16 or above |
| | 13 | +* Semantic MediaWiki 1.6 or above |
| | 14 | +* Semantic Forms 2.0 or above |
| | 15 | +* PHP 5.2 or above |
| | 16 | + |
| | 17 | +== Download == |
| | 18 | + |
| | 19 | +You can find the current version of SemanticSignup on the [https://code.google.com/p/semanticsignup/downloads/list Google Code download page], |
| | 20 | +as well as a [https://code.google.com/p/semanticsignup/downloads/list?can=1 list of legacy downloads]. |
| | 21 | + |
| | 22 | +You can also get the code directly from SVN. Tags can be obtained via |
| | 23 | + |
| | 24 | + svn checkout <nowiki>http://svn.wikimedia.org/svnroot/mediawiki/tags/extensions/SemanticSignup/REL_version</nowiki> |
| | 25 | + |
| | 26 | +Where 'version' is the version number of the tag, such as 0_1 (see the [http://svn.wikimedia.org/svnroot/mediawiki/tags/extensions/SemanticSignup/ available tags]). |
| | 27 | +The latest code can be obtained from trunk: |
| | 28 | + |
| | 29 | + svn checkout <nowiki>http://svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/SemanticSignup/</nowiki> |
| | 30 | + |
| | 31 | +== Installation == |
| | 32 | + |
| | 33 | +Once you have downloaded the code, place the ''SemanticSignup'' directory within your MediaWiki |
| | 34 | +'extensions' directory. Then add the following code to your [[Manual:LocalSettings.php|LocalSettings.php]] file: |
| | 35 | + |
| | 36 | +# SemanticSignup |
| | 37 | +require_once( "$IP/extensions/SemanticSignup/SemanticSignup.php" ); |
| | 38 | + |
| | 39 | +== Configuration == |
| | 40 | + |
| | 41 | +Configuration of SemanticSignup is done by adding simple PHP statements to your |
| | 42 | +[[Manual:LocalSettings.php|LocalSettings.php]] file. These statements need to be placed |
| | 43 | +AFTER the inclusion of SemanticSignup. The options are listed below and their default |
| | 44 | +is set in the [http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/SemanticSignup/SemanticSignup.settings.php?view=markup SemanticSignup settings file]. |
| | 45 | +You should NOT modify the settings file, but can have a look at it to get an idea of |
| | 46 | +how to use the settings, in case the below descriptions do not suffice. |
| Index: branches/extensions-realtime/SemanticSignup/includes/SES_Special.php |
| — | — | @@ -0,0 +1,334 @@ |
| | 2 | +<?php |
| | 3 | + |
| | 4 | +/** |
| | 5 | + * Created on 7 Jan 2008 by Serhii Kutnii |
| | 6 | + */ |
| | 7 | +class SES_UserAccountDataChecker extends SES_DataChecker { |
| | 8 | + |
| | 9 | + public $mUsername = ''; |
| | 10 | + public $mPassword = ''; |
| | 11 | + public $mEmail = ''; |
| | 12 | + public $mRealname = ''; |
| | 13 | + public $mDomain = ''; |
| | 14 | + public $mLanguage = ''; |
| | 15 | + public $mRemember = false; |
| | 16 | + public $mUser = null; |
| | 17 | + |
| | 18 | + protected function populateData() { |
| | 19 | + $this->mUsername = $this->getUserDataValue( 'wpName', 'nousername' ); |
| | 20 | + $name = trim( $this->mUsername ); |
| | 21 | + $this->mUser = User::newFromName( $name, 'creatable' ); |
| | 22 | + if ( !$this->mUser ) { |
| | 23 | + $this->error( wfMsg( 'noname' ) ); |
| | 24 | + } |
| | 25 | + |
| | 26 | + global $sesRealNameRequired; |
| | 27 | + $this->mRealname = $this->getUserDataValue('wpRealName', $sesRealNameRequired ? 'norealname' : null); |
| | 28 | + |
| | 29 | + $this->mPassword = $this->getUserDataValue('wpPassword'); |
| | 30 | + $retype = $this->getUserDataValue('wpRetype'); |
| | 31 | + if (strcmp($this->mPassword, $retype)) |
| | 32 | + $this->error(wfMsg('nopwdmatch')); |
| | 33 | + |
| | 34 | + $this->mDomain = $this->getUserDataValue('wpDomain'); |
| | 35 | + |
| | 36 | + global $wgEmailConfirmToEdit; |
| | 37 | + $this->mEmail = $this->getUserDataValue('wpEmail', $wgEmailConfirmToEdit ? 'noemailtitle' : null ); |
| | 38 | + |
| | 39 | + $this->mLanguage = $this->getUserDataValue('uselang'); |
| | 40 | + |
| | 41 | + global $wgRequest; |
| | 42 | + $this->mRemember = $wgRequest->getCheck('wpRemember'); |
| | 43 | + } |
| | 44 | + |
| | 45 | + //Checks |
| | 46 | + |
| | 47 | + public function checkDomainValidity() |
| | 48 | + { |
| | 49 | + global $wgAuth; |
| | 50 | + |
| | 51 | + if( !$wgAuth->validDomain( $this->mDomain ) ) |
| | 52 | + $this->error(wfMsg('wrongpassword')); |
| | 53 | + } |
| | 54 | + |
| | 55 | + public function checkDomainUser() |
| | 56 | + { |
| | 57 | + global $wgAuth; |
| | 58 | + |
| | 59 | + if( ('local' != $this->mDomain) && ('' != $this->mDomain) |
| | 60 | + && !$wgAuth->canCreateAccounts() && ( !$wgAuth->userExists($this->mName) || !$wgAuth->authenticate($this->mName, $this->mPassword) ) ) |
| | 61 | + $this->error(wfMsg('wrongpassword')); |
| | 62 | + } |
| | 63 | + |
| | 64 | + public function checkCreatePermissions() |
| | 65 | + { |
| | 66 | + global $wgUser; |
| | 67 | + |
| | 68 | + if (!$wgUser->isAllowed( 'createaccount' ) || $wgUser->isBlockedFromCreateAccount() ) |
| | 69 | + $this->error(wfMsg('createforbidden')); |
| | 70 | + } |
| | 71 | + |
| | 72 | + public function checkSorbs() |
| | 73 | + { |
| | 74 | + global $wgProxyWhitelist; |
| | 75 | + global $wgEnableSorbs; |
| | 76 | + $ip = wfGetIP(); |
| | 77 | + if ( $wgEnableSorbs && !in_array( $ip, $wgProxyWhitelist ) && |
| | 78 | + $wgUser->inSorbsBlacklist( $ip ) ) |
| | 79 | + $this->error(wfMsg('sorbs_create_account_reason')); |
| | 80 | + } |
| | 81 | + |
| | 82 | + public function checkUserExists() |
| | 83 | + { |
| | 84 | + if ($this->mUser->idForName()) |
| | 85 | + $this->error(wfMsg('userexists')); |
| | 86 | + } |
| | 87 | + |
| | 88 | + public function checkPasswordLength() |
| | 89 | + { |
| | 90 | + if (!$this->mUser->isValidPassword($this->mPassword)) |
| | 91 | + { |
| | 92 | + global $wgMinimalPasswordLength; |
| | 93 | + $this->error(wfMsgExt('passwordtooshort', array( 'parsemag' ), $wgMinimalPasswordLength)); |
| | 94 | + } |
| | 95 | + } |
| | 96 | + |
| | 97 | + public function checkEmailValidity() |
| | 98 | + { |
| | 99 | + global $wgEnableEmail; |
| | 100 | + if ($wgEnableEmail && !User::isValidEmailAddr($this->mEmail)) |
| | 101 | + $this->error(wfMsg('invalidemailaddress')); |
| | 102 | + } |
| | 103 | + |
| | 104 | + public function __construct() |
| | 105 | + { |
| | 106 | + $this->addCheck(array(&$this, 'checkDomainValidity'), array()); |
| | 107 | + $this->addCheck(array(&$this, 'checkDomainUser'), array()); |
| | 108 | + $this->addCheck(array(&$this, 'checkCreatePermissions'), array()); |
| | 109 | + $this->addCheck(array(&$this, 'checkSorbs'), array()); |
| | 110 | + $this->addCheck(array(&$this, 'checkUserExists'), array()); |
| | 111 | + $this->addCheck(array(&$this, 'checkPasswordLength'), array()); |
| | 112 | + $this->addCheck(array(&$this, 'checkEmailValidity'), array()); |
| | 113 | + } |
| | 114 | + } |
| | 115 | + |
| | 116 | + class SemanticSignup extends SpecialPage |
| | 117 | + { |
| | 118 | + private $mUserDataChecker = null; |
| | 119 | + private $mUserPageUrl = ''; |
| | 120 | + |
| | 121 | + public function __construct() |
| | 122 | + { |
| | 123 | + parent::__construct('SemanticSignup'); |
| | 124 | + $this->mIncludable = false; |
| | 125 | + |
| | 126 | + $this->mUserDataChecker = new SES_UserAccountDataChecker(); |
| | 127 | + } |
| | 128 | + |
| | 129 | + private function userSignup() |
| | 130 | + { |
| | 131 | + //Get user input and check the environment |
| | 132 | + $this->mUserDataChecker->run(); |
| | 133 | + |
| | 134 | + //Throw if data getting or environment checks have failed which indicates that account creation is impossible |
| | 135 | + $checker_error = $this->mUserDataChecker->getError(); |
| | 136 | + if ($checker_error) |
| | 137 | + throw new Exception($checker_error); |
| | 138 | + |
| | 139 | + $user = $this->mUserDataChecker->mUser; |
| | 140 | + |
| | 141 | + $user->setEmail( $this->mUserDataChecker->mEmail ); |
| | 142 | + $user->setRealName( $this->mUserDataChecker->mRealname ); |
| | 143 | + |
| | 144 | + $abortError = ''; |
| | 145 | + if( !wfRunHooks( 'AbortNewAccount', array( $user, &$abortError ) ) ) |
| | 146 | + { |
| | 147 | + // Hook point to add extra creation throttles and blocks |
| | 148 | + wfDebug( "LoginForm::addNewAccountInternal: a hook blocked creation\n" ); |
| | 149 | + throw new Exception( $abortError ); |
| | 150 | + } |
| | 151 | + |
| | 152 | + global $wgAccountCreationThrottle; |
| | 153 | + global $wgUser; |
| | 154 | + if ( $wgAccountCreationThrottle && $wgUser->isPingLimitable() ) |
| | 155 | + { |
| | 156 | + $key = wfMemcKey( 'acctcreate', 'ip', wfGetIP() ); |
| | 157 | + $value = $wgMemc->incr( $key ); |
| | 158 | + |
| | 159 | + if ( !$value ) { |
| | 160 | + $wgMemc->set( $key, 1, 86400 ); |
| | 161 | + } |
| | 162 | + |
| | 163 | + if ( $value > $wgAccountCreationThrottle ) |
| | 164 | + throw new Exception(wfMsg('throttlehit')); |
| | 165 | + } |
| | 166 | + |
| | 167 | + global $wgAuth; |
| | 168 | + |
| | 169 | + if( !$wgAuth->addUser( $user, $this->mUserDataChecker->mPassword, |
| | 170 | + $this->mUserDataChecker->mEmail, $this->mUserDataChecker->mRealname ) ) |
| | 171 | + throw new Exception('externaldberror'); |
| | 172 | + |
| | 173 | + $user->addToDatabase(); |
| | 174 | + |
| | 175 | + if ( $wgAuth->allowPasswordChange() ) |
| | 176 | + { |
| | 177 | + $user->setPassword($this->mUserDataChecker->mPassword); |
| | 178 | + } |
| | 179 | + |
| | 180 | + $user->setToken(); |
| | 181 | + |
| | 182 | + $wgAuth->initUser( $user, false ); |
| | 183 | + |
| | 184 | + $user->setOption( 'rememberpassword', $this->mUserDataChecker->mRemember ? 1 : 0 ); |
| | 185 | + $user->saveSettings(); |
| | 186 | + |
| | 187 | + # Update user count |
| | 188 | + $ssUpdate = new SiteStatsUpdate( 0, 0, 0, 0, 1 ); |
| | 189 | + $ssUpdate->doUpdate(); |
| | 190 | + |
| | 191 | + global $wgLoginLanguageSelector; |
| | 192 | + $language = $this->mUserDataChecker->mLanguage; |
| | 193 | + if( $wgLoginLanguageSelector && $language ) |
| | 194 | + $user->setOption( 'language', $language ); |
| | 195 | + |
| | 196 | + global $wgEmailAuthentication; |
| | 197 | + if( $wgEmailAuthentication && User::isValidEmailAddr( $user->getEmail() ) ){ |
| | 198 | + $err = $user->sendConfirmationMail(); |
| | 199 | + if (WikiError::isError($err)) |
| | 200 | + throw new Exception(wfMsg('emailfailed')); |
| | 201 | + } |
| | 202 | + |
| | 203 | + $user->saveSettings(); |
| | 204 | + wfRunHooks('AddNewAccount', array($user)); |
| | 205 | + } |
| | 206 | + |
| | 207 | + private function createUserPage() { |
| | 208 | + $form_title = Title::newFromText( SemanticSignupSettings::get( 'formName' ), SF_NS_FORM ); |
| | 209 | + $form = new Article($form_title); |
| | 210 | + $form_definition = $form->getContent(); |
| | 211 | + |
| | 212 | + $page_title = Title::newFromText($this->mUserDataChecker->mUser->getName(), NS_USER); |
| | 213 | + $this->mUserPageUrl = $page_title->escapeFullUrl(); |
| | 214 | + |
| | 215 | + global $sfgFormPrinter; |
| | 216 | + list ($form_text, $javascript_text, $data_text, $form_page_title, $generated_page_name) = |
| | 217 | + $sfgFormPrinter->formHTML($form_definition, true, false); |
| | 218 | + |
| | 219 | + $user_page = new Article($page_title); |
| | 220 | + |
| | 221 | + global $wgUser; |
| | 222 | + $wgUser = $this->mUserDataChecker->mUser; |
| | 223 | + $user_page->doEdit( $data_text, '', EDIT_FORCE_BOT ); |
| | 224 | + } |
| | 225 | + |
| | 226 | + private function printForm() { |
| | 227 | + global $sesSignupBotName; |
| | 228 | + global $wgUser; |
| | 229 | + |
| | 230 | + /* |
| | 231 | + * SemanticForms disable the form automatically if current user hasn't got edit rights |
| | 232 | + * so we have to use a bot account for the form request. Current user is being saved in |
| | 233 | + * the $old_user variable to be restored afterwards |
| | 234 | + */ |
| | 235 | + $old_user = null; |
| | 236 | + if ($wgUser->isAnon()) |
| | 237 | + { |
| | 238 | + $old_user = $wgUser; |
| | 239 | + $wgUser = User::newFromName($sesSignupBotName); |
| | 240 | + } |
| | 241 | + |
| | 242 | + $form_title = Title::newFromText( SemanticSignupSettings::get( 'formName' ), SF_NS_FORM ); |
| | 243 | + $form = new Article($form_title); |
| | 244 | + $form_definition = $form->getContent(); |
| | 245 | + |
| | 246 | + global $sfgFormPrinter; |
| | 247 | + list ($form_text, $javascript_text, $data_text, $form_page_title, $generated_page_name) = |
| | 248 | + $sfgFormPrinter->formHTML($form_definition, false, false); |
| | 249 | + |
| | 250 | + $text =<<<END |
| | 251 | + <form name="createbox" onsubmit="return validate_all()" action="" method="post" class="createbox"> |
| | 252 | +END; |
| | 253 | + $text .= $form_text.'</form>'; |
| | 254 | + |
| | 255 | + global $sfgScriptPath, $sfgYUIBase, $wgOut; |
| | 256 | + $mainCssUrl = $sfgScriptPath . '/skins/SF_main.css'; |
| | 257 | + $wgOut->addLink( array( |
| | 258 | + 'rel' => 'stylesheet', |
| | 259 | + 'type' => 'text/css', |
| | 260 | + 'media' => "screen, projection", |
| | 261 | + 'href' => $mainCssUrl |
| | 262 | + )); |
| | 263 | + $wgOut->addLink( array( |
| | 264 | + 'rel' => 'stylesheet', |
| | 265 | + 'type' => 'text/css', |
| | 266 | + 'media' => "screen, projection", |
| | 267 | + 'href' => $sfgYUIBase . "autocomplete/assets/skins/sam/autocomplete.css" |
| | 268 | + )); |
| | 269 | + $wgOut->addLink( array( |
| | 270 | + 'rel' => 'stylesheet', |
| | 271 | + 'type' => 'text/css', |
| | 272 | + 'media' => "screen, projection", |
| | 273 | + 'href' => $sfgScriptPath . '/skins/SF_yui_autocompletion.css' |
| | 274 | + )); |
| | 275 | + $wgOut->addLink( array( |
| | 276 | + 'rel' => 'stylesheet', |
| | 277 | + 'type' => 'text/css', |
| | 278 | + 'media' => "screen, projection", |
| | 279 | + 'href' => $sfgScriptPath . '/skins/floatbox.css' |
| | 280 | + )); |
| | 281 | + $wgOut->addScript('<script type="text/javascript" src="' . $sfgYUIBase . 'yahoo/yahoo-min.js"></script>' . "\n"); |
| | 282 | + $wgOut->addScript('<script type="text/javascript" src="' . $sfgYUIBase . 'dom/dom-min.js"></script>' . "\n"); |
| | 283 | + $wgOut->addScript('<script type="text/javascript" src="' . $sfgYUIBase . 'event/event-min.js"></script>' . "\n"); |
| | 284 | + $wgOut->addScript('<script type="text/javascript" src="' . $sfgYUIBase . 'get/get-min.js"></script>' . "\n"); |
| | 285 | + $wgOut->addScript('<script type="text/javascript" src="' . $sfgYUIBase . 'connection/connection-min.js"></script>' . "\n"); |
| | 286 | + $wgOut->addScript('<script type="text/javascript" src="' . $sfgYUIBase . 'json/json-min.js"></script>' . "\n"); |
| | 287 | + $wgOut->addScript('<script type="text/javascript" src="' . $sfgYUIBase . 'datasource/datasource-min.js"></script>' . "\n"); |
| | 288 | + $wgOut->addScript('<script type="text/javascript" src="' . $sfgYUIBase . 'autocomplete/autocomplete-min.js"></script>' . "\n"); |
| | 289 | + $wgOut->addScript('<script type="text/javascript" src="' . $sfgScriptPath . '/libs/SF_yui_autocompletion.js"></script>' . "\n"); |
| | 290 | + $wgOut->addScript('<script type="text/javascript" src="' . $sfgScriptPath . '/libs/floatbox.js"></script>' . "\n"); |
| | 291 | + |
| | 292 | + global $wgFCKEditorDir; |
| | 293 | + if ($wgFCKEditorDir) |
| | 294 | + $wgOut->addScript('<script type="text/javascript" src="' . "$wgScriptPath/$wgFCKEditorDir" . '/fckeditor.js"></script>' . "\n"); |
| | 295 | + if (! empty($javascript_text)) |
| | 296 | + $wgOut->addScript(' <script type="text/javascript">' . "\n" . $javascript_text . '</script>' . "\n"); |
| | 297 | + $wgOut->addMeta('robots','noindex,nofollow'); |
| | 298 | + $wgOut->addHTML($text); |
| | 299 | + |
| | 300 | + //Restoring the current user |
| | 301 | + if ($old_user) |
| | 302 | + $wgUser = $old_user; |
| | 303 | + } |
| | 304 | + |
| | 305 | + private function executeOnSubmit() { |
| | 306 | + global $wgOut; |
| | 307 | + |
| | 308 | + try { |
| | 309 | + $this->userSignup(); |
| | 310 | + $this->createUserPage(); |
| | 311 | + |
| | 312 | + $wgOut->redirect( $this->mUserPageUrl ); |
| | 313 | + } |
| | 314 | + catch ( Exception $e ) { |
| | 315 | + $wgOut->addHTML( '<div class="error">' . $e->getMessage() . '</div>' ); |
| | 316 | + $this->printForm(); |
| | 317 | + } |
| | 318 | + |
| | 319 | + return true; |
| | 320 | + } |
| | 321 | + |
| | 322 | + public function execute( $par ) { |
| | 323 | + global $wgRequest, $wgOut; |
| | 324 | + |
| | 325 | + $this->setHeaders(); |
| | 326 | + |
| | 327 | + if ( $wgRequest->getCheck( 'wpSave' ) ) { |
| | 328 | + return $this->executeOnSubmit(); |
| | 329 | + } else { |
| | 330 | + $this->printForm(); |
| | 331 | + return true; |
| | 332 | + } |
| | 333 | + } |
| | 334 | +} |
| | 335 | + |
| \ No newline at end of file |
| Property changes on: branches/extensions-realtime/SemanticSignup/includes/SES_Special.php |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 336 | + native |
| Index: branches/extensions-realtime/SemanticSignup/includes/SES_Utils.php |
| — | — | @@ -0,0 +1,72 @@ |
| | 2 | +<?php |
| | 3 | +/* |
| | 4 | + * Created on 13 Jan 2009 by Serhii Kutnii |
| | 5 | + */ |
| | 6 | + |
| | 7 | +/* |
| | 8 | + * An abstract data getter and checker class. |
| | 9 | + * Its concrete subclasses should incapsulate all the necessary data getting |
| | 10 | + * and environment checks. |
| | 11 | + */ |
| | 12 | +abstract class SES_DataChecker |
| | 13 | +{ |
| | 14 | + private $mError = null; |
| | 15 | + |
| | 16 | + public function getError() |
| | 17 | + { |
| | 18 | + return $this->mError; |
| | 19 | + } |
| | 20 | + |
| | 21 | + /* |
| | 22 | + * Get a value from the request. |
| | 23 | + * $err_message_id specifies an error that should be thrown |
| | 24 | + * if the value is empty |
| | 25 | + */ |
| | 26 | + protected function getUserDataValue($id, $err_message_id = null) |
| | 27 | + { |
| | 28 | + global $wgRequest; |
| | 29 | + $value = $wgRequest->getText($id); |
| | 30 | + |
| | 31 | + if ($err_message_id && !$value) |
| | 32 | + $this->error(wfMsg($err_message_id)); |
| | 33 | + |
| | 34 | + return $value; |
| | 35 | + } |
| | 36 | + |
| | 37 | + //Checks |
| | 38 | + private $mEnvCheckCalls = array(); |
| | 39 | + |
| | 40 | + protected function addCheck($method_callback, array $args) |
| | 41 | + { |
| | 42 | + $this->mEnvCheckCalls[] = array($method_callback, $args); |
| | 43 | + } |
| | 44 | + |
| | 45 | + protected function runChecks() |
| | 46 | + { |
| | 47 | + foreach ($this->mEnvCheckCalls as $call_array) |
| | 48 | + { |
| | 49 | + call_user_func_array($call_array[0], $call_array[1]); |
| | 50 | + } |
| | 51 | + } |
| | 52 | + |
| | 53 | + //Abstracting error calls in order to make this functionality changeable in subclasses |
| | 54 | + protected function error($message) |
| | 55 | + { |
| | 56 | + throw new Exception($message); |
| | 57 | + } |
| | 58 | + |
| | 59 | + abstract protected function populateData(); |
| | 60 | + |
| | 61 | + public function run() |
| | 62 | + { |
| | 63 | + try |
| | 64 | + { |
| | 65 | + $this->populateData(); |
| | 66 | + $this->runChecks(); |
| | 67 | + } |
| | 68 | + catch (Exception $e) |
| | 69 | + { |
| | 70 | + $this->mError = $e->getMessage(); |
| | 71 | + } |
| | 72 | + } |
| | 73 | +} |
| Property changes on: branches/extensions-realtime/SemanticSignup/includes/SES_Utils.php |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 74 | + native |
| Index: branches/extensions-realtime/SemanticSignup/includes/SES_SignupFields.php |
| — | — | @@ -0,0 +1,187 @@ |
| | 2 | +<?php |
| | 3 | +/* |
| | 4 | + * Created on 6 Jan 2009 by Serhii Kutnii |
| | 5 | + */ |
| | 6 | + |
| | 7 | +/* |
| | 8 | + * Borrowed from standard UsercreateTemplate. Some minor changes have been made |
| | 9 | + */ |
| | 10 | + |
| | 11 | +class CreateUserFieldsTemplate extends QuickTemplate |
| | 12 | +{ |
| | 13 | + function addInputItem( $name, $value, $type, $msg ) { |
| | 14 | + $this->data['extraInput'][] = array( |
| | 15 | + 'name' => $name, |
| | 16 | + 'value' => $value, |
| | 17 | + 'type' => $type, |
| | 18 | + 'msg' => $msg, |
| | 19 | + ); |
| | 20 | + } |
| | 21 | + |
| | 22 | + function execute() { |
| | 23 | + |
| | 24 | + ?> |
| | 25 | +<div id="userlogin"> |
| | 26 | + |
| | 27 | + <h2><?php $this->msg('createaccount') ?></h2> |
| | 28 | + <p id="userloginlink"><?php $this->html('link') ?></p> |
| | 29 | + <?php $this->html('header'); /* pre-table point for form plugins... */ ?> |
| | 30 | + <?php if( @$this->haveData( 'languages' ) ) { ?><div id="languagelinks"><p><?php $this->html( 'languages' ); ?></p></div><?php } ?> |
| | 31 | + <table> |
| | 32 | + <tr> |
| | 33 | + <td class="mw-label"><label for='wpName2'><?php $this->msg('yourname') ?></label></td> |
| | 34 | + <td class="mw-input"> |
| | 35 | + <input type='text' class='loginText' name="wpName" id="wpName2" |
| | 36 | + tabindex="1" |
| | 37 | + size='20' /> |
| | 38 | + </td> |
| | 39 | + </tr> |
| | 40 | + <tr> |
| | 41 | + <td class="mw-label"><label for='wpPassword2'><?php $this->msg('yourpassword') ?></label></td> |
| | 42 | + <td class="mw-input"> |
| | 43 | + <input type='password' class='loginPassword' name="wpPassword" id="wpPassword2" |
| | 44 | + tabindex="2" |
| | 45 | + value="" size='20' /> |
| | 46 | + </td> |
| | 47 | + </tr> |
| | 48 | + <?php if( $this->data['usedomain'] ) { |
| | 49 | + $doms = ""; |
| | 50 | + foreach( $this->data['domainnames'] as $dom ) { |
| | 51 | + $doms .= "<option>" . htmlspecialchars( $dom ) . "</option>"; |
| | 52 | + } |
| | 53 | + ?> |
| | 54 | + <tr> |
| | 55 | + <td class="mw-label"><?php $this->msg( 'yourdomainname' ) ?></td> |
| | 56 | + <td class="mw-input"> |
| | 57 | + <select name="wpDomain" value="<?php $this->text( 'domain' ) ?>" |
| | 58 | + tabindex="3"> |
| | 59 | + <?php echo $doms ?> |
| | 60 | + </select> |
| | 61 | + </td> |
| | 62 | + </tr> |
| | 63 | + <?php } ?> |
| | 64 | + <tr> |
| | 65 | + <td class="mw-label"><label for='wpRetype'><?php $this->msg('yourpasswordagain') ?></label></td> |
| | 66 | + <td class="mw-input"> |
| | 67 | + <input type='password' class='loginPassword' name="wpRetype" id="wpRetype" |
| | 68 | + tabindex="4" |
| | 69 | + value="" |
| | 70 | + size='20' /> |
| | 71 | + </td> |
| | 72 | + </tr> |
| | 73 | + <tr> |
| | 74 | + <?php if( $this->data['useemail'] ) { ?> |
| | 75 | + <td class="mw-label"><label for='wpEmail'><?php $this->msg('youremail') ?></label></td> |
| | 76 | + <td class="mw-input"> |
| | 77 | + <input type='text' class='loginText' name="wpEmail" id="wpEmail" |
| | 78 | + tabindex="5" |
| | 79 | + value="<?php $this->text('email') ?>" size='20' /> |
| | 80 | + <div class="prefsectiontip"> |
| | 81 | + <?php if( $this->data['emailrequired'] ) { |
| | 82 | + $this->msgWiki('prefs-help-email-required'); |
| | 83 | + } else { |
| | 84 | + $this->msgWiki('prefs-help-email'); |
| | 85 | + } ?> |
| | 86 | + </div> |
| | 87 | + </td> |
| | 88 | + <?php } ?> |
| | 89 | + <?php if( $this->data['userealname'] ) { ?> |
| | 90 | + </tr> |
| | 91 | + <tr> |
| | 92 | + <td class="mw-label"><label for='wpRealName'><?php $this->msg('yourrealname') ?></label></td> |
| | 93 | + <td class="mw-input"> |
| | 94 | + <input type='text' class='loginText' name="wpRealName" id="wpRealName" |
| | 95 | + tabindex="6" |
| | 96 | + size='20' /> |
| | 97 | + </td> |
| | 98 | + <?php } ?> |
| | 99 | + </tr> |
| | 100 | + <tr> |
| | 101 | + <td></td> |
| | 102 | + </tr> |
| | 103 | +<?php |
| | 104 | + $tabIndex = 8; |
| | 105 | + if ( isset( $this->data['extraInput'] ) && is_array( $this->data['extraInput'] ) ) { |
| | 106 | + foreach ( $this->data['extraInput'] as $inputItem ) { ?> |
| | 107 | + <tr> |
| | 108 | + <?php |
| | 109 | + if ( !empty( $inputItem['msg'] ) && $inputItem['type'] != 'checkbox' ) { |
| | 110 | + ?><td class="mw-label"><label for="<?php |
| | 111 | + echo htmlspecialchars( $inputItem['name'] ); ?>"><?php |
| | 112 | + $this->msgWiki( $inputItem['msg'] ) ?></label><?php |
| | 113 | + } else { |
| | 114 | + ?><td><?php |
| | 115 | + } |
| | 116 | + ?></td> |
| | 117 | + <td class="mw-input"> |
| | 118 | + <input type="<?php echo htmlspecialchars( $inputItem['type'] ) ?>" name="<?php |
| | 119 | + echo htmlspecialchars( $inputItem['name'] ); ?>" |
| | 120 | + tabindex="<?php echo $tabIndex++; ?>" |
| | 121 | + value="<?php |
| | 122 | + if ( $inputItem['type'] != 'checkbox' ) { |
| | 123 | + echo htmlspecialchars( $inputItem['value'] ); |
| | 124 | + } else { |
| | 125 | + echo '1'; |
| | 126 | + } |
| | 127 | + ?>" id="<?php echo htmlspecialchars( $inputItem['name'] ); ?>" |
| | 128 | + <?php |
| | 129 | + if ( $inputItem['type'] == 'checkbox' && !empty( $inputItem['value'] ) ) |
| | 130 | + echo 'checked="checked"'; |
| | 131 | + ?> /> <?php |
| | 132 | + if ( $inputItem['type'] == 'checkbox' && !empty( $inputItem['msg'] ) ) { |
| | 133 | + ?> |
| | 134 | + <label for="<?php echo htmlspecialchars( $inputItem['name'] ); ?>"><?php |
| | 135 | + $this->msg( $inputItem['msg'] ) ?></label><?php |
| | 136 | + } |
| | 137 | + ?> |
| | 138 | + </td> |
| | 139 | + </tr> |
| | 140 | +<?php |
| | 141 | + |
| | 142 | + } |
| | 143 | + } |
| | 144 | +?> |
| | 145 | + <tr> |
| | 146 | + <td></td> |
| | 147 | + </tr> |
| | 148 | + </table> |
| | 149 | +<?php if( @$this->haveData( 'uselang' ) ) { ?><input type="hidden" name="uselang" value="<?php $this->text( 'uselang' ); ?>" /><?php } ?> |
| | 150 | +</div> |
| | 151 | +<div id="signupend"><?php $this->msgWiki( 'signupend' ); ?></div> |
| | 152 | +<?php |
| | 153 | + |
| | 154 | + } |
| | 155 | +} |
| | 156 | + |
| | 157 | +class SES_SignupFields |
| | 158 | +{ |
| | 159 | + public static function render($input, $args, $parser) |
| | 160 | + { |
| | 161 | + $template = new CreateUserFieldsTemplate(); |
| | 162 | + |
| | 163 | + $template->set( 'header', '' ); |
| | 164 | + |
| | 165 | + global $wgEnableEmail, $wgAllowRealName, $wgEmailConfirmToEdit, $wgAuth, $wgUser; |
| | 166 | + $template->set( 'createemail', $wgEnableEmail && $wgUser->isLoggedIn() ); |
| | 167 | + $template->set( 'userealname', $wgAllowRealName ); |
| | 168 | + $template->set( 'useemail', $wgEnableEmail ); |
| | 169 | + $template->set( 'emailrequired', $wgEmailConfirmToEdit ); |
| | 170 | + $template->set( 'canreset', $wgAuth->allowPasswordChange() ); |
| | 171 | + //$template->set( 'remember', $wgUser->getOption( 'rememberpassword' ) ); |
| | 172 | + |
| | 173 | + global $wgLoginLanguageSelector; |
| | 174 | + # Prepare language selection links as needed |
| | 175 | + if( $wgLoginLanguageSelector ) |
| | 176 | + $template->set( 'languages', $this->makeLanguageSelector() ); |
| | 177 | + |
| | 178 | + // Give authentication and captcha plugins a chance to modify the form |
| | 179 | + $wgAuth->modifyUITemplate( $template ); |
| | 180 | + |
| | 181 | + ob_start(); |
| | 182 | + $template->execute(); |
| | 183 | + $text = ob_get_clean(); |
| | 184 | + |
| | 185 | + return $text; |
| | 186 | + } |
| | 187 | + |
| | 188 | +} |
| Property changes on: branches/extensions-realtime/SemanticSignup/includes/SES_SignupFields.php |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 189 | + native |
| Index: branches/extensions-realtime/SemanticSignup/release-notes |
| — | — | @@ -0,0 +1,21 @@ |
| | 2 | +These are the release notes for the SemanticSignup extension. |
| | 3 | + |
| | 4 | +Extension page on mediawiki.org: http://www.mediawiki.org/wiki/Extension:SemanticSignup |
| | 5 | +Latest version of the release notes: http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/SemanticSignup/RELEASE-NOTES?view=co |
| | 6 | + |
| | 7 | + |
| | 8 | +=== Version 0.3 === |
| | 9 | +2011-0x-xx |
| | 10 | + |
| | 11 | +* Added compatibility with MediaWiki 1.16 and above, removed compatibility with MediaWiki below 1.16. |
| | 12 | +* Added compatibility with Semantic MediaWiki 1.6 and above. |
| | 13 | +* Added INSTALL file. |
| | 14 | +* Rewrote setting handling. |
| | 15 | +* Moved entry point to SemanticSignup.php. |
| | 16 | +* Moved code to standard i18n, hooks and settings files. |
| | 17 | +* Stylized code. |
| | 18 | + |
| | 19 | +=== Version 0.2 === |
| | 20 | + |
| | 21 | +* a new configuration setting $sesSignupBotName added; |
| | 22 | +* README sections 3 and 4 updated. |
| Index: branches/extensions-realtime/SemanticSignup/COPYING |
| — | — | @@ -0,0 +1,674 @@ |
| | 2 | + GNU GENERAL PUBLIC LICENSE
|
| | 3 | + Version 3, 29 June 2007
|
| | 4 | +
|
| | 5 | + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
| | 6 | + Everyone is permitted to copy and distribute verbatim copies
|
| | 7 | + of this license document, but changing it is not allowed.
|
| | 8 | +
|
| | 9 | + Preamble
|
| | 10 | +
|
| | 11 | + The GNU General Public License is a free, copyleft license for
|
| | 12 | +software and other kinds of works.
|
| | 13 | +
|
| | 14 | + The licenses for most software and other practical works are designed
|
| | 15 | +to take away your freedom to share and change the works. By contrast,
|
| | 16 | +the GNU General Public License is intended to guarantee your freedom to
|
| | 17 | +share and change all versions of a program--to make sure it remains free
|
| | 18 | +software for all its users. We, the Free Software Foundation, use the
|
| | 19 | +GNU General Public License for most of our software; it applies also to
|
| | 20 | +any other work released this way by its authors. You can apply it to
|
| | 21 | +your programs, too.
|
| | 22 | +
|
| | 23 | + When we speak of free software, we are referring to freedom, not
|
| | 24 | +price. Our General Public Licenses are designed to make sure that you
|
| | 25 | +have the freedom to distribute copies of free software (and charge for
|
| | 26 | +them if you wish), that you receive source code or can get it if you
|
| | 27 | +want it, that you can change the software or use pieces of it in new
|
| | 28 | +free programs, and that you know you can do these things.
|
| | 29 | +
|
| | 30 | + To protect your rights, we need to prevent others from denying you
|
| | 31 | +these rights or asking you to surrender the rights. Therefore, you have
|
| | 32 | +certain responsibilities if you distribute copies of the software, or if
|
| | 33 | +you modify it: responsibilities to respect the freedom of others.
|
| | 34 | +
|
| | 35 | + For example, if you distribute copies of such a program, whether
|
| | 36 | +gratis or for a fee, you must pass on to the recipients the same
|
| | 37 | +freedoms that you received. You must make sure that they, too, receive
|
| | 38 | +or can get the source code. And you must show them these terms so they
|
| | 39 | +know their rights.
|
| | 40 | +
|
| | 41 | + Developers that use the GNU GPL protect your rights with two steps:
|
| | 42 | +(1) assert copyright on the software, and (2) offer you this License
|
| | 43 | +giving you legal permission to copy, distribute and/or modify it.
|
| | 44 | +
|
| | 45 | + For the developers' and authors' protection, the GPL clearly explains
|
| | 46 | +that there is no warranty for this free software. For both users' and
|
| | 47 | +authors' sake, the GPL requires that modified versions be marked as
|
| | 48 | +changed, so that their problems will not be attributed erroneously to
|
| | 49 | +authors of previous versions.
|
| | 50 | +
|
| | 51 | + Some devices are designed to deny users access to install or run
|
| | 52 | +modified versions of the software inside them, although the manufacturer
|
| | 53 | +can do so. This is fundamentally incompatible with the aim of
|
| | 54 | +protecting users' freedom to change the software. The systematic
|
| | 55 | +pattern of such abuse occurs in the area of products for individuals to
|
| | 56 | +use, which is precisely where it is most unacceptable. Therefore, we
|
| | 57 | +have designed this version of the GPL to prohibit the practice for those
|
| | 58 | +products. If such problems arise substantially in other domains, we
|
| | 59 | +stand ready to extend this provision to those domains in future versions
|
| | 60 | +of the GPL, as needed to protect the freedom of users.
|
| | 61 | +
|
| | 62 | + Finally, every program is threatened constantly by software patents.
|
| | 63 | +States should not allow patents to restrict development and use of
|
| | 64 | +software on general-purpose computers, but in those that do, we wish to
|
| | 65 | +avoid the special danger that patents applied to a free program could
|
| | 66 | +make it effectively proprietary. To prevent this, the GPL assures that
|
| | 67 | +patents cannot be used to render the program non-free.
|
| | 68 | +
|
| | 69 | + The precise terms and conditions for copying, distribution and
|
| | 70 | +modification follow.
|
| | 71 | +
|
| | 72 | + TERMS AND CONDITIONS
|
| | 73 | +
|
| | 74 | + 0. Definitions.
|
| | 75 | +
|
| | 76 | + "This License" refers to version 3 of the GNU General Public License.
|
| | 77 | +
|
| | 78 | + "Copyright" also means copyright-like laws that apply to other kinds of
|
| | 79 | +works, such as semiconductor masks.
|
| | 80 | +
|
| | 81 | + "The Program" refers to any copyrightable work licensed under this
|
| | 82 | +License. Each licensee is addressed as "you". "Licensees" and
|
| | 83 | +"recipients" may be individuals or organizations.
|
| | 84 | +
|
| | 85 | + To "modify" a work means to copy from or adapt all or part of the work
|
| | 86 | +in a fashion requiring copyright permission, other than the making of an
|
| | 87 | +exact copy. The resulting work is called a "modified version" of the
|
| | 88 | +earlier work or a work "based on" the earlier work.
|
| | 89 | +
|
| | 90 | + A "covered work" means either the unmodified Program or a work based
|
| | 91 | +on the Program.
|
| | 92 | +
|
| | 93 | + To "propagate" a work means to do anything with it that, without
|
| | 94 | +permission, would make you directly or secondarily liable for
|
| | 95 | +infringement under applicable copyright law, except executing it on a
|
| | 96 | +computer or modifying a private copy. Propagation includes copying,
|
| | 97 | +distribution (with or without modification), making available to the
|
| | 98 | +public, and in some countries other activities as well.
|
| | 99 | +
|
| | 100 | + To "convey" a work means any kind of propagation that enables other
|
| | 101 | +parties to make or receive copies. Mere interaction with a user through
|
| | 102 | +a computer network, with no transfer of a copy, is not conveying.
|
| | 103 | +
|
| | 104 | + An interactive user interface displays "Appropriate Legal Notices"
|
| | 105 | +to the extent that it includes a convenient and prominently visible
|
| | 106 | +feature that (1) displays an appropriate copyright notice, and (2)
|
| | 107 | +tells the user that there is no warranty for the work (except to the
|
| | 108 | +extent that warranties are provided), that licensees may convey the
|
| | 109 | +work under this License, and how to view a copy of this License. If
|
| | 110 | +the interface presents a list of user commands or options, such as a
|
| | 111 | +menu, a prominent item in the list meets this criterion.
|
| | 112 | +
|
| | 113 | + 1. Source Code.
|
| | 114 | +
|
| | 115 | + The "source code" for a work means the preferred form of the work
|
| | 116 | +for making modifications to it. "Object code" means any non-source
|
| | 117 | +form of a work.
|
| | 118 | +
|
| | 119 | + A "Standard Interface" means an interface that either is an official
|
| | 120 | +standard defined by a recognized standards body, or, in the case of
|
| | 121 | +interfaces specified for a particular programming language, one that
|
| | 122 | +is widely used among developers working in that language.
|
| | 123 | +
|
| | 124 | + The "System Libraries" of an executable work include anything, other
|
| | 125 | +than the work as a whole, that (a) is included in the normal form of
|
| | 126 | +packaging a Major Component, but which is not part of that Major
|
| | 127 | +Component, and (b) serves only to enable use of the work with that
|
| | 128 | +Major Component, or to implement a Standard Interface for which an
|
| | 129 | +implementation is available to the public in source code form. A
|
| | 130 | +"Major Component", in this context, means a major essential component
|
| | 131 | +(kernel, window system, and so on) of the specific operating system
|
| | 132 | +(if any) on which the executable work runs, or a compiler used to
|
| | 133 | +produce the work, or an object code interpreter used to run it.
|
| | 134 | +
|
| | 135 | + The "Corresponding Source" for a work in object code form means all
|
| | 136 | +the source code needed to generate, install, and (for an executable
|
| | 137 | +work) run the object code and to modify the work, including scripts to
|
| | 138 | +control those activities. However, it does not include the work's
|
| | 139 | +System Libraries, or general-purpose tools or generally available free
|
| | 140 | +programs which are used unmodified in performing those activities but
|
| | 141 | +which are not part of the work. For example, Corresponding Source
|
| | 142 | +includes interface definition files associated with source files for
|
| | 143 | +the work, and the source code for shared libraries and dynamically
|
| | 144 | +linked subprograms that the work is specifically designed to require,
|
| | 145 | +such as by intimate data communication or control flow between those
|
| | 146 | +subprograms and other parts of the work.
|
| | 147 | +
|
| | 148 | + The Corresponding Source need not include anything that users
|
| | 149 | +can regenerate automatically from other parts of the Corresponding
|
| | 150 | +Source.
|
| | 151 | +
|
| | 152 | + The Corresponding Source for a work in source code form is that
|
| | 153 | +same work.
|
| | 154 | +
|
| | 155 | + 2. Basic Permissions.
|
| | 156 | +
|
| | 157 | + All rights granted under this License are granted for the term of
|
| | 158 | +copyright on the Program, and are irrevocable provided the stated
|
| | 159 | +conditions are met. This License explicitly affirms your unlimited
|
| | 160 | +permission to run the unmodified Program. The output from running a
|
| | 161 | +covered work is covered by this License only if the output, given its
|
| | 162 | +content, constitutes a covered work. This License acknowledges your
|
| | 163 | +rights of fair use or other equivalent, as provided by copyright law.
|
| | 164 | +
|
| | 165 | + You may make, run and propagate covered works that you do not
|
| | 166 | +convey, without conditions so long as your license otherwise remains
|
| | 167 | +in force. You may convey covered works to others for the sole purpose
|
| | 168 | +of having them make modifications exclusively for you, or provide you
|
| | 169 | +with facilities for running those works, provided that you comply with
|
| | 170 | +the terms of this License in conveying all material for which you do
|
| | 171 | +not control copyright. Those thus making or running the covered works
|
| | 172 | +for you must do so exclusively on your behalf, under your direction
|
| | 173 | +and control, on terms that prohibit them from making any copies of
|
| | 174 | +your copyrighted material outside their relationship with you.
|
| | 175 | +
|
| | 176 | + Conveying under any other circumstances is permitted solely under
|
| | 177 | +the conditions stated below. Sublicensing is not allowed; section 10
|
| | 178 | +makes it unnecessary.
|
| | 179 | +
|
| | 180 | + 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
| | 181 | +
|
| | 182 | + No covered work shall be deemed part of an effective technological
|
| | 183 | +measure under any applicable law fulfilling obligations under article
|
| | 184 | +11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
| | 185 | +similar laws prohibiting or restricting circumvention of such
|
| | 186 | +measures.
|
| | 187 | +
|
| | 188 | + When you convey a covered work, you waive any legal power to forbid
|
| | 189 | +circumvention of technological measures to the extent such circumvention
|
| | 190 | +is effected by exercising rights under this License with respect to
|
| | 191 | +the covered work, and you disclaim any intention to limit operation or
|
| | 192 | +modification of the work as a means of enforcing, against the work's
|
| | 193 | +users, your or third parties' legal rights to forbid circumvention of
|
| | 194 | +technological measures.
|
| | 195 | +
|
| | 196 | + 4. Conveying Verbatim Copies.
|
| | 197 | +
|
| | 198 | + You may convey verbatim copies of the Program's source code as you
|
| | 199 | +receive it, in any medium, provided that you conspicuously and
|
| | 200 | +appropriately publish on each copy an appropriate copyright notice;
|
| | 201 | +keep intact all notices stating that this License and any
|
| | 202 | +non-permissive terms added in accord with section 7 apply to the code;
|
| | 203 | +keep intact all notices of the absence of any warranty; and give all
|
| | 204 | +recipients a copy of this License along with the Program.
|
| | 205 | +
|
| | 206 | + You may charge any price or no price for each copy that you convey,
|
| | 207 | +and you may offer support or warranty protection for a fee.
|
| | 208 | +
|
| | 209 | + 5. Conveying Modified Source Versions.
|
| | 210 | +
|
| | 211 | + You may convey a work based on the Program, or the modifications to
|
| | 212 | +produce it from the Program, in the form of source code under the
|
| | 213 | +terms of section 4, provided that you also meet all of these conditions:
|
| | 214 | +
|
| | 215 | + a) The work must carry prominent notices stating that you modified
|
| | 216 | + it, and giving a relevant date.
|
| | 217 | +
|
| | 218 | + b) The work must carry prominent notices stating that it is
|
| | 219 | + released under this License and any conditions added under section
|
| | 220 | + 7. This requirement modifies the requirement in section 4 to
|
| | 221 | + "keep intact all notices".
|
| | 222 | +
|
| | 223 | + c) You must license the entire work, as a whole, under this
|
| | 224 | + License to anyone who comes into possession of a copy. This
|
| | 225 | + License will therefore apply, along with any applicable section 7
|
| | 226 | + additional terms, to the whole of the work, and all its parts,
|
| | 227 | + regardless of how they are packaged. This License gives no
|
| | 228 | + permission to license the work in any other way, but it does not
|
| | 229 | + invalidate such permission if you have separately received it.
|
| | 230 | +
|
| | 231 | + d) If the work has interactive user interfaces, each must display
|
| | 232 | + Appropriate Legal Notices; however, if the Program has interactive
|
| | 233 | + interfaces that do not display Appropriate Legal Notices, your
|
| | 234 | + work need not make them do so.
|
| | 235 | +
|
| | 236 | + A compilation of a covered work with other separate and independent
|
| | 237 | +works, which are not by their nature extensions of the covered work,
|
| | 238 | +and which are not combined with it such as to form a larger program,
|
| | 239 | +in or on a volume of a storage or distribution medium, is called an
|
| | 240 | +"aggregate" if the compilation and its resulting copyright are not
|
| | 241 | +used to limit the access or legal rights of the compilation's users
|
| | 242 | +beyond what the individual works permit. Inclusion of a covered work
|
| | 243 | +in an aggregate does not cause this License to apply to the other
|
| | 244 | +parts of the aggregate.
|
| | 245 | +
|
| | 246 | + 6. Conveying Non-Source Forms.
|
| | 247 | +
|
| | 248 | + You may convey a covered work in object code form under the terms
|
| | 249 | +of sections 4 and 5, provided that you also convey the
|
| | 250 | +machine-readable Corresponding Source under the terms of this License,
|
| | 251 | +in one of these ways:
|
| | 252 | +
|
| | 253 | + a) Convey the object code in, or embodied in, a physical product
|
| | 254 | + (including a physical distribution medium), accompanied by the
|
| | 255 | + Corresponding Source fixed on a durable physical medium
|
| | 256 | + customarily used for software interchange.
|
| | 257 | +
|
| | 258 | + b) Convey the object code in, or embodied in, a physical product
|
| | 259 | + (including a physical distribution medium), accompanied by a
|
| | 260 | + written offer, valid for at least three years and valid for as
|
| | 261 | + long as you offer spare parts or customer support for that product
|
| | 262 | + model, to give anyone who possesses the object code either (1) a
|
| | 263 | + copy of the Corresponding Source for all the software in the
|
| | 264 | + product that is covered by this License, on a durable physical
|
| | 265 | + medium customarily used for software interchange, for a price no
|
| | 266 | + more than your reasonable cost of physically performing this
|
| | 267 | + conveying of source, or (2) access to copy the
|
| | 268 | + Corresponding Source from a network server at no charge.
|
| | 269 | +
|
| | 270 | + c) Convey individual copies of the object code with a copy of the
|
| | 271 | + written offer to provide the Corresponding Source. This
|
| | 272 | + alternative is allowed only occasionally and noncommercially, and
|
| | 273 | + only if you received the object code with such an offer, in accord
|
| | 274 | + with subsection 6b.
|
| | 275 | +
|
| | 276 | + d) Convey the object code by offering access from a designated
|
| | 277 | + place (gratis or for a charge), and offer equivalent access to the
|
| | 278 | + Corresponding Source in the same way through the same place at no
|
| | 279 | + further charge. You need not require recipients to copy the
|
| | 280 | + Corresponding Source along with the object code. If the place to
|
| | 281 | + copy the object code is a network server, the Corresponding Source
|
| | 282 | + may be on a different server (operated by you or a third party)
|
| | 283 | + that supports equivalent copying facilities, provided you maintain
|
| | 284 | + clear directions next to the object code saying where to find the
|
| | 285 | + Corresponding Source. Regardless of what server hosts the
|
| | 286 | + Corresponding Source, you remain obligated to ensure that it is
|
| | 287 | + available for as long as needed to satisfy these requirements.
|
| | 288 | +
|
| | 289 | + e) Convey the object code using peer-to-peer transmission, provided
|
| | 290 | + you inform other peers where the object code and Corresponding
|
| | 291 | + Source of the work are being offered to the general public at no
|
| | 292 | + charge under subsection 6d.
|
| | 293 | +
|
| | 294 | + A separable portion of the object code, whose source code is excluded
|
| | 295 | +from the Corresponding Source as a System Library, need not be
|
| | 296 | +included in conveying the object code work.
|
| | 297 | +
|
| | 298 | + A "User Product" is either (1) a "consumer product", which means any
|
| | 299 | +tangible personal property which is normally used for personal, family,
|
| | 300 | +or household purposes, or (2) anything designed or sold for incorporation
|
| | 301 | +into a dwelling. In determining whether a product is a consumer product,
|
| | 302 | +doubtful cases shall be resolved in favor of coverage. For a particular
|
| | 303 | +product received by a particular user, "normally used" refers to a
|
| | 304 | +typical or common use of that class of product, regardless of the status
|
| | 305 | +of the particular user or of the way in which the particular user
|
| | 306 | +actually uses, or expects or is expected to use, the product. A product
|
| | 307 | +is a consumer product regardless of whether the product has substantial
|
| | 308 | +commercial, industrial or non-consumer uses, unless such uses represent
|
| | 309 | +the only significant mode of use of the product.
|
| | 310 | +
|
| | 311 | + "Installation Information" for a User Product means any methods,
|
| | 312 | +procedures, authorization keys, or other information required to install
|
| | 313 | +and execute modified versions of a covered work in that User Product from
|
| | 314 | +a modified version of its Corresponding Source. The information must
|
| | 315 | +suffice to ensure that the continued functioning of the modified object
|
| | 316 | +code is in no case prevented or interfered with solely because
|
| | 317 | +modification has been made.
|
| | 318 | +
|
| | 319 | + If you convey an object code work under this section in, or with, or
|
| | 320 | +specifically for use in, a User Product, and the conveying occurs as
|
| | 321 | +part of a transaction in which the right of possession and use of the
|
| | 322 | +User Product is transferred to the recipient in perpetuity or for a
|
| | 323 | +fixed term (regardless of how the transaction is characterized), the
|
| | 324 | +Corresponding Source conveyed under this section must be accompanied
|
| | 325 | +by the Installation Information. But this requirement does not apply
|
| | 326 | +if neither you nor any third party retains the ability to install
|
| | 327 | +modified object code on the User Product (for example, the work has
|
| | 328 | +been installed in ROM).
|
| | 329 | +
|
| | 330 | + The requirement to provide Installation Information does not include a
|
| | 331 | +requirement to continue to provide support service, warranty, or updates
|
| | 332 | +for a work that has been modified or installed by the recipient, or for
|
| | 333 | +the User Product in which it has been modified or installed. Access to a
|
| | 334 | +network may be denied when the modification itself materially and
|
| | 335 | +adversely affects the operation of the network or violates the rules and
|
| | 336 | +protocols for communication across the network.
|
| | 337 | +
|
| | 338 | + Corresponding Source conveyed, and Installation Information provided,
|
| | 339 | +in accord with this section must be in a format that is publicly
|
| | 340 | +documented (and with an implementation available to the public in
|
| | 341 | +source code form), and must require no special password or key for
|
| | 342 | +unpacking, reading or copying.
|
| | 343 | +
|
| | 344 | + 7. Additional Terms.
|
| | 345 | +
|
| | 346 | + "Additional permissions" are terms that supplement the terms of this
|
| | 347 | +License by making exceptions from one or more of its conditions.
|
| | 348 | +Additional permissions that are applicable to the entire Program shall
|
| | 349 | +be treated as though they were included in this License, to the extent
|
| | 350 | +that they are valid under applicable law. If additional permissions
|
| | 351 | +apply only to part of the Program, that part may be used separately
|
| | 352 | +under those permissions, but the entire Program remains governed by
|
| | 353 | +this License without regard to the additional permissions.
|
| | 354 | +
|
| | 355 | + When you convey a copy of a covered work, you may at your option
|
| | 356 | +remove any additional permissions from that copy, or from any part of
|
| | 357 | +it. (Additional permissions may be written to require their own
|
| | 358 | +removal in certain cases when you modify the work.) You may place
|
| | 359 | +additional permissions on material, added by you to a covered work,
|
| | 360 | +for which you have or can give appropriate copyright permission.
|
| | 361 | +
|
| | 362 | + Notwithstanding any other provision of this License, for material you
|
| | 363 | +add to a covered work, you may (if authorized by the copyright holders of
|
| | 364 | +that material) supplement the terms of this License with terms:
|
| | 365 | +
|
| | 366 | + a) Disclaiming warranty or limiting liability differently from the
|
| | 367 | + terms of sections 15 and 16 of this License; or
|
| | 368 | +
|
| | 369 | + b) Requiring preservation of specified reasonable legal notices or
|
| | 370 | + author attributions in that material or in the Appropriate Legal
|
| | 371 | + Notices displayed by works containing it; or
|
| | 372 | +
|
| | 373 | + c) Prohibiting misrepresentation of the origin of that material, or
|
| | 374 | + requiring that modified versions of such material be marked in
|
| | 375 | + reasonable ways as different from the original version; or
|
| | 376 | +
|
| | 377 | + d) Limiting the use for publicity purposes of names of licensors or
|
| | 378 | + authors of the material; or
|
| | 379 | +
|
| | 380 | + e) Declining to grant rights under trademark law for use of some
|
| | 381 | + trade names, trademarks, or service marks; or
|
| | 382 | +
|
| | 383 | + f) Requiring indemnification of licensors and authors of that
|
| | 384 | + material by anyone who conveys the material (or modified versions of
|
| | 385 | + it) with contractual assumptions of liability to the recipient, for
|
| | 386 | + any liability that these contractual assumptions directly impose on
|
| | 387 | + those licensors and authors.
|
| | 388 | +
|
| | 389 | + All other non-permissive additional terms are considered "further
|
| | 390 | +restrictions" within the meaning of section 10. If the Program as you
|
| | 391 | +received it, or any part of it, contains a notice stating that it is
|
| | 392 | +governed by this License along with a term that is a further
|
| | 393 | +restriction, you may remove that term. If a license document contains
|
| | 394 | +a further restriction but permits relicensing or conveying under this
|
| | 395 | +License, you may add to a covered work material governed by the terms
|
| | 396 | +of that license document, provided that the further restriction does
|
| | 397 | +not survive such relicensing or conveying.
|
| | 398 | +
|
| | 399 | + If you add terms to a covered work in accord with this section, you
|
| | 400 | +must place, in the relevant source files, a statement of the
|
| | 401 | +additional terms that apply to those files, or a notice indicating
|
| | 402 | +where to find the applicable terms.
|
| | 403 | +
|
| | 404 | + Additional terms, permissive or non-permissive, may be stated in the
|
| | 405 | +form of a separately written license, or stated as exceptions;
|
| | 406 | +the above requirements apply either way.
|
| | 407 | +
|
| | 408 | + 8. Termination.
|
| | 409 | +
|
| | 410 | + You may not propagate or modify a covered work except as expressly
|
| | 411 | +provided under this License. Any attempt otherwise to propagate or
|
| | 412 | +modify it is void, and will automatically terminate your rights under
|
| | 413 | +this License (including any patent licenses granted under the third
|
| | 414 | +paragraph of section 11).
|
| | 415 | +
|
| | 416 | + However, if you cease all violation of this License, then your
|
| | 417 | +license from a particular copyright holder is reinstated (a)
|
| | 418 | +provisionally, unless and until the copyright holder explicitly and
|
| | 419 | +finally terminates your license, and (b) permanently, if the copyright
|
| | 420 | +holder fails to notify you of the violation by some reasonable means
|
| | 421 | +prior to 60 days after the cessation.
|
| | 422 | +
|
| | 423 | + Moreover, your license from a particular copyright holder is
|
| | 424 | +reinstated permanently if the copyright holder notifies you of the
|
| | 425 | +violation by some reasonable means, this is the first time you have
|
| | 426 | +received notice of violation of this License (for any work) from that
|
| | 427 | +copyright holder, and you cure the violation prior to 30 days after
|
| | 428 | +your receipt of the notice.
|
| | 429 | +
|
| | 430 | + Termination of your rights under this section does not terminate the
|
| | 431 | +licenses of parties who have received copies or rights from you under
|
| | 432 | +this License. If your rights have been terminated and not permanently
|
| | 433 | +reinstated, you do not qualify to receive new licenses for the same
|
| | 434 | +material under section 10.
|
| | 435 | +
|
| | 436 | + 9. Acceptance Not Required for Having Copies.
|
| | 437 | +
|
| | 438 | + You are not required to accept this License in order to receive or
|
| | 439 | +run a copy of the Program. Ancillary propagation of a covered work
|
| | 440 | +occurring solely as a consequence of using peer-to-peer transmission
|
| | 441 | +to receive a copy likewise does not require acceptance. However,
|
| | 442 | +nothing other than this License grants you permission to propagate or
|
| | 443 | +modify any covered work. These actions infringe copyright if you do
|
| | 444 | +not accept this License. Therefore, by modifying or propagating a
|
| | 445 | +covered work, you indicate your acceptance of this License to do so.
|
| | 446 | +
|
| | 447 | + 10. Automatic Licensing of Downstream Recipients.
|
| | 448 | +
|
| | 449 | + Each time you convey a covered work, the recipient automatically
|
| | 450 | +receives a license from the original licensors, to run, modify and
|
| | 451 | +propagate that work, subject to this License. You are not responsible
|
| | 452 | +for enforcing compliance by third parties with this License.
|
| | 453 | +
|
| | 454 | + An "entity transaction" is a transaction transferring control of an
|
| | 455 | +organization, or substantially all assets of one, or subdividing an
|
| | 456 | +organization, or merging organizations. If propagation of a covered
|
| | 457 | +work results from an entity transaction, each party to that
|
| | 458 | +transaction who receives a copy of the work also receives whatever
|
| | 459 | +licenses to the work the party's predecessor in interest had or could
|
| | 460 | +give under the previous paragraph, plus a right to possession of the
|
| | 461 | +Corresponding Source of the work from the predecessor in interest, if
|
| | 462 | +the predecessor has it or can get it with reasonable efforts.
|
| | 463 | +
|
| | 464 | + You may not impose any further restrictions on the exercise of the
|
| | 465 | +rights granted or affirmed under this License. For example, you may
|
| | 466 | +not impose a license fee, royalty, or other charge for exercise of
|
| | 467 | +rights granted under this License, and you may not initiate litigation
|
| | 468 | +(including a cross-claim or counterclaim in a lawsuit) alleging that
|
| | 469 | +any patent claim is infringed by making, using, selling, offering for
|
| | 470 | +sale, or importing the Program or any portion of it.
|
| | 471 | +
|
| | 472 | + 11. Patents.
|
| | 473 | +
|
| | 474 | + A "contributor" is a copyright holder who authorizes use under this
|
| | 475 | +License of the Program or a work on which the Program is based. The
|
| | 476 | +work thus licensed is called the contributor's "contributor version".
|
| | 477 | +
|
| | 478 | + A contributor's "essential patent claims" are all patent claims
|
| | 479 | +owned or controlled by the contributor, whether already acquired or
|
| | 480 | +hereafter acquired, that would be infringed by some manner, permitted
|
| | 481 | +by this License, of making, using, or selling its contributor version,
|
| | 482 | +but do not include claims that would be infringed only as a
|
| | 483 | +consequence of further modification of the contributor version. For
|
| | 484 | +purposes of this definition, "control" includes the right to grant
|
| | 485 | +patent sublicenses in a manner consistent with the requirements of
|
| | 486 | +this License.
|
| | 487 | +
|
| | 488 | + Each contributor grants you a non-exclusive, worldwide, royalty-free
|
| | 489 | +patent license under the contributor's essential patent claims, to
|
| | 490 | +make, use, sell, offer for sale, import and otherwise run, modify and
|
| | 491 | +propagate the contents of its contributor version.
|
| | 492 | +
|
| | 493 | + In the following three paragraphs, a "patent license" is any express
|
| | 494 | +agreement or commitment, however denominated, not to enforce a patent
|
| | 495 | +(such as an express permission to practice a patent or covenant not to
|
| | 496 | +sue for patent infringement). To "grant" such a patent license to a
|
| | 497 | +party means to make such an agreement or commitment not to enforce a
|
| | 498 | +patent against the party.
|
| | 499 | +
|
| | 500 | + If you convey a covered work, knowingly relying on a patent license,
|
| | 501 | +and the Corresponding Source of the work is not available for anyone
|
| | 502 | +to copy, free of charge and under the terms of this License, through a
|
| | 503 | +publicly available network server or other readily accessible means,
|
| | 504 | +then you must either (1) cause the Corresponding Source to be so
|
| | 505 | +available, or (2) arrange to deprive yourself of the benefit of the
|
| | 506 | +patent license for this particular work, or (3) arrange, in a manner
|
| | 507 | +consistent with the requirements of this License, to extend the patent
|
| | 508 | +license to downstream recipients. "Knowingly relying" means you have
|
| | 509 | +actual knowledge that, but for the patent license, your conveying the
|
| | 510 | +covered work in a country, or your recipient's use of the covered work
|
| | 511 | +in a country, would infringe one or more identifiable patents in that
|
| | 512 | +country that you have reason to believe are valid.
|
| | 513 | +
|
| | 514 | + If, pursuant to or in connection with a single transaction or
|
| | 515 | +arrangement, you convey, or propagate by procuring conveyance of, a
|
| | 516 | +covered work, and grant a patent license to some of the parties
|
| | 517 | +receiving the covered work authorizing them to use, propagate, modify
|
| | 518 | +or convey a specific copy of the covered work, then the patent license
|
| | 519 | +you grant is automatically extended to all recipients of the covered
|
| | 520 | +work and works based on it.
|
| | 521 | +
|
| | 522 | + A patent license is "discriminatory" if it does not include within
|
| | 523 | +the scope of its coverage, prohibits the exercise of, or is
|
| | 524 | +conditioned on the non-exercise of one or more of the rights that are
|
| | 525 | +specifically granted under this License. You may not convey a covered
|
| | 526 | +work if you are a party to an arrangement with a third party that is
|
| | 527 | +in the business of distributing software, under which you make payment
|
| | 528 | +to the third party based on the extent of your activity of conveying
|
| | 529 | +the work, and under which the third party grants, to any of the
|
| | 530 | +parties who would receive the covered work from you, a discriminatory
|
| | 531 | +patent license (a) in connection with copies of the covered work
|
| | 532 | +conveyed by you (or copies made from those copies), or (b) primarily
|
| | 533 | +for and in connection with specific products or compilations that
|
| | 534 | +contain the covered work, unless you entered into that arrangement,
|
| | 535 | +or that patent license was granted, prior to 28 March 2007.
|
| | 536 | +
|
| | 537 | + Nothing in this License shall be construed as excluding or limiting
|
| | 538 | +any implied license or other defenses to infringement that may
|
| | 539 | +otherwise be available to you under applicable patent law.
|
| | 540 | +
|
| | 541 | + 12. No Surrender of Others' Freedom.
|
| | 542 | +
|
| | 543 | + If conditions are imposed on you (whether by court order, agreement or
|
| | 544 | +otherwise) that contradict the conditions of this License, they do not
|
| | 545 | +excuse you from the conditions of this License. If you cannot convey a
|
| | 546 | +covered work so as to satisfy simultaneously your obligations under this
|
| | 547 | +License and any other pertinent obligations, then as a consequence you may
|
| | 548 | +not convey it at all. For example, if you agree to terms that obligate you
|
| | 549 | +to collect a royalty for further conveying from those to whom you convey
|
| | 550 | +the Program, the only way you could satisfy both those terms and this
|
| | 551 | +License would be to refrain entirely from conveying the Program.
|
| | 552 | +
|
| | 553 | + 13. Use with the GNU Affero General Public License.
|
| | 554 | +
|
| | 555 | + Notwithstanding any other provision of this License, you have
|
| | 556 | +permission to link or combine any covered work with a work licensed
|
| | 557 | +under version 3 of the GNU Affero General Public License into a single
|
| | 558 | +combined work, and to convey the resulting work. The terms of this
|
| | 559 | +License will continue to apply to the part which is the covered work,
|
| | 560 | +but the special requirements of the GNU Affero General Public License,
|
| | 561 | +section 13, concerning interaction through a network will apply to the
|
| | 562 | +combination as such.
|
| | 563 | +
|
| | 564 | + 14. Revised Versions of this License.
|
| | 565 | +
|
| | 566 | + The Free Software Foundation may publish revised and/or new versions of
|
| | 567 | +the GNU General Public License from time to time. Such new versions will
|
| | 568 | +be similar in spirit to the present version, but may differ in detail to
|
| | 569 | +address new problems or concerns.
|
| | 570 | +
|
| | 571 | + Each version is given a distinguishing version number. If the
|
| | 572 | +Program specifies that a certain numbered version of the GNU General
|
| | 573 | +Public License "or any later version" applies to it, you have the
|
| | 574 | +option of following the terms and conditions either of that numbered
|
| | 575 | +version or of any later version published by the Free Software
|
| | 576 | +Foundation. If the Program does not specify a version number of the
|
| | 577 | +GNU General Public License, you may choose any version ever published
|
| | 578 | +by the Free Software Foundation.
|
| | 579 | +
|
| | 580 | + If the Program specifies that a proxy can decide which future
|
| | 581 | +versions of the GNU General Public License can be used, that proxy's
|
| | 582 | +public statement of acceptance of a version permanently authorizes you
|
| | 583 | +to choose that version for the Program.
|
| | 584 | +
|
| | 585 | + Later license versions may give you additional or different
|
| | 586 | +permissions. However, no additional obligations are imposed on any
|
| | 587 | +author or copyright holder as a result of your choosing to follow a
|
| | 588 | +later version.
|
| | 589 | +
|
| | 590 | + 15. Disclaimer of Warranty.
|
| | 591 | +
|
| | 592 | + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
| | 593 | +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
| | 594 | +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
| | 595 | +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
| | 596 | +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
| | 597 | +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
| | 598 | +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
| | 599 | +ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
| | 600 | +
|
| | 601 | + 16. Limitation of Liability.
|
| | 602 | +
|
| | 603 | + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
| | 604 | +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
| | 605 | +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
| | 606 | +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
| | 607 | +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
| | 608 | +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
| | 609 | +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
| | 610 | +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
| | 611 | +SUCH DAMAGES.
|
| | 612 | +
|
| | 613 | + 17. Interpretation of Sections 15 and 16.
|
| | 614 | +
|
| | 615 | + If the disclaimer of warranty and limitation of liability provided
|
| | 616 | +above cannot be given local legal effect according to their terms,
|
| | 617 | +reviewing courts shall apply local law that most closely approximates
|
| | 618 | +an absolute waiver of all civil liability in connection with the
|
| | 619 | +Program, unless a warranty or assumption of liability accompanies a
|
| | 620 | +copy of the Program in return for a fee.
|
| | 621 | +
|
| | 622 | + END OF TERMS AND CONDITIONS
|
| | 623 | +
|
| | 624 | + How to Apply These Terms to Your New Programs
|
| | 625 | +
|
| | 626 | + If you develop a new program, and you want it to be of the greatest
|
| | 627 | +possible use to the public, the best way to achieve this is to make it
|
| | 628 | +free software which everyone can redistribute and change under these terms.
|
| | 629 | +
|
| | 630 | + To do so, attach the following notices to the program. It is safest
|
| | 631 | +to attach them to the start of each source file to most effectively
|
| | 632 | +state the exclusion of warranty; and each file should have at least
|
| | 633 | +the "copyright" line and a pointer to where the full notice is found.
|
| | 634 | +
|
| | 635 | + <one line to give the program's name and a brief idea of what it does.>
|
| | 636 | + Copyright (C) <year> <name of author>
|
| | 637 | +
|
| | 638 | + This program is free software: you can redistribute it and/or modify
|
| | 639 | + it under the terms of the GNU General Public License as published by
|
| | 640 | + the Free Software Foundation, either version 3 of the License, or
|
| | 641 | + (at your option) any later version.
|
| | 642 | +
|
| | 643 | + This program is distributed in the hope that it will be useful,
|
| | 644 | + but WITHOUT ANY WARRANTY; without even the implied warranty of
|
| | 645 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
| | 646 | + GNU General Public License for more details.
|
| | 647 | +
|
| | 648 | + You should have received a copy of the GNU General Public License
|
| | 649 | + along with this program. If not, see <http://www.gnu.org/licenses/>.
|
| | 650 | +
|
| | 651 | +Also add information on how to contact you by electronic and paper mail.
|
| | 652 | +
|
| | 653 | + If the program does terminal interaction, make it output a short
|
| | 654 | +notice like this when it starts in an interactive mode:
|
| | 655 | +
|
| | 656 | + <program> Copyright (C) <year> <name of author>
|
| | 657 | + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
| | 658 | + This is free software, and you are welcome to redistribute it
|
| | 659 | + under certain conditions; type `show c' for details.
|
| | 660 | +
|
| | 661 | +The hypothetical commands `show w' and `show c' should show the appropriate
|
| | 662 | +parts of the General Public License. Of course, your program's commands
|
| | 663 | +might be different; for a GUI interface, you would use an "about box".
|
| | 664 | +
|
| | 665 | + You should also get your employer (if you work as a programmer) or school,
|
| | 666 | +if any, to sign a "copyright disclaimer" for the program, if necessary.
|
| | 667 | +For more information on this, and how to apply and follow the GNU GPL, see
|
| | 668 | +<http://www.gnu.org/licenses/>.
|
| | 669 | +
|
| | 670 | + The GNU General Public License does not permit incorporating your program
|
| | 671 | +into proprietary programs. If your program is a subroutine library, you
|
| | 672 | +may consider it more useful to permit linking proprietary applications with
|
| | 673 | +the library. If this is what you want to do, use the GNU Lesser General
|
| | 674 | +Public License instead of this License. But first, please read
|
| | 675 | +<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
| Index: branches/extensions-realtime/SemanticSignup/README |
| — | — | @@ -0,0 +1,56 @@ |
| | 2 | +1. INTRO
|
| | 3 | +
|
| | 4 | +This is SemanticSignup version 0.1.0
|
| | 5 | +
|
| | 6 | +This is a MediaWiki extension built on top of Semantic MediaWiki
|
| | 7 | +and SemanticForms extensions and intended to be used with them.
|
| | 8 | +
|
| | 9 | +It is recommended to read these extensions' manuals before this one.
|
| | 10 | +
|
| | 11 | +2. USAGE
|
| | 12 | +
|
| | 13 | +This extension tweaks user registration process in order to make
|
| | 14 | +users populate their user pages with semantic data at registration time.
|
| | 15 | +Whenever the user registration form is requested the user is redirected
|
| | 16 | +to the Semantic Signup special page where he has to enter the usual
|
| | 17 | +account data and some additional information into a semantic form.
|
| | 18 | +When the form is submitted, the usual account information is used
|
| | 19 | +to register the new user account and a new User:<Username> page is
|
| | 20 | +populated with the additional data.
|
| | 21 | +
|
| | 22 | +3. INSTALLATION
|
| | 23 | +
|
| | 24 | +1. Create a semantic form for user pages (see the SemanticForms manual
|
| | 25 | +for details). Use the <signupfields /> tag to insert the user account
|
| | 26 | +input fields (e. g. username password and all that stuff) into this form -
|
| | 27 | +this is required for the form to be suitable for account registration.
|
| | 28 | +
|
| | 29 | +2. Insert the following lines into your LocalSettings.php:
|
| | 30 | +
|
| | 31 | +require_once('extensions/SemanticSignup/includes/SES_Main.php');
|
| | 32 | +$sesSignupFormName = 'MyFormName';
|
| | 33 | +$sesSignupBotName ='SignupBotName';
|
| | 34 | +
|
| | 35 | +where "MyFormName" should be replaced with whatever the form
|
| | 36 | +created at step 1 is called (the namespace title - i.e. "Form:" - should not be included)
|
| | 37 | +and "SignupBotName" is a name of a bot user account that will be used by SemanticSignup (you might need to create one).
|
| | 38 | +
|
| | 39 | +4. CONFIGURATION
|
| | 40 | +
|
| | 41 | +$sesSignupFormName controls the form which is displayed by the Semantic Signup
|
| | 42 | +special page.
|
| | 43 | +
|
| | 44 | +$sesRealNameRequired controls whether real name is required to register an account.
|
| | 45 | +
|
| | 46 | +$sesSignupBotName controls the name of a bot account used by SemanticSignup.
|
| | 47 | +Currently the extension makes use of it when getting the signup form only
|
| | 48 | +in order to avoid it being disabled if an anonymous user hasn't got "edit" permissions.
|
| | 49 | +
|
| | 50 | +5. SUPPORT & DONATIONS
|
| | 51 | +
|
| | 52 | +This extension was created by Serhii Kutnii mnkutster@gmail.com.
|
| | 53 | +
|
| | 54 | +The project home page is http://semanticsignup.sourceforge.net/.
|
| | 55 | +
|
| | 56 | +The bug and feature request tracker is available at
|
| | 57 | +https://sourceforge.net/tracker/?atid=1126589&group_id=250562&func=browse |
| \ No newline at end of file |
| Index: branches/extensions-realtime/SemanticSignup/SemanticSignup.i18n.aliases.php |
| — | — | @@ -0,0 +1,11 @@ |
| | 2 | +<?php |
| | 3 | + |
| | 4 | +/** |
| | 5 | + * Created on 7 Jan 2008 by Serhii Kutnii |
| | 6 | + */ |
| | 7 | + |
| | 8 | +$aliases = array(); |
| | 9 | + |
| | 10 | +$aliases['en'] = array( |
| | 11 | + 'SemanticSignup' => array( 'SemanticSignup', 'Semantic Signup' ) |
| | 12 | +); |
| Property changes on: branches/extensions-realtime/SemanticSignup/SemanticSignup.i18n.aliases.php |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 13 | + native |
| Index: branches/extensions-realtime/SemanticSignup/SemanticSignup.i18n.php |
| — | — | @@ -0,0 +1,21 @@ |
| | 2 | +<?php |
| | 3 | + |
| | 4 | +/** |
| | 5 | + * Created on 7 Jan 2008 by Serhii Kutnii |
| | 6 | + */ |
| | 7 | + |
| | 8 | +$messages = array(); |
| | 9 | + |
| | 10 | +$messages['en'] = array( |
| | 11 | + 'semanticsignup' => 'Semantic Signup', |
| | 12 | + 'ses-desc' => 'A MediaWiki extension built on top of Semantic Forms allowing to populate a user page with semantic data at signup time', |
| | 13 | + 'nousername' => 'Username has not been specified', |
| | 14 | + 'nopwdmatch' => 'Password and password confirmation don\'t match', |
| | 15 | + 'norealname' => 'Real name is required but has not been specified', |
| | 16 | + 'userexists' => 'User already exists', |
| | 17 | + 'invaliduname' => 'Username specified is not allowed', |
| | 18 | + 'emailfailed' => 'Confirmation email sending failed', |
| | 19 | + 'createforbidden' => 'Current user is not allowed to create accounts', |
| | 20 | + 'throttlehit' => 'New user accounts number maximum per day has been exceeded for this IP', |
| | 21 | + 'ses_userexists' => 'User already exists' |
| | 22 | +); |
| Property changes on: branches/extensions-realtime/SemanticSignup/SemanticSignup.i18n.php |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 23 | + native |
| Index: branches/extensions-realtime/SemanticSignup/SemanticSignup.settings.php |
| — | — | @@ -0,0 +1,46 @@ |
| | 2 | +<?php |
| | 3 | + |
| | 4 | +/** |
| | 5 | + * File defining the settings for the SemanticSignup extension. |
| | 6 | + * More info can be found at http://www.mediawiki.org/wiki/Extension:SemanticSignup#Settings |
| | 7 | + * |
| | 8 | + * NOTICE: |
| | 9 | + * Changing one of these settings can be done by copying or cutting it, |
| | 10 | + * and placing it in LocalSettings.php, AFTER the inclusion of this extension. |
| | 11 | + * |
| | 12 | + * @file SemanticSignup.settings.php |
| | 13 | + * @ingroup SemanticSignup |
| | 14 | + * |
| | 15 | + * @licence GNU GPL v3+ |
| | 16 | + * @author Jeroen De Dauw < jeroendedauw@gmail.com > |
| | 17 | + */ |
| | 18 | + |
| | 19 | +class SemanticSignupSettings { |
| | 20 | + |
| | 21 | + protected static function getDefaultSettings() { |
| | 22 | + return array( |
| | 23 | + 'requireName' => false, |
| | 24 | + 'formName' => '', |
| | 25 | + 'botName' => '', |
| | 26 | + ); |
| | 27 | + } |
| | 28 | + |
| | 29 | + public static function getSettings() { |
| | 30 | + static $settings = false; |
| | 31 | + |
| | 32 | + if ( $settings === false ) { |
| | 33 | + $settings = array_merge( |
| | 34 | + self::getDefaultSettings(), |
| | 35 | + $GLOBALS['egSemanticSignupSettings'] |
| | 36 | + ); |
| | 37 | + } |
| | 38 | + |
| | 39 | + return $settings; |
| | 40 | + } |
| | 41 | + |
| | 42 | + public static function get( $settingName ) { |
| | 43 | + $settings = self::getSettings(); |
| | 44 | + return array_key_exists( $settingName, $settings ) ? $settings[$settingName] : null; |
| | 45 | + } |
| | 46 | + |
| | 47 | +} |
| Property changes on: branches/extensions-realtime/SemanticSignup/SemanticSignup.settings.php |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 48 | + native |
| Property changes on: branches/extensions-realtime/CodeReview |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2 | 49 | Merged /trunk/extensions/CodeReview:r94187-94267 |
| Index: branches/extensions-realtime/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/MwEmbedSupport.php |
| — | — | @@ -36,8 +36,9 @@ |
| 37 | 37 | ), |
| 38 | 38 | 'mediawiki.UtilitiesTime' => array( 'scripts' => 'mediawiki/mediawiki.UtilitiesTime.js' ), |
| 39 | 39 | 'mediawiki.client' => array( 'scripts' => 'mediawiki/mediawiki.client.js' ), |
| 40 | | - 'mediawiki.Uri' => array( 'scripts' => 'mediawiki/mediawiki.Uri.js' ), |
| 41 | | - 'mediawiki.absoluteUrl' => array( 'scripts' => 'mediawiki/mediawiki.absoluteUrl.js' ), |
| | 40 | + 'mediawiki.absoluteUrl' => array( 'scripts' => 'mediawiki/mediawiki.absoluteUrl.js', |
| | 41 | + 'dependancies' => array( 'mediawiki.Uri' ), |
| | 42 | + ), |
| 42 | 43 | |
| 43 | 44 | 'mediawiki.language.parser' => array( |
| 44 | 45 | 'scripts'=> 'mediawiki/mediawiki.language.parser.js', |
| Index: branches/extensions-realtime/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/mediawiki/mediawiki.Uri.js |
| — | — | @@ -1,250 +0,0 @@ |
| 2 | | -/** |
| 3 | | - * Library for simple URI parsing and manipulation. Requires jQuery. |
| 4 | | - * |
| 5 | | - * Do not expect full RFC 3986 compliance. Intended to be minimal, but featureful. |
| 6 | | - * The use cases we have in mind are constructing 'next page' or 'previous page' URLs, |
| 7 | | - * detecting whether we need to use cross-domain proxies for an API, constructing simple |
| 8 | | - * URL-based API calls, etc. |
| 9 | | - * |
| 10 | | - * Intended to compress very well if you use a JS-parsing minifier. |
| 11 | | - * |
| 12 | | - * Dependencies: mw, mw.Utilities, jQuery |
| 13 | | - * |
| 14 | | - * Example: |
| 15 | | - * |
| 16 | | - * var uri = new mw.Uri( 'http://foo.com/mysite/mypage.php?quux=2' ); |
| 17 | | - * |
| 18 | | - * if ( uri.host == 'foo.com' ) { |
| 19 | | - * uri.host = 'www.foo.com'; |
| 20 | | - * uri.extend( { bar: 1 } ); |
| 21 | | - * |
| 22 | | - * $( 'a#id1' ).setAttr( 'href', uri ); |
| 23 | | - * // anchor with id 'id1' now links to http://www.foo.com/mysite/mypage.php?bar=1&quux=2 |
| 24 | | - * |
| 25 | | - * $( 'a#id2' ).setAttr( 'href', uri.clone().extend( { bar: 3, pif: 'paf' } ) ); |
| 26 | | - * // anchor with id 'id2' now links to http://www.foo.com/mysite/mypage.php?bar=3&quux=2&pif=paf |
| 27 | | - * } |
| 28 | | - * |
| 29 | | - * Parsing here is regex based, so may not work on all URIs, but is good enough for most. |
| 30 | | - * |
| 31 | | - * Given a URI like |
| 32 | | - * 'http://usr:pwd@www.test.com:81/dir/dir.2/index.htm?q1=0&&test1&test2=value+%28escaped%29#top': |
| 33 | | - * The returned object will have the following properties: |
| 34 | | - * |
| 35 | | - * protocol 'http' |
| 36 | | - * user 'usr' |
| 37 | | - * password 'pwd' |
| 38 | | - * host 'www.test.com' |
| 39 | | - * port '81' |
| 40 | | - * path '/dir/dir.2/index.htm' |
| 41 | | - * query { q1: 0, test1: '', test2: 'value (escaped)' } |
| 42 | | - * fragment 'top' |
| 43 | | - * |
| 44 | | - * n.b. 'password' is not technically allowed for HTTP URIs, but it is possible with other sorts of URIs. |
| 45 | | - * |
| 46 | | - * You can modify the properties directly. Then use the toString() method to extract the full URI string again. |
| 47 | | - * |
| 48 | | - * parsing based on parseUri 1.2.2 (c) Steven Levithan <stevenlevithan.com> MIT License |
| 49 | | - * http://stevenlevithan.com/demo/parseuri/js/ |
| 50 | | - * |
| 51 | | - */ |
| 52 | | - |
| 53 | | -( function( mw, $ ) { |
| 54 | | - /** |
| 55 | | - * Constructs URI object. Throws error if arguments are illegal/impossible, or otherwise don't parse. |
| 56 | | - * @constructor |
| 57 | | - * @param {!Object|String} URI string, or an Object with appropriate properties (especially another URI object to clone). Object must have non-blank 'protocol', 'host', and 'path' properties. |
| 58 | | - * @param {Boolean} strict mode (when parsing a string) |
| 59 | | - */ |
| 60 | | - mw.Uri = function( uri, strictMode ) { |
| 61 | | - strictMode = !!strictMode; |
| 62 | | - if ( mw.isFull( uri ) ) { |
| 63 | | - if ( typeof uri === 'string' ) { |
| 64 | | - this._parse( uri, strictMode ); |
| 65 | | - } else if ( typeof uri === 'object' ) { |
| 66 | | - var _this = this; |
| 67 | | - $.each( this._properties, function( i, property ) { |
| 68 | | - _this[property] = uri[property]; |
| 69 | | - } ); |
| 70 | | - if ( ! mw.isDefined( this.query ) ) { |
| 71 | | - this.query = {}; |
| 72 | | - } |
| 73 | | - } |
| 74 | | - } |
| 75 | | - //if ( !( this.protocol && this.host && this.path ) ) { |
| 76 | | - // throw new Error( "bad constructor arguments for " + uri); |
| 77 | | - //} |
| 78 | | - }; |
| 79 | | - |
| 80 | | - mw.Uri.prototype = { |
| 81 | | - |
| 82 | | - /** |
| 83 | | - * Standard encodeURIComponent, with extra stuff to make all browsers work similarly and more compliant with RFC 3986 |
| 84 | | - * @param {String} string |
| 85 | | - * @return {String} encoded for URI |
| 86 | | - */ |
| 87 | | - encode: function( component ) { |
| 88 | | - return encodeURIComponent( component ) |
| 89 | | - .replace( /!/g, '%21') |
| 90 | | - .replace( /'/g, '%27') |
| 91 | | - .replace( /\(/g, '%28') |
| 92 | | - .replace( /\)/g, '%29') |
| 93 | | - .replace( /\*/g, '%2A') |
| 94 | | - .replace( /%20/g, '+' ); |
| 95 | | - }, |
| 96 | | - |
| 97 | | - /** |
| 98 | | - * Standard decodeURIComponent, with '+' to space |
| 99 | | - * @param {String} string encoded for URI |
| 100 | | - * @return {String} decoded string |
| 101 | | - */ |
| 102 | | - decode: function( component ) { |
| 103 | | - return decodeURIComponent( component ).replace( /\+/g, ' ' ); |
| 104 | | - }, |
| 105 | | - |
| 106 | | - // regular expressions to parse many common URIs. |
| 107 | | - // @private |
| 108 | | - _parser: { |
| 109 | | - strict: /^(?:([^:\/?#]+):)?(?:\/\/(?:(?:([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?)?((?:[^?#\/]*\/)*[^?#]*)(?:\?([^#]*))?(?:#(.*))?/, |
| 110 | | - loose: /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?(?:(?:([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?((?:\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?[^?#\/]*)(?:\?([^#]*))?(?:#(.*))?/ |
| 111 | | - }, |
| 112 | | - |
| 113 | | - /* the order here matches the order of captured matches in the above parser regexes */ |
| 114 | | - // @private |
| 115 | | - _properties: [ |
| 116 | | - "protocol", // http |
| 117 | | - "user", // usr |
| 118 | | - "password", // pwd |
| 119 | | - "host", // www.test.com |
| 120 | | - "port", // 81 |
| 121 | | - "path", // /dir/dir.2/index.htm |
| 122 | | - "query", // q1=0&&test1&test2=value (will become { q1: 0, test1: '', test2: 'value' } ) |
| 123 | | - "fragment" // top |
| 124 | | - ], |
| 125 | | - |
| 126 | | - /** |
| 127 | | - * Parse a string and set our properties accordingly. |
| 128 | | - * @param {String} URI |
| 129 | | - * @param {Boolean} strictness |
| 130 | | - * @return {Boolean} success |
| 131 | | - */ |
| 132 | | - _parse: function( str, strictMode ) { |
| 133 | | - var matches = this._parser[ strictMode ? "strict" : "loose" ].exec( str ); |
| 134 | | - var uri = this; |
| 135 | | - $.each( uri._properties, function( i, property ) { |
| 136 | | - uri[ property ] = matches[ i+1 ]; |
| 137 | | - } ); |
| 138 | | - |
| 139 | | - // uri.query starts out as the query string; we will parse it into key-val pairs then make |
| 140 | | - // that object the "query" property. |
| 141 | | - // we overwrite query in uri way to make cloning easier, it can use the same list of properties. |
| 142 | | - var query = {}; |
| 143 | | - // using replace to iterate over a string |
| 144 | | - // JS 1.3 - function as parameter to replace |
| 145 | | - // Note: uri does not work with repeated parameter names (e.g. foo=1&foo=2 ) |
| 146 | | - if ( uri.query ) { |
| 147 | | - uri.query.replace( /(?:^|&)([^&=]*)=?([^&]*)/g, function ($0, $1, $2) { |
| 148 | | - if ( $1 ) { |
| 149 | | - query[ uri.decode( $1 ) ] = uri.decode( $2 ); |
| 150 | | - } |
| 151 | | - } ); |
| 152 | | - } |
| 153 | | - this.query = query; |
| 154 | | - }, |
| 155 | | - |
| 156 | | - /** |
| 157 | | - * Returns user and password portion of a URI. |
| 158 | | - * @return {String} |
| 159 | | - */ |
| 160 | | - getUserInfo: function() { |
| 161 | | - var userInfo = ''; |
| 162 | | - if ( mw.isFull( this.user ) ) { |
| 163 | | - userInfo += this.encode( this.user ); |
| 164 | | - if ( mw.isFull( this.password ) ) { |
| 165 | | - userInfo += ':' + this.encode( this.password ); |
| 166 | | - } |
| 167 | | - } |
| 168 | | - return userInfo; |
| 169 | | - }, |
| 170 | | - |
| 171 | | - /** |
| 172 | | - * Gets host and port portion of a URI. |
| 173 | | - * @return {String} |
| 174 | | - */ |
| 175 | | - getHostPort: function() { |
| 176 | | - return this.host |
| 177 | | - + ( mw.isFull( this.port ) ? ':' + this.port |
| 178 | | - : '' |
| 179 | | - ); |
| 180 | | - }, |
| 181 | | - |
| 182 | | - /** |
| 183 | | - * Returns the userInfo and host and port portion of the URI. |
| 184 | | - * In most real-world URLs, this is simply the hostname, but it is more general. |
| 185 | | - * @return {String} |
| 186 | | - */ |
| 187 | | - getAuthority: function() { |
| 188 | | - var userInfo = this.getUserInfo(); |
| 189 | | - return ( mw.isFull( userInfo ) ? userInfo + '@' |
| 190 | | - : '' |
| 191 | | - ) |
| 192 | | - + this.getHostPort(); |
| 193 | | - }, |
| 194 | | - |
| 195 | | - /** |
| 196 | | - * Returns the query arguments of the URL, encoded into a string |
| 197 | | - * Does not preserve the order of arguments passed into the URI. Does handle escaping. |
| 198 | | - * @return {String} |
| 199 | | - */ |
| 200 | | - getQueryString: function() { |
| 201 | | - var pairs = []; |
| 202 | | - var _this = this; |
| 203 | | - $.each( this.query, function( key, value ) { |
| 204 | | - pairs.push( _this.encode( key ) + '=' + _this.encode( value ) ); |
| 205 | | - } ); |
| 206 | | - return pairs.join( '&' ); |
| 207 | | - }, |
| 208 | | - |
| 209 | | - /** |
| 210 | | - * Returns everything after the authority section of the URI |
| 211 | | - * @return {String} |
| 212 | | - */ |
| 213 | | - getRelativePath: function() { |
| 214 | | - var queryString = this.getQueryString(); |
| 215 | | - return this.path |
| 216 | | - + ( mw.isFull( queryString ) ? '?' + queryString |
| 217 | | - : '' |
| 218 | | - ) |
| 219 | | - + ( mw.isFull( this.fragment ) ? '#' + this.encode( this.fragment ) |
| 220 | | - : '' |
| 221 | | - ); |
| 222 | | - }, |
| 223 | | - |
| 224 | | - /** |
| 225 | | - * Gets the entire URI string. May not be precisely the same as input due to order of query arguments. |
| 226 | | - * @return {String} the URI string |
| 227 | | - */ |
| 228 | | - toString: function() { |
| 229 | | - return this.protocol + '://' + this.getAuthority() + this.getRelativePath(); |
| 230 | | - }, |
| 231 | | - |
| 232 | | - /** |
| 233 | | - * Clone this URI |
| 234 | | - * @return {Object} new URI object with same properties |
| 235 | | - */ |
| 236 | | - clone: function() { |
| 237 | | - return new mw.Uri( this ); |
| 238 | | - }, |
| 239 | | - |
| 240 | | - /** |
| 241 | | - * Extend the query -- supply query parameters to override or add to ours |
| 242 | | - * @param {Object} query parameters in key-val form to override or add |
| 243 | | - * @return {Object} this URI object |
| 244 | | - */ |
| 245 | | - extend: function( parameters ) { |
| 246 | | - $.extend( this.query, parameters ); |
| 247 | | - return this; |
| 248 | | - } |
| 249 | | - }; |
| 250 | | - |
| 251 | | -} )( window.mediaWiki, jQuery ); |
| Index: branches/extensions-realtime/SemanticResultFormats/RELEASE-NOTES |
| — | — | @@ -5,6 +5,7 @@ |
| 6 | 6 | == SRF 1.6.1 == |
| 7 | 7 | |
| 8 | 8 | * Fixed rendering bug in the tagcloud format occuring for inline queries. |
| | 9 | +* Fixed jqPlotBar and jqPlotPie rendering on Special:Ask and other special pages. |
| 9 | 10 | |
| 10 | 11 | == SRF 1.6 == |
| 11 | 12 | |
| Index: branches/extensions-realtime/SemanticResultFormats/jqPlot/SRF_jqPlotPie.php |
| — | — | @@ -6,10 +6,6 @@ |
| 7 | 7 | * @author Yaron Koren |
| 8 | 8 | */ |
| 9 | 9 | |
| 10 | | -if ( !defined( 'MEDIAWIKI' ) ) { |
| 11 | | - die( 'Not an entry point.' ); |
| 12 | | -} |
| 13 | | - |
| 14 | 10 | class SRFjqPlotPie extends SMWResultPrinter { |
| 15 | 11 | protected $m_width = 400; |
| 16 | 12 | protected $m_height = 400; |
| — | — | @@ -105,9 +101,7 @@ |
| 106 | 102 | } |
| 107 | 103 | |
| 108 | 104 | protected function getResultText( SMWQueryResult $res, $outputmode ) { |
| 109 | | - global $wgOut, $wgParser; |
| 110 | | - |
| 111 | | - $wgParser->disableCache(); |
| | 105 | + global $wgOut; |
| 112 | 106 | |
| 113 | 107 | $this->addJavascriptAndCSS(); |
| 114 | 108 | |
| Index: branches/extensions-realtime/SemanticResultFormats/jqPlot/SRF_jqPlotBar.php |
| — | — | @@ -132,10 +132,8 @@ |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | protected function getResultText( SMWQueryResult $res, $outputmode ) { |
| 136 | | - global $wgOut, $wgParser; |
| | 136 | + global $wgOut; |
| 137 | 137 | |
| 138 | | - $wgParser->disableCache(); |
| 139 | | - |
| 140 | 138 | self::addJavascriptAndCSS(); |
| 141 | 139 | |
| 142 | 140 | $this->isHTML = true; |
| Property changes on: branches/extensions-realtime/Vector/modules/ext.vector.simpleSearch.js |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 143 | 141 | Merged /trunk/extensions/Vector/modules/ext.vector.simpleSearch.js:r94187-94267 |
| Property changes on: branches/extensions-realtime/Vector/modules/ext.vector.collapsibleTabs.js |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 144 | 142 | Merged /trunk/extensions/Vector/modules/ext.vector.collapsibleTabs.js:r94187-94267 |
| Property changes on: branches/extensions-realtime/CentralNotice/CentralNoticeBannerLogPager.php |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 145 | 143 | + native |
| Property changes on: branches/extensions-realtime/CentralNotice/CentralNoticePager.php |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 146 | 144 | + native |
| Property changes on: branches/extensions-realtime/CentralNotice/CentralNoticeLogPager.php |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 147 | 145 | + native |
| Property changes on: branches/extensions-realtime/HoneypotIntegration/HoneypotIntegration.class.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 148 | 146 | Merged /trunk/extensions/HoneypotIntegration/HoneypotIntegration.class.php:r94187-94267 |
| Property changes on: branches/extensions-realtime/ContactPageFundraiser |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 149 | 147 | Merged /trunk/extensions/ContactPageFundraiser:r94187-94267 |
| Index: branches/extensions-realtime/LocalisationUpdate/LocalisationUpdate.php |
| — | — | @@ -11,7 +11,7 @@ |
| 12 | 12 | /** |
| 13 | 13 | * Directory to store serialized cache files in. Defaults to $wgCacheDirectory. |
| 14 | 14 | * It's OK to share this directory among wikis as long as the wiki you run |
| 15 | | - * update.php on has all extensions the other wikis using the same directory |
| | 15 | + * update.php on has all extensions the other wikis using the same directory |
| 16 | 16 | * have. |
| 17 | 17 | * NOTE: If this variable and $wgCacheDirectory are both false, this extension |
| 18 | 18 | * WILL NOT WORK. |
| — | — | @@ -33,7 +33,6 @@ |
| 34 | 34 | |
| 35 | 35 | $wgLocalisationUpdateRetryAttempts = 5; |
| 36 | 36 | |
| 37 | | - |
| 38 | 37 | // Info about me! |
| 39 | 38 | $wgExtensionCredits['other'][] = array( |
| 40 | 39 | 'path' => __FILE__, |
| Index: branches/extensions-realtime/LocalisationUpdate/LocalisationUpdate.class.php |
| — | — | @@ -2,21 +2,21 @@ |
| 3 | 3 | |
| 4 | 4 | /** |
| 5 | 5 | * Class for localization updates. |
| 6 | | - * |
| | 6 | + * |
| 7 | 7 | * TODO: refactor code to remove duplication |
| 8 | 8 | */ |
| 9 | 9 | class LocalisationUpdate { |
| 10 | | - |
| | 10 | + |
| 11 | 11 | private static $newHashes = null; |
| 12 | 12 | private static $filecache = array(); |
| 13 | | - |
| | 13 | + |
| 14 | 14 | /** |
| 15 | 15 | * LocalisationCacheRecache hook handler. |
| 16 | | - * |
| | 16 | + * |
| 17 | 17 | * @param $lc LocalisationCache |
| 18 | 18 | * @param $langcode String |
| 19 | 19 | * @param $cache Array |
| 20 | | - * |
| | 20 | + * |
| 21 | 21 | * @return true |
| 22 | 22 | */ |
| 23 | 23 | public static function onRecache( LocalisationCache $lc, $langcode, array &$cache ) { |
| — | — | @@ -24,50 +24,50 @@ |
| 25 | 25 | $cache['messages'], |
| 26 | 26 | self::readFile( $langcode ) |
| 27 | 27 | ); |
| 28 | | - |
| | 28 | + |
| 29 | 29 | $cache['deps'][] = new FileDependency( |
| 30 | 30 | self::filename( $langcode ) |
| 31 | 31 | ); |
| 32 | | - |
| | 32 | + |
| 33 | 33 | return true; |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | /** |
| 37 | 37 | * Called from the cronjob to fetch new messages from SVN. |
| 38 | | - * |
| | 38 | + * |
| 39 | 39 | * @param $options Array |
| 40 | | - * |
| | 40 | + * |
| 41 | 41 | * @return true |
| 42 | 42 | */ |
| 43 | 43 | public static function updateMessages( array $options ) { |
| 44 | 44 | global $wgLocalisationUpdateDirectory; |
| 45 | | - |
| | 45 | + |
| 46 | 46 | $verbose = !isset( $options['quiet'] ); |
| 47 | 47 | $all = isset( $options['all'] ); |
| 48 | 48 | $skipCore = isset( $options['skip-core'] ); |
| 49 | 49 | $skipExtensions = isset( $options['skip-extensions'] ); |
| 50 | | - |
| | 50 | + |
| 51 | 51 | if( isset( $options['outdir'] ) ) { |
| 52 | 52 | $wgLocalisationUpdateDirectory = $options['outdir']; |
| 53 | 53 | } |
| 54 | | - |
| | 54 | + |
| 55 | 55 | $result = 0; |
| 56 | | - |
| | 56 | + |
| 57 | 57 | // Update all MW core messages. |
| 58 | 58 | if( !$skipCore ) { |
| 59 | 59 | $result = self::updateMediawikiMessages( $verbose ); |
| 60 | 60 | } |
| 61 | | - |
| | 61 | + |
| 62 | 62 | // Update all Extension messages. |
| 63 | 63 | if( !$skipExtensions ) { |
| 64 | 64 | if( $all ) { |
| 65 | 65 | global $IP; |
| 66 | 66 | $extFiles = array(); |
| 67 | | - |
| | 67 | + |
| 68 | 68 | // Look in extensions/ for all available items... |
| 69 | 69 | // TODO: add support for $wgExtensionAssetsPath |
| 70 | 70 | $dirs = new RecursiveDirectoryIterator( "$IP/extensions/" ); |
| 71 | | - |
| | 71 | + |
| 72 | 72 | // I ain't kidding... RecursiveIteratorIterator. |
| 73 | 73 | foreach( new RecursiveIteratorIterator( $dirs ) as $pathname => $item ) { |
| 74 | 74 | $filename = basename( $pathname ); |
| — | — | @@ -85,30 +85,30 @@ |
| 86 | 86 | $result += self::updateExtensionMessages( $locFile, $extension, $verbose ); |
| 87 | 87 | } |
| 88 | 88 | } |
| 89 | | - |
| | 89 | + |
| 90 | 90 | self::writeHashes(); |
| 91 | 91 | |
| 92 | 92 | // And output the result! |
| 93 | 93 | self::myLog( "Updated {$result} messages in total" ); |
| 94 | 94 | self::myLog( "Done" ); |
| 95 | | - |
| | 95 | + |
| 96 | 96 | return true; |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | /** |
| 100 | 100 | * Update Extension Messages. |
| 101 | | - * |
| | 101 | + * |
| 102 | 102 | * @param $file String |
| 103 | 103 | * @param $extension String |
| 104 | 104 | * @param $verbose Boolean |
| 105 | | - * |
| | 105 | + * |
| 106 | 106 | * @return Integer: the amount of updated messages |
| 107 | 107 | */ |
| 108 | 108 | public static function updateExtensionMessages( $file, $extension, $verbose ) { |
| 109 | 109 | global $IP, $wgLocalisationUpdateSVNURL; |
| 110 | | - |
| | 110 | + |
| 111 | 111 | $relfile = wfRelativePath( $file, "$IP/extensions" ); |
| 112 | | - |
| | 112 | + |
| 113 | 113 | // Create a full path. |
| 114 | 114 | // TODO: add support for $wgExtensionAssetsPath |
| 115 | 115 | $localfile = "$IP/extensions/$relfile"; |
| — | — | @@ -119,15 +119,15 @@ |
| 120 | 120 | |
| 121 | 121 | // Compare the 2 files. |
| 122 | 122 | $result = self::compareExtensionFiles( $extension, $svnfile, $file, $verbose, false, true ); |
| 123 | | - |
| | 123 | + |
| 124 | 124 | return $result; |
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | /** |
| 128 | 128 | * Update the Mediawiki Core Messages. |
| 129 | | - * |
| | 129 | + * |
| 130 | 130 | * @param $verbose Boolean |
| 131 | | - * |
| | 131 | + * |
| 132 | 132 | * @return Integer: the amount of updated messages |
| 133 | 133 | */ |
| 134 | 134 | public static function updateMediawikiMessages( $verbose ) { |
| — | — | @@ -173,22 +173,22 @@ |
| 174 | 174 | |
| 175 | 175 | // Compare the files. |
| 176 | 176 | $result = self::compareFiles( $svnfile, $localfile, $verbose, $changedEnglishStrings, false, true ); |
| 177 | | - |
| | 177 | + |
| 178 | 178 | // And update the change counter. |
| 179 | 179 | $changedCount += count( $result ); |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | // Log some nice info. |
| 183 | 183 | self::myLog( "{$changedCount} Mediawiki messages are updated" ); |
| 184 | | - |
| | 184 | + |
| 185 | 185 | return $changedCount; |
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | /** |
| 189 | 189 | * Removes all unneeded content from a file and returns it. |
| 190 | | - * |
| | 190 | + * |
| 191 | 191 | * @param $contents String |
| 192 | | - * |
| | 192 | + * |
| 193 | 193 | * @return String |
| 194 | 194 | */ |
| 195 | 195 | public static function cleanupFile( $contents ) { |
| — | — | @@ -199,9 +199,9 @@ |
| 200 | 200 | '?' . '>' => '' |
| 201 | 201 | ) |
| 202 | 202 | ); |
| 203 | | - |
| | 203 | + |
| 204 | 204 | $results = array(); |
| 205 | | - |
| | 205 | + |
| 206 | 206 | // And we only want the messages array. |
| 207 | 207 | preg_match( "/\\\$messages(.*\s)*?\);/", $contents, $results ); |
| 208 | 208 | |
| — | — | @@ -218,26 +218,26 @@ |
| 219 | 219 | // Return the cleaned up file. |
| 220 | 220 | return $contents; |
| 221 | 221 | } |
| 222 | | - |
| | 222 | + |
| 223 | 223 | /** |
| 224 | 224 | * Removes all unneeded content from a file and returns it. |
| 225 | | - * |
| 226 | | - * FIXME: duplicated cleanupFile code |
| 227 | | - * |
| | 225 | + * |
| | 226 | + * FIXME: duplicated cleanupFile code |
| | 227 | + * |
| 228 | 228 | * @param $contents String |
| 229 | | - * |
| | 229 | + * |
| 230 | 230 | * @return string |
| 231 | 231 | */ |
| 232 | 232 | public static function cleanupExtensionFile( $contents ) { |
| 233 | 233 | // We don't want PHP tags. |
| 234 | 234 | $contents = preg_replace( "/<\?php/", "", $contents ); |
| 235 | 235 | $contents = preg_replace( "/\?" . ">/", "", $contents ); |
| 236 | | - |
| | 236 | + |
| 237 | 237 | $results = array(); |
| 238 | | - |
| | 238 | + |
| 239 | 239 | // And we only want message arrays. |
| 240 | 240 | preg_match_all( "/\\\$messages(.*\s)*?\);/", $contents, $results ); |
| 241 | | - |
| | 241 | + |
| 242 | 242 | // But we want them all in one string. |
| 243 | 243 | if( !empty( $results[0] ) && is_array( $results[0] ) ) { |
| 244 | 244 | $contents = implode( "\n\n", $results[0] ); |
| — | — | @@ -247,23 +247,23 @@ |
| 248 | 248 | |
| 249 | 249 | // And we hate the windows vs linux linebreaks. |
| 250 | 250 | $contents = preg_replace( "/\\\r\\\n?/", "\n", $contents ); |
| 251 | | - |
| | 251 | + |
| 252 | 252 | return $contents; |
| 253 | | - } |
| | 253 | + } |
| 254 | 254 | |
| 255 | 255 | /** |
| 256 | 256 | * Returns the contents of a file or false on failiure. |
| 257 | | - * |
| | 257 | + * |
| 258 | 258 | * @param $basefile String |
| 259 | | - * |
| | 259 | + * |
| 260 | 260 | * @return string or false |
| 261 | 261 | */ |
| 262 | 262 | public static function getFileContents( $basefile ) { |
| 263 | 263 | global $wgLocalisationUpdateRetryAttempts; |
| 264 | | - |
| | 264 | + |
| 265 | 265 | $attempts = 0; |
| 266 | 266 | $basefilecontents = ''; |
| 267 | | - |
| | 267 | + |
| 268 | 268 | // Use cURL to get the SVN contents. |
| 269 | 269 | if ( preg_match( "/^http/", $basefile ) ) { |
| 270 | 270 | while( !$basefilecontents && $attempts <= $wgLocalisationUpdateRetryAttempts ) { |
| — | — | @@ -272,7 +272,7 @@ |
| 273 | 273 | self::myLog( 'Failed to download ' . $basefile . "; retrying in ${delay}s..." ); |
| 274 | 274 | sleep( $delay ); |
| 275 | 275 | } |
| 276 | | - |
| | 276 | + |
| 277 | 277 | $basefilecontents = Http::get( $basefile ); |
| 278 | 278 | $attempts++; |
| 279 | 279 | } |
| — | — | @@ -286,20 +286,20 @@ |
| 287 | 287 | return false; |
| 288 | 288 | } |
| 289 | 289 | } |
| 290 | | - |
| | 290 | + |
| 291 | 291 | return $basefilecontents; |
| 292 | 292 | } |
| 293 | 293 | |
| 294 | 294 | /** |
| 295 | 295 | * Returns an array containing the differences between the files. |
| 296 | | - * |
| | 296 | + * |
| 297 | 297 | * @param $basefile String |
| 298 | 298 | * @param $comparefile String |
| 299 | 299 | * @param $verbose Boolean |
| 300 | 300 | * @param $forbiddenKeys Array |
| 301 | 301 | * @param $alwaysGetResult Boolean |
| 302 | 302 | * @param $saveResults Boolean |
| 303 | | - * |
| | 303 | + * |
| 304 | 304 | * @return array |
| 305 | 305 | */ |
| 306 | 306 | public static function compareFiles( $basefile, $comparefile, $verbose, array $forbiddenKeys = array(), $alwaysGetResult = true, $saveResults = false ) { |
| — | — | @@ -307,7 +307,7 @@ |
| 308 | 308 | $langcode = Language::getCodeFromFileName( $basefile, 'Messages' ); |
| 309 | 309 | |
| 310 | 310 | $basefilecontents = self::getFileContents( $basefile ); |
| 311 | | - |
| | 311 | + |
| 312 | 312 | if ( $basefilecontents === false || $basefilecontents === '' ) { |
| 313 | 313 | return array(); // Failed |
| 314 | 314 | } |
| — | — | @@ -318,7 +318,7 @@ |
| 319 | 319 | // Change the variable name. |
| 320 | 320 | $basefilecontents = preg_replace( "/\\\$messages/", "\$base_messages", $basefilecontents ); |
| 321 | 321 | $basehash = md5( $basefilecontents ); |
| 322 | | - |
| | 322 | + |
| 323 | 323 | // Check if the file has changed since our last update. |
| 324 | 324 | if ( !$alwaysGetResult ) { |
| 325 | 325 | if ( !self::checkHash( $basefile, $basehash ) ) { |
| — | — | @@ -331,7 +331,7 @@ |
| 332 | 332 | $base_messages = self::parsePHP( $basefilecontents, 'base_messages' ); |
| 333 | 333 | |
| 334 | 334 | $comparefilecontents = self::getFileContents( $comparefile ); |
| 335 | | - |
| | 335 | + |
| 336 | 336 | if ( $comparefilecontents === false || $comparefilecontents === '' ) { |
| 337 | 337 | return array(); // Failed |
| 338 | 338 | } |
| — | — | @@ -342,7 +342,7 @@ |
| 343 | 343 | // Rename the array. |
| 344 | 344 | $comparefilecontents = preg_replace( "/\\\$messages/", "\$compare_messages", $comparefilecontents ); |
| 345 | 345 | $comparehash = md5( $comparefilecontents ); |
| 346 | | - |
| | 346 | + |
| 347 | 347 | // If this is the remote file check if the file has changed since our last update. |
| 348 | 348 | if ( preg_match( "/^http/", $comparefile ) && !$alwaysGetResult ) { |
| 349 | 349 | if ( !self::checkHash( $comparefile, $comparehash ) ) { |
| — | — | @@ -350,7 +350,7 @@ |
| 351 | 351 | return array(); |
| 352 | 352 | } |
| 353 | 353 | } |
| 354 | | - |
| | 354 | + |
| 355 | 355 | // Get the array. |
| 356 | 356 | $compare_messages = self::parsePHP( $comparefilecontents, 'compare_messages' ); |
| 357 | 357 | |
| — | — | @@ -378,69 +378,69 @@ |
| 379 | 379 | } elseif ( $saveResults ) { |
| 380 | 380 | self::myLog( "--{$langcode} hasn't changed--", $verbose ); |
| 381 | 381 | } |
| 382 | | - |
| | 382 | + |
| 383 | 383 | self::saveHash( $basefile, $basehash ); |
| 384 | | - |
| | 384 | + |
| 385 | 385 | self::saveHash( $comparefile, $comparehash ); |
| 386 | | - |
| | 386 | + |
| 387 | 387 | return $changedStrings; |
| 388 | 388 | } |
| 389 | 389 | |
| 390 | 390 | /** |
| 391 | 391 | * Checks whether a messages file has a certain hash. |
| 392 | | - * |
| | 392 | + * |
| 393 | 393 | * TODO: Swap return values, this is insane |
| 394 | | - * |
| | 394 | + * |
| 395 | 395 | * @param $file string Filename |
| 396 | 396 | * @param $hash string Hash |
| 397 | | - * |
| | 397 | + * |
| 398 | 398 | * @return bool True if $file does NOT have hash $hash, false if it does |
| 399 | 399 | */ |
| 400 | 400 | public static function checkHash( $file, $hash ) { |
| 401 | 401 | $hashes = self::readFile( 'hashes' ); |
| 402 | 402 | return @$hashes[$file] !== $hash; |
| 403 | 403 | } |
| 404 | | - |
| | 404 | + |
| 405 | 405 | public static function saveHash( $file, $hash ) { |
| 406 | 406 | if ( is_null( self::$newHashes ) ) { |
| 407 | 407 | self::$newHashes = self::readFile( 'hashes' ); |
| 408 | 408 | } |
| 409 | | - |
| | 409 | + |
| 410 | 410 | self::$newHashes[$file] = $hash; |
| 411 | 411 | } |
| 412 | | - |
| | 412 | + |
| 413 | 413 | public static function writeHashes() { |
| 414 | 414 | self::writeFile( 'hashes', self::$newHashes ); |
| 415 | 415 | } |
| 416 | 416 | |
| 417 | 417 | /** |
| 418 | | - * |
| 419 | | - * |
| | 418 | + * |
| | 419 | + * |
| 420 | 420 | * @param $changedStrings Array |
| 421 | 421 | * @param $forbiddenKeys Array |
| 422 | 422 | * @param $compare_messages Array |
| 423 | 423 | * @param $base_messages Array |
| 424 | 424 | * @param $langcode String |
| 425 | 425 | * @param $verbose Boolean |
| 426 | | - * |
| | 426 | + * |
| 427 | 427 | * @return Integer: the amount of updated messages |
| 428 | 428 | */ |
| 429 | 429 | public static function saveChanges( $changedStrings, array $forbiddenKeys, array $compare_messages, array $base_messages, $langcode, $verbose ) { |
| 430 | 430 | // Count the updates. |
| 431 | 431 | $updates = 0; |
| 432 | | - |
| | 432 | + |
| 433 | 433 | if( !is_array( $changedStrings ) ) { |
| 434 | 434 | self::myLog("CRITICAL ERROR: \$changedStrings is not an array in file " . (__FILE__) . ' at line ' .( __LINE__ ) ); |
| 435 | 435 | return 0; |
| 436 | 436 | } |
| 437 | 437 | |
| 438 | 438 | $new_messages = self::readFile( $langcode ); |
| 439 | | - |
| | 439 | + |
| 440 | 440 | foreach ( $changedStrings as $key => $value ) { |
| 441 | 441 | // If this message wasn't changed in English. |
| 442 | 442 | if ( !isset( $forbiddenKeys[$key] ) ) { |
| 443 | 443 | $new_messages[$key] = $base_messages[$key]; |
| 444 | | - |
| | 444 | + |
| 445 | 445 | // Output extra logmessages when needed. |
| 446 | 446 | if ( $verbose ) { |
| 447 | 447 | $oldmsg = isset( $compare_messages[$key] ) ? "'{$compare_messages[$key]}'" : 'not set'; |
| — | — | @@ -452,26 +452,26 @@ |
| 453 | 453 | } |
| 454 | 454 | } |
| 455 | 455 | self::writeFile( $langcode, $new_messages ); |
| 456 | | - |
| | 456 | + |
| 457 | 457 | return $updates; |
| 458 | 458 | } |
| 459 | 459 | |
| 460 | 460 | /** |
| 461 | | - * |
| | 461 | + * |
| 462 | 462 | * @param $extension String |
| 463 | 463 | * @param $basefile String |
| 464 | 464 | * @param $comparefile String |
| 465 | 465 | * @param $verbose Boolean |
| 466 | 466 | * @param $alwaysGetResult Boolean |
| 467 | 467 | * @param $saveResults Boolean |
| 468 | | - * |
| | 468 | + * |
| 469 | 469 | * @return Integer: the amount of updated messages |
| 470 | 470 | */ |
| 471 | 471 | public static function compareExtensionFiles( $extension, $basefile, $comparefile, $verbose, $alwaysGetResult = true, $saveResults = false ) { |
| 472 | 472 | // FIXME: Factor out duplicated code? |
| 473 | 473 | |
| 474 | 474 | $basefilecontents = self::getFileContents( $basefile ); |
| 475 | | - |
| | 475 | + |
| 476 | 476 | if ( $basefilecontents === false || $basefilecontents === '' ) { |
| 477 | 477 | return 0; // Failed |
| 478 | 478 | } |
| — | — | @@ -482,7 +482,7 @@ |
| 483 | 483 | // Rename the arrays. |
| 484 | 484 | $basefilecontents = preg_replace( "/\\\$messages/", "\$base_messages", $basefilecontents ); |
| 485 | 485 | $basehash = md5( $basefilecontents ); |
| 486 | | - |
| | 486 | + |
| 487 | 487 | // If this is the remote file |
| 488 | 488 | if ( preg_match( "/^http/", $basefile ) && !$alwaysGetResult ) { |
| 489 | 489 | // Check if the hash has changed |
| — | — | @@ -578,21 +578,21 @@ |
| 579 | 579 | } elseif($saveResults === true) { |
| 580 | 580 | self::myLog( "--{$language} hasn't changed--", $verbose ); |
| 581 | 581 | } |
| 582 | | - } |
| | 582 | + } |
| 583 | 583 | |
| 584 | 584 | // And log some stuff. |
| 585 | 585 | self::myLog( "Updated " . $updates . " messages for the '{$extension}' extension", $verbose ); |
| 586 | 586 | |
| 587 | 587 | self::saveHash( $basefile, $basehash ); |
| 588 | | - |
| | 588 | + |
| 589 | 589 | self::saveHash( $comparefile, $comparehash ); |
| 590 | | - |
| | 590 | + |
| 591 | 591 | return $updates; |
| 592 | 592 | } |
| 593 | | - |
| | 593 | + |
| 594 | 594 | /** |
| 595 | 595 | * Logs a message. |
| 596 | | - * |
| | 596 | + * |
| 597 | 597 | * @param $log String |
| 598 | 598 | */ |
| 599 | 599 | public static function myLog( $log, $verbose = true ) { |
| — | — | @@ -605,7 +605,7 @@ |
| 606 | 606 | print( $log . "\n" ); |
| 607 | 607 | } |
| 608 | 608 | } |
| 609 | | - |
| | 609 | + |
| 610 | 610 | public static function parsePHP( $php, $varname ) { |
| 611 | 611 | try { |
| 612 | 612 | $reader = new QuickArrayReader("<?php $php"); |
| — | — | @@ -615,32 +615,32 @@ |
| 616 | 616 | return false; |
| 617 | 617 | } |
| 618 | 618 | } |
| 619 | | - |
| | 619 | + |
| 620 | 620 | public static function filename( $lang ) { |
| 621 | 621 | global $wgLocalisationUpdateDirectory, $wgCacheDirectory; |
| 622 | | - |
| | 622 | + |
| 623 | 623 | $dir = $wgLocalisationUpdateDirectory ? |
| 624 | 624 | $wgLocalisationUpdateDirectory : |
| 625 | 625 | $wgCacheDirectory; |
| 626 | | - |
| | 626 | + |
| 627 | 627 | if ( !$dir ) { |
| 628 | 628 | throw new MWException( 'No cache directory configured' ); |
| 629 | 629 | } |
| 630 | | - |
| | 630 | + |
| 631 | 631 | return "$dir/l10nupdate-$lang.cache"; |
| 632 | 632 | } |
| 633 | | - |
| | 633 | + |
| 634 | 634 | public static function readFile( $lang ) { |
| 635 | 635 | if ( !isset( self::$filecache[$lang] ) ) { |
| 636 | 636 | $file = self::filename( $lang ); |
| 637 | 637 | $contents = @file_get_contents( $file ); |
| 638 | | - |
| | 638 | + |
| 639 | 639 | if ( $contents === false ) { |
| 640 | 640 | wfDebug( "Failed to read file '$file'\n" ); |
| 641 | 641 | $retval = array(); |
| 642 | 642 | } else { |
| 643 | 643 | $retval = unserialize( $contents ); |
| 644 | | - |
| | 644 | + |
| 645 | 645 | if ( $retval === false ) { |
| 646 | 646 | wfDebug( "Corrupted data in file '$file'\n" ); |
| 647 | 647 | $retval = array(); |
| — | — | @@ -648,18 +648,18 @@ |
| 649 | 649 | } |
| 650 | 650 | self::$filecache[$lang] = $retval; |
| 651 | 651 | } |
| 652 | | - |
| | 652 | + |
| 653 | 653 | return self::$filecache[$lang]; |
| 654 | 654 | } |
| 655 | | - |
| | 655 | + |
| 656 | 656 | public static function writeFile( $lang, $var ) { |
| 657 | 657 | $file = self::filename( $lang ); |
| 658 | | - |
| | 658 | + |
| 659 | 659 | if ( !@file_put_contents( $file, serialize( $var ) ) ) { |
| 660 | 660 | throw new MWException( "Failed to write to file '$file'" ); |
| 661 | 661 | } |
| 662 | | - |
| | 662 | + |
| 663 | 663 | self::$filecache[$lang] = $var; |
| 664 | 664 | } |
| 665 | | - |
| 666 | | -} |
| \ No newline at end of file |
| | 665 | + |
| | 666 | +} |
| Property changes on: branches/extensions-realtime/LocalisationUpdate |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 667 | 667 | Merged /trunk/extensions/LocalisationUpdate:r94187-94267 |
| Property changes on: branches/extensions-realtime/StringFunctionsEscaped |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 668 | 668 | Merged /trunk/extensions/StringFunctionsEscaped:r94187-94267 |
| Index: branches/extensions-realtime/MobileFrontend/MobileFrontend.php |
| — | — | @@ -49,7 +49,7 @@ |
| 50 | 50 | $wgHooks['SkinTemplateOutputPageBeforeExec'][] = array( &$wgExtMobileFrontend, 'addMobileFooter' ); |
| 51 | 51 | |
| 52 | 52 | class ExtMobileFrontend { |
| 53 | | - const VERSION = '0.5.14'; |
| | 53 | + const VERSION = '0.5.18'; |
| 54 | 54 | |
| 55 | 55 | /** |
| 56 | 56 | * @var DOMDocument |
| — | — | @@ -173,34 +173,6 @@ |
| 174 | 174 | self::$title = $out->getTitle(); |
| 175 | 175 | self::$htmlTitle = $out->getHTMLTitle(); |
| 176 | 176 | |
| 177 | | - // Need to get copyright footer from skin. The footer changes depending |
| 178 | | - // on whether we're using the WikimediaMessages extension or not. |
| 179 | | - //$skin = $wgUser->getSkin(); |
| 180 | | - //$copyright = $skin->getCopyright(); |
| 181 | | - |
| 182 | | - // Need to stash the results of the "wfMsg" call before the Output Buffering handler |
| 183 | | - // because at this point the database connection is shut down, etc. |
| 184 | | - //self::$messages['mobile-frontend-show'] = wfMsg( 'mobile-frontend-show-button' ); |
| 185 | | - //self::$messages['mobile-frontend-hide'] = wfMsg( 'mobile-frontend-hide-button' ); |
| 186 | | - //self::$messages['mobile-frontend-back-to-top'] = wfMsg( 'mobile-frontend-back-to-top-of-section' ); |
| 187 | | - //self::$messages['mobile-frontend-regular-site'] = wfMsg( 'mobile-frontend-regular-site' ); |
| 188 | | - //self::$messages['mobile-frontend-perm-stop-redirect'] = wfMsg( 'mobile-frontend-perm-stop-redirect' ); |
| 189 | | - //self::$messages['mobile-frontend-copyright'] = $copyright; |
| 190 | | - //self::$messages['mobile-frontend-home-button'] = wfMsg( 'mobile-frontend-home-button' ); |
| 191 | | - //self::$messages['mobile-frontend-random-button'] = wfMsg( 'mobile-frontend-random-button' ); |
| 192 | | - //self::$messages['mobile-frontend-are-you-sure'] = wfMsg( 'mobile-frontend-are-you-sure' ); |
| 193 | | - //self::$messages['mobile-frontend-explain-disable'] = wfMsg( 'mobile-frontend-explain-disable' ); |
| 194 | | - //self::$messages['mobile-frontend-disable-button'] = wfMsg( 'mobile-frontend-disable-button' ); |
| 195 | | - //self::$messages['mobile-frontend-back-button'] = wfMsg( 'mobile-frontend-back-button' ); |
| 196 | | - |
| 197 | | - //self::$dir = $wgContLang->getDir(); |
| 198 | | - //self::$code = $wgContLang->getCode(); |
| 199 | | - |
| 200 | | - self::$disableImages = $wgRequest->getText( 'disableImages', 0 ); |
| 201 | | - |
| 202 | | - //self::$mainPageUrl = Title::newMainPage()->getLocalUrl(); |
| 203 | | - //self::$randomPageUrl = SpecialPage::getTitleFor( 'Randompage' )->getLocalUrl(); |
| 204 | | - |
| 205 | 177 | $userAgent = $_SERVER['HTTP_USER_AGENT']; |
| 206 | 178 | $uAmd5 = md5($userAgent); |
| 207 | 179 | |
| — | — | @@ -234,6 +206,8 @@ |
| 235 | 207 | // This is stated to be intended behavior, as per the following: [http://bugs.php.net/bug.php?id=40104] |
| 236 | 208 | |
| 237 | 209 | $mAction = $wgRequest->getText( 'mAction' ); |
| | 210 | + $action = $wgRequest->getText( 'action' ); |
| | 211 | + self::$disableImages = $wgRequest->getText( 'disableImages', 0 ); |
| 238 | 212 | self::$useFormat = $wgRequest->getText( 'useFormat' ); |
| 239 | 213 | self::$format = $wgRequest->getText( 'format' ); |
| 240 | 214 | self::$requestedSegment = $wgRequest->getText( 'seg', 0 ); |
| — | — | @@ -277,11 +251,11 @@ |
| 278 | 252 | } |
| 279 | 253 | |
| 280 | 254 | if ( $mAction == 'opt_in_cookie' ) { |
| 281 | | - $wgRequest->response()->setcookie( 'optin', '1' ); |
| | 255 | + $this->setOptInOutCookie( '1' ); |
| 282 | 256 | } |
| 283 | 257 | |
| 284 | 258 | if ( $mAction == 'opt_out_cookie' ) { |
| 285 | | - $wgRequest->response()->setcookie( 'optin', '' ); |
| | 259 | + $this->setOptInOutCookie( '' ); |
| 286 | 260 | } |
| 287 | 261 | |
| 288 | 262 | // Note: Temporarily disabling this section for trial deployment |
| — | — | @@ -320,18 +294,40 @@ |
| 321 | 295 | |
| 322 | 296 | // Determine |
| 323 | 297 | |
| 324 | | - $xDevice = $_SERVER['HTTP_X_DEVICE']; |
| | 298 | + $xDevice = isset( $_SERVER['HTTP_X_DEVICE'] ) ? $_SERVER['HTTP_X_DEVICE'] : ''; |
| 325 | 299 | |
| 326 | 300 | if (self::$useFormat === 'mobile' || |
| 327 | 301 | self::$useFormat === 'mobile-wap' || |
| 328 | | - isset( $xDevice ) ) { |
| 329 | | - $this->getMsg(); |
| 330 | | - $this->disableCaching(); |
| 331 | | - ob_start( array( $this, 'DOMParse' ) ); |
| | 302 | + !empty( $xDevice ) ) { |
| | 303 | + if ( $action !== 'edit' ) { |
| | 304 | + $this->getMsg(); |
| | 305 | + $this->disableCaching(); |
| | 306 | + ob_start( array( $this, 'DOMParse' ) ); |
| | 307 | + } |
| 332 | 308 | } |
| 333 | 309 | |
| 334 | 310 | return true; |
| 335 | 311 | } |
| | 312 | + |
| | 313 | + private function setOptInOutCookie( $value ) { |
| | 314 | + global $wgCookieDomain, $wgRequest; |
| | 315 | + $tempWgCookieDomain = $wgCookieDomain; |
| | 316 | + $wgCookieDomain = $this->getBaseDomain(); |
| | 317 | + $wgRequest->response()->setcookie( 'optin', $value ); |
| | 318 | + $wgCookieDomain = $tempWgCookieDomain; |
| | 319 | + } |
| | 320 | + |
| | 321 | + private function getBaseDomain() { |
| | 322 | + //Validates value as IP address |
| | 323 | + if( !filter_var( $_SERVER['HTTP_HOST'], FILTER_VALIDATE_IP ) ) { |
| | 324 | + $domainParts = explode( '.', $_SERVER['HTTP_HOST'] ); |
| | 325 | + $domainParts = array_reverse( $domainParts ); |
| | 326 | + //Although some browsers will accept cookies without the initial ., » RFC 2109 requires it to be included. |
| | 327 | + return '.' . $domainParts[1] . '.' . $domainParts[0]; |
| | 328 | + } else { |
| | 329 | + return $_SERVER['HTTP_HOST']; |
| | 330 | + } |
| | 331 | + } |
| 336 | 332 | |
| 337 | 333 | private function disableCaching() { |
| 338 | 334 | if ( isset( $_SERVER['HTTP_VIA'] ) && |
| Property changes on: branches/extensions-realtime/CategoryTree/CategoryTreeFunctions.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 339 | 335 | Merged /trunk/extensions/CategoryTree/CategoryTreeFunctions.php:r94187-94267 |
| Index: branches/extensions-realtime/AjaxLogin/AjaxLogin.php |
| — | — | @@ -43,7 +43,7 @@ |
| 44 | 44 | // Hook things up |
| 45 | 45 | $wgHooks['BeforePageDisplay'][] = 'AjaxLoginJS'; |
| 46 | 46 | $wgHooks['SkinAfterContent'][] = 'GetAjaxLoginForm'; |
| 47 | | -$wgHooks['ResourceLoaderConfigVars'][] = 'efAddAjaxLoginVariables'; |
| | 47 | +$wgHooks['ResourceLoaderGetConfigVars'][] = 'efAddAjaxLoginVariables'; |
| 48 | 48 | |
| 49 | 49 | /** |
| 50 | 50 | * Adds required JavaScript & CSS files to the HTML output of a page if AjaxLogin is enabled |
| Property changes on: branches/extensions-realtime/StrategyWiki/ActiveStrategy |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 51 | 51 | Merged /trunk/extensions/StrategyWiki/ActiveStrategy:r94187-94267 |
| Property changes on: branches/extensions-realtime/StrategyWiki |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 52 | 52 | Merged /trunk/extensions/StrategyWiki:r94187-94267 |
| Property changes on: branches/extensions-realtime |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 53 | 53 | Merged /trunk/extensions:r94187-94267 |