Removed o_ prefixes

.github/ci/files/var/classes/DataObject/Customer.php

@@ -62,8 +62,8 @@
 
 class Customer extends \CustomerManagementFrameworkBundle\Model\AbstractCustomer\DefaultAbstractUserawareCustomer
 {
-protected $o_classId = "CU";
-protected $o_className = "Customer";
+protected $classId = "CU";
+protected $className = "Customer";
 protected $active;
 protected $gender;
 protected $firstname;

.github/ci/files/var/classes/DataObject/CustomerSegment.php

@@ -31,8 +31,8 @@
 
 class CustomerSegment extends \CustomerManagementFrameworkBundle\Model\AbstractCustomerSegment
 {
-protected $o_classId = "2";
-protected $o_className = "CustomerSegment";
+protected $classId = "2";
+protected $className = "CustomerSegment";
 protected $name;
 protected $group;
 protected $reference;

.github/ci/files/var/classes/DataObject/CustomerSegmentGroup.php

@@ -31,8 +31,8 @@
 
 class CustomerSegmentGroup extends Concrete
 {
-protected $o_classId = "1";
-protected $o_className = "CustomerSegmentGroup";
+protected $classId = "1";
+protected $className = "CustomerSegmentGroup";
 protected $name;
 protected $reference;
 protected $calculated;

.github/ci/files/var/classes/DataObject/LinkActivityDefinition.php

@@ -41,8 +41,8 @@
 
 class LinkActivityDefinition extends Concrete
 {
-protected $o_classId = "5";
-protected $o_className = "LinkActivityDefinition";
+protected $classId = "5";
+protected $className = "LinkActivityDefinition";
 protected $code;
 protected $attributeType;
 protected $label;

.github/ci/files/var/classes/DataObject/SsoIdentity.php

@@ -26,8 +26,8 @@
 
 class SsoIdentity extends \CustomerManagementFrameworkBundle\Model\AbstractSsoIdentity
 {
-protected $o_classId = "3";
-protected $o_className = "SsoIdentity";
+protected $classId = "3";
+protected $className = "SsoIdentity";
 protected $provider;
 protected $identifier;
 protected $profileData;

.github/ci/files/var/classes/DataObject/TermSegmentBuilderDefinition.php

@@ -24,8 +24,8 @@
 
 class TermSegmentBuilderDefinition extends \CustomerManagementFrameworkBundle\Model\AbstractTermSegmentBuilderDefinition
 {
-protected $o_classId = "4";
-protected $o_className = "TermSegmentBuilderDefinition";
+protected $classId = "4";
+protected $className = "TermSegmentBuilderDefinition";
 protected $name;
 protected $terms;
 

doc/03_Configuration.md

@@ -249,8 +249,8 @@ pimcore_customer_management_framework:
         filter_properties:
             # Filter fields which must match exactly.
             equals:
-                # ?filter[id]=8 will result in a SQL condition of "WHERE o_id=8"
-                id:                  o_id
+                # ?filter[id]=8 will result in a SQL condition of "WHERE id=8"
+                id:                  id
                 active:              active
 
             # Searched fields in customer view search filters
@@ -272,7 +272,7 @@ pimcore_customer_management_framework:
 
                 # main search filter
                 search:
-                  - o_id
+                  - id
                   - idEncoded
                   - firstname
                   - lastname

src/ActionTrigger/Condition/CountActivities.php

@@ -69,6 +69,6 @@ public function getDbCondition(ConditionDefinitionInterface $conditionDefinition
             return '-1';
         }
 
-        return 'o_id in ('.implode(',', $ids).')';
+        return 'id in ('.implode(',', $ids).')';
     }
 }

src/ActionTrigger/Condition/Customer.php

@@ -57,7 +57,7 @@ public function getDbCondition(ConditionDefinitionInterface $conditionDefinition
 
         $customerId = intval($options[self::OPTION_CUSTOMER_ID]);
 
-        $condition = sprintf('o_id = %s', $customerId);
+        $condition = sprintf('id = %s', $customerId);
 
         $not = $options[self::OPTION_NOT];
 

src/ActionTrigger/EventHandler/DefaultEventHandler.php

@@ -102,7 +102,7 @@ public function handleCustomerListEvent(CustomerListEventInterface $event, RuleE
 
                 $listing = \Pimcore::getContainer()->get('cmf.customer_provider')->getList();
                 $listing->setCondition($where);
-                $listing->setOrderKey('o_id');
+                $listing->setOrderKey('id');
                 $listing->setOrder('asc');
 
                 $paginator = $this->paginator->paginate($listing, 1, 100);

src/Controller/Admin/DuplicatesController.php

@@ -51,7 +51,7 @@ public function listAction(Request $request, DuplicatesIndexInterface $duplicate
             // build customer listing
             $customerList = $this->getSearchHelper()->getCustomerProvider()->getList();
             $customerList
-                ->setOrderKey('o_id')
+                ->setOrderKey('id')
                 ->setOrder('ASC');
 
             /** @noinspection PhpUnhandledExceptionInspection */

src/Controller/Admin/SegmentAssignmentController.php

@@ -50,7 +50,7 @@ public function inheritableSegments(Request $request, SegmentManagerInterface $s
         $type = $request->get('type') ?? '';
 
         $db = \Pimcore\Db::get();
-        $parentIdStatement = sprintf('SELECT `%s` FROM `%s` WHERE `%s` = :value', $type === 'object' ? 'o_parentId' : 'parentId', $type.'s', $type === 'object' ? 'o_id' : 'id');
+        $parentIdStatement = sprintf('SELECT `%s` FROM `%s` WHERE `%s` = :value', 'parentId', $type.'s', 'id');
         $parentId = $db->fetchOne($parentIdStatement, [
             'value' => $id
         ]);

src/Controller/Rest/AbstractRestController.php

@@ -317,24 +317,24 @@ public static function buildSqlCondition($q, $op = null, $subject = null)
 
         // Examples:
         //
-        //q={"o_modificationDate" : {"$gt" : "1000"}}
-        //where ((`o_modificationDate` > '1000') )
+        //q={"modificationDate" : {"$gt" : "1000"}}
+        //where ((`modificationDate` > '1000') )
         //
         //
         //
         //
-        //q=[{"o_modificationDate" : {"$gt" : "1000"}}, {"o_modificationDate" : {"$lt" : "9999"}}]
-        //where ( ((`o_modificationDate` > '1000') )  AND  ((`o_modificationDate` < '9999') )  )
+        //q=[{"modificationDate" : {"$gt" : "1000"}}, {"modificationDate" : {"$lt" : "9999"}}]
+        //where ( ((`modificationDate` > '1000') )  AND  ((`modificationDate` < '9999') )  )
         //
         //
         //
         //
-        //q={"o_modificationDate" : {"$gt" : "1000"}, "$or": [{"o_id": "3", "o_key": {"$like" :"%lorem-ipsum%"}}]}
-        //where ((`o_modificationDate` > '1000') AND  ((`o_id` = '3') OR  ((`o_key` LIKE '%lorem-ipsum%') )  )  )
+        //q={"modificationDate" : {"$gt" : "1000"}, "$or": [{"id": "3", "key": {"$like" :"%lorem-ipsum%"}}]}
+        //where ((`modificationDate` > '1000') AND  ((`id` = '3') OR  ((`key` LIKE '%lorem-ipsum%') )  )  )
         //
-        // q={"$and" : [{"o_published": "0"}, {"o_modificationDate" : {"$gt" : "1000"}, "$or": [{"o_id": "3", "o_key": {"$like" :"%lorem-ipsum%"}}]}]}
+        // q={"$and" : [{"published": "0"}, {"modificationDate" : {"$gt" : "1000"}, "$or": [{"id": "3", "key": {"$like" :"%lorem-ipsum%"}}]}]}
         //
-        // where ( ((`o_published` = '0') )  AND  ((`o_modificationDate` > '1000') AND  ((`o_id` = '3') OR (`o_key` LIKE '%lorem-ipsum%') )  )  )
+        // where ( ((`published` = '0') )  AND  ((`modificationDate` > '1000') AND  ((`id` = '3') OR (`key` LIKE '%lorem-ipsum%') )  )  )
 
         if (!$op) {
             $op = 'AND';

src/CustomerDuplicatesService/DefaultCustomerDuplicatesService.php

@@ -94,7 +94,7 @@ public function getDuplicatesByData(array $data, $limit = 0)
         $customerProvider->addActiveCondition($list);
 
         $list
-            ->addConditionParam('o_published = ?', 1);
+            ->addConditionParam('published = ?', 1);
 
         foreach ($data as $field => $value) {
             if (is_null($value) || $value === '') {
@@ -141,7 +141,7 @@ public function getDuplicatesOfCustomerByFields(CustomerInterface $customer, arr
         $duplicates = $this->getDuplicatesByData($data, $limit);
 
         if ($customer->getId()) {
-            $duplicates->addConditionParam('o_id != ?', $customer->getId());
+            $duplicates->addConditionParam('id != ?', $customer->getId());
         }
 
         if (!is_null($duplicates) && $duplicates->getCount()) {

src/CustomerList/Exporter/AbstractExporter.php

@@ -194,8 +194,8 @@ protected function getHeaderTitles(array $exportData)
         if ($this->getExportSegmentsAsColumns() && sizeof($exportData[self::SEGMENT_IDS])) {
             $list = \Pimcore::getContainer()->get('cmf.segment_manager')->getSegments();
             array_walk($exportData[self::SEGMENT_IDS], 'intval');
-            $list->addConditionParam('o_id in(' . implode(', ', $exportData[self::SEGMENT_IDS]) .')');
-            $list->setOrderKey('concat(o_path, o_key)', false);
+            $list->addConditionParam('id in(' . implode(', ', $exportData[self::SEGMENT_IDS]) .')');
+            $list->setOrderKey('concat(path, key)', false);
 
             $i = sizeof($titles);
             foreach ($list as $item) {

src/CustomerList/Filter/CustomerSegment.php

@@ -215,7 +215,7 @@ protected function addJoin(
 
         // relation matches one of our field names and relates to our current object
         $baseCondition = sprintf(
-            '`%1$s`.fieldname IN (%2$s) AND `%1$s`.src_id = o_id',
+            '`%1$s`.fieldname IN (%2$s) AND `%1$s`.src_id = id',
             $joinName,
             $relationNames
         );

src/CustomerProvider/ObjectNamingScheme/DefaultObjectNamingScheme.php

@@ -102,7 +102,7 @@ public function cleanupEmptyFolders()
         $archiveDir = $this->archiveDir ?: $this->parentPath;
 
         $folders->setCondition(
-            "o_id in (select o_id from (select o_id, o_path, o_key, o_type, (select count(*) from objects where o_parentId = o.o_id) as counter from objects o) as temp where counter=0 and o_type = 'folder' and (o_path like ? or o_path like ?) and o_creationDate < ?)",
+            "id in (select id from (select id, path, key, type, (select count(*) from objects where parentId = o.id) as counter from objects o) as temp where counter=0 and type = 'folder' and (path like ? or path like ?) and creationDate < ?)",
             [
                 str_replace('//', '/', $this->parentPath.'/%'),
                 str_replace('//', '/', $archiveDir .'/%'),

src/DependencyInjection/Configuration.php

@@ -275,7 +275,7 @@ private function buildCustomerListNode()
         ];
 
         $defaultFilterPropertiesEquals = [
-            'id' => 'o_id',
+            'id' => 'id',
             'active' => 'active',
         ];
 
@@ -290,7 +290,7 @@ private function buildCustomerListNode()
                 'lastname'
             ],
             'search' => [
-                'o_id',
+                'id',
                 'idEncoded',
                 'firstname',
                 'lastname',

src/DuplicatesIndex/DefaultMariaDbDuplicatesIndex.php

@@ -101,7 +101,7 @@ public function recreateIndex()
         $customerList = $customerProvider->getList();
 
         $customerProvider->addActiveCondition($customerList);
-        $customerList->setOrderKey('o_id');
+        $customerList->setOrderKey('id');
 
         $paginator = $this->paginator->paginate($customerList);
         $paginator->setItemNumberPerPage(200);
@@ -250,12 +250,12 @@ public function getPotentialDuplicates($page, $pageSize = 100, $declined = false
         if (!is_null($filterCustomerList)) {
             $query = $filterCustomerList->getQueryBuilder()
                 ->resetQueryPart('select')
-                ->select('o_id');
+                ->select('id');
             $joinTable = 'object_' . $filterCustomerList->getClassId();
             $select
                 ->distinct()
-                ->innerJoin(self::POTENTIAL_DUPLICATES_TABLE, $joinTable, $joinTable, 'FIND_IN_SET(o_id, duplicateCustomerIds)')
-                ->andWhere('o_id in (' . $query . ')');
+                ->innerJoin(self::POTENTIAL_DUPLICATES_TABLE, $joinTable, $joinTable, 'FIND_IN_SET(id, duplicateCustomerIds)')
+                ->andWhere('id in (' . $query . ')');
         }
 
         if ($declined) {

src/Helper/Objects.php

@@ -48,14 +48,14 @@ private static function checkObjectKeyHelper(Concrete $object, $origKey = null,
             $list = new \Pimcore\Model\DataObject\Listing;
             $list->setUnpublished(true);
             $list->addConditionParam(
-                'o_path = ? and o_key = ?',
+                'path = ? and key = ?',
                 [(string)$object->getParent() . '/', $object->getKey()]
             );
             $objectId = $object->getId();
             if ($objectId !== null) {
-                $list->addConditionParam('o_id != ?', $object->getId());
+                $list->addConditionParam('id != ?', $object->getId());
             } else {
-                $list->addConditionParam('o_id is not null');
+                $list->addConditionParam('id is not null');
             }
             $list->setLimit(1);
             $list = $list->load();

src/Listing/Filter/Permission.php

@@ -87,14 +87,14 @@ protected function addPermissionFilters(QueryBuilder $queryBuilder)
                 $cPath = $workspace->getCpath();
                 $cPath = $cPath === '/' ? '' : $cPath;
                 // prepare condition to allow sub paths (with wildcard) and path itself (with equation)
-                $condition = sprintf("(CONCAT(o_path,o_key) LIKE '%s/%%' OR CONCAT(o_path,o_key) = '%s')",
+                $condition = sprintf("(CONCAT(path,key) LIKE '%s/%%' OR CONCAT(path,key) = '%s')",
                     $cPath, $cPath);
                 // add allow condition
                 $allowConditions[] = $condition;
             } // if user is not allowed to list content -> add to deny conditions
             else {
                 // prepare condition to allow sub paths (with wildcard) and path itself (with equation)
-                $condition = sprintf("(CONCAT(o_path,o_key) NOT LIKE '%s/%%' AND CONCAT(o_path,o_key) <> '%s')",
+                $condition = sprintf("(CONCAT(path,key) NOT LIKE '%s/%%' AND CONCAT(path,key) <> '%s')",
                     $workspace->getCpath(),
                     $workspace->getCpath());
                 // add allow condition

src/Model/AbstractObjectActivity.php

@@ -52,9 +52,9 @@ public function cmfToArray()
         $result = ObjectToArray::getInstance()->toArray($this);
         unset($result['customer']);
 
-        $result['o_id'] = $this->getId();
-        $result['o_key'] = $this->getKey();
-        $result['o_path'] = $this->getRealFullPath();
+        $result['id'] = $this->getId();
+        $result['key'] = $this->getKey();
+        $result['path'] = $this->getRealFullPath();
 
         return $result;
     }
@@ -72,8 +72,8 @@ public function cmfUpdateData(array $data)
     public static function cmfCreate(array $data, $fromWebservice = false)
     {
         $object = null;
-        if (!empty($data['o_id'])) {
-            $object = self::getById($data['o_id']);
+        if (!empty($data['id'])) {
+            $object = self::getById($data['id']);
         }
 
         if (is_null($object)) {

src/Model/CustomerInterface.php

@@ -24,7 +24,7 @@
 
 /**
  * @method \Pimcore\Model\DataObject\ClassDefinition getClass()
- * @method static setPublished(bool $o_published)
+ * @method static setPublished(bool $published)
  */
 interface CustomerInterface extends ElementInterface
 {

src/Newsletter/ProviderHandler/Mailchimp.php

@@ -493,7 +493,7 @@ protected function getAllExportableSegments()
         $groups = $this->getExportableSegmentGroups();
         $select = $groups->getQueryBuilder()
             ->resetQueryPart('select')
-            ->select('o_id');
+            ->select('id');
 
         $segments = $this->segmentManager->getSegments();
         $segments->addConditionParam('group__id in (' . $select . ')');
@@ -861,7 +861,7 @@ public function doesOtherSubscribedCustomerWithEmailExist($email, $customerId =
         $list = $customerProvider->getList();
         $customerProvider->addActiveCondition($list);
         if ($customerId) {
-            $list->setCondition('trim(lower(email)) = ? and o_id != ?', [trim(strtolower($email)), $customerId]);
+            $list->setCondition('trim(lower(email)) = ? and id != ?', [trim(strtolower($email)), $customerId]);
         } else {
             $list->setCondition('trim(lower(email)) = ?', [trim(strtolower($email))]);
         }

src/Newsletter/Queue/DefaultNewsletterQueue.php

@@ -175,7 +175,7 @@ public function enqueueAllCustomers()
         $customerClassId = $customerProvider->getCustomerClassId();
 
         $sql = sprintf(
-            "insert into %s (SELECT `o_id` AS `customerId`,`email`, 'update' AS `operation`, ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000) AS `modificationDate` FROM `object_%s` WHERE o_published = 1 and o_id not in (select customerId from %s))",
+            "insert into %s (SELECT `id` AS `customerId`,`email`, 'update' AS `operation`, ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000) AS `modificationDate` FROM `object_%s` WHERE published = 1 and id not in (select customerId from %s))",
             self::QUEUE_TABLE,
             $customerClassId,
             self::QUEUE_TABLE

src/RESTApi/CustomersHandler.php

@@ -67,12 +67,12 @@ public function listRecords(Request $request)
             $customers = \Pimcore::getContainer()->get('cmf.customer_provider')->getList();
         }
 
-        $customers->setOrderKey('o_id');
+        $customers->setOrderKey('id');
         $customers->setOrder('asc');
         $customers->setUnpublished(false);
 
         if ($params->getModificationTimestamp()) {
-            $customers->addConditionParam('o_modificationDate > ?', $params->getModificationTimestamp());
+            $customers->addConditionParam('modificationDate > ?', $params->getModificationTimestamp());
         }
 
         $paginator = $this->handlePaginatorParams($customers, $request);

src/RESTApi/SegmentGroupsHandler.php

@@ -40,7 +40,7 @@ public function listRecords(Request $request)
     {
         $list = new CustomerSegmentGroup\Listing();
 
-        $list->setOrderKey('o_id');
+        $list->setOrderKey('id');
         $list->setOrder('asc');
         $list->setUnpublished(false);
 

src/RESTApi/SegmentsHandler.php

@@ -42,7 +42,7 @@ public function listRecords(Request $request)
     {
         $list = new CustomerSegment\Listing();
 
-        $list->setOrderKey('o_id');
+        $list->setOrderKey('id');
         $list->setOrder('asc');
         $list->setUnpublished(false);
 

src/Resources/public/js/startup.js

@@ -209,7 +209,7 @@ pimcore.plugin.customermanagementframework = Class.create({
         var object = event.detail.object;
         var type = event.detail.type;
 
-        if ("object" === type && object.data.general.o_className === pimcore.settings.cmf.customerClassName && pimcore.globalmanager.get("user").isAllowed(ActivityView.config.PERMISSION)) {
+        if ("object" === type && object.data.general.className === pimcore.settings.cmf.customerClassName && pimcore.globalmanager.get("user").isAllowed(ActivityView.config.PERMISSION)) {
             var panel = new ActivityView.ActivityTab(object, type).getPanel();
 
             object.tab.items.items[1].insert(1, panel);
@@ -343,7 +343,7 @@ pimcore.plugin.customermanagementframework = Class.create({
         var addTab = Boolean(pimcore.settings.cmf.segmentAssignment[type][subType]);
 
         if('object' === type && 'folder' !== subType) {
-            addTab &= pimcore.settings.cmf.segmentAssignment[type][subType][element.data.general.o_className];
+            addTab &= pimcore.settings.cmf.segmentAssignment[type][subType][element.data.general.className];
         }
 
         if (!addTab) {