From 707b0f68a156adb80170dcf295f9c20a1c902264 Mon Sep 17 00:00:00 2001 From: Alexandra Nantel Date: Thu, 24 Aug 2017 16:10:09 -0400 Subject: [PATCH] SQL and PHP cases PHP true,false,null in lowercase SQL keywords uppercase --- data-sources/data.tracker_activity.php | 2 +- extension.driver.php | 20 ++++++++++---------- lib/class.tracker.php | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/data-sources/data.tracker_activity.php b/data-sources/data.tracker_activity.php index 318334c..98f43d1 100644 --- a/data-sources/data.tracker_activity.php +++ b/data-sources/data.tracker_activity.php @@ -87,7 +87,7 @@ public function execute(array &$param_pool = null) ); // Build the element - $item = new XMLElement('activity', NULL, array( + $item = new XMLElement('activity', null, array( 'type' => $activity['action_type'], 'entry-id' => $activity['item_id'] )); diff --git a/extension.driver.php b/extension.driver.php index 040a887..f963c24 100644 --- a/extension.driver.php +++ b/extension.driver.php @@ -263,14 +263,14 @@ public function install() { Symphony::Database()->query( "CREATE TABLE IF NOT EXISTS `tbl_tracker_activity` ( - `id` int(11) unsigned NOT NULL auto_increment, - `item_type` varchar(255), - `item_id` varchar(75), - `action_type` varchar(255), - `user_id` int(11), - `timestamp` timestamp, - `fallback_username` varchar(2048), - `fallback_description` varchar(2048), + `id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, + `item_type` VARCHAR(255), + `item_id` VARCHAR(75), + `action_type` VARCHAR(255), + `user_id` INT(11), + `timestamp` TIMESTAMP, + `fallback_username` VARCHAR(2048), + `fallback_description` VARCHAR(2048), PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;"); @@ -289,8 +289,8 @@ public function update($previousVersion = null) if ($ret && version_compare($previousVersion, '1.7.0', '<')) { $ret = Symphony::Database()->query(" ALTER TABLE `tbl_tracker_activity` - MODIFY `fallback_username` varchar(2048), - MODIFY `fallback_description` varchar(2048); + MODIFY `fallback_username` VARCHAR(2048), + MODIFY `fallback_description` VARCHAR(2048); "); } diff --git a/lib/class.tracker.php b/lib/class.tracker.php index 44ac872..e75ff6c 100644 --- a/lib/class.tracker.php +++ b/lib/class.tracker.php @@ -608,7 +608,7 @@ public static function formatElementItem($activity, $fallback = false) $about = ExtensionManager::about($activity['item_id']); } catch (Exception $e) { - $about = NULL; + $about = null; } if (empty($about)) { $item = $activity['fallback_description']; @@ -652,7 +652,7 @@ public static function formatElementItem($activity, $fallback = false) break; default: - $item = NULL; + $item = null; break; }