Changeset 2486537
- Timestamp:
- 03/04/2021 08:44:48 AM (5 years ago)
- Location:
- ts-comfort-database
- Files:
-
- 30 added
- 4 edited
-
tags/1.0.10 (added)
-
tags/1.0.10/classes (added)
-
tags/1.0.10/classes/columnmeta.class.php (added)
-
tags/1.0.10/classes/database.class.php (added)
-
tags/1.0.10/classes/tsinf_comfort_db.class.php (added)
-
tags/1.0.10/classes/tsinf_comfort_post_search.php (added)
-
tags/1.0.10/css (added)
-
tags/1.0.10/css/edit_dataset.css (added)
-
tags/1.0.10/css/global_search.css (added)
-
tags/1.0.10/css/main.css (added)
-
tags/1.0.10/css/overview.css (added)
-
tags/1.0.10/css/table.css (added)
-
tags/1.0.10/images (added)
-
tags/1.0.10/images/Comfort-SQLite-Logo.png (added)
-
tags/1.0.10/images/Comfort-SQLite-Logo16x16.png (added)
-
tags/1.0.10/images/loading-symbol.svg (added)
-
tags/1.0.10/index.php (added)
-
tags/1.0.10/js (added)
-
tags/1.0.10/js/editform.js (added)
-
tags/1.0.10/js/global_search.js (added)
-
tags/1.0.10/js/main.js (added)
-
tags/1.0.10/js/overview.js (added)
-
tags/1.0.10/js/table.ajax.js (added)
-
tags/1.0.10/js/table.js (added)
-
tags/1.0.10/languages (added)
-
tags/1.0.10/languages/tsinf_comfortdb_plugin_textdomain-de_DE.mo (added)
-
tags/1.0.10/languages/tsinf_comfortdb_plugin_textdomain-de_DE.po (added)
-
tags/1.0.10/license.txt (added)
-
tags/1.0.10/plugin.php (added)
-
tags/1.0.10/readme.txt (added)
-
trunk/classes/database.class.php (modified) (2 diffs)
-
trunk/classes/tsinf_comfort_db.class.php (modified) (8 diffs)
-
trunk/plugin.php (modified) (1 diff)
-
trunk/readme.txt (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
ts-comfort-database/trunk/classes/database.class.php
r2337892 r2486537 84 84 public static function get_table_data($tablename, $limit = 50, $page = 1, $orderby = null, $order = null, $where = '') 85 85 { 86 $start = ($limit * $page) - $limit; 87 $end = $limit * $page; 88 86 $offset = ($limit * $page) - $limit; 87 89 88 $table_data = array(); 90 89 if(self::table_exists($tablename)) … … 110 109 $order_string . " 111 110 LIMIT %d,%d", 112 $ start,$end111 $offset,$limit 113 112 ); 114 113 -
ts-comfort-database/trunk/classes/tsinf_comfort_db.class.php
r2337892 r2486537 154 154 { 155 155 // EDIT DATASET 156 $identifier = $_GET['identifier'];156 $identifier = strip_tags(htmlspecialchars($_GET['identifier'])); 157 157 $identifier_array = explode("AND", $identifier); 158 158 … … 543 543 } 544 544 } 545 546 // echo 'helper_decode_identifier_string()<br />'; 547 // var_dump($identifier); 548 // echo '<br />'; 549 // var_dump($identifier_string); 550 // echo '<br />'; 551 552 553 $identifier_string = str_replace("{percent}", "%%", $identifier_string); 554 555 // var_dump($identifier_string); 556 // echo '<br />'; 545 557 } 546 558 … … 770 782 isset( $_GET['identifier'])) 771 783 { 772 $identifier = $_GET['identifier'];784 $identifier = strip_tags(htmlspecialchars($_GET['identifier'])); 773 785 $identifier_array = explode("AND", $identifier); 774 786 $where = self::helper_decode_identifier_string($identifier_array); … … 894 906 foreach($table_headers as $column_name) 895 907 { 896 /*$sort_link_search_params = '';908 $sort_link_search_params = ''; 897 909 if(isset($_GET['action']) && $_GET['action'] === 'search' && isset($_GET['identifier'])) 898 910 { 899 $sort_link_search_params = sprintf('&action=search&identifier=%s', strip_tags($_GET['identifier'])); 900 }*/ 911 $identifier = strip_tags(htmlspecialchars($_GET['identifier'])); 912 $sort_link_search_params = sprintf('&action=search&identifier=%s', urlencode(stripslashes($identifier))); 913 } 901 914 902 $column_headline_sort_link = admin_url(sprintf('?page=tscomfortdb-mainpage&table=%s&orderby=%s&order=%s&tpage=%d', urlencode($tablename), urlencode($column_name), urlencode($sort_link_order), urlencode($page)));915 $column_headline_sort_link = admin_url(sprintf('?page=tscomfortdb-mainpage&table=%s&orderby=%s&order=%s&tpage=%d%s', urlencode($tablename), urlencode($column_name), urlencode($sort_link_order), urlencode($page), $sort_link_search_params)); 903 916 904 917 $column_orderby_class = ''; … … 943 956 foreach($table_data as $table_dataset) 944 957 { 945 946 $edit_link = self::helper_get_row_edit_link($tablename, $table_dataset);958 $row_counter++; 959 $edit_link = self::helper_get_row_edit_link($tablename, $table_dataset); 947 960 $row_identifier = self::helper_get_row_identifier($tablename, $table_dataset); 948 961 949 ?><tr >962 ?><tr data-page-line="<?php echo $row_counter; ?>"> 950 963 <?php if(!$no_primary_keys) { ?> 951 964 <td><input type="checkbox" class="row_select row_identifier" name="row_identifier" value="<?php echo htmlentities($row_identifier, ENT_QUOTES); ?>" /></td> … … 953 966 <?php } ?> 954 967 <?php 955 $row_counter++;968 956 969 957 970 $column_counter = 0; … … 1260 1273 if($search === true) 1261 1274 { 1262 $identifier = $_GET['identifier']; 1263 $baselink = '?page=tscomfortdb-mainpage&table=' . $tablename . '&action=search&identifier=' . $identifier; 1275 $identifier = strip_tags(htmlspecialchars($_GET['identifier'])); 1276 $sort_link_search_params = sprintf('&action=search&identifier=%s', urlencode(stripslashes($identifier))); 1277 $baselink = '?page=tscomfortdb-mainpage&table=' . $tablename . $sort_link_search_params; 1278 1279 1264 1280 } 1265 1281 … … 1378 1394 $where_clause_array[] = "`" . urlencode($tablename) . "`.`" . urlencode($column_name) . "`=" . urlencode("'" . $column_data . "'"); 1379 1395 } else { 1380 $where_clause_array[] = "`" . urlencode($tablename) . "`.`" . urlencode($column_name) . "`" . urlencode(" LIKE ' %" . $column_data . "%'");1396 $where_clause_array[] = "`" . urlencode($tablename) . "`.`" . urlencode($column_name) . "`" . urlencode(" LIKE '{percent}" . $column_data . "{percent}'"); 1381 1397 } 1382 1398 } -
ts-comfort-database/trunk/plugin.php
r2337892 r2486537 7 7 Author: Tobias Spiess 8 8 Author URI: https://www.spiess-informatik.de 9 Version: 1.0. 99 Version: 1.0.10 10 10 Text-Domain: tsinf_comfortdb_plugin_textdomain 11 11 Domain Path: /languages -
ts-comfort-database/trunk/readme.txt
r2337892 r2486537 35 35 36 36 == Changelog == 37 *1.0.10 38 Fix errors in table search and table pagination 39 Fix errors in database core class 40 37 41 * 1.0.9 38 42 Add Adminbar Menu
Note: See TracChangeset
for help on using the changeset viewer.