diff --git a/bot.php b/bot.php index 0139e60..2210ede 100755 --- a/bot.php +++ b/bot.php @@ -36,5 +36,5 @@ $_REQUEST['c'] = "static"; $_REQUEST['p'] = "bot"; -include("index.php"); +require_once("index.php"); ?> diff --git a/configs/config.php b/configs/config.php index d7bd7e1..030128f 100644 --- a/configs/config.php +++ b/configs/config.php @@ -173,6 +173,19 @@ define('USER_AGENT', */ define ('SESSION_NAME', "yioopbiscuit"); +//check if mobile css and formatting should be used or not +if(isset($_SERVER['HTTP_USER_AGENT'])) { + $agent = $_SERVER['HTTP_USER_AGENT']; + if((stristr($agent, "mobile") || stristr($agent, "fennec")) && + !stristr($agent, "ipad") ) { + define("MOBILE", true); + } else { + define("MOBILE", false); + } +} else { + define("MOBILE", false); +} + /** * @global array addresses of memcached servers to use assuming memcached is * available diff --git a/configs/createdb.php b/configs/createdb.php index 06af8ad..7e83a3a 100755 --- a/configs/createdb.php +++ b/configs/createdb.php @@ -260,8 +260,9 @@ $db->execute("CREATE TABLE ACTIVE_FETCHER (NAME VARCHAR(16), $db->execute("CREATE TABLE CRON_TIME (TIMESTAMP INT(11))"); $db->execute("INSERT INTO CRON_TIME VALUES ('".time()."')"); -$db->execute("CREATE TABLE MEDIA_SOURCE (SOURCE_ID INT(11), TYPE VARCHAR(16), - NAME VARCHAR(16) UNIQUE, SOURCE_URL VARCHAR(256), THUMB_URL VARCHAR(256) +$db->execute("CREATE TABLE MEDIA_SOURCE ( + NAME VARCHAR(16) UNIQUE, TYPE VARCHAR(16), + SOURCE_URL VARCHAR(256), THUMB_URL VARCHAR(256) )"); diff --git a/controllers/admin_controller.php b/controllers/admin_controller.php index dfda18c..8ef5cb6 100755 --- a/controllers/admin_controller.php +++ b/controllers/admin_controller.php @@ -2074,33 +2074,33 @@ class AdminController extends Controller implements CrawlConstants "video" => tl('admin_controller_video'), "rss" => tl('admin_controller_rss_feed')); $source_type_flag = false; - if(isset($_REQUEST['SOURCE_TYPE']) && - in_array($_REQUEST['SOURCE_TYPE'], $data['SOURCE_TYPES'])) { - $data['SOURCE_TYPE'] = $_REQUEST['SOURCE_TYPE']; + if(isset($_REQUEST['sourcetype']) && + in_array($_REQUEST['sourcetype'], $data['SOURCE_TYPES'])) { + $data['SOURCE_TYPE'] = $_REQUEST['sourcetype']; $source_type_flag = true; } else { $data['SOURCE_TYPE'] = -1; } + $data["MEDIA_SOURCES"] = $this->sourceModel->getMediaSources(); if(isset($_REQUEST['arg']) && in_array($_REQUEST['arg'], $possible_arguments)) { switch($_REQUEST['arg']) { case "addsource": - if(isset($_REQUEST['sourcename'])) { - $source_name = - $this->clean($_REQUEST['sourcename'], "string" ); - } else { - break; - } - if(isset($_REQUEST['sourcetype'])) { - $source_type = - $this->clean($_REQUEST['sourcetype'], "string" ); - } else { - break; + if(!$source_type_flag) break; + $must_have = array("sourcename", + 'sourceurl'); + $to_clean = array_merge($must_have, + array('sourcethumbnail')); + foreach ($to_clean as $clean_me) { + $r[$clean_me] = (isset($_REQUEST[$clean_me])) ? + $this->clean($_REQUEST[$clean_me], "string" ) : ""; + if(in_array($clean_me, $must_have) && + $r[$clean_me] == "" ) break 2; } - $source_name = $this->sourceModel->addMediaSource( - $source_name, $source_url, $thumb_url); + $r['sourcename'], $r['sourcetype'], $r['sourceurl'], + $r['sourcethumbnail']); break; } } diff --git a/controllers/controller.php b/controllers/controller.php index 4d81127..09dec57 100755 --- a/controllers/controller.php +++ b/controllers/controller.php @@ -39,18 +39,6 @@ if(!defined('BASE_DIR')) {echo "BAD REQUEST"; exit();} require_once BASE_DIR."/lib/utility.php"; /** - * shorthand for echo - * - * @param string $text string to send to the current output - */ -if(!function_exists("e")) { - function e($text) - { - echo $text; - } -} - -/** * Base controller class for all controllers on * the SeekQuarry site. * @@ -58,7 +46,6 @@ if(!function_exists("e")) { * @package seek_quarry * @subpackage controller */ - abstract class Controller { /** diff --git a/css/search.css b/css/search.css index 4289295..dade510 100755 --- a/css/search.css +++ b/css/search.css @@ -1488,20 +1488,14 @@ body.mobile .crawlstable, .mixestable, +.mediasourcestable, .crawlstable th, .mixestable th, +.mediasourcestable th, .crawlstable td, .mixestable td, -.filetypestable -{ - border: 1px ridge black; - padding: 2px; -} - -.crawlstable th, -.mixestable th, -.crawlstable td, -.mixestable td, +.mediasourcestable td, +.filetypestable, .filetypestable td { border: 1px ridge black; diff --git a/examples/search_api.php b/examples/search_api.php index 7f7c039..b2c31db 100644 --- a/examples/search_api.php +++ b/examples/search_api.php @@ -140,9 +140,10 @@ $controller = new SearchController($indexing_plugins); echo "\n\n\nAn example of a query request with the search API:\n"; $query = "art i:1317414322"; - /* i:1317414322 is the timestamp of the index to use - if omit default index is used for query. Query string can be anything - you can type into Yioop! search box. + /* i:1317414322 is the timestamp of the index to use. + API requires that a default index be set even though the query might + specify to use a different one. The query string we pass to the + API can be anything you can type into Yioop! search box. */ $num_results = 10; // how many results to get back $first_result_to_return = 0; diff --git a/index.php b/index.php index 6e8d688..26a8f9f 100755 --- a/index.php +++ b/index.php @@ -54,6 +54,10 @@ session_start(); */ require_once(BASE_DIR."/models/datasources/".DBMS."_manager.php"); /** + * Load e() function + */ +require_once BASE_DIR."/lib/utility.php"; +/** * Load global functions related to localization */ require_once BASE_DIR."/lib/locale_functions.php"; @@ -126,20 +130,6 @@ if(!PROFILE ) { $controller_name = "admin"; } -//check if mobile css and formatting should be used or not -if(isset($_SERVER['HTTP_USER_AGENT'])) { - $agent = $_SERVER['HTTP_USER_AGENT']; - $is_admin = strcmp($controller_name, "admin") == 0; - if((stristr($agent, "mobile") || stristr($agent, "fennec")) && - !stristr($agent, "ipad") ) { - define("MOBILE", true); - } else { - define("MOBILE", false); - } -} else { - define("MOBILE", false); -} - $locale_tag = guessLocale(); if(upgradeDatabaseWorkDirectoryCheck()) { @@ -187,14 +177,6 @@ function checkAllowedController($controller_name) return in_array($controller_name, $available_controllers) ; } -/** - * shorthand for echo - * - * @param string $text string to send to the current output - */ -function e($text) -{ - echo $text; -} + ?> diff --git a/lib/upgrade_functions.php b/lib/upgrade_functions.php index 017f4fd..11c6128 100644 --- a/lib/upgrade_functions.php +++ b/lib/upgrade_functions.php @@ -71,15 +71,19 @@ function upgradeDatabaseWorkDirectoryCheck() $model->db->selectDB(DB_NAME); $sql = "SELECT ID FROM VERSION"; - $result = @$model->db->execute($sql); - if($result !== false) { - $row = $model->db->fetchArray($result); - if(isset($row['ID']) && $row['ID'] < 9 && $row['ID'] >= 0) { - return true; + for($i = 0; $i < 3; $i++) { + $result = @$model->db->execute($sql); + if($result !== false) { + $row = $model->db->fetchArray($result); + if(isset($row['ID']) && $row['ID'] < 9) { + return true; + } else if (isset($row['ID'])) { + return false; + } } - return false; + sleep(3); } - return false; + exit(); } /** @@ -99,10 +103,10 @@ function upgradeDatabaseWorkDirectory() if(isset($row['ID']) && in_array($row['ID'], $versions)) { $current_version = $row['ID']; } else { - $current_version = 0; + exit(); } } else { - return; // maybe someone else has locked DB, so bail + exit(); // maybe someone else has locked DB, so bail } $key = array_search($current_version, $versions); $versions = array_slice($versions, $current_version + 1); diff --git a/lib/utility.php b/lib/utility.php index 3cb452d..5356643 100755 --- a/lib/utility.php +++ b/lib/utility.php @@ -799,4 +799,13 @@ function greaterThan($a, $b) { return ($a > $b) ? -1 : 1; } +/** + * shorthand for echo + * + * @param string $text string to send to the current output + */ +function e($text) +{ + echo $text; +} ?> diff --git a/locale/ar/configure.ini b/locale/ar/configure.ini index fbe680e..aed24be 100755 --- a/locale/ar/configure.ini +++ b/locale/ar/configure.ini @@ -331,49 +331,49 @@ admin_controller_check_passed = "" ; admin_controller.php line: 2055 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2070 +; admin_controller.php line: 2072 admin_controller_media_kind = "" ; -; admin_controller.php line: 2071 +; admin_controller.php line: 2073 admin_controller_video = "" ; -; admin_controller.php line: 2072 +; admin_controller.php line: 2074 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2136 +; admin_controller.php line: 2161 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2169 +; admin_controller.php line: 2194 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2181 +; admin_controller.php line: 2206 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2190 +; admin_controller.php line: 2215 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2198 +; admin_controller.php line: 2223 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2209 +; admin_controller.php line: 2234 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2218 +; admin_controller.php line: 2243 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2229 +; admin_controller.php line: 2254 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2307 +; admin_controller.php line: 2332 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2321 +; admin_controller.php line: 2346 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2335 +; admin_controller.php line: 2360 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2371 +; admin_controller.php line: 2396 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1125,15 +1125,30 @@ searchsources_element_url = "" searchsources_element_thumbnail = "" ; ; searchsources_element.php line: 81 -manageusers_element_submit = "" +searchsources_element_submit = "" ; ; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 87 +searchsources_element_medianame = "" +; +; searchsources_element.php line: 88 +searchsources_element_mediatype = "" +; +; searchsources_element.php line: 89 +searchsources_element_mediaurls = "" +; +; searchsources_element.php line: 90 +searchsources_element_action = "" +; +; searchsources_element.php line: 97 +searchsources_element_deletemedia = "" +; +; searchsources_element.php line: 104 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 87 +; searchsources_element.php line: 105 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/de/configure.ini b/locale/de/configure.ini index 6f37329..5c1436c 100755 --- a/locale/de/configure.ini +++ b/locale/de/configure.ini @@ -331,49 +331,49 @@ admin_controller_check_passed = "" ; admin_controller.php line: 2055 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2070 +; admin_controller.php line: 2072 admin_controller_media_kind = "" ; -; admin_controller.php line: 2071 +; admin_controller.php line: 2073 admin_controller_video = "" ; -; admin_controller.php line: 2072 +; admin_controller.php line: 2074 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2136 +; admin_controller.php line: 2161 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2169 +; admin_controller.php line: 2194 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2181 +; admin_controller.php line: 2206 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2190 +; admin_controller.php line: 2215 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2198 +; admin_controller.php line: 2223 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2209 +; admin_controller.php line: 2234 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2218 +; admin_controller.php line: 2243 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2229 +; admin_controller.php line: 2254 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2307 +; admin_controller.php line: 2332 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2321 +; admin_controller.php line: 2346 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2335 +; admin_controller.php line: 2360 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2371 +; admin_controller.php line: 2396 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1125,15 +1125,30 @@ searchsources_element_url = "" searchsources_element_thumbnail = "" ; ; searchsources_element.php line: 81 -manageusers_element_submit = "" +searchsources_element_submit = "" ; ; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 87 +searchsources_element_medianame = "" +; +; searchsources_element.php line: 88 +searchsources_element_mediatype = "" +; +; searchsources_element.php line: 89 +searchsources_element_mediaurls = "" +; +; searchsources_element.php line: 90 +searchsources_element_action = "" +; +; searchsources_element.php line: 97 +searchsources_element_deletemedia = "" +; +; searchsources_element.php line: 104 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 87 +; searchsources_element.php line: 105 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/en-US/configure.ini b/locale/en-US/configure.ini index 5465fef..cfddaf0 100755 --- a/locale/en-US/configure.ini +++ b/locale/en-US/configure.ini @@ -331,49 +331,49 @@ admin_controller_check_passed = "Check Passed." ; admin_controller.php line: 2055 admin_controller_using_local_config = "Using configs/local_config.php so changing work directory above may not work." ; -; admin_controller.php line: 2070 +; admin_controller.php line: 2072 admin_controller_media_kind = "Media Kind" ; -; admin_controller.php line: 2071 +; admin_controller.php line: 2073 admin_controller_video = "Video" ; -; admin_controller.php line: 2072 +; admin_controller.php line: 2074 admin_controller_rss_feed = "RSS" ; -; admin_controller.php line: 2136 +; admin_controller.php line: 2161 admin_controller_configure_use_absolute_path = "Must use an Absolute path for Work Directory" ; -; admin_controller.php line: 2169 +; admin_controller.php line: 2194 admin_controller_configure_work_dir_set = "Work Directory Set! You may need to re-login!" ; -; admin_controller.php line: 2181 +; admin_controller.php line: 2206 admin_controller_name_your_bot = "Please Name Your robot" ; -; admin_controller.php line: 2190 +; admin_controller.php line: 2215 admin_controller_configure_work_profile_made = "Working Directory and Profile Created!" ; -; admin_controller.php line: 2198 +; admin_controller.php line: 2223 admin_controller_configure_no_set_config = "Unable to Update config.php File!" ; -; admin_controller.php line: 2209 +; admin_controller.php line: 2234 admin_controller_configure_no_create_profile = "Unable to Create Profile!" ; -; admin_controller.php line: 2218 +; admin_controller.php line: 2243 admin_controller_configure_work_dir_invalid = "Work Directory is Invalid! Cannot Create Profile!" ; -; admin_controller.php line: 2229 +; admin_controller.php line: 2254 admin_controller_configure_work_dir_invalid = "Work Directory is Invalid! Cannot Create Profile!" ; -; admin_controller.php line: 2307 +; admin_controller.php line: 2332 admin_controller_configure_no_change_db = "Problem Updating Database!" ; -; admin_controller.php line: 2321 +; admin_controller.php line: 2346 admin_controller_configure_profile_change = "Profile Updated!" ; -; admin_controller.php line: 2335 +; admin_controller.php line: 2360 admin_controller_configure_no_change_profile = "There was a Problem Updating Profile!" ; -; admin_controller.php line: 2371 +; admin_controller.php line: 2396 admin_controller_describe_robot = "Please Describe Your Robot" ; ; search_controller.php line: 142 @@ -1125,15 +1125,30 @@ searchsources_element_url = "URL:" searchsources_element_thumbnail = "Thumb:" ; ; searchsources_element.php line: 81 -manageusers_element_submit = "Submit" +searchsources_element_submit = "Submit" ; ; searchsources_element.php line: 85 searchsources_element_media_sources = "Media Sources" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 87 +searchsources_element_medianame = "Name" +; +; searchsources_element.php line: 88 +searchsources_element_mediatype = "Type" +; +; searchsources_element.php line: 89 +searchsources_element_mediaurls = "Urls" +; +; searchsources_element.php line: 90 +searchsources_element_action = "Action" +; +; searchsources_element.php line: 97 +searchsources_element_deletemedia = "Delete" +; +; searchsources_element.php line: 104 searchsources_element_add_subsearch = "Add a Subsearch" ; -; searchsources_element.php line: 87 +; searchsources_element.php line: 105 searchsources_element_subsearches = "Current Subsearches" ; ; signin_element.php line: 64 diff --git a/locale/en-US/statistics.txt b/locale/en-US/statistics.txt index 5a165df..b6bef56 100755 --- a/locale/en-US/statistics.txt +++ b/locale/en-US/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/locale/es/configure.ini b/locale/es/configure.ini index fd34603..ed0f2d2 100755 --- a/locale/es/configure.ini +++ b/locale/es/configure.ini @@ -331,49 +331,49 @@ admin_controller_check_passed = "" ; admin_controller.php line: 2055 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2070 +; admin_controller.php line: 2072 admin_controller_media_kind = "" ; -; admin_controller.php line: 2071 +; admin_controller.php line: 2073 admin_controller_video = "" ; -; admin_controller.php line: 2072 +; admin_controller.php line: 2074 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2136 +; admin_controller.php line: 2161 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2169 +; admin_controller.php line: 2194 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2181 +; admin_controller.php line: 2206 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2190 +; admin_controller.php line: 2215 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2198 +; admin_controller.php line: 2223 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2209 +; admin_controller.php line: 2234 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2218 +; admin_controller.php line: 2243 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2229 +; admin_controller.php line: 2254 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2307 +; admin_controller.php line: 2332 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2321 +; admin_controller.php line: 2346 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2335 +; admin_controller.php line: 2360 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2371 +; admin_controller.php line: 2396 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1125,15 +1125,30 @@ searchsources_element_url = "" searchsources_element_thumbnail = "" ; ; searchsources_element.php line: 81 -manageusers_element_submit = "" +searchsources_element_submit = "" ; ; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 87 +searchsources_element_medianame = "" +; +; searchsources_element.php line: 88 +searchsources_element_mediatype = "" +; +; searchsources_element.php line: 89 +searchsources_element_mediaurls = "" +; +; searchsources_element.php line: 90 +searchsources_element_action = "" +; +; searchsources_element.php line: 97 +searchsources_element_deletemedia = "" +; +; searchsources_element.php line: 104 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 87 +; searchsources_element.php line: 105 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/fa/configure.ini b/locale/fa/configure.ini index 34eea7a..e3538ce 100755 --- a/locale/fa/configure.ini +++ b/locale/fa/configure.ini @@ -331,49 +331,49 @@ admin_controller_check_passed = "" ; admin_controller.php line: 2055 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2070 +; admin_controller.php line: 2072 admin_controller_media_kind = "" ; -; admin_controller.php line: 2071 +; admin_controller.php line: 2073 admin_controller_video = "" ; -; admin_controller.php line: 2072 +; admin_controller.php line: 2074 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2136 +; admin_controller.php line: 2161 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2169 +; admin_controller.php line: 2194 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2181 +; admin_controller.php line: 2206 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2190 +; admin_controller.php line: 2215 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2198 +; admin_controller.php line: 2223 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2209 +; admin_controller.php line: 2234 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2218 +; admin_controller.php line: 2243 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2229 +; admin_controller.php line: 2254 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2307 +; admin_controller.php line: 2332 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2321 +; admin_controller.php line: 2346 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2335 +; admin_controller.php line: 2360 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2371 +; admin_controller.php line: 2396 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1125,15 +1125,30 @@ searchsources_element_url = "" searchsources_element_thumbnail = "" ; ; searchsources_element.php line: 81 -manageusers_element_submit = "" +searchsources_element_submit = "" ; ; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 87 +searchsources_element_medianame = "" +; +; searchsources_element.php line: 88 +searchsources_element_mediatype = "" +; +; searchsources_element.php line: 89 +searchsources_element_mediaurls = "" +; +; searchsources_element.php line: 90 +searchsources_element_action = "" +; +; searchsources_element.php line: 97 +searchsources_element_deletemedia = "" +; +; searchsources_element.php line: 104 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 87 +; searchsources_element.php line: 105 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/fr-FR/configure.ini b/locale/fr-FR/configure.ini index 5986645..ee06e85 100755 --- a/locale/fr-FR/configure.ini +++ b/locale/fr-FR/configure.ini @@ -331,49 +331,49 @@ admin_controller_check_passed = "" ; admin_controller.php line: 2055 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2070 +; admin_controller.php line: 2072 admin_controller_media_kind = "" ; -; admin_controller.php line: 2071 +; admin_controller.php line: 2073 admin_controller_video = "" ; -; admin_controller.php line: 2072 +; admin_controller.php line: 2074 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2136 +; admin_controller.php line: 2161 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2169 +; admin_controller.php line: 2194 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2181 +; admin_controller.php line: 2206 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2190 +; admin_controller.php line: 2215 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2198 +; admin_controller.php line: 2223 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2209 +; admin_controller.php line: 2234 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2218 +; admin_controller.php line: 2243 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2229 +; admin_controller.php line: 2254 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2307 +; admin_controller.php line: 2332 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2321 +; admin_controller.php line: 2346 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2335 +; admin_controller.php line: 2360 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2371 +; admin_controller.php line: 2396 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1125,15 +1125,30 @@ searchsources_element_url = "" searchsources_element_thumbnail = "" ; ; searchsources_element.php line: 81 -manageusers_element_submit = "" +searchsources_element_submit = "" ; ; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 87 +searchsources_element_medianame = "" +; +; searchsources_element.php line: 88 +searchsources_element_mediatype = "" +; +; searchsources_element.php line: 89 +searchsources_element_mediaurls = "" +; +; searchsources_element.php line: 90 +searchsources_element_action = "" +; +; searchsources_element.php line: 97 +searchsources_element_deletemedia = "" +; +; searchsources_element.php line: 104 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 87 +; searchsources_element.php line: 105 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/he/configure.ini b/locale/he/configure.ini index 1fdda43..bd5c48e 100755 --- a/locale/he/configure.ini +++ b/locale/he/configure.ini @@ -331,49 +331,49 @@ admin_controller_check_passed = "" ; admin_controller.php line: 2055 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2070 +; admin_controller.php line: 2072 admin_controller_media_kind = "" ; -; admin_controller.php line: 2071 +; admin_controller.php line: 2073 admin_controller_video = "" ; -; admin_controller.php line: 2072 +; admin_controller.php line: 2074 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2136 +; admin_controller.php line: 2161 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2169 +; admin_controller.php line: 2194 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2181 +; admin_controller.php line: 2206 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2190 +; admin_controller.php line: 2215 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2198 +; admin_controller.php line: 2223 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2209 +; admin_controller.php line: 2234 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2218 +; admin_controller.php line: 2243 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2229 +; admin_controller.php line: 2254 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2307 +; admin_controller.php line: 2332 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2321 +; admin_controller.php line: 2346 admin_controller_configure_profile_change = "פרופייל עודכן" ; -; admin_controller.php line: 2335 +; admin_controller.php line: 2360 admin_controller_configure_no_change_profile = "בעיה עם עדכון הפרופייל" ; -; admin_controller.php line: 2371 +; admin_controller.php line: 2396 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1125,15 +1125,30 @@ searchsources_element_url = "" searchsources_element_thumbnail = "" ; ; searchsources_element.php line: 81 -manageusers_element_submit = "" +searchsources_element_submit = "" ; ; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 87 +searchsources_element_medianame = "" +; +; searchsources_element.php line: 88 +searchsources_element_mediatype = "" +; +; searchsources_element.php line: 89 +searchsources_element_mediaurls = "" +; +; searchsources_element.php line: 90 +searchsources_element_action = "" +; +; searchsources_element.php line: 97 +searchsources_element_deletemedia = "" +; +; searchsources_element.php line: 104 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 87 +; searchsources_element.php line: 105 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/hi/configure.ini b/locale/hi/configure.ini index 672764c..76f4c5a 100755 --- a/locale/hi/configure.ini +++ b/locale/hi/configure.ini @@ -331,49 +331,49 @@ admin_controller_check_passed = "" ; admin_controller.php line: 2055 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2070 +; admin_controller.php line: 2072 admin_controller_media_kind = "" ; -; admin_controller.php line: 2071 +; admin_controller.php line: 2073 admin_controller_video = "" ; -; admin_controller.php line: 2072 +; admin_controller.php line: 2074 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2136 +; admin_controller.php line: 2161 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2169 +; admin_controller.php line: 2194 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2181 +; admin_controller.php line: 2206 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2190 +; admin_controller.php line: 2215 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2198 +; admin_controller.php line: 2223 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2209 +; admin_controller.php line: 2234 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2218 +; admin_controller.php line: 2243 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2229 +; admin_controller.php line: 2254 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2307 +; admin_controller.php line: 2332 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2321 +; admin_controller.php line: 2346 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2335 +; admin_controller.php line: 2360 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2371 +; admin_controller.php line: 2396 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1125,15 +1125,30 @@ searchsources_element_url = "" searchsources_element_thumbnail = "" ; ; searchsources_element.php line: 81 -manageusers_element_submit = "" +searchsources_element_submit = "" ; ; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 87 +searchsources_element_medianame = "" +; +; searchsources_element.php line: 88 +searchsources_element_mediatype = "" +; +; searchsources_element.php line: 89 +searchsources_element_mediaurls = "" +; +; searchsources_element.php line: 90 +searchsources_element_action = "" +; +; searchsources_element.php line: 97 +searchsources_element_deletemedia = "" +; +; searchsources_element.php line: 104 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 87 +; searchsources_element.php line: 105 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/in-ID/configure.ini b/locale/in-ID/configure.ini index b4f58e7..04c718c 100755 --- a/locale/in-ID/configure.ini +++ b/locale/in-ID/configure.ini @@ -331,49 +331,49 @@ admin_controller_check_passed = "" ; admin_controller.php line: 2055 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2070 +; admin_controller.php line: 2072 admin_controller_media_kind = "" ; -; admin_controller.php line: 2071 +; admin_controller.php line: 2073 admin_controller_video = "" ; -; admin_controller.php line: 2072 +; admin_controller.php line: 2074 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2136 +; admin_controller.php line: 2161 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2169 +; admin_controller.php line: 2194 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2181 +; admin_controller.php line: 2206 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2190 +; admin_controller.php line: 2215 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2198 +; admin_controller.php line: 2223 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2209 +; admin_controller.php line: 2234 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2218 +; admin_controller.php line: 2243 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2229 +; admin_controller.php line: 2254 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2307 +; admin_controller.php line: 2332 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2321 +; admin_controller.php line: 2346 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2335 +; admin_controller.php line: 2360 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2371 +; admin_controller.php line: 2396 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1125,15 +1125,30 @@ searchsources_element_url = "" searchsources_element_thumbnail = "" ; ; searchsources_element.php line: 81 -manageusers_element_submit = "" +searchsources_element_submit = "" ; ; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 87 +searchsources_element_medianame = "" +; +; searchsources_element.php line: 88 +searchsources_element_mediatype = "" +; +; searchsources_element.php line: 89 +searchsources_element_mediaurls = "" +; +; searchsources_element.php line: 90 +searchsources_element_action = "" +; +; searchsources_element.php line: 97 +searchsources_element_deletemedia = "" +; +; searchsources_element.php line: 104 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 87 +; searchsources_element.php line: 105 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/it/configure.ini b/locale/it/configure.ini index b4a1f1c..5e4f040 100755 --- a/locale/it/configure.ini +++ b/locale/it/configure.ini @@ -331,49 +331,49 @@ admin_controller_check_passed = "Controllo passato." ; admin_controller.php line: 2055 admin_controller_using_local_config = "Usando configs/local_config.php la Cartella di Lavoro sopra potrebbe non funzionare." ; -; admin_controller.php line: 2070 +; admin_controller.php line: 2072 admin_controller_media_kind = "" ; -; admin_controller.php line: 2071 +; admin_controller.php line: 2073 admin_controller_video = "" ; -; admin_controller.php line: 2072 +; admin_controller.php line: 2074 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2136 +; admin_controller.php line: 2161 admin_controller_configure_use_absolute_path = "Devi usare un percorso assoluto per la Cartella di Lavoro" ; -; admin_controller.php line: 2169 +; admin_controller.php line: 2194 admin_controller_configure_work_dir_set = "Cartella di Lavoro creata! Potrebbe essere necessario ri-accedere!" ; -; admin_controller.php line: 2181 +; admin_controller.php line: 2206 admin_controller_name_your_bot = "Dai un nome al tuo Robot" ; -; admin_controller.php line: 2190 +; admin_controller.php line: 2215 admin_controller_configure_work_profile_made = "Cartella di Lavoro e Profilo creati!" ; -; admin_controller.php line: 2198 +; admin_controller.php line: 2223 admin_controller_configure_no_set_config = "Impossibile aggiornare il file config.php!" ; -; admin_controller.php line: 2209 +; admin_controller.php line: 2234 admin_controller_configure_no_create_profile = "Impossibile creare Profilo!" ; -; admin_controller.php line: 2218 +; admin_controller.php line: 2243 admin_controller_configure_work_dir_invalid = "Cartella di Lavoro non valida! Impossibile creare Profilo!" ; -; admin_controller.php line: 2229 +; admin_controller.php line: 2254 admin_controller_configure_work_dir_invalid = "Cartella di Lavoro non valida! Impossibile creare Profilo!" ; -; admin_controller.php line: 2307 +; admin_controller.php line: 2332 admin_controller_configure_no_change_db = "Problema aggiornamento database!" ; -; admin_controller.php line: 2321 +; admin_controller.php line: 2346 admin_controller_configure_profile_change = "Profilo aggiornato!" ; -; admin_controller.php line: 2335 +; admin_controller.php line: 2360 admin_controller_configure_no_change_profile = "C'è stato un problema nell'aggiornamento Profilo!" ; -; admin_controller.php line: 2371 +; admin_controller.php line: 2396 admin_controller_describe_robot = "Descrivi il tuo Robot" ; ; search_controller.php line: 142 @@ -1125,15 +1125,30 @@ searchsources_element_url = "" searchsources_element_thumbnail = "" ; ; searchsources_element.php line: 81 -manageusers_element_submit = "Invia" +searchsources_element_submit = "" ; ; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 87 +searchsources_element_medianame = "" +; +; searchsources_element.php line: 88 +searchsources_element_mediatype = "" +; +; searchsources_element.php line: 89 +searchsources_element_mediaurls = "" +; +; searchsources_element.php line: 90 +searchsources_element_action = "" +; +; searchsources_element.php line: 97 +searchsources_element_deletemedia = "" +; +; searchsources_element.php line: 104 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 87 +; searchsources_element.php line: 105 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/it/statistics.txt b/locale/it/statistics.txt index d5e9abd..3e3765d 100755 --- a/locale/it/statistics.txt +++ b/locale/it/statistics.txt @@ -1 +1 @@ -d:96; \ No newline at end of file +d:94; \ No newline at end of file diff --git a/locale/ja/configure.ini b/locale/ja/configure.ini index 6acf44e..9129a78 100755 --- a/locale/ja/configure.ini +++ b/locale/ja/configure.ini @@ -331,49 +331,49 @@ admin_controller_check_passed = "" ; admin_controller.php line: 2055 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2070 +; admin_controller.php line: 2072 admin_controller_media_kind = "" ; -; admin_controller.php line: 2071 +; admin_controller.php line: 2073 admin_controller_video = "" ; -; admin_controller.php line: 2072 +; admin_controller.php line: 2074 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2136 +; admin_controller.php line: 2161 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2169 +; admin_controller.php line: 2194 admin_controller_configure_work_dir_set = "作業ディレクトリの設定しました。もう一度ログインしてください。" ; -; admin_controller.php line: 2181 +; admin_controller.php line: 2206 admin_controller_name_your_bot = "ボット名を入力してください。" ; -; admin_controller.php line: 2190 +; admin_controller.php line: 2215 admin_controller_configure_work_profile_made = "作業ディレクトリとプロフィールの作成しました。" ; -; admin_controller.php line: 2198 +; admin_controller.php line: 2223 admin_controller_configure_no_set_config = "config.phpファイルのできない。更新" ; -; admin_controller.php line: 2209 +; admin_controller.php line: 2234 admin_controller_configure_no_create_profile = "プロフィールを作成できない。" ; -; admin_controller.php line: 2218 +; admin_controller.php line: 2243 admin_controller_configure_work_dir_invalid = "無効な作業ディレクト。プロフィールを作成できない。" ; -; admin_controller.php line: 2229 +; admin_controller.php line: 2254 admin_controller_configure_work_dir_invalid = "無効な作業ディレクト。プロフィールを作成できない。" ; -; admin_controller.php line: 2307 +; admin_controller.php line: 2332 admin_controller_configure_no_change_db = "ディータベースの更新ない" ; -; admin_controller.php line: 2321 +; admin_controller.php line: 2346 admin_controller_configure_profile_change = "プロフィールの変更できました。" ; -; admin_controller.php line: 2335 +; admin_controller.php line: 2360 admin_controller_configure_no_change_profile = "プロフィールの変更できない。" ; -; admin_controller.php line: 2371 +; admin_controller.php line: 2396 admin_controller_describe_robot = "ロボットの説明してください。" ; ; search_controller.php line: 142 @@ -1125,15 +1125,30 @@ searchsources_element_url = "" searchsources_element_thumbnail = "" ; ; searchsources_element.php line: 81 -manageusers_element_submit = "サブミット" +searchsources_element_submit = "" ; ; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 87 +searchsources_element_medianame = "" +; +; searchsources_element.php line: 88 +searchsources_element_mediatype = "" +; +; searchsources_element.php line: 89 +searchsources_element_mediaurls = "" +; +; searchsources_element.php line: 90 +searchsources_element_action = "" +; +; searchsources_element.php line: 97 +searchsources_element_deletemedia = "" +; +; searchsources_element.php line: 104 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 87 +; searchsources_element.php line: 105 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/ja/statistics.txt b/locale/ja/statistics.txt index 87b79e8..e8680e2 100755 --- a/locale/ja/statistics.txt +++ b/locale/ja/statistics.txt @@ -1 +1 @@ -d:42; \ No newline at end of file +d:41; \ No newline at end of file diff --git a/locale/kn/configure.ini b/locale/kn/configure.ini index 37a1881..a48518b 100755 --- a/locale/kn/configure.ini +++ b/locale/kn/configure.ini @@ -331,49 +331,49 @@ admin_controller_check_passed = "ಪರಿಶೀಲನೆ ತೇರ್ಗಡೆ ; admin_controller.php line: 2055 admin_controller_using_local_config = "configs/local_config.php ಉಪಯೋಗದಲ್ಲಿದೆ, ಅದರಿಂದ ಮೇಲಿನ ಕಾರ್ಯ ನಿರ್ದೇಶಿಕೆಯನ್ನು ಬದಲಾವಣೆ ನಿಷ್ಕ್ರಿಯವಾಗಬಹುದು " ; -; admin_controller.php line: 2070 +; admin_controller.php line: 2072 admin_controller_media_kind = "" ; -; admin_controller.php line: 2071 +; admin_controller.php line: 2073 admin_controller_video = "" ; -; admin_controller.php line: 2072 +; admin_controller.php line: 2074 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2136 +; admin_controller.php line: 2161 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2169 +; admin_controller.php line: 2194 admin_controller_configure_work_dir_set = "ಕಾರ್ಯ ನಿರ್ದೇಶಿಕೆಯನ್ನು ನಿಗದಿಪಡಿಸಲಾಗಿದೆ! ನೀವು ಮರು ಪ್ರವೇಶಿಸಬೇಕಾಗಬಹುದು" ; -; admin_controller.php line: 2181 +; admin_controller.php line: 2206 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2190 +; admin_controller.php line: 2215 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2198 +; admin_controller.php line: 2223 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2209 +; admin_controller.php line: 2234 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2218 +; admin_controller.php line: 2243 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2229 +; admin_controller.php line: 2254 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2307 +; admin_controller.php line: 2332 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2321 +; admin_controller.php line: 2346 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2335 +; admin_controller.php line: 2360 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2371 +; admin_controller.php line: 2396 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1125,15 +1125,30 @@ searchsources_element_url = "" searchsources_element_thumbnail = "" ; ; searchsources_element.php line: 81 -manageusers_element_submit = "" +searchsources_element_submit = "" ; ; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 87 +searchsources_element_medianame = "" +; +; searchsources_element.php line: 88 +searchsources_element_mediatype = "" +; +; searchsources_element.php line: 89 +searchsources_element_mediaurls = "" +; +; searchsources_element.php line: 90 +searchsources_element_action = "" +; +; searchsources_element.php line: 97 +searchsources_element_deletemedia = "" +; +; searchsources_element.php line: 104 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 87 +; searchsources_element.php line: 105 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/kn/statistics.txt b/locale/kn/statistics.txt index 0f66448..750f010 100755 --- a/locale/kn/statistics.txt +++ b/locale/kn/statistics.txt @@ -1 +1 @@ -d:24; \ No newline at end of file +d:23; \ No newline at end of file diff --git a/locale/ko/configure.ini b/locale/ko/configure.ini index f1534ff..273e944 100755 --- a/locale/ko/configure.ini +++ b/locale/ko/configure.ini @@ -331,49 +331,49 @@ admin_controller_check_passed = "" ; admin_controller.php line: 2055 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2070 +; admin_controller.php line: 2072 admin_controller_media_kind = "" ; -; admin_controller.php line: 2071 +; admin_controller.php line: 2073 admin_controller_video = "" ; -; admin_controller.php line: 2072 +; admin_controller.php line: 2074 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2136 +; admin_controller.php line: 2161 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2169 +; admin_controller.php line: 2194 admin_controller_configure_work_dir_set = "작업 디렉토리가 지정 됐습니다. 다시 로그인이 필요할수 있습니다." ; -; admin_controller.php line: 2181 +; admin_controller.php line: 2206 admin_controller_name_your_bot = "로봇 이름을 정해 주십시요." ; -; admin_controller.php line: 2190 +; admin_controller.php line: 2215 admin_controller_configure_work_profile_made = "작업 디렉토리와 프로필이 생성됐습니다." ; -; admin_controller.php line: 2198 +; admin_controller.php line: 2223 admin_controller_configure_no_set_config = "config.php 파일을 업데이트 실패했습니다." ; -; admin_controller.php line: 2209 +; admin_controller.php line: 2234 admin_controller_configure_no_create_profile = "프로필을 생성할수 없습니다." ; -; admin_controller.php line: 2218 +; admin_controller.php line: 2243 admin_controller_configure_work_dir_invalid = "작업 디렉토리가 올바르지 않습니다. 프로필을 생성할수 없습니다." ; -; admin_controller.php line: 2229 +; admin_controller.php line: 2254 admin_controller_configure_work_dir_invalid = "작업 디렉토리가 올바르지 않습니다. 프로필을 생성할수 없습니다." ; -; admin_controller.php line: 2307 +; admin_controller.php line: 2332 admin_controller_configure_no_change_db = "데이터베이스를 업데이트하는데 문제가 발생했습니다." ; -; admin_controller.php line: 2321 +; admin_controller.php line: 2346 admin_controller_configure_profile_change = "프로필을 업데이트 했습니다." ; -; admin_controller.php line: 2335 +; admin_controller.php line: 2360 admin_controller_configure_no_change_profile = "프로필을 업데이트하는데 문제가 발생했습니다." ; -; admin_controller.php line: 2371 +; admin_controller.php line: 2396 admin_controller_describe_robot = "당신의 로봇을 기술해 주십시요." ; ; search_controller.php line: 142 @@ -1125,15 +1125,30 @@ searchsources_element_url = "" searchsources_element_thumbnail = "" ; ; searchsources_element.php line: 81 -manageusers_element_submit = "제출 하기" +searchsources_element_submit = "" ; ; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 87 +searchsources_element_medianame = "" +; +; searchsources_element.php line: 88 +searchsources_element_mediatype = "" +; +; searchsources_element.php line: 89 +searchsources_element_mediaurls = "" +; +; searchsources_element.php line: 90 +searchsources_element_action = "" +; +; searchsources_element.php line: 97 +searchsources_element_deletemedia = "" +; +; searchsources_element.php line: 104 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 87 +; searchsources_element.php line: 105 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/pl/configure.ini b/locale/pl/configure.ini index fc5b319..1b3d468 100755 --- a/locale/pl/configure.ini +++ b/locale/pl/configure.ini @@ -331,49 +331,49 @@ admin_controller_check_passed = "" ; admin_controller.php line: 2055 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2070 +; admin_controller.php line: 2072 admin_controller_media_kind = "" ; -; admin_controller.php line: 2071 +; admin_controller.php line: 2073 admin_controller_video = "" ; -; admin_controller.php line: 2072 +; admin_controller.php line: 2074 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2136 +; admin_controller.php line: 2161 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2169 +; admin_controller.php line: 2194 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2181 +; admin_controller.php line: 2206 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2190 +; admin_controller.php line: 2215 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2198 +; admin_controller.php line: 2223 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2209 +; admin_controller.php line: 2234 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2218 +; admin_controller.php line: 2243 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2229 +; admin_controller.php line: 2254 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2307 +; admin_controller.php line: 2332 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2321 +; admin_controller.php line: 2346 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2335 +; admin_controller.php line: 2360 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2371 +; admin_controller.php line: 2396 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1125,15 +1125,30 @@ searchsources_element_url = "" searchsources_element_thumbnail = "" ; ; searchsources_element.php line: 81 -manageusers_element_submit = "" +searchsources_element_submit = "" ; ; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 87 +searchsources_element_medianame = "" +; +; searchsources_element.php line: 88 +searchsources_element_mediatype = "" +; +; searchsources_element.php line: 89 +searchsources_element_mediaurls = "" +; +; searchsources_element.php line: 90 +searchsources_element_action = "" +; +; searchsources_element.php line: 97 +searchsources_element_deletemedia = "" +; +; searchsources_element.php line: 104 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 87 +; searchsources_element.php line: 105 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/pt/configure.ini b/locale/pt/configure.ini index ab311d2..862b220 100755 --- a/locale/pt/configure.ini +++ b/locale/pt/configure.ini @@ -331,49 +331,49 @@ admin_controller_check_passed = "" ; admin_controller.php line: 2055 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2070 +; admin_controller.php line: 2072 admin_controller_media_kind = "" ; -; admin_controller.php line: 2071 +; admin_controller.php line: 2073 admin_controller_video = "" ; -; admin_controller.php line: 2072 +; admin_controller.php line: 2074 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2136 +; admin_controller.php line: 2161 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2169 +; admin_controller.php line: 2194 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2181 +; admin_controller.php line: 2206 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2190 +; admin_controller.php line: 2215 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2198 +; admin_controller.php line: 2223 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2209 +; admin_controller.php line: 2234 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2218 +; admin_controller.php line: 2243 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2229 +; admin_controller.php line: 2254 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2307 +; admin_controller.php line: 2332 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2321 +; admin_controller.php line: 2346 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2335 +; admin_controller.php line: 2360 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2371 +; admin_controller.php line: 2396 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1125,15 +1125,30 @@ searchsources_element_url = "" searchsources_element_thumbnail = "" ; ; searchsources_element.php line: 81 -manageusers_element_submit = "" +searchsources_element_submit = "" ; ; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 87 +searchsources_element_medianame = "" +; +; searchsources_element.php line: 88 +searchsources_element_mediatype = "" +; +; searchsources_element.php line: 89 +searchsources_element_mediaurls = "" +; +; searchsources_element.php line: 90 +searchsources_element_action = "" +; +; searchsources_element.php line: 97 +searchsources_element_deletemedia = "" +; +; searchsources_element.php line: 104 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 87 +; searchsources_element.php line: 105 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/ru/configure.ini b/locale/ru/configure.ini index 65c4556..5e6d524 100755 --- a/locale/ru/configure.ini +++ b/locale/ru/configure.ini @@ -331,49 +331,49 @@ admin_controller_check_passed = "" ; admin_controller.php line: 2055 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2070 +; admin_controller.php line: 2072 admin_controller_media_kind = "" ; -; admin_controller.php line: 2071 +; admin_controller.php line: 2073 admin_controller_video = "" ; -; admin_controller.php line: 2072 +; admin_controller.php line: 2074 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2136 +; admin_controller.php line: 2161 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2169 +; admin_controller.php line: 2194 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2181 +; admin_controller.php line: 2206 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2190 +; admin_controller.php line: 2215 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2198 +; admin_controller.php line: 2223 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2209 +; admin_controller.php line: 2234 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2218 +; admin_controller.php line: 2243 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2229 +; admin_controller.php line: 2254 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2307 +; admin_controller.php line: 2332 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2321 +; admin_controller.php line: 2346 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2335 +; admin_controller.php line: 2360 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2371 +; admin_controller.php line: 2396 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1125,15 +1125,30 @@ searchsources_element_url = "" searchsources_element_thumbnail = "" ; ; searchsources_element.php line: 81 -manageusers_element_submit = "" +searchsources_element_submit = "" ; ; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 87 +searchsources_element_medianame = "" +; +; searchsources_element.php line: 88 +searchsources_element_mediatype = "" +; +; searchsources_element.php line: 89 +searchsources_element_mediaurls = "" +; +; searchsources_element.php line: 90 +searchsources_element_action = "" +; +; searchsources_element.php line: 97 +searchsources_element_deletemedia = "" +; +; searchsources_element.php line: 104 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 87 +; searchsources_element.php line: 105 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/th/configure.ini b/locale/th/configure.ini index 2b1a2c0..cdf8bb9 100755 --- a/locale/th/configure.ini +++ b/locale/th/configure.ini @@ -331,49 +331,49 @@ admin_controller_check_passed = "" ; admin_controller.php line: 2055 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2070 +; admin_controller.php line: 2072 admin_controller_media_kind = "" ; -; admin_controller.php line: 2071 +; admin_controller.php line: 2073 admin_controller_video = "" ; -; admin_controller.php line: 2072 +; admin_controller.php line: 2074 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2136 +; admin_controller.php line: 2161 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2169 +; admin_controller.php line: 2194 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2181 +; admin_controller.php line: 2206 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2190 +; admin_controller.php line: 2215 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2198 +; admin_controller.php line: 2223 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2209 +; admin_controller.php line: 2234 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2218 +; admin_controller.php line: 2243 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2229 +; admin_controller.php line: 2254 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2307 +; admin_controller.php line: 2332 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2321 +; admin_controller.php line: 2346 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2335 +; admin_controller.php line: 2360 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2371 +; admin_controller.php line: 2396 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1125,15 +1125,30 @@ searchsources_element_url = "" searchsources_element_thumbnail = "" ; ; searchsources_element.php line: 81 -manageusers_element_submit = "" +searchsources_element_submit = "" ; ; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 87 +searchsources_element_medianame = "" +; +; searchsources_element.php line: 88 +searchsources_element_mediatype = "" +; +; searchsources_element.php line: 89 +searchsources_element_mediaurls = "" +; +; searchsources_element.php line: 90 +searchsources_element_action = "" +; +; searchsources_element.php line: 97 +searchsources_element_deletemedia = "" +; +; searchsources_element.php line: 104 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 87 +; searchsources_element.php line: 105 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/tr/configure.ini b/locale/tr/configure.ini index 6ac841b..9d4e3c0 100755 --- a/locale/tr/configure.ini +++ b/locale/tr/configure.ini @@ -331,49 +331,49 @@ admin_controller_check_passed = "" ; admin_controller.php line: 2055 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2070 +; admin_controller.php line: 2072 admin_controller_media_kind = "" ; -; admin_controller.php line: 2071 +; admin_controller.php line: 2073 admin_controller_video = "" ; -; admin_controller.php line: 2072 +; admin_controller.php line: 2074 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2136 +; admin_controller.php line: 2161 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2169 +; admin_controller.php line: 2194 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2181 +; admin_controller.php line: 2206 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2190 +; admin_controller.php line: 2215 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2198 +; admin_controller.php line: 2223 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2209 +; admin_controller.php line: 2234 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2218 +; admin_controller.php line: 2243 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2229 +; admin_controller.php line: 2254 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2307 +; admin_controller.php line: 2332 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2321 +; admin_controller.php line: 2346 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2335 +; admin_controller.php line: 2360 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2371 +; admin_controller.php line: 2396 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1125,15 +1125,30 @@ searchsources_element_url = "" searchsources_element_thumbnail = "" ; ; searchsources_element.php line: 81 -manageusers_element_submit = "" +searchsources_element_submit = "" ; ; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 87 +searchsources_element_medianame = "" +; +; searchsources_element.php line: 88 +searchsources_element_mediatype = "" +; +; searchsources_element.php line: 89 +searchsources_element_mediaurls = "" +; +; searchsources_element.php line: 90 +searchsources_element_action = "" +; +; searchsources_element.php line: 97 +searchsources_element_deletemedia = "" +; +; searchsources_element.php line: 104 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 87 +; searchsources_element.php line: 105 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/vi-VN/configure.ini b/locale/vi-VN/configure.ini index d8d54d0..15f3b6b 100755 --- a/locale/vi-VN/configure.ini +++ b/locale/vi-VN/configure.ini @@ -331,49 +331,49 @@ admin_controller_check_passed = "Kiểm tra được thông qua" ; admin_controller.php line: 2055 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2070 +; admin_controller.php line: 2072 admin_controller_media_kind = "" ; -; admin_controller.php line: 2071 +; admin_controller.php line: 2073 admin_controller_video = "" ; -; admin_controller.php line: 2072 +; admin_controller.php line: 2074 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2136 +; admin_controller.php line: 2161 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2169 +; admin_controller.php line: 2194 admin_controller_configure_work_dir_set = "Công việc thiết lập thư mục bị đông cứng (Bạn có thể cần phải đăng nhập)" ; -; admin_controller.php line: 2181 +; admin_controller.php line: 2206 admin_controller_name_your_bot = "Đặt tên cho rô bô của bạn" ; -; admin_controller.php line: 2190 +; admin_controller.php line: 2215 admin_controller_configure_work_profile_made = "Thư mục làm việc và hồ sơ được tạo ra" ; -; admin_controller.php line: 2198 +; admin_controller.php line: 2223 admin_controller_configure_no_set_config = "Không thể cập nhật hồ sơ config.php" ; -; admin_controller.php line: 2209 +; admin_controller.php line: 2234 admin_controller_configure_no_create_profile = "Không thể tạo hồ sơ" ; -; admin_controller.php line: 2218 +; admin_controller.php line: 2243 admin_controller_configure_work_dir_invalid = "Công tác thư mục không hợp lệ" ; -; admin_controller.php line: 2229 +; admin_controller.php line: 2254 admin_controller_configure_work_dir_invalid = "Công tác thư mục không hợp lệ" ; -; admin_controller.php line: 2307 +; admin_controller.php line: 2332 admin_controller_configure_no_change_db = "Vấn đề cập nhật cơ sở dữ liệu" ; -; admin_controller.php line: 2321 +; admin_controller.php line: 2346 admin_controller_configure_profile_change = "Hồ sơ được cập nhật" ; -; admin_controller.php line: 2335 +; admin_controller.php line: 2360 admin_controller_configure_no_change_profile = "Có sự trở ngaị về việc cập nhật hồ sơ " ; -; admin_controller.php line: 2371 +; admin_controller.php line: 2396 admin_controller_describe_robot = "Diễn tả rô bô của bạn" ; ; search_controller.php line: 142 @@ -1125,15 +1125,30 @@ searchsources_element_url = "" searchsources_element_thumbnail = "" ; ; searchsources_element.php line: 81 -manageusers_element_submit = "" +searchsources_element_submit = "" ; ; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 87 +searchsources_element_medianame = "" +; +; searchsources_element.php line: 88 +searchsources_element_mediatype = "" +; +; searchsources_element.php line: 89 +searchsources_element_mediaurls = "" +; +; searchsources_element.php line: 90 +searchsources_element_action = "" +; +; searchsources_element.php line: 97 +searchsources_element_deletemedia = "" +; +; searchsources_element.php line: 104 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 87 +; searchsources_element.php line: 105 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/vi-VN/statistics.txt b/locale/vi-VN/statistics.txt index 67f539e..b9615e5 100755 --- a/locale/vi-VN/statistics.txt +++ b/locale/vi-VN/statistics.txt @@ -1 +1 @@ -d:39; \ No newline at end of file +d:38; \ No newline at end of file diff --git a/locale/zh-CN/configure.ini b/locale/zh-CN/configure.ini index 287dd1a..4a356f3 100755 --- a/locale/zh-CN/configure.ini +++ b/locale/zh-CN/configure.ini @@ -331,49 +331,49 @@ admin_controller_check_passed = "" ; admin_controller.php line: 2055 admin_controller_using_local_config = "" ; -; admin_controller.php line: 2070 +; admin_controller.php line: 2072 admin_controller_media_kind = "" ; -; admin_controller.php line: 2071 +; admin_controller.php line: 2073 admin_controller_video = "" ; -; admin_controller.php line: 2072 +; admin_controller.php line: 2074 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2136 +; admin_controller.php line: 2161 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2169 +; admin_controller.php line: 2194 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2181 +; admin_controller.php line: 2206 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2190 +; admin_controller.php line: 2215 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2198 +; admin_controller.php line: 2223 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2209 +; admin_controller.php line: 2234 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2218 +; admin_controller.php line: 2243 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2229 +; admin_controller.php line: 2254 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2307 +; admin_controller.php line: 2332 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2321 +; admin_controller.php line: 2346 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2335 +; admin_controller.php line: 2360 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2371 +; admin_controller.php line: 2396 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1125,15 +1125,30 @@ searchsources_element_url = "" searchsources_element_thumbnail = "" ; ; searchsources_element.php line: 81 -manageusers_element_submit = "完成" +searchsources_element_submit = "" ; ; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 87 +searchsources_element_medianame = "" +; +; searchsources_element.php line: 88 +searchsources_element_mediatype = "" +; +; searchsources_element.php line: 89 +searchsources_element_mediaurls = "" +; +; searchsources_element.php line: 90 +searchsources_element_action = "" +; +; searchsources_element.php line: 97 +searchsources_element_deletemedia = "" +; +; searchsources_element.php line: 104 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 87 +; searchsources_element.php line: 105 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/models/source_model.php b/models/source_model.php index df5292d..284cf42 100644 --- a/models/source_model.php +++ b/models/source_model.php @@ -67,6 +67,7 @@ class SourceModel extends Model $this->db->selectDB(DB_NAME); $sql = "SELECT * FROM MEDIA_SOURCE"; $i = 0; + $result = $this->db->execute($sql); while($sources[$i] = $this->db->fetchArray($result)) { $i++; } @@ -78,15 +79,15 @@ class SourceModel extends Model /** * - * @param int $user_id id of user to get session for * @return array user's session data */ - function addMediaSource($name, $source_url, $thumb_url) + function addMediaSource($name, $source_type, $source_url, $thumb_url) { $this->db->selectDB(DB_NAME); $sql = "INSERT INTO MEDIA_SOURCE VALUES ('". $this->db->escapeString($name)."','". + $this->db->escapeString($source_type)."','". $this->db->escapeString($source_url)."','". $this->db->escapeString($thumb_url)."')"; diff --git a/views/elements/searchsources_element.php b/views/elements/searchsources_element.php index 02c5af5..73d8629 100644 --- a/views/elements/searchsources_element.php +++ b/views/elements/searchsources_element.php @@ -79,11 +79,27 @@ class SearchsourcesElement extends Element <input type="text" id="source-thumbnail" name="sourcethumbnail" maxlength="80" class="narrowfield" /></td></tr> <tr><td></td><td class="center"><button class="buttonbox" - type="submit"><?php e(tl('manageusers_element_submit')); + type="submit"><?php e(tl('searchsources_element_submit')); ?></button></td></tr> </table> </form> <h2><?php e(tl('searchsources_element_media_sources'))?></h2> + <table class="mediasourcestable"> + <tr><th><?php e(tl('searchsources_element_medianame'));?></th> + <th><?php e(tl('searchsources_element_mediatype'));?></th><th><?php + e(tl('searchsources_element_mediaurls')); ?></th> + <th><?php e(tl('searchsources_element_action'));?></th></tr><?php + foreach($data['MEDIA_SOURCES'] as $source) { + ?> + <tr><td><?php e($source['NAME']); ?></td> + <td><?php e($source['TYPE']); ?></td> + <td><?php e($source['SOURCE_URL']."<br />". + $source['THUMB_URL']); ?></td> + <td><a href=""><?php e(tl('searchsources_element_deletemedia')); + ?></a></td> + <?php + } ?> + </table> <h2><?php e(tl('searchsources_element_add_subsearch'))?></h2> <h2><?php e(tl('searchsources_element_subsearches'))?></h2> <form id="addSearchSourceForm" method="post" action='#'>