OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

search.php fixes

Browse Source 
- fixed search.php admin test
- drop temp table
- updated search js warning
- fixed grey cachetype icons
This commit is contained in:
following 2013-07-18 19:11:52 +02:00
parent cb34703537
commit 9aad4c554d
12 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/doc/sql/static-data/data.sql
View File

@ -1872,7 +1872,7 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1377', '(leave
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1378', 'Please note the <a href=\"articles.php?page=cacheinfo#logpw\" target=\"_blank\">description</a>', '2010-09-07 20:19:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1379', 'Less', '2010-09-07 20:19:02');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1380', 'Search for caches', '2010-09-07 20:19:02');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1381', 'JavaScript is not activated, you cannot use the above options (sorting to attributes) - basic search is supported nevertheless.', '2010-09-07 20:19:02');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1381', 'JavaScript is not activated, you cannot use the above options (hide caches .. sort results) - basic search works nevertheless.', '2010-09-07 20:19:02');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1382', 'Sorting of result:', '2010-09-07 20:19:02');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1383', 'Last log', '2010-09-07 20:19:02');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1384', 'Show recommendation from other users first', '2010-09-07 20:19:02');
@ -5851,7 +5851,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1378', 'DE', 'Bitte die <a href=\"articles.php?page=cacheinfo#logpw\" target=\"_blank\">Beschreibung</a> beachten!', '2010-09-10 23:53:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1379', 'DE', 'weniger', '2010-09-10 23:52:53');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1380', 'DE', 'Cachesuche', '2010-09-10 23:52:44');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1381', 'DE', 'JavaScript ist bei dir deaktiviert, daher kannst du die obenstehenden Optionen (Sortierung bis Attribute) nicht nutzen - die Suche funktioniert aber trotzdem.', '2010-09-10 23:52:36');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1381', 'DE', 'JavaScript ist bei dir deaktiviert, daher kannst du die obenstehenden Optionen (Caches ausblenden .. Sortierung) nicht nutzen - die Suche funktioniert aber trotzdem.', '2010-09-10 23:52:36');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1382', 'DE', 'Ausgabe sortieren nach:', '2010-09-10 23:52:28');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1383', 'DE', 'letztes Log', '2012-07-24 21:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1384', 'DE', 'von anderen Benutzern empfohlene Caches zuerst anzeigen', '2010-09-10 23:51:58');
@ -7484,7 +7484,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1378', 'EN', 'Please note the <a href=\"articles.php?page=cacheinfo#logpw\" target=\"_blank\">description</a>', '2010-09-10 23:53:16');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1379', 'EN', 'Less', '2010-09-10 23:52:53');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1380', 'EN', 'Search for caches', '2010-09-10 23:52:44');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1381', 'EN', 'JavaScript is not activated, therefore you cannot use the above options (search to attributes) - basic search is supported nevertheless.', '2010-09-10 23:52:36');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1381', 'EN', 'JavaScript is not activated, you cannot use the above options (hide caches .. sort results) - basic search works nevertheless.', '2010-09-10 23:52:36');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1382', 'EN', 'Sort results by:', '2010-09-10 23:52:28');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1383', 'EN', 'Last logs', '2010-09-10 23:52:16');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1384', 'EN', 'Show caches recommended by other users first', '2010-09-10 23:51:58');
@ -10606,7 +10606,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1378', 'IT', 'Si prega di prendere visione della <a href=\"articles.php?page=cacheinfo#logpw\" target=\"_blank\">Descrizione</a>!', '2010-09-10 23:53:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1379', 'IT', 'Meno', '2010-09-10 23:52:53');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1380', 'IT', 'Ricerca cache', '2010-09-10 23:52:44');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1381', 'IT', 'JavaScript non è attivo, non puoi usare le opzioni precedenti (ordinamento per attrivuti) - tuttavia è possibile la ricerca base.', '2013-03-19 15:12:21');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1381', 'IT', 'JavaScript non è attivo, non puoi usare le opzioni precedenti - tuttavia è possibile la ricerca base.', '2013-03-19 15:12:21');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1382', 'IT', 'Risultati ordinati per:', '2010-10-27 18:49:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1383', 'IT', 'Ultimo log', '2010-09-10 23:52:16');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1384', 'IT', 'Visualizza prima le raccomandazioni di altri utenti', '2010-09-10 23:51:58');

BIN
htdocs/resource2/ocstyle/images/cacheicon/event-grey.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
htdocs/resource2/ocstyle/images/cacheicon/mathe-grey.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
htdocs/resource2/ocstyle/images/cacheicon/moving-grey.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
htdocs/resource2/ocstyle/images/cacheicon/multi-grey.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
htdocs/resource2/ocstyle/images/cacheicon/mystery-grey.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
htdocs/resource2/ocstyle/images/cacheicon/traditional-grey.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1023 B

After

Width:  |  Height:  |  Size: 1023 B

BIN
htdocs/resource2/ocstyle/images/cacheicon/unknown-grey.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
htdocs/resource2/ocstyle/images/cacheicon/virtual-grey.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
htdocs/resource2/ocstyle/images/cacheicon/webcam-grey.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

5
htdocs/search.php
View File

@ -621,7 +621,8 @@
}
// temporäre tabelle erstellen und dann einträge entfernen, die nicht mindestens so oft vorkommen wie worte gegeben wurden
sql_slave('CREATE TEMPORARY TABLE tmpuniids (`uni_id` int(11) NOT NULL, `cnt` int(11) NOT NULL, `olduni` int(11) NOT NULL, `simplehash` int(11) NOT NULL) ENGINE=MEMORY SELECT `gns_search`.`uni_id` `uni_id`, 0 `cnt`, 0 `olduni`, `simplehash` FROM `gns_search` WHERE ' . $sqlhashes);
sql_slave('DROP TABLE IF EXISTS `tmpuniids`');
sql_slave('CREATE TEMPORARY TABLE `tmpuniids` (`uni_id` int(11) NOT NULL, `cnt` int(11) NOT NULL, `olduni` int(11) NOT NULL, `simplehash` int(11) NOT NULL) ENGINE=MEMORY SELECT `gns_search`.`uni_id` `uni_id`, 0 `cnt`, 0 `olduni`, `simplehash` FROM `gns_search` WHERE ' . $sqlhashes);
sql_slave('ALTER TABLE `tmpuniids` ADD INDEX (`uni_id`)');
// BUGFIX: dieser Code sollte nur ausgeführt werden, wenn mehr als ein Suchbegriff eingegeben wurde
@ -1054,7 +1055,7 @@
$sql_innerjoin[] = '`cache_status` ON `caches`.`status`=`cache_status`.`id`';
if ($login->logged_in())
$sql_where[] = '(`cache_status`.`allow_user_view`=1 OR `caches`.`user_id`=' . sql_escape($login->userid) . ' OR (`caches`.`status`<>5 AND '. sql_escape($login->hasAdminPriv(ADMIN_USER)) . '>0))';
$sql_where[] = '(`cache_status`.`allow_user_view`=1 OR `caches`.`user_id`=' . sql_escape($login->userid) . ' OR (`caches`.`status`<>5 AND '. ($login->hasAdminPriv(ADMIN_USER) ? '1' : '0') . '))';
else
$sql_where[] = '`cache_status`.`allow_user_view`=1';

2
htdocs/templates2/ocstyle/search.tpl
View File

@ -440,7 +440,7 @@ function switchAttributeCat2()
</form>
<div id="scriptwarning" style="margin:0 5px 0 5px;">
<p><span class="errormsg">{t}JavaScript is not activated, you cannot use the above options (sorting to attributes) - basic search is supported nevertheless.{/t}</span></p>
<p><span class="errormsg">{t}JavaScript is not activated, you cannot use the above options (hide caches .. sort results) - basic search works nevertheless.{/t}</span></p>
</div>
{literal}