diff --git a/libraries/icms/view/theme/Object.php b/libraries/icms/view/theme/Object.php index f8d8e1dc4..44fa9a5ba 100644 --- a/libraries/icms/view/theme/Object.php +++ b/libraries/icms/view/theme/Object.php @@ -137,7 +137,7 @@ public function xoInit($options = array()) { : ICMS_THEME_URL . '/' . $this->folderName . '/', 'icms_themecss'=> xoops_getcss($this->folderName), 'icms_requesturi' => htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES), - 'icms_redirect' => htmlspecialchars(trim($_GET['xoops_redirect']), ENT_QUOTES), + 'icms_redirect' => (isset($_GET['xoops_redirect']) ? htmlspecialchars(trim($_GET['xoops_redirect']), ENT_QUOTES) : ''), 'icms_sitename' => htmlspecialchars($icmsConfig['sitename'], ENT_QUOTES), 'icms_slogan' => htmlspecialchars($icmsConfig['slogan'], ENT_QUOTES), 'icms_dirname' => @$icmsModule ? $icmsModule->getVar('dirname') : 'system', diff --git a/modules/formulize/class/forms.php b/modules/formulize/class/forms.php index 31c87d6b4..45ace7d4a 100755 --- a/modules/formulize/class/forms.php +++ b/modules/formulize/class/forms.php @@ -47,6 +47,7 @@ function __construct($id_form="", $includeAllElements=false){ if(!is_numeric($id_form)) { include XOOPS_ROOT_PATH.'/modules/formulize/class/formSetEmptyDefaults.php'; } else { + include XOOPS_ROOT_PATH.'/modules/formulize/class/formSetEmptyDefaults.php'; $formq = q("SELECT * FROM " . $xoopsDB->prefix("formulize_id") . " WHERE id_form=$id_form"); if(!isset($formq[0])) { unset($formq); diff --git a/modules/formulize/include/readelements.php b/modules/formulize/include/readelements.php index 6459e1ff1..5a361b119 100644 --- a/modules/formulize/include/readelements.php +++ b/modules/formulize/include/readelements.php @@ -97,7 +97,7 @@ $uid = $xoopsUser ? $xoopsUser->getVar('uid') : 0; $uid = isset($GLOBALS['userprofile_uid']) ? $GLOBALS['userprofile_uid'] : $uid; // if the userprofile form is in play and a new user has been set, then use that uid -if(!$element_handler) { +if(!isset($element_handler) OR !$element_handler) { $element_handler = xoops_getmodulehandler('elements', 'formulize'); } @@ -397,9 +397,10 @@ synchExistingSubformEntries($overrideFrid); synchSubformBlankDefaults(); - -foreach($notEntriesList['update_entry'] as $updateFid=>$updateEntries) { - $GLOBALS['formulize_snapshotRevisions'][$updateFid] = formulize_getCurrentRevisions($updateFid, $updateEntries); +if(isset($notEntriesList['update_entry'])) { + foreach($notEntriesList['update_entry'] as $updateFid=>$updateEntries) { + $GLOBALS['formulize_snapshotRevisions'][$updateFid] = formulize_getCurrentRevisions($updateFid, $updateEntries); + } } // update the derived values for all forms that we saved data for, now that we've saved all the data from all the forms diff --git a/modules/formulize/initialize.php b/modules/formulize/initialize.php index 63a50fed7..1f1709a25 100644 --- a/modules/formulize/initialize.php +++ b/modules/formulize/initialize.php @@ -147,7 +147,7 @@ $screen_handler =& xoops_getmodulehandler($thisscreen1->getVar('type').'Screen', 'formulize'); $screen = $screen_handler->get($sid); // get the full screen object - if($_POST['ventry'] AND $screen->getVar('type') == 'listOfEntries' AND $screen->getVar("viewentryscreen") != "none" AND $screen->getVar("viewentryscreen") AND !strstr($screen->getVar("viewentryscreen"), "p")) { // if the user is viewing an entry off a list, then check what screen gets used to display entries instead, since that's what we're doing (but only if there is a screen specified, and it's not a pageworks page) + if(isset($_POST['ventry']) AND $_POST['ventry'] AND $screen->getVar('type') == 'listOfEntries' AND $screen->getVar("viewentryscreen") != "none" AND $screen->getVar("viewentryscreen") AND !strstr($screen->getVar("viewentryscreen"), "p")) { // if the user is viewing an entry off a list, then check what screen gets used to display entries instead, since that's what we're doing (but only if there is a screen specified, and it's not a pageworks page) // do all this to set the Frid properly. That's it. Otherwise, no change. Frid affects behaviour in readelements.php $base_screen_handler = xoops_getmodulehandler('screen', 'formulize'); $viewEntryScreenObject = $base_screen_handler->get(intval($screen->getVar('viewentryscreen'))); @@ -167,7 +167,7 @@ $entry = ""; } -$formulize_screen_loadview = (!isset($formulize_screen_loadview) OR !is_numeric($formulize_screen_loadview)) ? intval($_GET['loadview']) : $formulize_screen_loadview; +$formulize_screen_loadview = (!isset($formulize_screen_loadview) OR !is_numeric($formulize_screen_loadview)) ? (isset($_GET['loadview']) ? intval($_GET['loadview']) : 0) : $formulize_screen_loadview; $loadThisView = (isset($formulize_screen_loadview) AND is_numeric($formulize_screen_loadview)) ? $formulize_screen_loadview : ""; if (!$loadThisView) { // a 0 could possibly screw things up, so change to "" diff --git a/themes/Anari/theme.html b/themes/Anari/theme.html index 5a5026fb0..41e6bd526 100644 --- a/themes/Anari/theme.html +++ b/themes/Anari/theme.html @@ -35,7 +35,7 @@ - + @@ -65,6 +65,7 @@