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

rewrite fix #170

Merged
merged 3 commits into from
Feb 17, 2021
Merged

rewrite fix #170

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6688ec
Merge pull request #7 from smartdatasoft/develop
jonnydhaka Feb 17, 2021
f9b08dd
Merge pull request #8 from smartdatasoft/develop
jonnydhaka Feb 17, 2021
e232a81
fix rewrite again
jonnydhaka Feb 17, 2021
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
184 changes: 103 additions & 81 deletions smartblog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,44 +413,42 @@ public function sampleDataInstall()
$title = 'From Now we are certified web agency';
$slug = 'from-now-we-are-certified-web-agency';
$des = 'Smartdatasoft is an offshore web development company located in Bangladesh. We are serving this sector since 2010. Our team is committed to develop high quality web based application and theme for our clients and also for the global marketplace. As your web development partner we will assist you in planning, development, implementation and upgrade! Why Smartdatasoft? Smartdatasoft released their first prestashop theme in November 2012. Till now we have 6+ prestashop theme which are getting sold on global renowned marketplace. Those themes are getting used in more than 400 customers eCommerce websites. Those themes are very user friendly and highly customize able from admin dashboard. For these reason these theme are very popular among the end users and developers';
elseif ( $i == 2 ) :
$title = 'What is Bootstrap? – The History and the Hype';
$slug = 'what-is-bootstrap';
$des = 'Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.';
elseif ( $i == 3 ) :
$title = 'Answers to your Questions about PrestaShop 1.6';
$slug = 'question-about-prestashop';
$des = 'Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.';
elseif ( $i == 4 ) :
$title = 'Share the Love for PrestaShop 1.6';
$slug = 'share-love-for-prestashop';
$des = 'Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.';
elseif ( $i == 5 ) :
$title = 'Christmas Sale is here 5';
$slug = 'christmas-sale-is-here';
$des = 'Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.';
elseif ( $i == 6 ) :
$title = 'Christmas Sale is here 6';
$slug = 'christmas-sale-is-here';
$des = 'Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.';
elseif ( $i == 7 ) :
$title = 'Christmas Sale is here 7';
$slug = 'christmas-sale-is-here';
$des = 'Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.';
endif;
foreach ( $languages as $language ) {
if ( ! Db::getInstance()->Execute(
'INSERT INTO `' . _DB_PREFIX_ . 'smart_blog_post_lang`(`id_smart_blog_post`,`id_lang`,`meta_title`,`meta_description`,`short_description`,`content`,`link_rewrite`)
elseif ($i == 2) :
$title = 'What is Bootstrap? – The History and the Hype';
$slug = 'what-is-bootstrap';
$des = 'Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.';
elseif ($i == 3) :
$title = 'Answers to your Questions about PrestaShop 1.6';
$slug = 'question-about-prestashop';
$des = 'Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.';
elseif ($i == 4) :
$title = 'Share the Love for PrestaShop 1.6';
$slug = 'share-love-for-prestashop';
$des = 'Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.';
elseif ($i == 5) :
$title = 'Christmas Sale is here 5';
$slug = 'christmas-sale-is-here';
$des = 'Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.';
elseif ($i == 6) :
$title = 'Christmas Sale is here 6';
$slug = 'christmas-sale-is-here';
$des = 'Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.';
elseif ($i == 7) :
$title = 'Christmas Sale is here 7';
$slug = 'christmas-sale-is-here';
$des = 'Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.';
endif;
foreach ($languages as $language) {
if (!Db::getInstance()->Execute(
'INSERT INTO `' . _DB_PREFIX_ . 'smart_blog_post_lang`(`id_smart_blog_post`,`id_lang`,`meta_title`,`meta_description`,`short_description`,`content`,`link_rewrite`)
VALUES(' . $i . ',' . (int) $language['id_lang'] . ',
"' . htmlspecialchars($title) . '",
"' . htmlspecialchars($des) . '","' . Tools::substr($des, 0, 200) . '","' . htmlspecialchars($des) . '","' . $slug . '"
)'
)
) {
return false;
}
}

)) {
return false;
}
}
}

for ($i = 1; $i <= 4; $i++) {
Expand Down Expand Up @@ -631,34 +629,34 @@ public function getContent()

$html = '';

$this->autoregisterhook( 'moduleRoutes', 'smartblog' );
$this->autoregisterhook( 'vcBeforeInit', 'smartlegendaaddons' );
if ( Tools::isSubmit( 'savesmartblog' ) ) {

Configuration::updateValue( 'smartblogmetatitle', Tools::getvalue( 'smartblogmetatitle' ) );
Configuration::updateValue( 'smartenablecomment', Tools::getvalue( 'smartenablecomment' ) );
Configuration::updateValue( 'smartenableguestcomment', Tools::getvalue( 'smartenableguestcomment' ) );
Configuration::updateValue( 'smartblogmetakeyword', Tools::getvalue( 'smartblogmetakeyword' ) );
Configuration::updateValue( 'smartblogmetadescrip', Tools::getvalue( 'smartblogmetadescrip' ) );
Configuration::updateValue( 'smartpostperpage', Tools::getvalue( 'smartpostperpage' ) );
Configuration::updateValue( 'smartblogrootcat', Tools::getvalue( 'smartblogrootcat' ) );
Configuration::updateValue( 'smartblogurlpattern', Tools::getvalue( 'smartblogurlpattern' ) );
Configuration::updateValue( 'smartacceptcomment', Tools::getvalue( 'smartacceptcomment' ) );
Configuration::updateValue( 'smartcaptchaoption', Tools::getvalue( 'smartcaptchaoption' ) );
Configuration::updateValue( 'smartshowviewed', Tools::getvalue( 'smartshowviewed' ) );
Configuration::updateValue( 'smartdisablecatimg', Tools::getvalue( 'smartdisablecatimg' ) );
Configuration::updateValue( 'smartshowauthorstyle', Tools::getvalue( 'smartshowauthorstyle' ) );
Configuration::updateValue( 'smartshowauthor', Tools::getvalue( 'smartshowauthor' ) );
Configuration::updateValue( 'smartshowcolumn', Tools::getvalue( 'smartshowcolumn' ) );
Configuration::updateValue( 'smartmainblogurl', Tools::getvalue( 'smartmainblogurl' ) );
Configuration::updateValue( 'smartusehtml', Tools::getvalue( 'smartusehtml' ) );
Configuration::updateValue( 'smartshownoimg', Tools::getvalue( 'smartshownoimg' ) );
Configuration::updateValue( 'smartdataformat', Tools::getvalue( 'smartdataformat' ) );
Configuration::updateValue( 'smartcustomcss', Tools::getvalue( 'smartcustomcss' ), true );
Configuration::updateValue( 'smartshowhomepost', Tools::getvalue( 'smartshowhomepost' ) );

$this->processImageUpload( $_FILES );
$html = $this->displayConfirmation( $this->l( 'The settings have been updated successfully.' ) );
$this->autoregisterhook('moduleRoutes', 'smartblog');
$this->autoregisterhook('vcBeforeInit', 'smartlegendaaddons');
if (Tools::isSubmit('savesmartblog')) {

Configuration::updateValue('smartblogmetatitle', Tools::getvalue('smartblogmetatitle'));
Configuration::updateValue('smartenablecomment', Tools::getvalue('smartenablecomment'));
Configuration::updateValue('smartenableguestcomment', Tools::getvalue('smartenableguestcomment'));
Configuration::updateValue('smartblogmetakeyword', Tools::getvalue('smartblogmetakeyword'));
Configuration::updateValue('smartblogmetadescrip', Tools::getvalue('smartblogmetadescrip'));
Configuration::updateValue('smartpostperpage', Tools::getvalue('smartpostperpage'));
Configuration::updateValue('smartblogrootcat', Tools::getvalue('smartblogrootcat'));
Configuration::updateValue('smartblogurlpattern', Tools::getvalue('smartblogurlpattern'));
Configuration::updateValue('smartacceptcomment', Tools::getvalue('smartacceptcomment'));
Configuration::updateValue('smartcaptchaoption', Tools::getvalue('smartcaptchaoption'));
Configuration::updateValue('smartshowviewed', Tools::getvalue('smartshowviewed'));
Configuration::updateValue('smartdisablecatimg', Tools::getvalue('smartdisablecatimg'));
Configuration::updateValue('smartshowauthorstyle', Tools::getvalue('smartshowauthorstyle'));
Configuration::updateValue('smartshowauthor', Tools::getvalue('smartshowauthor'));
Configuration::updateValue('smartshowcolumn', Tools::getvalue('smartshowcolumn'));
Configuration::updateValue('smartmainblogurl', Tools::getvalue('smartmainblogurl'));
Configuration::updateValue('smartusehtml', Tools::getvalue('smartusehtml'));
Configuration::updateValue('smartshownoimg', Tools::getvalue('smartshownoimg'));
Configuration::updateValue('smartdataformat', Tools::getvalue('smartdataformat'));
Configuration::updateValue('smartcustomcss', Tools::getvalue('smartcustomcss'), true);
Configuration::updateValue('smartshowhomepost', Tools::getvalue('smartshowhomepost'));

$this->processImageUpload($_FILES);
$html = $this->displayConfirmation($this->l('The settings have been updated successfully.'));
$helper = $this->SettingForm();
$html .= $feed_url_html;
$html .= $helper->generateForm($this->fields_form);
Expand Down Expand Up @@ -1232,13 +1230,13 @@ public static function GetSmartBlogLink($rewrite = 'smartblog', $params = null,
$dispatcher = Dispatcher::getInstance();
$id_lang = (int) Context::getContext()->language->id;

$force_routes = (bool) Configuration::get( 'PS_REWRITING_SETTINGS' );
if ( Tools::isSubmit( 'savesmartblog' ) ) {
return $url . Tools::getvalue( 'smartmainblogurl' );
$force_routes = (bool) Configuration::get('PS_REWRITING_SETTINGS');
if (Tools::isSubmit('savesmartblog')) {
return $url . Tools::getvalue('smartmainblogurl');
}

if ( $params != null ) {
return $url . $dispatcher->createUrl( $rewrite, $id_lang, $params, $force_routes );
if ($params != null) {
return $url . $dispatcher->createUrl($rewrite, $id_lang, $params, $force_routes);
} else {
$params = array();
return $url . $dispatcher->createUrl($rewrite, $id_lang, $params, $force_routes);
Expand Down Expand Up @@ -1275,7 +1273,7 @@ public function urlPatterWithoutId($alias, $html)
{
$my_link = array(
'smartblog' => array(
'controller' => 'category',
'controller' => 'list',
'rule' => $alias . $html,
'keywords' => array(),
'params' => array(
Expand Down Expand Up @@ -1349,7 +1347,7 @@ public function urlPatterWithoutId($alias, $html)
'module' => 'smartblog',
),
),
'smartblog_category' => array(
'module-smartblog-category' => array(
'controller' => 'category',
'rule' => $alias . '/category/{slug}' . $html,
'keywords' => array(
Expand Down Expand Up @@ -1428,6 +1426,20 @@ public function urlPatterWithoutId($alias, $html)
'module' => 'smartblog',
),
),
'module-smartblog-tagpost' => array(
'controller' => 'tagpost',
'rule' => $alias . '/tag/{tag}' . $html,
'keywords' => array(
'tag' => array(
'regexp' => '[_a-zA-Z0-9-\pL\+]*',
'param' => 'tag',
),
),
'params' => array(
'fc' => 'module',
'module' => 'smartblog',
),
),
'smartblog_tag' => array(
'controller' => 'tagpost',
'rule' => $alias . '/tag/{tag}' . $html,
Expand Down Expand Up @@ -1476,7 +1488,7 @@ public function urlPatterWithoutId($alias, $html)
'module' => 'smartblog',
),
),
'smartblog_post' => array(
'module-smartblog-details' => array(
'controller' => 'details',
'rule' => $alias . '/{slug}' . $html,
'keywords' => array(
Expand All @@ -1496,7 +1508,25 @@ public function urlPatterWithoutId($alias, $html)
'module' => 'smartblog',
),
),
'smartblog_archive' => array(
'module-smartblog-archivemonth' => array(
'controller' => 'archivemonth',
'rule' => $alias . '/archive/{year}/{month}' . $html,
'keywords' => array(
'year' => array(
'regexp' => '',
'param' => 'year',
),
'month' => array(
'regexp' => '',
'param' => 'month',
),
),
'params' => array(
'fc' => 'module',
'module' => 'smartblog',
),
),
'module-smartblog-archive' => array(
'controller' => 'archive',
'rule' => $alias . '/archive' . $html,
'keywords' => array(),
Expand All @@ -1520,7 +1550,7 @@ public function urlPatterWithoutId($alias, $html)
),
),
'smartblog_month' => array(
'controller' => 'archive',
'controller' => 'archivemonth',
'rule' => $alias . '/archive/{year}/{month}' . $html,
'keywords' => array(
'year' => array(
Expand Down Expand Up @@ -1838,15 +1868,7 @@ public function urlPatterWithIdOne($alias, $html)
'module' => 'smartblog',
),
),
'smartblog_archive' => array(
'controller' => 'archive',
'rule' => $alias . '/archive' . $html,
'keywords' => array(),
'params' => array(
'fc' => 'module',
'module' => 'smartblog',
),
),

'smartblog_archive_pagination' => array(
'controller' => 'archive',
'rule' => $alias . '/archive/page/{page}' . $html,
Expand Down