diff --git a/configs/createdb.php b/configs/createdb.php index f0a46d2..3ec6d93 100755 --- a/configs/createdb.php +++ b/configs/createdb.php @@ -75,7 +75,7 @@ if(!in_array(DBMS, array('sqlite', 'sqlite3'))) { $db->selectDB(DB_NAME); $db->execute("CREATE TABLE VERSION (ID INTEGER PRIMARY KEY)"); -$db->execute("INSERT INTO VERSION VALUES (7)"); +$db->execute("INSERT INTO VERSION VALUES (9)"); $db->execute("CREATE TABLE USER (USER_ID INTEGER PRIMARY KEY $auto_increment, ". "USER_NAME VARCHAR(16) UNIQUE, PASSWORD VARCHAR(16))"); @@ -260,6 +260,11 @@ $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), + NAME VARCHAR(16) UNIQUE, SOURCE_URL VARCHAR(256), THUMB_URL VARCHAR(256) + )"); + + $db->disconnect(); if(in_array(DBMS, array('sqlite','sqlite3' ))){ chmod(CRAWL_DIR."/data/".DB_NAME.".db", 0666); diff --git a/controllers/admin_controller.php b/controllers/admin_controller.php index 1227c44..a5430e8 100755 --- a/controllers/admin_controller.php +++ b/controllers/admin_controller.php @@ -2079,6 +2079,9 @@ class AdminController extends Controller implements CrawlConstants } else { $data['SOURCE_TYPE'] = -1; } + $data['SCRIPT'] .= "source_type = elt('source-type');". + "source_type.onchange = switchSourceType;". + "switchSourceType()"; return $data; } diff --git a/lib/upgrade_functions.php b/lib/upgrade_functions.php index 9d77a23..f3b3c21 100644 --- a/lib/upgrade_functions.php +++ b/lib/upgrade_functions.php @@ -71,18 +71,26 @@ 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) { - return false; + $i = 0; + do { + $result = @$model->db->execute($sql); + if($result !== false) { + $row = $model->db->fetchArray($result); + if(isset($row['ID']) && $row['ID'] >= 9) { + return false; + } else if(!isset($row['ID'])) { + $i++; + sleep(3); + continue; + } + return true; } - return true; - } else { sleep(3); - } - // if the database was busy so no result was returned, we don't upgrade - return false; + $i++; + } while($i < 3); + + // if the database still busy exit() + exit(); } /** diff --git a/locale/ar/configure.ini b/locale/ar/configure.ini index 3894d33..fbe680e 100755 --- a/locale/ar/configure.ini +++ b/locale/ar/configure.ini @@ -340,40 +340,40 @@ admin_controller_video = "" ; admin_controller.php line: 2072 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2133 +; admin_controller.php line: 2136 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2166 +; admin_controller.php line: 2169 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2178 +; admin_controller.php line: 2181 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2187 +; admin_controller.php line: 2190 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2195 +; admin_controller.php line: 2198 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2206 +; admin_controller.php line: 2209 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2215 +; admin_controller.php line: 2218 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2226 +; admin_controller.php line: 2229 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2304 +; admin_controller.php line: 2307 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2318 +; admin_controller.php line: 2321 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2332 +; admin_controller.php line: 2335 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2368 +; admin_controller.php line: 2371 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1112,28 +1112,28 @@ resultseditor_element_save_filter = "" ; searchsources_element.php line: 55 searchsources_element_add_media_source = "" ; -; searchsources_element.php line: 65 -searchsources_element_sourcename = "" -; -; searchsources_element.php line: 70 +; searchsources_element.php line: 64 searchsources_element_sourcetype = "" ; -; searchsources_element.php line: 76 +; searchsources_element.php line: 69 +searchsources_element_sourcename = "" +; +; searchsources_element.php line: 73 searchsources_element_url = "" ; -; searchsources_element.php line: 81 +; searchsources_element.php line: 77 searchsources_element_thumbnail = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 81 manageusers_element_submit = "" ; -; searchsources_element.php line: 91 +; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 92 +; searchsources_element.php line: 86 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 93 +; searchsources_element.php line: 87 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/de/configure.ini b/locale/de/configure.ini index fc41a30..6f37329 100755 --- a/locale/de/configure.ini +++ b/locale/de/configure.ini @@ -340,40 +340,40 @@ admin_controller_video = "" ; admin_controller.php line: 2072 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2133 +; admin_controller.php line: 2136 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2166 +; admin_controller.php line: 2169 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2178 +; admin_controller.php line: 2181 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2187 +; admin_controller.php line: 2190 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2195 +; admin_controller.php line: 2198 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2206 +; admin_controller.php line: 2209 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2215 +; admin_controller.php line: 2218 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2226 +; admin_controller.php line: 2229 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2304 +; admin_controller.php line: 2307 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2318 +; admin_controller.php line: 2321 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2332 +; admin_controller.php line: 2335 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2368 +; admin_controller.php line: 2371 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1112,28 +1112,28 @@ resultseditor_element_save_filter = "" ; searchsources_element.php line: 55 searchsources_element_add_media_source = "" ; -; searchsources_element.php line: 65 -searchsources_element_sourcename = "" -; -; searchsources_element.php line: 70 +; searchsources_element.php line: 64 searchsources_element_sourcetype = "" ; -; searchsources_element.php line: 76 +; searchsources_element.php line: 69 +searchsources_element_sourcename = "" +; +; searchsources_element.php line: 73 searchsources_element_url = "" ; -; searchsources_element.php line: 81 +; searchsources_element.php line: 77 searchsources_element_thumbnail = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 81 manageusers_element_submit = "" ; -; searchsources_element.php line: 91 +; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 92 +; searchsources_element.php line: 86 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 93 +; searchsources_element.php line: 87 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/en-US/configure.ini b/locale/en-US/configure.ini index 07194ac..5465fef 100755 --- a/locale/en-US/configure.ini +++ b/locale/en-US/configure.ini @@ -340,40 +340,40 @@ admin_controller_video = "Video" ; admin_controller.php line: 2072 admin_controller_rss_feed = "RSS" ; -; admin_controller.php line: 2133 +; admin_controller.php line: 2136 admin_controller_configure_use_absolute_path = "Must use an Absolute path for Work Directory" ; -; admin_controller.php line: 2166 +; admin_controller.php line: 2169 admin_controller_configure_work_dir_set = "Work Directory Set! You may need to re-login!" ; -; admin_controller.php line: 2178 +; admin_controller.php line: 2181 admin_controller_name_your_bot = "Please Name Your robot" ; -; admin_controller.php line: 2187 +; admin_controller.php line: 2190 admin_controller_configure_work_profile_made = "Working Directory and Profile Created!" ; -; admin_controller.php line: 2195 +; admin_controller.php line: 2198 admin_controller_configure_no_set_config = "Unable to Update config.php File!" ; -; admin_controller.php line: 2206 +; admin_controller.php line: 2209 admin_controller_configure_no_create_profile = "Unable to Create Profile!" ; -; admin_controller.php line: 2215 +; admin_controller.php line: 2218 admin_controller_configure_work_dir_invalid = "Work Directory is Invalid! Cannot Create Profile!" ; -; admin_controller.php line: 2226 +; admin_controller.php line: 2229 admin_controller_configure_work_dir_invalid = "Work Directory is Invalid! Cannot Create Profile!" ; -; admin_controller.php line: 2304 +; admin_controller.php line: 2307 admin_controller_configure_no_change_db = "Problem Updating Database!" ; -; admin_controller.php line: 2318 +; admin_controller.php line: 2321 admin_controller_configure_profile_change = "Profile Updated!" ; -; admin_controller.php line: 2332 +; admin_controller.php line: 2335 admin_controller_configure_no_change_profile = "There was a Problem Updating Profile!" ; -; admin_controller.php line: 2368 +; admin_controller.php line: 2371 admin_controller_describe_robot = "Please Describe Your Robot" ; ; search_controller.php line: 142 @@ -1112,28 +1112,28 @@ resultseditor_element_save_filter = "Save Filter" ; searchsources_element.php line: 55 searchsources_element_add_media_source = "Add Media Source" ; -; searchsources_element.php line: 65 -searchsources_element_sourcename = "Name:" -; -; searchsources_element.php line: 70 +; searchsources_element.php line: 64 searchsources_element_sourcetype = "Type:" ; -; searchsources_element.php line: 76 +; searchsources_element.php line: 69 +searchsources_element_sourcename = "Name:" +; +; searchsources_element.php line: 73 searchsources_element_url = "URL:" ; -; searchsources_element.php line: 81 +; searchsources_element.php line: 77 searchsources_element_thumbnail = "Thumb:" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 81 manageusers_element_submit = "Submit" ; -; searchsources_element.php line: 91 +; searchsources_element.php line: 85 searchsources_element_media_sources = "Media Sources" ; -; searchsources_element.php line: 92 +; searchsources_element.php line: 86 searchsources_element_add_subsearch = "Add a Subsearch" ; -; searchsources_element.php line: 93 +; searchsources_element.php line: 87 searchsources_element_subsearches = "Current Subsearches" ; ; signin_element.php line: 64 diff --git a/locale/es/configure.ini b/locale/es/configure.ini index 39eb725..fd34603 100755 --- a/locale/es/configure.ini +++ b/locale/es/configure.ini @@ -340,40 +340,40 @@ admin_controller_video = "" ; admin_controller.php line: 2072 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2133 +; admin_controller.php line: 2136 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2166 +; admin_controller.php line: 2169 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2178 +; admin_controller.php line: 2181 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2187 +; admin_controller.php line: 2190 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2195 +; admin_controller.php line: 2198 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2206 +; admin_controller.php line: 2209 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2215 +; admin_controller.php line: 2218 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2226 +; admin_controller.php line: 2229 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2304 +; admin_controller.php line: 2307 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2318 +; admin_controller.php line: 2321 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2332 +; admin_controller.php line: 2335 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2368 +; admin_controller.php line: 2371 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1112,28 +1112,28 @@ resultseditor_element_save_filter = "" ; searchsources_element.php line: 55 searchsources_element_add_media_source = "" ; -; searchsources_element.php line: 65 -searchsources_element_sourcename = "" -; -; searchsources_element.php line: 70 +; searchsources_element.php line: 64 searchsources_element_sourcetype = "" ; -; searchsources_element.php line: 76 +; searchsources_element.php line: 69 +searchsources_element_sourcename = "" +; +; searchsources_element.php line: 73 searchsources_element_url = "" ; -; searchsources_element.php line: 81 +; searchsources_element.php line: 77 searchsources_element_thumbnail = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 81 manageusers_element_submit = "" ; -; searchsources_element.php line: 91 +; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 92 +; searchsources_element.php line: 86 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 93 +; searchsources_element.php line: 87 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/fa/configure.ini b/locale/fa/configure.ini index c9af900..34eea7a 100755 --- a/locale/fa/configure.ini +++ b/locale/fa/configure.ini @@ -340,40 +340,40 @@ admin_controller_video = "" ; admin_controller.php line: 2072 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2133 +; admin_controller.php line: 2136 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2166 +; admin_controller.php line: 2169 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2178 +; admin_controller.php line: 2181 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2187 +; admin_controller.php line: 2190 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2195 +; admin_controller.php line: 2198 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2206 +; admin_controller.php line: 2209 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2215 +; admin_controller.php line: 2218 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2226 +; admin_controller.php line: 2229 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2304 +; admin_controller.php line: 2307 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2318 +; admin_controller.php line: 2321 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2332 +; admin_controller.php line: 2335 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2368 +; admin_controller.php line: 2371 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1112,28 +1112,28 @@ resultseditor_element_save_filter = "" ; searchsources_element.php line: 55 searchsources_element_add_media_source = "" ; -; searchsources_element.php line: 65 -searchsources_element_sourcename = "" -; -; searchsources_element.php line: 70 +; searchsources_element.php line: 64 searchsources_element_sourcetype = "" ; -; searchsources_element.php line: 76 +; searchsources_element.php line: 69 +searchsources_element_sourcename = "" +; +; searchsources_element.php line: 73 searchsources_element_url = "" ; -; searchsources_element.php line: 81 +; searchsources_element.php line: 77 searchsources_element_thumbnail = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 81 manageusers_element_submit = "" ; -; searchsources_element.php line: 91 +; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 92 +; searchsources_element.php line: 86 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 93 +; searchsources_element.php line: 87 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/fr-FR/configure.ini b/locale/fr-FR/configure.ini index 1f85a54..5986645 100755 --- a/locale/fr-FR/configure.ini +++ b/locale/fr-FR/configure.ini @@ -340,40 +340,40 @@ admin_controller_video = "" ; admin_controller.php line: 2072 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2133 +; admin_controller.php line: 2136 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2166 +; admin_controller.php line: 2169 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2178 +; admin_controller.php line: 2181 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2187 +; admin_controller.php line: 2190 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2195 +; admin_controller.php line: 2198 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2206 +; admin_controller.php line: 2209 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2215 +; admin_controller.php line: 2218 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2226 +; admin_controller.php line: 2229 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2304 +; admin_controller.php line: 2307 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2318 +; admin_controller.php line: 2321 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2332 +; admin_controller.php line: 2335 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2368 +; admin_controller.php line: 2371 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1112,28 +1112,28 @@ resultseditor_element_save_filter = "" ; searchsources_element.php line: 55 searchsources_element_add_media_source = "" ; -; searchsources_element.php line: 65 -searchsources_element_sourcename = "" -; -; searchsources_element.php line: 70 +; searchsources_element.php line: 64 searchsources_element_sourcetype = "" ; -; searchsources_element.php line: 76 +; searchsources_element.php line: 69 +searchsources_element_sourcename = "" +; +; searchsources_element.php line: 73 searchsources_element_url = "" ; -; searchsources_element.php line: 81 +; searchsources_element.php line: 77 searchsources_element_thumbnail = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 81 manageusers_element_submit = "" ; -; searchsources_element.php line: 91 +; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 92 +; searchsources_element.php line: 86 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 93 +; searchsources_element.php line: 87 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/he/configure.ini b/locale/he/configure.ini index c762585..1fdda43 100755 --- a/locale/he/configure.ini +++ b/locale/he/configure.ini @@ -340,40 +340,40 @@ admin_controller_video = "" ; admin_controller.php line: 2072 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2133 +; admin_controller.php line: 2136 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2166 +; admin_controller.php line: 2169 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2178 +; admin_controller.php line: 2181 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2187 +; admin_controller.php line: 2190 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2195 +; admin_controller.php line: 2198 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2206 +; admin_controller.php line: 2209 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2215 +; admin_controller.php line: 2218 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2226 +; admin_controller.php line: 2229 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2304 +; admin_controller.php line: 2307 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2318 +; admin_controller.php line: 2321 admin_controller_configure_profile_change = "פרופייל עודכן" ; -; admin_controller.php line: 2332 +; admin_controller.php line: 2335 admin_controller_configure_no_change_profile = "בעיה עם עדכון הפרופייל" ; -; admin_controller.php line: 2368 +; admin_controller.php line: 2371 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1112,28 +1112,28 @@ resultseditor_element_save_filter = "" ; searchsources_element.php line: 55 searchsources_element_add_media_source = "" ; -; searchsources_element.php line: 65 -searchsources_element_sourcename = "" -; -; searchsources_element.php line: 70 +; searchsources_element.php line: 64 searchsources_element_sourcetype = "" ; -; searchsources_element.php line: 76 +; searchsources_element.php line: 69 +searchsources_element_sourcename = "" +; +; searchsources_element.php line: 73 searchsources_element_url = "" ; -; searchsources_element.php line: 81 +; searchsources_element.php line: 77 searchsources_element_thumbnail = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 81 manageusers_element_submit = "" ; -; searchsources_element.php line: 91 +; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 92 +; searchsources_element.php line: 86 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 93 +; searchsources_element.php line: 87 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/hi/configure.ini b/locale/hi/configure.ini index 82c710e..672764c 100755 --- a/locale/hi/configure.ini +++ b/locale/hi/configure.ini @@ -340,40 +340,40 @@ admin_controller_video = "" ; admin_controller.php line: 2072 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2133 +; admin_controller.php line: 2136 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2166 +; admin_controller.php line: 2169 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2178 +; admin_controller.php line: 2181 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2187 +; admin_controller.php line: 2190 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2195 +; admin_controller.php line: 2198 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2206 +; admin_controller.php line: 2209 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2215 +; admin_controller.php line: 2218 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2226 +; admin_controller.php line: 2229 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2304 +; admin_controller.php line: 2307 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2318 +; admin_controller.php line: 2321 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2332 +; admin_controller.php line: 2335 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2368 +; admin_controller.php line: 2371 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1112,28 +1112,28 @@ resultseditor_element_save_filter = "" ; searchsources_element.php line: 55 searchsources_element_add_media_source = "" ; -; searchsources_element.php line: 65 -searchsources_element_sourcename = "" -; -; searchsources_element.php line: 70 +; searchsources_element.php line: 64 searchsources_element_sourcetype = "" ; -; searchsources_element.php line: 76 +; searchsources_element.php line: 69 +searchsources_element_sourcename = "" +; +; searchsources_element.php line: 73 searchsources_element_url = "" ; -; searchsources_element.php line: 81 +; searchsources_element.php line: 77 searchsources_element_thumbnail = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 81 manageusers_element_submit = "" ; -; searchsources_element.php line: 91 +; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 92 +; searchsources_element.php line: 86 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 93 +; searchsources_element.php line: 87 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/in-ID/configure.ini b/locale/in-ID/configure.ini index 9296c87..b4f58e7 100755 --- a/locale/in-ID/configure.ini +++ b/locale/in-ID/configure.ini @@ -340,40 +340,40 @@ admin_controller_video = "" ; admin_controller.php line: 2072 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2133 +; admin_controller.php line: 2136 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2166 +; admin_controller.php line: 2169 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2178 +; admin_controller.php line: 2181 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2187 +; admin_controller.php line: 2190 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2195 +; admin_controller.php line: 2198 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2206 +; admin_controller.php line: 2209 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2215 +; admin_controller.php line: 2218 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2226 +; admin_controller.php line: 2229 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2304 +; admin_controller.php line: 2307 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2318 +; admin_controller.php line: 2321 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2332 +; admin_controller.php line: 2335 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2368 +; admin_controller.php line: 2371 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1112,28 +1112,28 @@ resultseditor_element_save_filter = "" ; searchsources_element.php line: 55 searchsources_element_add_media_source = "" ; -; searchsources_element.php line: 65 -searchsources_element_sourcename = "" -; -; searchsources_element.php line: 70 +; searchsources_element.php line: 64 searchsources_element_sourcetype = "" ; -; searchsources_element.php line: 76 +; searchsources_element.php line: 69 +searchsources_element_sourcename = "" +; +; searchsources_element.php line: 73 searchsources_element_url = "" ; -; searchsources_element.php line: 81 +; searchsources_element.php line: 77 searchsources_element_thumbnail = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 81 manageusers_element_submit = "" ; -; searchsources_element.php line: 91 +; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 92 +; searchsources_element.php line: 86 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 93 +; searchsources_element.php line: 87 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/it/configure.ini b/locale/it/configure.ini index 12cacd7..b4a1f1c 100755 --- a/locale/it/configure.ini +++ b/locale/it/configure.ini @@ -340,40 +340,40 @@ admin_controller_video = "" ; admin_controller.php line: 2072 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2133 +; admin_controller.php line: 2136 admin_controller_configure_use_absolute_path = "Devi usare un percorso assoluto per la Cartella di Lavoro" ; -; admin_controller.php line: 2166 +; admin_controller.php line: 2169 admin_controller_configure_work_dir_set = "Cartella di Lavoro creata! Potrebbe essere necessario ri-accedere!" ; -; admin_controller.php line: 2178 +; admin_controller.php line: 2181 admin_controller_name_your_bot = "Dai un nome al tuo Robot" ; -; admin_controller.php line: 2187 +; admin_controller.php line: 2190 admin_controller_configure_work_profile_made = "Cartella di Lavoro e Profilo creati!" ; -; admin_controller.php line: 2195 +; admin_controller.php line: 2198 admin_controller_configure_no_set_config = "Impossibile aggiornare il file config.php!" ; -; admin_controller.php line: 2206 +; admin_controller.php line: 2209 admin_controller_configure_no_create_profile = "Impossibile creare Profilo!" ; -; admin_controller.php line: 2215 +; admin_controller.php line: 2218 admin_controller_configure_work_dir_invalid = "Cartella di Lavoro non valida! Impossibile creare Profilo!" ; -; admin_controller.php line: 2226 +; admin_controller.php line: 2229 admin_controller_configure_work_dir_invalid = "Cartella di Lavoro non valida! Impossibile creare Profilo!" ; -; admin_controller.php line: 2304 +; admin_controller.php line: 2307 admin_controller_configure_no_change_db = "Problema aggiornamento database!" ; -; admin_controller.php line: 2318 +; admin_controller.php line: 2321 admin_controller_configure_profile_change = "Profilo aggiornato!" ; -; admin_controller.php line: 2332 +; admin_controller.php line: 2335 admin_controller_configure_no_change_profile = "C'è stato un problema nell'aggiornamento Profilo!" ; -; admin_controller.php line: 2368 +; admin_controller.php line: 2371 admin_controller_describe_robot = "Descrivi il tuo Robot" ; ; search_controller.php line: 142 @@ -1112,28 +1112,28 @@ resultseditor_element_save_filter = "Salva Filtro" ; searchsources_element.php line: 55 searchsources_element_add_media_source = "" ; -; searchsources_element.php line: 65 -searchsources_element_sourcename = "" -; -; searchsources_element.php line: 70 +; searchsources_element.php line: 64 searchsources_element_sourcetype = "" ; -; searchsources_element.php line: 76 +; searchsources_element.php line: 69 +searchsources_element_sourcename = "" +; +; searchsources_element.php line: 73 searchsources_element_url = "" ; -; searchsources_element.php line: 81 +; searchsources_element.php line: 77 searchsources_element_thumbnail = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 81 manageusers_element_submit = "Invia" ; -; searchsources_element.php line: 91 +; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 92 +; searchsources_element.php line: 86 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 93 +; searchsources_element.php line: 87 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/ja/configure.ini b/locale/ja/configure.ini index 7a277b9..6acf44e 100755 --- a/locale/ja/configure.ini +++ b/locale/ja/configure.ini @@ -340,40 +340,40 @@ admin_controller_video = "" ; admin_controller.php line: 2072 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2133 +; admin_controller.php line: 2136 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2166 +; admin_controller.php line: 2169 admin_controller_configure_work_dir_set = "作業ディレクトリの設定しました。もう一度ログインしてください。" ; -; admin_controller.php line: 2178 +; admin_controller.php line: 2181 admin_controller_name_your_bot = "ボット名を入力してください。" ; -; admin_controller.php line: 2187 +; admin_controller.php line: 2190 admin_controller_configure_work_profile_made = "作業ディレクトリとプロフィールの作成しました。" ; -; admin_controller.php line: 2195 +; admin_controller.php line: 2198 admin_controller_configure_no_set_config = "config.phpファイルのできない。更新" ; -; admin_controller.php line: 2206 +; admin_controller.php line: 2209 admin_controller_configure_no_create_profile = "プロフィールを作成できない。" ; -; admin_controller.php line: 2215 +; admin_controller.php line: 2218 admin_controller_configure_work_dir_invalid = "無効な作業ディレクト。プロフィールを作成できない。" ; -; admin_controller.php line: 2226 +; admin_controller.php line: 2229 admin_controller_configure_work_dir_invalid = "無効な作業ディレクト。プロフィールを作成できない。" ; -; admin_controller.php line: 2304 +; admin_controller.php line: 2307 admin_controller_configure_no_change_db = "ディータベースの更新ない" ; -; admin_controller.php line: 2318 +; admin_controller.php line: 2321 admin_controller_configure_profile_change = "プロフィールの変更できました。" ; -; admin_controller.php line: 2332 +; admin_controller.php line: 2335 admin_controller_configure_no_change_profile = "プロフィールの変更できない。" ; -; admin_controller.php line: 2368 +; admin_controller.php line: 2371 admin_controller_describe_robot = "ロボットの説明してください。" ; ; search_controller.php line: 142 @@ -1112,28 +1112,28 @@ resultseditor_element_save_filter = "" ; searchsources_element.php line: 55 searchsources_element_add_media_source = "" ; -; searchsources_element.php line: 65 -searchsources_element_sourcename = "" -; -; searchsources_element.php line: 70 +; searchsources_element.php line: 64 searchsources_element_sourcetype = "" ; -; searchsources_element.php line: 76 +; searchsources_element.php line: 69 +searchsources_element_sourcename = "" +; +; searchsources_element.php line: 73 searchsources_element_url = "" ; -; searchsources_element.php line: 81 +; searchsources_element.php line: 77 searchsources_element_thumbnail = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 81 manageusers_element_submit = "サブミット" ; -; searchsources_element.php line: 91 +; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 92 +; searchsources_element.php line: 86 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 93 +; searchsources_element.php line: 87 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/kn/configure.ini b/locale/kn/configure.ini index 0df32cf..37a1881 100755 --- a/locale/kn/configure.ini +++ b/locale/kn/configure.ini @@ -340,40 +340,40 @@ admin_controller_video = "" ; admin_controller.php line: 2072 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2133 +; admin_controller.php line: 2136 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2166 +; admin_controller.php line: 2169 admin_controller_configure_work_dir_set = "ಕಾರ್ಯ ನಿರ್ದೇಶಿಕೆಯನ್ನು ನಿಗದಿಪಡಿಸಲಾಗಿದೆ! ನೀವು ಮರು ಪ್ರವೇಶಿಸಬೇಕಾಗಬಹುದು" ; -; admin_controller.php line: 2178 +; admin_controller.php line: 2181 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2187 +; admin_controller.php line: 2190 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2195 +; admin_controller.php line: 2198 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2206 +; admin_controller.php line: 2209 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2215 +; admin_controller.php line: 2218 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2226 +; admin_controller.php line: 2229 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2304 +; admin_controller.php line: 2307 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2318 +; admin_controller.php line: 2321 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2332 +; admin_controller.php line: 2335 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2368 +; admin_controller.php line: 2371 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1112,28 +1112,28 @@ resultseditor_element_save_filter = "" ; searchsources_element.php line: 55 searchsources_element_add_media_source = "" ; -; searchsources_element.php line: 65 -searchsources_element_sourcename = "" -; -; searchsources_element.php line: 70 +; searchsources_element.php line: 64 searchsources_element_sourcetype = "" ; -; searchsources_element.php line: 76 +; searchsources_element.php line: 69 +searchsources_element_sourcename = "" +; +; searchsources_element.php line: 73 searchsources_element_url = "" ; -; searchsources_element.php line: 81 +; searchsources_element.php line: 77 searchsources_element_thumbnail = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 81 manageusers_element_submit = "" ; -; searchsources_element.php line: 91 +; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 92 +; searchsources_element.php line: 86 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 93 +; searchsources_element.php line: 87 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/ko/configure.ini b/locale/ko/configure.ini index afef20c..f1534ff 100755 --- a/locale/ko/configure.ini +++ b/locale/ko/configure.ini @@ -340,40 +340,40 @@ admin_controller_video = "" ; admin_controller.php line: 2072 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2133 +; admin_controller.php line: 2136 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2166 +; admin_controller.php line: 2169 admin_controller_configure_work_dir_set = "작업 디렉토리가 지정 됐습니다. 다시 로그인이 필요할수 있습니다." ; -; admin_controller.php line: 2178 +; admin_controller.php line: 2181 admin_controller_name_your_bot = "로봇 이름을 정해 주십시요." ; -; admin_controller.php line: 2187 +; admin_controller.php line: 2190 admin_controller_configure_work_profile_made = "작업 디렉토리와 프로필이 생성됐습니다." ; -; admin_controller.php line: 2195 +; admin_controller.php line: 2198 admin_controller_configure_no_set_config = "config.php 파일을 업데이트 실패했습니다." ; -; admin_controller.php line: 2206 +; admin_controller.php line: 2209 admin_controller_configure_no_create_profile = "프로필을 생성할수 없습니다." ; -; admin_controller.php line: 2215 +; admin_controller.php line: 2218 admin_controller_configure_work_dir_invalid = "작업 디렉토리가 올바르지 않습니다. 프로필을 생성할수 없습니다." ; -; admin_controller.php line: 2226 +; admin_controller.php line: 2229 admin_controller_configure_work_dir_invalid = "작업 디렉토리가 올바르지 않습니다. 프로필을 생성할수 없습니다." ; -; admin_controller.php line: 2304 +; admin_controller.php line: 2307 admin_controller_configure_no_change_db = "데이터베이스를 업데이트하는데 문제가 발생했습니다." ; -; admin_controller.php line: 2318 +; admin_controller.php line: 2321 admin_controller_configure_profile_change = "프로필을 업데이트 했습니다." ; -; admin_controller.php line: 2332 +; admin_controller.php line: 2335 admin_controller_configure_no_change_profile = "프로필을 업데이트하는데 문제가 발생했습니다." ; -; admin_controller.php line: 2368 +; admin_controller.php line: 2371 admin_controller_describe_robot = "당신의 로봇을 기술해 주십시요." ; ; search_controller.php line: 142 @@ -1112,28 +1112,28 @@ resultseditor_element_save_filter = "" ; searchsources_element.php line: 55 searchsources_element_add_media_source = "" ; -; searchsources_element.php line: 65 -searchsources_element_sourcename = "" -; -; searchsources_element.php line: 70 +; searchsources_element.php line: 64 searchsources_element_sourcetype = "" ; -; searchsources_element.php line: 76 +; searchsources_element.php line: 69 +searchsources_element_sourcename = "" +; +; searchsources_element.php line: 73 searchsources_element_url = "" ; -; searchsources_element.php line: 81 +; searchsources_element.php line: 77 searchsources_element_thumbnail = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 81 manageusers_element_submit = "제출 하기" ; -; searchsources_element.php line: 91 +; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 92 +; searchsources_element.php line: 86 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 93 +; searchsources_element.php line: 87 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/pl/configure.ini b/locale/pl/configure.ini index 33ebdb9..fc5b319 100755 --- a/locale/pl/configure.ini +++ b/locale/pl/configure.ini @@ -340,40 +340,40 @@ admin_controller_video = "" ; admin_controller.php line: 2072 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2133 +; admin_controller.php line: 2136 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2166 +; admin_controller.php line: 2169 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2178 +; admin_controller.php line: 2181 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2187 +; admin_controller.php line: 2190 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2195 +; admin_controller.php line: 2198 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2206 +; admin_controller.php line: 2209 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2215 +; admin_controller.php line: 2218 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2226 +; admin_controller.php line: 2229 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2304 +; admin_controller.php line: 2307 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2318 +; admin_controller.php line: 2321 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2332 +; admin_controller.php line: 2335 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2368 +; admin_controller.php line: 2371 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1112,28 +1112,28 @@ resultseditor_element_save_filter = "" ; searchsources_element.php line: 55 searchsources_element_add_media_source = "" ; -; searchsources_element.php line: 65 -searchsources_element_sourcename = "" -; -; searchsources_element.php line: 70 +; searchsources_element.php line: 64 searchsources_element_sourcetype = "" ; -; searchsources_element.php line: 76 +; searchsources_element.php line: 69 +searchsources_element_sourcename = "" +; +; searchsources_element.php line: 73 searchsources_element_url = "" ; -; searchsources_element.php line: 81 +; searchsources_element.php line: 77 searchsources_element_thumbnail = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 81 manageusers_element_submit = "" ; -; searchsources_element.php line: 91 +; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 92 +; searchsources_element.php line: 86 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 93 +; searchsources_element.php line: 87 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/pt/configure.ini b/locale/pt/configure.ini index 3056f67..ab311d2 100755 --- a/locale/pt/configure.ini +++ b/locale/pt/configure.ini @@ -340,40 +340,40 @@ admin_controller_video = "" ; admin_controller.php line: 2072 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2133 +; admin_controller.php line: 2136 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2166 +; admin_controller.php line: 2169 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2178 +; admin_controller.php line: 2181 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2187 +; admin_controller.php line: 2190 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2195 +; admin_controller.php line: 2198 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2206 +; admin_controller.php line: 2209 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2215 +; admin_controller.php line: 2218 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2226 +; admin_controller.php line: 2229 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2304 +; admin_controller.php line: 2307 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2318 +; admin_controller.php line: 2321 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2332 +; admin_controller.php line: 2335 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2368 +; admin_controller.php line: 2371 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1112,28 +1112,28 @@ resultseditor_element_save_filter = "" ; searchsources_element.php line: 55 searchsources_element_add_media_source = "" ; -; searchsources_element.php line: 65 -searchsources_element_sourcename = "" -; -; searchsources_element.php line: 70 +; searchsources_element.php line: 64 searchsources_element_sourcetype = "" ; -; searchsources_element.php line: 76 +; searchsources_element.php line: 69 +searchsources_element_sourcename = "" +; +; searchsources_element.php line: 73 searchsources_element_url = "" ; -; searchsources_element.php line: 81 +; searchsources_element.php line: 77 searchsources_element_thumbnail = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 81 manageusers_element_submit = "" ; -; searchsources_element.php line: 91 +; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 92 +; searchsources_element.php line: 86 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 93 +; searchsources_element.php line: 87 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/ru/configure.ini b/locale/ru/configure.ini index dc64a0b..65c4556 100755 --- a/locale/ru/configure.ini +++ b/locale/ru/configure.ini @@ -340,40 +340,40 @@ admin_controller_video = "" ; admin_controller.php line: 2072 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2133 +; admin_controller.php line: 2136 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2166 +; admin_controller.php line: 2169 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2178 +; admin_controller.php line: 2181 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2187 +; admin_controller.php line: 2190 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2195 +; admin_controller.php line: 2198 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2206 +; admin_controller.php line: 2209 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2215 +; admin_controller.php line: 2218 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2226 +; admin_controller.php line: 2229 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2304 +; admin_controller.php line: 2307 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2318 +; admin_controller.php line: 2321 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2332 +; admin_controller.php line: 2335 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2368 +; admin_controller.php line: 2371 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1112,28 +1112,28 @@ resultseditor_element_save_filter = "" ; searchsources_element.php line: 55 searchsources_element_add_media_source = "" ; -; searchsources_element.php line: 65 -searchsources_element_sourcename = "" -; -; searchsources_element.php line: 70 +; searchsources_element.php line: 64 searchsources_element_sourcetype = "" ; -; searchsources_element.php line: 76 +; searchsources_element.php line: 69 +searchsources_element_sourcename = "" +; +; searchsources_element.php line: 73 searchsources_element_url = "" ; -; searchsources_element.php line: 81 +; searchsources_element.php line: 77 searchsources_element_thumbnail = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 81 manageusers_element_submit = "" ; -; searchsources_element.php line: 91 +; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 92 +; searchsources_element.php line: 86 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 93 +; searchsources_element.php line: 87 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/th/configure.ini b/locale/th/configure.ini index e7a3721..2b1a2c0 100755 --- a/locale/th/configure.ini +++ b/locale/th/configure.ini @@ -340,40 +340,40 @@ admin_controller_video = "" ; admin_controller.php line: 2072 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2133 +; admin_controller.php line: 2136 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2166 +; admin_controller.php line: 2169 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2178 +; admin_controller.php line: 2181 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2187 +; admin_controller.php line: 2190 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2195 +; admin_controller.php line: 2198 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2206 +; admin_controller.php line: 2209 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2215 +; admin_controller.php line: 2218 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2226 +; admin_controller.php line: 2229 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2304 +; admin_controller.php line: 2307 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2318 +; admin_controller.php line: 2321 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2332 +; admin_controller.php line: 2335 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2368 +; admin_controller.php line: 2371 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1112,28 +1112,28 @@ resultseditor_element_save_filter = "" ; searchsources_element.php line: 55 searchsources_element_add_media_source = "" ; -; searchsources_element.php line: 65 -searchsources_element_sourcename = "" -; -; searchsources_element.php line: 70 +; searchsources_element.php line: 64 searchsources_element_sourcetype = "" ; -; searchsources_element.php line: 76 +; searchsources_element.php line: 69 +searchsources_element_sourcename = "" +; +; searchsources_element.php line: 73 searchsources_element_url = "" ; -; searchsources_element.php line: 81 +; searchsources_element.php line: 77 searchsources_element_thumbnail = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 81 manageusers_element_submit = "" ; -; searchsources_element.php line: 91 +; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 92 +; searchsources_element.php line: 86 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 93 +; searchsources_element.php line: 87 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/tr/configure.ini b/locale/tr/configure.ini index 1e5ba32..6ac841b 100755 --- a/locale/tr/configure.ini +++ b/locale/tr/configure.ini @@ -340,40 +340,40 @@ admin_controller_video = "" ; admin_controller.php line: 2072 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2133 +; admin_controller.php line: 2136 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2166 +; admin_controller.php line: 2169 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2178 +; admin_controller.php line: 2181 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2187 +; admin_controller.php line: 2190 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2195 +; admin_controller.php line: 2198 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2206 +; admin_controller.php line: 2209 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2215 +; admin_controller.php line: 2218 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2226 +; admin_controller.php line: 2229 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2304 +; admin_controller.php line: 2307 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2318 +; admin_controller.php line: 2321 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2332 +; admin_controller.php line: 2335 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2368 +; admin_controller.php line: 2371 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1112,28 +1112,28 @@ resultseditor_element_save_filter = "" ; searchsources_element.php line: 55 searchsources_element_add_media_source = "" ; -; searchsources_element.php line: 65 -searchsources_element_sourcename = "" -; -; searchsources_element.php line: 70 +; searchsources_element.php line: 64 searchsources_element_sourcetype = "" ; -; searchsources_element.php line: 76 +; searchsources_element.php line: 69 +searchsources_element_sourcename = "" +; +; searchsources_element.php line: 73 searchsources_element_url = "" ; -; searchsources_element.php line: 81 +; searchsources_element.php line: 77 searchsources_element_thumbnail = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 81 manageusers_element_submit = "" ; -; searchsources_element.php line: 91 +; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 92 +; searchsources_element.php line: 86 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 93 +; searchsources_element.php line: 87 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/vi-VN/configure.ini b/locale/vi-VN/configure.ini index 0ff55f3..d8d54d0 100755 --- a/locale/vi-VN/configure.ini +++ b/locale/vi-VN/configure.ini @@ -340,40 +340,40 @@ admin_controller_video = "" ; admin_controller.php line: 2072 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2133 +; admin_controller.php line: 2136 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2166 +; admin_controller.php line: 2169 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: 2178 +; admin_controller.php line: 2181 admin_controller_name_your_bot = "Đặt tên cho rô bô của bạn" ; -; admin_controller.php line: 2187 +; admin_controller.php line: 2190 admin_controller_configure_work_profile_made = "Thư mục làm việc và hồ sơ được tạo ra" ; -; admin_controller.php line: 2195 +; admin_controller.php line: 2198 admin_controller_configure_no_set_config = "Không thể cập nhật hồ sơ config.php" ; -; admin_controller.php line: 2206 +; admin_controller.php line: 2209 admin_controller_configure_no_create_profile = "Không thể tạo hồ sơ" ; -; admin_controller.php line: 2215 +; admin_controller.php line: 2218 admin_controller_configure_work_dir_invalid = "Công tác thư mục không hợp lệ" ; -; admin_controller.php line: 2226 +; admin_controller.php line: 2229 admin_controller_configure_work_dir_invalid = "Công tác thư mục không hợp lệ" ; -; admin_controller.php line: 2304 +; admin_controller.php line: 2307 admin_controller_configure_no_change_db = "Vấn đề cập nhật cơ sở dữ liệu" ; -; admin_controller.php line: 2318 +; admin_controller.php line: 2321 admin_controller_configure_profile_change = "Hồ sơ được cập nhật" ; -; admin_controller.php line: 2332 +; admin_controller.php line: 2335 admin_controller_configure_no_change_profile = "Có sự trở ngaị về việc cập nhật hồ sơ " ; -; admin_controller.php line: 2368 +; admin_controller.php line: 2371 admin_controller_describe_robot = "Diễn tả rô bô của bạn" ; ; search_controller.php line: 142 @@ -1112,28 +1112,28 @@ resultseditor_element_save_filter = "" ; searchsources_element.php line: 55 searchsources_element_add_media_source = "" ; -; searchsources_element.php line: 65 -searchsources_element_sourcename = "" -; -; searchsources_element.php line: 70 +; searchsources_element.php line: 64 searchsources_element_sourcetype = "" ; -; searchsources_element.php line: 76 +; searchsources_element.php line: 69 +searchsources_element_sourcename = "" +; +; searchsources_element.php line: 73 searchsources_element_url = "" ; -; searchsources_element.php line: 81 +; searchsources_element.php line: 77 searchsources_element_thumbnail = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 81 manageusers_element_submit = "" ; -; searchsources_element.php line: 91 +; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 92 +; searchsources_element.php line: 86 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 93 +; searchsources_element.php line: 87 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/locale/zh-CN/configure.ini b/locale/zh-CN/configure.ini index 34aa4c1..287dd1a 100755 --- a/locale/zh-CN/configure.ini +++ b/locale/zh-CN/configure.ini @@ -340,40 +340,40 @@ admin_controller_video = "" ; admin_controller.php line: 2072 admin_controller_rss_feed = "" ; -; admin_controller.php line: 2133 +; admin_controller.php line: 2136 admin_controller_configure_use_absolute_path = "" ; -; admin_controller.php line: 2166 +; admin_controller.php line: 2169 admin_controller_configure_work_dir_set = "" ; -; admin_controller.php line: 2178 +; admin_controller.php line: 2181 admin_controller_name_your_bot = "" ; -; admin_controller.php line: 2187 +; admin_controller.php line: 2190 admin_controller_configure_work_profile_made = "" ; -; admin_controller.php line: 2195 +; admin_controller.php line: 2198 admin_controller_configure_no_set_config = "" ; -; admin_controller.php line: 2206 +; admin_controller.php line: 2209 admin_controller_configure_no_create_profile = "" ; -; admin_controller.php line: 2215 +; admin_controller.php line: 2218 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2226 +; admin_controller.php line: 2229 admin_controller_configure_work_dir_invalid = "" ; -; admin_controller.php line: 2304 +; admin_controller.php line: 2307 admin_controller_configure_no_change_db = "" ; -; admin_controller.php line: 2318 +; admin_controller.php line: 2321 admin_controller_configure_profile_change = "" ; -; admin_controller.php line: 2332 +; admin_controller.php line: 2335 admin_controller_configure_no_change_profile = "" ; -; admin_controller.php line: 2368 +; admin_controller.php line: 2371 admin_controller_describe_robot = "" ; ; search_controller.php line: 142 @@ -1112,28 +1112,28 @@ resultseditor_element_save_filter = "" ; searchsources_element.php line: 55 searchsources_element_add_media_source = "" ; -; searchsources_element.php line: 65 -searchsources_element_sourcename = "" -; -; searchsources_element.php line: 70 +; searchsources_element.php line: 64 searchsources_element_sourcetype = "" ; -; searchsources_element.php line: 76 +; searchsources_element.php line: 69 +searchsources_element_sourcename = "" +; +; searchsources_element.php line: 73 searchsources_element_url = "" ; -; searchsources_element.php line: 81 +; searchsources_element.php line: 77 searchsources_element_thumbnail = "" ; -; searchsources_element.php line: 86 +; searchsources_element.php line: 81 manageusers_element_submit = "完成" ; -; searchsources_element.php line: 91 +; searchsources_element.php line: 85 searchsources_element_media_sources = "" ; -; searchsources_element.php line: 92 +; searchsources_element.php line: 86 searchsources_element_add_subsearch = "" ; -; searchsources_element.php line: 93 +; searchsources_element.php line: 87 searchsources_element_subsearches = "" ; ; signin_element.php line: 64 diff --git a/models/cron_model.php b/models/cron_model.php index c039c1c..95a0aa2 100644 --- a/models/cron_model.php +++ b/models/cron_model.php @@ -67,14 +67,11 @@ class CronModel extends Model function getCronTime() { $this->db->selectDB(DB_NAME); - $result = @$this->db->execute("SELECT TIMESTAMP FROM CRON_TIME"); if($result) { $row = $this->db->fetchArray($result); - } else { - sleep(3); } - $timestamp = (isset($row['TIMESTAMP'])) ? $row['TIMESTAMP'] : 0; + $timestamp = (isset($row['TIMESTAMP'])) ? $row['TIMESTAMP'] : time(); return $timestamp; diff --git a/models/source_model.php b/models/source_model.php new file mode 100644 index 0000000..df5292d --- /dev/null +++ b/models/source_model.php @@ -0,0 +1,98 @@ +<?php +/** + * SeekQuarry/Yioop -- + * Open Source Pure PHP Search Engine, Crawler, and Indexer + * + * Copyright (C) 2009 - 2012 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 model + * @license http://www.gnu.org/licenses/ GPL3 + * @link http://www.seekquarry.com/ + * @copyright 2009 - 2012 + * @filesource + */ + +if(!defined('BASE_DIR')) {echo "BAD REQUEST"; exit();} + +/** Loads the base class */ +require_once BASE_DIR."/models/model.php"; + +/** Used for the crawlHash function */ +require_once BASE_DIR."/lib/utility.php"; + +/** + * This class is used + * + * @author Chris Pollett + * @package seek_quarry + * @subpackage model + */ +class SourceModel extends Model +{ + /** + * Just calls the parent class constructor + */ + function __construct() + { + parent::__construct(); + } + + + /** + * + * @param string $user_id id of user to get activities fors + */ + function getMediaSources() + { + $sources = array(); + $this->db->selectDB(DB_NAME); + $sql = "SELECT * FROM MEDIA_SOURCE"; + $i = 0; + while($sources[$i] = $this->db->fetchArray($result)) { + $i++; + } + unset($sources[$i]); //last one will be null + + return $sources; + + } + + /** + * + * @param int $user_id id of user to get session for + * @return array user's session data + */ + function addMediaSource($name, $source_url, $thumb_url) + { + $this->db->selectDB(DB_NAME); + + $sql = "INSERT INTO MEDIA_SOURCE VALUES ('". + $this->db->escapeString($name)."','". + $this->db->escapeString($source_url)."','". + $this->db->escapeString($thumb_url)."')"; + + $this->db->execute($sql); + } + +} + + ?> diff --git a/views/elements/searchsources_element.php b/views/elements/searchsources_element.php index b8325b7..02c5af5 100644 --- a/views/elements/searchsources_element.php +++ b/views/elements/searchsources_element.php @@ -60,33 +60,27 @@ class SearchsourcesElement extends Element e($data['YIOOP_TOKEN']); ?>" /> <input type="hidden" name="a" value="searchSources" /> <input type="hidden" name="arg" value="addsource" /> - - <table class="sourcetable"> - <tr><td><label for="source-name"><?php - e(tl('searchsources_element_sourcename'))?></label></td> - <td><input type="text" id="source-name" name="sourcename" - maxlength="80" class="narrowfield" /></td> - </tr> - <tr><td><label for="source-type"><?php - e(tl('searchsources_element_sourcetype'))?></label></td> - <td><?php $this->view->optionsHelper->render("source-type", - "source_type", $data['SOURCE_TYPES'], - $data['SOURCE_TYPE']); ?></td> - </tr> - <tr><td><label for="source-url"><?php - e(tl('searchsources_element_url'))?></label></td> - <td><input type="text" id="source-url" name="sourceurl" - maxlength="80" class="narrowfield" /></td> - </tr> - <tr><td><label for="source-thumbnail"><?php - e(tl('searchsources_element_thumbnail'))?></label></td> - <td><input type="text" id="source-thumbnail" name="sourcethumbnail" - maxlength="80" class="narrowfield" /></td> - </tr> + <table class="nametable"> + <tr><td><label for="source-type"><b><?php + e(tl('searchsources_element_sourcetype'))?></b></label></td><td> + <?php $this->view->optionsHelper->render("source-type", + "sourcetype", $data['SOURCE_TYPES'], + $data['SOURCE_TYPE']); ?></td></tr> + <tr><td><label for="source-name"><b><?php + e(tl('searchsources_element_sourcename'))?></b></label></td><td> + <input type="text" id="source-name" name="sourcename" + maxlength="80" class="narrowfield" /></td></tr> + <tr><td><label for="source-url"><b><?php + e(tl('searchsources_element_url'))?></b></label></td><td> + <input type="text" id="source-url" name="sourceurl" + maxlength="80" class="narrowfield" /></td></tr> + <tr><td><label for="source-thumbnail"><b id="thumb-text"><?php + e(tl('searchsources_element_thumbnail'))?></b></label></td><td> + <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')); - ?></button></td> - </tr> + ?></button></td></tr> </table> </form> <h2><?php e(tl('searchsources_element_media_sources'))?></h2> @@ -97,9 +91,22 @@ class SearchsourcesElement extends Element <input type="hidden" name="YIOOP_TOKEN" value="<?php e($data['YIOOP_TOKEN']); ?>" /> <input type="hidden" name="a" value="searchSources" /> - <input type="hidden" name="arg" value="settsource" /> + <input type="hidden" name="arg" value="setsource" /> </form> </div> + <script type= "text/javascript"> + function switchSourceType() + { + stype = elt("source-type"); + if(stype.options[stype.selectedIndex].value == "video") { + setDisplay("thumb-text", true); + setDisplay("source-thumbnail", true); + } else { + setDisplay("thumb-text", false); + setDisplay("source-thumbnail", false); + } + } + </script> <?php } }