diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 89086dcfe5..5ef5499761 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -469,7 +469,14 @@ function procModule()
// get type, kind
$type = $xml_info->action->{$this->act}->type;
$ruleset = $xml_info->action->{$this->act}->ruleset;
+ $meta_noindex = $xml_info->action->{$this->act}->meta_noindex;
$kind = stripos($this->act, 'admin') !== FALSE ? 'admin' : '';
+
+ if ($meta_noindex === 'true')
+ {
+ Context::addMetaTag('robots', 'noindex');
+ }
+
if(!$kind && $this->module == 'admin')
{
$kind = 'admin';
@@ -597,6 +604,7 @@ function procModule()
$forward->module = $module;
$forward->type = $xml_info->action->{$this->act}->type;
$forward->ruleset = $xml_info->action->{$this->act}->ruleset;
+ $forward->meta_noindex = $xml_info->action->{$this->act}->meta_noindex;
$forward->act = $this->act;
}
else
@@ -624,6 +632,10 @@ function procModule()
$tpl_path = $oModule->getTemplatePath();
$orig_module = $oModule;
+ if($forward->meta_noindex === 'true') {
+ Context::addMetaTag('robots', 'noindex');
+ }
+
$xml_info = $oModuleModel->getModuleActionXml($forward->module);
// check CSRF for non-GET actions
@@ -838,6 +850,10 @@ function procModule()
}
}
+ if ($kind === 'admin') {
+ Context::addMetaTag('robots', 'noindex');
+ }
+
// if failed message exists in session, set context
$this->_setInputErrorToContext();
diff --git a/modules/board/conf/module.xml b/modules/board/conf/module.xml
index 12ffae0723..c5d9aebffe 100644
--- a/modules/board/conf/module.xml
+++ b/modules/board/conf/module.xml
@@ -70,14 +70,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/modules/communication/conf/module.xml b/modules/communication/conf/module.xml
index a5a6d40398..f186e52ab1 100644
--- a/modules/communication/conf/module.xml
+++ b/modules/communication/conf/module.xml
@@ -26,14 +26,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/modules/document/conf/module.xml b/modules/document/conf/module.xml
index 224214889d..628198edc5 100644
--- a/modules/document/conf/module.xml
+++ b/modules/document/conf/module.xml
@@ -23,16 +23,16 @@
-
-
-
+
+
+
-
+
diff --git a/modules/editor/conf/module.xml b/modules/editor/conf/module.xml
index 4729cfdae0..156969e206 100644
--- a/modules/editor/conf/module.xml
+++ b/modules/editor/conf/module.xml
@@ -3,14 +3,16 @@
-
-
+
+
+
+
+
+
-
-
-
+
diff --git a/modules/install/conf/module.xml b/modules/install/conf/module.xml
index 15406e7776..cc773f0753 100644
--- a/modules/install/conf/module.xml
+++ b/modules/install/conf/module.xml
@@ -3,13 +3,14 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/modules/integration_search/conf/module.xml b/modules/integration_search/conf/module.xml
index 1905bad28e..efb68dd6b4 100644
--- a/modules/integration_search/conf/module.xml
+++ b/modules/integration_search/conf/module.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/modules/krzip/conf/module.xml b/modules/krzip/conf/module.xml
index 73e81d3a3f..b4a9522e05 100644
--- a/modules/krzip/conf/module.xml
+++ b/modules/krzip/conf/module.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/modules/layout/conf/module.xml b/modules/layout/conf/module.xml
index 4d77e9327d..2e92e67e1b 100644
--- a/modules/layout/conf/module.xml
+++ b/modules/layout/conf/module.xml
@@ -7,9 +7,9 @@
-
-
-
+
+
+
diff --git a/modules/member/conf/module.xml b/modules/member/conf/module.xml
index 55eb7cf695..a7778bb856 100644
--- a/modules/member/conf/module.xml
+++ b/modules/member/conf/module.xml
@@ -35,24 +35,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/modules/message/conf/module.xml b/modules/message/conf/module.xml
index 8e0983931c..2c59c85dfa 100644
--- a/modules/message/conf/module.xml
+++ b/modules/message/conf/module.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/modules/module/conf/module.xml b/modules/module/conf/module.xml
index 8b045614f0..9b671f6a06 100644
--- a/modules/module/conf/module.xml
+++ b/modules/module/conf/module.xml
@@ -21,11 +21,11 @@
-
-
+
+
-
-
+
+
diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index c550550b7f..f8e11270dc 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -935,6 +935,7 @@ function getModuleActionXml($module)
$ruleset = $action->attrs->ruleset?$action->attrs->ruleset:'';
$method = $action->attrs->method?$action->attrs->method:'';
$check_csrf = $action->attrs->check_csrf=='false'?'false':'true';
+ $meta_noindex = $action->attrs->{'meta-noindex'} === 'true' ? 'true' : 'false';
$index = $action->attrs->index;
$admin_index = $action->attrs->admin_index;
@@ -949,6 +950,7 @@ function getModuleActionXml($module)
$info->action->{$name}->ruleset = $ruleset;
$info->action->{$name}->method = $method;
$info->action->{$name}->check_csrf = $check_csrf;
+ $info->action->{$name}->meta_noindex = $meta_noindex;
if($action->attrs->menu_name)
{
if($menu_index == 'true')
@@ -973,6 +975,7 @@ function getModuleActionXml($module)
$buff[] = sprintf('$info->action->%s->ruleset=\'%s\';', $name, $ruleset);
$buff[] = sprintf('$info->action->%s->method=\'%s\';', $name, $method);
$buff[] = sprintf('$info->action->%s->check_csrf=\'%s\';', $name, $check_csrf);
+ $buff[] = sprintf('$info->action->%s->meta_noindex=\'%s\';', $name, $meta_noindex);
if($index=='true')
{
diff --git a/modules/widget/conf/module.xml b/modules/widget/conf/module.xml
index 34d9f07bfb..4ec24ede79 100644
--- a/modules/widget/conf/module.xml
+++ b/modules/widget/conf/module.xml
@@ -15,10 +15,10 @@
-
-
-
-
+
+
+
+