mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-06 13:16:54 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master'

Browse Source
This commit is contained in:
Awilum
2013-12-22 23:34:50 +02:00
parent 5d430aa2ee 1a1bfabda0
commit b134abb96e
10 changed files with 2946 additions and 3311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/themes/default/login.template.php
View File

@@ -55,7 +55,7 @@
<div class="container form-signin"> <div class="container form-signin">
<div style="text-align:center;"><a class="brand" href="<?php echo Option::get('siteurl'); ?>admin"><img src="<?php echo Option::get('siteurl'); ?>public/assets/img/monstra-logo.png" height="27" width="171"></a></div> <div style="text-align:center;"><a class="brand" href="<?php echo Option::get('siteurl'); ?>admin"><img src="<?php echo Option::get('siteurl'); ?>public/assets/img/monstra-logo.png" height="27" width="171" alt="monstra" /></a></div>
<div class="administration-area"> <div class="administration-area">
<hr> <hr>
<div> <div>

1
changelog.txt
View File

@@ -1,7 +1,6 @@
Monstra 2.3.0, 2013-12-19 Monstra 2.3.0, 2013-12-19
------------------------ ------------------------
- Update Twitter Bootstrap to 2.3.2 - Update Twitter Bootstrap to 2.3.2
- Update PHPMailer to 5.2.7
- Security: Added limits for login attempts #104 - Security: Added limits for login attempts #104
- Security: Obfuscate users email to prevent spam-bots from sniffing it. - Security: Obfuscate users email to prevent spam-bots from sniffing it.
- Core: Added ability to map Monstra Engine Directory. - Core: Added ability to map Monstra Engine Directory.

50
install.php
View File

@@ -295,7 +295,7 @@
<input class="input-xlarge" name="siteurl" type="text" value="<?php echo Html::toText($site_url); ?>" /> <input class="input-xlarge" name="siteurl" type="text" value="<?php echo Html::toText($site_url); ?>" />
<br /> <br />
<label><?php echo __('Username', 'users'); ?></label> <label><?php echo __('Username', 'users'); ?></label>
<input class="input-xlarge" class="login" name="login" value="<?php if(Request::post('login')) echo Html::toText(Request::post('login')); ?>" type="text" /> <input class="input-xlarge login" name="login" value="<?php if(Request::post('login')) echo Html::toText(Request::post('login')); ?>" type="text" />
<br /> <br />
<label><?php echo __('Password', 'users'); ?></label> <label><?php echo __('Password', 'users'); ?></label>
<input class="input-xlarge" name="password" type="password" /> <input class="input-xlarge" name="password" type="password" />
@@ -397,71 +397,71 @@
</form> </form>
</div> </div>
<hr> <hr>
<p align="center"><strong><?php echo __('...Monstra says...', 'system'); ?></strong></p> <p class="text-center"><strong><?php echo __('...Monstra says...', 'system'); ?></strong></p>
<div> <div>
<ul> <ul>
<?php <?php
if (version_compare(PHP_VERSION, "5.2.0", "<")) { if (version_compare(PHP_VERSION, "5.2.0", "<")) {
echo '<span class="error"><li>'.__('PHP 5.2 or greater is required', 'system').'</li></span>'; echo '<li class="error">'.__('PHP 5.2 or greater is required', 'system').'</li>';
} else { } else {
echo '<span class="ok"><li>'.__('PHP Version', 'system').' '.PHP_VERSION.'</li></span>'; echo '<li class="ok">'.__('PHP Version', 'system').' '.PHP_VERSION.'</li>';
} }
if (in_array('SimpleXML', $php_modules)) { if (in_array('SimpleXML', $php_modules)) {
echo '<span class="ok"><li>'.__('Module SimpleXML is installed', 'system').'</li></span>'; echo '<li class="ok">'.__('Module SimpleXML is installed', 'system').'</li>';
} else { } else {
echo '<span class="error"><li>'.__('SimpleXML module is required', 'system').'</li></span>'; echo '<li class="error">'.__('SimpleXML module is required', 'system').'</li>';
} }
if (in_array('dom', $php_modules)) { if (in_array('dom', $php_modules)) {
echo '<span class="ok"><li>'.__('Module DOM is installed', 'system').'</li></span>'; echo '<li class="ok">'.__('Module DOM is installed', 'system').'</li>';
} else { } else {
echo '<span class="error"><li>'.__('Module DOM is required', 'system').'</li></span>'; echo '<li class="error">'.__('Module DOM is required', 'system').'</li>';
} }
if (function_exists('apache_get_modules')) { if (function_exists('apache_get_modules')) {
if ( ! in_array('mod_rewrite',apache_get_modules())) { if ( ! in_array('mod_rewrite',apache_get_modules())) {
echo '<span class="error"><li>'.__('Apache Mod Rewrite is required', 'system').'</li></span>'; echo '<li class="error">'.__('Apache Mod Rewrite is required', 'system').'</li>';
} else { } else {
echo '<span class="ok"><li>'.__('Module Mod Rewrite is installed', 'system').'</li></span>'; echo '<li class="ok">'.__('Module Mod Rewrite is installed', 'system').'</li>';
} }
} else { } else {
echo '<span class="ok"><li>'.__('Module Mod Rewrite is installed', 'system').'</li></span>'; echo '<li class="ok">'.__('Module Mod Rewrite is installed', 'system').'</li>';
} }
foreach ($dir_array as $dir) { foreach ($dir_array as $dir) {
if (is_writable($dir.'/')) { if (is_writable($dir.'/')) {
echo '<span class="ok"><li>'.__('Directory: <b> :dir </b> writable', 'system', array(':dir' => $dir)).'</li></span>'; echo '<li class="ok">'.__('Directory: <b> :dir </b> writable', 'system', array(':dir' => $dir)).'</li>';
} else { } else {
echo '<span class="error"><li>'.__('Directory: <b> :dir </b> not writable', 'system', array(':dir' => $dir)).'</li></span>'; echo '<li class="error">'.__('Directory: <b> :dir </b> not writable', 'system', array(':dir' => $dir)).'</li>';
} }
} }
if (is_writable(__FILE__)) { if (is_writable(__FILE__)) {
echo '<span class="ok"><li>'.__('Install script writable', 'system').'</li></span>'; echo '<li class="ok">'.__('Install script writable', 'system').'</li>';
} else { } else {
echo '<span class="error"><li>'.__('Install script not writable', 'system').'</li></span>'; echo '<li class="error">'.__('Install script not writable', 'system').'</li>';
} }
if (is_writable('sitemap.xml')) { if (is_writable('sitemap.xml')) {
echo '<span class="ok"><li>'.__('Sitemap file writable', 'system').'</li></span>'; echo '<li class="ok">'.__('Sitemap file writable', 'system').'</li>';
} else { } else {
echo '<span class="error"><li>'.__('Sitemap file not writable', 'system').'</li></span>'; echo '<li class="error">'.__('Sitemap file not writable', 'system').'</li>';
} }
if (is_writable('.htaccess')) { if (is_writable('.htaccess')) {
echo '<span class="ok"><li>'.__('Main .htaccess file writable', 'system').'</li></span>'; echo '<li class="ok">'.__('Main .htaccess file writable', 'system').'</li>';
} else { } else {
echo '<span class="error"><li>'.__('Main .htaccess file not writable', 'system').'</li></span>'; echo '<li class="error">'.__('Main .htaccess file not writable', 'system').'</li>';
} }
if (isset($errors['sitename'])) echo '<span class="error"><li>'.$errors['sitename'].'</li></span>'; if (isset($errors['sitename'])) echo '<li class="error">'.$errors['sitename'].'</li>';
if (isset($errors['siteurl'])) echo '<span class="error"><li>'.$errors['siteurl'].'</li></span>'; if (isset($errors['siteurl'])) echo '<li class="error">'.$errors['siteurl'].'</li>';
if (isset($errors['login'])) echo '<span class="error"><li>'.$errors['login'].'</li></span>'; if (isset($errors['login'])) echo '<li class="error">'.$errors['login'].'</li>';
if (isset($errors['password'])) echo '<span class="error"><li>'.$errors['password'].'</li></span>'; if (isset($errors['password'])) echo '<li class="error">'.$errors['password'].'</li>';
if (isset($errors['email'])) echo '<span class="error"><li>'.$errors['email'].'</li></span>'; if (isset($errors['email'])) echo '<li class="error">'.$errors['email'].'</li>';
if (isset($errors['email_valid'])) echo '<span class="error"><li>'.$errors['email_valid'].'</li></span>'; if (isset($errors['email_valid'])) echo '<li class="error">'.$errors['email_valid'].'</li>';
?> ?>
</ul> </ul>
</div> </div>

6171
libraries/PHPMailer/PHPMailer.php
View File

File diff suppressed because it is too large Load Diff

4
plugins/box/filesmanager/languages/de.lang.php
View File

@@ -13,7 +13,7 @@
'Delete file: :file' => 'Lösche Datei: file', 'Delete file: :file' => 'Lösche Datei: file',
'Extension' => 'Dateiendung', 'Extension' => 'Dateiendung',
'Size' => 'Größe', 'Size' => 'Größe',
'Select file' => 'Select file', 'Select file' => 'Datei wählen',
'Change' => 'Change', 'Change' => 'Ändern',
) )
); );

18
plugins/box/sitemap/views/frontend/index.view.php
View File

@@ -3,25 +3,27 @@
<ul> <ul>
<?php <?php
// Display pages // Display pages
if (count($pages_list) > 0) { if (count($pages_list) > 0) {
foreach ($pages_list as $page) { foreach ($pages_list as $page) {
if (trim($page['parent']) !== '') $parent = $page['parent'].'/'; else $parent = ''; if (trim($page['parent']) !== '') $parent = $page['parent'].'/'; else $parent = '';
if (trim($page['parent']) !== '') { echo '<ul>'; } if (trim($page['parent']) !== '') { echo '<ul>'."\n"; }
echo '<li><a href="'.Option::get('siteurl').$parent.$page['slug'].'">'.$page['title'].'</a></li>'; echo '<li><a href="'.Option::get('siteurl').$parent.$page['slug'].'">'.$page['title'].'</a></li>'."\n";
if (trim($page['parent']) !== '') { echo '</ul>'; } if (trim($page['parent']) !== '') { echo '</ul>'."\n"; }
} }
if (count($components) == 0) { echo '<ul>'; } if (count($components) == 0) { echo '<ul>'."\n"; }
} }
// Display components // Display components
if (count($components) > 0) { if (count($components) > 0) {
if (count($pages_list) == 0) { echo '<ul>'; } if (count($pages_list) == 0) { echo '<ul>'."\n"; }
foreach ($components as $component) { foreach ($components as $component) {
echo '<li><a href="'.Option::get('siteurl').$component.'">'.__(ucfirst($component), $component).'</a></li>'; echo '<li><a href="'.Option::get('siteurl').$component.'">'.__(ucfirst($component), $component).'</a></li>'."\n";
} }
echo '</ul>'; if (count($pages_list) == 0) { echo '</ul>'."\n"; }
} }
?> ?>

2
plugins/box/users/languages/de.lang.php
View File

@@ -63,6 +63,6 @@
'Your login details for :site_name' => 'Deine Login-Daten für :site_name', 'Your login details for :site_name' => 'Deine Login-Daten für :site_name',
'About Me' => 'Über Mich', 'About Me' => 'Über Mich',
'Profile' => 'Profil', 'Profile' => 'Profil',
'You are banned for 10 minutes. Try again later' => 'You are banned for 10 minutes. Try again later', 'You are banned for 10 minutes. Try again later' => 'Du wurdest für 10 Minuten blockiert. Bitte probier es später nochmal',
) )
); );

2
public/assets/js/bootstrap.js vendored
View File

@@ -686,7 +686,7 @@
if (!isActive) { if (!isActive) {
if ('ontouchstart' in document.documentElement) { if ('ontouchstart' in document.documentElement) {
// if mobile we we use a backdrop because click events don't delegate // if mobile we use a backdrop because click events don't delegate
$('<div class="dropdown-backdrop"/>').insertBefore($(this)).on('click', clearMenus) $('<div class="dropdown-backdrop"/>').insertBefore($(this)).on('click', clearMenus)
} }
$parent.toggleClass('open') $parent.toggleClass('open')

2
public/themes/default/footer.chunk.php
View File

@@ -1,8 +1,6 @@
<footer> <footer>
<p>
<div style="float:left;"><?php echo Chunk::get('footer-links'); ?></div> <div style="float:left;"><?php echo Chunk::get('footer-links'); ?></div>
<div style="float:right;"><?php Action::run('theme_footer'); ?><?php echo Site::powered(); ?></div> <div style="float:right;"><?php Action::run('theme_footer'); ?><?php echo Site::powered(); ?></div>
</p>
</footer> </footer>
</div> <!-- /container --> </div> <!-- /container -->

5
storage/pages/2.page.txt
View File

@@ -2,19 +2,16 @@
&lt;p&gt;Welcome to your new Monstra powered website.&lt;br&gt;Monstra is succesfully installed, you can start editing the content and customising your site.&lt;/p&gt; &lt;p&gt;Welcome to your new Monstra powered website.&lt;br&gt;Monstra is succesfully installed, you can start editing the content and customising your site.&lt;/p&gt;
&lt;br&gt; &lt;br&gt;
&lt;h4&gt;Getting Started&lt;/h4&gt; &lt;h4&gt;Getting Started&lt;/h4&gt;
&lt;p&gt;This is a default &lt;u&gt;home&lt;/u&gt; page of your website.&lt;br&gt;Here&#039;s a quick description of how to edit this page: &lt;p&gt;This is a default &lt;u&gt;home&lt;/u&gt; page of your website.&lt;br&gt;Here&#039;s a quick description of how to edit this page:&lt;/p&gt;
&lt;ul&gt; &lt;ul&gt;
&lt;li&gt;First make sure you&#039;re &lt;a href=&quot;{siteurl}admin&quot;&gt;logged in.&lt;/a&gt;&lt;/li&gt; &lt;li&gt;First make sure you&#039;re &lt;a href=&quot;{siteurl}admin&quot;&gt;logged in.&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;Go to the &lt;a href=&quot;{siteurl}admin/index.php?id=pages&quot;&gt;Pages Manager&lt;/a&gt; and click &quot;Edit&quot; button for this page.&lt;/li&gt; &lt;li&gt;Go to the &lt;a href=&quot;{siteurl}admin/index.php?id=pages&quot;&gt;Pages Manager&lt;/a&gt; and click &quot;Edit&quot; button for this page.&lt;/li&gt;
&lt;li&gt;Make your changes, click &quot;Save&quot; and you&#039;re done!&lt;/li&gt; &lt;li&gt;Make your changes, click &quot;Save&quot; and you&#039;re done!&lt;/li&gt;
&lt;/ul&gt; &lt;/ul&gt;
&lt;/p&gt;
&lt;br&gt; &lt;br&gt;
&lt;h4&gt;Online Resources&lt;/h4&gt; &lt;h4&gt;Online Resources&lt;/h4&gt;
&lt;p&gt;
&lt;ul&gt; &lt;ul&gt;
&lt;li&gt;&lt;a href=&quot;http://monstra.org&quot;&gt;Official Site&lt;/a&gt;&lt;/li&gt; &lt;li&gt;&lt;a href=&quot;http://monstra.org&quot;&gt;Official Site&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href=&quot;http://forum.monstra.org&quot;&gt;Official Support Forum&lt;/a&gt;&lt;/li&gt; &lt;li&gt;&lt;a href=&quot;http://forum.monstra.org&quot;&gt;Official Support Forum&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href=&quot;http://monstra.org/documentation&quot;&gt;Documentation&lt;/a&gt;&lt;/li&gt; &lt;li&gt;&lt;a href=&quot;http://monstra.org/documentation&quot;&gt;Documentation&lt;/a&gt;&lt;/li&gt;
&lt;/ul&gt; &lt;/ul&gt;
&lt;/p&gt;