Skip to content

Commit

Permalink
Fixed installation login issue which seemed to imply we weren't delet…
Browse files Browse the repository at this point in the history 
…ing 'not_configured' but was actually a login problem as we were setting $user to the valued returned by the login method which was null since it doesn't return anything but simply updates the global $user. Also updates a SLEW of language phrases, etc... in the install/upgrade/configuration screens to better standardize language translation.

[#376 state:resolved owner:dleffler]
  • Loading branch information
@dleffler
dleffler committed Oct 31, 2011
1 parent 254c893 commit f0d17d2
Show file tree
Hide file tree
Showing 46 changed files with 305 additions and 586 deletions.
2 changes: 1 addition & 1 deletion framework/core/expFramework.php
View file
Expand Up @@ -253,7 +253,7 @@ function hotspot($source = null) {
if (!empty($source)) {
global $sectionObj;
//FIXME there is NO 'page' object
$page = new page($sectionObj->id);
$page = new section($sectionObj->id);
$modules = $page->getModulesBySource($source);
//eDebug($modules);exit();

Expand Down
324 changes: 158 additions & 166 deletions framework/core/lang/English - US.php
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion framework/modules-1/common/views/_grouppermissions.tpl
View file
Expand Up @@ -18,7 +18,7 @@
<div class="form_header">
<div class="info-header">
<div class="related-actions">
{help text="Get Help Managing Group Permissions" module="manage-group-permissions"}
{help text="Get Help"|gettext|cat:" "|cat:("Managing Group Permissions"|gettext) module="manage-group-permissions"}
</div>
<h1>{'Assign Group Permissions'|gettext}</h1>
</div>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules-1/common/views/_userpermissions.tpl
View file
Expand Up @@ -18,7 +18,7 @@
<div class="form_header">
<div class="info-header">
<div class="related-actions">
{help text="Get Help Managing User Permissions" module="manage-user-permissions"}
{help text="Get Help"|gettext|cat:" "|cat:("Managing User Permissions"|gettext) module="manage-user-permissions"}
</div>
<h1>{'Assign User Permissions'|gettext}</h1>
</div>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules-1/containermodule/views/_form_edit.tpl
View file
Expand Up @@ -25,7 +25,7 @@
{if $user->is_admin}
<a class="managemodules" href="{link module=expModule action=manage}">{"Manage Active Modules"|gettext}</a>
{/if}
{help text="Get Help with Adding Content" module="how-to-add-modules-to-a-page"}
{help text="Get Help"|gettext|cat:" "|cat:("Adding Page Content"|gettext) module="how-to-add-modules-to-a-page"}
</div>
<h1>{if $is_edit}Edit Module{else}Add New Content{/if}</h1>
</div>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules-1/navigationmodule/views/_form_editContentPage.tpl
View file
Expand Up @@ -20,7 +20,7 @@
<div class="navigationmodule form-editContentPage">
<div class="info-header">
<div class="related-actions">
{help text="Get Help Editing Content Pages" module="edit-content-page"}
{help text="Get Help"|gettext|cat:" "|cat:("Editing Content Pages"|gettext) module="edit-content-page"}
</div>
<h1>{if $is_edit == 1}{'Edit Existing Content Page'|gettext}{else}{'Create New Content Page'|gettext}{/if}</h1>
</div>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules-1/navigationmodule/views/_form_editExternalAlias.tpl
View file
Expand Up @@ -17,7 +17,7 @@
<div class="navigationmodule form-editExternalAliasPage">
<div class="info-header">
<div class="related-actions">
{help text="Get Help Editing External Alias Pages" module="edit-external-page"}
{help text="Get Help"|gettext|cat:" "|cat:("Editing External Alias Pages"|gettext) module="edit-external-page"}
</div>
<h1>{if $is_edit == 1}{'Edit Existing External Alias'|gettext}{else}{'New External Alias'|gettext}{/if}</h1>
</div>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules-1/navigationmodule/views/_form_editInternalAlias.tpl
View file
Expand Up @@ -17,7 +17,7 @@
<div class="navigationmodule form-editInternalAliasPage">
<div class="info-header">
<div class="related-actions">
{help text="Get Help Editing Internal Alias Pages" module="edit-internal-page"}
{help text="Get Help"|gettext|cat:" "|cat:("Editing Internal Alias Pages"|gettext) module="edit-internal-page"}
</div>
<h1>{if $is_edit == 1}{'Edit Existing Internal Alias'|gettext}{else}{'New Internal Alias'|gettext}{/if}</h1>
</div>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules-1/navigationmodule/views/_manager.tpl
View file
Expand Up @@ -18,7 +18,7 @@
<div class="form_header">
<div class="info-header">
<div class="related-actions">
{help text="Get Help Managing Pages" module="manage-all-pages"}
{help text="Get Help"|gettext|cat:" "|cat:("Managing Pages"|gettext) module="manage-all-pages"}
</div>
<h1>{'Manage Pages'|gettext}</h1>
</div>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules-1/navigationmodule/views/_move_standalone.tpl
View file
Expand Up @@ -17,7 +17,7 @@
<div class="navigationmodule form-moveStandalonePage">
<div class="info-header">
<div class="related-actions">
{help text="Get Help Moving Standalone Pages" module="move-standalone-page"}
{help text="Get Help"|gettext|cat:" "|cat:("Moving Standalone Pages"|gettext) module="move-standalone-page"}
</div>
<h1>{'Move Standalone Page'|gettext}</h1>
</div>
Expand Down
32 changes: 16 additions & 16 deletions framework/modules/administration/views/administration/configure_site.tpl
View file
Expand Up @@ -19,7 +19,7 @@
<div class="form_header">
<div class="info-header">
<div class="related-actions">
{help text="Learn More about configuring your website"|gettext page="site-configuration"}
{help text="Get Help"|gettext|cat:" "|cat:("configuring your website"|gettext) page="site-configuration"}
</div>
<h1>{'Configure Website'|gettext}</h1>
</div>
Expand Down Expand Up @@ -47,7 +47,7 @@
<div id="tab1">
<div class="info-header">
<div class="related-actions">
{help text="Learn More about general site configuration"|gettext module="general-configuration"}
{help text="Get Help"|gettext|cat:" "|cat:("general site configuration"|gettext) module="general-configuration"}
</div>
<h2>{"General Site Configuration"|gettext}</h2>
</div>
Expand All @@ -57,13 +57,13 @@
{control type="checkbox" postfalse=1 name="sc[SEF_URLS]" label="Search Engine Friendly URLs?"|gettext checked=$smarty.const.SEF_URLS value=1}
{control type="checkbox" postfalse=1 name="sc[ADVERTISE_RSS]" label="Advertise all RSS Feeds to Web Browsers?"|gettext checked=$smarty.const.ADVERTISE_RSS value=1}
{control type="dropdown" name="sc[SITE_DEFAULT_SECTION]" label="Default Section (Home Page)"|gettext items=$section_dropdown default=$smarty.const.SITE_DEFAULT_SECTION}
{control type="textarea" name="sc[SITE_KEYWORDS]" label='('|cat:'Meta'|gettext|cat:') '|cat:'Keywords'|gettext value=$smarty.const.SITE_KEYWORDS}
{control type="textarea" name="sc[SITE_DESCRIPTION]" label='('|cat:'Meta'|gettext|cat:') '|cat:'Description'|gettext value=$smarty.const.SITE_DESCRIPTION}
{control type="textarea" name="sc[SITE_KEYWORDS]" label='('|cat:('Meta'|gettext)|cat:') '|cat:('Keywords'|gettext) value=$smarty.const.SITE_KEYWORDS}
{control type="textarea" name="sc[SITE_DESCRIPTION]" label='('|cat:('Meta'|gettext)|cat:') '|cat:('Description'|gettext) value=$smarty.const.SITE_DESCRIPTION}
</div>
<div id="tab2">
<div class="info-header">
<div class="related-actions">
{help text="Learn More about anti-spam measures"|gettext module="anti-spam-measures"}
{help text="Get Help"|gettext|cat:" "|cat:("anti-spam measures"|gettext) module="anti-spam-measures"}
</div>
<h2>{gettext str="Anti-Spam Measures"}</h2>
</div>
Expand All @@ -78,7 +78,7 @@
<div id="tab3">
<div class="info-header">
<div class="related-actions">
{help text="Learn More about user registration"|gettext module="user-registration"}
{help text="Get Help"|gettext|cat:" "|cat:("user registration"|gettext) module="user-registration"}
</div>
<h2>{gettext str="User Registration"}</h2>
</div>
Expand All @@ -94,7 +94,7 @@
<div id="tab4">
<div class="info-header">
<div class="related-actions">
{help text="Learn More about user comment policies"|gettext module="user-comment-policies"}
{help text="Get Help"|gettext|cat:" "|cat:("user comment policies"|gettext) module="user-comment-policies"}
</div>
<h2>{gettext str="User Comment Policies"}</h2>
</div>
Expand All @@ -106,7 +106,7 @@
<div id="tab5">
<div class="info-header">
<div class="related-actions">
{help text="Learn More about display settings"|gettext module="display-settings"}
{help text="Get Help"|gettext|cat:" "|cat:("display settings"|gettext) module="display-settings"}
</div>
<h2>{gettext str="Display Settings"}</h2>
</div>
Expand All @@ -127,7 +127,7 @@
<div id="tab6">
<div class="info-header">
<div class="related-actions">
{help text="Learn More about mail server settings"|gettext module="mail-server-settings"}
{help text="Get Help"|gettext|cat:" "|cat:("mail server settings"|gettext) module="mail-server-settings"}
</div>
<h2>{gettext str="Mail Server Settings"}</h2>
</div>
Expand All @@ -144,7 +144,7 @@
<div id="tab7">
<div class="info-header">
<div class="related-actions">
{help text="Learn More about site maintenance mode settings"|gettext module="site-maintenance-mode-settings"}
{help text="Get Help"|gettext|cat:" "|cat:("site maintenance mode settings"|gettext) module="site-maintenance-mode-settings"}
</div>
<h2>{gettext str="Site Maintenance Mode Settings"}</h2>
</div>
Expand All @@ -154,7 +154,7 @@
<div id="tab8">
<div class="info-header">
<div class="related-actions">
{help text="Learn More about security settings"|gettext module="security-settings"}
{help text="Get Help"|gettext|cat:" "|cat:("security settings"|gettext) module="security-settings"}
</div>
<h2>{gettext str="Security Settings"}</h2>
</div>
Expand All @@ -169,7 +169,7 @@
<div id="tab9">
<div class="info-header">
<div class="related-actions">
{help text="Learn More about help link settings"|gettext module="help-link-settings"}
{help text="Get Help"|gettext|cat:" "|cat:("help link settings"|gettext) module="help-link-settings"}
</div>
<h2>{gettext str="Help Link Settings"}</h2>
</div>
Expand All @@ -179,7 +179,7 @@
<div id="tab10">
<div class="info-header">
<div class="related-actions">
{help text="Learn More about WYSIWYG editor settings"|gettext module="wysiwyg-editor-settings"}
{help text="Get Help"|gettext|cat:" "|cat:("WYSIWYG editor settings"|gettext) module="wysiwyg-editor-settings"}
</div>
<h2>{gettext str="WYSIWYG Editor Settings"}</h2>
</div>
Expand All @@ -192,7 +192,7 @@
<div id="tab11">
<div class="info-header">
<div class="related-actions">
{help text="Learn More about error messages"|gettext module="error-messages"}
{help text="Get Help"|gettext|cat:" "|cat:("error messages"|gettext) module="error-messages"}
</div>
<h2>{"Error Messages"|gettext}</h2>
</div>
Expand All @@ -204,7 +204,7 @@
<div id="tab12">
<div class="info-header">
<div class="related-actions">
{help text="Learn More about generating PDF's"|gettext module="pdf-generation"}
{help text="Get Help"|gettext|cat:" "|cat:("generating PDF's"|gettext) module="pdf-generation"}
</div>
<h2>{"PDF Generation"|gettext}</h2>
</div>
Expand All @@ -214,7 +214,7 @@
<div id="tab13">
<div class="info-header">
<div class="related-actions">
{help text="Learn More about minification"|gettext module="minify-configuration"}
{help text="Get Help"|gettext|cat:" "|cat:("minification"|gettext) module="minify-configuration"}
</div>
<h2>{"Minify Configuration"|gettext}</h2>
</div>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/administration/views/administration/manage_themes.tpl
View file
Expand Up @@ -23,7 +23,7 @@

<div class="info-header">
<div class="related-actions">
{help text="Get Help Managing Themes" module="manage-themes"}
{help text="Get Help"|gettext|cat:" "|cat:("Managing Themes"|gettext) module="manage-themes"}
</div>
<h1>{"Theme Manager"|gettext}</h1>
</div>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/administration/views/administration/upload_extension.tpl
View file
Expand Up @@ -16,7 +16,7 @@

<div class="info-header">
<div class="related-actions">
{help text="Get Help Uploading New Extensions" module="upload-extension"}
{help text="Get Help"|gettext|cat:" "|cat:("Uploading New Extensions"|gettext) module="upload-extension"}
</div>
<h1>Upload new Extension</h1>
</div>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/core/views/expHTMLEditor/edit.tpl
View file
Expand Up @@ -17,7 +17,7 @@
<div class="module text edit">
<div class="info-header">
<div class="related-actions">
{help text="Get Help with Toolbar Configuration" module="ckeditor-toolbar-configuration"}
{help text="Get Help"|gettext|cat:" "|cat:("Configuring Toolbars"|gettext) module="ckeditor-toolbar-configuration"}
</div>
{if $record->id != ""}
<h1>Editing CKEditor Toolbar Configuration</h1>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/core/views/expHTMLEditor/manage.tpl
View file
Expand Up @@ -26,7 +26,7 @@
<div class="info-header">
<div class="related-actions">
<a class="add" href="{link module="expHTMLEditor" action="edit"}">{"Create New Configuration"|gettext}</a>
{help text="Get Help Managing CKEditor Toolbars"|gettext module="ckeditor-toolbar-configuration"}
{help text="Get Help"|gettext|cat:" "|cat:("Managing CKEditor Toolbars"|gettext) module="ckeditor-toolbar-configuration"}
</div>
<h1>{"CKEditor Toolbar Manager"|gettext}</h1>
</div>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/core/views/expModule/manage.tpl
View file
Expand Up @@ -58,7 +58,7 @@
<div id="mod-manager" class="module administration modulemanager">
<div class="info-header">
<div class="related-actions">
{help text="Get Help Managing Modules"|gettext module="manage-modules"}
{help text="Get Help"|gettext|cat:" "|cat:("Managing Modules"|gettext) module="manage-modules"}
</div>
<h1>{"Module Manager"|gettext}</h1>
</div>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/file/views/file/picker_cke.tpl
View file
Expand Up @@ -20,7 +20,7 @@
{messagequeue}
<div class="info-header">
<div class="related-actions">
{help text="Get Help with the File Manager" module="file-manager"}
{help text="Get Help"|gettext|cat:" "|cat:("Managing Files"|gettext) module="file-manager"}
</div>
<div id="autocomplete">
<label for="dt_input">Filter by Filename, title, or alt:</label>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/file/views/file/uploader.tpl
View file
Expand Up @@ -29,7 +29,7 @@
<div id="noflash"></div>

<div class="related-actions">
{help text="Get Help with Uploading Files" module="upload-files"}
{help text="Get Help"|gettext|cat:" "|cat:("Uploading Files"|gettext) module="upload-files"}
</div>

</div>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/migration/views/migration/configure.tpl
View file
Expand Up @@ -17,7 +17,7 @@
<div id="migrationconfig" class="module migration configure">
<div class="info-header">
<div class="related-actions">
{help text="Get Help with Migration Database Settings" module="configure-migration-settings"}
{help text="Get Help"|gettext|cat:" "|cat:("Migration Database Settings"|gettext) module="configure-migration-settings"}
</div>
<h1>{"Database Settings to Migrate Your Old Site"|gettext}</h1>
</div>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/migration/views/migration/manage_content.tpl
View file
Expand Up @@ -21,7 +21,7 @@
<div class="module migration manage_content">
<div class="info-header">
<div class="related-actions">
{help text="Get Help with Migrating Content" module="migrate-content"}
{help text="Get Help"|gettext|cat:" "|cat:("Migrating Content"|gettext) module="migrate-content"}
</div>
<h1>{"Migrate Content"|gettext}</h1>
</div>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/migration/views/migration/manage_files.tpl
View file
Expand Up @@ -17,7 +17,7 @@
<div class="module migration manage-files">
<div class="info-header">
<div class="related-actions">
{help text="Get Help with Migrating Files" module="migrate-files"}
{help text="Get Help"|gettext|cat:" "|cat:("Migrating Files"|gettext) module="migrate-files"}
</div>
<h1>{"Migrate Files"|gettext}</h1>
</div>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/migration/views/migration/manage_pages.tpl
View file
Expand Up @@ -21,7 +21,7 @@
<div class="module migration manage-pages">
<div class="info-header">
<div class="related-actions">
{help text="Get Help with Migrating Pages" module="migrate-pages"}
{help text="Get Help"|gettext|cat:" "|cat:("Migrating Pages"|gettext) module="migrate-pages"}
</div>
<h1>{"Migrate Pages"|gettext}</h1>
</div>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/migration/views/migration/manage_users.tpl
View file
Expand Up @@ -21,7 +21,7 @@
<div class="module migration manage-users">
<div class="info-header">
<div class="related-actions">
{help text="Get Help with Migrating Users and Groups" module="migrate-users"}
{help text="Get Help"|gettext|cat:" "|cat:("Migrating Users and Groups"|gettext) module="migrate-users"}
</div>
<h1>{"Migrate Users and Groups"|gettext}</h1>
</div>
Expand Down
11 changes: 9 additions & 2 deletions framework/modules/pixidou/includes/class.upload/class.upload.php
View file
Expand Up @@ -3192,15 +3192,17 @@ function imagetransfer($src_im, $dst_im) {
* If the output format is PNG, then we do it pixel per pixel to retain the alpha channel
*
* @access private
* @param resource $dst_img Destination image
* @param resource $src_img Overlay image
* @param $dst_im
* @param $src_im
* @param int $dst_x x-coordinate of destination point
* @param int $dst_y y-coordinate of destination point
* @param int $src_x x-coordinate of source point
* @param int $src_y y-coordinate of source point
* @param int $src_w Source width
* @param int $src_h Source height
* @param int $pct Optional percentage of the overlay, between 0 and 100 (default: 100)
* @internal param \resource $dst_img Destination image
* @internal param \resource $src_img Overlay image
* @return resource Destination image
*/
function imagecopymergealpha(&$dst_im, &$src_im, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h, $pct = 0) {
Expand Down Expand Up @@ -5011,6 +5013,8 @@ function clean() {
* This function has been written by DHKold, and is used with permission of the author
*
* @access public
* @param $filename
* @return bool|\resource
*/
function imagecreatefrombmp($filename) {
if (! $f1 = fopen($filename,"rb")) return false;
Expand Down Expand Up @@ -5086,6 +5090,9 @@ function imagecreatefrombmp($filename) {
* This function has been published on the PHP website, and can be used freely
*
* @access public
* @param $im
* @param string $filename
* @return bool
*/
function imagebmp(&$im, $filename = "") {

Expand Down
2 changes: 1 addition & 1 deletion framework/modules/users/views/users/change_password.tpl
View file
Expand Up @@ -17,7 +17,7 @@
<div class="module users change-password">
<div class="info-header">
<div class="related-actions">
{help text="Get Help with Changing User Passwords" module="change-my-password"}
{help text="Get Help"|gettext|cat:" "|cat:("Changing User Passwords"|gettext) module="change-my-password"}
</div>
<h1>Change {if $isuser}your{else}{$u->username}'s{/if} password</h1>
</div>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/users/views/users/edituser.tpl
View file
Expand Up @@ -18,7 +18,7 @@
{form action=update}
<div class="info-header">
<div class="related-actions">
{help text="Get Help with User Accounts" module="edit-user"}
{help text="Get Help"|gettext|cat:" "|cat:("Editing User Accounts"|gettext) module="edit-user"}
</div>
{if $edit_user->id == ""}
<h1>Create a New User Account</h1>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/users/views/users/manage.tpl
View file
Expand Up @@ -21,7 +21,7 @@
<div class="module users manage">
<div class="info-header">
<div class="related-actions">
{help text="Get Help Managing Users" module="manage-users"}
{help text="Get Help"|gettext|cat:" "|cat:("Managing Users"|gettext) module="manage-users"}
</div>
<h1>{$moduletitle|default:"Manage Users"}</h1>
</div>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/users/views/users/manage_extensions.tpl
View file
Expand Up @@ -21,7 +21,7 @@
<div class="module users manage-extensions">
<div class="info-header">
<div class="related-actions">
{help text="Get Help Managing User Profile Extensions" module="manage-extensions"}
{help text="Get Help"|gettext|cat:" "|cat:("Managing User Profile Extensions"|gettext) module="manage-extensions"}
</div>
<h1>{"Manage User Profile Extensions"|gettext}</h1>
</div>
Expand Down

0 comments on commit f0d17d2

Please sign in to comment.