summaryrefslogtreecommitdiffstats
path: root/core/include
diff options
context:
space:
mode:
authorThomas Lange <code@nerdmind.de>2017-05-30 21:03:03 +0200
committerThomas Lange <code@nerdmind.de>2017-05-30 21:03:03 +0200
commitfd6af01e313f441189c4cd69668766d2ded7ced3 (patch)
tree0a0ae7cb2dd19c2a52b0799c37bb53b0e5e9e892 /core/include
parent1f1de386b09e48a02fccd62aa82ff319533969cc (diff)
downloadblog-fd6af01e313f441189c4cd69668766d2ded7ced3.tar.gz
blog-fd6af01e313f441189c4cd69668766d2ded7ced3.tar.xz
blog-fd6af01e313f441189c4cd69668766d2ded7ced3.zip
Several changes have been made in this commit, which together with the previous commits result in version 2.2 [changed template parameters]:v2.2
+ Implemented [core]: A new method called "getAll" has been added to the "Attribute" class which now returns all attributes as key->value array. The first parameter can be an array with attribute names which shall be excluded from returning. + Optimization [core]: The function "generateItemData" has been renamed to "generateItemTemplateData" and has been restructured to use the new implemented method "getAll" from the "Attribute" class. + Optimization [core]: The function "generateNaviTemplate" has been added and the functions "generatePageNaviTemplate", "generatePostNaviTemplate" and "generateUserNaviTemplate" have been restructured to make use of the new "generateNaviTemplate" function to reduce duplicate code. + Optimization [core]: Several files within the admin directory has been optimized to use the new "getAll" method of the "Attribute" class. + Optimization [core]: Several code optimizations have been made to the "HTTP" class. + Optimization [admin template]: All occurences of $PAGE['ID'], $POST['ID'] and $USER['ID'] have been replaced with $PAGE['ATTR']['ID'], $POST['ATTR']['ID'] and $USER['ATTR']['ID'] to make it more consistent. You now have to use ['ATTR']['ID'] instead of ['ID'] in your templates to get the ID of an item! Template upgrade to version 2.2 (only for customized templates): SEARCH: ['ID'] REPLACE: ['ATTR']['ID']
Diffstat (limited to 'core/include')
-rw-r--r--core/include/feed/main.php8
-rw-r--r--core/include/page/main.php8
-rw-r--r--core/include/post/main.php8
-rw-r--r--core/include/user/main.php6
4 files changed, 15 insertions, 15 deletions
diff --git a/core/include/feed/main.php b/core/include/feed/main.php
index 671f5c7..8879e72 100644
--- a/core/include/feed/main.php
+++ b/core/include/feed/main.php
@@ -24,8 +24,8 @@ try {
$User = User\Factory::build($Post->attr('user'));
$ItemTemplate = Template\Factory::build('feed/item_post');
- $ItemTemplate->set('POST', generatePostItemData($Post));
- $ItemTemplate->set('USER', generateUserItemData($User));
+ $ItemTemplate->set('POST', generateItemTemplateData($Post));
+ $ItemTemplate->set('USER', generateItemTemplateData($User));
$posts[] = $ItemTemplate;
}
@@ -45,8 +45,8 @@ try {
$User = User\Factory::build($Page->attr('user'));
$ItemTemplate = Template\Factory::build('feed/item_page');
- $ItemTemplate->set('PAGE', generatePageItemData($Page));
- $ItemTemplate->set('USER', generateUserItemData($User));
+ $ItemTemplate->set('PAGE', generateItemTemplateData($Page));
+ $ItemTemplate->set('USER', generateItemTemplateData($User));
$pages[] = $ItemTemplate;
}
diff --git a/core/include/page/main.php b/core/include/page/main.php
index 01579fc..18ba4c8 100644
--- a/core/include/page/main.php
+++ b/core/include/page/main.php
@@ -19,20 +19,20 @@ try {
$User = User\Factory::build($Page->attr('user'));
- $page_data = generatePageItemData($Page);
- $user_data = generateUserItemData($User);
+ $page_data = generateItemTemplateData($Page);
+ $user_data = generateItemTemplateData($User);
#===============================================================================
# Add page data for previous and next page
#===============================================================================
try {
$PrevPage = Page\Factory::build($Page->getPrevID());
- $page_data['PREV'] = generatePageItemData($PrevPage);
+ $page_data['PREV'] = generateItemTemplateData($PrevPage);
} catch(Page\Exception $Exception){}
try {
$NextPage = Page\Factory::build($Page->getNextID());
- $page_data['NEXT'] = generatePageItemData($NextPage);
+ $page_data['NEXT'] = generateItemTemplateData($NextPage);
} catch(Page\Exception $Exception){}
#===============================================================================
diff --git a/core/include/post/main.php b/core/include/post/main.php
index 8cd0a49..f091a4c 100644
--- a/core/include/post/main.php
+++ b/core/include/post/main.php
@@ -19,20 +19,20 @@ try {
$User = User\Factory::build($Post->attr('user'));
- $post_data = generatePostItemData($Post);
- $user_data = generateUserItemData($User);
+ $post_data = generateItemTemplateData($Post);
+ $user_data = generateItemTemplateData($User);
#===============================================================================
# Add post data for previous and next post
#===============================================================================
try {
$PrevPost = Post\Factory::build($Post->getPrevID());
- $post_data['PREV'] = generatePostItemData($PrevPost);
+ $post_data['PREV'] = generateItemTemplateData($PrevPost);
} catch(Post\Exception $Exception){}
try {
$NextPost = Post\Factory::build($Post->getNextID());
- $post_data['NEXT'] = generatePostItemData($NextPost);
+ $post_data['NEXT'] = generateItemTemplateData($NextPost);
} catch(Post\Exception $Exception){}
#===============================================================================
diff --git a/core/include/user/main.php b/core/include/user/main.php
index ba0d07b..b2b054a 100644
--- a/core/include/user/main.php
+++ b/core/include/user/main.php
@@ -17,19 +17,19 @@ try {
$User = User\Factory::build($param);
}
- $user_data = generateUserItemData($User);
+ $user_data = generateItemTemplateData($User);
#===============================================================================
# Add user data for previous and next user
#===============================================================================
try {
$PrevUser = User\Factory::build($User->getPrevID());
- $user_data['PREV'] = generateUserItemData($PrevUser);
+ $user_data['PREV'] = generateItemTemplateData($PrevUser);
} catch(User\Exception $Exception){}
try {
$NextUser = User\Factory::build($User->getNextID());
- $user_data['NEXT'] = generateUserItemData($NextUser);
+ $user_data['NEXT'] = generateItemTemplateData($NextUser);
} catch(User\Exception $Exception){}
#===============================================================================