Skip to content
This repository was archived by the owner on Feb 8, 2022. It is now read-only.

Commit f3f8bdb

Browse files
author
Friso Speulman
committed
Revert 6b2f7c0..89ab723
This rolls back to commit 6b2f7c0.
1 parent 89ab723 commit f3f8bdb

File tree

10 files changed

+4
-184
lines changed

10 files changed

+4
-184
lines changed

‎README.md‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
Author: Wieger Sloot at Sterc.nl <modx@sterc.nl>
44
Support: Friso Speulman at Sterc.nl <friso@sterc.nl>
5-
<<<<<<< HEAD
65
Version: 1.0.2
7-
=======
8-
>>>>>>> d130a3b592bd720e7fdeddcfc94223b0350e938b
96

107
### Description
118
MODX SEO Pro is a MODX package that helps you when performing Search Engine Optimization (SEO) in MODX. It enables you to:
@@ -17,21 +14,13 @@ MODX SEO Pro is a MODX package that helps you when performing Search Engine Opti
1714
Install the package
1815

1916
### Placeholders
20-
<<<<<<< HEAD
2117
`[[+seoPro.title]]` Sets the ultimate seo page title.
2218
`[[+seoPro.keywords]]` Add your keywords to the page.
23-
=======
24-
[[+seoPro.title]] Sets the ultimate seo page title.
25-
[[+seoPro.keywords]] Add your keywords to the page.
26-
>>>>>>> d130a3b592bd720e7fdeddcfc94223b0350e938b
2719

2820

2921
### Using a TV for the keywords?
3022
Use this gist to convert the TV values to seoPro https://gist.github.com/hometownlegends/7751607
3123

32-
<<<<<<< HEAD
3324

34-
=======
35-
>>>>>>> d130a3b592bd720e7fdeddcfc94223b0350e938b
3625
### Bugs and Features:
37-
https://github.com/Sterc/SEOPro
26+
https://github.com/Sterc/SEOPro

‎_build/build.transport.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@
1616
define('PKG_NAME_LOWER',strtolower(PKG_NAME));
1717
define('PKG_NAMESPACE',strtolower(PKG_NAME));
1818

19-
<<<<<<< HEAD
2019
define('PKG_VERSION','1.0.2');
21-
=======
22-
define('PKG_VERSION','1.0.0');
23-
>>>>>>> d130a3b592bd720e7fdeddcfc94223b0350e938b
2420
define('PKG_RELEASE','pl');
2521

2622
/* define sources */

‎_build/data/transport.plugin.events.php‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,5 @@
2929
'priority' => 0,
3030
'propertyset' => 0,
3131
),'',true,true);
32-
$events['OnLoadWebDocument']= $modx->newObject('modPluginEvent');
33-
$events['OnLoadWebDocument']->fromArray(array(
34-
'event' => 'OnLoadWebDocument',
35-
'priority' => 0,
36-
'propertyset' => 0,
37-
),'',true,true);
3832

3933
return $events;

‎_build/data/transport.settings.php‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,6 @@
55
*/
66
$settings = array();
77

8-
<<<<<<< HEAD
9-
=======
10-
// $settings['seopro_help']= $modx->newObject('modSystemSetting');
11-
// $settings['seopro_help']->fromArray(array(
12-
// 'key' => 'seopro_help',
13-
// 'value' => false,
14-
// 'xtype' => 'combo-boolean',
15-
// 'namespace' => 'seopro',
16-
// 'area' => 'general',
17-
// ),'',true,true);
18-
19-
// $settings['seopro_helpurl']= $modx->newObject('modSystemSetting');
20-
// $settings['seopro_helpurl']->fromArray(array(
21-
// 'key' => 'seopro_helpurl',
22-
// 'value' => 'http://docs.sterc.nl/packages/seopro/help.html',
23-
// 'xtype' => 'textfield',
24-
// 'namespace' => 'seopro',
25-
// 'area' => 'general',
26-
// ),'',true,true);
27-
28-
>>>>>>> d130a3b592bd720e7fdeddcfc94223b0350e938b
298
$settings['seopro.delimiter']= $modx->newObject('modSystemSetting');
309
$settings['seopro.delimiter']->fromArray(array(
3110
'key' => 'seopro.delimiter',
@@ -50,7 +29,6 @@
5029
'namespace' => 'seopro',
5130
'area' => 'general',
5231
),'',true,true);
53-
<<<<<<< HEAD
5432
$settings['seopro.usesitename']= $modx->newObject('modSystemSetting');
5533
$settings['seopro.usesitename']->fromArray(array(
5634
'key' => 'seopro.usesitename',
@@ -67,6 +45,4 @@
6745
'namespace' => 'seopro',
6846
'area' => 'general',
6947
),'',true,true);
70-
=======
71-
>>>>>>> d130a3b592bd720e7fdeddcfc94223b0350e938b
7248
return $settings;

‎assets/components/seopro/js/mgr/seopro.js‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -157,31 +157,22 @@ Ext.extend(seoPro, Ext.Component, {
157157
switch (field) {
158158
case 'pagetitle':
159159
case 'longtitle':
160-
<<<<<<< HEAD
161160
var title,siteName;
162161
var delimiter = MODx.isEmpty(MODx.config['seopro.delimiter']) ? '|' : MODx.config['seopro.delimiter'];
163162
var siteNameToggle = MODx.isEmpty(MODx.config['seopro.delimiter']) ? '|' : MODx.config['seopro.delimiter'];
164163
var siteNameShow = MODx.isEmpty(MODx.config['seopro.usesitename']) ? false : true;
165-
=======
166-
var title;
167-
var delimiter = MODx.isEmpty(MODx.config['seopro.delimiter']) ? '|' : MODx.config['seopro.delimiter'];
168-
>>>>>>> d130a3b592bd720e7fdeddcfc94223b0350e938b
169164
if (MODx.isEmpty(seoPro.config.values['longtitle'])) {
170165
title = seoPro.config.values['pagetitle'];
171166
} else {
172167
title = seoPro.config.values['longtitle'];
173168
}
174-
<<<<<<< HEAD
175169

176170
if(siteNameShow){
177171
siteName = ' ' + delimiter + ' ' + MODx.config.site_name;
178172
}else{
179173
siteName = ' ';
180174
}
181175
Ext.get('seopro-google-title').dom.innerHTML = title + siteName;
182-
=======
183-
Ext.get('seopro-google-title').dom.innerHTML = title + ' ' + delimiter + ' ' + MODx.config.site_name;
184-
>>>>>>> d130a3b592bd720e7fdeddcfc94223b0350e938b
185176
break;
186177
case 'description':
187178
case 'introtext':
@@ -206,14 +197,10 @@ Ext.extend(seoPro, Ext.Component, {
206197
});
207198
Ext.reg('seopro', seoPro);
208199

209-
<<<<<<< HEAD
210200
seoPro = new seoPro();
211201

212202
Ext.onReady(function() {
213203
if (!seoPro.config.loaded) {
214204
seoPro.initialize();
215205
}
216206
});
217-
=======
218-
seoPro = new seoPro();
219-
>>>>>>> d130a3b592bd720e7fdeddcfc94223b0350e938b

‎core/components/seopro/docs/readme.txt‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
--------------------
22
seoPro
33
--------------------
4-
<<<<<<< HEAD
54
Version: 1.0.2 PL
6-
=======
7-
Version: 1.0.0 PL
8-
>>>>>>> d130a3b592bd720e7fdeddcfc94223b0350e938b
95
Author: Wieger Sloot <wieger@sterc.nl>
106
Support: Friso Speulman <friso@sterc.nl>
117
--------------------
@@ -18,11 +14,7 @@ MODX SEO Pro is a MODX package that helps you when performing Search Engine Opti
1814

1915

2016
Using a TV for the keywords?
21-
<<<<<<< HEAD
2217
Use this gist to convert the TV values to seoPro https://gist.github.com/frisospeulman/7751607
23-
=======
24-
Use this gist to convert the TV values to seoPro https://gist.github.com/hometownlegends/7751607
25-
>>>>>>> d130a3b592bd720e7fdeddcfc94223b0350e938b
2618

2719
Bugs and Features:
2820
https://github.com/Sterc/SEOPro

‎core/components/seopro/elements/plugins/seopro.plugin.php‎

Lines changed: 1 addition & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
$seoPro = $modx->getService('seopro', 'seoPro', $modx->getOption('seopro.core_path', null, $modx->getOption('core_path') . 'components/seopro/') . 'model/seopro/', $scriptProperties);
99
if (!($seoPro instanceof seoPro))
1010
return '';
11-
<<<<<<< HEAD
1211

1312
switch ($modx->event->name) {
1413
case 'OnDocFormRender':
@@ -86,85 +85,6 @@
8685
$newSeoKeywords->save();
8786
break;
8887

89-
=======
90-
91-
switch ($modx->event->name) {
92-
case 'OnDocFormRender':
93-
$currClassKey = $resource->get('class_key');
94-
$strFields = $modx->getOption('seopro.fields', null, 'pagetitle:70,longtitle:70,description:155,alias:2023,menutitle:2023');
95-
$arrFields = array();
96-
if (is_array(explode(',', $strFields))) {
97-
foreach (explode(',', $strFields) as $field) {
98-
list($fieldName, $fieldCount) = explode(':', $field);
99-
$arrFields[$fieldName] = $fieldCount;
100-
}
101-
} else {
102-
return '';
103-
}
104-
105-
$keywords = '';
106-
$modx->controller->addLexiconTopic('seopro:default');
107-
if ($_REQUEST['id'] && $_REQUEST['a'] == 30) {
108-
$url = $modx->makeUrl($resource->get('id'), '', '', 'full');
109-
$url = str_replace($resource->get('alias'), '<span id=\"seopro-replace-alias\">' . $resource->get('alias') . '</span>', $url);
110-
$seoKeywords = $modx->getObject('seoKeywords', array('resource' => $resource->get('id')));
111-
if ($seoKeywords) {
112-
$keywords = $seoKeywords->get('keywords');
113-
}
114-
} elseif ($_REQUEST['a'] == 55) {
115-
if ($_REQUEST['id']) {
116-
$url = $modx->makeUrl($_REQUEST['id'], '', '', 'full');
117-
$url .= '/<span id=\"seopro-replace-alias\"></span>';
118-
} else {
119-
$url = $modx->getOption('site_url') . '<span id=\"seopro-replace-alias\"></span>';
120-
}
121-
}
122-
123-
if ($_REQUEST['id'] == $modx->getOption('site_start')) {
124-
unset($arrFields['alias']);
125-
unset($arrFields['menutitle']);
126-
}
127-
128-
129-
$config = $seoPro->config;
130-
unset($config['resource']);
131-
$modx->regClientStartupHTMLBlock('<script type="text/javascript">
132-
Ext.onReady(function() {
133-
seoPro.config = ' . $modx->toJSON($config) . ';
134-
seoPro.config.record = "' . $keywords . '";
135-
seoPro.config.values = {};
136-
seoPro.config.fields = "' . implode(",", array_keys($arrFields)) . '";
137-
seoPro.config.chars = ' . $modx->toJSON($arrFields) . '
138-
seoPro.config.url = "' . $url . '";
139-
});
140-
</script>');
141-
$modx->regClientCSS($seoPro->config['assetsUrl'] . 'css/mgr.css');
142-
$modx->regClientStartupScript($seoPro->config['assetsUrl'] . 'js/mgr/seopro.js??v=' . $modx->getOption('seopro.version',null,'v1.0.0'));
143-
$modx->regClientStartupScript($seoPro->config['assetsUrl'] . 'js/mgr/resource.js?v=' . $modx->getOption('seopro.version',null,'v1.0.0'));
144-
145-
break;
146-
147-
case 'OnDocFormSave':
148-
$seoKeywords = $modx->getObject('seoKeywords', array('resource' => $_POST['id']));
149-
if (!$seoKeywords) {
150-
$seoKeywords = $modx->newObject('seoKeywords', array('resource' => $_POST['id']));
151-
}
152-
$seoKeywords->set('keywords', trim($_POST['keywords'], ','));
153-
$seoKeywords->save();
154-
break;
155-
156-
case 'onResourceDuplicate':
157-
$seoKeywords = $modx->getObject('seoKeywords', array('resource' => $resource->get('id')));
158-
if (!$seoKeywords) {
159-
$seoKeywords = $modx->newObject('seoKeywords', array('resource' => $resource->get('id')));
160-
}
161-
$newSeoKeywords = $modx->newObject('seoKeywords');
162-
$newSeoKeywords->fromArray($seoKeywords->toArray());
163-
$newSeoKeywords->set('resource', $newResource->get('id'));
164-
$newSeoKeywords->save();
165-
break;
166-
167-
>>>>>>> d130a3b592bd720e7fdeddcfc94223b0350e938b
16888
case 'OnLoadWebDocument':
16989
if ($modx->context->get('key') == "mgr") {
17090
break;
@@ -174,23 +94,15 @@
17494
$keyWords = $seoKeywords->get('keywords');
17595
$modx->setPlaceholder('seoPro.keywords', $keyWords);
17696
}
177-
<<<<<<< HEAD
17897
$siteBranding = (boolean) $modx->getOption('seopro.allowbranding', null, true);
17998
$siteDelimiter = $modx->getOption('seopro.delimiter', null, '/');
18099
$siteUseSitename = (boolean) $modx->getOption('seopro.usesitename', null, true);
181100
$siteID = $modx->resource->get('id');
182101
$siteName = $modx->getOption('site_name');
183-
=======
184-
$siteBranding = (boolean) $modx->getOption('allowbranding', null, true);
185-
$siteID = $modx->resource->get('id');
186-
$siteName = $modx->getOption('site_name');
187-
$siteDelimiter = $modx->getOption('seopro.delimiter', null, '/');
188-
>>>>>>> d130a3b592bd720e7fdeddcfc94223b0350e938b
189102
$longtitle = $modx->resource->get('longtitle');
190103
$pagetitle = $modx->resource->get('pagetitle');
191104
$seoProTitle = array();
192105
if ($siteID == $modx->getOption('site_start')) {
193-
<<<<<<< HEAD
194106
$seoProTitle['pagetitle'] = !empty($longtitle) ? $longtitle : $siteName;
195107
} else {
196108
$seoProTitle['pagetitle'] = !empty($longtitle) ? $longtitle : $pagetitle;
@@ -202,17 +114,6 @@
202114
$modx->setPlaceholder('seoPro.title', implode(" ", $seoProTitle));
203115
if ($siteBranding) {
204116
$modx->regClientStartupHTMLBlock('<!-- This site is optimized with the Sterc seoPro plugin ' . $modx->getOption('seopro.version', null, 'v1.0.0') . ' - http://www.sterc.nl/modx/seopro -->');
205-
=======
206-
$seoProTitle['pagetitle'] = !empty($longtitle)? $longtitle:$siteName;
207-
} else {
208-
$seoProTitle['pagetitle'] = !empty($longtitle)? $longtitle:$pagetitle;
209-
$seoProTitle['delimiter'] = $siteDelimiter;
210-
$seoProTitle['sitename'] = $siteName;
211-
}
212-
$modx->setPlaceholder('seoPro.title', implode(" ", $seoProTitle));
213-
if ($siteBranding) {
214-
$modx->regClientStartupHTMLBlock('<!-- This site is optimized with the Sterc seoPro plugin '.$modx->getOption('seopro.version',null,'v1.0.0').' - http://www.sterc.nl/modx/seopro -->');
215-
>>>>>>> d130a3b592bd720e7fdeddcfc94223b0350e938b
216117
}
217118
break;
218-
}
119+
}

‎core/components/seopro/lexicon/en/default.inc.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,5 @@
1616
$_lang['setting_seopro.version_desc']= 'Current '.$_lang['setting_seopro.version'];
1717
$_lang['setting_seopro.allowbranding'] =' Allow Sterc branding in head.';
1818
$_lang['setting_seopro.allowbranding_desc']= 'Give us some love...';
19-
<<<<<<< HEAD
2019
$_lang['setting_seopro.usesitename'] ='Show sitename in the Google Preview and place in the sitename [[+seoPro.title]]?';
21-
$_lang['setting_seopro.usesitename_desc']= 'If the value is NO the delimiter and sitename setting will be removed from the preview en seo title placeholder';
22-
=======
23-
>>>>>>> d130a3b592bd720e7fdeddcfc94223b0350e938b
20+
$_lang['setting_seopro.usesitename_desc']= 'If the value is NO the delimiter and sitename setting will be removed from the preview en seo title placeholder';

‎core/components/seopro/lexicon/nl/default.inc.php‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,13 @@
88
$_lang['seopro.prevbox'] = 'Voorbeeld in Google';
99
$_lang['seopro.emptymetadescription']='<i>Vul een omschrijving in zodat een preview gemaakt kan worden.</i>';
1010

11-
<<<<<<< HEAD
1211
$_lang['setting_seopro.delimiter'] = 'Scheidingsteken in Google preview.';
1312
$_lang['setting_seopro.delimiter_desc'] = 'Scheidingsteken tussen Titel en sitenaam';
14-
=======
15-
$_lang['setting_seopro.delimiter'] = 'Delimiter in Google preview.';
16-
$_lang['setting_seopro.delimiter_desc'] = 'Delimiter tussen Titel en sitenaam';
17-
>>>>>>> d130a3b592bd720e7fdeddcfc94223b0350e938b
1813
$_lang['setting_seopro.fields'] = 'Velden waarop SEO pro zal werken ';
1914
$_lang['setting_seopro.fields_desc'] = 'Verander deze gegevens alleen als je weet wat je doet. Standaard waarde :pagetitle,longtitle,description,alias,menutitle. SEO Pro werkt niet op het content veld';
2015
$_lang['setting_seopro.version'] ='Versie nummer';
2116
$_lang['setting_seopro.version_desc']= 'Huidige '.$_lang['setting_seopro.version'];
2217
$_lang['setting_seopro.allowbranding'] ='Toestaan van Sterc Branding in de head';
2318
$_lang['setting_seopro.allowbranding_desc']= 'Give us some love...';
24-
<<<<<<< HEAD
2519
$_lang['setting_seopro.usesitename'] ='Site naam tonen in preview en [[+seoPro.title]]?';
26-
$_lang['setting_seopro.usesitename_desc']= 'Als deze op nee staat worden het scheidingsteken en sitenaam niet getoond.';
27-
=======
28-
>>>>>>> d130a3b592bd720e7fdeddcfc94223b0350e938b
20+
$_lang['setting_seopro.usesitename_desc']= 'Als deze op nee staat worden het scheidingsteken en sitenaam niet getoond.';

‎core/components/seopro/lexicon/ru/default.inc.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
$_lang['seopro.tips'] = 'SEO-PRO Советы!';
66
$_lang['seopro.focuskeywords'] = 'Фокусные фразы';
77
$_lang['seopro.focuskeywords_desc'] = 'Разделённые запятой';
8-
<<<<<<< HEAD
98
$_lang['seopro.prevbox'] = 'Как это будет выглядеть в Google?';
10-
=======
11-
$_lang['seopro.prevbox'] = 'Как эта страница будет выглядеть в поисковой выдаче Google:';
12-
>>>>>>> d130a3b592bd720e7fdeddcfc94223b0350e938b
139
$_lang['seopro.emptymetadescription']='<i>Для предварительного просмотра заполните поле Описание</i>';
1410

1511
$_lang['setting_seopro.delimiter'] = 'Разделитель в сниппете Google';

0 commit comments

Comments
 (0)