diff options
| -rwxr-xr-x | boot.php | 2 | ||||
| -rw-r--r-- | include/menu.php | 35 | ||||
| -rw-r--r-- | install/schema_mysql.sql | 6 | ||||
| -rw-r--r-- | install/schema_postgres.sql | 4 | ||||
| -rw-r--r-- | install/update.php | 24 | ||||
| -rw-r--r-- | version.inc | 2 |
6 files changed, 65 insertions, 8 deletions
@@ -49,7 +49,7 @@ define ( 'PLATFORM_NAME', 'redmatrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1141 ); +define ( 'DB_UPDATE_VERSION', 1142 ); /** * @brief Constant with a HTML line break. diff --git a/include/menu.php b/include/menu.php index 40ea2b0f4..0e5fa3c99 100644 --- a/include/menu.php +++ b/include/menu.php @@ -30,6 +30,9 @@ function menu_element($menu) { $arr['type'] = 'menu'; $arr['name'] = $menu['menu_name']; $arr['desc'] = $menu['menu_desc']; + $arr['created'] = $menu['menu_created']; + $arr['edited'] = $menu['menu_edited']; + $arr['baseurl'] = z_root(); if($menu['menu_flags']) { $arr['flags'] = array(); @@ -147,12 +150,14 @@ function menu_create($arr) { if($r) return false; - $r = q("insert into menu ( menu_name, menu_desc, menu_flags, menu_channel_id ) - values( '%s', '%s', %d, %d )", + $r = q("insert into menu ( menu_name, menu_desc, menu_flags, menu_channel_id, menu_created, menu_edited ) + values( '%s', '%s', %d, %d, '%s', '%s' )", dbesc($menu_name), dbesc($menu_desc), intval($menu_flags), - intval($menu_channel_id) + intval($menu_channel_id), + dbesc(datetime_convert()), + dbesc(datetime_convert()) ); if(! $r) return false; @@ -237,11 +242,12 @@ function menu_edit($arr) { return false; } - return q("update menu set menu_name = '%s', menu_desc = '%s', menu_flags = %d + return q("update menu set menu_name = '%s', menu_desc = '%s', menu_flags = %d, menu_edited = '%s' where menu_id = %d and menu_channel_id = %d", dbesc($menu_name), dbesc($menu_desc), intval($menu_flags), + dbesc(datetime_convert()), intval($menu_id), intval($menu_channel_id) ); @@ -306,6 +312,13 @@ function menu_add_item($menu_id, $uid, $arr) { intval($menu_id), intval($mitem_order) ); + + $x = q("update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d", + dbesc(datetime_convert()), + intval($menu_id), + intval($uid) + ); + return $r; } @@ -342,6 +355,13 @@ function menu_edit_item($menu_id, $uid, $arr) { intval($menu_id), intval($mitem_id) ); + + $x = q("update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d", + dbesc(datetime_convert()), + intval($menu_id), + intval($uid) + ); + return $r; } @@ -354,6 +374,13 @@ function menu_del_item($menu_id,$uid,$item_id) { intval($uid), intval($item_id) ); + + $x = q("update menu set menu_edited = '%s' where menu_id = %d and menu_channel_id = %d", + dbesc(datetime_convert()), + intval($menu_id), + intval($uid) + ); + return $r; } diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index c2cefd07d..8e3d5a7b4 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -836,10 +836,14 @@ CREATE TABLE IF NOT EXISTS `menu` ( `menu_name` char(255) NOT NULL DEFAULT '', `menu_desc` char(255) NOT NULL DEFAULT '', `menu_flags` int(11) NOT NULL DEFAULT '0', + `menu_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `menu_edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`menu_id`), KEY `menu_channel_id` (`menu_channel_id`), KEY `menu_name` (`menu_name`), - KEY `menu_flags` (`menu_flags`) + KEY `menu_flags` (`menu_flags`), + KEY `menu_created` (`menu_created`), + KEY `menu_edited` (`menu_edited`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index 438b29d49..48f3fe0fc 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -646,11 +646,15 @@ CREATE TABLE "menu" ( "menu_name" text NOT NULL DEFAULT '', "menu_desc" text NOT NULL DEFAULT '', "menu_flags" bigint NOT NULL DEFAULT '0', + "menu_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', + "menu_edited" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', PRIMARY KEY ("menu_id") ); create index "menu_channel_id" on menu ("menu_channel_id"); create index "menu_name" on menu ("menu_name"); create index "menu_flags" on menu ("menu_flags"); +create index "menu_created" on menu ("menu_created"); +create index "menu_edited" on menu ("menu_edited"); CREATE TABLE "menu_item" ( "mitem_id" serial NOT NULL, "mitem_link" text NOT NULL DEFAULT '', diff --git a/install/update.php b/install/update.php index 13dd004c9..13a45d301 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1141 ); +define( 'UPDATE_VERSION' , 1142 ); /** * @@ -1624,3 +1624,25 @@ function update_r1140() { } +function update_r1141() { + if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) { + $r1 = q("ALTER TABLE menu ADD menu_created timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', ADD menu_edited timestamp NOT NULL DEFAULT '0001-01-01 00:00:00'"); + $r2 = q("create index menu_created on menu ( menu_created ) "); + $r3 = q("create index menu_edited on menu ( menu_edited ) "); + $r = $r1 && $r2; + } + else + $r = q("ALTER TABLE menu ADD menu_created DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', ADD menu_edited DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', ADD INDEX ( menu_created ), ADD INDEX ( menu_edited ) "); + + $t = datetime_convert(); + q("update menu set menu_created = '%s', menu_edited = '%s' where true", + dbesc($t), + dbesc($t) + ); + + + if($r) + return UPDATE_SUCCESS; + return UPDATE_FAILED; + +}
\ No newline at end of file diff --git a/version.inc b/version.inc index 2dbf2a1b8..57c90a3d0 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-05-27.1045 +2015-05-28.1046 |