$pt = PhpThumb::getInstance();
+ *
+ * It's that simple! Outside of that, there's no need to modify anything within this class, unless you're doing
+ * some crazy customization... then knock yourself out! :)
+ *
+ * @package PhpThumb
+ * @subpackage Core
+ */
+class PhpThumb
+{
+ /**
+ * Instance of self
+ *
+ * @var object PhpThumb
+ */
+ protected static $_instance;
+ /**
+ * The plugin registry
+ *
+ * This is where all plugins to be loaded are stored. Data about the plugin is
+ * provided, and currently consists of:
+ * - loaded: true/false
+ * - implementation: gd/imagick/both
+ *
+ * @var array
+ */
+ protected $_registry;
+ /**
+ * What implementations are available
+ *
+ * This stores what implementations are available based on the loaded
+ * extensions in PHP, NOT whether or not the class files are present.
+ *
+ * @var array
+ */
+ protected $_implementations;
+
+ /**
+ * Returns an instance of self
+ *
+ * This is the usual singleton function that returns / instantiates the object
+ *
+ * @return PhpThumb
+ */
+ public static function getInstance ()
+ {
+ if(!(self::$_instance instanceof self))
+ {
+ self::$_instance = new self();
+ }
+
+ return self::$_instance;
+ }
+
+ /**
+ * Class constructor
+ *
+ * Initializes all the variables, and does some preliminary validation / checking of stuff
+ *
+ */
+ private function __construct ()
+ {
+ $this->_registry = array();
+ $this->_implementations = array('gd' => false, 'imagick' => false);
+
+ $this->getImplementations();
+ }
+
+ /**
+ * Finds out what implementations are available
+ *
+ * This function loops over $this->_implementations and validates that the required extensions are loaded.
+ *
+ * I had planned on attempting to load them dynamically via dl(), but that would provide more overhead than I
+ * was comfortable with (and would probably fail 99% of the time anyway)
+ *
+ */
+ private function getImplementations ()
+ {
+ foreach($this->_implementations as $extension => $loaded)
+ {
+ if($loaded)
+ {
+ continue;
+ }
+
+ if(extension_loaded($extension))
+ {
+ $this->_implementations[$extension] = true;
+ }
+ }
+ }
+
+ /**
+ * Returns whether or not $implementation is valid (available)
+ *
+ * If 'all' is passed, true is only returned if ALL implementations are available.
+ *
+ * You can also pass 'n/a', which always returns true
+ *
+ * @return bool
+ * @param string $implementation
+ */
+ public function isValidImplementation ($implementation)
+ {
+ if ($implementation == 'n/a')
+ {
+ return true;
+ }
+
+ if ($implementation == 'all')
+ {
+ foreach ($this->_implementations as $imp => $value)
+ {
+ if ($value == false)
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ if (array_key_exists($implementation, $this->_implementations))
+ {
+ return $this->_implementations[$implementation];
+ }
+
+ return false;
+ }
+
+ /**
+ * Registers a plugin in the registry
+ *
+ * Adds a plugin to the registry if it isn't already loaded, and if the provided
+ * implementation is valid. Note that you can pass the following special keywords
+ * for implementation:
+ * - all - Requires that all implementations be available
+ * - n/a - Doesn't require any implementation
+ *
+ * When a plugin is added to the registry, it's added as a key on $this->_registry with the value
+ * being an array containing the following keys:
+ * - loaded - whether or not the plugin has been "loaded" into the core class
+ * - implementation - what implementation this plugin is valid for
+ *
+ * @return bool
+ * @param string $pluginName
+ * @param string $implementation
+ */
+ public function registerPlugin ($pluginName, $implementation)
+ {
+ if (!array_key_exists($pluginName, $this->_registry) && $this->isValidImplementation($implementation))
+ {
+ $this->_registry[$pluginName] = array('loaded' => false, 'implementation' => $implementation);
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Loads all the plugins in $pluginPath
+ *
+ * All this function does is include all files inside the $pluginPath directory. The plugins themselves
+ * will not be added to the registry unless you've properly added the code to do so inside your plugin file.
+ *
+ * @param string $pluginPath
+ */
+ public function loadPlugins ($pluginPath)
+ {
+ // strip the trailing slash if present
+ if (substr($pluginPath, strlen($pluginPath) - 1, 1) == '/')
+ {
+ $pluginPath = substr($pluginPath, 0, strlen($pluginPath) - 1);
+ }
+
+ if ($handle = opendir($pluginPath))
+ {
+ while (false !== ($file = readdir($handle)))
+ {
+ if ($file == '.' || $file == '..' || $file == '.svn')
+ {
+ continue;
+ }
+
+ include_once($pluginPath . '/' . $file);
+ }
+ }
+ }
+
+ /**
+ * Returns the plugin registry for the supplied implementation
+ *
+ * @return array
+ * @param string $implementation
+ */
+ public function getPluginRegistry ($implementation)
+ {
+ $returnArray = array();
+
+ foreach ($this->_registry as $plugin => $meta)
+ {
+ if ($meta['implementation'] == 'n/a' || $meta['implementation'] == $implementation)
+ {
+ $returnArray[$plugin] = $meta;
+ }
+ }
+
+ return $returnArray;
+ }
+}
Property changes on: trunk/admin/media/inc/PhpThumb.inc.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Index: trunk/admin/media/inc/README
===================================================================
--- trunk/admin/media/inc/README (nonexistent)
+++ trunk/admin/media/inc/README (revision 2)
@@ -0,0 +1,13 @@
+# PHP Thumb
+
+PHP Thumb is a light-weight image manipulation library
+aimed at thumbnail generation. It features the ability to
+resize by width, height, and percentage, create custom crops,
+or square crops from the center, and rotate the image. You can
+also easily add custom functionality to the library through plugins.
+It also features the ability to perform multiple manipulations per
+instance (also known as chaining), without the need to save and
+re-initialize the class with every manipulation.
+
+More information and documentation is available at the project's
+homepage: [http://phpthumb.gxdlabs.com](http://phpthumb.gxdlabs.com)
Index: trunk/admin/media/inc/ThumbBase.inc.php
===================================================================
--- trunk/admin/media/inc/ThumbBase.inc.php (nonexistent)
+++ trunk/admin/media/inc/ThumbBase.inc.php (revision 2)
@@ -0,0 +1,323 @@
+
+ * Copyright (c) 2009, Ian Selby/Gen X Design
+ *
+ * Author(s): Ian Selby $thumb = PhpThumbFactory::create('/path/to/file.png');
+ *
+ * Refer to the documentation for the create function for more information
+ *
+ * @package PhpThumb
+ * @subpackage Core
+ */
+class PhpThumbFactory
+{
+ /**
+ * Which implemenation of the class should be used by default
+ *
+ * Currently, valid options are:
+ * - imagick
+ * - gd
+ *
+ * These are defined in the implementation map variable, inside the create function
+ *
+ * @var string
+ */
+ public static $defaultImplemenation = DEFAULT_THUMBLIB_IMPLEMENTATION;
+ /**
+ * Where the plugins can be loaded from
+ *
+ * Note, it's important that this path is properly defined. It is very likely that you'll
+ * have to change this, as the assumption here is based on a relative path.
+ *
+ * @var string
+ */
+ public static $pluginPath = THUMBLIB_PLUGIN_PATH;
+
+ /**
+ * Factory Function
+ *
+ * This function returns the correct thumbnail object, augmented with any appropriate plugins.
+ * It does so by doing the following:
+ * - Getting an instance of PhpThumb
+ * - Loading plugins
+ * - Validating the default implemenation
+ * - Returning the desired default implementation if possible
+ * - Returning the GD implemenation if the default isn't available
+ * - Throwing an exception if no required libraries are present
+ *
+ * @return GdThumb
+ * @uses PhpThumb
+ * @param string $filename The path and file to load [optional]
+ */
+ public static function create ($filename = null, $options = array(), $isDataStream = false)
+ {
+ // map our implementation to their class names
+ $implementationMap = array
+ (
+ 'imagick' => 'ImagickThumb',
+ 'gd' => 'GdThumb'
+ );
+
+ // grab an instance of PhpThumb
+ $pt = PhpThumb::getInstance();
+ // load the plugins
+ $pt->loadPlugins(self::$pluginPath);
+
+ $toReturn = null;
+ $implementation = self::$defaultImplemenation;
+
+ // attempt to load the default implementation
+ if ($pt->isValidImplementation(self::$defaultImplemenation))
+ {
+ $imp = $implementationMap[self::$defaultImplemenation];
+ $toReturn = new $imp($filename, $options, $isDataStream);
+ }
+ // load the gd implementation if default failed
+ else if ($pt->isValidImplementation('gd'))
+ {
+ $imp = $implementationMap['gd'];
+ $implementation = 'gd';
+ $toReturn = new $imp($filename, $options, $isDataStream);
+ }
+ // throw an exception if we can't load
+ else
+ {
+ throw new Exception('You must have either the GD or iMagick extension loaded to use this library');
+ }
+
+ $registry = $pt->getPluginRegistry($implementation);
+ $toReturn->importPlugins($registry);
+ return $toReturn;
+ }
+}
\ No newline at end of file
Property changes on: trunk/admin/media/inc/ThumbLib.inc.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Index: trunk/admin/media/inc/thumb_plugins/gd_reflection.inc.php
===================================================================
--- trunk/admin/media/inc/thumb_plugins/gd_reflection.inc.php (nonexistent)
+++ trunk/admin/media/inc/thumb_plugins/gd_reflection.inc.php (revision 2)
@@ -0,0 +1,180 @@
+
+ * Copyright (c) 2009, Ian Selby/Gen X Design
+ *
+ * Author(s): Ian Selby
|
|
| '+(o3_textfontclass ? '' : wrapStr(0,o3_textsize,'text'))+text+(o3_textfontclass ? '' : wrapStr(1,o3_textsize))+' | ||
') : '';
+ }
+}
+
+// Quotes Multi word font names; needed for CSS Standards adherence in font-family
+function quoteMultiNameFonts(theFont) {
+ var v, pM=theFont.split(',');
+ for (var i=0; i 0) clearTimeout(o3_timerid);
+
+ o3_timerid=setTimeout("cClick()",(o3_timeout=time));
+ }
+}
+
+// Was originally in the placeLayer() routine; separated out for future ease
+function horizontalPlacement(browserWidth, horizontalScrollAmount, widthFix) {
+ var placeX, iwidth=browserWidth, winoffset=horizontalScrollAmount;
+ var parsedWidth = parseInt(o3_width);
+
+ if (o3_fixx > -1 || o3_relx != null) {
+ // Fixed position
+ placeX=(o3_relx != null ? ( o3_relx < 0 ? winoffset +o3_relx+ iwidth - parsedWidth - widthFix : winoffset+o3_relx) : o3_fixx);
+ } else {
+ // If HAUTO, decide what to use.
+ if (o3_hauto == 1) {
+ if ((o3_x - winoffset) > (iwidth / 2)) {
+ o3_hpos = LEFT;
+ } else {
+ o3_hpos = RIGHT;
+ }
+ }
+
+ // From mouse
+ if (o3_hpos == CENTER) { // Center
+ placeX = o3_x+o3_offsetx-(parsedWidth/2);
+
+ if (placeX < winoffset) placeX = winoffset;
+ }
+
+ if (o3_hpos == RIGHT) { // Right
+ placeX = o3_x+o3_offsetx;
+
+ if ((placeX+parsedWidth) > (winoffset+iwidth - widthFix)) {
+ placeX = iwidth+winoffset - parsedWidth - widthFix;
+ if (placeX < 0) placeX = 0;
+ }
+ }
+ if (o3_hpos == LEFT) { // Left
+ placeX = o3_x-o3_offsetx-parsedWidth;
+ if (placeX < winoffset) placeX = winoffset;
+ }
+
+ // Snapping!
+ if (o3_snapx > 1) {
+ var snapping = placeX % o3_snapx;
+
+ if (o3_hpos == LEFT) {
+ placeX = placeX - (o3_snapx+snapping);
+ } else {
+ // CENTER and RIGHT
+ placeX = placeX+(o3_snapx - snapping);
+ }
+
+ if (placeX < winoffset) placeX = winoffset;
+ }
+ }
+
+ return placeX;
+}
+
+// was originally in the placeLayer() routine; separated out for future ease
+function verticalPlacement(browserHeight,verticalScrollAmount) {
+ var placeY, iheight=browserHeight, scrolloffset=verticalScrollAmount;
+ var parsedHeight=(o3_aboveheight ? parseInt(o3_aboveheight) : (olNs4 ? over.clip.height : over.offsetHeight));
+
+ if (o3_fixy > -1 || o3_rely != null) {
+ // Fixed position
+ placeY=(o3_rely != null ? (o3_rely < 0 ? scrolloffset+o3_rely+iheight - parsedHeight : scrolloffset+o3_rely) : o3_fixy);
+ } else {
+ // If VAUTO, decide what to use.
+ if (o3_vauto == 1) {
+ if ((o3_y - scrolloffset) > (iheight / 2) && o3_vpos == BELOW && (o3_y + parsedHeight + o3_offsety - (scrolloffset + iheight) > 0)) {
+ o3_vpos = ABOVE;
+ } else if (o3_vpos == ABOVE && (o3_y - (parsedHeight + o3_offsety) - scrolloffset < 0)) {
+ o3_vpos = BELOW;
+ }
+ }
+
+ // From mouse
+ if (o3_vpos == ABOVE) {
+ if (o3_aboveheight == 0) o3_aboveheight = parsedHeight;
+
+ placeY = o3_y - (o3_aboveheight+o3_offsety);
+ if (placeY < scrolloffset) placeY = scrolloffset;
+ } else {
+ // BELOW
+ placeY = o3_y+o3_offsety;
+ }
+
+ // Snapping!
+ if (o3_snapy > 1) {
+ var snapping = placeY % o3_snapy;
+
+ if (o3_aboveheight > 0 && o3_vpos == ABOVE) {
+ placeY = placeY - (o3_snapy+snapping);
+ } else {
+ placeY = placeY+(o3_snapy - snapping);
+ }
+
+ if (placeY < scrolloffset) placeY = scrolloffset;
+ }
+ }
+
+ return placeY;
+}
+
+// checks positioning flags
+function checkPositionFlags() {
+ if (olHautoFlag) olHautoFlag = o3_hauto=0;
+ if (olVautoFlag) olVautoFlag = o3_vauto=0;
+ return true;
+}
+
+// get Browser window width
+function windowWidth() {
+ var w;
+ if (o3_frame.innerWidth) w=o3_frame.innerWidth;
+ else if (eval('o3_frame.'+docRoot)&&eval("typeof o3_frame."+docRoot+".clientWidth=='number'")&&eval('o3_frame.'+docRoot+'.clientWidth'))
+ w=eval('o3_frame.'+docRoot+'.clientWidth');
+ return w;
+}
+
+// create the div container for popup content if it doesn't exist
+function createDivContainer(id,frm,zValue) {
+ id = (id || 'overDiv'), frm = (frm || o3_frame), zValue = (zValue || 1000);
+ var objRef, divContainer = layerReference(id);
+
+ if (divContainer == null) {
+ if (olNs4) {
+ divContainer = frm.document.layers[id] = new Layer(window.innerWidth, frm);
+ objRef = divContainer;
+ } else {
+ var body = (olIe4 ? frm.document.all.tags('BODY')[0] : frm.document.getElementsByTagName("BODY")[0]);
+ if (olIe4&&!document.getElementById) {
+ body.insertAdjacentHTML("beforeEnd",'');
+ divContainer=layerReference(id);
+ } else {
+ divContainer = frm.document.createElement("DIV");
+ divContainer.id = id;
+ body.appendChild(divContainer);
+ }
+ objRef = divContainer.style;
+ }
+
+ objRef.position = 'absolute';
+ objRef.visibility = 'hidden';
+ objRef.zIndex = zValue;
+ if (olIe4&&!olOp) objRef.left = objRef.top = '0px';
+ else objRef.left = objRef.top = -10000 + (!olNs4 ? 'px' : 0);
+ }
+
+ return divContainer;
+}
+
+// get reference to a layer with ID=id
+function layerReference(id) {
+ return (olNs4 ? o3_frame.document.layers[id] : (document.all ? o3_frame.document.all[id] : o3_frame.document.getElementById(id)));
+}
+////////
+// UTILITY FUNCTIONS
+////////
+
+// Checks if something is a function.
+function isFunction(fnRef) {
+ var rtn = true;
+
+ if (typeof fnRef == 'object') {
+ for (var i = 0; i < fnRef.length; i++) {
+ if (typeof fnRef[i]=='function') continue;
+ rtn = false;
+ break;
+ }
+ } else if (typeof fnRef != 'function') {
+ rtn = false;
+ }
+
+ return rtn;
+}
+
+// Converts an array into an argument string for use in eval.
+function argToString(array, strtInd, argName) {
+ var jS = strtInd, aS = '', ar = array;
+ argName=(argName ? argName : 'ar');
+
+ if (ar.length > jS) {
+ for (var k = jS; k < ar.length; k++) aS += argName+'['+k+'], ';
+ aS = aS.substring(0, aS.length-2);
+ }
+
+ return aS;
+}
+
+// Places a hook in the correct position in a hook point.
+function reOrder(hookPt, fnRef, order) {
+ var newPt = new Array(), match, i, j;
+
+ if (!order || typeof order == 'undefined' || typeof order == 'number') return hookPt;
+
+ if (typeof order=='function') {
+ if (typeof fnRef=='object') {
+ newPt = newPt.concat(fnRef);
+ } else {
+ newPt[newPt.length++]=fnRef;
+ }
+
+ for (i = 0; i < hookPt.length; i++) {
+ match = false;
+ if (typeof fnRef == 'function' && hookPt[i] == fnRef) {
+ continue;
+ } else {
+ for(j = 0; j < fnRef.length; j++) if (hookPt[i] == fnRef[j]) {
+ match = true;
+ break;
+ }
+ }
+ if (!match) newPt[newPt.length++] = hookPt[i];
+ }
+
+ newPt[newPt.length++] = order;
+
+ } else if (typeof order == 'object') {
+ if (typeof fnRef == 'object') {
+ newPt = newPt.concat(fnRef);
+ } else {
+ newPt[newPt.length++] = fnRef;
+ }
+
+ for (j = 0; j < hookPt.length; j++) {
+ match = false;
+ if (typeof fnRef == 'function' && hookPt[j] == fnRef) {
+ continue;
+ } else {
+ for (i = 0; i < fnRef.length; i++) if (hookPt[j] == fnRef[i]) {
+ match = true;
+ break;
+ }
+ }
+ if (!match) newPt[newPt.length++]=hookPt[j];
+ }
+
+ for (i = 0; i < newPt.length; i++) hookPt[i] = newPt[i];
+ newPt.length = 0;
+
+ for (j = 0; j < hookPt.length; j++) {
+ match = false;
+ for (i = 0; i < order.length; i++) {
+ if (hookPt[j] == order[i]) {
+ match = true;
+ break;
+ }
+ }
+ if (!match) newPt[newPt.length++] = hookPt[j];
+ }
+ newPt = newPt.concat(order);
+ }
+
+ hookPt = newPt;
+
+ return hookPt;
+}
+
+////////
+// PLUGIN ACTIVATION FUNCTIONS
+////////
+
+// Runs plugin functions to set runtime variables.
+function setRunTimeVariables(){
+ if (typeof runTime != 'undefined' && runTime.length) {
+ for (var k = 0; k < runTime.length; k++) {
+ runTime[k]();
+ }
+ }
+}
+
+// Runs plugin functions to parse commands.
+function parseCmdLine(pf, i, args) {
+ if (typeof cmdLine != 'undefined' && cmdLine.length) {
+ for (var k = 0; k < cmdLine.length; k++) {
+ var j = cmdLine[k](pf, i, args);
+ if (j >- 1) {
+ i = j;
+ break;
+ }
+ }
+ }
+
+ return i;
+}
+
+// Runs plugin functions to do things after parse.
+function postParseChecks(pf,args){
+ if (typeof postParse != 'undefined' && postParse.length) {
+ for (var k = 0; k < postParse.length; k++) {
+ if (postParse[k](pf,args)) continue;
+ return false; // end now since have an error
+ }
+ }
+ return true;
+}
+
+
+////////
+// PLUGIN REGISTRATION FUNCTIONS
+////////
+
+// Registers commands and creates constants.
+function registerCommands(cmdStr) {
+ if (typeof cmdStr!='string') return;
+
+ var pM = cmdStr.split(',');
+ pms = pms.concat(pM);
+
+ for (var i = 0; i< pM.length; i++) {
+ eval(pM[i].toUpperCase()+'='+pmCount++);
+ }
+}
+
+// Registers no-parameter commands
+function registerNoParameterCommands(cmdStr) {
+ if (!cmdStr && typeof cmdStr != 'string') return;
+ pmt=(!pmt) ? cmdStr : pmt + ',' + cmdStr;
+}
+
+// Register a function to hook at a certain point.
+function registerHook(fnHookTo, fnRef, hookType, optPm) {
+ var hookPt, last = typeof optPm;
+
+ if (fnHookTo == 'plgIn'||fnHookTo == 'postParse') return;
+ if (typeof hookPts[fnHookTo] == 'undefined') hookPts[fnHookTo] = new FunctionReference();
+
+ hookPt = hookPts[fnHookTo];
+
+ if (hookType != null) {
+ if (hookType == FREPLACE) {
+ hookPt.ovload = fnRef; // replace normal overlib routine
+ if (fnHookTo.indexOf('ol_content_') > -1) hookPt.alt[pms[CSSOFF-1-pmStart]]=fnRef;
+
+ } else if (hookType == FBEFORE || hookType == FAFTER) {
+ var hookPt=(hookType == 1 ? hookPt.before : hookPt.after);
+
+ if (typeof fnRef == 'object') {
+ hookPt = hookPt.concat(fnRef);
+ } else {
+ hookPt[hookPt.length++] = fnRef;
+ }
+
+ if (optPm) hookPt = reOrder(hookPt, fnRef, optPm);
+
+ } else if (hookType == FALTERNATE) {
+ if (last=='number') hookPt.alt[pms[optPm-1-pmStart]] = fnRef;
+ } else if (hookType == FCHAIN) {
+ hookPt = hookPt.chain;
+ if (typeof fnRef=='object') hookPt=hookPt.concat(fnRef); // add other functions
+ else hookPt[hookPt.length++]=fnRef;
+ }
+
+ return;
+ }
+}
+
+// Register a function that will set runtime variables.
+function registerRunTimeFunction(fn) {
+ if (isFunction(fn)) {
+ if (typeof fn == 'object') {
+ runTime = runTime.concat(fn);
+ } else {
+ runTime[runTime.length++] = fn;
+ }
+ }
+}
+
+// Register a function that will handle command parsing.
+function registerCmdLineFunction(fn){
+ if (isFunction(fn)) {
+ if (typeof fn == 'object') {
+ cmdLine = cmdLine.concat(fn);
+ } else {
+ cmdLine[cmdLine.length++] = fn;
+ }
+ }
+}
+
+// Register a function that does things after command parsing.
+function registerPostParseFunction(fn){
+ if (isFunction(fn)) {
+ if (typeof fn == 'object') {
+ postParse = postParse.concat(fn);
+ } else {
+ postParse[postParse.length++] = fn;
+ }
+ }
+}
+
+////////
+// PLUGIN REGISTRATION FUNCTIONS
+////////
+
+// Runs any hooks registered.
+function runHook(fnHookTo, hookType) {
+ var l = hookPts[fnHookTo], k, rtnVal = null, optPm, arS, ar = runHook.arguments;
+
+ if (hookType == FREPLACE) {
+ arS = argToString(ar, 2);
+
+ if (typeof l == 'undefined' || !(l = l.ovload)) rtnVal = eval(fnHookTo+'('+arS+')');
+ else rtnVal = eval('l('+arS+')');
+
+ } else if (hookType == FBEFORE || hookType == FAFTER) {
+ if (typeof l != 'undefined') {
+ l=(hookType == 1 ? l.before : l.after);
+
+ if (l.length) {
+ arS = argToString(ar, 2);
+ for (var k = 0; k < l.length; k++) eval('l[k]('+arS+')');
+ }
+ }
+ } else if (hookType == FALTERNATE) {
+ optPm = ar[2];
+ arS = argToString(ar, 3);
+
+ if (typeof l == 'undefined' || (l = l.alt[pms[optPm-1-pmStart]]) == 'undefined') {
+ rtnVal = eval(fnHookTo+'('+arS+')');
+ } else {
+ rtnVal = eval('l('+arS+')');
+ }
+ } else if (hookType == FCHAIN) {
+ arS=argToString(ar,2);
+ l=l.chain;
+
+ for (k=l.length; k > 0; k--) if((rtnVal=eval('l[k-1]('+arS+')'))!=void(0)) break;
+ }
+
+ return rtnVal;
+}
+
+////////
+// OBJECT CONSTRUCTORS
+////////
+
+// Object for handling hooks.
+function FunctionReference() {
+ this.ovload = null;
+ this.before = new Array();
+ this.after = new Array();
+ this.alt = new Array();
+ this.chain = new Array();
+}
+
+// Object for simple access to the overLIB version used.
+// Examples: simpleversion:351 major:3 minor:5 revision:1
+function Info(version, prerelease) {
+ this.version = version;
+ this.prerelease = prerelease;
+
+ this.simpleversion = Math.round(this.version*100);
+ this.major = parseInt(this.simpleversion / 100);
+ this.minor = parseInt(this.simpleversion / 10) - this.major * 10;
+ this.revision = parseInt(this.simpleversion) - this.major * 100 - this.minor * 10;
+ this.meets = meets;
+}
+
+// checks for Core Version required
+function meets(reqdVersion) {
+ return (!reqdVersion) ? false : this.simpleversion >= Math.round(100*parseFloat(reqdVersion));
+}
+
+
+////////
+// STANDARD REGISTRATIONS
+////////
+registerHook("ol_content_simple", ol_content_simple, FALTERNATE, CSSOFF);
+registerHook("ol_content_caption", ol_content_caption, FALTERNATE, CSSOFF);
+registerHook("ol_content_background", ol_content_background, FALTERNATE, CSSOFF);
+registerHook("ol_content_simple", ol_content_simple, FALTERNATE, CSSCLASS);
+registerHook("ol_content_caption", ol_content_caption, FALTERNATE, CSSCLASS);
+registerHook("ol_content_background", ol_content_background, FALTERNATE, CSSCLASS);
+registerPostParseFunction(checkPositionFlags);
+registerHook("hideObject", nbspCleanup, FAFTER);
+registerHook("horizontalPlacement", horizontalPlacement, FCHAIN);
+registerHook("verticalPlacement", verticalPlacement, FCHAIN);
+if (olNs4||(olIe5&&isMac)||olKq) olLoaded=1;
+registerNoParameterCommands('sticky,autostatus,autostatuscap,fullhtml,hauto,vauto,closeclick,wrap,followmouse,mouseoff,compatmode');
+///////
+// ESTABLISH MOUSECAPTURING
+///////
+
+// Capture events, alt. diffuses the overlib function.
+var olCheckMouseCapture=true;
+if ((olNs4 || olNs6 || olIe4)) {
+ olMouseCapture();
+} else {
+ overlib = no_overlib;
+ nd = no_overlib;
+ ver3fix = true;
+}
Index: trunk/admin/media/parameters.php
===================================================================
--- trunk/admin/media/parameters.php (nonexistent)
+++ trunk/admin/media/parameters.php (revision 2)
@@ -0,0 +1,39 @@
+query ( "SELECT * FROM ".TABLE_PREFIX."settings where `name`='mediasettings'" );
+ if ($query && $query->numRows() > 0) {
+ $settings = $query->fetchRow();
+ $pathsettings = __unserialize($settings['value']);
+ } else {
+ $database->query ( "INSERT INTO ".TABLE_PREFIX."settings (`name`,`value`) VALUES ('mediasettings','')" );
+ }
+}
+
Property changes on: trunk/admin/media/parameters.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Index: trunk/admin/media/rename.php
===================================================================
--- trunk/admin/media/rename.php (nonexistent)
+++ trunk/admin/media/rename.php (revision 2)
@@ -0,0 +1,158 @@
+get_get('dir');
+$directory = ($directory == '/') ? '' : $directory;
+
+$dirlink = 'browse.php?dir='.$directory;
+$rootlink = 'browse.php?dir=';
+// $file_id = intval($admin->get_get('id'));
+
+// first Check to see if it contains ..
+if (!check_media_path($directory)) {
+ $admin->print_error($MESSAGE['MEDIA_DIR_DOT_DOT_SLASH'],$rootlink, false);
+}
+
+// Get the temp id
+$file_id = intval($admin->checkIDKEY('id', false, $_SERVER['REQUEST_METHOD']))-1;
+if ($file_id===false) {
+ $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$dirlink, false);
+}
+
+$DIR = array();
+$FILE = array();
+// Get home folder not to show
+$home_folders = get_home_folders();
+// Check for potentially malicious files
+$forbidden_file_types = preg_replace( '/\s*[,;\|#]\s*/','|',RENAME_FILES_ON_UPLOAD);
+// Figure out what folder name the temp id is
+if($handle = opendir(WB_PATH.MEDIA_DIRECTORY.'/'.$directory)) {
+ // Loop through the files and dirs an add to list
+ while (false !== ($file = readdir($handle))) {
+ $info = pathinfo($file);
+ $ext = isset($info['extension']) ? $info['extension'] : '';
+ if(substr($file, 0, 1) != '.' AND $file != '.svn' AND $file != 'index.php') {
+ if( !preg_match('/'.$forbidden_file_types.'$/i', $ext) ) {
+ if(is_dir(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$file)) {
+ if(!isset($home_folders[$directory.'/'.$file])) {
+ $DIR[] = $file;
+ }
+ } else {
+ $FILE[] = $file;
+ }
+ }
+ }
+ }
+closedir($handle);
+}
+
+ $iSortFlags = ((version_compare(PHP_VERSION, '5.4.0', '<'))?SORT_REGULAR:SORT_NATURAL|SORT_FLAG_CASE);
+ sort($DIR, $iSortFlags);
+ sort($FILE, $iSortFlags);
+ $aListDir = array_merge($DIR,$FILE);
+ $temp_id = 0;
+ if(isset($aListDir)) {
+ foreach($aListDir AS $name)
+ {
+ if(!isset($rename_file)&& ($file_id == $temp_id)) {
+ $rename_file = $name;
+ $type = is_dir(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$rename_file)?'folder':'file';
+ }
+ $temp_id++;
+ }
+ }
+/*
+print '
'; +print_r( $_GET ); print ''; die(); // flush ();sleep(10); +*/ + +if (isset($_GET['img']) && isset($_GET['t'])) { + if(!class_exists('PhpThumbFactory', false)){ include($modulePath.'/inc/ThumbLib.inc.php'); } +// require_once($modulePath.'/inc/ThumbLib.inc.php'); + $image = addslashes($_GET['img']); + $type = intval($_GET['t']); +// $media = WB_PATH.MEDIA_DIRECTORY.'/'; + $thumb = PhpThumbFactory::create(WB_PATH.MEDIA_DIRECTORY.'/'.$image); + + if ($type == 1) { + $thumb->adaptiveResize(20,20); +// $thumb->resize(30,30); +// $thumb->cropFromCenter(80,50); +// $thumb->resizePercent(40); + } else { + $thumb->Resize(300,300); +// $thumb->resizePercent(25); +// $thumb->cropFromCenter(80,50); + } + $thumb->show(); + + } Property changes on: trunk/admin/media/thumb.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/media/upload.php =================================================================== --- trunk/admin/media/upload.php (nonexistent) +++ trunk/admin/media/upload.php (revision 2) @@ -0,0 +1,180 @@ +checkFTAN() ) +{ + $admin->print_header(); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL ); +} +// After check print the header +$admin->print_header(); + +// Target location +$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']); +$target = (isset(${$requestMethod}['target'])) ? ${$requestMethod}['target'] : ''; + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +$directory = ($target == '/') ? '' : $target; +$dirlink = 'index.php?dir='.$directory; +$rootlink = 'index.php?dir='; + +// Check to see if target contains ../ +if (!check_media_path($target, false)) +{ + $admin->print_error($MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] ); +} + +// Create relative path of the target location for the file +$relative = WB_PATH.$target.'/'; +$resizepath = str_replace(array('/',' '),'_',$target); + +// Find out whether we should replace files or give an error +$overwrite = ($admin->get_post('overwrite') != '') ? true : false; + +// Get list of file types to which we're supposed to append 'txt' +$get_result=$database->query("SELECT value FROM ".TABLE_PREFIX."settings WHERE name='rename_files_on_upload'"); +$file_extension_string=''; +if ($get_result->numRows()>0) { + $fetch_result=$get_result->fetchRow(); + $file_extension_string=$fetch_result['value']; +} + +$file_extensions=explode(",",$file_extension_string); +// get from settings and add to forbidden list +$forbidden_file_types = preg_replace( '/\s*[,;\|#]\s*/','|',RENAME_FILES_ON_UPLOAD); +// Loop through the files +$good_uploads = 0; +$sum_dirs = 0; +$sum_files = 0; +for($count = 1; $count <= 10; $count++) +{ + // If file was upload to tmp + if(isset($_FILES["file$count"]['name'])) + { + // Remove bad characters + $filename = trim(media_filename($_FILES["file$count"]['name']),'.') ; + // Check if there is still a filename left + // if($filename != '') { + $info = pathinfo($filename); + $ext = isset($info['extension']) ? $info['extension'] : ''; + + if ( ($filename != '') && !preg_match("/" . $forbidden_file_types . "$/i", $ext) ) + { + // Move to relative path (in media folder) + if(file_exists($relative.$filename) AND $overwrite == true) { + if(move_uploaded_file($_FILES["file$count"]['tmp_name'], $relative.$filename)) { + $good_uploads++; + $sum_files++; + // Chmod the uploaded file + change_mode($relative.$filename); + } + } elseif(!file_exists($relative.$filename)) { + if(move_uploaded_file($_FILES["file$count"]['tmp_name'], $relative.$filename)) { + $good_uploads++; + $sum_files++; + // Chmod the uploaded file + change_mode($relative.$filename); + } + } + + if(file_exists($relative.$filename)) { + if ($pathsettings[$resizepath]['width'] || $pathsettings[$resizepath]['height'] ) { + $rimg=new RESIZEIMAGE($relative.$filename); + $rimg->resize_limitwh($pathsettings[$resizepath]['width'],$pathsettings[$resizepath]['height'],$relative.$filename); + $rimg->close(); + } + } + + // store file name of first file for possible unzip action + if ($count == 1) { + $filename1 = $relative . $filename; + } + } + } +} +/* + * Callback function to skip files in black-list + */ +function pclzipCheckValidFile($p_event, &$p_header) +{ + // return 1; +// Check for potentially malicious files + $forbidden_file_types = preg_replace( '/\s*[,;\|#]\s*/','|',RENAME_FILES_ON_UPLOAD); + $info = pathinfo($p_header['filename']); + $ext = isset($info['extension']) ? $info['extension'] : ''; + $dots = (substr($info['basename'], 0, 1) == '.') || (substr($info['basename'], -1, 1) == '.'); + if( !preg_match('/'.$forbidden_file_types.'$/i', $ext) && $dots != '.' ) + { // ----- allowed file types are extracted + return 1; + }else + { // ----- all other files are skiped + return 0; + } +} +/* ********************************* */ + +// If the user chose to unzip the first file, unzip into the current folder +if (isset($_POST['unzip']) && isset($filename1) && file_exists($filename1) ) { + // Required to unzip file. + require_once(WB_PATH.'/include/pclzip/pclzip.lib.php'); + $archive = new PclZip($filename1); + $list = $archive->extract(PCLZIP_OPT_PATH, $relative,PCLZIP_CB_PRE_EXTRACT, 'pclzipCheckValidFile'); + + if($list == 0) { + // error while trying to extract the archive (most likely wrong format) + $admin->print_error('UNABLE TO UNZIP FILE' . $archive -> errorInfo(true)); + } + $sum_files = 0; + // rename executable files! + foreach ($list as $key => $val) { + if( ($val['folder'] ) && change_mode($val['filename']) ) { + $sum_dirs++; + } elseif( is_writable($val['filename']) && ($val['status'] == 'ok') && change_mode($val['filename']) ) { + $sum_files++; + } + } + if (isset($_POST['delzip'])) { unlink($filename1); } + $dir = dirname($filename1); + if(file_exists($dir)) { + $array = createFolderProtectFile($dir); + } +} +unset($list); + +if($sum_files == 1) { + $admin->print_success($sum_files.' '.$MESSAGE['MEDIA']['SINGLE_UPLOADED'] ); +} elseif($sum_files > 1) { + $admin->print_success($sum_files.' '.$MESSAGE['MEDIA']['UPLOADED'] ); +} else { + $admin->print_error($MESSAGE['MEDIA_NO_FILE_UPLOADED'] ); +} + +// Print admin +$admin->print_footer(); Property changes on: trunk/admin/media/upload.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/modules/details.php =================================================================== --- trunk/admin/modules/details.php (nonexistent) +++ trunk/admin/modules/details.php (revision 2) @@ -0,0 +1,155 @@ +checkFTAN()){ + $admin->print_header(); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); +} +$admin->print_header(); + +// Get module name + $file = ''; + if (!isset($_POST['file']) || $_POST['file'] == false) { + $iAddonId = 0; + $admin->print_error( $MESSAGE['GENERIC_FORGOT_OPTIONS'], $js_back ); + } else { + $iAddonId = $admin->checkIDKEY('file',0); + } + if ($iAddonId == 0){ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); + } + +// Get module directory + $sqlAddons = 'SELECT `directory` FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `addon_id`='.(int)$iAddonId.' ' + . ''.''; + if ($file = $database->get_one($sqlAddons)) { + $file = preg_replace('/[^a-z0-9_-]/i', "", $file); // fix secunia 2010-92-2 + } + +// Check if the module exists +if (!file_exists(WB_PATH.'/modules/'.$file)) { + $admin->print_error(' ('.$file.') '.$MESSAGE['GENERIC_NOT_INSTALLED'], $js_back ); +} + +// Setup template object, parse vars to it, then parse it +// Create new template object +$template = new Template(dirname($admin->correct_theme_source('modules_details.htt'))); +// $template->debug = true; +$template->set_file('page', 'modules_details.htt'); +$template->set_block('page', 'main_block', 'main'); + + +// Insert values +$sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ' +.'WHERE `type` = \'module\' ' +.'AND `directory` = \''.$file.'\''; +if($result = $database->query($sql)) { + $module = $result->fetchRow(MYSQLI_ASSOC); +} + +// check if a module description exists for the displayed backend language +$tool_description = false; +if(function_exists('file_get_contents') && file_exists(WB_PATH.'/modules/'.$file.'/languages/'.LANGUAGE .'.php')) { + // read contents of the module language file into string + $data = @file_get_contents(WB_PATH .'/modules/' .$file .'/languages/' .LANGUAGE .'.php'); + // use regular expressions to fetch the content of the variable from the string + $tool_description = get_variable_content('module_description', $data, false, false); + // replace optional placeholder {WB_URL} with value stored in config.php + if($tool_description !== false && strlen(trim($tool_description)) != 0) { + $tool_description = str_replace('{WB_URL}', WB_URL, $tool_description); + } else { + $tool_description = false; + } +} +if($tool_description !== false) { + // Override the module-description with correct desription in users language + $module['description'] = $tool_description; +} + +$template->set_var(array( + 'NAME' => $module['name'], + 'AUTHOR' => $module['author'], + 'DESCRIPTION' => $module['description'], + 'VERSION' => $module['version'], + 'DESIGNED_FOR' => $module['platform'], + 'ADMIN_URL' => ADMIN_URL, + 'WB_URL' => WB_URL, + 'THEME_URL' => THEME_URL + ) + ); + +switch ($module['function']) { + case NULL: + $type_name = $TEXT['UNKNOWN']; + break; + case 'page': + $type_name = $TEXT['PAGE']; + break; + case 'wysiwyg': + $type_name = $TEXT['WYSIWYG_EDITOR']; + break; + case 'tool': + $type_name = $TEXT['ADMINISTRATION_TOOL']; + break; + case 'admin': + $type_name = $TEXT['ADMIN']; + break; + case 'administration': + $type_name = $TEXT['ADMINISTRATION']; + break; + case 'snippet': + $type_name = $TEXT['CODE_SNIPPET']; + break; + default: + $type_name = $TEXT['UNKNOWN']; +} +$template->set_var('TYPE', $type_name); + +// Insert language headings +$template->set_var(array( + 'HEADING_MODULE_DETAILS' => $HEADING['MODULE_DETAILS'] + ) + ); +// Insert language text and messages +$template->set_var(array( + 'TEXT_NAME' => $TEXT['NAME'], + 'TEXT_TYPE' => $TEXT['TYPE'], + 'TEXT_AUTHOR' => $TEXT['AUTHOR'], + 'TEXT_VERSION' => $TEXT['VERSION'], + 'TEXT_DESIGNED_FOR' => $TEXT['DESIGNED_FOR'], + 'TEXT_DESCRIPTION' => $TEXT['DESCRIPTION'], + 'TEXT_BACK' => $TEXT['BACK'] + ) + ); + +// Parse module object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/modules/details.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/modules/index.php =================================================================== --- trunk/admin/modules/index.php (nonexistent) +++ trunk/admin/modules/index.php (revision 2) @@ -0,0 +1,210 @@ +correct_theme_source('modules.htt'))); +// $template->debug = true; +$template->set_file ('page', 'modules.htt'); +$template->set_block('page', 'main_block', 'main'); + +$template->set_block('main_block', 'module_install_block', 'module_install'); +// Insert values into module list +$template->set_block('main_block', 'module_detail_block', 'module_detail'); +$template->set_block('module_detail_block', 'module_detail_select_block', 'module_detail_select'); + +$template->set_block('main_block', 'module_uninstall_block', 'module_uninstall'); +$template->set_block('module_uninstall_block', 'module_uninstall_select_block', 'module_uninstall_select'); +$aPreventFromUninstall = array ( 'captcha_control', 'jsadmin', 'output_filter', 'wysiwyg', 'menu_link' ); + +$sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `type`=\'module\' ' + . 'ORDER BY `name`' + . ''; +if($oAddons = $database->query($sql)) { + while ($aAddon = $oAddons->fetchRow( MYSQLI_ASSOC )) { + if (!$admin->get_permission( $aAddon['directory'], 'module' )) { continue; } + $aAddonIdKey = $admin->getIDKEY($aAddon['addon_id']); + $sAddsonsPath = WB_PATH.'/modules/'.$aAddon['directory']; + $template->set_var('VALUE', $aAddonIdKey); + $template->set_var('NAME', $aAddon['name']); + $template->parse('module_detail_select', 'module_detail_select_block', true); + if (is_readable($sAddsonsPath.'/uninstall.php') && is_readable($sAddsonsPath . '/info.php')) { + if (!preg_match('/'.$aAddon['directory'].'/si', implode('|', $aPreventFromUninstall))) { + $template->set_var('UNINSTALL_VALUE', $aAddonIdKey); + $template->set_var('UNINSTALL_NAME', $aAddon['name']); + $template->parse('module_uninstall_select', 'module_uninstall_select_block', true); + } + } + } +} + +$show_block = false; +$template->set_block('main_block', 'module_advanced_block', 'module_advanced'); +$template->set_block('module_advanced_block', 'manuell_install_block', 'manuell_install'); +$template->set_block('module_advanced_block', 'manuell_upgrade_block', 'manuell_upgrade'); +$template->set_block('module_advanced_block', 'manuell_uninstall_block', 'manuell_uninstall'); +// Insert modules which includes a install.php file to install list +$template->set_block('manuell_install_block', 'manuell_install_select_block', 'manuell_install_select'); +$module_files = glob(WB_PATH . '/modules/*', GLOB_ONLYDIR|GLOB_NOSORT ); +natcasesort($module_files); +foreach ($module_files as $index => $sAddsonsPath) +{ + if( !$admin->get_permission( basename($sAddsonsPath), 'module' )) { continue; } + if (is_dir($sAddsonsPath)) { + if (is_readable($sAddsonsPath . '/install.php') && is_readable($sAddsonsPath . '/info.php')) { + require $sAddsonsPath . '/info.php'; + $show_block = true; + $AddonIdKey = $admin->getIDKEY(basename($sAddsonsPath),''); + $template->set_var('INSTALL_VISIBLE', ''); + $template->set_var('INSTALL_VALUE', $AddonIdKey); + $template->set_var('INSTALL_NAME', ( @$module_name ?: basename($sAddsonsPath)) ); + $template->parse('manuell_install_select', 'manuell_install_select_block', true); + } else { +// echo ''.basename($sAddsonsPath).'/install.php
'; + } + } else { + unset($module_files[$index]); + } +} + $template->set_block('manuell_upgrade_block', 'manuell_upgrade_select_block', 'manuell_upgrade_select'); + $template->set_block('manuell_uninstall_block', 'manuell_uninstall_select_block', 'manuell_uninstall_select'); + $oAddons->rewind(); + while ($aAddon = $oAddons->fetchRow( MYSQLI_ASSOC )) { + if( !$admin->get_permission( $aAddon['directory'], 'module' )) { continue; } + $aAddonIdKey = $admin->getIDKEY($aAddon['addon_id']); + $sAddsonsPath = WB_PATH.'/modules/'.$aAddon['directory']; + if (is_readable($sAddsonsPath.'/upgrade.php') && is_readable($sAddsonsPath . '/info.php')) { + $show_block = true; + $template->set_var('UPGRADE_VISIBLE', ''); + $template->set_var('UPGRADE_VALUE', $aAddonIdKey); + $template->set_var('UPGRADE_NAME', $aAddon['name']); + $template->parse('manuell_upgrade_select', 'manuell_upgrade_select_block', true); + } else { +// echo ''.$sAddsonsPath.'/upgrade.php
'; + } + if (is_readable($sAddsonsPath.'/uninstall.php') && is_readable($sAddsonsPath . '/info.php')) { + if (!preg_match('/'.$aAddon['directory'].'/si', implode('|', $aPreventFromUninstall))) { + $show_block = true; + $template->set_var('UNINSTALL_VISIBLE', ''); + $template->set_var('UNINSTALL_VALUE', $aAddonIdKey); + $template->set_var('UNINSTALL_NAME', $aAddon['name']); + $template->parse('manuell_uninstall_select', 'manuell_uninstall_select_block', true); + } + } else { +// echo ''.$sAddsonsPath.'/uninstall.php
'; + } + } + +// Insert permissions values and show or hidden blocks +if($admin->get_permission('modules_install') != true) { + $template->set_block ('module_install', ''); + $template->set_block ('manuell_install', ''); +} else { + $template->parse('module_install', 'module_install_block', true); + $template->parse('manuell_install', 'manuell_install_block', true); +} +if($admin->get_permission('modules_uninstall') != true) { + $template->set_block ('module_uninstall', ''); + $template->set_block ('manuell_uninstall', ''); +} else { + $template->parse('module_uninstall', 'module_uninstall_block', true); + $template->parse('manuell_uninstall', 'manuell_uninstall_block', true); +} +if($admin->get_permission('modules_view') != true) { + $template->set_block('module_detail', ''); + $template->set_block('manuell_upgrade', ''); +} else { + $template->parse('module_detail', 'module_detail_block', true); + $template->parse('manuell_upgrade', 'manuell_upgrade_block', true); +} +// only show block if there is something to show +if(!$show_block || count($module_files) == 0 || !isset($_GET['advanced']) || $admin->get_permission('admintools') != true) { + $template->set_block('module_advanced', ''); +} else { + $template->parse('module_advanced', 'module_advanced_block', true); +} + +$template->set_block('main_block', 'addon_template_block', 'addon_template'); +if($admin->get_permission('templates_view') != true) { + $template->set_block ('addon_template', ''); +} else { + $template->parse('addon_template', 'addon_template_block', true); +} + +$template->set_block('main_block', 'addon_language_block', 'addon_language'); +if($admin->get_permission('languages_view') != true) { + $template->set_block ('addon_language', ''); +} else { + $template->parse('addon_language', 'addon_language_block', true); +} + +$template->set_block('main_block', 'addon_module_block', 'addon_module'); +if($admin->get_permission('admintools') != true) { + $template->set_block ('addon_module', ''); +} else { + $template->parse('addon_module', 'addon_module_block', true); +} + +// Insert language headings +$template->set_var(array( + 'HEADING_INSTALL_MODULE' => $HEADING['INSTALL_MODULE'], + 'HEADING_UNINSTALL_MODULE' => $HEADING['UNINSTALL_MODULE'], + 'OVERWRITE_NEWER_FILES' => $MESSAGE['ADDON_OVERWRITE_NEWER_FILES'], + 'HEADING_MODULE_DETAILS' => $HEADING['MODULE_DETAILS'], + 'HEADING_INVOKE_MODULE_FILES' => $HEADING['INVOKE_MODULE_FILES'] + ) + ); +// insert urls +$template->set_var(array( + 'ADMIN_URL' => ADMIN_URL, + 'WB_URL' => WB_URL, + 'THEME_URL' => THEME_URL, + 'FTAN' => $admin->getFTAN() + ) + ); +// Insert language text and messages +$template->set_var(array( + 'URL_TEMPLATES' => $admin->get_permission('templates') ? ADMIN_URL . '/templates/index.php' : '#', + 'URL_LANGUAGES' => $admin->get_permission('languages') ? ADMIN_URL . '/languages/index.php' : '#', + 'URL_ADVANCED' => $admin->get_permission('admintools') ? ADMIN_URL . '/modules/index.php?advanced' : '#', + 'MENU_LANGUAGES' => $admin->get_permission('languages') ? $MENU['LANGUAGES'] : ' ', + 'MENU_TEMPLATES' => $admin->get_permission('templates') ? $MENU['TEMPLATES'] : ' ', + 'TEXT_ADVANCED' => $admin->get_permission('admintools') ? $TEXT['ADVANCED'] : ' ', + 'TEXT_INSTALL' => $TEXT['INSTALL'], + 'TEXT_UNINSTALL' => $TEXT['UNINSTALL'], + 'TEXT_VIEW_DETAILS' => $TEXT['VIEW_DETAILS'], + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], + 'TEXT_MANUAL_INSTALLATION' => $MESSAGE['ADDON_MANUAL_INSTALLATION'], + 'TEXT_MANUAL_INSTALLATION_WARNING' => $MESSAGE['ADDON_MANUAL_INSTALLATION_WARNING'], + 'TEXT_EXECUTE' => $TEXT['EXECUTE'], + 'TEXT_FILE' => $TEXT['FILE'] + ) +); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/modules/index.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/modules/install.php =================================================================== --- trunk/admin/modules/install.php (nonexistent) +++ trunk/admin/modules/install.php (revision 2) @@ -0,0 +1,197 @@ +checkFTAN()){ + $admin->print_header(); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); +} +// After check print the header +$admin->print_header(); + +// Check if user uploaded a file +if(!isset($_FILES['userfile'])) { + $admin->print_error($MESSAGE['GENERIC_ERROR_OPENING_FILE'], $js_back ); +} + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Set temp vars +$temp_dir = WB_PATH.'/temp/'; +$temp_file = $temp_dir . $_FILES['userfile']['name']; +$temp_unzip = WB_PATH.'/temp/unzip/'; + +if(!$_FILES['userfile']['error']) { + // Try to upload the file to the temp dir + if(!move_uploaded_file($_FILES['userfile']['tmp_name'], $temp_file)) + { + $admin->print_error($MESSAGE['GENERIC_BAD_PERMISSIONS']); + } +} else { +// index for language files + $key = 'UNKNOW_UPLOAD_ERROR'; + switch ($_FILES['userfile']['error']) { + case UPLOAD_ERR_INI_SIZE: + $key = 'UPLOAD_ERR_INI_SIZE'; + case UPLOAD_ERR_FORM_SIZE: + $key = 'UPLOAD_ERR_FORM_SIZE'; + case UPLOAD_ERR_PARTIAL: + $key = 'UPLOAD_ERR_PARTIAL'; + case UPLOAD_ERR_NO_FILE: + $key = 'UPLOAD_ERR_NO_FILE'; + case UPLOAD_ERR_NO_TMP_DIR: + $key = 'UPLOAD_ERR_NO_TMP_DIR'; + case UPLOAD_ERR_CANT_WRITE: + $key = 'UPLOAD_ERR_CANT_WRITE'; + case UPLOAD_ERR_EXTENSION: + $key = 'UPLOAD_ERR_EXTENSION'; + default: + $key = 'UNKNOW_UPLOAD_ERROR'; + } + $admin->print_error($MESSAGE[$key].'
'.$MESSAGE['GENERIC_CANNOT_UPLOAD']); +} + +// Include the PclZip class file (thanks to +require_once(WB_PATH.'/include/pclzip/pclzip.lib.php'); + +// Remove any vars with name "module_directory" +if (isset($module_directory)){unset($module_directory);} + +// Setup the PclZip object +$archive = new PclZip($temp_file); +// Unzip the files to the temp unzip folder +$list = $archive->extract(PCLZIP_OPT_PATH, $temp_unzip); + +// Check if uploaded file is a valid Add-On zip file +if (!($list && file_exists($temp_unzip . 'info.php'))) +{ + $admin->print_error($MESSAGE['GENERIC_INVALID_ADDON_FILE']); +} + +// Include the modules info file +require($temp_unzip.'info.php'); + +// Perform Add-on requirement checks before proceeding +require(WB_PATH . '/framework/addon.precheck.inc.php'); +preCheckAddon($temp_file); +// Delete the temp unzip directory +rm_full_dir($temp_unzip); + +// Check if the file is valid +if(!isset($module_directory)) +{ + if (file_exists($temp_file)) { unlink($temp_file); } // Remove temp file + $admin->print_error($MESSAGE['GENERIC_INVALID']); +} + +// Check if this module is already installed +// and compare versions if so +$new_module_version = $module_version; +$action="install"; +if(is_dir(WB_PATH.'/modules/'.$module_directory)) +{ + if(file_exists(WB_PATH.'/modules/'.$module_directory.'/info.php')) + { + require(WB_PATH.'/modules/'.$module_directory.'/info.php'); + // Version to be installed is older than currently installed version + if (versionCompare($module_version, $new_module_version, '>=')) + { + if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file + $admin->print_error($MESSAGE['GENERIC_ALREADY_INSTALLED']); + } + $action="upgrade"; + } +} + +// Check if module dir is writable +if(!is_writable(WB_PATH.'/modules/')) +{ + if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file + $admin->print_error($MESSAGE['GENERIC_BAD_PERMISSIONS']); +} + +// Set module directory +$module_dir = WB_PATH.'/modules/'.$module_directory; + +// Make sure the module dir exists, and chmod if needed +make_dir($module_dir); + +// Unzip module to the module dir +if(isset($_POST['overwrite'])){ + $list = (int)$archive->extract(PCLZIP_OPT_PATH, $module_dir, PCLZIP_OPT_REPLACE_NEWER ); +} else { + $list = (int)$archive->extract(PCLZIP_OPT_PATH, $module_dir ); +} + +if ($list==0) +{ + $admin->print_error($MESSAGE['GENERIC_CANNOT_UNZIP']); +} +/* + +if ($list == 0) { + $admin->print_error("ERROR : ".$archive->errorInfo(true)); +} +*/ +// Delete the temp zip file +if(file_exists($temp_file)) { unlink($temp_file); } + +// Chmod all the uploaded files +$dir = dir($module_dir); +while (false !== $entry = $dir->read()) +{ + // Skip pointers + if(substr($entry, 0, 1) != '.' AND $entry != '.svn' AND !is_dir($module_dir.'/'.$entry)) + { + // Chmod file + change_mode($module_dir.'/'.$entry, 'file'); + } +} +/* */ +// Run the modules install // upgrade script if there is one +if(file_exists($module_dir.'/'.$action.'.php')) +{ + require($module_dir.'/'.$action.'.php'); +} + +// Print success message +if ($action=="install") +{ + // Load module info into DB + load_module(WB_PATH.'/modules/'.$module_directory, false); + $admin->print_success($MESSAGE['GENERIC_INSTALLED']); +} elseif ($action=="upgrade") +{ + + upgrade_module($module_directory, false); + $admin->print_success($MESSAGE['GENERIC_UPGRADED']); +} + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/modules/install.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/modules/manual_install.php =================================================================== --- trunk/admin/modules/manual_install.php (nonexistent) +++ trunk/admin/modules/manual_install.php (revision 2) @@ -0,0 +1,155 @@ +$v) $aStr = str_replace("{{".$k."}}", $v, $aStr); + return $aStr; + } +} + +// check user permissions for admintools (redirect users with wrong permissions) +$admin = new admin('Admintools', 'admintools', false, false); +/* +if (!(isset($_POST['action']) && in_array($_POST['action'], array('install', 'upgrade', 'uninstall')))) { die(header('Location: index.php?advanced')); } +if (!(isset($_POST['file']) && $_POST['file'] != '' && (strpos($_POST['file'], '..') === false))){ die(header('Location: index.php?advanced')); } +*/ +$sCallingScript = $_SERVER["SCRIPT_NAME"]; + +$js_back = ADMIN_URL . '/modules/index.php?advanced'; + +if( !$admin->checkFTAN() ){ + $admin->print_header(); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back); +} + +if ($admin->get_permission('admintools') == false) { + $admin->print_header(); + $admin->print_error($MESSAGE['ADMIN_INSUFFICIENT_PRIVELLIGES'], $js_back); + } + + +// check if the referer URL if available +$referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : + (isset($HTTP_SERVER_VARS['HTTP_REFERER']) ? $HTTP_SERVER_VARS['HTTP_REFERER'] : ''); +$referer = ''; +// if referer is set, check if script was invoked from "admin/modules/index.php" +$required_url = ADMIN_URL . '/modules/index.php'; +if ($referer != '' && (!(strpos($referer, $required_url) !== false || strpos($referer, $required_url) !== false))) +{ + $admin->print_header(); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back); +} + +// include WB functions file +require_once(WB_PATH . '/framework/functions.php'); + +// load WB language file +require_once(WB_PATH . '/languages/' . LANGUAGE .'.php'); + +// create Admin object with admin header +$admin = new admin('Addons', '', true, false); +$aValideActions = array( 'uninstall', 'install', 'upgrade' ); + +$sAction = $admin->StripCodeFromText($_POST['action']); +$sAction = ( in_array($sAction, $aValideActions) ? $sAction : 'upgrade' ); +/** + * Manually execute the specified module file (install.php, upgrade.php or uninstall.php) + */ + $sAddonName = ''; + if (!isset($_POST['file']) || $_POST['file'] == false) { + $iAddonId = 0; + $admin->print_error( $MESSAGE['GENERIC_FORGOT_OPTIONS'], $js_back ); + } else { + $iAddonId = $admin->checkIDKEY('file',0); + } + + if ( is_numeric($iAddonId)&&($iAddonId == 0)){ + $admin->print_error($iAddonId.' '.$MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); + } +// Get module directory + if ($sAction != 'install') { + $sqlAddons = 'SELECT `directory` FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `addon_id`='.(int)$iAddonId.' ' + . ''.''; + if ($sAddonName = $database->get_one($sqlAddons)) { + $sAddonName = preg_replace('/[^a-z0-9_-]/i', "", $sAddonName); // fix secunia 2010-92-2 + } + } else { + $sAddonName = preg_replace('/[^a-z0-9_-]/i', "", $iAddonId); // fix secunia 2010-92-2 + } +// Extra protection +if(trim($sAddonName) == '') { + $admin->print_error($MESSAGE['GENERIC_ERROR_OPENING_FILE'], $js_back ); +} + +// check whether the module is needed in core +$aPreventFromUninstall = array ( 'captcha_control', 'jsadmin', 'output_filter', 'wysiwyg', 'menu_link' ); +if( + $sAction == 'uninstall' && + preg_match('/'.$sAddonsFile.'/si', implode('|', $aPreventFromUninstall )) +) { + $temp = array ('name' => $file ); + $msg = replace_all( $MESSAGE['MEDIA_CANNOT_DELETE_DIR'], $temp ); + $admin->print_error( $msg ); +} + +// check if specified module folder exists +$sAddonRelPath = '/modules/'.$sAddonName; +// let the old variablename if module use it + +if (!file_exists( WB_PATH.$sAddonRelPath.'/'.$sAction. '.php')){ + $admin->print_header(); + $admin->print_error($TEXT['NOT_FOUND'].': "'.$sAddonName.'/'.$sAction.'.php" ', $js_back); +} +// include modules install.php script +if( in_array($sAction, $aValideActions) ) { + require(WB_PATH.$sAddonRelPath . '/' . $sAction . '.php'); +} +// load module info into database and output status message +load_module(WB_PATH.$sAddonRelPath, false); +$msg = $TEXT['EXECUTE'] . ': "'.$sAddonName.'/'.$sAction.'.php"'; + +switch ($sAction) +{ + case 'install': + $admin->print_success($msg, $js_back); + break; + + case 'upgrade': + upgrade_module($sAddonName, false); + $admin->print_success($msg, $js_back); + break; + + case 'uninstall': + $admin->print_success($msg, $js_back); + break; +} Property changes on: trunk/admin/modules/manual_install.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/modules/uninstall.php =================================================================== --- trunk/admin/modules/uninstall.php (nonexistent) +++ trunk/admin/modules/uninstall.php (revision 2) @@ -0,0 +1,149 @@ +$v) $aStr = str_replace("{{".$k."}}", $v, $aStr); + return $aStr; + } +} + +$admin = new admin('Addons', 'modules_uninstall', false); + +$js_back = ADMIN_URL.'/modules/index.php'; + + if (!$admin->checkFTAN() ){ + $admin->print_header(); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); + } +// After check print the header + $admin->print_header(); + + $sAddonsFile = ''; +// Check if user selected template + if (!isset($_POST['file']) || $_POST['file'] == false) { + $iAddonId = 0; + $admin->print_error( $MESSAGE['GENERIC_FORGOT_OPTIONS'], $js_back ); + } else { + $iAddonId = $admin->checkIDKEY('file',0); + } + if ($iAddonId == 0){ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); + } + +// Get module directory + $sqlAddons = 'SELECT `directory` FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `addon_id`='.(int)$iAddonId.' ' + . ''.''; + if ($sAddonsFile = $database->get_one($sqlAddons)) { + $sAddonsFile = preg_replace('/[^a-z0-9_-]/i', "", $sAddonsFile); // fix secunia 2010-92-2 + } + +// check whether the module is core +$aPreventFromUninstall = array ( 'captcha_control', 'jsadmin', 'output_filter', 'wysiwyg', 'menu_link' ); +if( + preg_match('/'.$sAddonsFile.'/si', implode('|', $aPreventFromUninstall )) +) { + $temp = array ('name' => $file ); + $msg = replace_all( $MESSAGE['MEDIA_CANNOT_DELETE_DIR'], $temp ); + $admin->print_error( $msg ); +} +// Check if the module exists +if (!is_dir(WB_PATH.'/modules/'.$sAddonsFile) ) { + $admin->print_error($MESSAGE['GENERIC_NOT_INSTALLED'], $js_back ); +} +$sql = 'SELECT `section_id`, `page_id` FROM `'.TABLE_PREFIX.'sections` ' + . 'WHERE `module`=\''.$database->escapeString($sAddonsFile).'\''; +if( $oAddon = $database->query($sql)) { + + if ($oAddon->numRows() > 0) { + + /** + * Modul is in use, so we have to warn the user + */ + if (!array_key_exists("CANNOT_UNINSTALL_IN_USE_TMPL", $MESSAGE['GENERIC'])) { + $add = $oAddon->numRows() == 1 ? "this page" : "these pages"; + $msg_template_str = "
{{type}} {{type_name}} could not be uninstalled because it is still in use on {{pages}}"; + $msg_template_str .= ":
click for editing.
"; + } else { + $msg_template_str = $MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE_TMPL']; + $temp = explode(";",$MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE_TMPL_PAGES']); + $add = $oAddon->numRows() == 1 ? $temp[0] : $temp[1]; + } + /** + * The template-string for displaying the Page-Titles ... in this case as a link + */ + $page_template_str = "- {{title}}
"; + + $values = array ('type' => 'Modul', 'type_name' => $sAddonsFile, 'pages' => $add ); + $msg = replace_all ( $msg_template_str, $values ); + + $page_names = ""; + + while ($data = $oAddon->fetchRow(MYSQLI_ASSOC) ) { + $sql = 'SELECT `page_title` FROM `'.TABLE_PREFIX.'pages` ' + . 'WHERE `page_id`= '.(int)$data['page_id']; + $oPage = $database->query($sql); + $aPage = $oPage->fetchRow( MYSQLI_ASSOC ); + $aPageInfo = array( + 'id' => $data['page_id'], + 'title' => $aPage['page_title'] + ); + + $page_names .= replace_all ( $page_template_str, $aPageInfo ); + } + + /** + * Printing out the error-message and die(). + */ + $admin->print_error(str_replace ($TEXT['FILE'], "Modul", $MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE']).$msg.$page_names); + } +} else { + $admin->print_error($MESSAGE['GENERIC_CANNOT_UNINSTALL']); +} +// Check if we have permissions on the directory +if (!is_writable(WB_PATH.'/modules/'.$sAddonsFile)) { + $admin->print_error(' ('.$sAddonsFile.') '.$MESSAGE['GENERIC_CANNOT_UNINSTALL']); +} + +// Run the modules uninstall script if there is one +if(file_exists(WB_PATH.'/modules/'.$sAddonsFile.'/uninstall.php')) { + require(WB_PATH.'/modules/'.$sAddonsFile.'/uninstall.php'); +} + +// Try to delete the module dir +if (!rm_full_dir(WB_PATH.'/modules/'.$sAddonsFile)) { + $admin->print_error($MESSAGE['GENERIC_CANNOT_UNINSTALL']); +} else { + // Remove entry from DB + $sql = 'DELETE FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `type` = \'module\' ' + . 'AND `directory` = \''.$database->escapeString($sAddonsFile).'\' '; + $database->query($sql); +} +// Print success message +$admin->print_success($MESSAGE['GENERIC_UNINSTALLED']); + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/modules/uninstall.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/pages/add.php =================================================================== --- trunk/admin/pages/add.php (nonexistent) +++ trunk/admin/pages/add.php (revision 2) @@ -0,0 +1,256 @@ +checkFTAN()) +{ + $admin->print_header(); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL ); +} + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Get values +$title = $admin->get_post('title'); +$title = htmlspecialchars($title); +$module = preg_replace('/[^a-z0-9_-]/i', "", $admin->get_post('type')); // fix secunia 2010-93-4 +$parent = intval($admin->get_post('parent')); // fix secunia 2010-91-2 +$visibility = $admin->get_post('visibility'); +if (!in_array($visibility, array('public', 'private', 'registered', 'hidden', 'none'))) {$visibility = 'public';} // fix secunia 2010-91-2 +$admin_groups = $admin->get_post('admin_groups'); +$viewing_groups = $admin->get_post('viewing_groups'); + +// Work-out if we should check for existing page_code +$field_set = $database->field_exists(TABLE_PREFIX.'pages', 'page_code'); + +// add Admin to admin and viewing-groups +$admin_groups[] = 1; +$viewing_groups[] = 1; + +// After check print the header +$admin->print_header(); +// check parent page permissions: +if ($parent!=0) { + if (!$admin->get_page_permission($parent,'admin')) + { + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); + } + +} elseif (!$admin->get_permission('pages_add_l0','system')) +{ + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); +} + +// check module permissions: +if (!$admin->get_permission($module, 'module')) +{ + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); +} + +// Validate data +if($title == '' || substr($title,0,1)=='.') +{ + $admin->print_error($MESSAGE['PAGES_BLANK_PAGE_TITLE']); +} + +// Check to see if page created has needed permissions +if(!in_array(1, $admin->get_groups_id())) +{ + $admin_perm_ok = false; + foreach ($admin_groups as $adm_group) + { + if (in_array($adm_group, $admin->get_groups_id())) + { + $admin_perm_ok = true; + } + } + if ($admin_perm_ok == false) + { + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); + } + $admin_perm_ok = false; + foreach ($viewing_groups as $view_group) + { + if (in_array($view_group, $admin->get_groups_id())) + { + $admin_perm_ok = true; + } + } + if ($admin_perm_ok == false) + { + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); + } +} + +$admin_groups = implode(',', $admin_groups); +$viewing_groups = implode(',', $viewing_groups); + +// Work-out what the link and page filename should be +if($parent == '0') +{ + $link = '/'.page_filename($title); + // rename menu titles: index && intro to prevent clashes with intro page feature and WB core file /pages/index.php + if($link == '/index' || $link == '/intro') + { + $link .= '_0'; + $filename = WB_PATH .PAGES_DIRECTORY .'/' .page_filename($title) .'_0' .PAGE_EXTENSION; + } else { + $filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($title).PAGE_EXTENSION; + } +} else { + $parent_section = ''; + $parent_titles = array_reverse(get_parent_titles($parent)); + foreach($parent_titles AS $parent_title) + { + $parent_section .= page_filename($parent_title).'/'; + } + if($parent_section == '/') { $parent_section = ''; } + $link = '/'.$parent_section.page_filename($title); + $filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($title).PAGE_EXTENSION; + make_dir(WB_PATH.PAGES_DIRECTORY.'/'.$parent_section); +} + +// Check if a page with same page filename exists +$sql = 'SELECT `page_id` FROM `'.TABLE_PREFIX.'pages` ' + . 'WHERE `link`=\''.$link.'\''; +$get_same_page = $database->get_one($sql); +if ( + $get_same_page OR + file_exists(WB_PATH.PAGES_DIRECTORY.$link.PAGE_EXTENSION) OR + file_exists(WB_PATH.PAGES_DIRECTORY.$link.'/') +) { + $admin->print_error($MESSAGE['PAGES']['PAGE_EXISTS']); +} + +// Include the ordering class +require(WB_PATH.'/framework/class.order.php'); +$order = new order(TABLE_PREFIX.'pages', 'position', 'page_id', 'parent'); +// First clean order +$order->clean($parent); +// Get new order +$position = $order->get_new($parent); + +// Work-out if the page parent (if selected) has a seperate template or language to the default +$sql='SELECT `template`, `language` FROM `'.TABLE_PREFIX.'pages` ' + . 'WHERE `page_id` = '.(int)$parent; +$query_parent = $database->query($sql); +if ($query_parent->numRows() > 0) { + $fetch_parent = $query_parent->fetchRow( MYSQLI_ASSOC ); + $template = $fetch_parent['template']; + $language = $fetch_parent['language']; +} else { + $template = ''; + $language = DEFAULT_LANGUAGE; +} + +// Insert page into pages table +$sql = 'INSERT INTO `'.TABLE_PREFIX.'pages` ' + . 'SET `parent`='.(int)$parent.', ' + . '`link` = \'\', ' + . '`description`=\'\', ' + . '`keywords`=\'\', ' + . '`page_trail`=\'\', ' + . '`admin_users`=\'\', ' + . '`viewing_users`=\'\', ' + . '`target`=\'_top\', ' + . '`page_title`=\''.$database->escapeString($title).'\', ' + . '`menu_title`=\''.$database->escapeString($title).'\', ' + . '`template`=\''.$database->escapeString($template).'\', ' + . '`visibility`=\''.$database->escapeString($visibility).'\', ' + . '`position`='.(int)$position.', ' + . '`menu`=1, ' + . '`language`=\''.$database->escapeString($language).'\', ' + . '`searching`=1, ' + . '`modified_when`='.time().', ' + . '`modified_by`='.(int)$admin->get_user_id().', ' + . '`admin_groups`=\''.$database->escapeString($admin_groups).'\', ' + . '`viewing_groups`=\''.$database->escapeString($viewing_groups).'\''; +if (!$database->query($sql)) { + $admin->print_error($database->get_error()); +} +// Get the new page id +$page_id = $database->getLastInsertId(); +// Work out level +$level = level_count($page_id); +// Work out root parent +$root_parent = root_parent($page_id); +// Work out page trail +$page_trail = get_page_trail($page_id); +// Update page with new level and link +$sql = 'UPDATE `'.TABLE_PREFIX.'pages` SET ' + . '`root_parent` = '.(int)$root_parent.', ' + . '`level` = '.(int)$level.', ' + . '`link` = \''.$database->escapeString($link).'\', ' + . ((defined('PAGE_LANGUAGES') && PAGE_LANGUAGES) + && $field_set + && ($language == DEFAULT_LANGUAGE) + && (file_exists(WB_PATH.'/modules/mod_multilingual/update_keys.php') + ) + ? '`page_code` = '.(int)$page_id.', ' : '') +. '`page_trail`=\''.$database->escapeString($page_trail).'\' ' + . 'WHERE `page_id` = '.$page_id; + if (!$database->query($sql)) { + $admin->print_error($database->get_error()); +} +// Create a new file in the /pages dir +create_access_file($filename, $page_id, $level); + +// add position 1 to new page +$position = 1; + +// Add new record into the sections table +$sql = 'INSERT INTO `'.TABLE_PREFIX.'sections` ' + . 'SET `page_id`='.(int)$page_id.', ' + . '`position`='.(int)$position.', ' + . '`module`=\''.$database->escapeString($module).'\', ' + . '`block`=1'; +if (!$database->query($sql)) { + $admin->print_error($database->get_error()); +} +// Get the section id +if (!($section_id = $database->getLastInsertId())) { + $admin->print_error($database->get_error()); +} +// Include the selected modules add file if it exists +if ( + file_exists(WB_PATH.'/modules/'.$module.'/addon.php') && + file_exists(WB_PATH.'/modules/'.$module.'/cmd/cmdModify.inc') +) { + $sCommand = 'modify'; +// require WB_PATH.'/modules/'.$module.'/addon.php'; + $admin->print_success($MESSAGE['PAGES_ADDED'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} else { + if (file_exists(WB_PATH.'/modules/'.$module.'/add.php')) { + require WB_PATH.'/modules/'.$module.'/add.php'; + } + $admin->print_success($MESSAGE['PAGES_ADDED'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} +/* +// Include the selected modules add file if it exists +if(file_exists(WB_PATH.'/modules/'.$module.'/add.php')) { + require(WB_PATH.'/modules/'.$module.'/add.php'); +} +$admin->print_success($MESSAGE['PAGES']['ADDED'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +*/ +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/pages/add.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/pages/delete.php =================================================================== --- trunk/admin/pages/delete.php (nonexistent) +++ trunk/admin/pages/delete.php (revision 2) @@ -0,0 +1,118 @@ +checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) ) +{ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL ); + exit(); +} + +// Get perms +if (!$admin->get_page_permission($page_id,'admin')) { + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); +} + +// Find out more about the page +$query = "SELECT * FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"; +$results = $database->query($query); +if($database->is_error()) { + $admin->print_error($database->get_error()); +} +if($results->numRows() == 0) { + $admin->print_error($MESSAGE['PAGES_NOT_FOUND']); +} + +$results_array = $results->fetchRow(); + +$visibility = $results_array['visibility']; + +// Check if we should delete it or just set the visibility to 'deleted' +if(PAGE_TRASH != 'disabled' AND $visibility != 'deleted') { + // Page trash is enabled and page has not yet been deleted + // Function to change all child pages visibility to deleted + function trash_subs($parent = 0) { + global $database; + // Query pages + + $sql = 'SELECT `page_id` FROM `'.TABLE_PREFIX.'pages` ' + .'WHERE `parent` = '.$parent.' ' + .'ORDER BY `position` ASC'; + if($oRes = $database->query($sql)) { + // Check if there are any pages to show + if($oRes->numRows() > 0) { + // Loop through pages + while($page = $oRes->fetchRow(MYSQLI_ASSOC)) { + // Update the page visibility to 'deleted' + $sql = 'UPDATE `'.TABLE_PREFIX.'pages` SET ' + .'`visibility` = \'deleted\' ' + .'WHERE `page_id` = '.$page['page_id'].' ' + .''; + $database->query($sql); + + if($database->is_error()) { + $admin->print_error($database->get_error()); + } + // Run this function again for all sub-pages + trash_subs($page['page_id']); + } + } + } + } + // Update the page visibility to 'deleted' + $sql = 'UPDATE `'.TABLE_PREFIX.'pages` SET ' + .'`visibility` = \'deleted\' ' + .'WHERE `page_id` = '.$page_id.' ' + .''; + $database->query($sql); + + if($database->is_error()) { + $admin->print_error($database->get_error()); + } + // + // Run trash subs for this page + trash_subs($page_id); +} else { + // Really dump the page + // Delete page subs + $sub_pages = get_subs($page_id, array()); + foreach($sub_pages AS $sub_page_id) { + delete_page($sub_page_id); + } + // Delete page + delete_page($page_id); +} + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error()); +} else { + $admin->print_success($MESSAGE['PAGES_DELETED']); +} + +// Print admin footer +$admin->print_footer(); \ No newline at end of file Property changes on: trunk/admin/pages/delete.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/pages/eggsurplus.js =================================================================== --- trunk/admin/pages/eggsurplus.js (nonexistent) +++ trunk/admin/pages/eggsurplus.js (revision 2) @@ -0,0 +1,16 @@ + function add_child_page(page_id) + { + //find and select the page in the parent dropdown + var selectBox = document.add.parent; +console.info(selectBox); + for (var i = 0; i < selectBox.options.length; i++) + { + if (selectBox.options[i].value == page_id) + { + selectBox.selectedIndex = i; + break; + } + } + //set focus to add form + document.add.title.focus(); + } Index: trunk/admin/pages/empty_trash.php =================================================================== --- trunk/admin/pages/empty_trash.php (nonexistent) +++ trunk/admin/pages/empty_trash.php (revision 2) @@ -0,0 +1,54 @@ +query($query); + +// Insert values into main page list +if($get_pages->numRows() > 0) { + while($page = $get_pages->fetchRow()) { + // Delete page subs + $sub_pages = get_subs($page['page_id'], array()); + foreach($sub_pages AS $sub_page_id) { + delete_page($sub_page_id); + } + // Delete page + delete_page($page['page_id']); + } +} + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error()); +} else { + $admin->print_success($TEXT['TRASH_EMPTIED']); +} + +// Print admin +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: trunk/admin/pages/empty_trash.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/pages/html.php =================================================================== --- trunk/admin/pages/html.php (nonexistent) +++ trunk/admin/pages/html.php (revision 2) @@ -0,0 +1,39 @@ + + + + +
+
+
+
+
+
+'."\n" : '';
+ $par['num_subs'] = (empty($output) ) ? 1 : $par['num_subs'];
+ print $output;
+ return $editable_pages;
+}
+
+// Generate pages list
+if($admin->get_permission('pages_view') == true) {
+ ?>
+
+
function '.__FUNCTION__.'( '.$file_id.'=='.$temp_id.' ); filename: '.basename(__FILE__).' line: '.__LINE__.' ->'; flush (); // ob_flush();;sleep(10); die(); +print '
'; +print_r( $rename_file.' '.$type ); print '
function '.__FUNCTION__.'( '.' ); filename: '.basename(__FILE__).' line: '.__LINE__.' ->'; flush (); // ob_flush();;sleep(10); die(); +*/ + +if(!isset($rename_file)) { + $admin->print_error($MESSAGE['MEDIA_FILE_NOT_FOUND'], $dirlink, false); +} + +$sExtension = ''; +$sBasename = $rename_file; +preg_match ( + '/^(?:.*?[\/])?([^\/]*?)\.([^\.]*)$/iU', + str_replace('\\', '/', $rename_file), + $aMatches +); +if (sizeof($aMatches) == 3) { + $sBasename = $aMatches[1]; + $sExtension = $aMatches[2]; +} + +// Setup template object, parse vars to it, then parse it +// Create new template object +$template = new Template(dirname($admin->correct_theme_source('media_rename.htt'))); +$template->set_file('page', 'media_rename.htt'); +$template->set_block('page', 'main_block', 'main'); +//echo WB_PATH.'/media/'.$directory.'/'.$rename_file; +if($type == 'folder') { + $template->set_var('DISPlAY_EXTENSION', 'hide'); + $extension = ''; +} else { + $template->set_var('DISPlAY_EXTENSION', ''); + $extension = strstr($rename_file, '.'); +} + +if($type == 'folder') { + $type = $TEXT['FOLDER']; +} else { + $type = $TEXT['FILE']; +} + +$template->set_var(array( + 'THEME_URL' => THEME_URL, + 'FILENAME' => $rename_file, + 'BASENAME' => $sBasename, + 'DIR' => $directory, + 'FILE_ID' => $admin->getIDKEY($file_id), + // 'FILE_ID' => $file_id, + 'TYPE' => $type, + 'EXTENSION' => $sExtension, + 'FTAN' => $admin->getFTAN() + ) + ); + + +// Insert language text and messages +$template->set_var(array( + 'TEXT_TO' => $TEXT['TO'], + 'TEXT_RENAME' => $TEXT['RENAME'], + 'TEXT_CANCEL' => $TEXT['CANCEL'], + 'TEXT_UP' => $TEXT['UP'], + 'TEXT_OVERWRITE_EXISTING' => $TEXT['OVERWRITE_EXISTING'] + ) + ); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); Property changes on: trunk/admin/media/rename.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/media/rename2.php =================================================================== --- trunk/admin/media/rename2.php (nonexistent) +++ trunk/admin/media/rename2.php (revision 2) @@ -0,0 +1,172 @@ +get_post('id')); + +// first Check to see if it contains .. +if (!check_media_path($directory)) { + $admin->print_error($MESSAGE['MEDIA_DIR_DOT_DOT_SLASH'],$rootlink, false); +} + +// Get the temp id +$iFileId = $file_id = intval($admin->checkIDKEY('id', false, $_SERVER['REQUEST_METHOD'])); +if ($file_id===false) { + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$dirlink, false); +} + +$DIR = array(); +$FILE = array(); +// Check for potentially malicious files +$forbidden_file_types = preg_replace( '/\s*[,;\|#]\s*/','|',RENAME_FILES_ON_UPLOAD); +// Get home folder not to show +$home_folders = get_home_folders(); + +// Figure out what folder name the temp id is +if($handle = opendir(WB_PATH.MEDIA_DIRECTORY.'/'.$directory)) { + // Loop through the files and dirs an add to list + $temp_id = 0; + while (false !== ($file = readdir($handle))) { + if(substr($file, 0, 1) != '.' AND $file != '.svn' AND $file != 'index.php') { + $info = pathinfo($file); + $ext = isset($info['extension']) ? $info['extension'] : ''; + if( !preg_match('/'.$forbidden_file_types.'$/i', $ext) ) { + if(is_dir(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$file)) { + if(!isset($home_folders[$directory.'/'.$file])) { + $DIR[] = $file; + } + } else { + $FILE[] = $file; + } + } + } + } +closedir($handle); +} + + $iSortFlags = ((version_compare(PHP_VERSION, '5.4.0', '<'))?SORT_REGULAR:SORT_NATURAL|SORT_FLAG_CASE); + sort($DIR, $iSortFlags); + sort($FILE, $iSortFlags); + $aListDir = array_merge($DIR,$FILE); + $temp_id = 0; + if(isset($aListDir)) { +// sort($aListDir, SORT_REGULAR|SORT_FLAG_CASE); + foreach($aListDir AS $name) + { + if(!isset($rename_file)&& ($file_id == $temp_id)) { + $rename_file = $name; + $type = is_dir(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$rename_file)?'folder':'file'; + } + $temp_id++; + } + } + +$file_id = $admin->getIDKEY($file_id); + +if(!isset($rename_file)) { + $admin->print_error($MESSAGE['MEDIA_FILE_NOT_FOUND'], $dirlink, false); +} + +// Check if they entered a new name +if(media_filename($admin->get_post('name')) == "") { + $admin->print_error($MESSAGE['MEDIA_BLANK_NAME'], "rename.php?dir=$directory&id=$file_id", false); +} else { + $old_name = $admin->get_post('old_name'); + $new_name = media_filename($admin->get_post('name')); +} + +// Check if they entered an extension +if($type == 'file') { + if (strstr($new_name,'.')){ + $new_name = str_replace('.', '_', $new_name); + } + if(media_filename($admin->get_post('extension')) == "") { + $name = $new_name; + } else { + $extension = media_filename($admin->get_post('extension')); + $name = $new_name.'.'.trim($extension,'.'); + } +} elseif($type == 'folder') { + $extension = ''; + $name = $new_name; +} + +// Join new name and extension + +$info = pathinfo(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$name); +$ext = isset($info['extension']) ? $info['extension'] : ''; +$dots = (substr($info['basename'], 0, 1) == '.') || (substr($info['basename'], -1, 1) == '.'); + +if( preg_match('/'.$forbidden_file_types.'$/i', $ext) || $dots == '.' ) { + $admin->print_error($MESSAGE['MEDIA_CANNOT_RENAME'], "rename.php?dir=$directory&id=$file_id", false); +} + +// Check if the name contains .. +if(strstr($name, '..')) { + $admin->print_error($MESSAGE['MEDIA_NAME_DOT_DOT_SLASH'], "rename.php?dir=$directory&id=$file_id", false); +} + +// Check if the name is index.php +if($name == 'index.php') { + $admin->print_error($MESSAGE['MEDIA_NAME_INDEX_PHP'], "rename.php?dir=$directory&id=$file_id", false); +} + +// Check that the name still has a value +if($name == '') { + $admin->print_error($MESSAGE['MEDIA_BLANK_NAME'], "rename.php?dir=$directory&id=$file_id", false); +} + +$info = pathinfo(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$rename_file); +$ext = isset($info['extension']) ? $info['extension'] : ''; +$dots = (substr($info['basename'], 0, 1) == '.') || (substr($info['basename'], -1, 1) == '.'); + +if( preg_match('/'.$forbidden_file_types.'$/i', $ext) || $dots == '.' ) { + $admin->print_error($MESSAGE['MEDIA_CANNOT_RENAME'], "rename.php?dir=$directory&id=$file_id", false); +} + +// Check if we should overwrite or not +if($admin->get_post('overwrite') != 'yes' AND file_exists(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$name) == true) { + if($type == 'folder') { + $admin->print_error($MESSAGE['MEDIA_DIR_EXISTS'], "rename.php?dir=$directory&id=$file_id", false); + } else { + $admin->print_error($MESSAGE['MEDIA_FILE_EXISTS'], "rename.php?dir=$directory&id=$file_id", false); + } +} + +// Try and rename the file/folder +if(rename(WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$rename_file, WB_PATH.MEDIA_DIRECTORY.$directory.'/'.$name)) { + $usedFiles = array(); + // feature freeze + // require_once(ADMIN_PATH.'/media/dse.php'); + $admin->print_success($MESSAGE['MEDIA_RENAMED'], $dirlink); +} else { + $admin->print_error($MESSAGE['MEDIA_CANNOT_RENAME'], "rename.php?dir=$directory&id=$file_id", false); +} Property changes on: trunk/admin/media/rename2.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/media/resize_img.php =================================================================== --- trunk/admin/media/resize_img.php (nonexistent) +++ trunk/admin/media/resize_img.php (revision 2) @@ -0,0 +1,285 @@ +_error="Error: GD Library is not available."; + return false; + } + + $this->type=Array(1 => 'GIF', 2 => 'JPG', 3 => 'PNG', 4 => 'SWF', 5 => 'PSD', 6 => 'BMP', 7 => 'TIFF', 8 => 'TIFF', 9 => 'JPC', 10 => 'JP2', 11 => 'JPX', 12 => 'JB2', 13 => 'SWC', 14 => 'IFF', 15 => 'WBMP', 16 => 'XBM'); + if(!empty($imgFile)) + $this->setImage($imgFile); + } + /** + * Error occured while resizing the image. + * + * @return String + */ + function error() + { + return $this->_error; + } + + /** + * Set image file name + * + * @param String $imgFile + * @return void + */ + function setImage($imgFile) + { + $this->imgFile=$imgFile; + return $this->_createImage(); + } + /** + * + * @return void + */ + function close() + { + return @imagedestroy($this->_img); + } + /** + * Resize a image to given width and height and keep it's current width and height ratio + * + * @param Number $imgwidth + * @param Numnber $imgheight + * @param String $newfile + */ + function resize_limitwh($imgwidth,$imgheight,$newfile=NULL) + { + $image_per = 100; + list($width, $height, $type, $attr) = @getimagesize($this->imgFile); + if($width > $imgwidth && $imgwidth > 0) + $image_per = (double)(($imgwidth * 100) / $width); + + if(floor(($height * $image_per)/100)>$imgheight && $imgheight > 0) + $image_per = (double)(($imgheight * 100) / $height); + + $this->resize_percentage($image_per,$newfile); + + } + /** + * Resize an image to given percentage. + * + * @param Number $percent + * @param String $newfile + * @return Boolean + */ + function resize_percentage($percent=100,$newfile=NULL) + { + $newWidth=($this->imgWidth*$percent)/100; + $newHeight=($this->imgHeight*$percent)/100; + return $this->resize($newWidth,$newHeight,$newfile); + } + /** + * Resize an image to given X and Y percentage. + * + * @param Number $xpercent + * @param Number $ypercent + * @param String $newfile + * @return Boolean + */ + function resize_xypercentage($xpercent=100,$ypercent=100,$newfile=NULL) + { + $newWidth=($this->imgWidth*$xpercent)/100; + $newHeight=($this->imgHeight*$ypercent)/100; + return $this->resize($newWidth,$newHeight,$newfile); + } + + /** + * Resize an image to given width and height + * + * @param Number $width + * @param Number $height + * @param String $newfile + * @return Boolean + */ + function resize($width,$height,$newfile=NULL) + { + if(empty($this->imgFile)) + { + $this->_error="File name is not initialised."; + return false; + } + if($this->imgWidth<=0 || $this->imgHeight<=0) + { + $this->_error="Could not resize given image"; + return false; + } + if($width<=0) + $width=$this->imgWidth; + if($height<=0) + $height=$this->imgHeight; + + return $this->_resize($width,$height,$newfile); + } + + /** + * Get the image attributes + * @access Private + * + */ + function _getImageInfo() + { + @list($this->imgWidth,$this->imgHeight,$type,$this->imgAttr)=@getimagesize($this->imgFile); + $this->imgType=$this->type[$type]; + } + + /** + * Create the image resource + * @access Private + * @return Boolean + */ + function _createImage() + { + $this->_getImageInfo($this->imgFile); + if($this->imgType=='GIF') + { + $this->_img=@imagecreatefromgif($this->imgFile); + } + elseif($this->imgType=='JPG') + { + $this->_img=@imagecreatefromjpeg($this->imgFile); + } + elseif($this->imgType=='PNG') + { + $this->_img=@imagecreatefrompng($this->imgFile); + } + if(!$this->_img || !@is_resource($this->_img)) + { + $this->_error="Error loading ".$this->imgFile; + return false; + } + return true; + } + + /** + * Function is used to resize the image + * + * @access Private + * @param Number $width + * @param Number $height + * @param String $newfile + * @return Boolean + */ + function _resize($width,$height,$newfile=NULL) + { + if (!function_exists("imagecreate")) + { + $this->_error="Error: GD Library is not available."; + return false; + } + + $newimg=@imagecreatetruecolor($width,$height); + //imagecolortransparent( $newimg, imagecolorat( $newimg, 0, 0 ) ); + + if($this->imgType=='GIF' || $this->imgType=='PNG') + { + /** Code to keep transparency of image **/ + $colorcount = imagecolorstotal($this->_img); + if ($colorcount == 0) $colorcount = 256; + imagetruecolortopalette($newimg,true,$colorcount); + imagepalettecopy($newimg,$this->_img); + $transparentcolor = imagecolortransparent($this->_img); + imagefill($newimg,0,0,$transparentcolor); + imagecolortransparent($newimg,$transparentcolor); + } + + @imagecopyresampled ( $newimg, $this->_img, 0,0,0,0, $width, $height, $this->imgWidth,$this->imgHeight); + + + + if($newfile===HAR_AUTO_NAME) + { + if(@preg_match("/\..*+$/",@basename($this->imgFile),$matches)) + $newfile=@substr_replace($this->imgFile,"_har",-@strlen($matches[0]),0); + } + elseif(!empty($newfile)) + { + if(!@preg_match("/\..*+$/",@basename($newfile))) + { + if(@preg_match("/\..*+$/",@basename($this->imgFile),$matches)) + $newfile=$newfile.$matches[0]; + } + } + + if($this->imgType=='GIF') + { + if(!empty($newfile)) + @imagegif($newimg,$newfile); + else + { + @header("Content-type: image/gif"); + @imagegif($newimg); + } + } + elseif($this->imgType=='JPG') + { + if(!empty($newfile)) + @imagejpeg($newimg,$newfile,85); + else + { + @header("Content-type: image/jpeg"); + @imagejpeg($newimg); + } + } + elseif($this->imgType=='PNG') + { + if(!empty($newfile)) + @imagepng($newimg,$newfile); + else + { + @header("Content-type: image/png"); + @imagepng($newimg); + } + } + @imagedestroy($newimg); + } + } Property changes on: trunk/admin/media/resize_img.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/media/setparameter.php =================================================================== --- trunk/admin/media/setparameter.php (nonexistent) +++ trunk/admin/media/setparameter.php (revision 2) @@ -0,0 +1,133 @@ +get_post("save"))) { +/* + if (!$admin->checkFTAN()) + { + $admin->print_error('::'.$MESSAGE['GENERIC_SECURITY_ACCESS'],'browse.php',false); + } +*/ + + if(DEFAULT_THEME != ' wb_theme') { + //Check for existing settings entry, if not existing, create a record first! + if (!$database->query ( "SELECT * FROM ".TABLE_PREFIX."settings where `name`='mediasettings'" )) { + $database->query ( "INSERT INTO ".TABLE_PREFIX."settings (`name`,`value`) VALUES ('mediasettings','')" ); + } + } else { + $pathsettings = array(); + } + + $dirs = directory_list(WB_PATH.MEDIA_DIRECTORY); + $dirs[] = WB_PATH.MEDIA_DIRECTORY; + foreach($dirs AS $name) { + $r = str_replace(WB_PATH, '', $name); + $r = str_replace(array('/',' '),'_',$r); + $w = (int)$admin->get_post($r.'-w'); + $h = (int)$admin->get_post($r.'-h'); + $pathsettings[$r]['width']=$w; + $pathsettings[$r]['height']=$h; + } + $pathsettings['global']['admin_only'] = ($admin->get_post('admin_only')!=''?'checked':''); + $pathsettings['global']['show_thumbs'] = ($admin->get_post('show_thumbs')!=''?'checked':''); + $fieldSerialized = serialize($pathsettings); + $database->query ( "UPDATE ".TABLE_PREFIX."settings SET `value` = '$fieldSerialized' WHERE `name`='mediasettings'" ); + header ("Location: browse.php"); +} + +include ('parameters.php'); +if ($_SESSION['GROUP_ID'] != 1 && $pathsettings['global']['admin_only']) { + echo "Sorry, settings not available"; + exit(); +} + +// Read data to display +$caller = "setparameter"; + +// Setup template object, parse vars to it, then parse it +// Create new template object +$template = new Template(dirname($admin->correct_theme_source('setparameter.htt'))); +$template->set_file('page', 'setparameter.htt'); +$template->set_block('page', 'main_block', 'main'); +if ($_SESSION['GROUP_ID'] != 1) { + $template->set_var('DISPLAY_ADMIN', 'hide'); +} +$template->set_var(array( + 'TEXT_HEADER' => $TEXT['TEXT_HEADER'], + 'SAVE_TEXT' => $TEXT['SAVE'], + 'BACK' => $TEXT['BACK'], + ) + ); + +$template->set_block('main_block', 'list_block', 'list'); +$row_bg_color = ''; +$dirs = directory_list(WB_PATH.MEDIA_DIRECTORY); +$dirs[] = WB_PATH.MEDIA_DIRECTORY; + +$array_lowercase = array_map('strtolower', $dirs); +array_multisort($array_lowercase, SORT_ASC, SORT_STRING, $dirs); +$id=0; +foreach($dirs AS $name) { + $relative = str_replace(WB_PATH, '', $name); + $safepath = str_replace(array('/',' '),'_',$relative); + $cur_width = $cur_height = ''; + if (isset($pathsettings[$safepath]['width'])) $cur_width = $pathsettings[$safepath]['width']; + if (isset($pathsettings[$safepath]['height'])) $cur_height = $pathsettings[$safepath]['height']; + $cur_width = ($cur_width ? (int)$cur_width : '-'); + $cur_height = ($cur_height ? (int)$cur_height : '-'); + $id++; + + if($row_bg_color == 'DEDEDE') $row_bg_color = 'EEEEEE'; + else $row_bg_color = 'DEDEDE'; + $template->set_var(array( + 'ADMIN_URL' => ADMIN_URL, + 'PATH_NAME' => $relative, + 'WIDTH' => $TEXT['WIDTH'], + 'HEIGHT' => $TEXT['HEIGHT'], + 'FIELD_NAME_W' => $safepath.'-w', + 'FIELD_NAME_H' => $safepath.'-h', + 'CUR_WIDTH' => $cur_width, + 'CUR_HEIGHT' => $cur_height, + 'SETTINGS' => $TEXT['SETTINGS'], + 'ADMIN_ONLY' => $TEXT['ADMIN_ONLY'], + 'ADMIN_ONLY_SELECTED' => $pathsettings['global']['admin_only'], + 'NO_SHOW_THUMBS' => $TEXT['NO_SHOW_THUMBS'], + 'NO_SHOW_THUMBS_SELECTED' => $pathsettings['global']['show_thumbs'], + 'ROW_BG_COLOR' => $row_bg_color, + 'FTAN' => $admin->getFTAN(), + 'FILE_ID' => $id, + ) + ); + $template->parse('list', 'list_block', true); +} + +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); \ No newline at end of file Property changes on: trunk/admin/media/setparameter.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/media/thumb.php =================================================================== --- trunk/admin/media/thumb.php (nonexistent) +++ trunk/admin/media/thumb.php (revision 2) @@ -0,0 +1,58 @@ +function '.__FUNCTION__.'( '.''.' ); basename: '.basename(__FILE__).' line: '.__LINE__.' ->
'; +print_r( $aListDir ); print '
'; +print_r( $_GET ); print ''; die(); // flush ();sleep(10); +*/ + +if (isset($_GET['img']) && isset($_GET['t'])) { + if(!class_exists('PhpThumbFactory', false)){ include($modulePath.'/inc/ThumbLib.inc.php'); } +// require_once($modulePath.'/inc/ThumbLib.inc.php'); + $image = addslashes($_GET['img']); + $type = intval($_GET['t']); +// $media = WB_PATH.MEDIA_DIRECTORY.'/'; + $thumb = PhpThumbFactory::create(WB_PATH.MEDIA_DIRECTORY.'/'.$image); + + if ($type == 1) { + $thumb->adaptiveResize(20,20); +// $thumb->resize(30,30); +// $thumb->cropFromCenter(80,50); +// $thumb->resizePercent(40); + } else { + $thumb->Resize(300,300); +// $thumb->resizePercent(25); +// $thumb->cropFromCenter(80,50); + } + $thumb->show(); + + } Property changes on: trunk/admin/media/thumb.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/media/upload.php =================================================================== --- trunk/admin/media/upload.php (nonexistent) +++ trunk/admin/media/upload.php (revision 2) @@ -0,0 +1,180 @@ +checkFTAN() ) +{ + $admin->print_header(); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL ); +} +// After check print the header +$admin->print_header(); + +// Target location +$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']); +$target = (isset(${$requestMethod}['target'])) ? ${$requestMethod}['target'] : ''; + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +$directory = ($target == '/') ? '' : $target; +$dirlink = 'index.php?dir='.$directory; +$rootlink = 'index.php?dir='; + +// Check to see if target contains ../ +if (!check_media_path($target, false)) +{ + $admin->print_error($MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] ); +} + +// Create relative path of the target location for the file +$relative = WB_PATH.$target.'/'; +$resizepath = str_replace(array('/',' '),'_',$target); + +// Find out whether we should replace files or give an error +$overwrite = ($admin->get_post('overwrite') != '') ? true : false; + +// Get list of file types to which we're supposed to append 'txt' +$get_result=$database->query("SELECT value FROM ".TABLE_PREFIX."settings WHERE name='rename_files_on_upload'"); +$file_extension_string=''; +if ($get_result->numRows()>0) { + $fetch_result=$get_result->fetchRow(); + $file_extension_string=$fetch_result['value']; +} + +$file_extensions=explode(",",$file_extension_string); +// get from settings and add to forbidden list +$forbidden_file_types = preg_replace( '/\s*[,;\|#]\s*/','|',RENAME_FILES_ON_UPLOAD); +// Loop through the files +$good_uploads = 0; +$sum_dirs = 0; +$sum_files = 0; +for($count = 1; $count <= 10; $count++) +{ + // If file was upload to tmp + if(isset($_FILES["file$count"]['name'])) + { + // Remove bad characters + $filename = trim(media_filename($_FILES["file$count"]['name']),'.') ; + // Check if there is still a filename left + // if($filename != '') { + $info = pathinfo($filename); + $ext = isset($info['extension']) ? $info['extension'] : ''; + + if ( ($filename != '') && !preg_match("/" . $forbidden_file_types . "$/i", $ext) ) + { + // Move to relative path (in media folder) + if(file_exists($relative.$filename) AND $overwrite == true) { + if(move_uploaded_file($_FILES["file$count"]['tmp_name'], $relative.$filename)) { + $good_uploads++; + $sum_files++; + // Chmod the uploaded file + change_mode($relative.$filename); + } + } elseif(!file_exists($relative.$filename)) { + if(move_uploaded_file($_FILES["file$count"]['tmp_name'], $relative.$filename)) { + $good_uploads++; + $sum_files++; + // Chmod the uploaded file + change_mode($relative.$filename); + } + } + + if(file_exists($relative.$filename)) { + if ($pathsettings[$resizepath]['width'] || $pathsettings[$resizepath]['height'] ) { + $rimg=new RESIZEIMAGE($relative.$filename); + $rimg->resize_limitwh($pathsettings[$resizepath]['width'],$pathsettings[$resizepath]['height'],$relative.$filename); + $rimg->close(); + } + } + + // store file name of first file for possible unzip action + if ($count == 1) { + $filename1 = $relative . $filename; + } + } + } +} +/* + * Callback function to skip files in black-list + */ +function pclzipCheckValidFile($p_event, &$p_header) +{ + // return 1; +// Check for potentially malicious files + $forbidden_file_types = preg_replace( '/\s*[,;\|#]\s*/','|',RENAME_FILES_ON_UPLOAD); + $info = pathinfo($p_header['filename']); + $ext = isset($info['extension']) ? $info['extension'] : ''; + $dots = (substr($info['basename'], 0, 1) == '.') || (substr($info['basename'], -1, 1) == '.'); + if( !preg_match('/'.$forbidden_file_types.'$/i', $ext) && $dots != '.' ) + { // ----- allowed file types are extracted + return 1; + }else + { // ----- all other files are skiped + return 0; + } +} +/* ********************************* */ + +// If the user chose to unzip the first file, unzip into the current folder +if (isset($_POST['unzip']) && isset($filename1) && file_exists($filename1) ) { + // Required to unzip file. + require_once(WB_PATH.'/include/pclzip/pclzip.lib.php'); + $archive = new PclZip($filename1); + $list = $archive->extract(PCLZIP_OPT_PATH, $relative,PCLZIP_CB_PRE_EXTRACT, 'pclzipCheckValidFile'); + + if($list == 0) { + // error while trying to extract the archive (most likely wrong format) + $admin->print_error('UNABLE TO UNZIP FILE' . $archive -> errorInfo(true)); + } + $sum_files = 0; + // rename executable files! + foreach ($list as $key => $val) { + if( ($val['folder'] ) && change_mode($val['filename']) ) { + $sum_dirs++; + } elseif( is_writable($val['filename']) && ($val['status'] == 'ok') && change_mode($val['filename']) ) { + $sum_files++; + } + } + if (isset($_POST['delzip'])) { unlink($filename1); } + $dir = dirname($filename1); + if(file_exists($dir)) { + $array = createFolderProtectFile($dir); + } +} +unset($list); + +if($sum_files == 1) { + $admin->print_success($sum_files.' '.$MESSAGE['MEDIA']['SINGLE_UPLOADED'] ); +} elseif($sum_files > 1) { + $admin->print_success($sum_files.' '.$MESSAGE['MEDIA']['UPLOADED'] ); +} else { + $admin->print_error($MESSAGE['MEDIA_NO_FILE_UPLOADED'] ); +} + +// Print admin +$admin->print_footer(); Property changes on: trunk/admin/media/upload.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/modules/details.php =================================================================== --- trunk/admin/modules/details.php (nonexistent) +++ trunk/admin/modules/details.php (revision 2) @@ -0,0 +1,155 @@ +checkFTAN()){ + $admin->print_header(); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); +} +$admin->print_header(); + +// Get module name + $file = ''; + if (!isset($_POST['file']) || $_POST['file'] == false) { + $iAddonId = 0; + $admin->print_error( $MESSAGE['GENERIC_FORGOT_OPTIONS'], $js_back ); + } else { + $iAddonId = $admin->checkIDKEY('file',0); + } + if ($iAddonId == 0){ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); + } + +// Get module directory + $sqlAddons = 'SELECT `directory` FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `addon_id`='.(int)$iAddonId.' ' + . ''.''; + if ($file = $database->get_one($sqlAddons)) { + $file = preg_replace('/[^a-z0-9_-]/i', "", $file); // fix secunia 2010-92-2 + } + +// Check if the module exists +if (!file_exists(WB_PATH.'/modules/'.$file)) { + $admin->print_error(' ('.$file.') '.$MESSAGE['GENERIC_NOT_INSTALLED'], $js_back ); +} + +// Setup template object, parse vars to it, then parse it +// Create new template object +$template = new Template(dirname($admin->correct_theme_source('modules_details.htt'))); +// $template->debug = true; +$template->set_file('page', 'modules_details.htt'); +$template->set_block('page', 'main_block', 'main'); + + +// Insert values +$sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ' +.'WHERE `type` = \'module\' ' +.'AND `directory` = \''.$file.'\''; +if($result = $database->query($sql)) { + $module = $result->fetchRow(MYSQLI_ASSOC); +} + +// check if a module description exists for the displayed backend language +$tool_description = false; +if(function_exists('file_get_contents') && file_exists(WB_PATH.'/modules/'.$file.'/languages/'.LANGUAGE .'.php')) { + // read contents of the module language file into string + $data = @file_get_contents(WB_PATH .'/modules/' .$file .'/languages/' .LANGUAGE .'.php'); + // use regular expressions to fetch the content of the variable from the string + $tool_description = get_variable_content('module_description', $data, false, false); + // replace optional placeholder {WB_URL} with value stored in config.php + if($tool_description !== false && strlen(trim($tool_description)) != 0) { + $tool_description = str_replace('{WB_URL}', WB_URL, $tool_description); + } else { + $tool_description = false; + } +} +if($tool_description !== false) { + // Override the module-description with correct desription in users language + $module['description'] = $tool_description; +} + +$template->set_var(array( + 'NAME' => $module['name'], + 'AUTHOR' => $module['author'], + 'DESCRIPTION' => $module['description'], + 'VERSION' => $module['version'], + 'DESIGNED_FOR' => $module['platform'], + 'ADMIN_URL' => ADMIN_URL, + 'WB_URL' => WB_URL, + 'THEME_URL' => THEME_URL + ) + ); + +switch ($module['function']) { + case NULL: + $type_name = $TEXT['UNKNOWN']; + break; + case 'page': + $type_name = $TEXT['PAGE']; + break; + case 'wysiwyg': + $type_name = $TEXT['WYSIWYG_EDITOR']; + break; + case 'tool': + $type_name = $TEXT['ADMINISTRATION_TOOL']; + break; + case 'admin': + $type_name = $TEXT['ADMIN']; + break; + case 'administration': + $type_name = $TEXT['ADMINISTRATION']; + break; + case 'snippet': + $type_name = $TEXT['CODE_SNIPPET']; + break; + default: + $type_name = $TEXT['UNKNOWN']; +} +$template->set_var('TYPE', $type_name); + +// Insert language headings +$template->set_var(array( + 'HEADING_MODULE_DETAILS' => $HEADING['MODULE_DETAILS'] + ) + ); +// Insert language text and messages +$template->set_var(array( + 'TEXT_NAME' => $TEXT['NAME'], + 'TEXT_TYPE' => $TEXT['TYPE'], + 'TEXT_AUTHOR' => $TEXT['AUTHOR'], + 'TEXT_VERSION' => $TEXT['VERSION'], + 'TEXT_DESIGNED_FOR' => $TEXT['DESIGNED_FOR'], + 'TEXT_DESCRIPTION' => $TEXT['DESCRIPTION'], + 'TEXT_BACK' => $TEXT['BACK'] + ) + ); + +// Parse module object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/modules/details.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/modules/index.php =================================================================== --- trunk/admin/modules/index.php (nonexistent) +++ trunk/admin/modules/index.php (revision 2) @@ -0,0 +1,210 @@ +correct_theme_source('modules.htt'))); +// $template->debug = true; +$template->set_file ('page', 'modules.htt'); +$template->set_block('page', 'main_block', 'main'); + +$template->set_block('main_block', 'module_install_block', 'module_install'); +// Insert values into module list +$template->set_block('main_block', 'module_detail_block', 'module_detail'); +$template->set_block('module_detail_block', 'module_detail_select_block', 'module_detail_select'); + +$template->set_block('main_block', 'module_uninstall_block', 'module_uninstall'); +$template->set_block('module_uninstall_block', 'module_uninstall_select_block', 'module_uninstall_select'); +$aPreventFromUninstall = array ( 'captcha_control', 'jsadmin', 'output_filter', 'wysiwyg', 'menu_link' ); + +$sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `type`=\'module\' ' + . 'ORDER BY `name`' + . ''; +if($oAddons = $database->query($sql)) { + while ($aAddon = $oAddons->fetchRow( MYSQLI_ASSOC )) { + if (!$admin->get_permission( $aAddon['directory'], 'module' )) { continue; } + $aAddonIdKey = $admin->getIDKEY($aAddon['addon_id']); + $sAddsonsPath = WB_PATH.'/modules/'.$aAddon['directory']; + $template->set_var('VALUE', $aAddonIdKey); + $template->set_var('NAME', $aAddon['name']); + $template->parse('module_detail_select', 'module_detail_select_block', true); + if (is_readable($sAddsonsPath.'/uninstall.php') && is_readable($sAddsonsPath . '/info.php')) { + if (!preg_match('/'.$aAddon['directory'].'/si', implode('|', $aPreventFromUninstall))) { + $template->set_var('UNINSTALL_VALUE', $aAddonIdKey); + $template->set_var('UNINSTALL_NAME', $aAddon['name']); + $template->parse('module_uninstall_select', 'module_uninstall_select_block', true); + } + } + } +} + +$show_block = false; +$template->set_block('main_block', 'module_advanced_block', 'module_advanced'); +$template->set_block('module_advanced_block', 'manuell_install_block', 'manuell_install'); +$template->set_block('module_advanced_block', 'manuell_upgrade_block', 'manuell_upgrade'); +$template->set_block('module_advanced_block', 'manuell_uninstall_block', 'manuell_uninstall'); +// Insert modules which includes a install.php file to install list +$template->set_block('manuell_install_block', 'manuell_install_select_block', 'manuell_install_select'); +$module_files = glob(WB_PATH . '/modules/*', GLOB_ONLYDIR|GLOB_NOSORT ); +natcasesort($module_files); +foreach ($module_files as $index => $sAddsonsPath) +{ + if( !$admin->get_permission( basename($sAddsonsPath), 'module' )) { continue; } + if (is_dir($sAddsonsPath)) { + if (is_readable($sAddsonsPath . '/install.php') && is_readable($sAddsonsPath . '/info.php')) { + require $sAddsonsPath . '/info.php'; + $show_block = true; + $AddonIdKey = $admin->getIDKEY(basename($sAddsonsPath),''); + $template->set_var('INSTALL_VISIBLE', ''); + $template->set_var('INSTALL_VALUE', $AddonIdKey); + $template->set_var('INSTALL_NAME', ( @$module_name ?: basename($sAddsonsPath)) ); + $template->parse('manuell_install_select', 'manuell_install_select_block', true); + } else { +// echo ''.basename($sAddsonsPath).'/install.php
'; + } + } else { + unset($module_files[$index]); + } +} + $template->set_block('manuell_upgrade_block', 'manuell_upgrade_select_block', 'manuell_upgrade_select'); + $template->set_block('manuell_uninstall_block', 'manuell_uninstall_select_block', 'manuell_uninstall_select'); + $oAddons->rewind(); + while ($aAddon = $oAddons->fetchRow( MYSQLI_ASSOC )) { + if( !$admin->get_permission( $aAddon['directory'], 'module' )) { continue; } + $aAddonIdKey = $admin->getIDKEY($aAddon['addon_id']); + $sAddsonsPath = WB_PATH.'/modules/'.$aAddon['directory']; + if (is_readable($sAddsonsPath.'/upgrade.php') && is_readable($sAddsonsPath . '/info.php')) { + $show_block = true; + $template->set_var('UPGRADE_VISIBLE', ''); + $template->set_var('UPGRADE_VALUE', $aAddonIdKey); + $template->set_var('UPGRADE_NAME', $aAddon['name']); + $template->parse('manuell_upgrade_select', 'manuell_upgrade_select_block', true); + } else { +// echo ''.$sAddsonsPath.'/upgrade.php
'; + } + if (is_readable($sAddsonsPath.'/uninstall.php') && is_readable($sAddsonsPath . '/info.php')) { + if (!preg_match('/'.$aAddon['directory'].'/si', implode('|', $aPreventFromUninstall))) { + $show_block = true; + $template->set_var('UNINSTALL_VISIBLE', ''); + $template->set_var('UNINSTALL_VALUE', $aAddonIdKey); + $template->set_var('UNINSTALL_NAME', $aAddon['name']); + $template->parse('manuell_uninstall_select', 'manuell_uninstall_select_block', true); + } + } else { +// echo ''.$sAddsonsPath.'/uninstall.php
'; + } + } + +// Insert permissions values and show or hidden blocks +if($admin->get_permission('modules_install') != true) { + $template->set_block ('module_install', ''); + $template->set_block ('manuell_install', ''); +} else { + $template->parse('module_install', 'module_install_block', true); + $template->parse('manuell_install', 'manuell_install_block', true); +} +if($admin->get_permission('modules_uninstall') != true) { + $template->set_block ('module_uninstall', ''); + $template->set_block ('manuell_uninstall', ''); +} else { + $template->parse('module_uninstall', 'module_uninstall_block', true); + $template->parse('manuell_uninstall', 'manuell_uninstall_block', true); +} +if($admin->get_permission('modules_view') != true) { + $template->set_block('module_detail', ''); + $template->set_block('manuell_upgrade', ''); +} else { + $template->parse('module_detail', 'module_detail_block', true); + $template->parse('manuell_upgrade', 'manuell_upgrade_block', true); +} +// only show block if there is something to show +if(!$show_block || count($module_files) == 0 || !isset($_GET['advanced']) || $admin->get_permission('admintools') != true) { + $template->set_block('module_advanced', ''); +} else { + $template->parse('module_advanced', 'module_advanced_block', true); +} + +$template->set_block('main_block', 'addon_template_block', 'addon_template'); +if($admin->get_permission('templates_view') != true) { + $template->set_block ('addon_template', ''); +} else { + $template->parse('addon_template', 'addon_template_block', true); +} + +$template->set_block('main_block', 'addon_language_block', 'addon_language'); +if($admin->get_permission('languages_view') != true) { + $template->set_block ('addon_language', ''); +} else { + $template->parse('addon_language', 'addon_language_block', true); +} + +$template->set_block('main_block', 'addon_module_block', 'addon_module'); +if($admin->get_permission('admintools') != true) { + $template->set_block ('addon_module', ''); +} else { + $template->parse('addon_module', 'addon_module_block', true); +} + +// Insert language headings +$template->set_var(array( + 'HEADING_INSTALL_MODULE' => $HEADING['INSTALL_MODULE'], + 'HEADING_UNINSTALL_MODULE' => $HEADING['UNINSTALL_MODULE'], + 'OVERWRITE_NEWER_FILES' => $MESSAGE['ADDON_OVERWRITE_NEWER_FILES'], + 'HEADING_MODULE_DETAILS' => $HEADING['MODULE_DETAILS'], + 'HEADING_INVOKE_MODULE_FILES' => $HEADING['INVOKE_MODULE_FILES'] + ) + ); +// insert urls +$template->set_var(array( + 'ADMIN_URL' => ADMIN_URL, + 'WB_URL' => WB_URL, + 'THEME_URL' => THEME_URL, + 'FTAN' => $admin->getFTAN() + ) + ); +// Insert language text and messages +$template->set_var(array( + 'URL_TEMPLATES' => $admin->get_permission('templates') ? ADMIN_URL . '/templates/index.php' : '#', + 'URL_LANGUAGES' => $admin->get_permission('languages') ? ADMIN_URL . '/languages/index.php' : '#', + 'URL_ADVANCED' => $admin->get_permission('admintools') ? ADMIN_URL . '/modules/index.php?advanced' : '#', + 'MENU_LANGUAGES' => $admin->get_permission('languages') ? $MENU['LANGUAGES'] : ' ', + 'MENU_TEMPLATES' => $admin->get_permission('templates') ? $MENU['TEMPLATES'] : ' ', + 'TEXT_ADVANCED' => $admin->get_permission('admintools') ? $TEXT['ADVANCED'] : ' ', + 'TEXT_INSTALL' => $TEXT['INSTALL'], + 'TEXT_UNINSTALL' => $TEXT['UNINSTALL'], + 'TEXT_VIEW_DETAILS' => $TEXT['VIEW_DETAILS'], + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], + 'TEXT_MANUAL_INSTALLATION' => $MESSAGE['ADDON_MANUAL_INSTALLATION'], + 'TEXT_MANUAL_INSTALLATION_WARNING' => $MESSAGE['ADDON_MANUAL_INSTALLATION_WARNING'], + 'TEXT_EXECUTE' => $TEXT['EXECUTE'], + 'TEXT_FILE' => $TEXT['FILE'] + ) +); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/modules/index.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/modules/install.php =================================================================== --- trunk/admin/modules/install.php (nonexistent) +++ trunk/admin/modules/install.php (revision 2) @@ -0,0 +1,197 @@ +checkFTAN()){ + $admin->print_header(); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); +} +// After check print the header +$admin->print_header(); + +// Check if user uploaded a file +if(!isset($_FILES['userfile'])) { + $admin->print_error($MESSAGE['GENERIC_ERROR_OPENING_FILE'], $js_back ); +} + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Set temp vars +$temp_dir = WB_PATH.'/temp/'; +$temp_file = $temp_dir . $_FILES['userfile']['name']; +$temp_unzip = WB_PATH.'/temp/unzip/'; + +if(!$_FILES['userfile']['error']) { + // Try to upload the file to the temp dir + if(!move_uploaded_file($_FILES['userfile']['tmp_name'], $temp_file)) + { + $admin->print_error($MESSAGE['GENERIC_BAD_PERMISSIONS']); + } +} else { +// index for language files + $key = 'UNKNOW_UPLOAD_ERROR'; + switch ($_FILES['userfile']['error']) { + case UPLOAD_ERR_INI_SIZE: + $key = 'UPLOAD_ERR_INI_SIZE'; + case UPLOAD_ERR_FORM_SIZE: + $key = 'UPLOAD_ERR_FORM_SIZE'; + case UPLOAD_ERR_PARTIAL: + $key = 'UPLOAD_ERR_PARTIAL'; + case UPLOAD_ERR_NO_FILE: + $key = 'UPLOAD_ERR_NO_FILE'; + case UPLOAD_ERR_NO_TMP_DIR: + $key = 'UPLOAD_ERR_NO_TMP_DIR'; + case UPLOAD_ERR_CANT_WRITE: + $key = 'UPLOAD_ERR_CANT_WRITE'; + case UPLOAD_ERR_EXTENSION: + $key = 'UPLOAD_ERR_EXTENSION'; + default: + $key = 'UNKNOW_UPLOAD_ERROR'; + } + $admin->print_error($MESSAGE[$key].'
'.$MESSAGE['GENERIC_CANNOT_UPLOAD']); +} + +// Include the PclZip class file (thanks to +require_once(WB_PATH.'/include/pclzip/pclzip.lib.php'); + +// Remove any vars with name "module_directory" +if (isset($module_directory)){unset($module_directory);} + +// Setup the PclZip object +$archive = new PclZip($temp_file); +// Unzip the files to the temp unzip folder +$list = $archive->extract(PCLZIP_OPT_PATH, $temp_unzip); + +// Check if uploaded file is a valid Add-On zip file +if (!($list && file_exists($temp_unzip . 'info.php'))) +{ + $admin->print_error($MESSAGE['GENERIC_INVALID_ADDON_FILE']); +} + +// Include the modules info file +require($temp_unzip.'info.php'); + +// Perform Add-on requirement checks before proceeding +require(WB_PATH . '/framework/addon.precheck.inc.php'); +preCheckAddon($temp_file); +// Delete the temp unzip directory +rm_full_dir($temp_unzip); + +// Check if the file is valid +if(!isset($module_directory)) +{ + if (file_exists($temp_file)) { unlink($temp_file); } // Remove temp file + $admin->print_error($MESSAGE['GENERIC_INVALID']); +} + +// Check if this module is already installed +// and compare versions if so +$new_module_version = $module_version; +$action="install"; +if(is_dir(WB_PATH.'/modules/'.$module_directory)) +{ + if(file_exists(WB_PATH.'/modules/'.$module_directory.'/info.php')) + { + require(WB_PATH.'/modules/'.$module_directory.'/info.php'); + // Version to be installed is older than currently installed version + if (versionCompare($module_version, $new_module_version, '>=')) + { + if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file + $admin->print_error($MESSAGE['GENERIC_ALREADY_INSTALLED']); + } + $action="upgrade"; + } +} + +// Check if module dir is writable +if(!is_writable(WB_PATH.'/modules/')) +{ + if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file + $admin->print_error($MESSAGE['GENERIC_BAD_PERMISSIONS']); +} + +// Set module directory +$module_dir = WB_PATH.'/modules/'.$module_directory; + +// Make sure the module dir exists, and chmod if needed +make_dir($module_dir); + +// Unzip module to the module dir +if(isset($_POST['overwrite'])){ + $list = (int)$archive->extract(PCLZIP_OPT_PATH, $module_dir, PCLZIP_OPT_REPLACE_NEWER ); +} else { + $list = (int)$archive->extract(PCLZIP_OPT_PATH, $module_dir ); +} + +if ($list==0) +{ + $admin->print_error($MESSAGE['GENERIC_CANNOT_UNZIP']); +} +/* + +if ($list == 0) { + $admin->print_error("ERROR : ".$archive->errorInfo(true)); +} +*/ +// Delete the temp zip file +if(file_exists($temp_file)) { unlink($temp_file); } + +// Chmod all the uploaded files +$dir = dir($module_dir); +while (false !== $entry = $dir->read()) +{ + // Skip pointers + if(substr($entry, 0, 1) != '.' AND $entry != '.svn' AND !is_dir($module_dir.'/'.$entry)) + { + // Chmod file + change_mode($module_dir.'/'.$entry, 'file'); + } +} +/* */ +// Run the modules install // upgrade script if there is one +if(file_exists($module_dir.'/'.$action.'.php')) +{ + require($module_dir.'/'.$action.'.php'); +} + +// Print success message +if ($action=="install") +{ + // Load module info into DB + load_module(WB_PATH.'/modules/'.$module_directory, false); + $admin->print_success($MESSAGE['GENERIC_INSTALLED']); +} elseif ($action=="upgrade") +{ + + upgrade_module($module_directory, false); + $admin->print_success($MESSAGE['GENERIC_UPGRADED']); +} + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/modules/install.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/modules/manual_install.php =================================================================== --- trunk/admin/modules/manual_install.php (nonexistent) +++ trunk/admin/modules/manual_install.php (revision 2) @@ -0,0 +1,155 @@ +$v) $aStr = str_replace("{{".$k."}}", $v, $aStr); + return $aStr; + } +} + +// check user permissions for admintools (redirect users with wrong permissions) +$admin = new admin('Admintools', 'admintools', false, false); +/* +if (!(isset($_POST['action']) && in_array($_POST['action'], array('install', 'upgrade', 'uninstall')))) { die(header('Location: index.php?advanced')); } +if (!(isset($_POST['file']) && $_POST['file'] != '' && (strpos($_POST['file'], '..') === false))){ die(header('Location: index.php?advanced')); } +*/ +$sCallingScript = $_SERVER["SCRIPT_NAME"]; + +$js_back = ADMIN_URL . '/modules/index.php?advanced'; + +if( !$admin->checkFTAN() ){ + $admin->print_header(); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back); +} + +if ($admin->get_permission('admintools') == false) { + $admin->print_header(); + $admin->print_error($MESSAGE['ADMIN_INSUFFICIENT_PRIVELLIGES'], $js_back); + } + + +// check if the referer URL if available +$referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : + (isset($HTTP_SERVER_VARS['HTTP_REFERER']) ? $HTTP_SERVER_VARS['HTTP_REFERER'] : ''); +$referer = ''; +// if referer is set, check if script was invoked from "admin/modules/index.php" +$required_url = ADMIN_URL . '/modules/index.php'; +if ($referer != '' && (!(strpos($referer, $required_url) !== false || strpos($referer, $required_url) !== false))) +{ + $admin->print_header(); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back); +} + +// include WB functions file +require_once(WB_PATH . '/framework/functions.php'); + +// load WB language file +require_once(WB_PATH . '/languages/' . LANGUAGE .'.php'); + +// create Admin object with admin header +$admin = new admin('Addons', '', true, false); +$aValideActions = array( 'uninstall', 'install', 'upgrade' ); + +$sAction = $admin->StripCodeFromText($_POST['action']); +$sAction = ( in_array($sAction, $aValideActions) ? $sAction : 'upgrade' ); +/** + * Manually execute the specified module file (install.php, upgrade.php or uninstall.php) + */ + $sAddonName = ''; + if (!isset($_POST['file']) || $_POST['file'] == false) { + $iAddonId = 0; + $admin->print_error( $MESSAGE['GENERIC_FORGOT_OPTIONS'], $js_back ); + } else { + $iAddonId = $admin->checkIDKEY('file',0); + } + + if ( is_numeric($iAddonId)&&($iAddonId == 0)){ + $admin->print_error($iAddonId.' '.$MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); + } +// Get module directory + if ($sAction != 'install') { + $sqlAddons = 'SELECT `directory` FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `addon_id`='.(int)$iAddonId.' ' + . ''.''; + if ($sAddonName = $database->get_one($sqlAddons)) { + $sAddonName = preg_replace('/[^a-z0-9_-]/i', "", $sAddonName); // fix secunia 2010-92-2 + } + } else { + $sAddonName = preg_replace('/[^a-z0-9_-]/i', "", $iAddonId); // fix secunia 2010-92-2 + } +// Extra protection +if(trim($sAddonName) == '') { + $admin->print_error($MESSAGE['GENERIC_ERROR_OPENING_FILE'], $js_back ); +} + +// check whether the module is needed in core +$aPreventFromUninstall = array ( 'captcha_control', 'jsadmin', 'output_filter', 'wysiwyg', 'menu_link' ); +if( + $sAction == 'uninstall' && + preg_match('/'.$sAddonsFile.'/si', implode('|', $aPreventFromUninstall )) +) { + $temp = array ('name' => $file ); + $msg = replace_all( $MESSAGE['MEDIA_CANNOT_DELETE_DIR'], $temp ); + $admin->print_error( $msg ); +} + +// check if specified module folder exists +$sAddonRelPath = '/modules/'.$sAddonName; +// let the old variablename if module use it + +if (!file_exists( WB_PATH.$sAddonRelPath.'/'.$sAction. '.php')){ + $admin->print_header(); + $admin->print_error($TEXT['NOT_FOUND'].': "'.$sAddonName.'/'.$sAction.'.php" ', $js_back); +} +// include modules install.php script +if( in_array($sAction, $aValideActions) ) { + require(WB_PATH.$sAddonRelPath . '/' . $sAction . '.php'); +} +// load module info into database and output status message +load_module(WB_PATH.$sAddonRelPath, false); +$msg = $TEXT['EXECUTE'] . ': "'.$sAddonName.'/'.$sAction.'.php"'; + +switch ($sAction) +{ + case 'install': + $admin->print_success($msg, $js_back); + break; + + case 'upgrade': + upgrade_module($sAddonName, false); + $admin->print_success($msg, $js_back); + break; + + case 'uninstall': + $admin->print_success($msg, $js_back); + break; +} Property changes on: trunk/admin/modules/manual_install.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/modules/uninstall.php =================================================================== --- trunk/admin/modules/uninstall.php (nonexistent) +++ trunk/admin/modules/uninstall.php (revision 2) @@ -0,0 +1,149 @@ +$v) $aStr = str_replace("{{".$k."}}", $v, $aStr); + return $aStr; + } +} + +$admin = new admin('Addons', 'modules_uninstall', false); + +$js_back = ADMIN_URL.'/modules/index.php'; + + if (!$admin->checkFTAN() ){ + $admin->print_header(); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); + } +// After check print the header + $admin->print_header(); + + $sAddonsFile = ''; +// Check if user selected template + if (!isset($_POST['file']) || $_POST['file'] == false) { + $iAddonId = 0; + $admin->print_error( $MESSAGE['GENERIC_FORGOT_OPTIONS'], $js_back ); + } else { + $iAddonId = $admin->checkIDKEY('file',0); + } + if ($iAddonId == 0){ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); + } + +// Get module directory + $sqlAddons = 'SELECT `directory` FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `addon_id`='.(int)$iAddonId.' ' + . ''.''; + if ($sAddonsFile = $database->get_one($sqlAddons)) { + $sAddonsFile = preg_replace('/[^a-z0-9_-]/i', "", $sAddonsFile); // fix secunia 2010-92-2 + } + +// check whether the module is core +$aPreventFromUninstall = array ( 'captcha_control', 'jsadmin', 'output_filter', 'wysiwyg', 'menu_link' ); +if( + preg_match('/'.$sAddonsFile.'/si', implode('|', $aPreventFromUninstall )) +) { + $temp = array ('name' => $file ); + $msg = replace_all( $MESSAGE['MEDIA_CANNOT_DELETE_DIR'], $temp ); + $admin->print_error( $msg ); +} +// Check if the module exists +if (!is_dir(WB_PATH.'/modules/'.$sAddonsFile) ) { + $admin->print_error($MESSAGE['GENERIC_NOT_INSTALLED'], $js_back ); +} +$sql = 'SELECT `section_id`, `page_id` FROM `'.TABLE_PREFIX.'sections` ' + . 'WHERE `module`=\''.$database->escapeString($sAddonsFile).'\''; +if( $oAddon = $database->query($sql)) { + + if ($oAddon->numRows() > 0) { + + /** + * Modul is in use, so we have to warn the user + */ + if (!array_key_exists("CANNOT_UNINSTALL_IN_USE_TMPL", $MESSAGE['GENERIC'])) { + $add = $oAddon->numRows() == 1 ? "this page" : "these pages"; + $msg_template_str = "
{{type}} {{type_name}} could not be uninstalled because it is still in use on {{pages}}"; + $msg_template_str .= ":
click for editing.
"; + } else { + $msg_template_str = $MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE_TMPL']; + $temp = explode(";",$MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE_TMPL_PAGES']); + $add = $oAddon->numRows() == 1 ? $temp[0] : $temp[1]; + } + /** + * The template-string for displaying the Page-Titles ... in this case as a link + */ + $page_template_str = "- {{title}}
"; + + $values = array ('type' => 'Modul', 'type_name' => $sAddonsFile, 'pages' => $add ); + $msg = replace_all ( $msg_template_str, $values ); + + $page_names = ""; + + while ($data = $oAddon->fetchRow(MYSQLI_ASSOC) ) { + $sql = 'SELECT `page_title` FROM `'.TABLE_PREFIX.'pages` ' + . 'WHERE `page_id`= '.(int)$data['page_id']; + $oPage = $database->query($sql); + $aPage = $oPage->fetchRow( MYSQLI_ASSOC ); + $aPageInfo = array( + 'id' => $data['page_id'], + 'title' => $aPage['page_title'] + ); + + $page_names .= replace_all ( $page_template_str, $aPageInfo ); + } + + /** + * Printing out the error-message and die(). + */ + $admin->print_error(str_replace ($TEXT['FILE'], "Modul", $MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE']).$msg.$page_names); + } +} else { + $admin->print_error($MESSAGE['GENERIC_CANNOT_UNINSTALL']); +} +// Check if we have permissions on the directory +if (!is_writable(WB_PATH.'/modules/'.$sAddonsFile)) { + $admin->print_error(' ('.$sAddonsFile.') '.$MESSAGE['GENERIC_CANNOT_UNINSTALL']); +} + +// Run the modules uninstall script if there is one +if(file_exists(WB_PATH.'/modules/'.$sAddonsFile.'/uninstall.php')) { + require(WB_PATH.'/modules/'.$sAddonsFile.'/uninstall.php'); +} + +// Try to delete the module dir +if (!rm_full_dir(WB_PATH.'/modules/'.$sAddonsFile)) { + $admin->print_error($MESSAGE['GENERIC_CANNOT_UNINSTALL']); +} else { + // Remove entry from DB + $sql = 'DELETE FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `type` = \'module\' ' + . 'AND `directory` = \''.$database->escapeString($sAddonsFile).'\' '; + $database->query($sql); +} +// Print success message +$admin->print_success($MESSAGE['GENERIC_UNINSTALLED']); + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/modules/uninstall.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/pages/add.php =================================================================== --- trunk/admin/pages/add.php (nonexistent) +++ trunk/admin/pages/add.php (revision 2) @@ -0,0 +1,256 @@ +checkFTAN()) +{ + $admin->print_header(); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL ); +} + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Get values +$title = $admin->get_post('title'); +$title = htmlspecialchars($title); +$module = preg_replace('/[^a-z0-9_-]/i', "", $admin->get_post('type')); // fix secunia 2010-93-4 +$parent = intval($admin->get_post('parent')); // fix secunia 2010-91-2 +$visibility = $admin->get_post('visibility'); +if (!in_array($visibility, array('public', 'private', 'registered', 'hidden', 'none'))) {$visibility = 'public';} // fix secunia 2010-91-2 +$admin_groups = $admin->get_post('admin_groups'); +$viewing_groups = $admin->get_post('viewing_groups'); + +// Work-out if we should check for existing page_code +$field_set = $database->field_exists(TABLE_PREFIX.'pages', 'page_code'); + +// add Admin to admin and viewing-groups +$admin_groups[] = 1; +$viewing_groups[] = 1; + +// After check print the header +$admin->print_header(); +// check parent page permissions: +if ($parent!=0) { + if (!$admin->get_page_permission($parent,'admin')) + { + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); + } + +} elseif (!$admin->get_permission('pages_add_l0','system')) +{ + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); +} + +// check module permissions: +if (!$admin->get_permission($module, 'module')) +{ + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); +} + +// Validate data +if($title == '' || substr($title,0,1)=='.') +{ + $admin->print_error($MESSAGE['PAGES_BLANK_PAGE_TITLE']); +} + +// Check to see if page created has needed permissions +if(!in_array(1, $admin->get_groups_id())) +{ + $admin_perm_ok = false; + foreach ($admin_groups as $adm_group) + { + if (in_array($adm_group, $admin->get_groups_id())) + { + $admin_perm_ok = true; + } + } + if ($admin_perm_ok == false) + { + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); + } + $admin_perm_ok = false; + foreach ($viewing_groups as $view_group) + { + if (in_array($view_group, $admin->get_groups_id())) + { + $admin_perm_ok = true; + } + } + if ($admin_perm_ok == false) + { + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); + } +} + +$admin_groups = implode(',', $admin_groups); +$viewing_groups = implode(',', $viewing_groups); + +// Work-out what the link and page filename should be +if($parent == '0') +{ + $link = '/'.page_filename($title); + // rename menu titles: index && intro to prevent clashes with intro page feature and WB core file /pages/index.php + if($link == '/index' || $link == '/intro') + { + $link .= '_0'; + $filename = WB_PATH .PAGES_DIRECTORY .'/' .page_filename($title) .'_0' .PAGE_EXTENSION; + } else { + $filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($title).PAGE_EXTENSION; + } +} else { + $parent_section = ''; + $parent_titles = array_reverse(get_parent_titles($parent)); + foreach($parent_titles AS $parent_title) + { + $parent_section .= page_filename($parent_title).'/'; + } + if($parent_section == '/') { $parent_section = ''; } + $link = '/'.$parent_section.page_filename($title); + $filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($title).PAGE_EXTENSION; + make_dir(WB_PATH.PAGES_DIRECTORY.'/'.$parent_section); +} + +// Check if a page with same page filename exists +$sql = 'SELECT `page_id` FROM `'.TABLE_PREFIX.'pages` ' + . 'WHERE `link`=\''.$link.'\''; +$get_same_page = $database->get_one($sql); +if ( + $get_same_page OR + file_exists(WB_PATH.PAGES_DIRECTORY.$link.PAGE_EXTENSION) OR + file_exists(WB_PATH.PAGES_DIRECTORY.$link.'/') +) { + $admin->print_error($MESSAGE['PAGES']['PAGE_EXISTS']); +} + +// Include the ordering class +require(WB_PATH.'/framework/class.order.php'); +$order = new order(TABLE_PREFIX.'pages', 'position', 'page_id', 'parent'); +// First clean order +$order->clean($parent); +// Get new order +$position = $order->get_new($parent); + +// Work-out if the page parent (if selected) has a seperate template or language to the default +$sql='SELECT `template`, `language` FROM `'.TABLE_PREFIX.'pages` ' + . 'WHERE `page_id` = '.(int)$parent; +$query_parent = $database->query($sql); +if ($query_parent->numRows() > 0) { + $fetch_parent = $query_parent->fetchRow( MYSQLI_ASSOC ); + $template = $fetch_parent['template']; + $language = $fetch_parent['language']; +} else { + $template = ''; + $language = DEFAULT_LANGUAGE; +} + +// Insert page into pages table +$sql = 'INSERT INTO `'.TABLE_PREFIX.'pages` ' + . 'SET `parent`='.(int)$parent.', ' + . '`link` = \'\', ' + . '`description`=\'\', ' + . '`keywords`=\'\', ' + . '`page_trail`=\'\', ' + . '`admin_users`=\'\', ' + . '`viewing_users`=\'\', ' + . '`target`=\'_top\', ' + . '`page_title`=\''.$database->escapeString($title).'\', ' + . '`menu_title`=\''.$database->escapeString($title).'\', ' + . '`template`=\''.$database->escapeString($template).'\', ' + . '`visibility`=\''.$database->escapeString($visibility).'\', ' + . '`position`='.(int)$position.', ' + . '`menu`=1, ' + . '`language`=\''.$database->escapeString($language).'\', ' + . '`searching`=1, ' + . '`modified_when`='.time().', ' + . '`modified_by`='.(int)$admin->get_user_id().', ' + . '`admin_groups`=\''.$database->escapeString($admin_groups).'\', ' + . '`viewing_groups`=\''.$database->escapeString($viewing_groups).'\''; +if (!$database->query($sql)) { + $admin->print_error($database->get_error()); +} +// Get the new page id +$page_id = $database->getLastInsertId(); +// Work out level +$level = level_count($page_id); +// Work out root parent +$root_parent = root_parent($page_id); +// Work out page trail +$page_trail = get_page_trail($page_id); +// Update page with new level and link +$sql = 'UPDATE `'.TABLE_PREFIX.'pages` SET ' + . '`root_parent` = '.(int)$root_parent.', ' + . '`level` = '.(int)$level.', ' + . '`link` = \''.$database->escapeString($link).'\', ' + . ((defined('PAGE_LANGUAGES') && PAGE_LANGUAGES) + && $field_set + && ($language == DEFAULT_LANGUAGE) + && (file_exists(WB_PATH.'/modules/mod_multilingual/update_keys.php') + ) + ? '`page_code` = '.(int)$page_id.', ' : '') +. '`page_trail`=\''.$database->escapeString($page_trail).'\' ' + . 'WHERE `page_id` = '.$page_id; + if (!$database->query($sql)) { + $admin->print_error($database->get_error()); +} +// Create a new file in the /pages dir +create_access_file($filename, $page_id, $level); + +// add position 1 to new page +$position = 1; + +// Add new record into the sections table +$sql = 'INSERT INTO `'.TABLE_PREFIX.'sections` ' + . 'SET `page_id`='.(int)$page_id.', ' + . '`position`='.(int)$position.', ' + . '`module`=\''.$database->escapeString($module).'\', ' + . '`block`=1'; +if (!$database->query($sql)) { + $admin->print_error($database->get_error()); +} +// Get the section id +if (!($section_id = $database->getLastInsertId())) { + $admin->print_error($database->get_error()); +} +// Include the selected modules add file if it exists +if ( + file_exists(WB_PATH.'/modules/'.$module.'/addon.php') && + file_exists(WB_PATH.'/modules/'.$module.'/cmd/cmdModify.inc') +) { + $sCommand = 'modify'; +// require WB_PATH.'/modules/'.$module.'/addon.php'; + $admin->print_success($MESSAGE['PAGES_ADDED'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} else { + if (file_exists(WB_PATH.'/modules/'.$module.'/add.php')) { + require WB_PATH.'/modules/'.$module.'/add.php'; + } + $admin->print_success($MESSAGE['PAGES_ADDED'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +} +/* +// Include the selected modules add file if it exists +if(file_exists(WB_PATH.'/modules/'.$module.'/add.php')) { + require(WB_PATH.'/modules/'.$module.'/add.php'); +} +$admin->print_success($MESSAGE['PAGES']['ADDED'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id); +*/ +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/pages/add.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/pages/delete.php =================================================================== --- trunk/admin/pages/delete.php (nonexistent) +++ trunk/admin/pages/delete.php (revision 2) @@ -0,0 +1,118 @@ +checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) ) +{ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL ); + exit(); +} + +// Get perms +if (!$admin->get_page_permission($page_id,'admin')) { + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); +} + +// Find out more about the page +$query = "SELECT * FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"; +$results = $database->query($query); +if($database->is_error()) { + $admin->print_error($database->get_error()); +} +if($results->numRows() == 0) { + $admin->print_error($MESSAGE['PAGES_NOT_FOUND']); +} + +$results_array = $results->fetchRow(); + +$visibility = $results_array['visibility']; + +// Check if we should delete it or just set the visibility to 'deleted' +if(PAGE_TRASH != 'disabled' AND $visibility != 'deleted') { + // Page trash is enabled and page has not yet been deleted + // Function to change all child pages visibility to deleted + function trash_subs($parent = 0) { + global $database; + // Query pages + + $sql = 'SELECT `page_id` FROM `'.TABLE_PREFIX.'pages` ' + .'WHERE `parent` = '.$parent.' ' + .'ORDER BY `position` ASC'; + if($oRes = $database->query($sql)) { + // Check if there are any pages to show + if($oRes->numRows() > 0) { + // Loop through pages + while($page = $oRes->fetchRow(MYSQLI_ASSOC)) { + // Update the page visibility to 'deleted' + $sql = 'UPDATE `'.TABLE_PREFIX.'pages` SET ' + .'`visibility` = \'deleted\' ' + .'WHERE `page_id` = '.$page['page_id'].' ' + .''; + $database->query($sql); + + if($database->is_error()) { + $admin->print_error($database->get_error()); + } + // Run this function again for all sub-pages + trash_subs($page['page_id']); + } + } + } + } + // Update the page visibility to 'deleted' + $sql = 'UPDATE `'.TABLE_PREFIX.'pages` SET ' + .'`visibility` = \'deleted\' ' + .'WHERE `page_id` = '.$page_id.' ' + .''; + $database->query($sql); + + if($database->is_error()) { + $admin->print_error($database->get_error()); + } + // + // Run trash subs for this page + trash_subs($page_id); +} else { + // Really dump the page + // Delete page subs + $sub_pages = get_subs($page_id, array()); + foreach($sub_pages AS $sub_page_id) { + delete_page($sub_page_id); + } + // Delete page + delete_page($page_id); +} + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error()); +} else { + $admin->print_success($MESSAGE['PAGES_DELETED']); +} + +// Print admin footer +$admin->print_footer(); \ No newline at end of file Property changes on: trunk/admin/pages/delete.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/pages/eggsurplus.js =================================================================== --- trunk/admin/pages/eggsurplus.js (nonexistent) +++ trunk/admin/pages/eggsurplus.js (revision 2) @@ -0,0 +1,16 @@ + function add_child_page(page_id) + { + //find and select the page in the parent dropdown + var selectBox = document.add.parent; +console.info(selectBox); + for (var i = 0; i < selectBox.options.length; i++) + { + if (selectBox.options[i].value == page_id) + { + selectBox.selectedIndex = i; + break; + } + } + //set focus to add form + document.add.title.focus(); + } Index: trunk/admin/pages/empty_trash.php =================================================================== --- trunk/admin/pages/empty_trash.php (nonexistent) +++ trunk/admin/pages/empty_trash.php (revision 2) @@ -0,0 +1,54 @@ +query($query); + +// Insert values into main page list +if($get_pages->numRows() > 0) { + while($page = $get_pages->fetchRow()) { + // Delete page subs + $sub_pages = get_subs($page['page_id'], array()); + foreach($sub_pages AS $sub_page_id) { + delete_page($sub_page_id); + } + // Delete page + delete_page($page['page_id']); + } +} + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error()); +} else { + $admin->print_success($TEXT['TRASH_EMPTIED']); +} + +// Print admin +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: trunk/admin/pages/empty_trash.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/pages/html.php =================================================================== --- trunk/admin/pages/html.php (nonexistent) +++ trunk/admin/pages/html.php (revision 2) @@ -0,0 +1,39 @@ + + + + +
+
+
+
\ No newline at end of file
Property changes on: trunk/admin/pages/html.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Index: trunk/admin/pages/index.php
===================================================================
--- trunk/admin/pages/index.php (nonexistent)
+++ trunk/admin/pages/index.php (revision 2)
@@ -0,0 +1,640 @@
+clearIDKEY();
+// Include the WB functions file
+require(WB_PATH.'/framework/functions.php');
+// eggsurplus: add child pages for a specific page
+?>
+
+';
+ }
+ $retval .= ''."\n";
+ return $retval;
+}
+
+/**
+ * make_list()
+ *
+ * @return
+ */
+function make_list($parent = 0, $editable_pages = 0) {
+ // Get objects and vars from outside this function
+ global $admin, $template, $database, $TEXT, $MESSAGE, $HEADING, $par;
+ print set_node ($parent,$par);
+ // Get page list from database
+ $sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` '
+ .'WHERE `parent` = '.$parent.' '
+ . ((PAGE_TRASH != 'inline') ? 'AND `visibility` != \'deleted\' ' : ' ' )
+ . 'ORDER BY `position` ASC';
+ $get_pages = $database->query($sql);
+ // Insert values into main page list
+ if($get_pages->numRows() > 0)
+ {
+ while($page = $get_pages->fetchRow(MYSQLI_ASSOC))
+ {
+ // Get user perms
+ $admin_groups = explode(',', str_replace('_', '', $page['admin_groups']));
+ $admin_users = explode(',', str_replace('_', '', $page['admin_users']));
+ $in_group = FALSE;
+ foreach($admin->get_groups_id() as $cur_gid)
+ {
+ if (in_array($cur_gid, $admin_groups))
+ {
+ $in_group = TRUE;
+ }
+ }
+ if(($in_group) || is_numeric(array_search($admin->get_user_id(), $admin_users)))
+ {
+ if($page['visibility'] == 'deleted')
+ {
+ if(PAGE_TRASH == 'inline')
+ {
+ $can_modify = true;
+ $editable_pages = $editable_pages+1;
+ } else {
+ $can_modify = false;
+ }
+ } elseif($page['visibility'] != 'deleted')
+ {
+ $can_modify = true;
+ $editable_pages = $editable_pages+1;
+ }
+ } else {
+ if($page['visibility'] == 'private')
+ {
+ continue;
+ } else {
+ $can_modify = false;
+ }
+ }
+ // Work out if we should show a plus or not
+ $sql = 'SELECT `page_id`,`admin_groups`,`admin_users` FROM `'.TABLE_PREFIX.'pages` WHERE `parent` = '.$page['page_id'].' ';
+ $sql .= (PAGE_TRASH != 'inline') ? 'AND `visibility` != \'deleted\' ' : ' ';
+ // $sql .= ' ORDER BY `position` ASC';
+ $get_page_subs = $database->query($sql);
+ $num_subs = $get_page_subs->numRows();
+ $par['num_subs'] = $num_subs;
+/*
+ if(PAGE_TRASH != 'inline')
+ {
+ $get_page_subs = $database->query("SELECT page_id,admin_groups,admin_users FROM ".TABLE_PREFIX."pages WHERE parent = '".$page['page_id']."' AND visibility!='deleted'");
+ } else {
+ $get_page_subs = $database->query("SELECT page_id,admin_groups,admin_users FROM ".TABLE_PREFIX."pages WHERE parent = '".$page['page_id']."'");
+ }
+print 'function '.__FUNCTION__.'( '.''.' ); filename: '.basename(__FILE__).' line: '.__LINE__.' ->'; flush (); // ob_flush();;sleep(10); die(); +*/ + if($get_page_subs->numRows() > 0) + { + $display_plus = true; + } else { + $display_plus = false; + } + // Work out how many pages there are for this parent + $num_pages = $get_pages->numRows(); + ?> +
'; +print_r( $page ); print '
+
+
+ 
+
+
+ 
+
+ |
+ get_permission('pages_modify') && ($can_modify == true)) { ?>
+
+
+
+ ![<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['PUBLIC']; ?>](<?php echo THEME_URL; ?>/images/visible_16.png)
+
+ ![<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['PRIVATE']; ?>](<?php echo THEME_URL; ?>/images/private_16.png)
+
+ ![<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['REGISTERED']; ?>](<?php echo THEME_URL; ?>/images/keys_16.png)
+
+ ![<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['HIDDEN']; ?>](<?php echo THEME_URL; ?>/images/hidden_16.png)
+
+ ![<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['NONE']; ?>](<?php echo THEME_URL; ?>/images/none_16.png)
+
+ ![<?php echo $TEXT['VISIBILITY']; ?>: <?php echo $TEXT['DELETED']; ?>](<?php echo THEME_URL; ?>/images/deleted_16.png)
+ '.($page['menu_title']).''; ?>
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+ + + | ++ + | +
+
+
+ ![<?php echo $TEXT['VIEW']; ?>](<?php echo THEME_URL; ?>/images/view_16.png)
+
+
+ |
+
+
+ get_permission('pages_settings') && ($can_modify == true)) { ?>
+
+ ![<?php echo $TEXT['SETTINGS']; ?>](<?php echo THEME_URL; ?>/images/modify_16.png)
+
+
+
+
+ ![<?php echo $TEXT['RESTORE']; ?>](<?php echo THEME_URL; ?>/images/restore_16.png)
+
+
+ |
+
+
+ get_permission('pages_modify')==true && $can_modify==true)
+ {
+ $bShowSection = false;
+ $sql = 'SELECT `publ_start`, `publ_end` FROM `'.TABLE_PREFIX.'sections` '
+ . 'WHERE `page_id` = '.$page['page_id'].' AND `module` != \'menu_link\' ';
+ // $query_sections = $database->query("SELECT publ_start, publ_end FROM ".TABLE_PREFIX."sections WHERE page_id = '{$page['page_id']}' AND module != 'menu_link'");
+ if( ($query_sections = $database->query($sql)) )
+ {
+ $mdate_display=false;
+ while($mdate_res = $query_sections->fetchRow(MYSQLI_ASSOC))
+ {
+ $bShowSection = true;
+ if($mdate_res['publ_start']!='0' || $mdate_res['publ_end']!='0')
+ {
+ $mdate_display=true;
+ break;
+ }
+ }
+ if ($bShowSection) {
+ if($mdate_display==1)
+ {
+ $file=$admin->page_is_active($page)?"clock_16.png":"clock_red_16.png";
+ ?>
+
+ ![<?php echo $HEADING['MANAGE_SECTIONS']; ?>](<?php echo THEME_URL; ?>/images/noclock_16.png)
+
+
+
+ |
+
+
+
+ get_permission('pages_settings') == true && $can_modify == true) { ?>
+
+ ![<?php echo $TEXT['MOVE_UP']; ?>](<?php echo THEME_URL; ?>/images/up_16.png)
+
+
+
+
+ |
+
+
+
+ get_permission('pages_settings') == true && $can_modify == true) { ?>
+
+ ![<?php echo $TEXT['MOVE_DOWN']; ?>](<?php echo THEME_URL; ?>/images/down_16.png)
+
+
+
+
+ |
+
+ get_permission('pages_delete') && $can_modify == true) { // add IdKey ?>
+
+ ![<?php echo $TEXT['DELETE']; ?>](<?php echo THEME_URL; ?>/images/delete_16.png)
+
+
+ |
+
+
+ get_permission('pages_add') && ($page['visibility'] != 'deleted'))) { ?>
+
+ 
+
+
+ |
+ + + | + + + +
+
+
+
+
+
+ field_exists(TABLE_PREFIX.'pages', 'page_code');
+
+ $par = array();
+ $par['num_subs'] = 1;
+ $editable_pages = make_list(0, 0);
+} else {
+ $editable_pages = 0;
+}
+ ?>
+ | + : + | ++ : + | ++ PID: + | ++ : + | ++ + | +
|---|
+
+
+ correct_theme_source('pages.htt')));
+// $template->debug = true;
+$template->set_file('page', 'pages.htt');
+$template->set_block('page', 'main_block', 'main');
+// Insert values into the add page form
+$template->set_var('FTAN', $admin->getFTAN());
+
+// Group list 1
+
+ $query = "SELECT * FROM ".TABLE_PREFIX."groups";
+ $get_groups = $database->query($query);
+ $template->set_block('main_block', 'group_list_block', 'group_list');
+ // Insert admin group and current group first
+ $admin_group_name = $get_groups->fetchRow(MYSQLI_ASSOC);
+ $template->set_var(array(
+ 'ID' => 1,
+ 'TOGGLE' => '1',
+ 'DISABLED' => ' disabled="disabled"',
+ 'LINK_COLOR' => '000000',
+ 'CURSOR' => 'default',
+ 'NAME' => $admin_group_name['name'],
+ 'CHECKED' => ' checked="checked"'
+ )
+ );
+ $template->parse('group_list', 'group_list_block', true);
+
+ while($group = $get_groups->fetchRow(MYSQLI_ASSOC)) {
+ // check if the user is a member of this group
+ $flag_disabled = '';
+ $flag_checked = '';
+ $flag_cursor = 'pointer';
+ $flag_color = '';
+ if (in_array($group["group_id"], $admin->get_groups_id())) {
+ $flag_disabled = ''; //' disabled';
+ $flag_checked = ' checked="checked"';
+ $flag_cursor = 'default';
+ $flag_color = '000000';
+ }
+
+ // Check if the group is allowed to edit pages
+ $system_permissions = explode(',', $group['system_permissions']);
+ if(is_numeric(array_search('pages_modify', $system_permissions))) {
+ $template->set_var(array(
+ 'ID' => $group['group_id'],
+ 'TOGGLE' => $group['group_id'],
+ 'CHECKED' => $flag_checked,
+ 'DISABLED' => $flag_disabled,
+ 'LINK_COLOR' => $flag_color,
+ 'CURSOR' => $flag_checked,
+ 'NAME' => $group['name'],
+ )
+ );
+ $template->parse('group_list', 'group_list_block', true);
+ }
+ }
+// Group list 2
+
+ $query = "SELECT * FROM ".TABLE_PREFIX."groups";
+
+ $get_groups = $database->query($query);
+ $template->set_block('main_block', 'group_list_block2', 'group_list2');
+ // Insert admin group and current group first
+ $admin_group_name = $get_groups->fetchRow(MYSQLI_ASSOC);
+ $template->set_var(array(
+ 'ID' => 1,
+ 'TOGGLE' => '1',
+ 'DISABLED' => ' disabled="disabled"',
+ 'LINK_COLOR' => '000000',
+ 'CURSOR' => 'default',
+ 'NAME' => $admin_group_name['name'],
+ 'CHECKED' => ' checked="checked"'
+ )
+ );
+ $template->parse('group_list2', 'group_list_block2', true);
+
+ while($group = $get_groups->fetchRow(MYSQLI_ASSOC)) {
+ // check if the user is a member of this group
+ $flag_disabled = '';
+ $flag_checked = '';
+ $flag_cursor = 'pointer';
+ $flag_color = '';
+ if (in_array($group["group_id"], $admin->get_groups_id())) {
+ $flag_disabled = ''; //' disabled';
+ $flag_checked = ' checked="checked"';
+ $flag_cursor = 'default';
+ $flag_color = '000000';
+ }
+
+ $template->set_var(array(
+ 'ID' => $group['group_id'],
+ 'TOGGLE' => $group['group_id'],
+ 'CHECKED' => $flag_checked,
+ 'DISABLED' => $flag_disabled,
+ 'LINK_COLOR' => $flag_color,
+ 'CURSOR' => $flag_cursor,
+ 'NAME' => $group['name'],
+ )
+ );
+ $template->parse('group_list2', 'group_list_block2', true);
+ }
+
+
+// Parent page list
+// $database = new database();
+/**
+ * parent_list()
+ *
+ * @return
+ */
+function parent_list($parent)
+{
+ global $admin, $database, $template, $field_set;
+ $query = 'SELECT * FROM `'.TABLE_PREFIX.'pages` '
+ . 'WHERE `parent` = '.$parent.' '
+ . 'AND `visibility` !=\'deleted\' '
+ . 'ORDER BY `position` ';
+ $get_pages = $database->query($query);
+ while($page = $get_pages->fetchRow(MYSQLI_ASSOC)) {
+ if($admin->page_is_visible($page)==false) {continue;}
+ // if parent = 0 set flag_icon
+ $template->set_var('FLAG_ROOT_ICON',' none ');
+ if( $page['parent'] == 0 && $field_set) {
+ $template->set_var('FLAG_ROOT_ICON','url('.THEME_URL.'/images/flags/'.strtolower($page['language']).'.png)');
+ }
+ // Stop users from adding pages with a level of more than the set page level limit
+ if( $page['level'] <= PAGE_LEVEL_LIMIT + 1 ) {
+ // Get user perms
+ $admin_groups = explode(',', str_replace('_', '', $page['admin_groups']));
+ $admin_users = explode(',', str_replace('_', '', $page['admin_users']));
+
+ $in_group = FALSE;
+ foreach($admin->get_groups_id() as $cur_gid) {
+ if (in_array($cur_gid, $admin_groups)) {
+ $in_group = TRUE;
+ }
+ }
+ if(($in_group) || is_numeric(array_search($admin->get_user_id(), $admin_users))) {
+ $can_modify = true;
+ } else {
+ $can_modify = false;
+ }
+ // Title -'s prefix
+ $title_prefix = '';
+ for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - - '; }
+ $template->set_var(array(
+ 'ID' => $page['page_id'],
+ 'TITLE' => ($title_prefix.$page['menu_title']),
+ 'MENU-TITLE' => ($title_prefix.$page['menu_title']),
+ 'PAGE-TITLE' => ($title_prefix.$page['page_title'])
+ ));
+ if($can_modify == true) {
+ $template->set_var('DISABLED', '');
+ } else {
+ $template->set_var('DISABLED', ' disabled="disabled" class="disabled"');
+ }
+ $template->parse('page_list2', 'page_list_block2', true);
+ }
+ parent_list($page['page_id']);
+ }
+}
+$template->set_block('main_block', 'page_list_block2', 'page_list2');
+if($admin->get_permission('pages_add_l0') == true) {
+ $template->set_var(
+ array(
+ 'ID' => '0',
+ 'TITLE' => $TEXT['NONE'],
+ 'SELECTED' => ' selected="selected"',
+ 'DISABLED' => ''
+ )
+ );
+ $template->parse('page_list2', 'page_list_block2', true);
+}
+parent_list(0);
+// Explode module permissions
+$module_permissions = $_SESSION['MODULE_PERMISSIONS'];
+// Modules list
+$template->set_block('main_block', 'module_list_block', 'module_list');
+$result = $database->query("SELECT * FROM `".TABLE_PREFIX."addons` WHERE `type` = 'module' AND `function` = 'page' ORDER BY `name`");
+if($result->numRows() > 0) {
+ while ($module = $result->fetchRow(MYSQLI_ASSOC)) {
+ // Check if user is allowed to use this module
+ if(!is_numeric(array_search($module['directory'], $module_permissions))) {
+ $template->set_var('VALUE', $module['directory']);
+ $template->set_var('NAME', $module['name']);
+ if($module['directory'] == 'wysiwyg') {
+ $template->set_var('SELECTED', ' selected="selected"');
+ } else {
+ $template->set_var('SELECTED', '');
+ }
+ $template->parse('module_list', 'module_list_block', true);
+ }
+ }
+}
+// Insert urls
+$template->set_var(array(
+ 'THEME_URL' => THEME_URL,
+ 'WB_URL' => WB_URL,
+ 'ADMIN_URL' => ADMIN_URL,
+ )
+ );
+// Insert language headings
+$template->set_var(array(
+ 'HEADING_ADD_PAGE' => $HEADING['ADD_PAGE'],
+ 'HEADING_MODIFY_INTRO_PAGE' => $HEADING['MODIFY_INTRO_PAGE']
+ )
+ );
+// Insert language text and messages
+$template->set_var(array(
+ 'TEXT_TITLE' => $TEXT['TITLE'],
+ 'TEXT_TYPE' => $TEXT['TYPE'],
+ 'TEXT_PARENT' => $TEXT['PARENT'],
+ 'TEXT_VISIBILITY' => $TEXT['VISIBILITY'],
+ 'TEXT_PUBLIC' => $TEXT['PUBLIC'],
+ 'TEXT_PRIVATE' => $TEXT['PRIVATE'],
+ 'TEXT_REGISTERED' => $TEXT['REGISTERED'],
+ 'TEXT_HIDDEN' => $TEXT['HIDDEN'],
+ 'TEXT_NONE' => $TEXT['NONE'],
+ 'TEXT_NONE_FOUND' => $TEXT['NONE_FOUND'],
+ 'TEXT_ADD' => $TEXT['ADD'],
+ 'TEXT_RESET' => $TEXT['RESET'],
+ 'TEXT_ADMINISTRATORS' => $TEXT['ADMINISTRATORS'],
+ 'TEXT_PRIVATE_VIEWERS' => $TEXT['PRIVATE_VIEWERS'],
+ 'TEXT_REGISTERED_VIEWERS' => $TEXT['REGISTERED_VIEWERS'],
+ 'INTRO_LINK' => $MESSAGE['PAGES']['INTRO_LINK'],
+ )
+ );
+$template->set_block('main_block', 'add_block', 'add');
+$template->set_block('main_block', 'intro_block', 'intro');
+// Insert permissions values
+if($admin->get_permission('pages_add') != true) {
+ $template->set_var('DISPLAY_ADD', 'hide');
+ $template->set_block('add', '', '');
+} elseif($admin->get_permission('pages_add_l0') != true && $editable_pages == 0) {
+ $template->set_var('DISPLAY_ADD', 'hide');
+ $template->set_block('add', '', '');
+} else {
+ $template->parse('add', 'add_block', true);
+}
+if($admin->get_permission('pages_intro') != true || INTRO_PAGE != 'enabled') {
+ $template->set_var('DISPLAY_INTRO', 'hide');
+ $template->set_block('intro', '', '');
+} else {
+ $template->parse('intro', 'intro_block', true);
+}
+// Parse template object
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+// include the required file for Javascript admin
+/*
+if(file_exists(WB_PATH.'/modules/jsadmin/jsadmin_backend_include.php'))
+{
+ include(WB_PATH.'/modules/jsadmin/jsadmin_backend_include.php');
+}
+*/
+// Print admin
+$admin->print_footer(true);
Property changes on: trunk/admin/pages/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Index: trunk/admin/pages/intro.php
===================================================================
--- trunk/admin/pages/intro.php (nonexistent)
+++ trunk/admin/pages/intro.php (revision 2)
@@ -0,0 +1,64 @@
+ 0) {
+ $content = file_get_contents( $filename ) ;
+} else {
+ $content = file_get_contents( ADMIN_PATH.'/pages/html.php' ) ;
+}
+
+require_once(WB_PATH . '/include/editarea/wb_wrapper_edit_area.php');
+$toolbar = 'search, fullscreen, |, undo, redo, |, select_font, syntax_selection,|,word_wrap, highlight, reset_highlight, |,charmap, |, help';
+echo registerEditArea ('content','php',true,'both',true,true,600,450,$toolbar);
+function show_wysiwyg_editor($name,$id,$content,$width,$height) {
+ echo '';
+}
+?>
+
+print_footer();
Property changes on: trunk/admin/pages/intro.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Index: trunk/admin/pages/intro2.php
===================================================================
--- trunk/admin/pages/intro2.php (nonexistent)
+++ trunk/admin/pages/intro2.php (revision 2)
@@ -0,0 +1,55 @@
+checkFTAN())
+{
+ $admin->print_header();
+ $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL );
+}
+
+// Get posted content
+if(!isset($_POST['content'])) {
+ $admin->print_error($MESSAGE['PAGES_NOT_SAVED']);
+ exit(0);
+} else {
+ $content = $admin->strip_slashes($_POST['content']);
+}
+
+// Include the WB functions file
+require_once(WB_PATH.'/framework/functions.php');
+
+$admin->print_header();
+// Write new content
+$filename = WB_PATH.PAGES_DIRECTORY.'/intro'.PAGE_EXTENSION;
+if(! file_put_contents( $filename, $content )){
+ $admin->print_error($MESSAGE['PAGES_NOT_SAVED']);
+} else {
+ change_mode($filename);
+ $admin->print_success($MESSAGE['PAGES']['INTRO_SAVED']);
+}
+if(!is_writable($filename)) {
+ $admin->print_error($MESSAGE['PAGES']['INTRO_NOT_WRITABLE']);
+}
+
+// Print admin footer
+$admin->print_footer();
Property changes on: trunk/admin/pages/intro2.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Index: trunk/admin/pages/modify.php
===================================================================
--- trunk/admin/pages/modify.php (nonexistent)
+++ trunk/admin/pages/modify.php (revision 2)
@@ -0,0 +1,227 @@
+print_error($sDEBUG.$MESSAGE['PAGES_NOT_FOUND'], ADMIN_URL.'/pages/index.php' );
+ }
+
+/*
+if( (!($page_id = $admin->checkIDKEY('page_id', $page_id, $_SERVER['REQUEST_METHOD']))) )
+{
+ $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL );
+}
+*/
+
+// Get perms
+if(!$admin->get_page_permission($page_id,'admin')) {
+ $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS'], ADMIN_URL );
+}
+
+$sectionId = isset($_GET['wysiwyg']) ? htmlspecialchars($admin->get_get('wysiwyg')) : NULL;
+
+// Get page details
+$results_array=$admin->get_page_details($page_id);
+
+// Get display name of person who last modified the page
+$user=$admin->get_user_details($results_array['modified_by']);
+
+// Convert the unix ts for modified_when to human a readable form
+
+$modified_ts = ($results_array['modified_when'] != 0)
+ ? $modified_ts = date(TIME_FORMAT.', '.DATE_FORMAT, $results_array['modified_when']+TIMEZONE)
+ : 'Unknown';
+// $ftan_module = $GLOBALS['ftan_module'];
+// Setup template object, parse vars to it, then parse it
+// Create new template object
+$template = new Template(dirname($admin->correct_theme_source('pages_modify.htt')));
+// $template->debug = true;
+$template->set_file('page', 'pages_modify.htt');
+$template->set_block('page', 'main_block', 'main');
+// $template->set_var('FTAN', $admin->getFTAN() );
+
+$template->set_var(array(
+ 'PAGE_ID' => $results_array['page_id'],
+ // 'PAGE_IDKEY' => $admin->getIDKEY($results_array['page_id']),
+ 'PAGE_IDKEY' => $results_array['page_id'],
+ 'PAGE_TITLE' => ($results_array['page_title']),
+ 'MENU_TITLE' => ($results_array['menu_title']),
+ 'ADMIN_URL' => ADMIN_URL,
+ 'WB_URL' => WB_URL,
+ 'THEME_URL' => THEME_URL
+ ));
+
+$template->set_var(array(
+ 'MODIFIED_BY' => $user['display_name'],
+ 'MODIFIED_BY_USERNAME' => $user['username'],
+ 'MODIFIED_WHEN' => $modified_ts,
+ 'LAST_MODIFIED' => $MESSAGE['PAGES']['LAST_MODIFIED'],
+ ));
+
+$template->set_block('main_block', 'show_modify_block', 'show_modify');
+if($modified_ts == 'Unknown')
+{
+ $template->set_block('show_modify', '');
+ $template->set_var('CLASS_DISPLAY_MODIFIED', 'hide');
+
+} else {
+ $template->set_var('CLASS_DISPLAY_MODIFIED', '');
+ $template->parse('show_modify', 'show_modify_block', true);
+}
+
+// Work-out if we should show the "manage sections" link
+$sql = 'SELECT COUNT(*) FROM `'.TABLE_PREFIX.'sections` '
+ . 'WHERE `page_id`='.(int)$page_id.' AND `module`=\'menu_link\'';
+$query_sections = $database->get_one($sql);
+
+$template->set_block('main_block', 'show_section_block', 'show_section');
+if($query_sections) {
+ $template->set_block('show_section', '');
+ $template->set_var('DISPLAY_MANAGE_SECTIONS', 'display:none;');
+} elseif(MANAGE_SECTIONS == 'enabled') {
+ $template->set_var('TEXT_MANAGE_SECTIONS', $HEADING['MANAGE_SECTIONS']);
+ $template->parse('show_section', 'show_section_block', true);
+} else {
+ $template->set_block('show_section', '');
+ $template->set_var('DISPLAY_MANAGE_SECTIONS', 'display:none;');
+}
+
+// Insert language TEXT
+$template->set_var(array(
+ 'TEXT_CURRENT_PAGE' => $TEXT['CURRENT_PAGE'],
+ 'TEXT_CHANGE_SETTINGS' => $TEXT['CHANGE_SETTINGS'],
+ 'HEADING_MODIFY_PAGE' => $HEADING['MODIFY_PAGE']
+ ));
+
+// Parse and print header template
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+// get template used for the displayed page (for displaying block details)
+if (SECTION_BLOCKS)
+{
+ $sql = 'SELECT `template` FROM `'.TABLE_PREFIX.'pages` '
+ . 'WHERE `page_id`='.(int)$page_id;
+ if (($sTemplate = $database->get_one($sql)) !== null) {
+ $page_template = ($sTemplate == '') ? DEFAULT_TEMPLATE : $sTemplate;
+ // include template info file if exists
+ if (is_readable(WB_PATH.'/templates/'.$page_template.'/info.php')) {
+ include_once(WB_PATH.'/templates/'.$page_template.'/info.php');
+ }
+ }
+}
+
+// Get sections for this page
+$module_permissions = $_SESSION['MODULE_PERMISSIONS'];
+// workout for edit only one section for faster pageloading
+// Constant later set in wb_settings, in meantime defined in framework/initialize.php
+$sql = 'SELECT * FROM `'.TABLE_PREFIX.'sections` ';
+$sql .= (defined('EDIT_ONE_SECTION') && EDIT_ONE_SECTION && is_numeric($sectionId))
+ ? 'WHERE `section_id` = '.(int)$sectionId
+ : 'WHERE `page_id` = '.(int)$page_id;
+$sql .= ' ORDER BY position ASC';
+$query_sections = $database->query($sql);
+if($query_sections->numRows() > 0)
+{
+ while($section = $query_sections->fetchRow(MYSQLI_ASSOC))
+ {
+ $now = time();
+ $bSectionInactive = !(($now<=$section['publ_end'] || $section['publ_end']==0) && ($now>=$section['publ_start'] || $section['publ_start']==0));
+ $section_id = $section['section_id'];
+ $module = $section['module'];
+ //Have permission?
+ if(!is_numeric(array_search($module, $module_permissions)))
+ {
+ // Include the modules editing script if it exists
+ if (!is_readable(WB_PATH.'/modules/'.$module.'/modify.php')){
+ $admin->print_error($MESSAGE['GENERIC_MODULE_VERSION_ERROR'],ADMIN_URL.'/pages/settings.php?page_id='.(int)$page_id);
+ } else {
+// print /* ''. */"\n";
+ $sSectionBlock = ''."\n";
+// set container if SECTION_BLOCKS disabled
+// $sSectionInfoLine = ($bSectionInactive ? false: true);
+ $sSectionInfoLine = ($bSectionInactive ? 'inactive': 'active');
+// $sSectionInfoLine = ($bSectionInactive ? '
': '
+ ' );
+ } else {
+ $tpl->set_var(array(
+ 'VAR_MOVE_UP_URL' => ''
+ )
+ );
+ }
+ if($section['position'] != $num_sections ) {
+ $tpl->set_var(
+ 'VAR_MOVE_DOWN_URL',
+ '
+ 
+ ' );
+ } else {
+ $tpl->set_var(array(
+ 'VAR_MOVE_DOWN_URL' => ''
+ )
+ );
+ }
+ } else {
+ continue;
+ }
+ $tpl->set_var(array(
+ 'DISPLAY_DEBUG' => ' style="visibility="visible;"',
+ 'TEXT_SID' => 'SID',
+ 'DEBUG_COLSPAN_SIZE' => 9
+ )
+ );
+ if($bDebug)
+ {
+ $tpl->set_var(array(
+ 'DISPLAY_DEBUG' => ' style="visibility="visible;"',
+ 'TEXT_PID' => 'PID',
+ 'TEXT_SID' => 'SID',
+ 'POSITION' => $section['position']
+ )
+ );
+ } else {
+ $tpl->set_var(array(
+ 'DISPLAY_DEBUG' => ' style="display:none;"',
+ 'TEXT_PID' => '',
+ 'POSITION' => ''
+ )
+ );
+ }
+ if($bSectionCanDelete) {
+ $tpl->parse('can_delete', 'can_delete_block', false);
+ } else {
+// $tpl->parse('can_delete', '', false);
+ $tpl->set_block('can_delete_block', '');
+ }
+ $tpl->parse('show_section', 'show_section_block', true);
+ }
+ }
+
+ // now add the calendars -- remember to to set the range to [1970, 2037] if the date is used as timestamp!
+ // the loop is simply a copy from above.
+ $sql = 'SELECT `section_id`,`module` FROM `'.TABLE_PREFIX.'sections` ';
+ $sql .= 'WHERE page_id = '.$page_id.' ';
+ $sql .= 'ORDER BY `position` ASC';
+ $query_sections = $database->query($sql);
+
+ if($query_sections->numRows() > 0)
+ {
+ $num_sections = $query_sections->numRows();
+ while($section = $query_sections->fetchRow())
+ {
+ // Get the modules real name
+ $sql = 'SELECT `name` FROM `'.TABLE_PREFIX.'addons` '
+ . 'WHERE `directory` = "'.$section['module'].'"';
+ $module_name = $database->get_one($sql);
+
+ if(!is_numeric(array_search($section['module'], $module_permissions)))
+ {
+ $tpl->set_var(array(
+ 'jscal_ifformat' => $jscal_ifformat,
+ 'jscal_firstday' => $jscal_firstday,
+ 'jscal_today' => $jscal_today,
+ 'start_date' => 'start_date'.$section['section_id'],
+ 'end_date' => 'end_date'.$section['section_id'],
+ 'trigger_start' => 'trigger_start'.$section['section_id'],
+ 'trigger_end' => 'trigger_stop'.$section['section_id']
+ )
+ );
+ if(isset($jscal_use_time) && $jscal_use_time==TRUE) {
+ $tpl->set_var(array(
+ 'showsTime' => "true",
+ 'timeFormat' => "24"
+ )
+ );
+ } else {
+ $tpl->set_var(array(
+ 'showsTime' => "false",
+ 'timeFormat' => "24"
+ )
+ );
+ }
+ }
+ $tpl->parse('calendar_list', 'calendar_block', true);
+ }
+ }
+
+ // Work-out if we should show the "Add Section" form
+ $sql = 'SELECT `section_id` FROM `'.TABLE_PREFIX.'sections` '
+ . 'WHERE `page_id` = '.$page_id.' AND `module` = "menu_link"';
+ $query_sections = $database->query($sql);
+ if($query_sections->numRows() == 0)
+ {
+ // Modules list
+ $sql = 'SELECT `name`,`directory`,`type` FROM `'.TABLE_PREFIX.'addons` '
+ . 'WHERE `type` = \'module\' '
+ . 'AND `function` = \'page\' '
+ . 'AND `directory` != \'menu_link\' '
+ . 'ORDER BY `name`';
+ $result = $database->query($sql);
+ // if(DEBUG && $database->is_error()) { $admin->print_error($database->get_error()); }
+ if($result->numRows() > 0)
+ {
+ while ($module = $result->fetchRow(MYSQLI_ASSOC))
+ {
+ // Check if user is allowed to use this module echo $module['directory'],'
'; + if(!is_numeric(array_search($module['directory'], $module_permissions))) + { + $tpl->set_var('VALUE', $module['directory']); + $tpl->set_var('NAME', $module['name']); + if($module['directory'] == 'wysiwyg') + { + $tpl->set_var('SELECTED', ' selected="selected"'); + } else { + $tpl->set_var('SELECTED', ''); + } + $tpl->parse('module_list', 'module_block', true); + } else { + continue; + } + } + } + } + // Insert language text and messages + $tpl->set_var(array( + 'TEXT_MANAGE_SECTIONS' => $HEADING['MANAGE_SECTIONS'], + 'TEXT_ARE_YOU_SURE' => $TEXT['ARE_YOU_SURE'], + 'TEXT_TYPE' => $TEXT['TYPE'], + 'TEXT_ADD' => $TEXT['ADD'], + 'TEXT_SAVE' => $TEXT['SAVE'], + 'TEXTLINK_MODIFY_PAGE' => $HEADING['MODIFY_PAGE'], + 'TEXT_CALENDAR' => $TEXT['CALENDAR'], + 'TEXT_DELETE_DATE' => $TEXT['DELETE_DATE'], + 'TEXT_ADD_SECTION' => $TEXT['ADD_SECTION'], + 'TEXT_MOVE_UP' => $TEXT['MOVE_UP'], + 'TEXT_MOVE_DOWN' => $TEXT['MOVE_DOWN'] + ) + ); + $tpl->set_block('main_block', 'show_settings_block', 'show_settings'); + if ($admin->get_permission('pages_settings')) { + $tpl->parse('show_settings', 'show_settings_block', true); + } else { + $tpl->set_block('show_settings', ''); + } + $tpl->parse('main', 'main_block', false); + $tpl->pparse('output', 'page'); + // include the required file for Javascript admin + if(file_exists(WB_PATH.'/modules/jsadmin/jsadmin_backend_include.php')) + { + include(WB_PATH.'/modules/jsadmin/jsadmin_backend_include.php'); + } + break; +endswitch; + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/pages/sections.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/pages/sections_save.php =================================================================== --- trunk/admin/pages/sections_save.php (nonexistent) +++ trunk/admin/pages/sections_save.php (revision 2) @@ -0,0 +1,171 @@ +print_error($sDEBUG.$MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); + exit(0); +} else { + $iPageId = $page_id = (int)$aRequestVars['page_id']; +} + +$callingScript = $_SERVER['HTTP_REFERER']; +$sBackLink = $callingScript.'?page_id='.$iPageId; +//$sBackLink = ADMIN_URL.'/pages/sections.php?page_id='.$iPageId; + +if (!$admin->checkFTAN()) +{ + $admin->print_header(); + $sInfo = __LINE__.') '.strtoupper(basename(__DIR__).'_'.basename(__FILE__, ''.PAGE_EXTENSION)).'::'; + $sDEBUG=(@DEBUG?$sInfo:''); + $admin->print_error($sDEBUG.$MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL); +} +/* +if( (!($page_id = $admin->checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) ) +{ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); + exit(); +} +*/ +// Get perms +$sql = 'SELECT `admin_groups`,`admin_users` FROM `'.TABLE_PREFIX.'pages` ' + . ' WHERE `page_id` = '.(int)$page_id. ''; +$results = $database->query($sql); +$results_array = $results->fetchRow(MYSQLI_ASSOC); +$old_admin_groups = explode(',', $results_array['admin_groups']); +$old_admin_users = explode(',', $results_array['admin_users']); +$in_old_group = FALSE; +foreach($admin->get_groups_id() as $cur_gid){ + if (in_array($cur_gid, $old_admin_groups)) { + $in_old_group = TRUE; + } +} +if((!$in_old_group) && !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) { + $sInfo = __LINE__.') '.(basename(__DIR__).'_'.basename(__FILE__, ''.PAGE_EXTENSION)).'::'; + $sDEBUG=(@DEBUG?$sInfo:''); + $admin->print_error($sDEBUG.$MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); +} + +// Get page details +$query = 'SELECT COUNT(`page_id`) `numRows` FROM `'.TABLE_PREFIX.'pages` WHERE `page_id` = '.(int)$page_id.''; +$numRows = $database->get_one($query); +if($database->is_error()) { + $admin->print_header(); + $sInfo = __LINE__.') '.strtoupper(basename(__DIR__).'_'.basename(__FILE__, ''.PAGE_EXTENSION)).'_DATABASE_ERROR::'; + $sDEBUG=(@DEBUG?$sInfo:''); + $admin->print_error($sDEBUG.$database->get_error()); +} +if($numRows == 0) { + $admin->print_header(); + $sInfo = __LINE__.') '.strtoupper(basename(__DIR__).'_'.basename(__FILE__, ''.PAGE_EXTENSION)).'::'; + $sDEBUG=(@DEBUG?$sInfo:''); + $admin->print_error($sDEBUG.$MESSAGE['PAGES_NOT_FOUND']); +} +// After check print the header +$admin->print_header(); + +$results_array = $results->fetchRow(MYSQLI_ASSOC); +// Set module permissions +$module_permissions = $_SESSION['MODULE_PERMISSIONS']; + +$aSql = array(); +$section_id = intval($admin->get_post('section_id') ); +$sTitle = $admin->StripCodeFromText( $admin->get_post('title_'.$section_id ) ); +$bSaveTitle = isset( $aRequestVars['inputSection'] ); +if( $bSaveTitle ) { + $aSql[] = 'UPDATE `'.TABLE_PREFIX.'sections` SET ' + . '`title`=\''.$database->escapeString($sTitle).'\' ' + . 'WHERE `section_id`='.(int)$section_id; + foreach( $aSql as $sSql ) { + if(!$database->query($sSql)) { + } + } + +} else { +// Loop through sections + $sql = 'SELECT `section_id`,`module`,`position` FROM `'.TABLE_PREFIX.'sections` ' + . 'WHERE `page_id` = '.(int)$page_id.' ' + . 'ORDER BY `position` '; + if($query_sections = $database->query($sql)) + { + $num_sections = $query_sections->numRows(); + while($section = $query_sections->fetchRow(MYSQLI_ASSOC)) { + if(!is_numeric(array_search($section['module'], $module_permissions))) { + // Update the section record with properties + $section_id = $section['section_id']; + $sql = ''; $publ_start = 0; $publ_end = 0; + $dst = date("I")?" DST":""; // daylight saving time? + if(isset($_POST['block'.$section_id]) && $_POST['block'.$section_id] != '') { + $sql = "block = '".$admin->add_slashes($_POST['block'.$section_id])."'"; + } + // update publ_start and publ_end, trying to make use of the strtotime()-features like "next week", "+1 month", ... + if(isset($_POST['start_date'.$section_id]) && isset($_POST['end_date'.$section_id])) { + if(trim($_POST['start_date'.$section_id]) == '0' || trim($_POST['start_date'.$section_id]) == '') { + $publ_start = 0; + } else { + $publ_start = jscalendar_to_timestamp($_POST['start_date'.$section_id]); + } + if(trim($_POST['end_date'.$section_id]) == '0' || trim($_POST['end_date'.$section_id]) == '') { + $publ_end = 0; + } else { + $publ_end = jscalendar_to_timestamp($_POST['end_date'.$section_id], $publ_start); + } + if($sql != ''){$sql .= ",";} + $sql .= " publ_start = '".$database->escapeString($publ_start)."'"; + $sql .= ", publ_end = '".$database->escapeString($publ_end)."'"; + } + + $query = "UPDATE ".TABLE_PREFIX."sections SET $sql WHERE section_id = '$section_id'"; + if($sql != '') { + $database->query($query); + } + } + } + } + } +// Check for error or print success message +if($database->is_error()) { + $sInfo = __LINE__.') '.strtoupper(basename(__DIR__).'_'.basename(__FILE__, ''.PAGE_EXTENSION)).'::'; + $sDEBUG=(@DEBUG?$sInfo:''); + $admin->print_error($sDEBUG.$database->get_error(), ADMIN_URL.'/pages/sections.php?page_id='.$page_id ); +} else { + $admin->print_success($MESSAGE['PAGES_SECTIONS_PROPERTIES_SAVED'], $sBackLink ); +} + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/pages/sections_save.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/pages/settings-x.php =================================================================== --- trunk/admin/pages/settings-x.php (nonexistent) +++ trunk/admin/pages/settings-x.php (revision 2) @@ -0,0 +1,156 @@ +print_header(); + $admin->print_error($MESSAGE['PAGES_NOT_FOUND']); + } +// load requested page + $aPage = null; + $sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` WHERE `page_id` = '.$page_id; + if (($oResult = $database->query($sql))) { + $aPage = $oResult->fetchRow(MSQL_ASSOC); + } + if (!$aPage) { +// throw error if no valid page received + $admin->print_header(); + $admin->print_error($MESSAGE['PAGES_NOT_FOUND']); + } +// check if current user has admin rights to that page + if (!($admin->ami_group_member($aPage['admin_groups']) || + $admin->is_group_match($aPage['admin_users'], $admin->get_user_id())) + ) { + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); + } +// check if user has owner rights for this page + $bHasOwnerRight = ($admin->get_user_id() == $aPage['page_owner'] || $admin->get_user_id() == 1); +// restore SEO title from page-link + $aPage['seo_title'] = basename($aPage['link']); +// add user data array to page + $aPage['modified_by'] = $admin->get_user_details($aPage['modified_by']); + +// prepare template data ------------------------------------------------------- + $aTmplDataGlobal = array(); + $aTmplData = array(); + $aTmplDataGlobal['page'] = $aPage; + $aTmplDataGlobal['user'] = $admin->get_user_details($admin->get_user_id()); + $aTmplDataGlobal['user']['owner'] = $bHasOwnerRight; + +// get sorted group lists ------------------------------------------------------ + $aAdmins = explode(',', $aPage['admin_groups']); + $aViewers = explode(',', $aPage['viewing_groups']); + $aList = array(); + $sql = 'SELECT `group_id` `id`, `name` ' + . 'FROM `'.TABLE_PREFIX.'groups` ' + . 'ORDER BY `name`'; + $oRecords = $database->query($sql); + while ($aRecord = $oRecords->fetchRow(MYSQLI_ASSOC)) { + // if group is set as admin to this page + $aRecord['admin'] = in_array($aRecord['id'], $aAdmins); + // if group ist set as viewer to this page + $aRecord['viewer'] = in_array($aRecord['id'], $aViewers); + $aList[] = $aRecord; + } +// sort groups by admins + $aTmplData['GroupListAdmin'] = SettingsHelper::doMultiSort($aList, 'admin', 'name'); +// sort groups by viewers + $aTmplData['GroupListViewer'] = SettingsHelper::doMultiSort($aList, 'viewer', 'name'); +// get sorted user lists ------------------------------------------------------- + $aAdmins = explode(',', $aPage['admin_users']); + $aViewers = explode(',', $aPage['viewing_users']); + $aList = array(); + $sql = 'SELECT `user_id` `id`, `display_name` `name` ' + . 'FROM `'.TABLE_PREFIX.'users` ' + . 'ORDER BY `name`'; + $oRecords = $database->query($sql); + while ($aRecord = $oRecords->fetchRow(MYSQLI_ASSOC)) { + // if user is set as admin to this page + $aRecord['admin'] = in_array($aRecord['id'], $aAdmins); + // if user is set as viewer to this page + $aRecord['viewer'] = in_array($aRecord['id'], $aViewers); + $aList[] = $aRecord; + } +// sort groups by admins + $aTmplData['UserListAdmin'] = SettingsHelper::doMultiSort($aList, 'admin', 'name'); +// sort groups by viewers + $aTmplData['UserListViewer'] = SettingsHelper::doMultiSort($aList, 'viewer', 'name'); +// clean up memory + unset($aAdmins, $aViewers, $oRecords, $aRecord, $aList, $doMultiSort); +// add list of possible parent pages ------------------------------------------- + $aParentPages = SettingsHelper::getParentPagesList($aTmplDataGlobal['page']['page_id'], $iCurrentPage, $admin, $database); +// check for permission to add a level-0 page + if ($admin->get_permission('pages_add_l0') || $results_array['level'] == 0) { +// add the option to choose level-0 + $aPage['id'] = 0; + $aPage['title'] = $aLang['TEXT_NONE']; + $aPage['language'] = ''; + $aPage['active'] = !$results_array['parent']; + array_unshift($aParentPages, $aPage); + } + $aTmplData['ParentPages'] = $aParentPages; +// add list of linking targets ------------------------------------------------- + $aTmplData['LinkTargets'] = array( + array('target' => '_top', 'caption' => $TEXT['TOP_FRAME']), + array('target' => '_self', 'caption' => $TEXT['SAME_WINDOW']), + array('target' => '_blank', 'caption' => $TEXT['NEW_WINDOW']) + ); +// build list of available templates ------------------------------------------- + $aTemplatesList = array(); + $sql = 'SELECT `directory`, `name`, `version` FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `function` = \'template\' ' + . 'ORDER BY `name`'; + if (($oAddons = $database->query($sql))) { + while (($aAddon = $oAddon->fetchRow(MYSQLI_ASSOC))) { + $aTemplatesList[] = $aAddon; + } + } + if (!$aTemplatesList) { + $aTemplatesList[] = array('directory'=>'', 'name'=>'System Default', 'version'=>''); + } + $aTmplData['Templates'] = $aTemplatesList; +// get available menues from active template ----------------------------------- + $sTpl = WB_PATH.'/templates/' + .($aPage['template'] ?: DEFAULT_TEMPLATE) + .'/info.php'; + $aTemplateInfo = getContentFromInfoPhp( + WB_PATH.'/templates/'.($aPage['template'] ?: DEFAULT_TEMPLATE).'/info.php' + ); + if (!isset($aTemplateInfo['menu'])) { + $aTemplateInfo['menu'] = array(1 => 'Main'); + } + $aTmplData['Menues'] = $aTemplateInfo['menu']; +// get list of available languages --------------------------------------------- + $sql = 'SELECT `directory`, `name`, `version` FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `type` = \'language\' ' + . 'ORDER BY `name`'; + if (($oAddons = $database->query($sql))) { + while (($aAddon = $oAddon->fetchRow(MYSQLI_ASSOC))) { + $aLanguageList[] = $aAddon; + } + } + $aTmplData['Languages'] = $aLanguageList; + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/pages/settings-x.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/pages/settings.php =================================================================== --- trunk/admin/pages/settings.php (nonexistent) +++ trunk/admin/pages/settings.php (revision 2) @@ -0,0 +1,592 @@ +print_header(); + $admin->print_error($MESSAGE['PAGES_NOT_FOUND']); +} else { + $page_id = intval($_GET['page_id']); +} + +//if ( !function_exists( 'create_access_file' ) ) { require(WB_PATH.'/framework/functions.php'); } +if ( !function_exists( 'entities_to_7bit' ) ) { require(WB_PATH.'/framework/functions-utf8.php'); } +/* +if( (!($page_id = $admin->checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) ) +{ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); + exit(); +} +*/ +$field_set = $database->field_add(TABLE_PREFIX.'pages', 'page_code', 'INT(11) NOT NULL AFTER `modified_by`'); +$sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` WHERE `page_id` = '.$page_id; +$results = $database->query($sql); +$results_array = $results->fetchRow(MYSQLI_ASSOC); +$old_admin_groups = explode(',', $results_array['admin_groups']); +$old_admin_users = explode(',', $results_array['admin_users']); +// Work-out if we should check for existing page_code +$field_set = $database->field_exists(TABLE_PREFIX.'pages', 'page_code'); + +$in_old_group = FALSE; +foreach($admin->get_groups_id() as $cur_gid) +{ + if (in_array($cur_gid, $old_admin_groups)) + { + $in_old_group = TRUE; + } +} +if((!$in_old_group) && !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) +{ + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); +} +// Get page details +/* $database = new database(); */ +$sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` WHERE `page_id`='.$page_id; +$results = $database->query($sql); +if($database->is_error()) { + $admin->print_header(); + $admin->print_error($database->get_error()); +} +if($results->numRows() == 0) { + $admin->print_header(); + $admin->print_error($MESSAGE['PAGES_NOT_FOUND']); +} +$results_array = $results->fetchRow(MYSQLI_ASSOC); +$aCurrentPage['seo_title'] = basename($results_array['link']); +// Get display name of person who last modified the page +$user=$admin->get_user_details($results_array['modified_by']); +// Convert the unix ts for modified_when to human a readable form +if($results_array['modified_when'] != 0) +{ + $modified_ts = gmdate(TIME_FORMAT.', '.DATE_FORMAT, $results_array['modified_when']+TIMEZONE); +} else { + $modified_ts = 'Unknown'; +} +// Setup template object, parse vars to it, then parse it +// Create new template object +$template = new Template(dirname($admin->correct_theme_source('pages_settings.htt'))); +// $template->debug = true; +$template->set_file('page', 'pages_settings.htt'); +$template->set_block('page', 'main_block', 'main'); +$template->set_var('FTAN', $admin->getFTAN()); +$template->set_var(array( + 'PAGE_ID' => $results_array['page_id'], + // 'PAGE_IDKEY' => $admin->getIDKEY($aCurrentPage['page_id']), + 'PAGE_IDKEY' => $results_array['page_id'], + 'PAGE_TITLE' => ($results_array['page_title']), + 'MENU_TITLE' => ($results_array['menu_title']), + 'SEO_TITLE' => ($aCurrentPage['seo_title']=='') ? $results_array['menu_title'] : $aCurrentPage['seo_title'], + 'DESCRIPTION' => ($results_array['description']), + 'KEYWORDS' => ($results_array['keywords']), + 'MODIFIED_BY' => $user['display_name'], + 'MODIFIED_BY_USERNAME' => $user['username'], + 'MODIFIED_WHEN' => $modified_ts, + 'ADMIN_URL' => ADMIN_URL, + 'WB_URL' => WB_URL, + 'THEME_URL' => THEME_URL + ) + ); +$template->set_block('main_block', 'show_section_block', 'show_section'); +// Work-out if we should show the "manage sections" link +$sql = 'SELECT COUNT(*) FROM `'.TABLE_PREFIX.'sections` WHERE `page_id`='.$page_id.' AND `module`="menu_link"'; +$sections_available = (intval($database->get_one($sql)) != 0); +if ($sections_available) +{ + $template->set_var('DISPLAY_MANAGE_SECTIONS', 'display:none;'); + $template->parse('show_section', ''); +} elseif(MANAGE_SECTIONS == 'enabled') +{ + $template->set_var('TEXT_MANAGE_SECTIONS', $HEADING['MANAGE_SECTIONS']); + $template->parse('show_section', 'show_section_block', true); +} else { + $template->set_var('DISPLAY_MANAGE_SECTIONS', 'display:none;'); + $template->parse('show_section', ''); +} +// Visibility +if($results_array['visibility'] == 'public') { + $template->set_var('PUBLIC_SELECTED', ' selected="selected"'); +} elseif($results_array['visibility'] == 'private') { + $template->set_var('PRIVATE_SELECTED', ' selected="selected"'); +} elseif($results_array['visibility'] == 'registered') { + $template->set_var('REGISTERED_SELECTED', ' selected="selected"'); +} elseif($results_array['visibility'] == 'hidden') { + $template->set_var('HIDDEN_SELECTED', ' selected="selected"'); +} elseif($results_array['visibility'] == 'none') { + $template->set_var('NO_VIS_SELECTED', ' selected="selected"'); +} + $sql = 'SELECT * FROM `'.TABLE_PREFIX.'groups`'; + $get_groups = $database->query($sql); + $template->set_block('main_block', 'group_list_block', 'group_list'); + // Insert admin group and current group first + $admin_group_name = $get_groups->fetchRow(MYSQLI_ASSOC); + $template->set_var(array( + 'ID' => 1, + 'TOGGLE' => '', + 'DISABLED' => ' disabled="disabled"', + 'LINK_COLOR' => '000000', + 'CURSOR' => 'default', + 'NAME' => $admin_group_name['name'], + 'CHECKED' => ' checked="checked"' + ) + ); + $template->parse('group_list', 'group_list_block', true); + while($group = $get_groups->fetchRow(MYSQLI_ASSOC)) { + // check if the user is a member of this group + $flag_disabled = ''; + $flag_checked = ''; + $flag_cursor = 'pointer'; + $flag_color = ''; + if (in_array($group["group_id"], $admin->get_groups_id())) { + $flag_disabled = ''; //' disabled'; + $flag_checked = ''; //' checked'; + $flag_cursor = 'default'; + $flag_color = '000000'; + } +// Group list 1 (admin_groups) +// $admin_groups = explode(',', str_replace('_', '', $results_array['admin_groups'])); + // Check if the group is allowed to edit pages +// $system_permissions = explode(',', $group['system_permissions']); +// if(is_numeric(array_search('pages_modify', $system_permissions))) { + if ($admin->get_permission('pages_modify')) { + $template->set_var(array( + 'ID' => $group['group_id'], + 'TOGGLE' => $group['group_id'], + 'DISABLED' => $flag_disabled, + 'LINK_COLOR' => $flag_color, + 'CURSOR' => $flag_cursor, + 'NAME' => $group['name'], + 'CHECKED' => $flag_checked + ) + ); +// if(is_numeric(array_search($group['group_id'], $admin_groups))) { + if ($admin->is_group_match($group['group_id'], $results_array['admin_groups'])) { + $template->set_var('CHECKED', ' checked="checked"'); + } else { + if (!$flag_checked) $template->set_var('CHECKED', ''); + } + $template->parse('group_list', 'group_list_block', true); + } + } +// Group list 2 (viewing_groups) + $sql = 'SELECT * FROM `'.TABLE_PREFIX.'groups`'; + $get_groups = $database->query($sql); + $template->set_block('main_block', 'group_list_block2', 'group_list2'); + // Insert admin group and current group first + $admin_group_name = $get_groups->fetchRow(MYSQLI_ASSOC); + $template->set_var(array( + 'ID' => 1, + 'TOGGLE' => '', + 'DISABLED' => ' disabled="disabled"', + 'LINK_COLOR' => '000000', + 'CURSOR' => 'default', + 'NAME' => $admin_group_name['name'], + 'CHECKED' => ' checked="checked"' + ) + ); + $template->parse('group_list2', 'group_list_block2', true); + while($group = $get_groups->fetchRow(MYSQLI_ASSOC)) + { + // check if the user is a member of this group + $flag_disabled = ''; + $flag_checked = ''; + $flag_cursor = 'pointer'; + $flag_color = ''; + if (in_array($group["group_id"], $admin->get_groups_id())) + { + $flag_disabled = ''; //' disabled'; + $flag_checked = ''; //' checked'; + $flag_cursor = 'default'; + $flag_color = '000000'; + } + $template->set_var(array( + 'ID' => $group['group_id'], + 'TOGGLE' => $group['group_id'], + 'DISABLED' => $flag_disabled, + 'LINK_COLOR' => $flag_color, + 'CURSOR' => $flag_cursor, + 'NAME' => $group['name'], + 'CHECKED' => $flag_checked + ) + ); +// $viewing_groups = explode(',', str_replace('_', '', $results_array['viewing_groups'])); +// if(is_numeric(array_search($group['group_id'], $viewing_groups))) + if ($admin->is_group_match($group['group_id'], $results_array['viewing_groups'])) + { + $template->set_var('CHECKED', 'checked="checked"'); + } else { + if (!$flag_checked) {$template->set_var('CHECKED', '');} + } + $template->parse('group_list2', 'group_list_block2', true); + } +// Show private viewers +if($results_array['visibility'] == 'private' OR $results_array['visibility'] == 'registered') +{ + $template->set_var('DISPLAY_VIEWERS', ''); +} else { + $template->set_var('DISPLAY_VIEWERS', 'display:none;'); +} +//-- insert page_code 20090904--> +$template->set_var('DISPLAY_CODE_PAGE_LIST', ' id="multi_lingual" style="display:none;"'); +// Work-out if page languages feature is enabled +if ( + (defined('PAGE_LANGUAGES') && PAGE_LANGUAGES) && + $field_set && + file_exists(WB_PATH.'/modules/mod_multilingual/update_keys.php') + ) { + // workout field is set but module missing + $TEXT['PAGE_CODE'] = empty($TEXT['PAGE_CODE']) ? 'Pagecode' : $TEXT['PAGE_CODE']; + $template->set_var( array( + 'DISPLAY_CODE_PAGE_LIST' => ' id="multi_lingual"', + 'TEXT_PAGE_CODE' => ''.$TEXT['PAGE_CODE'].'' + ) + ); + // Page_code list + /* $database = new database(); */ + function page_code_list($parent) + { + global $admin, $database, $template, $results_array, $pageCode; + $default_language = DEFAULT_LANGUAGE; + $sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` WHERE `parent` = '.$parent.' AND `language` = "'.$default_language.'" ORDER BY `position` ASC'; + $get_pages = $database->query($sql); + while($page = $get_pages->fetchRow(MYSQLI_ASSOC)) + { + if(($admin->page_is_visible($page)==false) && ($page['visibility'] <> 'none') ) { continue; } + $template->set_var('FLAG_CODE_ICON',' none '); + if( $page['parent'] == 0 ) + { + $template->set_var('FLAG_CODE_ICON','url('.THEME_URL.'/images/flags/'.strtolower($page['language']).'.png)'); + } + // If the current page cannot be parent, then its children neither + $list_next_level = true; + // Stop users from adding pages with a level of more than the set page level limit + if($page['level']+1 < PAGE_LEVEL_LIMIT) + { + // Get user perms + $admin_groups = explode(',', str_replace('_', '', $page['admin_groups'])); + $admin_users = explode(',', str_replace('_', '', $page['admin_users'])); + $in_group = FALSE; + foreach($admin->get_groups_id() as $cur_gid) + { + if (in_array($cur_gid, $admin_groups)) + { + $in_group = TRUE; + } + } + if(($in_group) OR is_numeric(array_search($admin->get_user_id(), $admin_users))) + { + $can_modify = true; + } else { + $can_modify = false; + } + $title_prefix = ''; + for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - - '; } + // $space = str_repeat(' ', 3); $space.'<'..'>' + $template->set_var(array( + 'VALUE' => $page['page_code'], + 'PAGE_VALUE' => $title_prefix.$page['menu_title'], + 'PAGE_CODE' => $title_prefix.$page['page_id'] + ) + ); + if($results_array['page_code'] == $page['page_code']) + { + $template->set_var('SELECTED', ' selected="selected"'); + } elseif($can_modify != true) + { + $template->set_var('SELECTED', ' disabled="disabled" class="disabled"'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('page_code_list', 'page_code_list_block', true); + } + if ($list_next_level) + page_code_list($page['page_id']); + } + } // end page_code_list + // Insert code_page values from page to modify + $template->set_block('main_block', 'page_code_list_block', 'page_code_list'); + + if($admin->get_permission('pages_add_l0') == true OR $results_array['level'] == 0) + { + if($results_array['parent'] == 0) { $selected = ' selected'; } else { $selected = ''; } + $aPageCodeList = array( + 'VALUE' => '', + 'PAGE_CODE' => $TEXT['NONE'], + 'PAGE_VALUE' => '', + 'SELECTED' => $selected + ); + $template->set_var($aPageCodeList); + $template->parse('page_code_list', 'page_code_list_block', true); + } + // get pagecode form this page_id + page_code_list(0); +} +//-- page code --> +// Parent page list +/* $database = new database(); */ +function parent_list($parent) +{ + global $admin, $database, $template, $results_array,$field_set; + $sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` WHERE `parent` = '.$parent.' ORDER BY `position` ASC'; + $get_pages = $database->query($sql); + while($page = $get_pages->fetchRow(MYSQLI_ASSOC)) + { + if($admin->page_is_visible($page)==false) + { + continue; + } + // if parent = 0 set flag_icon + $template->set_var('FLAG_ROOT_ICON',' none '); + if( $page['parent'] == 0 && $field_set) + { + $template->set_var('FLAG_ROOT_ICON','url('.THEME_URL.'/images/flags/'.strtolower($page['language']).'.png)'); + } + // If the current page cannot be parent, then its children neither + $list_next_level = true; + // Stop users from adding pages with a level of more than the set page level limit + if( $page['level']+1 < PAGE_LEVEL_LIMIT +1 ) + { + // Get user perms + $admin_groups = explode(',', str_replace('_', '', $page['admin_groups'])); + $admin_users = explode(',', str_replace('_', '', $page['admin_users'])); + $in_group = FALSE; + foreach($admin->get_groups_id() as $cur_gid) + { + if (in_array($cur_gid, $admin_groups)) + { + $in_group = TRUE; + } + } + if(($in_group) OR is_numeric(array_search($admin->get_user_id(), $admin_users))) + { + $can_modify = true; + } else { + $can_modify = false; + } + // Title -'s prefix + $title_prefix = ''; + for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - - '; } + $template->set_var(array( + 'ID' => $page['page_id'], + 'TITLE' => ($title_prefix.$page['menu_title']), + 'PAGE-TITLE' => ($title_prefix.$page['page_title']), + 'MENU-TITLE' => ($title_prefix.$page['menu_title']), + 'FLAG_ICON' => ' none ', + )); + if($results_array['parent'] == $page['page_id']) + { + $template->set_var('SELECTED', ' selected="selected"'); + } elseif($results_array['page_id'] == $page['page_id']) + { + $template->set_var('SELECTED', ' disabled="disabled" class="disabled"'); + $list_next_level=false; + } elseif($can_modify != true) + { + $template->set_var('SELECTED', ' disabled="disabled" class="disabled"'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('page_list2', 'page_list_block2', true); + } + if ($list_next_level) + { + parent_list($page['page_id']); + } + } +} +$template->set_block('main_block', 'page_list_block2', 'page_list2'); +if($admin->get_permission('pages_add_l0') == true OR $results_array['level'] == 0) { + if($results_array['parent'] == 0) + { + $selected = ' selected="selected"'; + } else { + $selected = ''; + } + $template->set_var(array( + 'ID' => '0', + 'TITLE' => $TEXT['NONE'], + 'SELECTED' => $selected + ) ); + $template->parse('page_list2', 'page_list_block2', true); +} +parent_list(0); +if($modified_ts == 'Unknown') +{ + $template->set_var('DISPLAY_MODIFIED', 'hide'); +} else { + $template->set_var('DISPLAY_MODIFIED', ''); +} +// Templates list +$template->set_block('main_block', 'template_list_block', 'template_list'); + +$sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` WHERE `type` = "template" AND `function` = "template" order by `name`'; +if( ($res_templates = $database->query($sql)) ) +{ + while($rec_template = $res_templates->fetchRow(MYSQLI_ASSOC)) + { + // Check if the user has perms to use this template + if($rec_template['directory'] == $results_array['template'] OR $admin->get_permission($rec_template['directory'], 'template') == true) + { + $template->set_var('VALUE', $rec_template['directory']); + $template->set_var('NAME', $rec_template['name']); + if($rec_template['directory'] == $results_array['template']) + { + $template->set_var('SELECTED', ' selected="selected"'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('template_list', 'template_list_block', true); + } + } +} +// Menu list +if(MULTIPLE_MENUS == false) +{ + $template->set_var('DISPLAY_MENU_LIST', 'display:none;'); +} +// Include template info file (if it exists) +if($results_array['template'] != '') +{ + $template_location = WB_PATH.'/templates/'.$results_array['template'].'/info.php'; +} else { + $template_location = WB_PATH.'/templates/'.DEFAULT_TEMPLATE.'/info.php'; +} +if(file_exists($template_location)) +{ + require($template_location); +} +// Check if $menu is set +if(!isset($menu[1]) OR $menu[1] == '') +{ + // Make our own menu list + $menu[1] = $TEXT['MAIN']; +} +// Add menu options to the list +$template->set_block('main_block', 'menu_list_block', 'menu_list'); +foreach($menu AS $number => $name) +{ + $template->set_var('NAME', $name); + $template->set_var('VALUE', $number); + if($results_array['menu'] == $number) + { + $template->set_var('SELECTED', ' selected="selected"'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('menu_list', 'menu_list_block', true); +} +// Insert language values +$template->set_block('main_block', 'language_list_block', 'language_list'); +$sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` WHERE `type` = "language" ORDER BY `name`'; +if( ($res_languages = $database->query($sql)) ) +{ + while($rec_language = $res_languages->fetchRow(MYSQLI_ASSOC)) + { + $l_codes[$rec_language['name']] = $rec_language['directory']; + $l_names[$rec_language['name']] = entities_to_7bit($rec_language['name']); // sorting-problem workaround + } + asort($l_names); + foreach($l_names as $l_name=>$v) + { + $langIcons = (empty($l_codes[$l_name])) ? 'none' : strtolower($l_codes[$l_name]); + // Insert code and name + $template->set_var(array( + 'VALUE' => $l_codes[$l_name], + 'NAME' => $l_name, + 'FLAG_LANG_ICONS' => 'url('.THEME_URL.'/images/flags/'.$langIcons.'.png)', + )); + // Check if it is selected + if($results_array['language'] == $l_codes[$l_name]) + { + $template->set_var('SELECTED', ' selected="selected"'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('language_list', 'language_list_block', true); + } +} +// Select disabled if searching is disabled +if($results_array['searching'] == 0) +{ + $template->set_var('SEARCHING_DISABLED', ' selected="selected"'); +} +// Select what the page target is +switch ($results_array['target']) +{ + case '_top': + $template->set_var('TOP_SELECTED', ' selected="selected"'); + break; + case '_self': + $template->set_var('SELF_SELECTED', ' selected="selected"'); + break; + case '_blank': + $template->set_var('BLANK_SELECTED', ' selected="selected"'); + break; +} +// Insert language text +$template->set_var(array( + 'DISPLAY_ADVANCED' => ' disabled="disabled"', + 'HEADING_MODIFY_PAGE_SETTINGS' => $HEADING['MODIFY_PAGE_SETTINGS'], + 'TEXT_CURRENT_PAGE' => $TEXT['CURRENT_PAGE'], + 'TEXT_MODIFY' => $TEXT['MODIFY'], + 'TEXT_MODIFY_PAGE' => $HEADING['MODIFY_PAGE'], + 'LAST_MODIFIED' => $MESSAGE['PAGES']['LAST_MODIFIED'], + 'TEXT_PAGE_TITLE' => $TEXT['PAGE_TITLE'], + 'TEXT_MENU_TITLE' => $TEXT['MENU_TITLE'], + 'TEXT_SEO_TITLE' => $TEXT['FILE'].'-'.$TEXT['LINK'], + 'TEXT_TYPE' => $TEXT['TYPE'], + 'TEXT_MENU' => $TEXT['MENU'], + 'TEXT_PARENT' => $TEXT['PARENT'], + 'TEXT_VISIBILITY' => $TEXT['VISIBILITY'], + 'TEXT_PUBLIC' => $TEXT['PUBLIC'], + 'TEXT_PRIVATE' => $TEXT['PRIVATE'], + 'TEXT_REGISTERED' => $TEXT['REGISTERED'], + 'TEXT_NONE' => $TEXT['NONE'], + 'TEXT_HIDDEN' => $TEXT['HIDDEN'], + 'TEXT_TEMPLATE' => $TEXT['TEMPLATE'], + 'TEXT_TARGET' => $TEXT['TARGET'], + 'TEXT_SYSTEM_DEFAULT' => $TEXT['SYSTEM_DEFAULT'], + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], + 'TEXT_NEW_WINDOW' => $TEXT['NEW_WINDOW'], + 'TEXT_SAME_WINDOW' => $TEXT['SAME_WINDOW'], + 'TEXT_TOP_FRAME' => $TEXT['TOP_FRAME'], + 'TEXT_ADMINISTRATORS' => $TEXT['ADMINISTRATORS'], + 'TEXT_ALLOWED_VIEWERS' => $TEXT['ALLOWED_VIEWERS'], + 'TEXT_DESCRIPTION' => $TEXT['DESCRIPTION'], + 'TEXT_KEYWORDS' => $TEXT['KEYWORDS'], + 'TEXT_SEARCHING' => $TEXT['SEARCHING'], + 'TEXT_LANGUAGE' => $TEXT['LANGUAGE'], + 'TEXT_ENABLED' => $TEXT['ENABLED'], + 'TEXT_DISABLED' => $TEXT['DISABLED'], + 'TEXT_SAVE' => $TEXT['SAVE'], + 'TEXT_BACK' => $TEXT['BACK'], + 'TEXT_RESET' => $TEXT['RESET'], + 'LAST_MODIFIED' => $MESSAGE['PAGES']['LAST_MODIFIED'], + 'HEADING_MODIFY_PAGE' => $HEADING['MODIFY_PAGE'], + 'TEXT_PAGE_REORG' => ' Reorgansition' + ) ); +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/pages/settings.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/pages/settings2.php =================================================================== --- trunk/admin/pages/settings2.php (nonexistent) +++ trunk/admin/pages/settings2.php (revision 2) @@ -0,0 +1,381 @@ +query($sql))) { + // Insert values into main page list + while($page = $get_pages->fetchRow(MYSQLI_ASSOC)) { + // Fix page trail + $sql = 'UPDATE `'.TABLE_PREFIX.'pages` ' + . 'SET `page_trail`=\''.get_page_trail($page['page_id']).'\' ' + . ($root_parent != 0 ? ',`root_parent`='.(int)$root_parent.' ' : '') + . 'WHERE `page_id`='.(int)$page['page_id']; + $database->query($sql); + // Run this query on subs + fix_page_trail($page['page_id'],$root_parent); + } + } +} +/* ****************************************************************** */ +// inherit settings to subpages +//
+/*
+ * inheritable settings:
+ * template
+ * language
+ * menu
+ * searching
+ * visibility
+ * - admin_groups
+ * - admin_users
+ * - viewing_groups
+ * - viewing_users
+ */
+
+function doInheritSettings($database, $page_id, array $aSettings)
+{
+ // deactivate doInheritSettings
+ if (sizeof($aSettings)==0){return false;}
+ $sqlSet = '';
+ foreach ($aSettings as $sFieldname=>$sValue) {
+ $sqlSet .= '`'.$sFieldname.'`=\''.$database->escapeString($sValue).'\', ';
+ }
+ $sqlSet = rtrim($sqlSet, ' ,');
+ if ($sqlSet) {
+ $aListOfChildren = array();
+ $aMatches = array($page_id);
+ // search all children
+ do {
+ $sql = 'SELECT `page_id` FROM `'.TABLE_PREFIX.'pages` '
+ . 'WHERE `parent` IN('.implode(',', $aMatches).')';
+ if (($oChildren = $database->query($sql))) {
+ $aMatches = array();
+ while (($aChild = $oChildren->fetchRow(MYSQL_ASSOC))) {
+ $aMatches[] = $aChild['page_id'];
+ }
+ $aListOfChildren = array_merge($aListOfChildren, $aMatches);
+ }
+ } while (sizeof($aMatches) > 0);
+ $sqlSet = 'UPDATE `'.TABLE_PREFIX.'pages` SET '.$sqlSet.' '
+ . 'WHERE `page_id` IN('.implode(',', $aListOfChildren).')';
+ $database->query($sqlSet);
+ }
+}
+/* ****************************************************************** */
+
+// Create new admin object and print admin header
+if ( !defined( 'WB_PATH' ) ){ require( dirname(dirname((__DIR__))).'/config.php' ); }
+if ( !class_exists('admin', false) ) { require(WB_PATH.'/framework/class.admin.php'); }
+// suppress to print the header, so no new FTAN will be set
+$admin = new admin('Pages', 'pages_settings',false);
+// Get page id
+if(!isset($_POST['page_id']) || !is_numeric($_POST['page_id']))
+{
+ $admin->print_header();
+ $admin->print_error($MESSAGE['PAGES_NOT_FOUND']);
+} else {
+ $page_id = (int)$_POST['page_id'];
+}
+$target_url = ADMIN_URL.'/pages/settings.php?page_id='.$page_id;
+$pagetree_url = ADMIN_URL.'/pages/index.php';
+$bBackLink = isset($_POST['pagetree']);
+/*
+if( (!($page_id = $admin->checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) )
+{
+ $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
+}
+*/
+if (!$admin->checkFTAN())
+{
+ $admin->print_header();
+ $sInfo = strtoupper(basename(__DIR__).'_'.basename(__FILE__, ''.PAGE_EXTENSION)).'::';
+ $sDEBUG=(@DEBUG?$sInfo:'');
+ $admin->print_error($sDEBUG.$MESSAGE['GENERIC_SECURITY_ACCESS'], $target_url);
+}
+// After FTAN check print the header
+$admin->print_header();
+// Include the WB functions file
+if ( !function_exists( 'create_access_file' ) ) { require(WB_PATH.'/framework/functions.php'); }
+// Get values
+$page_title = $admin->StripCodeFromText($admin->get_post('page_title'));
+$menu_title = $admin->StripCodeFromText($admin->get_post('menu_title'));
+$seo_title = $admin->StripCodeFromText($admin->get_post('seo_title'));
+$page_code = intval($admin->get_post('page_code')) ;
+$description = $admin->StripCodeFromText($admin->get_post('description'));
+$keywords = $admin->StripCodeFromText($admin->get_post('keywords'));
+$parent = intval($admin->get_post('parent')); // fix secunia 2010-91-3
+$visibility = $admin->StripCodeFromText($admin->get_post('visibility'));
+if (!in_array($visibility, array('public', 'private', 'registered', 'hidden', 'none'))) {$visibility = 'public';} // fix secunia 2010-93-3
+$template = preg_replace('/[^a-z0-9_-]/i', "", $admin->get_post('template')); // fix secunia 2010-93-3
+$template = (($template == DEFAULT_TEMPLATE ) ? '' : $template);
+$target = preg_replace("/\W/", "", $admin->get_post('target'));
+$admin_groups = ($admin->get_post('admin_groups'));
+$viewing_groups = ($admin->get_post('viewing_groups'));
+$searching = intval($admin->get_post('searching'));
+$language = $admin->StripCodeFromText(strtoupper($admin->get_post('language')));
+$language = (preg_match('/^[A-Z]{2}$/', $language) ? $language : DEFAULT_LANGUAGE);
+$menu = intval($admin->get_post('menu')); // fix secunia 2010-91-3
+// Validate data
+if($menu_title == '' || substr($menu_title,0,1)=='.'){
+ $admin->print_error($MESSAGE['PAGES_BLANK_MENU_TITLE']);
+}
+if ( $page_title == '' || substr( $page_title, 0, 1) == '.') { $page_title = $menu_title; }
+if ( $seo_title == '' || substr( $seo_title, 0, 1) == '.') { $seo_title = $menu_title; }
+// fetch old datas
+$sql = 'SELECT `level`,`root_parent`, `parent`,`page_trail`,`link`,`position`,`admin_groups`,`admin_users` FROM `'.TABLE_PREFIX.'pages` '
+ . 'WHERE `page_id`='.$page_id;
+$oPages = $database->query($sql);
+$results_array = $oPages->fetchRow(MYSQLI_ASSOC);
+$old_parent = $results_array['parent'];
+$old_link = $results_array['link'];
+$old_position = $results_array['position'];
+$old_admin_groups = explode(',', str_replace('_', '', $results_array['admin_groups']));
+$old_admin_users = explode(',', str_replace('_', '', $results_array['admin_users']));
+// Work-out if we should check for existing page_code
+$field_set = $database->field_exists(TABLE_PREFIX.'pages', 'page_code');
+$in_old_group = FALSE;
+foreach($admin->get_groups_id() as $cur_gid){
+ if (in_array($cur_gid, $old_admin_groups)) { $in_old_group = TRUE; }
+}
+if ((!$in_old_group) && !is_numeric(array_search($admin->get_user_id(), $old_admin_users))){
+ $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS'], $target_url );
+}
+// Setup admin groups
+$admin_groups[] = 1;
+//if(!in_array(1, $admin->get_groups_id())) {
+// $admin_groups[] = implode(",",$admin->get_groups_id());
+//}
+$admin_groups = preg_replace("/[^\d,]/", "", implode(',', $admin_groups));
+// Setup viewing groups
+$viewing_groups[] = 1;
+//if(!in_array(1, $admin->get_groups_id())) {
+// $viewing_groups[] = implode(",",$admin->get_groups_id());
+//}
+$viewing_groups = preg_replace("/[^\d,]/", "", implode(',', $viewing_groups));
+// If needed, get new order
+if($parent != $old_parent){
+ // Include ordering class
+if ( !class_exists( 'order', false ) ) { require(WB_PATH.'/framework/class.order.php'); }
+ $order = new order(TABLE_PREFIX.'pages', 'position', 'page_id', 'parent');
+ // Get new order
+ $position = $order->get_new($parent);
+ // Clean new order
+ $order->clean($parent);
+} else {
+ $position = $old_position;
+}
+
+// Work out level and root parent
+$level = '0';
+$root_parent = '0';
+if ($parent!='0'){
+ $level = level_count($parent)+1;
+ $root_parent = root_parent($parent);
+}
+// Work-out what the link should be
+if($parent == '0'){
+ $link = '/'.page_filename( $seo_title);
+// $link = '/'.page_filename($menu_title);
+ // rename menu titles: index && intro to prevent clashes with intro page feature and WB core file /pages/index.php
+ if($link == '/index' || $link == '/intro')
+ {
+ $filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($seo_title).'_'.$page_id .PAGE_EXTENSION;
+ $link .= '_' .$page_id;
+ } else {
+ $filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($seo_title).PAGE_EXTENSION;
+ }
+} else {
+ $parent_section = '';
+ $parent_titles = array_reverse(get_parent_titles($parent));
+ foreach($parent_titles as $parent_title) {
+ $parent_section .= page_filename($parent_title).'/';
+ }
+ if( $parent_section == '/' ) { $parent_section = ''; }
+ $link = '/'.$parent_section.page_filename($seo_title);
+ $filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($seo_title).PAGE_EXTENSION;
+}
+
+// Check if a page with same page filename exists $oGetSamePage
+$sql = 'SELECT COUNT(*) FROM `'.TABLE_PREFIX.'pages` '
+ . 'WHERE `link` = "'.$database->escapeString($link).'" '
+ . 'AND `page_id` != '.(int)$page_id;
+if( $database->get_one($sql) > 0 ) {
+ $admin->print_error( $MESSAGE['PAGES_PAGE_EXISTS'] );
+}
+// Update page with new order
+$sql = 'UPDATE `'.TABLE_PREFIX.'pages` '
+ . 'SET `parent`='.(int)$parent.', `position`='.(int)$position.' '
+ . 'WHERE `page_id`='.(int)$page_id;
+// $database = new database();
+$database->query($sql);
+// Get page trail
+$page_trail = get_page_trail($page_id);
+$target_url = ADMIN_URL.'/pages/settings.php?page_id='.$page_id;
+// Update page settings in the pages table
+$sql = 'UPDATE `'.TABLE_PREFIX.'pages` SET '
+ . '`parent` = '.(int)$parent.', '
+ . '`page_title` = \''.$database->escapeString($page_title).'\', '
+ . '`menu_title` = \''.$database->escapeString($menu_title).'\', '
+ . '`menu` = '.(int)$menu.', '
+ . '`level` = '.(int)$level.', '
+ . '`page_trail` = \''.$database->escapeString($page_trail).'\', '
+ . '`root_parent` = '.(int)$root_parent.', '
+ . '`link` = \''.$database->escapeString($link).'\', '
+ . '`template` = \''.$database->escapeString($template).'\', '
+ . '`target` = \''.$database->escapeString($target).'\', '
+ . '`description` = \''.$database->escapeString($description).'\', '
+ . '`keywords` = \''.$database->escapeString($keywords).'\', '
+ . '`position` = '.(int)$position.', '
+ . '`visibility` = \''.$database->escapeString($visibility).'\', '
+ . '`searching` = '.(int)$searching.', '
+ . '`language` = \''.$database->escapeString($language).'\', '
+ . '`admin_groups` = \''.$database->escapeString($admin_groups).'\', '
+ . '`viewing_groups` = \''.$database->escapeString($viewing_groups).'\' '
+ . (defined('PAGE_LANGUAGES') && PAGE_LANGUAGES && $field_set ? ', `page_code` = '.(int)$page_code.' ' : ' ')
+ . 'WHERE `page_id` = '.(int)$page_id;
+if(!$database->query($sql)) {
+ if($database->is_error())
+ {
+ $admin->print_error($database->get_error(), $target_url );
+ }
+}
+/* *** inherit settings to subpages ********************************* */
+if (isset($_POST['inherit'])) {
+ // make sure, $aPost is am array
+ $aPost = (is_array($_POST['inherit'])
+ // use the array itself
+ ? $_POST['inherit']
+ // split the string into an array
+ : preg_split("/[\s,;\|]+/", $_POST['inherit'], -1, PREG_SPLIT_NO_EMPTY));
+ // define possible fields to inherit
+ $aInherit = array('template','menu','language','searching','visibility');
+ // define additional fields to 'visibility'
+ $aVisibilities = array('admin_groups','admin_users','viewing_groups','viewing_users');
+ // if 'all' is not selected
+ if (!in_array('all', $aPost)) {
+ // remove all not selected fields
+ $aInherit = array_intersect($aInherit, $aPost);
+ }
+ // if 'visibility' is selected
+ if (in_array('visibility', $aInherit)) {
+ // add the additional fields
+ $aInherit = array_merge($aInherit, $aVisibilities);
+ }
+ // flip array and set all values to ''
+ $aInherit = array_fill_keys($aInherit, '');
+ // iterate all existing fields
+ foreach ($aInherit as $key=>$value) {
+ // fill with real values (i.e. $aInherit['template'] = $template)
+ $aInherit[$key] = isset(${$key}) ? ${$key} : '';
+ }
+ // update database
+ doInheritSettings($database, $page_id, array());// $aInherit
+}
+/* ****************************************************************** */
+
+// Clean old order if needed
+if($parent != $old_parent)
+{
+ $order->clean($old_parent);
+}
+/* BEGIN page "access file" code */
+// Create a new file in the /pages dir if title changed
+if(!is_writable(WB_PATH.PAGES_DIRECTORY.'/'))
+{
+ $admin->print_error($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE']);
+} else {
+
+ $old_filename = WB_PATH.PAGES_DIRECTORY.$old_link.PAGE_EXTENSION;
+ // First check if we need to create a new file
+ if(($old_link != $link) || (!file_exists($old_filename)))
+ {
+ // Delete old file
+ $old_filename = WB_PATH.PAGES_DIRECTORY.$old_link.PAGE_EXTENSION;
+ if(file_exists($old_filename))
+ {
+ @unlink($old_filename);
+ }
+ // Create access file
+ create_access_file($filename,$page_id,$level);
+ // Move a directory for this page
+ if(file_exists(WB_PATH.PAGES_DIRECTORY.$old_link.'/') && is_dir(WB_PATH.PAGES_DIRECTORY.$old_link.'/'))
+ {
+ @rename(WB_PATH.PAGES_DIRECTORY.$old_link.'/', WB_PATH.PAGES_DIRECTORY.$link.'/');
+ }
+ // Update any pages that had the old link with the new one
+ $old_link_len = strlen($old_link);
+ $sql = 'SELECT `page_id`,`link`,`level` FROM `'.TABLE_PREFIX.'pages` '
+ . 'WHERE `link` LIKE \'%'.addcslashes($old_link, '%_').'/%\' '
+ . 'ORDER BY `level` ASC';
+ if (($query_subs = $database->query($sql))) {
+ while($sub = $query_subs->fetchRow(MYSQLI_ASSOC))
+ {
+ // Double-check to see if it contains old link
+ if(substr($sub['link'], 0, $old_link_len) == $old_link)
+ {
+ // Get new link
+ $replace_this = $old_link;
+ $old_sub_link_len =strlen($sub['link']);
+ $new_sub_link = $link.'/'.substr($sub['link'],$old_link_len+1,$old_sub_link_len);
+ // Work out level
+ $new_sub_level = level_count($sub['page_id']);
+ // Update level and link
+ $sql = 'UPDATE `'.TABLE_PREFIX.'pages` SET '
+ . '`link` = \''.$database->escapeString($new_sub_link).'\', '
+ . '`level` = '.(int)$new_sub_level.' '
+ . 'WHERE `page_id` = '.(int)$sub['page_id'];
+ $database->query( $sql );
+ // Re-write the access file for this page
+ $old_subpage_file = WB_PATH.PAGES_DIRECTORY.$new_sub_link.PAGE_EXTENSION;
+ if(file_exists($old_subpage_file))
+ {
+ @unlink($old_subpage_file);
+ }
+ create_access_file(WB_PATH.PAGES_DIRECTORY.$new_sub_link.PAGE_EXTENSION, $sub['page_id'], $new_sub_level);
+ }
+ }
+ }
+ }
+}
+
+// Fix sub-pages page trail
+fix_page_trail($page_id,$root_parent);
+
+/* END page "access file" code */
+
+// Check if there is a db error, otherwise say successful
+if($database->is_error())
+{
+ $admin->print_error($database->get_error(), $target_url );
+} elseif ( $bBackLink ) {
+ $admin->print_success($MESSAGE['PAGES_SAVED_SETTINGS'], $pagetree_url );
+} else {
+ $admin->print_success($MESSAGE['PAGES_SAVED_SETTINGS'], $target_url );
+}
+
+// Print admin footer
+$admin->print_footer();
Property changes on: trunk/admin/pages/settings2.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Index: trunk/admin/pages/settings_helper.php
===================================================================
--- trunk/admin/pages/settings_helper.php (nonexistent)
+++ trunk/admin/pages/settings_helper.php (revision 2)
@@ -0,0 +1,145 @@
+
+ * @author Manuela v.d.Decken
+ * @license GNU General Public License 3.0
+ * @version 0.0.0
+ * @revision $Revision$
+ * @lastmodified $Date$
+ * @since File available since 18.05.2016
+ * @deprecated no / since 0000/00/00
+ * @description xxx
+ */
+
+class SettingsHelper
+{
+
+/**
+ * get a list of possible allowed parent pages
+ * @param integer $iParent
+ * @param integer $iCurrentPage
+ * @param object $admin
+ * @param object $database
+ * @return array
+ */
+ static public function getParentPagesList($iParent, $iCurrentPage, $admin, $database)
+ {
+ $aRetval = array();
+ $aNeededFields = array('id', 'title', 'language', 'active');
+ $sql = 'SELECT *, `page_id` `id`, `menu_title` `title` '
+ . 'FROM `'.TABLE_PREFIX.'pages` '
+ . 'WHERE `parent`='.$iParent.' AND '
+ . '`level`<'.(PAGE_LEVEL_LIMIT - 1).', AND '
+ . '(SELECT FIND_IN_SET('.$iCurrentPage.', `page_trail`))<(`level`+1) '
+ . 'ORDER BY `position` ASC';
+ if (($oPages = $database->query($sql))) {
+ while (($aPage = $oPages->fetchRow(MYSQLI_ASSOC))) {
+ // skip this page and its children if page is not visible for current user
+ if (!$admin->page_is_visible($aPage)) { continue; }
+ // check if current user has admin or owner permissions for this page
+ $aPage['active'] = (bool)(
+ $admin->ami_group_member($aPage['admin_groups'])
+ || $admin->is_group_match($admin->get_user_id(), $aPage['admin_users'])
+ || $aPage['page_owner'] == $admin->get_user_id()
+ );
+ // Title -'s prefix
+ $aPage['title'] = str_repeat('- ', $aPage['level']).$aPage['title'];
+ // if parent = 0 set flag_icon
+ $aPage['language'] = $aPage['parent'] ? '' : $aPage['language'];
+ // remove unneeded fields from record and add record to retval
+ $aRetval[] = array_intersect_key($aPage, $aNeededFields);
+ // check for children
+ $aRetval = array_merge(
+ $aRetval,
+ self::getParentPagesList($aPage['id'], $iCurrentPage, $admin, $database)
+ );
+ }
+ }
+ return $aRetval;
+ } // end of method getParentPagesList()
+/**
+ * get a list of possible language reference pages
+ * @param integer $iParent
+ * @param string $sCurrentPageLanguage
+ * @param object $admin
+ * @param object $database
+ * @return array
+ */
+ static public function getPageCodeList($iParent, $sCurrentPageLanguage, $admin, $database)
+ {
+ $aRetval = array();
+ // there is no intlRef to choose if current page is set to DEFAULT_LANGUAGE
+ if (DEFAULT_LANGUAGE != $sCurrentPageLanguage) {
+ $aNeededFields = array('id', 'title', 'language', 'active', 'intlRef');
+ $sql = 'SELECT *, `page_id` `id`, `menu_title` `title`, `page_code` `intlRef` '
+ . 'FROM `'.TABLE_PREFIX.'pages` '
+ . 'WHERE `parent`='.$iParent.' AND '
+ . '`level`<'.(PAGE_LEVEL_LIMIT - 1).', AND '
+ . '`language`=\''.DEFAULT_LANGUAGE.'\' '
+ . 'ORDER BY `position` ASC';
+ if (($oPages = $database->query($sql))) {
+ while (($aPage = $oPages->fetchRow(MYSQLI_ASSOC))) {
+ // skip this page and its children if page is not visible for current user
+ if (!$admin->page_is_visible($aPage)) { continue; }
+ // check if current user has admin or owner permissions for this page
+ $aPage['active'] = (bool)(
+ $admin->ami_group_member($aPage['admin_groups'])
+ || $admin->is_group_match($admin->get_user_id(), $aPage['admin_users'])
+ || $aPage['page_owner'] == $admin->get_user_id()
+ );
+ // Title -'s prefix
+ $aPage['title'] = str_repeat('- ', $aPage['level']).$aPage['title'];
+ // if parent = 0 set flag_icon
+ $aPage['language'] = $aPage['parent'] ? '' : $aPage['language'];
+ // remove unneeded fields from record and add record to retval
+ $aRetval[] = array_intersect_key($aPage, $aNeededFields);
+ // check for children
+ $aRetval = array_merge(
+ $aRetval,
+ self::getPageCodeList($aPage['id'], $sCurrentPageLanguage, $admin, $database)
+ );
+ }
+ }
+ }
+ return $aRetval;
+ } // end of method getPageCodeList()
+/**
+ *
+ * @param array $aList
+ * @param string $sSortBy1
+ * @param string $sSortBy2
+ * @return array the sorted array
+ */
+
+ static function orderByColumn($aList)
+ {
+ $args = func_get_args();
+ array_shift($args);
+
+ }
+
+
+ static function doMultiSort($aList, $sSortBy1, $sSortBy2)
+ {
+ foreach ($aList as $key => $row) {
+ ${$sSortBy1}[$key] = $row[$sSortBy1];
+ ${$sSortBy2}[$key] = $row[$sSortBy2];
+ }
+ $iSortFlags = ((version_compare(PHP_VERSION, '5.4.0', '<'))?SORT_REGULAR:SORT_NATURAL|SORT_FLAG_CASE);
+ array_multisort(${$sSortBy1}, SORT_DESC, ${$sSortBy2}, SORT_ASC, $iSortFlags, $aList);
+ return $aList;
+ } // end of method doMultiSort()
+
+} // end of class SettingsHelper
Property changes on: trunk/admin/pages/settings_helper.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Index: trunk/admin/pages/trash.php
===================================================================
--- trunk/admin/pages/trash.php (nonexistent)
+++ trunk/admin/pages/trash.php (revision 2)
@@ -0,0 +1,282 @@
+
+
+
+
+
+
+
< +print_footer(); + +?> \ No newline at end of file Property changes on: trunk/admin/pages/trash.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/preferences/index.php =================================================================== --- trunk/admin/preferences/index.php (nonexistent) +++ trunk/admin/preferences/index.php (revision 2) @@ -0,0 +1,157 @@ +correct_theme_source('preferences.htt'))); + $template->set_file( 'page', 'preferences.htt' ); + $template->set_block( 'page', 'main_block', 'main' ); +// read user-info from table users and assign it to template + $sql = 'SELECT `display_name`, `username`, `email` FROM `'.TABLE_PREFIX.'users` '; + $sql .= 'WHERE `user_id` = '.(int)$admin->get_user_id(); + if( $res_user = $database->query($sql) ) + { + if( $rec_user = $res_user->fetchRow() ) + { + $template->set_var('DISPLAY_NAME', $rec_user['display_name']); + $template->set_var('USERNAME', $rec_user['username']); + $template->set_var('EMAIL', $rec_user['email']); + $template->set_var('ADMIN_URL', ADMIN_URL); + } + } +// read available languages from table addons and assign it to the template + $sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` '; + $sql .= 'WHERE `type` = \'language\' ORDER BY `directory`'; + if( $res_lang = $database->query($sql) ) + { + $template->set_block('main_block', 'language_list_block', 'language_list'); + while( $rec_lang = $res_lang->fetchRow() ) + { + $langIcons = (empty($rec_lang['directory'])) ? 'none' : strtolower($rec_lang['directory']); + $template->set_var('CODE', $rec_lang['directory']); + $template->set_var('NAME', $rec_lang['name']); + $template->set_var('FLAG', THEME_URL.'/images/flags/'.$langIcons); + $template->set_var('SELECTED', (LANGUAGE == $rec_lang['directory'] ? ' selected="selected"' : '') ); + $template->parse('language_list', 'language_list_block', true); + } + } +// Insert default timezone values + $user_time = true; + include_once( ADMIN_PATH.'/interface/timezones.php' ); + $template->set_block('main_block', 'timezone_list_block', 'timezone_list'); + $iActualTimezone = ((DEFAULT_TIMEZONE <> 0) ? DEFAULT_TIMEZONE : 0); + $iActualTimezone = (($iActualTimezone == $admin->get_timezone())? 'system_default':$admin->get_timezone()); + $iActualTimezone = (($iActualTimezone!='system_default')?intval($iActualTimezone):$iActualTimezone); + foreach( $TIMEZONES AS $hour_offset => $title ) + { + $iTmpOffset = (is_numeric($hour_offset)?$hour_offset*3600:$hour_offset); + $template->set_var('VALUE', $hour_offset); + $template->set_var('NAME', $title); + $template->set_var('SELECTED', (($iTmpOffset === $iActualTimezone) ? ' selected="selected"' : '')); + $template->parse('timezone_list', 'timezone_list_block', true); + } +// Insert date format list + include_once( ADMIN_PATH.'/interface/date_formats.php' ); + $template->set_block('main_block', 'date_format_list_block', 'date_format_list'); + foreach( $DATE_FORMATS AS $format => $title ) + { + $format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key) + $template->set_var( 'VALUE', ($format != 'system_default' ? $format : 'system_default') ); + $template->set_var( 'NAME', $title ); + if( (DATE_FORMAT == $format && !isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) || + ('system_default' == $format && isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) ) + { + $template->set_var('SELECTED', ' selected="selected"'); + }else { + $template->set_var('SELECTED', ''); + } + $template->parse('date_format_list', 'date_format_list_block', true); + } +// Insert time format list + include_once( ADMIN_PATH.'/interface/time_formats.php' ); + $template->set_block('main_block', 'time_format_list_block', 'time_format_list'); + foreach( $TIME_FORMATS AS $format => $title ) + { + $format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key) + $template->set_var('VALUE', $format != 'system_default' ? $format : 'system_default' ); + $template->set_var('NAME', $title); + if( (TIME_FORMAT == $format && !isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) || + ('system_default' == $format && isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) ) + { + $template->set_var('SELECTED', ' selected="selected"'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('time_format_list', 'time_format_list_block', true); + } + +// assign systemvars to template + $template->set_var(array( 'ADMIN_URL' => ADMIN_URL, + 'WB_URL' => WB_URL, + 'THEME_URL' => THEME_URL, + 'ACTION_URL' => ADMIN_URL.'/preferences/save.php' + ) + ); + $template->set_var('FTAN', $admin->getFTAN()); + $template->set_var('FORM_NAME', 'preferences_save'); +// assign language vars + $template->set_var(array( 'HEADING_MY_SETTINGS' => $HEADING['MY_SETTINGS'], + 'HEADING_MY_EMAIL' => $HEADING['MY_EMAIL'], + 'HEADING_MY_PASSWORD' => $HEADING['MY_PASSWORD'], + 'TEXT_SAVE' => $TEXT['SAVE'], + 'TEXT_RESET' => $TEXT['RESET'], + 'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'], + 'TEXT_USERNAME' => $TEXT['USERNAME'], + 'TEXT_EMAIL' => $TEXT['EMAIL'], + 'TEXT_LANGUAGE' => $TEXT['LANGUAGE'], + 'TEXT_TIMEZONE' => $TEXT['TIMEZONE'], + 'TEXT_DATE_FORMAT' => $TEXT['DATE_FORMAT'], + 'TEXT_TIME_FORMAT' => $TEXT['TIME_FORMAT'], + 'TEXT_CURRENT_PASSWORD' => $TEXT['CURRENT_PASSWORD'], + 'TEXT_NEW_PASSWORD' => $TEXT['NEW_PASSWORD'], + 'TEXT_RETYPE_NEW_PASSWORD' => $TEXT['RETYPE_NEW_PASSWORD'], + 'TEXT_NEW_PASSWORD' => $TEXT['NEW_PASSWORD'], + 'TEXT_RETYPE_NEW_PASSWORD' => $TEXT['RETYPE_NEW_PASSWORD'], + 'TEXT_NEED_CURRENT_PASSWORD' => $TEXT['NEED_CURRENT_PASSWORD'], + 'EMPTY_STRING' => '' + ) + ); +// Parse template for preferences form + $template->parse('main', 'main_block', false); + $output = $template->finish($template->parse('output', 'page')); + return $output; +} +// test if valid $admin-object already exists (bit complicated about PHP4 Compatibility) +if( !(isset($admin) && is_object($admin) && (get_class($admin) == 'admin')) ) +{ + require( '../../config.php' ); + require_once( WB_PATH.'/framework/class.admin.php' ); + $admin = new admin('Preferences'); +} +echo build_page($admin, $database); +$admin->print_footer(); Property changes on: trunk/admin/preferences/index.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/preferences/save.php =================================================================== --- trunk/admin/preferences/save.php (nonexistent) +++ trunk/admin/preferences/save.php (revision 2) @@ -0,0 +1,193 @@ +checkFTAN()){ $err_msg[] = $MESSAGE['GENERIC_SECURITY_ACCESS']; } + $sLanguagesAddonDefaultFile = WB_PATH.'/account/languages/EN.php'; + if (is_readable($sLanguagesAddonDefaultFile)){include $sLanguagesAddonDefaultFile;} + $sLanguagesAddonFile = WB_PATH.'/account/languages/'.LANGUAGE.'.php'; + if (is_readable($sLanguagesAddonFile)){include $sLanguagesAddonFile;} +// Get entered values and validate all + // remove any dangerouse chars from display_name +// $display_name = $admin->add_slashes(strip_tags(trim($admin->get_post('display_name')))); + $display_name = strip_tags( $admin->StripCodeFromText($admin->get_post('display_name'))); + $display_name = ( $display_name == '' ? $admin->get_display_name() : $display_name ); + // check that display_name is unique in whoole system (prevents from User-faking) + $sql = 'SELECT COUNT(*) FROM `'.TABLE_PREFIX.'users` '; + $sql .= 'WHERE `user_id` <> '.(int)$admin->get_user_id().' AND `display_name` LIKE "'.$display_name.'"'; + if( $database->get_one($sql) > 0 ){ $err_msg[] = ( @$MESSAGE['USERS_DISPLAYNAME_TAKEN']?:$MESSAGE['MEDIA_BLANK_NAME'].' ('.$TEXT['DISPLAY_NAME'].')'); } +// language must be 2 upercase letters only + $language = strtoupper($admin->get_post('language')); + $language = (preg_match('/^[A-Z]{2}$/', $language) ? $language : DEFAULT_LANGUAGE); + $user_time = true; +// timezone must be between -12 and +13 or -20 as system_default + $timezone = $admin->get_post('timezone'); + $timezone = (is_numeric($timezone) ? $timezone : DEFAULT_TIMEZONE/3600); + $timezone = (($timezone >= -12 && $timezone <= 13) ? $timezone : DEFAULT_TIMEZONE/3600) * 3600; + +// date_format must be a key from /interface/date_formats + $date_format = $admin->get_post('date_format'); + $date_format_key = str_replace(' ', '|', $date_format); + include( ADMIN_PATH.'/interface/date_formats.php' ); + $date_format = (array_key_exists($date_format_key, $DATE_FORMATS) ? $date_format : 'system_default'); + $date_format = ($date_format == 'system_default' ? '' : $date_format); + unset($DATE_FORMATS); +// time_format must be a key from /interface/time_formats + $time_format = $admin->get_post('time_format'); + $time_format_key = str_replace(' ', '|', $time_format); + $user_time = true; + include( ADMIN_PATH.'/interface/time_formats.php' ); + $time_format = (array_key_exists($time_format_key, $TIME_FORMATS) ? $time_format : 'system_default'); + $time_format = ($time_format == 'system_default' ? '' : $time_format); + unset($TIME_FORMATS); + +// email should be validatet by core + $email = trim( $admin->get_post('email') == null ? '' : $admin->get_post('email') ); + if( (!$admin->validate_email($email)) ) + { + $email = ''; + $err_msg[] = $MESSAGE['USERS_INVALID_EMAIL']; + }else { + if($email != '') { + $sql = 'SELECT `email` FROM `'.TABLE_PREFIX.'users` ' + . 'WHERE `user_id` = '.(int)$admin->get_user_id().' AND `email` LIKE \''.$email.'\''; + $IsOldMail = $database->get_one($sql); + // check that email is unique in whoole system + $email = $admin->add_slashes($email); + $sql = 'SELECT `email` FROM `'.TABLE_PREFIX.'users` ' + . 'WHERE `user_id` <> '.(int)$admin->get_user_id().' AND `email` LIKE \''.$email.'\''; + $checkMail = $database->get_one($sql); + + if( $checkMail == $email ){ $err_msg[] = $MESSAGE['USERS_EMAIL_TAKEN']; } + $bMailHasChanged = ($email != $IsOldMail); + } + } +// receive password vars and calculate needed action + $sCurrentPassword = $admin->get_post('current_password'); + $sCurrentPassword = (is_null($sCurrentPassword) ? '' : $sCurrentPassword); + $sNewPassword = $admin->get_post('new_password_1'); + $sNewPassword = (is_null($sNewPassword) ? '' : $sNewPassword); + $sNewPasswordRetyped = $admin->get_post('new_password_2'); + $sNewPasswordRetyped= (is_null($sNewPasswordRetyped) ? '' : $sNewPasswordRetyped); + + if($bMailHasChanged == true) + { + $bPassRequest = $bMailHasChanged; + } else { + $bPassRequest = ( ( $sCurrentPassword != '') || ($sNewPassword != '') || ($sNewPasswordRetyped != '') ) ? true : false; + } + +// Check existing password + $sql = 'SELECT `password` '; + $sql .= 'FROM `'.TABLE_PREFIX.'users` '; + $sql .= 'WHERE `user_id` = '.$admin->get_user_id(); + if ( $bPassRequest && md5($sCurrentPassword) != $database->get_one($sql)) { +// access denied + $err_msg[] = $MESSAGE['PREFERENCES_CURRENT_PASSWORD_INCORRECT']; + }else { +// validate new password + $sPwHashNew = false; + if($sNewPassword != '') { + if(strlen($sNewPassword) < $iMinPassLength) { + $err_msg[] = $MESSAGE['USERS_PASSWORD_TOO_SHORT']; + }else { + if($sNewPassword != $sNewPasswordRetyped) { + $err_msg[] = $MESSAGE['USERS_PASSWORD_MISMATCH']; + }else { + $pattern = '/[^'.$admin->password_chars.']/'; + if (preg_match($pattern, $sNewPassword)) { + $err_msg[] = $MESSAGE['PREFERENCES_INVALID_CHARS']; + }else { + $sPwHashNew = md5($sNewPassword); + } + } + } + } +// if no validation errors, try to update the database, otherwise return errormessages + if(sizeof($err_msg) == 0) + { + $sql = 'UPDATE `'.TABLE_PREFIX.'users` '; + $sql .= 'SET `display_name`=\''.$database->escapeString($display_name).'\', '; + if($sPwHashNew) { + $sql .= '`password`=\''.$database->escapeString($sPwHashNew).'\', '; + } + if($email != '') { + $sql .= '`email`=\''.$database->escapeString($email).'\', '; + } + $sql .= '`language`=\''.$database->escapeString($language).'\', ' + . '`timezone`=\''.$database->escapeString($timezone).'\', ' + . '`date_format`=\''.$database->escapeString($date_format).'\', ' + . '`time_format`=\''.$database->escapeString($time_format).'\' ' + . 'WHERE `user_id`='.(int)$admin->get_user_id(); + if( $database->query($sql) ) + { + // update successfull, takeover values into the session + $_SESSION['DISPLAY_NAME'] = $display_name; + $_SESSION['LANGUAGE'] = $language; + $_SESSION['TIMEZONE'] = $timezone; + $_SESSION['EMAIL'] = $email; + // Update date format + if($date_format != '') { + $_SESSION['DATE_FORMAT'] = $date_format; + if(isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) { unset($_SESSION['USE_DEFAULT_DATE_FORMAT']); } + } else { + $_SESSION['USE_DEFAULT_DATE_FORMAT'] = true; + if(isset($_SESSION['DATE_FORMAT'])) { unset($_SESSION['DATE_FORMAT']); } + } + // Update time format + if($time_format != '') { + $_SESSION['TIME_FORMAT'] = $time_format; + if(isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) { unset($_SESSION['USE_DEFAULT_TIME_FORMAT']); } + } else { + $_SESSION['USE_DEFAULT_TIME_FORMAT'] = true; + if(isset($_SESSION['TIME_FORMAT'])) { unset($_SESSION['TIME_FORMAT']); } + } + }else { + $err_msg[] = 'invalid database UPDATE call in '.__FILE__.'::'.__FUNCTION__.'before line '.__LINE__; + } + } + } + return ( (sizeof($err_msg) > 0) ? implode('
', $err_msg) : '' ); +} +$retval = save_preferences($admin, $database); +if( $retval == '') +{ + // print the header + $admin->print_header(); + $admin->print_success($MESSAGE['PREFERENCES_DETAILS_SAVED']); + $admin->print_footer(); +}else { + // print the header + $admin->print_header(); + $admin->print_error($retval); +} Property changes on: trunk/admin/preferences/save.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/settings/index.php =================================================================== --- trunk/admin/settings/index.php (nonexistent) +++ trunk/admin/settings/index.php (revision 2) @@ -0,0 +1,844 @@ + (defined('WEBSITE_SIGNATURE')?WEBSITE_SIGNATURE:'') +); +foreach($cfg as $key=>$value) { + db_update_key_value('settings', $key, $value); +} + +// Setup template object, parse vars to it, then parse it +// Create new template object + $template = new Template(dirname($admin->correct_theme_source('settings.htt')), 'remove'); +// $template->debug = true; + $template->set_file('page', 'settings.htt'); + $template->set_block('page', 'main_block', 'main'); +/*---------------------------------------------------------------------------------------------------*/ + $template->set_block('main_block', 'show_page_level_limit_block', 'show_page_level_limit'); + $template->set_block('main_block', 'show_checkbox_1_block', 'show_checkbox_1'); + $template->set_block('main_block', 'show_checkbox_2_block', 'show_checkbox_2'); + $template->set_block('main_block', 'show_checkbox_3_block', 'show_checkbox_3'); + $template->set_block('main_block', 'show_redirect_timer_block', 'show_redirect_timer'); + $template->set_block('main_block', 'show_php_error_level_block', 'show_php_error_level'); + $template->set_block('main_block', 'show_wysiwyg_block', 'show_wysiwyg'); + $template->set_block('main_block', 'show_charset_block', 'show_charset'); + $template->set_block('main_block', 'show_search_block', 'show_search'); + $template->set_block('main_block', 'show_access_block', 'show_access'); + $template->set_block('main_block', 'show_chmod_js_block', 'show_chmod_js'); + $template->set_block('main_block', 'show_setting_js_block', 'show_setting_js'); +/*---------------------------------------------------------------------------------------------------*/ + if (!$oTrans) { + $oTrans = Translate::getInstance(); + } + $oTrans->enableAddon('templates\\'.basename(THEME_PATH)); + $aLang = $oTrans->getLangArray(); + $template->set_var($aLang); +// Query current settings in the db, then loop through them and print them +$query = "SELECT * FROM `".TABLE_PREFIX."settings`"; +if($results = $database->query($query)) { + $aSetting = array(); + $settings = array(); + while($aSetting = $results->fetchRow(MYSQLI_ASSOC)) + { + $setting_name = $aSetting['name']; + $setting_value = $aSetting['value']; + switch ($setting_name) : + case 'wbmailer_smtp_password': + break; + default : + $sFilterApi = WB_PATH.'/modules/output_filter/OutputFilterApi.php'; + if (is_readable($sFilterApi)) { + require_once($sFilterApi); + $setting_value = OutputFilterApi('ReplaceSysvar', $setting_value); + } + $setting_value = htmlspecialchars($setting_value); + break; + endswitch; +// $setting_value = ( $setting_name != 'wbmailer_smtp_password' ) ? htmlspecialchars($aSetting['value']) : $aSetting['value']; + $settings[$setting_name] = $setting_value; + $template->set_var(strtoupper($setting_name),$setting_value); + } +} else { + +} +$SecureTokenLifeTime = $admin->getTokenLifeTime(); +array_walk( + $SecureTokenLifeTime, + function (&$aItem) { + $aItem /= 60; + } +); +$template->set_var( $SecureTokenLifeTime ); +/*---------------------------------------------------------------------------------------------------*/ +$template->set_var('EDITOR_WEBSITE_HEADER', ''); +$template->set_var('EDITOR_WEBSITE_FOOTER', ''); +$template->set_var('EDITOR_WEBSITE_SIGNATURE', ''); +if (defined('WYSIWYG_EDITOR') && is_readable(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include1.php')) +{ + require(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php'); + $template->set_block('main_block', 'show_website_header_block', 'show_website_header'); + if (defined('WYSIWYG_EDITOR')) { + $template->set_block('show_website_header', ''); + $WebsiteHeader = show_wysiwyg_editor('website_header','content_header', WEBSITE_HEADER,'100%','200', 'WB_Mini', true); + $template->set_var('EDITOR_WEBSITE_HEADER', $WebsiteHeader); + } else { + $template->parse('show_website_header','show_website_header_block',true); + } + $template->set_block('main_block', 'show_website_footer_block', 'show_website_footer'); + if (defined('WYSIWYG_EDITOR')) { + $template->set_block('show_website_footer', ''); + $WebsiteFooter = show_wysiwyg_editor('website_footer','content_footer', WEBSITE_FOOTER, '100%','200', 'WB_Mini', true); + $template->set_var('EDITOR_WEBSITE_FOOTER', $WebsiteFooter); + } else { + $template->parse('show_website_footer','show_website_footer_block',true); + } +// + $template->set_block('main_block', 'show_website_signature_block', 'show_website_signature'); + if (defined('WYSIWYG_EDITOR')) { + $template->set_block('show_website_signature', ''); + $WebsiteSignature = show_wysiwyg_editor('website_header','content_header', WEBSITE_SIGNATURE,'100%','200', 'WB_Mini', true); + $template->set_var('EDITOR_WEBSITE_SIGNATURE', $WebsiteSignature); + } else { + $template->parse('show_website_signature','show_website_signature_block',true); + } +} +/*---------------------------------------------------------------------------------------------------*/ +// Do the same for settings stored in config file as with ones in db +$database_type = ''; +$is_advanced = (boolean)$bAdvanced; +// Tell the browser whether or not to show advanced options +if($is_advanced) +{ + $template->set_var('DISPLAY_ADVANCED', ''); + $template->set_var('ADVANCED_FILE_PERMS_ID', 'file_perms_box'); + $template->set_var('BASIC_FILE_PERMS_ID', 'hide'); + $template->set_var('ADVANCED_VALUE', 1); + $template->set_var('ADVANCED_BUTTON', '<< '.$TEXT['HIDE_ADVANCED']); + $template->set_var('ADVANCED_LINK', 'index.php?advanced=0'); +} else { + $template->set_var('DISPLAY_ADVANCED', ' style="display: none;"'); + $template->set_var('BASIC_FILE_PERMS_ID', 'file_perms_box'); + $template->set_var('ADVANCED_FILE_PERMS_ID', 'hide'); + $template->set_var('ADVANCED_VALUE', 0); + $template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].' >>'); + $template->set_var('ADVANCED_LINK', 'index.php?advanced=1'); +} +/*---------------------------------------------------------------------------------------------------*/ + $query = 'SELECT * FROM `'.TABLE_PREFIX.'search` WHERE `extra` = \'\''; + $results = $database->query($query); + // Query current settings in the db, then loop through them and print them + while($aSearch = $results->fetchRow(MYSQLI_ASSOC)) + { + $search_name = $aSearch['name']; + $search_value = htmlspecialchars(($aSearch['value'])); + switch($search_name) { + // Search header + case 'header': + $template->set_var('SEARCH_HEADER', $search_value); + break; + // Search results header + case 'results_header': + $template->set_var('SEARCH_RESULTS_HEADER', $search_value); + break; + // Search results loop + case 'results_loop': + $template->set_var('SEARCH_RESULTS_LOOP', $search_value); + break; + // Search results footer + case 'results_footer': + $template->set_var('SEARCH_RESULTS_FOOTER', $search_value); + break; + // Search no results + case 'no_results': + $template->set_var('SEARCH_NO_RESULTS', $search_value); + break; + // Search footer + case 'footer': + $template->set_var('SEARCH_FOOTER', $search_value); + break; + // Search module-order + case 'module_order': + $template->set_var('SEARCH_MODULE_ORDER', $search_value); + break; + // Search max lines of excerpt + case 'max_excerpt': + $template->set_var('SEARCH_MAX_EXCERPT', $search_value); + break; + // time-limit + case 'time_limit': + $template->set_var('SEARCH_TIME_LIMIT', $search_value); + break; + // Search template + case 'template': + $search_template = $search_value; + break; + } + } +/*---------------------------------------------------------------------------------------------------*/ + $template->set_var(array( + 'WB_URL' => WB_URL, + 'THEME_URL' => THEME_URL, + 'ADMIN_URL' => ADMIN_URL, + )); + $template->set_var('FTAN', $admin->getFTAN()); +/*---------------------------------------------------------------------------------------------------*/ + // Insert page level limits + $template->set_block('show_page_level_limit_block', 'page_level_limit_list_block', 'page_level_limit_list'); + $template->set_var('PAGE_LEVEL_LIMIT', $settings['page_level_limit']); + // if select list + for($i = 1; $i <= 10; $i++) + { + $template->set_var('NUMBER', $i); + $template->set_var('SELECTED', ((PAGE_LEVEL_LIMIT == $i) ? ' selected="selected"' : '') ); + $template->parse('page_level_limit_list', 'page_level_limit_list_block', true); + } +/*---------------------------------------------------------------------------------------------------*/ + // Insert groups into signup list + $template->set_block('main_block', 'group_list_block', 'group_list'); + $sqlGroup = 'SELECT `group_id`, `name` FROM `'.TABLE_PREFIX.'groups` ' + . 'WHERE `group_id` != 1' + . ''; + if($results = $database->query($sqlGroup)) + { + while($group = $results->fetchRow(MYSQLI_ASSOC)) + { + $template->set_var('ID', $group['group_id']); + $template->set_var('NAME', $group['name']); + $template->set_var('SELECTED', ((FRONTEND_SIGNUP == $group['group_id']) ? ' selected="selected"' : '') ); + $template->parse('group_list', 'group_list_block', true); + } + } else { + $template->set_var('ID', 'disabled'); + $template->set_var('NAME', $MESSAGE['GROUPS']['NO_GROUPS_FOUND']); + $template->parse('group_list', 'group_list_block', true); + } +/*---------------------------------------------------------------------------------------------------*/ + // Insert default error reporting values + $template->set_block('show_php_error_level_block', 'error_reporting_list_block', 'error_reporting_list'); + require(ADMIN_PATH.'/interface/er_levels.php'); + foreach($ER_LEVELS AS $value => $title) + { + $template->set_var('VALUE', $value); + $template->set_var('NAME', $title); + $template->set_var('SELECTED', ((ER_LEVEL == $value) ? ' selected="selected"' : '') ); + $template->parse('error_reporting_list', 'error_reporting_list_block', true); + } +/*-------------------------------------------------------------------------------------*/ + // Insert WYSIWYG modules + $template->set_block('show_wysiwyg_block', 'wysiwyg_list_block', 'wysiwyg_list'); + $file='none'; + $module_name=$TEXT['NONE']; + $template->set_var('FILE', $file); + $template->set_var('NAME', $module_name); + $template->set_var('SELECTED', ((!defined('WYSIWYG_EDITOR') || $file == WYSIWYG_EDITOR) ? ' selected="selected"' : '') ); + $template->parse('wysiwyg_list', 'wysiwyg_list_block', true); + $sqlEditor = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `type` = \'module\' ' + . 'AND `function` = \'wysiwyg\' ' + . 'ORDER BY `name`'; + if($result = $database->query($sqlEditor)) + { + while($aWysiwyg = $result->fetchRow(MYSQLI_ASSOC)) + { + $template->set_var('FILE', $aWysiwyg['directory']); + $template->set_var('NAME', $aWysiwyg['name']); + $template->set_var('SELECTED', ((!defined('WYSIWYG_EDITOR') || $aWysiwyg['directory'] == WYSIWYG_EDITOR) ? ' selected="selected"' : '') ); + $template->parse('wysiwyg_list', 'wysiwyg_list_block', true); + } + } +/*---------------------------------------------------------------------------------------------------*/ + // Insert language values + $template->set_block('main_block', 'language_list_block', 'language_list'); + $sqlLang = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `type` = \'language\' ' + . 'ORDER BY `directory`'; + if($result = $database->query($sqlLang)) + { + while($aLang = $result->fetchRow(MYSQLI_ASSOC)) { + $langIcons = (empty($aLang['directory']) ? 'none' : strtolower($aLang['directory'])); + $template->set_var('CODE', $aLang['directory']); + $template->set_var('NAME', $aLang['name']); + $template->set_var('FLAG', THEME_URL.'/images/flags/'.$langIcons); + $template->set_var('SELECTED', (DEFAULT_LANGUAGE == $aLang['directory'] ? ' selected="selected"' : '') ); + $template->parse('language_list', 'language_list_block', true); + } + } +/*---------------------------------------------------------------------------------------------------*/ + // Insert default timezone values + $template->set_block('main_block', 'timezone_list_block', 'timezone_list'); + require(ADMIN_PATH.'/interface/timezones.php'); + foreach($TIMEZONES AS $hour_offset => $title) + { + // Make sure we dont list "System Default" as we are setting this value! + if($hour_offset != '-20') { + $template->set_var('VALUE', $hour_offset); + $template->set_var('NAME', $title); + $template->set_var('SELECTED', ( (DEFAULT_TIMEZONE == $hour_offset*60*60)?' selected="selected"':'' ) ); + $template->parse('timezone_list', 'timezone_list_block', true); + } + } +/*---------------------------------------------------------------------------------------------------*/ + // Insert default charset values + $template->set_block('show_charset_block', 'charset_list_block', 'charset_list'); + require(ADMIN_PATH.'/interface/charsets.php'); + foreach($CHARSETS AS $code => $title) { + $template->set_var('VALUE', $code); + $template->set_var('NAME', $title); + $template->set_var('SELECTED', ( (DEFAULT_CHARSET == $code)?' selected="selected"':'' ) ); + $template->parse('charset_list', 'charset_list_block', true); + } +/*---------------------------------------------------------------------------------------------------*/ + // Insert date format list + $template->set_block('main_block', 'date_format_list_block', 'date_format_list'); + require(ADMIN_PATH.'/interface/date_formats.php'); + foreach($DATE_FORMATS AS $format => $title) { + $format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key) + if($format != 'system_default') { + $template->set_var('VALUE', $format); + } else { + $template->set_var('VALUE', ''); + } + $template->set_var('NAME', $title); + $template->set_var('SELECTED', ( (DEFAULT_DATE_FORMAT == $format)?' selected="selected"':'' ) ); + $template->parse('date_format_list', 'date_format_list_block', true); + } +/*---------------------------------------------------------------------------------------------------*/ + // Insert time format list + $template->set_block('main_block', 'time_format_list_block', 'time_format_list'); + require(ADMIN_PATH.'/interface/time_formats.php'); + foreach($TIME_FORMATS AS $format => $title) { + $format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key) + if($format != 'system_default') { + $template->set_var('VALUE', $format); + } else { + $template->set_var('VALUE', ''); + } + $template->set_var('NAME', $title); + $template->set_var('SELECTED', ( (DEFAULT_TIME_FORMAT == $format)?' selected="selected"':'' ) ); + $template->parse('time_format_list', 'time_format_list_block', true); + } +/*---------------------------------------------------------------------------------------------------*/ + // Insert templates + $template->set_block('main_block', 'template_list_block', 'template_list'); + $sqlTheme = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `type` = \'template\' ' + . 'AND `function` != \'theme\' ' + . 'ORDER BY `name`'; + if($result = $database->query($sqlTheme)) { +// $result = $database->query("SELECT * FROM `".TABLE_PREFIX."addons` WHERE `type` = 'template' AND `function` != 'theme' ORDER BY `name`"); +// if($result->numRows() > 0) { + while($addon = $result->fetchRow( MYSQLI_ASSOC )) { + $template->set_var('FILE', $addon['directory']); + $template->set_var('NAME', $addon['name']); + $template->set_var('SELECTED', (($addon['directory'] == DEFAULT_TEMPLATE)?' selected="selected"':'') ); + $template->parse('template_list', 'template_list_block', true); + } + } +/*---------------------------------------------------------------------------------------------------*/ + // Insert backend theme + $template->set_block('main_block', 'theme_list_block', 'theme_list'); + $sqlTheme = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `type` = \'template\' ' + . 'AND `function` = \'theme\' ' + . 'ORDER BY `name`'; + if($result = $database->query($sqlTheme)) { + while($addon = $result->fetchRow( MYSQLI_ASSOC )) { + $template->set_var('FILE', $addon['directory']); + $template->set_var('NAME', $addon['name']); + $template->set_var('SELECTED', (($addon['directory'] == DEFAULT_THEME)?' selected="selected"':'') ); + $template->parse('theme_list', 'theme_list_block', true); + } + } +/*---------------------------------------------------------------------------------------------------*/ +// Insert templates for search settings + $template->set_block('main_block', 'search_template_list_block', 'search_template_list'); + $search_template = ( ($search_template == DEFAULT_TEMPLATE) || ($search_template == '') ) ? '' : $search_template; + $selected = ( ($search_template != DEFAULT_TEMPLATE) ) ? ' selected="selected"' : ''; + $template->set_var(array( + 'FILE' => '', + 'NAME' => $TEXT['SYSTEM_DEFAULT'], + 'SELECTED' => $selected + )); + $template->parse('search_template_list', 'search_template_list_block', true); + $sqlSearch = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ' + . ' WHERE `type` = \'template\' ' + . 'AND `function` =\'template\' ' + . 'ORDER BY `name`'; + if ($result = $database->query($sqlSearch)) + { + while($addon = $result->fetchRow(MYSQLI_ASSOC)) + { + $template->set_var('FILE', $addon['directory']); + $template->set_var('NAME', $addon['name']); + $template->set_var('SELECTED', (($addon['directory'] == $search_template) ? ' selected="selected"' : '') ); + $template->parse('search_template_list', 'search_template_list_block', true); + } + } +/*--------------------------------------------------------------------------------------------------------*/ + // Insert permissions values + if($admin->get_permission('settings_advanced') != true) + { + $template->set_var('DISPLAY_ADVANCED_BUTTON', 'hide'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if multiple menus feature is enabled + if(defined('MULTIPLE_MENUS') && MULTIPLE_MENUS == true) + { + $template->set_var('MULTIPLE_MENUS_ENABLED', ' checked="checked"'); + } else { + $template->set_var('MULTIPLE_MENUS_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if page languages feature is enabled + if(defined('PAGE_LANGUAGES') && PAGE_LANGUAGES == true) + { + $template->set_var('PAGE_LANGUAGES_ENABLED', ' checked="checked"'); + } else { + $template->set_var('PAGE_LANGUAGES_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if warn_page_leave feature is enabled + if (defined('WARN_PAGE_LEAVE') && WARN_PAGE_LEAVE == true) + { + $template->set_var('WARN_PAGE_LEAVE_ENABLED', ' checked="checked"'); + } else { + $template->set_var('WARN_PAGE_LEAVE_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if smart login feature is enabled + if(defined('SMART_LOGIN') && SMART_LOGIN == true) + { + $template->set_var('SMART_LOGIN_ENABLED', ' checked="checked"'); + } else { + $template->set_var('SMART_LOGIN_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + /* Make's sure GD library is installed */ + if(extension_loaded('gd') && function_exists('imageCreateFromJpeg')) + { + $template->set_var('GD_EXTENSION_ENABLED', ''); + } else { + $template->set_var('GD_EXTENSION_ENABLED', ' style="display: none;"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if section blocks feature is enabled + if(defined('SECTION_BLOCKS') && SECTION_BLOCKS == true) + { + $template->set_var('SECTION_BLOCKS_ENABLED', ' checked="checked"'); + } else { + $template->set_var('SECTION_BLOCKS_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if homepage redirection feature is enabled + if(defined('HOMEPAGE_REDIRECTION') && HOMEPAGE_REDIRECTION == true) + { + $template->set_var('HOMEPAGE_REDIRECTION_ENABLED', ' checked="checked"'); + } else { + $template->set_var('HOMEPAGE_REDIRECTION_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if debug mode feature is enabled + if(defined('DEBUG') && DEBUG == true) + { + $template->set_var('DEBUG_ENABLED', ' checked="checked"'); + } else { + $template->set_var('DEBUG_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if token_fingerprint feature is enabled + if(defined('SEC_TOKEN_FINGERPRINT') && SEC_TOKEN_FINGERPRINT == true) + { + $template->set_var('FINGERPRINT_ENABLED', ' checked="checked"'); + } else { + $template->set_var('FINGERPRINT_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out which server os should be checked {DISPLAY_CHMOD} + if(OPERATING_SYSTEM == 'linux') + { + $template->set_var('LINUX_SELECTED', ' checked="checked"'); + $template->set_var('DISPLAY_CHMOD', ' style="display: block;"'); + } elseif(OPERATING_SYSTEM == 'windows') { + $template->set_var('WINDOWS_SELECTED', ' checked="checked"'); + $template->set_var('DISPLAY_CHMOD', ' style="display: none;"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if manage sections feature is enabled + if(MANAGE_SECTIONS) + { + $template->set_var('MANAGE_SECTIONS_ENABLED', ' checked="checked"'); + } else { + $template->set_var('MANAGE_SECTIONS_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out which wbmailer routine should be checked + $template->set_var(array( + 'TEXT_WBMAILER_DEFAULT_SETTINGS_NOTICE' => $TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'], + 'TEXT_WBMAILER_DEFAULT_SENDER_MAIL' => $TEXT['WBMAILER_DEFAULT_SENDER_MAIL'], + 'TEXT_WBMAILER_DEFAULT_SENDER_NAME' => $TEXT['WBMAILER_DEFAULT_SENDER_NAME'], + 'TEXT_WBMAILER_NOTICE' => $TEXT['WBMAILER_NOTICE'], + 'TEXT_WBMAILER_FUNCTION' => $TEXT['WBMAILER_FUNCTION'], + 'TEXT_WBMAILER_SMTP_HOST' => $TEXT['WBMAILER_SMTP_HOST'], + 'TEXT_WBMAILER_PHP' => $TEXT['WBMAILER_PHP'], + 'TEXT_WBMAILER_SMTP' => $TEXT['WBMAILER_SMTP'], + 'TEXT_WBMAILER_SMTP_AUTH' => $TEXT['WBMAILER_SMTP_AUTH'], + 'TEXT_WBMAILER_SMTP_AUTH_NOTICE' => $TEXT['REQUIRED'].' '.$TEXT['WBMAILER_SMTP_AUTH'], + 'TEXT_WBMAILER_SMTP_USERNAME' => $TEXT['WBMAILER_SMTP_USERNAME'], + 'TEXT_WBMAILER_SMTP_PASSWORD' => $TEXT['WBMAILER_SMTP_PASSWORD'], + 'SMTP_AUTH_SELECTED' => ' checked="checked"' + )); + if(WBMAILER_ROUTINE == 'phpmail') + { + $template->set_var('PHPMAIL_SELECTED', ' checked="checked"'); + $template->set_var('SMTP_VISIBILITY', ' style="display: none;"'); + $template->set_var('SMTP_VISIBILITY_AUTH', ''); + // $template->set_var('SMTP_AUTH_SELECTED', ''); + } elseif(WBMAILER_ROUTINE == 'smtp') + { + $template->set_var('SMTPMAIL_SELECTED', ' checked="checked"'); + $template->set_var('SMTP_VISIBILITY', ''); + $template->set_var('SMTP_VISIBILITY_AUTH', ''); + } +//$template->set_var('SMTP_AUTH_SELECTED',( (WBMAILER_SMTP_AUTH === true) ?' checked="checked"':'') ); + $template->set_block('show_access_block', 'smtp_port_list_block', 'smtp_port_list'); + $aSmtpPorts = array( '25', '465', '587', '2525'); + foreach($aSmtpPorts as $sPort) + { + $template->set_var('VALUE', $sPort); + $template->set_var('PNAME', $sPort); + $template->set_var('SELECTED', ((WBMAILER_SMTP_PORT == $sPort) ? ' selected="selected"' : '') ); + $template->parse('smtp_port_list', 'smtp_port_list_block', true); + } +/*---------------------------------------------------------------------------------------------------*/ + $template->set_block('show_access_block', 'smtp_secure_list_block', 'smtp_secure_list'); + $aSmtpSecure = array( 'TLS', 'SSL' ); + foreach($aSmtpSecure as $sSecure) + { + $template->set_var('VALUE', $sSecure); + $template->set_var('SNAME', $sSecure); + $template->set_var('SELECTED', ((WBMAILER_SMTP_SECURE == $sSecure) ? ' selected="selected"' : '') ); + $template->parse('smtp_secure_list', 'smtp_secure_list_block', true); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if intro feature is enabled + if(INTRO_PAGE) + { + $template->set_var('INTRO_PAGE_ENABLED', ' checked="checked"'); + } else { + $template->set_var('INTRO_PAGE_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if frontend login feature is enabled + if(FRONTEND_LOGIN) + { + $template->set_var('PRIVATE_ENABLED', ' checked="checked"'); + } else { + $template->set_var('PRIVATE_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if page trash feature is disabled, in-line, or separate + if(PAGE_TRASH == 'disabled') + { + $template->set_var('PAGE_TRASH_DISABLED', ' checked="checked"'); + $template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', 'display: none;'); + } elseif(PAGE_TRASH == 'inline') + { + $template->set_var('PAGE_TRASH_INLINE', ' checked="checked"'); + $template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', 'display: none;'); + } elseif(PAGE_TRASH == 'separate') + { + $template->set_var('PAGE_TRASH_SEPARATE', ' checked="checked"'); + $template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', 'display: inline;'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if media home folde feature is enabled + if(HOME_FOLDERS) + { + $template->set_var('HOME_FOLDERS_ENABLED', ' checked="checked"'); + } else { + $template->set_var('HOME_FOLDERS_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Insert search select + if(SEARCH == 'private') + { + $template->set_var('PRIVATE_SEARCH', ' selected="selected"'); + } elseif(SEARCH == 'registered') { + $template->set_var('REGISTERED_SEARCH', ' selected="selected"'); + } elseif(SEARCH == 'none') { + $template->set_var('NONE_SEARCH', ' selected="selected"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if 777 permissions are set + if(STRING_FILE_MODE == '0777' AND STRING_DIR_MODE == '0777') + { + $template->set_var('WORLD_WRITEABLE_SELECTED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out which file mode boxes are checked + if(extract_permission(STRING_FILE_MODE, 'u', 'r')) + { + $template->set_var('FILE_U_R_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_FILE_MODE, 'u', 'w')) + { + $template->set_var('FILE_U_W_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_FILE_MODE, 'u', 'e')) + { + $template->set_var('FILE_U_E_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_FILE_MODE, 'g', 'r')) + { + $template->set_var('FILE_G_R_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_FILE_MODE, 'g', 'w')) + { + $template->set_var('FILE_G_W_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_FILE_MODE, 'g', 'e')) + { + $template->set_var('FILE_G_E_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_FILE_MODE, 'o', 'r')) + { + $template->set_var('FILE_O_R_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_FILE_MODE, 'o', 'w')) + { + $template->set_var('FILE_O_W_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_FILE_MODE, 'o', 'e')) + { + $template->set_var('FILE_O_E_CHECKED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out which dir mode boxes are checked + if(extract_permission(STRING_DIR_MODE, 'u', 'r')) + { + $template->set_var('DIR_U_R_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_DIR_MODE, 'u', 'w')) + { + $template->set_var('DIR_U_W_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_DIR_MODE, 'u', 'e')) + { + $template->set_var('DIR_U_E_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_DIR_MODE, 'g', 'r')) + { + $template->set_var('DIR_G_R_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_DIR_MODE, 'g', 'w')) + { + $template->set_var('DIR_G_W_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_DIR_MODE, 'g', 'e')) + { + $template->set_var('DIR_G_E_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_DIR_MODE, 'o', 'r')) + { + $template->set_var('DIR_O_R_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_DIR_MODE, 'o', 'w')) + { + $template->set_var('DIR_O_W_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_DIR_MODE, 'o', 'e')) + { + $template->set_var('DIR_O_E_CHECKED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + $template->set_var(array( + 'PAGES_DIRECTORY' => PAGES_DIRECTORY, + 'MEDIA_DIRECTORY' => MEDIA_DIRECTORY, + 'PAGE_EXTENSION' => PAGE_EXTENSION, + 'PAGE_SPACER' => PAGE_SPACER, + 'TABLE_PREFIX' => TABLE_PREFIX + )); +/*---------------------------------------------------------------------------------------------------*/ + // Insert Server Email value into template + $template->set_var('SERVER_EMAIL', SERVER_EMAIL); +/*---------------------------------------------------------------------------------------------------*/ + // Insert language headings + $template->set_var(array( + 'HEADING_GENERAL_SETTINGS' => $HEADING['GENERAL_SETTINGS'], + 'HEADING_DEFAULT_SETTINGS' => $HEADING['DEFAULT_SETTINGS'], + 'HEADING_SEARCH_SETTINGS' => $HEADING['SEARCH_SETTINGS'], + 'HEADING_SERVER_SETTINGS' => $HEADING['SERVER_SETTINGS'], + 'HEADING_WBMAILER_SETTINGS' => $HEADING['WBMAILER_SETTINGS'], + 'HEADING_ADMINISTRATION_TOOLS' => $HEADING['ADMINISTRATION_TOOLS'] + ) + ); +/*---------------------------------------------------------------------------------------------------*/ + $template->set_block('show_access_block', 'input_pages_directory_block', 'input_pages_directory'); + $template->set_block('show_access_block', 'show_pages_directory_block', 'show_pages_directory'); + $sql = 'SELECT COUNT(`page_id`) `numRows` FROM `'.TABLE_PREFIX.'pages` '; + if (!$database->get_one($sql) ) { + $template->parse('input_pages_directory', 'input_pages_directory_block', true); + $template->set_block('show_pages_directory', ''); + } else { + $template->parse('show_pages_directory', 'show_pages_directory_block', true); + $template->set_block('input_pages_directory', ''); + } +/*---------------------------------------------------------------------------------------------------*/ + // Insert language text and messages + $template->set_var(array( + 'TEXT_WEBSITE_TITLE' => $TEXT['WEBSITE_TITLE'], + 'TEXT_WEBSITE_DESCRIPTION' => $TEXT['WEBSITE_DESCRIPTION'], + 'TEXT_WEBSITE_KEYWORDS' => $TEXT['WEBSITE_KEYWORDS'], + 'TEXT_WEBSITE_HEADER' => $TEXT['WEBSITE_HEADER'], + 'TEXT_WEBSITE_FOOTER' => $TEXT['WEBSITE_FOOTER'], + 'TEXT_WEBSITE_SIGNATURE' => 'Signature', + 'TEXT_HEADER' => $TEXT['HEADER'], + 'TEXT_FOOTER' => $TEXT['FOOTER'], + 'TEXT_VISIBILITY' => $TEXT['VISIBILITY'], + 'TEXT_RESULTS_HEADER' => $TEXT['RESULTS_HEADER'], + 'TEXT_RESULTS_LOOP' => $TEXT['RESULTS_LOOP'], + 'TEXT_RESULTS_FOOTER' => $TEXT['RESULTS_FOOTER'], + 'TEXT_NO_RESULTS' => $TEXT['NO_RESULTS'], + 'TEXT_TEXT' => $TEXT['TEXT'], + 'TEXT_DEFAULT' => $TEXT['DEFAULT'], + 'TEXT_LANGUAGE' => $TEXT['LANGUAGE'], + 'TEXT_TIMEZONE' => $TEXT['TIMEZONE'], + 'TEXT_CHARSET' => $TEXT['CHARSET'], + 'TEXT_DATE_FORMAT' => $TEXT['DATE_FORMAT'], + 'TEXT_TIME_FORMAT' => $TEXT['TIME_FORMAT'], + 'TEXT_TEMPLATE' => $TEXT['TEMPLATE'], + 'TEXT_THEME' => $TEXT['THEME'], + 'TEXT_WYSIWYG_EDITOR' => $TEXT['WYSIWYG_EDITOR'], + 'TEXT_PAGE_LEVEL_LIMIT' => $TEXT['PAGE_LEVEL_LIMIT'], + 'TEXT_INTRO_PAGE' => $TEXT['INTRO_PAGE'], + 'TEXT_FRONTEND' => $TEXT['FRONTEND'], + 'TEXT_LOGIN' => $TEXT['LOGIN'], + 'TEXT_REDIRECT_AFTER' => $TEXT['REDIRECT_AFTER'], + 'TEXT_SIGNUP' => $TEXT['SIGNUP'], + 'TEXT_PHP_ERROR_LEVEL' => $TEXT['PHP_ERROR_LEVEL'], + 'TEXT_PAGES_DIRECTORY' => $TEXT['PAGES_DIRECTORY'], + 'TEXT_MEDIA_DIRECTORY' => $TEXT['MEDIA_DIRECTORY'], + 'TEXT_PAGE_EXTENSION' => $TEXT['PAGE_EXTENSION'], + 'TEXT_PAGE_SPACER' => $TEXT['PAGE_SPACER'], + 'TEXT_RENAME_FILES_ON_UPLOAD' => $TEXT['RENAME_FILES_ON_UPLOAD'], + 'TEXT_APP_NAME' => $TEXT['APP_NAME'], + 'TEXT_SESSION_IDENTIFIER' => $TEXT['SESSION_IDENTIFIER'], + 'TEXT_SEC_ANCHOR' => $TEXT['SEC_ANCHOR'], + 'TEXT_SERVER_OPERATING_SYSTEM' => $TEXT['SERVER_OPERATING_SYSTEM'], + 'TEXT_LINUX_UNIX_BASED' => $TEXT['LINUX_UNIX_BASED'], + 'TEXT_WINDOWS' => $TEXT['WINDOWS'], + 'TEXT_ADMIN' => $TEXT['ADMIN'], + 'TEXT_TYPE' => $TEXT['TYPE'], + 'TEXT_DATABASE' => $TEXT['DATABASE'], + 'TEXT_HOST' => $TEXT['HOST'], + 'TEXT_USERNAME' => $TEXT['USERNAME'], + 'TEXT_PASSWORD' => $TEXT['PASSWORD'], + 'TEXT_NAME' => $TEXT['NAME'], + 'TEXT_TABLE_PREFIX' => $TEXT['TABLE_PREFIX'], + 'TEXT_SAVE' => $TEXT['SAVE'], + 'TEXT_RESET' => $TEXT['RESET'], + 'TEXT_CHANGES' => $TEXT['CHANGES'], + 'TEXT_ENABLED' => $TEXT['ENABLED'], + 'TEXT_DISABLED' => $TEXT['DISABLED'], + 'TEXT_MANAGE_SECTIONS' => $HEADING['MANAGE_SECTIONS'], + 'TEXT_MANAGE' => $TEXT['MANAGE'], + 'TEXT_SEARCH' => $TEXT['SEARCH'], + 'TEXT_PUBLIC' => $TEXT['PUBLIC'], + 'TEXT_PRIVATE' => $TEXT['PRIVATE'], + 'TEXT_REGISTERED' => $TEXT['REGISTERED'], + 'TEXT_NONE' => $TEXT['NONE'], + 'TEXT_FILES' => strtoupper(substr($TEXT['FILES'], 0, 1)).substr($TEXT['FILES'], 1), + 'TEXT_DIRECTORIES' => $TEXT['DIRECTORIES'], + 'TEXT_FILESYSTEM_PERMISSIONS' => $TEXT['FILESYSTEM_PERMISSIONS'], + 'TEXT_USER' => $TEXT['USER'], + 'TEXT_GROUP' => $TEXT['GROUP'], + 'TEXT_OTHERS' => $TEXT['OTHERS'], + 'TEXT_READ' => $TEXT['READ'], + 'TEXT_WRITE' => $TEXT['WRITE'], + 'TEXT_EXECUTE' => $TEXT['EXECUTE'], + 'TEXT_WARN_PAGE_LEAVE' => '', + 'TEXT_SMART_LOGIN' => $TEXT['SMART_LOGIN'], + 'TEXT_MULTIPLE_MENUS' => $TEXT['MULTIPLE_MENUS'], + 'TEXT_HOMEPAGE_REDIRECTION' => $TEXT['HOMEPAGE_REDIRECTION'], + 'TEXT_SECTION_BLOCKS' => $TEXT['SECTION_BLOCKS'], + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], + 'TEXT_PAGE_TRASH' => $TEXT['PAGE_TRASH'], + 'TEXT_PAGE_LANGUAGES' => $TEXT['PAGE_LANGUAGES'], + 'TEXT_INLINE' => $TEXT['INLINE'], + 'TEXT_SEPARATE' => $TEXT['SEPARATE'], + 'TEXT_HOME_FOLDERS' => $TEXT['HOME_FOLDERS'], + 'TEXT_WYSIWYG_STYLE' => $TEXT['WYSIWYG_STYLE'], + 'TEXT_WORLD_WRITEABLE_FILE_PERMISSIONS' => $TEXT['WORLD_WRITEABLE_FILE_PERMISSIONS'], + 'MODE_SWITCH_WARNING' => $MESSAGE['SETTINGS']['MODE_SWITCH_WARNING'], + 'WORLD_WRITEABLE_WARNING' => $MESSAGE['SETTINGS']['WORLD_WRITEABLE_WARNING'], + 'TEXT_MODULE_ORDER' => $TEXT['MODULE_ORDER'], + 'TEXT_MAX_EXCERPT' => $TEXT['MAX_EXCERPT'], + 'TEXT_TIME_LIMIT' => $TEXT['TIME_LIMIT'] + )); +/*---------------------------------------------------------------------------------------------------*/ +if($is_advanced) +{ + $template->parse('show_page_level_limit', 'show_page_level_limit_block', true); + $template->parse('show_checkbox_1', 'show_checkbox_1_block', true); + $template->parse('show_checkbox_2', 'show_checkbox_2_block', true); + $template->parse('show_checkbox_3', 'show_checkbox_3_block', true); + $template->set_block('show_php_error_level', ''); + $template->set_block('show_charset', ''); + $template->parse('show_wysiwyg', 'show_wysiwyg_block', true); + $template->parse('show_search', 'show_search_block', true); + $template->parse('show_redirect_timer', 'show_redirect_timer_block', true); +}else { + $template->set_block('show_page_level_limit', ''); + $template->set_block('show_checkbox_1', ''); + $template->set_block('show_checkbox_2', ''); + $template->set_block('show_checkbox_3', ''); + $template->set_block('show_php_error_level', ''); + $template->set_block('show_charset', ''); + $template->set_block('show_wysiwyg', ''); + $template->set_block('show_search', ''); + $template->set_block('show_redirect_timer', ''); +} +if($is_advanced && $admin->get_user_id()=='1') +{ + $template->parse('show_access', 'show_access_block', true); + $template->parse('show_chmod_js', 'show_chmod_js_block', true); + $template->parse('show_setting_js', 'show_setting_js_block', true); +}else { + $template->set_block('show_access_block', ''); + $template->set_block('show_chmod_js_block', ''); + $template->set_block('show_setting_js_block', ''); +} +/*---------------------------------------------------------------------------------------------------*/ +// Parse template objects output +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +$admin->print_footer(); Property changes on: trunk/admin/settings/index.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/settings/locking.php =================================================================== --- trunk/admin/settings/locking.php (nonexistent) +++ trunk/admin/settings/locking.php (revision 2) @@ -0,0 +1,41 @@ +enableAddon(ADMIN_DIRECTORY.'\\settings'); + +if (!class_exists('admin', false)) {require (WB_PATH.'/framework/class.admin.php');} +$admin = new admin('Start', 'settings', false, false); + +if ($admin->get_user_id() == 1) { + $val = (((int)(defined('SYSTEM_LOCKED') ? SYSTEM_LOCKED : 0)) + 1) % 2; + db_update_key_value('settings', 'system_locked', $val); +} +// redirect to backend +header('Location: ' . ADMIN_URL . '/index.php'); +exit(); Property changes on: trunk/admin/settings/locking.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/settings/save.php =================================================================== --- trunk/admin/settings/save.php (nonexistent) +++ trunk/admin/settings/save.php (revision 2) @@ -0,0 +1,305 @@ +checkFTAN() ) +{ + $admin->print_header(); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); +} +$admin->print_header(); + +$TOKENS = unserialize($_SESSION['TOKENS']); +$array = $_POST; +ksort($array); + +$aInputs = array(); +$aOutputs = array(); + +$sql = 'SELECT `name`, `value` FROM `'.TABLE_PREFIX.'settings` ' + . 'ORDER BY `name`'; +if($oSettings = $database->query($sql)) { + while($aSetting = $oSettings->fetchRow( MYSQLI_ASSOC )) { + $aOutputs['_POST'][$aSetting['name']] = $aSetting['value']; + } +} +// After check print the header + +// Work-out file mode +if( !$bAdvanced ) +{ + // Check if should be set to 777 or left alone + if(isset($_POST['world_writeable']) && $_POST['world_writeable'] == 'true') + { + $file_mode = '0777'; + $dir_mode = '0777'; + } else { + $file_mode = STRING_FILE_MODE; + $dir_mode = STRING_DIR_MODE; + } +} else { + $file_mode = STRING_FILE_MODE; + $dir_mode = STRING_DIR_MODE; + + if($admin->get_user_id()=='1') + { + // Work-out the octal value for file mode + $u = 0; + if(isset($_POST['file_u_r']) && $_POST['file_u_r'] == 'true') { + $u = $u+4; + } + if(isset($_POST['file_u_w']) && $_POST['file_u_w'] == 'true') { + $u = $u+2; + } + if(isset($_POST['file_u_e']) && $_POST['file_u_e'] == 'true') { + $u = $u+1; + } + $g = 0; + if(isset($_POST['file_g_r']) && $_POST['file_g_r'] == 'true') { + $g = $g+4; + } + if(isset($_POST['file_g_w']) && $_POST['file_g_w'] == 'true') { + $g = $g+2; + } + if(isset($_POST['file_g_e']) && $_POST['file_g_e'] == 'true') { + $g = $g+1; + } + $o = 0; + if(isset($_POST['file_o_r']) && $_POST['file_o_r'] == 'true') { + $o = $o+4; + } + if(isset($_POST['file_o_w']) && $_POST['file_o_w'] == 'true') { + $o = $o+2; + } + if(isset($_POST['file_o_e']) && $_POST['file_o_e'] == 'true') { + $o = $o+1; + } + $file_mode = "0".$u.$g.$o; + // Work-out the octal value for dir mode + $u = 0; + if(isset($_POST['dir_u_r']) && $_POST['dir_u_r'] == 'true') { + $u = $u+4; + } + if(isset($_POST['dir_u_w']) && $_POST['dir_u_w'] == 'true') { + $u = $u+2; + } + if(isset($_POST['dir_u_e']) && $_POST['dir_u_e'] == 'true') { + $u = $u+1; + } + $g = 0; + if(isset($_POST['dir_g_r']) && $_POST['dir_g_r'] == 'true') { + $g = $g+4; + } + if(isset($_POST['dir_g_w']) && $_POST['dir_g_w'] == 'true') { + $g = $g+2; + } + if(isset($_POST['dir_g_e']) && $_POST['dir_g_e'] == 'true') { + $g = $g+1; + } + $o = 0; + if(isset($_POST['dir_o_r']) && $_POST['dir_o_r'] == 'true') { + $o = $o+4; + } + if(isset($_POST['dir_o_w']) && $_POST['dir_o_w'] == 'true') { + $o = $o+2; + } + if(isset($_POST['dir_o_e']) && $_POST['dir_o_e'] == 'true') { + $o = $o+1; + } + $dir_mode = "0".$u.$g.$o; + } +// Ensure that the specified default email is formally valid + if(isset($_POST['server_email'])) + { + $_POST['server_email'] = strip_tags($_POST['server_email']); + // $pattern = '/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9]([-a-z0-9_]?[a-z0-9])*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z]{2})|([1]?\d{1,2}|2[0-4]{1}\d{1}|25[0-5]{1})(\.([1]?\d{1,2}|2[0-4]{1}\d{1}|25[0-5]{1})){3})(:[0-9]{1,5})?\r/im'; + $pattern = '/^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.(([0-9]{1,3})|([a-zA-Z]{2,6}))$/'; + if(false == preg_match($pattern, $_POST['server_email'])) + { + $admin->print_error($MESSAGE['USERS_INVALID_EMAIL']. + '
Email: '.htmlentities($_POST['server_email']).'', $js_back); + } + } + + if(isset($_POST['wbmailer_routine']) && ($_POST['wbmailer_routine']=='smtp')) { + + $checkSmtpHost = (isset($_POST['wbmailer_smtp_host']) && ($_POST['wbmailer_smtp_host']=='') ? false : true); + $checkSmtpUser = (isset($_POST['wbmailer_smtp_username']) && ($_POST['wbmailer_smtp_username']=='') ? false : true); + $checkSmtpPassword = (isset($_POST['wbmailer_smtp_password']) && ($_POST['wbmailer_smtp_password']=='') ? false : true); + if(!$checkSmtpHost || !$checkSmtpUser || !$checkSmtpPassword) { + $admin->print_error($TEXT['REQUIRED'].' '.$TEXT['WBMAILER_SMTP_AUTH']. + '
'.$MESSAGE['GENERIC_FILL_IN_ALL'].'', $js_back); + } + + } +} + +$allow_tags_in_fields = array('website_header', 'website_footer','website_signature'); +$allow_empty_values = array('website_header','website_footer','website_signature','sec_anchor','pages_directory','page_spacer','wbmailer_smtp_secure'); +$disallow_in_fields = array('pages_directory', 'media_directory','wb_version'); + +// Query current settings in the db, then loop through them and update the db with the new value +$settings = array(); +$old_settings = array(); +// Query current settings in the db, then loop through them to get old values +$sql = 'SELECT `name`, `value` FROM `'.TABLE_PREFIX.'settings` ' + . 'ORDER BY `name`'; +if($res_settings = $database->query($sql)) { + $passed = false; + while($setting = $res_settings->fetchRow(MYSQLI_ASSOC)) : + $old_settings[$setting['name']] = $setting['value']; + $setting_name = $setting['name']; + if($setting_name=='wb_version') { continue; } + $value = $admin->get_post($setting_name); + $value = is_null($value) ? '' : $value; + $value = isset($_POST[$setting_name]) ? $value : $old_settings[$setting_name] ; + switch ($setting_name) : + case 'website_header': + case 'website_footer': + case 'website_signature': + $sRelUrl = preg_replace('/^https?:\/\/[^\/]+(.*)/is', '\1', WB_URL); + $sDocumentRootUrl = str_replace($sRelUrl, '', WB_URL); + $sMediaUrl = WB_URL.MEDIA_DIRECTORY; + $aPatterns = array( + '/(<[^>]*?=\s*\")(\/+)([^\"]*?\"[^>]*?)/is', + '/(<[^>]*=\s*")('.preg_quote($sMediaUrl, '/').')([^">]*".*>)/siU' + ); + $aReplacements = array( + '\1'.$sDocumentRootUrl.'/\3', + '$1{SYSVAR:MEDIA_REL}$3' + ); + $value = preg_replace($aPatterns, $aReplacements, $value); + $passed = true; + break; + case 'default_timezone': + $value=$value*60*60; + $passed = true; + break; + case 'string_dir_mode': + $value=$dir_mode; + $passed = true; + break; + case 'string_file_mode': + $value=$file_mode; + $passed = true; + break; + case 'pages_directory': + break; + case 'wbmailer_smtp_auth': + // $value = isset($_POST[$setting_name]) ? $_POST[$setting_name] : '' ; + $value = true ; + $passed = true; + break; + case 'sec_token_netmask4': + $iValue = intval( $value ); + $value = (($iValue > 32) || ( $iValue < 0 ) ? '24' : $value); + $passed = true; + break; + case 'sec_token_netmask6': + $iValue = intval( $value ); + $value = (($iValue > 128) || ( $iValue < 0 ) ? '64' : $value); + $passed = true; + break; + case 'sec_token_life_time': + $value = $admin->sanitizeLifeTime(intval( $value ) * 60 ); + $passed = true; + break; + case 'wb_version': + continue; + break; + default : + $passed = in_array($setting_name, $allow_empty_values); + break; + endswitch; + if(is_array($value)){ $value = $value['0']; } + if ( !in_array($setting_name, $allow_tags_in_fields)) { + $value = strip_tags($value); + } else { + + } + if ( (!in_array($value, $disallow_in_fields) && (isset($_POST[$setting_name])) || $passed == true)) { + $sIdentifier = trim($database->escapeString($setting_name)); + $value = trim($database->escapeString($value)); + if (!db_update_key_value('settings',$sIdentifier,$value)) { + $admin->print_error($database->get_error, $js_back ); + } +/* + $sql = 'UPDATE `'.TABLE_PREFIX.'settings` SET ' + . '`value`=\''.$value.'\' ' + . 'WHERE `name`=\''.$database->escapeString($setting_name).'\''; + if (!$database->query($sql)) { + $admin->print_error($database->get_error, $js_back ); + break; + } +*/ + } + endwhile; +} + +// Query current search settings in the db, then loop through them and update the db with the new value +$sql = 'SELECT `name`, `value` FROM `'.TABLE_PREFIX.'search` ' + . 'WHERE `extra`=\'\''; +if (!($res_search = $database->query($sql))) { + $admin->print_error($database->is_error(), $js_back ); +} +while($search_setting = $res_search->fetchRow()) : + $old_value = $search_setting['value']; + $setting_name = $search_setting['name']; + $post_name = 'search_'.$search_setting['name']; + + // hold old value if post is empty + // check search template + $value = (($admin->get_post($post_name) == '') && ($setting_name != 'template')) + ? $old_value + : $admin->get_post($post_name); + if (isset($value)) { + $value = $database->escapeString($value); + $sql = 'UPDATE `'.TABLE_PREFIX.'search` ' + . 'SET `value`=\''.$value.'\' ' + . 'WHERE `name`=\''.$setting_name.'\' AND `extra`=\'\''; + if(!($database->query($sql))) { + $admin->print_error( TABLE_PREFIX.'search :: '.$MESSAGE['GENERIC_NOT_UPGRADED'].'
'.$database->get_error, $js_back ); + break; + } + // $sql_info = mysql_info($database->db_handle); //->> nicht mehr erforderlich + } +endwhile; + +$admin->print_success($MESSAGE['SETTINGS_SAVED'], $js_back ); +$admin->print_footer(); + Property changes on: trunk/admin/settings/save.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/start/index.php =================================================================== --- trunk/admin/start/index.php (nonexistent) +++ trunk/admin/start/index.php (revision 2) @@ -0,0 +1,195 @@ + WB_PATH.'/modules/', + 'templates' => WB_PATH.'/templates/', + 'languages' => WB_PATH.'/languages/' + ); + foreach($dirs AS $type => $dir) { + if( ($handle = opendir($dir)) ) { + while(false !== ($file = readdir($handle))) { + if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'admin.php' AND $file != 'index.php') { + // Get addon type + if($type == 'modules') { + load_module($dir.'/'.$file, true); + // Pretty ugly hack to let modules run $admin->set_error + // See dummy class definition admin_dummy above + if(isset($admin->error) && $admin->error != '') { + $admin->print_error($admin->error); + } + } elseif($type == 'templates') { + load_template($dir.'/'.$file); + } elseif($type == 'languages') { + load_language($dir.'/'.$file); + } + } + } + closedir($handle); + } + } + $sql = 'DELETE FROM `'.TABLE_PREFIX.'settings` WHERE `name`=\'FINALIZE_SETUP\''; + if($database->query($sql)) { } +} +// --------------------------------------- +$msg = '
'; +// check if it is neccessary to start the uograde-script +if(($admin->ami_group_member('1')) && file_exists(WB_PATH.'/upgrade-script.php')) { + // check if it is neccessary to start the uograde-script + $oldVersion = ''; +/* + $oldVersion = ''.WB_VERSION.(@WB_SP ? : ''); + $newVersion = ''.VERSION.( @SP ? : ''); +*/ + $oldVersion = trim(''.WB_VERSION.'+'.WB_REVISION.'+'.( defined('WB_SP') ? WB_SP : ''), '+'); + $newVersion = trim(''.VERSION.'+'.REVISION.'+'.( defined('SP') ? SP : ''), '+'); + if ( version_compare($oldVersion, $newVersion, '<') === true ) { + if(!headers_sent()) { + header('Location: '.WB_URL.'/upgrade-script.php'); + exit; + } else { + echo "
'; +} + +/** + * delete stored ip adresses default after 60 days + */ +$sql = 'UPDATE `'.TABLE_PREFIX.'users` SET `login_ip` = \'\' WHERE `login_when` < '.(time()-(60*84600)); +$database->query($sql); + +// Setup template object, parse vars to it, then parse it +// Create new template object +$template = new Template(dirname($admin->correct_theme_source('start.htt'))); +$template->set_file('page', 'start.htt'); +$template->set_block('page', 'main_block', 'main'); + +// Insert values into the template object +$template->set_var(array( + 'WELCOME_MESSAGE' => $MESSAGE['START_WELCOME_MESSAGE'], + 'CURRENT_USER' => $MESSAGE['START_CURRENT_USER'], + 'DISPLAY_NAME' => $admin->get_display_name(), + 'ADMIN_URL' => ADMIN_URL, + 'WB_URL' => WB_URL, + 'THEME_URL' => THEME_URL, + 'WB_VERSION' => WB_VERSION, + 'START_LIST' => ' ' + ) + ); +// Insert permission values into the template object +$get_permission = (function($type='preferences', $ParentBlock='main_block') use ($admin, $template){ + $template->set_block($ParentBlock, 'show_'.$type.'_block', 'show_'.$type); + if ($admin->get_permission($type) != true) { + $template->set_block('show_'.$type, ''); + return false; + } else { + $template->parse('show_'.$type, 'show_'.$type.'_block', true); + } + return true; +}); +$get_permission ('pages'); +$get_permission ('media'); +$get_permission ('addons'); +$get_permission ('settings'); +$get_permission ('admintools'); +$get_permission ('access'); + +//$msg .= (file_exists(WB_PATH.'/install/')) ? $MESSAGE['START_INSTALL_DIR_EXISTS'] : $msg; + +// Check if installation directory still exists +if (file_exists(WB_PATH.'/upgrade-script.php') ) { +// Check if user is part of Adminstrators group / better be a Systemadministrator +// if ($admin->ami_group_member(1)){ + if ($admin->get_user_id() == 1) { + $template->set_var('WARNING', $msg ); + } else { + $template->set_var('DISPLAY_WARNING', 'display:none;'); + } +} else { + $template->set_var('DISPLAY_WARNING', 'display:none;'); +} + +// Insert "Add-ons" section overview (pretty complex compared to normal) +$addons_overview = $TEXT['MANAGE'].' '; +$addons_count = 0; +if($admin->get_permission('modules') == true) +{ + $addons_overview .= ''.$MENU['MODULES'].''; + $addons_count = 1; +} +if($admin->get_permission('templates') == true) +{ + if($addons_count == 1) { $addons_overview .= ', '; } + $addons_overview .= ''.$MENU['TEMPLATES'].''; + $addons_count = 1; +} +if($admin->get_permission('languages') == true) +{ + if($addons_count == 1) { $addons_overview .= ', '; } + $addons_overview .= ''.$MENU['LANGUAGES'].''; +} + +// Insert "Access" section overview (pretty complex compared to normal) +$access_overview = $TEXT['MANAGE'].' '; +$access_count = 0; +if($admin->get_permission('users') == true) { + $access_overview .= ''.$MENU['USERS'].''; + $access_count = 1; +} +if($admin->get_permission('groups') == true) { + if($access_count == 1) { $access_overview .= ', '; } + $access_overview .= ''.$MENU['GROUPS'].''; + $access_count = 1; +} + +// Insert section names and descriptions +$template->set_var(array( + 'PAGES' => $MENU['PAGES'], + 'MEDIA' => $MENU['MEDIA'], + 'ADDONS' => $MENU['ADDONS'], + 'ACCESS' => $MENU['ACCESS'], + 'PREFERENCES' => $MENU['PREFERENCES'], + 'SETTINGS' => $MENU['SETTINGS'], + 'ADMINTOOLS' => $MENU['ADMINTOOLS'], + 'HOME_OVERVIEW' => $OVERVIEW['START'], + 'PAGES_OVERVIEW' => $OVERVIEW['PAGES'], + 'MEDIA_OVERVIEW' => $OVERVIEW['MEDIA'], + 'ADDONS_OVERVIEW' => $addons_overview, + 'ACCESS_OVERVIEW' => $access_overview, + 'PREFERENCES_OVERVIEW' => $OVERVIEW['PREFERENCES'], + 'SETTINGS_OVERVIEW' => $OVERVIEW['SETTINGS'], + 'ADMINTOOLS_OVERVIEW' => $OVERVIEW['ADMINTOOLS'] + ) + ); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/start/index.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/templates/details.php =================================================================== --- trunk/admin/templates/details.php (nonexistent) +++ trunk/admin/templates/details.php (revision 2) @@ -0,0 +1,126 @@ +checkFTAN() ){ + $admin->print_header(); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL ); + } + $admin->print_header(); + + $file = ''; +// Check if user selected template + if (!isset($_POST['file']) || $_POST['file'] == false) { + $iAddonId = 0; + $admin->print_error( $MESSAGE['GENERIC_FORGOT_OPTIONS'], $js_back ); + } else { + $iAddonId = $admin->checkIDKEY('file',0); + } + if ($iAddonId == 0){ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); + } + +// Get template directory + $sqlAddons = 'SELECT `directory` FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `addon_id`='.(int)$iAddonId.' ' + . ''.''; + if ($file = $database->get_one($sqlAddons)) { + $file = preg_replace('/[^a-z0-9_-]/i', "", $file); // fix secunia 2010-92-2 + } + +// Check if the template exists + if (!is_readable(WB_PATH.'/templates/'.$file)) { + $admin->print_error($MESSAGE['GENERIC_NOT_INSTALLED'], $js_back ); + } + +// Setup template object, parse vars to it, then parse it +// Create new template object +$template = new Template(dirname($admin->correct_theme_source('templates_details.htt'))); +// $template->debug = true; +$template->set_file('page', 'templates_details.htt'); +$template->set_block('page', 'main_block', 'main'); +$template->set_var('FTAN', $admin->getFTAN()); + +// Insert values + $sqlAddons = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `type` = \'template\' ' + . 'AND `directory` = \''.$file.'\''; + if($result = $database->query($sqlAddons)) { + $row = $result->fetchRow(MYSQLI_ASSOC); + } + +// check if a template description exists for the displayed backend language +$tool_description = false; +if(function_exists('file_get_contents') && file_exists(WB_PATH.'/templates/'.$file.'/languages/'.LANGUAGE .'.php')) { + // read contents of the template language file into string + $data = @file_get_contents(WB_PATH .'/templates/' .$file .'/languages/' .LANGUAGE .'.php'); + // use regular expressions to fetch the content of the variable from the string + $tool_description = get_variable_content('template_description', $data, false, false); + // replace optional placeholder {WB_URL} with value stored in config.php + if($tool_description !== false && strlen(trim($tool_description)) != 0) { + $tool_description = str_replace('{WB_URL}', WB_URL, $tool_description); + } else { + $tool_description = false; + } +} +if($tool_description !== false) { + // Override the template-description with correct desription in users language + $row['description'] = $tool_description; +} + +$template->set_var(array( + 'NAME' => $row['name'], + 'TYPE' => $row['function'], + 'AUTHOR' => $row['author'], + 'DESCRIPTION' => $row['description'], + 'VERSION' => $row['version'], + 'DESIGNED_FOR' => $row['platform'] + ) + ); + +// Insert language headings +$template->set_var(array( + 'HEADING_TEMPLATE_DETAILS' => $HEADING['TEMPLATE_DETAILS'] + ) + ); +// Insert language text and messages +$template->set_var(array( + 'TEXT_NAME' => $TEXT['NAME'], + 'TEXT_TYPE' => $TEXT['TYPE'], + 'TEXT_AUTHOR' => $TEXT['AUTHOR'], + 'TEXT_VERSION' => $TEXT['VERSION'], + 'TEXT_DESIGNED_FOR' => $TEXT['DESIGNED_FOR'], + 'TEXT_DESCRIPTION' => $TEXT['DESCRIPTION'], + 'TEXT_BACK' => $TEXT['BACK'] + ) + ); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/templates/details.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/templates/index.php =================================================================== --- trunk/admin/templates/index.php (nonexistent) +++ trunk/admin/templates/index.php (revision 2) @@ -0,0 +1,135 @@ +correct_theme_source('templates.htt'))); +// $template->debug = true; +$template->set_file('page', 'templates.htt'); +$template->set_block('page', 'main_block', 'main'); +$template->set_var('FTAN', $admin->getFTAN()); + +// Insert values into template list +$template->set_block('main_block', 'template_detail_block', 'template_detail'); +$template->set_block('template_detail_block', 'template_detail_select_block', 'template_detail_select'); +$template->set_block('main_block', 'template_uninstall_block', 'template_uninstall'); +$template->set_block('template_uninstall_block', 'template_uninstall_select_block', 'template_uninstall_select'); +$aPreventFromUninstall = array (' wb_theme ', ' WbTheme ', ' default ', ' default_theme ', ' DefaultTheme '); +$sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `type` = \'template\' ' + . 'ORDER BY `name`'; +if($oAddons = $database->query( $sql )) { + while($aAddon = $oAddons->fetchRow( MYSQLI_ASSOC )) { + if( !$admin->get_permission( $aAddon['directory'], 'template' )) { continue; } + $aAddonIdKey = $admin->getIDKEY($aAddon['addon_id']); + $template->set_var('DETAIL_VALUE', $aAddonIdKey); + $template->set_var('DETAIL_NAME', $aAddon['name']); + $template->parse('template_detail_select', 'template_detail_select_block', true); + if (!preg_match('/'.$aAddon['directory'].'/si', implode('|', $aPreventFromUninstall))) { + $template->set_var('UNINSTALL_VALUE', $aAddonIdKey); + $template->set_var('UNINSTALL_NAME', $aAddon['name']); + $template->parse('template_uninstall_select', 'template_uninstall_select_block', true); + } + } +} + +// Insert permissions values +$template->set_block('main_block', 'template_install_block', 'template_install'); +if($admin->get_permission('templates_install') != true) { + $template->set_var('DISPLAY_INSTALL', ''); + $template->set_block('template_install', ''); +} else { + $template->parse('template_install', 'template_install_block', true); +} +if($admin->get_permission('templates_uninstall') != true) { + $template->set_var('DISPLAY_UNINSTALL', ''); + $template->set_block('template_uninstall', ''); +} else { + $template->parse('template_uninstall', 'template_uninstall_block', true); +} +if($admin->get_permission('templates_view') != true) { + $template->set_var('DISPLAY_LIST', ''); + $template->set_block('template_detail', ''); +} else { + $template->parse('template_detail', 'template_detail_block', true); +} + +$template->set_block('main_block', 'addon_module_block', 'addon_module'); +if($admin->get_permission('modules_view') != true) { + $template->set_block ('addon_module', ''); +} else { + $template->parse('addon_module', 'addon_module_block', true); +} + +$template->set_block('main_block', 'addon_language_block', 'addon_language'); +if($admin->get_permission('languages_view') != true) { + $template->set_block ('addon_language', ''); +} else { + $template->parse('addon_language', 'addon_language_block', true); +} + +$template->set_block('main_block', 'addon_template_block', 'addon_template'); +if($admin->get_permission('admintools') != true) { + $template->set_block ('addon_template', ''); +} else { + $template->parse('addon_template', 'addon_template_block', true); +} + + + +// Insert language headings +$template->set_var(array( + 'HEADING_INSTALL_TEMPLATE' => $HEADING['INSTALL_TEMPLATE'], + 'HEADING_UNINSTALL_TEMPLATE' => $HEADING['UNINSTALL_TEMPLATE'], + 'HEADING_TEMPLATE_DETAILS' => $HEADING['TEMPLATE_DETAILS'] + ) + ); +// insert urls +$template->set_var(array( + 'ADMIN_URL' => ADMIN_URL, + 'WB_URL' => WB_URL, + 'THEME_URL' => THEME_URL, + 'FTAN' => $admin->getFTAN() + ) + ); +// Insert language text and messages +$template->set_var(array( + 'URL_MODULES' => $admin->get_permission('modules') ? ADMIN_URL . '/modules/index.php' : '', + 'URL_LANGUAGES' => $admin->get_permission('languages') ? ADMIN_URL . '/languages/index.php' : '', + 'URL_ADVANCED' => ' ', + 'MENU_LANGUAGES' => $admin->get_permission('languages') ? $MENU['LANGUAGES'] : ' ', + 'MENU_MODULES' => $admin->get_permission('modules') ? $MENU['MODULES'] : ' ', + 'TEXT_INSTALL' => $TEXT['INSTALL'], + 'TEXT_UNINSTALL' => $TEXT['UNINSTALL'], + 'TEXT_VIEW_DETAILS' => $TEXT['VIEW_DETAILS'], + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], + 'CHANGE_TEMPLATE_NOTICE' => $MESSAGE['TEMPLATES']['CHANGE_TEMPLATE_NOTICE'] + ) +); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/templates/index.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/templates/install.php =================================================================== --- trunk/admin/templates/install.php (nonexistent) +++ trunk/admin/templates/install.php (revision 2) @@ -0,0 +1,161 @@ +checkFTAN() ) +{ + $admin->print_header(); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); +} +// After check print the header +$admin->print_header(); + +// Check if user uploaded a file +if(!isset($_FILES['userfile'])) { + $admin->print_error($MESSAGE['GENERIC_ERROR_OPENING_FILE'], $js_back ); +} + +// Include the WB functions file +if (!function_exists('load_template')){require(WB_PATH.'/framework/functions.php');} + +// Set temp vars +$temp_dir = WB_PATH.'/temp/'; +$temp_file = $temp_dir . $_FILES['userfile']['name']; +$temp_unzip = WB_PATH.'/temp/unzip/'; + +// Try to upload the file to the temp dir +if(!move_uploaded_file($_FILES['userfile']['tmp_name'], $temp_file)) { + $admin->print_error($MESSAGE['GENERIC_CANNOT_UPLOAD'], $js_back ); +} + +// Include the PclZip class file (thanks to +if(!class_exists('PclZip')){ require(WB_PATH.'/include/pclzip/pclzip.lib.php');} + +// Remove any vars with name "template_directory" and "theme_directory" +if (isset($template_directory)){unset($template_directory);} +if (isset($theme_directory)){unset($theme_directory);} + +// Setup the PclZip object +$archive = new PclZip($temp_file); +// Unzip the files to the temp unzip folder +$list = $archive->extract(PCLZIP_OPT_PATH, $temp_unzip); +// Check if uploaded file is a valid Add-On zip file +if (!($list || !file_exists($temp_unzip . 'info.php'))) { + $admin->print_error($MESSAGE['GENERIC_INVALID_ADDON_FILE']); +} + +// Include the templates info file +require($temp_unzip.'info.php'); + +// Perform Add-on requirement checks before proceeding +require(WB_PATH . '/framework/addon.precheck.inc.php'); +preCheckAddon($temp_file); + +// Delete the temp unzip directory +rm_full_dir($temp_unzip); + +// Check if the file is valid +if(!isset($template_directory)) { + if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file + $admin->print_error($MESSAGE['GENERIC_INVALID']); +} +// Check if this module is already installed +// and compare versions if so +$new_template_version = $template_version; +unset($template_version); +$success_message = $MESSAGE['GENERIC_MODULE_VERSION_ERROR']; + +if (is_dir(WB_PATH.'/templates/'.$template_directory)) { + + if (file_exists(WB_PATH.'/templates/'.$template_directory.'/info.php')) { + require(WB_PATH.'/templates/'.$template_directory.'/info.php'); + $sql = 'SELECT `version` FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `directory`=\''.$template_directory.'\''; + $old_template_version = $database->get_one($sql); + // Version to be installed is older than currently installed version + if (versionCompare($old_template_version, $new_template_version, '>=')) { + if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file + $admin->print_error($template_directory.'
'.$MESSAGE['GENERIC_ALREADY_INSTALLED'].'
'.'Version '.$old_template_version); + } else { + if (is_readable(WB_PATH.'/templates/'.$template_directory.'/upgrade.php')) { + require(WB_PATH.'/templates/'.$template_directory.'/upgrade.php'); + } + $success_message = $MESSAGE['GENERIC_UPGRADED']; + + } + } +} else { + $success_message = $MESSAGE['GENERIC_INSTALLED']; +} + +// Check if template dir is writable +if(!is_writable(WB_PATH.'/templates/')) { + if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file + $admin->print_error($MESSAGE['TEMPLATES_BAD_PERMISSIONS']); +} + +// Set template dir +$template_dir = WB_PATH.'/templates/'.$template_directory; + +// Make sure the template dir exists, and chmod if needed +if(!file_exists($template_dir)) { + make_dir($template_dir); +} else { + change_mode($template_dir, 'dir'); +} + +// Unzip template to the template dir +$list = (int)$archive->extract(PCLZIP_OPT_PATH, $template_dir, PCLZIP_OPT_REPLACE_NEWER); +if ($list==0) +{ + $admin->print_error($MESSAGE['GENERIC_CANNOT_UNZIP']); +} + +// Delete the temp zip file +if (file_exists($temp_file)) { unlink($temp_file); } + +// Chmod all the uploaded files +$dir = dir($template_dir); +while(false !== $entry = $dir->read()) { + // Skip pointers + if(substr($entry, 0, 1) != '.' AND $entry != '.svn' AND !is_dir($template_dir.'/'.$entry)) { + // Chmod file + change_mode($template_dir.'/'.$entry); + } +} + +// Load template info into DB +if (load_template($template_dir)===true){ +// Print success message + $admin->print_success($success_message); +} else { + $admin->print_error($MESSAGE['GENERIC_ALREADY_INSTALLED']); +} +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/templates/install.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/templates/uninstall.php =================================================================== --- trunk/admin/templates/uninstall.php (nonexistent) +++ trunk/admin/templates/uninstall.php (revision 2) @@ -0,0 +1,170 @@ +$v) $aStr = str_replace("{{".$k."}}", $v, $aStr); + return $aStr; + } +} + +// suppress to print the header, so no new FTAN will be set +$admin = new admin('Addons', 'templates_uninstall', false); + +$js_back = ADMIN_URL.'/templates/index.php'; + + if( !$admin->checkFTAN() ){ + $admin->print_header(); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); + } + // After check print the header + $admin->print_header(); + + $file = ''; +// Check if user selected template + if (!isset($_POST['file']) || $_POST['file'] == false) { + $iAddonId = 0; + $admin->print_error( $MESSAGE['GENERIC_FORGOT_OPTIONS'], $js_back ); + } else { + $iAddonId = $admin->checkIDKEY('file',0); + } + if ($iAddonId == 0){ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); + } + +// Get template directory + $sqlAddons = 'SELECT `directory` FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `addon_id`='.(int)$iAddonId.' ' + . ''.''; + if ($file = $database->get_one($sqlAddons)) { + $file = preg_replace('/[^a-z0-9_-]/i', "", $file); // fix secunia 2010-92-2 + } + +// check whether the template is used as default wb theme +$aPreventFromUninstall = array ('wb_theme', 'WbTheme', 'default_theme', 'DefaultTheme', 'default' ); +if( + $file == DEFAULT_THEME || + preg_match('/'.$file.'/si', implode('|', $aPreventFromUninstall )) +) { + $temp = array ('name' => $file ); + $msg = replace_all( $MESSAGE['GENERIC_CANNOT_UNINSTALL_IS_DEFAULT_THEME'], $temp ); + $admin->print_error( $msg ); +} +// Check if the template exists +if (!is_dir(WB_PATH.'/templates/'.$file)) { + $admin->print_error($MESSAGE['GENERIC_NOT_INSTALLED'], $js_back ); +} +/** +* Check if the template is the standard-template or still in use +*/ +if (!array_key_exists('CANNOT_UNINSTALL_IS_DEFAULT_TEMPLATE', $MESSAGE['GENERIC'] ) ) + $MESSAGE['GENERIC_CANNOT_UNINSTALL_IS_DEFAULT_TEMPLATE'] = "Can't uninstall this template {{name}} because it's the standardtemplate!"; + +// check whether the template is used as default wb theme +if($file == DEFAULT_THEME) { + $temp = array ('name' => $file ); + $msg = replace_all( $MESSAGE['GENERIC_CANNOT_UNINSTALL_IS_DEFAULT_TEMPLATE'], $temp ); + $admin->print_error( $msg ); +} + +if ($file == DEFAULT_TEMPLATE) { + $temp = array ('name' => $file ); + $msg = replace_all( $MESSAGE['GENERIC_CANNOT_UNINSTALL_IS_DEFAULT_TEMPLATE'], $temp ); + $admin->print_error( $msg ); + +} else { + + /** + * Check if the template is still in use by a page ... + */ + + $sqlPage = 'SELECT `page_id`, `page_title` FROM `'.TABLE_PREFIX.'pages` ' + . 'WHERE `template`=\''.$file.'\' ' + . 'ORDER BY `page_title`'.' '; + $info = $database->query($sqlPage); + if ($info->numRows() > 0) { + /** + * Template is still in use, so we're collecting the page-titles + */ + + /** + * The base-message template-string for the top of the message + */ + if (!array_key_exists("CANNOT_UNINSTALL_IN_USE_TMPL", $MESSAGE['GENERIC'])) { + $add = $info->numRows() == 1 ? "this page" : "these pages"; + $msg_template_str = "
{{type}} {{type_name}} could not be uninstalled because it is still in use by {{pages}}"; + $msg_template_str .= ":
click for editing.
"; + } else { + $msg_template_str = $MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE_TMPL']; + $temp = explode(";",$MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE_TMPL_PAGES']); + $add = $info->numRows() == 1 ? $temp[0] : $temp[1]; + } + /** + * The template-string for displaying the Page-Titles ... in this case as a link + */ + $page_template_str = "- {{title}}
"; + $values = array ('type' => 'Template', 'type_name' => $file, 'pages' => $add); + $msg = replace_all ( $msg_template_str, $values ); + $page_names = ""; + + while ($data = $info->fetchRow() ) { + $page_info = array( + 'id' => $data['page_id'], + 'title' => $data['page_title'] + ); + $page_names .= replace_all ( $page_template_str, $page_info ); + } + + /** + * Printing out the error-message and die(). + */ + $admin->print_error($MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE'].$msg.$page_names); + } +} + +// Check if we have permissions on the directory + if (!is_writable(WB_PATH.'/templates/'.$file)) { + $admin->print_error(' ('.$file.') '.$MESSAGE['GENERIC_CANNOT_UNINSTALL'], $js_back); + } +// Try to delete the template dir + if (!rm_full_dir(WB_PATH.'/templates/'.$file)) { + $admin->print_error(' ('.$file.') '.$MESSAGE['GENERIC_CANNOT_UNINSTALL'], $js_back); + } else { + // Remove entry from DB + $sql = 'DELETE FROM `'.TABLE_PREFIX.'addons`' + . 'WHERE `directory` = \''.$file.'\' ' + . 'AND type = \'template\' '; + $database->query($sql); + } + +// Update pages that use this template with default template + $sql = 'UPDATE '.TABLE_PREFIX.'pages SET ' + . 'template = '.DEFAULT_TEMPLATE.'' + . 'WHERE template = \''.$file.'\''; + if (!$database->query($sql)){} +// Print success message + $admin->print_success(' ('.$file.') '.$MESSAGE['GENERIC_UNINSTALLED'], $js_back); + + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/templates/uninstall.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/themes/templates/SectionInfoLine.htt =================================================================== --- trunk/admin/themes/templates/SectionInfoLine.htt (nonexistent) +++ trunk/admin/themes/templates/SectionInfoLine.htt (revision 2) @@ -0,0 +1,22 @@ + + +
+
+
+{BACKEND_BODY_MODULE_JS}
+
')."\n" ;
+ // output block name if blocks are enabled
+// if (SECTION_BLOCKS) {
+ if (isset($block[$section['block']]) && trim(strip_tags(($block[$section['block']]))) != '')
+ {
+ $block_name = htmlentities(strip_tags($block[$section['block']]));
+ } else {
+ if ($section['block'] == 1)
+ {
+ $block_name = $TEXT['MAIN'];
+ } else {
+ $block_name = '#' . (int) $section['block'];
+ }
+ }
+
+ ob_start() ;
+ require(WB_PATH.'/modules/'.$module.'/modify.php');
+ $content = ob_get_clean() ;
+ if($content != '')
+ {
+ echo $sSectionBlock;//block-outer
+ $sSectionIdPrefix = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? SEC_ANCHOR : '' );
+ $data = array();
+ $tpl = new Template(dirname($admin->correct_theme_source('SectionInfoLine.htt')),'keep');
+ // $template->debug = true;
+ $tpl->set_file('page', 'SectionInfoLine.htt');
+ $tpl->set_block('page', 'main_block', 'main');
+ $tpl->set_block('main_block', 'section_block', 'section_save');
+ $data['aTarget.SectionIdPrefix'] = $sSectionIdPrefix.$section_id;
+ $data['aTarget.SectionInfoLine'] = $sSectionInfoLine;
+ $data['aTarget.sectionBlock'] = $section['block'];
+ $data['aTarget.SectionId'] = $section_id;
+ $data['aTarget.pageId'] = $page_id;
+ $data['aTarget.FTAN'] = $admin->getFTAN();
+ $data['aTarget.BlockName'] = $block_name;
+ $data['aTarget.sectionUrl'] = ADMIN_URL.'/pages/';
+ $data['aTarget.sectionModule'] = $section['module'];
+ $data['aTarget.title'] = $section['title'];
+ $data['aTarget.Content'] = '';
+ if( $admin->get_permission('pages_settings') ) {
+ $data['lang.TEXT_SUBMIT'] = $TEXT['SAVE'];
+ $tpl->parse('section_save', 'section_block');
+ } else {
+ $tpl->parse('section_save', '');
+ }
+ $tpl->set_var($data);
+ $tpl->parse('main', 'main_block', false);
+ $tpl->pparse('output', 'page');
+ unset($tpl);
+ $sAfterContent = '
'."\n" ;
+ $content = $content."\n".$sAfterContent;
+ echo $content;
+ }
+ }
+ }
+ }
+}
+
+// Print admin footer
+$admin->print_footer();
Property changes on: trunk/admin/pages/modify.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Index: trunk/admin/pages/move_down.php
===================================================================
--- trunk/admin/pages/move_down.php (nonexistent)
+++ trunk/admin/pages/move_down.php (revision 2)
@@ -0,0 +1,66 @@
+move_down($id)) {
+ $admin->print_success($MESSAGE['PAGES']['REORDERED']);
+ } else {
+ $admin->print_error($MESSAGE['PAGES']['CANNOT_REORDER']);
+ }
+} else {
+ if($order->move_down($id)) {
+ $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/sections.php?page_id='.$page_id);
+ } else {
+ $admin->print_error($TEXT['ERROR'], ADMIN_URL.'/pages/sections.php?page_id='.$page_id);
+ }
+}
+
+// Print admin footer
+$admin->print_footer();
+
+?>
\ No newline at end of file
Property changes on: trunk/admin/pages/move_down.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Index: trunk/admin/pages/move_up.php
===================================================================
--- trunk/admin/pages/move_up.php (nonexistent)
+++ trunk/admin/pages/move_up.php (revision 2)
@@ -0,0 +1,66 @@
+move_up($id)) {
+ $admin->print_success($MESSAGE['PAGES']['REORDERED']);
+ } else {
+ $admin->print_error($MESSAGE['PAGES']['CANNOT_REORDER']);
+ }
+} else {
+ if($order->move_up($id)) {
+ $admin->print_success($TEXT['SUCCESS'], ADMIN_URL.'/pages/sections.php?page_id='.$page_id);
+ } else {
+ $admin->print_error($TEXT['ERROR'], ADMIN_URL.'/pages/sections.php?page_id='.$page_id);
+ }
+}
+
+// Print admin footer
+$admin->print_footer();
+
+?>
\ No newline at end of file
Property changes on: trunk/admin/pages/move_up.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Index: trunk/admin/pages/page_calendar.js
===================================================================
--- trunk/admin/pages/page_calendar.js (nonexistent)
+++ trunk/admin/pages/page_calendar.js (revision 2)
@@ -0,0 +1,27 @@
+Calendar.setup(
+ {
+ inputField : start_date,
+ ifFormat : jscal_ifformat,
+ button : trigger_start,
+ firstDay : jscal_firstday,
+ showsTime : showsTime,
+ timeFormat : timeFormat,
+ date : jscal_today,
+ range : [1970, 2037],
+ step : 1
+ }
+);
+
+Calendar.setup(
+ {
+ inputField : end_date,
+ ifFormat : jscal_ifformat,
+ button : trigger_end,
+ firstDay : jscal_firstday,
+ showsTime : showsTime,
+ timeFormat : timeFormat,
+ date : jscal_today,
+ range : [1970, 2037],
+ step : 1
+ }
+);
Index: trunk/admin/pages/page_index.js
===================================================================
--- trunk/admin/pages/page_index.js (nonexistent)
+++ trunk/admin/pages/page_index.js (revision 2)
@@ -0,0 +1,35 @@
+/*-- Addition for remembering expanded state of pages --*/
+function writeSessionCookie (cookieName, cookieValue) {
+ document.cookie = escape(cookieName) + "=" + escape(cookieValue) + ";";
+}
+
+function toggle_viewers() {
+ if(document.add.visibility.value == 'private') {
+ document.getElementById('viewers').style.display = 'block';
+ } else if(document.add.visibility.value == 'registered') {
+ document.getElementById('viewers').style.display = 'block';
+ } else {
+ document.getElementById('viewers').style.display = 'none';
+ }
+}
+function toggle_visibility(id){
+ if(document.getElementById(id).style.display == "block") {
+ document.getElementById(id).style.display = "none";
+ writeSessionCookie (id, "0");//Addition for remembering expanded state of pages
+ } else {
+ document.getElementById(id).style.display = "block";
+ writeSessionCookie (id, "1");//Addition for remembering expanded state of pages
+ }
+}
+var plus = new Image;
+plus.src = THEME_URL+"/images/plus_16.png";
+var minus = new Image;
+minus.src = THEME_URL+"/images/minus_16.png";
+function toggle_plus_minus(id) {
+ var img_src = document.images['plus_minus_' + id].src;
+ if(img_src == plus.src) {
+ document.images['plus_minus_' + id].src = minus.src;
+ } else {
+ document.images['plus_minus_' + id].src = plus.src;
+ }
+}
\ No newline at end of file
Index: trunk/admin/pages/page_settings.js
===================================================================
--- trunk/admin/pages/page_settings.js (nonexistent)
+++ trunk/admin/pages/page_settings.js (revision 2)
@@ -0,0 +1,26 @@
+function toggle_viewers() {
+ if(document.settings.visibility.value == 'private' || document.settings.visibility.value == 'registered') {
+ document.getElementById('allowed_viewers').style.display = 'block';
+ } else {
+ document.getElementById('allowed_viewers').style.display = 'none';
+ }
+}
+var lastselectedindex = new Array();
+
+function disabled_hack_for_ie(sel) {
+ var sels = document.getElementsByTagName("select");
+ var i;
+ var sel_num_in_doc = 0;
+ for (i = 0; i Creating '.$index.' access files
'; Property changes on: trunk/admin/pages/rebuildAccessFiles.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/pages/restore.php =================================================================== --- trunk/admin/pages/restore.php (nonexistent) +++ trunk/admin/pages/restore.php (revision 2) @@ -0,0 +1,102 @@ +query("SELECT admin_groups,admin_users FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"); +$results_array = $results->fetchRow(); + +// Find out more about the page +$query = "SELECT * FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"; +$results = $database->query($query); +if($database->is_error()) { + $admin->print_error($database->get_error()); +} +if($results->numRows() == 0) { + $admin->print_error($MESSAGE['PAGES']['NOT_FOUND']); +} +$results_array = $results->fetchRow(); +$old_admin_groups = explode(',', str_replace('_', '', $results_array['admin_groups'])); +$old_admin_users = explode(',', str_replace('_', '', $results_array['admin_users'])); + +$in_old_group = FALSE; +foreach($admin->get_groups_id() as $cur_gid){ + if (in_array($cur_gid, $old_admin_groups)) { + $in_old_group = TRUE; + } +} +if((!$in_old_group) AND !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) { + $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); +} + +$visibility = $results_array['visibility']; + +if(PAGE_TRASH) { + if($visibility == 'deleted') { + // Function to change all child pages visibility to deleted + function restore_subs($parent = 0) { + global $database; + // Query pages + $query_menu = $database->query("SELECT page_id FROM ".TABLE_PREFIX."pages WHERE parent = '$parent' ORDER BY position ASC"); + // Check if there are any pages to show + if($query_menu->numRows() > 0) { + // Loop through pages + while($page = $query_menu->fetchRow()) { + // Update the page visibility to 'deleted' + $database->query("UPDATE ".TABLE_PREFIX."pages SET visibility = 'public' WHERE page_id = '".$page['page_id']."' LIMIT 1"); + // Run this function again for all sub-pages + restore_subs($page['page_id']); + } + } + } + + // Update the page visibility to 'deleted' + $database->query("UPDATE ".TABLE_PREFIX."pages SET visibility = 'public' WHERE page_id = '$page_id.' LIMIT 1"); + + // Run trash subs for this page + restore_subs($page_id); + + } +} + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error()); +} else { + $admin->print_success($MESSAGE['PAGES']['RESTORED']); +} + +// Print admin footer +$admin->print_footer(); + +?> \ No newline at end of file Property changes on: trunk/admin/pages/restore.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/pages/save.php =================================================================== --- trunk/admin/pages/save.php (nonexistent) +++ trunk/admin/pages/save.php (revision 2) @@ -0,0 +1,102 @@ +checkFTAN()) +{ + $admin->print_header(); + $sInfo = strtoupper(basename(__DIR__).'_'.basename(__FILE__, '.'.PAGE_EXTENSION)).''; + $sDEBUG=(@DEBUG?$sInfo:''); + $admin->print_error($sDEBUG.$MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL ); +} +// After check print the header +$admin->print_header(); + +// Get perms +$sql = 'SELECT `admin_groups`,`admin_users` ' + . 'FROM `'.TABLE_PREFIX.'pages` ' + . 'WHERE `page_id` = '.$page_id; +$results = $database->query($sql); +$results_array = $results->fetchRow(); +if(!$admin->ami_group_member($results_array['admin_users']) && + !$admin->is_group_match($admin->get_groups_id(), $results_array['admin_groups'])) +{ + $sInfo = strtoupper(basename(__DIR__).'_'.basename(__FILE__, '.'.PAGE_EXTENSION)); + $sDEBUG=(@DEBUG?$sInfo:''); + $admin->print_error($sDEBUG.$MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); +} +// Get page module +$sql = 'SELECT `module` FROM `'.TABLE_PREFIX.'sections` ' + . 'WHERE `page_id`='.$page_id.' AND `section_id`='.$section_id; +$module = $database->get_one($sql); +if(!$module) +{ + $admin->print_error( $database->is_error() ? $database->get_error() : $MESSAGE['PAGES_NOT_FOUND']); +} +/* +// Update the pages table +$now = time(); +$sql = 'UPDATE `'.TABLE_PREFIX.'pages` ' + . 'SET `modified_when`='.$now.', ' + . '`modified_by`='.$admin->get_user_id().' ' + . 'WHERE `page_id`='.$page_id; +$database->query($sql); +*/ +// Include the modules saving script if it exists +if(file_exists(WB_PATH.'/modules/'.$module.'/save.php')) +{ + include(WB_PATH.'/modules/'.$module.'/save.php'); +} +// Check if there is a db error, otherwise say successful +if($database->is_error()) +{ + $admin->print_error($database->get_error(), $js_back ); +} else { + $admin->print_success($MESSAGE['PAGES_SAVED'], $js_back ); +} + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/pages/save.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/pages/sections.php =================================================================== --- trunk/admin/pages/sections.php (nonexistent) +++ trunk/admin/pages/sections.php (revision 2) @@ -0,0 +1,590 @@ +checkIDKEY('section_id', 0, $_SERVER['REQUEST_METHOD'])))) ) + { + if($admin_header) { $admin->print_header(); } + $sInfo = strtoupper(basename(__DIR__).'_'.basename(__FILE__, ''.PAGE_EXTENSION)).'_idkey::'; + $sDEBUG=(@DEBUG?$sInfo:''); + $admin->print_error($sDEBUG.$MESSAGE['GENERIC_SECURITY_ACCESS'], $backlink); + } + $action = 'show'; + $sql = 'SELECT `module` FROM `'.TABLE_PREFIX.'sections` '; + $sql .= ' WHERE `section_id` ='.$section_id; + if( ( ($modulname = $database->get_one($sql)) == $module) && ($section_id > 0 ) ) { + // Include the modules delete file if it exists + if(file_exists(WB_PATH.'/modules/'.$modulname.'/delete.php')) + { + require(WB_PATH.'/modules/'.$modulname.'/delete.php'); + } + $sql = 'DELETE FROM `'.TABLE_PREFIX.'sections` '; + $sql .= 'WHERE `section_id` ='.(int)$section_id; + if( !$database->query($sql) ) { + if($admin_header) { $admin->print_header(); } + $admin->print_error($database->get_error(),$backlink); + } else { + if ( !class_exists( 'order', false ) ) { require(WB_PATH.'/framework/class.order.php'); } + $order = new order(TABLE_PREFIX.'sections', 'position', 'section_id', 'page_id'); + $order->clean($page_id); + $format = $TEXT['SECTION'].' %d %s %s '.strtolower( $TEXT['DELETED']); + $message = sprintf ($format,$section_id,strtoupper($modulname),strtolower($TEXT['SUCCESS'])); + if($admin_header) { $admin->print_header(); } + $admin_header = false; + unset($_POST); + $admin->print_success($message, $backlink ); + } + } else { + if($admin_header) { $admin->print_header(); } + $admin->print_error($module.' '.strtolower($TEXT['NOT_FOUND']), $backlink); + } + + break; + case 'add' : + if (!$admin->checkFTAN()) + { + $admin->print_header(); + $sInfo = strtoupper(basename(__DIR__).'_'.basename(__FILE__, ''.PAGE_EXTENSION)).'::'; + $sDEBUG=(@DEBUG?$sInfo:''); + $admin->print_error($sDEBUG.$MESSAGE['GENERIC_SECURITY_ACCESS'], $backlink); + } + $action = 'show'; + $module = preg_replace('/\W/', '', $module ); // fix secunia 2010-91-4 + require_once(WB_PATH.'/framework/class.order.php'); + // Get new order + $order = new order(TABLE_PREFIX.'sections', 'position', 'section_id', 'page_id'); + $position = $order->get_new($page_id); + // Insert module into DB + $sql = 'INSERT INTO `'.TABLE_PREFIX.'sections` SET ' + . '`page_id` = '.(int)$page_id.', ' + . '`module` = \''.$module.'\', ' + . '`position` = '.(int)$position.', ' + . '`block` = 1'; + if($database->query($sql)) { + // Get the section id + $section_id = $database->get_one("SELECT LAST_INSERT_ID()"); + // Include the selected modules add file if it exists + if ( + file_exists(WB_PATH.'/modules/'.$module.'/addon.php') && + file_exists(WB_PATH.'/modules/'.$module.'/cmd/cmdModify.inc') + ) { break; } + if(file_exists(WB_PATH.'/modules/'.$module.'/add.php')) + { + require(WB_PATH.'/modules/'.$module.'/add.php'); + } + } elseif ($database->is_error()) { + if($admin_header) { $admin->print_header(); } + $admin->print_error($database->get_error()); + } + break; + default: + break; +endswitch; + +switch ($action): + default: + if($admin_header) { $admin->print_header(); } + // Get perms + $sql = 'SELECT `admin_groups`,`admin_users` FROM `'.TABLE_PREFIX.'pages` ' + . 'WHERE `page_id` = '.$page_id; + $oPages = $database->query($sql); + $aPages = $oPages->fetchRow(MYSQLI_ASSOC); + $in_old_group = $admin->is_group_match($aPages['admin_groups'],$admin->get_groups_id()); +/* + $old_admin_groups = explode(',', $aPages['admin_groups']); + $old_admin_users = explode(',', $aPages['admin_users']); + $in_old_group = false; + foreach($admin->get_groups_id() as $cur_gid) + { + if (in_array($cur_gid, $old_admin_groups)) + { + $in_old_group = true; + } + } +*/ + if ((!$in_old_group) && !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) + { + $admin->print_header(); + $sInfo = strtoupper(basename(__DIR__).'_'.basename(__FILE__, ''.PAGE_EXTENSION)).'::'; + $sDEBUG=(@DEBUG?$sInfo:''); + $admin->print_error($sDEBUG.$MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); + } + // Get page details + $sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` ' + . 'WHERE `page_id` = '.$page_id; + $results = $database->query($sql); + if($database->is_error()) + { + // $admin->print_header(); + $admin->print_error($database->get_error()); + } + if($results->numRows() == 0) + { + // $admin->print_header(); + $admin->print_error($MESSAGE['PAGES_NOT_FOUND']); + } + $results_array = $results->fetchRow(MYSQLI_ASSOC); + // Set module permissions + $aAllowedModules = array(); + $sAllowedModules = ''; + $module_permissions = $_SESSION['MODULE_PERMISSIONS']; + $sAllowedModules = implode(', ', + array_map(function(&$item) use ($database){ + return '\''.$database->escapeString($item) .'\''; + }, $module_permissions)); + $sqlAddons = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `type` = \'module\' ' + . ($sAllowedModules?'AND `directory` NOT IN ('.$sAllowedModules.')' :'') + . 'ORDER BY `name`'; + if($oAddons = $database->query($sqlAddons)) + { + while($aAddons = $oAddons->fetchRow(MYSQLI_ASSOC)) + { + $aAllowedModules[] = $aAddons['directory']; + } + } + + $sAllowedModules = ''; + $sAllowedModules = implode(', ', + array_map(function(&$item) use ($database){ + return '\''.$database->escapeString($item) .'\''; + }, $aAllowedModules)); + // Unset block var + unset($block); + // Include template info file (if it exists) + if($results_array['template'] != '') + { + $template_location = WB_PATH.'/templates/'.$results_array['template'].'/info.php'; + } else { + $template_location = WB_PATH.'/templates/'.DEFAULT_TEMPLATE.'/info.php'; + } + if(file_exists($template_location)) + { + require($template_location); + } + // Check if $menu is set + if(!isset($block[1]) || $block[1] == '') + { + // Make our own menu list + $block[1] = $TEXT['MAIN']; + } + // Get display name of person who last modified the page + $user=$admin->get_user_details($results_array['modified_by']); + // Convert the unix ts for modified_when to human a readable form + if($results_array['modified_when'] != 0) + { + $modified_ts = gmdate(TIME_FORMAT.', '.DATE_FORMAT, $results_array['modified_when']+TIMEZONE); + } else { + $modified_ts = 'Unknown'; + } + /*-- load css files with jquery --*/ + // include jscalendar-setup + $jscal_use_time = true; // whether to use a clock, too + require_once(WB_PATH."/include/jscalendar/wb-setup.php"); + // Setup template object, parse vars to it, then parse it + // Create new template object + $tpl = new Template(dirname($admin->correct_theme_source('pages_sections.htt'))); + // $template->debug = true; + $tpl->set_file('page', 'pages_sections.htt'); + $tpl->set_block('page', 'main_block', 'main'); + $tpl->set_block('main_block', 'module_block', 'module_list'); + $tpl->set_block('main_block', 'show_section_block', 'show_section'); + $tpl->set_block('main_block', 'calendar_block', 'calendar_list'); + $tpl->set_var('FTAN', $admin->getFTAN()); + // setting trash only if more than one section exists + $tpl->set_block('show_section_block', 'can_delete_block', 'can_delete'); + $sql = 'SELECT COUNT(*) FROM `'.TABLE_PREFIX.'sections` ' + . 'WHERE `page_id`='.intval($page_id).' ' + . 'AND `module` IN ('.$sAllowedModules.')'; + $bSectionCanDelete = ($database->get_one($sql) > 1); + // set first defaults and messages + $tpl->set_var(array( + 'PAGE_ID' => $results_array['page_id'], + // 'PAGE_IDKEY' => $admin->getIDKEY($results_array['page_id']), + 'PAGE_IDKEY' => $results_array['page_id'], + 'TEXT_PAGE' => $TEXT['PAGE'], + 'TIMEZONE' => 'TIMEZONE', + 'PAGE_TITLE' => ($results_array['page_title']), + 'MENU_TITLE' => ($results_array['menu_title']), + 'TEXT_CURRENT_PAGE' => $TEXT['CURRENT_PAGE'], + 'HEADING_MANAGE_SECTIONS' => $HEADING['MANAGE_SECTIONS'], + 'HEADING_MODIFY_PAGE' => $HEADING['MODIFY_PAGE'], + 'TEXT_CHANGE_SETTINGS' => $TEXT['CHANGE_SETTINGS'], + 'TEXT_ADD_SECTION' => $TEXT['ADD_SECTION'], + 'TEXT_ID' => 'ID', + 'TEXT_TYPE' => $TEXT['TYPE'], + 'TEXT_BLOCK' => $TEXT['BLOCK'], + 'TEXT_PUBL_START_DATE' => $TEXT{'PUBL_START_DATE'}, + 'TEXT_PUBL_END_DATE' => $TEXT['PUBL_END_DATE'], + 'TEXT_ACTIONS' => $TEXT['ACTIONS'], + 'TEXT_MODIFY' => $TEXT['MODIFY'], + 'TEXT_MODIFY_PAGE' => $HEADING['MODIFY_PAGE'], + 'LAST_MODIFIED' => $MESSAGE['PAGES']['LAST_MODIFIED'], + 'MODIFIED_BY' => $user['display_name'], + 'MODIFIED_BY_USERNAME' => $user['username'], + 'MODIFIED_WHEN' => $modified_ts, + 'ADMIN_URL' => ADMIN_URL, + 'WB_URL' => WB_URL, + 'THEME_URL' => THEME_URL + ) + ); + // Insert variables + $tpl->set_var(array( + 'PAGE_ID' => $results_array['page_id'], + // 'PAGE_IDKEY' => $admin->getIDKEY($results_array['page_id']), + 'PAGE_IDKEY' => $results_array['page_id'], + 'VAR_PAGE_TITLE' => $results_array['page_title'], + 'SETTINGS_LINK' => ADMIN_URL.'/pages/settings.php?page_id='.$results_array['page_id'], + 'MODIFY_LINK' => ADMIN_URL.'/pages/modify.php?page_id='.$results_array['page_id'] + ) + ); + $tpl->set_block('show_section_block', 'section_list_block', 'section_list'); + $tpl->set_block('show_section_block', 'section_title_block', 'section_title'); + $sqlSections = 'SELECT * FROM `'.TABLE_PREFIX.'sections` ' + . 'WHERE `page_id` = '.(int)$page_id.' ' + . 'ORDER BY `position`'; +// $query_sections = $database->query($sql); + if ($query_sections = $database->query($sqlSections)) + { + $num_sections = $query_sections->numRows(); + $section = array(); + while($section = $query_sections->fetchRow(MYSQLI_ASSOC)) + { + if(!is_numeric(array_search($section['module'], $module_permissions))) + { + // Get the modules real name + $sql = 'SELECT `name` FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `directory` = "'.$section['module'].'"'; + if(!$database->get_one($sql) || !file_exists(WB_PATH.'/modules/'.$section['module'])) + { + $edit_page = ''.$section['module'].''; + $section['title'] = $MESSAGE['GENERIC_NOT_INSTALLED']; + }else + { + $edit_page = ''; + } + $sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' ) ? SEC_ANCHOR : ''); + $edit_page_0 = '' : '">'; + $edit_page_1 .= $section['module'].''; + + if ($section['title']!='') { + $sSectionTitle = ((mb_strlen($section['title']) > 35) ? mb_substr($section['title'], 0, 34).'…' : $section['title']); + $tpl->set_var('SECTION_TITLE', $sSectionTitle); + $tpl->set_var('SEC_TAG_TITLE', $section['title']); + $tpl->parse('section_title', 'section_title_block', false); + } else { + $tpl->parse('section_title', ''); + } + + if(SECTION_BLOCKS) + { + if($edit_page == '') + { + if(defined('EDIT_ONE_SECTION') && EDIT_ONE_SECTION) + { + $edit_page = $edit_page_0.'&wysiwyg='.$section['section_id'].$edit_page_1; + } else { + $edit_page = $edit_page_0.$edit_page_1; + } + } + $input_attribute = 'input_normal'; + $tpl->set_var(array( + 'STYLE_DISPLAY_SECTION_BLOCK' => ' style="visibility:visible;"', + 'NAME_SIZE' => 300, + 'INPUT_ATTRIBUTE' => $input_attribute, + 'VAR_SECTION_ID' => $section['section_id'], + 'VAR_SECTION_IDKEY' => $admin->getIDKEY($section['section_id']), + // 'VAR_SECTION_IDKEY' => $section['section_id'], + 'VAR_POSITION' => $section['position'], + 'LINK_MODIFY_URL_VAR_MODUL_NAME' => $edit_page, + 'SELECT' => '', + 'SET_NONE_DISPLAY_OPTION' => '' + ) + ); + // Add block options to the section_list + $tpl->clear_var('section_list'); + + foreach($block AS $number => $name) + { + $tpl->set_var('NAME', htmlentities(strip_tags($name))); + $tpl->set_var('VALUE', $number); + $tpl->set_var('SIZE', 1); + if($section['block'] == $number) + { + $tpl->set_var('SELECTED', ' selected="selected"'); + } else { + $tpl->set_var('SELECTED', ''); + } + $tpl->parse('section_list', 'section_list_block', true); + } + } else { + if($edit_page == '') + { + $edit_page = $edit_page_0.'#wb_'.$edit_page_1; + } + + $input_attribute = 'input_normal'; + $tpl->set_var(array( + 'STYLE_DISPLAY_SECTION_BLOCK' => ' style="visibility:hidden;"', + 'NAME_SIZE' => 300, + 'INPUT_ATTRIBUTE' => $input_attribute, + 'VAR_SECTION_ID' => $section['section_id'], + 'VAR_SECTION_IDKEY' => $admin->getIDKEY($section['section_id']), + // 'VAR_SECTION_IDKEY' => $section['section_id'], + 'VAR_POSITION' => $section['position'], + 'LINK_MODIFY_URL_VAR_MODUL_NAME' => $edit_page, + 'NAME' => htmlentities(strip_tags($block[1])), + 'VALUE' => 1, + 'SET_NONE_DISPLAY_OPTION' => '' + ) + ); + } + // Insert icon and images + $tpl->set_var(array( + 'CLOCK_16_PNG' => 'clock_16.png', + 'CLOCK_DEL_16_PNG' => 'clock_del_16.png', + 'DELETE_16_PNG' => 'delete_16.png' + ) + ); + // set calendar start values + if($section['publ_start']==0) + { + $tpl->set_var('VALUE_PUBL_START', ''); + } else { + $tpl->set_var('VALUE_PUBL_START', date($jscal_format, $section['publ_start']+TIMEZONE)); + } + // set calendar start values + if($section['publ_end']==0) + { + $tpl->set_var('VALUE_PUBL_END', ''); + } else { + $tpl->set_var('VALUE_PUBL_END', date($jscal_format, $section['publ_end']+TIMEZONE)); + } + // Insert icons up and down + if($section['position'] != 1 ) + { + $tpl->set_var( + 'VAR_MOVE_UP_URL', + ' +
+ ' );
+ } else {
+ $tpl->set_var(array(
+ 'VAR_MOVE_UP_URL' => ''
+ )
+ );
+ }
+ if($section['position'] != $num_sections ) {
+ $tpl->set_var(
+ 'VAR_MOVE_DOWN_URL',
+ '
+
+ ' );
+ } else {
+ $tpl->set_var(array(
+ 'VAR_MOVE_DOWN_URL' => ''
+ )
+ );
+ }
+ } else {
+ continue;
+ }
+ $tpl->set_var(array(
+ 'DISPLAY_DEBUG' => ' style="visibility="visible;"',
+ 'TEXT_SID' => 'SID',
+ 'DEBUG_COLSPAN_SIZE' => 9
+ )
+ );
+ if($bDebug)
+ {
+ $tpl->set_var(array(
+ 'DISPLAY_DEBUG' => ' style="visibility="visible;"',
+ 'TEXT_PID' => 'PID',
+ 'TEXT_SID' => 'SID',
+ 'POSITION' => $section['position']
+ )
+ );
+ } else {
+ $tpl->set_var(array(
+ 'DISPLAY_DEBUG' => ' style="display:none;"',
+ 'TEXT_PID' => '',
+ 'POSITION' => ''
+ )
+ );
+ }
+ if($bSectionCanDelete) {
+ $tpl->parse('can_delete', 'can_delete_block', false);
+ } else {
+// $tpl->parse('can_delete', '', false);
+ $tpl->set_block('can_delete_block', '');
+ }
+ $tpl->parse('show_section', 'show_section_block', true);
+ }
+ }
+
+ // now add the calendars -- remember to to set the range to [1970, 2037] if the date is used as timestamp!
+ // the loop is simply a copy from above.
+ $sql = 'SELECT `section_id`,`module` FROM `'.TABLE_PREFIX.'sections` ';
+ $sql .= 'WHERE page_id = '.$page_id.' ';
+ $sql .= 'ORDER BY `position` ASC';
+ $query_sections = $database->query($sql);
+
+ if($query_sections->numRows() > 0)
+ {
+ $num_sections = $query_sections->numRows();
+ while($section = $query_sections->fetchRow())
+ {
+ // Get the modules real name
+ $sql = 'SELECT `name` FROM `'.TABLE_PREFIX.'addons` '
+ . 'WHERE `directory` = "'.$section['module'].'"';
+ $module_name = $database->get_one($sql);
+
+ if(!is_numeric(array_search($section['module'], $module_permissions)))
+ {
+ $tpl->set_var(array(
+ 'jscal_ifformat' => $jscal_ifformat,
+ 'jscal_firstday' => $jscal_firstday,
+ 'jscal_today' => $jscal_today,
+ 'start_date' => 'start_date'.$section['section_id'],
+ 'end_date' => 'end_date'.$section['section_id'],
+ 'trigger_start' => 'trigger_start'.$section['section_id'],
+ 'trigger_end' => 'trigger_stop'.$section['section_id']
+ )
+ );
+ if(isset($jscal_use_time) && $jscal_use_time==TRUE) {
+ $tpl->set_var(array(
+ 'showsTime' => "true",
+ 'timeFormat' => "24"
+ )
+ );
+ } else {
+ $tpl->set_var(array(
+ 'showsTime' => "false",
+ 'timeFormat' => "24"
+ )
+ );
+ }
+ }
+ $tpl->parse('calendar_list', 'calendar_block', true);
+ }
+ }
+
+ // Work-out if we should show the "Add Section" form
+ $sql = 'SELECT `section_id` FROM `'.TABLE_PREFIX.'sections` '
+ . 'WHERE `page_id` = '.$page_id.' AND `module` = "menu_link"';
+ $query_sections = $database->query($sql);
+ if($query_sections->numRows() == 0)
+ {
+ // Modules list
+ $sql = 'SELECT `name`,`directory`,`type` FROM `'.TABLE_PREFIX.'addons` '
+ . 'WHERE `type` = \'module\' '
+ . 'AND `function` = \'page\' '
+ . 'AND `directory` != \'menu_link\' '
+ . 'ORDER BY `name`';
+ $result = $database->query($sql);
+ // if(DEBUG && $database->is_error()) { $admin->print_error($database->get_error()); }
+ if($result->numRows() > 0)
+ {
+ while ($module = $result->fetchRow(MYSQLI_ASSOC))
+ {
+ // Check if user is allowed to use this module echo $module['directory'],''; + if(!is_numeric(array_search($module['directory'], $module_permissions))) + { + $tpl->set_var('VALUE', $module['directory']); + $tpl->set_var('NAME', $module['name']); + if($module['directory'] == 'wysiwyg') + { + $tpl->set_var('SELECTED', ' selected="selected"'); + } else { + $tpl->set_var('SELECTED', ''); + } + $tpl->parse('module_list', 'module_block', true); + } else { + continue; + } + } + } + } + // Insert language text and messages + $tpl->set_var(array( + 'TEXT_MANAGE_SECTIONS' => $HEADING['MANAGE_SECTIONS'], + 'TEXT_ARE_YOU_SURE' => $TEXT['ARE_YOU_SURE'], + 'TEXT_TYPE' => $TEXT['TYPE'], + 'TEXT_ADD' => $TEXT['ADD'], + 'TEXT_SAVE' => $TEXT['SAVE'], + 'TEXTLINK_MODIFY_PAGE' => $HEADING['MODIFY_PAGE'], + 'TEXT_CALENDAR' => $TEXT['CALENDAR'], + 'TEXT_DELETE_DATE' => $TEXT['DELETE_DATE'], + 'TEXT_ADD_SECTION' => $TEXT['ADD_SECTION'], + 'TEXT_MOVE_UP' => $TEXT['MOVE_UP'], + 'TEXT_MOVE_DOWN' => $TEXT['MOVE_DOWN'] + ) + ); + $tpl->set_block('main_block', 'show_settings_block', 'show_settings'); + if ($admin->get_permission('pages_settings')) { + $tpl->parse('show_settings', 'show_settings_block', true); + } else { + $tpl->set_block('show_settings', ''); + } + $tpl->parse('main', 'main_block', false); + $tpl->pparse('output', 'page'); + // include the required file for Javascript admin + if(file_exists(WB_PATH.'/modules/jsadmin/jsadmin_backend_include.php')) + { + include(WB_PATH.'/modules/jsadmin/jsadmin_backend_include.php'); + } + break; +endswitch; + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/pages/sections.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/pages/sections_save.php =================================================================== --- trunk/admin/pages/sections_save.php (nonexistent) +++ trunk/admin/pages/sections_save.php (revision 2) @@ -0,0 +1,171 @@ +print_error($sDEBUG.$MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); + exit(0); +} else { + $iPageId = $page_id = (int)$aRequestVars['page_id']; +} + +$callingScript = $_SERVER['HTTP_REFERER']; +$sBackLink = $callingScript.'?page_id='.$iPageId; +//$sBackLink = ADMIN_URL.'/pages/sections.php?page_id='.$iPageId; + +if (!$admin->checkFTAN()) +{ + $admin->print_header(); + $sInfo = __LINE__.') '.strtoupper(basename(__DIR__).'_'.basename(__FILE__, ''.PAGE_EXTENSION)).'::'; + $sDEBUG=(@DEBUG?$sInfo:''); + $admin->print_error($sDEBUG.$MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL); +} +/* +if( (!($page_id = $admin->checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) ) +{ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); + exit(); +} +*/ +// Get perms +$sql = 'SELECT `admin_groups`,`admin_users` FROM `'.TABLE_PREFIX.'pages` ' + . ' WHERE `page_id` = '.(int)$page_id. ''; +$results = $database->query($sql); +$results_array = $results->fetchRow(MYSQLI_ASSOC); +$old_admin_groups = explode(',', $results_array['admin_groups']); +$old_admin_users = explode(',', $results_array['admin_users']); +$in_old_group = FALSE; +foreach($admin->get_groups_id() as $cur_gid){ + if (in_array($cur_gid, $old_admin_groups)) { + $in_old_group = TRUE; + } +} +if((!$in_old_group) && !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) { + $sInfo = __LINE__.') '.(basename(__DIR__).'_'.basename(__FILE__, ''.PAGE_EXTENSION)).'::'; + $sDEBUG=(@DEBUG?$sInfo:''); + $admin->print_error($sDEBUG.$MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); +} + +// Get page details +$query = 'SELECT COUNT(`page_id`) `numRows` FROM `'.TABLE_PREFIX.'pages` WHERE `page_id` = '.(int)$page_id.''; +$numRows = $database->get_one($query); +if($database->is_error()) { + $admin->print_header(); + $sInfo = __LINE__.') '.strtoupper(basename(__DIR__).'_'.basename(__FILE__, ''.PAGE_EXTENSION)).'_DATABASE_ERROR::'; + $sDEBUG=(@DEBUG?$sInfo:''); + $admin->print_error($sDEBUG.$database->get_error()); +} +if($numRows == 0) { + $admin->print_header(); + $sInfo = __LINE__.') '.strtoupper(basename(__DIR__).'_'.basename(__FILE__, ''.PAGE_EXTENSION)).'::'; + $sDEBUG=(@DEBUG?$sInfo:''); + $admin->print_error($sDEBUG.$MESSAGE['PAGES_NOT_FOUND']); +} +// After check print the header +$admin->print_header(); + +$results_array = $results->fetchRow(MYSQLI_ASSOC); +// Set module permissions +$module_permissions = $_SESSION['MODULE_PERMISSIONS']; + +$aSql = array(); +$section_id = intval($admin->get_post('section_id') ); +$sTitle = $admin->StripCodeFromText( $admin->get_post('title_'.$section_id ) ); +$bSaveTitle = isset( $aRequestVars['inputSection'] ); +if( $bSaveTitle ) { + $aSql[] = 'UPDATE `'.TABLE_PREFIX.'sections` SET ' + . '`title`=\''.$database->escapeString($sTitle).'\' ' + . 'WHERE `section_id`='.(int)$section_id; + foreach( $aSql as $sSql ) { + if(!$database->query($sSql)) { + } + } + +} else { +// Loop through sections + $sql = 'SELECT `section_id`,`module`,`position` FROM `'.TABLE_PREFIX.'sections` ' + . 'WHERE `page_id` = '.(int)$page_id.' ' + . 'ORDER BY `position` '; + if($query_sections = $database->query($sql)) + { + $num_sections = $query_sections->numRows(); + while($section = $query_sections->fetchRow(MYSQLI_ASSOC)) { + if(!is_numeric(array_search($section['module'], $module_permissions))) { + // Update the section record with properties + $section_id = $section['section_id']; + $sql = ''; $publ_start = 0; $publ_end = 0; + $dst = date("I")?" DST":""; // daylight saving time? + if(isset($_POST['block'.$section_id]) && $_POST['block'.$section_id] != '') { + $sql = "block = '".$admin->add_slashes($_POST['block'.$section_id])."'"; + } + // update publ_start and publ_end, trying to make use of the strtotime()-features like "next week", "+1 month", ... + if(isset($_POST['start_date'.$section_id]) && isset($_POST['end_date'.$section_id])) { + if(trim($_POST['start_date'.$section_id]) == '0' || trim($_POST['start_date'.$section_id]) == '') { + $publ_start = 0; + } else { + $publ_start = jscalendar_to_timestamp($_POST['start_date'.$section_id]); + } + if(trim($_POST['end_date'.$section_id]) == '0' || trim($_POST['end_date'.$section_id]) == '') { + $publ_end = 0; + } else { + $publ_end = jscalendar_to_timestamp($_POST['end_date'.$section_id], $publ_start); + } + if($sql != ''){$sql .= ",";} + $sql .= " publ_start = '".$database->escapeString($publ_start)."'"; + $sql .= ", publ_end = '".$database->escapeString($publ_end)."'"; + } + + $query = "UPDATE ".TABLE_PREFIX."sections SET $sql WHERE section_id = '$section_id'"; + if($sql != '') { + $database->query($query); + } + } + } + } + } +// Check for error or print success message +if($database->is_error()) { + $sInfo = __LINE__.') '.strtoupper(basename(__DIR__).'_'.basename(__FILE__, ''.PAGE_EXTENSION)).'::'; + $sDEBUG=(@DEBUG?$sInfo:''); + $admin->print_error($sDEBUG.$database->get_error(), ADMIN_URL.'/pages/sections.php?page_id='.$page_id ); +} else { + $admin->print_success($MESSAGE['PAGES_SECTIONS_PROPERTIES_SAVED'], $sBackLink ); +} + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/pages/sections_save.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/pages/settings-x.php =================================================================== --- trunk/admin/pages/settings-x.php (nonexistent) +++ trunk/admin/pages/settings-x.php (revision 2) @@ -0,0 +1,156 @@ +print_header(); + $admin->print_error($MESSAGE['PAGES_NOT_FOUND']); + } +// load requested page + $aPage = null; + $sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` WHERE `page_id` = '.$page_id; + if (($oResult = $database->query($sql))) { + $aPage = $oResult->fetchRow(MSQL_ASSOC); + } + if (!$aPage) { +// throw error if no valid page received + $admin->print_header(); + $admin->print_error($MESSAGE['PAGES_NOT_FOUND']); + } +// check if current user has admin rights to that page + if (!($admin->ami_group_member($aPage['admin_groups']) || + $admin->is_group_match($aPage['admin_users'], $admin->get_user_id())) + ) { + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); + } +// check if user has owner rights for this page + $bHasOwnerRight = ($admin->get_user_id() == $aPage['page_owner'] || $admin->get_user_id() == 1); +// restore SEO title from page-link + $aPage['seo_title'] = basename($aPage['link']); +// add user data array to page + $aPage['modified_by'] = $admin->get_user_details($aPage['modified_by']); + +// prepare template data ------------------------------------------------------- + $aTmplDataGlobal = array(); + $aTmplData = array(); + $aTmplDataGlobal['page'] = $aPage; + $aTmplDataGlobal['user'] = $admin->get_user_details($admin->get_user_id()); + $aTmplDataGlobal['user']['owner'] = $bHasOwnerRight; + +// get sorted group lists ------------------------------------------------------ + $aAdmins = explode(',', $aPage['admin_groups']); + $aViewers = explode(',', $aPage['viewing_groups']); + $aList = array(); + $sql = 'SELECT `group_id` `id`, `name` ' + . 'FROM `'.TABLE_PREFIX.'groups` ' + . 'ORDER BY `name`'; + $oRecords = $database->query($sql); + while ($aRecord = $oRecords->fetchRow(MYSQLI_ASSOC)) { + // if group is set as admin to this page + $aRecord['admin'] = in_array($aRecord['id'], $aAdmins); + // if group ist set as viewer to this page + $aRecord['viewer'] = in_array($aRecord['id'], $aViewers); + $aList[] = $aRecord; + } +// sort groups by admins + $aTmplData['GroupListAdmin'] = SettingsHelper::doMultiSort($aList, 'admin', 'name'); +// sort groups by viewers + $aTmplData['GroupListViewer'] = SettingsHelper::doMultiSort($aList, 'viewer', 'name'); +// get sorted user lists ------------------------------------------------------- + $aAdmins = explode(',', $aPage['admin_users']); + $aViewers = explode(',', $aPage['viewing_users']); + $aList = array(); + $sql = 'SELECT `user_id` `id`, `display_name` `name` ' + . 'FROM `'.TABLE_PREFIX.'users` ' + . 'ORDER BY `name`'; + $oRecords = $database->query($sql); + while ($aRecord = $oRecords->fetchRow(MYSQLI_ASSOC)) { + // if user is set as admin to this page + $aRecord['admin'] = in_array($aRecord['id'], $aAdmins); + // if user is set as viewer to this page + $aRecord['viewer'] = in_array($aRecord['id'], $aViewers); + $aList[] = $aRecord; + } +// sort groups by admins + $aTmplData['UserListAdmin'] = SettingsHelper::doMultiSort($aList, 'admin', 'name'); +// sort groups by viewers + $aTmplData['UserListViewer'] = SettingsHelper::doMultiSort($aList, 'viewer', 'name'); +// clean up memory + unset($aAdmins, $aViewers, $oRecords, $aRecord, $aList, $doMultiSort); +// add list of possible parent pages ------------------------------------------- + $aParentPages = SettingsHelper::getParentPagesList($aTmplDataGlobal['page']['page_id'], $iCurrentPage, $admin, $database); +// check for permission to add a level-0 page + if ($admin->get_permission('pages_add_l0') || $results_array['level'] == 0) { +// add the option to choose level-0 + $aPage['id'] = 0; + $aPage['title'] = $aLang['TEXT_NONE']; + $aPage['language'] = ''; + $aPage['active'] = !$results_array['parent']; + array_unshift($aParentPages, $aPage); + } + $aTmplData['ParentPages'] = $aParentPages; +// add list of linking targets ------------------------------------------------- + $aTmplData['LinkTargets'] = array( + array('target' => '_top', 'caption' => $TEXT['TOP_FRAME']), + array('target' => '_self', 'caption' => $TEXT['SAME_WINDOW']), + array('target' => '_blank', 'caption' => $TEXT['NEW_WINDOW']) + ); +// build list of available templates ------------------------------------------- + $aTemplatesList = array(); + $sql = 'SELECT `directory`, `name`, `version` FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `function` = \'template\' ' + . 'ORDER BY `name`'; + if (($oAddons = $database->query($sql))) { + while (($aAddon = $oAddon->fetchRow(MYSQLI_ASSOC))) { + $aTemplatesList[] = $aAddon; + } + } + if (!$aTemplatesList) { + $aTemplatesList[] = array('directory'=>'', 'name'=>'System Default', 'version'=>''); + } + $aTmplData['Templates'] = $aTemplatesList; +// get available menues from active template ----------------------------------- + $sTpl = WB_PATH.'/templates/' + .($aPage['template'] ?: DEFAULT_TEMPLATE) + .'/info.php'; + $aTemplateInfo = getContentFromInfoPhp( + WB_PATH.'/templates/'.($aPage['template'] ?: DEFAULT_TEMPLATE).'/info.php' + ); + if (!isset($aTemplateInfo['menu'])) { + $aTemplateInfo['menu'] = array(1 => 'Main'); + } + $aTmplData['Menues'] = $aTemplateInfo['menu']; +// get list of available languages --------------------------------------------- + $sql = 'SELECT `directory`, `name`, `version` FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `type` = \'language\' ' + . 'ORDER BY `name`'; + if (($oAddons = $database->query($sql))) { + while (($aAddon = $oAddon->fetchRow(MYSQLI_ASSOC))) { + $aLanguageList[] = $aAddon; + } + } + $aTmplData['Languages'] = $aLanguageList; + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/pages/settings-x.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/pages/settings.php =================================================================== --- trunk/admin/pages/settings.php (nonexistent) +++ trunk/admin/pages/settings.php (revision 2) @@ -0,0 +1,592 @@ +print_header(); + $admin->print_error($MESSAGE['PAGES_NOT_FOUND']); +} else { + $page_id = intval($_GET['page_id']); +} + +//if ( !function_exists( 'create_access_file' ) ) { require(WB_PATH.'/framework/functions.php'); } +if ( !function_exists( 'entities_to_7bit' ) ) { require(WB_PATH.'/framework/functions-utf8.php'); } +/* +if( (!($page_id = $admin->checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) ) +{ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']); + exit(); +} +*/ +$field_set = $database->field_add(TABLE_PREFIX.'pages', 'page_code', 'INT(11) NOT NULL AFTER `modified_by`'); +$sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` WHERE `page_id` = '.$page_id; +$results = $database->query($sql); +$results_array = $results->fetchRow(MYSQLI_ASSOC); +$old_admin_groups = explode(',', $results_array['admin_groups']); +$old_admin_users = explode(',', $results_array['admin_users']); +// Work-out if we should check for existing page_code +$field_set = $database->field_exists(TABLE_PREFIX.'pages', 'page_code'); + +$in_old_group = FALSE; +foreach($admin->get_groups_id() as $cur_gid) +{ + if (in_array($cur_gid, $old_admin_groups)) + { + $in_old_group = TRUE; + } +} +if((!$in_old_group) && !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) +{ + $admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']); +} +// Get page details +/* $database = new database(); */ +$sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` WHERE `page_id`='.$page_id; +$results = $database->query($sql); +if($database->is_error()) { + $admin->print_header(); + $admin->print_error($database->get_error()); +} +if($results->numRows() == 0) { + $admin->print_header(); + $admin->print_error($MESSAGE['PAGES_NOT_FOUND']); +} +$results_array = $results->fetchRow(MYSQLI_ASSOC); +$aCurrentPage['seo_title'] = basename($results_array['link']); +// Get display name of person who last modified the page +$user=$admin->get_user_details($results_array['modified_by']); +// Convert the unix ts for modified_when to human a readable form +if($results_array['modified_when'] != 0) +{ + $modified_ts = gmdate(TIME_FORMAT.', '.DATE_FORMAT, $results_array['modified_when']+TIMEZONE); +} else { + $modified_ts = 'Unknown'; +} +// Setup template object, parse vars to it, then parse it +// Create new template object +$template = new Template(dirname($admin->correct_theme_source('pages_settings.htt'))); +// $template->debug = true; +$template->set_file('page', 'pages_settings.htt'); +$template->set_block('page', 'main_block', 'main'); +$template->set_var('FTAN', $admin->getFTAN()); +$template->set_var(array( + 'PAGE_ID' => $results_array['page_id'], + // 'PAGE_IDKEY' => $admin->getIDKEY($aCurrentPage['page_id']), + 'PAGE_IDKEY' => $results_array['page_id'], + 'PAGE_TITLE' => ($results_array['page_title']), + 'MENU_TITLE' => ($results_array['menu_title']), + 'SEO_TITLE' => ($aCurrentPage['seo_title']=='') ? $results_array['menu_title'] : $aCurrentPage['seo_title'], + 'DESCRIPTION' => ($results_array['description']), + 'KEYWORDS' => ($results_array['keywords']), + 'MODIFIED_BY' => $user['display_name'], + 'MODIFIED_BY_USERNAME' => $user['username'], + 'MODIFIED_WHEN' => $modified_ts, + 'ADMIN_URL' => ADMIN_URL, + 'WB_URL' => WB_URL, + 'THEME_URL' => THEME_URL + ) + ); +$template->set_block('main_block', 'show_section_block', 'show_section'); +// Work-out if we should show the "manage sections" link +$sql = 'SELECT COUNT(*) FROM `'.TABLE_PREFIX.'sections` WHERE `page_id`='.$page_id.' AND `module`="menu_link"'; +$sections_available = (intval($database->get_one($sql)) != 0); +if ($sections_available) +{ + $template->set_var('DISPLAY_MANAGE_SECTIONS', 'display:none;'); + $template->parse('show_section', ''); +} elseif(MANAGE_SECTIONS == 'enabled') +{ + $template->set_var('TEXT_MANAGE_SECTIONS', $HEADING['MANAGE_SECTIONS']); + $template->parse('show_section', 'show_section_block', true); +} else { + $template->set_var('DISPLAY_MANAGE_SECTIONS', 'display:none;'); + $template->parse('show_section', ''); +} +// Visibility +if($results_array['visibility'] == 'public') { + $template->set_var('PUBLIC_SELECTED', ' selected="selected"'); +} elseif($results_array['visibility'] == 'private') { + $template->set_var('PRIVATE_SELECTED', ' selected="selected"'); +} elseif($results_array['visibility'] == 'registered') { + $template->set_var('REGISTERED_SELECTED', ' selected="selected"'); +} elseif($results_array['visibility'] == 'hidden') { + $template->set_var('HIDDEN_SELECTED', ' selected="selected"'); +} elseif($results_array['visibility'] == 'none') { + $template->set_var('NO_VIS_SELECTED', ' selected="selected"'); +} + $sql = 'SELECT * FROM `'.TABLE_PREFIX.'groups`'; + $get_groups = $database->query($sql); + $template->set_block('main_block', 'group_list_block', 'group_list'); + // Insert admin group and current group first + $admin_group_name = $get_groups->fetchRow(MYSQLI_ASSOC); + $template->set_var(array( + 'ID' => 1, + 'TOGGLE' => '', + 'DISABLED' => ' disabled="disabled"', + 'LINK_COLOR' => '000000', + 'CURSOR' => 'default', + 'NAME' => $admin_group_name['name'], + 'CHECKED' => ' checked="checked"' + ) + ); + $template->parse('group_list', 'group_list_block', true); + while($group = $get_groups->fetchRow(MYSQLI_ASSOC)) { + // check if the user is a member of this group + $flag_disabled = ''; + $flag_checked = ''; + $flag_cursor = 'pointer'; + $flag_color = ''; + if (in_array($group["group_id"], $admin->get_groups_id())) { + $flag_disabled = ''; //' disabled'; + $flag_checked = ''; //' checked'; + $flag_cursor = 'default'; + $flag_color = '000000'; + } +// Group list 1 (admin_groups) +// $admin_groups = explode(',', str_replace('_', '', $results_array['admin_groups'])); + // Check if the group is allowed to edit pages +// $system_permissions = explode(',', $group['system_permissions']); +// if(is_numeric(array_search('pages_modify', $system_permissions))) { + if ($admin->get_permission('pages_modify')) { + $template->set_var(array( + 'ID' => $group['group_id'], + 'TOGGLE' => $group['group_id'], + 'DISABLED' => $flag_disabled, + 'LINK_COLOR' => $flag_color, + 'CURSOR' => $flag_cursor, + 'NAME' => $group['name'], + 'CHECKED' => $flag_checked + ) + ); +// if(is_numeric(array_search($group['group_id'], $admin_groups))) { + if ($admin->is_group_match($group['group_id'], $results_array['admin_groups'])) { + $template->set_var('CHECKED', ' checked="checked"'); + } else { + if (!$flag_checked) $template->set_var('CHECKED', ''); + } + $template->parse('group_list', 'group_list_block', true); + } + } +// Group list 2 (viewing_groups) + $sql = 'SELECT * FROM `'.TABLE_PREFIX.'groups`'; + $get_groups = $database->query($sql); + $template->set_block('main_block', 'group_list_block2', 'group_list2'); + // Insert admin group and current group first + $admin_group_name = $get_groups->fetchRow(MYSQLI_ASSOC); + $template->set_var(array( + 'ID' => 1, + 'TOGGLE' => '', + 'DISABLED' => ' disabled="disabled"', + 'LINK_COLOR' => '000000', + 'CURSOR' => 'default', + 'NAME' => $admin_group_name['name'], + 'CHECKED' => ' checked="checked"' + ) + ); + $template->parse('group_list2', 'group_list_block2', true); + while($group = $get_groups->fetchRow(MYSQLI_ASSOC)) + { + // check if the user is a member of this group + $flag_disabled = ''; + $flag_checked = ''; + $flag_cursor = 'pointer'; + $flag_color = ''; + if (in_array($group["group_id"], $admin->get_groups_id())) + { + $flag_disabled = ''; //' disabled'; + $flag_checked = ''; //' checked'; + $flag_cursor = 'default'; + $flag_color = '000000'; + } + $template->set_var(array( + 'ID' => $group['group_id'], + 'TOGGLE' => $group['group_id'], + 'DISABLED' => $flag_disabled, + 'LINK_COLOR' => $flag_color, + 'CURSOR' => $flag_cursor, + 'NAME' => $group['name'], + 'CHECKED' => $flag_checked + ) + ); +// $viewing_groups = explode(',', str_replace('_', '', $results_array['viewing_groups'])); +// if(is_numeric(array_search($group['group_id'], $viewing_groups))) + if ($admin->is_group_match($group['group_id'], $results_array['viewing_groups'])) + { + $template->set_var('CHECKED', 'checked="checked"'); + } else { + if (!$flag_checked) {$template->set_var('CHECKED', '');} + } + $template->parse('group_list2', 'group_list_block2', true); + } +// Show private viewers +if($results_array['visibility'] == 'private' OR $results_array['visibility'] == 'registered') +{ + $template->set_var('DISPLAY_VIEWERS', ''); +} else { + $template->set_var('DISPLAY_VIEWERS', 'display:none;'); +} +//-- insert page_code 20090904--> +$template->set_var('DISPLAY_CODE_PAGE_LIST', ' id="multi_lingual" style="display:none;"'); +// Work-out if page languages feature is enabled +if ( + (defined('PAGE_LANGUAGES') && PAGE_LANGUAGES) && + $field_set && + file_exists(WB_PATH.'/modules/mod_multilingual/update_keys.php') + ) { + // workout field is set but module missing + $TEXT['PAGE_CODE'] = empty($TEXT['PAGE_CODE']) ? 'Pagecode' : $TEXT['PAGE_CODE']; + $template->set_var( array( + 'DISPLAY_CODE_PAGE_LIST' => ' id="multi_lingual"', + 'TEXT_PAGE_CODE' => ''.$TEXT['PAGE_CODE'].'' + ) + ); + // Page_code list + /* $database = new database(); */ + function page_code_list($parent) + { + global $admin, $database, $template, $results_array, $pageCode; + $default_language = DEFAULT_LANGUAGE; + $sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` WHERE `parent` = '.$parent.' AND `language` = "'.$default_language.'" ORDER BY `position` ASC'; + $get_pages = $database->query($sql); + while($page = $get_pages->fetchRow(MYSQLI_ASSOC)) + { + if(($admin->page_is_visible($page)==false) && ($page['visibility'] <> 'none') ) { continue; } + $template->set_var('FLAG_CODE_ICON',' none '); + if( $page['parent'] == 0 ) + { + $template->set_var('FLAG_CODE_ICON','url('.THEME_URL.'/images/flags/'.strtolower($page['language']).'.png)'); + } + // If the current page cannot be parent, then its children neither + $list_next_level = true; + // Stop users from adding pages with a level of more than the set page level limit + if($page['level']+1 < PAGE_LEVEL_LIMIT) + { + // Get user perms + $admin_groups = explode(',', str_replace('_', '', $page['admin_groups'])); + $admin_users = explode(',', str_replace('_', '', $page['admin_users'])); + $in_group = FALSE; + foreach($admin->get_groups_id() as $cur_gid) + { + if (in_array($cur_gid, $admin_groups)) + { + $in_group = TRUE; + } + } + if(($in_group) OR is_numeric(array_search($admin->get_user_id(), $admin_users))) + { + $can_modify = true; + } else { + $can_modify = false; + } + $title_prefix = ''; + for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - - '; } + // $space = str_repeat(' ', 3); $space.'<'..'>' + $template->set_var(array( + 'VALUE' => $page['page_code'], + 'PAGE_VALUE' => $title_prefix.$page['menu_title'], + 'PAGE_CODE' => $title_prefix.$page['page_id'] + ) + ); + if($results_array['page_code'] == $page['page_code']) + { + $template->set_var('SELECTED', ' selected="selected"'); + } elseif($can_modify != true) + { + $template->set_var('SELECTED', ' disabled="disabled" class="disabled"'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('page_code_list', 'page_code_list_block', true); + } + if ($list_next_level) + page_code_list($page['page_id']); + } + } // end page_code_list + // Insert code_page values from page to modify + $template->set_block('main_block', 'page_code_list_block', 'page_code_list'); + + if($admin->get_permission('pages_add_l0') == true OR $results_array['level'] == 0) + { + if($results_array['parent'] == 0) { $selected = ' selected'; } else { $selected = ''; } + $aPageCodeList = array( + 'VALUE' => '', + 'PAGE_CODE' => $TEXT['NONE'], + 'PAGE_VALUE' => '', + 'SELECTED' => $selected + ); + $template->set_var($aPageCodeList); + $template->parse('page_code_list', 'page_code_list_block', true); + } + // get pagecode form this page_id + page_code_list(0); +} +//-- page code --> +// Parent page list +/* $database = new database(); */ +function parent_list($parent) +{ + global $admin, $database, $template, $results_array,$field_set; + $sql = 'SELECT * FROM `'.TABLE_PREFIX.'pages` WHERE `parent` = '.$parent.' ORDER BY `position` ASC'; + $get_pages = $database->query($sql); + while($page = $get_pages->fetchRow(MYSQLI_ASSOC)) + { + if($admin->page_is_visible($page)==false) + { + continue; + } + // if parent = 0 set flag_icon + $template->set_var('FLAG_ROOT_ICON',' none '); + if( $page['parent'] == 0 && $field_set) + { + $template->set_var('FLAG_ROOT_ICON','url('.THEME_URL.'/images/flags/'.strtolower($page['language']).'.png)'); + } + // If the current page cannot be parent, then its children neither + $list_next_level = true; + // Stop users from adding pages with a level of more than the set page level limit + if( $page['level']+1 < PAGE_LEVEL_LIMIT +1 ) + { + // Get user perms + $admin_groups = explode(',', str_replace('_', '', $page['admin_groups'])); + $admin_users = explode(',', str_replace('_', '', $page['admin_users'])); + $in_group = FALSE; + foreach($admin->get_groups_id() as $cur_gid) + { + if (in_array($cur_gid, $admin_groups)) + { + $in_group = TRUE; + } + } + if(($in_group) OR is_numeric(array_search($admin->get_user_id(), $admin_users))) + { + $can_modify = true; + } else { + $can_modify = false; + } + // Title -'s prefix + $title_prefix = ''; + for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - - '; } + $template->set_var(array( + 'ID' => $page['page_id'], + 'TITLE' => ($title_prefix.$page['menu_title']), + 'PAGE-TITLE' => ($title_prefix.$page['page_title']), + 'MENU-TITLE' => ($title_prefix.$page['menu_title']), + 'FLAG_ICON' => ' none ', + )); + if($results_array['parent'] == $page['page_id']) + { + $template->set_var('SELECTED', ' selected="selected"'); + } elseif($results_array['page_id'] == $page['page_id']) + { + $template->set_var('SELECTED', ' disabled="disabled" class="disabled"'); + $list_next_level=false; + } elseif($can_modify != true) + { + $template->set_var('SELECTED', ' disabled="disabled" class="disabled"'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('page_list2', 'page_list_block2', true); + } + if ($list_next_level) + { + parent_list($page['page_id']); + } + } +} +$template->set_block('main_block', 'page_list_block2', 'page_list2'); +if($admin->get_permission('pages_add_l0') == true OR $results_array['level'] == 0) { + if($results_array['parent'] == 0) + { + $selected = ' selected="selected"'; + } else { + $selected = ''; + } + $template->set_var(array( + 'ID' => '0', + 'TITLE' => $TEXT['NONE'], + 'SELECTED' => $selected + ) ); + $template->parse('page_list2', 'page_list_block2', true); +} +parent_list(0); +if($modified_ts == 'Unknown') +{ + $template->set_var('DISPLAY_MODIFIED', 'hide'); +} else { + $template->set_var('DISPLAY_MODIFIED', ''); +} +// Templates list +$template->set_block('main_block', 'template_list_block', 'template_list'); + +$sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` WHERE `type` = "template" AND `function` = "template" order by `name`'; +if( ($res_templates = $database->query($sql)) ) +{ + while($rec_template = $res_templates->fetchRow(MYSQLI_ASSOC)) + { + // Check if the user has perms to use this template + if($rec_template['directory'] == $results_array['template'] OR $admin->get_permission($rec_template['directory'], 'template') == true) + { + $template->set_var('VALUE', $rec_template['directory']); + $template->set_var('NAME', $rec_template['name']); + if($rec_template['directory'] == $results_array['template']) + { + $template->set_var('SELECTED', ' selected="selected"'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('template_list', 'template_list_block', true); + } + } +} +// Menu list +if(MULTIPLE_MENUS == false) +{ + $template->set_var('DISPLAY_MENU_LIST', 'display:none;'); +} +// Include template info file (if it exists) +if($results_array['template'] != '') +{ + $template_location = WB_PATH.'/templates/'.$results_array['template'].'/info.php'; +} else { + $template_location = WB_PATH.'/templates/'.DEFAULT_TEMPLATE.'/info.php'; +} +if(file_exists($template_location)) +{ + require($template_location); +} +// Check if $menu is set +if(!isset($menu[1]) OR $menu[1] == '') +{ + // Make our own menu list + $menu[1] = $TEXT['MAIN']; +} +// Add menu options to the list +$template->set_block('main_block', 'menu_list_block', 'menu_list'); +foreach($menu AS $number => $name) +{ + $template->set_var('NAME', $name); + $template->set_var('VALUE', $number); + if($results_array['menu'] == $number) + { + $template->set_var('SELECTED', ' selected="selected"'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('menu_list', 'menu_list_block', true); +} +// Insert language values +$template->set_block('main_block', 'language_list_block', 'language_list'); +$sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` WHERE `type` = "language" ORDER BY `name`'; +if( ($res_languages = $database->query($sql)) ) +{ + while($rec_language = $res_languages->fetchRow(MYSQLI_ASSOC)) + { + $l_codes[$rec_language['name']] = $rec_language['directory']; + $l_names[$rec_language['name']] = entities_to_7bit($rec_language['name']); // sorting-problem workaround + } + asort($l_names); + foreach($l_names as $l_name=>$v) + { + $langIcons = (empty($l_codes[$l_name])) ? 'none' : strtolower($l_codes[$l_name]); + // Insert code and name + $template->set_var(array( + 'VALUE' => $l_codes[$l_name], + 'NAME' => $l_name, + 'FLAG_LANG_ICONS' => 'url('.THEME_URL.'/images/flags/'.$langIcons.'.png)', + )); + // Check if it is selected + if($results_array['language'] == $l_codes[$l_name]) + { + $template->set_var('SELECTED', ' selected="selected"'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('language_list', 'language_list_block', true); + } +} +// Select disabled if searching is disabled +if($results_array['searching'] == 0) +{ + $template->set_var('SEARCHING_DISABLED', ' selected="selected"'); +} +// Select what the page target is +switch ($results_array['target']) +{ + case '_top': + $template->set_var('TOP_SELECTED', ' selected="selected"'); + break; + case '_self': + $template->set_var('SELF_SELECTED', ' selected="selected"'); + break; + case '_blank': + $template->set_var('BLANK_SELECTED', ' selected="selected"'); + break; +} +// Insert language text +$template->set_var(array( + 'DISPLAY_ADVANCED' => ' disabled="disabled"', + 'HEADING_MODIFY_PAGE_SETTINGS' => $HEADING['MODIFY_PAGE_SETTINGS'], + 'TEXT_CURRENT_PAGE' => $TEXT['CURRENT_PAGE'], + 'TEXT_MODIFY' => $TEXT['MODIFY'], + 'TEXT_MODIFY_PAGE' => $HEADING['MODIFY_PAGE'], + 'LAST_MODIFIED' => $MESSAGE['PAGES']['LAST_MODIFIED'], + 'TEXT_PAGE_TITLE' => $TEXT['PAGE_TITLE'], + 'TEXT_MENU_TITLE' => $TEXT['MENU_TITLE'], + 'TEXT_SEO_TITLE' => $TEXT['FILE'].'-'.$TEXT['LINK'], + 'TEXT_TYPE' => $TEXT['TYPE'], + 'TEXT_MENU' => $TEXT['MENU'], + 'TEXT_PARENT' => $TEXT['PARENT'], + 'TEXT_VISIBILITY' => $TEXT['VISIBILITY'], + 'TEXT_PUBLIC' => $TEXT['PUBLIC'], + 'TEXT_PRIVATE' => $TEXT['PRIVATE'], + 'TEXT_REGISTERED' => $TEXT['REGISTERED'], + 'TEXT_NONE' => $TEXT['NONE'], + 'TEXT_HIDDEN' => $TEXT['HIDDEN'], + 'TEXT_TEMPLATE' => $TEXT['TEMPLATE'], + 'TEXT_TARGET' => $TEXT['TARGET'], + 'TEXT_SYSTEM_DEFAULT' => $TEXT['SYSTEM_DEFAULT'], + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], + 'TEXT_NEW_WINDOW' => $TEXT['NEW_WINDOW'], + 'TEXT_SAME_WINDOW' => $TEXT['SAME_WINDOW'], + 'TEXT_TOP_FRAME' => $TEXT['TOP_FRAME'], + 'TEXT_ADMINISTRATORS' => $TEXT['ADMINISTRATORS'], + 'TEXT_ALLOWED_VIEWERS' => $TEXT['ALLOWED_VIEWERS'], + 'TEXT_DESCRIPTION' => $TEXT['DESCRIPTION'], + 'TEXT_KEYWORDS' => $TEXT['KEYWORDS'], + 'TEXT_SEARCHING' => $TEXT['SEARCHING'], + 'TEXT_LANGUAGE' => $TEXT['LANGUAGE'], + 'TEXT_ENABLED' => $TEXT['ENABLED'], + 'TEXT_DISABLED' => $TEXT['DISABLED'], + 'TEXT_SAVE' => $TEXT['SAVE'], + 'TEXT_BACK' => $TEXT['BACK'], + 'TEXT_RESET' => $TEXT['RESET'], + 'LAST_MODIFIED' => $MESSAGE['PAGES']['LAST_MODIFIED'], + 'HEADING_MODIFY_PAGE' => $HEADING['MODIFY_PAGE'], + 'TEXT_PAGE_REORG' => ' Reorgansition' + ) ); +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/pages/settings.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/pages/settings2.php =================================================================== --- trunk/admin/pages/settings2.php (nonexistent) +++ trunk/admin/pages/settings2.php (revision 2) @@ -0,0 +1,381 @@ +query($sql))) { + // Insert values into main page list + while($page = $get_pages->fetchRow(MYSQLI_ASSOC)) { + // Fix page trail + $sql = 'UPDATE `'.TABLE_PREFIX.'pages` ' + . 'SET `page_trail`=\''.get_page_trail($page['page_id']).'\' ' + . ($root_parent != 0 ? ',`root_parent`='.(int)$root_parent.' ' : '') + . 'WHERE `page_id`='.(int)$page['page_id']; + $database->query($sql); + // Run this query on subs + fix_page_trail($page['page_id'],$root_parent); + } + } +} +/* ****************************************************************** */ +// inherit settings to subpages +//
- >
+ query($query);
+
+ // Insert values into main page list
+ if($get_pages->numRows() > 0) {
+ while($page = $get_pages->fetchRow()) {
+ // Get user perms
+ $admin_groups = explode(',', str_replace('_', '', $page['admin_groups']));
+ $admin_users = explode(',', str_replace('_', '', $page['admin_users']));
+ $in_old_group = FALSE;
+ foreach($admin->get_groups_id() as $cur_gid){
+ if (in_array($cur_gid, $old_admin_groups)) {
+ $in_old_group = TRUE;
+ }
+ }
+ if((!$in_old_group) OR is_numeric(array_search($admin->get_user_id(), $admin_users))) {
+ if($page['visibility'] == 'deleted') {
+ $can_modify = true;
+ $editable_pages = $editable_pages+1;
+ } else {
+ $can_modify = false;
+ }
+ } else {
+ $can_modify = false;
+ }
+
+ // Work out if we should show a plus or not
+ $get_page_subs = $database->query("SELECT page_id,admin_groups,admin_users FROM ".TABLE_PREFIX."pages WHERE parent = '".$page['page_id']."'");
+ if($get_page_subs->numRows() > 0) {
+ $display_plus = true;
+ } else {
+ $display_plus = false;
+ }
+
+ // Work out how many pages there are for this parent
+ $num_pages = $get_pages->numRows();
+ ?>
+
+
-
+
+
++ ++ + + + get_permission('pages_modify') == true AND $can_modify == true AND $page['visibility'] != 'heading') { ?> +
+
+
+ + + + ++ '.($page['page_title']).''; + } + ?> + + ++ + ++ + +
+
+
+
+
+
+
+
+
+
+ + + get_permission('pages_settings') == true AND $can_modify == true) { ?> + + +
+
+
+
+
+
+
+
+ + + + get_permission('pages_settings') == true AND $can_modify == true) { ?> + + +
+
+
+
+
+ + + + get_permission('pages_settings') == true AND $can_modify == true) { ?> + + +
+
+
+
+
+ + get_permission('pages_delete') == true AND $can_modify == true) { ?> + + +
+
+
+
+
+
+
| + + | +
+
+
+
+ |
+
+
+
+
+
+ | + + | ++ : + | ++ : + | ++ : + | ++ : + | +
+
+
+
+
+
+
+
+< +print_footer(); + +?> \ No newline at end of file Property changes on: trunk/admin/pages/trash.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/preferences/index.php =================================================================== --- trunk/admin/preferences/index.php (nonexistent) +++ trunk/admin/preferences/index.php (revision 2) @@ -0,0 +1,157 @@ +correct_theme_source('preferences.htt'))); + $template->set_file( 'page', 'preferences.htt' ); + $template->set_block( 'page', 'main_block', 'main' ); +// read user-info from table users and assign it to template + $sql = 'SELECT `display_name`, `username`, `email` FROM `'.TABLE_PREFIX.'users` '; + $sql .= 'WHERE `user_id` = '.(int)$admin->get_user_id(); + if( $res_user = $database->query($sql) ) + { + if( $rec_user = $res_user->fetchRow() ) + { + $template->set_var('DISPLAY_NAME', $rec_user['display_name']); + $template->set_var('USERNAME', $rec_user['username']); + $template->set_var('EMAIL', $rec_user['email']); + $template->set_var('ADMIN_URL', ADMIN_URL); + } + } +// read available languages from table addons and assign it to the template + $sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` '; + $sql .= 'WHERE `type` = \'language\' ORDER BY `directory`'; + if( $res_lang = $database->query($sql) ) + { + $template->set_block('main_block', 'language_list_block', 'language_list'); + while( $rec_lang = $res_lang->fetchRow() ) + { + $langIcons = (empty($rec_lang['directory'])) ? 'none' : strtolower($rec_lang['directory']); + $template->set_var('CODE', $rec_lang['directory']); + $template->set_var('NAME', $rec_lang['name']); + $template->set_var('FLAG', THEME_URL.'/images/flags/'.$langIcons); + $template->set_var('SELECTED', (LANGUAGE == $rec_lang['directory'] ? ' selected="selected"' : '') ); + $template->parse('language_list', 'language_list_block', true); + } + } +// Insert default timezone values + $user_time = true; + include_once( ADMIN_PATH.'/interface/timezones.php' ); + $template->set_block('main_block', 'timezone_list_block', 'timezone_list'); + $iActualTimezone = ((DEFAULT_TIMEZONE <> 0) ? DEFAULT_TIMEZONE : 0); + $iActualTimezone = (($iActualTimezone == $admin->get_timezone())? 'system_default':$admin->get_timezone()); + $iActualTimezone = (($iActualTimezone!='system_default')?intval($iActualTimezone):$iActualTimezone); + foreach( $TIMEZONES AS $hour_offset => $title ) + { + $iTmpOffset = (is_numeric($hour_offset)?$hour_offset*3600:$hour_offset); + $template->set_var('VALUE', $hour_offset); + $template->set_var('NAME', $title); + $template->set_var('SELECTED', (($iTmpOffset === $iActualTimezone) ? ' selected="selected"' : '')); + $template->parse('timezone_list', 'timezone_list_block', true); + } +// Insert date format list + include_once( ADMIN_PATH.'/interface/date_formats.php' ); + $template->set_block('main_block', 'date_format_list_block', 'date_format_list'); + foreach( $DATE_FORMATS AS $format => $title ) + { + $format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key) + $template->set_var( 'VALUE', ($format != 'system_default' ? $format : 'system_default') ); + $template->set_var( 'NAME', $title ); + if( (DATE_FORMAT == $format && !isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) || + ('system_default' == $format && isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) ) + { + $template->set_var('SELECTED', ' selected="selected"'); + }else { + $template->set_var('SELECTED', ''); + } + $template->parse('date_format_list', 'date_format_list_block', true); + } +// Insert time format list + include_once( ADMIN_PATH.'/interface/time_formats.php' ); + $template->set_block('main_block', 'time_format_list_block', 'time_format_list'); + foreach( $TIME_FORMATS AS $format => $title ) + { + $format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key) + $template->set_var('VALUE', $format != 'system_default' ? $format : 'system_default' ); + $template->set_var('NAME', $title); + if( (TIME_FORMAT == $format && !isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) || + ('system_default' == $format && isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) ) + { + $template->set_var('SELECTED', ' selected="selected"'); + } else { + $template->set_var('SELECTED', ''); + } + $template->parse('time_format_list', 'time_format_list_block', true); + } + +// assign systemvars to template + $template->set_var(array( 'ADMIN_URL' => ADMIN_URL, + 'WB_URL' => WB_URL, + 'THEME_URL' => THEME_URL, + 'ACTION_URL' => ADMIN_URL.'/preferences/save.php' + ) + ); + $template->set_var('FTAN', $admin->getFTAN()); + $template->set_var('FORM_NAME', 'preferences_save'); +// assign language vars + $template->set_var(array( 'HEADING_MY_SETTINGS' => $HEADING['MY_SETTINGS'], + 'HEADING_MY_EMAIL' => $HEADING['MY_EMAIL'], + 'HEADING_MY_PASSWORD' => $HEADING['MY_PASSWORD'], + 'TEXT_SAVE' => $TEXT['SAVE'], + 'TEXT_RESET' => $TEXT['RESET'], + 'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'], + 'TEXT_USERNAME' => $TEXT['USERNAME'], + 'TEXT_EMAIL' => $TEXT['EMAIL'], + 'TEXT_LANGUAGE' => $TEXT['LANGUAGE'], + 'TEXT_TIMEZONE' => $TEXT['TIMEZONE'], + 'TEXT_DATE_FORMAT' => $TEXT['DATE_FORMAT'], + 'TEXT_TIME_FORMAT' => $TEXT['TIME_FORMAT'], + 'TEXT_CURRENT_PASSWORD' => $TEXT['CURRENT_PASSWORD'], + 'TEXT_NEW_PASSWORD' => $TEXT['NEW_PASSWORD'], + 'TEXT_RETYPE_NEW_PASSWORD' => $TEXT['RETYPE_NEW_PASSWORD'], + 'TEXT_NEW_PASSWORD' => $TEXT['NEW_PASSWORD'], + 'TEXT_RETYPE_NEW_PASSWORD' => $TEXT['RETYPE_NEW_PASSWORD'], + 'TEXT_NEED_CURRENT_PASSWORD' => $TEXT['NEED_CURRENT_PASSWORD'], + 'EMPTY_STRING' => '' + ) + ); +// Parse template for preferences form + $template->parse('main', 'main_block', false); + $output = $template->finish($template->parse('output', 'page')); + return $output; +} +// test if valid $admin-object already exists (bit complicated about PHP4 Compatibility) +if( !(isset($admin) && is_object($admin) && (get_class($admin) == 'admin')) ) +{ + require( '../../config.php' ); + require_once( WB_PATH.'/framework/class.admin.php' ); + $admin = new admin('Preferences'); +} +echo build_page($admin, $database); +$admin->print_footer(); Property changes on: trunk/admin/preferences/index.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/preferences/save.php =================================================================== --- trunk/admin/preferences/save.php (nonexistent) +++ trunk/admin/preferences/save.php (revision 2) @@ -0,0 +1,193 @@ +checkFTAN()){ $err_msg[] = $MESSAGE['GENERIC_SECURITY_ACCESS']; } + $sLanguagesAddonDefaultFile = WB_PATH.'/account/languages/EN.php'; + if (is_readable($sLanguagesAddonDefaultFile)){include $sLanguagesAddonDefaultFile;} + $sLanguagesAddonFile = WB_PATH.'/account/languages/'.LANGUAGE.'.php'; + if (is_readable($sLanguagesAddonFile)){include $sLanguagesAddonFile;} +// Get entered values and validate all + // remove any dangerouse chars from display_name +// $display_name = $admin->add_slashes(strip_tags(trim($admin->get_post('display_name')))); + $display_name = strip_tags( $admin->StripCodeFromText($admin->get_post('display_name'))); + $display_name = ( $display_name == '' ? $admin->get_display_name() : $display_name ); + // check that display_name is unique in whoole system (prevents from User-faking) + $sql = 'SELECT COUNT(*) FROM `'.TABLE_PREFIX.'users` '; + $sql .= 'WHERE `user_id` <> '.(int)$admin->get_user_id().' AND `display_name` LIKE "'.$display_name.'"'; + if( $database->get_one($sql) > 0 ){ $err_msg[] = ( @$MESSAGE['USERS_DISPLAYNAME_TAKEN']?:$MESSAGE['MEDIA_BLANK_NAME'].' ('.$TEXT['DISPLAY_NAME'].')'); } +// language must be 2 upercase letters only + $language = strtoupper($admin->get_post('language')); + $language = (preg_match('/^[A-Z]{2}$/', $language) ? $language : DEFAULT_LANGUAGE); + $user_time = true; +// timezone must be between -12 and +13 or -20 as system_default + $timezone = $admin->get_post('timezone'); + $timezone = (is_numeric($timezone) ? $timezone : DEFAULT_TIMEZONE/3600); + $timezone = (($timezone >= -12 && $timezone <= 13) ? $timezone : DEFAULT_TIMEZONE/3600) * 3600; + +// date_format must be a key from /interface/date_formats + $date_format = $admin->get_post('date_format'); + $date_format_key = str_replace(' ', '|', $date_format); + include( ADMIN_PATH.'/interface/date_formats.php' ); + $date_format = (array_key_exists($date_format_key, $DATE_FORMATS) ? $date_format : 'system_default'); + $date_format = ($date_format == 'system_default' ? '' : $date_format); + unset($DATE_FORMATS); +// time_format must be a key from /interface/time_formats + $time_format = $admin->get_post('time_format'); + $time_format_key = str_replace(' ', '|', $time_format); + $user_time = true; + include( ADMIN_PATH.'/interface/time_formats.php' ); + $time_format = (array_key_exists($time_format_key, $TIME_FORMATS) ? $time_format : 'system_default'); + $time_format = ($time_format == 'system_default' ? '' : $time_format); + unset($TIME_FORMATS); + +// email should be validatet by core + $email = trim( $admin->get_post('email') == null ? '' : $admin->get_post('email') ); + if( (!$admin->validate_email($email)) ) + { + $email = ''; + $err_msg[] = $MESSAGE['USERS_INVALID_EMAIL']; + }else { + if($email != '') { + $sql = 'SELECT `email` FROM `'.TABLE_PREFIX.'users` ' + . 'WHERE `user_id` = '.(int)$admin->get_user_id().' AND `email` LIKE \''.$email.'\''; + $IsOldMail = $database->get_one($sql); + // check that email is unique in whoole system + $email = $admin->add_slashes($email); + $sql = 'SELECT `email` FROM `'.TABLE_PREFIX.'users` ' + . 'WHERE `user_id` <> '.(int)$admin->get_user_id().' AND `email` LIKE \''.$email.'\''; + $checkMail = $database->get_one($sql); + + if( $checkMail == $email ){ $err_msg[] = $MESSAGE['USERS_EMAIL_TAKEN']; } + $bMailHasChanged = ($email != $IsOldMail); + } + } +// receive password vars and calculate needed action + $sCurrentPassword = $admin->get_post('current_password'); + $sCurrentPassword = (is_null($sCurrentPassword) ? '' : $sCurrentPassword); + $sNewPassword = $admin->get_post('new_password_1'); + $sNewPassword = (is_null($sNewPassword) ? '' : $sNewPassword); + $sNewPasswordRetyped = $admin->get_post('new_password_2'); + $sNewPasswordRetyped= (is_null($sNewPasswordRetyped) ? '' : $sNewPasswordRetyped); + + if($bMailHasChanged == true) + { + $bPassRequest = $bMailHasChanged; + } else { + $bPassRequest = ( ( $sCurrentPassword != '') || ($sNewPassword != '') || ($sNewPasswordRetyped != '') ) ? true : false; + } + +// Check existing password + $sql = 'SELECT `password` '; + $sql .= 'FROM `'.TABLE_PREFIX.'users` '; + $sql .= 'WHERE `user_id` = '.$admin->get_user_id(); + if ( $bPassRequest && md5($sCurrentPassword) != $database->get_one($sql)) { +// access denied + $err_msg[] = $MESSAGE['PREFERENCES_CURRENT_PASSWORD_INCORRECT']; + }else { +// validate new password + $sPwHashNew = false; + if($sNewPassword != '') { + if(strlen($sNewPassword) < $iMinPassLength) { + $err_msg[] = $MESSAGE['USERS_PASSWORD_TOO_SHORT']; + }else { + if($sNewPassword != $sNewPasswordRetyped) { + $err_msg[] = $MESSAGE['USERS_PASSWORD_MISMATCH']; + }else { + $pattern = '/[^'.$admin->password_chars.']/'; + if (preg_match($pattern, $sNewPassword)) { + $err_msg[] = $MESSAGE['PREFERENCES_INVALID_CHARS']; + }else { + $sPwHashNew = md5($sNewPassword); + } + } + } + } +// if no validation errors, try to update the database, otherwise return errormessages + if(sizeof($err_msg) == 0) + { + $sql = 'UPDATE `'.TABLE_PREFIX.'users` '; + $sql .= 'SET `display_name`=\''.$database->escapeString($display_name).'\', '; + if($sPwHashNew) { + $sql .= '`password`=\''.$database->escapeString($sPwHashNew).'\', '; + } + if($email != '') { + $sql .= '`email`=\''.$database->escapeString($email).'\', '; + } + $sql .= '`language`=\''.$database->escapeString($language).'\', ' + . '`timezone`=\''.$database->escapeString($timezone).'\', ' + . '`date_format`=\''.$database->escapeString($date_format).'\', ' + . '`time_format`=\''.$database->escapeString($time_format).'\' ' + . 'WHERE `user_id`='.(int)$admin->get_user_id(); + if( $database->query($sql) ) + { + // update successfull, takeover values into the session + $_SESSION['DISPLAY_NAME'] = $display_name; + $_SESSION['LANGUAGE'] = $language; + $_SESSION['TIMEZONE'] = $timezone; + $_SESSION['EMAIL'] = $email; + // Update date format + if($date_format != '') { + $_SESSION['DATE_FORMAT'] = $date_format; + if(isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) { unset($_SESSION['USE_DEFAULT_DATE_FORMAT']); } + } else { + $_SESSION['USE_DEFAULT_DATE_FORMAT'] = true; + if(isset($_SESSION['DATE_FORMAT'])) { unset($_SESSION['DATE_FORMAT']); } + } + // Update time format + if($time_format != '') { + $_SESSION['TIME_FORMAT'] = $time_format; + if(isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) { unset($_SESSION['USE_DEFAULT_TIME_FORMAT']); } + } else { + $_SESSION['USE_DEFAULT_TIME_FORMAT'] = true; + if(isset($_SESSION['TIME_FORMAT'])) { unset($_SESSION['TIME_FORMAT']); } + } + }else { + $err_msg[] = 'invalid database UPDATE call in '.__FILE__.'::'.__FUNCTION__.'before line '.__LINE__; + } + } + } + return ( (sizeof($err_msg) > 0) ? implode('
', $err_msg) : '' ); +} +$retval = save_preferences($admin, $database); +if( $retval == '') +{ + // print the header + $admin->print_header(); + $admin->print_success($MESSAGE['PREFERENCES_DETAILS_SAVED']); + $admin->print_footer(); +}else { + // print the header + $admin->print_header(); + $admin->print_error($retval); +} Property changes on: trunk/admin/preferences/save.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/settings/index.php =================================================================== --- trunk/admin/settings/index.php (nonexistent) +++ trunk/admin/settings/index.php (revision 2) @@ -0,0 +1,844 @@ + (defined('WEBSITE_SIGNATURE')?WEBSITE_SIGNATURE:'') +); +foreach($cfg as $key=>$value) { + db_update_key_value('settings', $key, $value); +} + +// Setup template object, parse vars to it, then parse it +// Create new template object + $template = new Template(dirname($admin->correct_theme_source('settings.htt')), 'remove'); +// $template->debug = true; + $template->set_file('page', 'settings.htt'); + $template->set_block('page', 'main_block', 'main'); +/*---------------------------------------------------------------------------------------------------*/ + $template->set_block('main_block', 'show_page_level_limit_block', 'show_page_level_limit'); + $template->set_block('main_block', 'show_checkbox_1_block', 'show_checkbox_1'); + $template->set_block('main_block', 'show_checkbox_2_block', 'show_checkbox_2'); + $template->set_block('main_block', 'show_checkbox_3_block', 'show_checkbox_3'); + $template->set_block('main_block', 'show_redirect_timer_block', 'show_redirect_timer'); + $template->set_block('main_block', 'show_php_error_level_block', 'show_php_error_level'); + $template->set_block('main_block', 'show_wysiwyg_block', 'show_wysiwyg'); + $template->set_block('main_block', 'show_charset_block', 'show_charset'); + $template->set_block('main_block', 'show_search_block', 'show_search'); + $template->set_block('main_block', 'show_access_block', 'show_access'); + $template->set_block('main_block', 'show_chmod_js_block', 'show_chmod_js'); + $template->set_block('main_block', 'show_setting_js_block', 'show_setting_js'); +/*---------------------------------------------------------------------------------------------------*/ + if (!$oTrans) { + $oTrans = Translate::getInstance(); + } + $oTrans->enableAddon('templates\\'.basename(THEME_PATH)); + $aLang = $oTrans->getLangArray(); + $template->set_var($aLang); +// Query current settings in the db, then loop through them and print them +$query = "SELECT * FROM `".TABLE_PREFIX."settings`"; +if($results = $database->query($query)) { + $aSetting = array(); + $settings = array(); + while($aSetting = $results->fetchRow(MYSQLI_ASSOC)) + { + $setting_name = $aSetting['name']; + $setting_value = $aSetting['value']; + switch ($setting_name) : + case 'wbmailer_smtp_password': + break; + default : + $sFilterApi = WB_PATH.'/modules/output_filter/OutputFilterApi.php'; + if (is_readable($sFilterApi)) { + require_once($sFilterApi); + $setting_value = OutputFilterApi('ReplaceSysvar', $setting_value); + } + $setting_value = htmlspecialchars($setting_value); + break; + endswitch; +// $setting_value = ( $setting_name != 'wbmailer_smtp_password' ) ? htmlspecialchars($aSetting['value']) : $aSetting['value']; + $settings[$setting_name] = $setting_value; + $template->set_var(strtoupper($setting_name),$setting_value); + } +} else { + +} +$SecureTokenLifeTime = $admin->getTokenLifeTime(); +array_walk( + $SecureTokenLifeTime, + function (&$aItem) { + $aItem /= 60; + } +); +$template->set_var( $SecureTokenLifeTime ); +/*---------------------------------------------------------------------------------------------------*/ +$template->set_var('EDITOR_WEBSITE_HEADER', ''); +$template->set_var('EDITOR_WEBSITE_FOOTER', ''); +$template->set_var('EDITOR_WEBSITE_SIGNATURE', ''); +if (defined('WYSIWYG_EDITOR') && is_readable(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include1.php')) +{ + require(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php'); + $template->set_block('main_block', 'show_website_header_block', 'show_website_header'); + if (defined('WYSIWYG_EDITOR')) { + $template->set_block('show_website_header', ''); + $WebsiteHeader = show_wysiwyg_editor('website_header','content_header', WEBSITE_HEADER,'100%','200', 'WB_Mini', true); + $template->set_var('EDITOR_WEBSITE_HEADER', $WebsiteHeader); + } else { + $template->parse('show_website_header','show_website_header_block',true); + } + $template->set_block('main_block', 'show_website_footer_block', 'show_website_footer'); + if (defined('WYSIWYG_EDITOR')) { + $template->set_block('show_website_footer', ''); + $WebsiteFooter = show_wysiwyg_editor('website_footer','content_footer', WEBSITE_FOOTER, '100%','200', 'WB_Mini', true); + $template->set_var('EDITOR_WEBSITE_FOOTER', $WebsiteFooter); + } else { + $template->parse('show_website_footer','show_website_footer_block',true); + } +// + $template->set_block('main_block', 'show_website_signature_block', 'show_website_signature'); + if (defined('WYSIWYG_EDITOR')) { + $template->set_block('show_website_signature', ''); + $WebsiteSignature = show_wysiwyg_editor('website_header','content_header', WEBSITE_SIGNATURE,'100%','200', 'WB_Mini', true); + $template->set_var('EDITOR_WEBSITE_SIGNATURE', $WebsiteSignature); + } else { + $template->parse('show_website_signature','show_website_signature_block',true); + } +} +/*---------------------------------------------------------------------------------------------------*/ +// Do the same for settings stored in config file as with ones in db +$database_type = ''; +$is_advanced = (boolean)$bAdvanced; +// Tell the browser whether or not to show advanced options +if($is_advanced) +{ + $template->set_var('DISPLAY_ADVANCED', ''); + $template->set_var('ADVANCED_FILE_PERMS_ID', 'file_perms_box'); + $template->set_var('BASIC_FILE_PERMS_ID', 'hide'); + $template->set_var('ADVANCED_VALUE', 1); + $template->set_var('ADVANCED_BUTTON', '<< '.$TEXT['HIDE_ADVANCED']); + $template->set_var('ADVANCED_LINK', 'index.php?advanced=0'); +} else { + $template->set_var('DISPLAY_ADVANCED', ' style="display: none;"'); + $template->set_var('BASIC_FILE_PERMS_ID', 'file_perms_box'); + $template->set_var('ADVANCED_FILE_PERMS_ID', 'hide'); + $template->set_var('ADVANCED_VALUE', 0); + $template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].' >>'); + $template->set_var('ADVANCED_LINK', 'index.php?advanced=1'); +} +/*---------------------------------------------------------------------------------------------------*/ + $query = 'SELECT * FROM `'.TABLE_PREFIX.'search` WHERE `extra` = \'\''; + $results = $database->query($query); + // Query current settings in the db, then loop through them and print them + while($aSearch = $results->fetchRow(MYSQLI_ASSOC)) + { + $search_name = $aSearch['name']; + $search_value = htmlspecialchars(($aSearch['value'])); + switch($search_name) { + // Search header + case 'header': + $template->set_var('SEARCH_HEADER', $search_value); + break; + // Search results header + case 'results_header': + $template->set_var('SEARCH_RESULTS_HEADER', $search_value); + break; + // Search results loop + case 'results_loop': + $template->set_var('SEARCH_RESULTS_LOOP', $search_value); + break; + // Search results footer + case 'results_footer': + $template->set_var('SEARCH_RESULTS_FOOTER', $search_value); + break; + // Search no results + case 'no_results': + $template->set_var('SEARCH_NO_RESULTS', $search_value); + break; + // Search footer + case 'footer': + $template->set_var('SEARCH_FOOTER', $search_value); + break; + // Search module-order + case 'module_order': + $template->set_var('SEARCH_MODULE_ORDER', $search_value); + break; + // Search max lines of excerpt + case 'max_excerpt': + $template->set_var('SEARCH_MAX_EXCERPT', $search_value); + break; + // time-limit + case 'time_limit': + $template->set_var('SEARCH_TIME_LIMIT', $search_value); + break; + // Search template + case 'template': + $search_template = $search_value; + break; + } + } +/*---------------------------------------------------------------------------------------------------*/ + $template->set_var(array( + 'WB_URL' => WB_URL, + 'THEME_URL' => THEME_URL, + 'ADMIN_URL' => ADMIN_URL, + )); + $template->set_var('FTAN', $admin->getFTAN()); +/*---------------------------------------------------------------------------------------------------*/ + // Insert page level limits + $template->set_block('show_page_level_limit_block', 'page_level_limit_list_block', 'page_level_limit_list'); + $template->set_var('PAGE_LEVEL_LIMIT', $settings['page_level_limit']); + // if select list + for($i = 1; $i <= 10; $i++) + { + $template->set_var('NUMBER', $i); + $template->set_var('SELECTED', ((PAGE_LEVEL_LIMIT == $i) ? ' selected="selected"' : '') ); + $template->parse('page_level_limit_list', 'page_level_limit_list_block', true); + } +/*---------------------------------------------------------------------------------------------------*/ + // Insert groups into signup list + $template->set_block('main_block', 'group_list_block', 'group_list'); + $sqlGroup = 'SELECT `group_id`, `name` FROM `'.TABLE_PREFIX.'groups` ' + . 'WHERE `group_id` != 1' + . ''; + if($results = $database->query($sqlGroup)) + { + while($group = $results->fetchRow(MYSQLI_ASSOC)) + { + $template->set_var('ID', $group['group_id']); + $template->set_var('NAME', $group['name']); + $template->set_var('SELECTED', ((FRONTEND_SIGNUP == $group['group_id']) ? ' selected="selected"' : '') ); + $template->parse('group_list', 'group_list_block', true); + } + } else { + $template->set_var('ID', 'disabled'); + $template->set_var('NAME', $MESSAGE['GROUPS']['NO_GROUPS_FOUND']); + $template->parse('group_list', 'group_list_block', true); + } +/*---------------------------------------------------------------------------------------------------*/ + // Insert default error reporting values + $template->set_block('show_php_error_level_block', 'error_reporting_list_block', 'error_reporting_list'); + require(ADMIN_PATH.'/interface/er_levels.php'); + foreach($ER_LEVELS AS $value => $title) + { + $template->set_var('VALUE', $value); + $template->set_var('NAME', $title); + $template->set_var('SELECTED', ((ER_LEVEL == $value) ? ' selected="selected"' : '') ); + $template->parse('error_reporting_list', 'error_reporting_list_block', true); + } +/*-------------------------------------------------------------------------------------*/ + // Insert WYSIWYG modules + $template->set_block('show_wysiwyg_block', 'wysiwyg_list_block', 'wysiwyg_list'); + $file='none'; + $module_name=$TEXT['NONE']; + $template->set_var('FILE', $file); + $template->set_var('NAME', $module_name); + $template->set_var('SELECTED', ((!defined('WYSIWYG_EDITOR') || $file == WYSIWYG_EDITOR) ? ' selected="selected"' : '') ); + $template->parse('wysiwyg_list', 'wysiwyg_list_block', true); + $sqlEditor = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `type` = \'module\' ' + . 'AND `function` = \'wysiwyg\' ' + . 'ORDER BY `name`'; + if($result = $database->query($sqlEditor)) + { + while($aWysiwyg = $result->fetchRow(MYSQLI_ASSOC)) + { + $template->set_var('FILE', $aWysiwyg['directory']); + $template->set_var('NAME', $aWysiwyg['name']); + $template->set_var('SELECTED', ((!defined('WYSIWYG_EDITOR') || $aWysiwyg['directory'] == WYSIWYG_EDITOR) ? ' selected="selected"' : '') ); + $template->parse('wysiwyg_list', 'wysiwyg_list_block', true); + } + } +/*---------------------------------------------------------------------------------------------------*/ + // Insert language values + $template->set_block('main_block', 'language_list_block', 'language_list'); + $sqlLang = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `type` = \'language\' ' + . 'ORDER BY `directory`'; + if($result = $database->query($sqlLang)) + { + while($aLang = $result->fetchRow(MYSQLI_ASSOC)) { + $langIcons = (empty($aLang['directory']) ? 'none' : strtolower($aLang['directory'])); + $template->set_var('CODE', $aLang['directory']); + $template->set_var('NAME', $aLang['name']); + $template->set_var('FLAG', THEME_URL.'/images/flags/'.$langIcons); + $template->set_var('SELECTED', (DEFAULT_LANGUAGE == $aLang['directory'] ? ' selected="selected"' : '') ); + $template->parse('language_list', 'language_list_block', true); + } + } +/*---------------------------------------------------------------------------------------------------*/ + // Insert default timezone values + $template->set_block('main_block', 'timezone_list_block', 'timezone_list'); + require(ADMIN_PATH.'/interface/timezones.php'); + foreach($TIMEZONES AS $hour_offset => $title) + { + // Make sure we dont list "System Default" as we are setting this value! + if($hour_offset != '-20') { + $template->set_var('VALUE', $hour_offset); + $template->set_var('NAME', $title); + $template->set_var('SELECTED', ( (DEFAULT_TIMEZONE == $hour_offset*60*60)?' selected="selected"':'' ) ); + $template->parse('timezone_list', 'timezone_list_block', true); + } + } +/*---------------------------------------------------------------------------------------------------*/ + // Insert default charset values + $template->set_block('show_charset_block', 'charset_list_block', 'charset_list'); + require(ADMIN_PATH.'/interface/charsets.php'); + foreach($CHARSETS AS $code => $title) { + $template->set_var('VALUE', $code); + $template->set_var('NAME', $title); + $template->set_var('SELECTED', ( (DEFAULT_CHARSET == $code)?' selected="selected"':'' ) ); + $template->parse('charset_list', 'charset_list_block', true); + } +/*---------------------------------------------------------------------------------------------------*/ + // Insert date format list + $template->set_block('main_block', 'date_format_list_block', 'date_format_list'); + require(ADMIN_PATH.'/interface/date_formats.php'); + foreach($DATE_FORMATS AS $format => $title) { + $format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key) + if($format != 'system_default') { + $template->set_var('VALUE', $format); + } else { + $template->set_var('VALUE', ''); + } + $template->set_var('NAME', $title); + $template->set_var('SELECTED', ( (DEFAULT_DATE_FORMAT == $format)?' selected="selected"':'' ) ); + $template->parse('date_format_list', 'date_format_list_block', true); + } +/*---------------------------------------------------------------------------------------------------*/ + // Insert time format list + $template->set_block('main_block', 'time_format_list_block', 'time_format_list'); + require(ADMIN_PATH.'/interface/time_formats.php'); + foreach($TIME_FORMATS AS $format => $title) { + $format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key) + if($format != 'system_default') { + $template->set_var('VALUE', $format); + } else { + $template->set_var('VALUE', ''); + } + $template->set_var('NAME', $title); + $template->set_var('SELECTED', ( (DEFAULT_TIME_FORMAT == $format)?' selected="selected"':'' ) ); + $template->parse('time_format_list', 'time_format_list_block', true); + } +/*---------------------------------------------------------------------------------------------------*/ + // Insert templates + $template->set_block('main_block', 'template_list_block', 'template_list'); + $sqlTheme = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `type` = \'template\' ' + . 'AND `function` != \'theme\' ' + . 'ORDER BY `name`'; + if($result = $database->query($sqlTheme)) { +// $result = $database->query("SELECT * FROM `".TABLE_PREFIX."addons` WHERE `type` = 'template' AND `function` != 'theme' ORDER BY `name`"); +// if($result->numRows() > 0) { + while($addon = $result->fetchRow( MYSQLI_ASSOC )) { + $template->set_var('FILE', $addon['directory']); + $template->set_var('NAME', $addon['name']); + $template->set_var('SELECTED', (($addon['directory'] == DEFAULT_TEMPLATE)?' selected="selected"':'') ); + $template->parse('template_list', 'template_list_block', true); + } + } +/*---------------------------------------------------------------------------------------------------*/ + // Insert backend theme + $template->set_block('main_block', 'theme_list_block', 'theme_list'); + $sqlTheme = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `type` = \'template\' ' + . 'AND `function` = \'theme\' ' + . 'ORDER BY `name`'; + if($result = $database->query($sqlTheme)) { + while($addon = $result->fetchRow( MYSQLI_ASSOC )) { + $template->set_var('FILE', $addon['directory']); + $template->set_var('NAME', $addon['name']); + $template->set_var('SELECTED', (($addon['directory'] == DEFAULT_THEME)?' selected="selected"':'') ); + $template->parse('theme_list', 'theme_list_block', true); + } + } +/*---------------------------------------------------------------------------------------------------*/ +// Insert templates for search settings + $template->set_block('main_block', 'search_template_list_block', 'search_template_list'); + $search_template = ( ($search_template == DEFAULT_TEMPLATE) || ($search_template == '') ) ? '' : $search_template; + $selected = ( ($search_template != DEFAULT_TEMPLATE) ) ? ' selected="selected"' : ''; + $template->set_var(array( + 'FILE' => '', + 'NAME' => $TEXT['SYSTEM_DEFAULT'], + 'SELECTED' => $selected + )); + $template->parse('search_template_list', 'search_template_list_block', true); + $sqlSearch = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ' + . ' WHERE `type` = \'template\' ' + . 'AND `function` =\'template\' ' + . 'ORDER BY `name`'; + if ($result = $database->query($sqlSearch)) + { + while($addon = $result->fetchRow(MYSQLI_ASSOC)) + { + $template->set_var('FILE', $addon['directory']); + $template->set_var('NAME', $addon['name']); + $template->set_var('SELECTED', (($addon['directory'] == $search_template) ? ' selected="selected"' : '') ); + $template->parse('search_template_list', 'search_template_list_block', true); + } + } +/*--------------------------------------------------------------------------------------------------------*/ + // Insert permissions values + if($admin->get_permission('settings_advanced') != true) + { + $template->set_var('DISPLAY_ADVANCED_BUTTON', 'hide'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if multiple menus feature is enabled + if(defined('MULTIPLE_MENUS') && MULTIPLE_MENUS == true) + { + $template->set_var('MULTIPLE_MENUS_ENABLED', ' checked="checked"'); + } else { + $template->set_var('MULTIPLE_MENUS_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if page languages feature is enabled + if(defined('PAGE_LANGUAGES') && PAGE_LANGUAGES == true) + { + $template->set_var('PAGE_LANGUAGES_ENABLED', ' checked="checked"'); + } else { + $template->set_var('PAGE_LANGUAGES_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if warn_page_leave feature is enabled + if (defined('WARN_PAGE_LEAVE') && WARN_PAGE_LEAVE == true) + { + $template->set_var('WARN_PAGE_LEAVE_ENABLED', ' checked="checked"'); + } else { + $template->set_var('WARN_PAGE_LEAVE_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if smart login feature is enabled + if(defined('SMART_LOGIN') && SMART_LOGIN == true) + { + $template->set_var('SMART_LOGIN_ENABLED', ' checked="checked"'); + } else { + $template->set_var('SMART_LOGIN_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + /* Make's sure GD library is installed */ + if(extension_loaded('gd') && function_exists('imageCreateFromJpeg')) + { + $template->set_var('GD_EXTENSION_ENABLED', ''); + } else { + $template->set_var('GD_EXTENSION_ENABLED', ' style="display: none;"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if section blocks feature is enabled + if(defined('SECTION_BLOCKS') && SECTION_BLOCKS == true) + { + $template->set_var('SECTION_BLOCKS_ENABLED', ' checked="checked"'); + } else { + $template->set_var('SECTION_BLOCKS_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if homepage redirection feature is enabled + if(defined('HOMEPAGE_REDIRECTION') && HOMEPAGE_REDIRECTION == true) + { + $template->set_var('HOMEPAGE_REDIRECTION_ENABLED', ' checked="checked"'); + } else { + $template->set_var('HOMEPAGE_REDIRECTION_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if debug mode feature is enabled + if(defined('DEBUG') && DEBUG == true) + { + $template->set_var('DEBUG_ENABLED', ' checked="checked"'); + } else { + $template->set_var('DEBUG_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if token_fingerprint feature is enabled + if(defined('SEC_TOKEN_FINGERPRINT') && SEC_TOKEN_FINGERPRINT == true) + { + $template->set_var('FINGERPRINT_ENABLED', ' checked="checked"'); + } else { + $template->set_var('FINGERPRINT_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out which server os should be checked {DISPLAY_CHMOD} + if(OPERATING_SYSTEM == 'linux') + { + $template->set_var('LINUX_SELECTED', ' checked="checked"'); + $template->set_var('DISPLAY_CHMOD', ' style="display: block;"'); + } elseif(OPERATING_SYSTEM == 'windows') { + $template->set_var('WINDOWS_SELECTED', ' checked="checked"'); + $template->set_var('DISPLAY_CHMOD', ' style="display: none;"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if manage sections feature is enabled + if(MANAGE_SECTIONS) + { + $template->set_var('MANAGE_SECTIONS_ENABLED', ' checked="checked"'); + } else { + $template->set_var('MANAGE_SECTIONS_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out which wbmailer routine should be checked + $template->set_var(array( + 'TEXT_WBMAILER_DEFAULT_SETTINGS_NOTICE' => $TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'], + 'TEXT_WBMAILER_DEFAULT_SENDER_MAIL' => $TEXT['WBMAILER_DEFAULT_SENDER_MAIL'], + 'TEXT_WBMAILER_DEFAULT_SENDER_NAME' => $TEXT['WBMAILER_DEFAULT_SENDER_NAME'], + 'TEXT_WBMAILER_NOTICE' => $TEXT['WBMAILER_NOTICE'], + 'TEXT_WBMAILER_FUNCTION' => $TEXT['WBMAILER_FUNCTION'], + 'TEXT_WBMAILER_SMTP_HOST' => $TEXT['WBMAILER_SMTP_HOST'], + 'TEXT_WBMAILER_PHP' => $TEXT['WBMAILER_PHP'], + 'TEXT_WBMAILER_SMTP' => $TEXT['WBMAILER_SMTP'], + 'TEXT_WBMAILER_SMTP_AUTH' => $TEXT['WBMAILER_SMTP_AUTH'], + 'TEXT_WBMAILER_SMTP_AUTH_NOTICE' => $TEXT['REQUIRED'].' '.$TEXT['WBMAILER_SMTP_AUTH'], + 'TEXT_WBMAILER_SMTP_USERNAME' => $TEXT['WBMAILER_SMTP_USERNAME'], + 'TEXT_WBMAILER_SMTP_PASSWORD' => $TEXT['WBMAILER_SMTP_PASSWORD'], + 'SMTP_AUTH_SELECTED' => ' checked="checked"' + )); + if(WBMAILER_ROUTINE == 'phpmail') + { + $template->set_var('PHPMAIL_SELECTED', ' checked="checked"'); + $template->set_var('SMTP_VISIBILITY', ' style="display: none;"'); + $template->set_var('SMTP_VISIBILITY_AUTH', ''); + // $template->set_var('SMTP_AUTH_SELECTED', ''); + } elseif(WBMAILER_ROUTINE == 'smtp') + { + $template->set_var('SMTPMAIL_SELECTED', ' checked="checked"'); + $template->set_var('SMTP_VISIBILITY', ''); + $template->set_var('SMTP_VISIBILITY_AUTH', ''); + } +//$template->set_var('SMTP_AUTH_SELECTED',( (WBMAILER_SMTP_AUTH === true) ?' checked="checked"':'') ); + $template->set_block('show_access_block', 'smtp_port_list_block', 'smtp_port_list'); + $aSmtpPorts = array( '25', '465', '587', '2525'); + foreach($aSmtpPorts as $sPort) + { + $template->set_var('VALUE', $sPort); + $template->set_var('PNAME', $sPort); + $template->set_var('SELECTED', ((WBMAILER_SMTP_PORT == $sPort) ? ' selected="selected"' : '') ); + $template->parse('smtp_port_list', 'smtp_port_list_block', true); + } +/*---------------------------------------------------------------------------------------------------*/ + $template->set_block('show_access_block', 'smtp_secure_list_block', 'smtp_secure_list'); + $aSmtpSecure = array( 'TLS', 'SSL' ); + foreach($aSmtpSecure as $sSecure) + { + $template->set_var('VALUE', $sSecure); + $template->set_var('SNAME', $sSecure); + $template->set_var('SELECTED', ((WBMAILER_SMTP_SECURE == $sSecure) ? ' selected="selected"' : '') ); + $template->parse('smtp_secure_list', 'smtp_secure_list_block', true); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if intro feature is enabled + if(INTRO_PAGE) + { + $template->set_var('INTRO_PAGE_ENABLED', ' checked="checked"'); + } else { + $template->set_var('INTRO_PAGE_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if frontend login feature is enabled + if(FRONTEND_LOGIN) + { + $template->set_var('PRIVATE_ENABLED', ' checked="checked"'); + } else { + $template->set_var('PRIVATE_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if page trash feature is disabled, in-line, or separate + if(PAGE_TRASH == 'disabled') + { + $template->set_var('PAGE_TRASH_DISABLED', ' checked="checked"'); + $template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', 'display: none;'); + } elseif(PAGE_TRASH == 'inline') + { + $template->set_var('PAGE_TRASH_INLINE', ' checked="checked"'); + $template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', 'display: none;'); + } elseif(PAGE_TRASH == 'separate') + { + $template->set_var('PAGE_TRASH_SEPARATE', ' checked="checked"'); + $template->set_var('DISPLAY_PAGE_TRASH_SEPARATE', 'display: inline;'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if media home folde feature is enabled + if(HOME_FOLDERS) + { + $template->set_var('HOME_FOLDERS_ENABLED', ' checked="checked"'); + } else { + $template->set_var('HOME_FOLDERS_DISABLED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Insert search select + if(SEARCH == 'private') + { + $template->set_var('PRIVATE_SEARCH', ' selected="selected"'); + } elseif(SEARCH == 'registered') { + $template->set_var('REGISTERED_SEARCH', ' selected="selected"'); + } elseif(SEARCH == 'none') { + $template->set_var('NONE_SEARCH', ' selected="selected"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out if 777 permissions are set + if(STRING_FILE_MODE == '0777' AND STRING_DIR_MODE == '0777') + { + $template->set_var('WORLD_WRITEABLE_SELECTED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out which file mode boxes are checked + if(extract_permission(STRING_FILE_MODE, 'u', 'r')) + { + $template->set_var('FILE_U_R_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_FILE_MODE, 'u', 'w')) + { + $template->set_var('FILE_U_W_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_FILE_MODE, 'u', 'e')) + { + $template->set_var('FILE_U_E_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_FILE_MODE, 'g', 'r')) + { + $template->set_var('FILE_G_R_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_FILE_MODE, 'g', 'w')) + { + $template->set_var('FILE_G_W_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_FILE_MODE, 'g', 'e')) + { + $template->set_var('FILE_G_E_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_FILE_MODE, 'o', 'r')) + { + $template->set_var('FILE_O_R_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_FILE_MODE, 'o', 'w')) + { + $template->set_var('FILE_O_W_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_FILE_MODE, 'o', 'e')) + { + $template->set_var('FILE_O_E_CHECKED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + // Work-out which dir mode boxes are checked + if(extract_permission(STRING_DIR_MODE, 'u', 'r')) + { + $template->set_var('DIR_U_R_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_DIR_MODE, 'u', 'w')) + { + $template->set_var('DIR_U_W_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_DIR_MODE, 'u', 'e')) + { + $template->set_var('DIR_U_E_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_DIR_MODE, 'g', 'r')) + { + $template->set_var('DIR_G_R_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_DIR_MODE, 'g', 'w')) + { + $template->set_var('DIR_G_W_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_DIR_MODE, 'g', 'e')) + { + $template->set_var('DIR_G_E_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_DIR_MODE, 'o', 'r')) + { + $template->set_var('DIR_O_R_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_DIR_MODE, 'o', 'w')) + { + $template->set_var('DIR_O_W_CHECKED', ' checked="checked"'); + } + if(extract_permission(STRING_DIR_MODE, 'o', 'e')) + { + $template->set_var('DIR_O_E_CHECKED', ' checked="checked"'); + } +/*---------------------------------------------------------------------------------------------------*/ + $template->set_var(array( + 'PAGES_DIRECTORY' => PAGES_DIRECTORY, + 'MEDIA_DIRECTORY' => MEDIA_DIRECTORY, + 'PAGE_EXTENSION' => PAGE_EXTENSION, + 'PAGE_SPACER' => PAGE_SPACER, + 'TABLE_PREFIX' => TABLE_PREFIX + )); +/*---------------------------------------------------------------------------------------------------*/ + // Insert Server Email value into template + $template->set_var('SERVER_EMAIL', SERVER_EMAIL); +/*---------------------------------------------------------------------------------------------------*/ + // Insert language headings + $template->set_var(array( + 'HEADING_GENERAL_SETTINGS' => $HEADING['GENERAL_SETTINGS'], + 'HEADING_DEFAULT_SETTINGS' => $HEADING['DEFAULT_SETTINGS'], + 'HEADING_SEARCH_SETTINGS' => $HEADING['SEARCH_SETTINGS'], + 'HEADING_SERVER_SETTINGS' => $HEADING['SERVER_SETTINGS'], + 'HEADING_WBMAILER_SETTINGS' => $HEADING['WBMAILER_SETTINGS'], + 'HEADING_ADMINISTRATION_TOOLS' => $HEADING['ADMINISTRATION_TOOLS'] + ) + ); +/*---------------------------------------------------------------------------------------------------*/ + $template->set_block('show_access_block', 'input_pages_directory_block', 'input_pages_directory'); + $template->set_block('show_access_block', 'show_pages_directory_block', 'show_pages_directory'); + $sql = 'SELECT COUNT(`page_id`) `numRows` FROM `'.TABLE_PREFIX.'pages` '; + if (!$database->get_one($sql) ) { + $template->parse('input_pages_directory', 'input_pages_directory_block', true); + $template->set_block('show_pages_directory', ''); + } else { + $template->parse('show_pages_directory', 'show_pages_directory_block', true); + $template->set_block('input_pages_directory', ''); + } +/*---------------------------------------------------------------------------------------------------*/ + // Insert language text and messages + $template->set_var(array( + 'TEXT_WEBSITE_TITLE' => $TEXT['WEBSITE_TITLE'], + 'TEXT_WEBSITE_DESCRIPTION' => $TEXT['WEBSITE_DESCRIPTION'], + 'TEXT_WEBSITE_KEYWORDS' => $TEXT['WEBSITE_KEYWORDS'], + 'TEXT_WEBSITE_HEADER' => $TEXT['WEBSITE_HEADER'], + 'TEXT_WEBSITE_FOOTER' => $TEXT['WEBSITE_FOOTER'], + 'TEXT_WEBSITE_SIGNATURE' => 'Signature', + 'TEXT_HEADER' => $TEXT['HEADER'], + 'TEXT_FOOTER' => $TEXT['FOOTER'], + 'TEXT_VISIBILITY' => $TEXT['VISIBILITY'], + 'TEXT_RESULTS_HEADER' => $TEXT['RESULTS_HEADER'], + 'TEXT_RESULTS_LOOP' => $TEXT['RESULTS_LOOP'], + 'TEXT_RESULTS_FOOTER' => $TEXT['RESULTS_FOOTER'], + 'TEXT_NO_RESULTS' => $TEXT['NO_RESULTS'], + 'TEXT_TEXT' => $TEXT['TEXT'], + 'TEXT_DEFAULT' => $TEXT['DEFAULT'], + 'TEXT_LANGUAGE' => $TEXT['LANGUAGE'], + 'TEXT_TIMEZONE' => $TEXT['TIMEZONE'], + 'TEXT_CHARSET' => $TEXT['CHARSET'], + 'TEXT_DATE_FORMAT' => $TEXT['DATE_FORMAT'], + 'TEXT_TIME_FORMAT' => $TEXT['TIME_FORMAT'], + 'TEXT_TEMPLATE' => $TEXT['TEMPLATE'], + 'TEXT_THEME' => $TEXT['THEME'], + 'TEXT_WYSIWYG_EDITOR' => $TEXT['WYSIWYG_EDITOR'], + 'TEXT_PAGE_LEVEL_LIMIT' => $TEXT['PAGE_LEVEL_LIMIT'], + 'TEXT_INTRO_PAGE' => $TEXT['INTRO_PAGE'], + 'TEXT_FRONTEND' => $TEXT['FRONTEND'], + 'TEXT_LOGIN' => $TEXT['LOGIN'], + 'TEXT_REDIRECT_AFTER' => $TEXT['REDIRECT_AFTER'], + 'TEXT_SIGNUP' => $TEXT['SIGNUP'], + 'TEXT_PHP_ERROR_LEVEL' => $TEXT['PHP_ERROR_LEVEL'], + 'TEXT_PAGES_DIRECTORY' => $TEXT['PAGES_DIRECTORY'], + 'TEXT_MEDIA_DIRECTORY' => $TEXT['MEDIA_DIRECTORY'], + 'TEXT_PAGE_EXTENSION' => $TEXT['PAGE_EXTENSION'], + 'TEXT_PAGE_SPACER' => $TEXT['PAGE_SPACER'], + 'TEXT_RENAME_FILES_ON_UPLOAD' => $TEXT['RENAME_FILES_ON_UPLOAD'], + 'TEXT_APP_NAME' => $TEXT['APP_NAME'], + 'TEXT_SESSION_IDENTIFIER' => $TEXT['SESSION_IDENTIFIER'], + 'TEXT_SEC_ANCHOR' => $TEXT['SEC_ANCHOR'], + 'TEXT_SERVER_OPERATING_SYSTEM' => $TEXT['SERVER_OPERATING_SYSTEM'], + 'TEXT_LINUX_UNIX_BASED' => $TEXT['LINUX_UNIX_BASED'], + 'TEXT_WINDOWS' => $TEXT['WINDOWS'], + 'TEXT_ADMIN' => $TEXT['ADMIN'], + 'TEXT_TYPE' => $TEXT['TYPE'], + 'TEXT_DATABASE' => $TEXT['DATABASE'], + 'TEXT_HOST' => $TEXT['HOST'], + 'TEXT_USERNAME' => $TEXT['USERNAME'], + 'TEXT_PASSWORD' => $TEXT['PASSWORD'], + 'TEXT_NAME' => $TEXT['NAME'], + 'TEXT_TABLE_PREFIX' => $TEXT['TABLE_PREFIX'], + 'TEXT_SAVE' => $TEXT['SAVE'], + 'TEXT_RESET' => $TEXT['RESET'], + 'TEXT_CHANGES' => $TEXT['CHANGES'], + 'TEXT_ENABLED' => $TEXT['ENABLED'], + 'TEXT_DISABLED' => $TEXT['DISABLED'], + 'TEXT_MANAGE_SECTIONS' => $HEADING['MANAGE_SECTIONS'], + 'TEXT_MANAGE' => $TEXT['MANAGE'], + 'TEXT_SEARCH' => $TEXT['SEARCH'], + 'TEXT_PUBLIC' => $TEXT['PUBLIC'], + 'TEXT_PRIVATE' => $TEXT['PRIVATE'], + 'TEXT_REGISTERED' => $TEXT['REGISTERED'], + 'TEXT_NONE' => $TEXT['NONE'], + 'TEXT_FILES' => strtoupper(substr($TEXT['FILES'], 0, 1)).substr($TEXT['FILES'], 1), + 'TEXT_DIRECTORIES' => $TEXT['DIRECTORIES'], + 'TEXT_FILESYSTEM_PERMISSIONS' => $TEXT['FILESYSTEM_PERMISSIONS'], + 'TEXT_USER' => $TEXT['USER'], + 'TEXT_GROUP' => $TEXT['GROUP'], + 'TEXT_OTHERS' => $TEXT['OTHERS'], + 'TEXT_READ' => $TEXT['READ'], + 'TEXT_WRITE' => $TEXT['WRITE'], + 'TEXT_EXECUTE' => $TEXT['EXECUTE'], + 'TEXT_WARN_PAGE_LEAVE' => '', + 'TEXT_SMART_LOGIN' => $TEXT['SMART_LOGIN'], + 'TEXT_MULTIPLE_MENUS' => $TEXT['MULTIPLE_MENUS'], + 'TEXT_HOMEPAGE_REDIRECTION' => $TEXT['HOMEPAGE_REDIRECTION'], + 'TEXT_SECTION_BLOCKS' => $TEXT['SECTION_BLOCKS'], + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], + 'TEXT_PAGE_TRASH' => $TEXT['PAGE_TRASH'], + 'TEXT_PAGE_LANGUAGES' => $TEXT['PAGE_LANGUAGES'], + 'TEXT_INLINE' => $TEXT['INLINE'], + 'TEXT_SEPARATE' => $TEXT['SEPARATE'], + 'TEXT_HOME_FOLDERS' => $TEXT['HOME_FOLDERS'], + 'TEXT_WYSIWYG_STYLE' => $TEXT['WYSIWYG_STYLE'], + 'TEXT_WORLD_WRITEABLE_FILE_PERMISSIONS' => $TEXT['WORLD_WRITEABLE_FILE_PERMISSIONS'], + 'MODE_SWITCH_WARNING' => $MESSAGE['SETTINGS']['MODE_SWITCH_WARNING'], + 'WORLD_WRITEABLE_WARNING' => $MESSAGE['SETTINGS']['WORLD_WRITEABLE_WARNING'], + 'TEXT_MODULE_ORDER' => $TEXT['MODULE_ORDER'], + 'TEXT_MAX_EXCERPT' => $TEXT['MAX_EXCERPT'], + 'TEXT_TIME_LIMIT' => $TEXT['TIME_LIMIT'] + )); +/*---------------------------------------------------------------------------------------------------*/ +if($is_advanced) +{ + $template->parse('show_page_level_limit', 'show_page_level_limit_block', true); + $template->parse('show_checkbox_1', 'show_checkbox_1_block', true); + $template->parse('show_checkbox_2', 'show_checkbox_2_block', true); + $template->parse('show_checkbox_3', 'show_checkbox_3_block', true); + $template->set_block('show_php_error_level', ''); + $template->set_block('show_charset', ''); + $template->parse('show_wysiwyg', 'show_wysiwyg_block', true); + $template->parse('show_search', 'show_search_block', true); + $template->parse('show_redirect_timer', 'show_redirect_timer_block', true); +}else { + $template->set_block('show_page_level_limit', ''); + $template->set_block('show_checkbox_1', ''); + $template->set_block('show_checkbox_2', ''); + $template->set_block('show_checkbox_3', ''); + $template->set_block('show_php_error_level', ''); + $template->set_block('show_charset', ''); + $template->set_block('show_wysiwyg', ''); + $template->set_block('show_search', ''); + $template->set_block('show_redirect_timer', ''); +} +if($is_advanced && $admin->get_user_id()=='1') +{ + $template->parse('show_access', 'show_access_block', true); + $template->parse('show_chmod_js', 'show_chmod_js_block', true); + $template->parse('show_setting_js', 'show_setting_js_block', true); +}else { + $template->set_block('show_access_block', ''); + $template->set_block('show_chmod_js_block', ''); + $template->set_block('show_setting_js_block', ''); +} +/*---------------------------------------------------------------------------------------------------*/ +// Parse template objects output +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +$admin->print_footer(); Property changes on: trunk/admin/settings/index.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/settings/locking.php =================================================================== --- trunk/admin/settings/locking.php (nonexistent) +++ trunk/admin/settings/locking.php (revision 2) @@ -0,0 +1,41 @@ +enableAddon(ADMIN_DIRECTORY.'\\settings'); + +if (!class_exists('admin', false)) {require (WB_PATH.'/framework/class.admin.php');} +$admin = new admin('Start', 'settings', false, false); + +if ($admin->get_user_id() == 1) { + $val = (((int)(defined('SYSTEM_LOCKED') ? SYSTEM_LOCKED : 0)) + 1) % 2; + db_update_key_value('settings', 'system_locked', $val); +} +// redirect to backend +header('Location: ' . ADMIN_URL . '/index.php'); +exit(); Property changes on: trunk/admin/settings/locking.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/settings/save.php =================================================================== --- trunk/admin/settings/save.php (nonexistent) +++ trunk/admin/settings/save.php (revision 2) @@ -0,0 +1,305 @@ +checkFTAN() ) +{ + $admin->print_header(); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); +} +$admin->print_header(); + +$TOKENS = unserialize($_SESSION['TOKENS']); +$array = $_POST; +ksort($array); + +$aInputs = array(); +$aOutputs = array(); + +$sql = 'SELECT `name`, `value` FROM `'.TABLE_PREFIX.'settings` ' + . 'ORDER BY `name`'; +if($oSettings = $database->query($sql)) { + while($aSetting = $oSettings->fetchRow( MYSQLI_ASSOC )) { + $aOutputs['_POST'][$aSetting['name']] = $aSetting['value']; + } +} +// After check print the header + +// Work-out file mode +if( !$bAdvanced ) +{ + // Check if should be set to 777 or left alone + if(isset($_POST['world_writeable']) && $_POST['world_writeable'] == 'true') + { + $file_mode = '0777'; + $dir_mode = '0777'; + } else { + $file_mode = STRING_FILE_MODE; + $dir_mode = STRING_DIR_MODE; + } +} else { + $file_mode = STRING_FILE_MODE; + $dir_mode = STRING_DIR_MODE; + + if($admin->get_user_id()=='1') + { + // Work-out the octal value for file mode + $u = 0; + if(isset($_POST['file_u_r']) && $_POST['file_u_r'] == 'true') { + $u = $u+4; + } + if(isset($_POST['file_u_w']) && $_POST['file_u_w'] == 'true') { + $u = $u+2; + } + if(isset($_POST['file_u_e']) && $_POST['file_u_e'] == 'true') { + $u = $u+1; + } + $g = 0; + if(isset($_POST['file_g_r']) && $_POST['file_g_r'] == 'true') { + $g = $g+4; + } + if(isset($_POST['file_g_w']) && $_POST['file_g_w'] == 'true') { + $g = $g+2; + } + if(isset($_POST['file_g_e']) && $_POST['file_g_e'] == 'true') { + $g = $g+1; + } + $o = 0; + if(isset($_POST['file_o_r']) && $_POST['file_o_r'] == 'true') { + $o = $o+4; + } + if(isset($_POST['file_o_w']) && $_POST['file_o_w'] == 'true') { + $o = $o+2; + } + if(isset($_POST['file_o_e']) && $_POST['file_o_e'] == 'true') { + $o = $o+1; + } + $file_mode = "0".$u.$g.$o; + // Work-out the octal value for dir mode + $u = 0; + if(isset($_POST['dir_u_r']) && $_POST['dir_u_r'] == 'true') { + $u = $u+4; + } + if(isset($_POST['dir_u_w']) && $_POST['dir_u_w'] == 'true') { + $u = $u+2; + } + if(isset($_POST['dir_u_e']) && $_POST['dir_u_e'] == 'true') { + $u = $u+1; + } + $g = 0; + if(isset($_POST['dir_g_r']) && $_POST['dir_g_r'] == 'true') { + $g = $g+4; + } + if(isset($_POST['dir_g_w']) && $_POST['dir_g_w'] == 'true') { + $g = $g+2; + } + if(isset($_POST['dir_g_e']) && $_POST['dir_g_e'] == 'true') { + $g = $g+1; + } + $o = 0; + if(isset($_POST['dir_o_r']) && $_POST['dir_o_r'] == 'true') { + $o = $o+4; + } + if(isset($_POST['dir_o_w']) && $_POST['dir_o_w'] == 'true') { + $o = $o+2; + } + if(isset($_POST['dir_o_e']) && $_POST['dir_o_e'] == 'true') { + $o = $o+1; + } + $dir_mode = "0".$u.$g.$o; + } +// Ensure that the specified default email is formally valid + if(isset($_POST['server_email'])) + { + $_POST['server_email'] = strip_tags($_POST['server_email']); + // $pattern = '/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9]([-a-z0-9_]?[a-z0-9])*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z]{2})|([1]?\d{1,2}|2[0-4]{1}\d{1}|25[0-5]{1})(\.([1]?\d{1,2}|2[0-4]{1}\d{1}|25[0-5]{1})){3})(:[0-9]{1,5})?\r/im'; + $pattern = '/^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.(([0-9]{1,3})|([a-zA-Z]{2,6}))$/'; + if(false == preg_match($pattern, $_POST['server_email'])) + { + $admin->print_error($MESSAGE['USERS_INVALID_EMAIL']. + '
Email: '.htmlentities($_POST['server_email']).'', $js_back); + } + } + + if(isset($_POST['wbmailer_routine']) && ($_POST['wbmailer_routine']=='smtp')) { + + $checkSmtpHost = (isset($_POST['wbmailer_smtp_host']) && ($_POST['wbmailer_smtp_host']=='') ? false : true); + $checkSmtpUser = (isset($_POST['wbmailer_smtp_username']) && ($_POST['wbmailer_smtp_username']=='') ? false : true); + $checkSmtpPassword = (isset($_POST['wbmailer_smtp_password']) && ($_POST['wbmailer_smtp_password']=='') ? false : true); + if(!$checkSmtpHost || !$checkSmtpUser || !$checkSmtpPassword) { + $admin->print_error($TEXT['REQUIRED'].' '.$TEXT['WBMAILER_SMTP_AUTH']. + '
'.$MESSAGE['GENERIC_FILL_IN_ALL'].'', $js_back); + } + + } +} + +$allow_tags_in_fields = array('website_header', 'website_footer','website_signature'); +$allow_empty_values = array('website_header','website_footer','website_signature','sec_anchor','pages_directory','page_spacer','wbmailer_smtp_secure'); +$disallow_in_fields = array('pages_directory', 'media_directory','wb_version'); + +// Query current settings in the db, then loop through them and update the db with the new value +$settings = array(); +$old_settings = array(); +// Query current settings in the db, then loop through them to get old values +$sql = 'SELECT `name`, `value` FROM `'.TABLE_PREFIX.'settings` ' + . 'ORDER BY `name`'; +if($res_settings = $database->query($sql)) { + $passed = false; + while($setting = $res_settings->fetchRow(MYSQLI_ASSOC)) : + $old_settings[$setting['name']] = $setting['value']; + $setting_name = $setting['name']; + if($setting_name=='wb_version') { continue; } + $value = $admin->get_post($setting_name); + $value = is_null($value) ? '' : $value; + $value = isset($_POST[$setting_name]) ? $value : $old_settings[$setting_name] ; + switch ($setting_name) : + case 'website_header': + case 'website_footer': + case 'website_signature': + $sRelUrl = preg_replace('/^https?:\/\/[^\/]+(.*)/is', '\1', WB_URL); + $sDocumentRootUrl = str_replace($sRelUrl, '', WB_URL); + $sMediaUrl = WB_URL.MEDIA_DIRECTORY; + $aPatterns = array( + '/(<[^>]*?=\s*\")(\/+)([^\"]*?\"[^>]*?)/is', + '/(<[^>]*=\s*")('.preg_quote($sMediaUrl, '/').')([^">]*".*>)/siU' + ); + $aReplacements = array( + '\1'.$sDocumentRootUrl.'/\3', + '$1{SYSVAR:MEDIA_REL}$3' + ); + $value = preg_replace($aPatterns, $aReplacements, $value); + $passed = true; + break; + case 'default_timezone': + $value=$value*60*60; + $passed = true; + break; + case 'string_dir_mode': + $value=$dir_mode; + $passed = true; + break; + case 'string_file_mode': + $value=$file_mode; + $passed = true; + break; + case 'pages_directory': + break; + case 'wbmailer_smtp_auth': + // $value = isset($_POST[$setting_name]) ? $_POST[$setting_name] : '' ; + $value = true ; + $passed = true; + break; + case 'sec_token_netmask4': + $iValue = intval( $value ); + $value = (($iValue > 32) || ( $iValue < 0 ) ? '24' : $value); + $passed = true; + break; + case 'sec_token_netmask6': + $iValue = intval( $value ); + $value = (($iValue > 128) || ( $iValue < 0 ) ? '64' : $value); + $passed = true; + break; + case 'sec_token_life_time': + $value = $admin->sanitizeLifeTime(intval( $value ) * 60 ); + $passed = true; + break; + case 'wb_version': + continue; + break; + default : + $passed = in_array($setting_name, $allow_empty_values); + break; + endswitch; + if(is_array($value)){ $value = $value['0']; } + if ( !in_array($setting_name, $allow_tags_in_fields)) { + $value = strip_tags($value); + } else { + + } + if ( (!in_array($value, $disallow_in_fields) && (isset($_POST[$setting_name])) || $passed == true)) { + $sIdentifier = trim($database->escapeString($setting_name)); + $value = trim($database->escapeString($value)); + if (!db_update_key_value('settings',$sIdentifier,$value)) { + $admin->print_error($database->get_error, $js_back ); + } +/* + $sql = 'UPDATE `'.TABLE_PREFIX.'settings` SET ' + . '`value`=\''.$value.'\' ' + . 'WHERE `name`=\''.$database->escapeString($setting_name).'\''; + if (!$database->query($sql)) { + $admin->print_error($database->get_error, $js_back ); + break; + } +*/ + } + endwhile; +} + +// Query current search settings in the db, then loop through them and update the db with the new value +$sql = 'SELECT `name`, `value` FROM `'.TABLE_PREFIX.'search` ' + . 'WHERE `extra`=\'\''; +if (!($res_search = $database->query($sql))) { + $admin->print_error($database->is_error(), $js_back ); +} +while($search_setting = $res_search->fetchRow()) : + $old_value = $search_setting['value']; + $setting_name = $search_setting['name']; + $post_name = 'search_'.$search_setting['name']; + + // hold old value if post is empty + // check search template + $value = (($admin->get_post($post_name) == '') && ($setting_name != 'template')) + ? $old_value + : $admin->get_post($post_name); + if (isset($value)) { + $value = $database->escapeString($value); + $sql = 'UPDATE `'.TABLE_PREFIX.'search` ' + . 'SET `value`=\''.$value.'\' ' + . 'WHERE `name`=\''.$setting_name.'\' AND `extra`=\'\''; + if(!($database->query($sql))) { + $admin->print_error( TABLE_PREFIX.'search :: '.$MESSAGE['GENERIC_NOT_UPGRADED'].'
'.$database->get_error, $js_back ); + break; + } + // $sql_info = mysql_info($database->db_handle); //->> nicht mehr erforderlich + } +endwhile; + +$admin->print_success($MESSAGE['SETTINGS_SAVED'], $js_back ); +$admin->print_footer(); + Property changes on: trunk/admin/settings/save.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/start/index.php =================================================================== --- trunk/admin/start/index.php (nonexistent) +++ trunk/admin/start/index.php (revision 2) @@ -0,0 +1,195 @@ + WB_PATH.'/modules/', + 'templates' => WB_PATH.'/templates/', + 'languages' => WB_PATH.'/languages/' + ); + foreach($dirs AS $type => $dir) { + if( ($handle = opendir($dir)) ) { + while(false !== ($file = readdir($handle))) { + if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'admin.php' AND $file != 'index.php') { + // Get addon type + if($type == 'modules') { + load_module($dir.'/'.$file, true); + // Pretty ugly hack to let modules run $admin->set_error + // See dummy class definition admin_dummy above + if(isset($admin->error) && $admin->error != '') { + $admin->print_error($admin->error); + } + } elseif($type == 'templates') { + load_template($dir.'/'.$file); + } elseif($type == 'languages') { + load_language($dir.'/'.$file); + } + } + } + closedir($handle); + } + } + $sql = 'DELETE FROM `'.TABLE_PREFIX.'settings` WHERE `name`=\'FINALIZE_SETUP\''; + if($database->query($sql)) { } +} +// --------------------------------------- +$msg = '
'; +// check if it is neccessary to start the uograde-script +if(($admin->ami_group_member('1')) && file_exists(WB_PATH.'/upgrade-script.php')) { + // check if it is neccessary to start the uograde-script + $oldVersion = ''; +/* + $oldVersion = ''.WB_VERSION.(@WB_SP ? : ''); + $newVersion = ''.VERSION.( @SP ? : ''); +*/ + $oldVersion = trim(''.WB_VERSION.'+'.WB_REVISION.'+'.( defined('WB_SP') ? WB_SP : ''), '+'); + $newVersion = trim(''.VERSION.'+'.REVISION.'+'.( defined('SP') ? SP : ''), '+'); + if ( version_compare($oldVersion, $newVersion, '<') === true ) { + if(!headers_sent()) { + header('Location: '.WB_URL.'/upgrade-script.php'); + exit; + } else { + echo "
The upgrade script could not be start automatically.\n" . + "Please click on this link to start the script!
\n"; + exit; + } + } +// $msg .= ''.$MESSAGE['START_UPGRADE_SCRIPT_EXISTS'].''; +} + +/** + * delete stored ip adresses default after 60 days + */ +$sql = 'UPDATE `'.TABLE_PREFIX.'users` SET `login_ip` = \'\' WHERE `login_when` < '.(time()-(60*84600)); +$database->query($sql); + +// Setup template object, parse vars to it, then parse it +// Create new template object +$template = new Template(dirname($admin->correct_theme_source('start.htt'))); +$template->set_file('page', 'start.htt'); +$template->set_block('page', 'main_block', 'main'); + +// Insert values into the template object +$template->set_var(array( + 'WELCOME_MESSAGE' => $MESSAGE['START_WELCOME_MESSAGE'], + 'CURRENT_USER' => $MESSAGE['START_CURRENT_USER'], + 'DISPLAY_NAME' => $admin->get_display_name(), + 'ADMIN_URL' => ADMIN_URL, + 'WB_URL' => WB_URL, + 'THEME_URL' => THEME_URL, + 'WB_VERSION' => WB_VERSION, + 'START_LIST' => ' ' + ) + ); +// Insert permission values into the template object +$get_permission = (function($type='preferences', $ParentBlock='main_block') use ($admin, $template){ + $template->set_block($ParentBlock, 'show_'.$type.'_block', 'show_'.$type); + if ($admin->get_permission($type) != true) { + $template->set_block('show_'.$type, ''); + return false; + } else { + $template->parse('show_'.$type, 'show_'.$type.'_block', true); + } + return true; +}); +$get_permission ('pages'); +$get_permission ('media'); +$get_permission ('addons'); +$get_permission ('settings'); +$get_permission ('admintools'); +$get_permission ('access'); + +//$msg .= (file_exists(WB_PATH.'/install/')) ? $MESSAGE['START_INSTALL_DIR_EXISTS'] : $msg; + +// Check if installation directory still exists +if (file_exists(WB_PATH.'/upgrade-script.php') ) { +// Check if user is part of Adminstrators group / better be a Systemadministrator +// if ($admin->ami_group_member(1)){ + if ($admin->get_user_id() == 1) { + $template->set_var('WARNING', $msg ); + } else { + $template->set_var('DISPLAY_WARNING', 'display:none;'); + } +} else { + $template->set_var('DISPLAY_WARNING', 'display:none;'); +} + +// Insert "Add-ons" section overview (pretty complex compared to normal) +$addons_overview = $TEXT['MANAGE'].' '; +$addons_count = 0; +if($admin->get_permission('modules') == true) +{ + $addons_overview .= ''.$MENU['MODULES'].''; + $addons_count = 1; +} +if($admin->get_permission('templates') == true) +{ + if($addons_count == 1) { $addons_overview .= ', '; } + $addons_overview .= ''.$MENU['TEMPLATES'].''; + $addons_count = 1; +} +if($admin->get_permission('languages') == true) +{ + if($addons_count == 1) { $addons_overview .= ', '; } + $addons_overview .= ''.$MENU['LANGUAGES'].''; +} + +// Insert "Access" section overview (pretty complex compared to normal) +$access_overview = $TEXT['MANAGE'].' '; +$access_count = 0; +if($admin->get_permission('users') == true) { + $access_overview .= ''.$MENU['USERS'].''; + $access_count = 1; +} +if($admin->get_permission('groups') == true) { + if($access_count == 1) { $access_overview .= ', '; } + $access_overview .= ''.$MENU['GROUPS'].''; + $access_count = 1; +} + +// Insert section names and descriptions +$template->set_var(array( + 'PAGES' => $MENU['PAGES'], + 'MEDIA' => $MENU['MEDIA'], + 'ADDONS' => $MENU['ADDONS'], + 'ACCESS' => $MENU['ACCESS'], + 'PREFERENCES' => $MENU['PREFERENCES'], + 'SETTINGS' => $MENU['SETTINGS'], + 'ADMINTOOLS' => $MENU['ADMINTOOLS'], + 'HOME_OVERVIEW' => $OVERVIEW['START'], + 'PAGES_OVERVIEW' => $OVERVIEW['PAGES'], + 'MEDIA_OVERVIEW' => $OVERVIEW['MEDIA'], + 'ADDONS_OVERVIEW' => $addons_overview, + 'ACCESS_OVERVIEW' => $access_overview, + 'PREFERENCES_OVERVIEW' => $OVERVIEW['PREFERENCES'], + 'SETTINGS_OVERVIEW' => $OVERVIEW['SETTINGS'], + 'ADMINTOOLS_OVERVIEW' => $OVERVIEW['ADMINTOOLS'] + ) + ); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/start/index.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/templates/details.php =================================================================== --- trunk/admin/templates/details.php (nonexistent) +++ trunk/admin/templates/details.php (revision 2) @@ -0,0 +1,126 @@ +checkFTAN() ){ + $admin->print_header(); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL ); + } + $admin->print_header(); + + $file = ''; +// Check if user selected template + if (!isset($_POST['file']) || $_POST['file'] == false) { + $iAddonId = 0; + $admin->print_error( $MESSAGE['GENERIC_FORGOT_OPTIONS'], $js_back ); + } else { + $iAddonId = $admin->checkIDKEY('file',0); + } + if ($iAddonId == 0){ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); + } + +// Get template directory + $sqlAddons = 'SELECT `directory` FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `addon_id`='.(int)$iAddonId.' ' + . ''.''; + if ($file = $database->get_one($sqlAddons)) { + $file = preg_replace('/[^a-z0-9_-]/i', "", $file); // fix secunia 2010-92-2 + } + +// Check if the template exists + if (!is_readable(WB_PATH.'/templates/'.$file)) { + $admin->print_error($MESSAGE['GENERIC_NOT_INSTALLED'], $js_back ); + } + +// Setup template object, parse vars to it, then parse it +// Create new template object +$template = new Template(dirname($admin->correct_theme_source('templates_details.htt'))); +// $template->debug = true; +$template->set_file('page', 'templates_details.htt'); +$template->set_block('page', 'main_block', 'main'); +$template->set_var('FTAN', $admin->getFTAN()); + +// Insert values + $sqlAddons = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `type` = \'template\' ' + . 'AND `directory` = \''.$file.'\''; + if($result = $database->query($sqlAddons)) { + $row = $result->fetchRow(MYSQLI_ASSOC); + } + +// check if a template description exists for the displayed backend language +$tool_description = false; +if(function_exists('file_get_contents') && file_exists(WB_PATH.'/templates/'.$file.'/languages/'.LANGUAGE .'.php')) { + // read contents of the template language file into string + $data = @file_get_contents(WB_PATH .'/templates/' .$file .'/languages/' .LANGUAGE .'.php'); + // use regular expressions to fetch the content of the variable from the string + $tool_description = get_variable_content('template_description', $data, false, false); + // replace optional placeholder {WB_URL} with value stored in config.php + if($tool_description !== false && strlen(trim($tool_description)) != 0) { + $tool_description = str_replace('{WB_URL}', WB_URL, $tool_description); + } else { + $tool_description = false; + } +} +if($tool_description !== false) { + // Override the template-description with correct desription in users language + $row['description'] = $tool_description; +} + +$template->set_var(array( + 'NAME' => $row['name'], + 'TYPE' => $row['function'], + 'AUTHOR' => $row['author'], + 'DESCRIPTION' => $row['description'], + 'VERSION' => $row['version'], + 'DESIGNED_FOR' => $row['platform'] + ) + ); + +// Insert language headings +$template->set_var(array( + 'HEADING_TEMPLATE_DETAILS' => $HEADING['TEMPLATE_DETAILS'] + ) + ); +// Insert language text and messages +$template->set_var(array( + 'TEXT_NAME' => $TEXT['NAME'], + 'TEXT_TYPE' => $TEXT['TYPE'], + 'TEXT_AUTHOR' => $TEXT['AUTHOR'], + 'TEXT_VERSION' => $TEXT['VERSION'], + 'TEXT_DESIGNED_FOR' => $TEXT['DESIGNED_FOR'], + 'TEXT_DESCRIPTION' => $TEXT['DESCRIPTION'], + 'TEXT_BACK' => $TEXT['BACK'] + ) + ); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/templates/details.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/templates/index.php =================================================================== --- trunk/admin/templates/index.php (nonexistent) +++ trunk/admin/templates/index.php (revision 2) @@ -0,0 +1,135 @@ +correct_theme_source('templates.htt'))); +// $template->debug = true; +$template->set_file('page', 'templates.htt'); +$template->set_block('page', 'main_block', 'main'); +$template->set_var('FTAN', $admin->getFTAN()); + +// Insert values into template list +$template->set_block('main_block', 'template_detail_block', 'template_detail'); +$template->set_block('template_detail_block', 'template_detail_select_block', 'template_detail_select'); +$template->set_block('main_block', 'template_uninstall_block', 'template_uninstall'); +$template->set_block('template_uninstall_block', 'template_uninstall_select_block', 'template_uninstall_select'); +$aPreventFromUninstall = array (' wb_theme ', ' WbTheme ', ' default ', ' default_theme ', ' DefaultTheme '); +$sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `type` = \'template\' ' + . 'ORDER BY `name`'; +if($oAddons = $database->query( $sql )) { + while($aAddon = $oAddons->fetchRow( MYSQLI_ASSOC )) { + if( !$admin->get_permission( $aAddon['directory'], 'template' )) { continue; } + $aAddonIdKey = $admin->getIDKEY($aAddon['addon_id']); + $template->set_var('DETAIL_VALUE', $aAddonIdKey); + $template->set_var('DETAIL_NAME', $aAddon['name']); + $template->parse('template_detail_select', 'template_detail_select_block', true); + if (!preg_match('/'.$aAddon['directory'].'/si', implode('|', $aPreventFromUninstall))) { + $template->set_var('UNINSTALL_VALUE', $aAddonIdKey); + $template->set_var('UNINSTALL_NAME', $aAddon['name']); + $template->parse('template_uninstall_select', 'template_uninstall_select_block', true); + } + } +} + +// Insert permissions values +$template->set_block('main_block', 'template_install_block', 'template_install'); +if($admin->get_permission('templates_install') != true) { + $template->set_var('DISPLAY_INSTALL', ''); + $template->set_block('template_install', ''); +} else { + $template->parse('template_install', 'template_install_block', true); +} +if($admin->get_permission('templates_uninstall') != true) { + $template->set_var('DISPLAY_UNINSTALL', ''); + $template->set_block('template_uninstall', ''); +} else { + $template->parse('template_uninstall', 'template_uninstall_block', true); +} +if($admin->get_permission('templates_view') != true) { + $template->set_var('DISPLAY_LIST', ''); + $template->set_block('template_detail', ''); +} else { + $template->parse('template_detail', 'template_detail_block', true); +} + +$template->set_block('main_block', 'addon_module_block', 'addon_module'); +if($admin->get_permission('modules_view') != true) { + $template->set_block ('addon_module', ''); +} else { + $template->parse('addon_module', 'addon_module_block', true); +} + +$template->set_block('main_block', 'addon_language_block', 'addon_language'); +if($admin->get_permission('languages_view') != true) { + $template->set_block ('addon_language', ''); +} else { + $template->parse('addon_language', 'addon_language_block', true); +} + +$template->set_block('main_block', 'addon_template_block', 'addon_template'); +if($admin->get_permission('admintools') != true) { + $template->set_block ('addon_template', ''); +} else { + $template->parse('addon_template', 'addon_template_block', true); +} + + + +// Insert language headings +$template->set_var(array( + 'HEADING_INSTALL_TEMPLATE' => $HEADING['INSTALL_TEMPLATE'], + 'HEADING_UNINSTALL_TEMPLATE' => $HEADING['UNINSTALL_TEMPLATE'], + 'HEADING_TEMPLATE_DETAILS' => $HEADING['TEMPLATE_DETAILS'] + ) + ); +// insert urls +$template->set_var(array( + 'ADMIN_URL' => ADMIN_URL, + 'WB_URL' => WB_URL, + 'THEME_URL' => THEME_URL, + 'FTAN' => $admin->getFTAN() + ) + ); +// Insert language text and messages +$template->set_var(array( + 'URL_MODULES' => $admin->get_permission('modules') ? ADMIN_URL . '/modules/index.php' : '', + 'URL_LANGUAGES' => $admin->get_permission('languages') ? ADMIN_URL . '/languages/index.php' : '', + 'URL_ADVANCED' => ' ', + 'MENU_LANGUAGES' => $admin->get_permission('languages') ? $MENU['LANGUAGES'] : ' ', + 'MENU_MODULES' => $admin->get_permission('modules') ? $MENU['MODULES'] : ' ', + 'TEXT_INSTALL' => $TEXT['INSTALL'], + 'TEXT_UNINSTALL' => $TEXT['UNINSTALL'], + 'TEXT_VIEW_DETAILS' => $TEXT['VIEW_DETAILS'], + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], + 'CHANGE_TEMPLATE_NOTICE' => $MESSAGE['TEMPLATES']['CHANGE_TEMPLATE_NOTICE'] + ) +); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/templates/index.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/templates/install.php =================================================================== --- trunk/admin/templates/install.php (nonexistent) +++ trunk/admin/templates/install.php (revision 2) @@ -0,0 +1,161 @@ +checkFTAN() ) +{ + $admin->print_header(); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); +} +// After check print the header +$admin->print_header(); + +// Check if user uploaded a file +if(!isset($_FILES['userfile'])) { + $admin->print_error($MESSAGE['GENERIC_ERROR_OPENING_FILE'], $js_back ); +} + +// Include the WB functions file +if (!function_exists('load_template')){require(WB_PATH.'/framework/functions.php');} + +// Set temp vars +$temp_dir = WB_PATH.'/temp/'; +$temp_file = $temp_dir . $_FILES['userfile']['name']; +$temp_unzip = WB_PATH.'/temp/unzip/'; + +// Try to upload the file to the temp dir +if(!move_uploaded_file($_FILES['userfile']['tmp_name'], $temp_file)) { + $admin->print_error($MESSAGE['GENERIC_CANNOT_UPLOAD'], $js_back ); +} + +// Include the PclZip class file (thanks to +if(!class_exists('PclZip')){ require(WB_PATH.'/include/pclzip/pclzip.lib.php');} + +// Remove any vars with name "template_directory" and "theme_directory" +if (isset($template_directory)){unset($template_directory);} +if (isset($theme_directory)){unset($theme_directory);} + +// Setup the PclZip object +$archive = new PclZip($temp_file); +// Unzip the files to the temp unzip folder +$list = $archive->extract(PCLZIP_OPT_PATH, $temp_unzip); +// Check if uploaded file is a valid Add-On zip file +if (!($list || !file_exists($temp_unzip . 'info.php'))) { + $admin->print_error($MESSAGE['GENERIC_INVALID_ADDON_FILE']); +} + +// Include the templates info file +require($temp_unzip.'info.php'); + +// Perform Add-on requirement checks before proceeding +require(WB_PATH . '/framework/addon.precheck.inc.php'); +preCheckAddon($temp_file); + +// Delete the temp unzip directory +rm_full_dir($temp_unzip); + +// Check if the file is valid +if(!isset($template_directory)) { + if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file + $admin->print_error($MESSAGE['GENERIC_INVALID']); +} +// Check if this module is already installed +// and compare versions if so +$new_template_version = $template_version; +unset($template_version); +$success_message = $MESSAGE['GENERIC_MODULE_VERSION_ERROR']; + +if (is_dir(WB_PATH.'/templates/'.$template_directory)) { + + if (file_exists(WB_PATH.'/templates/'.$template_directory.'/info.php')) { + require(WB_PATH.'/templates/'.$template_directory.'/info.php'); + $sql = 'SELECT `version` FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `directory`=\''.$template_directory.'\''; + $old_template_version = $database->get_one($sql); + // Version to be installed is older than currently installed version + if (versionCompare($old_template_version, $new_template_version, '>=')) { + if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file + $admin->print_error($template_directory.'
'.$MESSAGE['GENERIC_ALREADY_INSTALLED'].'
'.'Version '.$old_template_version); + } else { + if (is_readable(WB_PATH.'/templates/'.$template_directory.'/upgrade.php')) { + require(WB_PATH.'/templates/'.$template_directory.'/upgrade.php'); + } + $success_message = $MESSAGE['GENERIC_UPGRADED']; + + } + } +} else { + $success_message = $MESSAGE['GENERIC_INSTALLED']; +} + +// Check if template dir is writable +if(!is_writable(WB_PATH.'/templates/')) { + if(file_exists($temp_file)) { unlink($temp_file); } // Remove temp file + $admin->print_error($MESSAGE['TEMPLATES_BAD_PERMISSIONS']); +} + +// Set template dir +$template_dir = WB_PATH.'/templates/'.$template_directory; + +// Make sure the template dir exists, and chmod if needed +if(!file_exists($template_dir)) { + make_dir($template_dir); +} else { + change_mode($template_dir, 'dir'); +} + +// Unzip template to the template dir +$list = (int)$archive->extract(PCLZIP_OPT_PATH, $template_dir, PCLZIP_OPT_REPLACE_NEWER); +if ($list==0) +{ + $admin->print_error($MESSAGE['GENERIC_CANNOT_UNZIP']); +} + +// Delete the temp zip file +if (file_exists($temp_file)) { unlink($temp_file); } + +// Chmod all the uploaded files +$dir = dir($template_dir); +while(false !== $entry = $dir->read()) { + // Skip pointers + if(substr($entry, 0, 1) != '.' AND $entry != '.svn' AND !is_dir($template_dir.'/'.$entry)) { + // Chmod file + change_mode($template_dir.'/'.$entry); + } +} + +// Load template info into DB +if (load_template($template_dir)===true){ +// Print success message + $admin->print_success($success_message); +} else { + $admin->print_error($MESSAGE['GENERIC_ALREADY_INSTALLED']); +} +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/templates/install.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/templates/uninstall.php =================================================================== --- trunk/admin/templates/uninstall.php (nonexistent) +++ trunk/admin/templates/uninstall.php (revision 2) @@ -0,0 +1,170 @@ +$v) $aStr = str_replace("{{".$k."}}", $v, $aStr); + return $aStr; + } +} + +// suppress to print the header, so no new FTAN will be set +$admin = new admin('Addons', 'templates_uninstall', false); + +$js_back = ADMIN_URL.'/templates/index.php'; + + if( !$admin->checkFTAN() ){ + $admin->print_header(); + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); + } + // After check print the header + $admin->print_header(); + + $file = ''; +// Check if user selected template + if (!isset($_POST['file']) || $_POST['file'] == false) { + $iAddonId = 0; + $admin->print_error( $MESSAGE['GENERIC_FORGOT_OPTIONS'], $js_back ); + } else { + $iAddonId = $admin->checkIDKEY('file',0); + } + if ($iAddonId == 0){ + $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); + } + +// Get template directory + $sqlAddons = 'SELECT `directory` FROM `'.TABLE_PREFIX.'addons` ' + . 'WHERE `addon_id`='.(int)$iAddonId.' ' + . ''.''; + if ($file = $database->get_one($sqlAddons)) { + $file = preg_replace('/[^a-z0-9_-]/i', "", $file); // fix secunia 2010-92-2 + } + +// check whether the template is used as default wb theme +$aPreventFromUninstall = array ('wb_theme', 'WbTheme', 'default_theme', 'DefaultTheme', 'default' ); +if( + $file == DEFAULT_THEME || + preg_match('/'.$file.'/si', implode('|', $aPreventFromUninstall )) +) { + $temp = array ('name' => $file ); + $msg = replace_all( $MESSAGE['GENERIC_CANNOT_UNINSTALL_IS_DEFAULT_THEME'], $temp ); + $admin->print_error( $msg ); +} +// Check if the template exists +if (!is_dir(WB_PATH.'/templates/'.$file)) { + $admin->print_error($MESSAGE['GENERIC_NOT_INSTALLED'], $js_back ); +} +/** +* Check if the template is the standard-template or still in use +*/ +if (!array_key_exists('CANNOT_UNINSTALL_IS_DEFAULT_TEMPLATE', $MESSAGE['GENERIC'] ) ) + $MESSAGE['GENERIC_CANNOT_UNINSTALL_IS_DEFAULT_TEMPLATE'] = "Can't uninstall this template {{name}} because it's the standardtemplate!"; + +// check whether the template is used as default wb theme +if($file == DEFAULT_THEME) { + $temp = array ('name' => $file ); + $msg = replace_all( $MESSAGE['GENERIC_CANNOT_UNINSTALL_IS_DEFAULT_TEMPLATE'], $temp ); + $admin->print_error( $msg ); +} + +if ($file == DEFAULT_TEMPLATE) { + $temp = array ('name' => $file ); + $msg = replace_all( $MESSAGE['GENERIC_CANNOT_UNINSTALL_IS_DEFAULT_TEMPLATE'], $temp ); + $admin->print_error( $msg ); + +} else { + + /** + * Check if the template is still in use by a page ... + */ + + $sqlPage = 'SELECT `page_id`, `page_title` FROM `'.TABLE_PREFIX.'pages` ' + . 'WHERE `template`=\''.$file.'\' ' + . 'ORDER BY `page_title`'.' '; + $info = $database->query($sqlPage); + if ($info->numRows() > 0) { + /** + * Template is still in use, so we're collecting the page-titles + */ + + /** + * The base-message template-string for the top of the message + */ + if (!array_key_exists("CANNOT_UNINSTALL_IN_USE_TMPL", $MESSAGE['GENERIC'])) { + $add = $info->numRows() == 1 ? "this page" : "these pages"; + $msg_template_str = "
{{type}} {{type_name}} could not be uninstalled because it is still in use by {{pages}}"; + $msg_template_str .= ":
click for editing.
"; + } else { + $msg_template_str = $MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE_TMPL']; + $temp = explode(";",$MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE_TMPL_PAGES']); + $add = $info->numRows() == 1 ? $temp[0] : $temp[1]; + } + /** + * The template-string for displaying the Page-Titles ... in this case as a link + */ + $page_template_str = "- {{title}}
"; + $values = array ('type' => 'Template', 'type_name' => $file, 'pages' => $add); + $msg = replace_all ( $msg_template_str, $values ); + $page_names = ""; + + while ($data = $info->fetchRow() ) { + $page_info = array( + 'id' => $data['page_id'], + 'title' => $data['page_title'] + ); + $page_names .= replace_all ( $page_template_str, $page_info ); + } + + /** + * Printing out the error-message and die(). + */ + $admin->print_error($MESSAGE['GENERIC_CANNOT_UNINSTALL_IN_USE'].$msg.$page_names); + } +} + +// Check if we have permissions on the directory + if (!is_writable(WB_PATH.'/templates/'.$file)) { + $admin->print_error(' ('.$file.') '.$MESSAGE['GENERIC_CANNOT_UNINSTALL'], $js_back); + } +// Try to delete the template dir + if (!rm_full_dir(WB_PATH.'/templates/'.$file)) { + $admin->print_error(' ('.$file.') '.$MESSAGE['GENERIC_CANNOT_UNINSTALL'], $js_back); + } else { + // Remove entry from DB + $sql = 'DELETE FROM `'.TABLE_PREFIX.'addons`' + . 'WHERE `directory` = \''.$file.'\' ' + . 'AND type = \'template\' '; + $database->query($sql); + } + +// Update pages that use this template with default template + $sql = 'UPDATE '.TABLE_PREFIX.'pages SET ' + . 'template = '.DEFAULT_TEMPLATE.'' + . 'WHERE template = \''.$file.'\''; + if (!$database->query($sql)){} +// Print success message + $admin->print_success(' ('.$file.') '.$MESSAGE['GENERIC_UNINSTALLED'], $js_back); + + +// Print admin footer +$admin->print_footer(); Property changes on: trunk/admin/templates/uninstall.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Index: trunk/admin/themes/templates/SectionInfoLine.htt =================================================================== --- trunk/admin/themes/templates/SectionInfoLine.htt (nonexistent) +++ trunk/admin/themes/templates/SectionInfoLine.htt (revision 2) @@ -0,0 +1,22 @@ + + +
+
+
+
\ No newline at end of file
Index: trunk/admin/themes/templates/access.htt
===================================================================
--- trunk/admin/themes/templates/access.htt (nonexistent)
+++ trunk/admin/themes/templates/access.htt (revision 2)
@@ -0,0 +1,45 @@
+
+
+
+
+
Index: trunk/admin/themes/templates/addons.htt
===================================================================
--- trunk/admin/themes/templates/addons.htt (nonexistent)
+++ trunk/admin/themes/templates/addons.htt (revision 2)
@@ -0,0 +1,97 @@
+
+
+{ACCESS}
+ +
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: trunk/admin/themes/templates/admintools.htt
===================================================================
--- trunk/admin/themes/templates/admintools.htt (nonexistent)
+++ trunk/admin/themes/templates/admintools.htt (revision 2)
@@ -0,0 +1,27 @@
+
+
+{ADDONS_OVERVIEW} |
+ {TEXT_ADVANCED} | +
-
+
- {ADDONS_LIST} +
-
+
+
+ +
+ ++ + ++ +
+ + {MODULES} + {MODULES_OVERVIEW} + +
+ -
+
+
+ +
+ ++ + ++ +
+ + {TEMPLATES} + {TEMPLATES_OVERVIEW} + +
+ -
+
+
+ +
+ ++ + ++ +
+ + {LANGUAGES} + {LANGUAGES_OVERVIEW} + +
+
 |
+ {TXT_ADMIN_SETTINGS} + + | +
{HEADING_ADMINISTRATION_TOOLS}
+
+
+
\ No newline at end of file
Index: trunk/admin/themes/templates/error.htt
===================================================================
--- trunk/admin/themes/templates/error.htt (nonexistent)
+++ trunk/admin/themes/templates/error.htt (revision 2)
@@ -0,0 +1,9 @@
+
+
+-
+
+
-
+
+ +
++ + ++ + ++
+
+
+
+
\ No newline at end of file
Index: trunk/admin/themes/templates/footer.htt
===================================================================
--- trunk/admin/themes/templates/footer.htt (nonexistent)
+++ trunk/admin/themes/templates/footer.htt (revision 2)
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+{MESSAGE}
+ +| + + WebsiteBaker is released under the + GNU General Public License + + | +