forked from pommes-frites/piwigo-facetag
-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #22 from cccraig/minor-bug-fixes-and-enhancements
Minor bug fixes and enhancements
- Loading branch information
Showing
8 changed files
with
184 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -182,4 +182,8 @@ | |
| position: absolute; | ||
| top: 0; | ||
| left: 0; | ||
| } | ||
|
|
||
| .mugshot-hidden-while-selecting { | ||
| display: none !important; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| <?php | ||
|
|
||
| if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); | ||
|
|
||
| /* | ||
| * Creates the tagging user group and associates the current user with that group; | ||
| */ | ||
| function create_tag_group() { | ||
| // Checks to see if a taggers group exists. | ||
| $checkTaggerGroupQuery = "SELECT id FROM " . GROUPS_TABLE . " WHERE name='Taggers'"; | ||
|
|
||
| $result = fetch_sql($checkTaggerGroupQuery, 'id', false); | ||
|
|
||
| if ($result == 0) | ||
| { | ||
| $makeTaggerGroupQuery = "INSERT INTO " . GROUPS_TABLE . ' (name) VALUES ("Taggers")'; | ||
| pwg_query($makeTaggerGroupQuery); | ||
|
|
||
| $result = fetch_sql($checkTaggerGroupQuery, 'id', false); | ||
| } | ||
|
|
||
| $group_id = $result[0]; | ||
|
|
||
| $user = $_SESSION['pwg_uid']; | ||
|
|
||
| // Determines if the taggers group is associated with the current user and, if not, associates it. | ||
| $checkUserAssociationQuery = "SELECT * FROM " . USER_GROUP_TABLE . " WHERE group_id=$group_id AND user_id=$user"; | ||
|
|
||
| $association = fetch_sql($checkUserAssociationQuery, 'id', false); | ||
|
|
||
| if ($association == 0) | ||
| { | ||
| $makeUserAssociationQuery = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id) VALUES ('$group_id','$user')"; | ||
|
|
||
| pwg_query($makeUserAssociationQuery); | ||
| } | ||
|
|
||
| // Updates mugshot configuration | ||
| $data = unserialize(conf_get_param(MUGSHOT_ID)); | ||
|
|
||
| $data['groups'] = array_unique(array_push($data['groups'], $group_id)); | ||
|
|
||
| conf_update_param(MUGSHOT_ID, pwg_db_real_escape_string(serialize($data))); | ||
| } | ||
|
|
||
| /* | ||
| * Creates the drop trigger to clear database values | ||
| */ | ||
| function create_tag_drop_trigger() { | ||
| $deleteTriggerQuery = "DROP TRIGGER IF EXISTS `sync_mug_shot`;"; | ||
|
|
||
| pwg_query($deleteTriggerQuery); | ||
|
|
||
| // [mysql error 1419] You do not have the SUPER privilege and binary logging is enabled (you *might* want to use the less safe log_bin_trust_function_creators variable) | ||
| // This query is silently failing. | ||
| $makeTriggerQuery = "CREATE TRIGGER `sync_mug_shot` | ||
| AFTER DELETE ON ".TAGS_TABLE." | ||
| FOR EACH ROW DELETE FROM face_tag_positions | ||
| WHERE face_tag_positions.tag_id = old.id"; | ||
|
|
||
| pwg_query($makeTriggerQuery); | ||
| } | ||
|
|
||
| /* | ||
| * Creates the MugShot face tag table with all data columns required for resizing. | ||
| */ | ||
| function create_facetag_table() { | ||
| $configQuery = 'INSERT INTO ' . CONFIG_TABLE . ' (param,value,comment) VALUES ("MugShot","","MugShot configuration values");'; | ||
|
|
||
| pwg_query($configQuery); | ||
|
|
||
| $createTableQuery = 'CREATE TABLE IF NOT EXISTS `face_tag_positions` ( | ||
| `image_id` mediumint(8) unsigned NOT NULL default "0", | ||
| `tag_id` smallint(5) unsigned NOT NULL default "0", | ||
| `top` float unsigned NOT NULL default "0", | ||
| `lft` float unsigned NOT NULL default "0", | ||
| `width` float unsigned NOT NULL default "0", | ||
| `height` float unsigned NOT NULL default "0", | ||
| `image_width` float unsigned NOT NULL default "0", | ||
| `image_height` float unsigned NOT NULL default "0", | ||
| PRIMARY KEY (`image_id`,`tag_id`) | ||
| )'; | ||
|
|
||
| pwg_query($createTableQuery); | ||
| } | ||
|
|
||
| /* | ||
| * Fetches Sql | ||
| */ | ||
| function fetch_sql($sql, $col, $ser) { | ||
| $result = pwg_query($sql); | ||
|
|
||
| while ($row = pwg_db_fetch_assoc($result)) { | ||
| $data[] = $row; | ||
| } | ||
|
|
||
| if (!isset($data)) { | ||
| $data = 0; | ||
| } else { | ||
| if($col !== false) { | ||
| $data = array_column($data, $col); | ||
| } | ||
| } | ||
|
|
||
| return ($ser) ? json_encode($data) : $data; | ||
| } | ||
|
|
||
| ?> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters