Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check if is countable (fix #5) #6

Merged
merged 2 commits into from
Jan 23, 2020
Merged

Check if is countable (fix #5) #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97bf74a
:beetle: the fix is here
gpenverne Jan 23, 2020
f987922
CS fix
gpenverne Jan 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
162 changes: 83 additions & 79 deletions CartaPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,142 +17,148 @@
class CartaPlugin extends Omeka_Plugin_AbstractPlugin
{
protected $_hooks = array(
'install',
'uninstall',
'install',
'uninstall',
'define_routes',
'define_acl',
'public_items_show',
'admin_items_show_sidebar',
'admin_items_browse_detailed_each',
'initialize',
'after_save_item' ,
'after_save_item' ,
'public_head',
'admin_head'
'admin_head'
);


protected $_filters = array(
'admin_navigation_main',
'exhibit_layouts', // Added by David
'admin_items_form_tabs' // Added by David
'exhibit_layouts', // Added by David
'admin_items_form_tabs' // Added by David

);

public function hookInstall(){
public function hookInstall()
{
include("install.php");

}

public function hookUninstall(){
public function hookUninstall()
{
$db = get_db();
$db->query("DROP TABLE IF EXISTS `$db->Carta`");
$db->query("DROP TABLE IF EXISTS `$db->CartaGroup`");
$db->query("DROP TABLE IF EXISTS `$db->CartaLayer`");
$db->query("DROP TABLE IF EXISTS `$db->CartaItem`");
$db->query("DELETE FROM `$db->ElementSets` WHERE name = '_carta_version'");
$db->query("DELETE FROM `$db->ElementSets` WHERE name = '_carta_version'");
}

public function hookInitialize() {
$CurrentVersion = 6;
$elementSet = get_db()->getTable('ElementSet')->findBySql("name = '_carta_version'");
$db = get_db();

if(!$elementSet) {
$db->query("INSERT INTO `$db->ElementSets` (name, description) VALUES ('_carta_version', '{$CurrentVersion}')");
$elementSet = get_db()->getTable('ElementSet')->findBySql("name = '_carta_version'");
}

if((int) $elementSet[0]->description <= 0) {
$db->query("ALTER TABLE `$db->Carta` ADD COLUMN geo_image_olverlays LONGTEXT NOT NULL");
}
if((int) $elementSet[0]->description <= 1) {
$db->query("ALTER TABLE `$db->Carta` ADD COLUMN show_sidebar BOOLEAN NOT NULL DEFAULT TRUE");
$db->query("ALTER TABLE `$db->Carta` ADD COLUMN show_minimap BOOLEAN NOT NULL DEFAULT TRUE");
$db->query("ALTER TABLE `$db->Carta` ADD COLUMN show_measure BOOLEAN NOT NULL DEFAULT TRUE");
}
if((int) $elementSet[0]->description <= 2) {
$db->query("ALTER TABLE `$db->Carta` ADD COLUMN show_legend BOOLEAN NOT NULL DEFAULT FALSE");
$db->query("ALTER TABLE `$db->Carta` ADD COLUMN legend_content longtext NOT NULL");
}
if((int) $elementSet[0]->description <= 3) {
$db->query("ALTER TABLE `$db->Carta` ADD COLUMN latitude varchar(100) NOT NULL DEFAULT '0'");
$db->query("ALTER TABLE `$db->Carta` ADD COLUMN longitude varchar(100) NOT NULL DEFAULT '0'");
}
if((int) $elementSet[0]->description <= 4) {
$db->query("ALTER TABLE `$db->CartaLayer` ALTER COLUMN `name` varchar(300) NOT NULL");
$db->query("ALTER TABLE `$db->CartaLayer` ALTER COLUMN `url` varchar(300) NOT NULL");
$db->query("ALTER TABLE `$db->CartaLayer` ALTER COLUMN `key` varchar(300) NOT NULL");
$db->query("ALTER TABLE `$db->CartaLayer` ALTER COLUMN `accesstoken` varchar(300) NOT NULL");
$db->query("ALTER TABLE `$db->CartaLayer` ALTER COLUMN `attribution` varchar(300) NOT NULL");
}
if((int) $elementSet[0]->description <= 5) {
$db->query("ALTER TABLE `$db->Carta` ADD COLUMN show_cluster BOOLEAN NOT NULL DEFAULT FALSE");
}

$db->query("UPDATE `$db->ElementSets` SET description = '{$CurrentVersion}' WHERE name = '_carta_version'");
add_shortcode ('carta', array($this,'cartaShortcode'));
public function hookInitialize()
{
$CurrentVersion = 6;
$elementSet = get_db()->getTable('ElementSet')->findBySql("name = '_carta_version'");
$db = get_db();

if (!$elementSet) {
$db->query("INSERT INTO `$db->ElementSets` (name, description) VALUES ('_carta_version', '{$CurrentVersion}')");
$elementSet = get_db()->getTable('ElementSet')->findBySql("name = '_carta_version'");
}

if ((int) $elementSet[0]->description <= 0) {
$db->query("ALTER TABLE `$db->Carta` ADD COLUMN geo_image_olverlays LONGTEXT NOT NULL");
}
if ((int) $elementSet[0]->description <= 1) {
$db->query("ALTER TABLE `$db->Carta` ADD COLUMN show_sidebar BOOLEAN NOT NULL DEFAULT TRUE");
$db->query("ALTER TABLE `$db->Carta` ADD COLUMN show_minimap BOOLEAN NOT NULL DEFAULT TRUE");
$db->query("ALTER TABLE `$db->Carta` ADD COLUMN show_measure BOOLEAN NOT NULL DEFAULT TRUE");
}
if ((int) $elementSet[0]->description <= 2) {
$db->query("ALTER TABLE `$db->Carta` ADD COLUMN show_legend BOOLEAN NOT NULL DEFAULT FALSE");
$db->query("ALTER TABLE `$db->Carta` ADD COLUMN legend_content longtext NOT NULL");
}
if ((int) $elementSet[0]->description <= 3) {
$db->query("ALTER TABLE `$db->Carta` ADD COLUMN latitude varchar(100) NOT NULL DEFAULT '0'");
$db->query("ALTER TABLE `$db->Carta` ADD COLUMN longitude varchar(100) NOT NULL DEFAULT '0'");
}
if ((int) $elementSet[0]->description <= 4) {
$db->query("ALTER TABLE `$db->CartaLayer` ALTER COLUMN `name` varchar(300) NOT NULL");
$db->query("ALTER TABLE `$db->CartaLayer` ALTER COLUMN `url` varchar(300) NOT NULL");
$db->query("ALTER TABLE `$db->CartaLayer` ALTER COLUMN `key` varchar(300) NOT NULL");
$db->query("ALTER TABLE `$db->CartaLayer` ALTER COLUMN `accesstoken` varchar(300) NOT NULL");
$db->query("ALTER TABLE `$db->CartaLayer` ALTER COLUMN `attribution` varchar(300) NOT NULL");
}
if ((int) $elementSet[0]->description <= 5) {
$db->query("ALTER TABLE `$db->Carta` ADD COLUMN show_cluster BOOLEAN NOT NULL DEFAULT FALSE");
}

$db->query("UPDATE `$db->ElementSets` SET description = '{$CurrentVersion}' WHERE name = '_carta_version'");
add_shortcode('carta', array($this,'cartaShortcode'));
}

public function cartaShortcode($args){
include("shortcode.php");
public function cartaShortcode($args)
{
include("shortcode.php");
}



public function hookPublicHead($args){
public function hookPublicHead($args)
{
}



public function hookAdminHead($args)
public function hookAdminHead($args)
{

}


public function hookPublicItemsShow($args){

public function hookPublicItemsShow($args)
{
$item = $args['item'];
$id = $item->id;
$id = $item->id;


$cartaItem = get_db()->getTable('CartaItem')->getByItemId($item->id);


if(count($cartaItem) > 0){
if (is_array($cartaItem) && count($cartaItem) > 0) {
DavidGhedini marked this conversation as resolved.
Show resolved Hide resolved
$tobj = new Omeka_View_Helper_Shortcodes;

echo $tobj->shortcodes($cartaItem->content);

}


}

public function hookDefineAcl($args){
public function hookDefineAcl($args)
{
$acl = $args['acl'];
$acl->addResource('Cartas');
$acl->allow(null, 'Cartas');
}


public function hookAdminItemsBrowseDetailedEach($args){
public function hookAdminItemsBrowseDetailedEach($args)
{
}

public function hookAdminItemsShowSidebar($args){
public function hookAdminItemsShowSidebar($args)
{
}

public function hookDefineRoutes($array){
public function hookDefineRoutes($array)
{
}

public function filterAdminNavigationMain($navArray){
public function filterAdminNavigationMain($navArray)
{
$navArray['Carta'] = array('label'=>__("Carta"), 'uri'=>url('carta'));
return $navArray;
}


// Added by David - Add Carta Layout
public function filterExhibitLayouts($layouts){
// Added by David - Add Carta Layout
public function filterExhibitLayouts($layouts)
{
$layouts['carta'] = array(
'name' => __('Carta Map'),
'description' => __('Display a Carta Map')
Expand All @@ -161,16 +167,17 @@ public function filterExhibitLayouts($layouts){
}

// Added by David - add Carta to 'Add an Item' Tab
public function filterAdminItemsFormTabs($tabs, $args){
public function filterAdminItemsFormTabs($tabs, $args)
{
// insert the carta tab before the Miscellaneous tab
$item = $args['item'];
$tabs['Carta'] = $this->_cartaForm($item);

return $tabs;
}

public function hookAfterSaveItem($args){

public function hookAfterSaveItem($args)
{
if (!($post = $args['post'])) {
return;
}
Expand All @@ -190,19 +197,17 @@ public function hookAfterSaveItem($args){
"content"=>$post['carta_content']
);

if(empty($carta_item_id)){
if (empty($carta_item_id)) {
$cartaItem->insert($itemsJson);
}else{
} else {
$cartaItem->update($itemsJson, $carta_item_id);
}

}

// Start of Added by David: this is to add Carta Map as an Item

protected function _cartaForm($item, $post = null)
{

$carta_item_id = $item->id;


Expand All @@ -211,8 +216,7 @@ protected function _cartaForm($item, $post = null)
$string = ob_get_contents();
ob_end_clean();

return $string;
return $string;
}
// End of Added by David

}
// End of Added by David
}
Loading