Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/dleffler/exponent-cms
Browse files Browse the repository at this point in the history
  • Loading branch information
@illiphilli
illiphilli committed Mar 10, 2011
2 parents 8a0d0bf + 787eafc commit e57977f
Show file tree
Hide file tree
Showing 32 changed files with 714 additions and 114 deletions.
45 changes: 25 additions & 20 deletions datatypes/formbuilder_form.php
View file
Expand Up @@ -50,36 +50,41 @@ function form($object) {
$form->register('response',$i18n['response'],new htmleditorcontrol($object->response));
}

$form->register(null,'', new htmlcontrol('<br><br><b>'.$i18n['button_header'].'</b><br><hr><br>'));
$form->register(null,'', new htmlcontrol('<h3>'.$i18n['button_header'].'</h3><hr size="1" />'));
$form->register('submitbtn',$i18n['submitbtn'], new textcontrol($object->submitbtn));
$form->register('resetbtn',$i18n['resetbtn'], new textcontrol($object->resetbtn));
$form->register(null,'', new htmlcontrol('<br><br><b>'.$i18n['email_header'].'</b><br><hr><br>'));
$form->register(null,'', new htmlcontrol('<h3>'.$i18n['email_header'].'</h3><hr size="1" />'));
$form->register('is_email',$i18n['is_email'],new checkboxcontrol($object->is_email,false));

$userlist = array();
// Get User list
$userlist = array();
$users = exponent_users_getAllUsers();
foreach ($users as $locuser) {
$userlist[$locuser->id] = $locuser->username;
}
$defaults = array();
foreach ($db->selectObjects('formbuilder_address','form_id='.$object->id.' and user_id != 0') as $address) {
$locuser = exponent_users_getUserById($address->user_id);
$defaults[$locuser->id] = $locuser->username;
}

$defaults[$locuser->id] = $locuser->firstname . ' ' . $locuser->lastname . ' (' . $locuser->username . ')';
}
foreach ($users as $locuser) {
if(!array_key_exists($locuser->id, $defaults)) {
$userlist[$locuser->id] = $locuser->firstname . ' ' . $locuser->lastname . ' (' . $locuser->username . ')';
}
}
$form->register('users',$i18n['users'],new listbuildercontrol($defaults,$userlist));
$groups = exponent_users_getAllGroups();
$grouplist = array();

// Get Group list
$defaults = array();
foreach ($groups as $group) {
$grouplist[$group->id] = $group->name;
}
if ($grouplist != null) {
$grouplist = array();
$groups = exponent_users_getAllGroups();
if ($groups != null) {

foreach ($db->selectObjects('formbuilder_address','form_id='.$object->id.' and group_id != 0') as $address) {
$group = exponent_users_getGroupById($address->group_id);
$defaults[$group->id] = $group->name;
}

foreach ($groups as $group) {
if(!array_key_exists($group->id, $defaults)) {
$grouplist[$group->id] = $group->name;
}
}
$form->register('groups',$i18n['groups'],new listbuildercontrol($defaults,$grouplist));
}

Expand All @@ -90,14 +95,14 @@ function form($object) {

$form->register('addresses',$i18n['addresses'],new listbuildercontrol($defaults,null));
$form->register('subject',$i18n['subject'],new textcontrol($object->subject));
$form->register(null,'', new htmlcontrol('<br /><br /><b>'.$i18n['database_header'].'</b><br /><hr size="1" /><br />'));
$form->register(null,'', new htmlcontrol('<h3>'.$i18n['database_header'].'</h3><hr size="1" /><br />'));
$form->register('is_saved',$i18n['is_saved'],new checkboxcontrol($object->is_saved,false));
$form->register(null,'', new htmlcontrol('<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$i18n['warning_data_loss'].'<br />'));
$form->register(null,'', new htmlcontrol('&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$i18n['warning_data_loss'].'<br />'));
if ($object->is_saved == 1) {
$form->controls['is_saved']->disabled = true;
$form->meta('is_saved','1');
}
$form->register(null,'', new htmlcontrol('<br /><br /><br />'));
// $form->register(null,'', new htmlcontrol('<br /><br /><br />'));
$form->register('submit','',new buttongroupcontrol($i18n['save'],'',$i18n['cancel']));

return $form;
Expand Down
4 changes: 2 additions & 2 deletions datatypes/formbuilder_report.php
View file
Expand Up @@ -36,7 +36,7 @@ function form($object) {

$form->register('name',$i18n['name'],new textcontrol($object->name));
$form->register('description',$i18n['description'],new texteditorcontrol($object->description));
$form->register(null,'', new htmlcontrol('<br /><br />'.$i18n['blank_report_message'].'<br /><br />'));
$form->register(null,'', new htmlcontrol($i18n['blank_report_message']));
$form->register('text',$i18n['text'],new htmleditorcontrol($object->text));

$fields = array();
Expand Down Expand Up @@ -69,7 +69,7 @@ function form($object) {
}

$form->register('column_names',$i18n['column_names'], new listbuildercontrol($column_names,$fields));
$form->register(null,'', new htmlcontrol('<br /><br /><br />'));
// $form->register(null,'', new htmlcontrol('<br /><br /><br />'));
$form->register('submit','',new buttongroupcontrol($i18n['save'],'',$i18n['cancel']));
return $form;
}
Expand Down
Binary file added framework/core/assets/images/ajax-loader.gif
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added framework/core/assets/images/down.disabled.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added framework/core/assets/images/up.disabled.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 8 additions & 2 deletions framework/core/subsystems/expRouter.php 100644 → 100755
View file
Expand Up @@ -592,10 +592,16 @@ private function buildSEFPath () {
if (strpos($_SERVER['SERVER_SOFTWARE'],'Apache') === 0 || strpos($_SERVER['SERVER_SOFTWARE'],'WebServerX') === 0) {
switch(php_sapi_name()) {
case "cgi":
$this->sefPath = !empty($_SERVER['REQUEST_URI']) ? urldecode($_SERVER['REQUEST_URI']): null;
$this->sefPath = !empty($_SERVER['REQUEST_URI']) ? urldecode($_SERVER['REQUEST_URI']): null;
break;
case "cgi-fcgi":
$this->sefPath = (isset($_SERVER['REDIRECT_URL']) && $_SERVER['REDIRECT_URL'] != PATH_RELATIVE.'index.php') ? urldecode($_SERVER['REDIRECT_URL']) : urldecode($_ENV['REQUEST_URI']);
if (isset($_SERVER['REDIRECT_URL']) && $_SERVER['REDIRECT_URL'] != PATH_RELATIVE.'index.php') {
$this->sefPath = urldecode($_SERVER['REDIRECT_URL']);
} elseif (!empty($_ENV['REQUEST_URI'])) {
$this->sefPath = urldecode($_ENV['REQUEST_URI']);
} else {
$this->sefPath = urldecode($_SERVER['REQUEST_URI']);
}
break;
default:
$this->sefPath = !empty($_SERVER['REDIRECT_URL']) ? urldecode($_SERVER['REDIRECT_URL']) : null;
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/administration/menus/admin.php
View file
Expand Up @@ -148,7 +148,7 @@
),
array(
'text'=>'Migrate Content',
'url'=>makeLink(array('module'=>'migration','action'=>'analyze_site')),
'url'=>makeLink(array('module'=>'migration','action'=>'manage_content')),
),
array(
'text'=>'Migrate Users/Groups',
Expand Down

0 comments on commit e57977f

Please sign in to comment.