Thread: [Phpslash-commit] CVS: phpslash-ft/class Author.class,1.29,1.30 functions.inc,1.111,1.112 slashAuthC
Brought to you by:
joestewart,
nhruby
From: Joe S. <joe...@us...> - 2002-10-28 21:41:17
|
Update of /cvsroot/phpslash/phpslash-ft/class In directory usw-pr-cvs1:/tmp/cvs-serv22931/phpslash-ft/class Modified Files: Author.class functions.inc slashAuthCR.class Log Message: user option - skin setting Index: Author.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/Author.class,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** Author.class 23 Sep 2002 21:31:36 -0000 1.29 --- Author.class 28 Oct 2002 21:41:14 -0000 1.30 *************** *** 49,53 **** $this->author_templ->set_var( array( ! 'ROOTDIR' => $this->psl['rootur'], 'IMAGEDIR' => $this->psl['imageurl'] )); --- 49,53 ---- $this->author_templ->set_var( array( ! 'ROOTDIR' => $this->psl['rooturl'], 'IMAGEDIR' => $this->psl['imageurl'] )); *************** *** 158,161 **** --- 158,166 ---- } + if(!empty($ary['skin'])) { + $author_options_ary['preferences']['skin'] = $ary['skin']; + $author_options_ary['_PSL']['skin'] = $ary['skin']; + } + $serial_opts=addslashes(serialize($author_options_ary)); *************** *** 280,283 **** --- 285,290 ---- function saveProfile($ary) { + global $auth; + if ($ary['author_name'] == "") { error("There is no author_name in Author.class::saveAuthor"); *************** *** 299,307 **** $optname = $optionname_ary[$i]; $optval = $optionval_ary[$i]; ! $section_options_ary[$optname] = $optval; } } ! $serial_opts=addslashes(serialize($section_options_ary)); $this->db->query("SELECT author_id --- 306,322 ---- $optname = $optionname_ary[$i]; $optval = $optionval_ary[$i]; ! $author_options_ary[$optname] = $optval; } } ! ! if(!empty($ary['skin'])) { ! $author_options_ary['preferences']['skin'] = $ary['skin']; ! $author_options_ary['_PSL']['skin'] = $ary['skin']; ! $auth->auth['preferences']['skin'] = $ary['skin']; ! } ! ! ! $serial_opts=addslashes(serialize($author_options_ary)); $this->db->query("SELECT author_id *************** *** 419,430 **** while(list($k, $v) = each($allperms_ary)) { if(is_array($v)) { ! $this->author_templ->set_var( PERM_VALUE, $v); ! $this->author_templ->set_var( GROUP, "*"); ! } else { ! $this->author_templ->set_var( PERM_VALUE, $v); ! $this->author_templ->set_var( GROUP, ""); } ! $this->author_templ->set_var( PERM, $k); ! $this->author_templ->parse("perm_rows","perm_row",true); } --- 434,445 ---- while(list($k, $v) = each($allperms_ary)) { if(is_array($v)) { ! $this->author_templ->set_var( 'PERM_VALUE', $v); ! $this->author_templ->set_var( 'GROUP', "*"); ! } else { ! $this->author_templ->set_var( 'PERM_VALUE', $v); ! $this->author_templ->set_var( 'GROUP', ""); } ! $this->author_templ->set_var( 'PERM', $k); ! $this->author_templ->parse("perm_rows","perm_row",true); } *************** *** 434,438 **** 'AUTHOR_ID' => "", 'NAME' => "", ! 'REALNAME' => $this->author_id, 'EMAIL' => "", 'URL' => "", --- 449,453 ---- 'AUTHOR_ID' => "", 'NAME' => "", ! 'REALNAME' => "", 'EMAIL' => "", 'URL' => "", *************** *** 441,444 **** --- 456,492 ---- 'SECLEV' => "" )); + + $currentskin = $this->psl['defaultskin']; + if (!empty($temparray['preferences'])) { + $preferences = $temparray['preferences']; + if(array_key_exists('skin', $preferences)) { + $currentskin = $preferences['skin']; + } + unset($temparray['preferences']); + } + + // remove "skin" from templatedir + $templatedir = substr( $this->psl['templatedir'], 0, strrpos($this->psl['templatedir'], "/") ); + + $this->author_templ->set_block ("newauthor", "each_skin", "skins"); + $fulldirlist = dir($templatedir . "/"); + while( $eachfile = $fulldirlist->read()) { + $this->author_templ->set_var('SKIN_SELECTED', ''); + + if( (@is_dir($templatedir . "/" . $eachfile)) AND + ( $eachfile != ".") AND + ( $eachfile != "..") AND + ( $eachfile != "CVS") ) { + + $this->author_templ->set_var(array( + 'SKIN' => $eachfile + )); + + if("$eachfile" == "$currentskin") { + $this->author_templ->set_var('SKIN_SELECTED', 'selected=SELECTED'); + } + $this->author_templ->parse("skins","each_skin", true); + } + } $this->author_templ = displayoptions('author', $this->author_templ, "newauthor", ''); *************** *** 462,465 **** --- 510,514 ---- $default_tpl = "newauthor"; + $count = ''; if( empty($tpl) ) { *************** *** 533,543 **** while(list($k, $v) = each($allperms_ary)) { if(is_array($v)) { ! $this->author_templ->set_var( PERM_VALUE, $v); ! $this->author_templ->set_var( GROUP, "*"); } else { ! $this->author_templ->set_var( PERM_VALUE, $v); ! $this->author_templ->set_var( GROUP, ""); } ! $this->author_templ->set_var( PERM, $k); if ($this->perm->perm_islisted($author_perms,$k)) { $this->author_templ->parse("perm_rows","permhave_row",true); --- 582,592 ---- while(list($k, $v) = each($allperms_ary)) { if(is_array($v)) { ! $this->author_templ->set_var( 'PERM_VALUE', $v); ! $this->author_templ->set_var( 'GROUP', "*"); } else { ! $this->author_templ->set_var( 'PERM_VALUE', $v); ! $this->author_templ->set_var( 'GROUP', ""); } ! $this->author_templ->set_var( 'PERM', $k); if ($this->perm->perm_islisted($author_perms,$k)) { $this->author_templ->parse("perm_rows","permhave_row",true); *************** *** 552,555 **** --- 601,637 ---- } + $currentskin = $this->psl['defaultskin']; + if (!empty($temparray['preferences'])) { + $preferences = $temparray['preferences']; + if(array_key_exists('skin', $preferences)) { + $currentskin = $preferences['skin']; + } + unset($temparray['preferences']); + unset($temparray['_PSL']); + } + + // remove "skin" from templatedir + $templatedir = substr( $this->psl['templatedir'], 0, strrpos($this->psl['templatedir'], "/") ); + + $this->author_templ->set_block ($template, "each_skin", "skins"); + $fulldirlist = dir($templatedir . "/"); + while( $eachfile = $fulldirlist->read()) { + $this->author_templ->set_var('SKIN_SELECTED', ''); + + if( (@is_dir($templatedir . "/" . $eachfile)) AND + ( $eachfile != ".") AND + ( $eachfile != "..") AND + ( $eachfile != "CVS") ) { + + $this->author_templ->set_var(array( + 'SKIN' => $eachfile + )); + + if("$eachfile" == "$currentskin") { + $this->author_templ->set_var('SKIN_SELECTED', 'selected=SELECTED'); + } + $this->author_templ->parse("skins","each_skin", true); + } + } $this->author_templ = displayoptions('author', $this->author_templ, $template, $temparray); Index: functions.inc =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v retrieving revision 1.111 retrieving revision 1.112 diff -C2 -d -r1.111 -r1.112 *** functions.inc 24 Oct 2002 20:56:47 -0000 1.111 --- functions.inc 28 Oct 2002 21:41:14 -0000 1.112 *************** *** 1135,1139 **** } if($new_skin) { ! // check if skin templatedir exists if(@is_dir($templatedir . "/" . basename($new_skin))) { --- 1135,1141 ---- } if($new_skin) { ! ! // remove skin name from templatedir path ! $templatedir = substr($templatedir, 0, strrpos($templatedir, "/") ); // check if skin templatedir exists if(@is_dir($templatedir . "/" . basename($new_skin))) { *************** *** 1449,1453 **** 'DOPTION_VALUE_VAL' => $dvalue )); ! unset($options_ary[$dname]); } else { $tpl_object->set_var(array( --- 1451,1455 ---- 'DOPTION_VALUE_VAL' => $dvalue )); ! unset($options_ary[$dname]); } else { $tpl_object->set_var(array( *************** *** 1465,1469 **** reset($options_ary); } ! $optioncnt = $_PSL[$optioncount]; $i = 1; --- 1467,1473 ---- reset($options_ary); } ! if(array_key_exists($optioncount, $_PSL)) { ! $optioncnt = $_PSL[$optioncount]; ! } $i = 1; Index: slashAuthCR.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuthCR.class,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** slashAuthCR.class 24 Oct 2002 20:56:47 -0000 1.27 --- slashAuthCR.class 28 Oct 2002 21:41:14 -0000 1.28 *************** *** 48,51 **** --- 48,55 ---- } + if(!empty($this->auth['preferences'])) { + $_PSL['templatedir'] = setSkinTpl($this->auth['preferences']['skin']); + } + Auth::start(); } *************** *** 170,174 **** $setcookie = ''; ! $lostpw = ''; // TODO: Change there so they aren't undefined indexes :) --- 174,178 ---- $setcookie = ''; ! $lostpw = ''; // TODO: Change there so they aren't undefined indexes :) *************** *** 261,264 **** --- 265,274 ---- setcookie( 'user_info', base64_encode(serialize($cookie_ary)), time()+31536000,$this->psl['rooturl'] , "" , ""); } + + $temparray=unserialize($this->db->Record['author_options']); + if(!empty($temparray['preferences'])){ + $this->auth['preferences'] = $temparray['preferences']; + } + // may also need to get legacy records $this->auth["perm"] = $this->get_userperms( $uid); *************** *** 468,472 **** while ($db2->next_record()) { $section_perm = "section_id". $db2->Record['section_id']; ! debug("section_perm", $section_perm); $this->auth["perm"][$this->db->Record['group_name']][$section_perm] = true; } --- 478,482 ---- while ($db2->next_record()) { $section_perm = "section_id". $db2->Record['section_id']; ! // debug("section_perm", $section_perm); $this->auth["perm"][$this->db->Record['group_name']][$section_perm] = true; } *************** *** 504,508 **** $childgroup_name = $groups_ary[$childgroup_id]; ! if( !empty($this->auth['perm'][$childgroup_name])) { $this->auth['perm'][$group_name][$childgroup_name] = $this->auth['perm'][$childgroup_name]; } else { --- 514,518 ---- $childgroup_name = $groups_ary[$childgroup_id]; ! if( isset($this->auth['perm'][$childgroup_name])) { $this->auth['perm'][$group_name][$childgroup_name] = $this->auth['perm'][$childgroup_name]; } else { |