viewgit/inc/functions.php:22 Function utf8_encode() is deprecated [8192]
diff --git a/controllers/group_controller.php b/controllers/group_controller.php index 5a7d43479..886e796f6 100644 --- a/controllers/group_controller.php +++ b/controllers/group_controller.php @@ -384,7 +384,6 @@ class GroupController extends Controller implements CrawlConstants $data['page_id'] = $page_id; break; case "pages": - $data["PAGE_NAME"] = "pages"; $data["MODE"] = "pages"; $limit =isset($limit) ? $limit : 0; $num = (isset($_SESSION["MAX_PAGES_TO_SHOW"])) ? @@ -395,9 +394,25 @@ class GroupController extends Controller implements CrawlConstants } $data["LIMIT"] = $limit; $data["RESULTS_PER_PAGE"] = $num; - list($data["TOTAL_ROWS"], $data["PAGES"]) = - $group_model->getPageList( - $group['GROUP_ID'], $locale_tag, $filter, $limit, $num); + $data["FILTER"] = $filter; + $search_page_info = false; + if($filter != "") { + $search_page_info = $group_model->getPageInfoByName( + $group_id, $filter, $locale_tag, "read"); + } + if(!$search_page_info) { + list($data["TOTAL_ROWS"], $data["PAGES"]) = + $group_model->getPageList( + $group['GROUP_ID'], $locale_tag, $filter, $limit, + $num); + if($data["TOTAL_ROWS"] == 0) { + $data["MODE"] = "read"; + $page_name = $filter; + } + } else { + $data["MODE"] = "read"; + $page_name = $filter; + } break; } } @@ -408,8 +423,12 @@ class GroupController extends Controller implements CrawlConstants if(in_array($data["MODE"], array("read", "edit"))) { if(!isset($data["PAGE"]) || !$data['PAGE']) { $data["PAGE_NAME"] = $page_name; - $page_info = $group_model->getPageInfoByName($group_id, - $page_name, $locale_tag, $data["MODE"]); + if(isset($search_page_info) && $search_page_info) { + $page_info = $search_page_info; + } else { + $page_info = $group_model->getPageInfoByName($group_id, + $page_name, $locale_tag, $data["MODE"]); + } $data["PAGE"] = $page_info["PAGE"]; $data["PAGE_ID"] = $page_info["ID"]; $data["DISCUSS_THREAD"] = $page_info["DISCUSS_THREAD"]; diff --git a/locale/ar/configure.ini b/locale/ar/configure.ini index ad58f10e2..1176e9937 100755 --- a/locale/ar/configure.ini +++ b/locale/ar/configure.ini @@ -1038,7 +1038,7 @@ group_controller_page_reverted = "" ; group_controller.php line: 371 group_controller_revert_error = "" ; -; group_controller.php line: 404 +; group_controller.php line: 419 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -3333,25 +3333,37 @@ wiki_element_edit_reason = "" ; wiki_view.php line: 254 wiki_element_savebutton = "" ; -; wiki_view.php line: 314 +; wiki_view.php line: 278 +wiki_view_wiki_page_list = "" +; +; wiki_view.php line: 290 +wiki_view_filter_or_create = "" +; +; wiki_view.php line: 293 +wiki_element_search = "" +; +; wiki_view.php line: 297 +wiki_view_create_page = "" +; +; wiki_view.php line: 343 wiki_view_diff_current = "" ; -; wiki_view.php line: 315 +; wiki_view.php line: 344 wiki_view_diff_next = "" ; -; wiki_view.php line: 320 +; wiki_view.php line: 349 wiki_view_diff_current = "" ; -; wiki_view.php line: 323 +; wiki_view.php line: 352 wiki_view_diff_next = "" ; -; wiki_view.php line: 329 +; wiki_view.php line: 358 wiki_view_edited_by = "" ; -; wiki_view.php line: 330 +; wiki_view.php line: 362 wiki_view_page_len = "" ; -; wiki_view.php line: 332 +; wiki_view.php line: 364 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/ar/statistics.txt b/locale/ar/statistics.txt index 9be6a0c6e..87b79e8b5 100755 --- a/locale/ar/statistics.txt +++ b/locale/ar/statistics.txt @@ -1 +1 @@ -d:43; \ No newline at end of file +d:42; \ No newline at end of file diff --git a/locale/bn/configure.ini b/locale/bn/configure.ini index a90c0ff4a..2077be7e4 100755 --- a/locale/bn/configure.ini +++ b/locale/bn/configure.ini @@ -1038,7 +1038,7 @@ group_controller_page_reverted = "" ; group_controller.php line: 371 group_controller_revert_error = "" ; -; group_controller.php line: 404 +; group_controller.php line: 419 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -3333,25 +3333,37 @@ wiki_element_edit_reason = "" ; wiki_view.php line: 254 wiki_element_savebutton = "" ; -; wiki_view.php line: 314 +; wiki_view.php line: 278 +wiki_view_wiki_page_list = "" +; +; wiki_view.php line: 290 +wiki_view_filter_or_create = "" +; +; wiki_view.php line: 293 +wiki_element_search = "" +; +; wiki_view.php line: 297 +wiki_view_create_page = "" +; +; wiki_view.php line: 343 wiki_view_diff_current = "" ; -; wiki_view.php line: 315 +; wiki_view.php line: 344 wiki_view_diff_next = "" ; -; wiki_view.php line: 320 +; wiki_view.php line: 349 wiki_view_diff_current = "" ; -; wiki_view.php line: 323 +; wiki_view.php line: 352 wiki_view_diff_next = "" ; -; wiki_view.php line: 329 +; wiki_view.php line: 358 wiki_view_edited_by = "" ; -; wiki_view.php line: 330 +; wiki_view.php line: 362 wiki_view_page_len = "" ; -; wiki_view.php line: 332 +; wiki_view.php line: 364 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/de/configure.ini b/locale/de/configure.ini index ba4060dd5..553a4f412 100755 --- a/locale/de/configure.ini +++ b/locale/de/configure.ini @@ -1038,7 +1038,7 @@ group_controller_page_reverted = "" ; group_controller.php line: 371 group_controller_revert_error = "" ; -; group_controller.php line: 404 +; group_controller.php line: 419 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -3333,25 +3333,37 @@ wiki_element_edit_reason = "" ; wiki_view.php line: 254 wiki_element_savebutton = "" ; -; wiki_view.php line: 314 +; wiki_view.php line: 278 +wiki_view_wiki_page_list = "" +; +; wiki_view.php line: 290 +wiki_view_filter_or_create = "" +; +; wiki_view.php line: 293 +wiki_element_search = "" +; +; wiki_view.php line: 297 +wiki_view_create_page = "" +; +; wiki_view.php line: 343 wiki_view_diff_current = "" ; -; wiki_view.php line: 315 +; wiki_view.php line: 344 wiki_view_diff_next = "" ; -; wiki_view.php line: 320 +; wiki_view.php line: 349 wiki_view_diff_current = "" ; -; wiki_view.php line: 323 +; wiki_view.php line: 352 wiki_view_diff_next = "" ; -; wiki_view.php line: 329 +; wiki_view.php line: 358 wiki_view_edited_by = "" ; -; wiki_view.php line: 330 +; wiki_view.php line: 362 wiki_view_page_len = "" ; -; wiki_view.php line: 332 +; wiki_view.php line: 364 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/en-US/configure.ini b/locale/en-US/configure.ini index dd9f8521f..5fc67adb2 100755 --- a/locale/en-US/configure.ini +++ b/locale/en-US/configure.ini @@ -1038,7 +1038,7 @@ group_controller_page_reverted = "Page Reverted!" ; group_controller.php line: 371 group_controller_revert_error = "Error Reverting Page!" ; -; group_controller.php line: 404 +; group_controller.php line: 419 group_controller_main = "Main" ; ; machine_controller.php line: 174 @@ -3333,25 +3333,37 @@ wiki_element_edit_reason = "Edit Reason:" ; wiki_view.php line: 254 wiki_element_savebutton = "Save" ; -; wiki_view.php line: 314 +; wiki_view.php line: 278 +wiki_view_wiki_page_list = "%s Group Wiki Page List" +; +; wiki_view.php line: 290 +wiki_view_filter_or_create = "Search through group pages by title" +; +; wiki_view.php line: 293 +wiki_element_search = "Go" +; +; wiki_view.php line: 297 +wiki_view_create_page = "Create Page: %s" +; +; wiki_view.php line: 343 wiki_view_diff_current = "Cur" ; -; wiki_view.php line: 315 +; wiki_view.php line: 344 wiki_view_diff_next = "Next" ; -; wiki_view.php line: 320 +; wiki_view.php line: 349 wiki_view_diff_current = "Cur" ; -; wiki_view.php line: 323 +; wiki_view.php line: 352 wiki_view_diff_next = "Next" ; -; wiki_view.php line: 329 +; wiki_view.php line: 358 wiki_view_edited_by = "Edited by %s. " ; -; wiki_view.php line: 330 +; wiki_view.php line: 362 wiki_view_page_len = "(%s bytes)." ; -; wiki_view.php line: 332 +; wiki_view.php line: 364 wiki_view_revert = "Revert" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/es/configure.ini b/locale/es/configure.ini index 85c189211..9d78b1915 100755 --- a/locale/es/configure.ini +++ b/locale/es/configure.ini @@ -1038,7 +1038,7 @@ group_controller_page_reverted = "" ; group_controller.php line: 371 group_controller_revert_error = "" ; -; group_controller.php line: 404 +; group_controller.php line: 419 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -3333,25 +3333,37 @@ wiki_element_edit_reason = "" ; wiki_view.php line: 254 wiki_element_savebutton = "" ; -; wiki_view.php line: 314 +; wiki_view.php line: 278 +wiki_view_wiki_page_list = "" +; +; wiki_view.php line: 290 +wiki_view_filter_or_create = "" +; +; wiki_view.php line: 293 +wiki_element_search = "" +; +; wiki_view.php line: 297 +wiki_view_create_page = "" +; +; wiki_view.php line: 343 wiki_view_diff_current = "" ; -; wiki_view.php line: 315 +; wiki_view.php line: 344 wiki_view_diff_next = "" ; -; wiki_view.php line: 320 +; wiki_view.php line: 349 wiki_view_diff_current = "" ; -; wiki_view.php line: 323 +; wiki_view.php line: 352 wiki_view_diff_next = "" ; -; wiki_view.php line: 329 +; wiki_view.php line: 358 wiki_view_edited_by = "" ; -; wiki_view.php line: 330 +; wiki_view.php line: 362 wiki_view_page_len = "" ; -; wiki_view.php line: 332 +; wiki_view.php line: 364 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/fa/configure.ini b/locale/fa/configure.ini index 4dca0815f..3c078001b 100755 --- a/locale/fa/configure.ini +++ b/locale/fa/configure.ini @@ -1038,7 +1038,7 @@ group_controller_page_reverted = "" ; group_controller.php line: 371 group_controller_revert_error = "" ; -; group_controller.php line: 404 +; group_controller.php line: 419 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -3333,25 +3333,37 @@ wiki_element_edit_reason = "" ; wiki_view.php line: 254 wiki_element_savebutton = "" ; -; wiki_view.php line: 314 +; wiki_view.php line: 278 +wiki_view_wiki_page_list = "" +; +; wiki_view.php line: 290 +wiki_view_filter_or_create = "" +; +; wiki_view.php line: 293 +wiki_element_search = "" +; +; wiki_view.php line: 297 +wiki_view_create_page = "" +; +; wiki_view.php line: 343 wiki_view_diff_current = "" ; -; wiki_view.php line: 315 +; wiki_view.php line: 344 wiki_view_diff_next = "" ; -; wiki_view.php line: 320 +; wiki_view.php line: 349 wiki_view_diff_current = "" ; -; wiki_view.php line: 323 +; wiki_view.php line: 352 wiki_view_diff_next = "" ; -; wiki_view.php line: 329 +; wiki_view.php line: 358 wiki_view_edited_by = "" ; -; wiki_view.php line: 330 +; wiki_view.php line: 362 wiki_view_page_len = "" ; -; wiki_view.php line: 332 +; wiki_view.php line: 364 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/fr-FR/configure.ini b/locale/fr-FR/configure.ini index c5cbf8c08..df0251312 100755 --- a/locale/fr-FR/configure.ini +++ b/locale/fr-FR/configure.ini @@ -1038,7 +1038,7 @@ group_controller_page_reverted = "" ; group_controller.php line: 371 group_controller_revert_error = "" ; -; group_controller.php line: 404 +; group_controller.php line: 419 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -3333,25 +3333,37 @@ wiki_element_edit_reason = "" ; wiki_view.php line: 254 wiki_element_savebutton = "" ; -; wiki_view.php line: 314 +; wiki_view.php line: 278 +wiki_view_wiki_page_list = "" +; +; wiki_view.php line: 290 +wiki_view_filter_or_create = "" +; +; wiki_view.php line: 293 +wiki_element_search = "" +; +; wiki_view.php line: 297 +wiki_view_create_page = "" +; +; wiki_view.php line: 343 wiki_view_diff_current = "" ; -; wiki_view.php line: 315 +; wiki_view.php line: 344 wiki_view_diff_next = "" ; -; wiki_view.php line: 320 +; wiki_view.php line: 349 wiki_view_diff_current = "" ; -; wiki_view.php line: 323 +; wiki_view.php line: 352 wiki_view_diff_next = "" ; -; wiki_view.php line: 329 +; wiki_view.php line: 358 wiki_view_edited_by = "" ; -; wiki_view.php line: 330 +; wiki_view.php line: 362 wiki_view_page_len = "" ; -; wiki_view.php line: 332 +; wiki_view.php line: 364 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/he/configure.ini b/locale/he/configure.ini index 5ac9fac84..966292fb2 100755 --- a/locale/he/configure.ini +++ b/locale/he/configure.ini @@ -1038,7 +1038,7 @@ group_controller_page_reverted = "" ; group_controller.php line: 371 group_controller_revert_error = "" ; -; group_controller.php line: 404 +; group_controller.php line: 419 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -3333,25 +3333,37 @@ wiki_element_edit_reason = "" ; wiki_view.php line: 254 wiki_element_savebutton = "" ; -; wiki_view.php line: 314 +; wiki_view.php line: 278 +wiki_view_wiki_page_list = "" +; +; wiki_view.php line: 290 +wiki_view_filter_or_create = "" +; +; wiki_view.php line: 293 +wiki_element_search = "" +; +; wiki_view.php line: 297 +wiki_view_create_page = "" +; +; wiki_view.php line: 343 wiki_view_diff_current = "" ; -; wiki_view.php line: 315 +; wiki_view.php line: 344 wiki_view_diff_next = "" ; -; wiki_view.php line: 320 +; wiki_view.php line: 349 wiki_view_diff_current = "" ; -; wiki_view.php line: 323 +; wiki_view.php line: 352 wiki_view_diff_next = "" ; -; wiki_view.php line: 329 +; wiki_view.php line: 358 wiki_view_edited_by = "" ; -; wiki_view.php line: 330 +; wiki_view.php line: 362 wiki_view_page_len = "" ; -; wiki_view.php line: 332 +; wiki_view.php line: 364 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/hi/configure.ini b/locale/hi/configure.ini index 0c6e0276b..1a2219a10 100755 --- a/locale/hi/configure.ini +++ b/locale/hi/configure.ini @@ -1038,7 +1038,7 @@ group_controller_page_reverted = "" ; group_controller.php line: 371 group_controller_revert_error = "" ; -; group_controller.php line: 404 +; group_controller.php line: 419 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -3333,25 +3333,37 @@ wiki_element_edit_reason = "" ; wiki_view.php line: 254 wiki_element_savebutton = "" ; -; wiki_view.php line: 314 +; wiki_view.php line: 278 +wiki_view_wiki_page_list = "" +; +; wiki_view.php line: 290 +wiki_view_filter_or_create = "" +; +; wiki_view.php line: 293 +wiki_element_search = "" +; +; wiki_view.php line: 297 +wiki_view_create_page = "" +; +; wiki_view.php line: 343 wiki_view_diff_current = "" ; -; wiki_view.php line: 315 +; wiki_view.php line: 344 wiki_view_diff_next = "" ; -; wiki_view.php line: 320 +; wiki_view.php line: 349 wiki_view_diff_current = "" ; -; wiki_view.php line: 323 +; wiki_view.php line: 352 wiki_view_diff_next = "" ; -; wiki_view.php line: 329 +; wiki_view.php line: 358 wiki_view_edited_by = "" ; -; wiki_view.php line: 330 +; wiki_view.php line: 362 wiki_view_page_len = "" ; -; wiki_view.php line: 332 +; wiki_view.php line: 364 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/in-ID/configure.ini b/locale/in-ID/configure.ini index ac417f0b0..891ae7d73 100755 --- a/locale/in-ID/configure.ini +++ b/locale/in-ID/configure.ini @@ -1038,7 +1038,7 @@ group_controller_page_reverted = "" ; group_controller.php line: 371 group_controller_revert_error = "" ; -; group_controller.php line: 404 +; group_controller.php line: 419 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -3333,25 +3333,37 @@ wiki_element_edit_reason = "" ; wiki_view.php line: 254 wiki_element_savebutton = "" ; -; wiki_view.php line: 314 +; wiki_view.php line: 278 +wiki_view_wiki_page_list = "" +; +; wiki_view.php line: 290 +wiki_view_filter_or_create = "" +; +; wiki_view.php line: 293 +wiki_element_search = "" +; +; wiki_view.php line: 297 +wiki_view_create_page = "" +; +; wiki_view.php line: 343 wiki_view_diff_current = "" ; -; wiki_view.php line: 315 +; wiki_view.php line: 344 wiki_view_diff_next = "" ; -; wiki_view.php line: 320 +; wiki_view.php line: 349 wiki_view_diff_current = "" ; -; wiki_view.php line: 323 +; wiki_view.php line: 352 wiki_view_diff_next = "" ; -; wiki_view.php line: 329 +; wiki_view.php line: 358 wiki_view_edited_by = "" ; -; wiki_view.php line: 330 +; wiki_view.php line: 362 wiki_view_page_len = "" ; -; wiki_view.php line: 332 +; wiki_view.php line: 364 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/it/configure.ini b/locale/it/configure.ini index d73535351..73f048308 100755 --- a/locale/it/configure.ini +++ b/locale/it/configure.ini @@ -1038,7 +1038,7 @@ group_controller_page_reverted = "" ; group_controller.php line: 371 group_controller_revert_error = "" ; -; group_controller.php line: 404 +; group_controller.php line: 419 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -3333,25 +3333,37 @@ wiki_element_edit_reason = "" ; wiki_view.php line: 254 wiki_element_savebutton = "" ; -; wiki_view.php line: 314 +; wiki_view.php line: 278 +wiki_view_wiki_page_list = "" +; +; wiki_view.php line: 290 +wiki_view_filter_or_create = "" +; +; wiki_view.php line: 293 +wiki_element_search = "" +; +; wiki_view.php line: 297 +wiki_view_create_page = "" +; +; wiki_view.php line: 343 wiki_view_diff_current = "" ; -; wiki_view.php line: 315 +; wiki_view.php line: 344 wiki_view_diff_next = "" ; -; wiki_view.php line: 320 +; wiki_view.php line: 349 wiki_view_diff_current = "" ; -; wiki_view.php line: 323 +; wiki_view.php line: 352 wiki_view_diff_next = "" ; -; wiki_view.php line: 329 +; wiki_view.php line: 358 wiki_view_edited_by = "" ; -; wiki_view.php line: 330 +; wiki_view.php line: 362 wiki_view_page_len = "" ; -; wiki_view.php line: 332 +; wiki_view.php line: 364 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/ja/configure.ini b/locale/ja/configure.ini index 15bdf0ab3..0e7ddac51 100755 --- a/locale/ja/configure.ini +++ b/locale/ja/configure.ini @@ -1038,7 +1038,7 @@ group_controller_page_reverted = "" ; group_controller.php line: 371 group_controller_revert_error = "" ; -; group_controller.php line: 404 +; group_controller.php line: 419 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -3333,25 +3333,37 @@ wiki_element_edit_reason = "" ; wiki_view.php line: 254 wiki_element_savebutton = "" ; -; wiki_view.php line: 314 +; wiki_view.php line: 278 +wiki_view_wiki_page_list = "" +; +; wiki_view.php line: 290 +wiki_view_filter_or_create = "" +; +; wiki_view.php line: 293 +wiki_element_search = "" +; +; wiki_view.php line: 297 +wiki_view_create_page = "" +; +; wiki_view.php line: 343 wiki_view_diff_current = "" ; -; wiki_view.php line: 315 +; wiki_view.php line: 344 wiki_view_diff_next = "" ; -; wiki_view.php line: 320 +; wiki_view.php line: 349 wiki_view_diff_current = "" ; -; wiki_view.php line: 323 +; wiki_view.php line: 352 wiki_view_diff_next = "" ; -; wiki_view.php line: 329 +; wiki_view.php line: 358 wiki_view_edited_by = "" ; -; wiki_view.php line: 330 +; wiki_view.php line: 362 wiki_view_page_len = "" ; -; wiki_view.php line: 332 +; wiki_view.php line: 364 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/kn/configure.ini b/locale/kn/configure.ini index 53bea9b60..ae249af19 100755 --- a/locale/kn/configure.ini +++ b/locale/kn/configure.ini @@ -1038,7 +1038,7 @@ group_controller_page_reverted = "" ; group_controller.php line: 371 group_controller_revert_error = "" ; -; group_controller.php line: 404 +; group_controller.php line: 419 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -3333,25 +3333,37 @@ wiki_element_edit_reason = "" ; wiki_view.php line: 254 wiki_element_savebutton = "" ; -; wiki_view.php line: 314 +; wiki_view.php line: 278 +wiki_view_wiki_page_list = "" +; +; wiki_view.php line: 290 +wiki_view_filter_or_create = "" +; +; wiki_view.php line: 293 +wiki_element_search = "" +; +; wiki_view.php line: 297 +wiki_view_create_page = "" +; +; wiki_view.php line: 343 wiki_view_diff_current = "" ; -; wiki_view.php line: 315 +; wiki_view.php line: 344 wiki_view_diff_next = "" ; -; wiki_view.php line: 320 +; wiki_view.php line: 349 wiki_view_diff_current = "" ; -; wiki_view.php line: 323 +; wiki_view.php line: 352 wiki_view_diff_next = "" ; -; wiki_view.php line: 329 +; wiki_view.php line: 358 wiki_view_edited_by = "" ; -; wiki_view.php line: 330 +; wiki_view.php line: 362 wiki_view_page_len = "" ; -; wiki_view.php line: 332 +; wiki_view.php line: 364 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/ko/configure.ini b/locale/ko/configure.ini index a97c42e00..85b3f8ed0 100755 --- a/locale/ko/configure.ini +++ b/locale/ko/configure.ini @@ -1038,7 +1038,7 @@ group_controller_page_reverted = "" ; group_controller.php line: 371 group_controller_revert_error = "" ; -; group_controller.php line: 404 +; group_controller.php line: 419 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -3333,25 +3333,37 @@ wiki_element_edit_reason = "" ; wiki_view.php line: 254 wiki_element_savebutton = "" ; -; wiki_view.php line: 314 +; wiki_view.php line: 278 +wiki_view_wiki_page_list = "" +; +; wiki_view.php line: 290 +wiki_view_filter_or_create = "" +; +; wiki_view.php line: 293 +wiki_element_search = "" +; +; wiki_view.php line: 297 +wiki_view_create_page = "" +; +; wiki_view.php line: 343 wiki_view_diff_current = "" ; -; wiki_view.php line: 315 +; wiki_view.php line: 344 wiki_view_diff_next = "" ; -; wiki_view.php line: 320 +; wiki_view.php line: 349 wiki_view_diff_current = "" ; -; wiki_view.php line: 323 +; wiki_view.php line: 352 wiki_view_diff_next = "" ; -; wiki_view.php line: 329 +; wiki_view.php line: 358 wiki_view_edited_by = "" ; -; wiki_view.php line: 330 +; wiki_view.php line: 362 wiki_view_page_len = "" ; -; wiki_view.php line: 332 +; wiki_view.php line: 364 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/pl/configure.ini b/locale/pl/configure.ini index 7a58d0317..f8b1c4a06 100755 --- a/locale/pl/configure.ini +++ b/locale/pl/configure.ini @@ -1038,7 +1038,7 @@ group_controller_page_reverted = "" ; group_controller.php line: 371 group_controller_revert_error = "" ; -; group_controller.php line: 404 +; group_controller.php line: 419 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -3333,25 +3333,37 @@ wiki_element_edit_reason = "" ; wiki_view.php line: 254 wiki_element_savebutton = "" ; -; wiki_view.php line: 314 +; wiki_view.php line: 278 +wiki_view_wiki_page_list = "" +; +; wiki_view.php line: 290 +wiki_view_filter_or_create = "" +; +; wiki_view.php line: 293 +wiki_element_search = "" +; +; wiki_view.php line: 297 +wiki_view_create_page = "" +; +; wiki_view.php line: 343 wiki_view_diff_current = "" ; -; wiki_view.php line: 315 +; wiki_view.php line: 344 wiki_view_diff_next = "" ; -; wiki_view.php line: 320 +; wiki_view.php line: 349 wiki_view_diff_current = "" ; -; wiki_view.php line: 323 +; wiki_view.php line: 352 wiki_view_diff_next = "" ; -; wiki_view.php line: 329 +; wiki_view.php line: 358 wiki_view_edited_by = "" ; -; wiki_view.php line: 330 +; wiki_view.php line: 362 wiki_view_page_len = "" ; -; wiki_view.php line: 332 +; wiki_view.php line: 364 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/pt/configure.ini b/locale/pt/configure.ini index f73852d5c..e9a97bc68 100755 --- a/locale/pt/configure.ini +++ b/locale/pt/configure.ini @@ -1038,7 +1038,7 @@ group_controller_page_reverted = "" ; group_controller.php line: 371 group_controller_revert_error = "" ; -; group_controller.php line: 404 +; group_controller.php line: 419 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -3333,25 +3333,37 @@ wiki_element_edit_reason = "" ; wiki_view.php line: 254 wiki_element_savebutton = "" ; -; wiki_view.php line: 314 +; wiki_view.php line: 278 +wiki_view_wiki_page_list = "" +; +; wiki_view.php line: 290 +wiki_view_filter_or_create = "" +; +; wiki_view.php line: 293 +wiki_element_search = "" +; +; wiki_view.php line: 297 +wiki_view_create_page = "" +; +; wiki_view.php line: 343 wiki_view_diff_current = "" ; -; wiki_view.php line: 315 +; wiki_view.php line: 344 wiki_view_diff_next = "" ; -; wiki_view.php line: 320 +; wiki_view.php line: 349 wiki_view_diff_current = "" ; -; wiki_view.php line: 323 +; wiki_view.php line: 352 wiki_view_diff_next = "" ; -; wiki_view.php line: 329 +; wiki_view.php line: 358 wiki_view_edited_by = "" ; -; wiki_view.php line: 330 +; wiki_view.php line: 362 wiki_view_page_len = "" ; -; wiki_view.php line: 332 +; wiki_view.php line: 364 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/ru/configure.ini b/locale/ru/configure.ini index fb685cd80..5324bab9a 100755 --- a/locale/ru/configure.ini +++ b/locale/ru/configure.ini @@ -1038,7 +1038,7 @@ group_controller_page_reverted = "" ; group_controller.php line: 371 group_controller_revert_error = "" ; -; group_controller.php line: 404 +; group_controller.php line: 419 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -3333,25 +3333,37 @@ wiki_element_edit_reason = "" ; wiki_view.php line: 254 wiki_element_savebutton = "" ; -; wiki_view.php line: 314 +; wiki_view.php line: 278 +wiki_view_wiki_page_list = "" +; +; wiki_view.php line: 290 +wiki_view_filter_or_create = "" +; +; wiki_view.php line: 293 +wiki_element_search = "" +; +; wiki_view.php line: 297 +wiki_view_create_page = "" +; +; wiki_view.php line: 343 wiki_view_diff_current = "" ; -; wiki_view.php line: 315 +; wiki_view.php line: 344 wiki_view_diff_next = "" ; -; wiki_view.php line: 320 +; wiki_view.php line: 349 wiki_view_diff_current = "" ; -; wiki_view.php line: 323 +; wiki_view.php line: 352 wiki_view_diff_next = "" ; -; wiki_view.php line: 329 +; wiki_view.php line: 358 wiki_view_edited_by = "" ; -; wiki_view.php line: 330 +; wiki_view.php line: 362 wiki_view_page_len = "" ; -; wiki_view.php line: 332 +; wiki_view.php line: 364 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/te/configure.ini b/locale/te/configure.ini index 10aefd17f..ddd054f23 100755 --- a/locale/te/configure.ini +++ b/locale/te/configure.ini @@ -1038,7 +1038,7 @@ group_controller_page_reverted = "" ; group_controller.php line: 371 group_controller_revert_error = "" ; -; group_controller.php line: 404 +; group_controller.php line: 419 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -3333,25 +3333,37 @@ wiki_element_edit_reason = "" ; wiki_view.php line: 254 wiki_element_savebutton = "" ; -; wiki_view.php line: 314 +; wiki_view.php line: 278 +wiki_view_wiki_page_list = "" +; +; wiki_view.php line: 290 +wiki_view_filter_or_create = "" +; +; wiki_view.php line: 293 +wiki_element_search = "" +; +; wiki_view.php line: 297 +wiki_view_create_page = "" +; +; wiki_view.php line: 343 wiki_view_diff_current = "" ; -; wiki_view.php line: 315 +; wiki_view.php line: 344 wiki_view_diff_next = "" ; -; wiki_view.php line: 320 +; wiki_view.php line: 349 wiki_view_diff_current = "" ; -; wiki_view.php line: 323 +; wiki_view.php line: 352 wiki_view_diff_next = "" ; -; wiki_view.php line: 329 +; wiki_view.php line: 358 wiki_view_edited_by = "" ; -; wiki_view.php line: 330 +; wiki_view.php line: 362 wiki_view_page_len = "" ; -; wiki_view.php line: 332 +; wiki_view.php line: 364 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/th/configure.ini b/locale/th/configure.ini index d232bdf45..57a3ef264 100755 --- a/locale/th/configure.ini +++ b/locale/th/configure.ini @@ -1038,7 +1038,7 @@ group_controller_page_reverted = "" ; group_controller.php line: 371 group_controller_revert_error = "" ; -; group_controller.php line: 404 +; group_controller.php line: 419 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -3333,25 +3333,37 @@ wiki_element_edit_reason = "" ; wiki_view.php line: 254 wiki_element_savebutton = "" ; -; wiki_view.php line: 314 +; wiki_view.php line: 278 +wiki_view_wiki_page_list = "" +; +; wiki_view.php line: 290 +wiki_view_filter_or_create = "" +; +; wiki_view.php line: 293 +wiki_element_search = "" +; +; wiki_view.php line: 297 +wiki_view_create_page = "" +; +; wiki_view.php line: 343 wiki_view_diff_current = "" ; -; wiki_view.php line: 315 +; wiki_view.php line: 344 wiki_view_diff_next = "" ; -; wiki_view.php line: 320 +; wiki_view.php line: 349 wiki_view_diff_current = "" ; -; wiki_view.php line: 323 +; wiki_view.php line: 352 wiki_view_diff_next = "" ; -; wiki_view.php line: 329 +; wiki_view.php line: 358 wiki_view_edited_by = "" ; -; wiki_view.php line: 330 +; wiki_view.php line: 362 wiki_view_page_len = "" ; -; wiki_view.php line: 332 +; wiki_view.php line: 364 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/tr/configure.ini b/locale/tr/configure.ini index fba617ce2..e77c34809 100755 --- a/locale/tr/configure.ini +++ b/locale/tr/configure.ini @@ -1038,7 +1038,7 @@ group_controller_page_reverted = "" ; group_controller.php line: 371 group_controller_revert_error = "" ; -; group_controller.php line: 404 +; group_controller.php line: 419 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -3333,25 +3333,37 @@ wiki_element_edit_reason = "" ; wiki_view.php line: 254 wiki_element_savebutton = "" ; -; wiki_view.php line: 314 +; wiki_view.php line: 278 +wiki_view_wiki_page_list = "" +; +; wiki_view.php line: 290 +wiki_view_filter_or_create = "" +; +; wiki_view.php line: 293 +wiki_element_search = "" +; +; wiki_view.php line: 297 +wiki_view_create_page = "" +; +; wiki_view.php line: 343 wiki_view_diff_current = "" ; -; wiki_view.php line: 315 +; wiki_view.php line: 344 wiki_view_diff_next = "" ; -; wiki_view.php line: 320 +; wiki_view.php line: 349 wiki_view_diff_current = "" ; -; wiki_view.php line: 323 +; wiki_view.php line: 352 wiki_view_diff_next = "" ; -; wiki_view.php line: 329 +; wiki_view.php line: 358 wiki_view_edited_by = "" ; -; wiki_view.php line: 330 +; wiki_view.php line: 362 wiki_view_page_len = "" ; -; wiki_view.php line: 332 +; wiki_view.php line: 364 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/vi-VN/configure.ini b/locale/vi-VN/configure.ini index 5e0402c97..286f65fd3 100755 --- a/locale/vi-VN/configure.ini +++ b/locale/vi-VN/configure.ini @@ -1038,7 +1038,7 @@ group_controller_page_reverted = "" ; group_controller.php line: 371 group_controller_revert_error = "" ; -; group_controller.php line: 404 +; group_controller.php line: 419 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -3333,25 +3333,37 @@ wiki_element_edit_reason = "" ; wiki_view.php line: 254 wiki_element_savebutton = "" ; -; wiki_view.php line: 314 +; wiki_view.php line: 278 +wiki_view_wiki_page_list = "" +; +; wiki_view.php line: 290 +wiki_view_filter_or_create = "" +; +; wiki_view.php line: 293 +wiki_element_search = "" +; +; wiki_view.php line: 297 +wiki_view_create_page = "" +; +; wiki_view.php line: 343 wiki_view_diff_current = "" ; -; wiki_view.php line: 315 +; wiki_view.php line: 344 wiki_view_diff_next = "" ; -; wiki_view.php line: 320 +; wiki_view.php line: 349 wiki_view_diff_current = "" ; -; wiki_view.php line: 323 +; wiki_view.php line: 352 wiki_view_diff_next = "" ; -; wiki_view.php line: 329 +; wiki_view.php line: 358 wiki_view_edited_by = "" ; -; wiki_view.php line: 330 +; wiki_view.php line: 362 wiki_view_page_len = "" ; -; wiki_view.php line: 332 +; wiki_view.php line: 364 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/zh-CN/configure.ini b/locale/zh-CN/configure.ini index 8ebba3113..91ccf31ec 100755 --- a/locale/zh-CN/configure.ini +++ b/locale/zh-CN/configure.ini @@ -1038,7 +1038,7 @@ group_controller_page_reverted = "" ; group_controller.php line: 371 group_controller_revert_error = "" ; -; group_controller.php line: 404 +; group_controller.php line: 419 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -3333,25 +3333,37 @@ wiki_element_edit_reason = "" ; wiki_view.php line: 254 wiki_element_savebutton = "" ; -; wiki_view.php line: 314 +; wiki_view.php line: 278 +wiki_view_wiki_page_list = "" +; +; wiki_view.php line: 290 +wiki_view_filter_or_create = "" +; +; wiki_view.php line: 293 +wiki_element_search = "" +; +; wiki_view.php line: 297 +wiki_view_create_page = "" +; +; wiki_view.php line: 343 wiki_view_diff_current = "" ; -; wiki_view.php line: 315 +; wiki_view.php line: 344 wiki_view_diff_next = "" ; -; wiki_view.php line: 320 +; wiki_view.php line: 349 wiki_view_diff_current = "" ; -; wiki_view.php line: 323 +; wiki_view.php line: 352 wiki_view_diff_next = "" ; -; wiki_view.php line: 329 +; wiki_view.php line: 358 wiki_view_edited_by = "" ; -; wiki_view.php line: 330 +; wiki_view.php line: 362 wiki_view_page_len = "" ; -; wiki_view.php line: 332 +; wiki_view.php line: 364 wiki_view_revert = "" ; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins diff --git a/locale/zh-CN/statistics.txt b/locale/zh-CN/statistics.txt index 8f6a89ac6..68101b705 100755 --- a/locale/zh-CN/statistics.txt +++ b/locale/zh-CN/statistics.txt @@ -1 +1 @@ -d:13; \ No newline at end of file +d:12; \ No newline at end of file diff --git a/models/datasources/pdo_manager.php b/models/datasources/pdo_manager.php index e4c0ec081..a784bf9df 100644 --- a/models/datasources/pdo_manager.php +++ b/models/datasources/pdo_manager.php @@ -177,4 +177,4 @@ class PdoManager extends DatasourceManager } -?> \ No newline at end of file +?> diff --git a/models/group_model.php b/models/group_model.php index f80a12c66..bbb6d3fb3 100644 --- a/models/group_model.php +++ b/models/group_model.php @@ -889,16 +889,17 @@ class GroupModel extends Model $db = $this->db; $filter_parts = preg_split("/\s+/", $filter); $like = ""; + $params = array($group_id, $locale_tag); foreach($filter_parts as $part) { - $part = trim(mb_strtoupper($db->escapeString($part))); if($part != "") { - $like .= " AND UPPER(TITLE) LIKE %$part% "; + $like .= " AND UPPER(TITLE) LIKE ? "; + $params[] = "%$part%"; } } $sql = "SELECT COUNT(*) AS TOTAL FROM GROUP_PAGE WHERE GROUP_ID = ? AND LOCALE_TAG= ? $like"; - $result = $db->execute($sql, array($group_id, $locale_tag)); + $result = $db->execute($sql, $params); if($result) { $row = $db->fetchArray($result); $total = ($row) ? $row["TOTAL"] : 0; @@ -907,9 +908,9 @@ class GroupModel extends Model if($total > 0) { $sql = "SELECT TITLE, SUBSTR(PAGE,0, 100) AS DESCRIPTION FROM GROUP_PAGE WHERE GROUP_ID = ? AND - LOCALE_TAG= ? $like ORDER BY TITLE ASC ". + LOCALE_TAG= ? $like ORDER BY UPPER(TITLE) ASC ". $db->limitOffset($limit, $num); - $result = $db->execute($sql, array($group_id, $locale_tag)); + $result = $db->execute($sql, $params); $i = 0; if($result) { while($pages[$i] = $db->fetchArray($result)) { diff --git a/views/wiki_view.php b/views/wiki_view.php index 6113461c3..2f6593972 100644 --- a/views/wiki_view.php +++ b/views/wiki_view.php @@ -117,7 +117,7 @@ class WikiView extends View break; case "pages": - $this->renderPages($data); + $this->renderPages($data, $can_edit, $logged_in); break; case "history": @@ -262,17 +262,45 @@ class WikiView extends View /** * @param array $data */ - function renderPages($data) + function renderPages($data, $can_edit, $logged_in) { ?> <div class="small-margin-current-activity"> <?php $base_query = "?c=group&".CSRF_TOKEN."=". $data[CSRF_TOKEN] . "&group_id=". - $data["GROUP"]["GROUP_ID"]."&a=wiki&arg=read"; + $data["GROUP"]["GROUP_ID"]."&a=wiki"; + $create_query = $base_query . "&arg=edit&page_name=" . + $data["FILTER"]; + $base_query .= "&arg=read"; $paging_query = "?c=group&".CSRF_TOKEN."=". $data[CSRF_TOKEN] . "&group_id=". $data["GROUP"]["GROUP_ID"]."&a=wiki&arg=pages"; + e("<h2>".tl("wiki_view_wiki_page_list", + $data["GROUP"]["GROUP_NAME"]). "</h2>"); + ?> + <form id="editpageForm" method="get" action='#'> + <input type="hidden" name="c" value="group" /> + <input type="hidden" name="<?php e(CSRF_TOKEN); ?>" value="<?php + e($data[CSRF_TOKEN]); ?>" /> + <input type="hidden" name="a" value="wiki" /> + <input type="hidden" name="arg" value="pages" /> + <input type="hidden" name="group_id" value="<?php + e($data['GROUP']['GROUP_ID']); ?>" /> + <input type="text" name="filter" class="extra-wide-field" + placeholder="<?php e(tl("wiki_view_filter_or_create")); + ?>" value="<?php e($data['FILTER'])?>" /> + <button class="button-box" type="submit"><?php + e(tl('wiki_element_search')); ?></button> + </form> + <?php + if($data["FILTER"] != "") { + e("<a href='$create_query'>".tl("wiki_view_create_page", + $data['FILTER']) . "</a>"); + } + ?> + <div> </div> + <?php foreach($data['PAGES'] as $page) { ?> <div class='group-result'> @@ -333,8 +361,12 @@ class WikiView extends View e("<i>{$item["EDIT_REASON"]}</i>. "); } e(tl("wiki_view_page_len", $item["PAGE_LEN"])." "); - e("[<a href='$base_query&revert=".$item['PUBDATE']. + if($first && $data['LIMIT'] == 0) { + e("[<b>".tl("wiki_view_revert")."</b>]."); + } else { + e("[<a href='$base_query&revert=".$item['PUBDATE']. "'>".tl("wiki_view_revert")."</a>]."); + } $first = false; $next = $item['PUBDATE']; ?>