[dZeeemp-cvs] dzeeemp.sources/core library.Access.php,1.1,1.2 library.Containers.php,1.2,1.3 library
Brought to you by:
lovchy
Menu
▾
▴
[dZeeemp-cvs] dzeeemp.sources/core library.Access.php,1.1,1.2 library.Containers.php,1.2,1.3 library.GlobCache.php,1.2,1.3 library.Lang.php,1.1,1.2 library.Logs.php,1.2,1.3 library.Modules.php,1.4,1.5 library.Search.php,1.1,1.2 library.Sections.php,1.2,1.3 library.Templates.php,1.2,1.3 library.Triggers.php,1.3,1.4 the.Thorn.php,1.7,1.8
|
From: Boris B. <lo...@us...> - 2004-06-13 00:01:46
|
Update of /cvsroot/dzeeemp/dzeeemp.sources/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8003/core Modified Files: library.Access.php library.Containers.php library.GlobCache.php library.Lang.php library.Logs.php library.Modules.php library.Search.php library.Sections.php library.Templates.php library.Triggers.php the.Thorn.php Log Message: A lot of code fixed/improved Index: library.Templates.php =================================================================== RCS file: /cvsroot/dzeeemp/dzeeemp.sources/core/library.Templates.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** library.Templates.php 14 May 2004 23:01:48 -0000 1.2 --- library.Templates.php 13 Jun 2004 00:01:33 -0000 1.3 *************** *** 168,172 **** // }}} ! function &_vreplaceCallback($params, $set = false) { static $tmpldata; --- 168,172 ---- // }}} ! function &_vreplaceCallback(&$params, $set = false) { static $tmpldata; *************** *** 210,214 **** return $text; ! LibTemplates::_vreplaceCallback(&$tmpldata, true); return preg_replace_callback('/<dzeeemp name="(.+?)" parameters="(.+?)">/i', $callback, $text); --- 210,214 ---- return $text; ! LibTemplates::_vreplaceCallback($tmpldata, true); return preg_replace_callback('/<dzeeemp name="(.+?)" parameters="(.+?)">/i', $callback, $text); Index: library.Lang.php =================================================================== RCS file: /cvsroot/dzeeemp/dzeeemp.sources/core/library.Lang.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** library.Lang.php 11 Apr 2004 13:27:54 -0000 1.1 --- library.Lang.php 13 Jun 2004 00:01:33 -0000 1.2 *************** *** 125,129 **** * @param string $librarieName,... Libraries names */ ! function call () { $data = func_get_args(); --- 125,129 ---- * @param string $librarieName,... Libraries names */ ! function call() { $data = func_get_args(); *************** *** 137,141 **** require $path; ! $this->append(&$lang); } // }}} --- 137,141 ---- require $path; ! $this->append($lang); } // }}} *************** *** 145,149 **** * Appends lang data */ ! function append ($data) { if ( !is_array($data) ) --- 145,149 ---- * Appends lang data */ ! function append (&$data) { if ( !is_array($data) ) Index: library.Logs.php =================================================================== RCS file: /cvsroot/dzeeemp/dzeeemp.sources/core/library.Logs.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** library.Logs.php 17 Apr 2004 09:55:51 -0000 1.2 --- library.Logs.php 13 Jun 2004 00:01:33 -0000 1.3 *************** *** 130,134 **** for ($i=0, $log=''; isset($this->Buffer[$i]); $i++) ! $log .= '<?php $logs[] = \''.implode('~', &$this->Buffer[$i]).'\'; ?>'."\n"; if (!@fwrite($fp, $log)) return false; --- 130,134 ---- for ($i=0, $log=''; isset($this->Buffer[$i]); $i++) ! $log .= '<?php $logs[] = \''.implode('~', $this->Buffer[$i]).'\'; ?>'."\n"; if (!@fwrite($fp, $log)) return false; Index: library.Search.php =================================================================== RCS file: /cvsroot/dzeeemp/dzeeemp.sources/core/library.Search.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** library.Search.php 11 Apr 2004 13:27:54 -0000 1.1 --- library.Search.php 13 Jun 2004 00:01:33 -0000 1.2 *************** *** 39,50 **** require (THORN_SEARCH_CONFIG); ! if( empty($str) && empty($sp) ) { // {{{ Output Form $tmpl = LibTemplates::select('search.form.sections'); ! if(is_array($sa)) { ! foreach ($sa as $key => $value) { $tmpldata = array ( 'keyword' => $key, --- 39,53 ---- require (THORN_SEARCH_CONFIG); ! if ( empty($str) && empty($sp) ) { // {{{ Output Form $tmpl = LibTemplates::select('search.form.sections'); ! $rows = ''; ! ! if ( is_array($sa) ) { ! foreach ($sa as $key => $value) ! { $tmpldata = array ( 'keyword' => $key, *************** *** 52,56 **** ); ! $rows .= LibTemplates::replace($tmpldata,$tmpl); } } --- 55,59 ---- ); ! $rows .= LibTemplates::replace($tmpldata, $tmpl); } } *************** *** 140,147 **** $data = call_user_func_array ($function, $parameters); ! if (!empty($data[0]['section'])) ! $_SESSION['search'][$data[0]['section']] = array_merge($_SESSION['search'][$data[0]['section']], $data); - if($num >= $max) $num += sizeof($data); elseif (is_array($data)) { --- 143,155 ---- $data = call_user_func_array ($function, $parameters); ! if ( !empty($data[0]['section']) ) ! { ! $_SESSION['search'][$data[0]['section']] = ! array_merge($_SESSION['search'][$data[0]['section']], $data); ! } ! ! if ( $num >= $max ) ! $num += sizeof($data); elseif (is_array($data)) { Index: library.GlobCache.php =================================================================== RCS file: /cvsroot/dzeeemp/dzeeemp.sources/core/library.GlobCache.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** library.GlobCache.php 19 May 2004 23:11:37 -0000 1.2 --- library.GlobCache.php 13 Jun 2004 00:01:33 -0000 1.3 *************** *** 81,85 **** } ! function insert($keyword, $data, $flush = true) { $this->Assoc['debug']->sign('Cache on {'.$keyword.'} inserted!', THORN_DEBUG_CACHE); --- 81,85 ---- } ! function insert($keyword, &$data, $flush = true) { $this->Assoc['debug']->sign('Cache on {'.$keyword.'} inserted!', THORN_DEBUG_CACHE); Index: library.Sections.php =================================================================== RCS file: /cvsroot/dzeeemp/dzeeemp.sources/core/library.Sections.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** library.Sections.php 12 Apr 2004 03:21:17 -0000 1.2 --- library.Sections.php 13 Jun 2004 00:01:33 -0000 1.3 *************** *** 104,109 **** --- 104,113 ---- for ($i=0, $parents=array(); isset($splited[$i]); $i++) { + $parents[$i] = ''; + for ($y=0; $y<=$i; $y++) + { $parents[$i] .= $splited[$y].'/'; + } } *************** *** 382,385 **** --- 386,391 ---- // }}} + $found = array(); + // {{{ Seach perform foreach ($index as $s) Index: the.Thorn.php =================================================================== RCS file: /cvsroot/dzeeemp/dzeeemp.sources/core/the.Thorn.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** the.Thorn.php 11 Jun 2004 17:32:12 -0000 1.7 --- the.Thorn.php 13 Jun 2004 00:01:33 -0000 1.8 *************** *** 259,263 **** // }}} ! $this->Objects['triggers']->throw(THORN_TG_STARTUP, &$this); define ('THORN_INSTANCE_EXISTS', true); --- 259,263 ---- // }}} ! $this->Objects['triggers']->throw(THORN_TG_STARTUP); define ('THORN_INSTANCE_EXISTS', true); *************** *** 486,490 **** elseif ( isset($this->Objects[$name]) ) { ! aggregate(&$this->Objects[$name], $lib); } --- 486,490 ---- elseif ( isset($this->Objects[$name]) ) { ! aggregate($this->Objects[$name], $lib); } Index: library.Triggers.php =================================================================== RCS file: /cvsroot/dzeeemp/dzeeemp.sources/core/library.Triggers.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** library.Triggers.php 14 May 2004 23:01:48 -0000 1.3 --- library.Triggers.php 13 Jun 2004 00:01:33 -0000 1.4 *************** *** 95,99 **** * @return array|string PHP callback */ ! function _parseCallback($cbStr) { if ( (($tmp = strpos('::', $cbStr)) !== false) || (strpos('->', $cbStr) != false) ) --- 95,99 ---- * @return array|string PHP callback */ ! function _parseCallback(&$cbStr) { if ( (($tmp = strpos('::', $cbStr)) !== false) || (strpos('->', $cbStr) != false) ) *************** *** 145,149 **** for ($i=0; $data = $this->Assoc['database']->fetch(); $i++) { ! $toCache[$i] = $this->_parseCallback(&$data[0]); } --- 145,149 ---- for ($i=0; $data = $this->Assoc['database']->fetch(); $i++) { ! $toCache[$i] = $this->_parseCallback($data[0]); } *************** *** 156,160 **** for ($i=0; isset($triggers[$i]); $i++) { ! $data = call_user_func_array($triggers[$i], &$parameters); if ( $this->Flag ) --- 156,160 ---- for ($i=0; isset($triggers[$i]); $i++) { ! $data = call_user_func_array($triggers[$i], $parameters); if ( $this->Flag ) Index: library.Modules.php =================================================================== RCS file: /cvsroot/dzeeemp/dzeeemp.sources/core/library.Modules.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** library.Modules.php 14 May 2004 23:01:48 -0000 1.4 --- library.Modules.php 13 Jun 2004 00:01:33 -0000 1.5 *************** *** 168,175 **** $keyword = 'Mod'.$keyInCase; ! if ( !$Module = &new $keyword(&$params) ) return $__Errors->select(); ! $dZeeemp->setDestructor(&$Module); $Module->Action = &$do; --- 168,175 ---- $keyword = 'Mod'.$keyInCase; ! if ( !$Module = &new $keyword($params) ) return $__Errors->select(); ! $dZeeemp->setDestructor($Module); $Module->Action = &$do; Index: library.Containers.php =================================================================== RCS file: /cvsroot/dzeeemp/dzeeemp.sources/core/library.Containers.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** library.Containers.php 14 May 2004 23:01:48 -0000 1.2 --- library.Containers.php 13 Jun 2004 00:01:33 -0000 1.3 *************** *** 44,48 **** var $Right; ! function IListEntry($data, $left, $right) { $this->Data = $data; --- 44,48 ---- var $Right; ! function IListEntry(&$data, $left, $right) { $this->Data = $data; *************** *** 93,97 **** else $left = THORN_ILE_TOPBORDER; ! $this->Store[$i] = new IListEntry(&$data[$i], $left, THORN_ILE_BOTTOMBORDER); } --- 93,97 ---- else $left = THORN_ILE_TOPBORDER; ! $this->Store[$i] = new IListEntry($data[$i], $left, THORN_ILE_BOTTOMBORDER); } Index: library.Access.php =================================================================== RCS file: /cvsroot/dzeeemp/dzeeemp.sources/core/library.Access.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** library.Access.php 11 Apr 2004 13:27:54 -0000 1.1 --- library.Access.php 13 Jun 2004 00:01:32 -0000 1.2 *************** *** 80,84 **** for ($i=0, $values=array(); $data=$__Database->fetch(); $i++) { ! LayerExternalCache::add($keyword[$i].$mod); $values[$data[0]] = $data[1]; --- 80,84 ---- for ($i=0, $values=array(); $data=$__Database->fetch(); $i++) { ! LayerExternalCache::add($keyword[$i].$mod, $data[1]); $values[$data[0]] = $data[1]; |
