diff --git a/blog.php b/blog.php index 6aea1c074..1fad3578b 100755 --- a/blog.php +++ b/blog.php @@ -33,8 +33,9 @@ * @copyright 2009 - 2014 * @filesource */ -$_REQUEST['c'] = "static"; -$_REQUEST['p'] = "blog"; +$_REQUEST['c'] = "group"; +$_REQUEST['a'] = "groupFeeds"; +$_REQUEST['just_group_id'] = 2; require_once("index.php"); -?> \ No newline at end of file +?> diff --git a/controllers/components/social_component.php b/controllers/components/social_component.php index dea92d65c..7886fb922 100644 --- a/controllers/components/social_component.php +++ b/controllers/components/social_component.php @@ -548,14 +548,23 @@ class SocialComponent extends Component implements CrawlConstants function groupFeeds() { $parent = $this->parent; + $controller_name = + (get_class($parent) == "AdminController") ? "admin" : "group"; + $other_controller_name = (get_class($parent) == "AdminController") + ? "group" : "admin"; $group_model = $parent->model("group"); $user_model = $parent->model("user"); $data["ELEMENT"] = "groupfeed"; $data['SCRIPT'] = ""; - $user_id = $_SESSION['USER_ID']; + if(isset($_SESSION['USER_ID'])) { + $user_id = $_SESSION['USER_ID']; + } else { + $user_id = PUBLIC_GROUP_ID; + } + $username = $user_model->getUsername($user_id); if(isset($_REQUEST['num'])) { - $results_per_page = $this->clean($_REQUEST['num'], "int"); + $results_per_page = $parent->clean($_REQUEST['num'], "int"); } else if(isset($_SESSION['MAX_PAGES_TO_SHOW']) ) { $results_per_page = $_SESSION['MAX_PAGES_TO_SHOW']; } else { @@ -849,7 +858,9 @@ class SocialComponent extends Component implements CrawlConstants $data['LIMIT'] = $limit; $data['RESULTS_PER_PAGE'] = $results_per_page; $data['PAGES'] = $pages; - $data['PAGING_QUERY'] = "?c=admin&a=groupFeeds"; + $data['PAGING_QUERY'] = "?c=$controller_name&a=groupFeeds"; + $data['OTHER_PAGING_QUERY'] = + "?c=$other_controller_name&a=groupFeeds"; return $data; } diff --git a/controllers/group_controller.php b/controllers/group_controller.php new file mode 100644 index 000000000..5c7c23be2 --- /dev/null +++ b/controllers/group_controller.php @@ -0,0 +1,214 @@ +<?php +/** + * SeekQuarry/Yioop -- + * Open Source Pure PHP Search Engine, Crawler, and Indexer + * + * Copyright (C) 2009 - 2014 Chris Pollett chris@pollett.org + * + * LICENSE: + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * END LICENSE + * + * @author Chris Pollett chris@pollett.org + * @package seek_quarry + * @subpackage controller + * @license http://www.gnu.org/licenses/ GPL3 + * @link http://www.seekquarry.com/ + * @copyright 2009 - 2014 + * @filesource + */ + +if(!defined('BASE_DIR')) {echo "BAD REQUEST"; exit();} + +/** Load base controller class if needed */ +require_once BASE_DIR."/controllers/controller.php"; +/** Loads common constants for web crawling */ +require_once BASE_DIR."/lib/crawl_constants.php"; +/** Need get host for search filter admin */ +require_once BASE_DIR."/lib/url_parser.php"; +/** Used in rule parser test in page options */ +require_once BASE_DIR."/lib/page_rule_parser.php"; +/** Used to create, update, and delete user-trained classifiers. */ +require_once BASE_DIR."/lib/classifiers/classifier.php"; +/** Loads crawl_daemon to manage news_updater */ +require_once BASE_DIR."/lib/crawl_daemon.php"; +/** get processors for different file types */ +foreach(glob(BASE_DIR."/lib/processors/*_processor.php") as $filename) { + require_once $filename; +} +/** + * Controller used to handle admin functionalities such as + * modify login and password, CREATE, UPDATE,DELETE operations + * for users, roles, locale, and crawls + * + * @author Chris Pollett + * @package seek_quarry + * @subpackage controller + */ + +class GroupController extends Controller implements CrawlConstants +{ + /** + * Says which activities (roughly methods invoke from the web) this + * controller will respond to (note: more activities will be loaded from + * components) + * @var array + */ + var $activities = array("feed", "wiki"); + + /** + * + */ + function processRequest() + { + $data = array(); + + if(!PROFILE) { + return $this->configureRequest(); + } + if(isset($_SESSION['USER_ID'])) { + $user = $_SESSION['USER_ID']; + $data['ADMIN'] = 1; + } else { + $user = $_SERVER['REMOTE_ADDR']; + } + $data['SCRIPT'] = ""; + $data[CSRF_TOKEN] = $this->generateCSRFToken($user); + $token_okay = $this->checkCSRFToken(CSRF_TOKEN, $user); + + if(!$token_okay) { + $keep_fields = array("a","f","just_group_id","just_user_id", + "just_thread", "limit", "num"); + $request = $_REQUEST; + $_REQUEST = array(); + foreach($keep_fields as $field) { + if(isset($request[$field])) { + $_REQUEST[$field] = + $this->clean($request[$field], "string"); + } + } + $_REQUEST["c"] = "group"; + } + $data = array_merge($data, $this->processSession()); + if(!isset($data['REFRESH'])) { + $view = "group"; + } else { + $view = $data['REFRESH']; + } + if(isset($_REQUEST['f']) && + in_array($_REQUEST['f'], array("rss", "json", "serial"))) { + $this->setupViewFormatOutput($_REQUEST['f'], $view, $data); + } + $_SESSION['REMOTE_ADDR'] = $_SERVER['REMOTE_ADDR']; + $this->displayView($view, $data); + } + + /** + * + */ + function processSession() + { + if(isset($_REQUEST['a']) && + in_array($_REQUEST['a'], $this->activities)) { + $activity = $_REQUEST['a']; + } else { + $activity = "groupFeeds"; + } + $data = $this->call($activity); + $data['ACTIVITY_CONTROLLER'] = "group"; + $data['ACTIVITY_METHOD'] = $activity; //for settings controller + if(!is_array($data)) { + $data = array(); + } + return $data; + } + + /** + * + */ + function setupViewFormatOutput($format, &$view, &$data) + { + $data["QUERY"] = "groups:feed"; + if(isset($data["JUST_GROUP_ID"])) { + $data["QUERY"] = "groups:just_group_id:".$data["JUST_GROUP_ID"]; + } + if(isset($data["JUST_USER_ID"])) { + $data["QUERY"] = "groups:just_user_id:".$data["JUST_USER_ID"]; + } + if(isset($data["JUST_THREAD"])) { + $data["QUERY"] = "groups:just_thread:".$data["JUST_THREAD"]; + } + $data["its"] = 0; + $num_pages = count($data["PAGES"]); + $base_query = $data['PAGING_QUERY']."&".CSRF_TOKEN."=". + $data[CSRF_TOKEN]."&"; + for($i = 0; $i < $num_pages; $i++) { + $data["PAGES"][$i][self::URL] = BASE_URL. $base_query . + "just_thread=". $data["PAGES"][$i]['PARENT_ID']; + } + switch($format) + { + case "rss": + $view = "rss"; + break; + case "json": + $out_data = array(); + $out_data["language"] = getLocaleTag(); + $out_data["link"] = + NAME_SERVER."?f=$format&q={$data['QUERY']}"; + $out_data["totalResults"] = $data['TOTAL_ROWS']; + $out_data["startIndex"] = $data['LIMIT']; + $out_data["itemsPerPage"] = $data['RESULTS_PER_PAGE']; + foreach($data['PAGES'] as $page) { + $item = array(); + $item["title"] = $page[self::TITLE]; + if(!isset($page[self::TYPE]) || + (isset($page[self::TYPE]) + && $page[self::TYPE] != "link")) { + $item["link"] = $page[self::URL]; + } else { + $item["link"] = strip_tags($page[self::TITLE]); + } + $item["description"] = strip_tags($page[self::DESCRIPTION]); + if(isset($page[self::THUMB]) + && $page[self::THUMB] != 'NULL') { + $item["thumb"] = $page[self::THUMB]; + } + if(isset($page[self::TYPE])) { + $item["type"] = $page[self::TYPE]; + } + $out_data['item'][] =$item; + } + e(json_encode($out_data)); + exit(); + break; + case "serial": + e(serialize($out_data)); + exit(); + break; + } + } + + /** + * + */ + function wiki() + { + $data = array(); + return $data; + } +} +?> diff --git a/controllers/search_controller.php b/controllers/search_controller.php index c55971fdc..effdd21c3 100755 --- a/controllers/search_controller.php +++ b/controllers/search_controller.php @@ -148,7 +148,7 @@ class SearchController extends Controller implements CrawlConstants $out_data = array(); $out_data["language"] = getLocaleTag(); $out_data["link"] = NAME_SERVER. - "?f=json&q={$data['QUERY']}&its={$data['QUERY']}"; + "?f=json&q={$data['QUERY']}"; $out_data["totalResults"] = $data['TOTAL_ROWS']; $out_data["startIndex"] = $data['LIMIT']; $out_data["itemsPerPage"] = $data['RESULTS_PER_PAGE']; diff --git a/controllers/settings_controller.php b/controllers/settings_controller.php index df4051cde..9af0188b0 100755 --- a/controllers/settings_controller.php +++ b/controllers/settings_controller.php @@ -164,8 +164,12 @@ class SettingsController extends Controller $data['its'] = $crawl_model->getCurrentIndexDatabaseName(); } if(isset($_REQUEST['return'])) { + $c="admin"; + if(isset($_REQUEST['oldc'])) { + $c = $this->clean($_REQUEST['oldc'], "string"); + } $return = $this->clean($_REQUEST['return'], 'string'); - $data['RETURN'] = "?c=admin&".CSRF_TOKEN."=".$data[CSRF_TOKEN]. + $data['RETURN'] = "?c=$c&".CSRF_TOKEN."=".$data[CSRF_TOKEN]. "&a=$return"; } return $changed_settings_flag; diff --git a/css/search.css b/css/search.css index 1ebe45220..14b6b0f1b 100755 --- a/css/search.css +++ b/css/search.css @@ -804,19 +804,32 @@ ul.in-list li top: 14pt; } -.admin-heading +.admin-heading, +.group-heading, { position: relative; top: 30px; } - +.group-heading small +{ + position: relative; + top: -30px; +} .mobile .admin-heading { position: absolute; top: 20px; } - - +.mobile .group-heading +{ + position: absolute; + top: 10 px; +} +.mobile .group-heading small +{ + position: relative; + top: 0px; +} .landing .logo { min-width: 6in; @@ -1797,7 +1810,8 @@ div..button-group-result margin: 0; } -.current-activity +.current-activity, +.small-margin-current-activity { background-color: #fff; border: 1px solid #ccc; @@ -1823,8 +1837,14 @@ div..button-group-result margin-right: 2.75in; } +.small-margin-current-activity +{ + margin-left: .2in; + margin-right: .2in; +} -.mobile .current-activity +.mobile .current-activity, +.mobile .small-margin-current-activity { clear:both; font-size:12pt; @@ -1839,7 +1859,10 @@ div..button-group-result top:120px; width: 310px; } - +.mobile .small-margin-current-activity +{ + top:90px; +} .current-activity h2 { margin-top: 0.05in; diff --git a/index.php b/index.php index b1ecc51da..ef5d75e3c 100755 --- a/index.php +++ b/index.php @@ -137,9 +137,9 @@ if (function_exists('lcfirst') === false) { } } -$available_controllers = array( "admin", "archive", "cache", "crawl", - "fetch", "machine", "resource", "search", "settings", - "statistics", "static", "classifier"); +$available_controllers = array( "admin", "archive", "cache", "classifier", + "crawl", "fetch", "group", "machine", "resource", "search", "settings", + "statistics", "static"); if(!WEB_ACCESS) { $available_controllers = array("admin", "archive", "cache", "crawl", "fetch", "machine"); @@ -216,4 +216,4 @@ function checkAllowedController($controller_name) return in_array($controller_name, $available_controllers) ; } -?> \ No newline at end of file +?> diff --git a/locale/ar/configure.ini b/locale/ar/configure.ini index 542aefe44..daa31e1b4 100755 --- a/locale/ar/configure.ini +++ b/locale/ar/configure.ini @@ -690,154 +690,154 @@ social_component_unknown_access = "" ; social_component.php line: 536 social_component_group_filter_users = "" ; -; social_component.php line: 595 +; social_component.php line: 604 social_component_comment_error = "" ; -; social_component.php line: 601 +; social_component.php line: 610 social_component_no_comment = "" ; -; social_component.php line: 615 +; social_component.php line: 624 social_component_no_post_access = "" ; -; social_component.php line: 623 +; social_component.php line: 632 social_component_no_post_access = "" ; -; social_component.php line: 629 +; social_component.php line: 638 social_component_join_group = "" ; -; social_component.php line: 632 +; social_component.php line: 641 social_component_join_group_detail = "" ; -; social_component.php line: 644 +; social_component.php line: 653 social_component_comment_added = "" ; -; social_component.php line: 652 +; social_component.php line: 661 social_component_delete_error = "" ; -; social_component.php line: 660 +; social_component.php line: 669 social_component_item_deleted = "" ; -; social_component.php line: 664 +; social_component.php line: 673 social_component_no_item_deleted = "" ; -; social_component.php line: 674 +; social_component.php line: 683 social_component_comment_error = "" ; -; social_component.php line: 681 +; social_component.php line: 690 social_component_need_title_description = "" ; -; social_component.php line: 693 +; social_component.php line: 702 social_component_no_post_access = "" ; -; social_component.php line: 700 +; social_component.php line: 709 social_component_thread_created = "" ; -; social_component.php line: 711 +; social_component.php line: 720 social_component_comment_error = "" ; -; social_component.php line: 717 +; social_component.php line: 726 social_component_need_title_description = "" ; -; social_component.php line: 728 +; social_component.php line: 737 social_component_no_update_access = "" ; -; social_component.php line: 738 +; social_component.php line: 747 social_component_no_update_access = "" ; -; social_component.php line: 745 +; social_component.php line: 754 social_component_post_updated = "" ; -; social_component.php line: 763 +; social_component.php line: 772 social_component_join_group = "" ; -; social_component.php line: 766 +; social_component.php line: 775 social_component_join_group_detail = "" ; -; social_component.php line: 886 +; social_component.php line: 897 social_component_select_crawl = "حدد تتبع الارتباطات" ; -; social_component.php line: 887 +; social_component.php line: 898 social_component_default_crawl = "تتبع الارتباطات الافتراضية" ; -; social_component.php line: 889 +; social_component.php line: 900 social_component_select_crawl = "حدد تتبع الارتباطات" ; -; social_component.php line: 891 +; social_component.php line: 902 social_component_default_crawl = "تتبع الارتباطات الافتراضية" ; -; social_component.php line: 913 +; social_component.php line: 924 social_component_unnamed = "لم يكشف عن اسمه الزحف" ; -; social_component.php line: 920 +; social_component.php line: 931 social_component_mix_created = "الزحف ميكس إنشاؤها!" ; -; social_component.php line: 927 +; social_component.php line: 938 social_component_mix_invalid_timestamp = "" ; -; social_component.php line: 933 +; social_component.php line: 944 social_component_mix_deleted = "الزحف ميكس حذف!" ; -; social_component.php line: 951 +; social_component.php line: 962 social_component_mix_doesnt_exists = "ميكسحذف لاتوجد لا!" ; -; social_component.php line: 961 +; social_component.php line: 972 social_component_mix_imported = "" ; -; social_component.php line: 965 +; social_component.php line: 976 social_component_set_index = "" ; -; social_component.php line: 986 +; social_component.php line: 997 social_component_comment_error = "" ; -; social_component.php line: 994 +; social_component.php line: 1005 social_component_invalid_timestamp = "" ; -; social_component.php line: 1013 +; social_component.php line: 1024 social_component_no_post_access = "" ; -; social_component.php line: 1018 +; social_component.php line: 1029 social_component_share_title = "" ; -; social_component.php line: 1020 +; social_component.php line: 1031 social_component_share_description = "" ; -; social_component.php line: 1025 +; social_component.php line: 1036 social_component_thread_created = "" ; -; social_component.php line: 1071 +; social_component.php line: 1082 social_component_mix_not_owner = "" ; -; social_component.php line: 1084 +; social_component.php line: 1095 social_component_add_crawls = "إضافة عمليات تتبع الارتباطات" ; -; social_component.php line: 1086 +; social_component.php line: 1097 social_component_num_results = "عدد من النتائج" ; -; social_component.php line: 1088 +; social_component.php line: 1099 social_component_del_frag = "" ; -; social_component.php line: 1090 +; social_component.php line: 1101 social_component_weight = "الوزن" ; -; social_component.php line: 1091 +; social_component.php line: 1102 social_component_name = "" ; -; social_component.php line: 1093 +; social_component.php line: 1104 social_component_add_keywords = "" ; -; social_component.php line: 1095 +; social_component.php line: 1106 social_component_actions = "إجراءات" ; -; social_component.php line: 1097 +; social_component.php line: 1108 social_component_add_query = "إضافة استعلام" ; -; social_component.php line: 1098 +; social_component.php line: 1109 social_component_delete = "" ; -; social_component.php line: 1146 +; social_component.php line: 1157 social_component_too_many_fragments = "" ; -; social_component.php line: 1157 +; social_component.php line: 1168 social_component_mix_saved = "الزحف ميكس التغييرات المحفوظة!" ; ; system_component.php line: 83 @@ -993,6 +993,9 @@ system_component_check_passed = "تمرير الاختيار." ; system_component.php line: 1041 system_component_using_local_config = "استخدام configs/local_config.php حتى تغيير دليل العمل أعلاه قد لا تعمل." ; +; group_controller.php line: 112 +group_controller_group_feeds = "" +; ; machine_controller.php line: 174 machine_controller_nolines = "" ; @@ -1714,73 +1717,76 @@ footer_element_copyright_yioop = "يوب! (ج) 2014" ; footer_element.php line: 83 footer_element_php_search_engine = "بي إتش بي محرك البحث" ; -; groupfeed_element.php line: 71 +; groupfeed_element.php line: 85 groupfeed_element_back = "" ; -; groupfeed_element.php line: 78 +; groupfeed_element.php line: 94 groupfeed_element_recent_activity = "" ; -; groupfeed_element.php line: 81 +; groupfeed_element.php line: 97 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 85 -groupfeed_element_group = "" +; groupfeed_element.php line: 102 +groupfeed_element_feed = "" +; +; groupfeed_element.php line: 105 +group_view_wiki = "" ; -; groupfeed_element.php line: 88 +; groupfeed_element.php line: 107 groupfeed_element_user = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 134 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 121 +; groupfeed_element.php line: 145 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 147 +; groupfeed_element.php line: 171 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 152 +; groupfeed_element.php line: 176 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 164 +; groupfeed_element.php line: 188 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 188 +; groupfeed_element.php line: 212 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 195 +; groupfeed_element.php line: 219 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 268 +; groupfeed_element.php line: 292 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 273 +; groupfeed_element.php line: 297 groupfeed_element_save = "" ; -; groupfeed_element.php line: 299 +; groupfeed_element.php line: 323 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 302 +; groupfeed_element.php line: 326 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 307 +; groupfeed_element.php line: 331 groupfeed_element_post = "" ; -; groupfeed_element.php line: 312 +; groupfeed_element.php line: 336 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 365 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 368 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 349 +; groupfeed_element.php line: 373 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 379 groupfeed_element_save = "" ; -; groupfeed_element.php line: 384 +; groupfeed_element.php line: 408 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2792,21 +2798,36 @@ serversettings_element_captcha_setting = "" ; serversettings_element.php line: 255 serversettings_element_submit = "تقديم" ; -; signin_element.php line: 65 +; signin_element.php line: 67 signin_element_settings = "إعدادات" ; -; signin_element.php line: 70 +; signin_element.php line: 72 signin_element_signin = "تسجيل الدخول" ; -; signin_element.php line: 74 +; signin_element.php line: 76 signin_element_admin = "أنشطة" ; -; signin_element.php line: 76 +; signin_element.php line: 78 signin_element_signout = "تسجيل الخروج" ; ; subsearch_element.php line: 71 subsearch_element_more = "أكثر" ; +; group_view.php line: 72 +group_view_feed = "" +; +; group_view.php line: 75 +group_view_wiki = "" +; +; group_view.php line: 77 +group_view_user = "" +; +; group_view.php line: 80 +group_view_myfeeds = "" +; +; group_view.php line: 99 +adminview_auto_logout_one_minute = "خروج السيارات في دقيقة واحدة!!" +; ; /Applications/MAMP/htdocs/git/yioop//views/helpers ; ; feeds_helper.php line: 70 @@ -3183,6 +3204,12 @@ signin_view_return_yioop = "العودة إلى يوب" ; view.php line: 36 view_locale_version4 = "" ; +; wiki_view.php line: 73 +group_view_wiki = "" +; +; wiki_view.php line: 91 +adminview_auto_logout_one_minute = "خروج السيارات في دقيقة واحدة!!" +; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins ; ; wordfilter_plugin.php line: 307 diff --git a/locale/bn/configure.ini b/locale/bn/configure.ini index ac96ad877..c43e1951b 100755 --- a/locale/bn/configure.ini +++ b/locale/bn/configure.ini @@ -690,154 +690,154 @@ social_component_unknown_access = "" ; social_component.php line: 536 social_component_group_filter_users = "" ; -; social_component.php line: 595 +; social_component.php line: 604 social_component_comment_error = "" ; -; social_component.php line: 601 +; social_component.php line: 610 social_component_no_comment = "" ; -; social_component.php line: 615 +; social_component.php line: 624 social_component_no_post_access = "" ; -; social_component.php line: 623 +; social_component.php line: 632 social_component_no_post_access = "" ; -; social_component.php line: 629 +; social_component.php line: 638 social_component_join_group = "" ; -; social_component.php line: 632 +; social_component.php line: 641 social_component_join_group_detail = "" ; -; social_component.php line: 644 +; social_component.php line: 653 social_component_comment_added = "" ; -; social_component.php line: 652 +; social_component.php line: 661 social_component_delete_error = "" ; -; social_component.php line: 660 +; social_component.php line: 669 social_component_item_deleted = "" ; -; social_component.php line: 664 +; social_component.php line: 673 social_component_no_item_deleted = "" ; -; social_component.php line: 674 +; social_component.php line: 683 social_component_comment_error = "" ; -; social_component.php line: 681 +; social_component.php line: 690 social_component_need_title_description = "" ; -; social_component.php line: 693 +; social_component.php line: 702 social_component_no_post_access = "" ; -; social_component.php line: 700 +; social_component.php line: 709 social_component_thread_created = "" ; -; social_component.php line: 711 +; social_component.php line: 720 social_component_comment_error = "" ; -; social_component.php line: 717 +; social_component.php line: 726 social_component_need_title_description = "" ; -; social_component.php line: 728 +; social_component.php line: 737 social_component_no_update_access = "" ; -; social_component.php line: 738 +; social_component.php line: 747 social_component_no_update_access = "" ; -; social_component.php line: 745 +; social_component.php line: 754 social_component_post_updated = "" ; -; social_component.php line: 763 +; social_component.php line: 772 social_component_join_group = "" ; -; social_component.php line: 766 +; social_component.php line: 775 social_component_join_group_detail = "" ; -; social_component.php line: 886 +; social_component.php line: 897 social_component_select_crawl = "" ; -; social_component.php line: 887 +; social_component.php line: 898 social_component_default_crawl = "" ; -; social_component.php line: 889 +; social_component.php line: 900 social_component_select_crawl = "" ; -; social_component.php line: 891 +; social_component.php line: 902 social_component_default_crawl = "" ; -; social_component.php line: 913 +; social_component.php line: 924 social_component_unnamed = "" ; -; social_component.php line: 920 +; social_component.php line: 931 social_component_mix_created = "" ; -; social_component.php line: 927 +; social_component.php line: 938 social_component_mix_invalid_timestamp = "" ; -; social_component.php line: 933 +; social_component.php line: 944 social_component_mix_deleted = "" ; -; social_component.php line: 951 +; social_component.php line: 962 social_component_mix_doesnt_exists = "" ; -; social_component.php line: 961 +; social_component.php line: 972 social_component_mix_imported = "" ; -; social_component.php line: 965 +; social_component.php line: 976 social_component_set_index = "" ; -; social_component.php line: 986 +; social_component.php line: 997 social_component_comment_error = "" ; -; social_component.php line: 994 +; social_component.php line: 1005 social_component_invalid_timestamp = "" ; -; social_component.php line: 1013 +; social_component.php line: 1024 social_component_no_post_access = "" ; -; social_component.php line: 1018 +; social_component.php line: 1029 social_component_share_title = "" ; -; social_component.php line: 1020 +; social_component.php line: 1031 social_component_share_description = "" ; -; social_component.php line: 1025 +; social_component.php line: 1036 social_component_thread_created = "" ; -; social_component.php line: 1071 +; social_component.php line: 1082 social_component_mix_not_owner = "" ; -; social_component.php line: 1084 +; social_component.php line: 1095 social_component_add_crawls = "" ; -; social_component.php line: 1086 +; social_component.php line: 1097 social_component_num_results = "" ; -; social_component.php line: 1088 +; social_component.php line: 1099 social_component_del_frag = "" ; -; social_component.php line: 1090 +; social_component.php line: 1101 social_component_weight = "" ; -; social_component.php line: 1091 +; social_component.php line: 1102 social_component_name = "" ; -; social_component.php line: 1093 +; social_component.php line: 1104 social_component_add_keywords = "" ; -; social_component.php line: 1095 +; social_component.php line: 1106 social_component_actions = "" ; -; social_component.php line: 1097 +; social_component.php line: 1108 social_component_add_query = "" ; -; social_component.php line: 1098 +; social_component.php line: 1109 social_component_delete = "" ; -; social_component.php line: 1146 +; social_component.php line: 1157 social_component_too_many_fragments = "" ; -; social_component.php line: 1157 +; social_component.php line: 1168 social_component_mix_saved = "" ; ; system_component.php line: 83 @@ -993,6 +993,9 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; +; group_controller.php line: 112 +group_controller_group_feeds = "" +; ; machine_controller.php line: 174 machine_controller_nolines = "" ; @@ -1714,73 +1717,76 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 71 +; groupfeed_element.php line: 85 groupfeed_element_back = "" ; -; groupfeed_element.php line: 78 +; groupfeed_element.php line: 94 groupfeed_element_recent_activity = "" ; -; groupfeed_element.php line: 81 +; groupfeed_element.php line: 97 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 85 -groupfeed_element_group = "" +; groupfeed_element.php line: 102 +groupfeed_element_feed = "" +; +; groupfeed_element.php line: 105 +group_view_wiki = "" ; -; groupfeed_element.php line: 88 +; groupfeed_element.php line: 107 groupfeed_element_user = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 134 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 121 +; groupfeed_element.php line: 145 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 147 +; groupfeed_element.php line: 171 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 152 +; groupfeed_element.php line: 176 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 164 +; groupfeed_element.php line: 188 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 188 +; groupfeed_element.php line: 212 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 195 +; groupfeed_element.php line: 219 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 268 +; groupfeed_element.php line: 292 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 273 +; groupfeed_element.php line: 297 groupfeed_element_save = "" ; -; groupfeed_element.php line: 299 +; groupfeed_element.php line: 323 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 302 +; groupfeed_element.php line: 326 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 307 +; groupfeed_element.php line: 331 groupfeed_element_post = "" ; -; groupfeed_element.php line: 312 +; groupfeed_element.php line: 336 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 365 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 368 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 349 +; groupfeed_element.php line: 373 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 379 groupfeed_element_save = "" ; -; groupfeed_element.php line: 384 +; groupfeed_element.php line: 408 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2792,21 +2798,36 @@ serversettings_element_captcha_setting = "" ; serversettings_element.php line: 255 serversettings_element_submit = "" ; -; signin_element.php line: 65 +; signin_element.php line: 67 signin_element_settings = "" ; -; signin_element.php line: 70 +; signin_element.php line: 72 signin_element_signin = "" ; -; signin_element.php line: 74 +; signin_element.php line: 76 signin_element_admin = "" ; -; signin_element.php line: 76 +; signin_element.php line: 78 signin_element_signout = "" ; ; subsearch_element.php line: 71 subsearch_element_more = "" ; +; group_view.php line: 72 +group_view_feed = "" +; +; group_view.php line: 75 +group_view_wiki = "" +; +; group_view.php line: 77 +group_view_user = "" +; +; group_view.php line: 80 +group_view_myfeeds = "" +; +; group_view.php line: 99 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//views/helpers ; ; feeds_helper.php line: 70 @@ -3183,6 +3204,12 @@ signin_view_return_yioop = "" ; view.php line: 36 view_locale_version4 = "" ; +; wiki_view.php line: 73 +group_view_wiki = "" +; +; wiki_view.php line: 91 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins ; ; wordfilter_plugin.php line: 307 diff --git a/locale/de/configure.ini b/locale/de/configure.ini index 2865c1ab4..bb27b7844 100755 --- a/locale/de/configure.ini +++ b/locale/de/configure.ini @@ -690,154 +690,154 @@ social_component_unknown_access = "" ; social_component.php line: 536 social_component_group_filter_users = "" ; -; social_component.php line: 595 +; social_component.php line: 604 social_component_comment_error = "" ; -; social_component.php line: 601 +; social_component.php line: 610 social_component_no_comment = "" ; -; social_component.php line: 615 +; social_component.php line: 624 social_component_no_post_access = "" ; -; social_component.php line: 623 +; social_component.php line: 632 social_component_no_post_access = "" ; -; social_component.php line: 629 +; social_component.php line: 638 social_component_join_group = "" ; -; social_component.php line: 632 +; social_component.php line: 641 social_component_join_group_detail = "" ; -; social_component.php line: 644 +; social_component.php line: 653 social_component_comment_added = "" ; -; social_component.php line: 652 +; social_component.php line: 661 social_component_delete_error = "" ; -; social_component.php line: 660 +; social_component.php line: 669 social_component_item_deleted = "" ; -; social_component.php line: 664 +; social_component.php line: 673 social_component_no_item_deleted = "" ; -; social_component.php line: 674 +; social_component.php line: 683 social_component_comment_error = "" ; -; social_component.php line: 681 +; social_component.php line: 690 social_component_need_title_description = "" ; -; social_component.php line: 693 +; social_component.php line: 702 social_component_no_post_access = "" ; -; social_component.php line: 700 +; social_component.php line: 709 social_component_thread_created = "" ; -; social_component.php line: 711 +; social_component.php line: 720 social_component_comment_error = "" ; -; social_component.php line: 717 +; social_component.php line: 726 social_component_need_title_description = "" ; -; social_component.php line: 728 +; social_component.php line: 737 social_component_no_update_access = "" ; -; social_component.php line: 738 +; social_component.php line: 747 social_component_no_update_access = "" ; -; social_component.php line: 745 +; social_component.php line: 754 social_component_post_updated = "" ; -; social_component.php line: 763 +; social_component.php line: 772 social_component_join_group = "" ; -; social_component.php line: 766 +; social_component.php line: 775 social_component_join_group_detail = "" ; -; social_component.php line: 886 +; social_component.php line: 897 social_component_select_crawl = "" ; -; social_component.php line: 887 +; social_component.php line: 898 social_component_default_crawl = "" ; -; social_component.php line: 889 +; social_component.php line: 900 social_component_select_crawl = "" ; -; social_component.php line: 891 +; social_component.php line: 902 social_component_default_crawl = "" ; -; social_component.php line: 913 +; social_component.php line: 924 social_component_unnamed = "" ; -; social_component.php line: 920 +; social_component.php line: 931 social_component_mix_created = "" ; -; social_component.php line: 927 +; social_component.php line: 938 social_component_mix_invalid_timestamp = "" ; -; social_component.php line: 933 +; social_component.php line: 944 social_component_mix_deleted = "" ; -; social_component.php line: 951 +; social_component.php line: 962 social_component_mix_doesnt_exists = "" ; -; social_component.php line: 961 +; social_component.php line: 972 social_component_mix_imported = "" ; -; social_component.php line: 965 +; social_component.php line: 976 social_component_set_index = "" ; -; social_component.php line: 986 +; social_component.php line: 997 social_component_comment_error = "" ; -; social_component.php line: 994 +; social_component.php line: 1005 social_component_invalid_timestamp = "" ; -; social_component.php line: 1013 +; social_component.php line: 1024 social_component_no_post_access = "" ; -; social_component.php line: 1018 +; social_component.php line: 1029 social_component_share_title = "" ; -; social_component.php line: 1020 +; social_component.php line: 1031 social_component_share_description = "" ; -; social_component.php line: 1025 +; social_component.php line: 1036 social_component_thread_created = "" ; -; social_component.php line: 1071 +; social_component.php line: 1082 social_component_mix_not_owner = "" ; -; social_component.php line: 1084 +; social_component.php line: 1095 social_component_add_crawls = "" ; -; social_component.php line: 1086 +; social_component.php line: 1097 social_component_num_results = "" ; -; social_component.php line: 1088 +; social_component.php line: 1099 social_component_del_frag = "" ; -; social_component.php line: 1090 +; social_component.php line: 1101 social_component_weight = "" ; -; social_component.php line: 1091 +; social_component.php line: 1102 social_component_name = "" ; -; social_component.php line: 1093 +; social_component.php line: 1104 social_component_add_keywords = "" ; -; social_component.php line: 1095 +; social_component.php line: 1106 social_component_actions = "" ; -; social_component.php line: 1097 +; social_component.php line: 1108 social_component_add_query = "" ; -; social_component.php line: 1098 +; social_component.php line: 1109 social_component_delete = "" ; -; social_component.php line: 1146 +; social_component.php line: 1157 social_component_too_many_fragments = "" ; -; social_component.php line: 1157 +; social_component.php line: 1168 social_component_mix_saved = "" ; ; system_component.php line: 83 @@ -993,6 +993,9 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; +; group_controller.php line: 112 +group_controller_group_feeds = "" +; ; machine_controller.php line: 174 machine_controller_nolines = "" ; @@ -1714,73 +1717,76 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 71 +; groupfeed_element.php line: 85 groupfeed_element_back = "" ; -; groupfeed_element.php line: 78 +; groupfeed_element.php line: 94 groupfeed_element_recent_activity = "" ; -; groupfeed_element.php line: 81 +; groupfeed_element.php line: 97 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 85 -groupfeed_element_group = "" +; groupfeed_element.php line: 102 +groupfeed_element_feed = "" +; +; groupfeed_element.php line: 105 +group_view_wiki = "" ; -; groupfeed_element.php line: 88 +; groupfeed_element.php line: 107 groupfeed_element_user = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 134 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 121 +; groupfeed_element.php line: 145 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 147 +; groupfeed_element.php line: 171 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 152 +; groupfeed_element.php line: 176 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 164 +; groupfeed_element.php line: 188 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 188 +; groupfeed_element.php line: 212 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 195 +; groupfeed_element.php line: 219 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 268 +; groupfeed_element.php line: 292 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 273 +; groupfeed_element.php line: 297 groupfeed_element_save = "" ; -; groupfeed_element.php line: 299 +; groupfeed_element.php line: 323 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 302 +; groupfeed_element.php line: 326 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 307 +; groupfeed_element.php line: 331 groupfeed_element_post = "" ; -; groupfeed_element.php line: 312 +; groupfeed_element.php line: 336 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 365 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 368 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 349 +; groupfeed_element.php line: 373 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 379 groupfeed_element_save = "" ; -; groupfeed_element.php line: 384 +; groupfeed_element.php line: 408 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2792,21 +2798,36 @@ serversettings_element_captcha_setting = "" ; serversettings_element.php line: 255 serversettings_element_submit = "" ; -; signin_element.php line: 65 +; signin_element.php line: 67 signin_element_settings = "" ; -; signin_element.php line: 70 +; signin_element.php line: 72 signin_element_signin = "" ; -; signin_element.php line: 74 +; signin_element.php line: 76 signin_element_admin = "" ; -; signin_element.php line: 76 +; signin_element.php line: 78 signin_element_signout = "" ; ; subsearch_element.php line: 71 subsearch_element_more = "" ; +; group_view.php line: 72 +group_view_feed = "" +; +; group_view.php line: 75 +group_view_wiki = "" +; +; group_view.php line: 77 +group_view_user = "" +; +; group_view.php line: 80 +group_view_myfeeds = "" +; +; group_view.php line: 99 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//views/helpers ; ; feeds_helper.php line: 70 @@ -3183,6 +3204,12 @@ signin_view_return_yioop = "" ; view.php line: 36 view_locale_version4 = "" ; +; wiki_view.php line: 73 +group_view_wiki = "" +; +; wiki_view.php line: 91 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins ; ; wordfilter_plugin.php line: 307 diff --git a/locale/en-US/configure.ini b/locale/en-US/configure.ini index a566ffa3f..ca3ac0fc2 100755 --- a/locale/en-US/configure.ini +++ b/locale/en-US/configure.ini @@ -690,154 +690,154 @@ social_component_unknown_access = "Attempt to change access to unknown value!" ; social_component.php line: 536 social_component_group_filter_users = "Filtering Users!" ; -; social_component.php line: 595 +; social_component.php line: 604 social_component_comment_error = "Error in comment data!" ; -; social_component.php line: 601 +; social_component.php line: 610 social_component_no_comment = "Cannot post blank comment!" ; -; social_component.php line: 615 +; social_component.php line: 624 social_component_no_post_access = "Cannot post to that group!" ; -; social_component.php line: 623 +; social_component.php line: 632 social_component_no_post_access = "Cannot post to that group!" ; -; social_component.php line: 629 +; social_component.php line: 638 social_component_join_group = "%s joined %s!" ; -; social_component.php line: 632 +; social_component.php line: 641 social_component_join_group_detail = "On %s, you joined the group %s." ; -; social_component.php line: 644 +; social_component.php line: 653 social_component_comment_added = "Comment Added!" ; -; social_component.php line: 652 +; social_component.php line: 661 social_component_delete_error = "Error Deleting Item" ; -; social_component.php line: 660 +; social_component.php line: 669 social_component_item_deleted = "Item Deleted!" ; -; social_component.php line: 664 +; social_component.php line: 673 social_component_no_item_deleted = "No Item Deleted!" ; -; social_component.php line: 674 +; social_component.php line: 683 social_component_comment_error = "Error in comment data!" ; -; social_component.php line: 681 +; social_component.php line: 690 social_component_need_title_description = "Need both title and description!" ; -; social_component.php line: 693 +; social_component.php line: 702 social_component_no_post_access = "Cannot post to that group!" ; -; social_component.php line: 700 +; social_component.php line: 709 social_component_thread_created = "Thread Created!" ; -; social_component.php line: 711 +; social_component.php line: 720 social_component_comment_error = "Error in comment data!" ; -; social_component.php line: 717 +; social_component.php line: 726 social_component_need_title_description = "Need both title and description!" ; -; social_component.php line: 728 +; social_component.php line: 737 social_component_no_update_access = "Cannot Update Post!" ; -; social_component.php line: 738 +; social_component.php line: 747 social_component_no_update_access = "Cannot Update Post!" ; -; social_component.php line: 745 +; social_component.php line: 754 social_component_post_updated = "Post Updated!" ; -; social_component.php line: 763 +; social_component.php line: 772 social_component_join_group = "%s joined %s!" ; -; social_component.php line: 766 +; social_component.php line: 775 social_component_join_group_detail = "On %s, you joined the group %s." ; -; social_component.php line: 886 +; social_component.php line: 897 social_component_select_crawl = "Select Crawl" ; -; social_component.php line: 887 +; social_component.php line: 898 social_component_default_crawl = "Default Crawl" ; -; social_component.php line: 889 +; social_component.php line: 900 social_component_select_crawl = "Select Crawl" ; -; social_component.php line: 891 +; social_component.php line: 902 social_component_default_crawl = "Default Crawl" ; -; social_component.php line: 913 +; social_component.php line: 924 social_component_unnamed = "Unnamed Crawl" ; -; social_component.php line: 920 +; social_component.php line: 931 social_component_mix_created = "Crawl Mix Created!" ; -; social_component.php line: 927 +; social_component.php line: 938 social_component_mix_invalid_timestamp = "Invalid Timestamp!" ; -; social_component.php line: 933 +; social_component.php line: 944 social_component_mix_deleted = "Crawl Mix Deleted!" ; -; social_component.php line: 951 +; social_component.php line: 962 social_component_mix_doesnt_exists = "Mix to Delete Does not Exist!" ; -; social_component.php line: 961 +; social_component.php line: 972 social_component_mix_imported = "Mix Successfully Imported!" ; -; social_component.php line: 965 +; social_component.php line: 976 social_component_set_index = "Setting Crawl To Use as Index" ; -; social_component.php line: 986 +; social_component.php line: 997 social_component_comment_error = "Error in comment data!" ; -; social_component.php line: 994 +; social_component.php line: 1005 social_component_invalid_timestamp = "Shared Mix Has An Invalid Timestamp" ; -; social_component.php line: 1013 +; social_component.php line: 1024 social_component_no_post_access = "Cannot post to that group!" ; -; social_component.php line: 1018 +; social_component.php line: 1029 social_component_share_title = "Try out this crawl mix!" ; -; social_component.php line: 1020 +; social_component.php line: 1031 social_component_share_description = "%s is sharing the crawl mix %s!" ; -; social_component.php line: 1025 +; social_component.php line: 1036 social_component_thread_created = "Thread Created!" ; -; social_component.php line: 1071 +; social_component.php line: 1082 social_component_mix_not_owner = "Not Mix Owner!" ; -; social_component.php line: 1084 +; social_component.php line: 1095 social_component_add_crawls = "Add Crawls" ; -; social_component.php line: 1086 +; social_component.php line: 1097 social_component_num_results = "Results Shown" ; -; social_component.php line: 1088 +; social_component.php line: 1099 social_component_del_frag = "Remove" ; -; social_component.php line: 1090 +; social_component.php line: 1101 social_component_weight = "Weight" ; -; social_component.php line: 1091 +; social_component.php line: 1102 social_component_name = "Name" ; -; social_component.php line: 1093 +; social_component.php line: 1104 social_component_add_keywords = "Keywords" ; -; social_component.php line: 1095 +; social_component.php line: 1106 social_component_actions = "Actions" ; -; social_component.php line: 1097 +; social_component.php line: 1108 social_component_add_query = "Add Query" ; -; social_component.php line: 1098 +; social_component.php line: 1109 social_component_delete = "Delete" ; -; social_component.php line: 1146 +; social_component.php line: 1157 social_component_too_many_fragments = "Too Many Search Result Fragments!" ; -; social_component.php line: 1157 +; social_component.php line: 1168 social_component_mix_saved = "Crawl Mix Changes Saved!" ; ; system_component.php line: 83 @@ -993,6 +993,9 @@ system_component_check_passed = "Check Passed." ; system_component.php line: 1041 system_component_using_local_config = "Using configs/local_config.php so changing work directory above may not work." ; +; group_controller.php line: 112 +group_controller_group_feeds = "Group Feeds" +; ; machine_controller.php line: 174 machine_controller_nolines = "No Lines Match Filter!" ; @@ -1714,73 +1717,76 @@ footer_element_copyright_yioop = "(c) 2014 Yioop!" ; footer_element.php line: 83 footer_element_php_search_engine = "PHP Search Engine" ; -; groupfeed_element.php line: 71 +; groupfeed_element.php line: 85 groupfeed_element_back = "My Group Feeds" ; -; groupfeed_element.php line: 78 +; groupfeed_element.php line: 94 groupfeed_element_recent_activity = "Recent Group Activity" ; -; groupfeed_element.php line: 81 +; groupfeed_element.php line: 97 groupfeed_element_thread = "%s group thread: %s " ; -; groupfeed_element.php line: 85 -groupfeed_element_group = "%s Group Feed" +; groupfeed_element.php line: 102 +groupfeed_element_feed = "Feed" +; +; groupfeed_element.php line: 105 +group_view_wiki = "Wiki" ; -; groupfeed_element.php line: 88 +; groupfeed_element.php line: 107 groupfeed_element_user = "%s User Feed" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 134 groupfeed_element_comment = "Comment" ; -; groupfeed_element.php line: 121 +; groupfeed_element.php line: 145 groupfeed_element_start_thread = "Start New Thread" ; -; groupfeed_element.php line: 147 +; groupfeed_element.php line: 171 groupfeed_element_edit = "Edit" ; -; groupfeed_element.php line: 152 +; groupfeed_element.php line: 176 groupfeed_element_delete = "Delete" ; -; groupfeed_element.php line: 164 +; groupfeed_element.php line: 188 groupfeed_element_num_posts = " (%s posts)" ; -; groupfeed_element.php line: 188 +; groupfeed_element.php line: 212 groupfeed_element_comment = "Comment" ; -; groupfeed_element.php line: 195 +; groupfeed_element.php line: 219 groupfeed_element_start_thread = "Start New Thread" ; -; groupfeed_element.php line: 268 +; groupfeed_element.php line: 292 groupfeed_element_add_comment = "Add a Comment" ; -; groupfeed_element.php line: 273 +; groupfeed_element.php line: 297 groupfeed_element_save = "Save" ; -; groupfeed_element.php line: 299 +; groupfeed_element.php line: 323 groupfeed_element_start_thread = "Start New Thread" ; -; groupfeed_element.php line: 302 +; groupfeed_element.php line: 326 groupfeed_element_subject = "Subject" ; -; groupfeed_element.php line: 307 +; groupfeed_element.php line: 331 groupfeed_element_post = "Post" ; -; groupfeed_element.php line: 312 +; groupfeed_element.php line: 336 groupfeed_element_save = "Save" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 365 groupfeed_element_edit_post = "Edit Post" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 368 groupfeed_element_subject = "Subject" ; -; groupfeed_element.php line: 349 +; groupfeed_element.php line: 373 groupfeed_element_post = "Post" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 379 groupfeed_element_save = "Save" ; -; groupfeed_element.php line: 384 +; groupfeed_element.php line: 408 groupfeed_element_no_longer_update = "Group Feeds No Longer Updating!" ; ; machinelog_element.php line: 61 @@ -2792,21 +2798,36 @@ serversettings_element_captcha_setting = "Captcha Setting" ; serversettings_element.php line: 255 serversettings_element_submit = "Submit" ; -; signin_element.php line: 65 +; signin_element.php line: 67 signin_element_settings = "Settings" ; -; signin_element.php line: 70 +; signin_element.php line: 72 signin_element_signin = "Sign In" ; -; signin_element.php line: 74 +; signin_element.php line: 76 signin_element_admin = "Admin" ; -; signin_element.php line: 76 +; signin_element.php line: 78 signin_element_signout = "Sign Out" ; ; subsearch_element.php line: 71 subsearch_element_more = "More" ; +; group_view.php line: 72 +group_view_feed = "Feed" +; +; group_view.php line: 75 +group_view_wiki = "Wiki" +; +; group_view.php line: 77 +group_view_user = "%s User" +; +; group_view.php line: 80 +group_view_myfeeds = "My Feeds" +; +; group_view.php line: 99 +adminview_auto_logout_one_minute = "Auto-logout in One Minute!!" +; ; /Applications/MAMP/htdocs/git/yioop//views/helpers ; ; feeds_helper.php line: 70 @@ -3183,6 +3204,12 @@ signin_view_return_yioop = "Return to Yioop" ; view.php line: 36 view_locale_version4 = "Version 4" ; +; wiki_view.php line: 73 +group_view_wiki = "Wiki" +; +; wiki_view.php line: 91 +adminview_auto_logout_one_minute = "Auto-logout in One Minute!!" +; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins ; ; wordfilter_plugin.php line: 307 diff --git a/locale/es/configure.ini b/locale/es/configure.ini index d5358eb36..6af15b09d 100755 --- a/locale/es/configure.ini +++ b/locale/es/configure.ini @@ -690,154 +690,154 @@ social_component_unknown_access = "" ; social_component.php line: 536 social_component_group_filter_users = "" ; -; social_component.php line: 595 +; social_component.php line: 604 social_component_comment_error = "" ; -; social_component.php line: 601 +; social_component.php line: 610 social_component_no_comment = "" ; -; social_component.php line: 615 +; social_component.php line: 624 social_component_no_post_access = "" ; -; social_component.php line: 623 +; social_component.php line: 632 social_component_no_post_access = "" ; -; social_component.php line: 629 +; social_component.php line: 638 social_component_join_group = "" ; -; social_component.php line: 632 +; social_component.php line: 641 social_component_join_group_detail = "" ; -; social_component.php line: 644 +; social_component.php line: 653 social_component_comment_added = "" ; -; social_component.php line: 652 +; social_component.php line: 661 social_component_delete_error = "" ; -; social_component.php line: 660 +; social_component.php line: 669 social_component_item_deleted = "" ; -; social_component.php line: 664 +; social_component.php line: 673 social_component_no_item_deleted = "" ; -; social_component.php line: 674 +; social_component.php line: 683 social_component_comment_error = "" ; -; social_component.php line: 681 +; social_component.php line: 690 social_component_need_title_description = "" ; -; social_component.php line: 693 +; social_component.php line: 702 social_component_no_post_access = "" ; -; social_component.php line: 700 +; social_component.php line: 709 social_component_thread_created = "" ; -; social_component.php line: 711 +; social_component.php line: 720 social_component_comment_error = "" ; -; social_component.php line: 717 +; social_component.php line: 726 social_component_need_title_description = "" ; -; social_component.php line: 728 +; social_component.php line: 737 social_component_no_update_access = "" ; -; social_component.php line: 738 +; social_component.php line: 747 social_component_no_update_access = "" ; -; social_component.php line: 745 +; social_component.php line: 754 social_component_post_updated = "" ; -; social_component.php line: 763 +; social_component.php line: 772 social_component_join_group = "" ; -; social_component.php line: 766 +; social_component.php line: 775 social_component_join_group_detail = "" ; -; social_component.php line: 886 +; social_component.php line: 897 social_component_select_crawl = "Seleccionar Rastreo" ; -; social_component.php line: 887 +; social_component.php line: 898 social_component_default_crawl = "" ; -; social_component.php line: 889 +; social_component.php line: 900 social_component_select_crawl = "Seleccionar Rastreo" ; -; social_component.php line: 891 +; social_component.php line: 902 social_component_default_crawl = "" ; -; social_component.php line: 913 +; social_component.php line: 924 social_component_unnamed = "Rastreo sin nombre" ; -; social_component.php line: 920 +; social_component.php line: 931 social_component_mix_created = "Rastreo Mix creado!" ; -; social_component.php line: 927 +; social_component.php line: 938 social_component_mix_invalid_timestamp = "" ; -; social_component.php line: 933 +; social_component.php line: 944 social_component_mix_deleted = "Rastreo Mix eliminado!" ; -; social_component.php line: 951 +; social_component.php line: 962 social_component_mix_doesnt_exists = "Mix para eliminar (borrar) no existe!" ; -; social_component.php line: 961 +; social_component.php line: 972 social_component_mix_imported = "" ; -; social_component.php line: 965 +; social_component.php line: 976 social_component_set_index = "" ; -; social_component.php line: 986 +; social_component.php line: 997 social_component_comment_error = "" ; -; social_component.php line: 994 +; social_component.php line: 1005 social_component_invalid_timestamp = "" ; -; social_component.php line: 1013 +; social_component.php line: 1024 social_component_no_post_access = "" ; -; social_component.php line: 1018 +; social_component.php line: 1029 social_component_share_title = "" ; -; social_component.php line: 1020 +; social_component.php line: 1031 social_component_share_description = "" ; -; social_component.php line: 1025 +; social_component.php line: 1036 social_component_thread_created = "" ; -; social_component.php line: 1071 +; social_component.php line: 1082 social_component_mix_not_owner = "" ; -; social_component.php line: 1084 +; social_component.php line: 1095 social_component_add_crawls = "Añadir Rastreos" ; -; social_component.php line: 1086 +; social_component.php line: 1097 social_component_num_results = "Número de Resultados" ; -; social_component.php line: 1088 +; social_component.php line: 1099 social_component_del_frag = "" ; -; social_component.php line: 1090 +; social_component.php line: 1101 social_component_weight = "Tamaño" ; -; social_component.php line: 1091 +; social_component.php line: 1102 social_component_name = "" ; -; social_component.php line: 1093 +; social_component.php line: 1104 social_component_add_keywords = "" ; -; social_component.php line: 1095 +; social_component.php line: 1106 social_component_actions = "Acciones" ; -; social_component.php line: 1097 +; social_component.php line: 1108 social_component_add_query = "Agregar consulta" ; -; social_component.php line: 1098 +; social_component.php line: 1109 social_component_delete = "" ; -; social_component.php line: 1146 +; social_component.php line: 1157 social_component_too_many_fragments = "" ; -; social_component.php line: 1157 +; social_component.php line: 1168 social_component_mix_saved = "Guardados los Cambios del Rastreo Mix!" ; ; system_component.php line: 83 @@ -993,6 +993,9 @@ system_component_check_passed = "Entrada Aprobada" ; system_component.php line: 1041 system_component_using_local_config = "" ; +; group_controller.php line: 112 +group_controller_group_feeds = "" +; ; machine_controller.php line: 174 machine_controller_nolines = "" ; @@ -1714,73 +1717,76 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 71 +; groupfeed_element.php line: 85 groupfeed_element_back = "" ; -; groupfeed_element.php line: 78 +; groupfeed_element.php line: 94 groupfeed_element_recent_activity = "" ; -; groupfeed_element.php line: 81 +; groupfeed_element.php line: 97 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 85 -groupfeed_element_group = "" +; groupfeed_element.php line: 102 +groupfeed_element_feed = "" +; +; groupfeed_element.php line: 105 +group_view_wiki = "" ; -; groupfeed_element.php line: 88 +; groupfeed_element.php line: 107 groupfeed_element_user = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 134 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 121 +; groupfeed_element.php line: 145 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 147 +; groupfeed_element.php line: 171 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 152 +; groupfeed_element.php line: 176 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 164 +; groupfeed_element.php line: 188 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 188 +; groupfeed_element.php line: 212 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 195 +; groupfeed_element.php line: 219 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 268 +; groupfeed_element.php line: 292 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 273 +; groupfeed_element.php line: 297 groupfeed_element_save = "" ; -; groupfeed_element.php line: 299 +; groupfeed_element.php line: 323 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 302 +; groupfeed_element.php line: 326 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 307 +; groupfeed_element.php line: 331 groupfeed_element_post = "" ; -; groupfeed_element.php line: 312 +; groupfeed_element.php line: 336 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 365 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 368 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 349 +; groupfeed_element.php line: 373 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 379 groupfeed_element_save = "" ; -; groupfeed_element.php line: 384 +; groupfeed_element.php line: 408 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2792,21 +2798,36 @@ serversettings_element_captcha_setting = "" ; serversettings_element.php line: 255 serversettings_element_submit = "Enviar" ; -; signin_element.php line: 65 +; signin_element.php line: 67 signin_element_settings = "" ; -; signin_element.php line: 70 +; signin_element.php line: 72 signin_element_signin = "" ; -; signin_element.php line: 74 +; signin_element.php line: 76 signin_element_admin = "" ; -; signin_element.php line: 76 +; signin_element.php line: 78 signin_element_signout = "" ; ; subsearch_element.php line: 71 subsearch_element_more = "" ; +; group_view.php line: 72 +group_view_feed = "" +; +; group_view.php line: 75 +group_view_wiki = "" +; +; group_view.php line: 77 +group_view_user = "" +; +; group_view.php line: 80 +group_view_myfeeds = "" +; +; group_view.php line: 99 +adminview_auto_logout_one_minute = "Auto-cerrar la sesión en un minuto!" +; ; /Applications/MAMP/htdocs/git/yioop//views/helpers ; ; feeds_helper.php line: 70 @@ -3183,6 +3204,12 @@ signin_view_return_yioop = "" ; view.php line: 36 view_locale_version4 = "" ; +; wiki_view.php line: 73 +group_view_wiki = "" +; +; wiki_view.php line: 91 +adminview_auto_logout_one_minute = "Auto-cerrar la sesión en un minuto!" +; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins ; ; wordfilter_plugin.php line: 307 diff --git a/locale/fa/configure.ini b/locale/fa/configure.ini index 3bbea73b6..4017cb49e 100755 --- a/locale/fa/configure.ini +++ b/locale/fa/configure.ini @@ -690,154 +690,154 @@ social_component_unknown_access = "" ; social_component.php line: 536 social_component_group_filter_users = "" ; -; social_component.php line: 595 +; social_component.php line: 604 social_component_comment_error = "" ; -; social_component.php line: 601 +; social_component.php line: 610 social_component_no_comment = "" ; -; social_component.php line: 615 +; social_component.php line: 624 social_component_no_post_access = "" ; -; social_component.php line: 623 +; social_component.php line: 632 social_component_no_post_access = "" ; -; social_component.php line: 629 +; social_component.php line: 638 social_component_join_group = "" ; -; social_component.php line: 632 +; social_component.php line: 641 social_component_join_group_detail = "" ; -; social_component.php line: 644 +; social_component.php line: 653 social_component_comment_added = "" ; -; social_component.php line: 652 +; social_component.php line: 661 social_component_delete_error = "" ; -; social_component.php line: 660 +; social_component.php line: 669 social_component_item_deleted = "" ; -; social_component.php line: 664 +; social_component.php line: 673 social_component_no_item_deleted = "" ; -; social_component.php line: 674 +; social_component.php line: 683 social_component_comment_error = "" ; -; social_component.php line: 681 +; social_component.php line: 690 social_component_need_title_description = "" ; -; social_component.php line: 693 +; social_component.php line: 702 social_component_no_post_access = "" ; -; social_component.php line: 700 +; social_component.php line: 709 social_component_thread_created = "" ; -; social_component.php line: 711 +; social_component.php line: 720 social_component_comment_error = "" ; -; social_component.php line: 717 +; social_component.php line: 726 social_component_need_title_description = "" ; -; social_component.php line: 728 +; social_component.php line: 737 social_component_no_update_access = "" ; -; social_component.php line: 738 +; social_component.php line: 747 social_component_no_update_access = "" ; -; social_component.php line: 745 +; social_component.php line: 754 social_component_post_updated = "" ; -; social_component.php line: 763 +; social_component.php line: 772 social_component_join_group = "" ; -; social_component.php line: 766 +; social_component.php line: 775 social_component_join_group_detail = "" ; -; social_component.php line: 886 +; social_component.php line: 897 social_component_select_crawl = "یک خزش انتخاب کنید" ; -; social_component.php line: 887 +; social_component.php line: 898 social_component_default_crawl = "خزش پیش‌فرض" ; -; social_component.php line: 889 +; social_component.php line: 900 social_component_select_crawl = "یک خزش انتخاب کنید" ; -; social_component.php line: 891 +; social_component.php line: 902 social_component_default_crawl = "خزش پیش‌فرض" ; -; social_component.php line: 913 +; social_component.php line: 924 social_component_unnamed = "خزش بی‌نام" ; -; social_component.php line: 920 +; social_component.php line: 931 social_component_mix_created = "ترکیب خزش ساخته شد!" ; -; social_component.php line: 927 +; social_component.php line: 938 social_component_mix_invalid_timestamp = "" ; -; social_component.php line: 933 +; social_component.php line: 944 social_component_mix_deleted = "ترکیب خزش حذف شد!" ; -; social_component.php line: 951 +; social_component.php line: 962 social_component_mix_doesnt_exists = "ترکیبی که می‌خواهید حذف کنید وجود ندارد!" ; -; social_component.php line: 961 +; social_component.php line: 972 social_component_mix_imported = "" ; -; social_component.php line: 965 +; social_component.php line: 976 social_component_set_index = "" ; -; social_component.php line: 986 +; social_component.php line: 997 social_component_comment_error = "" ; -; social_component.php line: 994 +; social_component.php line: 1005 social_component_invalid_timestamp = "" ; -; social_component.php line: 1013 +; social_component.php line: 1024 social_component_no_post_access = "" ; -; social_component.php line: 1018 +; social_component.php line: 1029 social_component_share_title = "" ; -; social_component.php line: 1020 +; social_component.php line: 1031 social_component_share_description = "" ; -; social_component.php line: 1025 +; social_component.php line: 1036 social_component_thread_created = "" ; -; social_component.php line: 1071 +; social_component.php line: 1082 social_component_mix_not_owner = "" ; -; social_component.php line: 1084 +; social_component.php line: 1095 social_component_add_crawls = "خزش اضافه کن" ; -; social_component.php line: 1086 +; social_component.php line: 1097 social_component_num_results = "تعداد نتایج" ; -; social_component.php line: 1088 +; social_component.php line: 1099 social_component_del_frag = "" ; -; social_component.php line: 1090 +; social_component.php line: 1101 social_component_weight = "وزن" ; -; social_component.php line: 1091 +; social_component.php line: 1102 social_component_name = "" ; -; social_component.php line: 1093 +; social_component.php line: 1104 social_component_add_keywords = "" ; -; social_component.php line: 1095 +; social_component.php line: 1106 social_component_actions = "فرمان‌ها" ; -; social_component.php line: 1097 +; social_component.php line: 1108 social_component_add_query = "پُرسمان اضافه کن" ; -; social_component.php line: 1098 +; social_component.php line: 1109 social_component_delete = "" ; -; social_component.php line: 1146 +; social_component.php line: 1157 social_component_too_many_fragments = "" ; -; social_component.php line: 1157 +; social_component.php line: 1168 social_component_mix_saved = "تغییرات ترکیب خزش ذخیره شد!" ; ; system_component.php line: 83 @@ -993,6 +993,9 @@ system_component_check_passed = "در بررسی مشکلی پیدا نشد." ; system_component.php line: 1041 system_component_using_local_config = "از configs/local_config.php استفاده می‌شود، بنابراین ممکن است تغییر بالا عمل نکند." ; +; group_controller.php line: 112 +group_controller_group_feeds = "" +; ; machine_controller.php line: 174 machine_controller_nolines = "هیچ خطی با این فیلتر مطابق نیست!" ; @@ -1714,73 +1717,76 @@ footer_element_copyright_yioop = "(c) 2014 Yioop!" ; footer_element.php line: 83 footer_element_php_search_engine = "موتور جستجو PHP" ; -; groupfeed_element.php line: 71 +; groupfeed_element.php line: 85 groupfeed_element_back = "" ; -; groupfeed_element.php line: 78 +; groupfeed_element.php line: 94 groupfeed_element_recent_activity = "" ; -; groupfeed_element.php line: 81 +; groupfeed_element.php line: 97 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 85 -groupfeed_element_group = "" +; groupfeed_element.php line: 102 +groupfeed_element_feed = "" +; +; groupfeed_element.php line: 105 +group_view_wiki = "" ; -; groupfeed_element.php line: 88 +; groupfeed_element.php line: 107 groupfeed_element_user = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 134 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 121 +; groupfeed_element.php line: 145 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 147 +; groupfeed_element.php line: 171 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 152 +; groupfeed_element.php line: 176 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 164 +; groupfeed_element.php line: 188 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 188 +; groupfeed_element.php line: 212 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 195 +; groupfeed_element.php line: 219 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 268 +; groupfeed_element.php line: 292 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 273 +; groupfeed_element.php line: 297 groupfeed_element_save = "" ; -; groupfeed_element.php line: 299 +; groupfeed_element.php line: 323 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 302 +; groupfeed_element.php line: 326 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 307 +; groupfeed_element.php line: 331 groupfeed_element_post = "" ; -; groupfeed_element.php line: 312 +; groupfeed_element.php line: 336 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 365 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 368 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 349 +; groupfeed_element.php line: 373 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 379 groupfeed_element_save = "" ; -; groupfeed_element.php line: 384 +; groupfeed_element.php line: 408 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2792,21 +2798,36 @@ serversettings_element_captcha_setting = "" ; serversettings_element.php line: 255 serversettings_element_submit = "ارسال" ; -; signin_element.php line: 65 +; signin_element.php line: 67 signin_element_settings = "تنظیمات" ; -; signin_element.php line: 70 +; signin_element.php line: 72 signin_element_signin = "ورود" ; -; signin_element.php line: 74 +; signin_element.php line: 76 signin_element_admin = "مدیر" ; -; signin_element.php line: 76 +; signin_element.php line: 78 signin_element_signout = "خروج" ; ; subsearch_element.php line: 71 subsearch_element_more = "بیشتر" ; +; group_view.php line: 72 +group_view_feed = "" +; +; group_view.php line: 75 +group_view_wiki = "" +; +; group_view.php line: 77 +group_view_user = "" +; +; group_view.php line: 80 +group_view_myfeeds = "" +; +; group_view.php line: 99 +adminview_auto_logout_one_minute = "خروج خودکار تا یک دقیقهٔ دیگر!!" +; ; /Applications/MAMP/htdocs/git/yioop//views/helpers ; ; feeds_helper.php line: 70 @@ -3183,6 +3204,12 @@ signin_view_return_yioop = "بازگشت به Yioop" ; view.php line: 36 view_locale_version4 = "" ; +; wiki_view.php line: 73 +group_view_wiki = "" +; +; wiki_view.php line: 91 +adminview_auto_logout_one_minute = "خروج خودکار تا یک دقیقهٔ دیگر!!" +; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins ; ; wordfilter_plugin.php line: 307 diff --git a/locale/fr-FR/configure.ini b/locale/fr-FR/configure.ini index 5db94b38f..5c08be750 100755 --- a/locale/fr-FR/configure.ini +++ b/locale/fr-FR/configure.ini @@ -690,154 +690,154 @@ social_component_unknown_access = "" ; social_component.php line: 536 social_component_group_filter_users = "" ; -; social_component.php line: 595 +; social_component.php line: 604 social_component_comment_error = "" ; -; social_component.php line: 601 +; social_component.php line: 610 social_component_no_comment = "" ; -; social_component.php line: 615 +; social_component.php line: 624 social_component_no_post_access = "" ; -; social_component.php line: 623 +; social_component.php line: 632 social_component_no_post_access = "" ; -; social_component.php line: 629 +; social_component.php line: 638 social_component_join_group = "" ; -; social_component.php line: 632 +; social_component.php line: 641 social_component_join_group_detail = "" ; -; social_component.php line: 644 +; social_component.php line: 653 social_component_comment_added = "" ; -; social_component.php line: 652 +; social_component.php line: 661 social_component_delete_error = "" ; -; social_component.php line: 660 +; social_component.php line: 669 social_component_item_deleted = "" ; -; social_component.php line: 664 +; social_component.php line: 673 social_component_no_item_deleted = "" ; -; social_component.php line: 674 +; social_component.php line: 683 social_component_comment_error = "" ; -; social_component.php line: 681 +; social_component.php line: 690 social_component_need_title_description = "" ; -; social_component.php line: 693 +; social_component.php line: 702 social_component_no_post_access = "" ; -; social_component.php line: 700 +; social_component.php line: 709 social_component_thread_created = "" ; -; social_component.php line: 711 +; social_component.php line: 720 social_component_comment_error = "" ; -; social_component.php line: 717 +; social_component.php line: 726 social_component_need_title_description = "" ; -; social_component.php line: 728 +; social_component.php line: 737 social_component_no_update_access = "" ; -; social_component.php line: 738 +; social_component.php line: 747 social_component_no_update_access = "" ; -; social_component.php line: 745 +; social_component.php line: 754 social_component_post_updated = "" ; -; social_component.php line: 763 +; social_component.php line: 772 social_component_join_group = "" ; -; social_component.php line: 766 +; social_component.php line: 775 social_component_join_group_detail = "" ; -; social_component.php line: 886 +; social_component.php line: 897 social_component_select_crawl = "" ; -; social_component.php line: 887 +; social_component.php line: 898 social_component_default_crawl = "" ; -; social_component.php line: 889 +; social_component.php line: 900 social_component_select_crawl = "" ; -; social_component.php line: 891 +; social_component.php line: 902 social_component_default_crawl = "" ; -; social_component.php line: 913 +; social_component.php line: 924 social_component_unnamed = "" ; -; social_component.php line: 920 +; social_component.php line: 931 social_component_mix_created = "" ; -; social_component.php line: 927 +; social_component.php line: 938 social_component_mix_invalid_timestamp = "" ; -; social_component.php line: 933 +; social_component.php line: 944 social_component_mix_deleted = "" ; -; social_component.php line: 951 +; social_component.php line: 962 social_component_mix_doesnt_exists = "" ; -; social_component.php line: 961 +; social_component.php line: 972 social_component_mix_imported = "" ; -; social_component.php line: 965 +; social_component.php line: 976 social_component_set_index = "" ; -; social_component.php line: 986 +; social_component.php line: 997 social_component_comment_error = "" ; -; social_component.php line: 994 +; social_component.php line: 1005 social_component_invalid_timestamp = "" ; -; social_component.php line: 1013 +; social_component.php line: 1024 social_component_no_post_access = "" ; -; social_component.php line: 1018 +; social_component.php line: 1029 social_component_share_title = "" ; -; social_component.php line: 1020 +; social_component.php line: 1031 social_component_share_description = "" ; -; social_component.php line: 1025 +; social_component.php line: 1036 social_component_thread_created = "" ; -; social_component.php line: 1071 +; social_component.php line: 1082 social_component_mix_not_owner = "" ; -; social_component.php line: 1084 +; social_component.php line: 1095 social_component_add_crawls = "" ; -; social_component.php line: 1086 +; social_component.php line: 1097 social_component_num_results = "" ; -; social_component.php line: 1088 +; social_component.php line: 1099 social_component_del_frag = "" ; -; social_component.php line: 1090 +; social_component.php line: 1101 social_component_weight = "" ; -; social_component.php line: 1091 +; social_component.php line: 1102 social_component_name = "" ; -; social_component.php line: 1093 +; social_component.php line: 1104 social_component_add_keywords = "" ; -; social_component.php line: 1095 +; social_component.php line: 1106 social_component_actions = "" ; -; social_component.php line: 1097 +; social_component.php line: 1108 social_component_add_query = "" ; -; social_component.php line: 1098 +; social_component.php line: 1109 social_component_delete = "" ; -; social_component.php line: 1146 +; social_component.php line: 1157 social_component_too_many_fragments = "" ; -; social_component.php line: 1157 +; social_component.php line: 1168 social_component_mix_saved = "" ; ; system_component.php line: 83 @@ -993,6 +993,9 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; +; group_controller.php line: 112 +group_controller_group_feeds = "" +; ; machine_controller.php line: 174 machine_controller_nolines = "" ; @@ -1714,73 +1717,76 @@ footer_element_copyright_yioop = "(c) 2014 Yioop!" ; footer_element.php line: 83 footer_element_php_search_engine = "PHP Moteur de recherche" ; -; groupfeed_element.php line: 71 +; groupfeed_element.php line: 85 groupfeed_element_back = "" ; -; groupfeed_element.php line: 78 +; groupfeed_element.php line: 94 groupfeed_element_recent_activity = "" ; -; groupfeed_element.php line: 81 +; groupfeed_element.php line: 97 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 85 -groupfeed_element_group = "" +; groupfeed_element.php line: 102 +groupfeed_element_feed = "" +; +; groupfeed_element.php line: 105 +group_view_wiki = "" ; -; groupfeed_element.php line: 88 +; groupfeed_element.php line: 107 groupfeed_element_user = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 134 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 121 +; groupfeed_element.php line: 145 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 147 +; groupfeed_element.php line: 171 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 152 +; groupfeed_element.php line: 176 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 164 +; groupfeed_element.php line: 188 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 188 +; groupfeed_element.php line: 212 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 195 +; groupfeed_element.php line: 219 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 268 +; groupfeed_element.php line: 292 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 273 +; groupfeed_element.php line: 297 groupfeed_element_save = "" ; -; groupfeed_element.php line: 299 +; groupfeed_element.php line: 323 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 302 +; groupfeed_element.php line: 326 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 307 +; groupfeed_element.php line: 331 groupfeed_element_post = "" ; -; groupfeed_element.php line: 312 +; groupfeed_element.php line: 336 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 365 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 368 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 349 +; groupfeed_element.php line: 373 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 379 groupfeed_element_save = "" ; -; groupfeed_element.php line: 384 +; groupfeed_element.php line: 408 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2792,21 +2798,36 @@ serversettings_element_captcha_setting = "" ; serversettings_element.php line: 255 serversettings_element_submit = "" ; -; signin_element.php line: 65 +; signin_element.php line: 67 signin_element_settings = "Paramètres de recherche" ; -; signin_element.php line: 70 +; signin_element.php line: 72 signin_element_signin = "Connexion" ; -; signin_element.php line: 74 +; signin_element.php line: 76 signin_element_admin = "Administration" ; -; signin_element.php line: 76 +; signin_element.php line: 78 signin_element_signout = "Déconnexion" ; ; subsearch_element.php line: 71 subsearch_element_more = "Plus" ; +; group_view.php line: 72 +group_view_feed = "" +; +; group_view.php line: 75 +group_view_wiki = "" +; +; group_view.php line: 77 +group_view_user = "" +; +; group_view.php line: 80 +group_view_myfeeds = "" +; +; group_view.php line: 99 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//views/helpers ; ; feeds_helper.php line: 70 @@ -3183,6 +3204,12 @@ signin_view_return_yioop = "Retourner à Yioop" ; view.php line: 36 view_locale_version4 = "" ; +; wiki_view.php line: 73 +group_view_wiki = "" +; +; wiki_view.php line: 91 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins ; ; wordfilter_plugin.php line: 307 diff --git a/locale/he/configure.ini b/locale/he/configure.ini index ae39ef67c..ea410d302 100755 --- a/locale/he/configure.ini +++ b/locale/he/configure.ini @@ -690,154 +690,154 @@ social_component_unknown_access = "" ; social_component.php line: 536 social_component_group_filter_users = "" ; -; social_component.php line: 595 +; social_component.php line: 604 social_component_comment_error = "" ; -; social_component.php line: 601 +; social_component.php line: 610 social_component_no_comment = "" ; -; social_component.php line: 615 +; social_component.php line: 624 social_component_no_post_access = "" ; -; social_component.php line: 623 +; social_component.php line: 632 social_component_no_post_access = "" ; -; social_component.php line: 629 +; social_component.php line: 638 social_component_join_group = "" ; -; social_component.php line: 632 +; social_component.php line: 641 social_component_join_group_detail = "" ; -; social_component.php line: 644 +; social_component.php line: 653 social_component_comment_added = "" ; -; social_component.php line: 652 +; social_component.php line: 661 social_component_delete_error = "" ; -; social_component.php line: 660 +; social_component.php line: 669 social_component_item_deleted = "" ; -; social_component.php line: 664 +; social_component.php line: 673 social_component_no_item_deleted = "" ; -; social_component.php line: 674 +; social_component.php line: 683 social_component_comment_error = "" ; -; social_component.php line: 681 +; social_component.php line: 690 social_component_need_title_description = "" ; -; social_component.php line: 693 +; social_component.php line: 702 social_component_no_post_access = "" ; -; social_component.php line: 700 +; social_component.php line: 709 social_component_thread_created = "" ; -; social_component.php line: 711 +; social_component.php line: 720 social_component_comment_error = "" ; -; social_component.php line: 717 +; social_component.php line: 726 social_component_need_title_description = "" ; -; social_component.php line: 728 +; social_component.php line: 737 social_component_no_update_access = "" ; -; social_component.php line: 738 +; social_component.php line: 747 social_component_no_update_access = "" ; -; social_component.php line: 745 +; social_component.php line: 754 social_component_post_updated = "" ; -; social_component.php line: 763 +; social_component.php line: 772 social_component_join_group = "" ; -; social_component.php line: 766 +; social_component.php line: 775 social_component_join_group_detail = "" ; -; social_component.php line: 886 +; social_component.php line: 897 social_component_select_crawl = "" ; -; social_component.php line: 887 +; social_component.php line: 898 social_component_default_crawl = "" ; -; social_component.php line: 889 +; social_component.php line: 900 social_component_select_crawl = "" ; -; social_component.php line: 891 +; social_component.php line: 902 social_component_default_crawl = "" ; -; social_component.php line: 913 +; social_component.php line: 924 social_component_unnamed = "" ; -; social_component.php line: 920 +; social_component.php line: 931 social_component_mix_created = "" ; -; social_component.php line: 927 +; social_component.php line: 938 social_component_mix_invalid_timestamp = "" ; -; social_component.php line: 933 +; social_component.php line: 944 social_component_mix_deleted = "" ; -; social_component.php line: 951 +; social_component.php line: 962 social_component_mix_doesnt_exists = "" ; -; social_component.php line: 961 +; social_component.php line: 972 social_component_mix_imported = "" ; -; social_component.php line: 965 +; social_component.php line: 976 social_component_set_index = "" ; -; social_component.php line: 986 +; social_component.php line: 997 social_component_comment_error = "" ; -; social_component.php line: 994 +; social_component.php line: 1005 social_component_invalid_timestamp = "" ; -; social_component.php line: 1013 +; social_component.php line: 1024 social_component_no_post_access = "" ; -; social_component.php line: 1018 +; social_component.php line: 1029 social_component_share_title = "" ; -; social_component.php line: 1020 +; social_component.php line: 1031 social_component_share_description = "" ; -; social_component.php line: 1025 +; social_component.php line: 1036 social_component_thread_created = "" ; -; social_component.php line: 1071 +; social_component.php line: 1082 social_component_mix_not_owner = "" ; -; social_component.php line: 1084 +; social_component.php line: 1095 social_component_add_crawls = "" ; -; social_component.php line: 1086 +; social_component.php line: 1097 social_component_num_results = "" ; -; social_component.php line: 1088 +; social_component.php line: 1099 social_component_del_frag = "" ; -; social_component.php line: 1090 +; social_component.php line: 1101 social_component_weight = "" ; -; social_component.php line: 1091 +; social_component.php line: 1102 social_component_name = "" ; -; social_component.php line: 1093 +; social_component.php line: 1104 social_component_add_keywords = "" ; -; social_component.php line: 1095 +; social_component.php line: 1106 social_component_actions = "" ; -; social_component.php line: 1097 +; social_component.php line: 1108 social_component_add_query = "" ; -; social_component.php line: 1098 +; social_component.php line: 1109 social_component_delete = "" ; -; social_component.php line: 1146 +; social_component.php line: 1157 social_component_too_many_fragments = "" ; -; social_component.php line: 1157 +; social_component.php line: 1168 social_component_mix_saved = "" ; ; system_component.php line: 83 @@ -993,6 +993,9 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; +; group_controller.php line: 112 +group_controller_group_feeds = "" +; ; machine_controller.php line: 174 machine_controller_nolines = "" ; @@ -1714,73 +1717,76 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 71 +; groupfeed_element.php line: 85 groupfeed_element_back = "" ; -; groupfeed_element.php line: 78 +; groupfeed_element.php line: 94 groupfeed_element_recent_activity = "" ; -; groupfeed_element.php line: 81 +; groupfeed_element.php line: 97 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 85 -groupfeed_element_group = "" +; groupfeed_element.php line: 102 +groupfeed_element_feed = "" +; +; groupfeed_element.php line: 105 +group_view_wiki = "" ; -; groupfeed_element.php line: 88 +; groupfeed_element.php line: 107 groupfeed_element_user = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 134 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 121 +; groupfeed_element.php line: 145 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 147 +; groupfeed_element.php line: 171 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 152 +; groupfeed_element.php line: 176 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 164 +; groupfeed_element.php line: 188 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 188 +; groupfeed_element.php line: 212 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 195 +; groupfeed_element.php line: 219 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 268 +; groupfeed_element.php line: 292 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 273 +; groupfeed_element.php line: 297 groupfeed_element_save = "" ; -; groupfeed_element.php line: 299 +; groupfeed_element.php line: 323 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 302 +; groupfeed_element.php line: 326 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 307 +; groupfeed_element.php line: 331 groupfeed_element_post = "" ; -; groupfeed_element.php line: 312 +; groupfeed_element.php line: 336 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 365 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 368 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 349 +; groupfeed_element.php line: 373 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 379 groupfeed_element_save = "" ; -; groupfeed_element.php line: 384 +; groupfeed_element.php line: 408 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2792,21 +2798,36 @@ serversettings_element_captcha_setting = "" ; serversettings_element.php line: 255 serversettings_element_submit = "שלח" ; -; signin_element.php line: 65 +; signin_element.php line: 67 signin_element_settings = "" ; -; signin_element.php line: 70 +; signin_element.php line: 72 signin_element_signin = "" ; -; signin_element.php line: 74 +; signin_element.php line: 76 signin_element_admin = "" ; -; signin_element.php line: 76 +; signin_element.php line: 78 signin_element_signout = "" ; ; subsearch_element.php line: 71 subsearch_element_more = "" ; +; group_view.php line: 72 +group_view_feed = "" +; +; group_view.php line: 75 +group_view_wiki = "" +; +; group_view.php line: 77 +group_view_user = "" +; +; group_view.php line: 80 +group_view_myfeeds = "" +; +; group_view.php line: 99 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//views/helpers ; ; feeds_helper.php line: 70 @@ -3183,6 +3204,12 @@ signin_view_return_yioop = "" ; view.php line: 36 view_locale_version4 = "" ; +; wiki_view.php line: 73 +group_view_wiki = "" +; +; wiki_view.php line: 91 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins ; ; wordfilter_plugin.php line: 307 diff --git a/locale/hi/configure.ini b/locale/hi/configure.ini index f85f15e71..4982e56f3 100755 --- a/locale/hi/configure.ini +++ b/locale/hi/configure.ini @@ -690,154 +690,154 @@ social_component_unknown_access = "" ; social_component.php line: 536 social_component_group_filter_users = "" ; -; social_component.php line: 595 +; social_component.php line: 604 social_component_comment_error = "" ; -; social_component.php line: 601 +; social_component.php line: 610 social_component_no_comment = "" ; -; social_component.php line: 615 +; social_component.php line: 624 social_component_no_post_access = "" ; -; social_component.php line: 623 +; social_component.php line: 632 social_component_no_post_access = "" ; -; social_component.php line: 629 +; social_component.php line: 638 social_component_join_group = "" ; -; social_component.php line: 632 +; social_component.php line: 641 social_component_join_group_detail = "" ; -; social_component.php line: 644 +; social_component.php line: 653 social_component_comment_added = "" ; -; social_component.php line: 652 +; social_component.php line: 661 social_component_delete_error = "" ; -; social_component.php line: 660 +; social_component.php line: 669 social_component_item_deleted = "" ; -; social_component.php line: 664 +; social_component.php line: 673 social_component_no_item_deleted = "" ; -; social_component.php line: 674 +; social_component.php line: 683 social_component_comment_error = "" ; -; social_component.php line: 681 +; social_component.php line: 690 social_component_need_title_description = "" ; -; social_component.php line: 693 +; social_component.php line: 702 social_component_no_post_access = "" ; -; social_component.php line: 700 +; social_component.php line: 709 social_component_thread_created = "" ; -; social_component.php line: 711 +; social_component.php line: 720 social_component_comment_error = "" ; -; social_component.php line: 717 +; social_component.php line: 726 social_component_need_title_description = "" ; -; social_component.php line: 728 +; social_component.php line: 737 social_component_no_update_access = "" ; -; social_component.php line: 738 +; social_component.php line: 747 social_component_no_update_access = "" ; -; social_component.php line: 745 +; social_component.php line: 754 social_component_post_updated = "" ; -; social_component.php line: 763 +; social_component.php line: 772 social_component_join_group = "" ; -; social_component.php line: 766 +; social_component.php line: 775 social_component_join_group_detail = "" ; -; social_component.php line: 886 +; social_component.php line: 897 social_component_select_crawl = "" ; -; social_component.php line: 887 +; social_component.php line: 898 social_component_default_crawl = "" ; -; social_component.php line: 889 +; social_component.php line: 900 social_component_select_crawl = "" ; -; social_component.php line: 891 +; social_component.php line: 902 social_component_default_crawl = "" ; -; social_component.php line: 913 +; social_component.php line: 924 social_component_unnamed = "" ; -; social_component.php line: 920 +; social_component.php line: 931 social_component_mix_created = "" ; -; social_component.php line: 927 +; social_component.php line: 938 social_component_mix_invalid_timestamp = "" ; -; social_component.php line: 933 +; social_component.php line: 944 social_component_mix_deleted = "" ; -; social_component.php line: 951 +; social_component.php line: 962 social_component_mix_doesnt_exists = "" ; -; social_component.php line: 961 +; social_component.php line: 972 social_component_mix_imported = "" ; -; social_component.php line: 965 +; social_component.php line: 976 social_component_set_index = "" ; -; social_component.php line: 986 +; social_component.php line: 997 social_component_comment_error = "" ; -; social_component.php line: 994 +; social_component.php line: 1005 social_component_invalid_timestamp = "" ; -; social_component.php line: 1013 +; social_component.php line: 1024 social_component_no_post_access = "" ; -; social_component.php line: 1018 +; social_component.php line: 1029 social_component_share_title = "" ; -; social_component.php line: 1020 +; social_component.php line: 1031 social_component_share_description = "" ; -; social_component.php line: 1025 +; social_component.php line: 1036 social_component_thread_created = "" ; -; social_component.php line: 1071 +; social_component.php line: 1082 social_component_mix_not_owner = "" ; -; social_component.php line: 1084 +; social_component.php line: 1095 social_component_add_crawls = "" ; -; social_component.php line: 1086 +; social_component.php line: 1097 social_component_num_results = "" ; -; social_component.php line: 1088 +; social_component.php line: 1099 social_component_del_frag = "" ; -; social_component.php line: 1090 +; social_component.php line: 1101 social_component_weight = "" ; -; social_component.php line: 1091 +; social_component.php line: 1102 social_component_name = "" ; -; social_component.php line: 1093 +; social_component.php line: 1104 social_component_add_keywords = "" ; -; social_component.php line: 1095 +; social_component.php line: 1106 social_component_actions = "" ; -; social_component.php line: 1097 +; social_component.php line: 1108 social_component_add_query = "" ; -; social_component.php line: 1098 +; social_component.php line: 1109 social_component_delete = "" ; -; social_component.php line: 1146 +; social_component.php line: 1157 social_component_too_many_fragments = "" ; -; social_component.php line: 1157 +; social_component.php line: 1168 social_component_mix_saved = "" ; ; system_component.php line: 83 @@ -993,6 +993,9 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; +; group_controller.php line: 112 +group_controller_group_feeds = "" +; ; machine_controller.php line: 174 machine_controller_nolines = "" ; @@ -1714,73 +1717,76 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 71 +; groupfeed_element.php line: 85 groupfeed_element_back = "" ; -; groupfeed_element.php line: 78 +; groupfeed_element.php line: 94 groupfeed_element_recent_activity = "" ; -; groupfeed_element.php line: 81 +; groupfeed_element.php line: 97 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 85 -groupfeed_element_group = "" +; groupfeed_element.php line: 102 +groupfeed_element_feed = "" +; +; groupfeed_element.php line: 105 +group_view_wiki = "" ; -; groupfeed_element.php line: 88 +; groupfeed_element.php line: 107 groupfeed_element_user = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 134 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 121 +; groupfeed_element.php line: 145 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 147 +; groupfeed_element.php line: 171 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 152 +; groupfeed_element.php line: 176 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 164 +; groupfeed_element.php line: 188 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 188 +; groupfeed_element.php line: 212 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 195 +; groupfeed_element.php line: 219 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 268 +; groupfeed_element.php line: 292 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 273 +; groupfeed_element.php line: 297 groupfeed_element_save = "" ; -; groupfeed_element.php line: 299 +; groupfeed_element.php line: 323 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 302 +; groupfeed_element.php line: 326 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 307 +; groupfeed_element.php line: 331 groupfeed_element_post = "" ; -; groupfeed_element.php line: 312 +; groupfeed_element.php line: 336 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 365 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 368 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 349 +; groupfeed_element.php line: 373 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 379 groupfeed_element_save = "" ; -; groupfeed_element.php line: 384 +; groupfeed_element.php line: 408 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2792,21 +2798,36 @@ serversettings_element_captcha_setting = "" ; serversettings_element.php line: 255 serversettings_element_submit = "" ; -; signin_element.php line: 65 +; signin_element.php line: 67 signin_element_settings = "सेटिंग्स" ; -; signin_element.php line: 70 +; signin_element.php line: 72 signin_element_signin = "साइन इन करें" ; -; signin_element.php line: 74 +; signin_element.php line: 76 signin_element_admin = "प्रशासक" ; -; signin_element.php line: 76 +; signin_element.php line: 78 signin_element_signout = "साइन आउट करें" ; ; subsearch_element.php line: 71 subsearch_element_more = "" ; +; group_view.php line: 72 +group_view_feed = "" +; +; group_view.php line: 75 +group_view_wiki = "" +; +; group_view.php line: 77 +group_view_user = "" +; +; group_view.php line: 80 +group_view_myfeeds = "" +; +; group_view.php line: 99 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//views/helpers ; ; feeds_helper.php line: 70 @@ -3183,6 +3204,12 @@ signin_view_return_yioop = "वापस Yioop! पर" ; view.php line: 36 view_locale_version4 = "" ; +; wiki_view.php line: 73 +group_view_wiki = "" +; +; wiki_view.php line: 91 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins ; ; wordfilter_plugin.php line: 307 diff --git a/locale/in-ID/configure.ini b/locale/in-ID/configure.ini index e0c330e84..ba749474f 100755 --- a/locale/in-ID/configure.ini +++ b/locale/in-ID/configure.ini @@ -690,154 +690,154 @@ social_component_unknown_access = "" ; social_component.php line: 536 social_component_group_filter_users = "" ; -; social_component.php line: 595 +; social_component.php line: 604 social_component_comment_error = "" ; -; social_component.php line: 601 +; social_component.php line: 610 social_component_no_comment = "" ; -; social_component.php line: 615 +; social_component.php line: 624 social_component_no_post_access = "" ; -; social_component.php line: 623 +; social_component.php line: 632 social_component_no_post_access = "" ; -; social_component.php line: 629 +; social_component.php line: 638 social_component_join_group = "" ; -; social_component.php line: 632 +; social_component.php line: 641 social_component_join_group_detail = "" ; -; social_component.php line: 644 +; social_component.php line: 653 social_component_comment_added = "" ; -; social_component.php line: 652 +; social_component.php line: 661 social_component_delete_error = "" ; -; social_component.php line: 660 +; social_component.php line: 669 social_component_item_deleted = "" ; -; social_component.php line: 664 +; social_component.php line: 673 social_component_no_item_deleted = "" ; -; social_component.php line: 674 +; social_component.php line: 683 social_component_comment_error = "" ; -; social_component.php line: 681 +; social_component.php line: 690 social_component_need_title_description = "" ; -; social_component.php line: 693 +; social_component.php line: 702 social_component_no_post_access = "" ; -; social_component.php line: 700 +; social_component.php line: 709 social_component_thread_created = "" ; -; social_component.php line: 711 +; social_component.php line: 720 social_component_comment_error = "" ; -; social_component.php line: 717 +; social_component.php line: 726 social_component_need_title_description = "" ; -; social_component.php line: 728 +; social_component.php line: 737 social_component_no_update_access = "" ; -; social_component.php line: 738 +; social_component.php line: 747 social_component_no_update_access = "" ; -; social_component.php line: 745 +; social_component.php line: 754 social_component_post_updated = "" ; -; social_component.php line: 763 +; social_component.php line: 772 social_component_join_group = "" ; -; social_component.php line: 766 +; social_component.php line: 775 social_component_join_group_detail = "" ; -; social_component.php line: 886 +; social_component.php line: 897 social_component_select_crawl = "" ; -; social_component.php line: 887 +; social_component.php line: 898 social_component_default_crawl = "" ; -; social_component.php line: 889 +; social_component.php line: 900 social_component_select_crawl = "" ; -; social_component.php line: 891 +; social_component.php line: 902 social_component_default_crawl = "" ; -; social_component.php line: 913 +; social_component.php line: 924 social_component_unnamed = "" ; -; social_component.php line: 920 +; social_component.php line: 931 social_component_mix_created = "" ; -; social_component.php line: 927 +; social_component.php line: 938 social_component_mix_invalid_timestamp = "" ; -; social_component.php line: 933 +; social_component.php line: 944 social_component_mix_deleted = "" ; -; social_component.php line: 951 +; social_component.php line: 962 social_component_mix_doesnt_exists = "" ; -; social_component.php line: 961 +; social_component.php line: 972 social_component_mix_imported = "" ; -; social_component.php line: 965 +; social_component.php line: 976 social_component_set_index = "" ; -; social_component.php line: 986 +; social_component.php line: 997 social_component_comment_error = "" ; -; social_component.php line: 994 +; social_component.php line: 1005 social_component_invalid_timestamp = "" ; -; social_component.php line: 1013 +; social_component.php line: 1024 social_component_no_post_access = "" ; -; social_component.php line: 1018 +; social_component.php line: 1029 social_component_share_title = "" ; -; social_component.php line: 1020 +; social_component.php line: 1031 social_component_share_description = "" ; -; social_component.php line: 1025 +; social_component.php line: 1036 social_component_thread_created = "" ; -; social_component.php line: 1071 +; social_component.php line: 1082 social_component_mix_not_owner = "" ; -; social_component.php line: 1084 +; social_component.php line: 1095 social_component_add_crawls = "" ; -; social_component.php line: 1086 +; social_component.php line: 1097 social_component_num_results = "" ; -; social_component.php line: 1088 +; social_component.php line: 1099 social_component_del_frag = "" ; -; social_component.php line: 1090 +; social_component.php line: 1101 social_component_weight = "" ; -; social_component.php line: 1091 +; social_component.php line: 1102 social_component_name = "" ; -; social_component.php line: 1093 +; social_component.php line: 1104 social_component_add_keywords = "" ; -; social_component.php line: 1095 +; social_component.php line: 1106 social_component_actions = "" ; -; social_component.php line: 1097 +; social_component.php line: 1108 social_component_add_query = "" ; -; social_component.php line: 1098 +; social_component.php line: 1109 social_component_delete = "" ; -; social_component.php line: 1146 +; social_component.php line: 1157 social_component_too_many_fragments = "" ; -; social_component.php line: 1157 +; social_component.php line: 1168 social_component_mix_saved = "" ; ; system_component.php line: 83 @@ -993,6 +993,9 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; +; group_controller.php line: 112 +group_controller_group_feeds = "" +; ; machine_controller.php line: 174 machine_controller_nolines = "" ; @@ -1714,73 +1717,76 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 71 +; groupfeed_element.php line: 85 groupfeed_element_back = "" ; -; groupfeed_element.php line: 78 +; groupfeed_element.php line: 94 groupfeed_element_recent_activity = "" ; -; groupfeed_element.php line: 81 +; groupfeed_element.php line: 97 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 85 -groupfeed_element_group = "" +; groupfeed_element.php line: 102 +groupfeed_element_feed = "" +; +; groupfeed_element.php line: 105 +group_view_wiki = "" ; -; groupfeed_element.php line: 88 +; groupfeed_element.php line: 107 groupfeed_element_user = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 134 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 121 +; groupfeed_element.php line: 145 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 147 +; groupfeed_element.php line: 171 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 152 +; groupfeed_element.php line: 176 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 164 +; groupfeed_element.php line: 188 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 188 +; groupfeed_element.php line: 212 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 195 +; groupfeed_element.php line: 219 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 268 +; groupfeed_element.php line: 292 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 273 +; groupfeed_element.php line: 297 groupfeed_element_save = "" ; -; groupfeed_element.php line: 299 +; groupfeed_element.php line: 323 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 302 +; groupfeed_element.php line: 326 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 307 +; groupfeed_element.php line: 331 groupfeed_element_post = "" ; -; groupfeed_element.php line: 312 +; groupfeed_element.php line: 336 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 365 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 368 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 349 +; groupfeed_element.php line: 373 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 379 groupfeed_element_save = "" ; -; groupfeed_element.php line: 384 +; groupfeed_element.php line: 408 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2792,21 +2798,36 @@ serversettings_element_captcha_setting = "" ; serversettings_element.php line: 255 serversettings_element_submit = "" ; -; signin_element.php line: 65 +; signin_element.php line: 67 signin_element_settings = "" ; -; signin_element.php line: 70 +; signin_element.php line: 72 signin_element_signin = "Masuk" ; -; signin_element.php line: 74 +; signin_element.php line: 76 signin_element_admin = "Administratif" ; -; signin_element.php line: 76 +; signin_element.php line: 78 signin_element_signout = "Keluar" ; ; subsearch_element.php line: 71 subsearch_element_more = "" ; +; group_view.php line: 72 +group_view_feed = "" +; +; group_view.php line: 75 +group_view_wiki = "" +; +; group_view.php line: 77 +group_view_user = "" +; +; group_view.php line: 80 +group_view_myfeeds = "" +; +; group_view.php line: 99 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//views/helpers ; ; feeds_helper.php line: 70 @@ -3183,6 +3204,12 @@ signin_view_return_yioop = "" ; view.php line: 36 view_locale_version4 = "" ; +; wiki_view.php line: 73 +group_view_wiki = "" +; +; wiki_view.php line: 91 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins ; ; wordfilter_plugin.php line: 307 diff --git a/locale/it/configure.ini b/locale/it/configure.ini index 997c8e92b..64c45fa25 100755 --- a/locale/it/configure.ini +++ b/locale/it/configure.ini @@ -690,154 +690,154 @@ social_component_unknown_access = "" ; social_component.php line: 536 social_component_group_filter_users = "" ; -; social_component.php line: 595 +; social_component.php line: 604 social_component_comment_error = "" ; -; social_component.php line: 601 +; social_component.php line: 610 social_component_no_comment = "" ; -; social_component.php line: 615 +; social_component.php line: 624 social_component_no_post_access = "" ; -; social_component.php line: 623 +; social_component.php line: 632 social_component_no_post_access = "" ; -; social_component.php line: 629 +; social_component.php line: 638 social_component_join_group = "" ; -; social_component.php line: 632 +; social_component.php line: 641 social_component_join_group_detail = "" ; -; social_component.php line: 644 +; social_component.php line: 653 social_component_comment_added = "" ; -; social_component.php line: 652 +; social_component.php line: 661 social_component_delete_error = "" ; -; social_component.php line: 660 +; social_component.php line: 669 social_component_item_deleted = "" ; -; social_component.php line: 664 +; social_component.php line: 673 social_component_no_item_deleted = "" ; -; social_component.php line: 674 +; social_component.php line: 683 social_component_comment_error = "" ; -; social_component.php line: 681 +; social_component.php line: 690 social_component_need_title_description = "" ; -; social_component.php line: 693 +; social_component.php line: 702 social_component_no_post_access = "" ; -; social_component.php line: 700 +; social_component.php line: 709 social_component_thread_created = "" ; -; social_component.php line: 711 +; social_component.php line: 720 social_component_comment_error = "" ; -; social_component.php line: 717 +; social_component.php line: 726 social_component_need_title_description = "" ; -; social_component.php line: 728 +; social_component.php line: 737 social_component_no_update_access = "" ; -; social_component.php line: 738 +; social_component.php line: 747 social_component_no_update_access = "" ; -; social_component.php line: 745 +; social_component.php line: 754 social_component_post_updated = "" ; -; social_component.php line: 763 +; social_component.php line: 772 social_component_join_group = "" ; -; social_component.php line: 766 +; social_component.php line: 775 social_component_join_group_detail = "" ; -; social_component.php line: 886 +; social_component.php line: 897 social_component_select_crawl = "Seleziona Scansione" ; -; social_component.php line: 887 +; social_component.php line: 898 social_component_default_crawl = "" ; -; social_component.php line: 889 +; social_component.php line: 900 social_component_select_crawl = "Seleziona Scansione" ; -; social_component.php line: 891 +; social_component.php line: 902 social_component_default_crawl = "" ; -; social_component.php line: 913 +; social_component.php line: 924 social_component_unnamed = "Scansione senza nome" ; -; social_component.php line: 920 +; social_component.php line: 931 social_component_mix_created = "Unione Scansioni creata!" ; -; social_component.php line: 927 +; social_component.php line: 938 social_component_mix_invalid_timestamp = "" ; -; social_component.php line: 933 +; social_component.php line: 944 social_component_mix_deleted = "Unione Scansioni cancellata!" ; -; social_component.php line: 951 +; social_component.php line: 962 social_component_mix_doesnt_exists = "Unione Scansioni da cancellare inesistente!" ; -; social_component.php line: 961 +; social_component.php line: 972 social_component_mix_imported = "" ; -; social_component.php line: 965 +; social_component.php line: 976 social_component_set_index = "" ; -; social_component.php line: 986 +; social_component.php line: 997 social_component_comment_error = "" ; -; social_component.php line: 994 +; social_component.php line: 1005 social_component_invalid_timestamp = "" ; -; social_component.php line: 1013 +; social_component.php line: 1024 social_component_no_post_access = "" ; -; social_component.php line: 1018 +; social_component.php line: 1029 social_component_share_title = "" ; -; social_component.php line: 1020 +; social_component.php line: 1031 social_component_share_description = "" ; -; social_component.php line: 1025 +; social_component.php line: 1036 social_component_thread_created = "" ; -; social_component.php line: 1071 +; social_component.php line: 1082 social_component_mix_not_owner = "" ; -; social_component.php line: 1084 +; social_component.php line: 1095 social_component_add_crawls = "Aggiungi scansione" ; -; social_component.php line: 1086 +; social_component.php line: 1097 social_component_num_results = "Numero di risultati" ; -; social_component.php line: 1088 +; social_component.php line: 1099 social_component_del_frag = "" ; -; social_component.php line: 1090 +; social_component.php line: 1101 social_component_weight = "Peso" ; -; social_component.php line: 1091 +; social_component.php line: 1102 social_component_name = "" ; -; social_component.php line: 1093 +; social_component.php line: 1104 social_component_add_keywords = "" ; -; social_component.php line: 1095 +; social_component.php line: 1106 social_component_actions = "Azioni" ; -; social_component.php line: 1097 +; social_component.php line: 1108 social_component_add_query = "Aggiungi Ricerca" ; -; social_component.php line: 1098 +; social_component.php line: 1109 social_component_delete = "" ; -; social_component.php line: 1146 +; social_component.php line: 1157 social_component_too_many_fragments = "" ; -; social_component.php line: 1157 +; social_component.php line: 1168 social_component_mix_saved = "Cambiamenti Unione Scansioni effettuati!" ; ; system_component.php line: 83 @@ -993,6 +993,9 @@ system_component_check_passed = "Controllo passato." ; system_component.php line: 1041 system_component_using_local_config = "Usando configs/local_config.php la Cartella di Lavoro sopra potrebbe non funzionare." ; +; group_controller.php line: 112 +group_controller_group_feeds = "" +; ; machine_controller.php line: 174 machine_controller_nolines = "" ; @@ -1714,73 +1717,76 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "Motore di Ricerca in PHP" ; -; groupfeed_element.php line: 71 +; groupfeed_element.php line: 85 groupfeed_element_back = "" ; -; groupfeed_element.php line: 78 +; groupfeed_element.php line: 94 groupfeed_element_recent_activity = "" ; -; groupfeed_element.php line: 81 +; groupfeed_element.php line: 97 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 85 -groupfeed_element_group = "" +; groupfeed_element.php line: 102 +groupfeed_element_feed = "" +; +; groupfeed_element.php line: 105 +group_view_wiki = "" ; -; groupfeed_element.php line: 88 +; groupfeed_element.php line: 107 groupfeed_element_user = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 134 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 121 +; groupfeed_element.php line: 145 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 147 +; groupfeed_element.php line: 171 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 152 +; groupfeed_element.php line: 176 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 164 +; groupfeed_element.php line: 188 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 188 +; groupfeed_element.php line: 212 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 195 +; groupfeed_element.php line: 219 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 268 +; groupfeed_element.php line: 292 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 273 +; groupfeed_element.php line: 297 groupfeed_element_save = "" ; -; groupfeed_element.php line: 299 +; groupfeed_element.php line: 323 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 302 +; groupfeed_element.php line: 326 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 307 +; groupfeed_element.php line: 331 groupfeed_element_post = "" ; -; groupfeed_element.php line: 312 +; groupfeed_element.php line: 336 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 365 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 368 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 349 +; groupfeed_element.php line: 373 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 379 groupfeed_element_save = "" ; -; groupfeed_element.php line: 384 +; groupfeed_element.php line: 408 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2792,21 +2798,36 @@ serversettings_element_captcha_setting = "" ; serversettings_element.php line: 255 serversettings_element_submit = "Invia" ; -; signin_element.php line: 65 +; signin_element.php line: 67 signin_element_settings = "Impostazioni" ; -; signin_element.php line: 70 +; signin_element.php line: 72 signin_element_signin = "Accedi" ; -; signin_element.php line: 74 +; signin_element.php line: 76 signin_element_admin = "Amministratore" ; -; signin_element.php line: 76 +; signin_element.php line: 78 signin_element_signout = "Esci" ; ; subsearch_element.php line: 71 subsearch_element_more = "Più" ; +; group_view.php line: 72 +group_view_feed = "" +; +; group_view.php line: 75 +group_view_wiki = "" +; +; group_view.php line: 77 +group_view_user = "" +; +; group_view.php line: 80 +group_view_myfeeds = "" +; +; group_view.php line: 99 +adminview_auto_logout_one_minute = "Fine Accesso in un minuto!!" +; ; /Applications/MAMP/htdocs/git/yioop//views/helpers ; ; feeds_helper.php line: 70 @@ -3183,6 +3204,12 @@ signin_view_return_yioop = "Ritorna a Yioop" ; view.php line: 36 view_locale_version4 = "" ; +; wiki_view.php line: 73 +group_view_wiki = "" +; +; wiki_view.php line: 91 +adminview_auto_logout_one_minute = "Fine Accesso in un minuto!!" +; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins ; ; wordfilter_plugin.php line: 307 diff --git a/locale/ja/configure.ini b/locale/ja/configure.ini index 5b3d9ef17..6b38391d5 100755 --- a/locale/ja/configure.ini +++ b/locale/ja/configure.ini @@ -690,154 +690,154 @@ social_component_unknown_access = "" ; social_component.php line: 536 social_component_group_filter_users = "" ; -; social_component.php line: 595 +; social_component.php line: 604 social_component_comment_error = "" ; -; social_component.php line: 601 +; social_component.php line: 610 social_component_no_comment = "" ; -; social_component.php line: 615 +; social_component.php line: 624 social_component_no_post_access = "" ; -; social_component.php line: 623 +; social_component.php line: 632 social_component_no_post_access = "" ; -; social_component.php line: 629 +; social_component.php line: 638 social_component_join_group = "" ; -; social_component.php line: 632 +; social_component.php line: 641 social_component_join_group_detail = "" ; -; social_component.php line: 644 +; social_component.php line: 653 social_component_comment_added = "" ; -; social_component.php line: 652 +; social_component.php line: 661 social_component_delete_error = "" ; -; social_component.php line: 660 +; social_component.php line: 669 social_component_item_deleted = "" ; -; social_component.php line: 664 +; social_component.php line: 673 social_component_no_item_deleted = "" ; -; social_component.php line: 674 +; social_component.php line: 683 social_component_comment_error = "" ; -; social_component.php line: 681 +; social_component.php line: 690 social_component_need_title_description = "" ; -; social_component.php line: 693 +; social_component.php line: 702 social_component_no_post_access = "" ; -; social_component.php line: 700 +; social_component.php line: 709 social_component_thread_created = "" ; -; social_component.php line: 711 +; social_component.php line: 720 social_component_comment_error = "" ; -; social_component.php line: 717 +; social_component.php line: 726 social_component_need_title_description = "" ; -; social_component.php line: 728 +; social_component.php line: 737 social_component_no_update_access = "" ; -; social_component.php line: 738 +; social_component.php line: 747 social_component_no_update_access = "" ; -; social_component.php line: 745 +; social_component.php line: 754 social_component_post_updated = "" ; -; social_component.php line: 763 +; social_component.php line: 772 social_component_join_group = "" ; -; social_component.php line: 766 +; social_component.php line: 775 social_component_join_group_detail = "" ; -; social_component.php line: 886 +; social_component.php line: 897 social_component_select_crawl = "" ; -; social_component.php line: 887 +; social_component.php line: 898 social_component_default_crawl = "" ; -; social_component.php line: 889 +; social_component.php line: 900 social_component_select_crawl = "" ; -; social_component.php line: 891 +; social_component.php line: 902 social_component_default_crawl = "" ; -; social_component.php line: 913 +; social_component.php line: 924 social_component_unnamed = "" ; -; social_component.php line: 920 +; social_component.php line: 931 social_component_mix_created = "" ; -; social_component.php line: 927 +; social_component.php line: 938 social_component_mix_invalid_timestamp = "" ; -; social_component.php line: 933 +; social_component.php line: 944 social_component_mix_deleted = "" ; -; social_component.php line: 951 +; social_component.php line: 962 social_component_mix_doesnt_exists = "" ; -; social_component.php line: 961 +; social_component.php line: 972 social_component_mix_imported = "" ; -; social_component.php line: 965 +; social_component.php line: 976 social_component_set_index = "" ; -; social_component.php line: 986 +; social_component.php line: 997 social_component_comment_error = "" ; -; social_component.php line: 994 +; social_component.php line: 1005 social_component_invalid_timestamp = "" ; -; social_component.php line: 1013 +; social_component.php line: 1024 social_component_no_post_access = "" ; -; social_component.php line: 1018 +; social_component.php line: 1029 social_component_share_title = "" ; -; social_component.php line: 1020 +; social_component.php line: 1031 social_component_share_description = "" ; -; social_component.php line: 1025 +; social_component.php line: 1036 social_component_thread_created = "" ; -; social_component.php line: 1071 +; social_component.php line: 1082 social_component_mix_not_owner = "" ; -; social_component.php line: 1084 +; social_component.php line: 1095 social_component_add_crawls = "" ; -; social_component.php line: 1086 +; social_component.php line: 1097 social_component_num_results = "" ; -; social_component.php line: 1088 +; social_component.php line: 1099 social_component_del_frag = "" ; -; social_component.php line: 1090 +; social_component.php line: 1101 social_component_weight = "" ; -; social_component.php line: 1091 +; social_component.php line: 1102 social_component_name = "" ; -; social_component.php line: 1093 +; social_component.php line: 1104 social_component_add_keywords = "" ; -; social_component.php line: 1095 +; social_component.php line: 1106 social_component_actions = "" ; -; social_component.php line: 1097 +; social_component.php line: 1108 social_component_add_query = "" ; -; social_component.php line: 1098 +; social_component.php line: 1109 social_component_delete = "" ; -; social_component.php line: 1146 +; social_component.php line: 1157 social_component_too_many_fragments = "" ; -; social_component.php line: 1157 +; social_component.php line: 1168 social_component_mix_saved = "" ; ; system_component.php line: 83 @@ -993,6 +993,9 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; +; group_controller.php line: 112 +group_controller_group_feeds = "" +; ; machine_controller.php line: 174 machine_controller_nolines = "" ; @@ -1714,73 +1717,76 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 71 +; groupfeed_element.php line: 85 groupfeed_element_back = "" ; -; groupfeed_element.php line: 78 +; groupfeed_element.php line: 94 groupfeed_element_recent_activity = "" ; -; groupfeed_element.php line: 81 +; groupfeed_element.php line: 97 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 85 -groupfeed_element_group = "" +; groupfeed_element.php line: 102 +groupfeed_element_feed = "" +; +; groupfeed_element.php line: 105 +group_view_wiki = "" ; -; groupfeed_element.php line: 88 +; groupfeed_element.php line: 107 groupfeed_element_user = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 134 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 121 +; groupfeed_element.php line: 145 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 147 +; groupfeed_element.php line: 171 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 152 +; groupfeed_element.php line: 176 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 164 +; groupfeed_element.php line: 188 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 188 +; groupfeed_element.php line: 212 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 195 +; groupfeed_element.php line: 219 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 268 +; groupfeed_element.php line: 292 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 273 +; groupfeed_element.php line: 297 groupfeed_element_save = "" ; -; groupfeed_element.php line: 299 +; groupfeed_element.php line: 323 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 302 +; groupfeed_element.php line: 326 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 307 +; groupfeed_element.php line: 331 groupfeed_element_post = "" ; -; groupfeed_element.php line: 312 +; groupfeed_element.php line: 336 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 365 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 368 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 349 +; groupfeed_element.php line: 373 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 379 groupfeed_element_save = "" ; -; groupfeed_element.php line: 384 +; groupfeed_element.php line: 408 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2792,21 +2798,36 @@ serversettings_element_captcha_setting = "" ; serversettings_element.php line: 255 serversettings_element_submit = "サブミット" ; -; signin_element.php line: 65 +; signin_element.php line: 67 signin_element_settings = "設定" ; -; signin_element.php line: 70 +; signin_element.php line: 72 signin_element_signin = "サインイン" ; -; signin_element.php line: 74 +; signin_element.php line: 76 signin_element_admin = "管理" ; -; signin_element.php line: 76 +; signin_element.php line: 78 signin_element_signout = "ログアウト" ; ; subsearch_element.php line: 71 subsearch_element_more = "" ; +; group_view.php line: 72 +group_view_feed = "" +; +; group_view.php line: 75 +group_view_wiki = "" +; +; group_view.php line: 77 +group_view_user = "" +; +; group_view.php line: 80 +group_view_myfeeds = "" +; +; group_view.php line: 99 +adminview_auto_logout_one_minute = "自動なログアウト一分ぐらい" +; ; /Applications/MAMP/htdocs/git/yioop//views/helpers ; ; feeds_helper.php line: 70 @@ -3183,6 +3204,12 @@ signin_view_return_yioop = "ウィオップ!に戻る" ; view.php line: 36 view_locale_version4 = "" ; +; wiki_view.php line: 73 +group_view_wiki = "" +; +; wiki_view.php line: 91 +adminview_auto_logout_one_minute = "自動なログアウト一分ぐらい" +; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins ; ; wordfilter_plugin.php line: 307 diff --git a/locale/kn/configure.ini b/locale/kn/configure.ini index d66e30157..e0fe4c2e0 100755 --- a/locale/kn/configure.ini +++ b/locale/kn/configure.ini @@ -690,154 +690,154 @@ social_component_unknown_access = "" ; social_component.php line: 536 social_component_group_filter_users = "" ; -; social_component.php line: 595 +; social_component.php line: 604 social_component_comment_error = "" ; -; social_component.php line: 601 +; social_component.php line: 610 social_component_no_comment = "" ; -; social_component.php line: 615 +; social_component.php line: 624 social_component_no_post_access = "" ; -; social_component.php line: 623 +; social_component.php line: 632 social_component_no_post_access = "" ; -; social_component.php line: 629 +; social_component.php line: 638 social_component_join_group = "" ; -; social_component.php line: 632 +; social_component.php line: 641 social_component_join_group_detail = "" ; -; social_component.php line: 644 +; social_component.php line: 653 social_component_comment_added = "" ; -; social_component.php line: 652 +; social_component.php line: 661 social_component_delete_error = "" ; -; social_component.php line: 660 +; social_component.php line: 669 social_component_item_deleted = "" ; -; social_component.php line: 664 +; social_component.php line: 673 social_component_no_item_deleted = "" ; -; social_component.php line: 674 +; social_component.php line: 683 social_component_comment_error = "" ; -; social_component.php line: 681 +; social_component.php line: 690 social_component_need_title_description = "" ; -; social_component.php line: 693 +; social_component.php line: 702 social_component_no_post_access = "" ; -; social_component.php line: 700 +; social_component.php line: 709 social_component_thread_created = "" ; -; social_component.php line: 711 +; social_component.php line: 720 social_component_comment_error = "" ; -; social_component.php line: 717 +; social_component.php line: 726 social_component_need_title_description = "" ; -; social_component.php line: 728 +; social_component.php line: 737 social_component_no_update_access = "" ; -; social_component.php line: 738 +; social_component.php line: 747 social_component_no_update_access = "" ; -; social_component.php line: 745 +; social_component.php line: 754 social_component_post_updated = "" ; -; social_component.php line: 763 +; social_component.php line: 772 social_component_join_group = "" ; -; social_component.php line: 766 +; social_component.php line: 775 social_component_join_group_detail = "" ; -; social_component.php line: 886 +; social_component.php line: 897 social_component_select_crawl = "ಕ್ರಾವ್ಲನ್ನು ಆಯ್ಕೆ ಮಾಡಿ" ; -; social_component.php line: 887 +; social_component.php line: 898 social_component_default_crawl = "" ; -; social_component.php line: 889 +; social_component.php line: 900 social_component_select_crawl = "ಕ್ರಾವ್ಲನ್ನು ಆಯ್ಕೆ ಮಾಡಿ" ; -; social_component.php line: 891 +; social_component.php line: 902 social_component_default_crawl = "" ; -; social_component.php line: 913 +; social_component.php line: 924 social_component_unnamed = "ಹೆಸರಿಡದ ಕ್ರಾವ್ಲ" ; -; social_component.php line: 920 +; social_component.php line: 931 social_component_mix_created = "ಕ್ರಾವ್ಲಗಳ ಮಿಶ್ರಣ ಸೃಜಿಸಲಾಯಿತು" ; -; social_component.php line: 927 +; social_component.php line: 938 social_component_mix_invalid_timestamp = "" ; -; social_component.php line: 933 +; social_component.php line: 944 social_component_mix_deleted = "ಕ್ರಾವ್ಲ ಮಿಶ್ರಣ ಅಳಿಸಲಾಗಿದೆ" ; -; social_component.php line: 951 +; social_component.php line: 962 social_component_mix_doesnt_exists = "ಅಳಿಸಬೇಕಾದ ಕ್ರಾವ್ಲ ಮಿಶ್ರಣ ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ" ; -; social_component.php line: 961 +; social_component.php line: 972 social_component_mix_imported = "" ; -; social_component.php line: 965 +; social_component.php line: 976 social_component_set_index = "" ; -; social_component.php line: 986 +; social_component.php line: 997 social_component_comment_error = "" ; -; social_component.php line: 994 +; social_component.php line: 1005 social_component_invalid_timestamp = "" ; -; social_component.php line: 1013 +; social_component.php line: 1024 social_component_no_post_access = "" ; -; social_component.php line: 1018 +; social_component.php line: 1029 social_component_share_title = "" ; -; social_component.php line: 1020 +; social_component.php line: 1031 social_component_share_description = "" ; -; social_component.php line: 1025 +; social_component.php line: 1036 social_component_thread_created = "" ; -; social_component.php line: 1071 +; social_component.php line: 1082 social_component_mix_not_owner = "" ; -; social_component.php line: 1084 +; social_component.php line: 1095 social_component_add_crawls = "ಕ್ರಾವ್ಲಗಳನ್ನು ಸೇರಿಸಿ" ; -; social_component.php line: 1086 +; social_component.php line: 1097 social_component_num_results = "ಫಲಿತಾಂಶಗಳ ಸಂಖ್ಯೆ" ; -; social_component.php line: 1088 +; social_component.php line: 1099 social_component_del_frag = "" ; -; social_component.php line: 1090 +; social_component.php line: 1101 social_component_weight = "ಗೌರವ" ; -; social_component.php line: 1091 +; social_component.php line: 1102 social_component_name = "" ; -; social_component.php line: 1093 +; social_component.php line: 1104 social_component_add_keywords = "" ; -; social_component.php line: 1095 +; social_component.php line: 1106 social_component_actions = "ಕ್ರಿಯೆಗಳು" ; -; social_component.php line: 1097 +; social_component.php line: 1108 social_component_add_query = "ಪ್ರಶ್ನೆಯನ್ನು ಸೇರಿಸು" ; -; social_component.php line: 1098 +; social_component.php line: 1109 social_component_delete = "" ; -; social_component.php line: 1146 +; social_component.php line: 1157 social_component_too_many_fragments = "" ; -; social_component.php line: 1157 +; social_component.php line: 1168 social_component_mix_saved = "ಕ್ರಾವ್ಲ್ ಮಿಶ್ರಣದಲ್ಲಿ ಬದಲಾವಣೆಯನ್ನು ಉಳಿಸು" ; ; system_component.php line: 83 @@ -993,6 +993,9 @@ system_component_check_passed = "ಪರಿಶೀಲನೆ ತೇರ್ಗಡೆ ; system_component.php line: 1041 system_component_using_local_config = "configs/local_config.php ಉಪಯೋಗದಲ್ಲಿದೆ, ಅದರಿಂದ ಮೇಲಿನ ಕಾರ್ಯ ನಿರ್ದೇಶಿಕೆಯನ್ನು ಬದಲಾವಣೆ ನಿಷ್ಕ್ರಿಯವಾಗಬಹುದು " ; +; group_controller.php line: 112 +group_controller_group_feeds = "" +; ; machine_controller.php line: 174 machine_controller_nolines = "" ; @@ -1714,73 +1717,76 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 71 +; groupfeed_element.php line: 85 groupfeed_element_back = "" ; -; groupfeed_element.php line: 78 +; groupfeed_element.php line: 94 groupfeed_element_recent_activity = "" ; -; groupfeed_element.php line: 81 +; groupfeed_element.php line: 97 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 85 -groupfeed_element_group = "" +; groupfeed_element.php line: 102 +groupfeed_element_feed = "" +; +; groupfeed_element.php line: 105 +group_view_wiki = "" ; -; groupfeed_element.php line: 88 +; groupfeed_element.php line: 107 groupfeed_element_user = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 134 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 121 +; groupfeed_element.php line: 145 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 147 +; groupfeed_element.php line: 171 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 152 +; groupfeed_element.php line: 176 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 164 +; groupfeed_element.php line: 188 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 188 +; groupfeed_element.php line: 212 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 195 +; groupfeed_element.php line: 219 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 268 +; groupfeed_element.php line: 292 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 273 +; groupfeed_element.php line: 297 groupfeed_element_save = "" ; -; groupfeed_element.php line: 299 +; groupfeed_element.php line: 323 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 302 +; groupfeed_element.php line: 326 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 307 +; groupfeed_element.php line: 331 groupfeed_element_post = "" ; -; groupfeed_element.php line: 312 +; groupfeed_element.php line: 336 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 365 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 368 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 349 +; groupfeed_element.php line: 373 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 379 groupfeed_element_save = "" ; -; groupfeed_element.php line: 384 +; groupfeed_element.php line: 408 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2792,21 +2798,36 @@ serversettings_element_captcha_setting = "" ; serversettings_element.php line: 255 serversettings_element_submit = "" ; -; signin_element.php line: 65 +; signin_element.php line: 67 signin_element_settings = "ನಿಗದಿಗಳು" ; -; signin_element.php line: 70 +; signin_element.php line: 72 signin_element_signin = "ಒಳಪ್ರವೇಶಿಸಿ" ; -; signin_element.php line: 74 +; signin_element.php line: 76 signin_element_admin = "ಕಾರ್ಯ ನಿರ್ವಾಹಕ " ; -; signin_element.php line: 76 +; signin_element.php line: 78 signin_element_signout = "ನಿಷ್ಕ್ರಮಿಸಿ" ; ; subsearch_element.php line: 71 subsearch_element_more = "" ; +; group_view.php line: 72 +group_view_feed = "" +; +; group_view.php line: 75 +group_view_wiki = "" +; +; group_view.php line: 77 +group_view_user = "" +; +; group_view.php line: 80 +group_view_myfeeds = "" +; +; group_view.php line: 99 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//views/helpers ; ; feeds_helper.php line: 70 @@ -3183,6 +3204,12 @@ signin_view_return_yioop = "ಯೂಪ್'ಗೆ ಮರಳಿರಿ" ; view.php line: 36 view_locale_version4 = "" ; +; wiki_view.php line: 73 +group_view_wiki = "" +; +; wiki_view.php line: 91 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins ; ; wordfilter_plugin.php line: 307 diff --git a/locale/ko/configure.ini b/locale/ko/configure.ini index 160b9bd16..6880720af 100755 --- a/locale/ko/configure.ini +++ b/locale/ko/configure.ini @@ -690,154 +690,154 @@ social_component_unknown_access = "" ; social_component.php line: 536 social_component_group_filter_users = "" ; -; social_component.php line: 595 +; social_component.php line: 604 social_component_comment_error = "" ; -; social_component.php line: 601 +; social_component.php line: 610 social_component_no_comment = "" ; -; social_component.php line: 615 +; social_component.php line: 624 social_component_no_post_access = "" ; -; social_component.php line: 623 +; social_component.php line: 632 social_component_no_post_access = "" ; -; social_component.php line: 629 +; social_component.php line: 638 social_component_join_group = "" ; -; social_component.php line: 632 +; social_component.php line: 641 social_component_join_group_detail = "" ; -; social_component.php line: 644 +; social_component.php line: 653 social_component_comment_added = "" ; -; social_component.php line: 652 +; social_component.php line: 661 social_component_delete_error = "" ; -; social_component.php line: 660 +; social_component.php line: 669 social_component_item_deleted = "" ; -; social_component.php line: 664 +; social_component.php line: 673 social_component_no_item_deleted = "" ; -; social_component.php line: 674 +; social_component.php line: 683 social_component_comment_error = "" ; -; social_component.php line: 681 +; social_component.php line: 690 social_component_need_title_description = "" ; -; social_component.php line: 693 +; social_component.php line: 702 social_component_no_post_access = "" ; -; social_component.php line: 700 +; social_component.php line: 709 social_component_thread_created = "" ; -; social_component.php line: 711 +; social_component.php line: 720 social_component_comment_error = "" ; -; social_component.php line: 717 +; social_component.php line: 726 social_component_need_title_description = "" ; -; social_component.php line: 728 +; social_component.php line: 737 social_component_no_update_access = "" ; -; social_component.php line: 738 +; social_component.php line: 747 social_component_no_update_access = "" ; -; social_component.php line: 745 +; social_component.php line: 754 social_component_post_updated = "" ; -; social_component.php line: 763 +; social_component.php line: 772 social_component_join_group = "" ; -; social_component.php line: 766 +; social_component.php line: 775 social_component_join_group_detail = "" ; -; social_component.php line: 886 +; social_component.php line: 897 social_component_select_crawl = "" ; -; social_component.php line: 887 +; social_component.php line: 898 social_component_default_crawl = "" ; -; social_component.php line: 889 +; social_component.php line: 900 social_component_select_crawl = "" ; -; social_component.php line: 891 +; social_component.php line: 902 social_component_default_crawl = "" ; -; social_component.php line: 913 +; social_component.php line: 924 social_component_unnamed = "" ; -; social_component.php line: 920 +; social_component.php line: 931 social_component_mix_created = "" ; -; social_component.php line: 927 +; social_component.php line: 938 social_component_mix_invalid_timestamp = "" ; -; social_component.php line: 933 +; social_component.php line: 944 social_component_mix_deleted = "" ; -; social_component.php line: 951 +; social_component.php line: 962 social_component_mix_doesnt_exists = "" ; -; social_component.php line: 961 +; social_component.php line: 972 social_component_mix_imported = "" ; -; social_component.php line: 965 +; social_component.php line: 976 social_component_set_index = "" ; -; social_component.php line: 986 +; social_component.php line: 997 social_component_comment_error = "" ; -; social_component.php line: 994 +; social_component.php line: 1005 social_component_invalid_timestamp = "" ; -; social_component.php line: 1013 +; social_component.php line: 1024 social_component_no_post_access = "" ; -; social_component.php line: 1018 +; social_component.php line: 1029 social_component_share_title = "" ; -; social_component.php line: 1020 +; social_component.php line: 1031 social_component_share_description = "" ; -; social_component.php line: 1025 +; social_component.php line: 1036 social_component_thread_created = "" ; -; social_component.php line: 1071 +; social_component.php line: 1082 social_component_mix_not_owner = "" ; -; social_component.php line: 1084 +; social_component.php line: 1095 social_component_add_crawls = "" ; -; social_component.php line: 1086 +; social_component.php line: 1097 social_component_num_results = "" ; -; social_component.php line: 1088 +; social_component.php line: 1099 social_component_del_frag = "" ; -; social_component.php line: 1090 +; social_component.php line: 1101 social_component_weight = "" ; -; social_component.php line: 1091 +; social_component.php line: 1102 social_component_name = "" ; -; social_component.php line: 1093 +; social_component.php line: 1104 social_component_add_keywords = "" ; -; social_component.php line: 1095 +; social_component.php line: 1106 social_component_actions = "" ; -; social_component.php line: 1097 +; social_component.php line: 1108 social_component_add_query = "" ; -; social_component.php line: 1098 +; social_component.php line: 1109 social_component_delete = "" ; -; social_component.php line: 1146 +; social_component.php line: 1157 social_component_too_many_fragments = "" ; -; social_component.php line: 1157 +; social_component.php line: 1168 social_component_mix_saved = "" ; ; system_component.php line: 83 @@ -993,6 +993,9 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; +; group_controller.php line: 112 +group_controller_group_feeds = "" +; ; machine_controller.php line: 174 machine_controller_nolines = "" ; @@ -1714,73 +1717,76 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 71 +; groupfeed_element.php line: 85 groupfeed_element_back = "" ; -; groupfeed_element.php line: 78 +; groupfeed_element.php line: 94 groupfeed_element_recent_activity = "" ; -; groupfeed_element.php line: 81 +; groupfeed_element.php line: 97 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 85 -groupfeed_element_group = "" +; groupfeed_element.php line: 102 +groupfeed_element_feed = "" +; +; groupfeed_element.php line: 105 +group_view_wiki = "" ; -; groupfeed_element.php line: 88 +; groupfeed_element.php line: 107 groupfeed_element_user = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 134 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 121 +; groupfeed_element.php line: 145 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 147 +; groupfeed_element.php line: 171 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 152 +; groupfeed_element.php line: 176 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 164 +; groupfeed_element.php line: 188 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 188 +; groupfeed_element.php line: 212 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 195 +; groupfeed_element.php line: 219 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 268 +; groupfeed_element.php line: 292 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 273 +; groupfeed_element.php line: 297 groupfeed_element_save = "" ; -; groupfeed_element.php line: 299 +; groupfeed_element.php line: 323 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 302 +; groupfeed_element.php line: 326 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 307 +; groupfeed_element.php line: 331 groupfeed_element_post = "" ; -; groupfeed_element.php line: 312 +; groupfeed_element.php line: 336 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 365 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 368 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 349 +; groupfeed_element.php line: 373 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 379 groupfeed_element_save = "" ; -; groupfeed_element.php line: 384 +; groupfeed_element.php line: 408 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2792,21 +2798,36 @@ serversettings_element_captcha_setting = "" ; serversettings_element.php line: 255 serversettings_element_submit = "제출 " ; -; signin_element.php line: 65 +; signin_element.php line: 67 signin_element_settings = "세팅" ; -; signin_element.php line: 70 +; signin_element.php line: 72 signin_element_signin = "로그 인" ; -; signin_element.php line: 74 +; signin_element.php line: 76 signin_element_admin = "관리자" ; -; signin_element.php line: 76 +; signin_element.php line: 78 signin_element_signout = "로그 아웃" ; ; subsearch_element.php line: 71 subsearch_element_more = "" ; +; group_view.php line: 72 +group_view_feed = "" +; +; group_view.php line: 75 +group_view_wiki = "" +; +; group_view.php line: 77 +group_view_user = "" +; +; group_view.php line: 80 +group_view_myfeeds = "" +; +; group_view.php line: 99 +adminview_auto_logout_one_minute = "1 분내에 자동 로그 아웃 됍니다." +; ; /Applications/MAMP/htdocs/git/yioop//views/helpers ; ; feeds_helper.php line: 70 @@ -3183,6 +3204,12 @@ signin_view_return_yioop = "Yioop 으로 돌아가기" ; view.php line: 36 view_locale_version4 = "" ; +; wiki_view.php line: 73 +group_view_wiki = "" +; +; wiki_view.php line: 91 +adminview_auto_logout_one_minute = "1 분내에 자동 로그 아웃 됍니다." +; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins ; ; wordfilter_plugin.php line: 307 diff --git a/locale/pl/configure.ini b/locale/pl/configure.ini index 58c3bf074..2cdae19bb 100755 --- a/locale/pl/configure.ini +++ b/locale/pl/configure.ini @@ -690,154 +690,154 @@ social_component_unknown_access = "" ; social_component.php line: 536 social_component_group_filter_users = "" ; -; social_component.php line: 595 +; social_component.php line: 604 social_component_comment_error = "" ; -; social_component.php line: 601 +; social_component.php line: 610 social_component_no_comment = "" ; -; social_component.php line: 615 +; social_component.php line: 624 social_component_no_post_access = "" ; -; social_component.php line: 623 +; social_component.php line: 632 social_component_no_post_access = "" ; -; social_component.php line: 629 +; social_component.php line: 638 social_component_join_group = "" ; -; social_component.php line: 632 +; social_component.php line: 641 social_component_join_group_detail = "" ; -; social_component.php line: 644 +; social_component.php line: 653 social_component_comment_added = "" ; -; social_component.php line: 652 +; social_component.php line: 661 social_component_delete_error = "" ; -; social_component.php line: 660 +; social_component.php line: 669 social_component_item_deleted = "" ; -; social_component.php line: 664 +; social_component.php line: 673 social_component_no_item_deleted = "" ; -; social_component.php line: 674 +; social_component.php line: 683 social_component_comment_error = "" ; -; social_component.php line: 681 +; social_component.php line: 690 social_component_need_title_description = "" ; -; social_component.php line: 693 +; social_component.php line: 702 social_component_no_post_access = "" ; -; social_component.php line: 700 +; social_component.php line: 709 social_component_thread_created = "" ; -; social_component.php line: 711 +; social_component.php line: 720 social_component_comment_error = "" ; -; social_component.php line: 717 +; social_component.php line: 726 social_component_need_title_description = "" ; -; social_component.php line: 728 +; social_component.php line: 737 social_component_no_update_access = "" ; -; social_component.php line: 738 +; social_component.php line: 747 social_component_no_update_access = "" ; -; social_component.php line: 745 +; social_component.php line: 754 social_component_post_updated = "" ; -; social_component.php line: 763 +; social_component.php line: 772 social_component_join_group = "" ; -; social_component.php line: 766 +; social_component.php line: 775 social_component_join_group_detail = "" ; -; social_component.php line: 886 +; social_component.php line: 897 social_component_select_crawl = "" ; -; social_component.php line: 887 +; social_component.php line: 898 social_component_default_crawl = "" ; -; social_component.php line: 889 +; social_component.php line: 900 social_component_select_crawl = "" ; -; social_component.php line: 891 +; social_component.php line: 902 social_component_default_crawl = "" ; -; social_component.php line: 913 +; social_component.php line: 924 social_component_unnamed = "" ; -; social_component.php line: 920 +; social_component.php line: 931 social_component_mix_created = "" ; -; social_component.php line: 927 +; social_component.php line: 938 social_component_mix_invalid_timestamp = "" ; -; social_component.php line: 933 +; social_component.php line: 944 social_component_mix_deleted = "" ; -; social_component.php line: 951 +; social_component.php line: 962 social_component_mix_doesnt_exists = "" ; -; social_component.php line: 961 +; social_component.php line: 972 social_component_mix_imported = "" ; -; social_component.php line: 965 +; social_component.php line: 976 social_component_set_index = "" ; -; social_component.php line: 986 +; social_component.php line: 997 social_component_comment_error = "" ; -; social_component.php line: 994 +; social_component.php line: 1005 social_component_invalid_timestamp = "" ; -; social_component.php line: 1013 +; social_component.php line: 1024 social_component_no_post_access = "" ; -; social_component.php line: 1018 +; social_component.php line: 1029 social_component_share_title = "" ; -; social_component.php line: 1020 +; social_component.php line: 1031 social_component_share_description = "" ; -; social_component.php line: 1025 +; social_component.php line: 1036 social_component_thread_created = "" ; -; social_component.php line: 1071 +; social_component.php line: 1082 social_component_mix_not_owner = "" ; -; social_component.php line: 1084 +; social_component.php line: 1095 social_component_add_crawls = "" ; -; social_component.php line: 1086 +; social_component.php line: 1097 social_component_num_results = "" ; -; social_component.php line: 1088 +; social_component.php line: 1099 social_component_del_frag = "" ; -; social_component.php line: 1090 +; social_component.php line: 1101 social_component_weight = "" ; -; social_component.php line: 1091 +; social_component.php line: 1102 social_component_name = "" ; -; social_component.php line: 1093 +; social_component.php line: 1104 social_component_add_keywords = "" ; -; social_component.php line: 1095 +; social_component.php line: 1106 social_component_actions = "" ; -; social_component.php line: 1097 +; social_component.php line: 1108 social_component_add_query = "" ; -; social_component.php line: 1098 +; social_component.php line: 1109 social_component_delete = "" ; -; social_component.php line: 1146 +; social_component.php line: 1157 social_component_too_many_fragments = "" ; -; social_component.php line: 1157 +; social_component.php line: 1168 social_component_mix_saved = "" ; ; system_component.php line: 83 @@ -993,6 +993,9 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; +; group_controller.php line: 112 +group_controller_group_feeds = "" +; ; machine_controller.php line: 174 machine_controller_nolines = "" ; @@ -1714,73 +1717,76 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 71 +; groupfeed_element.php line: 85 groupfeed_element_back = "" ; -; groupfeed_element.php line: 78 +; groupfeed_element.php line: 94 groupfeed_element_recent_activity = "" ; -; groupfeed_element.php line: 81 +; groupfeed_element.php line: 97 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 85 -groupfeed_element_group = "" +; groupfeed_element.php line: 102 +groupfeed_element_feed = "" +; +; groupfeed_element.php line: 105 +group_view_wiki = "" ; -; groupfeed_element.php line: 88 +; groupfeed_element.php line: 107 groupfeed_element_user = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 134 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 121 +; groupfeed_element.php line: 145 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 147 +; groupfeed_element.php line: 171 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 152 +; groupfeed_element.php line: 176 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 164 +; groupfeed_element.php line: 188 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 188 +; groupfeed_element.php line: 212 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 195 +; groupfeed_element.php line: 219 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 268 +; groupfeed_element.php line: 292 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 273 +; groupfeed_element.php line: 297 groupfeed_element_save = "" ; -; groupfeed_element.php line: 299 +; groupfeed_element.php line: 323 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 302 +; groupfeed_element.php line: 326 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 307 +; groupfeed_element.php line: 331 groupfeed_element_post = "" ; -; groupfeed_element.php line: 312 +; groupfeed_element.php line: 336 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 365 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 368 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 349 +; groupfeed_element.php line: 373 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 379 groupfeed_element_save = "" ; -; groupfeed_element.php line: 384 +; groupfeed_element.php line: 408 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2792,21 +2798,36 @@ serversettings_element_captcha_setting = "" ; serversettings_element.php line: 255 serversettings_element_submit = "" ; -; signin_element.php line: 65 +; signin_element.php line: 67 signin_element_settings = "" ; -; signin_element.php line: 70 +; signin_element.php line: 72 signin_element_signin = "" ; -; signin_element.php line: 74 +; signin_element.php line: 76 signin_element_admin = "" ; -; signin_element.php line: 76 +; signin_element.php line: 78 signin_element_signout = "" ; ; subsearch_element.php line: 71 subsearch_element_more = "" ; +; group_view.php line: 72 +group_view_feed = "" +; +; group_view.php line: 75 +group_view_wiki = "" +; +; group_view.php line: 77 +group_view_user = "" +; +; group_view.php line: 80 +group_view_myfeeds = "" +; +; group_view.php line: 99 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//views/helpers ; ; feeds_helper.php line: 70 @@ -3183,6 +3204,12 @@ signin_view_return_yioop = "" ; view.php line: 36 view_locale_version4 = "" ; +; wiki_view.php line: 73 +group_view_wiki = "" +; +; wiki_view.php line: 91 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins ; ; wordfilter_plugin.php line: 307 diff --git a/locale/pt/configure.ini b/locale/pt/configure.ini index 4ffc664c5..739282a4c 100755 --- a/locale/pt/configure.ini +++ b/locale/pt/configure.ini @@ -690,154 +690,154 @@ social_component_unknown_access = "" ; social_component.php line: 536 social_component_group_filter_users = "" ; -; social_component.php line: 595 +; social_component.php line: 604 social_component_comment_error = "" ; -; social_component.php line: 601 +; social_component.php line: 610 social_component_no_comment = "" ; -; social_component.php line: 615 +; social_component.php line: 624 social_component_no_post_access = "" ; -; social_component.php line: 623 +; social_component.php line: 632 social_component_no_post_access = "" ; -; social_component.php line: 629 +; social_component.php line: 638 social_component_join_group = "" ; -; social_component.php line: 632 +; social_component.php line: 641 social_component_join_group_detail = "" ; -; social_component.php line: 644 +; social_component.php line: 653 social_component_comment_added = "" ; -; social_component.php line: 652 +; social_component.php line: 661 social_component_delete_error = "" ; -; social_component.php line: 660 +; social_component.php line: 669 social_component_item_deleted = "" ; -; social_component.php line: 664 +; social_component.php line: 673 social_component_no_item_deleted = "" ; -; social_component.php line: 674 +; social_component.php line: 683 social_component_comment_error = "" ; -; social_component.php line: 681 +; social_component.php line: 690 social_component_need_title_description = "" ; -; social_component.php line: 693 +; social_component.php line: 702 social_component_no_post_access = "" ; -; social_component.php line: 700 +; social_component.php line: 709 social_component_thread_created = "" ; -; social_component.php line: 711 +; social_component.php line: 720 social_component_comment_error = "" ; -; social_component.php line: 717 +; social_component.php line: 726 social_component_need_title_description = "" ; -; social_component.php line: 728 +; social_component.php line: 737 social_component_no_update_access = "" ; -; social_component.php line: 738 +; social_component.php line: 747 social_component_no_update_access = "" ; -; social_component.php line: 745 +; social_component.php line: 754 social_component_post_updated = "" ; -; social_component.php line: 763 +; social_component.php line: 772 social_component_join_group = "" ; -; social_component.php line: 766 +; social_component.php line: 775 social_component_join_group_detail = "" ; -; social_component.php line: 886 +; social_component.php line: 897 social_component_select_crawl = "" ; -; social_component.php line: 887 +; social_component.php line: 898 social_component_default_crawl = "" ; -; social_component.php line: 889 +; social_component.php line: 900 social_component_select_crawl = "" ; -; social_component.php line: 891 +; social_component.php line: 902 social_component_default_crawl = "" ; -; social_component.php line: 913 +; social_component.php line: 924 social_component_unnamed = "" ; -; social_component.php line: 920 +; social_component.php line: 931 social_component_mix_created = "" ; -; social_component.php line: 927 +; social_component.php line: 938 social_component_mix_invalid_timestamp = "" ; -; social_component.php line: 933 +; social_component.php line: 944 social_component_mix_deleted = "" ; -; social_component.php line: 951 +; social_component.php line: 962 social_component_mix_doesnt_exists = "" ; -; social_component.php line: 961 +; social_component.php line: 972 social_component_mix_imported = "" ; -; social_component.php line: 965 +; social_component.php line: 976 social_component_set_index = "" ; -; social_component.php line: 986 +; social_component.php line: 997 social_component_comment_error = "" ; -; social_component.php line: 994 +; social_component.php line: 1005 social_component_invalid_timestamp = "" ; -; social_component.php line: 1013 +; social_component.php line: 1024 social_component_no_post_access = "" ; -; social_component.php line: 1018 +; social_component.php line: 1029 social_component_share_title = "" ; -; social_component.php line: 1020 +; social_component.php line: 1031 social_component_share_description = "" ; -; social_component.php line: 1025 +; social_component.php line: 1036 social_component_thread_created = "" ; -; social_component.php line: 1071 +; social_component.php line: 1082 social_component_mix_not_owner = "" ; -; social_component.php line: 1084 +; social_component.php line: 1095 social_component_add_crawls = "" ; -; social_component.php line: 1086 +; social_component.php line: 1097 social_component_num_results = "" ; -; social_component.php line: 1088 +; social_component.php line: 1099 social_component_del_frag = "" ; -; social_component.php line: 1090 +; social_component.php line: 1101 social_component_weight = "" ; -; social_component.php line: 1091 +; social_component.php line: 1102 social_component_name = "" ; -; social_component.php line: 1093 +; social_component.php line: 1104 social_component_add_keywords = "" ; -; social_component.php line: 1095 +; social_component.php line: 1106 social_component_actions = "" ; -; social_component.php line: 1097 +; social_component.php line: 1108 social_component_add_query = "" ; -; social_component.php line: 1098 +; social_component.php line: 1109 social_component_delete = "" ; -; social_component.php line: 1146 +; social_component.php line: 1157 social_component_too_many_fragments = "" ; -; social_component.php line: 1157 +; social_component.php line: 1168 social_component_mix_saved = "" ; ; system_component.php line: 83 @@ -993,6 +993,9 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; +; group_controller.php line: 112 +group_controller_group_feeds = "" +; ; machine_controller.php line: 174 machine_controller_nolines = "" ; @@ -1714,73 +1717,76 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 71 +; groupfeed_element.php line: 85 groupfeed_element_back = "" ; -; groupfeed_element.php line: 78 +; groupfeed_element.php line: 94 groupfeed_element_recent_activity = "" ; -; groupfeed_element.php line: 81 +; groupfeed_element.php line: 97 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 85 -groupfeed_element_group = "" +; groupfeed_element.php line: 102 +groupfeed_element_feed = "" +; +; groupfeed_element.php line: 105 +group_view_wiki = "" ; -; groupfeed_element.php line: 88 +; groupfeed_element.php line: 107 groupfeed_element_user = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 134 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 121 +; groupfeed_element.php line: 145 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 147 +; groupfeed_element.php line: 171 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 152 +; groupfeed_element.php line: 176 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 164 +; groupfeed_element.php line: 188 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 188 +; groupfeed_element.php line: 212 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 195 +; groupfeed_element.php line: 219 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 268 +; groupfeed_element.php line: 292 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 273 +; groupfeed_element.php line: 297 groupfeed_element_save = "" ; -; groupfeed_element.php line: 299 +; groupfeed_element.php line: 323 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 302 +; groupfeed_element.php line: 326 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 307 +; groupfeed_element.php line: 331 groupfeed_element_post = "" ; -; groupfeed_element.php line: 312 +; groupfeed_element.php line: 336 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 365 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 368 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 349 +; groupfeed_element.php line: 373 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 379 groupfeed_element_save = "" ; -; groupfeed_element.php line: 384 +; groupfeed_element.php line: 408 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2792,21 +2798,36 @@ serversettings_element_captcha_setting = "" ; serversettings_element.php line: 255 serversettings_element_submit = "" ; -; signin_element.php line: 65 +; signin_element.php line: 67 signin_element_settings = "" ; -; signin_element.php line: 70 +; signin_element.php line: 72 signin_element_signin = "" ; -; signin_element.php line: 74 +; signin_element.php line: 76 signin_element_admin = "" ; -; signin_element.php line: 76 +; signin_element.php line: 78 signin_element_signout = "" ; ; subsearch_element.php line: 71 subsearch_element_more = "" ; +; group_view.php line: 72 +group_view_feed = "" +; +; group_view.php line: 75 +group_view_wiki = "" +; +; group_view.php line: 77 +group_view_user = "" +; +; group_view.php line: 80 +group_view_myfeeds = "" +; +; group_view.php line: 99 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//views/helpers ; ; feeds_helper.php line: 70 @@ -3183,6 +3204,12 @@ signin_view_return_yioop = "" ; view.php line: 36 view_locale_version4 = "" ; +; wiki_view.php line: 73 +group_view_wiki = "" +; +; wiki_view.php line: 91 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins ; ; wordfilter_plugin.php line: 307 diff --git a/locale/ru/configure.ini b/locale/ru/configure.ini index 1d6edea9c..a8a65e8e8 100755 --- a/locale/ru/configure.ini +++ b/locale/ru/configure.ini @@ -690,154 +690,154 @@ social_component_unknown_access = "" ; social_component.php line: 536 social_component_group_filter_users = "" ; -; social_component.php line: 595 +; social_component.php line: 604 social_component_comment_error = "" ; -; social_component.php line: 601 +; social_component.php line: 610 social_component_no_comment = "" ; -; social_component.php line: 615 +; social_component.php line: 624 social_component_no_post_access = "" ; -; social_component.php line: 623 +; social_component.php line: 632 social_component_no_post_access = "" ; -; social_component.php line: 629 +; social_component.php line: 638 social_component_join_group = "" ; -; social_component.php line: 632 +; social_component.php line: 641 social_component_join_group_detail = "" ; -; social_component.php line: 644 +; social_component.php line: 653 social_component_comment_added = "" ; -; social_component.php line: 652 +; social_component.php line: 661 social_component_delete_error = "" ; -; social_component.php line: 660 +; social_component.php line: 669 social_component_item_deleted = "" ; -; social_component.php line: 664 +; social_component.php line: 673 social_component_no_item_deleted = "" ; -; social_component.php line: 674 +; social_component.php line: 683 social_component_comment_error = "" ; -; social_component.php line: 681 +; social_component.php line: 690 social_component_need_title_description = "" ; -; social_component.php line: 693 +; social_component.php line: 702 social_component_no_post_access = "" ; -; social_component.php line: 700 +; social_component.php line: 709 social_component_thread_created = "" ; -; social_component.php line: 711 +; social_component.php line: 720 social_component_comment_error = "" ; -; social_component.php line: 717 +; social_component.php line: 726 social_component_need_title_description = "" ; -; social_component.php line: 728 +; social_component.php line: 737 social_component_no_update_access = "" ; -; social_component.php line: 738 +; social_component.php line: 747 social_component_no_update_access = "" ; -; social_component.php line: 745 +; social_component.php line: 754 social_component_post_updated = "" ; -; social_component.php line: 763 +; social_component.php line: 772 social_component_join_group = "" ; -; social_component.php line: 766 +; social_component.php line: 775 social_component_join_group_detail = "" ; -; social_component.php line: 886 +; social_component.php line: 897 social_component_select_crawl = "" ; -; social_component.php line: 887 +; social_component.php line: 898 social_component_default_crawl = "" ; -; social_component.php line: 889 +; social_component.php line: 900 social_component_select_crawl = "" ; -; social_component.php line: 891 +; social_component.php line: 902 social_component_default_crawl = "" ; -; social_component.php line: 913 +; social_component.php line: 924 social_component_unnamed = "" ; -; social_component.php line: 920 +; social_component.php line: 931 social_component_mix_created = "" ; -; social_component.php line: 927 +; social_component.php line: 938 social_component_mix_invalid_timestamp = "" ; -; social_component.php line: 933 +; social_component.php line: 944 social_component_mix_deleted = "" ; -; social_component.php line: 951 +; social_component.php line: 962 social_component_mix_doesnt_exists = "" ; -; social_component.php line: 961 +; social_component.php line: 972 social_component_mix_imported = "" ; -; social_component.php line: 965 +; social_component.php line: 976 social_component_set_index = "" ; -; social_component.php line: 986 +; social_component.php line: 997 social_component_comment_error = "" ; -; social_component.php line: 994 +; social_component.php line: 1005 social_component_invalid_timestamp = "" ; -; social_component.php line: 1013 +; social_component.php line: 1024 social_component_no_post_access = "" ; -; social_component.php line: 1018 +; social_component.php line: 1029 social_component_share_title = "" ; -; social_component.php line: 1020 +; social_component.php line: 1031 social_component_share_description = "" ; -; social_component.php line: 1025 +; social_component.php line: 1036 social_component_thread_created = "" ; -; social_component.php line: 1071 +; social_component.php line: 1082 social_component_mix_not_owner = "" ; -; social_component.php line: 1084 +; social_component.php line: 1095 social_component_add_crawls = "" ; -; social_component.php line: 1086 +; social_component.php line: 1097 social_component_num_results = "" ; -; social_component.php line: 1088 +; social_component.php line: 1099 social_component_del_frag = "" ; -; social_component.php line: 1090 +; social_component.php line: 1101 social_component_weight = "" ; -; social_component.php line: 1091 +; social_component.php line: 1102 social_component_name = "" ; -; social_component.php line: 1093 +; social_component.php line: 1104 social_component_add_keywords = "" ; -; social_component.php line: 1095 +; social_component.php line: 1106 social_component_actions = "" ; -; social_component.php line: 1097 +; social_component.php line: 1108 social_component_add_query = "" ; -; social_component.php line: 1098 +; social_component.php line: 1109 social_component_delete = "" ; -; social_component.php line: 1146 +; social_component.php line: 1157 social_component_too_many_fragments = "" ; -; social_component.php line: 1157 +; social_component.php line: 1168 social_component_mix_saved = "" ; ; system_component.php line: 83 @@ -993,6 +993,9 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; +; group_controller.php line: 112 +group_controller_group_feeds = "" +; ; machine_controller.php line: 174 machine_controller_nolines = "" ; @@ -1714,73 +1717,76 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 71 +; groupfeed_element.php line: 85 groupfeed_element_back = "" ; -; groupfeed_element.php line: 78 +; groupfeed_element.php line: 94 groupfeed_element_recent_activity = "" ; -; groupfeed_element.php line: 81 +; groupfeed_element.php line: 97 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 85 -groupfeed_element_group = "" +; groupfeed_element.php line: 102 +groupfeed_element_feed = "" +; +; groupfeed_element.php line: 105 +group_view_wiki = "" ; -; groupfeed_element.php line: 88 +; groupfeed_element.php line: 107 groupfeed_element_user = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 134 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 121 +; groupfeed_element.php line: 145 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 147 +; groupfeed_element.php line: 171 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 152 +; groupfeed_element.php line: 176 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 164 +; groupfeed_element.php line: 188 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 188 +; groupfeed_element.php line: 212 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 195 +; groupfeed_element.php line: 219 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 268 +; groupfeed_element.php line: 292 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 273 +; groupfeed_element.php line: 297 groupfeed_element_save = "" ; -; groupfeed_element.php line: 299 +; groupfeed_element.php line: 323 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 302 +; groupfeed_element.php line: 326 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 307 +; groupfeed_element.php line: 331 groupfeed_element_post = "" ; -; groupfeed_element.php line: 312 +; groupfeed_element.php line: 336 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 365 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 368 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 349 +; groupfeed_element.php line: 373 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 379 groupfeed_element_save = "" ; -; groupfeed_element.php line: 384 +; groupfeed_element.php line: 408 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2792,21 +2798,36 @@ serversettings_element_captcha_setting = "" ; serversettings_element.php line: 255 serversettings_element_submit = "" ; -; signin_element.php line: 65 +; signin_element.php line: 67 signin_element_settings = "" ; -; signin_element.php line: 70 +; signin_element.php line: 72 signin_element_signin = "" ; -; signin_element.php line: 74 +; signin_element.php line: 76 signin_element_admin = "" ; -; signin_element.php line: 76 +; signin_element.php line: 78 signin_element_signout = "" ; ; subsearch_element.php line: 71 subsearch_element_more = "" ; +; group_view.php line: 72 +group_view_feed = "" +; +; group_view.php line: 75 +group_view_wiki = "" +; +; group_view.php line: 77 +group_view_user = "" +; +; group_view.php line: 80 +group_view_myfeeds = "" +; +; group_view.php line: 99 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//views/helpers ; ; feeds_helper.php line: 70 @@ -3183,6 +3204,12 @@ signin_view_return_yioop = "" ; view.php line: 36 view_locale_version4 = "" ; +; wiki_view.php line: 73 +group_view_wiki = "" +; +; wiki_view.php line: 91 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins ; ; wordfilter_plugin.php line: 307 diff --git a/locale/te/configure.ini b/locale/te/configure.ini index 5aaab8613..9072fa895 100755 --- a/locale/te/configure.ini +++ b/locale/te/configure.ini @@ -690,154 +690,154 @@ social_component_unknown_access = "" ; social_component.php line: 536 social_component_group_filter_users = "" ; -; social_component.php line: 595 +; social_component.php line: 604 social_component_comment_error = "" ; -; social_component.php line: 601 +; social_component.php line: 610 social_component_no_comment = "" ; -; social_component.php line: 615 +; social_component.php line: 624 social_component_no_post_access = "" ; -; social_component.php line: 623 +; social_component.php line: 632 social_component_no_post_access = "" ; -; social_component.php line: 629 +; social_component.php line: 638 social_component_join_group = "" ; -; social_component.php line: 632 +; social_component.php line: 641 social_component_join_group_detail = "" ; -; social_component.php line: 644 +; social_component.php line: 653 social_component_comment_added = "" ; -; social_component.php line: 652 +; social_component.php line: 661 social_component_delete_error = "" ; -; social_component.php line: 660 +; social_component.php line: 669 social_component_item_deleted = "" ; -; social_component.php line: 664 +; social_component.php line: 673 social_component_no_item_deleted = "" ; -; social_component.php line: 674 +; social_component.php line: 683 social_component_comment_error = "" ; -; social_component.php line: 681 +; social_component.php line: 690 social_component_need_title_description = "" ; -; social_component.php line: 693 +; social_component.php line: 702 social_component_no_post_access = "" ; -; social_component.php line: 700 +; social_component.php line: 709 social_component_thread_created = "" ; -; social_component.php line: 711 +; social_component.php line: 720 social_component_comment_error = "" ; -; social_component.php line: 717 +; social_component.php line: 726 social_component_need_title_description = "" ; -; social_component.php line: 728 +; social_component.php line: 737 social_component_no_update_access = "" ; -; social_component.php line: 738 +; social_component.php line: 747 social_component_no_update_access = "" ; -; social_component.php line: 745 +; social_component.php line: 754 social_component_post_updated = "" ; -; social_component.php line: 763 +; social_component.php line: 772 social_component_join_group = "" ; -; social_component.php line: 766 +; social_component.php line: 775 social_component_join_group_detail = "" ; -; social_component.php line: 886 +; social_component.php line: 897 social_component_select_crawl = "క్రాల్ ఎంచుకోండి" ; -; social_component.php line: 887 +; social_component.php line: 898 social_component_default_crawl = "డిఫాల్ట క్రాల్" ; -; social_component.php line: 889 +; social_component.php line: 900 social_component_select_crawl = "క్రాల్ ఎంచుకోండి" ; -; social_component.php line: 891 +; social_component.php line: 902 social_component_default_crawl = "డిఫాల్ట క్రాల్" ; -; social_component.php line: 913 +; social_component.php line: 924 social_component_unnamed = "పేరు లేని క్రాల్" ; -; social_component.php line: 920 +; social_component.php line: 931 social_component_mix_created = "" ; -; social_component.php line: 927 +; social_component.php line: 938 social_component_mix_invalid_timestamp = "" ; -; social_component.php line: 933 +; social_component.php line: 944 social_component_mix_deleted = "" ; -; social_component.php line: 951 +; social_component.php line: 962 social_component_mix_doesnt_exists = "" ; -; social_component.php line: 961 +; social_component.php line: 972 social_component_mix_imported = "" ; -; social_component.php line: 965 +; social_component.php line: 976 social_component_set_index = "" ; -; social_component.php line: 986 +; social_component.php line: 997 social_component_comment_error = "" ; -; social_component.php line: 994 +; social_component.php line: 1005 social_component_invalid_timestamp = "" ; -; social_component.php line: 1013 +; social_component.php line: 1024 social_component_no_post_access = "" ; -; social_component.php line: 1018 +; social_component.php line: 1029 social_component_share_title = "" ; -; social_component.php line: 1020 +; social_component.php line: 1031 social_component_share_description = "" ; -; social_component.php line: 1025 +; social_component.php line: 1036 social_component_thread_created = "" ; -; social_component.php line: 1071 +; social_component.php line: 1082 social_component_mix_not_owner = "" ; -; social_component.php line: 1084 +; social_component.php line: 1095 social_component_add_crawls = "క్రాల్ లు జోడించుము" ; -; social_component.php line: 1086 +; social_component.php line: 1097 social_component_num_results = "" ; -; social_component.php line: 1088 +; social_component.php line: 1099 social_component_del_frag = "" ; -; social_component.php line: 1090 +; social_component.php line: 1101 social_component_weight = "బరువు" ; -; social_component.php line: 1091 +; social_component.php line: 1102 social_component_name = "" ; -; social_component.php line: 1093 +; social_component.php line: 1104 social_component_add_keywords = "" ; -; social_component.php line: 1095 +; social_component.php line: 1106 social_component_actions = "యాక్సన్ లు" ; -; social_component.php line: 1097 +; social_component.php line: 1108 social_component_add_query = "క్వెరి జోడించుము" ; -; social_component.php line: 1098 +; social_component.php line: 1109 social_component_delete = "" ; -; social_component.php line: 1146 +; social_component.php line: 1157 social_component_too_many_fragments = "" ; -; social_component.php line: 1157 +; social_component.php line: 1168 social_component_mix_saved = "" ; ; system_component.php line: 83 @@ -993,6 +993,9 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; +; group_controller.php line: 112 +group_controller_group_feeds = "" +; ; machine_controller.php line: 174 machine_controller_nolines = "" ; @@ -1714,73 +1717,76 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 71 +; groupfeed_element.php line: 85 groupfeed_element_back = "" ; -; groupfeed_element.php line: 78 +; groupfeed_element.php line: 94 groupfeed_element_recent_activity = "" ; -; groupfeed_element.php line: 81 +; groupfeed_element.php line: 97 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 85 -groupfeed_element_group = "" +; groupfeed_element.php line: 102 +groupfeed_element_feed = "" +; +; groupfeed_element.php line: 105 +group_view_wiki = "" ; -; groupfeed_element.php line: 88 +; groupfeed_element.php line: 107 groupfeed_element_user = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 134 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 121 +; groupfeed_element.php line: 145 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 147 +; groupfeed_element.php line: 171 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 152 +; groupfeed_element.php line: 176 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 164 +; groupfeed_element.php line: 188 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 188 +; groupfeed_element.php line: 212 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 195 +; groupfeed_element.php line: 219 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 268 +; groupfeed_element.php line: 292 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 273 +; groupfeed_element.php line: 297 groupfeed_element_save = "" ; -; groupfeed_element.php line: 299 +; groupfeed_element.php line: 323 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 302 +; groupfeed_element.php line: 326 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 307 +; groupfeed_element.php line: 331 groupfeed_element_post = "" ; -; groupfeed_element.php line: 312 +; groupfeed_element.php line: 336 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 365 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 368 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 349 +; groupfeed_element.php line: 373 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 379 groupfeed_element_save = "" ; -; groupfeed_element.php line: 384 +; groupfeed_element.php line: 408 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2792,21 +2798,36 @@ serversettings_element_captcha_setting = "" ; serversettings_element.php line: 255 serversettings_element_submit = "" ; -; signin_element.php line: 65 +; signin_element.php line: 67 signin_element_settings = "సెట్టింగులు" ; -; signin_element.php line: 70 +; signin_element.php line: 72 signin_element_signin = "సైన్ ఇన్ " ; -; signin_element.php line: 74 +; signin_element.php line: 76 signin_element_admin = "అడ్మిన్ " ; -; signin_element.php line: 76 +; signin_element.php line: 78 signin_element_signout = "సైన్ ఔట్ " ; ; subsearch_element.php line: 71 subsearch_element_more = "" ; +; group_view.php line: 72 +group_view_feed = "" +; +; group_view.php line: 75 +group_view_wiki = "" +; +; group_view.php line: 77 +group_view_user = "" +; +; group_view.php line: 80 +group_view_myfeeds = "" +; +; group_view.php line: 99 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//views/helpers ; ; feeds_helper.php line: 70 @@ -3183,6 +3204,12 @@ signin_view_return_yioop = "" ; view.php line: 36 view_locale_version4 = "" ; +; wiki_view.php line: 73 +group_view_wiki = "" +; +; wiki_view.php line: 91 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins ; ; wordfilter_plugin.php line: 307 diff --git a/locale/th/configure.ini b/locale/th/configure.ini index 1236e4773..e6a15ac65 100755 --- a/locale/th/configure.ini +++ b/locale/th/configure.ini @@ -690,154 +690,154 @@ social_component_unknown_access = "" ; social_component.php line: 536 social_component_group_filter_users = "" ; -; social_component.php line: 595 +; social_component.php line: 604 social_component_comment_error = "" ; -; social_component.php line: 601 +; social_component.php line: 610 social_component_no_comment = "" ; -; social_component.php line: 615 +; social_component.php line: 624 social_component_no_post_access = "" ; -; social_component.php line: 623 +; social_component.php line: 632 social_component_no_post_access = "" ; -; social_component.php line: 629 +; social_component.php line: 638 social_component_join_group = "" ; -; social_component.php line: 632 +; social_component.php line: 641 social_component_join_group_detail = "" ; -; social_component.php line: 644 +; social_component.php line: 653 social_component_comment_added = "" ; -; social_component.php line: 652 +; social_component.php line: 661 social_component_delete_error = "" ; -; social_component.php line: 660 +; social_component.php line: 669 social_component_item_deleted = "" ; -; social_component.php line: 664 +; social_component.php line: 673 social_component_no_item_deleted = "" ; -; social_component.php line: 674 +; social_component.php line: 683 social_component_comment_error = "" ; -; social_component.php line: 681 +; social_component.php line: 690 social_component_need_title_description = "" ; -; social_component.php line: 693 +; social_component.php line: 702 social_component_no_post_access = "" ; -; social_component.php line: 700 +; social_component.php line: 709 social_component_thread_created = "" ; -; social_component.php line: 711 +; social_component.php line: 720 social_component_comment_error = "" ; -; social_component.php line: 717 +; social_component.php line: 726 social_component_need_title_description = "" ; -; social_component.php line: 728 +; social_component.php line: 737 social_component_no_update_access = "" ; -; social_component.php line: 738 +; social_component.php line: 747 social_component_no_update_access = "" ; -; social_component.php line: 745 +; social_component.php line: 754 social_component_post_updated = "" ; -; social_component.php line: 763 +; social_component.php line: 772 social_component_join_group = "" ; -; social_component.php line: 766 +; social_component.php line: 775 social_component_join_group_detail = "" ; -; social_component.php line: 886 +; social_component.php line: 897 social_component_select_crawl = "" ; -; social_component.php line: 887 +; social_component.php line: 898 social_component_default_crawl = "" ; -; social_component.php line: 889 +; social_component.php line: 900 social_component_select_crawl = "" ; -; social_component.php line: 891 +; social_component.php line: 902 social_component_default_crawl = "" ; -; social_component.php line: 913 +; social_component.php line: 924 social_component_unnamed = "" ; -; social_component.php line: 920 +; social_component.php line: 931 social_component_mix_created = "" ; -; social_component.php line: 927 +; social_component.php line: 938 social_component_mix_invalid_timestamp = "" ; -; social_component.php line: 933 +; social_component.php line: 944 social_component_mix_deleted = "" ; -; social_component.php line: 951 +; social_component.php line: 962 social_component_mix_doesnt_exists = "" ; -; social_component.php line: 961 +; social_component.php line: 972 social_component_mix_imported = "" ; -; social_component.php line: 965 +; social_component.php line: 976 social_component_set_index = "" ; -; social_component.php line: 986 +; social_component.php line: 997 social_component_comment_error = "" ; -; social_component.php line: 994 +; social_component.php line: 1005 social_component_invalid_timestamp = "" ; -; social_component.php line: 1013 +; social_component.php line: 1024 social_component_no_post_access = "" ; -; social_component.php line: 1018 +; social_component.php line: 1029 social_component_share_title = "" ; -; social_component.php line: 1020 +; social_component.php line: 1031 social_component_share_description = "" ; -; social_component.php line: 1025 +; social_component.php line: 1036 social_component_thread_created = "" ; -; social_component.php line: 1071 +; social_component.php line: 1082 social_component_mix_not_owner = "" ; -; social_component.php line: 1084 +; social_component.php line: 1095 social_component_add_crawls = "" ; -; social_component.php line: 1086 +; social_component.php line: 1097 social_component_num_results = "" ; -; social_component.php line: 1088 +; social_component.php line: 1099 social_component_del_frag = "" ; -; social_component.php line: 1090 +; social_component.php line: 1101 social_component_weight = "" ; -; social_component.php line: 1091 +; social_component.php line: 1102 social_component_name = "" ; -; social_component.php line: 1093 +; social_component.php line: 1104 social_component_add_keywords = "" ; -; social_component.php line: 1095 +; social_component.php line: 1106 social_component_actions = "" ; -; social_component.php line: 1097 +; social_component.php line: 1108 social_component_add_query = "" ; -; social_component.php line: 1098 +; social_component.php line: 1109 social_component_delete = "" ; -; social_component.php line: 1146 +; social_component.php line: 1157 social_component_too_many_fragments = "" ; -; social_component.php line: 1157 +; social_component.php line: 1168 social_component_mix_saved = "" ; ; system_component.php line: 83 @@ -993,6 +993,9 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; +; group_controller.php line: 112 +group_controller_group_feeds = "" +; ; machine_controller.php line: 174 machine_controller_nolines = "" ; @@ -1714,73 +1717,76 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 71 +; groupfeed_element.php line: 85 groupfeed_element_back = "" ; -; groupfeed_element.php line: 78 +; groupfeed_element.php line: 94 groupfeed_element_recent_activity = "" ; -; groupfeed_element.php line: 81 +; groupfeed_element.php line: 97 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 85 -groupfeed_element_group = "" +; groupfeed_element.php line: 102 +groupfeed_element_feed = "" +; +; groupfeed_element.php line: 105 +group_view_wiki = "" ; -; groupfeed_element.php line: 88 +; groupfeed_element.php line: 107 groupfeed_element_user = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 134 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 121 +; groupfeed_element.php line: 145 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 147 +; groupfeed_element.php line: 171 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 152 +; groupfeed_element.php line: 176 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 164 +; groupfeed_element.php line: 188 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 188 +; groupfeed_element.php line: 212 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 195 +; groupfeed_element.php line: 219 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 268 +; groupfeed_element.php line: 292 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 273 +; groupfeed_element.php line: 297 groupfeed_element_save = "" ; -; groupfeed_element.php line: 299 +; groupfeed_element.php line: 323 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 302 +; groupfeed_element.php line: 326 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 307 +; groupfeed_element.php line: 331 groupfeed_element_post = "" ; -; groupfeed_element.php line: 312 +; groupfeed_element.php line: 336 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 365 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 368 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 349 +; groupfeed_element.php line: 373 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 379 groupfeed_element_save = "" ; -; groupfeed_element.php line: 384 +; groupfeed_element.php line: 408 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2792,21 +2798,36 @@ serversettings_element_captcha_setting = "" ; serversettings_element.php line: 255 serversettings_element_submit = "" ; -; signin_element.php line: 65 +; signin_element.php line: 67 signin_element_settings = "" ; -; signin_element.php line: 70 +; signin_element.php line: 72 signin_element_signin = "" ; -; signin_element.php line: 74 +; signin_element.php line: 76 signin_element_admin = "" ; -; signin_element.php line: 76 +; signin_element.php line: 78 signin_element_signout = "" ; ; subsearch_element.php line: 71 subsearch_element_more = "" ; +; group_view.php line: 72 +group_view_feed = "" +; +; group_view.php line: 75 +group_view_wiki = "" +; +; group_view.php line: 77 +group_view_user = "" +; +; group_view.php line: 80 +group_view_myfeeds = "" +; +; group_view.php line: 99 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//views/helpers ; ; feeds_helper.php line: 70 @@ -3183,6 +3204,12 @@ signin_view_return_yioop = "" ; view.php line: 36 view_locale_version4 = "" ; +; wiki_view.php line: 73 +group_view_wiki = "" +; +; wiki_view.php line: 91 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins ; ; wordfilter_plugin.php line: 307 diff --git a/locale/tr/configure.ini b/locale/tr/configure.ini index 977d949ad..a78a43f70 100755 --- a/locale/tr/configure.ini +++ b/locale/tr/configure.ini @@ -690,154 +690,154 @@ social_component_unknown_access = "" ; social_component.php line: 536 social_component_group_filter_users = "" ; -; social_component.php line: 595 +; social_component.php line: 604 social_component_comment_error = "" ; -; social_component.php line: 601 +; social_component.php line: 610 social_component_no_comment = "" ; -; social_component.php line: 615 +; social_component.php line: 624 social_component_no_post_access = "" ; -; social_component.php line: 623 +; social_component.php line: 632 social_component_no_post_access = "" ; -; social_component.php line: 629 +; social_component.php line: 638 social_component_join_group = "" ; -; social_component.php line: 632 +; social_component.php line: 641 social_component_join_group_detail = "" ; -; social_component.php line: 644 +; social_component.php line: 653 social_component_comment_added = "" ; -; social_component.php line: 652 +; social_component.php line: 661 social_component_delete_error = "" ; -; social_component.php line: 660 +; social_component.php line: 669 social_component_item_deleted = "" ; -; social_component.php line: 664 +; social_component.php line: 673 social_component_no_item_deleted = "" ; -; social_component.php line: 674 +; social_component.php line: 683 social_component_comment_error = "" ; -; social_component.php line: 681 +; social_component.php line: 690 social_component_need_title_description = "" ; -; social_component.php line: 693 +; social_component.php line: 702 social_component_no_post_access = "" ; -; social_component.php line: 700 +; social_component.php line: 709 social_component_thread_created = "" ; -; social_component.php line: 711 +; social_component.php line: 720 social_component_comment_error = "" ; -; social_component.php line: 717 +; social_component.php line: 726 social_component_need_title_description = "" ; -; social_component.php line: 728 +; social_component.php line: 737 social_component_no_update_access = "" ; -; social_component.php line: 738 +; social_component.php line: 747 social_component_no_update_access = "" ; -; social_component.php line: 745 +; social_component.php line: 754 social_component_post_updated = "" ; -; social_component.php line: 763 +; social_component.php line: 772 social_component_join_group = "" ; -; social_component.php line: 766 +; social_component.php line: 775 social_component_join_group_detail = "" ; -; social_component.php line: 886 +; social_component.php line: 897 social_component_select_crawl = "" ; -; social_component.php line: 887 +; social_component.php line: 898 social_component_default_crawl = "" ; -; social_component.php line: 889 +; social_component.php line: 900 social_component_select_crawl = "" ; -; social_component.php line: 891 +; social_component.php line: 902 social_component_default_crawl = "" ; -; social_component.php line: 913 +; social_component.php line: 924 social_component_unnamed = "" ; -; social_component.php line: 920 +; social_component.php line: 931 social_component_mix_created = "" ; -; social_component.php line: 927 +; social_component.php line: 938 social_component_mix_invalid_timestamp = "" ; -; social_component.php line: 933 +; social_component.php line: 944 social_component_mix_deleted = "" ; -; social_component.php line: 951 +; social_component.php line: 962 social_component_mix_doesnt_exists = "" ; -; social_component.php line: 961 +; social_component.php line: 972 social_component_mix_imported = "" ; -; social_component.php line: 965 +; social_component.php line: 976 social_component_set_index = "" ; -; social_component.php line: 986 +; social_component.php line: 997 social_component_comment_error = "" ; -; social_component.php line: 994 +; social_component.php line: 1005 social_component_invalid_timestamp = "" ; -; social_component.php line: 1013 +; social_component.php line: 1024 social_component_no_post_access = "" ; -; social_component.php line: 1018 +; social_component.php line: 1029 social_component_share_title = "" ; -; social_component.php line: 1020 +; social_component.php line: 1031 social_component_share_description = "" ; -; social_component.php line: 1025 +; social_component.php line: 1036 social_component_thread_created = "" ; -; social_component.php line: 1071 +; social_component.php line: 1082 social_component_mix_not_owner = "" ; -; social_component.php line: 1084 +; social_component.php line: 1095 social_component_add_crawls = "" ; -; social_component.php line: 1086 +; social_component.php line: 1097 social_component_num_results = "" ; -; social_component.php line: 1088 +; social_component.php line: 1099 social_component_del_frag = "" ; -; social_component.php line: 1090 +; social_component.php line: 1101 social_component_weight = "" ; -; social_component.php line: 1091 +; social_component.php line: 1102 social_component_name = "" ; -; social_component.php line: 1093 +; social_component.php line: 1104 social_component_add_keywords = "" ; -; social_component.php line: 1095 +; social_component.php line: 1106 social_component_actions = "" ; -; social_component.php line: 1097 +; social_component.php line: 1108 social_component_add_query = "" ; -; social_component.php line: 1098 +; social_component.php line: 1109 social_component_delete = "" ; -; social_component.php line: 1146 +; social_component.php line: 1157 social_component_too_many_fragments = "" ; -; social_component.php line: 1157 +; social_component.php line: 1168 social_component_mix_saved = "" ; ; system_component.php line: 83 @@ -993,6 +993,9 @@ system_component_check_passed = "" ; system_component.php line: 1041 system_component_using_local_config = "" ; +; group_controller.php line: 112 +group_controller_group_feeds = "" +; ; machine_controller.php line: 174 machine_controller_nolines = "" ; @@ -1714,73 +1717,76 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 71 +; groupfeed_element.php line: 85 groupfeed_element_back = "" ; -; groupfeed_element.php line: 78 +; groupfeed_element.php line: 94 groupfeed_element_recent_activity = "" ; -; groupfeed_element.php line: 81 +; groupfeed_element.php line: 97 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 85 -groupfeed_element_group = "" +; groupfeed_element.php line: 102 +groupfeed_element_feed = "" +; +; groupfeed_element.php line: 105 +group_view_wiki = "" ; -; groupfeed_element.php line: 88 +; groupfeed_element.php line: 107 groupfeed_element_user = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 134 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 121 +; groupfeed_element.php line: 145 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 147 +; groupfeed_element.php line: 171 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 152 +; groupfeed_element.php line: 176 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 164 +; groupfeed_element.php line: 188 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 188 +; groupfeed_element.php line: 212 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 195 +; groupfeed_element.php line: 219 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 268 +; groupfeed_element.php line: 292 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 273 +; groupfeed_element.php line: 297 groupfeed_element_save = "" ; -; groupfeed_element.php line: 299 +; groupfeed_element.php line: 323 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 302 +; groupfeed_element.php line: 326 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 307 +; groupfeed_element.php line: 331 groupfeed_element_post = "" ; -; groupfeed_element.php line: 312 +; groupfeed_element.php line: 336 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 365 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 368 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 349 +; groupfeed_element.php line: 373 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 379 groupfeed_element_save = "" ; -; groupfeed_element.php line: 384 +; groupfeed_element.php line: 408 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2792,21 +2798,36 @@ serversettings_element_captcha_setting = "" ; serversettings_element.php line: 255 serversettings_element_submit = "" ; -; signin_element.php line: 65 +; signin_element.php line: 67 signin_element_settings = "" ; -; signin_element.php line: 70 +; signin_element.php line: 72 signin_element_signin = "" ; -; signin_element.php line: 74 +; signin_element.php line: 76 signin_element_admin = "" ; -; signin_element.php line: 76 +; signin_element.php line: 78 signin_element_signout = "" ; ; subsearch_element.php line: 71 subsearch_element_more = "" ; +; group_view.php line: 72 +group_view_feed = "" +; +; group_view.php line: 75 +group_view_wiki = "" +; +; group_view.php line: 77 +group_view_user = "" +; +; group_view.php line: 80 +group_view_myfeeds = "" +; +; group_view.php line: 99 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//views/helpers ; ; feeds_helper.php line: 70 @@ -3183,6 +3204,12 @@ signin_view_return_yioop = "" ; view.php line: 36 view_locale_version4 = "" ; +; wiki_view.php line: 73 +group_view_wiki = "" +; +; wiki_view.php line: 91 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins ; ; wordfilter_plugin.php line: 307 diff --git a/locale/vi-VN/configure.ini b/locale/vi-VN/configure.ini index 8af7fd647..6b2f0c9f6 100755 --- a/locale/vi-VN/configure.ini +++ b/locale/vi-VN/configure.ini @@ -690,154 +690,154 @@ social_component_unknown_access = "" ; social_component.php line: 536 social_component_group_filter_users = "" ; -; social_component.php line: 595 +; social_component.php line: 604 social_component_comment_error = "" ; -; social_component.php line: 601 +; social_component.php line: 610 social_component_no_comment = "" ; -; social_component.php line: 615 +; social_component.php line: 624 social_component_no_post_access = "" ; -; social_component.php line: 623 +; social_component.php line: 632 social_component_no_post_access = "" ; -; social_component.php line: 629 +; social_component.php line: 638 social_component_join_group = "" ; -; social_component.php line: 632 +; social_component.php line: 641 social_component_join_group_detail = "" ; -; social_component.php line: 644 +; social_component.php line: 653 social_component_comment_added = "" ; -; social_component.php line: 652 +; social_component.php line: 661 social_component_delete_error = "" ; -; social_component.php line: 660 +; social_component.php line: 669 social_component_item_deleted = "" ; -; social_component.php line: 664 +; social_component.php line: 673 social_component_no_item_deleted = "" ; -; social_component.php line: 674 +; social_component.php line: 683 social_component_comment_error = "" ; -; social_component.php line: 681 +; social_component.php line: 690 social_component_need_title_description = "" ; -; social_component.php line: 693 +; social_component.php line: 702 social_component_no_post_access = "" ; -; social_component.php line: 700 +; social_component.php line: 709 social_component_thread_created = "" ; -; social_component.php line: 711 +; social_component.php line: 720 social_component_comment_error = "" ; -; social_component.php line: 717 +; social_component.php line: 726 social_component_need_title_description = "" ; -; social_component.php line: 728 +; social_component.php line: 737 social_component_no_update_access = "" ; -; social_component.php line: 738 +; social_component.php line: 747 social_component_no_update_access = "" ; -; social_component.php line: 745 +; social_component.php line: 754 social_component_post_updated = "" ; -; social_component.php line: 763 +; social_component.php line: 772 social_component_join_group = "" ; -; social_component.php line: 766 +; social_component.php line: 775 social_component_join_group_detail = "" ; -; social_component.php line: 886 +; social_component.php line: 897 social_component_select_crawl = "Chọn thu thập thông tin" ; -; social_component.php line: 887 +; social_component.php line: 898 social_component_default_crawl = "" ; -; social_component.php line: 889 +; social_component.php line: 900 social_component_select_crawl = "Chọn thu thập thông tin" ; -; social_component.php line: 891 +; social_component.php line: 902 social_component_default_crawl = "" ; -; social_component.php line: 913 +; social_component.php line: 924 social_component_unnamed = "Vô danh" ; -; social_component.php line: 920 +; social_component.php line: 931 social_component_mix_created = "Tạo ra hỗn hợp " ; -; social_component.php line: 927 +; social_component.php line: 938 social_component_mix_invalid_timestamp = "" ; -; social_component.php line: 933 +; social_component.php line: 944 social_component_mix_deleted = "Xóa kết hợp " ; -; social_component.php line: 951 +; social_component.php line: 962 social_component_mix_doesnt_exists = "Kết hợp này không tồn tại" ; -; social_component.php line: 961 +; social_component.php line: 972 social_component_mix_imported = "" ; -; social_component.php line: 965 +; social_component.php line: 976 social_component_set_index = "" ; -; social_component.php line: 986 +; social_component.php line: 997 social_component_comment_error = "" ; -; social_component.php line: 994 +; social_component.php line: 1005 social_component_invalid_timestamp = "" ; -; social_component.php line: 1013 +; social_component.php line: 1024 social_component_no_post_access = "" ; -; social_component.php line: 1018 +; social_component.php line: 1029 social_component_share_title = "" ; -; social_component.php line: 1020 +; social_component.php line: 1031 social_component_share_description = "" ; -; social_component.php line: 1025 +; social_component.php line: 1036 social_component_thread_created = "" ; -; social_component.php line: 1071 +; social_component.php line: 1082 social_component_mix_not_owner = "" ; -; social_component.php line: 1084 +; social_component.php line: 1095 social_component_add_crawls = "Cộng thêm thu thập" ; -; social_component.php line: 1086 +; social_component.php line: 1097 social_component_num_results = "Số kết quả" ; -; social_component.php line: 1088 +; social_component.php line: 1099 social_component_del_frag = "" ; -; social_component.php line: 1090 +; social_component.php line: 1101 social_component_weight = "Trọng lượng" ; -; social_component.php line: 1091 +; social_component.php line: 1102 social_component_name = "" ; -; social_component.php line: 1093 +; social_component.php line: 1104 social_component_add_keywords = "" ; -; social_component.php line: 1095 +; social_component.php line: 1106 social_component_actions = "Hành động" ; -; social_component.php line: 1097 +; social_component.php line: 1108 social_component_add_query = "Cộng thêm truy vấn" ; -; social_component.php line: 1098 +; social_component.php line: 1109 social_component_delete = "" ; -; social_component.php line: 1146 +; social_component.php line: 1157 social_component_too_many_fragments = "" ; -; social_component.php line: 1157 +; social_component.php line: 1168 social_component_mix_saved = "Kết hợp đã được lưu dữ" ; ; system_component.php line: 83 @@ -993,6 +993,9 @@ system_component_check_passed = "Kiểm tra được thông qua" ; system_component.php line: 1041 system_component_using_local_config = "" ; +; group_controller.php line: 112 +group_controller_group_feeds = "" +; ; machine_controller.php line: 174 machine_controller_nolines = "" ; @@ -1714,73 +1717,76 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 71 +; groupfeed_element.php line: 85 groupfeed_element_back = "" ; -; groupfeed_element.php line: 78 +; groupfeed_element.php line: 94 groupfeed_element_recent_activity = "" ; -; groupfeed_element.php line: 81 +; groupfeed_element.php line: 97 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 85 -groupfeed_element_group = "" +; groupfeed_element.php line: 102 +groupfeed_element_feed = "" +; +; groupfeed_element.php line: 105 +group_view_wiki = "" ; -; groupfeed_element.php line: 88 +; groupfeed_element.php line: 107 groupfeed_element_user = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 134 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 121 +; groupfeed_element.php line: 145 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 147 +; groupfeed_element.php line: 171 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 152 +; groupfeed_element.php line: 176 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 164 +; groupfeed_element.php line: 188 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 188 +; groupfeed_element.php line: 212 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 195 +; groupfeed_element.php line: 219 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 268 +; groupfeed_element.php line: 292 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 273 +; groupfeed_element.php line: 297 groupfeed_element_save = "" ; -; groupfeed_element.php line: 299 +; groupfeed_element.php line: 323 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 302 +; groupfeed_element.php line: 326 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 307 +; groupfeed_element.php line: 331 groupfeed_element_post = "" ; -; groupfeed_element.php line: 312 +; groupfeed_element.php line: 336 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 365 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 368 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 349 +; groupfeed_element.php line: 373 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 379 groupfeed_element_save = "" ; -; groupfeed_element.php line: 384 +; groupfeed_element.php line: 408 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2792,21 +2798,36 @@ serversettings_element_captcha_setting = "" ; serversettings_element.php line: 255 serversettings_element_submit = "" ; -; signin_element.php line: 65 +; signin_element.php line: 67 signin_element_settings = "Những cài đặt" ; -; signin_element.php line: 70 +; signin_element.php line: 72 signin_element_signin = "Đăng nhập" ; -; signin_element.php line: 74 +; signin_element.php line: 76 signin_element_admin = "" ; -; signin_element.php line: 76 +; signin_element.php line: 78 signin_element_signout = "Thoát" ; ; subsearch_element.php line: 71 subsearch_element_more = "" ; +; group_view.php line: 72 +group_view_feed = "" +; +; group_view.php line: 75 +group_view_wiki = "" +; +; group_view.php line: 77 +group_view_user = "" +; +; group_view.php line: 80 +group_view_myfeeds = "" +; +; group_view.php line: 99 +adminview_auto_logout_one_minute = "Tự động thoát trong một phút" +; ; /Applications/MAMP/htdocs/git/yioop//views/helpers ; ; feeds_helper.php line: 70 @@ -3183,6 +3204,12 @@ signin_view_return_yioop = "Trở lại trang Yioop" ; view.php line: 36 view_locale_version4 = "" ; +; wiki_view.php line: 73 +group_view_wiki = "" +; +; wiki_view.php line: 91 +adminview_auto_logout_one_minute = "Tự động thoát trong một phút" +; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins ; ; wordfilter_plugin.php line: 307 diff --git a/locale/zh-CN/configure.ini b/locale/zh-CN/configure.ini index 0f2024385..31d54ca77 100755 --- a/locale/zh-CN/configure.ini +++ b/locale/zh-CN/configure.ini @@ -690,154 +690,154 @@ social_component_unknown_access = "" ; social_component.php line: 536 social_component_group_filter_users = "" ; -; social_component.php line: 595 +; social_component.php line: 604 social_component_comment_error = "" ; -; social_component.php line: 601 +; social_component.php line: 610 social_component_no_comment = "" ; -; social_component.php line: 615 +; social_component.php line: 624 social_component_no_post_access = "" ; -; social_component.php line: 623 +; social_component.php line: 632 social_component_no_post_access = "" ; -; social_component.php line: 629 +; social_component.php line: 638 social_component_join_group = "" ; -; social_component.php line: 632 +; social_component.php line: 641 social_component_join_group_detail = "" ; -; social_component.php line: 644 +; social_component.php line: 653 social_component_comment_added = "" ; -; social_component.php line: 652 +; social_component.php line: 661 social_component_delete_error = "" ; -; social_component.php line: 660 +; social_component.php line: 669 social_component_item_deleted = "" ; -; social_component.php line: 664 +; social_component.php line: 673 social_component_no_item_deleted = "" ; -; social_component.php line: 674 +; social_component.php line: 683 social_component_comment_error = "" ; -; social_component.php line: 681 +; social_component.php line: 690 social_component_need_title_description = "" ; -; social_component.php line: 693 +; social_component.php line: 702 social_component_no_post_access = "" ; -; social_component.php line: 700 +; social_component.php line: 709 social_component_thread_created = "" ; -; social_component.php line: 711 +; social_component.php line: 720 social_component_comment_error = "" ; -; social_component.php line: 717 +; social_component.php line: 726 social_component_need_title_description = "" ; -; social_component.php line: 728 +; social_component.php line: 737 social_component_no_update_access = "" ; -; social_component.php line: 738 +; social_component.php line: 747 social_component_no_update_access = "" ; -; social_component.php line: 745 +; social_component.php line: 754 social_component_post_updated = "" ; -; social_component.php line: 763 +; social_component.php line: 772 social_component_join_group = "" ; -; social_component.php line: 766 +; social_component.php line: 775 social_component_join_group_detail = "" ; -; social_component.php line: 886 +; social_component.php line: 897 social_component_select_crawl = "搜尋選擇" ; -; social_component.php line: 887 +; social_component.php line: 898 social_component_default_crawl = "" ; -; social_component.php line: 889 +; social_component.php line: 900 social_component_select_crawl = "搜尋選擇" ; -; social_component.php line: 891 +; social_component.php line: 902 social_component_default_crawl = "" ; -; social_component.php line: 913 +; social_component.php line: 924 social_component_unnamed = "未命名" ; -; social_component.php line: 920 +; social_component.php line: 931 social_component_mix_created = "" ; -; social_component.php line: 927 +; social_component.php line: 938 social_component_mix_invalid_timestamp = "" ; -; social_component.php line: 933 +; social_component.php line: 944 social_component_mix_deleted = "" ; -; social_component.php line: 951 +; social_component.php line: 962 social_component_mix_doesnt_exists = "" ; -; social_component.php line: 961 +; social_component.php line: 972 social_component_mix_imported = "" ; -; social_component.php line: 965 +; social_component.php line: 976 social_component_set_index = "" ; -; social_component.php line: 986 +; social_component.php line: 997 social_component_comment_error = "" ; -; social_component.php line: 994 +; social_component.php line: 1005 social_component_invalid_timestamp = "" ; -; social_component.php line: 1013 +; social_component.php line: 1024 social_component_no_post_access = "" ; -; social_component.php line: 1018 +; social_component.php line: 1029 social_component_share_title = "" ; -; social_component.php line: 1020 +; social_component.php line: 1031 social_component_share_description = "" ; -; social_component.php line: 1025 +; social_component.php line: 1036 social_component_thread_created = "" ; -; social_component.php line: 1071 +; social_component.php line: 1082 social_component_mix_not_owner = "" ; -; social_component.php line: 1084 +; social_component.php line: 1095 social_component_add_crawls = "增加索引" ; -; social_component.php line: 1086 +; social_component.php line: 1097 social_component_num_results = "結果數量" ; -; social_component.php line: 1088 +; social_component.php line: 1099 social_component_del_frag = "" ; -; social_component.php line: 1090 +; social_component.php line: 1101 social_component_weight = "元素重量" ; -; social_component.php line: 1091 +; social_component.php line: 1102 social_component_name = "" ; -; social_component.php line: 1093 +; social_component.php line: 1104 social_component_add_keywords = "" ; -; social_component.php line: 1095 +; social_component.php line: 1106 social_component_actions = "元素活動" ; -; social_component.php line: 1097 +; social_component.php line: 1108 social_component_add_query = "增加查詢" ; -; social_component.php line: 1098 +; social_component.php line: 1109 social_component_delete = "" ; -; social_component.php line: 1146 +; social_component.php line: 1157 social_component_too_many_fragments = "" ; -; social_component.php line: 1157 +; social_component.php line: 1168 social_component_mix_saved = "" ; ; system_component.php line: 83 @@ -993,6 +993,9 @@ system_component_check_passed = "通過檢查" ; system_component.php line: 1041 system_component_using_local_config = "使用當地語言" ; +; group_controller.php line: 112 +group_controller_group_feeds = "" +; ; machine_controller.php line: 174 machine_controller_nolines = "" ; @@ -1714,73 +1717,76 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 71 +; groupfeed_element.php line: 85 groupfeed_element_back = "" ; -; groupfeed_element.php line: 78 +; groupfeed_element.php line: 94 groupfeed_element_recent_activity = "" ; -; groupfeed_element.php line: 81 +; groupfeed_element.php line: 97 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 85 -groupfeed_element_group = "" +; groupfeed_element.php line: 102 +groupfeed_element_feed = "" +; +; groupfeed_element.php line: 105 +group_view_wiki = "" ; -; groupfeed_element.php line: 88 +; groupfeed_element.php line: 107 groupfeed_element_user = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 134 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 121 +; groupfeed_element.php line: 145 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 147 +; groupfeed_element.php line: 171 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 152 +; groupfeed_element.php line: 176 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 164 +; groupfeed_element.php line: 188 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 188 +; groupfeed_element.php line: 212 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 195 +; groupfeed_element.php line: 219 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 268 +; groupfeed_element.php line: 292 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 273 +; groupfeed_element.php line: 297 groupfeed_element_save = "" ; -; groupfeed_element.php line: 299 +; groupfeed_element.php line: 323 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 302 +; groupfeed_element.php line: 326 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 307 +; groupfeed_element.php line: 331 groupfeed_element_post = "" ; -; groupfeed_element.php line: 312 +; groupfeed_element.php line: 336 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 365 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 368 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 349 +; groupfeed_element.php line: 373 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 379 groupfeed_element_save = "" ; -; groupfeed_element.php line: 384 +; groupfeed_element.php line: 408 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2792,21 +2798,36 @@ serversettings_element_captcha_setting = "" ; serversettings_element.php line: 255 serversettings_element_submit = "" ; -; signin_element.php line: 65 +; signin_element.php line: 67 signin_element_settings = "設定" ; -; signin_element.php line: 70 +; signin_element.php line: 72 signin_element_signin = "登入" ; -; signin_element.php line: 74 +; signin_element.php line: 76 signin_element_admin = "管理員" ; -; signin_element.php line: 76 +; signin_element.php line: 78 signin_element_signout = "登出" ; ; subsearch_element.php line: 71 subsearch_element_more = "" ; +; group_view.php line: 72 +group_view_feed = "" +; +; group_view.php line: 75 +group_view_wiki = "" +; +; group_view.php line: 77 +group_view_user = "" +; +; group_view.php line: 80 +group_view_myfeeds = "" +; +; group_view.php line: 99 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//views/helpers ; ; feeds_helper.php line: 70 @@ -3183,6 +3204,12 @@ signin_view_return_yioop = "回到首頁" ; view.php line: 36 view_locale_version4 = "" ; +; wiki_view.php line: 73 +group_view_wiki = "" +; +; wiki_view.php line: 91 +adminview_auto_logout_one_minute = "" +; ; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins ; ; wordfilter_plugin.php line: 307 diff --git a/models/group_model.php b/models/group_model.php index e87ecb64c..29c9d9b24 100644 --- a/models/group_model.php +++ b/models/group_model.php @@ -609,7 +609,7 @@ class GroupModel extends Model * and that they should be grouped by thread * @return array elements of which represent one group feed item */ - function getGroupItems($limit=0, $num=100, $search_array = array(), + function getGroupItems($limit = 0, $num = 100, $search_array = array(), $user_id = ROOT_ID, $for_group = -1) { $db = $this->db; @@ -622,11 +622,16 @@ class GroupModel extends Model $add_where = " AND "; } $user_id = $db->escapeString($user_id); - $where .= $add_where. " UG.USER_ID='$user_id' AND - GI.GROUP_ID=G.GROUP_ID AND GI.GROUP_ID=UG.GROUP_ID AND - UG.USER_ID = U.USER_ID AND (( - UG.STATUS='".ACTIVE_STATUS."' - AND G.MEMBER_ACCESS IN ('".GROUP_READ."','".GROUP_READ_COMMENT. + $non_public_where = ($user_id != PUBLIC_GROUP_ID) ? + " UG.USER_ID='$user_id' AND " : + " G.REGISTER_TYPE='".PUBLIC_JOIN."' AND "; + $non_public_status = ($user_id != PUBLIC_GROUP_ID) ? + " UG.STATUS='".ACTIVE_STATUS."' AND " : ""; + $where .= $add_where. $non_public_where . + "GI.USER_ID=P.USER_ID AND + GI.GROUP_ID=G.GROUP_ID AND GI.GROUP_ID=UG.GROUP_ID AND (( + $non_public_status + G.MEMBER_ACCESS IN ('".GROUP_READ."','".GROUP_READ_COMMENT. "','".GROUP_READ_WRITE."'))OR (G.OWNER_ID = UG.USER_ID)) AND P.USER_ID = GI.USER_ID"; @@ -636,7 +641,7 @@ class GroupModel extends Model $select = "SELECT DISTINCT MIN(GI.ID) AS ID, COUNT(GI.ID) AS NUM_POSTS, GI.PARENT_ID AS PARENT_ID, MIN(GI.GROUP_ID) AS GROUP_ID, MIN(GI.TITLE )AS TITLE, - MIN(GI.DESCRIPTION) AS DESCRIPTION, MIN(GI.PUBDATE) AS PUBDATE, + MAX(GI.DESCRIPTION) AS DESCRIPTION, MAX(GI.PUBDATE) AS PUBDATE, MIN(G.OWNER_ID) AS OWNER_ID, MIN(G.MEMBER_ACCESS) AS MEMBER_ACCESS, MIN(G.GROUP_NAME) AS GROUP_NAME, MIN(P.USER_NAME) AS USER_NAME, @@ -652,12 +657,20 @@ class GroupModel extends Model P.USER_ID AS USER_ID "; } $sql = "$select - FROM GROUP_ITEM GI, GROUPS G, USER_GROUP UG, USERS U, USERS P + FROM GROUP_ITEM GI, GROUPS G, USER_GROUP UG, USERS P $where $group_by $order_by $limit"; $result = $db->execute($sql); $i = 0; - while($groups[$i] = $db->fetchArray($result)) { - $i++; + $read_only = ($user_id == PUBLIC_GROUP_ID); + if($read_only) { + while($groups[$i] = $db->fetchArray($result)) { + $groups[$i]["MEMBER_ACCESS"] = GROUP_READ; + $i++; + } + } else { + while($groups[$i] = $db->fetchArray($result)) { + $i++; + } } unset($groups[$i]); //last one will be null return $groups; @@ -690,11 +703,16 @@ class GroupModel extends Model $add_where = " AND "; } $user_id = $db->escapeString($user_id); - $where .= $add_where. " UG.USER_ID='$user_id' AND - GI.USER_ID=P.USER_ID AND + $non_public_where = ($user_id != PUBLIC_GROUP_ID) ? + " UG.USER_ID='$user_id' AND " : + " G.REGISTER_TYPE='".PUBLIC_JOIN."' AND "; + $non_public_status = ($user_id != PUBLIC_GROUP_ID) ? + " UG.STATUS='".ACTIVE_STATUS."' AND " : ""; + $where .= $add_where. $non_public_where . + "GI.USER_ID=P.USER_ID AND GI.GROUP_ID=G.GROUP_ID AND GI.GROUP_ID=UG.GROUP_ID AND (( - UG.STATUS='".ACTIVE_STATUS."' - AND G.MEMBER_ACCESS IN ('".GROUP_READ."','".GROUP_READ_COMMENT. + $non_public_status + G.MEMBER_ACCESS IN ('".GROUP_READ."','".GROUP_READ_COMMENT. "','".GROUP_READ_WRITE."'))OR (G.OWNER_ID = UG.USER_ID))"; if($for_group >= 0) { diff --git a/views/crawlstatus_view.php b/views/crawlstatus_view.php index e5adcd8f0..cd3425ec7 100755 --- a/views/crawlstatus_view.php +++ b/views/crawlstatus_view.php @@ -220,8 +220,11 @@ class CrawlstatusView extends View <th colspan="3"><?php e(tl('crawlstatus_view_actions'));?></th></tr> <?php foreach($data['RECENT_CRAWLS'] as $crawl) { + $description = (MOBILE) ? wordwrap($crawl['DESCRIPTION'], + 10, "<br />\n", true) : + $crawl['DESCRIPTION']; ?> - <tr><td><b><?php e($crawl['DESCRIPTION']); ?></b><br /> + <tr><td><b><?php e($description); ?></b><br /> [<a href="?<?php e(CSRF_TOKEN."=".$data[CSRF_TOKEN]); ?>&c=statistics&its=<?php e($crawl['CRAWL_TIME']); ?>"><?php diff --git a/views/elements/groupfeed_element.php b/views/elements/groupfeed_element.php index 7d7afffe4..8d1287538 100644 --- a/views/elements/groupfeed_element.php +++ b/views/elements/groupfeed_element.php @@ -54,45 +54,68 @@ class GroupfeedElement extends Element implements CrawlConstants */ function render($data) { + $is_admin = (get_class($this->view) == "AdminView"); if(!isset($data['STATUS'])) { ?> - <div id="feedstatus" class="current-activity"> + <div id="feedstatus" <?php if($is_admin) { + e(' class="current-activity" '); + } else { + e(' class="small-margin-current-activity" '); + }?> > <?php } $base_query = $data['PAGING_QUERY']."&".CSRF_TOKEN."=". $data[CSRF_TOKEN]; - $paging_query = $data['PAGING_QUERY']."&".CSRF_TOKEN."=". - $data[CSRF_TOKEN]; + $paging_query = $base_query; + $other_paging_query = $data['OTHER_PAGING_QUERY']."&". + CSRF_TOKEN."=".$data[CSRF_TOKEN]; if(isset($data['ADD_PAGING_QUERY'])) { $paging_query .= $data['ADD_PAGING_QUERY']; + $other_paging_query .= $data['ADD_PAGING_QUERY']; + } + if(isset($data['LIMIT'])) { + $other_paging_query .= "&limit=".$data['LIMIT']; + } + if(isset($data['RESULTS_PER_PAGE'])) { + $other_paging_query .= "&num=".$data['RESULTS_PER_PAGE']; } - if($data['SUBTITLE'] != "") { ?> + if($data['SUBTITLE'] != "" && isset($data['ADMIN']) && + $data['ADMIN']) { ?> <div class="float-opposite"> <a href="<?php e($base_query) ?>"><?php e(tl('groupfeed_element_back'))?></a> </div> <?php } - ?> - <h2><?php - if($data['SUBTITLE'] == "") { - e(tl('groupfeed_element_recent_activity')); - } else { - if(isset($data['JUST_THREAD'])) { - e(tl('groupfeed_element_thread', - $data['PAGES'][0][self::SOURCE_NAME], - $data['SUBTITLE'])); - } else if(isset($data['JUST_GROUP_ID'])){ - e(tl('groupfeed_element_group', - $data['PAGES'][0][self::SOURCE_NAME])); - } else if(isset($data['JUST_USER_ID'])) { - e(tl('groupfeed_element_user', - $data['PAGES'][0]["USER_NAME"])); + if($is_admin) { + ?> + <h2><?php + e("<a href='$other_paging_query'><<</a>"); + if($data['SUBTITLE'] == "") { + e(tl('groupfeed_element_recent_activity')); } else { - e("[{$data['SUBTITLE']}]"); + if(isset($data['JUST_THREAD'])) { + e(tl('groupfeed_element_thread', + $data['PAGES'][0][self::SOURCE_NAME], + $data['SUBTITLE'])); + } else if(isset($data['JUST_GROUP_ID'])){ + e($data['PAGES'][0][self::SOURCE_NAME]); + e(" [".tl('groupfeed_element_feed')."|". + "<a href='?c=group&a=wiki&group_id=". + $data['JUST_GROUP_ID']."'>" . + tl('group_view_wiki') . "</a>]"); + } else if(isset($data['JUST_USER_ID'])) { + e(tl('groupfeed_element_user', + $data['PAGES'][0]["USER_NAME"])); + } else { + e("[{$data['SUBTITLE']}]"); + } } + ?> + </h2> + <?php } - ?></h2> + ?> <div> </div> @@ -100,7 +123,8 @@ class GroupfeedElement extends Element implements CrawlConstants $open_in_tabs = $data['OPEN_IN_TABS']; $time = time(); $can_comment = array(GROUP_READ_COMMENT, GROUP_READ_WRITE); - if(in_array($data['PAGES'][0]["MEMBER_ACCESS"], $can_comment)) { + if(isset($data['PAGES'][0]["MEMBER_ACCESS"]) && + in_array($data['PAGES'][0]["MEMBER_ACCESS"], $can_comment)) { if(isset($data['JUST_THREAD'])) { ?> <div class='button-group-result'> @@ -137,7 +161,7 @@ class GroupfeedElement extends Element implements CrawlConstants $subsearch = (isset($data["SUBSEARCH"])) ? $data["SUBSEARCH"] : ""; if($page["MEMBER_ACCESS"] == GROUP_READ_WRITE && - !$page['USER_ID'] == "" && + $page['USER_ID'] != "" && isset($_SESSION['USER_ID']) && ($page['USER_ID'] == $_SESSION['USER_ID'] || $_SESSION['USER_ID'] == ROOT_ID)) { ?> @@ -250,8 +274,8 @@ class GroupfeedElement extends Element implements CrawlConstants function comment_form(id, parent_id, group_id) { clearInterval(updateId); - tmp = '<div class="comment<?php e($clear); ?>" ></div>'; - start_elt = elt(id).innerHTML.substr(0, tmp.length) + tmp = '<div class="comment<?php e($clear); ?>"></div>'; + start_elt = elt(id).innerHTML.substr(0, tmp.length); if(start_elt != tmp) { elt(id).innerHTML = tmp + @@ -364,7 +388,7 @@ class GroupfeedElement extends Element implements CrawlConstants } </script> <?php - if($data['LIMIT'] == 0) { ?> + if($data['LIMIT'] == 0 ) { ?> <script type="text/javascript" > var updateId; function feedStatusUpdate() diff --git a/views/elements/signin_element.php b/views/elements/signin_element.php index 09d9bd147..394d506ac 100755 --- a/views/elements/signin_element.php +++ b/views/elements/signin_element.php @@ -62,6 +62,8 @@ class SigninElement extends Element e((isset($data['its'])) ? '&its='.$data['its'] : ''); e((isset($data['ACTIVITY_METHOD'])) ? '&return='.$data['ACTIVITY_METHOD']:''); + e((isset($data['ACTIVITY_CONTROLLER'])) ? + '&oldc='.$data['ACTIVITY_CONTROLLER']:''); ?>"><?php e(tl('signin_element_settings')); ?></a></li><?php } diff --git a/views/feedstatus_view.php b/views/feedstatus_view.php index 4132bb9c4..2f3a5daab 100644 --- a/views/feedstatus_view.php +++ b/views/feedstatus_view.php @@ -46,7 +46,7 @@ class FeedstatusView extends View { /** - * An Ajax call from the My Group Feeds elemnt in Admin View triggers + * An Ajax call from the My Group Feeds element in Admin View triggers * this view to be instantiated. The renderView method then draws * the most recent feed posts. * @@ -57,4 +57,4 @@ class FeedstatusView extends View $this->element("groupfeed")->render($data); } } -?> \ No newline at end of file +?> diff --git a/views/group_view.php b/views/group_view.php new file mode 100644 index 000000000..04be0262f --- /dev/null +++ b/views/group_view.php @@ -0,0 +1,134 @@ +<?php +/** + * SeekQuarry/Yioop -- + * Open Source Pure PHP Search Engine, Crawler, and Indexer + * + * Copyright (C) 2009 - 2014 Chris Pollett chris@pollett.org + * + * LICENSE: + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * END LICENSE + * + * @author Chris Pollett chris@pollett.org + * @package seek_quarry + * @subpackage view + * @license http://www.gnu.org/licenses/ GPL3 + * @link http://www.seekquarry.com/ + * @copyright 2009 - 2014 + * @filesource + */ + +if(!defined('BASE_DIR')) {echo "BAD REQUEST"; exit();} + +/** + * + * @author Chris Pollett + * @package seek_quarry + * @subpackage view + */ +class GroupView extends View implements CrawlConstants +{ + /** This view is drawn on a web layout + * @var string + */ + var $layout = "web"; + + /** + * @param array $data + */ + function renderView($data) { + $logo = "resources/yioop.png"; + $base_query = $data['PAGING_QUERY']."&".CSRF_TOKEN."=". + $data[CSRF_TOKEN]; + if(MOBILE) { + $logo = "resources/m-yioop.png"; + } + if(PROFILE) { + ?> + <div class="top-bar"><?php + $this->element("signin")->render($data); + ?> + </div><?php + } + ?> + <h1 class="group-heading logo"><a href="./?<?php + e(CSRF_TOKEN."=".$data[CSRF_TOKEN]); ?>"><img + src="<?php e($logo); ?>" alt="Yioop!" /></a><small> - <?php + if(isset($data['JUST_THREAD'])) { + e("<a href='$base_query&a=groupFeeds&just_group_id=". + $data['PAGES'][0]["GROUP_ID"]."' >". + $data['PAGES'][0][self::SOURCE_NAME]."</a> : ". + $data['SUBTITLE']); + if(!MOBILE) { + e(" [<a href='$base_query&f=rss". + "&a=groupFeeds&just_thread=". + $data['JUST_THREAD']."'>RSS</a>]"); + } + } else if(isset($data['JUST_GROUP_ID'])){ + e($data['PAGES'][0][self::SOURCE_NAME]); + e(" [".tl('group_view_feed')); + if(!MOBILE && (!isset($data["ADMIN"]) || !$data["ADMIN"])) { + e("|<a href='$base_query&a=groupFeeds&just_group_id=". + $data['PAGES'][0]["GROUP_ID"]."&f=rss' >RSS</a>"); + } + e("|<a href='$base_query&a=wiki&group_id=". + $data['JUST_GROUP_ID']."'>" . + tl('group_view_wiki') . "</a>]"); + } else if(isset($data['JUST_USER_ID'])) { + e(tl('group_view_user', + $data['PAGES'][0]["USER_NAME"])); + } else { + e(tl('group_view_myfeeds')); + } + ?></small> + </h1> + <?php + if(isset($data['ELEMENT'])) { + $element = $data['ELEMENT']; + $this->element($element)->render($data); + } + if(PROFILE) { + ?> + <script type="text/javascript"> + /* + Used to warn that user is about to be logged out + */ + function logoutWarn() + { + doMessage( + "<h2 class='red'><?php + e(tl('adminview_auto_logout_one_minute'))?></h2>"); + } + /* + Javascript to perform autologout + */ + function autoLogout() + { + document.location='?c=search&a=signout'; + } + + //schedule logout warnings + var sec = 1000; + var minute = 60*sec; + setTimeout("logoutWarn()", 59 * minute); + setTimeout("autoLogout()", 60 * minute); + + </script> + <?php + } + } +} +?> diff --git a/views/wiki_view.php b/views/wiki_view.php new file mode 100644 index 000000000..5e2260875 --- /dev/null +++ b/views/wiki_view.php @@ -0,0 +1,113 @@ +<?php +/** + * SeekQuarry/Yioop -- + * Open Source Pure PHP Search Engine, Crawler, and Indexer + * + * Copyright (C) 2009 - 2014 Chris Pollett chris@pollett.org + * + * LICENSE: + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * END LICENSE + * + * @author Chris Pollett chris@pollett.org + * @package seek_quarry + * @subpackage view + * @license http://www.gnu.org/licenses/ GPL3 + * @link http://www.seekquarry.com/ + * @copyright 2009 - 2014 + * @filesource + */ + +if(!defined('BASE_DIR')) {echo "BAD REQUEST"; exit();} + +/** + * + * @author Chris Pollett + * @package seek_quarry + * @subpackage view + */ +class WikiView extends View +{ + /** This view is drawn on a web layout + * @var string + */ + var $layout = "web"; + + /** + * Renders the list of admin activities and draws the current activity + * Renders the Javascript to autologout after an hour + * + * @param array $data what is contained in this array depend on the current + * admin activity. The $data['ELEMENT'] says which activity to render + */ + function renderView($data) { + $logo = "resources/yioop.png"; + if(MOBILE) { + $logo = "resources/m-yioop.png"; + } + if(PROFILE) { + ?> + <div class="top-bar"><?php + $this->element("signin")->render($data); + ?> + </div><?php + } + + ?> + + <h1 class="admin-heading logo"><a href="./?<?php + e(CSRF_TOKEN."=".$data[CSRF_TOKEN]); ?>"><img + src="<?php e($logo); ?>" alt="Yioop!" /></a><span> - <?php + e(tl('group_view_wiki')); + ?> + </h1> + <?php + if(isset($data['ELEMENT'])) { + $element = $data['ELEMENT']; + $this->element($element)->render($data); + } + if(PROFILE) { + ?> + <script type="text/javascript"> + /* + Used to warn that user is about to be logged out + */ + function logoutWarn() + { + doMessage( + "<h2 class='red'><?php + e(tl('adminview_auto_logout_one_minute'))?></h2>"); + } + /* + Javascript to perform autologout + */ + function autoLogout() + { + document.location='?c=search&a=signout'; + } + + //schedule logout warnings + var sec = 1000; + var minute = 60*sec; + setTimeout("logoutWarn()", 59 * minute); + setTimeout("autoLogout()", 60 * minute); + + </script> + <?php + } + } +} +?>