mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-07-31 18:30:20 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master'

Browse Source
This commit is contained in:
Awilum
2013-12-08 21:04:12 +04:00
parent 4ae5fe6ede 31ec9de178
commit 98c618dbaf
7 changed files with 53 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,7 +83,7 @@
<input name="login" class="input-xlarge" type="text" value="<?php echo $user_login; ?>" />
<?php if (Option::get('captcha_installed') == 'true') { ?>
<label><?php echo __('Captcha'); ?><label>
<label><?php echo __('Captcha', 'users'); ?></label>
<input type="text" name="answer" class="input-xlarge">
<?php CryptCaptcha::draw(); ?>
<?php } ?>

66
libraries/Gelato/Image/Image.php
View File

@@ -176,6 +176,7 @@ class Image
$width = (int) $width;
$height = ($height === null) ? null : (int) $height;
$aspect_ratio = ($aspect_ratio === null) ? null : (int) $aspect_ratio;
$xpos = $ypos = 0;
// Resizes the image to {$width}% of the original size
if ($height === null) {
@@ -186,7 +187,7 @@ class Image
} else {
// Resizes the image to the smalles possible dimension while maintaining aspect ratio
if ($aspect_ratio === Image::AUTO) {
if ($aspect_ratio === Image::AUTO || $aspect_ratio === null) {
// Calculate smallest size based on given height and width while maintaining aspect ratio
$percentage = min(($width / $this->width), ($height / $this->height));
@@ -194,6 +195,11 @@ class Image
$new_width = round($this->width * $percentage);
$new_height = round($this->height * $percentage);
if ($aspect_ratio === null) {
$xpos = (int)(($width - $new_width) / 2);
$ypos = (int)(($height - $new_height) / 2);
}
// Resizes the image using the width to maintain aspect ratio
} elseif ($aspect_ratio === Image::WIDTH) {
@@ -216,31 +222,27 @@ class Image
}
}
// Create a new true color image width new width and height
$resized = imagecreatetruecolor($new_width, $new_height);
$transPng = imagecolorallocatealpha($resized, 0, 0, 0, 127);
imagefill($resized, 0, 0, $transPng);
$old_image = $this->image;
// Copy and resize part of an image with resampling
imagecopyresampled($resized, $this->image, 0, 0, 0, 0, $new_width, $new_height, $this->width, $this->height);
// Destroy an image
imagedestroy($this->image);
// Create a new true color image width new width and height
if ($aspect_ratio === null) {
$this->image = imagecreatetruecolor($width, $height);
} else {
$this->image = imagecreatetruecolor($new_width, $new_height);
$transPng = imagecolorallocatealpha($this->image, 0, 0, 0, 127);
imagefill($this->image, 0, 0, $transPng);
}
if ($this->type === IMAGETYPE_PNG) {
$bgcolor = imagecolorallocatealpha($this->image, 0, 0, 0, 127);
} else {
$bgcolor = imagecolorallocate($this->image, 255, 255, 255);
}
imagefill($this->image, 0, 0, $bgcolor);
// Copy and resize part of an image with resampling
imagecopyresampled($this->image, $resized, 0, 0, 0, 0, $new_width, $new_height, $new_width, $new_height);
imagecopyresampled($this->image, $old_image, $xpos, $ypos, 0, 0, $new_width, $new_height, $this->width, $this->height);
// Destroy an image
imagedestroy($resized);
// Save new width and height
$this->width = $new_width;
$this->height = $new_height;
imagedestroy($old_image);
return $this;
}
@@ -271,31 +273,19 @@ class Image
if ($y + $height > $this->height) $height = $this->height - $y;
if ($width <= 0 || $height <= 0) return false;
// Create a new true color image
$crop = imagecreatetruecolor($width, $height);
$transPng = imagecolorallocatealpha($crop, 0, 0, 0, 127);
imagefill($crop, 0, 0, $transPng);
// Copy and resize part of an image with resampling
imagecopyresampled($crop, $this->image, 0, 0, $x, $y, $this->width, $this->height, $this->width, $this->height);
// Destroy an image
imagedestroy($this->image);
$old_image = $this->image;
// Create a new true color image
$this->image = imagecreatetruecolor($width, $height);
$transPng = imagecolorallocatealpha($this->image, 0, 0, 0, 127);
imagefill($this->image, 0, 0, $transPng);
$transparent = imagecolorallocatealpha($this->image, 0, 0, 0, 127);
imagefill($this->image, 0, 0, $transparent);
// Copy and resize part of an image with resampling
imagecopyresampled($this->image, $crop, 0, 0, 0, 0, $width, $height, $width, $height);
imagecopyresampled($this->image, $old_image, 0, 0, 0, 0, $width, $height, $width, $height);
// Destroy an image
imagedestroy($crop);
// Save new width and height
$this->width = $width;
$this->height = $height;
imagedestroy($old_image);
return $this;
}

6
plugins/box/blocks/languages/de.lang.php
View File

@@ -10,7 +10,7 @@
'Create New Block' => 'Erstelle einen neuen Block',
'New Block' => 'Neuer Block',
'Edit Block' => 'Bearbeite Block',
'Save' => 'Save',
'Save' => 'Speichern',
'Save and Exit' => 'Speichern und Schließen',
'Actions' => 'Aktionen',
'Required field' => 'Erforderliches Feld',
@@ -19,9 +19,9 @@
'Delete block: :block' => 'Lösche Block: :block',
'Block content' => 'Block-Inhalt',
'Block <i>:name</i> deleted' => 'Block <i>:name</i> gelöscht',
'Your changes to the block <i>:name</i> have been saved.' => 'Deine Änderungen für den Block <i>:name</i> wurden übernommen.',
'Your changes to the block <i>:name</i> have been saved.' => 'Deine Änderungen für den Block <i>:name</i> wurden gespeichert.',
'Delete block: :block' => 'Lösche Block: :block',
'View Embed Code' => 'View Embed Code',
'View Embed Code' => 'Zeige Embed Code',
'Embed Code' => 'Embed Code',
'Shortcode' => 'Shortcode',
'PHP Code' => 'PHP Code',

10
plugins/box/pages/views/frontend/available_pages.view.php
View File

@@ -1,5 +1,11 @@
<ul>
<?php foreach ($pages as $page) { ?>
<?php
foreach ($pages as $page) {
if ($page['status'] == 'published') {
?>
<li><a href="<?php echo $page['parent'].'/'.$page['slug']; ?>"><?php echo $page['title']; ?></a></li>
<?php } ?>
<?php
}
}
?>
</ul>

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

@@ -8,12 +8,12 @@
'Password' => 'Passwort',
'Registered' => 'Registriert',
'Email' => 'Email',
'Role' => 'Rolle',
'Roles' => 'Rollen',
'Role' => 'Funktion',
'Roles' => 'Funktionen',
'Edit' => 'Bearbeiten',
'Actions' => 'Aktionen',
'Delete' => 'Löschen',
'Log In' => 'Log In',
'Log In' => 'Einloggen',
'Log Out' => 'Ausloggen',
'Register New User' => 'Registriere Neuen Benutzer',
'New User Registration' => 'Neuen Benutzer registrieren',
@@ -40,7 +40,7 @@
'Captcha' => 'Captcha',
'Registration' => 'Registrierung',
'Username' => 'Benutzername',
'User email is invalid' => 'Benutzer Email ist nicht gültig',
'User email is invalid' => 'Benutzer-Email ist nicht gültig',
'Reset Password' => 'Passwort zurücksetzen',
'Send New Password' => 'Neues Passwort zusenden',
'This user doesnt alredy exist' => 'Dieser Benutzer ist nocht nicht vorhanden',

2
plugins/box/users/views/frontend/password_reset.view.php
View File

@@ -16,7 +16,7 @@
?>
<?php if (Option::get('captcha_installed') == 'true') { ?>
<label><?php echo __('Captcha'); ?><label>
<label><?php echo __('Captcha', 'users'); ?></label>
<input type="text" name="answer" class="input-large"><?php if (isset($errors['users_captcha_wrong'])) echo Html::nbsp(3).'<span class="error">'.$errors['users_captcha_wrong'].'</span>'; ?>
<?php CryptCaptcha::draw(); ?>
<?php } ?>

2
plugins/box/users/views/frontend/registration.view.php
View File

@@ -21,7 +21,7 @@
if (isset($errors['users_invalid_email'])) echo Html::nbsp(3).'<span class="error">'.$errors['users_invalid_email'].'</span>';
?>
<?php if (Option::get('captcha_installed') == 'true') { ?>
<label><?php echo __('Captcha'); ?><label>
<label><?php echo __('Captcha', 'users'); ?></label>
<input type="text" name="answer" class="input-large"><?php if (isset($errors['users_captcha_wrong'])) echo Html::nbsp(3).'<span class="error">'.$errors['users_captcha_wrong'].'</span>'; ?>
<?php CryptCaptcha::draw(); ?>
<?php } ?>