| Index: trunk/extensions/SemanticForms/includes/SF_FormClasses.inc |
| — | — | @@ -29,7 +29,7 @@ |
| 30 | 30 | function createMarkup() { |
| 31 | 31 | $title = Title::makeTitle( SF_NS_FORM, $this->form_name ); |
| 32 | 32 | $ad = SpecialPage::getPage('AddPage'); |
| 33 | | - $add_data_url = sffTitleURLString($ad->getTitle()) . "/" . $title->getPartialURL(); |
| | 33 | + $add_data_url = SFLinkUtils::titleURLString($ad->getTitle()) . "/" . $title->getPartialURL(); |
| 34 | 34 | $form_description = wfMsgForContent('sf_form_docu', $this->form_name, $add_data_url); |
| 35 | 35 | $form_input = "{{#forminput:" . $this->form_name . "}}\n"; |
| 36 | 36 | $text =<<<END |
| — | — | @@ -363,7 +363,7 @@ |
| 364 | 364 | $field_form_text = $template_num . "_" . $this->num; |
| 365 | 365 | $template_field = $this->template_field; |
| 366 | 366 | $text = '<h3>' . wfMsg('sf_createform_field') . " '" . $template_field->field_name . "'</h3>\n"; |
| 367 | | - $prop_link_text = sffLinkText(SMW_NS_PROPERTY, $template_field->semantic_field); |
| | 367 | + $prop_link_text = SFUtils::linkText(SMW_NS_PROPERTY, $template_field->semantic_field); |
| 368 | 368 | // TODO - remove this probably-unnecessary check? |
| 369 | 369 | if ($template_field->semantic_field == "") { |
| 370 | 370 | // print nothing if there's no semantic field |
| — | — | @@ -371,10 +371,10 @@ |
| 372 | 372 | $text .= '<p>' . wfMsg('sf_createform_fieldpropunknowntype', $prop_link_text) . "</p>\n"; |
| 373 | 373 | } elseif ($template_field->is_list) { |
| 374 | 374 | $text .= '<p>' . wfMsg('sf_createform_fieldproplist', $prop_link_text, |
| 375 | | - sffLinkText(SMW_NS_TYPE, $template_field->field_type)) . "</p>\n"; |
| | 375 | + SFUtils::linkText(SMW_NS_TYPE, $template_field->field_type)) . "</p>\n"; |
| 376 | 376 | } else { |
| 377 | 377 | $text .= '<p>' . wfMsg('sf_createform_fieldprop', $prop_link_text, |
| 378 | | - sffLinkText(SMW_NS_TYPE, $template_field->field_type)) . "</p>\n"; |
| | 378 | + SFUtils::linkText(SMW_NS_TYPE, $template_field->field_type)) . "</p>\n"; |
| 379 | 379 | } |
| 380 | 380 | // if it's not a semantic field - don't add any text |
| 381 | 381 | $form_label_text = wfMsg('sf_createform_formlabel'); |
| Index: trunk/extensions/SemanticForms/includes/SF_FormEditPage.php |
| — | — | @@ -36,7 +36,7 @@ |
| 37 | 37 | } |
| 38 | 38 | global $sfgIP; |
| 39 | 39 | $target_title = $this->mArticle->getTitle(); |
| 40 | | - $target_name = sffTitleString($target_title); |
| | 40 | + $target_name = SFLinkUtils::titleString($target_title); |
| 41 | 41 | if ($target_title->exists()) { |
| 42 | 42 | require_once($sfgIP . '/specials/SF_EditData.php'); |
| 43 | 43 | printEditForm($this->form_name, $target_name); |
| Index: trunk/extensions/SemanticForms/includes/SF_AutocompleteAPI.php |
| — | — | @@ -39,20 +39,20 @@ |
| 40 | 40 | $this->dieUsage("The substring must be specified", 'param_substr'); |
| 41 | 41 | } |
| 42 | 42 | if ($property != '') { |
| 43 | | - $data = sffGetAllValuesForProperty_1_2($property, $substr); |
| | 43 | + $data = SFUtils::getAllValuesForProperty_1_2($property, $substr); |
| 44 | 44 | } elseif ($relation != '') { |
| 45 | | - $data = sffGetAllValuesForProperty_orig(true, $relation, $substr); |
| | 45 | + $data = SFUtils::getAllValuesForProperty_orig(true, $relation, $substr); |
| 46 | 46 | } elseif ($attribute != '') { |
| 47 | | - $data = sffGetAllValuesForProperty_orig(false, $attribute, $substr); |
| | 47 | + $data = SFUtils::getAllValuesForProperty_orig(false, $attribute, $substr); |
| 48 | 48 | } elseif ($category != '') { |
| 49 | | - $data = sffGetAllPagesForCategory($category, 3, $substr); |
| | 49 | + $data = SFUtils::getAllPagesForCategory($category, 3, $substr); |
| 50 | 50 | } elseif ($concept != '') { |
| 51 | | - $data = sffGetAllPagesForConcept($concept, $substr); |
| | 51 | + $data = SFUtils::getAllPagesForConcept($concept, $substr); |
| 52 | 52 | } elseif ($namespace != '') { |
| 53 | 53 | // special handling for main (blank) namespace |
| 54 | 54 | if ($namespace == 'main') |
| 55 | 55 | $namespace = ''; |
| 56 | | - $data = sffGetAllPagesForNamespace($namespace, $substr); |
| | 56 | + $data = SFUtils::getAllPagesForNamespace($namespace, $substr); |
| 57 | 57 | } else { |
| 58 | 58 | $date = array(); |
| 59 | 59 | } |